Binary file bin/hbthemeindexer_symbian.exe has changed
Binary file bin/themeindexer_symbian.exe has changed
--- a/config.tests/symbian/sgimagelite/main.cpp Mon May 03 12:48:33 2010 +0300
+++ b/config.tests/symbian/sgimagelite/main.cpp Fri May 14 16:09:54 2010 +0300
@@ -24,9 +24,11 @@
****************************************************************************/
#include <ncp_feature_consts.hrh>
+#include <ncp_feature_settings.hrh>
#ifndef VSW_GSW_SGIMAGELITE
#error VSW_GSW_SGIMAGELITE not defined
#endif
-int main() { }
+int main() { return 0;}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/config.tests/unix/sharedmemory/main.cpp Fri May 14 16:09:54 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 Config module of the UI Extensions for Mobile.
+**
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at developer.feedback@nokia.com.
+**
+****************************************************************************/
+
+#include <QCoreApplication>
+#include <QSharedMemory>
+#include <QtDebug>
+#include <cstdlib>
+#include "hbsharedmemorymanager_p.h"
+
+int main(int argc, char *argv[])
+{
+ QCoreApplication app(argc, argv);
+ QSharedMemory sharedMemory("hbconftest_sharedmemory");
+ if (!sharedMemory.create(CACHE_SIZE, QSharedMemory::ReadWrite)) {
+ qWarning() << sharedMemory.errorString();
+ return EXIT_FAILURE;
+ }
+ return EXIT_SUCCESS;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/config.tests/unix/sharedmemory/sharedmemory.pro Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,37 @@
+#
+#############################################################################
+##
+## Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+## All rights reserved.
+## Contact: Nokia Corporation (developer.feedback@nokia.com)
+##
+## This file is part of the UI Extensions for Mobile.
+##
+## GNU Lesser General Public License Usage
+## This file may be used under the terms of the GNU Lesser General Public
+## License version 2.1 as published by the Free Software Foundation and
+## appearing in the file LICENSE.LGPL included in the packaging of this file.
+## Please review the following information to ensure the GNU Lesser General
+## Public License version 2.1 requirements will be met:
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Nokia gives you certain additional
+## rights. These rights are described in the Nokia Qt LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## If you have questions regarding the use of this file, please contact
+## Nokia at developer.feedback@nokia.com.
+##
+#############################################################################
+#
+
+TEMPLATE = app
+TARGET = hbconftest_sharedmemory
+DEPENDPATH += . $${HB_SOURCE_DIR}/src/hbcore/core
+INCLUDEPATH += . $${HB_SOURCE_DIR}/src/hbcore/core
+DEFINES += HB_BOOTSTRAPPED
+CONFIG -= app_bundle
+
+# Input
+SOURCES += main.cpp
+HEADERS += hbsharedmemorymanager_p.h
--- a/configure.py Mon May 03 12:48:33 2010 +0300
+++ b/configure.py Fri May 14 16:09:54 2010 +0300
@@ -61,19 +61,21 @@
if not part in HB_NOMAKE_PARTS:
HB_NOMAKE_PARTS.append(part)
-def run_process(command, cwd=None):
+def run_process(args, cwd=None):
code = 0
output = ""
+ if os.name == "nt":
+ args = ["cmd.exe", "/C"] + args
try:
if cwd != None:
oldcwd = os.getcwd()
os.chdir(cwd)
if sys.version_info[0] == 2 and sys.version_info[1] < 4:
- process = popen2.Popen4(command)
+ process = popen2.Popen4(args)
code = process.wait()
output = process.fromchild.read()
else:
- process = subprocess.Popen(command, stderr=subprocess.PIPE, stdout=subprocess.PIPE)
+ process = subprocess.Popen(args, stderr=subprocess.PIPE, stdout=subprocess.PIPE)
(stdout, stderr) = process.communicate()
code = process.returncode
output = stdout + stderr
@@ -132,8 +134,29 @@
"NOTE: Use '--prefix .' to configure a local setup. A local "
"setup will install nothing else than the qmake "
"feature file." % prefix)
+ group.add_option("--bin-dir", dest="bindir", metavar="dir",
+ help="Install executables to <dir>. The default value is 'PREFIX/bin'.")
+ group.add_option("--lib-dir", dest="libdir", metavar="dir",
+ help="Install libraries to <dir>. The default value is 'PREFIX/lib'.")
+ group.add_option("--doc-dir", dest="docdir", metavar="dir",
+ help="Install documentation to <dir>. The default value is 'PREFIX/doc'.")
+ group.add_option("--include-dir", dest="includedir", metavar="dir",
+ help="Install headers to <dir>. The default value is 'PREFIX/include'.")
+ group.add_option("--plugin-dir", dest="plugindir", metavar="dir",
+ help="Install plugins to <dir>. The default value is 'PREFIX/plugins'.")
+ group.add_option("--resource-dir", dest="resourcedir", metavar="dir",
+ help="Install resources to <dir>. The default value is 'PREFIX/resources'.")
+ group.add_option("--feature-dir", dest="featuredir", metavar="dir",
+ help="Install qmake feature files to <dir>. The default value is 'QTDIR/mkspecs/features'.")
self.add_option_group(group)
self.set_defaults(prefix=None)
+ self.set_defaults(bindir=None)
+ self.set_defaults(libdir=None)
+ self.set_defaults(docdir=None)
+ self.set_defaults(includedir=None)
+ self.set_defaults(plugindir=None)
+ self.set_defaults(resourcedir=None)
+ self.set_defaults(featuredir=None)
group = optparse.OptionGroup(self, "Configure options")
group.add_option("--platform", dest="platform", metavar="platform",
@@ -178,6 +201,14 @@
self.set_defaults(fast=False)
self.set_defaults(defines=None)
+ group = optparse.OptionGroup(self, "Host options")
+ group.add_option("--host-qmake-bin", dest="hostqmakebin", metavar="path",
+ help="Specify the host qmake tool.")
+ group.add_option("--host-make-bin", dest="hostmakebin", metavar="path",
+ help="Specify the host make tool (make, nmake, mingw32-make, gmake...).")
+ self.set_defaults(hostqmakebin=None)
+ self.set_defaults(hostmakebin=None)
+
group = optparse.OptionGroup(self, "qmake options")
group.add_option("--qmake-bin", dest="qmakebin", metavar="path",
help="Specify the path to the qmake. The one "
@@ -278,10 +309,13 @@
self._error = None
self._qmake = qmake
self._spec = None
+ self._version = None
+ self._features = None
+ self._qtdir = None
def name(self):
if not self._platform:
- self._platform = self._detect_platform()
+ self._detect_qt()
return self._platform
def make(self):
@@ -290,20 +324,43 @@
return self._make
def qmake(self):
+ if not self._qmake:
+ self._detect_qt()
return self._qmake
def error(self):
return self._error
def spec(self):
+ if not self._spec:
+ self._detect_qt()
return self._spec
- def _detect_platform(self):
+ def version(self):
+ if not self._version:
+ self._detect_qt()
+ return self._version
+
+ def features(self):
+ if not self._features:
+ self._detect_qt()
+ return self._features
+
+ def qtdir(self):
+ if not self._qtdir:
+ self._detect_qt()
+ return self._qtdir
+
+ def _detect_qt(self):
lines = list()
- lines.append("symbian:message(symbian)\n")
- lines.append("else:macx:message(macx)\n")
- lines.append("else:unix:message(unix)\n")
- lines.append("else:win32:message(win32)\n")
+ lines.append("symbian:message(platform:symbian)\n")
+ lines.append("else:macx:message(platform:macx)\n")
+ lines.append("else:unix:message(platform:unix)\n")
+ lines.append("else:win32:message(platform:win32)\n")
+
+ lines.append("message(version:$$[QT_VERSION])\n")
+ lines.append("message(libraries:$$[QT_INSTALL_LIBS])\n")
+ lines.append("message(features:$$[QMAKE_MKSPECS]/features)\n")
try:
if not os.path.exists("tmp"):
@@ -315,13 +372,10 @@
except Exception, e:
print(e)
self._error = "Unable to write a temporary file. Make sure to configure in a writable directory."
- return None
+ return
# do not use .qmake.cache when detecting the platform
- args = []
- if os.name == "nt":
- args += "cmd.exe", "/C"
- args += [self._qmake, "-nocache", os.path.split(filepath)[1]]
+ args = [self._qmake, "-nocache", os.path.split(filepath)[1]]
if self._spec:
args += ["-spec", self._spec]
(code, output) = run_process(args, "tmp")
@@ -330,10 +384,12 @@
self._error = "Unable to execute %s" % self._qmake
if self._qmake == "qmake":
self._error += ". Add qmake to PATH or pass --qmake-bin <path/to/qmake>."
- return None
try:
- return re.match("Project MESSAGE: (\w+)", output).group(1)
+ self._platform = re.search("Project MESSAGE: platform:(\S+)", output).group(1)
+ self._version = re.search("Project MESSAGE: version:(\S+)", output).group(1)
+ self._qtdir = re.search("Project MESSAGE: libraries:(\S+)", output).group(1)
+ self._features = re.search("Project MESSAGE: features:(\S+)", output).group(1)
except:
self._error = "Unable to parse qmake output (%s)" % output.strip()
if output.find("QMAKESPEC") != -1:
@@ -373,29 +429,45 @@
self._sourcedir = sourcedir
self._builddir = builddir
- def compile(self, test, patterns=None):
+ def compile(self, test):
code = -1
prevdir = os.getcwd()
try:
+ basename = os.path.basename(test)
sourcedir = os.path.join(self._sourcedir, test)
- filepath = os.path.join(sourcedir, os.path.basename(sourcedir) + ".pro")
+ filepath = os.path.join(sourcedir, basename + ".pro")
builddir = os.path.join(self._builddir, test)
+ # create build dir
if not os.path.exists(builddir):
os.makedirs(builddir)
os.chdir(builddir)
+ # run qmake & make
args = [self._qmake, filepath]
if self._spec:
args += ["-spec", self._spec]
run_process(args)
- (code, output) = run_process(self._make)
- if code == 0 and patterns:
+ (code, output) = run_process([self._make])
+
+ # make return value is not reliable
+ if self._platform == "symbian":
+ # on symbian, check that no error patterns such as '***' can be found from build output
+ patterns = ["\\*\\*\\*", "Errors caused tool to abort"]
for pattern in patterns:
if re.search(pattern, output) != None:
code = -1
- break
+ else:
+ # on other platforms, check that the resulting executable exists
+ executable = os.path.join(builddir, "hbconftest_" + basename)
+ if os.name == "nt":
+ executable.append(".exe")
+ if not os.path.exists(executable) or not os.access(executable, os.X_OK):
+ code = -1
+
+ # clean
run_process([self._make, "clean"])
+
except:
code = -1
os.chdir(prevdir)
@@ -478,14 +550,9 @@
sourcedir = os.path.abspath(sys.path[0])
# default prefixes
- symbianprefix = None
- if platform.name() == "symbian":
- if os.path.isdir("/s60"):
- symbianprefix = "$${EPOCROOT}epoc32/include/hb"
- else:
- symbianprefix = "$${EPOCROOT}epoc32/include/mw/hb"
- prefixes = { "symbian" : symbianprefix,
+ prefixes = { "symbian" : "$${EPOCROOT}epoc32",
"unix" : "/usr/local/hb",
+ "macx" : "/usr/local/hb",
"win32" : "C:/hb" }
# parse command line options
@@ -499,6 +566,7 @@
print("Configuring Hb...")
print("INFO: Platform: %s" % platform.name())
print("INFO: Make: %s" % platform.make())
+ print("INFO: Qt: %s in %s" % (platform.version(), platform.qtdir()))
# warn about deprecated options
if options.qtanimation != None:
@@ -538,10 +606,6 @@
basedir = os.path.abspath(basedir)
local = os.path.isdir(basedir) and (basedir == currentdir)
- if not local:
- resourcedir = basedir + "/resources"
- else:
- resourcedir = sourcedir + "/src/hbcore/resources"
# generate local build wrapper headers
synchb = "bin/synchb.py"
@@ -550,11 +614,6 @@
print("INFO: Running %s" % synchb)
os.system("python %s/%s -i %s -o %s" % (sourcedir, synchb, sourcedir, currentdir))
- # write config
- config = ConfigFile()
- config.set_value("HB_INSTALL_DIR", ConfigFile.format_dir(basedir))
- config.set_value("HB_RESOURCES_DIR", ConfigFile.format_dir(resourcedir))
-
# generate a qrc for resources
args = [os.path.join(sourcedir, "bin/resourcifier.py")]
args += ["-i", "%s" % os.path.join(sys.path[0], "src/hbcore/resources")]
@@ -571,43 +630,90 @@
os.system("python %s" % " ".join(args))
# compilation tests to detect available features
+ config = ConfigFile()
test = ConfigTest(platform)
test.setup(sourcedir, currentdir)
- print("INFO: Detecting available features...")
- patterns = { "symbian" : ["\\*\\*\\*", "Errors caused tool to abort"],
- "maemo" : ["\\*\\*\\*"],
- "unix" : ["\\*\\*\\*"],
- "win32" : ["\\*\\*\\*"] }
+ print("\nDetecting available features...")
if options.qtmobility == None:
- options.qtmobility = test.compile("config.tests/all/mobility", patterns.get(platform.name(), None))
- print("INFO:\tQt Mobility:\t\t\t%s" % options.qtmobility)
+ options.qtmobility = test.compile("config.tests/all/mobility")
if options.qtmobility:
config.add_value("DEFINES", "HB_HAVE_QT_MOBILITY")
+ print("INFO: Qt Mobility:\t\t\t%s" % options.qtmobility)
if platform.name() == "symbian":
- sgimagelite_result = test.compile("config.tests/symbian/sgimagelite", patterns.get(platform.name(), None))
+ sgimagelite_result = test.compile("config.tests/symbian/sgimagelite")
if sgimagelite_result:
- config.add_value("CONFIG", "sgimagelite_support")
- print("INFO:\tSgImage-Lite:\t\t\t%s" % sgimagelite_result)
+ config.add_value("CONFIG", "sgimage")
+ print("INFO: SgImage-Lite:\t\t\t%s" % sgimagelite_result)
if options.dui == None:
- options.dui = test.compile("config.tests/maemo/dui", patterns.get(platform.name(), None))
- print("INFO:\tDirect UI:\t\t\t%s" % options.dui)
+ options.dui = test.compile("config.tests/maemo/dui")
if options.dui:
config.add_value("CONFIG", "hb_maemo_dui")
config.add_value("DEFINES", "HB_MAEMO_DUI")
+ print("INFO: Direct UI:\t\t\t%s" % options.dui)
- config.set_value("HB_BIN_DIR", ConfigFile.format_dir(basedir + "/bin"))
- config.set_value("HB_LIB_DIR", ConfigFile.format_dir(basedir + "/lib"))
- config.set_value("HB_DOC_DIR", ConfigFile.format_dir(basedir + "/doc"))
- if not options.developer and platform.name() == "symbian":
- config.set_value("HB_INCLUDE_DIR", ConfigFile.format_dir(basedir))
- else:
- config.set_value("HB_INCLUDE_DIR", ConfigFile.format_dir(basedir + "/include"))
+ # directories
+ if options.bindir == None:
+ # TODO: symbian
+ options.bindir = basedir + "/bin"
+ if options.libdir == None:
+ # TODO: symbian
+ options.libdir = basedir + "/lib"
+ if options.docdir == None:
+ # TODO: symbian
+ options.docdir = basedir + "/doc"
+ if options.includedir == None:
+ if platform.name() == "symbian" and not options.developer:
+ if os.path.isdir("/s60"):
+ options.includedir = basedir + "/include/hb"
+ else:
+ options.includedir = basedir + "/include/mw/hb"
+ else:
+ options.includedir = basedir + "/include"
+ if options.plugindir == None:
+ if platform.name() == "symbian":
+ # TODO: fix to "$${EPOCROOT}resource/hb/plugins"
+ options.plugindir = "$${EPOCROOT}resource/qt/plugins/hb"
+ else:
+ options.plugindir = basedir + "/plugins"
+ if options.featuredir == None:
+ options.featuredir = platform.features()
+ if options.resourcedir == None:
+ # TODO: fix this, some components want to write resources...
+ # thus, cannot point to the source tree!
+ if not local:
+ options.resourcedir = basedir + "/resources"
+ else:
+ options.resourcedir = sourcedir + "/src/hbcore/resources"
- if platform.name() == "symbian":
- plugins_dir = "$${EPOCROOT}resource/qt/plugins/hb"
- else:
- plugins_dir = basedir + "/plugins"
- config.set_value("HB_PLUGINS_DIR", ConfigFile.format_dir(plugins_dir))
+ config.set_value("HB_INSTALL_DIR", ConfigFile.format_dir(basedir))
+ config.set_value("HB_BIN_DIR", ConfigFile.format_dir(options.bindir))
+ config.set_value("HB_LIB_DIR", ConfigFile.format_dir(options.libdir))
+ config.set_value("HB_DOC_DIR", ConfigFile.format_dir(options.docdir))
+ config.set_value("HB_INCLUDE_DIR", ConfigFile.format_dir(options.includedir))
+ config.set_value("HB_PLUGINS_DIR", ConfigFile.format_dir(options.plugindir))
+ config.set_value("HB_RESOURCES_DIR", ConfigFile.format_dir(options.resourcedir))
+ config.set_value("HB_FEATURES_DIR", ConfigFile.format_dir(options.featuredir))
+
+
+ if os.name == "posix" or os.name == "mac":
+ sharedmem = test.compile("config.tests/unix/sharedmemory")
+ if sharedmem:
+ (code, output) = run_process(["./hbconftest_sharedmemory"], "config.tests/unix/sharedmemory")
+ sharedmem = (code == 0)
+ if not sharedmem:
+ print("DEBUG:%s" % output)
+ print("INFO: Shared Memory:\t\t\t%s" % sharedmem)
+ if not sharedmem:
+ print("WARNING:The amount of available shared memory is too low!")
+ print "\tTry adjusting the shared memory configuration",
+ if os.path.exists("/proc/sys/kernel/shmmax"):
+ print "(/proc/sys/kernel/shmmax)"
+ elif os.path.exists("/etc/sysctl.conf"):
+ print "(/etc/sysctl.conf)"
+
+
+
+ # TODO: get rid of this!
if platform.name() == "symbian":
config.set_value("HB_PLUGINS_EXPORT_DIR", ConfigFile.format_dir("$${EPOCROOT}epoc32/winscw/c/resource/qt/plugins/hb"))
@@ -632,6 +738,7 @@
config.set_value("HB_BUILD_DIR", ConfigFile.format_dir(currentdir))
config.set_value("HB_SOURCE_DIR", ConfigFile.format_dir(sourcedir))
+ config.set_value("HB_MKSPECS_DIR", ConfigFile.format_dir(basedir + "/mkspecs"))
if platform.name() == "symbian":
if os.path.isdir("/s60"):
@@ -659,6 +766,10 @@
for nomake in HB_NOMAKE_PARTS:
config.add_value("HB_NOMAKE_PARTS", nomake)
+ if options.qmakeopt:
+ for qmakeopt in options.qmakeopt.split():
+ config._lines.append(qmakeopt + "\n")
+
if local:
config.add_value("CONFIG", "local")
if options.silent:
@@ -700,7 +811,7 @@
config._lines.append("}\n")
# TODO: is there any better way to expose functions to the whole source tree?
- config._lines.append("include(%s)\n" % (os.path.splitdrive(sourcedir)[1] + "/src/hbfunctions.prf"))
+ config._lines.append("include(%s)\n" % (os.path.splitdrive(sourcedir)[1] + "/mkspecs/hb_functions.prf"))
if options.verbose:
print("INFO: Writing .qmake.cache")
@@ -708,6 +819,24 @@
print("ERROR: Unable to write .qmake.cache.")
return
+ # build host tools
+ if platform.name() == "symbian" or options.hostqmakebin != None or options.hostmakebin != None:
+ print("\nBuilding host tools...")
+ if options.hostqmakebin != None and options.hostmakebin != None:
+ profile = "%s/src/hbtools/hbtools.pro" % sourcedir
+ if os.path.exists(profile):
+ toolsdir = os.path.join(currentdir, "src/hbtools")
+ if not os.path.exists(toolsdir):
+ os.makedirs(toolsdir)
+ os.chdir(toolsdir)
+ os.system("\"%s\" -config silent %s" % (options.hostqmakebin, profile))
+ os.system("\"%s\"" % (options.hostmakebin))
+ os.chdir(currentdir)
+ else:
+ print("WARNING: Cannot build host tools, because no --host-qmake-bin and/or")
+ print(" --host-make-bin was provided. Hb will attempt to run host")
+ print(" tools from PATH.")
+
# run qmake
if options.qmakebin:
qmake = options.qmakebin
@@ -722,7 +851,9 @@
if options.qmakeopt:
qmake = "%s \\\"%s\\\"" % (qmake, options.qmakeopt)
if options.verbose:
- print("INFO: Running %s" % qmake)
+ print("\nRunning %s -cache %s %s" % (qmake, cachefile, profile))
+ else:
+ print("\nRunning qmake...")
try:
ret = os.system("%s -cache %s %s" % (qmake, cachefile, profile))
except KeyboardInterrupt:
@@ -741,6 +872,10 @@
if not os.path.exists(tsrcdir):
os.makedirs(tsrcdir)
os.chdir(tsrcdir)
+ if options.verbose:
+ print("\nRunning %s %s" % (qmake, profile))
+ else:
+ print("\nRunning qmake in tsrc...")
os.system("%s %s" % (qmake, profile))
os.chdir(currentdir)
--- a/hb.prf Mon May 03 12:48:33 2010 +0300
+++ b/hb.prf Fri May 14 16:09:54 2010 +0300
@@ -30,6 +30,7 @@
symbian:CONFIG += symbian_i18n skin_icon
include(hb_install.prf)
+#include(docml2bin.prf)
CONFIG(debug, debug|release) {
win32:SUFFIX = d
--- a/hb.pro Mon May 03 12:48:33 2010 +0300
+++ b/hb.pro Fri May 14 16:09:54 2010 +0300
@@ -36,28 +36,32 @@
feature.files += $$HB_SOURCE_DIR/hb.prf
feature.files += $$HB_BUILD_DIR/hb_install.prf
-feature.path = $$[QMAKE_MKSPECS]/features
+feature.files += $$HB_MKSPECS_DIR/hb_functions.prf
+#feature.files += $$HB_MKSPECS_DIR/docml2bin.prf
+feature.path = $$HB_FEATURES_DIR
INSTALLS += feature
QMAKE_DISTCLEAN += $$hbNativePath($$HB_BUILD_DIR/.qmake.cache)
QMAKE_DISTCLEAN += $$hbNativePath($$HB_BUILD_DIR/hb_install.prf)
+hbvar.path = .
+hbvar.commands += $(QMAKE) -set HB \"hbcore hbwidgets hbutils\"
+QMAKE_EXTRA_TARGETS += hbvar
+INSTALLS += hbvar
+
symbian {
exists(rom):include(rom/rom.pri)
- install.depends += index
+ install.depends += index 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)
QMAKE_EXTRA_TARGETS += install
}
-# indexing
-symbian {
- THEMEINDEXER = $$hbNativePath($$HB_SOURCE_DIR/bin/themeindexer_symbian)
- HB_THEMES_DIR = $${EPOCROOT}epoc32/data/z/resource/hb/themes
-} else {
- THEMEINDEXER = $$hbNativePath($$HB_BUILD_DIR/bin/themeindexer)
- HB_THEMES_DIR = $(HB_THEMES_DIR)/themes
-}
+# 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 = .
@@ -70,12 +74,15 @@
}
for(index.target, index.targets) {
!isEmpty(index.commands):index.commands += &&
- index.commands += $$THEMEINDEXER -n $$index.name -s $$index.source -t $$index.target
+ index.commands += $$hbToolCommand(hbthemeindexer) -n $$index.name -s $$index.source -t $$index.target
}
QMAKE_EXTRA_TARGETS += index
INSTALLS += index
}
+# css binary generation
+
+
!contains(HB_NOMAKE_PARTS, tests):exists(tsrc) {
test.depends = sub-src
test.commands += cd tsrc && $(MAKE) test
--- a/layers.sysdef.xml Mon May 03 12:48:33 2010 +0300
+++ b/layers.sysdef.xml Fri May 14 16:09:54 2010 +0300
@@ -17,6 +17,9 @@
<module name="qtdo.hb.fute_app">
<unit name="qtdo.hb.fute_app" unitID="qtdo.hb.fute_app" bldFile="&layer_real_source_path;/tsrc/fute" mrp="" proFile="fute.pro" qmakeArgs="-r MMP_RULES+=EXPORTUNFROZEN" filter="hb_fute_app"/>
</module>
+ <module name="qtdo.hb.fute_lang_app">
+ <unit name="qtdo.hb.fute_lang_app" unitID="qtdo.hb.fute_lang_app" bldFile="&layer_real_source_path;/tsrc/fute/languageswitcher" mrp="" proFile="languageswitcher.pro" qmakeArgs="MMP_RULES+=EXPORTUNFROZEN"/>
+ </module>
</layer>
<layer name="unit_test_layer">
<module name="qtdo.hb.unit_test">
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mkspecs/docml2bin.prf Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,19 @@
+include(hb_install.prf)
+include(hb_functions.prf)
+
+QMAKE_DOCML2BIN = $$hbNativePath($${HB_BIN_DIR}/docml2bin)
+
+docml2bin.input = DOCML
+docml2bin.output = ${QMAKE_FILE_IN}.bin
+docml2bin.commands = "$$QMAKE_DOCML2BIN" -s "${QMAKE_FILE_IN}" -t "${QMAKE_FILE_OUT}"
+docml2bin.name = DOCML2BIN ${QMAKE_FILE_IN}
+docml2bin.CONFIG = no_link
+
+rcc.depends += compiler_docml2bin_make_all
+
+## how to add ".bin" for each variable?
+#rcc.depends += for(DOCMLFILE, $$list(DOCML)) { DOCMLFILE }
+#rcc.depends += $${first(DOCML)}.bin
+#rcc.depends += $${last(DOCML)}.bin
+
+QMAKE_EXTRA_COMPILERS += docml2bin
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mkspecs/hb_functions.prf Fri May 14 16:09:54 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 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.
+##
+#############################################################################
+#
+
+defineReplace(hbLibraryTarget) {
+ unset(LIBRARY_NAME)
+ LIBRARY_NAME = $$1
+ # the following leads to ugly vcproj names but had to be commented
+ # out, because it broke vcproj generator dependency checks
+ #!debug_and_release|build_pass { <--
+ CONFIG(debug, debug|release) {
+ mac:RET = $$member(LIBRARY_NAME, 0)_debug
+ else:win32:RET = $$member(LIBRARY_NAME, 0)d
+ }
+ #}
+ isEmpty(RET):RET = $$LIBRARY_NAME
+ return($$RET)
+}
+
+# params: <collection/library>
+# eg. hbAddLibrary(hbcore/HbCore)
+defineTest(hbAddLibrary) {
+ PARTS = $$split(1, "/")
+ COLLECTION = $$lower($$first(PARTS))
+ LIBRARY = $$last(PARTS)
+
+ INCLUDEPATH *= $${HB_BUILD_DIR}/include/$${COLLECTION}
+ INCLUDEPATH *= $${HB_BUILD_DIR}/include/$${COLLECTION}/private
+ DEPENDPATH *= $${HB_BUILD_DIR}/include/$${COLLECTION}
+ DEPENDPATH *= $${HB_BUILD_DIR}/include/$${COLLECTION}/private
+
+ LIBS *= -L$${HB_BUILD_DIR}/lib
+ LIBS *= -l$$hbLibraryTarget($$LIBRARY)
+ QMAKE_RPATHDIR *= $${HB_BUILD_DIR}/lib
+ unix:HB_COVERAGE_EXCLUDE += \"*/$$COLLECTION/*\"
+
+ export(LIBS)
+ export(INCLUDEPATH)
+ export(DEPENDPATH)
+ export(QMAKE_RPATHDIR)
+ export(HB_COVERAGE_EXCLUDE)
+ return(true)
+}
+
+# params: <collection>
+# NOTE: PUBLIC_HEADERS, INTERNAL_HEADERS, CONVENIENCE_HEADERS
+# eg. hbExportHeaders(hbcore)
+defineTest(hbExportHeaders) {
+ for(PUBLIC_HEADER, PUBLIC_HEADERS) {
+ PUBLIC_HEADER = $$section(PUBLIC_HEADER, ":", 1)
+ 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(CONVENIENCE_HEADER, CONVENIENCE_HEADERS) {
+ CONVENIENCE_HEADER = $$section(CONVENIENCE_HEADER, ":", 1)
+ EXPORT_PATH = $$sprintf($$HB_EXPORT_DIR, $$1, $$basename(CONVENIENCE_HEADER))
+ BLD_INF_RULES.prj_exports *= "$$CONVENIENCE_HEADER $$EXPORT_PATH"
+ }
+ export(BLD_INF_RULES.prj_exports)
+ return(true)
+}
+
+# params: -
+# eg. $$hbUnixStyle():CMD=/path/to/cmd else:CMD=\path\to\cmd
+defineTest(hbUnixStyle) {
+ symbian|win32:!win32-g++ {
+ unixstyle = false
+ } else:win32-g++:isEmpty(QMAKE_SH) {
+ unixstyle = false
+ } else {
+ unixstyle = true
+ }
+ return($$unixstyle)
+}
+
+# params: <path>
+# eg. features.path = $$hbNativePath($$[QMAKE_MKSPECS]/features)
+defineReplace(hbNativePath) {
+ hbUnixStyle() {
+ return($$quote(\"$$replace(1, "\\", "/")\"))
+ } else {
+ return($$quote(\"$$replace(1, "/", "\\")\"))
+ }
+}
+
+# params: <tool name>
+# eg. hbfoo.command = $$hbToolCommand(hbfoo)
+defineReplace(hbToolCommand) {
+ # tool in PATH?
+ hbUnixStyle():DEVNULL = /dev/null
+ else:DEVNULL = nul
+ system($$1 > $$DEVNULL 2>&1):return($$1)
+
+ # host build is runnable?
+ hbtoolcmd = $$hbNativePath($$HB_BUILD_DIR/bin/$$1)
+ system($$hbtoolcmd > $$DEVNULL 2>&1):return($$hbtoolcmd)
+
+ # pre-built tool is runnable?
+ hbtoolcmd = $$hbNativePath($$sprintf("%1%2", $$HB_SOURCE_DIR/bin/$$1, "_symbian.exe"))
+ system($$hbtoolcmd > $$DEVNULL 2>&1):return($$hbtoolcmd)
+
+ # fall back to <builddir>/bin
+ return($$hbNativePath($$HB_BUILD_DIR/bin/$$1))
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbapps/hbapps.pro Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,37 @@
+#
+#############################################################################
+##
+## Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+## All rights reserved.
+## Contact: Nokia Corporation (developer.feedback@nokia.com)
+##
+## This file is part of the UI Extensions for Mobile.
+##
+## GNU Lesser General Public License Usage
+## This file may be used under the terms of the GNU Lesser General Public
+## License version 2.1 as published by the Free Software Foundation and
+## appearing in the file LICENSE.LGPL included in the packaging of this file.
+## Please review the following information to ensure the GNU Lesser General
+## Public License version 2.1 requirements will be met:
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Nokia gives you certain additional
+## rights. These rights are described in the Nokia Qt LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## If you have questions regarding the use of this file, please contact
+## Nokia at developer.feedback@nokia.com.
+##
+#############################################################################
+#
+
+TEMPLATE = subdirs
+
+SUBDIRS += hbthemechanger
+
+symbian {
+ SUBDIRS += hbiconpreloader
+}
+
+include($${HB_SOURCE_DIR}/src/hbcommon.pri)
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbapps/hbiconpreloader/hbiconpreloader.pro Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,25 @@
+TEMPLATE = app
+TARGET =
+DEPENDPATH += .
+INCLUDEPATH += .
+
+SOURCES += main.cpp
+
+symbian {
+ TARGET.CAPABILITY = CAP_APPLICATION
+ TARGET.EPOCALLOWDLLDATA = 1
+
+ LIBS += -lcone
+ LIBS += -lavkon
+ LIBS += -leikcore
+
+ myrssrules = \
+ "hidden = KAppIsHidden;" \
+ "launch = KAppLaunchInBackground;"
+
+ RSS_RULES += myrssrules
+}
+
+hbAddLibrary(hbcore/HbCore)
+hbAddLibrary(hbwidgets/HbWidgets)
+hbAddLibrary(hbutils/HbUtils)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbapps/hbiconpreloader/main.cpp Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,66 @@
+/****************************************************************************
+**
+** 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 <hbapplication.h>
+#include <hbmainwindow.h>
+#include <QMainWindow>
+#include <QDebug>
+
+#ifdef Q_OS_SYMBIAN
+#include <coemain.h>
+#endif
+
+/*
+* This application exists temporarily to preload some time-consuming graphics
+* when theme server is started in order to simulate the real scenario where
+* such graphics get loaded in the boot when first app is shown.
+* It creates more realistic results for the performance tests.
+*/
+int main(int argc, char *argv[])
+{
+ HbApplication app(argc, argv, Hb::NoSplash);
+ // Create a mainwindow so its graphics get cached and next app startup is faster
+ HbMainWindow window;
+ window.show();
+
+ qDebug() << "HB: HbIconPreloader started";
+
+ // Render the window in a pixmap painter, it does not get drawn and icons do not get loaded
+ // otherwise because the application runs in background.
+ QImage image(1, 1, QImage::Format_ARGB32);
+ QPainter painter(&image);
+
+ window.render(&painter);
+
+#ifdef Q_OS_SYMBIAN
+ // To avoid crash in app exit
+ CCoeEnv::Static()->DisableExitChecks(true);
+#endif
+
+ QApplication::processEvents(); // to prevent mysterious deadlocks when destroying the mainwindow
+
+ // Exit the application
+ return 0;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbapps/hbthemechanger/hbthemechanger.pro Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,61 @@
+#############################################################################
+##
+## Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+## All rights reserved.
+## Contact: Nokia Corporation (developer.feedback@nokia.com)
+##
+## This file is part of the UI Extensions for Mobile.
+##
+## GNU Lesser General Public License Usage
+## This file may be used under the terms of the GNU Lesser General Public
+## License version 2.1 as published by the Free Software Foundation and
+## appearing in the file LICENSE.LGPL included in the packaging of this file.
+## Please review the following information to ensure the GNU Lesser General
+## Public License version 2.1 requirements will be met:
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Nokia gives you certain additional
+## rights. These rights are described in the Nokia Qt LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## If you have questions regarding the use of this file, please contact
+## Nokia at developer.feedback@nokia.com.
+##
+#############################################################################
+
+TEMPLATE = app
+TARGET = hbthemechanger
+
+TARGET.EPOCHEAPSIZE = 0x20000 0x1000000
+QT += network
+DEFINES += HB_RESOURCES_DIR=\"\\\"$${HB_RESOURCES_DIR}\\\"\"
+
+# directories
+DESTDIR = $${HB_BUILD_DIR}/bin
+
+# dependencies
+hbAddLibrary(hbcore/HbCore)
+hbAddLibrary(hbwidgets/HbWidgets)
+
+# Input
+HEADERS += themechangerdefs.h
+HEADERS += themeselectionlist.h
+SOURCES += themeselectionlist.cpp
+SOURCES += themechangermain.cpp
+
+symbian {
+ TARGET.CAPABILITY += WriteDeviceData
+ HEADERS += themeclientsymbian.h
+ SOURCES += themeclientsymbian.cpp
+} else {
+ HEADERS += themeclientqt.h
+ SOURCES += themeclientqt.cpp
+}
+
+# installation
+!local {
+ target.path = $${HB_BIN_DIR}
+ INSTALLS += target
+}
+
+include($${HB_SOURCE_DIR}/src/hbcommon.pri)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbapps/hbthemechanger/themechangerdefs.h Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,34 @@
+/****************************************************************************
+**
+** 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 THEMECHANGERDEFS_H
+#define THEMECHANGERDEFS_H
+
+#ifdef Q_OS_SYMBIAN
+// Enable theme change timing logging
+#define THEME_CHANGER_TIMER_LOG
+#endif
+#undef THEME_CHANGER_TRACES
+
+#endif //THEMECHANGERDEFS_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbapps/hbthemechanger/themechangermain.cpp Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,91 @@
+/****************************************************************************
+**
+** 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 <hbapplication.h>
+#include <hbmainwindow.h>
+#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)
+ {
+ QFile file("c:/data/logs/hbthemechanger.txt");
+
+ if (!file.open(QIODevice::Append))
+ return;
+ QTextStream out(&file);
+
+ switch (type)
+ {
+ case QtDebugMsg:
+ out << msg << QChar::LineSeparator;
+ break;
+ case QtWarningMsg:
+ break;
+ case QtCriticalMsg:
+ break;
+ case QtFatalMsg:
+ break;
+ }
+ }
+#endif //THEME_CHANGER_TIMER_LOG
+
+int main(int argc, char *argv[])
+{
+#ifdef THEME_CHANGER_TIMER_LOG
+ qInstallMsgHandler(debugOutput);
+#endif
+ // Initialization
+ HbApplication app(argc, argv);
+ app.setApplicationName("ThemeChanger");
+ // Main window widget.
+ // 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);
+ themelist->displayThemes();
+
+ mainWindow.addView( themelist );
+
+ // Show widget
+ mainWindow.show();
+ // Enter event loop
+ return app.exec();
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbapps/hbthemechanger/themeclientqt.cpp Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,101 @@
+/****************************************************************************
+**
+** 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;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbapps/hbthemechanger/themeclientqt.h Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (developer.feedback@nokia.com)
+**
+** This file is part of the 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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbapps/hbthemechanger/themeclientsymbian.cpp Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,98 @@
+/****************************************************************************
+**
+** 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;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbapps/hbthemechanger/themeclientsymbian.h Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,46 @@
+/****************************************************************************
+**
+** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (developer.feedback@nokia.com)
+**
+** This file is part of the 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 */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbapps/hbthemechanger/themeselectionlist.cpp Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,293 @@
+/****************************************************************************
+**
+** 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 <QSettings>
+#include <QStringList>
+#include <QDir>
+#include <QTimer>
+#include <hbinstance.h>
+#include <hbmenu.h>
+#include <hbaction.h>
+#include <hbicon.h>
+#include <hblistwidgetitem.h>
+#include <QDebug>
+#include <QTime>
+#include <QThread>
+
+#include "themeselectionlist.h"
+#include "themechangerdefs.h"
+
+/**
+ * Constructor
+ */
+ThemeSelectionList::ThemeSelectionList(
+#ifdef Q_OS_SYMBIAN
+ ThemeClientSymbian* client
+#else
+ ThemeClientQt* client
+#endif
+ ):
+ oldItemIndex(-1),
+ themelist(new HbListWidget(this)),
+ rightMark(new HbIcon(QString("qtg_small_tick"))),
+ noMark(new HbIcon(QString(""))),
+ client(client)
+{
+ connect(themelist, SIGNAL(activated(HbListWidgetItem *)),this, SLOT(setChosen(HbListWidgetItem *)));
+ setWidget(themelist);
+
+ // Automatic updation of the themelist when some theme is installed or uninstalled
+ // when the hbthemechanger app is open
+ watcher=new QFileSystemWatcher();
+ foreach(const QString &KThemeRootPath, rootPaths()) {
+ if(!KThemeRootPath.contains("/romthemes")){
+ watcher->addPath(KThemeRootPath+"/themes/icons/");
+ }
+ }
+ connect(watcher,SIGNAL(directoryChanged(const QString &)),this,SLOT(updateThemeList(const QString &)));
+ QObject::connect(this,SIGNAL(newThemeSelected(QString)),this,SLOT(sendThemeName(QString)));
+#ifdef THEME_CHANGER_TIMER_LOG
+ idleTimer = new QTimer(this);
+ connect(idleTimer, SIGNAL(timeout()), this, SLOT(processWhenIdle()));
+ connect(hbInstance->theme(),SIGNAL(changeFinished()), this, SLOT(themeChanged()));
+ idleTimer->start(0); // to make a connection to server
+#endif
+}
+
+/**
+ * Destructor
+ */
+ThemeSelectionList::~ThemeSelectionList()
+{
+ // Set the theme to the applied theme before exiting.
+ setChosen(themelist->item(oldItemIndex));
+ delete noMark;
+
+ noMark=NULL;
+ delete rightMark;
+ rightMark=NULL;
+
+ // Reset the item view
+ themelist->reset();
+ delete themelist;
+ themelist=NULL;
+}
+
+
+/**
+ * displayThemes
+ */
+void ThemeSelectionList::displayThemes()
+{
+ bool entryAdded = false;
+ bool themePresent = false;
+ foreach(const QString &KThemeRootPath, rootPaths()){
+ dir.setPath(KThemeRootPath) ;
+ QStringList list = dir.entryList(QDir::AllDirs|QDir::NoDotAndDotDot,QDir::Name);
+ if(list.contains("themes",Qt::CaseInsensitive )) {
+ themePresent = true;
+ QDir root = KThemeRootPath;
+ dir.setPath(root.path()+"/themes/icons/") ;
+ QStringList iconthemeslist=dir.entryList(QDir::AllDirs|QDir::NoDotAndDotDot,QDir::Name);
+ foreach(QString themefolder, iconthemeslist) {
+ QDir iconThemePath(root.path()+"/themes/icons/"+themefolder);
+ if(iconThemePath.exists("index.theme")) {
+ 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) ) {
+ iconthemeslist.removeOne(themefolder);
+ }
+ }
+ else {
+ iconthemeslist.removeOne(themefolder);
+ }
+
+ }
+ if(!entryAdded){
+ iconthemeslist.insert(0,"hbdefault"); //adding one default entry
+ 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));
+ oldItemIndex=themelist->count()-1;
+ themelist->setCurrentRow(oldItemIndex);
+ }
+ else {
+ themelist->addItem(*noMark,list.at(i));
+ }
+ }
+ }
+ }
+ // else{//add a case for no theme ,make hbdefault entry
+ if(!themePresent) {
+ QStringList defaultList;
+ defaultList.insert(0,"hbdefault"); //adding one default entry
+ themelist->addItem(*rightMark,defaultList.at(0));
+ 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");
+ }
+ }
+
+ }
+}
+
+/**
+ * setChosen
+ */
+void ThemeSelectionList::setChosen(HbListWidgetItem *item)
+{
+ QString str=item->text();
+
+#ifdef THEME_CHANGER_TRACES
+ qDebug() << "ThemeSelectionList::Setchosen with ThemeName: "<<str;
+#endif
+ if(iCurrentTheme != str ) {
+#ifdef THEME_CHANGER_TIMER_LOG
+ timer.start();
+ qDebug() << "Selected theme: " << str;
+#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);
+ }
+ }
+ else
+ {
+ applySelection(); //double tap //put a tick
+ }
+}
+
+
+/**
+ * applySelection
+ */
+void ThemeSelectionList::applySelection()
+{
+ if(oldItemIndex!=themelist->currentRow()) {
+ themelist->setIcon(themelist->currentRow(),*rightMark);
+ if(oldItemIndex >= 0) {
+ themelist->setIcon(oldItemIndex,*noMark);
+ }
+ oldItemIndex = themelist->currentRow();
+ }
+}
+
+
+/**
+ * event
+ */
+bool ThemeSelectionList::event(QEvent *e)
+{
+ if((e->type()==QEvent::ShortcutOverride)||(e->type()==QEvent::WindowDeactivate)) {
+ // save old applied theme
+ themelist->setCurrentRow(oldItemIndex);
+ themelist->setFocus();
+ setChosen(themelist->item(oldItemIndex));
+ return true;
+ }
+ return (HbView::event(e));
+}
+
+/**
+ * updateThemeList
+ */
+void ThemeSelectionList::updateThemeList(const QString &path)
+{
+ Q_UNUSED(path);
+ themelist->clear();
+ this->displayThemes();
+}
+
+
+/**
+ * sendThemeName
+ */
+void ThemeSelectionList::sendThemeName(const QString& name)
+{
+ client->changeTheme(name);
+}
+
+/**
+ * \internal
+ */
+QStringList ThemeSelectionList::rootPaths()
+{
+ QStringList rootDirs;
+#if defined(Q_OS_SYMBIAN)
+ rootDirs << "c:/resource/hb"
+ << "z:/resource/hb"
+ << "e:/resource/hb"
+ << "f:/resource/hb";
+#else
+ QString envDir = qgetenv("HB_THEMES_DIR");
+ if (!envDir.isEmpty())
+ rootDirs << envDir;
+#endif
+#if defined(Q_OS_MAC)
+ rootDirs << QDir::homePath() + "/Library/UI Extensions for Mobile";
+#elif !defined(Q_OS_SYMBIAN)
+ rootDirs << HB_RESOURCES_DIR;
+#endif
+ return rootDirs;
+}
+
+#ifdef THEME_CHANGER_TIMER_LOG
+void ThemeSelectionList::processWhenIdle()
+{
+ qDebug() << "Theme changed applied in " << timer.elapsed() << " msec";
+ idleTimer->stop();
+ QThread::currentThread()->setPriority(QThread::NormalPriority);
+ if (!client->isConnected()) {
+ client->connectToServer();
+ }
+}
+
+void ThemeSelectionList::themeChanged()
+{
+ idleTimer->start(0);
+}
+#endif //THEME_CHANGER_TIMER_LOG
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbapps/hbthemechanger/themeselectionlist.h Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,94 @@
+/****************************************************************************
+**
+** 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 THEMESELECTIONLIST_H
+#define THEMESELECTIONLIST_H
+
+#include <QDir>
+#include <QModelIndex>
+#include <QStandardItemModel>
+#include <QFileSystemWatcher>
+#include <QTime>
+#include <hbview.h>
+#include <hblistwidget.h>
+
+#ifdef Q_OS_SYMBIAN
+#include "themeclientsymbian.h"
+#else
+#include "themeclientqt.h"
+#endif
+#include "themechangerdefs.h"
+
+class HbIcon;
+
+class ThemeSelectionList:public HbView
+{
+Q_OBJECT
+public:
+
+#ifdef Q_OS_SYMBIAN
+ ThemeSelectionList(ThemeClientSymbian* client);
+#else
+ ThemeSelectionList(ThemeClientQt* client);
+#endif
+
+ ~ThemeSelectionList();
+signals:
+ void newThemeSelected(const QString &newthemepath);
+public slots:
+ void displayThemes();
+ void setChosen(HbListWidgetItem *item);
+ void applySelection();
+ void updateThemeList(const QString &path);
+ void sendThemeName(const QString& name);
+#ifdef THEME_CHANGER_TIMER_LOG
+ void processWhenIdle();
+ void themeChanged();
+#endif
+
+protected:
+ bool event(QEvent *e);
+ void resizeEvent(QResizeEvent* event);
+private:
+ static QStringList rootPaths();
+ QDir dir;
+ int oldItemIndex;
+ HbListWidget *themelist;
+ HbIcon* rightMark;
+ HbIcon* noMark;
+ HbAction *action;
+#ifdef Q_OS_SYMBIAN
+ ThemeClientSymbian* client;
+#else
+ ThemeClientQt* client;
+#endif
+
+ QFileSystemWatcher *watcher;
+ QString iCurrentTheme;
+#ifdef THEME_CHANGER_TIMER_LOG
+ QTime timer;
+ QTimer *idleTimer;
+#endif
+};
+#endif //THEMESELECTIONLIST_H
--- a/src/hbcore/activity/activity.pri Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/activity/activity.pri Fri May 14 16:09:54 2010 +0300
@@ -32,7 +32,5 @@
INTERNAL_HEADERS += $$PWD/hbactivitymanager_p.h \
$$PWD/hbactivityplugininterface_p.h \
- $$PWD/hbactivitycommandlineparser_p.h \
SOURCES += $$PWD/hbactivitymanager.cpp \
- $$PWD/hbactivitycommandlineparser_p.cpp \
--- a/src/hbcore/activity/hbactivitycommandlineparser_p.cpp Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +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 "hbactivitycommandlineparser_p.h"
-#include <QUrl>
-
-/*!
- @alpha
- @hbcore
- \class HbActivityCommandLineParser
- \brief The HbActivityCommandLineParser class is responsible for parsing
- activity URI passed as command line argument.
-*/
-
-/*!
- Searches \a commandLineArguments for pair of "-activity" marker and
- activity URI, which should have following syntax:
-
- appto://UID3?activityname=activity-name-value&key1=value
-
- If both marker and URI are found, \a reason is set to
- Hb::ActivationReasonActivity, and \a activityId and \a parameters are
- filled with parsed values.
-*/
-void HbActivityCommandLineParser::parseUri(const QStringList &commandLineArguments, Hb::ActivationReason &reason, QString &id, QVariantHash ¶ms)
-{
- int activityMarkerIndex = commandLineArguments.indexOf("-activity");
- if (activityMarkerIndex != -1 && commandLineArguments.count() - 1 > activityMarkerIndex) {
- QUrl activityUri(commandLineArguments.at(activityMarkerIndex+1));
- if (activityUri.scheme() == "appto") {
- QList<QPair<QString, QString> > parameters = activityUri.queryItems();
- for (QList<QPair<QString, QString> >::const_iterator i = parameters.constBegin(); i != parameters.constEnd(); ++i) {
- params.insert(i->first, i->second);
- }
-
- if (params.contains("activityname") && !params.value("activityname").toString().isEmpty()) {
- // all necessary data is present
- reason = Hb::ActivationReasonActivity;
- id = params.value("activityname").toString();
- } else {
- params.clear();
- }
- }
- }
-}
--- a/src/hbcore/activity/hbactivitycommandlineparser_p.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +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 HBACTIVITYCOMMANDLINEPARSER_H
-#define HBACTIVITYCOMMANDLINEPARSER_H
-
-#include <QStringList>
-#include <QVariantHash>
-
-#include <hbglobal.h>
-#include <hbnamespace.h>
-
-class HbActivityCommandLineParser
-{
-
-public:
- static void parseUri(const QStringList &commandLineParams, Hb::ActivationReason &reason, QString &id, QVariantHash ¶ms);
-
-};
-
-#endif // HBACTIVITYCOMMANDLINEPARSER_H
--- a/src/hbcore/activity/hbactivitymanager.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/activity/hbactivitymanager.cpp Fri May 14 16:09:54 2010 +0300
@@ -35,7 +35,7 @@
#include "hbactivityplugininterface_p.h"
/*!
- @beta
+ @stable
@hbcore
\class HbActivityManager
\brief HbActivityManager is an access point for Activities features.
@@ -69,38 +69,34 @@
HbActivityPluginInterface *HbActivityManagerPrivate::activityPlugin() const
{
if (!mActivityPlugin) {
- QStringList pluginPathList;
+ 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);
+ if (QFile::exists(libPath) && library.load()) {
+ library.unload();
+ pluginPath = libPath;
+ }
+#else
+ QLibrary library(libPath);
+ if (library.load()) {
+ library.unload();
+ pluginPath = library.fileName();
+ }
+#endif
+ QPluginLoader loader(pluginPath);
+ QObject *pluginInstance = loader.instance();
+ if (pluginInstance) {
+ mActivityPlugin = qobject_cast<HbActivityPluginInterface*>(pluginInstance);
+ if (mActivityPlugin) {
+ q->connect(pluginInstance, SIGNAL(activityRequested(QString)), q, SIGNAL(activityRequested(QString)));
+ } else {
#if defined(Q_OS_SYMBIAN)
- QStringList cDriveList;
- QStringList romList;
-
- foreach (const QString &libraryPath, qApp->libraryPaths()) {
- QString absolutePath = QDir(libraryPath).absolutePath();
- cDriveList << absolutePath.replace(0, 1, 'C');
- romList << absolutePath.replace(0, 1, 'Z');
- }
- pluginPathList << cDriveList << romList;
-#else
- pluginPathList << qApp->libraryPaths();
+ qWarning("Cannot load activity plugin. Features related to activities won't be available.");
#endif
-
- foreach (const QString &path, pluginPathList) {
- QDir dir(path);
- QString filePath = dir.filePath("hbactivityplugin");
- QLibrary library(filePath);
- if (library.load()) {
- QPluginLoader loader(dir.filePath(library.fileName()));
- QObject *pluginInstance = loader.instance();
- if (pluginInstance) {
- mActivityPlugin = qobject_cast<HbActivityPluginInterface*>(pluginInstance);
- if (mActivityPlugin) {
- q->connect(pluginInstance, SIGNAL(activityRequested(QString)), q, SIGNAL(activityRequested(QString)));
- } else {
-#if defined(Q_OS_SYMBIAN)
- qWarning("Cannot load activity plugin. Features related to activities won't be available.");
-#endif
- loader.unload();
- }
+ loader.unload();
}
}
}
@@ -187,6 +183,22 @@
}
/*!
+\internal
+*/
+void HbActivityManagerPrivate::parseCommandLine(const QStringList &commandLineParams, Hb::ActivationReason &reason, QString &id, QVariantHash ¶ms) const
+{
+ HbActivityPluginInterface *plugin = activityPlugin();
+ if (plugin) {
+ QVariantHash activityParams = plugin->parseCommandLine(commandLineParams);
+ if (!activityParams.isEmpty()) {
+ reason = Hb::ActivationReasonActivity;
+ id = activityParams.value("activityname").toString();
+ params = activityParams;
+ }
+ }
+}
+
+/*!
Constructor
\a parent. Parent of this object.
*/
@@ -266,3 +278,18 @@
return d->waitActivity();
}
+/*!
+ Searches \a commandLineArguments for pair of "-activity" marker and
+ activity URI, which should have following syntax:
+
+ appto://UID3?activityname=activity-name-value&key1=value
+
+ If both marker and valid URI are found, \a reason is set to
+ Hb::ActivationReasonActivity, and \a activityId and \a parameters are
+ filled with parsed values.
+*/
+void HbActivityManager::parseCommandLine(const QStringList &commandLineParams, Hb::ActivationReason &reason, QString &id, QVariantHash ¶ms) const
+{
+ Q_D(const HbActivityManager);
+ d->parseCommandLine(commandLineParams, reason, id, params);
+}
--- a/src/hbcore/activity/hbactivitymanager.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/activity/hbactivitymanager.h Fri May 14 16:09:54 2010 +0300
@@ -33,6 +33,7 @@
#include <QString>
#include <hbglobal.h>
+#include <hbnamespace.h>
class HbActivityManagerPrivate;
@@ -50,7 +51,8 @@
QList<QVariantHash> activities() const;
QVariant activityData(const QString &activityId) const;
bool waitActivity();
-
+ void parseCommandLine(const QStringList &commandLineParams, Hb::ActivationReason &reason, QString &id, QVariantHash ¶ms) const;
+
signals:
void activityRequested(const QString &activityId);
--- a/src/hbcore/activity/hbactivitymanager_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/activity/hbactivitymanager_p.h Fri May 14 16:09:54 2010 +0300
@@ -42,7 +42,8 @@
QList<QVariantHash> activities() const;
QVariant activityData(const QString &activityId) const;
bool waitActivity();
-
+ void parseCommandLine(const QStringList &commandLineParams, Hb::ActivationReason &reason, QString &id, QVariantHash ¶ms) const;
+
private:
HbActivityPluginInterface *activityPlugin() const;
--- a/src/hbcore/activity/hbactivityplugininterface_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/activity/hbactivityplugininterface_p.h Fri May 14 16:09:54 2010 +0300
@@ -44,6 +44,7 @@
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
--- a/src/hbcore/core/core.pri Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/core/core.pri Fri May 14 16:09:54 2010 +0300
@@ -30,11 +30,8 @@
PUBLIC_HEADERS += $$PWD/hbaction.h
PUBLIC_HEADERS += $$PWD/hbapplication.h
PUBLIC_HEADERS += $$PWD/hbevent.h
-PUBLIC_HEADERS += $$PWD/hbgesture.h
-PUBLIC_HEADERS += $$PWD/hbgesturefilter.h
PUBLIC_HEADERS += $$PWD/hbglobal.h
PUBLIC_HEADERS += $$PWD/hbgraphicsscene.h
-PUBLIC_HEADERS += $$PWD/hbgraphicsscenemouseevent.h
PUBLIC_HEADERS += $$PWD/hbinstance.h
PUBLIC_HEADERS += $$PWD/hbnamespace.h
PUBLIC_HEADERS += $$PWD/hbs60events.h
@@ -53,8 +50,6 @@
PRIVATE_HEADERS += $$PWD/hbvariant_p.h
PRIVATE_HEADERS += $$PWD/hbstringvector_p.h
PRIVATE_HEADERS += $$PWD/hbaction_p.h
-PRIVATE_HEADERS += $$PWD/hbgesture_p.h
-PRIVATE_HEADERS += $$PWD/hbgesturefilter_p.h
PRIVATE_HEADERS += $$PWD/hbgraphicsscene_p.h
PRIVATE_HEADERS += $$PWD/hbglobal_p.h
PRIVATE_HEADERS += $$PWD/hbinstance_p.h
@@ -64,25 +59,25 @@
PRIVATE_HEADERS += $$PWD/hbthemeperf_p.h
PRIVATE_HEADERS += $$PWD/hbstringdata_p.h
PRIVATE_HEADERS += $$PWD/hbthemeindex_p.h
+PRIVATE_HEADERS += $$PWD/hbsharedcache_p.h
PRIVATE_HEADERS += $$PWD/hbmainwindoworientation_p.h
PRIVATE_HEADERS += $$PWD/hborientationstatus_p.h
PRIVATE_HEADERS += $$PWD/hbsensorlistener_p.h
PRIVATE_HEADERS += $$PWD/hblocalechangenotifier_p.h
PRIVATE_HEADERS += $$PWD/hbapplication_p.h
PRIVATE_HEADERS += $$PWD/hbthemesystemeffect_p.h
+PRIVATE_HEADERS += $$PWD/hbpluginloader_p.h
+PRIVATE_HEADERS += $$PWD/hbpluginloader_p_p.h
symbian {
- PRIVATE_HEADERS += $$PWD/hbcorepskeys_p.h
- PRIVATE_HEADERS += $$PWD/hbsensornotifyhandler_p.h
+ PRIVATE_HEADERS += $$PWD/hbcorepskeys_p.h
+ PRIVATE_HEADERS += $$PWD/hbsensornotifyhandler_p.h
}
SOURCES += $$PWD/hbaction.cpp
SOURCES += $$PWD/hbapplication.cpp
SOURCES += $$PWD/hbevent.cpp
-SOURCES += $$PWD/hbgesture.cpp
-SOURCES += $$PWD/hbgesturefilter.cpp
SOURCES += $$PWD/hbglobal.cpp
SOURCES += $$PWD/hbgraphicsscene.cpp
-SOURCES += $$PWD/hbgraphicsscenemouseevent.cpp
SOURCES += $$PWD/hbinstance.cpp
SOURCES += $$PWD/hbnamespace.cpp
SOURCES += $$PWD/hbstandarddirs.cpp
@@ -95,12 +90,13 @@
SOURCES += $$PWD/hbstring_p.cpp
SOURCES += $$PWD/hbvariant_p.cpp
SOURCES += $$PWD/hbthemeindex.cpp
+SOURCES += $$PWD/hbsharedcache.cpp
SOURCES += $$PWD/hbmainwindoworientation.cpp
SOURCES += $$PWD/hborientationstatus.cpp
SOURCES += $$PWD/hbsensorlistener.cpp
SOURCES += $$PWD/hblocalechangenotifier_p.cpp
SOURCES += $$PWD/hbthemesystemeffect.cpp
+SOURCES += $$PWD/hbpluginloader.cpp
symbian {
SOURCES += $$PWD/hbsensornotifyhandler_p.cpp
}
-
--- a/src/hbcore/core/hbaction.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/core/hbaction.cpp Fri May 14 16:09:54 2010 +0300
@@ -30,7 +30,7 @@
#include <hbiconloader_p.h>
/*!
- @beta
+ @stable
@hbcore
\class HbAction
\brief HbAction extends QAction with exclusiveness.
@@ -105,36 +105,6 @@
}
/*!
- Constructs a new HbAction with softkey \a action and \a parent.
-
- \deprecated HbAction::HbAction(Hb::SoftKeyAction, QObject *)
- is deprecated.
- Use HbAction::HbAction(Hb::NavigationAction, QObject *) instead.
-*/
-HbAction::HbAction(Hb::SoftKeyAction action, QObject* parent)
- : QAction(parent), d_ptr(new HbActionPrivate)
-{
- Q_D(HbAction);
- switch (action) {
- case Hb::QuitAction:
- d->icon = HbIcon("qtg_mono_app_exit");
- break;
- case Hb::BackAction:
- d->icon = HbIcon("qtg_mono_back");
- break;
- case Hb::ConfirmAction:
- d->icon = HbIcon("qtg_mono_back");
- break;
- case Hb::DoneAction:
- d->icon = HbIcon("qtg_mono_back");
- break;
- default:
- qWarning("HbAction: unknown action: %i", action);
- break;
- }
-}
-
-/*!
Constructs a new HbAction with the given navigation \a action and \a parent.
*/
HbAction::HbAction(Hb::NavigationAction action, QObject* parent)
--- a/src/hbcore/core/hbaction.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/core/hbaction.h Fri May 14 16:09:54 2010 +0300
@@ -48,7 +48,6 @@
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::SoftKeyAction action, QObject* parent = 0);
explicit HbAction(Hb::NavigationAction action, QObject* parent = 0);
virtual ~HbAction();
--- a/src/hbcore/core/hbapplication.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/core/hbapplication.cpp Fri May 14 16:09:54 2010 +0300
@@ -27,8 +27,6 @@
#include "hbapplication_p.h"
#include "hbsplashscreen.h"
#include "hbactivitymanager.h"
-#include "hbactivitycommandlineparser_p.h"
-#include "hbiconloader_p.h"
#include <QTime>
#include <QUrl>
@@ -241,28 +239,31 @@
if (event->type() != QSymbianEvent::WindowServerEvent) {
return QApplication::symbianEventFilter(event);
}
+
+ // Do not add system critical functionality here (or to HbApplication in general).
+ // Orbit apps may not necessarily have a HbApplication instance.
+ // Some may use QApplication and all features must work in those cases too.
+
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());
+ 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) {
- w->resize(nSize);
- }
-
+ TSize rWinSize;
+ if (win)
+ rWinSize = win->Size();
+ // fix for emulator / changing modes
+ QSize nSize( (int)rWinSize.iWidth, (int)rWinSize.iHeight );
+ foreach (HbMainWindow* w, windows) {
+ w->resize(nSize);
+ }
}
- return false; //continue handling in QApplication::s60ProcessEvent
+ return false; //continue handling in QApplication::s60ProcessEvent
case KChangeDirection:{
TUint8* dataptr = aEvent->EventData();
switch(*dataptr){
@@ -292,16 +293,6 @@
}
}
return false;
- case EEventWindowVisibilityChanged:{
- // Get the Visiblity notification from the window server.
- const TWsVisibilityChangedEvent *visChangedEvent = aEvent->VisibilityChanged();
- if ( visChangedEvent->iFlags & TWsVisibilityChangedEvent::ENotVisible ) {
- // App is not visible
- HbIconLoader *loader = HbIconLoader::global();
- loader->handleForegroundLost();
- }
- }
- return QApplication::symbianEventFilter(event);
case KChangeTouchAreaVis:{
TUint8* dataptr = aEvent->EventData();
HbTouchAreaPrivate::setOutlineDrawing(*dataptr == 1);
@@ -336,9 +327,9 @@
HbApplicationPrivate::HbApplicationPrivate(HbApplication *parent)
: QObject(parent), q_ptr(parent), mActivateReason(Hb::ActivationReasonNormal)
{
- HbActivityCommandLineParser::parseUri(qApp->arguments(), mActivateReason, mActivateId, mActivateParams);
mActivityManager = new HbActivityManager(this);
connect(mActivityManager, SIGNAL(activityRequested(QString)), this, SLOT(prepareActivityData(QString)));
+ mActivityManager->parseCommandLine(qApp->arguments(), mActivateReason, mActivateId, mActivateParams);
}
HbApplicationPrivate::~HbApplicationPrivate()
--- a/src/hbcore/core/hbgesture.cpp Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,174 +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 "hbgesture.h"
-#include "hbgesture_p.h"
-#include <hbinstance.h>
-#include <hbwidget.h>
-
-#include "hbglobal_p.h"
-
-/*!
-//
-// W A R N I N G
-// -------------
-//
-// This implementation of Gesture filter is most probably removed in later releases.
-// It exists purely as an implementation detail.
-// This implementation may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-*/
-
-/*!
- @proto
- @hbcore
- \class HbGesture
- \brief HbGesture is a class that is used to register gestures to HbGestureFilter.
-
- HbGesture itself only contains very little, it has callback functions that are used
- to emit "triggered" and "panned" signals and basic constructors and destructors.
-
- Normally user connects to either triggered() or panned() signals and handles in the
- application what is the desired result of those signals.
-
- Typically user defines the gestures in the \a itemChange() function if it is defined.
- The filter needs to be installed for every GraphicsItem.
-
- Example of registering new gestures:
- \snippet{itemviews/hblistview.cpp,1}
-
- \a GestureFilter uses these Gestures to compare user inputs and when match is detected,
- appropriate callback function is called. Unmatched user input is propagated onwards.
-
- HbGesture currently supports the following types of gestures:
- - Hb::up
- - Hb::down
- - Hb::left
- - Hb::right
- - Hb::pan
- - Hb::longpress
-*/
-
-/*!
- \fn void HbGesture::triggered( int speed );
-
- This signal is emitted when the when gesture matches with a flick gesture.
-*/
-
-/*!
- \fn void HbGesture::panned( QPointF delta );
-
- This signal is emitted when the when gesture matches with a pan gesture.
-*/
-
-/*!
- \fn void HbGesture::longPress( QPointF delta )
-
- This signal is emitted when the when gesture matches with a longPress gesture.
-*/
-
-/*!
- \deprecated HbGesture::HbGesture(HbGesture::Direction, int, QObject*)
- is deprecated.
-
- Constructor that requires three parameters, direction, minimum distance
- and parent object.
- \a Direction defines the direction for the gesture. \a minDistance defines
- the minimum pixel distance for the gesture. \a Parent is the parent object.
- */
-HbGesture::HbGesture( Direction direction, int minDistance, QObject *parent ) :
- QObject( parent ), d(new HbGesturePrivate)
-{
- HB_DEPRECATED("HbGesture::HbGesture is deprecated. Use Qt gesture fw instead.");
- d->mDirection = direction;
-
- if ( minDistance == HbGestureDefaultMinDistance ) {
- // Same hardcoded value is used for all resolutions here.
- // This could be also defined in UI metrics, but then also metrics change signals
- // would need to be listened in this class and the value updated upon them.
- // Currently, this is not considered worth doing since there will be Gesture FW coming in QT,
- // which will replace this implementation.
- minDistance = 15;
- }
-
- d->mMinDistance = minDistance;
-}
-
-/*!
- Destructs the gesture.
- */
-HbGesture::~HbGesture()
-{
- delete d;
-}
-
-/*!
- Called by the gesture filter when a gesture match occurs.
- \a Speed is the relative speed of the gesture.
- */
-void HbGesture::callback( int speed )
-{
- emit triggered( speed );
-}
-
-/*!
- Called by the gesture filter when a gesture match occurs.
- \a Delta is the direction and distance of the gesture.
- */
-void HbGesture::panCallback( QPointF delta )
-{
- emit panned( delta );
-}
-
-/*!
- Called by the gesture filter when a gesture match occurs.
- \a Delta is the direction and distance of the gesture.
- */
-void HbGesture::longPressCallback( QPointF delta )
-{
-
- // And emit singal
- emit longPress( delta );
-}
-
-/*!
- Returns the direction of the gesture
- */
-HbGesture::Direction HbGesture::direction() const
-{
- return d->mDirection;
-}
-
-/*!
- Returns the minimum pixel distance for the gesture
- */
-int HbGesture::minDistance() const
-{
- return d->mMinDistance;
-}
-
--- a/src/hbcore/core/hbgesture.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +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_GESTURE_H
-#define HB_GESTURE_H
-
-#include <QObject>
-#include "hbglobal.h"
-#include <QPointF>
-
-class HbGesture;
-class HbGesturePrivate;
-
-class HB_CORE_EXPORT HbGesture : public QObject
-{
- Q_OBJECT
-
-public:
-
- /**
- * Direction of the gesture.
- */
- enum Direction
- {
- /* empty gesture */
- none=0,
- /** Left */
- left= 0x0000001,
- /** Right */
- right= 0x0000002,
- /** Up */
- up= 0x0000004,
- /** Down */
- down= 0x0000008,
- /** Pan */
- pan= 0x0000010,
- /** Longpress */
- longpress= 0x0000020
- };
-
- /*
- * Defines that the default minimum pixel distance should be used for the gesture.
- * The actual amount of pixels might vary based on the screen resolution.
- */
- static const int HbGestureDefaultMinDistance = -1;
-
-public:
-
- explicit HbGesture( Direction direction,
- int minDistance = HbGestureDefaultMinDistance,
- QObject *parent = 0 );
-
- virtual ~HbGesture();
-
- void callback( int speed );
- void panCallback( QPointF delta );
- void longPressCallback( QPointF delta );
-
- Direction direction() const;
-
- int minDistance() const;
-
-signals:
-
- void triggered( int speed );
- void panned( QPointF delta );
- void longPress( QPointF delta );
-
-private: // Data
-
- HbGesturePrivate * const d;
-};
-
-#endif // HB_GESTURE_H
--- a/src/hbcore/core/hbgesture_p.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +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 HBGESTURE_P_H
-#define HBGESTURE_P_H
-
-class HbGesturePrivate
-{
-public:
- HbGesture::Direction mDirection;
- int mMinDistance;
-};
-
-#endif // HBGESTURE_P_H
-
--- a/src/hbcore/core/hbgesturefilter.cpp Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,640 +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.
-**
-****************************************************************************/
-
-/*!
-//
-// W A R N I N G
-// -------------
-//
-// This implementation of Gesture filter is most probably removed in later releases.
-// It exists purely as an implementation detail.
-// This implementation may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-*/
-
-#include "hbgesturefilter.h"
-#include "hbgesturefilter_p.h"
-#include "hbgesture.h"
-#include "hbgraphicsscenemouseevent.h"
-#include "hbinstance.h"
-
-#include "hbglobal_p.h"
-
-#include <QDebug>
-#include <QTimeLine>
-#include <QGraphicsSceneMouseEvent>
-
-static const int HB_FLICK_MAX_DURATION = 200; // ms
-static const int HB_LONG_PRESS_ANIMATION_DELAY = 200; // ms
-static const int HB_LONG_PRESS_TOTAL_TRESHOLD = 300; // ms
-static const int HB_LONG_PRESS_PIXEL_TRESHOLD = 20; // pixels
-
-/*!
- @proto
- @hbcore
- \class HbGestureFilter
- \brief HbGestureFilter is a class that is used as event filter.
-
- Gesture filter for implementing touch gesture actions. This filter can be installed
- as an event filter by calling QObject::installEventFilter for the targeted UI object.
- The actions for the gestures can be hooked by connecting to the \a triggered() or
- \a panned() signals of the added gestures.
-
- Example of adding gestures:
- \snippet{ultimatecodesnippet/ultimatecodesnippet.cpp,4}
-
- \a HbGestureFilter uses Gestures to compare user inputs and when match is detected,
- appropriate callback function is called. Unmatched user input is propagated onwards.
-
- \sa HbGesture
- \sa HbGestureSceneFilter
-
-*/
-
-/*!
- \class HbGestureSceneFilter
- \brief HbGestureSceneFilter is a gesture filter for a graphics scene.
-
- Gesture filter for implementing touch gesture actions. This filter can be installed
- as an event filter for a scene by calling QGraphicsItem::installSceneEventFilter for
- the targeted UI object. The actions for the gestures can be hooked by connecting to
- the \a triggered() or \a panned() signals of the added gestures.
-
- Typically user defines the gestures for graphics scene in the \a itemChange() function
- if it is defined. The filter needs to be installed for every GraphicsItem.
-
- Example of installing the gesture filter to graphics scene:
- \snippet{itemviews/hblistview.cpp,1}
-
- \a HbGestureSceneFilter uses Gestures to compare user inputs and when match is detected,
- appropriate callback function is called. Unmatched user input is propagated onwards.
-
- \sa HbGesture
- \sa HbGestureFilter
-
-*/
-
-
-HbGestureFilterPrivate::HbGestureFilterPrivate(Qt::MouseButton button) :
- button(button),
- pressPoint(),
- pressTime(),
- touchDownScenePos(),
- panLastScenePos(),
- gestureTimer(),
- allGestures(HbGesture::none),
- longPressTimer(0),
- longPressDelayTimer(0)
-{
-}
-
-HbGestureFilterPrivate::~HbGestureFilterPrivate()
-{
- qDeleteAll(gestures);
- gestures.clear();
- delete longPressTimer;
- delete longPressDelayTimer;
-}
-
-
-/*!
- \deprecated HbGestureFilter::HbGestureFilter(Qt::MouseButton, QObject*)
- is deprecated. Please use Qt gesture framework instead.
-
- Constructs new HbGestureFilter with two parameters.
- \a Button specifies, which button is used for the gesture.
- \a Parent is the parent object.
- */
-HbGestureFilter::HbGestureFilter( Qt::MouseButton button, QObject *parent ) :
- QObject( parent )
-{
- HB_DEPRECATED("HbGestureFilter is deprecated. Use Qt gesture fw instead.");
- d = new HbGestureFilterPrivate(button);
-}
-
-/*!
- Destructs the gesture filter.
- */
-HbGestureFilter::~HbGestureFilter()
-{
- delete d;
-}
-
-/*!
- Adds a gesture to this filter.
- The action for the gesture can be triggered by connecting
- to the gesture's \a triggered() or \a panned() signal.
-
- \note All the added gestures are deleted when the filter is deleted.
- \note The same object instance may not be added more than once,
- doing so will cause a double deletion crash.
- */
-void HbGestureFilter::addGesture(HbGesture *gesture)
-{
- d->gestures.append(gesture);
-}
-
-void HbGestureFilter::removeGesture(HbGesture *gesture)
-{
- foreach ( HbGesture* iterator, d->gestures) {
- if (iterator == gesture){
- qDebug() << "Removing gesture";
- d->gestures.removeAll(iterator);
- }
-
- }
-}
-
-/*!
- The event filter function.
- \a obj Parameter not currently used, \a event parameter is the mouse event.
-
- \internal
- */
-bool HbGestureFilter::eventFilter( QObject *obj, QEvent *event )
-{
- Q_UNUSED(obj);
- if ( event->type() == QEvent::MouseButtonPress &&
- static_cast<QMouseEvent *>(event)->button() == d->button ) {
- QMouseEvent *mouseEvent = static_cast<QMouseEvent *>(event);
- d->pressPoint = mouseEvent->pos();
- d->pressTime = QTime::currentTime();
- }
- else if ( event->type() == QEvent::MouseButtonRelease &&
- static_cast<QMouseEvent *>(event)->button() == d->button ) {
- QMouseEvent *mouseEvent = static_cast<QMouseEvent *>(event);
-
- int xDistance = qAbs(d->pressPoint.x() - mouseEvent->x());
- int yDistance = qAbs(d->pressPoint.y() - mouseEvent->y());
-
- int distance;
- HbGesture::Direction dir;
-
- // If horizontal movement is longer, it is either left or right "flick"
- if ( xDistance >= yDistance ) {
- distance = xDistance;
- dir = d->pressPoint.x() >= mouseEvent->x() ? HbGesture::left : HbGesture::right;
- }
- // If vertical movement is longer, it is either up or down "flick"
- else {
- distance = yDistance;
- dir = d->pressPoint.y() >= mouseEvent->y() ? HbGesture::up : HbGesture::down;
- }
-
- int time = d->pressTime.elapsed();
- if ( !time ) {
- time = 1; // to avoid division by zero
- }
-
- int speed = (int)distance * 1000 / time;
-
- for ( GestureList::iterator i = d->gestures.begin();
- i != d->gestures.end(); ++i ) {
- HbGesture *gesture = *i;
-
- // If gesture matches, do a callback, which emits the signal.
- if ( gesture->direction() == dir && distance >= gesture->minDistance() ) {
- gesture->callback( speed );
- }
-
- }
- }
- return false;
-}
-
-HbGestureSceneFilterPrivate::HbGestureSceneFilterPrivate(Qt::MouseButton button) :
- p(button),
- widget(0),
- panning(false),
- mouseReleased(true),
- longPressDelayCancelled(false),
- longPressCompleted(false),
- panThreshold(HB_LONG_PRESS_PIXEL_TRESHOLD),
- withinThreshold(true)
-{
-}
-
-HbGestureSceneFilterPrivate::~HbGestureSceneFilterPrivate()
-{
-}
-
-// HbGestureScene Filter
-
-/*!
- \deprecated HbGestureSceneFilter::HbGestureSceneFilter(Qt::MouseButton, QGraphicsItem*)
- is deprecated. Please use Qt gesture framework instead.
-
- Constructor for HbGestureSceneFilter with
- \a Button Specifies, which button is used for the gesture.
- \a Parent is the parent object.
- */
-HbGestureSceneFilter::HbGestureSceneFilter(Qt::MouseButton button, QGraphicsItem *parent) :
- HbWidget(parent),
- d(new HbGestureSceneFilterPrivate(button))
-{
- HB_DEPRECATED("HbGestureSceneFilter is deprecated. Use Qt gesture fw instead.");
- showLongpressAnimation = false;
-}
-
-/*!
- Destructs the gesture scene filter.
- */
-HbGestureSceneFilter::~HbGestureSceneFilter()
-{
- delete d;
-}
-
-/*!
- Adds new HbGesture to gesture filter.
- */
-void HbGestureSceneFilter::addGesture( HbGesture *gesture )
-{
- d->p.gestures.append( gesture );
- d->p.allGestures = (HbGesture::Direction)(gesture->direction() | d->p.allGestures);
- if ( gesture->direction() == HbGesture::pan )
- d->panThreshold = gesture->minDistance();
-
-}
-
-void HbGestureSceneFilter::removeGesture(HbGesture *gesture)
-{
-
- foreach ( HbGesture* iterator, d->p.gestures) {
- if (iterator == gesture){
- d->p.gestures.removeAll(iterator);
- d->p.allGestures = (HbGesture::Direction)(gesture->direction() ^ d->p.allGestures);
- if ( gesture->direction() == HbGesture::pan )
- d->panThreshold = HB_LONG_PRESS_PIXEL_TRESHOLD;
- }
-
- }
-}
-
-int HbGestureSceneFilter::count()
-{
- return d->p.gestures.count();
-}
-
-
-/*!
- Starts the longpress watcher.
- */
-void HbGestureSceneFilter::startLongPressWatcher()
-{
- d->longPressDelayCancelled = false;
- //Create delay timer before starting longpress 250ms
- if ( !d->p.longPressDelayTimer )
- {
- d->p.longPressDelayTimer = new QTimeLine(HB_LONG_PRESS_ANIMATION_DELAY, 0);
- //Once the timer finishes, start the actual longpress
- connect( d->p.longPressDelayTimer, SIGNAL(finished()), this, SLOT(startLongPressCounter()) );
- }
- //Start the delay timer
- d->p.longPressDelayTimer->start();
-}
-
-/*!
- Starts the longpress counter.
-
- \internal
- */
-void HbGestureSceneFilter::startLongPressCounter()
-{
- if (!d->longPressDelayCancelled) {
-
- //Delay timer has exceeded, start the long press.
- if ( !d->p.longPressTimer )
- {
- d->p.longPressTimer = new QTimeLine(HB_LONG_PRESS_TOTAL_TRESHOLD, 0);
- connect( d->p.longPressTimer, SIGNAL(finished()), this, SLOT(completeLongPress()) );
- }
-
- d->p.longPressTimer->setCurrentTime(0);
- d->p.longPressTimer->start();
-
- }
-
- else {
-
- }
-}
-
-/*!
- Called when longpress is completed, it removes the animation.
-
- \internal
- */
-void HbGestureSceneFilter::completeLongPress()
-{
- //If the timer reached end
- if (d->p.longPressTimer->currentFrame() == d->p.longPressTimer->endFrame() && !d->longPressDelayCancelled) {
-
- for ( GestureList::iterator i = d->p.gestures.begin(); i != d->p.gestures.end(); ++i ) {
- HbGesture *gesture = *i;
-
- // If gesture matches, do a callback, which emits the signal.
- if ( gesture->direction() == HbGesture::longpress ) {
- //Delete the long press animation before the callback.
- d->longPressCompleted = true;
-
- // Create custom Hb Event and add position data
- HbGraphicsSceneMouseEvent longPressEvent(HbGraphicsSceneMouseEvent::LongPress);
- longPressEvent.setAccepted(false);
- longPressEvent.setPos(d->p.touchDownScenePos);
-
- //Get all items under cursor
- QList<QGraphicsItem *> items;
- //Needed to prevent testing fault
- if(scene()) {
- items = scene()->items(d->p.touchDownScenePos);
- // Go through all items and send event to widget
- foreach(QGraphicsItem *item, items){
- if(item->isWidget()) {
- HbWidget *obj = static_cast<HbWidget*>(item);
- QCoreApplication::sendEvent(obj, &longPressEvent);
- if (longPressEvent.isAccepted())
- break;
- }
- }
- }
-
- gesture->longPressCallback( d->p.touchDownScenePos );
- }
- }
-
- }
-
- else {
- d->longPressCompleted = false;
- }
-}
-
-/*!
- Called when longpress is cancelled, it removes the animation.
-
- \internal
- */
-void HbGestureSceneFilter::cancelLongPress()
-{
- d->longPressCompleted = false;
- d->longPressDelayCancelled = true;
-
- if (d->p.longPressDelayTimer)
- d->p.longPressDelayTimer->stop();
- if (d->p.longPressTimer)
- d->p.longPressTimer->stop();
-}
-
-/*!
- Event filter function for the scene.
- Parameter \a watched is the GraphicsItem that is related to the \a event.
-
- \internal
- */
-bool HbGestureSceneFilter::sceneEventFilter(QGraphicsItem *watched, QEvent *event)
-{
- if (!event) return false;
-
- //Set panning directions
- Qt::Orientations panDirs = (Qt::Horizontal|Qt::Vertical);
- int timestamp;
-
- //Mouse press event.
- //Handle double click events like normal events
- if ( ( event->type() == QEvent::GraphicsSceneMousePress )
- || ( event->type() == QEvent::GraphicsSceneMouseDoubleClick ) ) {
-
- d->longPressCompleted = false;
- d->mouseReleased = false;
-
- if (watched->isWidget())
- d->widget = static_cast<QGraphicsWidget*>(watched);
- else {
- d->widget = 0;
- return false;
- }
-
- QGraphicsSceneMouseEvent *mouseEvent = static_cast<QGraphicsSceneMouseEvent *>(event);
- d->p.pressPoint = mouseEvent->pos().toPoint();
-
- if (d->widget && !d->widget->isUnderMouse()) {
- d->widget = 0;
- return false;
- }
-
-
- d->p.gestureTimer.restart();
- timestamp = 0;
-
- //Mark the position
- d->p.touchDownScenePos = mouseEvent->scenePos();
- d->p.panLastScenePos = d->p.touchDownScenePos;
-
- if (d->p.allGestures & HbGesture::longpress) {
- startLongPressWatcher();
- } else {
- // make sure long press delay cancelled is always cleared
- d->longPressDelayCancelled = false;
- }
-
- d->withinThreshold = true;
- return false;
-
-
- }
- //Mouse move event
- else if ( event->type() == QEvent::GraphicsSceneMouseMove) {
-
- QGraphicsSceneMouseEvent *mouseEvent = static_cast<QGraphicsSceneMouseEvent *>(event);
-
- //WHere the "mouse" was moved to
- QPointF scenePos = mouseEvent->scenePos();
-
- //Check threshold for mouse move during longpress.
- //Uses hbgesture::pan minDistance as the threshold.
- int xDistance = qAbs(d->p.touchDownScenePos.toPoint().x() - mouseEvent->scenePos().toPoint().x());
- int yDistance = qAbs(d->p.touchDownScenePos.toPoint().y() - mouseEvent->scenePos().toPoint().y());
-
- //See if the distance exceeds the threshold and cancel the longpress if so.
- if ( xDistance > d->panThreshold || yDistance > d->panThreshold) {
- d->withinThreshold = false;
- cancelLongPress();
- }
-
- //See if the panning is registered as gesture
- if (!d->mouseReleased && (d->p.allGestures & HbGesture::pan)) d->panning = true;
- else d->panning = false;
-
-
-
- //Based on timestamp we decide if we are panning or flicking
- timestamp = d->p.gestureTimer.elapsed();
-
- //Mouse panning
- if (d->panning && !d->mouseReleased && timestamp > HB_FLICK_MAX_DURATION) {
- QPointF lastPanPos(scenePos);
-
- // Exit if panning outside widget
- if (watched->isWidget()) {
- QGraphicsWidget *w = static_cast<QGraphicsWidget*>(watched);
- if (w && !w->isUnderMouse()) {
- return false;
- }
- }
-
- // Handle unidirectional panning
- if (panDirs==Qt::Vertical) {
- lastPanPos.setX(d->p.touchDownScenePos.x());
- }
- if (panDirs==Qt::Horizontal) {
- lastPanPos.setY(d->p.touchDownScenePos.y());
- }
-
- QLineF delta( d->p.touchDownScenePos, lastPanPos );
-
- //This does not make much sense
- const QPointF &newScenePos = lastPanPos;
- QPointF deltaPoint = newScenePos - d->p.panLastScenePos;
-
- // Until the threshold has been passed, keep the panLastScenePos
- // at the touch down position. This makes the point under
- // your finger the same as where you first touched, which
- // is what the user expects.
- if (!d->withinThreshold) {
- d->p.panLastScenePos = newScenePos;
- }
-
- bool gestureFound = false;
- for ( GestureList::iterator i = d->p.gestures.begin(); i != d->p.gestures.end(); ++i ) {
- HbGesture *gesture = *i;
-
- // If gesture matches, do a callback, which emits the signal.
- if ( gesture->direction() == HbGesture::pan ) {
- //Take mouse move event location
- int moveX = mouseEvent->pos().toPoint().x();
- int moveY = mouseEvent->pos().toPoint().y();
-
- //Calculate the distance between mouse press and release
- int xDistance = qAbs( d->p.pressPoint.x() - moveX );
- int yDistance = qAbs( d->p.pressPoint.y() - moveY );
-
- //If longpress already cancelled, so panning is the only option
- if ( d->longPressDelayCancelled ) {
- gestureFound = true;
- gesture->panCallback( deltaPoint );
- return true;
- }
- //Because we still might be having longpress,
- //check that panning gesture minimum distance is exceeded
- else if ( xDistance > d->panThreshold || yDistance > d->panThreshold ) {
- gestureFound = true;
- gesture->panCallback( deltaPoint );
- return true;
- }
- }
- }
- return gestureFound;
- } //panning
- else d->panning = false;
- }//mouse move
-
- //Mouse release event
- else if ( event->type() == QEvent::GraphicsSceneMouseRelease ) {
-
- if (d->longPressCompleted == false) {
- d->mouseReleased = true;
- cancelLongPress();
-
- if (d->panning) {
- d->panning = false;
- return false;
- }
-
- QGraphicsSceneMouseEvent *mouseEvent = static_cast<QGraphicsSceneMouseEvent*>(event);
-
- int ex = mouseEvent->pos().toPoint().x();
- int ey = mouseEvent->pos().toPoint().y();
-
- //Calculate the distance between mouse press and release
- int xDistance = qAbs(d->p.pressPoint.x() - ex);
- int yDistance = qAbs(d->p.pressPoint.y() - ey);
-
- int distance;
- HbGesture::Direction dir;
-
- // If horizontal movement is longer, it is either lefmetaObjectt or right "flick"
- if ( xDistance >= yDistance ) {
- distance = xDistance;
- dir = d->p.pressPoint.x() >= ex ? HbGesture::left : HbGesture::right;
- }
- // If vertical movement is longer, it is either up or down "flick"
- else {
- distance = yDistance;
- dir = d->p.pressPoint.y() >= ey ? HbGesture::up : HbGesture::down;
- }
-
- int time = d->p.gestureTimer.elapsed();
- if ( !time ) {
- time = 1; // to avoid division by zero
- }
-
- int speed = (int)distance * 1000 / time;
- bool flag = false;
-
- for ( GestureList::iterator i = d->p.gestures.begin();
- i != d->p.gestures.end(); ++i ) {
- HbGesture *gesture = *i;
-
- // If gesture matches, do a callback, which emits the signal.
- if ( gesture->direction() == dir && distance >= gesture->minDistance() ) {
- gesture->callback( speed );
- flag = true;
- }
- }
- return flag;
- } // !longPressCompleted
-
- //If this is the release event from a succesfull long press.
- else if (d->longPressCompleted) {
- d->longPressCompleted = false;
- // return false so that the event can be handled in menu
- // -> case when releasing outside context menu -> closes the menu
- return false;
- }
-
- } //Mouse release event
-
- return false;
-} //HbGestureSceneFilter
-
-void HbGestureSceneFilter::setLongpressAnimation(bool animationEnabled)
-{
- showLongpressAnimation = animationEnabled;
-}
-
-// End of File
--- a/src/hbcore/core/hbgesturefilter.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,99 +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_GESTURE_FILTER_H
-#define HB_GESTURE_FILTER_H
-
-#include <hbglobal.h>
-#include <hbwidget.h>
-
-#include <QObject>
-#include <QEvent>
-#include <QRectF>
-#include <qnamespace.h>
-#include <QPainter>
-#include <QWidget>
-#include <QGraphicsItem>
-
-class HbGesture;
-class HbGestureFilterPrivate;
-class HbGestureSceneFilterPrivate;
-
-class HB_CORE_EXPORT HbGestureFilter : public QObject
-{
- Q_OBJECT
-
-public:
-
- explicit HbGestureFilter( Qt::MouseButton button = Qt::LeftButton, QObject *parent = 0 );
- ~HbGestureFilter();
- void addGesture( HbGesture *gesture );
- void removeGesture( HbGesture *gesture );
-
-private:
-
- bool eventFilter( QObject *obj, QEvent *event );
-
-private: // Data
-
- HbGestureFilterPrivate * d;
-};
-
-
-class HB_CORE_EXPORT HbGestureSceneFilter : public HbWidget
-{
- Q_OBJECT
-
-public:
- explicit HbGestureSceneFilter(Qt::MouseButton button = Qt::LeftButton, QGraphicsItem *parent = 0 );
- ~HbGestureSceneFilter();
- void addGesture( HbGesture *gesture );
- void removeGesture( HbGesture *gesture );
- QRectF boundingRect() const { return QRectF(0,0,0,0); }
- void paint(QPainter*, const QStyleOptionGraphicsItem*, QWidget*) { }
- bool sceneEventFilter ( QGraphicsItem * watched, QEvent * event );
-
- void setLongpressAnimation(bool animationEnabled);
- int count();
-
-protected:
- // Intentionally by-passing polish loop.
- void polishEvent() { QGraphicsWidget::polishEvent(); }
-
-private slots:
- void startLongPressCounter();
- void completeLongPress();
- void cancelLongPress();
-
-private: //Functions related to panning and long press
- void startLongPressWatcher();
-
-private:
- HbGestureSceneFilterPrivate * const d;
- bool showLongpressAnimation;
-};
-
-#endif // HB_GESTURE_FILTER_H
-
--- a/src/hbcore/core/hbgesturefilter_p.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +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 HBGESTUREFILTER_P_H
-#define HBGESTUREFILTER_P_H
-
-#include "hbgesturefilter.h"
-#include "hbgesture.h"
-#include <QTime>
-#include <QPointer>
-#include <QGraphicsWidget>
-
-QT_BEGIN_NAMESPACE
-class QTimeLine;
-QT_END_NAMESPACE
-
-typedef QList<HbGesture*> GestureList;
-
-class HbGestureFilterPrivate
-{
-public:
- HbGestureFilterPrivate(Qt::MouseButton button);
- ~HbGestureFilterPrivate();
-
-public:
- GestureList gestures;
- Qt::MouseButton button;
- QPoint pressPoint;
- QTime pressTime;
- QPointF touchDownScenePos;
- QPointF panLastScenePos;
- QTime gestureTimer;
- HbGesture::Direction allGestures;
- QTimeLine *longPressTimer;
- QTimeLine *longPressDelayTimer;
-};
-
-class HbGestureSceneFilterPrivate
-{
-public:
- HbGestureSceneFilterPrivate(Qt::MouseButton button);
- ~HbGestureSceneFilterPrivate();
-public:
- HbGestureFilterPrivate p;
- QPointer<QGraphicsWidget> widget;
- bool panning;
- bool mouseReleased;
- bool longPressDelayCancelled;
- bool longPressCompleted;
- int panThreshold;
- bool withinThreshold;
-};
-
-#endif // HBGESTUREFILTER_P_H
-
--- a/src/hbcore/core/hbglobal.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/core/hbglobal.h Fri May 14 16:09:54 2010 +0300
@@ -76,8 +76,8 @@
# define HB_FEEDBACK_EXPORT Q_DECL_IMPORT
# endif // BUILD_HB_FEEDBACK
-# ifdef HB_DEVELOPER
-# if defined(BUILD_HB_CORE) || defined(BUILD_HB_WIDGETS)
+# if defined(HB_DEVELOPER) || defined (Q_OS_SYMBIAN)
+# if defined(BUILD_HB_CORE) || defined(BUILD_HB_WIDGETS) || defined(BUILD_HB_FEEDBACK)
# define HB_AUTOTEST_EXPORT Q_DECL_EXPORT
# else
# define HB_AUTOTEST_EXPORT Q_DECL_IMPORT
--- a/src/hbcore/core/hbgraphicsscene.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/core/hbgraphicsscene.cpp Fri May 14 16:09:54 2010 +0300
@@ -110,7 +110,12 @@
QGraphicsItem *item(q->focusItem());
bool cont(true);
bool result(false);
- HbWidget *widget = static_cast<HbWidget *>(item);
+
+ HbWidget *widget(0);
+
+ if (item) {
+ widget = qobject_cast<HbWidget *>(item->toGraphicsObject());
+ }
while (cont) {
result = cont = false;
@@ -118,7 +123,8 @@
focusGroup = widget->d_func()->focusGroup;
if (!focusGroup) {
- widget = static_cast<HbWidget *>(widget->parentItem());
+ item = widget->parentItem();
+ widget = item ? qobject_cast<HbWidget *>(item->toGraphicsObject()) : 0;
}
}
@@ -143,7 +149,8 @@
if (!result) {
cont = true;
focusGroup = 0;
- widget = static_cast<HbWidget *>(widget->parentItem());
+ item = widget->parentItem();
+ widget = item ? qobject_cast<HbWidget *>(item->toGraphicsObject()) : 0;
}
}
return result;
--- a/src/hbcore/core/hbgraphicsscenemouseevent.cpp Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +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.
-**
-****************************************************************************/
-
-/*!
-//
-// W A R N I N G
-// -------------
-//
-// This implementation of Mouse events is most probably removed in later releases.
-// It exists purely as an implementation detail.
-// This implementation may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-*/
-
-#include "hbgraphicsscenemouseevent.h"
-
-const int HbGraphicsSceneMouseEvent::LongPress = registerEventType();
-
-/*!
- @hbcore
- \class HbGraphicsSceneMouseEvent
- \brief HbGraphicsSceneMouseEvent is a class having support for Hb specific events.
-
-
- NOTE: TO BE REMOVED / DEPRECATED when the new Qt Gesture Filter is fully taken into use
- This class supports following extra types of events besides those supported by QGraphicsSceneMouseEvent
-
- LongPress - This event is normally sent by gesture framework to the widget which will
- resceive longpress event. Widget needs to reimplement bool event(QEvent *e)
- method.
-
- Example of how to send HbGraphicsSceneMouseEvent
- \snippet{core/hbgesturefilter.cpp,1}
-
- Example of how to receive HbGraphicsSceneMouseEvent
- \code
- bool ContentWidget::event(QEvent *e)
- {
- if ( e->type() == HbGraphicsSceneMouseEvent::LongPress ) {
- QGraphicsSceneMouseEvent *mouseEvent = static_cast<QGraphicsSceneMouseEvent *>(e);
- HbAbstractViewItem* listViewItem = NULL;
- Q_UNUSED(listViewItem);
- onLongPressed(listViewItem, mouseEvent->pos());
- e->accept();
- return true;
- }
- return QGraphicsWidget::event(e);
- }
- \endcode
-
-*/
-
-/*!
- Constructs a HbGraphicsSceneMouseEvent with \a type.
- \a eventType - type of event
-
- \deprecated HbGraphicsSceneMouseEvent::HbGraphicsSceneMouseEvent(int)
- is deprecated.
-*/
-
-HbGraphicsSceneMouseEvent::HbGraphicsSceneMouseEvent(int eventType)
-: QGraphicsSceneMouseEvent((QGraphicsSceneMouseEvent::Type)eventType)
-{
-}
--- a/src/hbcore/core/hbgraphicsscenemouseevent.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbCore module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#ifndef HB_GRAPHICS_SCENE_MOUSE_EVENT_H
-#define HB_GRAPHICS_SCENE_MOUSE_EVENT_H
-
-#include <hbglobal.h>
-#include <QGraphicsSceneMouseEvent> //krazy:exclude=qclasses
-
-class HB_CORE_EXPORT HbGraphicsSceneMouseEvent: public QGraphicsSceneMouseEvent
-{
-public:
- // Hb specific events
- static const int LongPress;
- HbGraphicsSceneMouseEvent(int eventType);
-};
-
-#endif // HB_GRAPHICS_SCENE_MOUSE_EVENT_H
-
--- a/src/hbcore/core/hbinstance.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/core/hbinstance.cpp Fri May 14 16:09:54 2010 +0300
@@ -31,7 +31,6 @@
#include <hbtheme.h>
#include <hbstyle.h>
#include <hbtypefaceinfo_p.h>
-#include <hboogmwatcher_p.h>
#include "hbmainwindow_p.h"
#include "hbdeviceprofile.h"
#include "hbglobal_p.h"
@@ -62,7 +61,7 @@
#endif
/*!
- @beta
+ @stable
@hbcore
\class HbInstance
\brief HbInstance manages global settings and objects in the application.
@@ -132,24 +131,22 @@
#endif //HB_TESTABILITY
connect(mTheme, SIGNAL(changeFinished()), this, SLOT(updateScenes()));
-
+
#ifdef HB_TESTABILITY
// Activate testability plugin if exists
- QString testabilityPlugin = "testability/testability";
+ QObject *plugin = 0;
+
+#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)
QString testabilityPluginPostfix = ".dll";
-
- QObject *plugin = 0;
-
-#ifdef Q_OS_LINUX
- testabilityPluginPostfix = ".so";
- testabilityPlugin = "testability/libtestability";
-#endif //linux
+ QString testabilityPlugin = "testability/testability";
+#elif defined(Q_OS_MAC)
+ QString testabilityPluginPostfix = ".dylib";
+ QString testabilityPlugin = "testability/libtestability";
+#else
+ QString testabilityPluginPostfix = ".so";
+ QString testabilityPlugin = "testability/libtestability";
+#endif
-#ifdef Q_OS_MAC
- testabilityPluginPostfix = ".dylib";
- testabilityPlugin = "testability/libtestability";
-#endif //mac
-
testabilityPlugin = QLibraryInfo::location(QLibraryInfo::PluginsPath) + QObject::tr("/") + testabilityPlugin + testabilityPluginPostfix;
#ifdef Q_OS_SYMBIAN
@@ -260,7 +257,6 @@
HbCssInspectorWindow::instance()->refresh();
#endif
#endif
- HbOogmWatcher::instance()->mainWindowReady();
emit windowAdded(window);
}
@@ -454,19 +450,6 @@
}
/*!
- Returns the instance of HbTypefaceInfo
-
- \deprecated HbInstance::typefaceInfo() const
- is deprecated. Use HbFontSpec instead.
-
-*/
-
-HbTypefaceInfo *HbInstance::typefaceInfo() const
-{
- return NULL;
-}
-
-/*!
Sets the list of directories to search when loading libraries to
\a paths. All existing paths will be deleted and the path list
will consist of the paths given in \a paths.
--- a/src/hbcore/core/hbinstance.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/core/hbinstance.h Fri May 14 16:09:54 2010 +0300
@@ -50,7 +50,6 @@
HbStyle *style() const;
HbTheme *theme() const;
- HbTypefaceInfo *typefaceInfo() const;
void addLibraryPath(const QString &path);
void removeLibraryPath(const QString &path);
--- a/src/hbcore/core/hbmainwindoworientation.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/core/hbmainwindoworientation.cpp Fri May 14 16:09:54 2010 +0300
@@ -176,14 +176,15 @@
newOrientation = mDefaultOrientation;
}
foreach(HbMainWindow *window, mWindowList) {
-
void *surface(0);
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)->setTransformedOrientation(newOrientation, animate);
}
}
}
--- a/src/hbcore/core/hbmemorymanager_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/core/hbmemorymanager_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -24,9 +24,12 @@
****************************************************************************/
#include "hbmemorymanager_p.h"
+#include "hbsharedmemorymanager_p.h"
+#ifndef HB_BIN_CSS
#include "hbheapmemorymanager_p.h"
-#include "hbsharedmemorymanager_p.h"
#include "hbsharedmemorymanagerut_p.h"
+#endif // HB_BIN_CSS
+
#include "hbmemoryutils_p.h"
#define SHARED_CONTAINER_UNITTEST_PREFIX "unittest_hbsharedcontainer_"
@@ -35,6 +38,7 @@
/**
* helper function to know whether process is a shared container unittest
*/
+#ifndef HB_BIN_CSS
static bool isSharedContainerUnitTest()
{
static bool isSharedContainerUnit = false;
@@ -52,12 +56,15 @@
}
return isSharedContainerUnit;
}
-
+#endif
/**
* to get instance of hbmemory manager
*/
HbMemoryManager * HbMemoryManager::instance( MemoryType type )
{
+ Q_UNUSED(type)
+
+#ifndef HB_BIN_CSS
switch(type) {
case SharedMemory :
if ( isSharedContainerUnitTest() ) {
@@ -65,11 +72,14 @@
} else {
return HbSharedMemoryManager::instance();
}
- case HeapMemory :
+ case HeapMemory :
return HbHeapMemoryManager::instance();
default:
return 0;
}
+#else
+ return HbSharedMemoryManager::instance();
+#endif
}
/**
@@ -77,13 +87,20 @@
*/
void HbMemoryManager::releaseInstance( MemoryType type )
{
+ Q_UNUSED(type)
+
+#ifndef HB_BIN_CSS
if ( type == SharedMemory ) {
- if ( isSharedContainerUnitTest() ) {
+ if ( isSharedContainerUnitTest() ) {
HbSharedMemoryManagerUt::releaseInstance();
} else {
HbSharedMemoryManager::releaseInstance();
}
+
} else if ( type == HeapMemory ) {
HbHeapMemoryManager::releaseInstance();
}
+#else
+ return HbSharedMemoryManager::releaseInstance();
+#endif
}
--- a/src/hbcore/core/hbmemorymanager_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/core/hbmemorymanager_p.h Fri May 14 16:09:54 2010 +0300
@@ -29,9 +29,8 @@
// To enable-disable css parser related traces
#undef CSS_PARSER_TRACES
-#include <hbglobal.h>
+#include "hbglobal.h"
#include <hbthemeperf_p.h>
-
#include <new>
//Temporary for std::bad_alloc, till the macro HB_CHECK_PTR is replaced by q_check_ptr
--- a/src/hbcore/core/hbmultisegmentallocator_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/core/hbmultisegmentallocator_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -280,3 +280,57 @@
return retVal;
}
+
+#ifdef HB_THEME_SERVER_MEMORY_REPORT
+void HbMultiSegmentAllocator::writeReport(QTextStream &reportWriter)
+{
+ reportWriter << "***** (Sub)HbMultiSegmentAllocator report *****\n\n";
+ reportWriter << SPACE_NEEDED_FOR_MULTISEGMENT_ALLOCATOR << " bytes allocated for internal bookkeeping\n";
+ reportWriter << AMOUNT_OF_DIFFERENT_CHUNK_SIZES << " different chunk sizes (";
+ for (int i = 0; i < AMOUNT_OF_DIFFERENT_CHUNK_SIZES-1; i++) {
+ reportWriter << ChunkSizes[i] << ", ";
+ }
+ reportWriter << ChunkSizes[AMOUNT_OF_DIFFERENT_CHUNK_SIZES-1] << ")\n";
+ reportWriter << CHUNKS_IN_ONE_LIST << " chunks in one list\n\n";
+
+ // calculate all the data from chunklists
+ int totalMemoryReserved = 0; // all the memory needed from shared chunk
+ int totalBookkeepingMemory = 0; // all the space needed for internal bookkeeping
+ int totalAllocatedMemory = 0; // all the allocated memory visible for clients
+ for (int i = 0; i < AMOUNT_OF_DIFFERENT_CHUNK_SIZES; i++) {
+ int allocations = 0;
+ int listCount = 0;
+ ChunkListHeader *listHeader;
+ listHeader = (ChunkListHeader*)((unsigned char*)(chunk->data()) + header->offsetsToChunkLists[i]);
+ for (;;) {
+ allocations += listHeader->allocatedChunks;
+ listCount++;
+ if (listHeader->nextListOffset != -1) {
+ listHeader = (ChunkListHeader*)((unsigned char*)(chunk->data()) + listHeader->nextListOffset);
+ } else {
+ break;
+ }
+ }
+ reportWriter << "for chunk size " << ChunkSizes[i] << ", " << listCount << " list(s) used\n";
+ reportWriter << "and in these lists " << allocations << " chunks are allocated\n";
+ int totalSize = listCount * (sizeof(ChunkListHeader) + (sizeof(int)+ChunkSizes[i])*CHUNKS_IN_ONE_LIST);
+ totalMemoryReserved += totalSize;
+ reportWriter << "Total size reserved from shared chunk for these list(s): " << totalSize << " bytes\n";
+ int bookKeeping = listCount * (sizeof(ChunkListHeader) + sizeof(int)*CHUNKS_IN_ONE_LIST);
+ totalBookkeepingMemory += bookKeeping;
+ reportWriter << " - bytes used for bookkeeping: " << bookKeeping << "\n";
+ reportWriter << " - actual allocated bytes (in chunks, not in actual data, which might be less than chunk size): " << allocations*ChunkSizes[i] << "\n\n";
+ totalAllocatedMemory += allocations*ChunkSizes[i];
+ }
+
+ reportWriter << "*** HbMultiSegmentAllocator summary ***\n";
+ reportWriter << "Total memory reserved from shared chunk: " << totalMemoryReserved << " bytes\n";
+ reportWriter << " - internal bookkeeping uses " << totalBookkeepingMemory << " bytes\n";
+ reportWriter << " - actual memory allocated by clients: " << totalAllocatedMemory << " bytes\n";
+ int totalFragmentationPercent = (int)((float)(totalAllocatedMemory)/(float)(totalMemoryReserved)*100);
+ int usableFragmentationPercent = (int)((float)(totalAllocatedMemory)/(float)(totalMemoryReserved-totalBookkeepingMemory)*100);
+ reportWriter << "allocated memory / all memory reserved from shared chunk = " << totalFragmentationPercent << "%\n";
+ reportWriter << "allocated memory / all usable memory for client data = " << usableFragmentationPercent << "%\n";
+
+}
+#endif
--- a/src/hbcore/core/hbnamespace.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/core/hbnamespace.cpp Fri May 14 16:09:54 2010 +0300
@@ -26,8 +26,8 @@
#include <hbnamespace.h>
/*!
- @beta
- @hbcore
+ @beta
+ @hbcore
\namespace Hb
\brief The Hb namespace contains miscellaneous identifiers used throughout the Hb library.
*/
@@ -187,24 +187,11 @@
This enum describes the (list) item content visibility values available in LibHb.
*/
-/*!
- \enum LogicalFontName
- Logical fonts
- \deprecated Hb::LogicalFontName
- is deprecated. Use HbFontSpec instead.
-
- */
-
/*!
\enum SceneItem
LibHb's built-in scene items.
This enum describes the scene items available in LibHb.
- \deprecated Hb::NaviPaneItem
- \deprecated Hb::PrimarySoftKeyItem
- \deprecated Hb::SecondarySoftKeyItem
- \deprecated Hb::MiddleSoftKeyItem
- \deprecated Hb::SoftKeyItems
*/
/*!
@@ -587,49 +574,4 @@
Application was started by other means.
*/
-/*!
- \deprecated Hb::ItemType_FormViewItem
- is deprecated.
-*/
-/*!
- \deprecated Hb::ItemType_FormView
- is deprecated.
-*/
-
-/*!
- \deprecated Hb::ItemType_AbstractItemContainer
- is deprecated.
-*/
-
-/*!
- \deprecated Hb::ItemType_AbstractItemView
- is deprecated.
-*/
-
-/*!
- \deprecated Hb::ItemType_AbstractViewItem
- is deprecated.
-*/
-
-/*!
- \deprecated Hb::ItemType_ItemHighlight
- is deprecated.
-*/
-
-/*!
- \deprecated Hb::ItemType_ListWidgetViewItem
- is deprecated.
-*/
-
-/*!
- \deprecated Hb::ItemType_Highlight
- is deprecated.
-*/
-
-/*!
- \deprecated Hb::ItemType_RoundRobinLabel
- is deprecated.
-*/
-
-
--- a/src/hbcore/core/hbnamespace.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/core/hbnamespace.h Fri May 14 16:09:54 2010 +0300
@@ -35,8 +35,8 @@
class HB_CORE_EXPORT Hb
{
Q_GADGET
- Q_ENUMS( SoftKeyId SoftKeyAction NavigationAction UiAttribute TouchGesture
- ItemDataRole GraphicsItemType LogicalFontName SceneItem
+ Q_ENUMS( NavigationAction UiAttribute TouchGesture
+ ItemDataRole GraphicsItemType SceneItem
InstantInteraction ContinuousInteraction InteractionModifier
TextCursorVisibility SliderTickPosition ModelItemType TextWrapping
ActivationReason )
@@ -54,29 +54,6 @@
static const int Key_SoftKeySecondary = Qt::Key_Launch1;
static const int Key_SoftKeyMiddle = Qt::Key_Launch2;
-
- // DEPRECATED - DO NOT USE - These are deprecated along with deprecation of softkey functions in HbMainWindow.
- // This enumeration will become internal to Hb.
- enum SoftKeyId
- {
- PrimarySoftKey,
- SecondarySoftKey,
- MiddleSoftKey,
-
- //Custom softkey id's start here.
- CustomSoftKey = 0xFF
- };
-
- // DEPRECATED - DO NOT USE - These are deprecated along with deprecation of softkey functions in HbMainWindow.
- // Use NavigationAction instead.
- enum SoftKeyAction
- {
- QuitAction,
- BackAction,
- ConfirmAction,
- DoneAction
- };
-
enum NavigationAction
{
QuitNaviAction,
@@ -136,16 +113,10 @@
ItemType_NotificationDialog = QGraphicsItem::UserType+10000,
ItemType_FrameItem,
ItemType_GraphicsPixmapItem,
- ItemType_FormViewItem,
- ItemType_FormView,
- ItemType_AbstractItemContainer,
ItemType_AbstractItemView,
ItemType_ListView,
- ItemType_AbstractViewItem,
ItemType_ListViewItem,
- ItemType_ItemHighlight,
ItemType_ListWidgetItem,
- ItemType_ListWidgetViewItem,
ItemType_GridViewItem,
ItemType_Popup,
ItemType_Dialog,
@@ -154,7 +125,6 @@
ItemType_AbstractButton,
ItemType_AbstractItem,
ItemType_AbstractSlider,
- ItemType_Highlight,
ItemType_IconItem,
ItemType_Label,
ItemType_AbstractEdit,
@@ -178,7 +148,6 @@
ItemType_ToolButton,
ItemType_Widget,
ItemType_View,
- ItemType_RoundRobinLabel,
ItemType_ConfirmationQuery,
ItemType_CheckBox,
ItemType_MessageQuery,
@@ -218,6 +187,7 @@
ItemType_IndexFeedback,
ItemType_SelectionDialog,
ItemType_SelectionDialogContentWidget,
+ ItemType_InputButtonGroup,
ItemType_Last = QGraphicsItem::UserType + 20000
};
@@ -229,44 +199,13 @@
};
Q_DECLARE_FLAGS(WidgetAttributes, WidgetAttribute)
-
- // DEPRECATED - DO NOT USE - These are deprecated along with deprecation of HbFontProvider
- // Use HbFontSpec and the font roles defines in HbFontSpec API
- enum LogicalFontName
- {
- FontUndefined = 0,
- FontPrimary,
- FontSecondary,
- FontTitle,
- FontPrimarySmall,
- FontDigital
- };
-
-
enum SceneItem {
NoItem = 0x00000000,
-
- // Deprecated
- TitlePaneItem = 0x00000001,
- // Deprecated
- NaviPaneItem = 0x00000002,
ToolBarItem = 0x00000004,
- // Deprecated
- IndicatorItems = 0x00000008,
DockWidgetItem = 0x00000010,
TitleBarItem = 0x00000020,
StatusBarItem = 0x00000040,
-
- // Deprecated
- PrimarySoftKeyItem = 0x00010000,
- // Deprecated
- SecondarySoftKeyItem = 0x00020000,
- // Deprecated
- MiddleSoftKeyItem = 0x00040000,
- // Deprecated
- SoftKeyItems = 0x00070000,
-
AllItems = 0xFFFFFFFF
};
@@ -286,7 +225,8 @@
IconResource = 0,
ThemeResource,
EffectResource,
- StyleSheetResource
+ StyleSheetResource,
+ AnimationResource
};
Q_DECLARE_FLAGS(SceneItems, SceneItem)
@@ -297,9 +237,6 @@
WindowFlagNoBackground = 0x00000002,
WindowFlagFixedVertical = 0x00000004,
WindowFlagFixedHorizontal = 0x00000008,
-
- // Deprecated
- WindowFlagNoSplash = 0x00000010
};
Q_DECLARE_FLAGS(WindowFlags, WindowFlag)
--- a/src/hbcore/core/hbnamespace_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/core/hbnamespace_p.h Fri May 14 16:09:54 2010 +0300
@@ -45,12 +45,9 @@
ItemType_FadeItem,
ItemType_LongPressVisualizer,
ItemType_BatteryIndicator,
- ItemType_Decorator,
ItemType_IndicatorGroup,
ItemType_IndicatorMenu,
- ItemType_NaviPane, // deprecated
ItemType_SignalIndicator,
- ItemType_SoftKey, // deprecated
ItemType_NavigationButton,
ItemType_IndicatorButton,
ItemType_TitlePane,
@@ -155,15 +152,6 @@
static const qreal VKBValueUnit = FadingItemZValueUnit / 2;
static const qreal SelectionControlHandlesValueUnit = VKBValueUnit / 2;
- enum SoftKeyId
- {
- PrimarySoftKey,
- SecondarySoftKey,
- MiddleSoftKey,
-
- //Custom softkey id's start here.
- CustomSoftKey = 0xFF
- };
}
#endif // HBNAMESPACE_P_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/core/hbpluginloader.cpp Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,138 @@
+/****************************************************************************
+**
+** 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 "hbpluginloader_p.h"
+#include "hbpluginloader_p_p.h"
+#include <QtDebug>
+
+HbPluginLoaderPrivate::HbPluginLoaderPrivate()
+{
+}
+
+HbPluginLoaderPrivate::~HbPluginLoaderPrivate()
+{
+}
+
+/*
+ Constructs a plugin loader with \a parent.
+*/
+HbPluginLoader::HbPluginLoader(QObject *parent) :
+ QPluginLoader(parent), d_ptr(new HbPluginLoaderPrivate)
+{
+}
+
+/*
+ Constructs a plugin loader with \a pluginName and \a parent.
+*/
+HbPluginLoader::HbPluginLoader(const QString &pluginName, QObject *parent) :
+ QPluginLoader(parent), d_ptr(new HbPluginLoaderPrivate)
+{
+ Q_D(HbPluginLoader);
+ d->pluginName = pluginName;
+}
+
+/*
+ Destructs the plugin loader.
+*/
+HbPluginLoader::~HbPluginLoader()
+{
+}
+
+/*
+ Returns the plugin name.
+
+ NOTE: Plugin name is the first argument passed to Q_EXPORT_PLUGIN2(PluginName, ClassName).
+
+ \sa setPluginName(), Q_EXPORT_PLUGIN2
+*/
+QString HbPluginLoader::pluginName() const
+{
+ Q_D(const HbPluginLoader);
+ return d->pluginName;
+}
+
+/*
+ Sets the plugin name.
+
+ NOTE: Plugin name is the first argument passed to Q_EXPORT_PLUGIN2(PluginName, ClassName).
+
+ \sa pluginName(), Q_EXPORT_PLUGIN2
+*/
+void HbPluginLoader::setPluginName(const QString &pluginName)
+{
+ Q_D(HbPluginLoader);
+ d->pluginName = pluginName;
+}
+
+/*
+ This convenience function resolves the actual file name of the plugin first and then calls QPluginLoader::instance().
+
+ NOTE: this function does not override but overshadows QPluginLoader::instance()
+
+ \sa resolveFileName(), QPluginLoader::instance()
+*/
+QObject *HbPluginLoader::instance()
+{
+ QObject *result = 0;
+ if (resolveFileName()) {
+ result = QPluginLoader::instance();
+ }
+ return result;
+}
+
+/*
+ This convenience function resolves the actual file name of the plugin first and then calls QPluginLoader::load().
+
+ NOTE: this function does not override but overshadows QPluginLoader::load()
+
+ \sa resolveFileName(), QPluginLoader::load()
+*/
+bool HbPluginLoader::load()
+{
+ bool result = false;
+ if (resolveFileName()) {
+ result = QPluginLoader::load();
+ }
+ return result;
+}
+
+/*
+ Resolves the actual file name of the plugin.
+
+ \sa pluginName(), fileName()
+*/
+bool HbPluginLoader::resolveFileName()
+{
+ Q_D(HbPluginLoader);
+ if (!d->library.isLoaded() && !d->pluginName.isEmpty()) {
+ d->library.setFileName(d->pluginName);
+ if (d->library.load()) {
+ setFileName(d->library.fileName());
+ } else {
+ qWarning() << "HbPluginLoader::resolveFileName():" << d->library.errorString();
+ }
+ }
+ return d->library.isLoaded();
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/core/hbpluginloader_p.h Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,70 @@
+/****************************************************************************
+**
+** 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 HBPLUGINLOADER_P_H
+#define HBPLUGINLOADER_P_H
+
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the Hb API. It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include <QPluginLoader>
+#include <hbglobal.h>
+
+class HbPluginLoaderPrivate;
+
+class HB_CORE_PRIVATE_EXPORT HbPluginLoader : public QPluginLoader
+{
+ Q_OBJECT
+
+public:
+ HbPluginLoader(QObject *parent = 0);
+ HbPluginLoader(const QString &pluginName, QObject *parent = 0);
+ ~HbPluginLoader();
+
+ QString pluginName() const;
+ void setPluginName(const QString &pluginName);
+
+ QObject *instance();
+ bool load();
+
+ bool resolveFileName();
+
+protected:
+ HbPluginLoaderPrivate * const d_ptr;
+
+private:
+ Q_DISABLE_COPY(HbPluginLoader)
+ Q_DECLARE_PRIVATE_D(d_ptr, HbPluginLoader)
+};
+
+#endif // HBPLUGINLOADER_P_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/core/hbpluginloader_p_p.h Fri May 14 16:09:54 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 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 HBPLUGINLOADER_P_PH
+#define HBPLUGINLOADER_P_PH
+
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the Hb API. It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+class HbPluginLoaderPrivate
+{
+public:
+ HbPluginLoaderPrivate();
+ virtual ~HbPluginLoaderPrivate();
+
+ QString pluginName;
+ QLibrary library;
+};
+
+#endif // HBPLUGINLOADER_P_PH
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/core/hbsharedcache.cpp Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,221 @@
+/****************************************************************************
+**
+** 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 <QSystemSemaphore>
+
+static QSystemSemaphore *Semaphore;
+
+static QLatin1String SemaphoreName("hbsharedcache_semaphore");
+
+#include "hbsharedcache_p.h"
+#include "hbsharedmemorymanager_p.h"
+
+#ifdef HB_BIN_CSS
+#include "hbcssconverterutils_p.h"
+#endif
+
+class HbCacheLocker
+{
+public:
+ HbCacheLocker(QSystemSemaphore &semaphore) : semaphore(semaphore)
+ {
+ semaphore.acquire();
+ }
+ ~HbCacheLocker()
+ {
+ semaphore.release();
+ }
+ 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];
+ }
+
+ // Is the target in lower or upper half?
+ else if (comparison < 0) {
+ end = mid - 1;
+ } else {
+ begin = mid + 1;
+ }
+ }
+
+ // Did not find the target, return 0.
+ return 0;
+}
+
+HbSharedCache *HbSharedCache::instance()
+{
+ GET_MEMORY_MANAGER(HbMemoryManager::SharedMemory);
+ return static_cast<HbSharedMemoryManager*>(manager)->cache();
+}
+
+//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) {
+ try {
+ CacheItem cacheItem(key, offset);
+ HbVector<CacheItem> &vector = itemCache(itemType);
+ HbCacheLocker locker(*Semaphore);
+ vector.append(cacheItem);
+ added = true;
+ } catch (std::exception &) {
+
+ }
+ }
+ return added;
+}
+
+int HbSharedCache::offset(ItemType itemType, const QString &key) 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);
+ }
+ }
+ 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;
+ }
+ }
+ return offset;
+}
+
+bool HbSharedCache::remove(ItemType itemType, const QString &key)
+{
+ bool removed = false;
+
+ HbVector<CacheItem> &cacheVector = itemCache(itemType);
+ HbCacheLocker locker(*Semaphore);
+ int count = cacheVector.count();
+ for (int i = 0; i < count; ++i) {
+ if (cacheVector.at(i).key == key) {
+ cacheVector.remove(i);
+ removed = true;
+ break;
+ }
+ }
+ return removed;
+}
+
+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));
+ }
+#endif
+ } else {
+ mOffsetItemCount = 0;
+ }
+}
+
+HbSharedCache::HbSharedCache()
+ : mLayoutDefCache(HbMemoryManager::SharedMemory),
+ mStylesheetCache(HbMemoryManager::SharedMemory),
+ mEffectCache(HbMemoryManager::SharedMemory)
+{
+}
+
+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;
+#endif
+}
+
+void HbSharedCache::initClient()
+{
+ //client opens the semaphore created by the server.
+ Semaphore = new QSystemSemaphore(SemaphoreName, 1, QSystemSemaphore::Open);
+}
+
+HbVector<HbSharedCache::CacheItem> &HbSharedCache::itemCache(ItemType type)
+{
+ const HbVector<CacheItem> &items = const_cast<const HbSharedCache*>(this)->itemCache(type);
+ return const_cast<HbVector<CacheItem>&>(items);
+}
+
+const HbVector<HbSharedCache::CacheItem> &HbSharedCache::itemCache(ItemType type) const
+{
+ const HbVector<CacheItem> *items = 0;
+ switch(type) {
+ case LayoutDefinition:
+ items = &mLayoutDefCache;
+ break;
+ case Effect:
+ items = &mEffectCache;
+ break;
+ case Stylesheet:
+ items = &mStylesheetCache;
+ break;
+ default:
+ Q_ASSERT(false);
+ break;
+ }
+ return *items;
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/core/hbsharedcache_p.h Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,86 @@
+/****************************************************************************
+**
+** 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 HBSHAREDCACHE_P_H
+#define HBSHAREDCACHE_P_H
+
+#include <hbstring_p.h>
+#include <hbvector_p.h>
+
+struct HbOffsetItem
+{
+ HbOffsetItem() : nameOffset(-1), offset(-1) {}
+ HbOffsetItem(int nameOffset, int offset)
+ : nameOffset(nameOffset), offset(offset) {}
+ int nameOffset;
+ int offset;
+};
+
+class HB_CORE_PRIVATE_EXPORT HbSharedCache
+{
+private:
+ struct CacheItem {
+ HbString key;
+ int offset;
+ CacheItem()
+ : key(HbMemoryManager::SharedMemory), offset(-1)
+ {
+ }
+ CacheItem(const QString &cacheKey,
+ int cacheOffset )
+ : key(cacheKey, HbMemoryManager::SharedMemory), offset(cacheOffset)
+ {
+ }
+ };
+public:
+ enum ItemType {
+ LayoutDefinition,
+ Stylesheet,
+ Effect
+ };
+ static HbSharedCache *instance();
+ bool add(ItemType itemType, const QString &key, int offset);
+ int offset(ItemType itemType, const QString &key) const;
+ bool remove(ItemType itemType, const QString &key);
+
+private:
+ HbSharedCache();
+ void initServer();
+ void initClient();
+ HbVector<CacheItem> &itemCache(ItemType type);
+ const HbVector<CacheItem> &itemCache(ItemType type) const;
+ void addOffsetMap(const char *offsetMapData, int size, int offsetItemCount);
+ friend class HbSharedMemoryManager;
+private:
+ friend bool writeCssBinary(const QStringList &, const QString &);
+
+ HbVector<CacheItem> mLayoutDefCache;
+ HbVector<CacheItem> mStylesheetCache;
+ HbVector<CacheItem> mEffectCache;
+ int mOffsetItemCount;
+ HbOffsetItem mOffsetItems[1]; //actual size or array is mOffsetItemCount
+};
+
+#endif // HBSHAREDCACHE_P_H
--- a/src/hbcore/core/hbsharedmemoryallocators_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/core/hbsharedmemoryallocators_p.h Fri May 14 16:09:54 2010 +0300
@@ -26,8 +26,6 @@
#ifndef HBSHAREDMEMORYALLOCATORS_P_H
#define HBSHAREDMEMORYALLOCATORS_P_H
-//#include <hbglobal.h>
-//#include <hbthemeperf_p.h>
#include "hbthemecommon_p.h"
#define ALIGN_SIZE 4
@@ -76,9 +74,10 @@
int alloc(int size);
int allocatedSize(int offset);
void free(int offset);
- void initialize(QSharedMemory *sharedChunk,
+ void initialize(QSharedMemory *sharedChunk,
const unsigned int offset = 0,
HbSharedMemoryAllocator *mainAllocator = 0);
+ int size();
#ifdef HB_THEME_SERVER_MEMORY_REPORT
void writeReport(QTextStream &reportWriter);
#endif
--- a/src/hbcore/core/hbsharedmemorymanager_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/core/hbsharedmemorymanager_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -24,16 +24,32 @@
****************************************************************************/
#include "hbsharedmemorymanager_p.h"
+#include "hbsharedmemoryallocators_p.h"
+#include "hbmemoryutils_p.h"
#include <QSharedMemory>
#include <QString>
#include <QList>
#include <QDebug>
+#ifdef HB_THEME_SERVER_MEMORY_REPORT
+#include <QDate>
+#include <QDir>
+#include <QFile>
+#endif
+#include "hbsharedcache_p.h"
-#include "hbsharedmemoryallocators_p.h"
-#include "hbmemoryutils_p.h"
+#ifdef HB_BIN_CSS
+#include "hbcssconverterutils_p.h"
+#endif // HB_BIN_CSS
#define USE_SUBALLOCATOR
+#ifdef HB_THEME_SERVER_FULL_MEMORY_REPORT
+// identifier and size are packed in one quint32
+static const int allocIdentifier = 0x80000000;
+static const int freeIdentifier = 0x40000000;
+static const int reallocIdentifier = 0xC0000000;
+#endif
+
HbSharedMemoryManager *HbSharedMemoryManager::memManager = 0;
/* Functions implementation of HbSharedMemoryManager class */
@@ -53,7 +69,9 @@
chunk = new QSharedMemory(HB_THEME_SHARED_PIXMAP_CHUNK);
// check if app filename is same as server filename ..
// ToDo: improve server identification logic.. UID on symbian?
- if ( HbMemoryUtils::getCleanAppName() == THEME_SERVER_NAME ) {
+ const QString &appName = HbMemoryUtils::getCleanAppName();
+ bool binCSSConverterApp = (appName == BIN_CSS_APP || appName == BIN_CSS_APP_SYMBIAN);
+ if (appName == THEME_SERVER_NAME || binCSSConverterApp) {
// This is server, create shared memory chunk
success = chunk->create( CACHE_SIZE, QSharedMemory::ReadWrite );
// If sharedMemory already exists.
@@ -78,21 +96,55 @@
if (success && isWritable()) {
// if we are recovering from theme server crash, shared chunk may
// already be ready
- HbSharedChunkHeader *chunkHeader = (HbSharedChunkHeader*)(chunk->data());
- if (chunkHeader->identifier == INITIALIZED_CHUNK_IDENTIFIER) {
+ bool enableRecovery = true;
+ if (binCSSConverterApp) {
+ enableRecovery = false;
+ }
+ HbSharedChunkHeader *chunkHeader = static_cast<HbSharedChunkHeader*>(chunk->data());
+ if (enableRecovery && chunkHeader->identifier == INITIALIZED_CHUNK_IDENTIFIER) {
// just reconnect allocators to the shared chunk
mainAllocator->initialize(chunk, chunkHeader->mainAllocatorOffset);
subAllocator->initialize(chunk, chunkHeader->subAllocatorOffset, mainAllocator);
} else {
- chunkHeader->mainAllocatorOffset = sizeof(HbSharedChunkHeader);
+ // Load memory file in the beginning of the chunk first.
+ HbSharedCache *cachePtr = 0;
+ int memoryFileSize = 0;
+ chunkHeader->sharedCacheOffset = 0;
+
+ if (!binCSSConverterApp) {
+#ifdef Q_OS_SYMBIAN
+ QString memoryFile("z:/resource/hb/themes/css.bin");
+ memoryFileSize = loadMemoryFile(memoryFile);
+#endif
+ }
+
+ // Put main allocator after the memory file or if memory file was not loaded, after chunk header.
+ chunkHeader->mainAllocatorOffset = memoryFileSize ? ALIGN(memoryFileSize) : sizeof(HbSharedChunkHeader);
mainAllocator->initialize(chunk, chunkHeader->mainAllocatorOffset);
chunkHeader->subAllocatorOffset = alloc(SPACE_NEEDED_FOR_MULTISEGMENT_ALLOCATOR);
subAllocator->initialize(chunk, chunkHeader->subAllocatorOffset, mainAllocator);
chunkHeader->identifier = INITIALIZED_CHUNK_IDENTIFIER;
+
+ if (!binCSSConverterApp) {
+ if (memoryFileSize > 0) {
+ cachePtr = cache();
+ } else {
+ cachePtr = createSharedCache(0, 0, 0);
+ }
+
+ if (cachePtr) {
+ cachePtr->initServer();
+ }
+ }
}
- success = true;
- }
- return success;
+ success = true;
+ } else {
+ HbSharedCache *cachePtr = cache();
+ if (cachePtr) {
+ cachePtr->initClient();
+ }
+ }
+ return success;
}
/**
@@ -103,6 +155,54 @@
*/
int HbSharedMemoryManager::alloc(int size)
{
+#ifdef HB_THEME_SERVER_MEMORY_REPORT
+// some code copied, but much more readable this way
+ if (isWritable() && size > 0) {
+ int offset = -1;
+#ifdef USE_SUBALLOCATOR
+ if (size <= MAXIMUM_ALLOC_SIZE_FOR_SUBALLOCATOR) {
+ offset = subAllocator->alloc(size);
+ } else {
+ try{
+ // main allocator may throw bad_alloc
+ offset = mainAllocator->alloc(size);
+ }
+ catch(std::bad_alloc &badAlloc){
+ Q_UNUSED(badAlloc);
+ OOMCount++;
+ if (!OOMReportCreated) {
+ OOMReportCreated = true;
+ createReport();
+ }
+ throw;
+ }
+ }
+#else
+ try{
+ // main allocator may throw bad_alloc
+ offset = mainAllocator->alloc(size);
+ }
+ catch(std::bad_alloc &badAlloc){
+ OOMCount++;
+ throw;
+ }
+#endif
+ if (offset == -1) {
+ // we ran out of memory
+ OOMCount++;
+ if (!OOMReportCreated) {
+ OOMReportCreated = true;
+ createReport();
+ }
+ throw std::bad_alloc();
+ }
+ if (allocations.contains(size)) {
+ allocations[size].first++;
+ } else {
+ allocations.insert(size, QPair<quint32,quint32>(1,0));
+ }
+
+#else // normal alloc without reporting
if (isWritable() && size > 0) {
int offset = -1;
#ifdef USE_SUBALLOCATOR
@@ -118,6 +218,15 @@
// we ran out of memory
throw std::bad_alloc();
}
+#endif // HB_THEME_SERVER_MEMORY_REPORT
+
+#ifdef HB_THEME_SERVER_FULL_MEMORY_REPORT
+ fullAllocationHistory.append(QPair<quint32,quint32>(size | allocIdentifier, offset));
+#endif
+
+#ifdef HB_BIN_CSS
+ HbCssConverterUtils::cellAllocated(offset, size);
+#endif
return offset;
} else {
// memory manager attached in read only mode, cannot allocate memory
@@ -133,11 +242,31 @@
// don't do anything when freeing NULL (pointer)offset
if (isWritable() && (offset > 0)) {
int metaData = *(int*)((unsigned char*)(base())+offset-sizeof(int));
+#ifdef HB_THEME_SERVER_MEMORY_REPORT
+ int size = 0;
+ if (metaData & MAIN_ALLOCATOR_IDENTIFIER) {
+ size = mainAllocator->allocatedSize(offset);
+ } else {
+ size = subAllocator->allocatedSize(offset);
+ }
+
+ if (allocations.contains(size)) {
+ allocations[size].second++;
+ }
+#ifdef HB_THEME_SERVER_FULL_MEMORY_REPORT
+ fullAllocationHistory.append(QPair<quint32,quint32>(size | freeIdentifier, offset));
+#endif
+
+#endif
if (metaData & MAIN_ALLOCATOR_IDENTIFIER) {
mainAllocator->free(offset);
} else {
subAllocator->free(offset);
}
+
+#ifdef HB_BIN_CSS
+ HbCssConverterUtils::cellFreed(offset);
+#endif
}
}
@@ -150,20 +279,41 @@
{
int newOffset = -1;
if (isWritable()) {
+#ifdef HB_THEME_SERVER_FULL_MEMORY_REPORT
+ if (offset > 0) { // if offset == -1, just do normal alloc and not report realloc
+ fullAllocationHistory.append(QPair<quint32,quint32>(newSize | reallocIdentifier, offset));
+ }
+#endif
newOffset = alloc(newSize);
int allocatedSize = ALIGN(newSize);
if (offset > 0) {
+#ifdef HB_BIN_CSS
+ HbCssConverterUtils::cellMoved(offset, newOffset);
+#endif
unsigned char *scrPtr = (unsigned char*)(base())+offset;
int metaData = *(int*)((unsigned char*)(base())+offset-sizeof(int));
if (metaData & MAIN_ALLOCATOR_IDENTIFIER) {
int oldSize = mainAllocator->allocatedSize(offset);
memcpy((unsigned char*)(base())+newOffset, scrPtr, qMin(oldSize, allocatedSize));
+#ifdef HB_THEME_SERVER_MEMORY_REPORT
+ free(offset);
+#else
mainAllocator->free(offset);
+#endif
} else {
int oldSize = subAllocator->allocatedSize(offset);
memcpy((unsigned char*)(base())+newOffset, scrPtr, qMin(oldSize, allocatedSize));
+#ifdef HB_THEME_SERVER_MEMORY_REPORT
+ free(offset);
+#else
subAllocator->free(offset);
+#endif
}
+
+#if HB_BIN_CSS
+ // Does not matter if already called when calling free() above.
+ HbCssConverterUtils::cellFreed(offset);
+#endif
}
} else {
// tried to free non-writable memory???
@@ -185,18 +335,68 @@
* constructor
*/
HbSharedMemoryManager::HbSharedMemoryManager()
- :writable(true),
+ : writable(true),
mainAllocator(new HbSplayTreeAllocator),
subAllocator(new HbMultiSegmentAllocator),
chunk(0)
+#ifdef HB_THEME_SERVER_MEMORY_REPORT
+ ,totalAllocated(0),
+ OOMCount(0),
+ OOMReportCreated(false),
+ ordinal(1)
+#endif
{
}
+HbSharedCache *HbSharedMemoryManager::createSharedCache(
+ const char *offsetMapData, int size, int offsetItemCount, int sharedCacheOffset)
+{
+ HbSharedCache *cache = 0;
+ HbSharedChunkHeader *chunkHeader = static_cast<HbSharedChunkHeader*>(chunk->data());
+ if (chunkHeader->sharedCacheOffset != 0) {
+ free(chunkHeader->sharedCacheOffset);
+ chunkHeader->sharedCacheOffset = 0;
+ }
+ if (!offsetMapData) {
+ size = 0;
+ }
+
+ int sharedCacheSize = sizeof(HbSharedCache) + size;
+ // If shared cache offset is not given as parameter, alloc it
+ if (sharedCacheOffset < 0) {
+ sharedCacheOffset = alloc(sharedCacheSize);
+ }
+
+ if (sharedCacheOffset >= 0) {
+ cache = new (static_cast<char*>(base()) + sharedCacheOffset) HbSharedCache();
+ cache->addOffsetMap(offsetMapData, size, offsetItemCount);
+ chunkHeader->sharedCacheOffset = sharedCacheOffset;
+ }
+ return cache;
+}
+
+int HbSharedMemoryManager::size()
+{
+ if(mainAllocator) {
+ return (dynamic_cast<HbSplayTreeAllocator*>(mainAllocator))->size();
+ }
+ return -1;
+}
+
+HbSharedCache *HbSharedMemoryManager::cache()
+{
+ const HbSharedChunkHeader *chunkHeader = static_cast<const HbSharedChunkHeader*>(chunk->data());
+ return reinterpret_cast<HbSharedCache*>((char*)base() + chunkHeader->sharedCacheOffset);
+}
+
/**
* destructor
*/
HbSharedMemoryManager::~HbSharedMemoryManager()
{
+#ifdef HB_THEME_SERVER_MEMORY_REPORT
+ allocations.clear();
+#endif
delete subAllocator;
delete mainAllocator;
delete chunk;
@@ -227,6 +427,7 @@
memManager = 0;
}
+
/**
* gets the free memory reported by main allocator
*/
@@ -244,3 +445,159 @@
HbSplayTreeAllocator *splayAllocator = static_cast<HbSplayTreeAllocator*>(mainAllocator);
return splayAllocator->allocatedBytes();
}
+
+int HbSharedMemoryManager::loadMemoryFile(const QString &filePath)
+{
+ int loadedSize = 0;
+
+#ifdef CSSBIN_TRACES
+ qDebug() << "loading: " << filePath;
+#endif
+ QFile file(filePath);
+ if(file.open(QFile::ReadOnly)) {
+ qint64 fileSize = file.size();
+ file.read(static_cast<char*>(chunk->data()), fileSize);
+ file.close();
+ loadedSize = (int)fileSize;
+ }
+#ifdef CSSBIN_TRACES
+ qDebug() << "Loading memory file status: " << (ok ? "no error" : file.errorString());
+#endif
+ return loadedSize;
+}
+
+#ifdef HB_THEME_SERVER_MEMORY_REPORT
+bool pairGreaterThan(const QPair<quint32, QPair<quint32,quint32> > &p1, const QPair<quint32, QPair<quint32,quint32> > &p2)
+{
+ return p1.first > p2.first;
+}
+
+void HbSharedMemoryManager::createReport()
+{
+#if defined(Q_OS_SYMBIAN) || defined(Q_OS_WIN)
+ QString filePath("C:\\data\\log\\themeserver\\");
+#else
+ QString filePath(QDir::tempPath());
+ filePath.append("\\data\\log\\themeserver\\");
+#endif
+
+ filePath = QDir::toNativeSeparators(filePath);
+
+ QDir dir(filePath);
+ if (!dir.exists()) {
+ dir.mkpath(filePath);
+ }
+
+ filePath.append(QString::number(QDate::currentDate().year()));
+ filePath.append("wk");
+ filePath.append(QString::number(QDate::currentDate().weekNumber()));
+#ifdef HB_THEME_SERVER_FULL_MEMORY_REPORT
+ filePath.append("_");
+ filePath.append(QString::number(ordinal));
+ ordinal++;
+#endif
+ filePath.append(".txt");
+
+ QFile file(filePath);
+ if (!file.open(QFile::WriteOnly | QFile::Append | QFile::Text)) {
+ qWarning() << "Create shared memory report error - can't write to file " << filePath;
+ return;
+ }
+
+ QTextStream reportWriter(&file);
+
+ reportWriter << "********************************************************************************\n";
+ reportWriter << "HbSharedMemoryManager: memory report\n";
+ reportWriter << "********************************************************************************\n\n";
+
+ // list for sorting allocations and frees
+ QList<QPair<quint32, QPair<quint32,quint32> > > valueList;
+ QMap<quint32, QPair<quint32,quint32> >::const_iterator i; // size, <allocated, freed>
+ for (i = allocations.constBegin(); i != allocations.constEnd(); ++i) {
+ valueList.append(QPair<quint32,QPair<quint32,quint32> >(i.value().first, QPair<quint32,quint32>(i.key(), i.value().second)));
+ }
+ qSort(valueList.begin(), valueList.end(), pairGreaterThan);
+
+ reportWriter << "Top 30 allocation counts:\n";
+ reportWriter << "(allocation sizes for small allocations are chunk sizes from multisegment algorithm, not actual original allocation sizes)\n";
+ reportWriter << "times allocated - times released - size\n";
+ int count = 0;
+ for (int i = 0; i < valueList.size(); i++) {
+ if (count > 30) break; // only report top 30 sizes
+ reportWriter << valueList.at(i).first << " - " << valueList.at(i).second.second << " - " << valueList.at(i).second.first << "\n";
+ count++;
+ }
+ reportWriter << "\n";
+
+ valueList.clear();
+ for (i = allocations.constBegin(); i != allocations.constEnd(); ++i) {
+ valueList.append(QPair<quint32,QPair<quint32,quint32> >(i.key(), QPair<quint32,quint32>(i.value().first, i.value().second)));
+ }
+ qSort(valueList.begin(), valueList.end(), pairGreaterThan);
+ reportWriter << "Top 30 allocated sizes:\n";
+ reportWriter << "size - times allocated - times released\n";
+ count = 0;
+ for (int i = 0; i < valueList.size(); i++) {
+ if (count > 30) break; // only report top 30 sizes
+ reportWriter << valueList.at(i).first << " - " << valueList.at(i).second.first << " - " << valueList.at(i).second.second << "\n";
+ count++;
+ }
+ reportWriter << "\n";
+
+
+
+ mainAllocator->writeReport(reportWriter);
+#ifdef USE_SUBALLOCATOR
+ subAllocator->writeReport(reportWriter);
+#endif
+
+#ifdef HB_THEME_SERVER_FULL_MEMORY_REPORT
+ reportWriter << "\n********************* FULL ALLOCATION HISTORY ***********************\n\n";
+ for (int i = 0; i < fullAllocationHistory.size(); i++) {
+ quint32 size = fullAllocationHistory.at(i).first & 0x3FFFFFFF;
+ quint32 identifier = fullAllocationHistory.at(i).first & 0xC0000000;
+ quint32 offset = fullAllocationHistory.at(i).second;
+ switch (identifier) {
+ case allocIdentifier:
+ reportWriter << "allocated " << size << " bytes from offset " << offset << "\n";
+ break;
+ case freeIdentifier:
+ reportWriter << "freed " << size << " bytes from offset " << offset << "\n";
+ break;
+ case reallocIdentifier:
+ reportWriter << "reallocation from offset " << offset << " with " << size << " bytes" << "\n";
+ i++;
+ if (i <= fullAllocationHistory.size()) {
+ size = fullAllocationHistory.at(i).first & 0x3FFFFFFF;
+ identifier = fullAllocationHistory.at(i).first & 0xC0000000;
+ offset = fullAllocationHistory.at(i).second;
+ if (identifier == allocIdentifier) { // should come right after realloc
+ reportWriter << " from realloc: allocated " << size << " bytes from offset " << offset << "\n";
+ } else {
+ reportWriter << "ERROR: no alloc after realloc! How is this possible?\n";
+ }
+ }
+ i++;
+ if (i <= fullAllocationHistory.size()) {
+ size = fullAllocationHistory.at(i).first & 0x3FFFFFFF;
+ identifier = fullAllocationHistory.at(i).first & 0xC0000000;
+ offset = fullAllocationHistory.at(i).second;
+ if (identifier == freeIdentifier) { // should come right after realloc and alloc
+ reportWriter << " from realloc: freed " << size << " bytes from offset " << offset << "\n";
+ } else {
+ reportWriter << "ERROR: no free after realloc and alloc! How is this possible?\n";
+ }
+ }
+ break;
+ default:
+ break;
+ }
+
+ }
+#endif
+ file.close();
+ if (file.error()) {
+ qWarning() << "Create shared memory report error - error with file " << filePath;
+ }
+}
+#endif
--- a/src/hbcore/core/hbsharedmemorymanager_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/core/hbsharedmemorymanager_p.h Fri May 14 16:09:54 2010 +0300
@@ -26,15 +26,23 @@
#ifndef HBSHAREDMEMORYMANAGER_P_H
#define HBSHAREDMEMORYMANAGER_P_H
+#if !defined(HB_BOOTSTRAPPED) || defined(HB_BIN_CSS)
#include "hbmemorymanager_p.h"
-
-#include <new>
+#include "hbthemecommon_p.h"
+#ifdef HB_THEME_SERVER_MEMORY_REPORT
+#include <QMap>
+#include <QPair>
+#endif
+#endif // HB_BOOTSTRAPPED
// 13 MB cache size
#define CACHE_SIZE 1024*1024*13
+#if !defined(HB_BOOTSTRAPPED) || defined(HB_BIN_CSS)
+
class QSharedMemory;
class HbSharedMemoryAllocator;
+class HbSharedCache;
class HB_CORE_PRIVATE_EXPORT HbSharedMemoryManager
: public HbMemoryManager
@@ -50,16 +58,25 @@
}
static HbMemoryManager *instance();
static void releaseInstance();
+ int size();
+ HbSharedCache *createSharedCache(
+ const char *offsetMapData, int size, int offsetItemCount, int sharedCacheOffset = -1);
+ HbSharedCache *cache();
int freeSharedMemory();
int allocatedSharedMemory();
+#ifdef HB_THEME_SERVER_MEMORY_REPORT
+ void createReport();
+#endif
+
protected:
HbSharedMemoryManager();
~HbSharedMemoryManager();
private:
bool initialize();
+ int loadMemoryFile(const QString &filePath);
protected:
bool writable;
@@ -69,6 +86,19 @@
private:
static HbSharedMemoryManager *memManager;
+
+#ifdef HB_THEME_SERVER_MEMORY_REPORT
+ int totalAllocated;
+ int OOMCount; // how many out of memory exceptions have occurred
+ bool OOMReportCreated; // write report in first OOM
+ int ordinal; // used in report filename
+ QMap<quint32, QPair<quint32, quint32> > allocations; // size, <allocated, freed>
+#ifdef HB_THEME_SERVER_FULL_MEMORY_REPORT
+ QVector<QPair<quint32, quint32> > fullAllocationHistory;
+#endif
+#endif
};
+#endif // HB_BOOTSTRAPPED
+
#endif // HBSHAREDMEMORYMANAGER_P_H
--- a/src/hbcore/core/hbsmartpointer_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/core/hbsmartpointer_p.h Fri May 14 16:09:54 2010 +0300
@@ -154,6 +154,13 @@
mOffset = offset;
}
+ // This function is here for being able to modify offset when
+ // cells in shared memory are moved.
+ difference_type *offsetPtr()
+ {
+ return &mOffset;
+ }
+
HbMemoryManager::MemoryType memoryType() const
{
return mType;
--- a/src/hbcore/core/hbsplaytreeallocator_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/core/hbsplaytreeallocator_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -52,7 +52,7 @@
chunk = sharedChunk;
this->offset = offset;
- header = (HeapHeader*)(chunk->data()) + offset;
+ header = (HeapHeader*)(static_cast<char *>(chunk->data()) + offset);
if (header->identifier == INITIALIZED_ALLOCATOR_IDENTIFIER) {
return; // already initialized
}
@@ -484,6 +484,28 @@
}
}
+/**
+ * HbSplayTreeAllocator::size
+ *
+ * Gets the total size as bytes used.
+ */
+int HbSplayTreeAllocator::size()
+{
+ // splay the 'pointer' tree to obtain last pointer
+ TreeNode *node = TO_NODE_POINTER(splay(&header->pointerNode, (unsigned int)((char*)chunk->data()+chunk->size())));
+
+ if (node) {
+ TreeNode *right = TO_NODE_POINTER(node->rightNode);
+ if (right) {
+ node = right;
+ }
+ MemoryBlock *block = reinterpret_cast<MemoryBlock*>(reinterpret_cast<char*>(node) - sizeof(TreeNode));
+ int lastUsedOffset = TO_OFFSET(block)+sizeof(MemoryBlock)-1; // this is not aligned to 4!!! but actual last byte allocated
+ return lastUsedOffset;
+ }
+ return -1; // couldn't found last used offset
+}
+
int HbSplayTreeAllocator::freeBytes()
{
return header->freeBytes;
@@ -493,3 +515,14 @@
{
return header->allocatedBytes;
}
+
+#ifdef HB_THEME_SERVER_MEMORY_REPORT
+void HbSplayTreeAllocator::writeReport(QTextStream &reportWriter)
+{
+ reportWriter << "***** (Main)HbSplayTreeAllocator report *****\n\n";
+ reportWriter << "Allocated memory (including memory allocated by multisegment allocator): " << header->allocatedBytes << " bytes\n";
+ reportWriter << "Free memory: " << header->freeBytes << " bytes\n";
+ reportWriter << "Splaytree allocator is best fit allocator, so there is really no point to calculate fragmentation\n\n";
+
+}
+#endif
--- a/src/hbcore/core/hbstandarddirs.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/core/hbstandarddirs.cpp Fri May 14 16:09:54 2010 +0300
@@ -317,13 +317,7 @@
file.setFileName(absolutePath);
fileExists = file.open(QIODevice::ReadOnly);
file.close();
- // E.g. in hardware absolutepath is not found...
- // ToDo: mirrored.txt will be refactored
- //if(name.endsWith("mirrored.txt") && !fileExists) {
- // return QString(":/themes/icons/hbdefault/mirrored.txt");
- //} else {
- return absolutePath;
- //}
+ return absolutePath;
}
}
else if (resType == Hb::EffectResource) {
@@ -395,7 +389,6 @@
}
}
-
QStringList HbStandardDirs::findExistingFolderList(const QStringList &relativeFolderPaths,
const QString ¤tThemeName,
Hb::ResourceType resType)
--- a/src/hbcore/core/hbstring_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/core/hbstring_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -31,6 +31,10 @@
#include <QChar>
#include <QDebug>
+#ifdef HB_BIN_CSS
+#include "hbcssconverterutils_p.h"
+#endif
+
static const int shared_null_offset = -2;
static HbStringData *shared_null = 0;
@@ -40,6 +44,16 @@
mCapacity(0),
mRef(1)
{
+#ifdef HB_BIN_CSS
+ HbCssConverterUtils::registerOffsetHolder(&mStartOffset);
+#endif
+}
+
+HbStringData::~HbStringData()
+{
+#ifdef HB_BIN_CSS
+ HbCssConverterUtils::unregisterOffsetHolder(&mStartOffset);
+#endif
}
HbStringData *getStringData(HbMemoryManager::MemoryType type, int offset, bool shared = false)
@@ -74,6 +88,10 @@
mDataOffset = manager->alloc(sizeof(HbStringData));
HbStringData* data = HbMemoryUtils::getAddress<HbStringData>(mMemoryType, mDataOffset);
new(data) HbStringData();
+
+#ifdef HB_BIN_CSS
+ HbCssConverterUtils::registerOffsetHolder(&mDataOffset);
+#endif
}
/*
@@ -98,6 +116,10 @@
data->mLength = length;
data->mCapacity = length;
mDataOffset = dataOffset.release();
+
+#ifdef HB_BIN_CSS
+ HbCssConverterUtils::registerOffsetHolder(&mDataOffset);
+#endif
}
/*
@@ -118,6 +140,10 @@
mShared = false;
data->mRef.ref();
}
+
+#ifdef HB_BIN_CSS
+ HbCssConverterUtils::registerOffsetHolder(&mDataOffset);
+#endif
}
/*
@@ -125,6 +151,10 @@
*/
HbString::~HbString()
{
+#ifdef HB_BIN_CSS
+ HbCssConverterUtils::unregisterOffsetHolder(&mDataOffset);
+#endif
+
GET_MEMORY_MANAGER(mMemoryType);
// if the memory where the string is not writable it means it's client process, so do nothing
if (!manager->isWritable() || mDataOffset == shared_null_offset)
--- a/src/hbcore/core/hbstring_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/core/hbstring_p.h Fri May 14 16:09:54 2010 +0300
@@ -30,6 +30,7 @@
#include "hbmemoryutils_p.h"
#ifdef CSS_PARSER_TRACES
+#include "hbstringdata_p.h"
#include <QByteArray>
#include <QDebug>
#endif // CSS_PARSER_TRACES
@@ -85,10 +86,12 @@
}
void print() const
{
- GET_MEMORY_MANAGER(mMemoryType)
- HbStringData * mData = HbMemoryUtils::getAddress<HbStringData>( mMemoryType, mDataOffset);
- qDebug() << QString::fromRawData( (QChar*)((char*)manager->base()
- + mData->mStartOffset), mData->mLength );
+ 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
--- a/src/hbcore/core/hbstringdata_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/core/hbstringdata_p.h Fri May 14 16:09:54 2010 +0300
@@ -44,7 +44,7 @@
{
public:
HbStringData();
- ~HbStringData() {}
+ ~HbStringData();
public:
int mStartOffset;
int mLength;
--- a/src/hbcore/core/hbthemeindex.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/core/hbthemeindex.cpp Fri May 14 16:09:54 2010 +0300
@@ -27,16 +27,312 @@
#include "hbthemeindex_p.h"
#ifndef HB_BOOTSTRAPPED
#include "hbthemeclient_p.h"
+#include "hbinstance.h"
#endif // HB_BOOTSTRAPPED
+
+HbThemeIndexResource::HbThemeIndexResource(const QString &resourceName) :
+ resourceName(resourceName),
+ data(0)
+{
+#ifndef HB_BOOTSTRAPPED
+ getResourceData();
+#endif // HB_BOOTSTRAPPED
+}
+
+void HbThemeIndexResource::getResourceData()
+{
+#ifndef HB_BOOTSTRAPPED
+#ifdef THEME_INDEX_TRACES
+ qDebug() << "HbThemeIndexResource::getResourceData(: get item for" << resourceName.toUtf8();
+#endif
+ // Theme index tables are always valid in shared memory
+
+ // Try to find themable item with following logic:
+ // If item is locked in base theme
+ // Select item from base theme
+ // Else if item is found from C-drive operator theme
+ // Select item from C-drive operator theme
+ // Else if item is found from ROM operator theme
+ // Select item from ROM operator theme
+ // Else if item is found from active theme
+ // Select item from active theme
+ // Else
+ // Select item from base theme
+
+ type = BaseTheme; // This is the default, even we couldn't find themable resource
+
+ // First check base theme, which should be always valid
+ HbThemeIndexInfo info = HbThemeUtils::getThemeIndexInfo(BaseTheme);
+ if (info.themeIndexOffset == 0) { // This shouldn't happen, as there must be valid base theme
+ return; // Data will be 0
+ }
+
+ const char *baseAddress = HbMemoryUtils::getAddress<char>(HbMemoryManager::SharedMemory,
+ info.themeIndexOffset);
+ HbThemeIndex baseIndex(baseAddress);
+ const HbThemeIndexItemData *baseItemData = baseIndex.getItemData(resourceName);
+
+ if (!baseItemData) { // If the item is not found from base theme, it can't be found elsewhere
+ return; // Data will be 0
+ }
+
+ if (baseItemData->flags & HbThemeIndexItemData::Locked) {
+ basePath = info.path;
+ themeName = info.name;
+ data = baseItemData;
+ return;
+ }
+
+ // Base wasn't locked, next check operator theme in C-drive
+ info = HbThemeUtils::getThemeIndexInfo(OperatorC);
+ if (info.themeIndexOffset > 0) {
+ const char *operatorCAddress = HbMemoryUtils::getAddress<char>(HbMemoryManager::SharedMemory,
+ info.themeIndexOffset);
+ HbThemeIndex operatorCIndex(operatorCAddress);
+ const HbThemeIndexItemData *operatorCItemData = operatorCIndex.getItemData(resourceName);
+
+ if (operatorCItemData) { // Found, use it
+ type = OperatorC;
+ basePath = info.path;
+ themeName = info.name;
+ data = operatorCItemData;
+ return;
+ }
+ }
+
+ // Not found from operator theme in C-drive, next check operator theme in ROM
+ info = HbThemeUtils::getThemeIndexInfo(OperatorROM);
+ if (info.themeIndexOffset > 0) {
+ const char *operatorZAddress = HbMemoryUtils::getAddress<char>(HbMemoryManager::SharedMemory,
+ info.themeIndexOffset);
+ HbThemeIndex operatorZIndex(operatorZAddress);
+ const HbThemeIndexItemData *operatorZItemData = operatorZIndex.getItemData(resourceName);
+
+ if (operatorZItemData) { // Found, use it
+ type = OperatorROM;
+ basePath = info.path;
+ themeName = info.name;
+ data = operatorZItemData;
+ return;
+ }
+ }
+
+ // Not found from operator themes, try active theme
+ info = HbThemeUtils::getThemeIndexInfo(ActiveTheme);
+ if (info.themeIndexOffset > 0) {
+ const char *activeThemeAddress = HbMemoryUtils::getAddress<char>(HbMemoryManager::SharedMemory,
+ info.themeIndexOffset);
+ HbThemeIndex activeThemeIndex(activeThemeAddress);
+ const HbThemeIndexItemData *activeThemeItemData = activeThemeIndex.getItemData(resourceName);
+
+ if (activeThemeItemData) { // Found, use it
+ type = ActiveTheme;
+ basePath = info.path;
+ themeName = info.name;
+ data = activeThemeItemData;
+ return;
+ }
+ }
+
+ // Not found from active theme, use base
+ info = HbThemeUtils::getThemeIndexInfo(BaseTheme);
+ basePath = info.path;
+ themeName = info.name;
+ data = baseItemData;
+ return;
+#endif // HB_BOOTSTRAPPED
+}
+
+
+HbThemeIndexResource::~HbThemeIndexResource()
+{
+}
+
+bool HbThemeIndexResource::isValid()
+{
+ if (data) {
+ return true;
+ }
+ return false;
+}
+
+const QSize HbThemeIndexResource::defaultItemSize()
+{
+ if (data) {
+ return QSize(data->defaultWidth, data->defaultHeight);
+ }
+ return QSize();
+}
+
+const QSize HbThemeIndexResource::mirroredItemSize()
+{
+ if (data) {
+ return QSize(data->mirroredWidth, data->mirroredHeight);
+ }
+ return QSize();
+}
+
+bool HbThemeIndexResource::isAutomaticallyMirrored()
+{
+ if (data) {
+ return (data->flags & HbThemeIndexItemData::Mirrorable);
+ }
+ return false;
+}
+
+bool HbThemeIndexResource::isLocked()
+{
+ if (data) {
+ return (data->flags & HbThemeIndexItemData::Locked);
+ }
+ return false;
+}
+
+QString HbThemeIndexResource::fullFileName()
+{
+ if (!data) {
+ return QString();
+ }
+
+ QString fullName = basePath;
+ switch (data->itemType) {
+ case HbThemeIndexItemData::SvgItem:
+ {
+ fullName = fullName + "/icons/" + themeName + "/scalable/" + resourceName + ".svg";
+ break;
+ }
+ case HbThemeIndexItemData::PngItem:
+ {
+ fullName = fullName + "/icons/" + themeName + "/pixmap/" + resourceName + ".png";
+ break;
+ }
+ case HbThemeIndexItemData::MngItem:
+ {
+ fullName = fullName + "/icons/" + themeName + "/pixmap/" + resourceName + ".mng";
+ break;
+ }
+ case HbThemeIndexItemData::GifItem:
+ {
+ fullName = fullName + "/icons/" + themeName + "/pixmap/" + resourceName + ".gif";
+ break;
+ }
+ case HbThemeIndexItemData::XpmItem:
+ {
+ fullName = fullName + "/icons/" + themeName + "/pixmap/" + resourceName + ".xpm";
+ break;
+ }
+ case HbThemeIndexItemData::JpgItem:
+ {
+ fullName = fullName + "/icons/" + themeName + "/pixmap/" + resourceName + ".jpg";
+ break;
+ }
+ case HbThemeIndexItemData::NvgItem:
+ {
+ fullName = fullName + "/icons/" + themeName + "/scalable/" + resourceName + ".nvg";
+ break;
+ }
+ case HbThemeIndexItemData::SvgzItem:
+ {
+ fullName = fullName + "/icons/" + themeName + "/scalable/" + resourceName + ".svgz";
+ break;
+ }
+ case HbThemeIndexItemData::QpicItem:
+ {
+ fullName = fullName + "/icons/" + themeName + "/pixmap/" + resourceName + ".qpic";
+ break;
+ }
+ case HbThemeIndexItemData::AxmlItem:
+ {
+ fullName = fullName + "/animations/" + themeName + "/" + resourceName;
+ break;
+ }
+ case HbThemeIndexItemData::FxmlItem:
+ {
+ fullName = fullName + "/effects/" + themeName + "/" + resourceName;
+ break;
+ }
+ default:
+ {
+ break;
+ }
+ }
+
+ return fullName;
+}
+
+QString HbThemeIndexResource::fullMirroredFileName()
+{
+ if (!data) {
+ return QString();
+ }
+
+ QString fullName = basePath;
+ switch (data->mirroredItemType) {
+ case HbThemeIndexItemData::SvgItem:
+ {
+ fullName = fullName + "/icons/" + themeName + "/scalable/mirrored/" + resourceName + ".svg";
+ break;
+ }
+ case HbThemeIndexItemData::PngItem:
+ {
+ fullName = fullName + "/icons/" + themeName + "/pixmap/mirrored/" + resourceName + ".png";
+ break;
+ }
+ case HbThemeIndexItemData::MngItem:
+ {
+ fullName = fullName + "/icons/" + themeName + "/pixmap/mirrored/" + resourceName + ".mng";
+ break;
+ }
+ case HbThemeIndexItemData::GifItem:
+ {
+ fullName = fullName + "/icons/" + themeName + "/pixmap/mirrored/" + resourceName + ".gif";
+ break;
+ }
+ case HbThemeIndexItemData::XpmItem:
+ {
+ fullName = fullName + "/icons/" + themeName + "/pixmap/mirrored/" + resourceName + ".xpm";
+ break;
+ }
+ case HbThemeIndexItemData::JpgItem:
+ {
+ fullName = fullName + "/icons/" + themeName + "/pixmap/mirrored/" + resourceName + ".jpg";
+ break;
+ }
+ case HbThemeIndexItemData::NvgItem:
+ {
+ fullName = fullName + "/icons/" + themeName + "/scalable/mirrored/" + resourceName + ".nvg";
+ break;
+ }
+ case HbThemeIndexItemData::SvgzItem:
+ {
+ fullName = fullName + "/icons/" + themeName + "/scalable/mirrored/" + resourceName + ".svgz";
+ break;
+ }
+ case HbThemeIndexItemData::QpicItem:
+ {
+ fullName = fullName + "/icons/" + themeName + "/pixmap/mirrored/" + resourceName + ".qpic";
+ break;
+ }
+ default:
+ {
+ return fullFileName(); // There was no mirrored icon, return normal icon
+ break;
+ }
+ }
+
+ return fullName;
+}
+
+
// Class HbThemeIndex has the logic of handling different versions of
// the theme index file formats.
HbThemeIndex::HbThemeIndex(const char *baseAddress) :
mBaseAddress(baseAddress),
- mCount(0),
- mItemArray(0),
- mStringAreaStart(0)
+ mItemCount(0),
+ mThemeItemDataArray(0),
+ initialized(false)
{
}
@@ -44,54 +340,53 @@
{
}
-int HbThemeIndex::itemCount()
+void HbThemeIndex::init()
{
- if (!mCount) {
- //int version = *(reinterpret_cast<const int *>(mBaseAddress));
- // Assumes version 1 for now
- const HbThemeIndexHeaderV1 *header = reinterpret_cast<const HbThemeIndexHeaderV1 *>(mBaseAddress);
- mCount = header->count;
- }
+ //int version = *(reinterpret_cast<const int *>(mBaseAddress));
+ // Assumes version 1 for now
+ const HbThemeIndexHeaderV1 *header = reinterpret_cast<const HbThemeIndexHeaderV1 *>(mBaseAddress);
+ mItemCount = header->itemCount;
+ mThemeItemDataArray = reinterpret_cast<const HbThemeIndexItemData *>(mBaseAddress + sizeof(HbThemeIndexHeaderV1));
- return mCount;
+ initialized = true;
}
-const HbThemeIndexItem *HbThemeIndex::itemArray()
+quint32 HbThemeIndex::hash(const QString &string)
{
- if (!mItemArray) {
- // Assumes version 1 for now
- mItemArray = reinterpret_cast<const HbThemeIndexItem *>(mBaseAddress + sizeof(HbThemeIndexHeaderV1));
+ quint32 hashValue = 0;
+ quint32 c;
+ QByteArray array = string.toLatin1();
+ char *data = array.data();
+ c = *data++;
+
+ while (c) {
+ hashValue = c + (hashValue << 6) + (hashValue << 16) - hashValue;
+ c = *data++;
}
- return mItemArray;
+
+ return hashValue;
}
-const char *HbThemeIndex::stringAreaStart()
+const HbThemeIndexItemData *HbThemeIndex::getItemData(const QString &itemName)
{
- if (!mStringAreaStart) {
- // Assumes version 1 for now
- mStringAreaStart = mBaseAddress + sizeof(HbThemeIndexHeaderV1) + itemCount() * sizeof(HbThemeIndexItem);
+ if (!initialized) {
+ init();
}
- return mStringAreaStart;
-}
+ quint32 hashValue = hash(itemName);
+ int begin = 0;
+ int end = mItemCount - 1;
-const HbThemeIndexItem *binaryFind(const QString &itemName, const char* themeIndexBase, const HbThemeIndexItem *itemArray, int count)
-{
- int begin = 0;
- int end = count - 1;
+ const HbThemeIndexItemData *retItem = 0;
// binary search
while (begin <= end) {
int mid = begin + (end-begin)/2;
- // Fast string comparison, no unnecessary mem copy
- int comparison = itemName.compare(QLatin1String(themeIndexBase + itemArray[mid].iconnameOffset));
- // If the item was found, we're done.
- if (!comparison) {
- return &itemArray[mid];
- }
-
- // Is the target in lower or upper half?
- else if (comparison < 0) {
+
+ if (mThemeItemDataArray[mid].itemNameHash == hashValue) {
+ retItem = &mThemeItemDataArray[mid];
+ return retItem;
+ } else if (hashValue < mThemeItemDataArray[mid].itemNameHash) {
end = mid - 1;
} else {
begin = mid + 1;
@@ -99,58 +394,58 @@
}
// Did not find the target, return 0.
- return 0;
+ return retItem;
}
-/**
-* Returns true if the current theme has a valid theme index included in it.
-*/
-bool ThemeIndexTables::isValid()
+int HbThemeIndex::itemCount()
{
-#ifndef HB_BOOTSTRAPPED
- // Retrieve tables from server if not done yet
- if (!tablesRetrieved) {
- HbThemeClient::global()->getThemeIndexTables(*this);
- tablesRetrieved = true;
+ if (!initialized) {
+ init();
+ }
-#ifdef THEME_INDEX_TRACES
- qDebug() << "ThemeIndex: retrieved index tables, table[0] =" << tables[0] << "table[1] =" << tables[1];
-
-#endif // THEME_INDEX_TRACES
-
- }
-#endif // HB_BOOTSTRAPPED
- return tables[0] >= 0;
+ return mItemCount;
}
-const HbThemeIndexItem *ThemeIndexTables::getItem(const QString &itemName, int &tableIndex)
+bool HbThemeIndex::validateItems(qint64 byteSize)
{
- if (isValid()) {
- // Check the current theme index and its parents
- for (int i = 0; i < ThemeIndexTableCountMax; ++i) {
- int usedTable = tables[i];
- if (usedTable < 0) {
- break;
- }
-
- const char *baseAddress = reinterpret_cast<const char *>(usedTable);
- HbThemeIndex index(baseAddress);
- // Check the table
- int count = index.itemCount();
- const HbThemeIndexItem *itemArray = index.itemArray();
-
- // Get the correct item from the table using binary find
- const HbThemeIndexItem *item = binaryFind(itemName, baseAddress, itemArray, count);
-
- if (item) {
- tableIndex = i;
-#ifdef THEME_INDEX_TRACES
- qDebug() << "ThemeIndex: Returned item for" << itemName.toUtf8() << "from table" << tableIndex;
-#endif
- return item;
- }
+ if (!initialized) {
+ init();
+ }
+
+ bool indexOK = false;
+
+ if (sizeof(HbThemeIndexHeaderV1)
+ + (mItemCount * sizeof(HbThemeIndexItemData)) == byteSize) {
+ indexOK = true;
+ }
+
+ #ifdef THEME_INDEX_TRACES
+ if (!indexOK) {
+ qDebug() << "ThemeIndex: Index file corrupted!";
+ }
+ #endif
+
+ /* Todo: fix
+ // Validate items
+ for (int i = 0; i < mItemCount; i++) {
+ const HbThemeIndexItem *item = mThemeItemArray++;
+ if (!item ||
+ item->itemNameOffset < stringAreaStart || item->itemNameOffset >= byteSize ||
+ item->itemFolderOffset < stringAreaStart || item->itemFolderOffset >= byteSize ||
+ item->extOffset < stringAreaStart || item->extOffset >= byteSize ||
+ (item->mirroredExtOffset != -1 &&
+ (item->mirroredExtOffset < stringAreaStart || item->mirroredExtOffset >= byteSize))) {
+
+ indexOK = false;
+ break;
}
}
-
- return 0;
+*/
+ #ifdef THEME_INDEX_TRACES
+ if (!indexOK) {
+ qDebug() << "ThemeIndex: Icons NOK! Stopping validation.";
+ }
+ #endif
+
+ return indexOK;
}
--- a/src/hbcore/core/hbthemeindex_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/core/hbthemeindex_p.h Fri May 14 16:09:54 2010 +0300
@@ -26,8 +26,12 @@
#ifndef HBTHEMEINDEX_P_H
#define HBTHEMEINDEX_P_H
+#include <hbnamespace.h>
+#include <hbthemecommon_p.h>
+
#ifndef HB_BOOTSTRAPPED
#include "hbglobal.h"
+#include "hbthemeutils_p.h"
#else
#define HB_CORE_PRIVATE_EXPORT
#endif // HB_BOOTSTRAPPED
@@ -36,48 +40,99 @@
#include <QDataStream>
class HbThemeIndexItem;
-
-static const int ThemeIndexTableCountMax = 4;
+struct HbThemeIndexItemData;
class HB_CORE_PRIVATE_EXPORT HbThemeIndex
{
public:
HbThemeIndex(const char *baseAddress);
~HbThemeIndex();
-public:
+
int itemCount();
- const HbThemeIndexItem *itemArray();
- const char *stringAreaStart();
+ bool validateItems(qint64 byteSize);
+
+ static quint32 hash(const QString &string);
+ const HbThemeIndexItemData *getItemData(const QString &itemName);
+
private:
+ void init();
+
const char *mBaseAddress;
- int mCount;
- const HbThemeIndexItem *mItemArray;
- const char *mStringAreaStart;
+ int mItemCount;
+ const HbThemeIndexItemData *mThemeItemDataArray;
+ bool initialized;
};
-class HbThemeIndexItem
+
+struct HbThemeIndexItemData
+ {
+ enum Flag {
+ Default = 0x00,
+ Mirrorable = 0x01,
+ Locked = 0x02
+ };
+
+ enum Type {
+ NotDefined = 0,
+ SvgItem = 1, // .svg
+ PngItem = 2, // .png
+ MngItem = 3, // .mng
+ GifItem = 4, // .gif
+ XpmItem = 5, // .xpm
+ JpgItem = 6, // .jpg
+ NvgItem = 7, // .nvg
+ SvgzItem = 8, // .svgz
+ QpicItem = 9, // .qpic
+ FxmlItem = 10, // .fxml
+ AxmlItem = 11 // .axml
+ };
+
+ HbThemeIndexItemData() :
+ itemType(NotDefined),
+ itemNameHash(0),
+ flags(Default),
+ mirroredItemType(NotDefined),
+ defaultWidth(-1),
+ defaultHeight(-1),
+ mirroredWidth(-1),
+ mirroredHeight(-1) {}
+
+ quint32 itemType; // from enum Type
+ quint32 itemNameHash;
+ quint32 flags; // from enum Flag
+
+ // These will go to every themable item, but overhead is still small
+ // because most of the items are icons
+ quint32 mirroredItemType; // from enum Type
+ qint32 defaultWidth;
+ qint32 defaultHeight;
+ qint32 mirroredWidth;
+ qint32 mirroredHeight;
+ };
+
+
+// Helper class for getting data out of HbThemeIndexItemData
+class HbThemeIndexResource
{
public:
- HbThemeIndexItem() :
- iconnameOffset(-1),
- folderOffset(-1),
- extOffset(-1),
- mirroredExtOffset(-1),
- defaultSize(),
- mirroredDefaultSize()
- {
- }
-
- ~HbThemeIndexItem() {}
+ HbThemeIndexResource(const QString &resourceName);
+ ~HbThemeIndexResource();
-public:
- // Offsets to char* from the theme index base address
- int iconnameOffset;
- int folderOffset;
- int extOffset;
- int mirroredExtOffset;
- QSize defaultSize;
- QSize mirroredDefaultSize;
+ bool isValid();
+ const QSize defaultItemSize();
+ const QSize mirroredItemSize();
+ bool isAutomaticallyMirrored();
+ bool isLocked();
+ QString fullFileName();
+ QString fullMirroredFileName();
+
+private:
+ void getResourceData();
+ const QString &resourceName;
+ const HbThemeIndexItemData *data; // not owned
+ QString basePath;
+ QString themeName;
+ HbThemeType type;
};
// Version number is always the first integer in the header so the code can use correct header
@@ -85,43 +140,9 @@
struct HbThemeIndexHeaderV1
{
// Theme index version, current latest one is 1
- int version;
- // Number of items in the theme index
- int count;
+ quint32 version;
+ // Number of themable items (currently they are icons, effecs and animations)
+ quint32 itemCount;
};
-/**
-* Contains shared chunk addresses for theme indexes for the active theme
-* and its parent themes starting from table1.
-* E.g. currentTheme is SfBlackTheme
-* => table1 points to SfBlackTheme theme index
-* => table2 points to its parent theme (base theme) index
-* => table3 and table4 are -1 because there are no more parents
-*/
-class HB_CORE_PRIVATE_EXPORT ThemeIndexTables
-{
-public:
- inline ThemeIndexTables()
- {
- clear();
- }
-
- inline void clear()
- {
- tables[0] = -1;
- tables[1] = -1;
- tables[2] = -1;
- tables[3] = -1;
- tablesRetrieved = false;
- }
-
- bool isValid();
- const HbThemeIndexItem *getItem(const QString &itemName, int &tableIndex);
-
-public:
- int tables[4];
- QChar drives[4];
- bool tablesRetrieved;
-};
-
-#endif // HBTHEMEINDEX_P_H
+#endif //HBTHEMEINDEX_P_H
--- a/src/hbcore/core/hbthemesystemeffect.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/core/hbthemesystemeffect.cpp Fri May 14 16:09:54 2010 +0300
@@ -71,7 +71,7 @@
const int effectInfoCount = sizeof(effectInfoArray) / sizeof(EffectInfoEntry);
#ifdef Q_OS_SYMBIAN
-const TInt tfxPurpose = Qt::Window;
+//const TInt tfxPurpose = Qt::Window;
#endif //Q_OS_SYMBIAN
--- a/src/hbcore/core/hbvariant_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/core/hbvariant_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -32,6 +32,40 @@
#include "hbstring_p.h"
#include "hbsmartoffset_p.h"
+#ifdef HB_BIN_CSS
+#include "hbcssconverterutils_p.h"
+#endif
+
+HbVariant::HbVariantData::HbVariantData()
+ :stringSize(0),
+ mRef(1),
+ mDataType(Invalid)
+{
+}
+
+HbVariant::HbVariantData::~HbVariantData()
+{
+#ifdef HB_BIN_CSS
+ // Does not matter if unregistering with types that do not actually
+ // use mem offset
+ HbCssConverterUtils::unregisterOffsetHolder(&mData.offset);
+#endif
+}
+
+void HbVariant::HbVariantData::setDataType(Type dataType)
+{
+ mDataType = dataType;
+#ifdef HB_BIN_CSS
+ // Types that allocate memory from memory manager
+ if (mDataType == String || mDataType == StringList || mDataType == Color) {
+ // Does not matter if register same offset holder many times
+ HbCssConverterUtils::registerOffsetHolder(&mData.offset);
+ } else {
+ HbCssConverterUtils::unregisterOffsetHolder(&mData.offset);
+ }
+#endif
+}
+
/**
* detach
* used to support implicit sharing
@@ -48,17 +82,23 @@
HbVariantData *newData = new((char*)manager->base() + offset.get()) HbVariantData();
newData->mData = data->mData;
- newData->mDataType = data->mDataType;
+ newData->setDataType(data->dataType());
- if ( data->mDataType == String ) {
+ if ( data->dataType() == String ) {
HbSmartOffset dataOffset(manager->alloc( data->stringSize*sizeof(QChar)));
+#ifdef HB_BIN_CSS
+ HbCssConverterUtils::registerOffsetHolder(&(newData->mData.offset));
+#endif
::memcpy(HbMemoryUtils::getAddress<char>(mMemoryType, dataOffset.get()),
getAddress<char>(mMemoryType, data->mData.offset, mShared),
data->stringSize * sizeof(QChar));
newData->stringSize = data->stringSize;
newData->mData.offset = dataOffset.release();
- } else if(data->mDataType == Color) {
+ } else if(data->dataType() == Color) {
HbSmartOffset dataOffset(manager->alloc(sizeof(QColor)));
+#ifdef HB_BIN_CSS
+ HbCssConverterUtils::registerOffsetHolder(&(newData->mData.offset));
+#endif
new (HbMemoryUtils::getAddress<QColor>(mMemoryType, dataOffset.get()))
QColor(*getAddress<QColor>(mMemoryType, data->mData.offset, mShared));
newData->mData.offset = dataOffset.release();
@@ -76,6 +116,10 @@
: mMemoryType( type ), mShared( false )
{
initializeData();
+
+#ifdef HB_BIN_CSS
+ HbCssConverterUtils::registerOffsetHolder(&mDataOffset);
+#endif
}
/*
@@ -87,8 +131,12 @@
HbVariantData * data = initializeData();
if(data){
data->mData.i = val;
- data->mDataType = Int;
+ data->setDataType(Int);
}
+
+#ifdef HB_BIN_CSS
+ HbCssConverterUtils::registerOffsetHolder(&mDataOffset);
+#endif
}
/*
@@ -100,8 +148,12 @@
HbVariantData * data = initializeData();
if(data){
data->mData.d = val;
- data->mDataType = Double;
+ data->setDataType(Double);
}
+
+#ifdef HB_BIN_CSS
+ HbCssConverterUtils::registerOffsetHolder(&mDataOffset);
+#endif
}
/*
@@ -112,6 +164,10 @@
{
initializeData();
fillStringData(str.constData(), str.length());
+
+#ifdef HB_BIN_CSS
+ HbCssConverterUtils::registerOffsetHolder(&mDataOffset);
+#endif
}
/*
@@ -123,6 +179,10 @@
initializeData();
QString str = QString::fromAscii(val);
fillStringData(str.constData(), str.length());
+
+#ifdef HB_BIN_CSS
+ HbCssConverterUtils::registerOffsetHolder(&mDataOffset);
+#endif
}
@@ -134,6 +194,10 @@
{
initializeData();
fillColorData(col);
+
+#ifdef HB_BIN_CSS
+ HbCssConverterUtils::registerOffsetHolder(&mDataOffset);
+#endif
}
/*
@@ -158,6 +222,10 @@
}
Q_ASSERT( mMemoryType == HbMemoryManager::SharedMemory
|| mMemoryType == HbMemoryManager::HeapMemory );
+
+#ifdef HB_BIN_CSS
+ HbCssConverterUtils::registerOffsetHolder(&mDataOffset);
+#endif
}
/*
@@ -172,8 +240,13 @@
HbVariantData *data= getAddress<HbVariantData>( mMemoryType, mDataOffset, mShared );
if( mShared != true && !data->mRef.deref() ) {
clear();
+ data->~HbVariantData();
HbMemoryUtils::freeMemory( mMemoryType, mDataOffset );
}
+
+#ifdef HB_BIN_CSS
+ HbCssConverterUtils::unregisterOffsetHolder(&mDataOffset);
+#endif
}
/*
@@ -183,7 +256,7 @@
{
HbVariantData *data = getAddress<HbVariantData>( mMemoryType, mDataOffset, mShared );
- switch(data->mDataType) {
+ switch(data->dataType()) {
case HbVariant::Int:
return data->mData.i;
case HbVariant::Double:
@@ -205,7 +278,7 @@
{
HbVariantData *data = getAddress<HbVariantData>( mMemoryType, mDataOffset, mShared );
- switch(data->mDataType) {
+ switch(data->dataType()) {
case HbVariant::Int:
return QString::number(data->mData.i);
case HbVariant::Double:
@@ -243,7 +316,7 @@
{
HbVariantData *data = getAddress<HbVariantData>( mMemoryType, mDataOffset, mShared );
- switch(data->mDataType) {
+ switch(data->dataType()) {
case HbVariant::String: {
QColor col = QColor();
col.setNamedColor(getString());
@@ -286,7 +359,7 @@
{
HbVariantData *data = getAddress<HbVariantData>( mMemoryType, mDataOffset, mShared );
- switch(data->mDataType) {
+ switch(data->dataType()) {
case HbVariant::Int:
return double(data->mData.i);
case HbVariant::Double:
@@ -332,7 +405,7 @@
str, allocBytes);
}
data->stringSize = size;
- data->mDataType = String;
+ data->setDataType(String);
if (oldOffset != -1) {
//clean old string data when assigned with a new string value
HbMemoryUtils::freeMemory(mMemoryType, oldOffset);
@@ -348,13 +421,13 @@
HbVariantData *data = getAddress<HbVariantData>(mMemoryType, mDataOffset, mShared);
int oldOffset = reservesMemory(data) ? data->mData.offset : -1;
- if(data->mDataType == HbVariant::Color && data->mData.offset != -1) {
+ if(data->dataType() == HbVariant::Color && data->mData.offset != -1) {
oldOffset = -1; //use the preallocated memory.
} else {
data->mData.offset = manager->alloc(sizeof(QColor));
}
new (getAddress<char>(mMemoryType, data->mData.offset, mShared)) QColor(col);
- data->mDataType = Color;
+ data->setDataType(Color);
if (oldOffset != -1) {
HbMemoryUtils::freeMemory(mMemoryType, oldOffset);
}
@@ -370,7 +443,7 @@
HbVariantData *data = getAddress<HbVariantData>(mMemoryType, mDataOffset, mShared);
freeMemory(data);
data->mData.i = val;
- data->mDataType = Int;
+ data->setDataType(Int);
return *this;
}
@@ -384,7 +457,7 @@
HbVariantData *data = getAddress<HbVariantData>(mMemoryType, mDataOffset, mShared);
freeMemory(data);
data->mData.d = val;
- data->mDataType = Double;
+ data->setDataType(Double);
return *this;
}
@@ -444,6 +517,7 @@
if(mShared != true) {
if(data->mRef == 1) {
clear();
+ data->~HbVariantData();
HbMemoryUtils::freeMemory(mMemoryType, mDataOffset);
}else {
data->mRef.deref();
@@ -455,6 +529,7 @@
otherData->mRef.ref();
if(mShared != true && !data->mRef.deref() ) {
clear();
+ data->~HbVariantData();
HbMemoryUtils::freeMemory(mMemoryType, mDataOffset);
}
mShared = other.mShared;
@@ -472,24 +547,24 @@
{
HbVariantData *data = getAddress<HbVariantData>(mMemoryType, mDataOffset, mShared);
- if(data->mDataType == t) {
+ if(data->dataType() == t) {
return true;
}
switch(uint(t)) {
case HbVariant::Int:
- return data->mDataType == HbVariant::Double
- || data->mDataType == HbVariant::String;
+ return data->dataType() == HbVariant::Double
+ || data->dataType() == HbVariant::String;
case HbVariant::Double:
- return data->mDataType == HbVariant::Int
- || data->mDataType == HbVariant::String;
+ return data->dataType() == HbVariant::Int
+ || data->dataType() == HbVariant::String;
case HbVariant::String:
- return data->mDataType == HbVariant::Int
- || data->mDataType == HbVariant::StringList
- || data->mDataType == HbVariant::Double
- || data->mDataType == HbVariant::Color;
+ return data->dataType() == HbVariant::Int
+ || data->dataType() == HbVariant::StringList
+ || data->dataType() == HbVariant::Double
+ || data->dataType() == HbVariant::Color;
case HbVariant::StringList:
case HbVariant::Color:
- return data->mDataType == HbVariant::String;
+ return data->dataType() == HbVariant::String;
default :
return false;
}
@@ -507,7 +582,7 @@
int tempOffset = -1;
QColor col;
QString str;
- if(data->mDataType == t) {
+ if(data->dataType() == t) {
return true;
}
if (!this->canConvert(t)) {
@@ -515,10 +590,10 @@
}
switch (t) {
case HbVariant::Int:
- switch(data->mDataType) {
+ switch(data->dataType()) {
case HbVariant::Double:
data->mData.i = qRound64(data->mData.d);
- data->mDataType = HbVariant::Int;
+ data->setDataType(HbVariant::Int);
return true;
case HbVariant::String:
str = getString();
@@ -526,17 +601,17 @@
tempOffset = data->mData.offset;
data->mData.i = str.toLongLong(&ok);
HbMemoryUtils::freeMemory(mMemoryType, tempOffset);
- data->mDataType = HbVariant::Int;
+ data->setDataType(HbVariant::Int);
return ok;
default:
return false;
}
case HbVariant::Double:
- switch(data->mDataType) {
+ switch(data->dataType()) {
case HbVariant::Int:
data->mData.d = double(data->mData.i);
- data->mDataType = HbVariant::Double;
+ data->setDataType(HbVariant::Double);
return true;
case HbVariant::String:
str = getString();
@@ -544,24 +619,22 @@
tempOffset = data->mData.offset;
data->mData.d = str.toDouble(&ok);
HbMemoryUtils::freeMemory(mMemoryType, tempOffset);
- data->mDataType = HbVariant::Double;
+ data->setDataType(HbVariant::Double);
return ok;
default:
return false;
}
case HbVariant::String:
- switch(data->mDataType) {
+ switch(data->dataType()) {
case HbVariant::Int : {
QString num = QString::number(data->mData.i);
fillStringData(num.constData(), num.length());
- data->mDataType = HbVariant::String;
return true;
}
case HbVariant::Double: {
QString num = QString::number(data->mData.d);
fillStringData(num.constData(), num.length());
- data->mDataType = HbVariant::String;
return true;
}
case HbVariant::StringList:
@@ -570,7 +643,6 @@
case HbVariant::Color: {
QString colName = getColor().name();
fillStringData(colName.constData(), colName.length());
- data->mDataType = HbVariant::String;
return true;
}
default:
@@ -578,7 +650,7 @@
}
case HbVariant::Color:
- switch(data->mDataType) {
+ switch(data->dataType()) {
case HbVariant::String:
col.setNamedColor(getString());
if (!col.isValid()) {
@@ -605,7 +677,7 @@
{
HbVariantData *data = getAddress<HbVariantData>(mMemoryType, mDataOffset, mShared);
- switch(data->mDataType) {
+ switch(data->dataType()) {
case HbVariant::Int :
return QVariant(data->mData.i);
case HbVariant::Double :
@@ -632,7 +704,7 @@
detach(); // This can be optimise.
HbVariantData *data = getAddress<HbVariantData>(mMemoryType,mDataOffset, mShared);
- switch(data->mDataType) {
+ switch(data->dataType()) {
case HbVariant::Int :
data->mData.i=0;
break;
@@ -650,7 +722,7 @@
break;
}
data->stringSize = 0;
- data->mDataType=HbVariant::Invalid;
+ data->setDataType(HbVariant::Invalid);
}
#ifdef CSS_PARSER_TRACES
@@ -665,7 +737,7 @@
void HbVariant::print() const
{
HbVariantData * data = getAddress<HbVariantData>( mMemoryType, mDataOffset, mShared);
- switch(data->mDataType)
+ switch(data->dataType())
{
case HbVariant::Int:
qDebug() << data->mData.i;
--- a/src/hbcore/core/hbvariant_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/core/hbvariant_p.h Fri May 14 16:09:54 2010 +0300
@@ -54,12 +54,12 @@
private:
struct HbVariantData
{
- HbVariantData()
- : mDataType(Invalid),
- stringSize(0),
- mRef(1)
- {
- }
+ HbVariantData();
+ ~HbVariantData();
+
+ Type dataType() const {return mDataType;}
+ void setDataType(Type dataType);
+
union Data
{
int i;
@@ -67,9 +67,10 @@
int offset;
} mData;
- Type mDataType;
int stringSize;
QAtomicInt mRef;
+ private:
+ Type mDataType;
};
public:
@@ -90,7 +91,7 @@
Type type()
{
HbVariantData *data = getAddress<HbVariantData>(mMemoryType, mDataOffset, mShared);
- return data->mDataType;
+ return data->dataType();
}
#ifdef CSS_PARSER_TRACES
@@ -142,8 +143,8 @@
}
static bool reservesMemory(const HbVariantData *data)
{
- return data->mDataType == HbVariant::String
- || data->mDataType == HbVariant::Color;
+ return data->dataType() == HbVariant::String
+ || data->dataType() == HbVariant::Color;
}
void freeMemory(HbVariantData *data)
{
--- a/src/hbcore/core/hbvector_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/core/hbvector_p.h Fri May 14 16:09:54 2010 +0300
@@ -34,6 +34,17 @@
#include "hbsmartpointer_p.h"
#include "hbmemoryutils_p.h"
+#ifdef HB_BIN_CSS
+static const int HbVectorDefaultCapacity = 1;
+#else
+static const int HbVectorDefaultCapacity = 5;
+#endif
+
+#ifdef HB_BIN_CSS
+#include "hbcssconverterutils_p.h"
+#endif
+
+
/**
* const iterator class of HbVector
*/
@@ -228,7 +239,11 @@
GET_MEMORY_MANAGER(type);
HbSmartOffset smartOffset(manager->alloc(sizeof(HbVectorData)), type );
mData = new((char*)manager->base() + smartOffset.get()) HbVectorData(type);
- smartOffset.release();
+ smartOffset.release();
+
+#ifdef HB_BIN_CSS
+ HbCssConverterUtils::registerOffsetHolder(mData.offsetPtr());
+#endif
}
HbVector(const HbVector<T> &other)
@@ -248,6 +263,10 @@
}
Q_ASSERT(mMemoryType == HbMemoryManager::SharedMemory
|| mMemoryType == HbMemoryManager::HeapMemory);
+
+#ifdef HB_BIN_CSS
+ HbCssConverterUtils::registerOffsetHolder(mData.offsetPtr());
+#endif
}
~HbVector()
@@ -259,7 +278,10 @@
if(mShared != true && !mData->mRef.deref()) {
destroyData();
}
-
+
+#ifdef HB_BIN_CSS
+ HbCssConverterUtils::unregisterOffsetHolder(mData.offsetPtr());
+#endif
}
HbMemoryManager::MemoryType memoryType() const
@@ -601,7 +623,6 @@
DataPointer newData(0, mMemoryType);
GET_MEMORY_MANAGER(mMemoryType)
HbSmartOffset offset(manager->alloc(sizeof(HbVectorData)), mMemoryType);
- qDebug() << tempData->mSize << "," << oldSize;
newData = new ((char*)manager->base() + offset.get())
HbVectorData(mMemoryType, oldSize, newSize);
mData = newData;
@@ -637,7 +658,13 @@
return (char*)mData->mStart.get() - (char*)manager->base();
} else {
// this statement can throw
- int offset = manager->realloc(oldOffset, newSize * sizeof(T));
+ int offset = -1;
+ if (capacity() > 0) {
+ offset = manager->realloc(oldOffset, newSize * sizeof(T));
+ } else {
+ offset = manager->alloc(newSize * sizeof(T));
+ }
+
return offset;
}
}
@@ -661,19 +688,28 @@
{
// The ctor of HbVectorData can throw owing to manager->alloc, we're not catching the exception
// if any and simply allow to propagate it to caller.
- HbVectorData(HbMemoryManager::MemoryType type, unsigned int size=0, unsigned int capacity = 5)
+ HbVectorData(HbMemoryManager::MemoryType type, unsigned int size=0, unsigned int capacity = 0)
: mStart(0,type),
mSize(size),
mCapacity(capacity),
mRef(1)
{
+#ifdef HB_BIN_CSS
+
+ HbCssConverterUtils::registerOffsetHolder(mStart.offsetPtr());
+#endif
GET_MEMORY_MANAGER(type);
- mStart = (T*) ((char*)manager->base() + manager->alloc(capacity*sizeof(T)));
+ if (capacity > 0) {
+ mStart = (T*) ((char*)manager->base() + manager->alloc(capacity*sizeof(T)));
+ }
}
~HbVectorData()
{
- destroyAll();
+#ifdef HB_BIN_CSS
+ HbCssConverterUtils::unregisterOffsetHolder(mStart.offsetPtr());
+#endif //HB_BIN_CSS
+ destroyAll();
}
void deAllocateAll(HbMemoryManager::MemoryType type)
@@ -799,9 +835,16 @@
} else {
GET_MEMORY_MANAGER(mMemoryType);
int offset = (char*)mData->mStart.get() - (char*)manager->base();
- int newOffset = reAlloc(offset, 2 * mData->mCapacity, mData->mSize);
+#ifdef HB_BIN_CSS
+ int capacity = (mData->mCapacity == 0) ? HbVectorDefaultCapacity : mData->mCapacity + 1;
+ int newOffset = reAlloc(offset, capacity, mData->mSize);
+#else
+ int capacity = (mData->mCapacity == 0) ? HbVectorDefaultCapacity : mData->mCapacity * 2;
+ int newOffset = reAlloc(offset, capacity, mData->mSize);
+#endif
+ mData->mCapacity = capacity;
mData->mStart.setOffset(newOffset);
- mData->mCapacity *= 2;
+
if(QTypeInfo<value_type>::isComplex) {
Inserter it(mData->mStart + mData->mSize, mData->mStart + mData->mSize + 1);
--- a/src/hbcore/cssparser/hbcssparser_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/cssparser/hbcssparser_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -34,7 +34,6 @@
#include <qbrush.h>
#include <qimagereader.h>
#include <qgraphicswidget.h>
-#include <hbfontspec.h>
//QT_BEGIN_NAMESPACE
@@ -145,6 +144,7 @@
{ "column-narrow-width", HbColumnNarrowWidth },
{ "column-wide-width", HbColumnWideWidth },
{ "fixed-height", HbFixedHeight },
+ { "fixed-size", HbFixedSize },
{ "fixed-width", HbFixedWidth },
{ "float", Float },
{ "font", Font },
@@ -171,8 +171,10 @@
{ "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 },
@@ -194,6 +196,7 @@
{ "page-break-before", PageBreakBefore },
{ "position", Position },
{ "pref-height", HbPreferredHeight },
+ { "pref-size", HbPreferredSize },
{ "pref-width", HbPreferredWidth },
{ "right", Right },
{ "section", HbSection },
@@ -426,6 +429,7 @@
return prop->id;
}
+#ifndef HB_BIN_CSS
///////////////////////////////////////////////////////////////////////////////
// Value Extractor
ValueExtractor::ValueExtractor(const HbVector<Declaration> &decls, const HbDeviceProfile &profile, const QPalette &pal)
@@ -604,8 +608,6 @@
return pol;
}
-
-
int ValueExtractor::lengthValue(const Declaration &decl)
{
if (decl.values.count() < 1)
@@ -665,6 +667,34 @@
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;
@@ -893,7 +923,7 @@
return hit;
}
-
+#endif
static Qt::Alignment parseAlignment(const Value *values, int count)
{
Qt::Alignment a[2] = { 0, 0 };
@@ -1110,7 +1140,7 @@
return BorderStyle_Unknown;
}
-
+#ifndef HB_BIN_CSS
void ValueExtractor::borderValue(const Declaration &decl, qreal *width, HbCss::BorderStyle *style, QBrush *color)
{
*width = 0;
@@ -1864,7 +1894,7 @@
}
return hit;
}
-
+#endif
QColor Declaration::colorValue(const QPalette &pal) const
{
@@ -2270,12 +2300,13 @@
if (elementName == GLOBAL_CSS_SELECTOR)
return 0;
- static QHash<QString, int> depths;
- if (depths.contains(elementName)) {
- return depths[elementName];
+ const uint nameHash = qHash(elementName.constData());
+ static QHash<uint, int> depths;
+ if (depths.contains(nameHash)) {
+ return depths[nameHash];
} else {
int result = nodeNameEquals(node, elementName);
- depths[elementName] = result;
+ depths[nameHash] = result;
return result;
}
}
@@ -2394,11 +2425,12 @@
bool firstLoop = true;
while(count--){
const QString &className = classNames.at(count);
- QVectorIterator<StyleSheet*> iter(widgetSheets[className]);
+ uint classNameHash = qHash(className);
+ QVectorIterator<StyleSheet*> iter(widgetSheets[classNameHash]);
while (iter.hasNext()) {
const StyleSheet *styleSheet = iter.next();
if(styleSheet) {
- WidgetStyleRules* widgetStack = styleSheet->widgetStack(className);
+ WidgetStyleRules* widgetStack = styleSheet->widgetStack(classNameHash);
if (widgetStack) {
matchRules(node, widgetStack->styleRules, styleSheet->origin, styleSheet->depth, &weightedRules, false);
// Append orientation-specific rules
@@ -2443,11 +2475,12 @@
int count = classNames.count();
while (count--) {
const QString &className = classNames.at(count);
- QVectorIterator<StyleSheet*> iter(widgetSheets[className]);
+ uint classNameHash = qHash(className);
+ QVectorIterator<StyleSheet*> iter(widgetSheets[classNameHash]);
while (iter.hasNext()) {
const StyleSheet *styleSheet = iter.next();
if (styleSheet) {
- WidgetStyleRules* widgetStack = styleSheet->widgetStack(className);
+ WidgetStyleRules* widgetStack = styleSheet->widgetStack(classNameHash);
if (widgetStack) {
if (widgetStack->portraitRules.count() ||
widgetStack->landscapeRules.count()) {
@@ -2538,14 +2571,14 @@
{
styleSheets.append(styleSheet);
foreach (const HbCss::WidgetStyleRules &wsr, styleSheet->widgetRules) {
- widgetSheets[wsr.widgetName].append(styleSheet);
+ widgetSheets[wsr.classNameHash].append(styleSheet);
}
}
void StyleSelector::removeStyleSheet( StyleSheet* styleSheet )
{
styleSheets.remove(styleSheets.indexOf(styleSheet));
- QHash<QString, QVector<HbCss::StyleSheet*> >::iterator iter = widgetSheets.begin();
+ QHash<uint, QVector<HbCss::StyleSheet*> >::iterator iter = widgetSheets.begin();
while (iter != widgetSheets.end()) {
int index = iter.value().indexOf(styleSheet);
if (index != -1) {
@@ -2609,7 +2642,7 @@
return output;
}
-int QCssScanner_Generated::handleCommentStart()
+int HbQCss::QCssScanner_Generated::handleCommentStart()
{
while (pos < input.size() - 1) {
if (input.at(pos) == QLatin1Char('*')
@@ -2624,7 +2657,7 @@
void Scanner::scan(const QString &preprocessedInput, QVector<Symbol> *symbols)
{
- QCssScanner_Generated scanner(preprocessedInput);
+ HbQCss::QCssScanner_Generated scanner(preprocessedInput);
Symbol sym;
int tok = scanner.lex();
while (tok != -1) {
@@ -2782,13 +2815,14 @@
void Parser::addRuleToWidgetStack(StyleSheet *sheet, const QString &stackName, StyleRule &rule)
{
- WidgetStyleRules* widgetStack = sheet->widgetStack(stackName);
+ uint stackNameHash = qHash(stackName);
+ WidgetStyleRules* widgetStack = sheet->widgetStack(stackNameHash);
if (!widgetStack) {
#ifdef CSSSTACKS_DEBUG
qDebug() << "Creating stack for classname" << stackName;
#endif
- HbCss::WidgetStyleRules rules(stackName, sheet->memoryType);
+ HbCss::WidgetStyleRules rules(stackNameHash, sheet->memoryType);
widgetStack = sheet->addWidgetStack(rules);
}
--- a/src/hbcore/cssparser/hbcssparser_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/cssparser/hbcssparser_p.h Fri May 14 16:09:54 2010 +0300
@@ -171,8 +171,12 @@
HbAspectRatio,
HbPreferredWidth,
HbPreferredHeight,
+ HbPreferredSize,
HbFixedWidth,
HbFixedHeight,
+ HbFixedSize,
+ HbMinimumSize,
+ HbMaximumSize,
HbSizePolicy,
HbSizePolicyHorizontal,
HbSizePolicyVertical,
@@ -1057,10 +1061,9 @@
struct WidgetStyleRules
{
-WidgetStyleRules(const QString &widgetname = "", HbMemoryManager::MemoryType type = HbMemoryManager::HeapMemory)
- : widgetName(type), styleRules(type), portraitRules(type), landscapeRules(type)
+WidgetStyleRules(uint widgetNameHash, HbMemoryManager::MemoryType type = HbMemoryManager::HeapMemory)
+ : classNameHash(widgetNameHash), styleRules(type), portraitRules(type), landscapeRules(type)
{
- widgetName = widgetname;
}
#ifdef CSS_PARSER_TRACES
bool supportsPrinting() const {return true;}
@@ -1068,7 +1071,6 @@
void print() const
{
qDebug() <<"==============WidgetStyleRules::Print():Begin==================";
- qDebug() << "WidgetName = " << widgetName;
qDebug() << "Generic rules:";
styleRules.print();
qDebug() << "Portrait rules:";
@@ -1079,7 +1081,7 @@
}
#endif
// Data
- HbString widgetName;
+ uint classNameHash;
HbVector<StyleRule> styleRules;
HbVector<StyleRule> portraitRules;
HbVector<StyleRule> landscapeRules;
@@ -1146,13 +1148,12 @@
#endif
// Utility functions
- WidgetStyleRules* widgetStack(const QString &className) const
+ WidgetStyleRules* widgetStack(uint classNameHash) const
{
for (int i=0; i<widgetRules.count(); i++) {
- QString stackName = widgetRules.at(i).widgetName;
- if (strcmp(stackName.toLatin1().data(), className.toLatin1().data()) == 0) {
- return &(widgetRules.at(i));
- }
+ if (classNameHash == widgetRules.at(i).classNameHash) {
+ return &(widgetRules.at(i));
+ }
}
return 0;
}
@@ -1212,7 +1213,7 @@
void removeStyleSheet( StyleSheet* styleSheet );
QVector<StyleSheet*> styleSheets;
- QHash<QString, QVector<StyleSheet*> > widgetSheets;
+ QHash<uint, QVector<StyleSheet*> > widgetSheets;
QString medium;
private:
void matchRules(NodePtr node, const HbVector<StyleRule> &rules, StyleSheetOrigin origin,
--- a/src/hbcore/cssparser/hbcssscanner_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/cssparser/hbcssscanner_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -23,6 +23,9 @@
**
****************************************************************************/
+// namespace added to avoid symbol conflicts with QT.
+namespace HbQCss {
+
// auto generated. DO NOT EDIT.
class QCssScanner_Generated
{
@@ -1128,3 +1131,5 @@
return token;
}
+} // namespace
+
--- a/src/hbcore/cssparser/hblayeredstyleloader_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/cssparser/hblayeredstyleloader_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -24,7 +24,9 @@
****************************************************************************/
#include "hblayeredstyleloader_p.h"
#include "hbwidgetstyleloader_p.h"
+#ifndef HB_BIN_CSS
#include <hbwidget.h>
+#endif
#include <QDir>
#include <QTextStream>
@@ -32,14 +34,20 @@
#include <QtDebug>
//#define LAYEREDSTYLELOADER_DEBUG
+#ifndef HB_BIN_CSS
+#define HB_USETHEMESERVER
+#endif
+
#include "hbvector_p.h"
#include "hbmemorymanager_p.h"
#include "hbmemoryutils_p.h"
+#ifdef HB_USETHEMESERVER
#include "hbthemeclient_p.h"
+#endif
#include "hbtheme.h"
+#ifndef HB_BIN_CSS
#include "hbtheme_p.h"
-#include "hbthemeclient_p.h"
-#include "hbinstance.h"
+#endif
#include "hbthemeperf_p.h"
#include "hbcssformatter_p.h"
@@ -140,7 +148,9 @@
QTime time;
time.start();
#endif
+#ifdef HB_USETHEMESERVER
styleSheet = HbThemeClient::global()->getSharedStyleSheet(fileName,priority);
+#endif
#ifdef LAYEREDSTYLELOADER_DEBUG
qDebug() << "Time elapsed in getting the shared stylesheet "<< fileName << " is : %d ms" <<time.elapsed();
#endif
@@ -387,7 +397,7 @@
QVector<QVector<HbCss::WeightedRule> > weightedRulesList;
HbLayeredStyleLoader *allStack = getStack(Concern_All);
- QVectorIterator<LayerPriority> iter(LayerList());
+ QListIterator<LayerPriority> iter(LayerList());
while (iter.hasNext()) {
LayerPriority priority = iter.next();
QMap<LayerPriority, Layer>::const_iterator it = mStyleLayers.constFind(priority);
@@ -425,7 +435,7 @@
QVector<QVector<HbCss::WeightedDeclaration> > weightedDeclsList;
HbLayeredStyleLoader *allStack = getStack(Concern_All);
- QVectorIterator<LayerPriority> iter(LayerList());
+ QListIterator<LayerPriority> iter(LayerList());
while (iter.hasNext()) {
LayerPriority priority = iter.next();
QMap<LayerPriority, Layer>::const_iterator it = mStyleLayers.constFind(priority);
@@ -473,7 +483,7 @@
QVector<QVector<HbCss::WeightedRule> > weightedRulesList;
HbLayeredStyleLoader *allStack = getStack(Concern_All);
- QVectorIterator<LayerPriority> iter(LayerList());
+ QListIterator<LayerPriority> iter(LayerList());
while (iter.hasNext()) {
LayerPriority priority = iter.next();
QMap<LayerPriority, Layer>::const_iterator it = mStyleLayers.constFind(priority);
@@ -504,6 +514,7 @@
qDebug() << "Style rules for" << widget->metaObject()->className();
qDebug("\n%s", HbCssFormatter::weightedStyleRulesToString(weightedRules).toLatin1().constData());
#endif
+ rules.reserve(count);
for (int j = 0; j < weightedRules.count(); j++) {
rules += weightedRules.at(j).second;
}
@@ -518,7 +529,7 @@
{
HbLayeredStyleLoader *allStack = getStack(Concern_All);
- QVectorIterator<LayerPriority> iter(LayerList());
+ QListIterator<LayerPriority> iter(LayerList());
while (iter.hasNext()) {
LayerPriority priority = iter.next();
QMap<LayerPriority, Layer>::const_iterator it = mStyleLayers.constFind(priority);
@@ -566,27 +577,22 @@
\return List of all layer priorities in use
*/
-QVector<HbLayeredStyleLoader::LayerPriority> HbLayeredStyleLoader::LayerList() const
+QList<HbLayeredStyleLoader::LayerPriority> HbLayeredStyleLoader::LayerList() const
{
- QVector<LayerPriority> result;
-
- QMap<LayerPriority, int> uniqueLayers;
- QList<LayerPriority> allLayers = mStyleLayers.keys();
+ QList<LayerPriority> mergedLayers = mStyleLayers.keys();
HbLayeredStyleLoader *allStack = getStack(Concern_All);
if (allStack) {
- allLayers << allStack->mStyleLayers.keys();
- }
- QListIterator<LayerPriority> iter(allLayers);
- while (iter.hasNext()) {
- uniqueLayers.insert(iter.next(), 0);
+ QList<LayerPriority> allLayers = allStack->mStyleLayers.keys();
+ for (int i=0; i<allLayers.count(); i++) {
+ const LayerPriority &layer = allLayers.at(i);
+ if (!mergedLayers.contains(layer)) {
+ mergedLayers.append(layer);
+ }
+ }
}
-
- QMapIterator<LayerPriority, int> mapIt(uniqueLayers);
- while (mapIt.hasNext()) {
- mapIt.next();
- result << mapIt.key();
- }
- return result;
+ qSort(mergedLayers);
+
+ return mergedLayers;
}
@@ -632,7 +638,7 @@
int widgetstack_count = defaultSs->widgetRules.count();
stream << widgetstack_count;
foreach (const HbCss::WidgetStyleRules &rules, defaultSs->widgetRules) {
- stream << rules.widgetName;
+ stream << rules.classNameHash;
saveStyleRules(stream, &rules.styleRules);
saveStyleRules(stream, &rules.portraitRules);
saveStyleRules(stream, &rules.landscapeRules);
@@ -689,10 +695,10 @@
stream >> widgetstacks_count;
for (int stack = 0; stack < widgetstacks_count; stack++) {
// Create the widget stack if necessary
- QString widgetname;
- stream >> widgetname;
+ uint classNameHash;
+ stream >> classNameHash;
- HbCss::WidgetStyleRules rules(widgetname, sheet->memoryType);
+ HbCss::WidgetStyleRules rules(classNameHash, sheet->memoryType);
HbCss::WidgetStyleRules* addedStack = sheet->addWidgetStack(rules);
loadStyleRules(stream, addedStack->styleRules);
--- a/src/hbcore/cssparser/hblayeredstyleloader_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/cssparser/hblayeredstyleloader_p.h Fri May 14 16:09:54 2010 +0300
@@ -86,7 +86,7 @@
void variableRuleSets(QHash<QString, HbCss::Declaration> *variables) const;
private:
- QVector<LayerPriority> LayerList() const;
+ QList<LayerPriority> LayerList() const;
bool loadBinary(const QString& fileName,HbCss::StyleSheet *styleSheet);
bool saveBinary(const QString& fileName,HbCss::StyleSheet *styleSheet);
void saveDeclarations(QDataStream & stream,HbVector<HbCss::Declaration>* decls );
--- a/src/hbcore/cssparser/hbstyleselector_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/cssparser/hbstyleselector_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -24,7 +24,9 @@
****************************************************************************/
#include "hbstyleselector_p.h"
+#ifndef HB_BIN_CSS
#include <hbicon.h>
+#endif
#include <QObject>
#include <QGraphicsWidget>
#include <QMetaProperty>
@@ -72,8 +74,6 @@
}
AttributeValue aVal;
- aVal.mValue1 = QString();
- aVal.mValue2 = QString();
aVal.mEmptyValue = false;
QGraphicsWidget *widget = WIDGET(node);
@@ -105,8 +105,12 @@
} else if (value.type() == QVariant::Bool) {
aVal.mEmptyValue = !value.toBool();
} else if (value.userType() == QMetaType::type("HbIcon")) {
+#ifdef HB_BIN_CSS
+ aVal.mEmptyValue = true;
+#else
HbIcon icon = value.value<HbIcon>();
aVal.mEmptyValue = icon.isNull();
+#endif
}
const QMetaProperty metaProperty = metaObject->property(metaObject->indexOfProperty(attr.name.toLatin1()));
if (metaProperty.isEnumType()) {
--- a/src/hbcore/cssparser/hbwidgetstyleloader_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/cssparser/hbwidgetstyleloader_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -23,16 +23,16 @@
**
****************************************************************************/
-#include <hbstyle.h>
-
+#ifndef HB_BIN_CSS
#include "hbinstance_p.h"
+#include <hbstyle.h>
#include "hbstyle_p.h"
-
+#include "hbcolortheme_p.h"
+#endif
#include "hbwidgetstyleloader_p.h"
#include "hbwidgetloader_p.h"
#include "hblayeredstyleloader_p.h"
#include "hbstyleloader.h"
-#include "hbcolortheme_p.h"
#include "hbwidget.h"
//#define WIDGETSTYLELOADER_DEBUG
@@ -235,7 +235,9 @@
#endif
FileSet set(path, type, concern, priority);
mFileSets.append(set);
+ mFullyLoadedWidgets.clear();
+#ifndef HB_BIN_CSS
// Style can be null in hbInstance construction face.
if (HbInstancePrivate::d_ptr()->mStyle) {
HbInstancePrivate::d_ptr()->mStyle->d_func()->clearStyleSheetCaches();
@@ -244,6 +246,7 @@
|| concern == HbLayeredStyleLoader::Concern_All) {
HbColorTheme::instance()->flushVariableCache();
}
+#endif
#ifdef WIDGETSTYLELOADER_DEBUG
qDebug() << "WidgetStyleLoader now contains" << mFileSets.count() << "filters";
@@ -305,16 +308,18 @@
}
}
mFileSets.removeAt(i);
+#ifndef HB_BIN_CSS
if (HbInstancePrivate::d_ptr()->mStyle) {
HbInstancePrivate::d_ptr()->mStyle->d_func()->clearStyleSheetCaches();
}
if ( concern && (*concern == HbLayeredStyleLoader::Concern_Colors ||
*concern == HbLayeredStyleLoader::Concern_All)) {
- HbColorTheme *colorThemeInstance = HbColorTheme::instance();
+ HbColorTheme *colorThemeInstance = HbColorTheme::instance();
if (colorThemeInstance) { // Check that the instance has not been destroyed.
colorThemeInstance->flushVariableCache();
}
}
+#endif
}
#ifdef WIDGETSTYLELOADER_DEBUG
else {
@@ -345,6 +350,11 @@
if(!widget){
return;
}
+ const char *classNameChar = widget->metaObject()->className();
+ uint classNameHash = qHash(classNameChar);
+ if (mFullyLoadedWidgets.contains(classNameHash)) {
+ return;
+ }
#ifdef WIDGETSTYLELOADER_DEBUG
qDebug() << "loadCssForWidget called for " << widget->metaObject()->className();
#endif
@@ -420,6 +430,7 @@
}
}
}
+ mFullyLoadedWidgets.append(classNameHash);
}
@@ -436,6 +447,7 @@
\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
*/
+#ifndef HB_BIN_CSS
bool HbWidgetStyleLoader::loadWidgetML(HbWidget *widget, const QString &layoutName, const QString §ionName)
{
if(!widget){
@@ -482,32 +494,30 @@
#endif
}
- if ( attemptToLoad ) {
- static HbWidgetLoader loader;
+ if ( attemptToLoad ) {
+ static HbWidgetLoader loader;
#ifdef WIDGETSTYLELOADER_DEBUG
- qDebug() << "Attempting to load file " << filename;
+ qDebug() << "Attempting to load file " << filename;
#endif
HbMemoryManager::MemoryType type =
HbLayeredStyleLoader::sharingNeeded(mFileSets[c].priority)
? HbMemoryManager::SharedMemory
: HbMemoryManager::HeapMemory;
if(loader.load(widget, filename, layoutName, sectionName, type)) {
- loaded = true;
- break;
- }
+ loaded = true;
+ break;
+ }
+ }
+ meta = meta->superClass();
+ if(!meta){
+ break;
+ }
+ className = meta->className();
}
-
- meta = meta->superClass();
- if(!meta){
- break;
- }
- className = meta->className();
- }
}
-
- return loaded;
+ return loaded;
}
-
+#endif
/*!
For any filesets loaded with the given concern, the list of loaded CSS files is cleared causing
@@ -530,6 +540,7 @@
#endif
}
}
+ mFullyLoadedWidgets.clear();
}
@@ -557,4 +568,5 @@
#endif
}
}
+ mFullyLoadedWidgets.clear();
}
--- a/src/hbcore/cssparser/hbwidgetstyleloader_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/cssparser/hbwidgetstyleloader_p.h Fri May 14 16:09:54 2010 +0300
@@ -97,6 +97,7 @@
};
QList<FileSet> mFileSets;
+ QVector<uint> mFullyLoadedWidgets;
};
#endif // HBWIDGETSTYLELOADER_P_H
--- a/src/hbcore/decorators/decorators.pri Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/decorators/decorators.pri Fri May 14 16:09:54 2010 +0300
@@ -29,15 +29,10 @@
PRIVATE_HEADERS += $$PWD/hbbatteryindicator_p.h
PRIVATE_HEADERS += $$PWD/hbbatteryindicator_p_p.h
-PRIVATE_HEADERS += $$PWD/hbdecorator_p.h
-PRIVATE_HEADERS += $$PWD/hbdecorator_p_p.h
PRIVATE_HEADERS += $$PWD/hbindicatorgroup_p.h
PRIVATE_HEADERS += $$PWD/hbindicatorgroup_p_p.h
PRIVATE_HEADERS += $$PWD/hbsignalindicator_p.h
PRIVATE_HEADERS += $$PWD/hbsignalindicator_p_p.h
-PRIVATE_HEADERS += $$PWD/hbsoftkey_p.h
-PRIVATE_HEADERS += $$PWD/hbsoftkey_p_p.h
-PRIVATE_HEADERS += $$PWD/hbsoftkeygroup_p.h
PRIVATE_HEADERS += $$PWD/hbstatusbar_p.h
PRIVATE_HEADERS += $$PWD/hbstatusbar_p_p.h
PRIVATE_HEADERS += $$PWD/hbtitlebar_p.h
@@ -45,7 +40,7 @@
PRIVATE_HEADERS += $$PWD/hbtitlebarhandle_p.h
PRIVATE_HEADERS += $$PWD/hbtitlepane_p.h
PRIVATE_HEADERS += $$PWD/hbtitlepane_p_p.h
-PRIVATE_HEADERS += $$PWD/hbsysteminfo_p.h
+
PRIVATE_HEADERS += $$PWD/hbnavigationbutton_p.h
PRIVATE_HEADERS += $$PWD/hbnavigationbutton_p_p.h
PRIVATE_HEADERS += $$PWD/hbindicatorbutton_p.h
@@ -53,59 +48,13 @@
PRIVATE_HEADERS += $$PWD/hbindicatorleveliconitem_p.h
SOURCES += $$PWD/hbbatteryindicator.cpp
-SOURCES += $$PWD/hbdecorator.cpp
SOURCES += $$PWD/hbindicatorgroup.cpp
SOURCES += $$PWD/hbsignalindicator.cpp
-SOURCES += $$PWD/hbsoftkey.cpp
-SOURCES += $$PWD/hbsoftkeygroup.cpp
SOURCES += $$PWD/hbstatusbar.cpp
SOURCES += $$PWD/hbtitlebar.cpp
SOURCES += $$PWD/hbtitlebarhandle.cpp
SOURCES += $$PWD/hbtitlepane.cpp
-SOURCES += $$PWD/hbsysteminfo.cpp
+
SOURCES += $$PWD/hbnavigationbutton.cpp
SOURCES += $$PWD/hbindicatorbutton.cpp
SOURCES += $$PWD/hbindicatorleveliconitem.cpp
-
-symbian {
-PRIVATE_HEADERS += $$PWD/hbsysteminfo_sym_p_p.h
-PRIVATE_HEADERS += $$PWD/hbbatterymonitor_sym_p.h
-PRIVATE_HEADERS += $$PWD/hbnetworksignalmonitor_sym_p.h
-PRIVATE_HEADERS += $$PWD/hbindicatormonitor_sym_p.h
-PRIVATE_HEADERS += $$PWD/hbnetworkmodemonitor_sym_p.h
-SOURCES += $$PWD/hbsysteminfo_sym.cpp
-SOURCES += $$PWD/hbbatterymonitor_sym.cpp
-SOURCES += $$PWD/hbnetworksignalmonitor_sym.cpp
-SOURCES += $$PWD/hbindicatormonitor_sym.cpp
-SOURCES += $$PWD/hbnetworkmodemonitor_sym.cpp
-
-LIBS += -letel3rdparty \
- -lsysutil \
- -lefsrv \
- -lfeatdiscovery \
- -letelmm \
- -letel
-}
-
-win32* {
-PRIVATE_HEADERS += $$PWD/hbsysteminfo_win_p_p.h
-PRIVATE_HEADERS += $$PWD/hbwmihelper_win_p.h
-SOURCES += $$PWD/hbsysteminfo_win.cpp
-SOURCES += $$PWD/hbwmihelper_win.cpp
-
-!win32-g++ {
-LIBS += Ole32.lib \
- Strmiids.lib \
- Bthprops.lib \
- User32.lib \
- Gdi32.lib \
- Ws2_32.lib \
- Wbemuuid.lib \
- Oleaut32.lib
-}
-}
-
-unix:!symbian {
-PRIVATE_HEADERS += $$PWD/hbsysteminfo_linux_p_p.h
-SOURCES += $$PWD/hbsysteminfo_linux.cpp
-}
--- a/src/hbcore/decorators/hbbatteryindicator.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/decorators/hbbatteryindicator.cpp Fri May 14 16:09:54 2010 +0300
@@ -34,8 +34,7 @@
\brief HbBatteryIndicator represents a battery indicator item.
The battery indicator shows approximately how much charge is left in the battery of the device.
- It is created and managed by the HbIndicatorGroup which in turn is part of the HbMainWindow's
- HbDecoratorGroup.
+ It is created and managed by the HbStatusBar which in turn is part of the HbMainWindow.
*/
// 0-33% for low, 34-66% for medium and 67-100% for high
@@ -46,23 +45,28 @@
mBatteryBackgroundIcon(0),
mBatteryLevelIcon(0),
mBatteryIcon(0),
- mSystemDeviceInfo(new HbSystemDeviceInfo()),
+#ifdef HB_HAVE_QT_MOBILITY
+ mSystemDeviceInfo(new HbSystemInfo(0, false)),
+#endif // HB_HAVE_QT_MOBILITY
mChargingOn(false)
{
}
HbBatteryIndicatorPrivate::~HbBatteryIndicatorPrivate()
{
+#ifdef HB_HAVE_QT_MOBILITY
delete mSystemDeviceInfo;
+#endif // HB_HAVE_QT_MOBILITY
}
/*
Handles signal for changing the power state.
*/
-void HbBatteryIndicatorPrivate::_q_setPowerState(HbSystemDeviceInfo::PowerState powerState)
+#ifdef HB_HAVE_QT_MOBILITY
+void HbBatteryIndicatorPrivate::_q_setPowerState(QSystemDeviceInfo::PowerState powerState)
{
Q_Q(HbBatteryIndicator);
- if (powerState == HbSystemDeviceInfo::WallPowerChargingBattery) {
+ if (powerState == QSystemDeviceInfo::WallPowerChargingBattery) {
q->setLevel(0);
mChargingOn = true;
if (mChargingTimer.isActive()) {
@@ -75,6 +79,7 @@
q->setLevel(mSystemDeviceInfo->batteryLevel());
}
}
+#endif // HB_HAVE_QT_MOBILITY
// ======== MEMBER FUNCTIONS ========
@@ -86,6 +91,14 @@
: HbWidget(*new HbBatteryIndicatorPrivate, parent)
{
createPrimitives();
+ updatePrimitives();
+
+#ifdef HB_HAVE_QT_MOBILITY
+ Q_D(HbBatteryIndicator);
+ connect(d->mSystemDeviceInfo, SIGNAL(batteryLevelChanged(int)), this, SLOT(setLevel(int)));
+ connect(d->mSystemDeviceInfo, SIGNAL(powerStateChanged(QSystemDeviceInfo::PowerState)), this,
+ SLOT(_q_setPowerState(QSystemDeviceInfo::PowerState)));
+#endif // HB_HAVE_QT_MOBILITY
}
/*
@@ -101,10 +114,7 @@
*/
void HbBatteryIndicator::delayedConstruction()
{
- Q_D(HbBatteryIndicator);
- connect(d->mSystemDeviceInfo, SIGNAL(batteryLevelChanged(int)), this, SLOT(setLevel(int)));
- connect(d->mSystemDeviceInfo, SIGNAL(powerStateChanged(HbSystemDeviceInfo::PowerState)), this,
- SLOT(_q_setPowerState(HbSystemDeviceInfo::PowerState)));
+
}
void HbBatteryIndicator::createPrimitives()
@@ -156,7 +166,10 @@
Q_D(HbBatteryIndicator);
if (event->timerId() == d->mChargingTimer.timerId()) {
int step(4);
- int currentLevel = d->mSystemDeviceInfo->batteryLevel();
+ int currentLevel(0);
+#ifdef HB_HAVE_QT_MOBILITY
+ currentLevel = d->mSystemDeviceInfo->batteryLevel();
+#endif // HB_HAVE_QT_MOBILITY
if (currentLevel < batteryThreshold[0]) {
currentLevel = batteryThreshold[0] - 1;
step = 2;
--- a/src/hbcore/decorators/hbbatteryindicator_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/decorators/hbbatteryindicator_p.h Fri May 14 16:09:54 2010 +0300
@@ -65,7 +65,9 @@
Q_DECLARE_PRIVATE_D(d_ptr, HbBatteryIndicator)
Q_DISABLE_COPY(HbBatteryIndicator)
- Q_PRIVATE_SLOT(d_func(), void _q_setPowerState(HbSystemDeviceInfo::PowerState))
+#ifdef HB_HAVE_QT_MOBILITY
+ Q_PRIVATE_SLOT(d_func(), void _q_setPowerState(QSystemDeviceInfo::PowerState))
+#endif // HB_HAVE_QT_MOBILITY
};
#endif // HBBATTERYINDICATOR_H
--- a/src/hbcore/decorators/hbbatteryindicator_p_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/decorators/hbbatteryindicator_p_p.h Fri May 14 16:09:54 2010 +0300
@@ -28,7 +28,9 @@
#include <hbwidget_p.h>
#include "hbbatteryindicator_p.h"
-#include "hbsysteminfo_p.h"
+#ifdef HB_HAVE_QT_MOBILITY
+#include <hbsysteminfo_p.h>
+#endif // HB_HAVE_QT_MOBILITY
class HbBatteryIndicatorPrivate : public HbWidgetPrivate
{
@@ -37,16 +39,18 @@
public:
HbBatteryIndicatorPrivate();
virtual ~HbBatteryIndicatorPrivate();
-
- void _q_setPowerState(HbSystemDeviceInfo::PowerState powerState);
-
+#ifdef HB_HAVE_QT_MOBILITY
+ void _q_setPowerState(QSystemDeviceInfo::PowerState powerState);
+#endif // HB_HAVE_QT_MOBILITY
private:
int mLevelPercent;
QGraphicsItem *mBatteryBackgroundIcon;
QGraphicsItem *mBatteryLevelIcon;
QGraphicsItem *mBatteryIcon;
- HbSystemDeviceInfo* mSystemDeviceInfo;
+#ifdef HB_HAVE_QT_MOBILITY
+ HbSystemInfo *mSystemDeviceInfo;
+#endif // HB_HAVE_QT_MOBILITY
QBasicTimer mChargingTimer;
bool mChargingOn;
--- a/src/hbcore/decorators/hbbatterymonitor_sym.cpp Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +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 "hbbatterymonitor_sym_p.h"
-
-CBatteryMonitor::~CBatteryMonitor()
-{
- Cancel();
- delete iTelephony;
-}
-
-void CBatteryMonitor::ConstructL()
-{
- iTelephony = CTelephony::NewL();
- iTelephony->GetBatteryInfo(iStatus, iBatteryInfoV1Pckg);
- SetActive();
-}
-
-CBatteryMonitor::CBatteryMonitor(MBatteryObserver& aObserver)
- : CActive(EPriorityStandard), iObserver(aObserver), iBatteryInfoV1Pckg(iBatteryInfoV1)
-{
- CActiveScheduler::Add(this);
-}
-
-TUint CBatteryMonitor::batteryLevel() const
-{
- return iBatteryInfoV1.iChargeLevel;
-}
-
-void CBatteryMonitor::RunL()
-{
- if (iStatus.Int() == KErrNone) {
- iTelephony->NotifyChange(iStatus, CTelephony::EBatteryInfoChange, iBatteryInfoV1Pckg);
- SetActive();
- iObserver.BatteryLevelL(iBatteryInfoV1.iChargeLevel, iBatteryInfoV1.iStatus);
- }
-}
-
-void CBatteryMonitor::DoCancel()
-{
- iTelephony->CancelAsync(CTelephony::EBatteryInfoChangeCancel);
-}
--- a/src/hbcore/decorators/hbbatterymonitor_sym_p.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +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 HBBATTERYMONITOR_H
-#define HBBATTERYMONITOR_H
-
-#include <etel3rdparty.h>
-
-class MBatteryObserver
- {
- public:
- virtual void BatteryLevelL( TUint aChargeLevel,
- CTelephony::TBatteryStatus aBatteryStatus ) = 0;
- };
-
-class CBatteryMonitor : public CActive
- {
-public:
- CBatteryMonitor( MBatteryObserver& aObserver );
- void ConstructL();
- ~CBatteryMonitor();
-
- TUint batteryLevel() const;
-
-private:
- void RunL();
- void DoCancel();
-
-private:
- MBatteryObserver& iObserver;
- CTelephony* iTelephony;
- CTelephony::TBatteryInfoV1 iBatteryInfoV1;
- CTelephony::TBatteryInfoV1Pckg iBatteryInfoV1Pckg;
- };
-
-#endif /* HBBATTERYMONITOR_H */
--- a/src/hbcore/decorators/hbdecorator.cpp Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,235 +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 <QGraphicsSceneMouseEvent>
-
-#include "hbdecorator_p.h"
-#include "hbdecorator_p_p.h"
-#include "hbstyleoptiondecorator.h"
-#include "hbmainwindow_p.h"
-#include "hbview.h"
-
-/*
- \class HbDecorator
- \brief HbDecorator is the base class for common decorators. Decorators are
- components that are always available even if the view contents change.
-
- HbDecorator class is a base class for all decorators. This class defines the available decorator
- types:
-
- enum DecoratorType
- {
- SoftKey,
- Indicator,
- TitlePane,
- NaviPane
-
- HbDecorator offers a simple interface for showing, hiding and updating a decorator.
- Even though this is not an abstract API it is meant to be derived and does not have much
- use as is.
-
- For more information please see the documentation of the implemented decorators (from the
- inheritance diagram).
-
- Typically decorators are created by using HbDecoratorGroup.
-
- \sa HbDecoratorGroup
-
- */
-
-HbDecoratorPrivate::HbDecoratorPrivate()
- : mMode(QIcon::Normal)
-{
-//#ifdef HB_EFFECTS
-// HbEffect::add("decorator", "decorator_pressed", "pressed");
-// HbEffect::add("decorator", "decorator_released", "released");
-// HbEffect::add("decorator", "decorator_latched", "latched");
-//#endif
-}
-
-void HbDecoratorPrivate::init(HbDecorator::DecoratorType type)
-{
- mType = type;
-}
-
-/*
- Constructor, the decorator \a type is required as a parameter.
- The \a parent is an optional parameter.
-*/
-HbDecorator::HbDecorator(DecoratorType type, QGraphicsItem *parent)
- : HbWidget(*new HbDecoratorPrivate, parent)
-{
- Q_D(HbDecorator);
- d->init(type);
- setFocusPolicy(Qt::ClickFocus);
-}
-
-HbDecorator::HbDecorator(HbDecoratorPrivate &dd, DecoratorType type, QGraphicsItem *parent)
- : HbWidget(dd, parent)
-{
- Q_D(HbDecorator);
- d->init(type);
- setFocusPolicy(Qt::ClickFocus);
-}
-
-/*
- Destructor.
- */
-HbDecorator::~HbDecorator()
-{
-}
-
-
-/*
- \a property HbDecorator::decoratorType
- \brief This property holds the decorator type
- */
-HbDecorator::DecoratorType HbDecorator::decoratorType() const
-{
- Q_D(const HbDecorator);
- return d->mType;
-}
-
-/*
- Resets icon mode
-*/
-void HbDecorator::resetMode()
-{
- Q_D(HbDecorator);
- d->mMode = QIcon::Normal;
-#ifdef HB_EFFECTS
- HbEffect::start(this, "decorator", "released");
-#endif
-}
-
-/*
- \reimp
-*/
-QVariant HbDecorator::itemChange(GraphicsItemChange change, const QVariant & value)
-{
- switch( change ) {
- case ItemVisibleHasChanged:
- {
- Q_D(const HbDecorator);
- if ( d->polished ) {
- // Cannot emit signals directly from "visibilityChanged", since it might
- // lead to e.g. item deletion that's not allowed in "itemChange".
- // Using QMetaObject to emit the signal asynchronously.
- QMetaObject::invokeMethod(this, "visibilityChanged", Qt::QueuedConnection);
- }
- break;
- }
- default:
- break;
- }
- return HbWidget::itemChange( change, value );
-}
-
-void HbDecorator::initStyleOption(HbStyleOptionDecorator *option) const
-{
- Q_D(const HbDecorator);
- HbWidget::initStyleOption(option);
-
- option->mode = d->mMode;
- if (mainWindow() && mainWindow()->currentView()) {
- if (mainWindow()->currentView()->titleBarFlags() & HbView::TitleBarTransparent) {
- option->transparent = true;
- }
- }
-}
-
-/*
- \reimp
- */
-void HbDecorator::mousePressEvent(QGraphicsSceneMouseEvent *event)
-{
- Q_D(HbDecorator);
- Q_UNUSED( event );
- d->mMode = QIcon::Active;
- updatePrimitives();
-#ifdef HB_EFFECTS
- if (boundingRect().contains(event->pos())) {
- HbEffect::start(this, "decorator", "pressed");
- }
-#endif
-}
-
-/*
- \reimp
- */
-void HbDecorator::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
-{
- Q_D(HbDecorator);
-
- if (boundingRect().contains(event->pos())) {
- d->mMode = QIcon::Selected;
- updatePrimitives();
-#ifdef HB_EFFECTS
- if (boundingRect().contains(event->pos())) {
- HbEffect::start(this, "decorator", "latched");
- }
-#endif
- } else {
- d->mMode = QIcon::Normal;
- updatePrimitives();
-#ifdef HB_EFFECTS
- if (boundingRect().contains(event->pos())) {
- HbEffect::start(this, "decorator", "released");
- }
-#endif
- }
-}
-
-/*
- \reimp
- */
-void HbDecorator::mouseMoveEvent(QGraphicsSceneMouseEvent * event)
-{
- Q_D(HbDecorator);
-
- if (boundingRect().contains(event->pos())) {
- if (d->mMode != QIcon::Active) {
- d->mMode = QIcon::Active;
- updatePrimitives();
- }
-
- } else {
- if (d->mMode != QIcon::Normal) {
- d->mMode = QIcon::Normal;
- updatePrimitives();
- }
- }
-}
-
-/*
- \reimp
- */
-void HbDecorator::changeEvent(QEvent* event)
-{
- if (event->type() == QEvent::LayoutDirectionChange) {
- updatePrimitives();
- }
- HbWidget::changeEvent(event);
-}
--- a/src/hbcore/decorators/hbdecorator_p.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +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 HBDECORATOR_H
-#define HBDECORATOR_H
-
-#include "hbnamespace_p.h"
-#include <hbnamespace.h>
-#include <hbwidget.h>
-
-class HbDecoratorPrivate;
-class HbStyleOptionDecorator;
-
-class HB_CORE_PRIVATE_EXPORT HbDecorator : public HbWidget
-{
- Q_OBJECT
- Q_PROPERTY(DecoratorType decoratorType READ decoratorType)
-
-public:
- /*
- LibHb's predefined set of decorators.
-
- This enum describes different decorator types available in LibHb.
- */
- enum DecoratorType
- {
- SoftKey, /*!< A soft key decorator. */
- Indicator, /*!< An indicator decorator. */
- TitlePane, /*!< A title pane decorator. */
- NaviPane, /*!< A navi pane decorator. */
- };
-
- explicit HbDecorator(DecoratorType type, QGraphicsItem *parent = 0);
- virtual ~HbDecorator();
-
- DecoratorType decoratorType() const;
-
- enum { Type = HbPrivate::ItemType_Decorator };
- int type() const { return Type; }
-
- void resetMode();
-
-signals:
- void launchPopup(const QPointF &pos);
- void visibilityChanged();
-
-protected:
- HbDecorator(HbDecoratorPrivate &dd, DecoratorType type, QGraphicsItem *parent=0);
- QVariant itemChange(GraphicsItemChange change, const QVariant &value);
- void initStyleOption(HbStyleOptionDecorator *option) const;
- void mousePressEvent(QGraphicsSceneMouseEvent *event);
- void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
- void mouseMoveEvent(QGraphicsSceneMouseEvent * event);
- void changeEvent(QEvent* event);
-private:
- Q_DECLARE_PRIVATE_D(d_ptr, HbDecorator)
- Q_DISABLE_COPY(HbDecorator)
-};
-
-#endif // HBDECORATOR_H
--- a/src/hbcore/decorators/hbdecorator_p_p.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbCore module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#ifndef HBDECORATOR_H_H
-#define HBDECORATOR_H_H
-
-#include <hbdecorator_p.h>
-#include <hbwidget_p.h>
-
-class HbDecoratorPrivate : public HbWidgetPrivate
-{
- Q_DECLARE_PUBLIC(HbDecorator)
-
-public:
- HbDecoratorPrivate();
-
- void init(HbDecorator::DecoratorType type);
-
- HbDecorator::DecoratorType mType;
- QIcon::Mode mMode;
-};
-
-
-#endif // HBDECORATOR_H_H
-
--- a/src/hbcore/decorators/hbindicatorbutton.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/decorators/hbindicatorbutton.cpp Fri May 14 16:09:54 2010 +0300
@@ -31,18 +31,25 @@
#include "hbindicatorbutton_p.h"
#include "hbindicatorbutton_p_p.h"
-#include "hbstyleoptionindicatorbutton.h"
+#include "hbstyleoptionindicatorbutton_p.h"
+
+#if defined(Q_OS_SYMBIAN)
+#include "hbindicatorsym_p.h"
+#else
+#include "hbindicatorwin32_p.h"
+#endif // defined(Q_OS_SYMBIAN)
static const char noteIndicatorType[] = {"com.nokia.hb.indicatormenu/1.0"};
-HbIndicatorButtonPrivate::HbIndicatorButtonPrivate()
+HbIndicatorButtonPrivate::HbIndicatorButtonPrivate() :
+ handleIcon(0), defaultAction(0), newEventAction(0), deviceDialog(0)
{
}
HbIndicatorButtonPrivate::~HbIndicatorButtonPrivate()
{
-
+ delete deviceDialog;
}
void HbIndicatorButtonPrivate::init()
@@ -52,13 +59,66 @@
void HbIndicatorButtonPrivate::showIndicatorMenu()
{
- //HbDeviceDialog *deviceDialog = new HbDeviceDialog();
+ if (mIndicators.count() > 0) {
+ QVariantMap parametersMap;
+ QString noteType(noteIndicatorType);
+
+ parametersMap.clear();
+ deviceDialog->show(noteType, parametersMap);
+ }
+}
+
+void HbIndicatorButtonPrivate::addIndicators(const QList<IndicatorClientInfo> &clientInfo)
+{
+ for (int i = 0; i < clientInfo.size(); ++i) {
+ if (clientInfo.at(i).hasMenuData) {
+ mIndicators.prepend(clientInfo.at(i));
+ }
+ }
+
+ updateIcon();
+}
+
+void HbIndicatorButtonPrivate::removeIndicators(const QList<IndicatorClientInfo> &clientInfo)
+{
+ for (int i = 0; i < clientInfo.size(); ++i) {
+ int index = findIndicator(clientInfo.at(i));
+ if (index >= 0) {
+ mIndicators.removeAt(index);
+ }
+ }
- QVariantMap parametersMap;
- QString noteType(noteIndicatorType);
+ updateIcon();
+}
+
+int HbIndicatorButtonPrivate::findIndicator(const IndicatorClientInfo &indicator) const
+{
+ int index = -1;
+ for (int i = 0; i < mIndicators.size(); ++i) {
+ if (mIndicators.at(i).type == indicator.type) {
+ index = i;
+ break;
+ }
+ }
+ return index;
+}
- parametersMap.clear();
- deviceDialog->show(noteType, parametersMap);
+void HbIndicatorButtonPrivate::updateIcon()
+{
+ Q_Q(HbIndicatorButton);
+ bool newEvent(false);
+ for (int i = 0; i < mIndicators.size(); ++i) {
+ if (mIndicators.at(i).category == HbIndicatorInterface::NotificationCategory
+ || mIndicators.at(i).category == HbIndicatorInterface::ProgressCategory) {
+ newEvent = true;
+ break;
+ }
+ }
+ if (newEvent) {
+ q->setAction(newEventAction);
+ } else {
+ q->setAction(defaultAction);
+ }
}
HbIndicatorButton::HbIndicatorButton(QGraphicsItem *parent)
@@ -67,6 +127,11 @@
Q_D(HbIndicatorButton);
d->init();
+ // add default actions
+ d->defaultAction = new HbAction(HbIcon("qtg_mono_options_menu"), "IndicatorMenu", this);
+ d->newEventAction = new HbAction(HbIcon("qtg_mono_new_event"), "IndicatorMenu", this);
+ setAction(d->defaultAction);
+
createPrimitives();
}
@@ -78,15 +143,11 @@
void HbIndicatorButton::delayedConstruction()
{
Q_D(HbIndicatorButton);
- // add default actions
- d->defaultAction = new HbAction(HbIcon("qtg_mono_options_menu"), "IndicatorMenu", this);
- d->notificationAction = new HbAction(HbIcon("qtg_mono_new_event"), "IndicatorMenu", this);
- setAction(d->defaultAction);
connect(this, SIGNAL(pressed()), this, SLOT(handlePress()));
connect(this, SIGNAL(released()), this, SLOT(handleRelease()));
- d->deviceDialog = new HbDeviceDialog();
+ d->deviceDialog = new HbDeviceDialog(HbDeviceDialog::ImmediateResourceReservationFlag);
}
void HbIndicatorButton::showHandleIndication(bool show)
@@ -108,6 +169,7 @@
{
Q_D(HbIndicatorButton);
d->handleIcon = style()->createPrimitive(HbStyle::P_IndicatorButton_handleindication, this);
+ d->handleIcon->setVisible(false);
setBackgroundItem(HbStyle::P_IndicatorButton_background); // calls updatePrimitives()
}
@@ -121,14 +183,16 @@
HbToolButton::updatePrimitives();
}
-void HbIndicatorButton::setIcon(int count)
+void HbIndicatorButton::activate(const QList<IndicatorClientInfo> &clientInfo)
{
Q_D(HbIndicatorButton);
- if (count == 0) {
- setAction(d->defaultAction);
- } else {
- setAction(d->notificationAction);
- }
+ d->addIndicators(clientInfo);
+}
+
+void HbIndicatorButton::deactivate(const QList<IndicatorClientInfo> &clientInfo)
+{
+ Q_D(HbIndicatorButton);
+ d->removeIndicators(clientInfo);
}
void HbIndicatorButton::initStyleOption(HbStyleOptionIndicatorButton *option) const
--- a/src/hbcore/decorators/hbindicatorbutton_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/decorators/hbindicatorbutton_p.h Fri May 14 16:09:54 2010 +0300
@@ -31,6 +31,7 @@
class HbIndicatorButtonPrivate;
class HbStyleOptionIndicatorButton;
+struct IndicatorClientInfo;
class HB_CORE_PRIVATE_EXPORT HbIndicatorButton : public HbToolButton
{
@@ -51,7 +52,8 @@
public slots:
virtual void createPrimitives();
virtual void updatePrimitives();
- void setIcon(int count);
+ void activate(const QList<IndicatorClientInfo> &clientInfo);
+ void deactivate(const QList<IndicatorClientInfo> &clientInfo);
protected:
virtual void initStyleOption(HbStyleOptionIndicatorButton *option) const;
--- a/src/hbcore/decorators/hbindicatorbutton_p_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/decorators/hbindicatorbutton_p_p.h Fri May 14 16:09:54 2010 +0300
@@ -40,13 +40,20 @@
void init();
void showIndicatorMenu();
+ void addIndicators(const QList<IndicatorClientInfo> &clientInfo);
+ void removeIndicators(const QList<IndicatorClientInfo> &clientInfo);
+ int findIndicator(const IndicatorClientInfo &indicator) const;
+ void updateIcon();
+
private:
QGraphicsItem *handleIcon;
HbAction *defaultAction;
- HbAction *notificationAction;
+ HbAction *newEventAction;
HbDeviceDialog *deviceDialog;
+
+ QList<IndicatorClientInfo> mIndicators;
};
#endif // HBINDICATORBUTTON_P_P_H
--- a/src/hbcore/decorators/hbindicatorgroup.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/decorators/hbindicatorgroup.cpp Fri May 14 16:09:54 2010 +0300
@@ -23,11 +23,11 @@
**
****************************************************************************/
-#include <QTimer>
+#include <hbiconanimationmanager.h>
#include "hbindicatorgroup_p.h"
#include "hbindicatorgroup_p_p.h"
-#include "hbstyleoptionindicatorgroup.h"
+#include "hbstyleoptionindicatorgroup_p.h"
#include "hbiconitem.h"
@@ -39,30 +39,17 @@
HbIndicatorGroupPrivate::HbIndicatorGroupPrivate() :
mIndicatorType(HbIndicatorGroup::NotificationType),
- mIndicatorPrivate(0), mProgressAdded(false), mIndicatorAdded(false)
+ mProgressAdded(false), mIndicatorAdded(false), mProgressAnimationFound(false)
{
}
HbIndicatorGroupPrivate::~HbIndicatorGroupPrivate()
{
- mIndicatorPrivate->stopListen();
- delete mIndicatorPrivate;
-
mIndicators.clear();
}
void HbIndicatorGroupPrivate::delayedConstruction()
{
- Q_Q(HbIndicatorGroup);
- q->connect(mIndicatorPrivate, SIGNAL(activated(const QList<IndicatorClientInfo> &)),
- q, SLOT(activate(const QList<IndicatorClientInfo> &)));
- q->connect(mIndicatorPrivate, SIGNAL(updated(const QList<IndicatorClientInfo> &)),
- q, SLOT(update(const QList<IndicatorClientInfo> &)));
- q->connect(mIndicatorPrivate, SIGNAL(allActivated(const QList<IndicatorClientInfo> &)),
- q, SLOT(activateAll(const QList<IndicatorClientInfo> &)));
- q->connect(mIndicatorPrivate, SIGNAL(deactivated(const QList<IndicatorClientInfo> &)),
- q, SLOT(deactivate(const QList<IndicatorClientInfo> &)));
-
#ifdef HB_EFFECTS
HbEffect::add(
QStringList() << "indicator" << "indicator" << "indicator" << "indicator",
@@ -70,16 +57,13 @@
QStringList() << "appear" << "disappear" << "move_right" << "move_left");
#endif
- QTimer::singleShot(0, q, SLOT(startListen()));
+ mProgressAnimationFound = HbIconAnimationManager::global()->addDefinitionFile("qtg_status_progress.axml");
}
void HbIndicatorGroupPrivate::init()
{
Q_Q(HbIndicatorGroup);
q->createPrimitives();
-
- mIndicatorPrivate = new HbIndicatorPrivate;
- mIndicatorPrivate->init();
}
int HbIndicatorGroupPrivate::setIconName(HbStyleOptionIndicatorGroup &option, int index)
@@ -96,7 +80,11 @@
if (mIndicators.count() > index) {
if (mIndicators.at(index).category == HbIndicatorInterface::ProgressCategory) {
if (!mProgressAdded) {
- option.iconName = "qtg_status_progress";
+ if (mProgressAnimationFound) {
+ option.iconName = "qtg_status_progress";
+ } else {
+ option.iconName = "qtg_status_progress_1";
+ }
mProgressAdded = true;
}
} else {
@@ -117,7 +105,6 @@
mIndicatorAdded = true;
}
}
- emitNotificationCount();
}
void HbIndicatorGroupPrivate::updateIndicators(const QList<IndicatorClientInfo> &clientInfo)
@@ -136,7 +123,6 @@
for (int i = 0; i < clientInfo.size(); ++i) {
removeIndicator(clientInfo.at(i));
}
- emitNotificationCount();
}
int HbIndicatorGroupPrivate::findIndicator(const IndicatorClientInfo &indicator) const
@@ -156,7 +142,11 @@
int index = findIndicator(indicator);
if (index >= 0) {
if (mIndicators.at(index).category == HbIndicatorInterface::ProgressCategory) {
- mRemovedIndicators.append("qtg_status_progress");
+ if (mProgressAnimationFound) {
+ mRemovedIndicators.append("qtg_status_progress");
+ } else {
+ mRemovedIndicators.append("qtg_status_progress_1");
+ }
} else {
mRemovedIndicators.append(mIndicators.at(index).iconPath);
}
@@ -185,14 +175,6 @@
return canAdd;
}
-void HbIndicatorGroupPrivate::emitNotificationCount()
-{
- Q_Q(HbIndicatorGroup);
- if (mIndicatorType == HbIndicatorGroup::NotificationType) {
- emit q->notificationCountChanged(mIndicators.size());
- }
-}
-
void HbIndicatorGroupPrivate::startAddingEffect()
{
#ifdef HB_EFFECTS
@@ -364,19 +346,6 @@
}
}
-void HbIndicatorGroup::startListen()
-{
- Q_D(HbIndicatorGroup);
- d->mIndicatorPrivate->startListen();
-
-#ifdef HB_EFFECTS
- HbEffect::add(
- QStringList() << "indicator" << "indicator" << "indicator" << "indicator",
- QStringList() << "indicator_appear" << "indicator_disappear" << "indicator_move_right" << "indicator_move_left",
- QStringList() << "appear" << "disappear" << "move_right" << "move_left");
-#endif
-}
-
void HbIndicatorGroup::initStyleOption(HbStyleOptionIndicatorGroup *option) const
{
HbWidget::initStyleOption(option);
--- a/src/hbcore/decorators/hbindicatorgroup_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/decorators/hbindicatorgroup_p.h Fri May 14 16:09:54 2010 +0300
@@ -65,11 +65,6 @@
void activateAll(const QList<IndicatorClientInfo> &clientInfo);
void deactivate(const QList<IndicatorClientInfo> &clientInfo);
- void startListen();
-
-signals:
- void notificationCountChanged(int count);
-
protected:
virtual void initStyleOption(HbStyleOptionIndicatorGroup *option) const;
--- a/src/hbcore/decorators/hbindicatorgroup_p_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/decorators/hbindicatorgroup_p_p.h Fri May 14 16:09:54 2010 +0300
@@ -29,8 +29,6 @@
#include <hbwidget_p.h>
#include "hbindicatorgroup_p.h"
-class HbIndicatorPrivate;
-
class HbIndicatorGroupPrivate : public HbWidgetPrivate
{
Q_DECLARE_PUBLIC(HbIndicatorGroup)
@@ -53,8 +51,6 @@
bool canAddIndicator(const IndicatorClientInfo &indicator) const;
- void emitNotificationCount();
-
void startAddingEffect();
void startRemovingEffect();
@@ -63,12 +59,12 @@
private:
HbIndicatorGroup::IndicatorType mIndicatorType;
QList<QGraphicsItem*> mIcons;
- HbIndicatorPrivate *mIndicatorPrivate;
QList<IndicatorClientInfo> mIndicators;
bool mProgressAdded;
bool mIndicatorAdded;
QList<QPointF> mOriginalPos;
- QStringList mRemovedIndicators;
+ QStringList mRemovedIndicators;
+ bool mProgressAnimationFound;
};
#endif // HBINDICATORGROUP_P_P_H
--- a/src/hbcore/decorators/hbindicatormonitor_sym.cpp Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +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 "hbindicatormonitor_sym_p.h"
-
-CIndicatorMonitor::~CIndicatorMonitor()
-{
- Cancel();
- delete iTelephony;
-}
-
-void CIndicatorMonitor::ConstructL()
-{
- iTelephony = CTelephony::NewL();
- iTelephony->GetIndicator(iStatus, iIndicatorV1Pckg);
- SetActive();
-}
-
-CIndicatorMonitor::CIndicatorMonitor(MIndicatorObserver& aObserver)
- : CActive(EPriorityStandard), iObserver(aObserver), iIndicatorV1Pckg(iIndicatorV1)
-{
- CActiveScheduler::Add(this);
-}
-
-void CIndicatorMonitor::RunL()
-{
- if (iStatus.Int() == KErrNone) {
- iTelephony->NotifyChange(iStatus, CTelephony::EIndicatorChange, iIndicatorV1Pckg);
- SetActive();
- iObserver.ChargerConnected(iIndicatorV1.iIndicator & CTelephony::KIndChargerConnected);
- }
-}
-
-void CIndicatorMonitor::DoCancel()
-{
- iTelephony->CancelAsync(CTelephony::EIndicatorChangeCancel);
-}
--- a/src/hbcore/decorators/hbindicatormonitor_sym_p.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbCore module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#ifndef HBINDICATORMONITOR_H
-#define HBINDICATORMONITOR_H
-
-#include <etel3rdparty.h>
-
-class MIndicatorObserver
- {
-public:
- virtual void ChargerConnected(TUint32 state) = 0;
- };
-
-class CIndicatorMonitor : public CActive
- {
-public:
- CIndicatorMonitor(MIndicatorObserver& aObserver);
- void ConstructL();
- ~CIndicatorMonitor();
-
-private:
- void RunL();
- void DoCancel();
-
-private:
- MIndicatorObserver& iObserver;
- CTelephony* iTelephony;
- CTelephony::TIndicatorV1 iIndicatorV1;
- CTelephony::TIndicatorV1Pckg iIndicatorV1Pckg;
- };
-
-#endif /* HBINDICATORMONITOR_H */
--- a/src/hbcore/decorators/hbnavigationbutton.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/decorators/hbnavigationbutton.cpp Fri May 14 16:09:54 2010 +0300
@@ -30,7 +30,7 @@
#include "hbnavigationbutton_p.h"
#include "hbnavigationbutton_p_p.h"
-#include "hbstyleoptionnavigationbutton.h"
+#include "hbstyleoptionnavigationbutton_p.h"
#include "hbmainwindow_p.h"
HbNavigationButtonPrivate::HbNavigationButtonPrivate()
--- a/src/hbcore/decorators/hbnetworkmodemonitor_sym.cpp Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +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 "hbnetworkmodemonitor_sym_p.h"
-
-CNetworkModeMonitor::~CNetworkModeMonitor()
-{
- Cancel();
- delete iTelephony;
-}
-
-void CNetworkModeMonitor::ConstructL()
-{
- iTelephony = CTelephony::NewL();
- iTelephony->GetCurrentNetworkInfo(iStatus, iNetworkInfoV1Pckg);
- SetActive();
-}
-
-CNetworkModeMonitor::CNetworkModeMonitor(MNetworkModeObserver& aObserver)
- : CActive(EPriorityStandard), iObserver(aObserver), iNetworkInfoV1Pckg(iNetworkInfoV1)
-{
- CActiveScheduler::Add(this);
-}
-
-CTelephony::TNetworkMode CNetworkModeMonitor::networkMode() const
-{
- return iNetworkInfoV1.iMode;
-}
-
-void CNetworkModeMonitor::RunL()
-{
- if (iStatus.Int() == KErrNone) {
- iTelephony->NotifyChange(iStatus, CTelephony::ECurrentNetworkInfoChange, iNetworkInfoV1Pckg);
- SetActive();
- iObserver.NetWorkModeChanged(iNetworkInfoV1.iMode);
- }
-}
-
-void CNetworkModeMonitor::DoCancel()
-{
- iTelephony->CancelAsync(CTelephony::ECurrentNetworkInfoChangeCancel);
-}
--- a/src/hbcore/decorators/hbnetworkmodemonitor_sym_p.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +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 HBNETWORKMODEMONITOR_H
-#define HBNETWORKMODEMONITOR_H
-
-#include <etel3rdparty.h>
-
-class MNetworkModeObserver
- {
- public:
- virtual void NetWorkModeChanged(CTelephony::TNetworkMode aMode) = 0;
- };
-
-class CNetworkModeMonitor : public CActive
- {
-public:
- CNetworkModeMonitor(MNetworkModeObserver& aObserver);
- void ConstructL();
- ~CNetworkModeMonitor();
-
- CTelephony::TNetworkMode networkMode() const;
-
-private:
- void RunL();
- void DoCancel();
-
-private:
- MNetworkModeObserver& iObserver;
- CTelephony* iTelephony;
- CTelephony::TNetworkInfoV1 iNetworkInfoV1;
- CTelephony::TNetworkInfoV1Pckg iNetworkInfoV1Pckg;
- };
-
-#endif /* HBNETWORKMODEMONITOR_H */
--- a/src/hbcore/decorators/hbnetworksignalmonitor_sym.cpp Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +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 "hbnetworksignalmonitor_sym_p.h"
-
-CNetworkSignalMonitor::~CNetworkSignalMonitor()
-{
- Cancel();
- delete iTelephony;
-}
-
-void CNetworkSignalMonitor::ConstructL()
-{
- iTelephony = CTelephony::NewL();
- iTelephony->GetSignalStrength(iStatus, iSigStrengthV1Pckg);
- SetActive();
-}
-
-CNetworkSignalMonitor::CNetworkSignalMonitor(MNetworkSignalObserver& aObserver)
- : CActive(EPriorityStandard), iObserver(aObserver), iSigStrengthV1Pckg(iSigStrengthV1)
-{
- CActiveScheduler::Add(this);
-}
-
-TInt32 CNetworkSignalMonitor::signalStrength() const
-{
- TInt32 strength(0);
- switch (iSigStrengthV1.iBar)
- {
- case 0:
- strength = 0;
- break;
- case 1:
- strength = 14;
- break;
- case 2:
- strength = 29;
- break;
- case 3:
- strength = 43;
- break;
- case 4:
- strength = 57;
- break;
- case 5:
- strength = 72;
- break;
- case 6:
- strength = 86;
- break;
- case 7:
- strength = 100;
- break;
- default:
- strength = iSigStrengthV1.iBar;
- break;
- }
- return strength;
-}
-
-void CNetworkSignalMonitor::RunL()
-{
- if (iStatus.Int() == KErrNone) {
- iTelephony->NotifyChange(iStatus, CTelephony::ESignalStrengthChange, iSigStrengthV1Pckg);
- SetActive();
- iObserver.SignalStatusL(iSigStrengthV1.iSignalStrength, iSigStrengthV1.iBar);
- }
-}
-
-void CNetworkSignalMonitor::DoCancel()
-{
- iTelephony->CancelAsync(CTelephony::ESignalStrengthChangeCancel);
-}
--- a/src/hbcore/decorators/hbnetworksignalmonitor_sym_p.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +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 HBNETWORKSIGNALMONITOR_H
-#define HBNETWORKSIGNALMONITOR_H
-
-#include <etel3rdparty.h>
-
-class MNetworkSignalObserver
- {
- public:
- virtual void SignalStatusL( TInt32 aStrength, TInt8 aBars ) = 0;
- };
-
-class CNetworkSignalMonitor : public CActive
- {
-public:
- CNetworkSignalMonitor( MNetworkSignalObserver& aObserver );
- void ConstructL();
- ~CNetworkSignalMonitor();
-
- TInt32 signalStrength() const;
-
-private:
- void RunL();
- void DoCancel();
-
-private:
- MNetworkSignalObserver& iObserver;
- CTelephony* iTelephony;
- CTelephony::TSignalStrengthV1 iSigStrengthV1;
- CTelephony::TSignalStrengthV1Pckg iSigStrengthV1Pckg;
- };
-
-#endif /* HBNETWORKSIGNALMONITOR_H */
--- a/src/hbcore/decorators/hbsignalindicator.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/decorators/hbsignalindicator.cpp Fri May 14 16:09:54 2010 +0300
@@ -34,8 +34,7 @@
\brief HbSignalIndicator represents a signal indicator item.
The signal indicator shows approximately the signal strength of the mobile network.
- It is created and managed by the HbIndicatorGroup which in turn is part of the HbMainWindow's
- HbDecoratorGroup.
+ It is created and managed by the HbStatusBar which in turn is part of the HbMainWindow.
*/
// 0-33% for low, 34-66% for medium and 67-100% for high
@@ -45,19 +44,23 @@
mLevelPercent(-1),
mSignalBackgroundIcon(0),
mSignalLevelIcon(0),
- mSignalIcon(0),
- mSystemNetworkInfo(new HbSystemNetworkInfo()),
- mNetworkMode(HbSystemNetworkInfo::UnknownMode)
+ mSignalIcon(0)
+#ifdef HB_HAVE_QT_MOBILITY
+ ,mSystemNetworkInfo(new HbSystemInfo(0, false))
+ ,mNetworkMode(QSystemNetworkInfo::UnknownMode)
+#endif // HB_HAVE_QT_MOBILITY
{
-
}
HbSignalIndicatorPrivate::~HbSignalIndicatorPrivate()
{
+#ifdef HB_HAVE_QT_MOBILITY
delete mSystemNetworkInfo;
+#endif // HB_HAVE_QT_MOBILITY
}
-void HbSignalIndicatorPrivate::_q_setNetworkSignalStrength(HbSystemNetworkInfo::NetworkMode mode, int strength)
+#ifdef HB_HAVE_QT_MOBILITY
+void HbSignalIndicatorPrivate::_q_setNetworkSignalStrength(QSystemNetworkInfo::NetworkMode mode, int strength)
{
Q_Q(HbSignalIndicator);
if (mode != mNetworkMode) {
@@ -67,12 +70,13 @@
q->setLevel(strength);
}
-void HbSignalIndicatorPrivate::_q_setNetworkMode(HbSystemNetworkInfo::NetworkMode mode)
+void HbSignalIndicatorPrivate::_q_setNetworkMode(QSystemNetworkInfo::NetworkMode mode)
{
Q_Q(HbSignalIndicator);
mNetworkMode = mode;
q->updatePrimitives();
}
+#endif // HB_HAVE_QT_MOBILITY
// ======== MEMBER FUNCTIONS ========
@@ -83,6 +87,14 @@
: HbWidget(*new HbSignalIndicatorPrivate, parent)
{
createPrimitives();
+ updatePrimitives();
+#ifdef HB_HAVE_QT_MOBILITY
+ Q_D(HbSignalIndicator);
+ connect(d->mSystemNetworkInfo, SIGNAL(networkSignalStrengthChanged(QSystemNetworkInfo::NetworkMode, int)),
+ this, SLOT(_q_setNetworkSignalStrength(QSystemNetworkInfo::NetworkMode, int)));
+ connect(d->mSystemNetworkInfo, SIGNAL(networkModeChanged(QSystemNetworkInfo::NetworkMode)),
+ this, SLOT(_q_setNetworkMode(QSystemNetworkInfo::NetworkMode)));
+#endif // HB_HAVE_QT_MOBILITY
}
/*
@@ -95,12 +107,6 @@
void HbSignalIndicator::delayedConstruction()
{
- Q_D(HbSignalIndicator);
- connect(d->mSystemNetworkInfo, SIGNAL(networkSignalStrengthChanged(HbSystemNetworkInfo::NetworkMode, int)),
- this, SLOT(_q_setNetworkSignalStrength(HbSystemNetworkInfo::NetworkMode, int)));
- connect(d->mSystemNetworkInfo, SIGNAL(networkModeChanged(HbSystemNetworkInfo::NetworkMode)),
- this, SLOT(_q_setNetworkMode(HbSystemNetworkInfo::NetworkMode)));
- updatePrimitives();
}
/*
@@ -151,7 +157,9 @@
Q_D(const HbSignalIndicator);
// style option should default to unknown mode if not set
+#ifdef HB_HAVE_QT_MOBILITY
option->networkMode = d->mNetworkMode;
+#endif // HB_HAVE_QT_MOBILITY
//signal level setting
if (d->mLevelPercent >= 0 && d->mLevelPercent <= signalThreshold[0]) { // low
--- a/src/hbcore/decorators/hbsignalindicator_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/decorators/hbsignalindicator_p.h Fri May 14 16:09:54 2010 +0300
@@ -61,8 +61,10 @@
Q_DECLARE_PRIVATE_D(d_ptr, HbSignalIndicator)
Q_DISABLE_COPY(HbSignalIndicator)
- Q_PRIVATE_SLOT(d_func(), void _q_setNetworkSignalStrength(HbSystemNetworkInfo::NetworkMode, int))
- Q_PRIVATE_SLOT(d_func(), void _q_setNetworkMode(HbSystemNetworkInfo::NetworkMode))
+#ifdef HB_HAVE_QT_MOBILITY
+ Q_PRIVATE_SLOT(d_func(), void _q_setNetworkSignalStrength(QSystemNetworkInfo::NetworkMode, int))
+ Q_PRIVATE_SLOT(d_func(), void _q_setNetworkMode(QSystemNetworkInfo::NetworkMode))
+#endif // HB_HAVE_QT_MOBILITY
};
#endif // HBSIGNALINDICATOR_H
--- a/src/hbcore/decorators/hbsignalindicator_p_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/decorators/hbsignalindicator_p_p.h Fri May 14 16:09:54 2010 +0300
@@ -28,7 +28,10 @@
#include <hbwidget_p.h>
#include "hbsignalindicator_p.h"
+
+#ifdef HB_HAVE_QT_MOBILITY
#include "hbsysteminfo_p.h"
+#endif // HB_HAVE_QT_MOBILITY
class HbSignalIndicatorPrivate : public HbWidgetPrivate
{
@@ -38,8 +41,10 @@
HbSignalIndicatorPrivate();
virtual ~HbSignalIndicatorPrivate();
- void _q_setNetworkSignalStrength(HbSystemNetworkInfo::NetworkMode mode, int strength);
- void _q_setNetworkMode(HbSystemNetworkInfo::NetworkMode mode);
+#ifdef HB_HAVE_QT_MOBILITY
+ void _q_setNetworkSignalStrength(QSystemNetworkInfo::NetworkMode mode, int strength);
+ void _q_setNetworkMode(QSystemNetworkInfo::NetworkMode mode);
+#endif // HB_HAVE_QT_MOBILITY
private:
int mLevelPercent;
@@ -48,9 +53,10 @@
QGraphicsItem *mSignalLevelIcon;
QGraphicsItem *mSignalIcon;
- HbSystemNetworkInfo* mSystemNetworkInfo;
- HbSystemNetworkInfo::NetworkMode mNetworkMode;
-
+#ifdef HB_HAVE_QT_MOBILITY
+ HbSystemInfo *mSystemNetworkInfo;
+ QSystemNetworkInfo::NetworkMode mNetworkMode;
+#endif // HB_HAVE_QT_MOBILITY
};
#endif // HBSIGNALINDICATOR_P_P_H
--- a/src/hbcore/decorators/hbsoftkey.cpp Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,234 +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 <QGraphicsSceneResizeEvent>
-
-#include <hbeffect.h>
-#include "hbsoftkey_p.h"
-#include "hbsoftkey_p_p.h"
-#include "hbnamespace.h"
-#include "hbnamespace_p.h"
-#include "hbdeviceprofile.h"
-#include "hbevent.h"
-#include "hbaction.h"
-#include "hbtoolbutton.h"
-#include "hbtoolbutton_p.h"
-#include "hbinstance.h"
-#include "hbiconitem.h"
-#include "hbstyle.h"
-#include "hbstyleoptionsoftkey.h"
-#include <QDebug>
-HbSoftKeyPrivate::HbSoftKeyPrivate() :
- mButton(0)
-{
-}
-
-void HbSoftKeyPrivate::init(HbPrivate::SoftKeyId key)
-{
- Q_Q(HbSoftKey);
-
- mKey = key;
- mButton = new HbToolButton(q);
- mButton->setBackgroundItem(HbStyle::P_Softkey_background);
- HbToolButtonPrivate::d_ptr(mButton)->setBackgroundVisible(false);
- updatePrimitives();
-}
-
-void HbSoftKeyPrivate::updatePrimitives()
-{
- Q_Q(HbSoftKey);
- HbStyleOptionSoftKey option;
- q->initStyleOption(&option);
- if (mButton->isDown()) {
- option.mode = QIcon::Active;
- }
- if (HbDeviceProfile::profile(q).touch()) {
- q->style()->updatePrimitive(mButton->backgroundItem(), HbStyle::P_Softkey_background, &option);
- } else {
- // Hide icon & background & show text
- mButton->setEnabled(true);
- mButton->setToolButtonStyle(HbToolButton::ToolButtonText);
- }
-}
-
-/*!
- @beta
- @hbcore
- \class HbSoftKey
- \brief HbSoftKey is an Hb decorator and it implements softkeys which are usually used to execute
- various types of application and platform functionality.
-
- There are a number of pre-defined soft key types: OptionsKey, BackKey, SearchKey.
- It is possible to attach the softkeys to various locations on screen: top, bottom, left, right.
- HbSoftkey uses HbToolButton to show the actual widget, so HbSoftkey is merely a class that adds platform-defined
- layouting for an HbToolButton.
-
- HbSoftkeyGroup can be used to access the platform-defined softkeys.
-
- Here's how the softkey group creates the softkey and connects it to launch a menu
-
- \code
-
- HbSoftKey* primary = new HbSoftKey(HbPrivate::PrimarySoftKey, this);
- primary->setData(Hb::StateRole, "primary");
-
- HbAction *action = new HbAction(this);
- connect(action, SIGNAL(triggered()), d, SLOT(launchMenu()));
- primary->addAction(action);
-
- \endcode
-*/
-
-// ======== MEMBER FUNCTIONS ========
-
-
-/*
- Constructor.
- \param key Id needs to be given; the platform defined ids will place the softkey in a platform defined position.
- Custom ids can also be given but the positioning needs to be then handled by the client.
-
- \param parent Optional.
-
-*/
-
-HbSoftKey::HbSoftKey(HbPrivate::SoftKeyId key, QGraphicsItem *parent)
- : HbDecorator(*new HbSoftKeyPrivate, SoftKey, parent)
-{
- Q_D(HbSoftKey);
- d->init(key);
- connect(d->mButton, SIGNAL(pressed()), this, SLOT(buttonPressed()));
- connect(d->mButton, SIGNAL(released()), this, SLOT(buttonReleased()));
-}
-
-HbSoftKey::HbSoftKey(HbSoftKeyPrivate &dd, HbPrivate::SoftKeyId key, QGraphicsItem *parent )
- : HbDecorator(dd, SoftKey, parent)
-{
- Q_D(HbSoftKey);
- d->init(key);
-}
-
-HbSoftKey::~HbSoftKey()
-{
-
-}
-
-HbAction *HbSoftKey::action() const
-{
- Q_D(const HbSoftKey);
- return (d->mActions.isEmpty()? 0 : d->mActions.last());
-}
-
-void HbSoftKey::addAction(HbAction *action)
-{
- Q_D(HbSoftKey);
-
- if (action) {
- d->mActions << action;
- d->mButton->setAction(action);
- }
-}
-
-void HbSoftKey::removeAction(HbAction *action)
-{
- Q_D(HbSoftKey);
-
- if (action && !d->mActions.isEmpty()) {
- if (d->mActions.last() == action) {
- d->mActions.removeLast();
- if (!d->mActions.isEmpty()) {
- d->mButton->setAction(d->mActions.last());
- } else {
- d->mButton->setAction(0);
- }
- }
- else {
- int index = d->mActions.lastIndexOf(action);
- if (index != -1) {
- d->mActions.removeAt(index);
- }
- }
- }
-}
-
-/*!
- \reimp
- */
-void HbSoftKey::updatePrimitives()
-{
- Q_D(HbSoftKey);
-
- d->updatePrimitives();
-}
-
-void HbSoftKey::buttonPressed()
-{
-#ifdef HB_EFFECTS
- HbEffect::start(this, "decorator", "pressed");
-#endif
- updatePrimitives();
-}
-
-void HbSoftKey::buttonReleased()
-{
-#ifdef HB_EFFECTS
- HbEffect::start(this, "decorator", "released");
-#endif
- updatePrimitives();
-}
-
-void HbSoftKey::resizeEvent(QGraphicsSceneResizeEvent * event)
-{
- Q_D(HbSoftKey);
- HbDecorator::resizeEvent(event);
-
- if (d->mButton) {
- d->mButton->resize(event->newSize());
- }
-}
-
-bool HbSoftKey::event(QEvent *e)
-{
- if (e->type() == HbEvent::DeviceProfileChanged) {
- updatePrimitives();
- }
- return HbDecorator::event(e);
-}
-
-HbPrivate::SoftKeyId HbSoftKey::softKeyId()
-{
- Q_D(HbSoftKey);
- return d->mKey;
-}
-
-/*!
- Initializes \a option with the values from this HbSoftKey.
- */
-void HbSoftKey::initStyleOption(HbStyleOptionSoftKey *option) const
-{
- const Q_D(HbSoftKey);
- option->mKey = d->mKey;
- HbDecorator::initStyleOption(option);
-}
-
--- a/src/hbcore/decorators/hbsoftkey_p.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +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 HBSOFTKEY_P_H
-#define HBSOFTKEY_P_H
-
-#include "hbnamespace_p.h"
-
-#include <hbglobal.h>
-#include <hbdecorator_p.h>
-#include <hbnamespace.h>
-
-class HbAction;
-class HbSoftKeyPrivate;
-class HbStyleOptionSoftKey;
-
-class HB_CORE_PRIVATE_EXPORT HbSoftKey : public HbDecorator
-{
- Q_OBJECT
-
-public:
- explicit HbSoftKey(HbPrivate::SoftKeyId, QGraphicsItem *parent = 0);
- virtual ~HbSoftKey();
-
- HbAction *action() const;
- void addAction(HbAction *action);
- void removeAction(HbAction *action);
-
- HbPrivate::SoftKeyId softKeyId();
-
- enum { Type = HbPrivate::ItemType_SoftKey };
- int type() const { return Type; }
-
-public slots:
- virtual void updatePrimitives();
- void buttonPressed();
- void buttonReleased();
-
-protected:
- HbSoftKey(HbSoftKeyPrivate &dd, HbPrivate::SoftKeyId key, QGraphicsItem *parent = 0);
- void resizeEvent ( QGraphicsSceneResizeEvent * event );
- virtual bool event(QEvent *e);
- void initStyleOption(HbStyleOptionSoftKey *option) const;
-
-private:
- Q_DECLARE_PRIVATE_D(d_ptr, HbSoftKey)
- Q_DISABLE_COPY(HbSoftKey)
-
-};
-
-#endif // HBSOFTKEY_P_H
--- a/src/hbcore/decorators/hbsoftkey_p_p.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +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 HBSOFTKEY_P_P_H
-#define HBSOFTKEY_P_P_H
-
-#include <hbsoftkey_p.h>
-#include <hbdecorator_p_p.h>
-#include <hbtoolbutton.h>
-#include <hbaction.h>
-
-class HbSoftKeyPrivate: public HbDecoratorPrivate
-{
- Q_DECLARE_PUBLIC(HbSoftKey)
-
-public:
- HbSoftKeyPrivate();
- void init(HbPrivate::SoftKeyId key);
-
- HbPrivate::SoftKeyId mKey;
- HbToolButton *mButton;
- QList<HbAction *> mActions;
-
- void updatePrimitives();
-};
-
-#endif // HBSOFTKEY_P_P_H
-
--- a/src/hbcore/decorators/hbsoftkeygroup.cpp Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,153 +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 <QApplication>
-#include <QHash>
-
-#include "hbsoftkeygroup_p.h"
-#include "hbsoftkey_p.h"
-#include "hbaction.h"
-#include "hbnamespace_p.h"
-
-class HbSoftKeyGroupPrivate : public QObject
-{
- Q_OBJECT
-public:
- HbSoftKeyGroupPrivate(HbSoftKeyGroup *group);
-
- QHash<HbPrivate::SoftKeyId, HbSoftKey *> mSoftKeys;
- HbSoftKeyGroup *q;
- HbAction *mDefaultSecondaryAction;
-
-private slots:
- void launchMenu();
-};
-
-HbSoftKeyGroupPrivate::HbSoftKeyGroupPrivate(HbSoftKeyGroup *group)
- : q(group), mDefaultSecondaryAction(0)
-{
-}
-
-void HbSoftKeyGroupPrivate::launchMenu()
-{
- // only the primary softkey is connected so it is safe to assume
- // the sender is q->primary
- emit q->launchMenu(mSoftKeys.value(HbPrivate::PrimarySoftKey)->scenePos());
-
-}
-
-/*
- \class HbSoftKeyGroup
- \brief HbSoftKeyGroup manages soft keys.
-
- HbSoftKeyGroup creates and manages soft keys. HbSoftKeyGroup
- also provides access to individual soft keys. In the default
- constructor it creates primary, secondary and middle softkeys.
-
- Typically the softkey group is created by \a HbDecoratorGroup.
- The softkey group is accessible via HbDecoratorGroup::indicatorGroup().
-
- A brief example of how to use this class:
- \code
- HbSoftKeyGroup *softkeys = decorators->softKeyGroup();
- HbSoftKey *primary = softkeys->softKey(HbPrivate::PrimarySoftKey);
- \endcode
-
- \sa HbDecoratorGroup
-*/
-
-
-/*
- Default constructor.
- Creates PrimarySoftkey, SecondarySoftkey and MiddleSoftkey named
- "primary", "secondary" and "middle" respectively. Primary softkey
- connects \a launchMenu() slot and secondary to \a quit() slot.
-*/
-HbSoftKeyGroup::HbSoftKeyGroup(QObject *parent)
- : QObject(parent), d(new HbSoftKeyGroupPrivate(this))
-{
- HbSoftKey* secondary = new HbSoftKey(HbPrivate::SecondarySoftKey);
-
- // add default quit action to secondary softkey
- d->mDefaultSecondaryAction = new HbAction(Hb::QuitNaviAction,this);
- d->mDefaultSecondaryAction->setText("Quit");
- connect(d->mDefaultSecondaryAction, SIGNAL(triggered()), qApp, SLOT(quit()));
- secondary->addAction(d->mDefaultSecondaryAction);
-
- d->mSoftKeys.insert(HbPrivate::SecondarySoftKey, secondary);
-
- // Create primary and middle soft keys only for non-touch
- if (!HbDeviceProfile::current().touch()) {
- HbSoftKey* primary = new HbSoftKey(HbPrivate::PrimarySoftKey);
- // add default launch menu action to primary softkey
- HbAction *action = new HbAction(this);
- action->setText("Options");
- connect(action, SIGNAL(triggered()), d, SLOT(launchMenu()));
- primary->addAction(action);
- d->mSoftKeys.insert(HbPrivate::PrimarySoftKey, primary);
-
- HbSoftKey* middle = new HbSoftKey(HbPrivate::MiddleSoftKey);
- d->mSoftKeys.insert(HbPrivate::MiddleSoftKey, middle);
- }
-}
-
-/*
- Destructs the softkey group.
- */
-HbSoftKeyGroup::~HbSoftKeyGroup()
-{
- delete d;
-}
-
-/*
- Returns a list of all soft keys.
-
- \sa HbSoftKey
- */
-QList<HbSoftKey *> HbSoftKeyGroup::softKeys() const
-{
- return d->mSoftKeys.values();
-}
-
-/*
- Returns the standard soft \a key.
-
- \sa HbPrivate::SoftKeyId, HbSoftKey
- */
-HbSoftKey *HbSoftKeyGroup::softKey(HbPrivate::SoftKeyId key) const
-{
- return d->mSoftKeys.value(key);
-}
-
-/*!
- Returns the default action for the secondary softkey (typically
- an action to quit the application).
-*/
-HbAction *HbSoftKeyGroup::defaultSecondaryAction() const
-{
- return d->mDefaultSecondaryAction;
-}
-
-#include "hbsoftkeygroup.moc"
--- a/src/hbcore/decorators/hbsoftkeygroup_p.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +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 HBSOFTKEYGROUP_H
-#define HBSOFTKEYGROUP_H
-
-#include "hbglobal.h"
-#include "hbnamespace.h"
-#include "hbnamespace_p.h"
-#include <QObject>
-
-class HbSoftKey;
-class HbSoftKeyGroupPrivate;
-class HbAction;
-
-class HB_AUTOTEST_EXPORT HbSoftKeyGroup : public QObject
-{
- Q_OBJECT
-
-public:
- HbSoftKeyGroup(QObject * parent = 0);
- virtual ~HbSoftKeyGroup();
-
- QList<HbSoftKey *> softKeys() const;
- HbSoftKey *softKey(HbPrivate::SoftKeyId key) const;
-
- HbAction *defaultSecondaryAction() const;
-
-signals:
- void launchMenu(const QPointF &pos);
-
-private:
- HbSoftKeyGroupPrivate *d;
- friend class HbSoftKeyGroupPrivate;
-};
-
-#endif // HBSOFTKEYGROUP_H
--- a/src/hbcore/decorators/hbstatusbar.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/decorators/hbstatusbar.cpp Fri May 14 16:09:54 2010 +0300
@@ -24,6 +24,7 @@
****************************************************************************/
#include <QTime>
+
#include <hbtextitem.h>
#include <hbmainwindow.h>
#include <hbview.h>
@@ -35,6 +36,12 @@
#include "hbbatteryindicator_p.h"
#include "hbindicatorgroup_p.h"
+#if defined(Q_OS_SYMBIAN)
+#include "hbindicatorsym_p.h"
+#else
+#include "hbindicatorwin32_p.h"
+#endif // defined(Q_OS_SYMBIAN)
+
const int clockUpdateDelay = 10000; // 10 s
/*
@@ -53,10 +60,17 @@
mNotificationIndicatorGroup(0),
mSettingsIndicatorGroup(0),
mMainWindow(0),
- mPreviousProperties(0)
+ mPreviousProperties(0),
+ mIndicatorPrivate(0)
{
}
+HbStatusBarPrivate::~HbStatusBarPrivate()
+{
+ mIndicatorPrivate->stopListen();
+ delete mIndicatorPrivate;
+}
+
void HbStatusBarPrivate::delayedConstruction()
{
Q_Q(HbStatusBar);
@@ -66,12 +80,31 @@
mNotificationIndicatorGroup->delayedConstruction();
mSettingsIndicatorGroup->delayedConstruction();
- q->connect(mNotificationIndicatorGroup, SIGNAL(notificationCountChanged(int)),
- q, SIGNAL(notificationCountChanged(int)));
- q->connect(mMainWindow, SIGNAL(currentViewChanged(HbView*)), q, SLOT(currentViewChanged(HbView*)));
+ q->connect(mIndicatorPrivate, SIGNAL(activated(const QList<IndicatorClientInfo> &)),
+ mNotificationIndicatorGroup, SLOT(activate(const QList<IndicatorClientInfo> &)));
+ q->connect(mIndicatorPrivate, SIGNAL(updated(const QList<IndicatorClientInfo> &)),
+ mNotificationIndicatorGroup, SLOT(update(const QList<IndicatorClientInfo> &)));
+ q->connect(mIndicatorPrivate, SIGNAL(allActivated(const QList<IndicatorClientInfo> &)),
+ mNotificationIndicatorGroup, SLOT(activateAll(const QList<IndicatorClientInfo> &)));
+ q->connect(mIndicatorPrivate, SIGNAL(deactivated(const QList<IndicatorClientInfo> &)),
+ mNotificationIndicatorGroup, SLOT(deactivate(const QList<IndicatorClientInfo> &)));
+
+ q->connect(mIndicatorPrivate, SIGNAL(activated(const QList<IndicatorClientInfo> &)),
+ mSettingsIndicatorGroup, SLOT(activate(const QList<IndicatorClientInfo> &)));
+ q->connect(mIndicatorPrivate, SIGNAL(updated(const QList<IndicatorClientInfo> &)),
+ mSettingsIndicatorGroup, SLOT(update(const QList<IndicatorClientInfo> &)));
+ q->connect(mIndicatorPrivate, SIGNAL(allActivated(const QList<IndicatorClientInfo> &)),
+ mSettingsIndicatorGroup, SLOT(activateAll(const QList<IndicatorClientInfo> &)));
+ q->connect(mIndicatorPrivate, SIGNAL(deactivated(const QList<IndicatorClientInfo> &)),
+ mSettingsIndicatorGroup, SLOT(deactivate(const QList<IndicatorClientInfo> &)));
+
+ q->connect(mIndicatorPrivate, SIGNAL(activated(const QList<IndicatorClientInfo> &)),
+ q, SIGNAL(activated(const QList<IndicatorClientInfo> &)));
+ q->connect(mIndicatorPrivate, SIGNAL(deactivated(const QList<IndicatorClientInfo> &)),
+ q, SIGNAL(deactivated(const QList<IndicatorClientInfo> &)));
mClockTimerId = q->startTimer(clockUpdateDelay);
- updateTime();
+ mIndicatorPrivate->startListen();
}
void HbStatusBarPrivate::init()
@@ -90,6 +123,9 @@
mSettingsIndicatorGroup = new HbIndicatorGroup(HbIndicatorGroup::SettingsType, q);
q->style()->setItemName(mSettingsIndicatorGroup, "settingsindicators");
+
+ mIndicatorPrivate = new HbIndicatorPrivate;
+ mIndicatorPrivate->init();
}
void HbStatusBarPrivate::updateTime()
@@ -164,6 +200,8 @@
d->mTimeTextItem = style()->createPrimitive(HbStyle::P_StatusBar_timetext, this);
setBackgroundItem(HbStyle::P_StatusBar_background);
+
+ d->updateTime();
}
void HbStatusBar::updatePrimitives()
@@ -217,3 +255,34 @@
}
}
+/*!
+ \reimp
+*/
+QGraphicsItem *HbStatusBar::primitive(const QString &itemName) const
+{
+ const Q_D(HbStatusBar);
+ if (itemName == "") {
+ return 0;
+ } else {
+ if (itemName == "background") {
+ return this->backgroundItem();
+ }
+ else if (itemName == "timetext") {
+ return d->mTimeTextItem;
+ }
+ else if (itemName == "signal") {
+ return d->mSignalIndicator;
+ }
+ else if (itemName == "battery") {
+ return d->mBatteryIndicator;
+ }
+ else if (itemName == "notificationindicators") {
+ return d->mNotificationIndicatorGroup;
+ }
+ else if (itemName == "settingsindicators") {
+ return d->mSettingsIndicatorGroup;
+ } else {
+ return 0;
+ }
+ }
+}
--- a/src/hbcore/decorators/hbstatusbar_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/decorators/hbstatusbar_p.h Fri May 14 16:09:54 2010 +0300
@@ -32,6 +32,7 @@
class HbStatusBarPrivate;
class HbStyleOptionStatusBar;
class HbView;
+struct IndicatorClientInfo;
class HB_CORE_PRIVATE_EXPORT HbStatusBar : public HbWidget
{
@@ -47,6 +48,7 @@
int type() const { return Type; }
void propertiesChanged();
+ QGraphicsItem *primitive(const QString &itemName) const;
public slots:
virtual void createPrimitives();
@@ -54,7 +56,8 @@
void currentViewChanged(HbView *view);
signals:
- void notificationCountChanged(int count);
+ void activated(const QList<IndicatorClientInfo> &clientInfo);
+ void deactivated(const QList<IndicatorClientInfo> &clientInfo);
protected:
void initStyleOption(HbStyleOptionStatusBar *option) const;
--- a/src/hbcore/decorators/hbstatusbar_p_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/decorators/hbstatusbar_p_p.h Fri May 14 16:09:54 2010 +0300
@@ -32,6 +32,7 @@
class HbSignalIndicator;
class HbBatteryIndicator;
class HbIndicatorGroup;
+class HbIndicatorPrivate;
class HbStatusBarPrivate : public HbWidgetPrivate
{
@@ -39,6 +40,7 @@
public:
HbStatusBarPrivate();
+ virtual ~HbStatusBarPrivate();
void delayedConstruction();
void init();
@@ -55,6 +57,8 @@
HbMainWindow *mMainWindow;
int mPreviousProperties;
+
+ HbIndicatorPrivate *mIndicatorPrivate;
};
--- a/src/hbcore/decorators/hbsysteminfo.cpp Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,530 +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 "hbsysteminfo_p.h"
-
-#if defined(Q_OS_SYMBIAN)
-#include "hbsysteminfo_sym_p_p.h"
-#elif defined(Q_OS_WIN)
-#include "hbsysteminfo_win_p_p.h"
-#elif defined(Q_OS_UNIX)
-#include "hbsysteminfo_linux_p_p.h"
-#endif
-
-#include <QStringList>
-#include <QSize>
-#include <QFile>
-#include <QTextStream>
-#include <QLocale>
-#include <QLibraryInfo>
-#include <QApplication>
-#include <QDesktopWidget>
-#include <QDebug>
-
-#include <locale.h>
-
- /*
- \class HbSystemNetworkInfo
-
- \ingroup systeminfo
-
- \brief The HbSystemNetworkInfo class provides access to network information from the system.
-
- */
-/*
- \enum HbSystemNetworkInfo::NetworkStatus
- This enum describes the status of the network connection:
-
- \value UndefinedStatus There is no network device, or error.
- \value NoNetworkAvailable There is no network available.
- \value EmergencyOnly Emergency calls only.
- \value Searching Searching for or connecting with the network.
- \value Busy Network is busy.
- \value Connected Connected to newtwork.
- \value HomeNetwork On Home Network.
- \value Denied Network access denied.
- \value Roaming On Roaming network.
-
- */
-/*
- \enum HbSystemNetworkInfo::NetworkMode
- This enum describes the type of network:
-
- \value UnknownMode Unknown network.or netowrk error.
- \value GsmMode Global System for Mobile (GSM) network.
- \value CdmaMode Code division multiple access (CDMA) network.
- \value WcdmaMode Wideband Code Division Multiple Access (W-CDMA) network.
- \value WlanMode Wireless Local Area Network (WLAN) network.
- \value EthernetMode Wired Local Area network.
- \value BluetoothMode Bluetooth network.
- \value WimaxMode Wimax network.
-
- */
-
-/*
- \class QSystemDisplayInfo
-
- \ingroup systeminfo
-
- \brief The QSystemDisplayInfo class provides access to display information from the system.
-
- */
-
- /*
- \class QSystemStorageInfo
-
- \ingroup systeminfo
-
- \brief The QSystemStorageInfo class provides access to memory and disk information from the system.
-
- */
-
-/*
- \enum QSystemStorageInfo::DriveType
- This enum describes the type of drive or volume
-
- \value NoDrive Drive type undetermined.
- \value InternalDrive Is internal drive.
- \value RemovableDrive Is removable.
- \value RemoteDrive Is a network drive.
- \value CdromDrive Is a cd rom drive.
-*/
-
-
-/*
- \class HbSystemDeviceInfo
-
- \ingroup systeminfo
-
- \brief The HbSystemDeviceInfo class provides access to device
-information from the system.
-
- */
-/*
- \fn void HbSystemDeviceInfo::batteryLevelChanged(int level)
-
- This signal is emitted when battery level has changed.
- \a level is the new level.
- */
-
-/*
- \fn void HbSystemDeviceInfo::batteryStatusChanged(HbSystemDeviceInfo::BatteryStatus status)
-
- This signal is emitted when battery status has changed.
- \a status is the new status.
- */
-
- /*
- \fn void HbSystemDeviceInfo::powerStateChanged(HbSystemDeviceInfo::PowerState state)
-
- This signal is emitted when the power state has changed, such as when a phone gets plugged qint32o the wall.
- \a state is the new power state.
- */
-
-/*
- \fn void HbSystemDeviceInfo::currentProfileChanged(HbSystemDeviceInfo::Profile profile)
-
- This signal is emitted whenever the network profile changes, specified by \a profile.
-*/
-
-
-/*
- \enum HbSystemDeviceInfo::BatteryStatus
- This enum describes the status of the main battery.
-
- \value NoBatteryLevel Battery level undetermined.
- \value BatteryCritical Battery level is critical 3% or less.
- \value BatteryVeryLow Battery level is very low, 10% or less.
- \value BatteryLow Battery level is low 40% or less.
- \value BatteryNormal Battery level is above 40%.
-
- */
-/*
- \enum HbSystemDeviceInfo::PowerState
- This enum describes the power state:
-
- \value UnknownPower Power error.
- \value BatteryPower On battery power.
- \value WallPower On wall power.
- \value WallPowerChargingBattery On wall power and charging main battery.
-
- */
-/*
- \enum HbSystemDeviceInfo::Profile
- This enum describes the current operating profile of the device or computer.
-
- \value UnknownProfile Profile unknown or error.
- \value SilentProfile Silent profile.
- \value NormalProfile Normal profile.
- \value LoudProfile Loud profile.
- \value VibProfile Vibrate profile.
- \value OfflineProfile Offline profile.
- \value PowersaveProfile Powersave profile.
- \value CustomProfile Custom profile.
-
- */
-
-/*
- \enum HbSystemDeviceInfo::SimStatus
- This enum describes the status is the sim card or cards.
-
- \value SimNotAvailable SIM is not available on this device.
- \value SingleSimAvailable One SIM card is available on this.
- \value DualSimAvailable Two SIM cards are available on this device.
- \value SimLocked Device has SIM lock enabled.
-*/
-
-/*
- \enum HbSystemDeviceInfo::InputMethod
- This enum describes the device method of user input.
-
- \value Keys Device has key/buttons.
- \value Keypad Device has keypad (1,2,3, etc).
- \value Keyboard Device has qwerty keyboard.
- \value SingleTouch Device has single touch screen.
- \value MultiTouch Device has muti touch screen.
- \value Mouse Device has a mouse.
-*/
-
-/*
- \class QSystemScreenSaver
-
- \ingroup systeminfo
-
- \brief The QSystemScreenSaver class provides access to screen saver and blanking.
-
- */
-
-/*
- \fn void QSystemInfo::currentLanguageChanged(const QString &lang)
-
- This signal is emitted whenever the current language changes, specified by \a lang,
- which is in 2 letter, ISO 639-1 specification form.
- */
-
-/*
- \fn void HbSystemNetworkInfo::networkStatusChanged(HbSystemNetworkInfo::NetworkMode mode, HbSystemNetworkInfo::NetworkStatus status)
-
- This signal is emitted whenever the network status of \a mode changes, specified by \a status.
- */
-
-/*
- \fn void HbSystemNetworkInfo::networkSignalStrengthChanged(HbSystemNetworkInfo::NetworkMode mode,int strength)
-
- This signal is emitted whenever the network \a mode signal strength changes, specified by \a strength.
- */
-
-/*
- \fn void HbSystemNetworkInfo::currentMobileCountryCodeChanged(const QString &mcc)
-
- This signal is emitted whenever the Mobile Country Code changes, specified by \a mcc.
-*/
-
-/*
- \fn void HbSystemNetworkInfo::currentMobileNetworkCodeChanged(const QString &mnc)
-
- This signal is emitted whenever the network Mobile Network Code changes, specified by \a mnc.
-*/
-
-/*
- \fn void HbSystemNetworkInfo::networkNameChanged(HbSystemNetworkInfo::NetworkMode mode,const QString & netName)
-
- This signal is emitted whenever the network \a mode name changes, specified by \a netName.
-
-*/
-
-/*
- \fn void HbSystemNetworkInfo::networkModeChanged(HbSystemNetworkInfo::NetworkMode mode)
-
- This signal is emitted whenever the network mode changes, specified by \a mode.
-*/
-
-/*
- \fn void HbSystemDeviceInfo::bluetoothStateChanged(bool on)
-
- This signal is emitted whenever bluetooth state changes, specified by \a on.
-*/
-
- /*
- Constructs a HbSystemNetworkInfo object with the given \a parent.
- */
-HbSystemNetworkInfo::HbSystemNetworkInfo(QObject *parent)
-{
- d = new HbSystemNetworkInfoPrivate(parent);
- connect(d,SIGNAL(currentMobileCountryCodeChanged(QString)),
- this,SIGNAL(currentMobileCountryCodeChanged(QString)));
-
- connect(d,SIGNAL(currentMobileNetworkCodeChanged(QString)),
- this,SIGNAL(currentMobileNetworkCodeChanged(QString)));
-
- connect(d,SIGNAL(networkModeChanged(HbSystemNetworkInfo::NetworkMode)),
- this,SIGNAL(networkModeChanged(HbSystemNetworkInfo::NetworkMode)));
-
- connect(d,SIGNAL(networkNameChanged(HbSystemNetworkInfo::NetworkMode,QString)),
- this,SIGNAL(networkNameChanged(HbSystemNetworkInfo::NetworkMode,QString)));
-
- connect(d,SIGNAL(networkSignalStrengthChanged(HbSystemNetworkInfo::NetworkMode,int)),
- this,SIGNAL(networkSignalStrengthChanged(HbSystemNetworkInfo::NetworkMode,int)));
-
- connect(d,SIGNAL(networkStatusChanged(HbSystemNetworkInfo::NetworkMode,HbSystemNetworkInfo::NetworkStatus)),
- this,SIGNAL(networkStatusChanged(HbSystemNetworkInfo::NetworkMode,HbSystemNetworkInfo::NetworkStatus)));
-}
-
-/*
- Destroys the HbSystemNetworkInfo object.
- */
-HbSystemNetworkInfo::~HbSystemNetworkInfo()
-{
- delete d;
-}
-
-/*
- Returns the status of the network \a mode.
-*/
-HbSystemNetworkInfo::NetworkStatus HbSystemNetworkInfo::networkStatus(HbSystemNetworkInfo::NetworkMode mode) const
-{
- return d->networkStatus(mode);
-}
-
-/*
- Returns the strength of the network signal, per network \a mode , 0 - 100 linear scaling,
- or -1 in the case of unknown network mode or error.
-
- In the case of HbSystemNetworkInfo::EthMode, it will either be 100 for carrier active, or 0 for when
- there is no carrier or cable connected.
-*/
-int HbSystemNetworkInfo::networkSignalStrength(HbSystemNetworkInfo::NetworkMode mode) const
-{
- return d->networkSignalStrength(mode);
-}
-
-/*
- Returns the Cell ID of the connected tower or based station.
-*/
-int HbSystemNetworkInfo::cellId() const
-{
- return d->cellId();
-}
-
-/*
- Returns the Location Area Code. In the case of none such as a Desktop, "No Mobile Network."
-*/
-int HbSystemNetworkInfo::locationAreaCode() const
-{
- return d->locationAreaCode();
-}
-
- /*
- Returns the current Mobile Country Code. In the case of none such as a Desktop, "No Mobile Network."
-*/
-QString HbSystemNetworkInfo::currentMobileCountryCode() const
-{
- return d->currentMobileCountryCode();
-}
-
-/*
- Returns the current Mobile Network Code. In the case of none such as a Desktop, "No Mobile Network."
-*/
-QString HbSystemNetworkInfo::currentMobileNetworkCode() const
-{
- return d->currentMobileNetworkCode();
-}
-
-/*
- Returns the home Mobile Network Code. In the case of none such as a Desktop, "No Mobile Network."
-*/
-QString HbSystemNetworkInfo::homeMobileCountryCode() const
-{
- return d->homeMobileCountryCode();
-}
-
-/*
- Returns the home Mobile Country Code. In the case of none such as a Desktop, "No Mobile Network."
-*/
-QString HbSystemNetworkInfo::homeMobileNetworkCode() const
-{
- return d->homeMobileNetworkCode();
-}
-
-/*
- Returns the name of the operator for the network \a mode. For wlan this returns the network's current SSID.
-In the case of no network such as a desktop, "No Operator".
-*/
-QString HbSystemNetworkInfo::networkName(HbSystemNetworkInfo::NetworkMode mode) const
-{
- return d->networkName(mode);
-}
-
-/*
- Returns the MAC address for the interface servicing the network \a mode.
- */
-QString HbSystemNetworkInfo::macAddress(HbSystemNetworkInfo::NetworkMode mode) const
-{
- return d->macAddress(mode);
-}
-
-/*
- Returns the first found QNetworkInterface for type \a mode.
- */
-QNetworkInterface HbSystemNetworkInfo::interfaceForMode(HbSystemNetworkInfo::NetworkMode mode) const
-{
- return d->interfaceForMode(mode);
-}
-
-// device
- /*
- Constructs a HbSystemDeviceInfo with the given \a parent.
- */
-HbSystemDeviceInfo::HbSystemDeviceInfo(QObject *parent)
-{
- d = new HbSystemDeviceInfoPrivate(parent);
- connect(d,SIGNAL(batteryLevelChanged(int)),
- this,SIGNAL(batteryLevelChanged(int)));
-
- connect(d,SIGNAL(batteryStatusChanged(HbSystemDeviceInfo::BatteryStatus)),
- this,SIGNAL(batteryStatusChanged(HbSystemDeviceInfo::BatteryStatus)));
-
- connect(d,SIGNAL(bluetoothStateChanged(bool)),
- this,SIGNAL(bluetoothStateChanged(bool)));
-
- connect(d,SIGNAL(currentProfileChanged(HbSystemDeviceInfo::Profile)),
- this,SIGNAL(currentProfileChanged(HbSystemDeviceInfo::Profile)));
-
- connect(d,SIGNAL(powerStateChanged(HbSystemDeviceInfo::PowerState)),
- this,SIGNAL(powerStateChanged(HbSystemDeviceInfo::PowerState)));
- }
-
-/*
- Destroys the HbSystemDeviceInfo object.
- */
-HbSystemDeviceInfo::~HbSystemDeviceInfo()
-{
- delete d;
-}
-
-
-/*
- Returns the HbSystemDeviceInfo::InputMethodFlags InputMethodType that the system uses.
-*/
-HbSystemDeviceInfo::InputMethodFlags HbSystemDeviceInfo::inputMethodType() const
-{
- return d->inputMethodType();
-}
-/*
- Returns the International Mobile Equipment Identity (IMEI), or a null QString in the case of none.
-*/
-QString HbSystemDeviceInfo::imei() const
-{
- return d->imei();
-}
-
-/*
- Returns the International Mobile Subscriber Identity (IMSI), or a null QString in the case of none.
-*/
-QString HbSystemDeviceInfo::imsi() const
-{
- return d->imsi();
-}
-
-/*
- Returns the name of the manufacturer of this device. In the case of desktops, the name of the vendor
- of the motherboard.
-*/
-QString HbSystemDeviceInfo::manufacturer() const
-{
- return d->manufacturer();
-}
-
-/*
- Returns the model information of the device. In the case of desktops where no
- model information is present, the CPU architect, such as i686, and machine type, such as Server,
- Desktop or Laptop.
-*/
-QString HbSystemDeviceInfo::model() const
-{
- return d->model();
-}
-
-/*
- Returns the product name of the device. In the case where no product information is available,
-
-*/
-QString HbSystemDeviceInfo::productName() const
-{
- return d->productName();
-}
-/*
- Returns the battery charge level as percentage 1 - 100 scale.
-*/
-int HbSystemDeviceInfo::batteryLevel() const
-{
- return d->batteryLevel();
-}
-
- /*
- Returns the battery charge status.
-*/
-HbSystemDeviceInfo::BatteryStatus HbSystemDeviceInfo::batteryStatus() const
-{
- return d->batteryStatus();
-}
-
-/*
- \property HbSystemDeviceInfo::simStatus
- \brief the status of the sim card.
- Returns the HbSystemDeviceInfo::simStatus status of SIM card.
-*/
-HbSystemDeviceInfo::SimStatus HbSystemDeviceInfo::simStatus() const
-{
- return d->simStatus();
-}
-/*
- Returns true if the device is locked, otherwise false.
-*/
-bool HbSystemDeviceInfo::isDeviceLocked() const
-{
- return d->isDeviceLocked();
-}
-
-/*
- \property HbSystemDeviceInfo::currentProfile
- \brief the device profile
- Gets the current HbSystemDeviceInfo::currentProfile device profile.
-*/
-HbSystemDeviceInfo::Profile HbSystemDeviceInfo::currentProfile() const
-{
- return d->currentProfile();
-}
-
-/*
- \property HbSystemDeviceInfo::currentPowerState
- \brief the power state.
-
- Gets the current HbSystemDeviceInfo::currentPowerState state.
-*/
-HbSystemDeviceInfo::PowerState HbSystemDeviceInfo::currentPowerState() const
-{
- return d->currentPowerState();
-}
--- a/src/hbcore/decorators/hbsysteminfo_linux.cpp Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,295 +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 "hbsysteminfo_linux_p_p.h"
-
-#include <QTimerEvent>
-#include <QDebug>
-
-Q_GLOBAL_STATIC(HbSystemNetworkInfoPrivate, hbSystemNetworkInfoPrivate)
-
-HbSystemNetworkInfoPrivate::HbSystemNetworkInfoPrivate(QObject *parent)
- : QObject(parent)
-{
- netStrengthTimer.start(10000, this);
-}
-
-HbSystemNetworkInfoPrivate::~HbSystemNetworkInfoPrivate()
-{
- netStrengthTimer.stop();
-}
-
-HbSystemNetworkInfoPrivate *HbSystemNetworkInfoPrivate::instance()
-{
- return hbSystemNetworkInfoPrivate();
-}
-
-void HbSystemNetworkInfoPrivate::emitNetworkStatusChanged(HbSystemNetworkInfo::NetworkMode mode, HbSystemNetworkInfo::NetworkStatus status)
-{
- emit networkStatusChanged(mode, status);
-}
-
-void HbSystemNetworkInfoPrivate::emitNetworkSignalStrengthChanged(HbSystemNetworkInfo::NetworkMode mode,int strength)
-{
- emit networkSignalStrengthChanged(mode, strength);
-}
-
-void HbSystemNetworkInfoPrivate::nlaNetworkChanged()
-{
- qWarning() << Q_FUNC_INFO;
-}
-
-void HbSystemNetworkInfoPrivate::networkStrengthTimeout()
-{
- qWarning() << __FUNCTION__;
- QList<HbSystemNetworkInfo::NetworkMode> modeList;
- modeList << HbSystemNetworkInfo::GsmMode;
- modeList << HbSystemNetworkInfo::CdmaMode;
- modeList << HbSystemNetworkInfo::WcdmaMode;
- modeList << HbSystemNetworkInfo::WlanMode;
- modeList << HbSystemNetworkInfo::EthernetMode;
- modeList << HbSystemNetworkInfo::BluetoothMode;
- modeList << HbSystemNetworkInfo::WimaxMode;
-
- foreach(HbSystemNetworkInfo::NetworkMode mode, modeList) {
- networkSignalStrength(mode);
- }
- }
-
-void HbSystemNetworkInfoPrivate::networkStatusTimeout()
-{
- qWarning() << __FUNCTION__;
- QList<HbSystemNetworkInfo::NetworkMode> modeList;
- modeList << HbSystemNetworkInfo::GsmMode;
- modeList << HbSystemNetworkInfo::CdmaMode;
- modeList << HbSystemNetworkInfo::WcdmaMode;
- modeList << HbSystemNetworkInfo::WlanMode;
- modeList << HbSystemNetworkInfo::EthernetMode;
- modeList << HbSystemNetworkInfo::BluetoothMode;
- modeList << HbSystemNetworkInfo::WimaxMode;
-
- foreach(HbSystemNetworkInfo::NetworkMode mode, modeList) {
- networkStatus(mode);
- }
- }
-
-HbSystemNetworkInfo::NetworkStatus HbSystemNetworkInfoPrivate::networkStatus(HbSystemNetworkInfo::NetworkMode mode)
-{
- switch(mode) {
- case HbSystemNetworkInfo::UnknownMode:
- break;
- case HbSystemNetworkInfo::GsmMode:
- break;
- case HbSystemNetworkInfo::CdmaMode:
- break;
- case HbSystemNetworkInfo::WcdmaMode:
- break;
- case HbSystemNetworkInfo::WlanMode:
- break;
- case HbSystemNetworkInfo::EthernetMode:
- break;
- case HbSystemNetworkInfo::BluetoothMode:
- break;
- case HbSystemNetworkInfo::WimaxMode:
- break;
- };
- return HbSystemNetworkInfo::NoNetworkAvailable;
-}
-
-int HbSystemNetworkInfoPrivate::networkSignalStrength(HbSystemNetworkInfo::NetworkMode mode)
-{
- switch(mode) {
- case HbSystemNetworkInfo::UnknownMode:
- break;
- case HbSystemNetworkInfo::GsmMode:
- break;
- case HbSystemNetworkInfo::CdmaMode:
- break;
- case HbSystemNetworkInfo::WcdmaMode:
- break;
- case HbSystemNetworkInfo::WlanMode:
- break;
- case HbSystemNetworkInfo::EthernetMode:
- break;
- case HbSystemNetworkInfo::BluetoothMode:
- break;
- case HbSystemNetworkInfo::WimaxMode:
- break;
- };
- return -1;
-}
-
-void HbSystemNetworkInfoPrivate::timerEvent(QTimerEvent *event)
-{
- if (event->timerId() == netStrengthTimer.timerId()) {
- networkStrengthTimeout();
- } else if (event->timerId() == netStatusTimer.timerId()) {
- networkStatusTimeout();
- } else {
- QObject::timerEvent(event);
- }
-}
-
-int HbSystemNetworkInfoPrivate::cellId()
-{
- return -1;
-}
-
-int HbSystemNetworkInfoPrivate::locationAreaCode()
-{
- return -1;
-}
-
-// Mobile Country Code
-QString HbSystemNetworkInfoPrivate::currentMobileCountryCode()
-{
- return "No Network";
-}
-
-// Mobile Network Code
-QString HbSystemNetworkInfoPrivate::currentMobileNetworkCode()
-{
- return "No Network";
-}
-
-QString HbSystemNetworkInfoPrivate::homeMobileCountryCode()
-{
- return "No Network";
-}
-
-QString HbSystemNetworkInfoPrivate::homeMobileNetworkCode()
-{
- return "No Network";
-}
-
-QString HbSystemNetworkInfoPrivate::networkName(HbSystemNetworkInfo::NetworkMode mode)
-{
- QString netname = "No network available";
- switch(mode) {
- case HbSystemNetworkInfo::WlanMode:
- break;
- case HbSystemNetworkInfo::EthernetMode:
- break;
- default:
- break;
- };
- return netname;
-}
-
-QString HbSystemNetworkInfoPrivate::macAddress(HbSystemNetworkInfo::NetworkMode mode)
-{
- return interfaceForMode(mode).hardwareAddress();
-}
-
-QNetworkInterface HbSystemNetworkInfoPrivate::interfaceForMode(HbSystemNetworkInfo::NetworkMode mode)
-{
- Q_UNUSED(mode);
- return QNetworkInterface();
-}
-
-HbSystemDeviceInfoPrivate::HbSystemDeviceInfoPrivate(QObject *parent)
- : QObject(parent), currentLevel(0)
-{
- batteryLevelTimer.start(10000, this);
-}
-
-HbSystemDeviceInfoPrivate::~HbSystemDeviceInfoPrivate()
-{
- batteryLevelTimer.stop();
-}
-
-HbSystemDeviceInfo::Profile HbSystemDeviceInfoPrivate::currentProfile()
-{
- return HbSystemDeviceInfo::UnknownProfile;
-}
-
-HbSystemDeviceInfo::InputMethodFlags HbSystemDeviceInfoPrivate::inputMethodType()
-{
- HbSystemDeviceInfo::InputMethodFlags methods;
- return methods;
-}
-
-HbSystemDeviceInfo::PowerState HbSystemDeviceInfoPrivate::currentPowerState()
-{
- return HbSystemDeviceInfo::UnknownPower;
-}
-
-QString HbSystemDeviceInfoPrivate::imei()
-{
- return "Sim Not Available";
-}
-
-QString HbSystemDeviceInfoPrivate::imsi()
-{
- return "Sim Not Available";
-}
-
-QString HbSystemDeviceInfoPrivate::manufacturer()
-{
- return "Unknown";
-}
-
-QString HbSystemDeviceInfoPrivate::model()
-{
- return "Unknown";
-}
-
-QString HbSystemDeviceInfoPrivate::productName()
-{
- return "Unknown";
-}
-
-int HbSystemDeviceInfoPrivate::batteryLevel()
-{
- return 0;
-}
-
-HbSystemDeviceInfo::SimStatus HbSystemDeviceInfoPrivate::simStatus()
-{
- return HbSystemDeviceInfo::SimNotAvailable;
-}
-
-HbSystemDeviceInfo::BatteryStatus HbSystemDeviceInfoPrivate::batteryStatus()
-{
- return HbSystemDeviceInfo::NoBatteryLevel;
-}
-
-bool HbSystemDeviceInfoPrivate::isDeviceLocked()
-{
- return false;
-}
-
-void HbSystemDeviceInfoPrivate::timerEvent(QTimerEvent *event)
-{
- if (event->timerId() == batteryLevelTimer.timerId()) {
- int level = batteryLevel();
- if (level != currentLevel) {
- currentLevel = level;
- emit batteryLevelChanged(currentLevel);
- }
- } else {
- QObject::timerEvent(event);
- }
-}
--- a/src/hbcore/decorators/hbsysteminfo_linux_p_p.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,133 +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 HBSYSTEMINFO_LINUX_P_P_H
-#define HBSYSTEMINFO_LINUX_P_P_H
-
-#include <QObject>
-#include <QBasicTimer>
-
-#include "hbsysteminfo_p.h"
-
-class HbSystemNetworkInfoPrivate : public QObject
-{
- Q_OBJECT
-
-public:
-
- HbSystemNetworkInfoPrivate(QObject *parent = 0);
- virtual ~HbSystemNetworkInfoPrivate();
-
- HbSystemNetworkInfo::NetworkStatus networkStatus(HbSystemNetworkInfo::NetworkMode mode);
- qint32 networkSignalStrength(HbSystemNetworkInfo::NetworkMode mode);
- int cellId();
- int locationAreaCode();
-
- QString currentMobileCountryCode(); // Mobile Country Code
- QString currentMobileNetworkCode(); // Mobile Network Code
-
- QString homeMobileCountryCode();
- QString homeMobileNetworkCode();
-
- QString networkName(HbSystemNetworkInfo::NetworkMode mode);
- QString macAddress(HbSystemNetworkInfo::NetworkMode mode);
-
- QNetworkInterface interfaceForMode(HbSystemNetworkInfo::NetworkMode mode);
-
- void emitNetworkStatusChanged(HbSystemNetworkInfo::NetworkMode, HbSystemNetworkInfo::NetworkStatus);
- void emitNetworkSignalStrengthChanged(HbSystemNetworkInfo::NetworkMode,int);
-
- static HbSystemNetworkInfoPrivate *instance();
-
-signals:
- void networkStatusChanged(HbSystemNetworkInfo::NetworkMode, HbSystemNetworkInfo::NetworkStatus);
- void networkSignalStrengthChanged(HbSystemNetworkInfo::NetworkMode,int);
- void currentMobileCountryCodeChanged(const QString &);
- void currentMobileNetworkCodeChanged(const QString &);
- void networkNameChanged(HbSystemNetworkInfo::NetworkMode, const QString &);
- void networkModeChanged(HbSystemNetworkInfo::NetworkMode);
-
-protected:
- void timerEvent(QTimerEvent *event);
-
-private slots:
- void nlaNetworkChanged();
- void networkStrengthTimeout();
- void networkStatusTimeout();
-
-private:
- quint32 wifiStrength;
- quint32 ethStrength;
-
- QBasicTimer netStrengthTimer;
- QBasicTimer netStatusTimer;
-};
-
-class HbSystemDeviceInfoPrivate : public QObject
-{
- Q_OBJECT
-
-public:
-
- HbSystemDeviceInfoPrivate(QObject *parent = 0);
- virtual ~HbSystemDeviceInfoPrivate();
-
- QString imei();
- QString imsi();
- QString manufacturer();
- QString model();
- QString productName();
-
- HbSystemDeviceInfo::InputMethodFlags inputMethodType();
-
- int batteryLevel();
- HbSystemDeviceInfo::BatteryStatus batteryStatus();
-
- HbSystemDeviceInfo::SimStatus simStatus();
- bool isDeviceLocked();
- HbSystemDeviceInfo::Profile currentProfile();
-
- HbSystemDeviceInfo::PowerState currentPowerState();
- void setConnection();
-
-signals:
- void batteryLevelChanged(int);
- void batteryStatusChanged(HbSystemDeviceInfo::BatteryStatus);
-
- void powerStateChanged(HbSystemDeviceInfo::PowerState);
- void currentProfileChanged(HbSystemDeviceInfo::Profile);
- void bluetoothStateChanged(bool);
-
-protected:
- void timerEvent(QTimerEvent *event);
-
-private:
- QBasicTimer batteryLevelTimer;
- int currentLevel;
-};
-
-#endif /*HBSYSTEMINFO_LINUX_P_P_H*/
-
-
--- a/src/hbcore/decorators/hbsysteminfo_p.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,185 +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 HBSYSTEMINFO_H
-#define HBSYSTEMINFO_H
-
-#include <QObject>
-#include <QNetworkInterface>
-
-#include "hbglobal.h"
-#include "hbnamespace.h"
-
-class HbSystemNetworkInfoPrivate;
-class HbSystemDeviceInfoPrivate;
-
-class HB_CORE_PRIVATE_EXPORT HbSystemNetworkInfo : public QObject
-{
- Q_OBJECT
- Q_ENUMS(NetworkStatus)
- Q_ENUMS(NetworkMode)
-
-public:
-
- HbSystemNetworkInfo(QObject *parent = 0);
- virtual ~HbSystemNetworkInfo();
-
- enum NetworkStatus {
- UndefinedStatus = 0,
- NoNetworkAvailable,
- EmergencyOnly,
- Searching,
- Busy,
- Connected,
- HomeNetwork,
- Denied,
- Roaming
- };
-
- enum NetworkMode {
- UnknownMode=0,
- GsmMode,
- CdmaMode,
- WcdmaMode,
- WlanMode,
- EthernetMode,
- BluetoothMode,
- WimaxMode
- };
- Q_DECLARE_FLAGS(NetworkModes, NetworkMode)
-
- HbSystemNetworkInfo::NetworkStatus networkStatus(HbSystemNetworkInfo::NetworkMode mode) const;
- int networkSignalStrength(HbSystemNetworkInfo::NetworkMode mode) const;
- QString macAddress(HbSystemNetworkInfo::NetworkMode mode) const;
-
- int cellId() const;
- int locationAreaCode() const;
-
- QString currentMobileCountryCode() const;
- QString currentMobileNetworkCode() const;
- QString homeMobileCountryCode() const;
- QString homeMobileNetworkCode() const;
- QString networkName(HbSystemNetworkInfo::NetworkMode mode) const;
- QNetworkInterface interfaceForMode(HbSystemNetworkInfo::NetworkMode mode) const;
-
-signals:
- void networkStatusChanged(HbSystemNetworkInfo::NetworkMode, HbSystemNetworkInfo::NetworkStatus);
- void networkSignalStrengthChanged(HbSystemNetworkInfo::NetworkMode, int);
- void currentMobileCountryCodeChanged(const QString &);
- void currentMobileNetworkCodeChanged(const QString &);
- void networkNameChanged(HbSystemNetworkInfo::NetworkMode,const QString &);
- void networkModeChanged(HbSystemNetworkInfo::NetworkMode);
-
-private:
- HbSystemNetworkInfoPrivate *d;
-};
-
-class HB_CORE_PRIVATE_EXPORT HbSystemDeviceInfo : public QObject
-{
- Q_OBJECT
- Q_PROPERTY(Profile currentProfile READ currentProfile)
- Q_PROPERTY(PowerState currentPowerState READ currentPowerState)
- Q_PROPERTY(SimStatus simStatus READ simStatus)
-
- Q_ENUMS(BatteryLevel)
- Q_ENUMS(PowerState)
- Q_ENUMS(InputMethod)
-
-public:
-
- HbSystemDeviceInfo(QObject *parent = 0);
- virtual ~HbSystemDeviceInfo();
-
- enum BatteryStatus {
- NoBatteryLevel = 0,
- BatteryCritical,
- BatteryVeryLow,
- BatteryLow,
- BatteryNormal
- };
-
- enum PowerState {
- UnknownPower = 0,
- BatteryPower,
- WallPower,
- WallPowerChargingBattery
- };
-
- enum InputMethod {
- Keys = 0x0000001,
- Keypad = 0x0000002,
- Keyboard = 0x0000004,
- SingleTouch = 0x0000008,
- MultiTouch = 0x0000010,
- Mouse = 0x0000020
- };
- Q_DECLARE_FLAGS(InputMethodFlags, InputMethod)
-
- HbSystemDeviceInfo::InputMethodFlags inputMethodType() const;
-
- QString imei() const;
- QString imsi() const;
- QString manufacturer() const;
- QString model() const; //external
- QString productName() const; //internal name
-
- int batteryLevel() const; //signal
- HbSystemDeviceInfo::BatteryStatus batteryStatus() const;
-
- enum Profile {
- UnknownProfile = 0,
- SilentProfile,
- NormalProfile,
- LoudProfile,
- VibProfile,
- OfflineProfile,
- PowersaveProfile,
- CustomProfile
- };
-
- enum SimStatus {
- SimNotAvailable = 0,
- SingleSimAvailable,
- DualSimAvailable,
- SimLocked
- };
-
- bool isDeviceLocked() const;
- HbSystemDeviceInfo::SimStatus simStatus() const;
- HbSystemDeviceInfo::Profile currentProfile() const;
- HbSystemDeviceInfo::PowerState currentPowerState() const;
-
-signals:
- void batteryLevelChanged(int);
- void batteryStatusChanged(HbSystemDeviceInfo::BatteryStatus );
- void powerStateChanged(HbSystemDeviceInfo::PowerState);
- void currentProfileChanged(HbSystemDeviceInfo::Profile);
- void bluetoothStateChanged(bool);
-
-private:
- HbSystemDeviceInfoPrivate *d;
-};
-
-#endif /*HBSYSTEMINFO_H*/
--- a/src/hbcore/decorators/hbsysteminfo_sym.cpp Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,338 +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 "hbsysteminfo_sym_p_p.h"
-#include <QDebug>
-
-Q_GLOBAL_STATIC(HbSystemNetworkInfoPrivate, hbSystemNetworkInfoPrivate)
-
-HbSystemNetworkInfoPrivate::HbSystemNetworkInfoPrivate(QObject *parent)
- : QObject(parent)
-{
- networkSignalMonitor = new CNetworkSignalMonitor(*this);
- TRAP(iError, networkSignalMonitor->ConstructL();)
- networkModeMonitor = new CNetworkModeMonitor(*this);
- TRAP(iError, networkModeMonitor->ConstructL();)
-}
-
-HbSystemNetworkInfoPrivate::~HbSystemNetworkInfoPrivate()
-{
- delete networkSignalMonitor;
- delete networkModeMonitor;
-}
-
-HbSystemNetworkInfoPrivate *HbSystemNetworkInfoPrivate::instance()
-{
- return hbSystemNetworkInfoPrivate();
-}
-
-void HbSystemNetworkInfoPrivate::emitNetworkStatusChanged(HbSystemNetworkInfo::NetworkMode mode,
- HbSystemNetworkInfo::NetworkStatus status)
-{
- emit networkStatusChanged(mode, status);
-}
-
-void HbSystemNetworkInfoPrivate::emitNetworkSignalStrengthChanged(HbSystemNetworkInfo::NetworkMode mode,
- int strength)
-{
- emit networkSignalStrengthChanged(mode, strength);
-}
-
-HbSystemNetworkInfo::NetworkStatus HbSystemNetworkInfoPrivate::networkStatus(
- HbSystemNetworkInfo::NetworkMode mode) const
-{
- switch(mode) {
- case HbSystemNetworkInfo::GsmMode:
- break;
- case HbSystemNetworkInfo::CdmaMode:
- break;
- case HbSystemNetworkInfo::WcdmaMode:
- break;
- case HbSystemNetworkInfo::WlanMode:
- break;
- case HbSystemNetworkInfo::EthernetMode:
- break;
- case HbSystemNetworkInfo::BluetoothMode:
- break;
- case HbSystemNetworkInfo::WimaxMode:
- break;
- };
- return HbSystemNetworkInfo::NoNetworkAvailable;
-}
-
-int HbSystemNetworkInfoPrivate::networkSignalStrength(HbSystemNetworkInfo::NetworkMode mode) const
-{
- switch(mode) {
- case HbSystemNetworkInfo::GsmMode:
- return networkSignalMonitor->signalStrength();
- case HbSystemNetworkInfo::CdmaMode:
- return networkSignalMonitor->signalStrength();
- case HbSystemNetworkInfo::WcdmaMode:
- return networkSignalMonitor->signalStrength();
- case HbSystemNetworkInfo::WlanMode:
- break;
- case HbSystemNetworkInfo::EthernetMode:
- break;
- case HbSystemNetworkInfo::BluetoothMode:
- break;
- case HbSystemNetworkInfo::WimaxMode:
- break;
- };
- return -1;
-}
-
-int HbSystemNetworkInfoPrivate::cellId() const
-{
- return -1;
-}
-
-int HbSystemNetworkInfoPrivate::locationAreaCode() const
-{
- return -1;
-}
-
-// Mobile Country Code
-QString HbSystemNetworkInfoPrivate::currentMobileCountryCode() const
-{
- return "No Network";
-}
-
-// Mobile Network Code
-QString HbSystemNetworkInfoPrivate::currentMobileNetworkCode() const
-{
- return "No Network";
-}
-
-QString HbSystemNetworkInfoPrivate::homeMobileCountryCode() const
-{
- return "No Network";
-}
-
-QString HbSystemNetworkInfoPrivate::homeMobileNetworkCode() const
-{
- return "No Network";
-}
-
-QString HbSystemNetworkInfoPrivate::networkName(HbSystemNetworkInfo::NetworkMode mode) const
-{
- QString netname = "No network available";
- switch(mode) {
- case HbSystemNetworkInfo::WlanMode:
- break;
- case HbSystemNetworkInfo::EthernetMode:
- break;
- default:
- break;
- };
- return netname;
-}
-
-QString HbSystemNetworkInfoPrivate::macAddress(HbSystemNetworkInfo::NetworkMode mode) const
-{
- return interfaceForMode(mode).hardwareAddress();
-}
-
-QNetworkInterface HbSystemNetworkInfoPrivate::interfaceForMode(HbSystemNetworkInfo::NetworkMode mode) const
-{
- QList<QNetworkInterface> interfaceList;
- interfaceList = QNetworkInterface::allInterfaces();
- qWarning() << "number of interfaces" << interfaceList.count();
-
- for(int i = 0; i < interfaceList.count(); i++) {
- QNetworkInterface netInterface = interfaceList.at(i);
- qWarning() << netInterface.name() << netInterface.hardwareAddress()
- << netInterface.flags() << "mode" << mode;
- if (!netInterface.isValid() || (netInterface.flags() & QNetworkInterface::IsLoopBack)) {
- continue;
- }
- } //end interfaceList
-
- return QNetworkInterface();
-}
-
-// From MNetworkSignalObserver
-void HbSystemNetworkInfoPrivate::SignalStatusL(TInt32 aStrength, TInt8 aBars)
-{
- switch (aBars)
- {
- case 0:
- aStrength = 0;
- break;
- case 1:
- aStrength = 14;
- break;
- case 2:
- aStrength = 29;
- break;
- case 3:
- aStrength = 43;
- break;
- case 4:
- aStrength = 57;
- break;
- case 5:
- aStrength = 72;
- break;
- case 6:
- aStrength = 86;
- break;
- case 7:
- aStrength = 100;
- break;
- default:
- aStrength = aBars;
- break;
- }
- emit networkSignalStrengthChanged(networkMode(networkModeMonitor->networkMode()), aStrength);
-}
-
-// From MNetworkModeObserver
-void HbSystemNetworkInfoPrivate::NetWorkModeChanged(CTelephony::TNetworkMode aMode)
-{
- emit networkModeChanged(networkMode(aMode));
-}
-
-HbSystemNetworkInfo::NetworkMode HbSystemNetworkInfoPrivate::networkMode(CTelephony::TNetworkMode aMode) const
-{
- HbSystemNetworkInfo::NetworkMode mode(HbSystemNetworkInfo::UnknownMode);
- switch (aMode)
- {
- case CTelephony::ENetworkModeUnknown:
- mode = HbSystemNetworkInfo::UnknownMode;
- break;
- case CTelephony::ENetworkModeUnregistered:
- mode = HbSystemNetworkInfo::UnknownMode;
- break;
- case CTelephony::ENetworkModeGsm:
- mode = HbSystemNetworkInfo::GsmMode;
- break;
- case CTelephony::ENetworkModeCdma95:
- case CTelephony::ENetworkModeCdma2000:
- mode = HbSystemNetworkInfo::WcdmaMode;
- break;
- case CTelephony::ENetworkModeWcdma:
- case CTelephony::ENetworkModeTdcdma:
- mode = HbSystemNetworkInfo::WcdmaMode;
- break;
- default:
- mode = HbSystemNetworkInfo::UnknownMode;
- break;
- }
- return mode;
-}
-
-HbSystemDeviceInfoPrivate::HbSystemDeviceInfoPrivate(QObject *parent)
- : QObject(parent)
-{
- batteryMonitor = new CBatteryMonitor(*this);
- TRAP(iError, batteryMonitor->ConstructL();)
- indicatorMonitor = new CIndicatorMonitor(*this);
- TRAP(iError, indicatorMonitor->ConstructL();)
-}
-
-HbSystemDeviceInfoPrivate::~HbSystemDeviceInfoPrivate()
-{
- delete batteryMonitor;
- delete indicatorMonitor;
-}
-
-HbSystemDeviceInfo::Profile HbSystemDeviceInfoPrivate::currentProfile() const
-{
- return HbSystemDeviceInfo::UnknownProfile;
-}
-
-HbSystemDeviceInfo::InputMethodFlags HbSystemDeviceInfoPrivate::inputMethodType() const
-{
- HbSystemDeviceInfo::InputMethodFlags methods;
- return methods;
-}
-
-HbSystemDeviceInfo::PowerState HbSystemDeviceInfoPrivate::currentPowerState() const
-{
- return HbSystemDeviceInfo::UnknownPower;
-}
-
-QString HbSystemDeviceInfoPrivate::imei() const
-{
- return "Sim Not Available";
-}
-
-QString HbSystemDeviceInfoPrivate::imsi() const
-{
- return "Sim Not Available";
-}
-
-QString HbSystemDeviceInfoPrivate::manufacturer() const
-{
- return "Unknown";
-}
-
-QString HbSystemDeviceInfoPrivate::model() const
-{
- return "Unknown";
-}
-
-QString HbSystemDeviceInfoPrivate::productName() const
-{
- return "Unknown";
-}
-
-int HbSystemDeviceInfoPrivate::batteryLevel()
-{
- return batteryMonitor->batteryLevel();
-}
-
-HbSystemDeviceInfo::SimStatus HbSystemDeviceInfoPrivate::simStatus() const
-{
- return HbSystemDeviceInfo::SimNotAvailable;
-}
-
-HbSystemDeviceInfo::BatteryStatus HbSystemDeviceInfoPrivate::batteryStatus() const
-{
- return HbSystemDeviceInfo::NoBatteryLevel;
-}
-
-bool HbSystemDeviceInfoPrivate::isDeviceLocked() const
-{
- return false;
-}
-
-// From MNetworkSignalObserver
-void HbSystemDeviceInfoPrivate::BatteryLevelL(TUint aChargeLevel, CTelephony::TBatteryStatus aBatteryStatus)
-{
- Q_UNUSED(aBatteryStatus);
- emit batteryLevelChanged(aChargeLevel);
-}
-
-// From MIndicatorObserver
-void HbSystemDeviceInfoPrivate::ChargerConnected(TUint32 state)
-{
- if (state) {
- emit powerStateChanged(HbSystemDeviceInfo::WallPowerChargingBattery);
- } else {
- emit powerStateChanged(HbSystemDeviceInfo::BatteryPower);
- }
-}
-
--- a/src/hbcore/decorators/hbsysteminfo_sym_p_p.h Mon May 03 12:48:33 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 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 HBSYSTEMINFO_SYM_P_P_H
-#define HBSYSTEMINFO_SYM_P_P_H
-
-#include <QObject>
-
-#include "hbsysteminfo_p.h"
-#include "hbnetworksignalmonitor_sym_p.h"
-#include "hbbatterymonitor_sym_p.h"
-#include "hbindicatormonitor_sym_p.h"
-#include "hbnetworkmodemonitor_sym_p.h"
-
-class HbSystemNetworkInfoPrivate : public QObject, public MNetworkSignalObserver, public MNetworkModeObserver
-{
- Q_OBJECT
-
-public:
-
- HbSystemNetworkInfoPrivate(QObject *parent = 0);
- virtual ~HbSystemNetworkInfoPrivate();
-
- HbSystemNetworkInfo::NetworkStatus networkStatus(HbSystemNetworkInfo::NetworkMode mode) const;
- int networkSignalStrength(HbSystemNetworkInfo::NetworkMode mode) const;
- int cellId() const;
- int locationAreaCode() const;
-
- QString currentMobileCountryCode() const; // Mobile Country Code
- QString currentMobileNetworkCode() const; // Mobile Network Code
-
- QString homeMobileCountryCode() const;
- QString homeMobileNetworkCode() const;
-
- QString networkName(HbSystemNetworkInfo::NetworkMode mode) const;
- QString macAddress(HbSystemNetworkInfo::NetworkMode mode) const;
-
- QNetworkInterface interfaceForMode(HbSystemNetworkInfo::NetworkMode mode) const;
-
- void emitNetworkStatusChanged(HbSystemNetworkInfo::NetworkMode, HbSystemNetworkInfo::NetworkStatus);
- void emitNetworkSignalStrengthChanged(HbSystemNetworkInfo::NetworkMode,int);
-
- static HbSystemNetworkInfoPrivate *instance();
-
- // From MNetworkSignalObserver
- void SignalStatusL(TInt32 aStrength, TInt8 aBars);
-
- // From MNetworkModeObserver
- void NetWorkModeChanged(CTelephony::TNetworkMode aMode);
-
-signals:
- void networkStatusChanged(HbSystemNetworkInfo::NetworkMode, HbSystemNetworkInfo::NetworkStatus);
- void networkSignalStrengthChanged(HbSystemNetworkInfo::NetworkMode, int);
- void currentMobileCountryCodeChanged(const QString &);
- void currentMobileNetworkCodeChanged(const QString &);
- void networkNameChanged(HbSystemNetworkInfo::NetworkMode, const QString &);
- void networkModeChanged(HbSystemNetworkInfo::NetworkMode);
-
-private:
- HbSystemNetworkInfo::NetworkMode networkMode(CTelephony::TNetworkMode aMode) const;
-
-private:
- quint32 wifiStrength;
- quint32 ethStrength;
-
- CNetworkSignalMonitor *networkSignalMonitor;
- CNetworkModeMonitor *networkModeMonitor;
- mutable int iError;
-};
-
-class HbSystemDeviceInfoPrivate : public QObject, public MBatteryObserver, public MIndicatorObserver
-{
- Q_OBJECT
-
-public:
-
- HbSystemDeviceInfoPrivate(QObject *parent = 0);
- virtual ~HbSystemDeviceInfoPrivate();
-
- QString imei() const;
- QString imsi() const;
- QString manufacturer() const;
- QString model() const;
- QString productName() const;
-
- HbSystemDeviceInfo::InputMethodFlags inputMethodType() const;
-
- int batteryLevel();
- HbSystemDeviceInfo::BatteryStatus batteryStatus() const;
-
- HbSystemDeviceInfo::SimStatus simStatus() const;
- bool isDeviceLocked() const;
- HbSystemDeviceInfo::Profile currentProfile() const;
-
- HbSystemDeviceInfo::PowerState currentPowerState() const;
- void setConnection();
-
- // From MBatteryObserver
- void BatteryLevelL(TUint aChargeLevel, CTelephony::TBatteryStatus aBatteryStatus);
- // From MIndicatorObserver
- void ChargerConnected(TUint32 state);
-
-signals:
- void batteryLevelChanged(int);
- void batteryStatusChanged(HbSystemDeviceInfo::BatteryStatus);
-
- void powerStateChanged(HbSystemDeviceInfo::PowerState);
- void currentProfileChanged(HbSystemDeviceInfo::Profile);
- void bluetoothStateChanged(bool);
-
-private:
- CBatteryMonitor *batteryMonitor;
- CIndicatorMonitor *indicatorMonitor;
- mutable int iError;
-};
-
-#endif /*HBSYSTEMINFO_SYM_P_P_H*/
-
-
--- a/src/hbcore/decorators/hbsysteminfo_win.cpp Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,636 +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 "hbsysteminfo_win_p_p.h"
-
-#include <QTimerEvent>
-
-#ifndef Q_CC_MINGW
-#include "hbwmihelper_win_p.h"
-#endif
-
-#ifdef Q_OS_WINCE
-#include <vibrate.h>
-#include <Led_drvr.h>
-#include <simmgr.h>
-#include <Ifapi.h>
-#include <Winbase.h>
-#endif
-
-Q_GLOBAL_STATIC(HbSystemNetworkInfoPrivate, hbSystemNetworkInfoPrivate)
-
-HbSystemNetworkInfoPrivate::HbSystemNetworkInfoPrivate(QObject *parent)
- : QObject(parent)
-{
-#ifndef Q_CC_MINGW
- wHelper = new WMIHelper(this);
- wHelper->setWmiNamespace("root/cimv2");
- wHelper->setClassName("Win32_NetworkAdapter");
- wHelper->setClassProperty(QStringList() << "NetConnectionStatus");
-#endif // Q_CC_MINGW
-
- netStrengthTimer.start(1000, this);
-}
-
-HbSystemNetworkInfoPrivate::~HbSystemNetworkInfoPrivate()
-{
- netStrengthTimer.stop();
-#ifndef Q_CC_MINGW
- delete wHelper;
-#endif // Q_CC_MINGW
-}
-
-HbSystemNetworkInfoPrivate *HbSystemNetworkInfoPrivate::instance()
-{
- return hbSystemNetworkInfoPrivate();
-}
-
-void HbSystemNetworkInfoPrivate::emitNetworkStatusChanged(HbSystemNetworkInfo::NetworkMode mode, HbSystemNetworkInfo::NetworkStatus status)
-{
- // networkStatus(mode);
- emit networkStatusChanged(mode, status);
-}
-
-void HbSystemNetworkInfoPrivate::emitNetworkSignalStrengthChanged(HbSystemNetworkInfo::NetworkMode mode,int strength)
-{
- emit networkSignalStrengthChanged(mode, strength);
-}
-
-void HbSystemNetworkInfoPrivate::nlaNetworkChanged()
-{
- qWarning() << Q_FUNC_INFO;
-}
-
-void HbSystemNetworkInfoPrivate::networkStrengthTimeout()
-{
-// qWarning() << __FUNCTION__;
- QList<HbSystemNetworkInfo::NetworkMode> modeList;
- modeList << HbSystemNetworkInfo::GsmMode;
- modeList << HbSystemNetworkInfo::CdmaMode;
- modeList << HbSystemNetworkInfo::WcdmaMode;
- modeList << HbSystemNetworkInfo::WlanMode;
- modeList << HbSystemNetworkInfo::EthernetMode;
- modeList << HbSystemNetworkInfo::BluetoothMode;
- modeList << HbSystemNetworkInfo::WimaxMode;
-
- foreach(HbSystemNetworkInfo::NetworkMode mode, modeList) {
- networkSignalStrength(mode);
- }
- }
-
-void HbSystemNetworkInfoPrivate::networkStatusTimeout()
-{
- qWarning() << __FUNCTION__;
- QList<HbSystemNetworkInfo::NetworkMode> modeList;
- modeList << HbSystemNetworkInfo::GsmMode;
- modeList << HbSystemNetworkInfo::CdmaMode;
- modeList << HbSystemNetworkInfo::WcdmaMode;
- modeList << HbSystemNetworkInfo::WlanMode;
- modeList << HbSystemNetworkInfo::EthernetMode;
- modeList << HbSystemNetworkInfo::BluetoothMode;
- modeList << HbSystemNetworkInfo::WimaxMode;
-
- foreach(HbSystemNetworkInfo::NetworkMode mode, modeList) {
- networkStatus(mode);
- }
- }
-
-HbSystemNetworkInfo::NetworkStatus HbSystemNetworkInfoPrivate::networkStatus(HbSystemNetworkInfo::NetworkMode mode)
-{
- switch(mode) {
- case HbSystemNetworkInfo::GsmMode:
- break;
- case HbSystemNetworkInfo::CdmaMode:
- break;
- case HbSystemNetworkInfo::WcdmaMode:
- break;
- case HbSystemNetworkInfo::WlanMode:
- break;
- case HbSystemNetworkInfo::EthernetMode:
- {
-#ifndef Q_CC_MINGW
- QVariant v = wHelper->getWMIData();
- if(v.toUInt() == 2) {
- return HbSystemNetworkInfo::Connected;
- }
-#endif
- }
- break;
- case HbSystemNetworkInfo::BluetoothMode:
- {
-#ifndef Q_CC_MINGW
- QString cond;
- cond = QString("WHERE MACAddress = '%1'").arg( interfaceForMode(mode).hardwareAddress());
- wHelper->setConditional(cond.toLatin1());
- QVariant v = wHelper->getWMIData();
- if(v.toUInt() == 2) {
- return HbSystemNetworkInfo::Connected;
- }
-#endif
- }
- break;
- case HbSystemNetworkInfo::WimaxMode:
- break;
- default:
- break;
- };
- return HbSystemNetworkInfo::NoNetworkAvailable;
-}
-
-int HbSystemNetworkInfoPrivate::networkSignalStrength(HbSystemNetworkInfo::NetworkMode mode)
-{
- switch(mode) {
- case HbSystemNetworkInfo::GsmMode:
- break;
- case HbSystemNetworkInfo::CdmaMode:
- break;
- case HbSystemNetworkInfo::WcdmaMode:
- break;
- case HbSystemNetworkInfo::WlanMode:
- break;
- case HbSystemNetworkInfo::EthernetMode:
- {
-// qWarning() << "checking ethernet signal";
-#ifndef Q_CC_MINGW
- QString cond;
- cond = QString("WHERE MACAddress = '%1'").arg(interfaceForMode(mode).hardwareAddress());
- wHelper->setConditional(cond.toLatin1());
- QVariant v = wHelper->getWMIData();
- quint32 strength = v.toUInt();
- quint32 tmpStrength;
- //qWarning() << strength << ethStrength;
-
- if( strength == 2
- || strength == 9) {
- tmpStrength = 100;
- } else {
- tmpStrength = 0;
- }
-
- if(tmpStrength != ethStrength) {
- ethStrength = tmpStrength;
- emit networkSignalStrengthChanged(mode, ethStrength);
- }
- return ethStrength;
-#endif
- }
- break;
- case HbSystemNetworkInfo::BluetoothMode:
- break;
- case HbSystemNetworkInfo::WimaxMode:
- break;
- default:
- break;
- };
- return -1;
-}
-
-void HbSystemNetworkInfoPrivate::timerEvent(QTimerEvent *event)
-{
- if (event->timerId() == netStrengthTimer.timerId()) {
- networkStrengthTimeout();
- netStrengthTimer.start(100000, this);
- } else if (event->timerId() == netStatusTimer.timerId()) {
- networkStatusTimeout();
- } else {
- QObject::timerEvent(event);
- }
-}
-
-int HbSystemNetworkInfoPrivate::cellId()
-{
- return -1;
-}
-
-int HbSystemNetworkInfoPrivate::locationAreaCode()
-{
- return -1;
-}
-
-// Mobile Country Code
-QString HbSystemNetworkInfoPrivate::currentMobileCountryCode()
-{
- return "No Network";
-}
-
-// Mobile Network Code
-QString HbSystemNetworkInfoPrivate::currentMobileNetworkCode()
-{
- return "No Network";
-}
-
-QString HbSystemNetworkInfoPrivate::homeMobileCountryCode()
-{
- return "No Network";
-}
-
-QString HbSystemNetworkInfoPrivate::homeMobileNetworkCode()
-{
- return "No Network";
-}
-
-QString HbSystemNetworkInfoPrivate::networkName(HbSystemNetworkInfo::NetworkMode mode)
-{
- QString netname = "No network available";
- switch(mode) {
- case HbSystemNetworkInfo::WlanMode:
- break;
- case HbSystemNetworkInfo::EthernetMode:
- break;
- default:
- break;
- };
- return netname;
-}
-
-QString HbSystemNetworkInfoPrivate::macAddress(HbSystemNetworkInfo::NetworkMode mode)
-{
- return interfaceForMode(mode).hardwareAddress();
-}
-
-QNetworkInterface HbSystemNetworkInfoPrivate::interfaceForMode(HbSystemNetworkInfo::NetworkMode mode)
-{
- QList<QNetworkInterface> interfaceList;
- interfaceList = QNetworkInterface::allInterfaces();
-// qWarning() << "number of interfaces" << interfaceList.count();
-
- for(int i = 0; i < interfaceList.count(); i++) {
- QNetworkInterface netInterface = interfaceList.at(i);
- //qWarning() << netInterface.name() << netInterface.hardwareAddress() << netInterface.flags() << "mode" << mode;
- if (!netInterface.isValid() || (netInterface.flags() & QNetworkInterface::IsLoopBack)) {
- continue;
- }
-
-#ifndef Q_CC_MINGW
- unsigned long oid;
- DWORD bytesWritten;
-
- NDIS_MEDIUM medium ;
- NDIS_PHYSICAL_MEDIUM physicalMedium = NdisPhysicalMediumUnspecified;
-
- HANDLE handle = CreateFile((TCHAR *)QString("\\\\.\\%1").arg(netInterface.name()).utf16(), 0,
- FILE_SHARE_READ, 0, OPEN_EXISTING, 0, 0);
- if (handle == INVALID_HANDLE_VALUE) {
- qWarning() << "Invalid handle";
- continue/*return QNetworkInterface()*/;
- }
-
- oid = OID_GEN_MEDIA_SUPPORTED;
- bytesWritten;
- bool result = DeviceIoControl(handle, IOCTL_NDIS_QUERY_GLOBAL_STATS, &oid, sizeof(oid),
- &medium, sizeof(medium), &bytesWritten, 0);
- if (!result) {
- CloseHandle(handle);
- qWarning() << "DeviceIo result is false";
-// return QNetworkInterface();
- continue;
- }
-
- oid = OID_GEN_PHYSICAL_MEDIUM;
- bytesWritten = 0;
- result = DeviceIoControl(handle, IOCTL_NDIS_QUERY_GLOBAL_STATS, &oid, sizeof(oid),
- &physicalMedium, sizeof(physicalMedium), &bytesWritten, 0);
- if (!result) {
- CloseHandle(handle);
- if (medium == NdisMedium802_3 && mode == HbSystemNetworkInfo::EthernetMode) {
- return netInterface;
- } else {
- continue;
- }
- }
-
- CloseHandle(handle);
-
- if (medium == NdisMedium802_3) {
- switch (physicalMedium) {
- case NdisPhysicalMediumWirelessLan:
- {
- if(mode == HbSystemNetworkInfo::WlanMode) {
- return netInterface;
- }
- }
- break;
- case NdisPhysicalMediumBluetooth:
- {
- if(mode == HbSystemNetworkInfo::BluetoothMode) {
- return netInterface;
- }
- }
- break;
- case NdisPhysicalMediumWiMax:
- {
- if(mode == HbSystemNetworkInfo::WimaxMode) {
- return netInterface;
- }
- }
- break;
- };
- }
-#endif
- } //end interfaceList
-
- return QNetworkInterface();
-}
-
-HbSystemDeviceInfoPrivate::HbSystemDeviceInfoPrivate(QObject *parent)
- : QObject(parent), currentLevel(0)
-{
- batteryLevelTimer.start(1000, this);
-}
-
-HbSystemDeviceInfoPrivate::~HbSystemDeviceInfoPrivate()
-{
- batteryLevelTimer.stop();
-}
-
-HbSystemDeviceInfo::Profile HbSystemDeviceInfoPrivate::currentProfile()
-{
- return HbSystemDeviceInfo::UnknownProfile;
-}
-
-HbSystemDeviceInfo::InputMethodFlags HbSystemDeviceInfoPrivate::inputMethodType()
-{
- HbSystemDeviceInfo::InputMethodFlags methods;
-
- int mouseResult = GetSystemMetrics(SM_CMOUSEBUTTONS);
- if(mouseResult > 0) {
- if((methods & HbSystemDeviceInfo::Mouse) != HbSystemDeviceInfo::Mouse) {
- methods |= HbSystemDeviceInfo::Mouse;
- }
- }
- int tabletResult = GetSystemMetrics(SM_TABLETPC);
- if(tabletResult > 0) {
- if((methods & HbSystemDeviceInfo::SingleTouch) != HbSystemDeviceInfo::SingleTouch) {
- methods |= HbSystemDeviceInfo::SingleTouch;
- }
- }
- int keyboardType = GetKeyboardType(0);
- switch(keyboardType) {
- case 1:
- case 3:
- {
- if((methods & HbSystemDeviceInfo::Keyboard) != HbSystemDeviceInfo::Keyboard) {
- methods |= HbSystemDeviceInfo::Keyboard;
- }
- }
- break;
- case 2:
- case 4:
- {
- if((methods & HbSystemDeviceInfo::Keyboard) != HbSystemDeviceInfo::Keyboard) {
- methods |= HbSystemDeviceInfo::Keyboard;
-
- }
- if((methods & HbSystemDeviceInfo::Keypad) != HbSystemDeviceInfo::Keypad) {
- methods |= HbSystemDeviceInfo::Keypad;
- }
- }
- break;
- case 5:
- {
- if((methods & HbSystemDeviceInfo::Keypad) != HbSystemDeviceInfo::Keypad) {
- methods |= HbSystemDeviceInfo::Keypad;
- }
- }
- break;
- default:
- break;
- };
-
- return methods;
-}
-
-HbSystemDeviceInfo::PowerState HbSystemDeviceInfoPrivate::currentPowerState()
-{
-#ifdef Q_OS_WINCE
- SYSTEM_POWER_STATUS_EX status;
- GetSystemPowerStatusEx(&status, true);
-
-#else
- SYSTEM_POWER_STATUS status;
- GetSystemPowerStatus(&status);
-#endif
-
- if(status.BatteryFlag & BATTERY_FLAG_CHARGING)
- return HbSystemDeviceInfo::WallPowerChargingBattery;
- if(status.ACLineStatus == AC_LINE_ONLINE)
- return HbSystemDeviceInfo::WallPower;
- if(status.ACLineStatus == AC_LINE_OFFLINE)
- return HbSystemDeviceInfo::BatteryPower;
-
- return HbSystemDeviceInfo::UnknownPower;
-}
-
-QString HbSystemDeviceInfoPrivate::imei()
-{
-// if(this->getSimStatus() == HbSystemDeviceInfo::SimNotAvailable)
- return "Sim Not Available";
-}
-
-QString HbSystemDeviceInfoPrivate::imsi()
-{
-// if(getSimStatus() == HbSystemDeviceInfo::SimNotAvailable)
- return "Sim Not Available";
-}
-
-QString HbSystemDeviceInfoPrivate::manufacturer()
-{
- QString manu;
-#ifndef Q_CC_MINGW
- WMIHelper *wHelper;
- wHelper = new WMIHelper(this);
- wHelper->setWmiNamespace("root/cimv2");
- wHelper->setClassName("Win32_ComputerSystemProduct");
- wHelper->setClassProperty(QStringList() << "Vendor");
- QVariant v = wHelper->getWMIData();
- manu = v.toString();
- if(manu.isEmpty()) {
- manu = "System manufacturer";
- }
- delete wHelper;
-#endif
- return manu;
-}
-
-QString HbSystemDeviceInfoPrivate::model()
-{
- QString model;
-#ifndef Q_CC_MINGW
- WMIHelper *wHelper;
- wHelper = new WMIHelper(this);
- wHelper->setWmiNamespace("root/cimv2");
-
- wHelper->setClassName("Win32_ComputerSystem");
- wHelper->setClassProperty(QStringList() << "Model");
- QVariant v = wHelper->getWMIData();
- model = v.toString();
-
- wHelper->setClassName("Win32_ComputerSystem");
- wHelper->setClassProperty(QStringList() << "PCSystemType");
- v = wHelper->getWMIData();
- switch(v.toUInt()) {
- case 0:
- model += "";
- break;
- case 1:
- model += "Desktop";
- break;
- case 2:
- model += "Mobile";
- break;
- case 3:
- model += "Workstation";
- break;
- case 4:
- model += "Enterprise Server";
- break;
- case 5:
- model += "Small/Home Server";
- break;
- case 6:
- model += "Applicance PC";
- break;
- case 7:
- model += "Performace Server";
- break;
- case 8:
- model += "Maximum";
- break;
-
- };
- delete wHelper;
-#endif
- return model;
-}
-
-QString HbSystemDeviceInfoPrivate::productName()
-{
- QString name;
-#ifndef Q_CC_MINGW
- WMIHelper *wHelper;
- wHelper = new WMIHelper(this);
- wHelper->setWmiNamespace("root/cimv2");
- wHelper->setClassName("Win32_ComputerSystemProduct");
- wHelper->setClassProperty(QStringList() << "Name");
- QVariant v = wHelper->getWMIData();
- name = v.toString();
-
- if(name.isEmpty()) {
- wHelper->setClassName("Win32_ComputerSystem");
- wHelper->setClassProperty(QStringList() << "PCSystemType");
- v = wHelper->getWMIData();
- name = v.toString();
- if(name.isEmpty()) {
- name = "Unspecified product";
- }
- }
-
- delete wHelper;
-#endif
- return name;
-}
-
-int HbSystemDeviceInfoPrivate::batteryLevel()
-{
-#ifdef Q_OS_WINCE
- SYSTEM_POWER_STATUS_EX status;
- if (GetSystemPowerStatusEx(&statusEx, true) ) {
- qWarning() <<"battery level" <</* status.ACLineStatus << status.BatteryFlag <<*/ status.BatteryLifePercent;
- return status.BatteryLifePercent;
-} else {
- qWarning() << "Battery status failed";
- }
-#else
- int level(0);
- SYSTEM_POWER_STATUS status;
- if (GetSystemPowerStatus(&status) ) {
- if (status.BatteryFlag == 128) {
- level = 100;
- } else {
- level = status.BatteryLifePercent;
- }
- }
-#endif
- return level;
-}
-
-HbSystemDeviceInfo::SimStatus HbSystemDeviceInfoPrivate::simStatus()
-{
-#ifdef Q_OS_WINCE
- HSIM handle;
- DWORD lockedState;
- HRESULT result = SimInitialize(0,NULL,NULL,&handle);
- if(result == S_OK) {
- SimGetPhoneLockedState(handle,&lockedState);
- if(lockedState == SIM_LOCKEDSTATE_READY) {
- return HbSystemDeviceInfo::SingleAvailable;
- } else {
- return HbSystemDeviceInfo::SimLocked;
- }
-
-
- } else if(result == SIM_E_NOSIM) {
- return HbSystemDeviceInfo::SimNotAvailable;
- }
- SimDeinitialize(handle);
-
-#endif
- return HbSystemDeviceInfo::SimNotAvailable;
-}
-
-HbSystemDeviceInfo::BatteryStatus HbSystemDeviceInfoPrivate::batteryStatus()
-{
- return HbSystemDeviceInfo::NoBatteryLevel;
-}
-
-bool HbSystemDeviceInfoPrivate::isDeviceLocked()
-{
-#ifdef Q_OS_WINCE
- HSIM handle;
- DWORD lockedState;
- HRESULT result = SimInitialize(0,NULL,NULL,&handle);
- if(result == S_OK) {
- SimGetPhoneLockedState(handle,&lockedState);
- if(lockedState != SIM_LOCKEDSTATE_READY) {
- return true;
- }
- }
-#endif
- return false;
-}
-
-void HbSystemDeviceInfoPrivate::timerEvent(QTimerEvent *event)
-{
- if (event->timerId() == batteryLevelTimer.timerId()) {
- int level = batteryLevel();
- if (level != currentLevel) {
- currentLevel = level;
- emit batteryLevelChanged(currentLevel);
- }
- batteryLevelTimer.start(100000, this);
- } else {
- QObject::timerEvent(event);
- }
-}
--- a/src/hbcore/decorators/hbsysteminfo_win_p_p.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,147 +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 HBSYSTEMINFO_WIN_P_P_H
-#define HBSYSTEMINFO_WIN_P_P_H
-
-#include <QObject>
-#include <QBasicTimer>
-
-#include <winsock2.h>
-
-#ifdef Q_CC_MSVC
-#include <ntddndis.h>
-#else
-//#include <ddk/ntddndis.h>
-#endif
-
-#include "hbsysteminfo_p.h"
-
-class WMIHelper;
-
-class HbSystemNetworkInfoPrivate : public QObject
-{
- Q_OBJECT
-
-public:
-
- HbSystemNetworkInfoPrivate(QObject *parent = 0);
- virtual ~HbSystemNetworkInfoPrivate();
-
- HbSystemNetworkInfo::NetworkStatus networkStatus(HbSystemNetworkInfo::NetworkMode mode);
- qint32 networkSignalStrength(HbSystemNetworkInfo::NetworkMode mode);
- int cellId();
- int locationAreaCode();
-
- QString currentMobileCountryCode(); // Mobile Country Code
- QString currentMobileNetworkCode(); // Mobile Network Code
-
- QString homeMobileCountryCode();
- QString homeMobileNetworkCode();
-
- QString networkName(HbSystemNetworkInfo::NetworkMode mode);
- QString macAddress(HbSystemNetworkInfo::NetworkMode mode);
-
- QNetworkInterface interfaceForMode(HbSystemNetworkInfo::NetworkMode mode);
-
- void emitNetworkStatusChanged(HbSystemNetworkInfo::NetworkMode, HbSystemNetworkInfo::NetworkStatus);
- void emitNetworkSignalStrengthChanged(HbSystemNetworkInfo::NetworkMode,int);
-
- static HbSystemNetworkInfoPrivate *instance();
-
-signals:
- void networkStatusChanged(HbSystemNetworkInfo::NetworkMode, HbSystemNetworkInfo::NetworkStatus);
- void networkSignalStrengthChanged(HbSystemNetworkInfo::NetworkMode,int);
- void currentMobileCountryCodeChanged(const QString &);
- void currentMobileNetworkCodeChanged(const QString &);
- void networkNameChanged(HbSystemNetworkInfo::NetworkMode, const QString &);
- void networkModeChanged(HbSystemNetworkInfo::NetworkMode);
-
-protected:
- void timerEvent(QTimerEvent *event);
-
-private slots:
- void nlaNetworkChanged();
- void networkStrengthTimeout();
- void networkStatusTimeout();
-
-private:
- quint32 wifiStrength;
- quint32 ethStrength;
-
- QBasicTimer netStrengthTimer;
- QBasicTimer netStatusTimer;
-
-#ifndef Q_CC_MINGW
- WMIHelper *wHelper;
-#endif
-};
-
-class HbSystemDeviceInfoPrivate : public QObject
-{
- Q_OBJECT
-
-public:
-
- HbSystemDeviceInfoPrivate(QObject *parent = 0);
- virtual ~HbSystemDeviceInfoPrivate();
-
- QString imei();
- QString imsi();
- QString manufacturer();
- QString model();
- QString productName();
-
- HbSystemDeviceInfo::InputMethodFlags inputMethodType();
-
- int batteryLevel();
- HbSystemDeviceInfo::BatteryStatus batteryStatus();
-
- HbSystemDeviceInfo::SimStatus simStatus();
- bool isDeviceLocked();
- HbSystemDeviceInfo::Profile currentProfile();
-
- HbSystemDeviceInfo::PowerState currentPowerState();
- void setConnection();
-
-signals:
- void batteryLevelChanged(int);
- void batteryStatusChanged(HbSystemDeviceInfo::BatteryStatus);
-
- void powerStateChanged(HbSystemDeviceInfo::PowerState);
- void currentProfileChanged(HbSystemDeviceInfo::Profile);
- void bluetoothStateChanged(bool);
-
-protected:
- void timerEvent(QTimerEvent *event);
-
-private:
- QBasicTimer batteryLevelTimer;
- int currentLevel;
-};
-
-#endif /*HBSYSTEMINFO_WIN_P_P_H*/
-
-
--- a/src/hbcore/decorators/hbtitlebar.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/decorators/hbtitlebar.cpp Fri May 14 16:09:54 2010 +0300
@@ -25,8 +25,6 @@
#include <QGraphicsSceneMouseEvent>
-#include <hbgesture.h>
-#include <hbgesturefilter.h>
#include <hbview.h>
#include <hbdeviceprofile.h>
#include <hbmenu.h>
@@ -44,7 +42,6 @@
#include "hbindicatorbutton_p.h"
#include "hbtitlebarhandle_p.h"
#include "hbtitlepane_p.h"
-#include "hbsoftkey_p.h"
/*
\class HbTitleBar
@@ -53,8 +50,8 @@
*/
HbTitleBarPrivate::HbTitleBarPrivate() :
- mMainWindow(0), mTitlePane(0), mNavigationButton(0), mIndicatorButton(0), mTitleBarFilter(0),
- mTitleBarGestureLeft(0), mTitleBarGestureRight(0), mTitleBarHandle(0), mTouchAreaItem(0)
+ mMainWindow(0), mTitlePane(0), mNavigationButton(0), mIndicatorButton(0),
+ mTitleBarHandle(0), mTouchAreaItem(0)
{
}
@@ -74,7 +71,10 @@
#endif
q->connect(mTitlePane, SIGNAL(launchPopup(QPointF)), mMainWindow, SLOT(_q_launchMenu(QPointF)));
- q->connect(q, SIGNAL(notificationCountChanged(int)), mIndicatorButton, SLOT(setIcon(int)));
+ q->connect(q, SIGNAL(activated(const QList<IndicatorClientInfo> &)),
+ mIndicatorButton, SLOT(activate(const QList<IndicatorClientInfo> &)));
+ q->connect(q, SIGNAL(deactivated(const QList<IndicatorClientInfo> &)),
+ mIndicatorButton, SLOT(deactivate(const QList<IndicatorClientInfo> &)));
q->connect(mMainWindow, SIGNAL(currentViewChanged(HbView*)), q, SLOT(currentViewChanged(HbView*)));
q->connect(mDefaultNavigationAction, SIGNAL(triggered()), qApp, SLOT(quit()));
}
@@ -91,6 +91,11 @@
mNavigationButton = new HbNavigationButton(q);
// add default quit action
mDefaultNavigationAction = new HbAction(Hb::QuitNaviAction, q);
+ HbIcon icon = HbIcon(mDefaultNavigationAction->icon().iconName());
+ // the default action's icon should mirror in case of a layout direction change
+ icon.setMirroringMode(HbIcon::LayoutDirection);
+ mDefaultNavigationAction->setIcon(icon);
+
mDefaultNavigationAction->setText("Quit");
mNavigationButton->setAction(mDefaultNavigationAction);
@@ -283,7 +288,7 @@
QSize screenSize = HbDeviceProfile::profile(this).logicalSize();
QRectF handleRect = d->mTitleBarHandle->boundingRect();
- if (layoutDirection() == Qt::LeftToRight && d->mMainWindow &&
+ if (d->mMainWindow &&
d->mIndicatorButton->isVisible() &&
p == HbTitleBar::Original) {
#ifdef HB_EFFECTS
@@ -293,17 +298,7 @@
#else // no effects, just do the translation
translate(screenSize.width()-handleRect.width(), 0);
#endif //HB_EFFECTS
- } else if (layoutDirection() == Qt::RightToLeft && d->mMainWindow &&
- d->mIndicatorButton->isVisible() &&
- p == HbTitleBar::Minimized) {
-#ifdef HB_EFFECTS
- //grabMouse(); // this prevents taps/gestures on top of animating titlebar
- QRectF extRect(0-(screenSize.width()-handleRect.width()), 0.0, screenSize.width()-handleRect.width(), 10.0);
- HbEffect::start(this, "titlebar", "minimize", this, "effectFinished", QVariant(), extRect);
-#else // no effects, just do the translation
- translate(x()-scenePos().x(), y()-scenePos().y());
-#endif //HB_EFFECTS
- }
+ }
}
/*
@@ -324,7 +319,7 @@
QRectF handleRect = d->mTitleBarHandle->boundingRect();
// only way to reliable find the position of titlebar is using
// titlebar's transformation information
- if (layoutDirection() == Qt::LeftToRight && d->mMainWindow &&
+ if (d->mMainWindow &&
d->mIndicatorButton->isVisible() &&
p == HbTitleBar::Minimized) {
#ifdef HB_EFFECTS
@@ -335,18 +330,7 @@
#else // no effects, just do the translation
translate(x()-scenePos().x(), y()-scenePos().y());
#endif //HB_EFFECTS
- } else if (layoutDirection() == Qt::RightToLeft && d->mMainWindow &&
- d->mIndicatorButton->isVisible() &&
- p == HbTitleBar::Original) {
-#ifdef HB_EFFECTS
- //grabMouse(); // this prevents taps/gestures on top of animating titlebar
- // effect translates widget from rect's right x-coordinate to left x-coordinate
- QRectF extRect(-screenSize.width(), 0.0, screenSize.width()-handleRect.width(), 10.0); // height not used in effect
- HbEffect::start(this, "titlebar", "maximize", this, "effectFinished", QVariant(), extRect);
-#else // no effects, just do the translation
- translate(0-(screenSize.width()-handleRect.width()), 0);
-#endif //HB_EFFECTS
- }
+ }
}
#ifdef HB_EFFECTS
@@ -493,3 +477,32 @@
}
return filterOutEvent;
}
+
+/*!
+ \reimp
+*/
+QGraphicsItem *HbTitleBar::primitive(const QString &itemName) const
+{
+ Q_D(const HbTitleBar);
+ if (itemName == "") {
+ return 0;
+ } else {
+ if (itemName == "title") {
+ return d->mTitlePane;
+ }
+ else if (itemName == "status") {
+ return d->mIndicatorButton;
+ }
+ else if (itemName == "back") {
+ return d->mNavigationButton;
+ }
+ else if (itemName == "handle") {
+ return d->mTitleBarHandle;
+ }
+ else if (itemName == "toucharea") {
+ return d->mTouchAreaItem;
+ } else {
+ return 0;
+ }
+ }
+}
--- a/src/hbcore/decorators/hbtitlebar_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/decorators/hbtitlebar_p.h Fri May 14 16:09:54 2010 +0300
@@ -31,13 +31,13 @@
#ifdef HB_EFFECTS
#include <hbeffect.h>
#endif // HB_EFFECTS
-#include <hbgesture.h>
class HbIndicatorButton;
class HbTitleBarPrivate;
class HbTitlePane;
class HbView;
class HbAction;
+struct IndicatorClientInfo;
class HB_CORE_PRIVATE_EXPORT HbTitleBar : public HbWidget
{
@@ -71,10 +71,12 @@
HbAction *navigationAction() const;
void setNavigationAction(HbAction *action);
void setDefaultNavigationAction();
+ QGraphicsItem *primitive(const QString &itemName) const;
signals:
void titleBarStateChanged();
- void notificationCountChanged(int count);
+ void activated(const QList<IndicatorClientInfo> &clientInfo);
+ void deactivated(const QList<IndicatorClientInfo> &clientInfo);
public slots:
void gestureRight();
--- a/src/hbcore/decorators/hbtitlebar_p_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/decorators/hbtitlebar_p_p.h Fri May 14 16:09:54 2010 +0300
@@ -31,8 +31,6 @@
class HbIndicatorButton;
class HbMainWindow;
-class HbGestureSceneFilter;
-class HbGesture;
class HbNavigationButton;
class HbTitleBarHandle;
@@ -53,9 +51,6 @@
HbTitlePane *mTitlePane;
HbNavigationButton *mNavigationButton;
HbIndicatorButton *mIndicatorButton;
- HbGestureSceneFilter *mTitleBarFilter;
- HbGesture *mTitleBarGestureLeft;
- HbGesture *mTitleBarGestureRight;
HbTitleBarHandle *mTitleBarHandle;
QGraphicsItem *mTouchAreaItem;
HbAction *mDefaultNavigationAction;
--- a/src/hbcore/decorators/hbtitlepane.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/decorators/hbtitlepane.cpp Fri May 14 16:09:54 2010 +0300
@@ -25,8 +25,9 @@
#include "hbtitlepane_p.h"
#include "hbtitlepane_p_p.h"
+#include "hbevent.h"
-#include <hbstyleoptiontitlepane.h>
+#include <hbstyleoptiontitlepane_p.h>
#include <hbapplication.h>
#include <hbwidgetfeedback.h>
#include <hbmainwindow.h>
@@ -65,7 +66,6 @@
Q_Q(HbTitlePane);
q->grabGesture(Qt::TapGesture);
q->grabGesture(Qt::PanGesture);
- updatePrimitives();
}
void HbTitlePanePrivate::init()
@@ -87,10 +87,9 @@
{
Q_Q(HbTitlePane);
- q->setBackgroundItem(HbStyle::P_TitlePane_background);
mTextItem = q->style()->createPrimitive(HbStyle::P_TitlePane_text, q);
-
mIcon = q->style()->createPrimitive(HbStyle::P_TitlePane_icon, q);
+ q->setBackgroundItem(HbStyle::P_TitlePane_background); // calls updatePrimitives
}
void HbTitlePanePrivate::updatePrimitives()
@@ -335,7 +334,9 @@
bool HbTitlePane::eventFilter(QObject *object, QEvent *event)
{
Q_UNUSED(object);
- if (event->type() == QEvent::ActionAdded || event->type() == QEvent::ActionRemoved) {
+ if (event->type() == QEvent::ActionAdded || event->type() == QEvent::ActionRemoved
+ || event->type() == HbEvent::WindowLayoutDirectionChanged)
+ {
repolish();
}
return false;
@@ -363,3 +364,26 @@
}
return HbWidget::itemChange(change, value);
}
+
+/*!
+ \reimp
+*/
+QGraphicsItem *HbTitlePane::primitive(const QString &itemName) const
+{
+ Q_D(const HbTitlePane);
+ if (itemName == "") {
+ return 0;
+ } else {
+ if (itemName == "background") {
+ return this->backgroundItem();
+ }
+ else if (itemName == "text") {
+ return d->mTextItem;
+ }
+ else if (itemName == "icon") {
+ return d->mIcon;
+ } else {
+ return 0;
+ }
+ }
+}
--- a/src/hbcore/decorators/hbtitlepane_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/decorators/hbtitlepane_p.h Fri May 14 16:09:54 2010 +0300
@@ -49,6 +49,7 @@
int type() const { return Type; }
void resetMode();
+ QGraphicsItem *primitive(const QString &itemName) const;
signals:
void launchPopup(const QPointF &pos);
--- a/src/hbcore/decorators/hbwmihelper_win.cpp Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,214 +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 <QtGlobal>
-
-#ifndef Q_CC_MINGW
-#include <objbase.h>
-#include <QDebug>
-
-#include "hbwmihelper_win_p.h"
-
-WMIHelper::WMIHelper(QObject * parent)
- : QObject(parent)
-{
- m_conditional = QString();
-}
-
-WMIHelper::~WMIHelper()
-{
- //wbemServices->Release();
- //wbemLocator->Release();
- CoUninitialize();
-}
-
-QVariant WMIHelper::getWMIData()
-{
- if (!m_wmiNamespace.isEmpty() && !m_className.isEmpty() && !m_classProperties.isEmpty()) {
- return getWMIData(m_wmiNamespace, m_className, m_classProperties);
- }
- return QVariant();
-}
-
-void WMIHelper::initializeWMI(const QString &wmiNamespace)
-{
- HRESULT hres;
- wbemLocator = 0;
-
- hres = CoCreateInstance(CLSID_WbemLocator,0,CLSCTX_INPROC_SERVER,
- IID_IWbemLocator, (LPVOID *) &wbemLocator);
-
- if (hres == CO_E_NOTINITIALIZED) { // COM was not initialized
- CoInitializeEx(0, COINIT_MULTITHREADED);
- hres = CoCreateInstance(CLSID_WbemLocator,0,CLSCTX_INPROC_SERVER,
- IID_IWbemLocator, (LPVOID *) &wbemLocator);
- }
-
- if (hres != S_OK) {
- qWarning() << "Failed to create IWbemLocator object." << hres;
- return ;
- }
- wbemServices = 0;
- hres = wbemLocator->ConnectServer(::SysAllocString((const OLECHAR *)wmiNamespace.utf16()),0,0,0,0,0,0,&wbemServices);
-
- if (hres != WBEM_S_NO_ERROR){
- qWarning() << "Could not connect";
- return ;
- }
-
- hres = CoSetProxyBlanket( wbemServices, RPC_C_AUTHN_WINNT, RPC_C_AUTHZ_NONE, 0,
- RPC_C_AUTHN_LEVEL_CALL, RPC_C_IMP_LEVEL_IMPERSONATE, 0, EOAC_NONE );
-
- if (hres != S_OK) {
- qWarning() << "Could not set proxy blanket" << hres;
- return ;
- }
-
- if (!initializedNamespaces.contains(wmiNamespace)) {
- initializedNamespaces.insert(wmiNamespace, true);
- } else {
- initializedNamespaces[wmiNamespace] = true;
- }
-}
-
-QVariant WMIHelper::getWMIData(const QString &wmiNamespace, const QString &className, const QStringList &classProperty)
-{
- if(!initializedNamespaces.contains(wmiNamespace)) {
- initializeWMI(wmiNamespace);
- }
-
- HRESULT hres;
- QVariant returnVariant;
-
- IEnumWbemClassObject* wbemEnumerator = 0;
- if (!m_conditional.isEmpty()) {
- if (m_conditional.left(1) != " ") {
- m_conditional.prepend(" ");
- }
- }
-
- QString aString = "SELECT * FROM " + className + m_conditional;
- BSTR bstrQuery;
- bstrQuery = ::SysAllocString((const OLECHAR *)aString.utf16());
-
- hres = wbemServices->ExecQuery(L"WQL", bstrQuery,
- WBEM_FLAG_BIDIRECTIONAL | WBEM_FLAG_RETURN_IMMEDIATELY,0,&wbemEnumerator);
-
- if (hres != WBEM_S_NO_ERROR){
- qWarning() << "WMI Query failed.";
- wbemLocator->Release();
- wbemEnumerator->Release();
- return returnVariant;
- }
-
- ::SysFreeString(bstrQuery);
-
- wbemCLassObject = 0;
- ULONG result = 0;
-
- wmiVariantList.clear();
- while (wbemEnumerator) {
- HRESULT hr = wbemEnumerator->Next(WBEM_INFINITE, 1,&wbemCLassObject, &result);
- if(0 == result){
- break;
- }
-
- foreach (QString property, classProperty) {
- VARIANT msVariant;
- CIMTYPE variantType;
- hr = wbemCLassObject->Get((LPCWSTR)property.utf16(), 0, &msVariant, &variantType, 0);
- returnVariant = msVariantToQVariant(msVariant, variantType);
- wmiVariantList << returnVariant;
-
- VariantClear(&msVariant);
- }
- wbemCLassObject->Release();
- }
-
- wbemEnumerator->Release();
- return returnVariant;
-}
-
-QVariant WMIHelper::msVariantToQVariant(VARIANT msVariant, CIMTYPE variantType)
-{
- QVariant returnVariant;
- switch(variantType) {
- case CIM_STRING:
- case CIM_CHAR16:
- {
- QString str((QChar*)msVariant.bstrVal, wcslen(msVariant.bstrVal));
- QVariant vs(str);
- returnVariant = vs;
- }
- break;
- case CIM_BOOLEAN:
- {
- QVariant vb(msVariant.boolVal);
- returnVariant = vb;
- }
- break;
- case CIM_UINT8:
- {
- QVariant vb(msVariant.uintVal);
- returnVariant = vb;
- }
- break;
- case CIM_UINT16:
- {
- QVariant vb(msVariant.uintVal);
- returnVariant = vb;
- }
- case CIM_UINT32:
- {
- QVariant vb(msVariant.uintVal);
- returnVariant = vb;
- }
- break;
- };
- VariantClear(&msVariant);
- return returnVariant;
-}
-
-void WMIHelper::setWmiNamespace(const QString &wmiNamespace)
-{
- m_wmiNamespace = wmiNamespace;
-}
-
-void WMIHelper::setClassName(const QString &className)
-{
- m_className = className;
-}
-
-void WMIHelper::setClassProperty(const QStringList &classProperties)
-{
- m_classProperties = classProperties;
-}
-
-void WMIHelper::setConditional(const QString &conditional)
-{
- m_conditional = conditional;
-}
-
-#endif
--- a/src/hbcore/decorators/hbwmihelper_win_p.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +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 WMIHELPER_H
-#define WMIHELPER_H
-
-#ifndef Q_CC_MINGW
-#include <QObject>
-#include <QVariant>
-#include <QString>
-#include <Wbemidl.h>
-
-#include <QStringList>
-
-class WMIHelper : public QObject
-{
-public:
- WMIHelper(QObject *parent = 0);
- ~WMIHelper();
- QVariant getWMIData();
- QVariant getWMIData(const QString &wmiNamespace,const QString &className, const QStringList &classProperties);
- QList <QVariant> wmiVariantList;
- void setWmiNamespace(const QString &wmiNamespace);
- void setClassName(const QString &className);
- void setClassProperty(const QStringList &classProperties);
- void setConditional(const QString &conditional); //see WQL SQL for WMI)
-
-private:
- IWbemLocator *wbemLocator;
- IWbemServices *wbemServices;
- IWbemClassObject *wbemCLassObject;
-
- QString m_className;
- QStringList m_classProperties;
- QString m_conditional;
- QString m_wmiNamespace;
- QVariant msVariantToQVariant(VARIANT msVariant, CIMTYPE variantType);
- void initializeWMI(const QString &wmiNamespace);
- QHash <QString, bool> initializedNamespaces;
-};
-#endif
-
-#endif // WMIHELPER_H
--- a/src/hbcore/devicedialogbase/devicedialogbase.pri Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/devicedialogbase/devicedialogbase.pri Fri May 14 16:09:54 2010 +0300
@@ -34,7 +34,6 @@
PUBLIC_HEADERS += $$PWD/hbindicator.h
PUBLIC_HEADERS += $$PWD/hbdevicedialogplugin.h
PUBLIC_HEADERS += $$PWD/hbdevicedialoginterface.h
-PUBLIC_HEADERS += $$PWD/hbsymbiandevicedialog.h #deprecated
PUBLIC_HEADERS += $$PWD/hbdevicedialogsymbian.h
PUBLIC_HEADERS += $$PWD/hbsymbianvariant.h
PUBLIC_HEADERS += $$PWD/hbindicatorsymbian.h
@@ -53,7 +52,6 @@
PRIVATE_HEADERS += $$PWD/hbdeleteguardsymbian_p.h
SOURCES += $$PWD/hbsymbianvariant.cpp
-SOURCES += $$PWD/hbsymbiandevicedialog.cpp #deprecated
SOURCES += $$PWD/hbdevicedialogsymbian.cpp
SOURCES += $$PWD/hbdevicedialogsym_p.cpp
--- a/src/hbcore/devicedialogbase/devicedialogserver/devicedialogserver.pri Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/devicedialogbase/devicedialogserver/devicedialogserver.pri Fri May 14 16:09:54 2010 +0300
@@ -35,6 +35,9 @@
PRIVATE_HEADERS += $$PWD/hbdevicedialogserver_p.h
PRIVATE_HEADERS += $$PWD/hbpluginnamecache_p.h
PRIVATE_HEADERS += $$PWD/hbdevicedialogserverstatus_p.h
+contains(DEFINES, HB_HAVE_QT_MOBILITY) {
+PRIVATE_HEADERS += $$PWD/hbsysteminfo_p.h
+}
SOURCES += $$PWD/hbdevicedialogserver.cpp
SOURCES += $$PWD/hbdevicedialogmanager.cpp
@@ -42,23 +45,39 @@
SOURCES += $$PWD/hbdevicedialogscontainer.cpp
SOURCES += $$PWD/hbdevicedialogpluginmanager.cpp
SOURCES += $$PWD/hbpluginnamecache.cpp
+contains(DEFINES, HB_HAVE_QT_MOBILITY) {
+SOURCES += $$PWD/hbsysteminfo_p.cpp
+}
symbian {
PRIVATE_HEADERS += $$PWD/hbdevicedialogserversym_p_p.h
PRIVATE_HEADERS += $$PWD/hbdevicedialogsession_p.h
PRIVATE_HEADERS += $$PWD/hbdevicedialogserverdefs_p.h
+contains(DEFINES, HB_HAVE_QT_MOBILITY) {
+PRIVATE_HEADERS += $$PWD/hbsysteminfosym_p_p.h
+}
SOURCES += $$PWD/hbdevicedialogserversym_p.cpp
SOURCES += $$PWD/hbdevicedialogsession.cpp
SOURCES += $$PWD/hbindicatorsessionhandler.cpp
SOURCES += $$PWD/hbdevicedialogserverstatussym.cpp
+contains(DEFINES, HB_HAVE_QT_MOBILITY) {
+SOURCES += $$PWD/hbsysteminfosym_p_p.cpp
+}
}
!symbian {
PRIVATE_HEADERS += $$PWD/hbdevicedialogserverwin_p_p.h
+contains(DEFINES, HB_HAVE_QT_MOBILITY) {
+PRIVATE_HEADERS += $$PWD/hbsysteminfowin_p_p.h
+}
SOURCES += $$PWD/hbdevicedialogserverwin_p.cpp
SOURCES += $$PWD/hbdevicedialogserverstatuswin.cpp
+contains(DEFINES, HB_HAVE_QT_MOBILITY) {
+SOURCES += $$PWD/hbsysteminfowin_p_p.cpp
+}
+
}
symbian {
--- a/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogmanager_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogmanager_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -48,6 +48,8 @@
#include "hbindicatorwin32_p.h"
#endif // Q_OS_SYMBIAN
+const char* indicatorMenu = "com.nokia.hb.indicatormenu/1.0";
+
//local symbian helper functions
#if defined(Q_OS_SYMBIAN)
TRect QRectToTRect(const QRectF &rect)
@@ -126,7 +128,8 @@
// Server publishes it's status. Applications use it to delay showing of notification
// dialogs when server is showing.
mServerStatus.setStatus(HbDeviceDialogServerStatus::NoFlags);
-
+ qApp->installEventFilter(this);
+ init();
TRACE_EXIT
}
@@ -146,6 +149,27 @@
TRACE_EXIT
}
+void HbDeviceDialogManagerPrivate::init()
+{
+ TRACE_ENTRY
+ // Performance optimization for indicator menu.
+ bool recycled(true);
+ int error(0);
+
+ HbDeviceDialogInterface *deviceDialogIf =
+ mPluginManager.createWidget(QString(indicatorMenu), QVariantMap(), recycled, error);
+ if (deviceDialogIf) {
+ HbPopup *popup = deviceDialogIf->deviceDialogWidget();
+#if defined(Q_OS_SYMBIAN)
+ mIndicatorPluginManager->connectTo(popup);
+#else
+ HbIndicatorPrivate::pluginManager()->connectTo(popup);
+#endif
+ mPluginManager.freeWidget(deviceDialogIf);
+ }
+ TRACE_EXIT
+}
+
// Set main window. Main window is not a construct parameter as it may be
// created later than device dialog server.
void HbDeviceDialogManagerPrivate::setMainWindow(HbMainWindow *mainWindow)
@@ -188,8 +212,6 @@
dialog.setVariable(HbDeviceDialogsContainer::Dialog::ClientTag, parameters.mClientTag);
id = dialog.id();
- mScene->addItem(popup);
-
if (info.group == HbDeviceDialogPlugin::DeviceNotificationDialogGroup) {
// Disable HbNotificationDialog sequential show feature. Server takes care of
// showing sequentially.
@@ -301,22 +323,24 @@
if (foreground) {
if(!mMainWindow->isVisible()) {
mMainWindow->showFullScreen();
- RWindowGroup &rootWindowGroup = CCoeEnv::Static()->RootWin();
- const int positionForeground(0);
- rootWindowGroup.SetOrdinalPosition(positionForeground,
- ECoeWinPriorityAlwaysAtFront);
+ doMoveToForeground(foreground, ECoeWinPriorityAlwaysAtFront);
}
} else {
if(mMainWindow->isVisible()) {
mMainWindow->hide();
- RWindowGroup &rootWindowGroup = CCoeEnv::Static()->RootWin();
- const int positionBackground(-1);
- rootWindowGroup.SetOrdinalPosition(positionBackground, ECoeWinPriorityNormal);
+ doMoveToForeground(foreground, ECoeWinPriorityNormal);
}
}
TRACE_EXIT
}
+void HbDeviceDialogManagerPrivate::doMoveToForeground(bool foreground, int priority)
+{
+ const int positionForeground = foreground ? 0 : -1;
+ RWindowGroup &rootWindowGroup = CCoeEnv::Static()->RootWin();
+ rootWindowGroup.SetOrdinalPosition(positionForeground, priority);
+}
+
void HbDeviceDialogManagerPrivate::updateWindowRegion() const
{
RWindowBase *win =
@@ -343,6 +367,12 @@
Q_UNUSED(foreground)
}
+void HbDeviceDialogManagerPrivate::doMoveToForeground(bool foreground, int priority)
+{
+ Q_UNUSED(foreground)
+ Q_UNUSED(priority)
+}
+
void HbDeviceDialogManagerPrivate::updateWindowRegion() const
{
}
@@ -658,6 +688,9 @@
{
TRACE_ENTRY
HbDeviceDialogsContainer::Dialog ¤t = mDialogs.find(id);
+
+ bool securityDialog = current.flags() & (HbDeviceDialogsContainer::Dialog::SecurityGroup|HbDeviceDialogsContainer::Dialog::CriticalGroup);
+
if (current.isValid()) {
// If device dialog was cancelled by client or server, give reason
int closeReason = HbDeviceDialogNoError;
@@ -672,12 +705,71 @@
mDialogs.remove(current);
removeRegionRect(id);
}
+
showDialogs();
setupWindowRegion();
updateStatus();
+
+ if (!securityDialog) {
+ return;
+ }
+
+ // security or critical level active
+ const HbDeviceDialogsContainer::Dialog begin;
+ const HbDeviceDialogsContainer::Dialog::Flags securityGroup(
+ HbDeviceDialogsContainer::Dialog::SecurityGroup);
+ const HbDeviceDialogsContainer::Dialog::Flags criticalGroup(
+ HbDeviceDialogsContainer::Dialog::CriticalGroup);
+ const HbDeviceDialogsContainer::Dialog::Flags showing(
+ HbDeviceDialogsContainer::Dialog::Showing);
+
+ HbDeviceDialogsContainer::Dialog &dialog = mDialogs.next(begin, securityGroup|showing,
+ securityGroup|showing);
+ bool showingSecurity = dialog.isValid();
+ if (!showingSecurity) {
+ dialog = mDialogs.next(begin, criticalGroup|showing, criticalGroup|showing);
+ showingSecurity = dialog.isValid();
+ }
+
+ if (!showingSecurity) {
+ return;
+ }
+ // check are there more security|critical dialogs showing. If there is, do not
+ // goto background.
+ bool moreDialogs = mDialogs.next(dialog, securityGroup|showing,
+ securityGroup|showing).isValid();
+
+ if (!moreDialogs) {
+ moreDialogs = mDialogs.next(dialog, criticalGroup|showing,
+ criticalGroup|showing).isValid();
+ }
+
+ if (showingSecurity && !moreDialogs) {
+#if defined(Q_OS_SYMBIAN)
+ doMoveToForeground(false, ECoeWinPriorityAlwaysAtFront-1);
+ mMainWindow->hide();
+#endif
+ }
TRACE_EXIT
}
+
+bool HbDeviceDialogManagerPrivate::eventFilter(QObject *obj, QEvent *event)
+{
+ Q_UNUSED(obj)
+// activate to correct priority. e.g. Telephone application has gone to background and
+// we are in security level.
+ if (event->type() == QEvent::ApplicationActivate) {
+#if defined(Q_OS_SYMBIAN)
+ RWindowGroup &rootWindowGroup = CCoeEnv::Static()->RootWin();
+ if (rootWindowGroup.OrdinalPriority() == ECoeWinPriorityAlwaysAtFront-1) {
+ moveToForeground(true);
+ }
+#endif // Q_OS_SYMBIAN
+ }
+ return QObject::eventFilter(obj, event);
+}
+
// Called by device dialog widget to inform manager of closed device dialog
void HbDeviceDialogManagerPrivate::deviceDialogClosed()
{
--- a/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogmanager_p_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogmanager_p_p.h Fri May 14 16:09:54 2010 +0300
@@ -106,7 +106,7 @@
// Constructor and destructor
explicit HbDeviceDialogManagerPrivate(HbDeviceDialogManager *manager);
virtual ~HbDeviceDialogManagerPrivate();
-
+ void init();
void setMainWindow(HbMainWindow *mainWindow);
// Device dialog client related API
@@ -121,6 +121,7 @@
// Device dialog control related API
void moveToForeground(bool foreground);
+ void doMoveToForeground(bool foreground, int priority);
void updateWindowRegion() const;
void resetWindowRegion() const;
bool showDialogs();
@@ -136,6 +137,7 @@
static void setDialogPriority(HbPopup *popup, HbDeviceDialogPlugin::DeviceDialogGroup group);
static bool checkDialogInfo(const HbDeviceDialogPlugin::DeviceDialogInfo &deviceDialogInfo);
void deleteDeviceDialog(int id);
+ bool eventFilter(QObject *obj, QEvent *event);
public slots:
void deviceDialogUpdate(const QVariantMap &data) const;
--- a/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogpluginmanager.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogpluginmanager.cpp Fri May 14 16:09:54 2010 +0300
@@ -35,6 +35,10 @@
#include <QDir>
#include <QApplication>
+#if defined(Q_OS_SYMBIAN)
+#include <coemain.h>
+#include <f32file.h>
+#endif // Q_OS_SYMBIAN
/*
\class HbDeviceDialogPluginManager
\brief HbDeviceDialogPluginManager manages loading and unloading of device dialog plugins
@@ -66,11 +70,13 @@
connect(&mDeleteTimer, SIGNAL(timeout()), this, SLOT(deleteWidgets()));
// Get list of plugin directories to watch/scan
- const QStringList pathList = pluginPathList();
- for (int i = 0; i < pathList.length(); i++) {
- updateCachePath(pathList.at(i));
+ int readOnlyPaths;
+ mPluginPathList = pluginPathList("/devicedialogs/", readOnlyPaths);
+
+ // Scan only read-only drives at startup to ensure installed plugins cannot affect device boot
+ for(int i = 0; i < readOnlyPaths; i++) {
+ updateCachePath(mPluginPathList.at(i), true);
}
-
TRACE_EXIT
}
@@ -284,12 +290,11 @@
void HbDeviceDialogPluginManager::scanPlugins(PluginScanCallback func, const QString &deviceDialogType, bool stopIfFound)
{
TRACE_ENTRY
- const QStringList pathList = pluginPathList();
const QString fileNameFilter = pluginFileNameFilter();
- foreach (const QString &path, pathList) {
+ foreach(const QString &path, mPluginPathList) {
QDir pluginDir(path, fileNameFilter, QDir::NoSort, QDir::Files | QDir::Readable);
- foreach (const QString &fileName, pluginDir.entryList()) {
+ foreach(const QString &fileName, pluginDir.entryList()) {
if (scanPlugin(func, deviceDialogType, pluginDir.absoluteFilePath(fileName)) &&
stopIfFound) {
break;
@@ -411,7 +416,7 @@
}
// Update plugin name cache watch/scan list
-void HbDeviceDialogPluginManager::updateCachePath(const QString &path)
+void HbDeviceDialogPluginManager::updateCachePath(const QString &path, bool updateReadOnly)
{
QString dirPath = HbPluginNameCache::directoryPath(path);
QFileInfo fileInfo(dirPath);
@@ -420,7 +425,9 @@
if (fileInfo.isWritable()) {
mNameCache.addWatchPath(dirPath);
} else {
- mNameCache.scanDirectory(dirPath);
+ if (updateReadOnly) {
+ mNameCache.scanDirectory(dirPath);
+ }
}
} else {
mNameCache.removeWatchPath(dirPath);
@@ -428,27 +435,25 @@
}
//Generate directory path list to search plugins
-QStringList HbDeviceDialogPluginManager::pluginPathList()
+QStringList HbDeviceDialogPluginManager::pluginPathList(const QString &subDir, int &readOnlyPaths)
{
QStringList pluginPathList;
#if defined(Q_OS_SYMBIAN)
- const QString pluginRelativePath("resource/plugins/devicedialogs/");
+ QString pluginRelativePath("resource/plugins");
+ pluginRelativePath.append(subDir);
QFileInfoList driveInfoList = QDir::drives();
- foreach (const QFileInfo &driveInfo, driveInfoList) {
+ foreach(const QFileInfo &driveInfo, driveInfoList) {
const QString drive = driveInfo.absolutePath();
- if (drive.startsWith("z:", Qt::CaseInsensitive) ||
- drive.startsWith("c:", Qt::CaseInsensitive)) {
- QString path(drive + pluginRelativePath);
- pluginPathList << path;
- }
+ QString path(drive + pluginRelativePath);
+ pluginPathList << path;
}
#elif defined(Q_OS_WIN32) || defined(Q_OS_UNIX)
- pluginPathList << qApp->applicationDirPath() + '/' << HB_PLUGINS_DIR"/devicedialogs/";
+ pluginPathList << qApp->applicationDirPath() + '/' << HB_PLUGINS_DIR + subDir;
#endif
-
+ readOnlyPaths = trimPluginPathList(pluginPathList);
// Plugin name caching differentiates directory and file names by trailing slash in a name
for (int i = 0; i < pluginPathList.length(); i++) {
Q_ASSERT(pluginPathList.at(i).endsWith('/'));
@@ -509,3 +514,77 @@
{
mAllWidgetsDeleted = true;
}
+
+// Trim plugin search path list from all possible drives. Returns number of read only paths
+// at head of path list.
+int HbDeviceDialogPluginManager::trimPluginPathList(QStringList &pathList)
+{
+#if defined(Q_OS_SYMBIAN)
+ // Get list of disk drives
+ TDriveList driveList;
+ RFs &fs = CCoeEnv::Static()->FsSession();
+ int error = fs.DriveList(driveList);
+ Q_ASSERT(error == KErrNone);
+
+ // Put pathlist into search order. Rom-drives first, then internal and local removable drives.
+ // Remote drives are not supported for plugins.
+ int numRomDrives = 0;
+ int numInternalDrives = 0;
+ int numRemovableDrives = 0;
+ int count = pathList.count();
+ for(int i = 0; i < count; i++) {
+ QChar c(pathList.at(i).at(0).toLower());
+ int driveIndex = c.toAscii() - 'a';
+ TDriveInfo driveInfo;
+ error = fs.Drive(driveInfo, EDriveA + driveIndex);
+ Q_ASSERT(error == KErrNone);
+ if (driveInfo.iDriveAtt == (KDriveAttInternal|KDriveAttRom)) {
+ if (i != numRomDrives) {
+ const QString tmp(pathList.at(i));
+ pathList.removeAt(i);
+ pathList.insert(numRomDrives, tmp);
+ }
+ numRomDrives++;
+ } else if (driveInfo.iDriveAtt == (KDriveAttInternal|KDriveAttLocal)) {
+ int newPlace = numRomDrives + numInternalDrives;
+ if (i != newPlace) {
+ const QString tmp(pathList.at(i));
+ pathList.removeAt(i);
+ pathList.insert(newPlace, tmp);
+ }
+ numInternalDrives++;
+ } else if (driveInfo.iDriveAtt & (KDriveAttInternal|KDriveAttRemovable)) {
+ int newPlace = numRomDrives + numInternalDrives + numRemovableDrives;
+ if (i != newPlace) {
+ const QString tmp(pathList.at(i));
+ pathList.removeAt(i);
+ pathList.insert(newPlace, tmp);
+ }
+ numRemovableDrives++;
+ }
+ }
+ // Cut other drives off the list
+ for(int i = numRomDrives + numInternalDrives + numRemovableDrives; i < count; i++) {
+ pathList.removeLast();
+ }
+
+ // Ensure alphanumeric order
+ if (numRomDrives > 1) {
+ QStringList::iterator begin = pathList.begin();
+ qSort(begin, begin + numRomDrives);
+ }
+ if (numInternalDrives > 1) {
+ QStringList::iterator begin = pathList.begin() + numRomDrives;
+ qSort(begin, begin + numInternalDrives);
+ }
+ if (numRemovableDrives > 1) {
+ QStringList::iterator begin = pathList.begin() + numRomDrives + numInternalDrives;
+ qSort(begin, begin + numRemovableDrives);
+ }
+
+ return numRomDrives;
+#else // Q_OS_SYMBIAN
+ Q_UNUSED(pathList)
+ return 0;
+#endif // Q_OS_SYMBIAN
+}
--- a/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogpluginmanager_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogpluginmanager_p.h Fri May 14 16:09:54 2010 +0300
@@ -67,6 +67,10 @@
bool unloadPlugin(const QString &deviceDialogType);
const HbDeviceDialogPlugin &plugin(const QString &deviceDialogType);
+ static QStringList pluginPathList(const QString &subDir, int &readOnlyPaths);
+ static QString pluginFileNameFilter();
+ static int trimPluginPathList(QStringList &pathList);
+
private: // types
struct PluginInfo {
enum Flag {
@@ -97,9 +101,7 @@
int findPlugin(const QString &deviceDialogType) const;
void freeRecycleWidgets();
- void updateCachePath(const QString &path);
- static QStringList pluginPathList();
- static QString pluginFileNameFilter();
+ void updateCachePath(const QString &path, bool updateReadOnly = false);
static QStringList pluginKeys(QObject *pluginInstance);
private slots:
@@ -114,6 +116,7 @@
bool mAllWidgetsDeleted;
QTimer mDeleteTimer; // timer used to delete widgets
HbPluginNameCache mNameCache;
+ QStringList mPluginPathList;
};
#endif // HBDEVICEDIALOGPLUGINMANAGER_P_H
--- a/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogserversym_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogserversym_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -31,6 +31,9 @@
#include "hbdevicedialogserversym_p_p.h"
#include "hbdevicedialogsession_p.h"
#include "hbdevicedialogserverdefs_p.h"
+#ifdef HB_HAVE_QT_MOBILITY
+#include "hbsysteminfo_p.h"
+#endif // HB_HAVE_QT_MOBILITY
/*!
\class HbDeviceDialogServerPrivate
@@ -47,6 +50,9 @@
mSessionCount = 0;
// No need for timer until server automatic close will be again enabled
// mExitTimer = CPeriodic::New(CActive::EPriorityLow);
+#ifdef HB_HAVE_QT_MOBILITY
+ mDeviceInfo = new HbSystemInfo(0, true);
+#endif // HB_HAVE_QT_MOBILITY
TRACE_EXIT
}
@@ -55,6 +61,10 @@
*/
HbDeviceDialogServerPrivate::~HbDeviceDialogServerPrivate()
{
+#ifdef HB_HAVE_QT_MOBILITY
+ delete mDeviceInfo;
+#endif // HB_HAVE_QT_MOBILITY
+
// delete mExitTimer;
}
--- a/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogserversym_p_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/devicedialogbase/devicedialogserver/hbdevicedialogserversym_p_p.h Fri May 14 16:09:54 2010 +0300
@@ -26,6 +26,7 @@
#define HBDEVICEDIALOGSERVERSYM_P_P_H
#include <e32base.h>
+#include <e32property.h>
#include <QVariantMap>
#include "hbdevicedialogserver_p.h"
@@ -33,6 +34,9 @@
class HbDeviceDialogSession;
class HbIndicatorSessionHandler;
+#ifdef HB_HAVE_QT_MOBILITY
+class HbSystemInfo;
+#endif // HB_HAVE_QT_MOBILITY
class HbDeviceDialogServerPrivate: public CPolicyServer
{
@@ -79,6 +83,10 @@
RPointerArray<HbDeviceDialogSession> iSessionList;
RPointerArray<HbIndicatorSessionHandler> iIndicatorSessionList;
int mSessionCount;
+
+#ifdef HB_HAVE_QT_MOBILITY
+ HbSystemInfo *mDeviceInfo;
+#endif // HB_HAVE_QT_MOBILITY
// CPeriodic *mExitTimer; Not used as server not closing automatically
};
--- a/src/hbcore/devicedialogbase/devicedialogserver/hbindicatorclientinfo_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/devicedialogbase/devicedialogserver/hbindicatorclientinfo_p.h Fri May 14 16:09:54 2010 +0300
@@ -34,19 +34,22 @@
struct IndicatorClientInfo {
inline IndicatorClientInfo() :
- category(HbIndicatorInterface::SettingCategory) {}
+ category(HbIndicatorInterface::SettingCategory), hasMenuData(true) {}
inline IndicatorClientInfo(const QString &type,
const QString &iconPath,
- HbIndicatorInterface::Category category) :
+ HbIndicatorInterface::Category category,
+ bool hasMenuData) :
type(type),
iconPath(iconPath),
- category(category) {}
+ category(category),
+ hasMenuData(hasMenuData){}
inline IndicatorClientInfo(const IndicatorClientInfo ©Source) :
type(copySource.type),
iconPath(copySource.iconPath),
- category(copySource.category) {}
+ category(copySource.category),
+ hasMenuData(copySource.hasMenuData){}
inline bool isValid() const {
return !iconPath.isEmpty();
@@ -55,6 +58,7 @@
QString type;
QString iconPath;
HbIndicatorInterface::Category category;
+ bool hasMenuData;
};
inline QDataStream& operator << (QDataStream &outStream,
@@ -63,6 +67,7 @@
outStream << obj.type;
outStream << obj.iconPath;
outStream << obj.category;
+ outStream << obj.hasMenuData;
return outStream;
}
@@ -74,6 +79,7 @@
int category;
inStream >> category;
obj.category= static_cast<HbIndicatorInterface::Category>(category);
+ inStream >> obj.hasMenuData;
return inStream;
}
--- a/src/hbcore/devicedialogbase/devicedialogserver/hbpluginnamecache.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/devicedialogbase/devicedialogserver/hbpluginnamecache.cpp Fri May 14 16:09:54 2010 +0300
@@ -63,6 +63,13 @@
#define USE_NAME_CACHE_THREAD 1
#endif
+// Uncomment to monitor plugin installation directories and updating plugin name cache on directory
+// changes. Otherwise name cache is updated when cache miss occurs.
+// Currently directory monitoring is disabled in order slightly improve security. Plugin is not
+// executed automatically after installation to get type strings. Instead application must trigger
+// a plugin scan and name cache miss to get plugin executed.
+//#define MONITOR_INSTALLATION_DIRS 1
+
// Thread that scans directories and keeps the cache current
class HbPluginNameCacheThread : public QThread
{
@@ -167,6 +174,9 @@
{
TRACE_ENTRY_ARGS(path)
+ // Invalidate cache contents for the path
+ mNameCache.removePath(path);
+
QString fileNameFilter = mPluginFileNameFilter();
QDir pluginDir(path, fileNameFilter, QDir::NoSort, QDir::Files | QDir::Readable);
@@ -182,7 +192,6 @@
if (pluginInstance) {
// If plugin type is correct, plugin file name and keys are saved into a cache
mNameCache.insert(mGetPluginKeys(pluginInstance), absolutePath);
-
}
loader->unload();
delete loader;
@@ -234,7 +243,9 @@
QString dirPath = directoryPath(path);
TRACE(dirPath)
if (!dirPath.isEmpty()) {
+#ifdef MONITOR_INSTALLATION_DIRS
mWatcher.addPath(dirPath); // start watching
+#endif // MONITOR_INSTALLATION_DIRS
directoryChanged(dirPath); // scan directory
}
}
@@ -246,6 +257,7 @@
QString dirPath = directoryPath(path);
TRACE(dirPath)
if (!dirPath.isEmpty()) {
+#ifdef MONITOR_INSTALLATION_DIRS
#if defined(Q_OS_LINUX) || defined(Q_OS_MAC)
const Qt::CaseSensitivity cs = Qt::CaseSensitive;
#else
@@ -253,6 +265,9 @@
#endif // Q_OS_LINUX || Q_OS_MAC
if (mWatcher.directories().contains(dirPath, cs)) {
mWatcher.removePath(dirPath);
+#else // MONITOR_INSTALLATION_DIRS
+ {
+#endif // MONITOR_INSTALLATION_DIRS
mThread->cancelScan(dirPath);
removePath(path);
}
@@ -311,8 +326,11 @@
TRACE_ENTRY_ARGS("keys" << keys << "filePath" << filePath)
QMutexLocker(&mThread->lock());
for (int i = 0; i < keys.size(); ++i) {
- // New entry is added into a cache or existing one is updated
- mCache.insert(keys.at(i), filePath);
+ // New entry is added into a cache. If the key is already present, value is not
+ // updated. This is to prevent overriding an existing plugin.
+ if (!mCache.contains(keys.at(i))) {
+ mCache.insert(keys.at(i), filePath);
+ }
}
}
@@ -363,8 +381,6 @@
{
TRACE_ENTRY_ARGS(path)
- // Invalidate cache contents for the path
- removePath(path);
mThread->scanDirectory(path);
TRACE_EXIT
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/devicedialogbase/devicedialogserver/hbsysteminfo_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,70 @@
+/****************************************************************************
+**
+** 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 "hbsysteminfo_p.h"
+#if defined(Q_OS_SYMBIAN)
+#include "hbsysteminfosym_p_p.h"
+#else
+#include "hbsysteminfowin_p_p.h"
+#endif // defined(Q_OS_SYMBIAN)
+
+
+HbSystemInfo::HbSystemInfo(QObject *parent, bool writer)
+: QObject(parent), d_ptr(new HbSystemInfoPrivate)
+{
+ Q_D(HbSystemInfo);
+ d->q_ptr = this;
+ d->init(writer);
+}
+
+HbSystemInfo::~HbSystemInfo()
+{
+ delete d_ptr;
+}
+
+int HbSystemInfo::networkSignalStrength() const
+{
+ Q_D(const HbSystemInfo);
+ return d->networkSignalStrength();
+}
+
+QSystemNetworkInfo::NetworkMode HbSystemInfo::networkMode() const
+{
+ Q_D(const HbSystemInfo);
+ return d->networkMode();
+}
+
+int HbSystemInfo::batteryLevel() const
+{
+ Q_D(const HbSystemInfo);
+ return d->batteryLevel();
+}
+
+QSystemDeviceInfo::PowerState HbSystemInfo::powerState() const
+{
+ Q_D(const HbSystemInfo);
+ return d->powerState();
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/devicedialogbase/devicedialogserver/hbsysteminfo_p.h Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,63 @@
+/****************************************************************************
+**
+** 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 HBSYSTEMINFO_H
+#define HBSYSTEMINFO_H
+
+#include <hbglobal.h>
+#include <QObject>
+#include <hbforegroundwatcher_p.h>
+#include <qsysteminfo.h>
+using QtMobility::QSystemNetworkInfo;
+using QtMobility::QSystemDeviceInfo;
+
+class HbSystemInfoPrivate;
+
+class HbSystemInfo : public QObject
+{
+ Q_OBJECT
+
+public:
+ explicit HbSystemInfo(QObject *parent = 0, bool writer = false);
+ virtual ~HbSystemInfo();
+
+ int networkSignalStrength() const;
+ QSystemNetworkInfo::NetworkMode networkMode() const;
+ int batteryLevel() const;
+ QSystemDeviceInfo::PowerState powerState() const;
+
+signals:
+ void networkSignalStrengthChanged(QSystemNetworkInfo::NetworkMode, int);
+ void networkModeChanged(QSystemNetworkInfo::NetworkMode);
+ void batteryLevelChanged(int);
+ void powerStateChanged(QSystemDeviceInfo::PowerState);
+
+private:
+ HbSystemInfoPrivate *d_ptr;
+ Q_DECLARE_PRIVATE_D(d_ptr, HbSystemInfo)
+ Q_DISABLE_COPY(HbSystemInfo)
+};
+
+#endif // HBSYSTEMINFO_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/devicedialogbase/devicedialogserver/hbsysteminfosym_p_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,275 @@
+/****************************************************************************
+**
+** 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 "hbsysteminfosym_p_p.h"
+#include "hbsysteminfo_p.h"
+#include <qapplication.h>
+#include <qcoreevent.h>
+
+const TUint32 secureId = 0x20022FC5;
+
+// publish & subscribe
+const TUid PropertyCategoryUid = {secureId};
+const TUint InfoKey = 'Info';
+_LIT_SECURITY_POLICY_PASS(KRdPolicy); // all pass
+_LIT_SECURITY_POLICY_S0(KWrPolicy, PropertyCategoryUid.iUid); // pass device dialog server
+
+HbSystemInfoPrivate::HbSystemInfoPrivate()
+: CActive(CActive::EPriorityStandard),
+ mPtr(0,0),
+ mListening(false),
+ mWatcher(0)
+{
+}
+
+HbSystemInfoPrivate::~HbSystemInfoPrivate()
+{
+ if (!mWriter) {
+ lostForeground();
+ }
+ delete mSystemNetworkInfo;
+ delete mSystemDeviceInfo;
+ mInfoProperty.Close();
+ delete mDataBuffer;
+}
+
+void HbSystemInfoPrivate::init(bool writer)
+{
+ // device dialog server is the writer
+ if (writer) {
+ RProcess me;
+ if ((me.SecureId().iId != secureId )) {
+ return;
+ }
+ }
+
+ if (writer) {
+ mSystemNetworkInfo = new QtMobility::QSystemNetworkInfo();
+ connect(mSystemNetworkInfo, SIGNAL(networkSignalStrengthChanged(QSystemNetworkInfo::NetworkMode, int)),
+ this, SLOT(setNetworkSignalStrength(QSystemNetworkInfo::NetworkMode, int)));
+ connect(mSystemNetworkInfo, SIGNAL(networkModeChanged(QSystemNetworkInfo::NetworkMode)),
+ this, SLOT(setNetworkMode(QSystemNetworkInfo::NetworkMode)));
+
+ mSystemDeviceInfo = new QtMobility::QSystemDeviceInfo();
+ mDeviceSystemInfo.batteryLevel = mSystemDeviceInfo->batteryLevel();
+ mDeviceSystemInfo.powerState = mSystemDeviceInfo->currentPowerState();
+ connect(mSystemDeviceInfo, SIGNAL(batteryLevelChanged(int)),
+ this, SLOT(setBatteryLevel(int)));
+ connect(mSystemDeviceInfo, SIGNAL(powerStateChanged(QSystemDeviceInfo::PowerState)),
+ this, SLOT(setPowerState(QSystemDeviceInfo::PowerState)));
+
+ int err = mInfoProperty.Define(PropertyCategoryUid, InfoKey, RProperty::EByteArray, KRdPolicy, KWrPolicy);
+ if (err == KErrNone) {
+ writeDeviceInfo();
+ }
+ } else {
+ CActiveScheduler::Add(this);
+
+ qApp->installEventFilter(this);
+ mWatcher = HbForegroundWatcher::instance();
+ connect(mWatcher, SIGNAL(foregroundGained()), SLOT(gainedForeground()));
+ connect(mWatcher, SIGNAL(foregroundLost()), SLOT(lostForeground()));
+
+ mDataBuffer = HBufC8::New(RProperty::KMaxPropertySize);
+ if (mDataBuffer) {
+ mPtr.Set(mDataBuffer->Des());
+ mInfoProperty.Attach(PropertyCategoryUid, InfoKey);
+ }
+
+ }
+}
+
+void HbSystemInfoPrivate::start()
+{
+ if (mInfoProperty.Handle()) {
+ mInfoProperty.Subscribe(iStatus);
+ SetActive();
+ }
+}
+
+void HbSystemInfoPrivate::readDeviceInfo()
+{
+ int error(KErrGeneral);
+ if (mDataBuffer) {
+ mPtr.Zero();
+ error = mInfoProperty.Get(PropertyCategoryUid, InfoKey, mPtr);
+ }
+
+ if (error == KErrNone) {
+ QByteArray resArray( (const char*) mPtr.Ptr(), mPtr.Size() );
+ QDataStream stream( &resArray, QIODevice::ReadOnly);
+ DeviceSystemInfo sysInfo;
+ stream >> sysInfo;
+ dataReceived(sysInfo);
+ }
+}
+
+void HbSystemInfoPrivate::writeDeviceInfo()
+{
+ QByteArray array;
+ QDataStream stream(&array, QIODevice::WriteOnly);
+ stream << mDeviceSystemInfo;
+ //write data
+ TPtr8 ptr( reinterpret_cast<TUint8*>(array.data()),
+ array.size(), array.size());
+ mInfoProperty.Set(PropertyCategoryUid, InfoKey, ptr);
+}
+
+void HbSystemInfoPrivate::dataReceived(const DeviceSystemInfo& info)
+{
+ Q_Q(HbSystemInfo);
+ bool modeChanged = info.networkMode != mDeviceSystemInfo.networkMode;
+ bool signalLevelChanged = info.signalStrength != mDeviceSystemInfo.signalStrength;
+
+ if (modeChanged) {
+ mDeviceSystemInfo.networkMode = info.networkMode;
+ }
+
+ if (modeChanged && !signalLevelChanged) {
+ emit q->networkModeChanged((QSystemNetworkInfo::NetworkMode)mDeviceSystemInfo.networkMode);
+ } else {
+ mDeviceSystemInfo.signalStrength = info.signalStrength;
+ emit q->networkSignalStrengthChanged((QSystemNetworkInfo::NetworkMode)mDeviceSystemInfo.networkMode,
+ mDeviceSystemInfo.signalStrength);
+ }
+
+ if (info.powerState != mDeviceSystemInfo.powerState) {
+ mDeviceSystemInfo.powerState = info.powerState;
+ emit q->powerStateChanged(((QSystemDeviceInfo::PowerState)mDeviceSystemInfo.powerState));
+ }
+
+ if (info.batteryLevel != mDeviceSystemInfo.batteryLevel) {
+ mDeviceSystemInfo.batteryLevel = info.batteryLevel;
+ emit q->batteryLevelChanged(mDeviceSystemInfo.batteryLevel);
+ }
+}
+
+void HbSystemInfoPrivate::DoCancel()
+{
+}
+
+void HbSystemInfoPrivate::RunL()
+{
+ int result = iStatus.Int();
+ if (result != KErrCancel) {
+ start();
+ }
+ if (result == KErrNone) {
+ readDeviceInfo();
+ }
+}
+
+void HbSystemInfoPrivate::setNetworkSignalStrength(
+ QSystemNetworkInfo::NetworkMode mode,
+ int strength)
+{
+ bool changed(false);
+
+ if (mode != mDeviceSystemInfo.networkMode) {
+ mDeviceSystemInfo.networkMode = mode;
+ changed = true;
+ }
+
+ if (strength != mDeviceSystemInfo.signalStrength) {
+ mDeviceSystemInfo.signalStrength = strength;
+ changed = true;
+ }
+
+ if (changed) {
+ writeDeviceInfo();
+ }
+}
+
+void HbSystemInfoPrivate::setNetworkMode(QSystemNetworkInfo::NetworkMode mode)
+{
+ if (mode != mDeviceSystemInfo.networkMode) {
+ mDeviceSystemInfo.networkMode = mode;
+ writeDeviceInfo();
+ }
+}
+
+void HbSystemInfoPrivate::setBatteryLevel(int level)
+{
+ if (level != mDeviceSystemInfo.batteryLevel) {
+ mDeviceSystemInfo.batteryLevel = level;
+ writeDeviceInfo();
+ }
+}
+
+void HbSystemInfoPrivate::setPowerState(QSystemDeviceInfo::PowerState state)
+{
+ if (state != mDeviceSystemInfo.powerState) {
+ mDeviceSystemInfo.powerState = state;
+ writeDeviceInfo();
+ }
+}
+
+void HbSystemInfoPrivate::lostForeground()
+{
+ if (mListening) {
+ mInfoProperty.Cancel();
+ Cancel();
+ mListening = false;
+ }
+}
+
+void HbSystemInfoPrivate::gainedForeground()
+{
+ if (!mListening) {
+ start();
+ readDeviceInfo();
+ mListening = true;
+ }
+}
+
+int HbSystemInfoPrivate::networkSignalStrength() const
+{
+ return mDeviceSystemInfo.signalStrength;
+}
+
+QSystemNetworkInfo::NetworkMode HbSystemInfoPrivate::networkMode() const
+{
+ return mDeviceSystemInfo.networkMode;
+}
+
+int HbSystemInfoPrivate::batteryLevel() const
+{
+ return mDeviceSystemInfo.batteryLevel;
+}
+
+QSystemDeviceInfo::PowerState HbSystemInfoPrivate::powerState() const
+{
+ return mDeviceSystemInfo.powerState;
+}
+
+bool HbSystemInfoPrivate::eventFilter(QObject *obj, QEvent *event)
+{
+ if (event->type() == QEvent::ApplicationActivate) {
+ gainedForeground();
+ } else if (event->type() == QEvent::ApplicationDeactivate) {
+ lostForeground();
+ }
+ return QObject::eventFilter(obj, event);
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/devicedialogbase/devicedialogserver/hbsysteminfosym_p_p.h Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,121 @@
+/****************************************************************************
+**
+** 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 HBSYSTEMINFOSYM_P_P_H
+#define HBSYSTEMINFOSYM_P_P_H
+
+#include <e32base.h>
+#include <e32property.h>
+#include "hbsysteminfo_p.h"
+
+struct DeviceSystemInfo
+{
+ inline DeviceSystemInfo() :
+ networkMode(QSystemNetworkInfo::UnknownMode),
+ signalStrength(0),
+ batteryLevel(0),
+ powerState(QSystemDeviceInfo::UnknownPower) {}
+
+ QSystemNetworkInfo::NetworkMode networkMode;
+ int signalStrength;
+ int batteryLevel;
+ QSystemDeviceInfo::PowerState powerState;
+};
+
+inline QDataStream& operator << (QDataStream &outStream,
+ const DeviceSystemInfo &obj)
+{
+ outStream << obj.networkMode;
+ outStream << obj.signalStrength;
+ outStream << obj.powerState;
+ outStream << obj.batteryLevel;
+ return outStream;
+}
+
+inline QDataStream& operator >> (QDataStream &inStream,
+ DeviceSystemInfo &obj)
+{
+ int temp;
+ inStream >> temp;
+ obj.networkMode = (QSystemNetworkInfo::NetworkMode)temp;
+ inStream >> obj.signalStrength;
+ inStream >> temp;
+ obj.powerState= (QSystemDeviceInfo::PowerState)temp;
+ inStream >> obj.batteryLevel;
+ return inStream;
+}
+
+class HbSystemInfoPrivate : public QObject,
+ public CActive
+{
+ Q_OBJECT
+
+public:
+ HbSystemInfoPrivate();
+ virtual ~HbSystemInfoPrivate();
+ void init(bool writer);
+
+public:
+ void start();
+ void readDeviceInfo();
+ void writeDeviceInfo();
+ void dataReceived(const DeviceSystemInfo& info);
+ bool eventFilter(QObject *obj, QEvent *event);
+public:
+ int networkSignalStrength() const;
+ QSystemNetworkInfo::NetworkMode networkMode() const;
+ int batteryLevel() const;
+ QSystemDeviceInfo::PowerState powerState() const;
+
+protected:
+ virtual void DoCancel();
+ virtual void RunL();
+
+public slots:
+ void setNetworkSignalStrength(QSystemNetworkInfo::NetworkMode, int);
+ void setNetworkMode(QSystemNetworkInfo::NetworkMode);
+ void setBatteryLevel(int);
+ void setPowerState(QSystemDeviceInfo::PowerState);
+
+ void lostForeground();
+ void gainedForeground();
+
+public:
+ DeviceSystemInfo mDeviceSystemInfo;
+ Q_DECLARE_PUBLIC(HbSystemInfo)
+private:
+ QSystemNetworkInfo *mSystemNetworkInfo;
+ QSystemDeviceInfo *mSystemDeviceInfo;
+
+ RProperty mInfoProperty;
+ HBufC8 *mDataBuffer;
+ TPtr8 mPtr;
+ HbSystemInfo *q_ptr;
+
+ bool mWriter;
+ bool mListening;
+ HbForegroundWatcher *mWatcher;
+};
+#endif // HBSYSTEMINFOSYM_P_P_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/devicedialogbase/devicedialogserver/hbsysteminfowin_p_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,92 @@
+/****************************************************************************
+**
+** 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 "hbsysteminfowin_p_p.h"
+#include "hbsysteminfo_p.h"
+
+HbSystemInfoPrivate::HbSystemInfoPrivate()
+{
+}
+
+HbSystemInfoPrivate::~HbSystemInfoPrivate()
+{
+ delete mSystemNetworkInfo;
+ delete mSystemDeviceInfo;
+}
+
+void HbSystemInfoPrivate::init(bool writer)
+{
+ Q_UNUSED(writer);
+ Q_Q(HbSystemInfo);
+ mSystemNetworkInfo = new QSystemNetworkInfo();
+ connect(mSystemNetworkInfo, SIGNAL(networkSignalStrengthChanged(QSystemNetworkInfo::NetworkMode, int)),
+ q, SIGNAL(networkSignalStrengthChanged(QSystemNetworkInfo::NetworkMode, int)));
+ connect(mSystemNetworkInfo, SIGNAL(networkModeChanged(QSystemNetworkInfo::NetworkMode)),
+ this, SLOT(setNetworkMode(QSystemNetworkInfo::NetworkMode)));
+
+ mSystemDeviceInfo = new QSystemDeviceInfo();
+ connect(mSystemDeviceInfo, SIGNAL(batteryLevelChanged(int)),
+ q, SIGNAL(batteryLevelChanged(int)));
+ connect(mSystemDeviceInfo, SIGNAL(powerStateChanged(QSystemDeviceInfo::PowerState)),
+ q, SIGNAL(powerStateChanged(QSystemDeviceInfo::PowerState)));
+ mWatcher = HbForegroundWatcher::instance();
+ connect(mWatcher, SIGNAL(foregroundGained()), SLOT(gainedForeground()));
+ connect(mWatcher, SIGNAL(foregroundLost()), SLOT(lostForeground()));
+}
+
+void HbSystemInfoPrivate::lostForeground()
+{
+}
+
+void HbSystemInfoPrivate::gainedForeground()
+{
+}
+
+int HbSystemInfoPrivate::networkSignalStrength() const
+{
+ return mSystemNetworkInfo->networkSignalStrength(mNetworkMode);
+}
+
+QSystemNetworkInfo::NetworkMode HbSystemInfoPrivate::networkMode() const
+{
+ return mNetworkMode;
+}
+
+int HbSystemInfoPrivate::batteryLevel() const
+{
+ return mSystemDeviceInfo->batteryLevel();
+}
+
+QSystemDeviceInfo::PowerState HbSystemInfoPrivate::powerState() const
+{
+ return mSystemDeviceInfo->currentPowerState();
+}
+
+void HbSystemInfoPrivate::setNetworkMode(QSystemNetworkInfo::NetworkMode mode)
+{
+ Q_Q(HbSystemInfo);
+ mNetworkMode = mode;
+ emit q->networkModeChanged(mode);
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/devicedialogbase/devicedialogserver/hbsysteminfowin_p_p.h Fri May 14 16:09:54 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.
+**
+****************************************************************************/
+
+#ifndef HBSYSTEMINFOWIN_P_P_H
+#define HBSYSTEMINFOWIN_P_P_H
+
+#include "hbsysteminfo_p.h"
+
+class HbSystemInfoPrivate : public QObject
+{
+ Q_OBJECT
+
+public:
+ HbSystemInfoPrivate();
+ virtual ~HbSystemInfoPrivate();
+ void init(bool writer);
+
+ int networkSignalStrength() const;
+ QSystemNetworkInfo::NetworkMode networkMode() const;
+ int batteryLevel() const;
+ QSystemDeviceInfo::PowerState powerState() const;
+
+public slots:
+ void setNetworkMode(QSystemNetworkInfo::NetworkMode);
+
+ void lostForeground();
+ void gainedForeground();
+public:
+ QSystemNetworkInfo *mSystemNetworkInfo;
+ QSystemDeviceInfo *mSystemDeviceInfo;
+ QSystemNetworkInfo::NetworkMode mNetworkMode;
+
+ Q_DECLARE_PUBLIC(HbSystemInfo)
+ HbSystemInfo *q_ptr;
+ HbForegroundWatcher *mWatcher;
+};
+
+#endif
--- a/src/hbcore/devicedialogbase/hbdevicedialog.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/devicedialogbase/hbdevicedialog.cpp Fri May 14 16:09:54 2010 +0300
@@ -24,15 +24,35 @@
****************************************************************************/
/*!
+ @stable
+ @hbcore
\class HbDeviceDialog
- \brief HbDeviceDialog displays dialogs on top of applications
+ \brief HbDeviceDialog displays a dialog on top of all running applications
+
+ Device Dialogs are used to display information, queries and alerts for the device rather than
+ for an application. Some example device dialogs are:
+ - Low battery
+ - Low memory
+ - Incoming bluetooth message
+ - Text message received
+
+ Due to the importance of these dialogs they are
+ displayed on top of all applications. The HbDeviceDialog class provides the client
+ interface for creating these dialogs. This differs from other dialog classes such as
+ HbMessageBox in that
+ HbDeviceDialog is not a widget but is the interface to a framework that handles the dialogs.
+
+ \section _framework Device Dialog Framework
+
+ Any application is able to generate device dialogs. However, in
+ order to display the dialogs on top of all applications, the device dialog framework
+ uses a server. To display a dialog an application uses the HbDeviceDialog client interface to send requests for
+ dialogs to the server. The HbDeviceDialog class can also be used or extended as part of a set of specialization classes
+ to create different device dialog types.
+
+ Device dialog widgets are implemented in plugins loaded by the server.
- HbDeviceDialog is a concrete class. It can be used directly or as a part of
- specialization classes for different device dialog types. It's not a widget but interfaces
- to a device dialog service which is responsible for displaying device dialogs.
- Device dialog widgets are implemented in plugins loaded by the service.
-
- Below is a runtime view of device dialog framework.
+ Shown below is a runtime view of the device dialog framework.
\dot
digraph G {
@@ -105,111 +125,160 @@
}
\enddot
+ <b>Platform dependent.</b> Currently server is implemented only for Symbian platform. On other platforms,
+ device dialog are displayed on client's mainwindow.
+
HbDeviceDialog has no dependencies to other parts of the framework. Only to Qt. Thus it can be used
also from engine components that have no user interface.
- There are three classes of device dialogs. Generic device dialogs which are displayed on top
- of all applications (incoming call is an exception). Examples of these are "Low memory"
- message box and "Receive message via bluetooth" query. Device notification dialogs are
- notifications displayed in a top left corner of a display. Examples are "New message" and
- "Low battery" notifications. Universal indicator menu shows enhanced status indicator
+ \section _types Types of device dialogs
+
+ There are three classes of device dialogs:
+ -# Generic device dialogs are displayed on top
+ of all applications, except in the case of an incoming call. Examples of these are a "Low memory"
+ message box and a "Receive message via bluetooth?" query.
+ -# Device notification dialogs are
+ notifications displayed in the top left corner of the display. Examples are "New message" and
+ "Low battery" notifications.
+ -# The Universal indicator menu shows enhanced status indicator
information.
- Generic device dialogs and indicator menu interrupt current foreground application.
- User cannot interact with the application with a touch or keyboard until the dialog
- is dismissed. Device notification dialog behaves differently allowing interaction with the
+ Generic device dialogs and the indicator menu interrupt the current foreground application.
+ The user cannot interact with the application with a touch or keyboard until the dialog
+ is dismissed. Device notification dialogs behave differently allowing interaction with the
current foreground application.
Device dialog widgets are constructed dynamically by the device dialog service. Construction
takes two parameters: a type and a set of parameters appropriate to the dialog type.
- Widgets are implemented by plugins. Device dialog type is an unique string identifying the
+ The device dialog type is a unique string identifying the
dialog. A search is made to find a plugin that can instantiate the requested
dialog. The service loads the plugin and creates an instance of the widget.
- Parameter set is encapsulated in QMap<QString, QVariant>. Each device dialog implementation has
- a default value for all parameters. Only parameters that differ from the default needs to be
+ The parameter set is encapsulated in QMap<QString, QVariant>. Each device dialog implementation has
+ a default value for all parameters. Only parameters that differ from the default need to be
given. Parameters are <name, value> pairs. How the parameters are used depends on
the plugin implementing the dialog. Suggested usage is <name, value> used as property
name and value pairs of the dialog implementation. This makes it easy to set properties using
QObject::setProperty(const char*, const QVariant&). If data types supported by QVariant are
not suitable for a specific device dialog, Q_DECLARE_METATYPE can be used to add data types.
- Data can be sent to a device dialog after it has been launched using update() function. Data
- sent by the dialog is received by dataReceived signal. A copy of the last data received
- is held by the class and can be fetched by a receivedData() function. This allows to receive
- data without having to connect to a signal by waiting for a dialog to close and then
+ %Data can be sent to a device dialog after it has been launched using the update() function. %Data
+ sent by the dialog is received by the dataReceived signal. A copy of the last data received
+ is held by the class and can be fetched by a call to the receivedData() function. This allows data to be received
+ without having to connect to a signal by waiting for a dialog to close and then
getting the received data.
It is possible to launch multiple device dialogs from a single HbDeviceDialog object.
- However if there is a need to update a dialog or receive data from it, only the last one
- launched is able to do it. In this case instantiate HbDeviceDialog class for each device dialog
+ However if there is a need to update a dialog or receive data from it, only the last dialog
+ launched supports this. In this case instantiate the HbDeviceDialog class for each device dialog
that needs communication (update or data receive) after a launch.
- HbDeviceDialog::show() method returns after device dialog service has accepted the dialog.
+ HbDeviceDialog::show() method returns after the device dialog service has accepted the dialog.
The service decides when the dialog is actually displayed. If there is no need to receive
- data from the dialog widget, HbDeviceDialog object can be destroyed after show method returns
- (can be allocated in a stack). A function is provided to wait for device dialog to be dismissed
+ data from the dialog widget, the HbDeviceDialog object can be destroyed after the show() method returns
+ (can be allocated in a stack). A function is provided to wait for the device dialog to be dismissed,
making the dialog display synchronous.
If any signals of HbDeviceDialog are connected, then the instance needs to exist until the
- dialog is dismissed. In this case device dialog service will close all dialogs
+ dialog is dismissed. In this case the device dialog service will close all dialogs
launched by the instance when it is deleted making it inappropriate to allocate HbDeviceDialog
into a stack.
Several clients can share the same device dialog widget by agreeing on an unique tag. See
HbDeviceDialogWidgetPlugin for more information.
- When HbDeviceDialog object is created, it can reserve a communication channel to device dialog
+ When the HbDeviceDialog object is created, it can reserve a communication channel to the device dialog
service or the channel creation may be delayed until show(). This is controlled by a constructor
- flag. Default is the delayed resource reservation.
+ flag. The default is the delayed resource reservation.
+
+ The HbDeviceDialog class is not thread safe. If cancel() needs to called across threads, a queued
+ signal slot connection can be used.
+
+ \section _usecases Using the HbDeviceDialog class
+
+ The code below launches a device dialog and continues execution
+ \code
+ // Launch a device dialog and continue execution.
+
+ HbDeviceDialog deviceDialog;
+ QVariantMap parameters;
+ parameters.insertMulti(QString("text"), QVariant(QString("Warning text")));
+ const char *deviceDialogType = "hb.devdlg.examplemessagebox/1.0";
+ deviceDialog.show(QString(deviceDialogType), parameters);
+ \endcode
+
+ The code below demonstrates how to use HbDeviceDialog as a member variable and connect signals before launching the device dialog
+ \code
+ // Connect signals and launch a device dialog.
- HbDeviceDialog class is not thread safe. If cancel() needs to called across threads, a queued
- signal slot connection can be used.
+ connect(mDeviceDialog, SIGNAL(dataReceived(QVariantMap)),
+ this, SLOT(dataReceived(QVariantMap)));
+ connect(mDeviceDialog, SIGNAL(deviceDialogClosed()), this, SLOT(deviceDialogClosed()));
+ connect(mDeviceDialog, SIGNAL(error(int)), this, SLOT(error(int)));
+ QVariantMap parameters;
+ mDeviceDialog.show(QString("hb.devdlg.examplequery/1.0"), parameters);
+ \endcode
+
+ The code below shows how to wait until a dialog has closed
+ \code
+ // Below code launches a query and then waits for it to close.
+
+ // Launch query
+ HbDeviceDialog deviceDialog;
+ QVariantMap parameters;
+ deviceDialog.show(QString("hb.devdlg.samplequery/1.0"), parameters);
+ // Wait for note to close
+ deviceDialog.waitForClosed();
+ // Get data the dialog sent
+ QVariantMap data = deviceDialog.receivedData();
+ \endcode
\sa HbDeviceDialogPlugin
-
- \beta
- \hbcore
*/
/*!
\enum HbDeviceDialog::DeviceDialogError
Defines device dialog error codes and ranges.
*/
+
/*!
\var HbDeviceDialog::DeviceDialogError HbDeviceDialog::FrameworkErrors
- Start of an error range for errors originating from device dialog framework (client or server).
+ Start of an error range for errors originating from the device dialog framework (client or server).
*/
+
/*!
\var HbDeviceDialog::DeviceDialogError HbDeviceDialog::PluginErrors
- Start of an error range for errors originating from device dialog plugins. The framework passes
+ Start of an error range for errors originating from the device dialog plugins. The framework passes
these from the plugin unmodified.
*/
+
/*!
\var HbDeviceDialog::DeviceDialogError HbDeviceDialog::ErrorTypeMask
- Mask for error type part of the error code.
+ Mask for the error type part of the error code.
*/
+
/*!
\var HbDeviceDialog::DeviceDialogError HbDeviceDialog::CancelledError
Operation was cancelled by cancel().
*/
-/*!
- \var HbDeviceDialog::DeviceDialogError HbDeviceDialog::SystemCancelledError
- Operation was cancelled by device dialog framework.
-*/
/*!
- \enum HbDeviceDialog::DeviceDialogFlags
- Defines construct flags.
+ \var HbDeviceDialog::DeviceDialogError HbDeviceDialog::SystemCancelledError
+ Operation was cancelled by the device dialog framework.
*/
-/*!
- \var HbDeviceDialog::DeviceDialogFlags HbDeviceDialog::NoDeviceDialogFlags
- No flags specified.
-*/
+
/*!
\var HbDeviceDialog::DeviceDialogFlags HbDeviceDialog::NoFlags
No flags specified.
*/
+
+/*!
+ \enum HbDeviceDialog::DeviceDialogFlag
+ Defines construct flags.
+
+ The DeviceDialogFlags type is a typedef for QFlags<DeviceDialogFlag>. It stores an OR combination of the DeviceDialogFlag values.
+*/
+
/*!
\var HbDeviceDialog::DeviceDialogFlags HbDeviceDialog::ImmediateResourceReservationFlag
Reserves resources immediately instead of delaying until show() is called.
@@ -218,7 +287,9 @@
/*!
\fn void HbDeviceDialog::dataReceived(QVariantMap data)
- This signal is emitted when data is received from a device dialog. \a data contains data from
+ This signal is emitted when data is received from a device dialog.
+
+ \a data contains data from
the dialog. The structure and meaning of the data is a contract between the dialog and
a client. Suggested usage is a set of signal names and parameters.
*/
@@ -227,8 +298,8 @@
\fn void HbDeviceDialog::deviceDialogClosed()
This signal is emitted when a device dialog is closed. Any data sent by the dialog is indicated by
- the dataReceived() signal. If the signal is not connected, latest data received is saved and
- can be retrieved by a receivedData() function.
+ the dataReceived() signal. If the signal is not connected, the latest data received is saved and
+ can be retrieved using the receivedData() function.
\sa dataReceived() receivedData()
*/
@@ -236,7 +307,9 @@
/*!
\fn void HbDeviceDialog::error(int error)
- This signal is emitted when an error has occurred. \a error contains an error code.
+ This signal is emitted when an error has occurred.
+
+ \a error contains an error code.
*/
#include "hbdevicedialog.h"
@@ -252,10 +325,14 @@
#endif // defined(Q_OS_SYMBIAN)
/*!
- Constructs an object. \a f contains construct flags. \a parent is a parent pointer.
- HbDeviceDialog can be allocated into a stack if no signals are to be connected. Device dialog
+ Constructor.
+
+ \param f Contains the construct flags. See DeviceDialogFlag
+ \param parent The parent pointer.
+
+ HbDeviceDialog can be allocated on the stack if no signals are to be connected. The Device dialog
service keeps dialogs launched when the object goes out of scope. If any signals
- are connected, device dialog service will clean all dialogs launched when the instance is
+ are connected, the device dialog service will clean all dialogs launched when the instance is
deleted. In this case the object must remain in existence until the dialog widget is
dismissed.
*/
@@ -267,6 +344,9 @@
d->init(f);
}
+/*!
+ Constructor required by the shared d-pointer paradigm.
+*/
HbDeviceDialog::HbDeviceDialog(HbDeviceDialogPrivate &dd, DeviceDialogFlags f, QObject *parent) :
QObject(parent), d_ptr(&dd)
{
@@ -275,41 +355,25 @@
d->init(f);
}
+/*!
+ Destructor.
+*/
HbDeviceDialog::~HbDeviceDialog()
{
delete d_ptr;
}
/*!
- Shows a device dialog using a device dialog service. The function returns immediately after the
- service has accepted the dialog. Returns true if dialog was accepted, false if error occurred.
+ Shows a device dialog using the device dialog service.
+
+ The function returns immediately after the
+ service has accepted the dialog. Returns \c true if the dialog was accepted, \c false if an error occurred.
The service decides when the dialog is actually displayed.
- \arg deviceDialogType identifies a device dialog to be displayed by a name.
- \arg parameters defines properties of the dialog.
+ \param deviceDialogType Identifies a device dialog to be displayed by a name.
+ \param parameters Defines properties of the dialog.
\sa update(), waitForClosed(), cancel()
-
- \code
- // Below code launches a device dialog and continues execution.
-
- HbDeviceDialog deviceDialog;
- QVariantMap parameters;
- parameters.insertMulti(QString("text"), QVariant(QString("Warning text")));
- const char *deviceDialogType = "hb.devdlg.examplemessagebox/1.0";
- deviceDialog.show(QString(deviceDialogType), parameters);
- \endcode
-
- \code
- // Below code has HbDeviceDialog as a member variable. It connects signals and launches a device dialog.
-
- connect(mDeviceDialog, SIGNAL(dataReceived(QVariantMap)),
- this, SLOT(dataReceived(QVariantMap)));
- connect(mDeviceDialog, SIGNAL(deviceDialogClosed()), this, SLOT(deviceDialogClosed()));
- connect(mDeviceDialog, SIGNAL(error(int)), this, SLOT(error(int)));
- QVariantMap parameters;
- mDeviceDialog.show(QString("hb.devdlg.examplequery/1.0"), parameters);
- \endcode
*/
bool HbDeviceDialog::show(const QString &deviceDialogType, const QVariantMap ¶meters)
{
@@ -317,10 +381,11 @@
}
/*!
- Updates device dialog parameters by a set of new values. show() must be called before an
- update() can be called. If multiple dialogs have been launched by a single HbDeviceDialog
- instance, the last dialog launched receives the update. Returns true on success and false
- if error occurred.
+ Updates device dialog parameters by a set of new values. You must call show() before calling
+ update(). If multiple dialogs have been launched by a single HbDeviceDialog
+ instance, the last dialog launched receives the update.
+
+ \return Returns \c true on success and \c false if an error occurred.
\sa show()
*/
@@ -330,32 +395,25 @@
}
/*!
- Waits for a device dialog to be displayed and dismissed. \a flags specifies flags passed to
- QEventLoop::exec() function. Returns true on success and false if error occurred.
+ Waits for a device dialog to be displayed and subsequently dismissed.
+
+ \a flags specifies the flags passed to the
+ QEventLoop::exec() function.
- The wait is implemented by starting a new event loop. Consider following caveats before using
- this function. Stack usage increases. Depending on application program flow, several event
- loops may get instantiated on top of each other. Application event processing continues while
- waitForClosed() executes. When it returns application state may have changed. For example some
- objects may have been deleted or application may have exited.
+ The wait is implemented by starting a new event loop. The following potential problems should be considered before using
+ this function:
+ - Stack usage increases.
+ - Depending on the application program flow, several event
+ loops may get instantiated on top of each other.
+ - Application event processing continues while
+ waitForClosed() executes.
+ - When the function returns, the application state may have changed. For example some
+ objects may have been deleted or the application may have exited.
<b>Note that starting an event loop isn't compatible with gestures.</b> Therefore if an application
- has an user interface, please don't use this function. Instead connect to signals.
-
+ has a user interface, please don't use this function. Instead connect to signals.
+ \return Returns \c true on success and \c false if an error occurred.
\sa cancel()
-
- \code
- // Below code launches a query and then waits for it to close.
-
- // Launch query
- HbDeviceDialog deviceDialog;
- QVariantMap parameters;
- deviceDialog.show(QString("hb.devdlg.samplequery/1.0"), parameters);
- // Wait for note to close
- deviceDialog.waitForClosed();
- // Get data the dialog sent
- QVariantMap data = deviceDialog.receivedData();
- \endcode
*/
bool HbDeviceDialog::waitForClosed(QEventLoop::ProcessEventsFlag flags)
{
@@ -363,9 +421,11 @@
}
/*!
- Returns the latest data received from a device dialog. This function can be called instead of
- connecting to dataReceived() signal. If dataReceived() signal has connections, latest data is
- not saved and this function returns empty data structure.
+ Returns the latest data received from a device dialog.
+
+ This function can be called instead of
+ connecting to the dataReceived() signal. If the dataReceived() signal has connections, the latest data is
+ not saved and this function returns an empty data structure.
\sa waitForClosed()
*/
@@ -375,7 +435,9 @@
}
/*!
- Returns a last error. Last error is cleared when any other API function than error() is called.
+ Returns the last error.
+
+ The last error is cleared when any other API function except error() is called.
*/
int HbDeviceDialog::error() const
{
@@ -383,11 +445,15 @@
}
/*!
- Cancels a device dialog. The dialog is removed from the device dialog service. Does nothing if
- the dialog has already been dismissed. Removes dialog if it's waiting to be displayed or
- currently on display. If multiple dialogs have been launched by a single HbDeviceDialog
- instance, the last dialog launched is cancelled. deviceDialogClosed() signal is emitted if
- a dialog was closed. Returns true on success and false if error occurred.
+ Cancels a device dialog and removes the dialog from the device dialog service.
+
+ Removes the dialog if the dialog is waiting to be displayed or
+ currently on display. Has no effect if
+ the dialog has already been dismissed. If multiple dialogs have been launched by a single HbDeviceDialog
+ instance, the last dialog launched is cancelled. The deviceDialogClosed() signal is emitted if
+ a dialog was closed.
+
+ \return Returns \c true on success and \c false if an error occurred.
\sa show(), deviceDialogClosed()
*/
--- a/src/hbcore/devicedialogbase/hbdevicedialogclientsession.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/devicedialogbase/hbdevicedialogclientsession.cpp Fri May 14 16:09:54 2010 +0300
@@ -66,29 +66,15 @@
}
TInt error = KErrNone;
- if (ServerRunning()) {
- if (!Handle()) {
- TVersion serverVersion(KHbServerMajor, KHbServerMinor, KHbServerBuild);
- error = CreateSession(KHbServerName, serverVersion, KNumAsyncMessageSlots,
- EIpcSession_Unsharable, 0, aStatus);
- }
- } else {
- error = Connect();
- User::RequestComplete(aStatus, error);
+ if (!Handle()) {
+ TVersion serverVersion(KHbServerMajor, KHbServerMinor, KHbServerBuild);
+ error = CreateSession(KHbServerName, serverVersion, KNumAsyncMessageSlots,
+ EIpcSession_Unsharable, 0, aStatus);
}
TRACE_EXIT
return error;
}
-TBool RHbDeviceDialogClientSession::ServerRunning() const
-{
- TRACE_ENTRY
- TFindServer findHbServer(KHbServerName);
- TFullName name;
- TRACE_EXIT
- return findHbServer.Next(name) == KErrNone;
-}
-
/*!
\internal
*/
@@ -130,6 +116,15 @@
return error;
}
+TBool RHbDeviceDialogClientSession::ServerRunning()
+{
+ TRACE_ENTRY
+ TFindServer findHbServer(KHbServerName);
+ TFullName name;
+ TRACE_EXIT
+ return findHbServer.Next(name) == KErrNone;
+}
+
/*!
\internal
*/
--- a/src/hbcore/devicedialogbase/hbdevicedialogclientsession_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/devicedialogbase/hbdevicedialogclientsession_p.h Fri May 14 16:09:54 2010 +0300
@@ -35,10 +35,10 @@
virtual ~RHbDeviceDialogClientSession();
TInt Connect(TRequestStatus *aStatus);
- TBool ServerRunning() const;
TInt Connect();
void Close();
TInt StartServer();
+ static TBool ServerRunning();
int SendSyncRequest(int aCommand, int aInt0 = 0);
int SendSyncRequest(int aCommand, const TDesC8 &aData, TDes8 *aReceiveData = 0);
--- a/src/hbcore/devicedialogbase/hbdevicedialogplugin.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/devicedialogbase/hbdevicedialogplugin.cpp Fri May 14 16:09:54 2010 +0300
@@ -31,6 +31,9 @@
service. The service queues and displays device dialogs according to client requests and
system state. The service displays widgets in it's window (HbApplication window).
+ <b>Platform dependent.</b> Currently server is implemented only for Symbian platform. On other platforms,
+ device dialog are displayed on client's mainwindow.
+
Device dialog widgets are created by plugins. The service loads a plugin to create and display
a device dialog. A single plugin may implement several different dialogs or just one.
Dialogs are identified by a string. By convention the string should follow
@@ -45,17 +48,18 @@
numbers in type strings. It performs string comparison of the whole string when searching
for a plugin.
- Device dialogs are divided into three groups: generic device dialog, device notification dialog
- and indicator groups. The group dictates how and when a dialog is shown. Each dialog
- indicates which group it belongs to. The group need not be fixed. It may change depending on
- create parameters.
+ Device dialogs are divided into five groups: generic, notification, indicator-menu, security
+ and critical groups. The group dictates how and when a dialog is shown. Generic and
+ notification dialogs are intended for application use. Indicator, security and critical dialogs are
+ for platform. Each dialog indicates which group it belongs to. The group need not be fixed.
+ It may change depending on create parameters.
Device dialog groups may prioritize (queueing) device dialogs in respect to other groups.
In addition each device dialog has an individual queueing priority that may affect how it is
shown inside a group. Currently there is no queueing implemented for device dialogs. All
dialogs are displayed in order requests are received. Z-order of dialogs on display is
- determined by popup framework. Last dialog created is on top. Z-order may be changed by
- dialog widget changing it's popup priority.
+ determined by popup framework. Last dialog created is on top. Device dialog framework
+ manipulates Z-order of dialogs. Device dialogs themselves should not change the popup Z-order.
Device dialog widgets have to be derived from HbPopup either directly or by ancestry.
@@ -70,12 +74,8 @@
HbDeviceDialogPlugin::SharedDeviceDialog.
</div>
- On S60, platform and third party plugins are run by separate servers with different
- platform security capabilities. The capabilities are following.
- - Platform plugins
- - ProtServ, SwEvent, TrustedUI
- - Third party plugins
- - ProtServ, TrustedUI
+ <b>Symbian.</b>Plugins are run by a server with platform security capabilities ProtServ, SwEvent,
+ TrustedUI and ReadDeviceData.
Plugins are responsible for maintaining system security for their own part. If plugin
performs operations that may compromise security or want's to limit access to specific
@@ -85,12 +85,22 @@
function returns false. In addition, HbDeviceDialogPlugin constructor has a check which
allows only device dialog service to load plugins derived from it.
- Device dialog plugins can be installed into a device by users. Tbd. This needs to be clarified.
+ <b>Symbian.</b>Device dialog plugins can be installed into a device. If a plugin doesn't have
+ required platform security capabilities it will not load. Plugins are searched from device's
+ local drives. The search order is rom-drives, non-removable drives and removable drives. Once
+ a pluging is found the search stops. This implies that plugins on rom drives cannot be
+ overriden by plugins on other drives.
- Plugin location differs depending on platform. On Symbian, device dialog plugin stubs are
- located in /resource/plugins/devicedialogs directory and executables in /sys/bin directory.
- On Windows/Linux plugin executables are searched from application's current directory and
- HB_PLUGINS_DIR/devicedialogs directory.
+ <b>Platform dependent.</b>Plugin location differs depending on platform. On Symbian, device dialog
+ plugin stubs (.qtplugin) are located in /resource/plugins/devicedialogs directory and executables
+ in /sys/bin directory. On other platforms plugin executables are searched from application's
+ current directory and HB_PLUGINS_DIR/devicedialogs directory.
+
+ Well behaving dialog widget should observe following rules:
+ - Should not create and show other dialogs
+ - No calls to show(), hide() or setVisible()
+ - Not setting popup Z-order
+ - No time consuming operations performed
Creating a device dialog plugin and widget involves following steps.
- Set in .pro file TEMPLATE = lib and CONFIG += hb plugin
@@ -101,7 +111,8 @@
Q_OBJECT
\endcode
- Implement device dialog widget and HbDeviceDialogInterface interface. Declare and emit
- deviceDialogClosed and optionally deviceDialogData signals.
+ deviceDialogClosed and optionally deviceDialogData signals. Do not call show(), hide() or
+ setVisible() in the plugin. Device dialog framework calls show() to display the widget.
\code
public:
bool setDeviceDialogParameters(const QVariantMap ¶meters);
@@ -178,7 +189,7 @@
\sa HbDeviceDialogPluginInterface HbDeviceDialogInterface HbDeviceDialog HbPopup
- \alpha
+ \stable
\hbcore
*/
@@ -253,15 +264,7 @@
attaching to a device dialog widget.
*/
-/*!
- \var HbDeviceDialogPlugin::DeviceDialogFlag HbDeviceDialogPlugin::NoLocalisableData
- If the flag is set, device dialog service does not try to find and localise strings
- from the property set. If not set localisable strings are localised by the device
- dialog service.
- \deprecated HbDeviceDialogPlugin::NoLocalisableData
- is deprecated. Will be removed as localization is always done by application.
-*/
/*!
\var HbDeviceDialogPlugin::DefaultPriority
@@ -414,7 +417,7 @@
\sa HbDeviceDialogPlugin HbDeviceDialog
- \alpha
+ \stable
\hbcore
*/
@@ -482,7 +485,7 @@
from HbDeviceDialogPlugin. This class declares createDeviceDialog() function which the plugin must
implement.
- \alpha
+ \stable
\hbcore
*/
--- a/src/hbcore/devicedialogbase/hbdevicedialogplugin.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/devicedialogbase/hbdevicedialogplugin.h Fri May 14 16:09:54 2010 +0300
@@ -70,8 +70,7 @@
enum DeviceDialogFlag{
NoDeviceDialogFlags = 0x00,
SharedDeviceDialog = 0x01,
- SecurityCheck = 0x02,
- NoLocalisableData = 0x04 // deprecated
+ SecurityCheck = 0x02
};
Q_DECLARE_FLAGS(DeviceDialogFlags, DeviceDialogFlag)
--- a/src/hbcore/devicedialogbase/hbdevicedialogsymbian.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/devicedialogbase/hbdevicedialogsymbian.cpp Fri May 14 16:09:54 2010 +0300
@@ -49,7 +49,7 @@
When plugin returns data in Qt format, the data is converted, if possible,
to CHbSymbianVariantMap.
- \proto
+ \stable
\hbcore
*/
--- a/src/hbcore/devicedialogbase/hbdevicedialogwin32_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/devicedialogbase/hbdevicedialogwin32_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -55,7 +55,9 @@
HbDeviceDialogPrivate::~HbDeviceDialogPrivate()
{
- mDeviceDialogManager->deviceDialogClientClosing(reinterpret_cast<quintptr>(this));
+ if (mDeviceDialogManager) {
+ mDeviceDialogManager->deviceDialogClientClosing(reinterpret_cast<quintptr>(this));
+ }
if (mEventLoop && mEventLoop->isRunning()) {
mEventLoop->exit(HbDeviceDialog::CancelledError);
}
--- a/src/hbcore/devicedialogbase/hbdevicedialogwin32_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/devicedialogbase/hbdevicedialogwin32_p.h Fri May 14 16:09:54 2010 +0300
@@ -51,7 +51,7 @@
// We mean it.
//
-class HbDeviceDialogPrivate : public QObject
+class HB_AUTOTEST_EXPORT HbDeviceDialogPrivate : public QObject
{
Q_OBJECT
--- a/src/hbcore/devicedialogbase/hbindicator.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/devicedialogbase/hbindicator.cpp Fri May 14 16:09:54 2010 +0300
@@ -45,7 +45,7 @@
\sa HbIndicatorPluginInterface
- \alpha
+ \stable
\hbcore
*/
--- a/src/hbcore/devicedialogbase/hbindicatorsym_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/devicedialogbase/hbindicatorsym_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -42,6 +42,8 @@
{
TInt error = KErrNone;
if (!IsActive()) {
+ // Async connect to prevent deadlock if application is started from a
+ // device dialog server plugin.
iStatus = KRequestPending;
error = iIndicator->mHbSession.Connect(&iStatus);
if (error == KErrNone) {
@@ -50,15 +52,15 @@
}
return error;
}
- void RunL() {
+ void RunL()
+ {
if (iStatus == KErrNone) {
iIndicator->Start();
}
}
void DoCancel()
{
- TRequestStatus *rs = &iStatus;
- User::RequestComplete(rs, KErrNone);
+ // No Cancel() available for RSessionBase::Connect()
}
private:
HbIndicatorPrivate *iIndicator;
@@ -121,26 +123,33 @@
{
TRACE_ENTRY
TInt error = KErrNone;
+ bool asynchConnect = false;
if (forListening) {
- if (!iAsyncListener) {
- iAsyncListener = new (ELeave) CAsyncListener(this);
+ CreateReceiveBufferL(DefaultReceiveBufferSize);
+ // If device dialog server is running, connect asynchronously. This is to
+ // prevent a deadlock if server plugin is starting an application.
+ asynchConnect = RHbDeviceDialogClientSession::ServerRunning();
+ if (asynchConnect){
+ if (!iAsyncListener) {
+ iAsyncListener = new (ELeave) CAsyncListener(this);
+ }
+ error = iAsyncListener->Start();
+ } else {
+ error = mHbSession.Connect();
}
- error = iAsyncListener->Start();
} else {
error = mHbSession.Connect();
}
- if ( error != KErrNone && error != KErrAlreadyExists) {
+ if (error != KErrNone) {
TRACE("initialize error: " << error);
- setError( HbDeviceDialogConnectError );
- User::LeaveIfError( error );
- }
- else if (forListening){
- iBuffer = HBufC8::NewL( 256 );
- iDataPtr.Set( iBuffer->Des() );
- iDataPtr.Zero();
+ setError(HbDeviceDialogConnectError);
+ User::Leave(error);
}
iInitialized = ETrue;
+ if (forListening && !asynchConnect) {
+ Start();
+ }
TRACE_EXIT
}
@@ -180,7 +189,7 @@
bool HbIndicatorPrivate::stopListen()
{
TRACE_ENTRY
- //close connections to server.
+ // Close connections to server
bool ok = false;
if (iRequesting) {
Close();
@@ -232,24 +241,22 @@
iRequesting = EFalse;
if (status >= 0 && iMsgType == EHbIndicatorUserActivated) {
- iMsgType = -1;
- if (status > 0) {
- delete iBuffer;
- iBuffer = NULL;
- iBuffer = HBufC8::NewL(status);
- iDataPtr.Set(iBuffer->Des());
- TInt error = mHbSession.SendSyncRequest(EHbSrvActivatedIndicatorData, iDataPtr, &iMsgTypePtr);
- }
-
- QByteArray resArray((const char*)iDataPtr.Ptr(), iDataPtr.Size());
- QDataStream stream(&resArray, QIODevice::ReadOnly);
- QVariant var;
- stream >> var;
-
- if (q_ptr && q_ptr->receivers(SIGNAL(userActivated(QString, QVariantMap))) > 0) {
- QVariantMap map = var.toMap();
- emit q_func()->userActivated(map.value("type").toString(), map.value("data").toMap());
- }
+ iMsgType = -1;
+ if (status > 0) {
+ CreateReceiveBufferL(status);
+ TInt error = mHbSession.SendSyncRequest(EHbSrvActivatedIndicatorData,
+ iDataPtr, &iMsgTypePtr);
+ }
+
+ QByteArray resArray((const char*)iDataPtr.Ptr(), iDataPtr.Size());
+ QDataStream stream(&resArray, QIODevice::ReadOnly);
+ QVariant var;
+ stream >> var;
+
+ if (q_ptr && q_ptr->receivers(SIGNAL(userActivated(QString, QVariantMap))) > 0) {
+ QVariantMap map = var.toMap();
+ emit q_func()->userActivated(map.value("type").toString(), map.value("data").toMap());
+ }
} else if (status >= 0) {
QByteArray resArray( (const char*) iDataPtr.Ptr(), iDataPtr.Size() );
QDataStream stream( &resArray, QIODevice::ReadOnly);
@@ -301,11 +308,7 @@
if ( status > 0 && iBuffer->Size() < status ) {
// Resize buffer.
- delete iBuffer;
- iBuffer = NULL;
-
- iBuffer = HBufC8::NewL( status );
- iDataPtr.Set( iBuffer->Des() );
+ CreateReceiveBufferL(status);
}
} else {
setError(status);
@@ -347,17 +350,16 @@
{
TRACE_ENTRY
- if ( !iRequesting && iInitialized && !IsActive() ) {
- if (!iBuffer) {
- iBuffer = HBufC8::NewL( 256 );
- iDataPtr.Set( iBuffer->Des() );
- }
- iDataPtr.Zero();
+ if (!iRequesting && iInitialized && !IsActive()) {
+ if (!iBuffer) {
+ CreateReceiveBufferL(DefaultReceiveBufferSize);
+ }
+ iDataPtr.Zero();
TPckg<TInt> pckg( iMsgType );
iMsgTypePtr.Set( pckg ); //iMsgTypePtr is ignored in server side.
mHbSession.SendASyncRequest( EHbSrvGetActivatedIndicatorsStart,
- iDataPtr, iMsgTypePtr, iStatus );
+ iDataPtr, iMsgTypePtr, iStatus );
SetActive();
iRequesting = ETrue;
}
@@ -368,7 +370,7 @@
{
TRACE_ENTRY
- if ( !iRequesting && iInitialized && !IsActive() ) {
+ if (!iRequesting && iInitialized && !IsActive()) {
TPckg<TInt> pckg( iMsgType );
iMsgTypePtr.Set( pckg );
@@ -435,3 +437,10 @@
return result;
}
+void HbIndicatorPrivate::CreateReceiveBufferL(int size)
+{
+ delete iBuffer; iBuffer = 0;
+ iBuffer = HBufC8::NewL(size);
+ iDataPtr.Set(iBuffer->Des());
+ iDataPtr.Zero();
+}
--- a/src/hbcore/devicedialogbase/hbindicatorsym_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/devicedialogbase/hbindicatorsym_p.h Fri May 14 16:09:54 2010 +0300
@@ -51,6 +51,11 @@
{
Q_OBJECT
+private: // types
+ enum {
+ DefaultReceiveBufferSize = 256
+ };
+
public: // methods
HbIndicatorPrivate();
@@ -83,6 +88,7 @@
void Continue();
void Close();
TBool sendActivateMessage(const QString &indicatorType, TBool activate, const QVariant& data);
+ void CreateReceiveBufferL(int size);
private: // data
--- a/src/hbcore/devicedialogbase/hbindicatorsymbian.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/devicedialogbase/hbindicatorsymbian.cpp Fri May 14 16:09:54 2010 +0300
@@ -62,7 +62,7 @@
\sa HbIndicator
- \alpha
+ \stable
\hbcore
*/
--- a/src/hbcore/devicedialogbase/hbindicatorsymbian.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/devicedialogbase/hbindicatorsymbian.h Fri May 14 16:09:54 2010 +0300
@@ -51,11 +51,11 @@
IMPORT_C static CHbIndicatorSymbian* NewL();
IMPORT_C ~CHbIndicatorSymbian();
- TBool Activate(const TDesC& aIndicatorType, const CHbSymbianVariant* aParameter = 0);
- TBool Deactivate(const TDesC& aIndicatorType, const CHbSymbianVariant* aParameter = 0);
+ IMPORT_C TBool Activate(const TDesC& aIndicatorType, const CHbSymbianVariant* aParameter = 0);
+ IMPORT_C TBool Deactivate(const TDesC& aIndicatorType, const CHbSymbianVariant* aParameter = 0);
- TInt Error() const;
- void SetObserver(MHbIndicatorSymbianObserver* aObserver);
+ IMPORT_C TInt Error() const;
+ IMPORT_C void SetObserver(MHbIndicatorSymbianObserver* aObserver);
private:
CHbIndicatorSymbian();
--- a/src/hbcore/devicedialogbase/hbindicatorwin32_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/devicedialogbase/hbindicatorwin32_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -31,13 +31,14 @@
#include "hbindicatorpluginmanager_p.h"
#include "hbdevicedialogerrors_p.h"
+HbIndicatorPluginManager *HbIndicatorPrivate::mIndicatorPluginManager = 0;
+
HbIndicatorPluginManager *HbIndicatorPrivate::pluginManager()
{
- static HbIndicatorPluginManager *manager;
- if (!manager) {
- manager = new HbIndicatorPluginManager();
+ if (!mIndicatorPluginManager) {
+ mIndicatorPluginManager = new HbIndicatorPluginManager();
}
- return manager;
+ return mIndicatorPluginManager;
}
// Indicators are implemented only for Symbian/S60 OS. All others use a stub which shows
--- a/src/hbcore/devicedialogbase/hbindicatorwin32_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/devicedialogbase/hbindicatorwin32_p.h Fri May 14 16:09:54 2010 +0300
@@ -88,6 +88,7 @@
int iLastError;
bool iListening;
QBasicTimer timer;
+ static HbIndicatorPluginManager *mIndicatorPluginManager;
};
#endif // HBINDICATORWIN32_P_H
--- a/src/hbcore/devicedialogbase/hbsymbiandevicedialog.cpp Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,550 +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 <QVariant>
-
-#include "hbdevicedialogserverdefs_p.h"
-#include "hbdevicedialogerrors_p.h"
-#include "hbdevicedialogclientsession_p.h"
-#include <e32cmn.h>
-
-#include "hbsymbiandevicedialog.h"
-#include "hbsymbianvariant.h"
-#include "hbsymbianvariantconverter_p.h"
-
-/*!
- \class CHbDeviceDialog
- \brief CHbDeviceDialog is a Symbian implementation of HbDeviceDialog.
-
- CHbDeviceDialog displays dialogs on top of applications. It is a client interface for Symbian applications to
- Hb device dialogs.
-
- \deprecated CHbDeviceDialog
- is deprecated. Replaced by a class CHbDeviceDialogSymbian.
-
- \sa HbDeviceDialog
-
- Data given to this API in s60 format is packed to QVariantMap. See
- CHbSymbianVariant to see which Qt datatypes are supported.
- \sa CHbSymbianVariant
- \sa CHbSymbianVariantMap
-
- When plugin returns data in Qt format, the data is converted, if possible,
- to CHbSymbianVariantMap.
-
- \proto
-
- \hbcore
- */
-
-/*!
- \enum CHbDeviceDialog::TDeviceDialogError
- Defines device dialog error codes and ranges.
-*/
-/*!
- \var TDeviceDialogError::DeviceDialogError HbDeviceDialog::FrameworkErrors
- Start of an error range for errors originating from device dialog framework (client or server).
-*/
-/*!
- \var TDeviceDialogError::DeviceDialogError HbDeviceDialog::PluginErrors
- Start of an error range for errors originating from device dialog plugins. The framework passes
- these from the plugin unmodified.
-*/
-/*!
- \var TDeviceDialogError::DeviceDialogError HbDeviceDialog::ErrorTypeMask
- Mask for error type part of the error code.
-*/
-/*!
- \var TDeviceDialogError::DeviceDialogError HbDeviceDialog::CancelledError
- Operation was cancelled by Cancel().
-*/
-/*!
- \var DeviceDialogs60Error::DeviceDialogError HbDeviceDialog::SystemCancelledError
- Operation was cancelled by device dialog framework.
-*/
-
-/*!
- \fn void MHbDeviceDialogObserver::DataReceived(CHbSymbianVariantMap& aData)
-
- This callback is called when data is received from a device dialog.
- \a aData contains data from the dialog plugin.
- The structure and meaning of the data is a contract between the dialog and
- a client. Structure should be aligned with the data types supported by
- CHbSymbianVariantMap.
-
- \sa CHbSymbianVariantMap.
-*/
-
-/*!
- \fn void MHbDeviceDialogObserver::DeviceDialogClosed(TInt aCompletionCode)
-
- This callback is called when a device dialog is closed. Any data sent by
- the dialog is indicated by the dataReceived() callback. If no observer is
- set in CHbDeviceDialog::Show the latest data can be retrieved with
- CHbDeviceDialog::receivedData()
-
- \a aCompletionCode gives the result of the dialog completion. Code can be
- either Symbian error code or device dialog error code
- device dialog error code
-
- \sa DataReceived() ReceivedData()
-*/
-
-// Device dialogs are implemented only for Symbian/S60 OS.
-
-class CHbDeviceDialogPrivate : public CActive
-{
-public:
- CHbDeviceDialogPrivate();
- ~CHbDeviceDialogPrivate();
- TInt Show( const QByteArray& aArray );
- TInt Update( const QByteArray& aArray );
- void CancelDialog();
- TInt Error() const;
- void SetObserver( MHbDeviceDialogObserver* aObserver );
-
- // CActive
- void RunL();
- void DoCancel();
- TInt RunError( TInt aError );
-
- void Start();
- TInt SymToDeviceDialogError( TInt errorCode );
- void SetError(TInt aError);
-
-public:
- TInt iFlags;
- RHbDeviceDialogClientSession iHbSession;
- TInt iLastError;
- TPckgBuf<THbDeviceDialogSrvUpdateInfo> iUpdateInfo;
- TPckgBuf<int> iDeviceDialogId;
- HBufC8* iBuffer;
- TPtr8 iDataPtr;
- TBool iRequesting;
- QVariantMap iDataReceived;
- CActiveSchedulerWait* iWait;
- MHbDeviceDialogObserver* iObserver;
-
-};
-
-CHbDeviceDialogPrivate::CHbDeviceDialogPrivate():
-CActive( EPriorityStandard ),
-iFlags(0),
-iLastError(0),
-iDeviceDialogId(0),
-iBuffer(NULL),
-iDataPtr(NULL, 0, 0),
-iRequesting(EFalse),
-iWait(NULL),
-iObserver(NULL)
-{
- if (!iBuffer) {
- iBuffer = HBufC8::NewL(64);
- if (iBuffer) {
- iDataPtr.Set(iBuffer->Des());
- }
- }
-}
-
-CHbDeviceDialogPrivate::~CHbDeviceDialogPrivate()
-{
- // Inform the server to finish the dialog session and not to cancel it
- if(!iObserver) {
- iHbSession.SendSyncRequest(EHbSrvClientClosing);
- }
-
- Cancel();
- iHbSession.Close();
-
- delete iBuffer;
- iBuffer = NULL;
-
- iObserver= NULL;
- // stop synchorous calls
- if(iWait) {
- if( iWait->IsStarted() ) {
- iWait->AsyncStop();
- }
- delete iWait;
- iWait = NULL;
- }
-}
-
-TInt CHbDeviceDialogPrivate::Show(const QByteArray& aArray )
-{
- TInt error = iLastError = KErrNone;
-
- 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);
-
- if (error == KErrNone) {
- // Start listening for server updates. Device dialog update and closing is
- // received via this channel. Error status received in RunL method.
- Start();
- }
- // Error, just return the error code
- else {
- SetError(error);
- }
- return error;
-}
-
-/*!
- \internal
-
- Send device dialog update.
-*/
-TInt CHbDeviceDialogPrivate::Update( const QByteArray& aArray )
-{
- TInt error = iLastError = KErrNone;
- if (iRequesting) {
-
- TPtrC8 ptr( reinterpret_cast<const TUint8*>(aArray.data()), aArray.size() );
-
- error = iHbSession.SendSyncRequest( EHbSrvUpdateDeviceDialog, ptr );
- //error = SymToDeviceDialogError(error);
- if (error != KErrNone) {
- SetError(error);
- }
- }
- else {
- SetError(KErrBadHandle);
- error = KErrBadHandle;
- }
- return error;
-}
-
-/*!
- \internal
-
- Cancel a scheduled popup on HbDeviceDialogManager. Event buffer is cleared
- at server.
-*/
-void CHbDeviceDialogPrivate::CancelDialog()
-{
- iLastError = KErrNone;
- int error = KErrNotFound;
-
- if (iRequesting) {
- // Ignore other than server errors.
- error = iHbSession.SendSyncRequest(EHbSrvCancelDeviceDialog, iDeviceDialogId());
- // error = SymToDeviceDialogError(error);
- }
- if (error != KErrNone) {
- SetError(error);
- }
-}
-
-/*!
- \internal
-
- Return last error.
-*/
-TInt CHbDeviceDialogPrivate::Error() const
-{
- return iLastError;
-}
-
-void CHbDeviceDialogPrivate::SetObserver( MHbDeviceDialogObserver* aObserver )
-{
- iObserver = aObserver;
-}
-/*!
- \internal
- RunL from CActive.
-*/
-void CHbDeviceDialogPrivate::RunL()
-{
- TInt completionCode = iStatus.Int();
- //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(iObserver) {
- iObserver->DeviceDialogClosed(completionCode);
- }
- }
- else {
- // Check that event is for latest device dialog. iDeviceDialogId was updated by server
- // during show()
- THbDeviceDialogSrvUpdateInfo &updateInfo = iUpdateInfo();
- if (updateInfo.iDeviceDialogId == iDeviceDialogId()) {
- switch(updateInfo.iUpdateType) {
- case EHbDeviceDialogUpdateData: {
- if (completionCode == KErrNone &&
- updateInfo.iInfo.iDataInfo.iDataSize > 0) {
- // Resize buffer and get new data synchronously
- delete iBuffer;
- iBuffer = NULL;
- iBuffer = HBufC8::NewL(updateInfo.iInfo.iDataInfo.iDataSize);
- iDataPtr.Set(iBuffer->Des());
- completionCode = iHbSession.SendSyncRequest(EHbSrvUpdateData, iDataPtr);
- //errorCode = SymToDeviceDialogError(completionCode);
-
- // data request failed
- if (completionCode < KErrNone) {
- iRequesting = EFalse;
- SetError(completionCode);
- if(iObserver) {
- iObserver->DeviceDialogClosed(completionCode);
- }
- }
- }
- if (completionCode == KErrNone) {
- // Signal data if there are connections. Otherwise keep a copy.
- QByteArray resArray((const char*)iDataPtr.Ptr(), iDataPtr.Size());
- QDataStream stream(&resArray, QIODevice::ReadOnly);
-
- iDataReceived.clear();
-
- QVariant var;
- stream >> var;
- QVariantMap varMap = var.toMap();
-
- if(iObserver) {
- CHbSymbianVariantMap* symbianMap =
- HbSymbianVariantConverter::fromQVariantMapL(varMap);
- iObserver->DataReceived(*symbianMap);
- delete symbianMap;
- symbianMap = 0;
- }
- else {
- iDataReceived = varMap;
- }
- }
- break;
- }
- case EHbDeviceDialogUpdateClosed:
- // Signal possible cancelled error
- if (completionCode != KErrNone) {
- SetError(completionCode);
- }
- iRequesting = EFalse;
- if(iObserver) {
- iObserver->DeviceDialogClosed(completionCode);
- }
- break;
- default:
- break;
- }
- }
- }
- // Make a new request if there was no errors and device dialog wasn't closed
- if (iRequesting) {
- Start();
- }
- else if (iWait && iWait->IsStarted()){
- // No requests going so stop
- iWait->AsyncStop();
- }
-}
-
-/*!
- \internal
- DoCancel from CActive.
-*/
-void CHbDeviceDialogPrivate::DoCancel()
-{
- SetError(KErrCancel);
- iRequesting = EFalse;
- iHbSession.SendSyncRequest(EHbSrvCancelUpdateChannel);
- if(iObserver) {
- iObserver->DeviceDialogClosed(KErrCancel);
- }
-}
-
-/*!
- \internal
- RunError from CActive.
-*/
-TInt CHbDeviceDialogPrivate::RunError( TInt /*aError*/ )
-{
- SetError( KErrGeneral );
- return KErrNone;
-}
-
-/*!
- \internal
- Starts asynchronous message to receive update and close events from session.
-*/
-void CHbDeviceDialogPrivate::Start()
-{
- iDataPtr.Zero();
-
- if ( !IsActive() ) {
- iHbSession.SendASyncRequest( EHbSrvOpenUpdateChannel, iDataPtr, iUpdateInfo, iStatus );
- SetActive();
- iRequesting = ETrue;
- }
-}
-
-// Convert symbian error code into HbDeviceDialog error code
-int CHbDeviceDialogPrivate::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;
- }
- }
- return errorCode;
-}
-
-void CHbDeviceDialogPrivate::SetError( TInt aError )
-{
- iLastError = aError;
-}
-
-/*!
- Constructs CHbDeviceDialog object. \a f contains construct flags. Device
- dialog service will clean all dialogs launched when the instance is deleted.
-*/
-
-EXPORT_C CHbDeviceDialog* CHbDeviceDialog::NewL( TInt aFlags )
-{
- CHbDeviceDialog* s60DeviceDialog = new CHbDeviceDialog(aFlags);
- int error = KErrNone;
- if(s60DeviceDialog->d) {
- error = s60DeviceDialog->d->iHbSession.Connect();
- }
- if(error != KErrNone) {
- CleanupStack::PushL(s60DeviceDialog);
- User::Leave(error);
- delete s60DeviceDialog;
- s60DeviceDialog = 0;
- }
- return s60DeviceDialog;
-}
-
-EXPORT_C CHbDeviceDialog::~CHbDeviceDialog()
-{
- delete d;
-}
-
-/*!
- Show of device dialog. aParameter data is sent to
- device dialog in Qt's QVariantMap object. The method call is synchronous if
- no observer is set. When aObserver is set, the call is asynchronous. Deleting
- the CHbDeviceDialog object does not cancel the call but leaves the plugin on the
- server to complete the session. Use CHbDeviceDialog::Cancel to cancel the device
- dialog.
-
- \a aDeviceDialogType is name of the device dialog. Identifies the device
- dialog plugin. \a aParameters is a buffer containing data for the device dialog.
-
- \a aObserver is used to observe the session. If set, the call is asynchronous.
-
- Return value informs if the call was successful.
- */
-EXPORT_C TInt CHbDeviceDialog::Show(const TDesC& aDeviceDialogType, const CHbSymbianVariantMap& aParameters, MHbDeviceDialogObserver* aObserver)
-{
- d->SetObserver(aObserver);
-
- QString deviceDialogType = QString::fromUtf16(aDeviceDialogType.Ptr(), aDeviceDialogType.Length());
-
- QVariantMap parameters;
- HbSymbianVariantConverter::toQtVariantMap(aParameters, parameters);
-
- QByteArray array;
- QDataStream stream( &array, QIODevice::WriteOnly );
-
- QVariant var( parameters );
- stream << deviceDialogType;
- stream << var;
-
- return d->Show(array);
-}
-
-/*!
- Updates device dialog parameters by a set of new values. Show() must be called before an
- Update() can be called. Returns true on success and false
- if error occurred.
-
- \sa Show()
-*/
-EXPORT_C TInt CHbDeviceDialog::Update(const CHbSymbianVariantMap& aParameters)
-{
- if(!d) {
- return KErrNotReady;
- }
- QVariantMap parameters;
-
- HbSymbianVariantConverter::toQtVariantMap(aParameters, parameters);
-
- QByteArray array;
- QDataStream stream( &array, QIODevice::WriteOnly );
-
- QVariant var( parameters );
- stream << var;
-
- return d->Update(array);
-}
-
-/*!
- Get the data received from device dialog if using synchronous Show
- in s60 data types. Caller gets the ownership.
-*/
-EXPORT_C CHbSymbianVariantMap* CHbDeviceDialog::ReceivedDataL() const
-{
- CHbSymbianVariantMap* map = HbSymbianVariantConverter::fromQVariantMapL(d->iDataReceived);
- return map;
-}
-
-/*!
- Cancel device dialog session. Visible dialog is removed from the screen.
- Waiting dialogs are canceled and no effect if dialog already dismissed
-*/
-EXPORT_C void CHbDeviceDialog::Cancel()
-{
- d->CancelDialog();
-}
-
-/*!
- Set observer for device dialog events. \aObserver is pointer to the
- observer. Null disables observing.
-*/
-EXPORT_C void CHbDeviceDialog::SetObserver(MHbDeviceDialogObserver* aObserver)
-{
- d->SetObserver(aObserver);
-}
-
-CHbDeviceDialog::CHbDeviceDialog(TInt aFlags) : d(NULL)
-{
- d = new CHbDeviceDialogPrivate;
- d->iFlags = aFlags;
- CActiveScheduler::Add(d);
-
- // Is needed to implement?
- //if (mDeviceDialogFlags & HbDeviceDialog::ImmediateResourceReservationFlag)
-}
--- a/src/hbcore/devicedialogbase/hbsymbiandevicedialog.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +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 HBSYMBIANDEVICEDIALOG_H
-#define HBSYMBIANDEVICEDIALOG_H
-
-#if defined(__SYMBIAN32__) || defined(SYMBIAN) || defined(HB_DOXYGEN)
-
-#include <e32base.h>
-
-class CHbDeviceDialogPrivate;
-class CHbSymbianVariantMap;
-
-class MHbDeviceDialogObserver
-{
-public:
-
- virtual void DataReceived(CHbSymbianVariantMap& aData) = 0;
-
- virtual void DeviceDialogClosed(TInt aCompletionCode) = 0;
-};
-
-class CHbDeviceDialog : public CBase
-{
-public:
-
- enum TDeviceDialogError{
- EFrameworkErrors = 0x00000000,
- EPluginErrors = 0x10000000,
- EErrorTypeMask = 0xf0000000,
- ECancelledError = 0x0fffffff,
- ESystemCancelledError = 0x0ffffffe
- };
-
- enum TDeviceDialogFlag{
- ENoDeviceDialogFlags = 0x0
- };
-
- IMPORT_C static CHbDeviceDialog* NewL(TInt aFlags = ENoDeviceDialogFlags);
-
- IMPORT_C ~CHbDeviceDialog();
-
- IMPORT_C TInt Show(const TDesC& aDeviceDialogType, const CHbSymbianVariantMap& aParameters, MHbDeviceDialogObserver* aObserver = NULL);
-
- IMPORT_C CHbSymbianVariantMap* ReceivedDataL() const;
-
- IMPORT_C TInt Update(const CHbSymbianVariantMap& aParameters);
-
- IMPORT_C void Cancel();
-
- IMPORT_C void SetObserver(MHbDeviceDialogObserver* aObserver);
-
-private:
-
- CHbDeviceDialog(TInt aFlags = ENoDeviceDialogFlags);
-
- void ConstructL(TInt aFlags = ENoDeviceDialogFlags);
-
- CHbDeviceDialogPrivate* d;
- };
-
-#endif // defined(__SYMBIAN32__) || defined(SYMBIAN) || defined(HB_DOXYGEN)
-
-#endif // HBSYMBIANDEVICEDIALOG_H
--- a/src/hbcore/devicedialogbase/hbsymbianvariant.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/devicedialogbase/hbsymbianvariant.cpp Fri May 14 16:09:54 2010 +0300
@@ -258,7 +258,7 @@
The data passed to the constructor is copied to the CHbSymbianVariant.
\sa CHbSymbianVariantMap, CHbDeviceDialog
- \proto
+ \stable
\hbcore
@@ -427,7 +427,7 @@
It replicates QVariantMap functionality to Symbian native programming side.
\sa CHbSymbianVariant, CHbDeviceDialog
- \proto
+ \stable
*/
/*!
--- a/src/hbcore/devicedialogbase/hbtextresolversymbian.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/devicedialogbase/hbtextresolversymbian.cpp Fri May 14 16:09:54 2010 +0300
@@ -324,7 +324,9 @@
HBufC* tmp = HbTextResolverSymbian::LoadL(KTextTest3, intarray, 1);
\endcode
-
+
+ \stable
+ \hbcore
*/
/*!
--- a/src/hbcore/feedback/feedback.pri Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/feedback/feedback.pri Fri May 14 16:09:54 2010 +0300
@@ -33,7 +33,8 @@
$$PWD/hbfeedbackplugin.cpp \
$$PWD/hbfeedbackplugingroup.cpp \
$$PWD/hbinstantinteractionevent.cpp \
- $$PWD/hbcontinuousinteractionevent.cpp
+ $$PWD/hbcontinuousinteractionevent.cpp \
+ $$PWD/hbfeedbacknamespace.cpp
PUBLIC_HEADERS += $$PWD/hbfeedbacknamespace.h \
$$PWD/hbwidgetfeedback.h \
--- a/src/hbcore/feedback/hbcontinuousinteractionevent.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/feedback/hbcontinuousinteractionevent.cpp Fri May 14 16:09:54 2010 +0300
@@ -26,35 +26,27 @@
#include "hbcontinuousinteractionevent_p.h"
/*!
- @beta
- @hbcore
- \class HbContinuousInteractionEvent
-
- \brief Continuous interaction event contains widget interaction information. Feedback engines use that information to implement various feedback effects.
-
- Gesture event's type is
- HbContinuousInteractionEvent::ContinuousInteraction - when user is in the middle of performing a continuous interaction.
- HbContinuousInteractionEvent::ContinuousInteractionStop - when ongoing continuous interaction is stopped.
-
- \sa HbInstantInteractionEvent
-*/
-
-/*!
\fn const HbWidget* HbContinuousInteractionEvent::widget() const
Returns the widget being interacted with. Should never be null.
+
+ \internal
*/
/*!
\fn Hb::ContinuousInteraction HbContinuousInteractionEvent::interaction() const
- Returns the type of continuous interaction, whether the widget was panned, flicked, etc.
+ Returns the type of continuous interaction.
+
+ \internal
*/
/*!
\fn QPointF HbContinuousInteractionEvent::delta() const
Returns the movement vector of the continuous interaction.
+
+ \internal
*/
const int HbContinuousInteractionEvent::ContinuousInteraction = registerEventType();
@@ -62,10 +54,16 @@
/*!
Constructs a HbContinuousInteractionEvent with continuous interaction information.
+
+ Continuous interaction event contains widget interaction information. Feedback engines use that
+ information to implement various feedback effects.
+
\param eventType either HbContinuousInteractionEvent::ContinuousInteraction or HbContinuousInteractionEvent::ContinuousInteractionStop.
\param widget - widget being interacted with
\param interaction - type of continuous interaction
\param delta - movement vector of the continuous interaction
+
+ \internal
*/
HbContinuousInteractionEvent::HbContinuousInteractionEvent(int eventType, const HbWidget *widget, Hb::ContinuousInteraction interaction, QPointF delta)
: QEvent((QEvent::Type)eventType), m_widget(widget), m_interaction(interaction), m_delta(delta)
@@ -75,4 +73,3 @@
HbContinuousInteractionEvent::~HbContinuousInteractionEvent()
{
}
-
--- a/src/hbcore/feedback/hbfeedbackengine.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/feedback/hbfeedbackengine.cpp Fri May 14 16:09:54 2010 +0300
@@ -35,14 +35,16 @@
@hbcore
\class HbFeedbackEngine
- \brief Base class for implementing haptic, sound and visual feedback effects,
- user action loggers and screenreaders.
+ \brief Base class for implementing engines for different kinds of feedback effects.
- The feedback engine receives interaction information from HbFeedbackManager as
- interaction and continuous interaction events. All events are received in method event() and forwarded to the
- corresponding virtual methods overridden by various engine implementations. Interaction information
- is received by methods pressed(), released(), clicked(), keyRepeated(), longPressed(), draggedOver(), flicked(),
- popupOpened(), popupClosed(), boundaryReached(), rotated90Degrees(), selectionChanged().
+ The feedback engine receives interaction information from HbFeedbackManager as interaction and continuous
+ interaction events. All events are received in method event() and forwarded to the corresponding virtual
+ methods overridden by various engine implementations.
+
+ Instant interaction information is received by methods pressed(), released(), clicked(), keyRepeated(),
+ longPressed(), draggedOver(), flicked(), popupOpened(), popupClosed(), boundaryReached(), rotated90Degrees(),
+ selectionChanged() and multitouchActivated().
+
Continuous interaction information is received by methods continuousTriggered() and continuousStopped().
\sa HbNameSpace, HbFeedbackManager, HbFeedbackPlugin
@@ -59,18 +61,17 @@
};
/*!
- Constructs HbFeedbackEngine. If you don't pass HbFeedbackManager
- during construction, you need to provide it by calling setManager().
-
+ Constructor.
*/
HbFeedbackEngine::HbFeedbackEngine() : d(new HbFeedbackEnginePrivate())
{
}
/*!
- Constructs the engine with required feedback manager.
+ Constructs the engine with required feedback manager. If the HbFeedbackManager object is not provided during construction,
+ it needs to be provided by calling setManager().
- \param manager feedback manager which passes interaction information to the engine
+ \param manager feedback manager object which passes interaction information to the engine
*/
HbFeedbackEngine::HbFeedbackEngine(HbFeedbackManager* manager) : d(new HbFeedbackEnginePrivate())
{
@@ -78,7 +79,7 @@
}
/*!
- Destructor
+ Destructor.
*/
HbFeedbackEngine::~HbFeedbackEngine()
{
@@ -116,7 +117,7 @@
}
/*!
- Enables the engine. When enabled, events received in method event() are forwarded to appropriate
+ Enables the engine. When enabled, events received in method event() are forwarded to corresponding
virtual callback functions that different feedback engines can override.
\param enabled sets the engine status either enabled or disabled
@@ -140,8 +141,8 @@
}
/*!
- All events received by the QObject-based class come trough method event()
- and are forwarded to the protected virtual methods corresponding to the interactions and gestures.
+ All events received by the QObject-based class come trough method event() and are forwarded to
+ the virtual methods corresponding to the interactions.
\param e the interaction event
*/
@@ -187,7 +188,7 @@
Always returns zero when called outside the scope of triggered callbacks.
- \return extra specifier to interaction
+ \return extra modifier to the interaction
*/
Hb::InteractionModifiers HbFeedbackEngine::modifiers()
@@ -206,7 +207,7 @@
\param widget widget being interacted with
\param interaction the interaction
- \param modifiers extra specifiers to the interaction
+ \param modifiers extra modifiers to the interaction
*/
void HbFeedbackEngine::triggered(const HbWidget *widget, Hb::InstantInteraction interaction, Hb::InteractionModifiers modifiers)
{
@@ -316,7 +317,7 @@
/*!
Called when the engine receives a click event from the feedback manager.
- \param widget being handled.
+ \param widget being interacted with
*/
void HbFeedbackEngine::clicked(const HbWidget *widget)
{
@@ -388,8 +389,8 @@
/*!
Called when the engine receives a "boundary reached" event from the feedback manager.
- Boundary reached event should be initiated whenever user flicks, swipes, scrolls and
- pans reach the border of the scroll area.
+ Boundary reached event should be initiated whenever user flicks or pans so that the
+ boundary of the scroll area is reached.
\param widget the widget being interacted with
*/
@@ -399,7 +400,7 @@
}
/*!
- Called when the engine receives a "rotate step" event from the feedback manager.
+ Called when the engine receives a "rotated 90 degrees" event from the feedback manager.
\param widget the widget being interacted with
*/
@@ -444,7 +445,7 @@
/*!
Called when the engine receives a "continuous interaction stop" event from the feedback manager.
- This methods is needed for knowing when to stop continuous feedback effects started by the interaction.
+ This method indicates when to stop previously started continuous feedback effect.
\param widget the widget being interacted with
\param interaction the interaction in progress
@@ -454,4 +455,3 @@
Q_UNUSED(widget);
Q_UNUSED(interaction);
}
-
--- a/src/hbcore/feedback/hbfeedbackmanager.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/feedback/hbfeedbackmanager.cpp Fri May 14 16:09:54 2010 +0300
@@ -45,8 +45,8 @@
\class HbFeedbackManager
- \brief Feedback manager forwards interaction information from the widgets to feedback engine plugins.
- Feedback engine plugins decide what kind of feedback effects will be played. Widgets don't use
+ \brief Feedback manager forwards interaction information from the widgets to the feedback engine plugins.
+ Feedback engine plugins decide what kind of feedback effects will be played. Widgets are not to use the
HbFeedbackManager directly but through HbWidgetFeedback convenience class.
*/
@@ -106,7 +106,7 @@
/*!
Returns feedback manager singleton object responsible for initiating feedback effects.
- \return HbFeedbackManager returns feedback manager singleton object
+ \return HbFeedbackManager the feedback manager singleton object
*/
HbFeedbackManager* HbFeedbackManager::instance()
{
@@ -118,7 +118,7 @@
\param widget the widget being interacted with
\param interaction the interaction
- \param modifiers extra specifiers to the interaction
+ \param modifiers extra modifiers to the interaction
*/
void HbFeedbackManager::triggered(const HbWidget *widget, Hb::InstantInteraction interaction, Hb::InteractionModifiers modifiers)
{
@@ -135,7 +135,7 @@
}
/*!
- Mediates continuous interaction triggers to all active feedback plugins.
+ Mediates continuous interaction triggers to all active feedback engine plugins.
\param widget the widget being interacted with
\param interaction the continuous interaction in progress
@@ -157,8 +157,7 @@
/*!
Mediates a "continuous interaction stop" triggers to all active feedback engine plugins.
- This methods is needed for knowing when to stop continuous feedback effects started by
- the continuous interaction.
+ This method indicates when the previously started continuous feedback interaction is stopped.
\param widget the widget being interacted with
\param interaction the continuous interaction in progress
@@ -265,4 +264,3 @@
{
return *d->pluginGroup;
}
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/feedback/hbfeedbacknamespace.cpp Fri May 14 16:09:54 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 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 <hbfeedbacknamespace.h>
+
+/*!
+ @hbcore
+ \namespace HbFeedback
+ \brief The HbFeedback namespace contains the feedback effects supported by the current haptic frawework.
+*/
+
+/*!
+ \enum HbFeedback::Type
+ The supported feedback types.
+*/
+
+/*!
+ \var HbFeedback::Type HbFeedback::TypeInstant
+ Instant feedback.
+*/
+
+/*!
+ \var HbFeedback::Type HbFeedback::TypeContinuous
+ Continuous feedback.
+*/
+
+/*!
+ \enum HbFeedback::InstantEffect
+
+ Instant feedback is fire&forget type of feedback which initiates a short haptic and/or sound
+ feedback effect. Each enumeration value corresponds to a certain instant feedback effect.
+
+ \sa HbInstantFeedback
+*/
+
+/*!
+ \enum HbFeedback::ContinuousEffect
+
+ Continuous feedback is a feedback type, which has to be explicitly started, updated and
+ stopped by the framework and is used to provide ongoing feedback in situations in which
+ the user is performing some longer duration touch interaction, e.g. dragging slider handle
+ to change the slider value. Continuous feedback intensity can be updated during the playback
+ between values 0 and 100.
+
+ \sa HbContinuousFeedback
+*/
+
+/*!
+ \enum HbFeedback::IntensityLevel
+
+ A set of predefined values for continuous feedback intensity.
+
+ \sa HbContinuousFeedback
+*/
+
+/*!
+ \enum HbFeedback::Modality
+
+ The available modalities for feedback effects. Effects can be played using one or several
+ of the available modalities, e.g. haptic, audio.
+
+ \sa HbInstantFeedback, HbContinuousFeedback
+*/
+
+/*!
+ HbFeedback::StandardFeedbackTimeout
+
+ A timeout value has to be defined for each continuous feedback to avoid situations where
+ the continuous feedback is never stopped and unintentionally continues to play indefinetly.
+
+ The recommended standard value is 300 milliseconds.
+
+ \sa HbContinuousFeedback
+*/
--- a/src/hbcore/feedback/hbfeedbacknamespace.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/feedback/hbfeedbacknamespace.h Fri May 14 16:09:54 2010 +0300
@@ -30,17 +30,11 @@
#include <QObject>
#include <hbglobal.h>
-/*!
- \namespace HbFeedback
- \brief The HbFeedback namespace lists the feedback effects supported
- by the current haptic software and hardware.
-*/
-
#ifndef HB_DOXYGEN
class HB_CORE_EXPORT HbFeedback
{
Q_GADGET
- Q_ENUMS(Type InstantEffect ContinuousEffect TacticonEffect HitAreaType IntensityLevel Modality)
+ Q_ENUMS(Type InstantEffect ContinuousEffect IntensityLevel Modality)
Q_FLAGS(Types Modalities)
public:
@@ -49,29 +43,13 @@
{
#endif // HB_DOXYGEN
- /*!
- Three different types of feedback mechanisms are supported: instant,
- continuous and hit area feedbacks.
- */
-
enum Type {
TypeInstant = 0x001,
- TypeContinuous = 0x002,
- TypeHitArea = 0x004,
- TypeTacticon = 0x008
+ TypeContinuous = 0x002
};
Q_DECLARE_FLAGS(Types, Type)
- /*!
- Instant feedback is fire&forget approach that initiates short
- haptic and sound effect which lasts on average between 100-500
- milliseconds. Each effect value corresponds to a certain haptic
- and/or sound effect defined in the themes.
-
- \sa HbInstantFeedback
- */
-
enum InstantEffect {
None,
Basic, // For generic instant feedback for custom widgets
@@ -109,22 +87,11 @@
NegativeTacticon,
/* new standard instant feedbacks here */
NumberOfInstantFeedbacks,
- NoOverride, // utility effect
InstantUser = 65535,
/* user defined custom instant feedbacks */
InstantMaxUser = 262140
};
- /*!
- Continuous feedback has to be explicitly started, updated and
- cancelled by the system and is used to provide ongoing feedback
- whenever user is dragging slider handles or swiping flickable widgets
- with her finger. Continuous feedback intensity can be varied
- during playback between values 0 and 100.
-
- \sa HbContinuousFeedback
- */
-
enum ContinuousEffect {
ContinuousNone,
ContinuousSmooth, // For generic continuous feedback for custom widgets
@@ -134,63 +101,17 @@
ContinuousPinch,
/* new standard continuous feedbacks here */
NumberOfContinuousFeedbacks,
- NoContinuousOverride, // utility effect
ContinuousUser = 1000,
/* user defined continuous instant feedbacks */
ContinuousMaxUser = 65535
};
- /*!
- \deprecated HbFeedback::TacticonEffect
- is deprecated. Use HbFeedback::InstantEffect instead.
-
- Tacticon feedback is a special kind of instant
- feedback reserved for tacticon use cases.
-
- \sa HbTacticonsFeedback
- */
-
- enum TacticonEffect {
- TacticonNone,
- TacticonPositive,
- TacticonNeutral,
- TacticonNegative,
- /* new tacticon feedbacks here */
- NumberOfTacticonFeedbacks
- };
-
- /*!
- Minimum, smooth and maximum intensity values of continuous feedback.
-
- \sa HbContinuousFeedback
- */
enum IntensityLevel {
IntensityZero = 0,
IntensitySmooth = 50,
IntensityFull = 100
};
- /*!
- Hit area feedback is a special type of low-latency instant
- feedback that is initiated by preregistered hit area rectangles
- in the windowing system that are hit area matched before the
- touch events are even forwarded to the application windows.
- Hit area feedback can be set to initiate either when finger or
- stylus a.) presses down the screen or b.) is released from the
- screen.
-
- \sa HbHitAreaFeedback
- */
- enum HitAreaType {
- MouseButtonPress,
- MouseButtonRelease
- };
-
- /*!
- \enum Modality
- The available modalities for feedback effects.
- Effects can be synthesized using one or several of the available modalities.
- */
enum Modality {
All = 0xFFFF,
Audio = 0x0001,
@@ -199,15 +120,6 @@
Q_DECLARE_FLAGS(Modalities, Modality)
- /*!
- Timeout value has to be defined for each continuous feedback
- to avoid situations where continuous feedback is never cancelled
- and accidentally continues to play infinitely.
-
- Recommended standard value is 300 milliseconds.
-
- \sa HbContinuousFeedback
- */
static const int StandardFeedbackTimeout = 300;
};
@@ -215,4 +127,3 @@
Q_DECLARE_OPERATORS_FOR_FLAGS(HbFeedback::Modalities)
#endif // HBFEEDBACKNAMESPACE_H
-
--- a/src/hbcore/feedback/hbfeedbackplugin.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/feedback/hbfeedbackplugin.cpp Fri May 14 16:09:54 2010 +0300
@@ -56,7 +56,7 @@
\brief Base class for all feedback plugins.
- Implements abstract interface HbFeedbackPluginInterface and derives from QObject. All plugins
+ Implements abstract interface HbFeedbackPluginInterface and derives from QObject. All feedback plugins
are expected to derive from HbFeedbackPlugin.
*/
@@ -111,4 +111,3 @@
{
d->m_featureName = featureName;
}
-
--- a/src/hbcore/feedback/hbinstantinteractionevent.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/feedback/hbinstantinteractionevent.cpp Fri May 14 16:09:54 2010 +0300
@@ -28,39 +28,34 @@
const int HbInstantInteractionEvent::InstantInteraction = registerEventType();
-/*!
- @beta
- @hbcore
-
- \class HbInstantInteractionEvent
- \brief Interaction event contains widget interaction information. Feedback engines use this
- information to implement various feedback effects.
-
- HbInstantInteractionEvent::InstantInteraction - QEvent type for interaction events.
-
- Continuous interactions are called gestures.
-
- \sa HbContinuousInteractionEvent
-*/
/*!
\fn const HbWidget* HbInstantInteractionEvent::widget() const
Returns the widget being interacted with. Should never be null.
+
+ \internal
*/
/*!
\fn Hb::InstantInteraction HbInstantInteractionEvent::interaction() const
- Returns the type of interaction, whether the widget was pressed, released, etc.
+ Returns the type of instant interaction
+
+ \internal
*/
/*!
Constructs HbInstantInteractionEvent with interaction information.
+ Interaction event contains widget interaction information. Feedback engines use this
+ information to implement various feedback effects.
+
\param widget the widget being interacted with
\param interaction the interaction
\param modifiers optional modifiers associated to the interaction
+
+ \internal
*/
HbInstantInteractionEvent::HbInstantInteractionEvent(const HbWidget *widget, Hb::InstantInteraction interaction, Hb::InteractionModifiers modifiers)
--- a/src/hbcore/gestures/hbgesturerecognizers_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gestures/hbgesturerecognizers_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -32,6 +32,7 @@
#include "hbswipegesture.h"
#include <QGesture>
+#include <QTime>
//#define RECOGNIZERS_DEBUG
#ifdef RECOGNIZERS_DEBUG
@@ -90,7 +91,7 @@
// this is to enable testability within logic classes.
// QGesture contains gesture state, which cannot be modified by
// anything else, but QGestureManager itself.
- return HbPanGestureLogic::recognize(state->state(), static_cast<HbPanGesture *>(state), watched, event);
+ return HbPanGestureLogic::recognize(state->state(), static_cast<HbPanGesture *>(state), watched, event, QTime::currentTime());
}
/*!
@@ -355,7 +356,7 @@
// this is to enable testability within logic classes.
// QGesture contains gesture state, which cannot be modified by
// anything else, but QGestureManager itself.
- return HbSwipeGestureLogic::recognize(state->state(), static_cast<HbSwipeGesture *>(state), watched, event);
+ return HbSwipeGestureLogic::recognize(state->state(), static_cast<HbSwipeGesture *>(state), watched, event, QTime::currentTime());
}
/*!
--- a/src/hbcore/gestures/hbgestures_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gestures/hbgestures_p.h Fri May 14 16:09:54 2010 +0300
@@ -30,11 +30,11 @@
#include <QObject>
#include <QGraphicsView>
-const int HbDefaultPanThreshold = 20;
+const int HbDefaultPanThreshold = 30;
const int HbDefaultTapRadius = HbDefaultPanThreshold-1;
-const qreal HbSwipeMinOffset = 150;
-const qreal HbSwipeMinSpeed = 0.6;
+const qreal HbSwipeMinOffset = 100;
+const qreal HbSwipeMinSpeed = 0.8;
class HbGestureUtils
{
--- a/src/hbcore/gestures/hbpangesture.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gestures/hbpangesture.cpp Fri May 14 16:09:54 2010 +0300
@@ -33,14 +33,16 @@
#include <QDebug>
/*!
+ @hbcore
\class HbPanGesture
- \brief HbPanGesture contains data and functionality for pan gesture.
+ \brief HbPanGesture is an extension to Qt standard QPanGesture
+ \sa QPanGesture
*/
/*!
- \brief
- \return
+ \brief HbPanGesture constructor
+ \param parent Owner for gesture
*/
HbPanGesture::HbPanGesture(QObject *parent) : QPanGesture(parent), d_ptr(new HbPanGesturePrivate)
@@ -49,8 +51,9 @@
}
/*!
- \brief
- \return
+ \brief HbPanGesture constructor
+ \param dd Private data
+ \param parent Owner for gesture
*/
HbPanGesture::HbPanGesture( HbPanGesturePrivate &dd, QObject *parent )
@@ -60,9 +63,7 @@
}
/*!
- \brief
- \return
-
+ \brief HbPanGesture destructor
*/
HbPanGesture::~HbPanGesture()
{
@@ -70,9 +71,9 @@
}
/*!
- \brief
- \return
-
+ \property startPos
+ \brief Starting position for gesture in global coordinates.
+ \sa HbPanGesture::sceneStartPos
*/
QPointF HbPanGesture::startPos() const
{
@@ -80,11 +81,6 @@
return d->mStartPos;
}
-/*!
- \brief
- \return
-
-*/
void HbPanGesture::setStartPos(const QPointF &startPos)
{
Q_D(HbPanGesture);
@@ -92,9 +88,9 @@
}
/*!
- \brief
- \return
-
+ \property velocity
+ \brief Panning velocity in global coordinates.
+ \sa HbPanGesture::sceneVelocity
*/
QPointF HbPanGesture::velocity() const
{
@@ -102,21 +98,15 @@
return HbVelocityCalculator( d->mAxisX, d->mAxisY ).velocity(QTime::currentTime());
}
-/*!
- \brief
- \return
-
-*/
void HbPanGesture::setVelocity(const QPointF &)
{
- // Q_D(HbPanGesture);
- // d->mVelocity = velocity;
+ Q_ASSERT(false);
}
/*!
- \brief
- \return
-
+ \property sceneLastOffset
+ \brief The total offset from start position to second last position in scene coordinates.
+ \sa QPanGesture::lastOffset()
*/
QPointF HbPanGesture::sceneLastOffset() const
{
@@ -124,11 +114,6 @@
return d->mSceneLastOffset;
}
-/*!
- \brief
- \return
-
-*/
void HbPanGesture::setSceneLastOffset(const QPointF &lastOffset)
{
Q_D(HbPanGesture);
@@ -136,9 +121,9 @@
}
/*!
- \brief
- \return
-
+ \property sceneOffset
+ \brief The total offset from start position to current position in scene coordinates.
+ \sa QPanGesture::offset()
*/
QPointF HbPanGesture::sceneOffset() const
{
@@ -146,11 +131,6 @@
return d->mSceneOffset;
}
-/*!
- \brief
- \return
-
-*/
void HbPanGesture::setSceneOffset(const QPointF &offset)
{
Q_D(HbPanGesture);
@@ -158,9 +138,9 @@
}
/*!
- \brief
- \return
-
+ \property sceneStartPos
+ \brief Starting position for gesture in scene coordinates.
+ \sa HbPanGesture::startPos()
*/
QPointF HbPanGesture::sceneStartPos() const
{
@@ -168,11 +148,6 @@
return d->mSceneStartPos;
}
-/*!
- \brief
- \return
-
-*/
void HbPanGesture::setSceneStartPos(const QPointF &startPos)
{
Q_D(HbPanGesture);
@@ -180,9 +155,9 @@
}
/*!
- \brief
- \return
-
+ \property sceneVelocity
+ \brief Panning velocity in scene coordinates.
+ \sa HbPanGesture::velocity()
*/
QPointF HbPanGesture::sceneVelocity() const
{
@@ -191,21 +166,19 @@
}
/*!
- \brief
- \return
-
+ \property sceneAcceleration
+ \brief Panning acceleration in scene coordinates.
+ \sa QPanGesture::acceleration()
*/
QPointF HbPanGesture::sceneAcceleration() const
{
- //Q_D(const HbPanGesture);
- //return d->mSceneAcceleration;
return QPointF(0,0);
}
/*!
- \brief
- \return
-
+ \property sceneDelta
+ \brief Distance between last two points in scene coordinates.
+ \sa QPanGesture::delta()
*/
QPointF HbPanGesture::sceneDelta() const
{
--- a/src/hbcore/gestures/hbpangesturelogic_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gestures/hbpangesturelogic_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -32,8 +32,6 @@
#include "hbpangesture_p.h"
#include "hbpangesturelogic_p.h"
-const int KPanStopTime = 30;
-const int KVelocitySampleTime = 30;
const int KPanThreshold = 20;
/*!
@@ -126,6 +124,10 @@
gesture->d_ptr->mSceneLastOffset = HbGestureUtils::mapToScene(watched, QPointF(0,0));
gesture->d_ptr->mLastTimeStamp = mCurrentTime;
+ gesture->d_ptr->mAxisX.resetRecorder(HbDefaultPanThreshold);
+ gesture->d_ptr->mAxisY.resetRecorder(HbDefaultPanThreshold);
+ gesture->d_ptr->mSceneAxisX.resetRecorder(HbDefaultPanThreshold);
+ gesture->d_ptr->mSceneAxisY.resetRecorder(HbDefaultPanThreshold);
gesture->d_ptr->mAxisX.record( me->globalPos().x(), mCurrentTime );
gesture->d_ptr->mAxisY.record( me->globalPos().y(), mCurrentTime );
gesture->d_ptr->mSceneAxisX.record( scenePos.x(), mCurrentTime );
@@ -218,10 +220,11 @@
Qt::GestureState gestureState,
HbPanGesture *gesture,
QObject *watched,
- QEvent *event )
+ QEvent *event,
+ QTime currentTime)
{
// Record the time right away.
- mCurrentTime = QTime::currentTime();
+ mCurrentTime = currentTime;
if ( isMouseEvent(event->type()) )
{
--- a/src/hbcore/gestures/hbpangesturelogic_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gestures/hbpangesturelogic_p.h Fri May 14 16:09:54 2010 +0300
@@ -66,7 +66,8 @@
Qt::GestureState gestureState,
HbPanGesture *gesture,
QObject *watched,
- QEvent *event );
+ QEvent *event,
+ QTime currentTime);
QTime mCurrentTime;
};
--- a/src/hbcore/gestures/hbpinchgesture.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gestures/hbpinchgesture.cpp Fri May 14 16:09:54 2010 +0300
@@ -27,6 +27,18 @@
#include "hbpinchgesture.h"
#include "hbpinchgesture_p.h"
+/*!
+ @hbcore
+ \class HbPinchGesture
+
+ \brief HbPinchGesture is an extension to Qt standard QPinchGesture
+ \sa QPinchGesture
+*/
+
+/*!
+ \brief HbPinchGesture constructor
+ \param parent Owner for gesture
+*/
HbPinchGesture::HbPinchGesture(QObject *parent)
: QPinchGesture(parent), d_ptr(new HbPinchGesturePrivate)
@@ -37,6 +49,11 @@
setScaleFactor(1);
}
+/*!
+ \brief HbPinchGesture constructor
+ \param dd Private data
+ \param parent Owner for gesture
+*/
HbPinchGesture::HbPinchGesture(HbPinchGesturePrivate &dd, QObject *parent)
: QPinchGesture(parent), d_ptr(&dd)
{
@@ -46,11 +63,19 @@
setScaleFactor(1);
}
+/*!
+ \brief HbPinchGesture destructor
+*/
HbPinchGesture::~HbPinchGesture()
{
delete d_ptr;
}
+/*!
+ \property sceneTotalRotationAngle
+ \brief The total angle covered by the gesture in scene coordinates.
+ \sa QPinchGesture::totalRotationAngle()
+*/
qreal HbPinchGesture::sceneTotalRotationAngle() const
{
Q_D(const HbPinchGesture);
@@ -63,6 +88,11 @@
d->mSceneTotalRotationAngle = value;
}
+/*!
+ \property sceneLastRotationAngle
+ \brief The last reported angle covered by the gesture motion in scene coordinates.
+ \sa QPinchGesture::lastRotationAngle()
+*/
qreal HbPinchGesture::sceneLastRotationAngle() const
{
Q_D(const HbPinchGesture);
@@ -75,6 +105,11 @@
d->mSceneLastRotationAngle = value;
}
+/*!
+ \property sceneRotationAngle
+ \brief The angle covered by the gesture motion in scene coordinates.
+ \sa QPinchGesture::rotationAngle()
+*/
qreal HbPinchGesture::sceneRotationAngle() const
{
Q_D(const HbPinchGesture);
@@ -87,6 +122,11 @@
d->mSceneRotationAngle = value;
}
+/*!
+ \property sceneStartCenterPoint
+ \brief The starting position of the center point in scene coordinates.
+ \sa QPinchGesture::startCenterPoint()
+*/
QPointF HbPinchGesture::sceneStartCenterPoint() const
{
Q_D(const HbPinchGesture);
@@ -99,6 +139,11 @@
d->mSceneStartCenterPoint = value;
}
+/*!
+ \property sceneLastCenterPoint
+ \brief The last position of the center point recorded for this gesture in scene coordinates.
+ \sa QPinchGesture::lastCenterPoint()
+*/
QPointF HbPinchGesture::sceneLastCenterPoint() const
{
Q_D(const HbPinchGesture);
@@ -111,6 +156,11 @@
d->mSceneLastCenterPoint = value;
}
+/*!
+ \property sceneCenterPoint
+ \brief The current center point in scene coordinates.
+ \sa QPinchGesture::centerPoint()
+*/
QPointF HbPinchGesture::sceneCenterPoint() const
{
Q_D(const HbPinchGesture);
--- a/src/hbcore/gestures/hbpointrecorder_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gestures/hbpointrecorder_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -25,9 +25,12 @@
#include "hbpointrecorder_p.h"
+#include <QPair>
+#include <QTime>
#include <QDebug>
-//#define VELOCITY_DEBUG
-#ifndef VELOCITY_DEBUG
+
+//#define POINT_DEBUG
+#ifndef POINT_DEBUG
# define DEBUG if (0) qDebug
#else
# define DEBUG qDebug
@@ -49,6 +52,8 @@
*/
HbPointRecorder::HbPointRecorder()
+ :
+ mThreshold(0)
{
}
@@ -64,50 +69,59 @@
/*!
\internal
+ \brief Clears all data from the recorder
+ \param threshold set used threshold to detect movement and stops
+*/
+void HbPointRecorder::resetRecorder(qreal threshold)
+{
+ mThreshold = threshold;
+ clear();
+}
+
+/*!
+ \internal
\brief Records point to list with timestamp.
\param point Point to be recorded.
\param time Time to be recorded.
\return Nothing.
*/
-void HbPointRecorder::record(qreal point, QTime time)
+void HbPointRecorder::record(qreal point, const QTime &time)
{
- // No point to record a point, if timestamp is less or equal with previous.
- if ( !isEmpty() && lastTime().msecsTo(time) == 0 )
- {
- DEBUG() << "Ignoring point, because no difference in time stamps.";
- return;
+ // Empty list always accepts first point without tests.
+ if ( !isEmpty() ) {
+ // No point to record a point, if timestamp is less or equal with previous.
+ if ( lastTime().msecsTo(time) == 0 ) {
+ DEBUG() << "Ignoring point, because no difference in time stamps.";
+ return;
+ }
+
+ // Don't tolerate points, which are too close to previously recorded point.
+ if ( qAbs(lastPoint() - point) < mThreshold ) {
+ DEBUG() << "Ignoring point, because it is withing threshold of previous point";
+ return;
+ }
}
// In case the list contains two or more points, direction can be
// determined. Each new point added needs to be checked for direction
// change.
- if ( mPoints.length() > 1 )
- {
+ if ( length() > 1 ) {
// Clear list, on direction change. Leave the last recorded point
// to the list, as it can be considered as first point for new direction.
- if ( dirChanged( point ) )
- {
- qreal tempPoint = lastPoint();
- QTime tempTime = lastTime();
-
+ if ( dirChanged( point ) ) {
+ HbPointTime temp = last();
clear();
-
- mPoints.append( tempPoint );
- mTimes.append( tempTime );
+ append(temp);
}
}
// Finally check, if the position has changed. Don't record point, when no position
// change.
- if ( isEmpty() || point != lastPoint() )
- {
+ if ( isEmpty() || point != lastPoint() ) {
// Add point and time to list.
- mPoints.append( point );
- mTimes.append( time );
- }
- else
- {
+ append(HbPointTime(point, time));
+ } else {
DEBUG() << "Ignoring point, because it equals previous.";
}
}
@@ -115,27 +129,13 @@
/*!
\internal
\brief
- \return True, when no recorded items.
-
-*/
-bool HbPointRecorder::isEmpty() const
-{
- // This situation should be impossible to even happen, but in case
- // the lists are out of sync. The result of empty list dictates the
- // result of this test.
- return !mTimes.length() && !mPoints.length();
-}
-
-/*!
- \internal
- \brief
\return Last recorded point.
*/
qreal HbPointRecorder::lastPoint() const
{
Q_ASSERT(!isEmpty());
- return mPoints.last();
+ return last().first;
}
/*!
@@ -147,7 +147,7 @@
const QTime& HbPointRecorder::lastTime() const
{
Q_ASSERT(!isEmpty());
- return mTimes.last();
+ return last().second;
}
/*!
@@ -158,10 +158,16 @@
*/
bool HbPointRecorder::dirChanged( qreal point ) const
{
- qreal x0 = mPoints.at(mPoints.length()-2);
- qreal x1 = mPoints.at(mPoints.length()-1);
- qreal dir0 = x1 - x0;
- qreal dir1 = point - x1;
+ // Without direction, the direction cannot really change
+ if ( length() < 2 ) { return false; }
+
+ qreal pos0 = (*this)[-2].first;
+ qreal pos1 = (*this)[-1].first;
+ qreal dir0 = pos1 - pos0;
+ qreal dir1 = point - pos1;
+
+ // Don't react on movement, when changes happen within threshold
+ if ( qAbs(dir1) <= mThreshold ) { return false; }
// Check for '+' and '-' -signs in directions. Opposite signs means
// direction change.
@@ -170,59 +176,31 @@
/*!
\internal
- \param T type of items in the list.
- \brief Returns given number of items from the end.
- \return List of items.
+ \brief Operator to access the list.
- This function gets items from the given list from the end by the
- amount of items specified by 'number' parameter. In case, when the
- length of the list is less than required number of items, complete
- list is provided instead.
+ Supports negative values, which will define order from the end.
*/
-template <class T>
-QList<T> HbPointRecorder::getLastItems( QList<T> list, int number ) const
+HbPointTime HbPointRecorder::operator[]( int number ) const
{
- if ( list.length() <= number )
- {
- return list;
+ // Let's trust, that QList::at() takes care of validity checks.
+ if ( number < 0 ) {
+ number = count() + number;
}
- else
- {
- QList<T> tempList;
- for ( int i = list.length(); --i >= list.length()-number; )
- {
- tempList.insert(0, list.at(i));
- }
- return tempList;
- }
+ return at(number);
}
+
/*!
\internal
- \copydoc HbPointRecorder::getLastItems
+ \copydoc HbPointRecorder::getLastRecords
*/
-QList<qreal> HbPointRecorder::getLastPoints( int number ) const
-{
- return getLastItems(mPoints, number);
-}
-
-/*!
- \internal
- \copydoc HbPointRecorder::getLastItems
-*/
-QList<QTime> HbPointRecorder::getLastTimes( int number ) const
+QList<HbPointTime> HbPointRecorder::getLastRecords( int number ) const
{
- return getLastItems(mTimes, number);
-}
+ QList<HbPointTime> recordings;
+ number = number > count() ? count() : number;
+ for (int i=count()-number; i < count(); i++) {
+ recordings.append((*this)[i]);
+ }
-/*!
- \internal
- \brief
- \return Last recorded timestamp.
-
-*/
-void HbPointRecorder::clear()
-{
- mPoints.clear();
- mTimes.clear();
+ return recordings;
}
--- a/src/hbcore/gestures/hbpointrecorder_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gestures/hbpointrecorder_p.h Fri May 14 16:09:54 2010 +0300
@@ -27,33 +27,42 @@
#define HBPOINTRECORDER_P_H
#include "hbglobal.h"
+#include "hbgestures_p.h"
#include <QList>
-#include <QTime>
+#include <QPair>
+
+#include <QSet>
-class HB_CORE_PRIVATE_EXPORT HbPointRecorder
+class QTime;
+typedef QPair<qreal, QTime> HbPointTime;
+
+class HB_CORE_PRIVATE_EXPORT HbPointRecorder : public QList<HbPointTime>
{
public:
HbPointRecorder();
~HbPointRecorder();
- void record(qreal point, QTime time);
+ void record(qreal pos, const QTime &time);
+ void resetRecorder(qreal threshold);
+
qreal lastPoint() const;
const QTime& lastTime() const;
bool dirChanged(qreal point) const;
- void clear();
- bool isEmpty() const;
- QList<qreal> getLastPoints( int number ) const;
- QList<QTime> getLastTimes( int number ) const;
+ HbPointTime operator[](int index) const;
+ QList<HbPointTime> getLastRecords( int number ) const;
- // TODO RECONSIDER THE WHOLE DESIGN
- QList<qreal> mPoints;
- QList<QTime> mTimes;
-private:
- template <class T> QList<T> getLastItems( QList<T> list, int number ) const;
-
-
-
+ qreal mThreshold;
};
+inline uint qHash(const QTime &)
+{
+ return 0;
+}
+
+inline uint qHash(const qreal)
+{
+ return 0;
+}
+
#endif // HBPOINTRECORDER_P_H
--- a/src/hbcore/gestures/hbswipegesture.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gestures/hbswipegesture.cpp Fri May 14 16:09:54 2010 +0300
@@ -30,6 +30,20 @@
#include <QPointF>
#include <QVariant>
+/*!
+ @hbcore
+ \class HbSwipeGesture
+
+ \brief HbSwipeGesture is an extension to Qt standard HbSwipeGesture
+ \sa QSwipeGesture
+*/
+
+const int KHbDirectionThreshold = 45; // degrees
+
+/*!
+ \brief HbSwipeGesture constructor
+ \param parent Owner for gesture
+*/
HbSwipeGesture::HbSwipeGesture(QObject *parent)
: QSwipeGesture(parent), d_ptr(new HbSwipeGesturePrivate)
@@ -37,37 +51,60 @@
d_ptr->mSceneSwipeAngle = 0;
}
+/*!
+ \brief HbSwipeGesture constructor
+ \param dd Private data
+ \param parent Owner for gesture
+*/
HbSwipeGesture::HbSwipeGesture(HbSwipeGesturePrivate &dd, QObject *parent)
: QSwipeGesture(parent), d_ptr(&dd)
{
}
+/*!
+ \brief HbSwipeGesture destructor
+*/
HbSwipeGesture::~HbSwipeGesture()
{
delete d_ptr;
}
+/*!
+ \property sceneHorizontalDirection
+ \brief Horizontal direction of swipe in scene coordinates.
+
+ \sa QSwipeGesture::horizontalDirection()
+*/
QSwipeGesture::SwipeDirection HbSwipeGesture::sceneHorizontalDirection() const
{
- if (d_ptr->mSceneSwipeAngle < 0 || d_ptr->mSceneSwipeAngle == 90 || d_ptr->mSceneSwipeAngle == 270)
+ if ((d_ptr->mSceneSwipeAngle <= 90 - KHbDirectionThreshold && d_ptr->mSceneSwipeAngle >= 0) || d_ptr->mSceneSwipeAngle >= 270 + KHbDirectionThreshold)
+ return QSwipeGesture::Right;
+ else if (d_ptr->mSceneSwipeAngle >= 90 + KHbDirectionThreshold && d_ptr->mSceneSwipeAngle <= 270 - KHbDirectionThreshold)
+ return QSwipeGesture::Left;
+ else
return QSwipeGesture::NoDirection;
- else if (d_ptr->mSceneSwipeAngle < 90 || d_ptr->mSceneSwipeAngle > 270)
- return QSwipeGesture::Right;
+}
+/*!
+ \property sceneVerticalDirection
+ \brief Vertical direction of swipe in scene coordinates.
+ \sa QSwipeGesture::verticalDirection()
+*/
+QSwipeGesture::SwipeDirection HbSwipeGesture::sceneVerticalDirection() const
+{
+ if (d_ptr->mSceneSwipeAngle < 180 - KHbDirectionThreshold && d_ptr->mSceneSwipeAngle > 0 + KHbDirectionThreshold)
+ return QSwipeGesture::Up;
+ else if (d_ptr->mSceneSwipeAngle > 180 + KHbDirectionThreshold && d_ptr->mSceneSwipeAngle < 360 - KHbDirectionThreshold)
+ return QSwipeGesture::Down;
else
- return QSwipeGesture::Left;
+ return QSwipeGesture::NoDirection;
}
-QSwipeGesture::SwipeDirection HbSwipeGesture::sceneVerticalDirection() const
-{
- if (d_ptr->mSceneSwipeAngle <= 0 || d_ptr->mSceneSwipeAngle == 180)
- return QSwipeGesture::NoDirection;
- else if (d_ptr->mSceneSwipeAngle < 180)
- return QSwipeGesture::Up;
- else
- return QSwipeGesture::Down;
-}
-
+/*!
+ \property sceneSwipeAngle
+ \brief Angle for swipe in scene coordinates.
+ \sa QSwipeGesture::swipeAngle()
+*/
qreal HbSwipeGesture::sceneSwipeAngle() const
{
return d_ptr->mSceneSwipeAngle;
@@ -82,8 +119,6 @@
/*!
\deprecated
\property speed
-
- Stores the speed of the swipe gesture in pixels per milliseconds.
*/
qreal HbSwipeGesture::speed() const
{
@@ -100,9 +135,6 @@
/*!
\deprecated
\property touchPointCount
-
- Stores the number of touchpoints used in the swipe
-
*/
int HbSwipeGesture::touchPointCount() const
{
--- a/src/hbcore/gestures/hbswipegesture_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gestures/hbswipegesture_p.h Fri May 14 16:09:54 2010 +0300
@@ -26,7 +26,9 @@
#ifndef HBSWIPEGESTURE_P_H
#define HBSWIPEGESTURE_P_H
+#include "hbpointrecorder_p.h"
#include <hbglobal.h>
+
#include <QPoint>
#include <QGesture>
@@ -37,7 +39,10 @@
QPointF mSceneStartPos;
QTime mStartTime;
- qreal mSceneSwipeAngle;
+ qreal mSceneSwipeAngle;
+
+ HbPointRecorder mAxisX;
+ HbPointRecorder mAxisY;
};
#endif // HBSWIPEGESTURE_P_H
--- a/src/hbcore/gestures/hbswipegesturelogic_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gestures/hbswipegesturelogic_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -23,15 +23,17 @@
**
****************************************************************************/
+#include "hbswipegesture.h"
+#include "hbswipegesture_p.h"
+#include "hbswipegesturelogic_p.h"
+#include "hbpointrecorder_p.h"
+#include "hbvelocitycalculator_p.h"
+
#include <QEvent>
#include <QGestureRecognizer>
#include <QGraphicsView>
#include <QMouseEvent>
-#include "hbswipegesture.h"
-#include "hbswipegesture_p.h"
-#include "hbswipegesturelogic_p.h"
-
/*!
@hbcore
\internal
@@ -100,12 +102,41 @@
if (!(gestureState == Qt::NoGesture && me->button() == Qt::LeftButton)) {
return QGestureRecognizer::Ignore;
}
- gesture->d_func()->mStartTime = QTime::currentTime();
+ gesture->d_func()->mStartTime = mCurrentTime;
gesture->d_func()->mStartPos = me->globalPos();
gesture->d_func()->mSceneStartPos = HbGestureUtils::mapToScene(watched, me->globalPos());
gesture->setHotSpot(me->globalPos());
+ gesture->d_ptr->mAxisX.clear();
+ gesture->d_ptr->mAxisY.clear();
+ gesture->d_ptr->mAxisX.record(me->globalPos().x(), mCurrentTime);
+ gesture->d_ptr->mAxisY.record(me->globalPos().y(), mCurrentTime);
+
+ return QGestureRecognizer::MayBeGesture;
+}
+
+/*!
+ \internal
+ \brief
+ \return
+
+*/
+QGestureRecognizer::Result HbSwipeGestureLogic::handleMouseMove(
+ Qt::GestureState gestureState,
+ HbSwipeGesture *gesture,
+ QObject *watched,
+ QMouseEvent *me )
+{
+ Q_UNUSED(watched);
+ Q_UNUSED(gestureState);
+
+ if (!me->buttons().testFlag(Qt::LeftButton)){
+ return QGestureRecognizer::Ignore;
+ }
+
+ gesture->d_ptr->mAxisX.record(me->globalPos().x(), mCurrentTime);
+ gesture->d_ptr->mAxisY.record(me->globalPos().y(), mCurrentTime);
return QGestureRecognizer::MayBeGesture;
}
@@ -126,14 +157,23 @@
Q_UNUSED(watched);
Q_UNUSED(gestureState);
+ if (me->button() != Qt::LeftButton) {
+ return QGestureRecognizer::Ignore;
+ }
+
QPointF totalOffset = me->globalPos() - gesture->d_func()->mStartPos.toPoint();
- QPointF velocity = totalOffset / gesture->d_func()->mStartTime.elapsed();
+ int deltaTime = gesture->d_func()->mStartTime.msecsTo(mCurrentTime);
+ QPointF velocity = deltaTime != 0 ? totalOffset / deltaTime : QPointF(0,0);
gesture->setSwipeAngle(QLineF(gesture->d_func()->mStartPos, me->globalPos()).angle());
gesture->setSceneSwipeAngle(QLineF(gesture->d_func()->mSceneStartPos, HbGestureUtils::mapToScene(watched, me->globalPos())).angle());
- if (totalOffset.manhattanLength() >= HbSwipeMinOffset && velocity.manhattanLength() >= HbSwipeMinSpeed && me->button() == Qt::LeftButton) {
+ bool movedEnough = totalOffset.manhattanLength() >= HbSwipeMinOffset;
+ bool fastEnough = velocity.manhattanLength() >= HbSwipeMinSpeed;
+ bool notStoppedAtEnd = HbVelocityCalculator(gesture->d_ptr->mAxisX, gesture->d_ptr->mAxisY).velocity(mCurrentTime) != QPointF(0,0);
+
+ if (movedEnough && fastEnough && notStoppedAtEnd) {
return QGestureRecognizer::FinishGesture;
} else {
return QGestureRecognizer::Ignore;
@@ -150,10 +190,11 @@
Qt::GestureState gestureState,
HbSwipeGesture *gesture,
QObject *watched,
- QEvent *event )
+ QEvent *event,
+ QTime currentTime)
{
// Record the time right away.
- mCurrentTime = QTime::currentTime();
+ mCurrentTime = currentTime;
if ( isMouseEvent(event->type()) )
{
@@ -165,10 +206,8 @@
return handleMousePress(gestureState, gesture, watched, me);
case QEvent::MouseMove:
- if (me->buttons().testFlag(Qt::LeftButton))
- return QGestureRecognizer::MayBeGesture;
- else
- return QGestureRecognizer::Ignore;
+ return handleMouseMove(gestureState, gesture, watched, me);
+
case QEvent::MouseButtonRelease:
return handleMouseRelease(gestureState, gesture, watched, me);
--- a/src/hbcore/gestures/hbswipegesturelogic_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gestures/hbswipegesturelogic_p.h Fri May 14 16:09:54 2010 +0300
@@ -27,6 +27,7 @@
#define HBSWIPEGESTURELOGIC_P_H
#include "hbgestures_p.h"
+#include "hbglobal.h"
#include <QEvent>
#include <QGestureRecognizer>
@@ -46,17 +47,23 @@
Qt::GestureState gestureState,
HbSwipeGesture *gesture,
QObject *watched,
- QMouseEvent *me );
+ QMouseEvent *me);
+ QGestureRecognizer::Result handleMouseMove(
+ Qt::GestureState gestureState,
+ HbSwipeGesture *gesture,
+ QObject *watched,
+ QMouseEvent *me);
QGestureRecognizer::Result handleMouseRelease(
Qt::GestureState gestureState,
HbSwipeGesture *gesture,
QObject *watched,
- QMouseEvent *me );
+ QMouseEvent *me);
QGestureRecognizer::Result recognize(
Qt::GestureState gestureState,
HbSwipeGesture *gesture,
QObject *watched,
- QEvent *event );
+ QEvent *event,
+ QTime currentTime);
QTime mCurrentTime;
};
--- a/src/hbcore/gestures/hbtapandholdgesture.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gestures/hbtapandholdgesture.cpp Fri May 14 16:09:54 2010 +0300
@@ -30,12 +30,17 @@
#include <QObject>
/*!
- \internal
+ @hbcore
\class HbTapAndHoldGesture
- \brief HbTapAndHoldGesture implements a gesture for tap and hold.
+ \brief HbTapAndHoldGesture is an extension to Qt standard QTapAndHoldGesture
+ \sa QTapAndHoldGesture
*/
+/*!
+ \brief HbTapAndHoldGesture constructor
+ \param parent Parent for the gesture
+*/
HbTapAndHoldGesture::HbTapAndHoldGesture(QObject* parent)
:
QTapAndHoldGesture(parent)
@@ -43,19 +48,33 @@
priv = new HbTapAndHoldGesturePrivate(this);
}
-HbTapAndHoldGesture::HbTapAndHoldGesture(HbTapAndHoldGesturePrivate* data, QObject* parent)
+/*!
+ \brief HbTapAndHoldGesture constructor
+ \param dd Custom private data
+ \param parent Parent for the gesture
+*/
+HbTapAndHoldGesture::HbTapAndHoldGesture(HbTapAndHoldGesturePrivate* dd, QObject* parent)
:
QTapAndHoldGesture(parent),
- priv(data)
+ priv(dd)
{
priv->q_ptr = this;
}
+/*!
+ \brief HbTapAndHoldGesture destructor
+*/
HbTapAndHoldGesture::~HbTapAndHoldGesture()
{
delete priv; priv = NULL;
}
+/*!
+ \property scenePosition
+
+ Current position of the gesture.
+ \sa QTapAndHoldGesture::position()
+*/
QPointF HbTapAndHoldGesture::scenePosition() const
{
return priv->mScenePos;
--- a/src/hbcore/gestures/hbtapandholdgesturelogic_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gestures/hbtapandholdgesturelogic_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -306,7 +306,11 @@
QObject *watched,
QEvent *event )
{
- DEBUG() << "Entering" << gestureState << gesture << watched << event;
+ if (!gesture || !watched || !event )
+ {
+ DEBUG() << "WARNING: Ignoring tap and hold gesture because of invalid arguments from gesture fw.";
+ return QGestureRecognizer::Ignore;
+ }
switch( event->type() )
{
--- a/src/hbcore/gestures/hbtapgesture.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gestures/hbtapgesture.cpp Fri May 14 16:09:54 2010 +0300
@@ -66,18 +66,31 @@
*/
+/*!
+ \brief HbTapGesture constructor
+ \param parent Parent for the gesture
+*/
HbTapGesture::HbTapGesture(QObject *parent)
: QTapGesture(parent), d_ptr(new HbTapGesturePrivate)
{
DEBUG() << "Creating" << this;
}
+/*!
+ \brief HbTapGesture constructor
+ \param dd Custom private data
+ \param parent Parent for the gesture
+
+*/
HbTapGesture::HbTapGesture( HbTapGesturePrivate &dd, QObject *parent )
: QTapGesture(parent), d_ptr( &dd )
{
DEBUG() << "Creating" << this;
}
+/*!
+ \brief HbTapGesture destructor
+*/
HbTapGesture::~HbTapGesture()
{
DEBUG() << "Deleting" << this;
@@ -85,11 +98,8 @@
}
/*!
-
\property startPos
-
- Stores the starting position of the tap gesture in screen coordinates.
-
+ \brief Stores the starting position of the tap gesture in screen coordinates.
*/
QPointF HbTapGesture::startPos() const
{
@@ -104,11 +114,8 @@
}
/*!
-
\property sceneStartPos
-
- Stores the starting position of the tap gesture in scene coordinates.
-
+ \brief Stores the starting position of the tap gesture in scene coordinates.
*/
QPointF HbTapGesture::sceneStartPos() const
{
@@ -123,11 +130,9 @@
}
/*!
-
- \property startPos
-
- Stores the starting position of the tap gesture in scene coordinates.
-
+ \property scenePosition
+ \brief Stores the current position of the tap gesture in scene coordinates.
+ \sa QTapGesture::position()
*/
QPointF HbTapGesture::scenePosition() const
{
@@ -143,6 +148,7 @@
/*!
\property tapStyleHint
+ \brief Indicates whether tap is normal tap or long press.
TapStyleHint is by default Tap and in case of long press, the gesture
update event is sent and TapStyleHint changed to TapAndHold.
--- a/src/hbcore/gestures/hbtapgesturelogic_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gestures/hbtapgesturelogic_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -211,6 +211,12 @@
QObject *watched,
QEvent *event )
{
+ if (!gesture || !watched || !event )
+ {
+ DEBUG() << "WARNING: Ignoring tap gesture because of invalid arguments from gesture fw.";
+ return QGestureRecognizer::Ignore;
+ }
+
switch(event->type())
{
case QEvent::MouseButtonDblClick:
--- a/src/hbcore/gestures/hbvelocitycalculator_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gestures/hbvelocitycalculator_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -37,18 +37,12 @@
# define DEBUG qDebug
#endif
-// Number of points through considered relevant to calculate speed.
-const int KHbPoints = 4;
-
-// Number to used to adjust the speed to look better for eyes. Simulates mass effect.
-const qreal KHbAdjust = 4.0;
-
const int KHbSampleTime = 80; // ms
-const int KHbStopTime = 30; // ms
+const int KHbStopTime = 70; // ms
/*!
@hbcore
- \internal
+ \internals
\class HbVelocityCalculator
\brief Class to calculate velocity from point.
@@ -100,55 +94,24 @@
{
Q_UNUSED(time)
+ if (list.count() < 2) {
+ return 0.0;
+ }
+
+ DEBUG() << "Stationary time: " << list.lastTime().msecsTo(time);
+ if (list.lastTime().msecsTo(time) > KHbStopTime) {
+ return 0.0;
+ }
+
// Accumulate the distance from previous point until we have sufficient sample
qreal delta = 0.0;
int timeDelta = 0;
- if (!(list.mTimes.count() > 1 && list.mPoints.count() > 1) ||
- (list.mTimes.last().msec()-time.msec() > KHbStopTime)) {
- return 0.0;
- }
- int i = list.mTimes.count();
+ int i = list.count();
while (timeDelta < KHbSampleTime && i > 0) {
i--;
- timeDelta = time.msec() - list.mTimes.at(i).msec();
- }
- delta = list.mPoints.last() - list.mPoints.at(i);
-
- return delta / (qreal)(list.mTimes.at(i).msecsTo(time));
- /*// Make decisions based on the last few points.
- QList<int> points = list.getLastPoints( KHbPoints );
- QList<QTime> times = list.getLastTimes( KHbPoints );
- qreal velocity = 0.0;
-
- // In case of empty list or in case the sizes of the list are different
- // consider this movement being stopped.
- if ( !points.length() || points.length() != times.length() )
- {
- DEBUG() << "Cancelling velocity calculation, because points.length() == " << points.length() << " and times.length() == " << times.length();
- return velocity;
-
+ timeDelta = list.at(i).second.msecsTo(time);
}
- else
- {
- DEBUG() << "Number of points recorded: " << points.length();
- }
+ delta = list.lastPoint() - list.at(i).first;
- // Sum the velocities between timedeltas to get the final speed.
- qreal avg_dt = 0.0;
- for ( int i = 0; i<points.length()-1; i++)
- {
- qreal t = times[i].msecsTo(times[i+1]);
- avg_dt += t;
- velocity += ( points[i+1] - points[i] ) / t;
- velocity /= 2.0;
- }
- avg_dt /= times.length();
-
- // Calculate time between release and last update point.
- qreal dt = list.lastTime().msecsTo(time);
-
- if ( !dt ) { dt = avg_dt; }
-
- // Scale the velocity correctly and adjust it with magic.
- return velocity * dt / KHbAdjust;*/
+ return delta / (qreal)(list.at(i).second.msecsTo(time));
}
--- a/src/hbcore/gestures/hbvelocitycalculator_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gestures/hbvelocitycalculator_p.h Fri May 14 16:09:54 2010 +0300
@@ -40,7 +40,7 @@
QPointF velocity( const QTime& time ) const;
private:
- qreal calculate_velocity( const HbPointRecorder& listX, const QTime& time ) const;
+ qreal calculate_velocity( const HbPointRecorder& list, const QTime& time ) const;
const HbPointRecorder& mListX;
const HbPointRecorder& mListY;
--- a/src/hbcore/gui/hbabstractbutton.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gui/hbabstractbutton.cpp Fri May 14 16:09:54 2010 +0300
@@ -26,7 +26,7 @@
#include "hbabstractbutton.h"
#include "hbabstractbutton_p.h"
#include "hbapplication.h"
-#include "hbstyleoption.h"
+#include "hbstyleoption_p.h"
#include "hbtooltip.h"
#include "hbinstance.h"
#include <QGraphicsSceneMouseEvent>
--- a/src/hbcore/gui/hbabstractbutton_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gui/hbabstractbutton_p.h Fri May 14 16:09:54 2010 +0300
@@ -40,8 +40,6 @@
#include <QBasicTimer>
#include "hbwidget_p.h"
-class HbGestureSceneFilter;
-
class HB_CORE_PRIVATE_EXPORT HbAbstractButtonPrivate : public HbWidgetPrivate
{
Q_DECLARE_PUBLIC( HbAbstractButton )
--- a/src/hbcore/gui/hbactionmanager.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gui/hbactionmanager.cpp Fri May 14 16:09:54 2010 +0300
@@ -79,26 +79,32 @@
Calculates and returns the position of the action
based on the container template.
*/
-int HbActionManager::position(QAction *aAction, QList<QAction *> actions) const
+int HbActionManager::position(QAction *aAction, QList<QAction *> actions, int maxPos) const
{
- if (actions.count() == 0) {
+ if (actions.count() == 0) {
return 0;
}
+ if (maxPos < 0) {
+ maxPos = actions.count();
+ }
// try to downcast aAction. If that fails, return a fallback value
HbAction* action = qobject_cast<HbAction *>(aAction);
if (!action){
- return actions.count();
+ return maxPos;
}
int index = templateIndex(action);
if (index == -1) {
- return actions.count();
+ return maxPos;
}
int pos(0);
foreach (QAction *qaction, actions) {
HbAction *containerAction = qobject_cast<HbAction *>(qaction);
+ if (!containerAction) {
+ break;
+ }
int containerIndex = templateIndex(containerAction);
if (index < containerIndex) {
break;
@@ -107,6 +113,9 @@
pos++;
}
}
+ if (pos > maxPos) {
+ pos = maxPos;
+ }
return pos;
}
--- a/src/hbcore/gui/hbactionmanager_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gui/hbactionmanager_p.h Fri May 14 16:09:54 2010 +0300
@@ -59,7 +59,7 @@
HbActionManager(HbView::ActionContainer container, QObject *parent, HbMainWindow *mainWindow);
~HbActionManager();
- int position(QAction *action, QList<QAction *> actions) const;
+ int position(QAction *action, QList<QAction *> actions, int maxPos = -1) const;
void addItem(HbAction::CommandRole role);
QAction *orderedAction(int index, QList<QAction *> actions);
--- a/src/hbcore/gui/hbcontentwidget.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gui/hbcontentwidget.cpp Fri May 14 16:09:54 2010 +0300
@@ -44,18 +44,19 @@
HbContentWidget::HbContentWidget(HbMainWindow *mainWindow,QGraphicsItem *parent /*= 0*/):
HbStackedWidget(parent),
- viewSwitchRunning(false),
- targetView(0),
- hidingView(0),
- mainWindow(mainWindow)
+ mViewSwitchRunning(false),
+ mTargetView(0),
+ mHidingView(0),
+ mMainWindow(mainWindow)
{
}
QSizeF HbContentWidget::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
{
- Q_UNUSED( constraint );
+ Q_UNUSED(constraint);
QSizeF size;
+
switch (which) {
case Qt::MinimumSize:
size = QSizeF(0, 0);
@@ -76,6 +77,7 @@
size = QSizeF(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
break;
}
+
return size;
}
@@ -86,7 +88,7 @@
void HbContentWidget::setTargetView(HbView *view)
{
- targetView = view;
+ mTargetView = view;
}
QString HbContentWidget::getEffectEvent(const char *baseName,
@@ -132,7 +134,7 @@
QGraphicsWidget *viewWidget = view->widget();
QGraphicsWidget *effectTarget = viewWidget ? viewWidget : view;
if (flags & Hb::ViewSwitchFullScreen) {
- effectTarget = HbMainWindowPrivate::d_ptr(mainWindow)->mClippingItem;
+ effectTarget = HbMainWindowPrivate::d_ptr(mMainWindow)->mClippingItem;
if (!(flags & Hb::ViewSwitchSequential)) {
// The Parallel+FullScreen combination does not make sense
// (e.g. cannot animate the one and only titlebar
@@ -153,15 +155,15 @@
// HideRegItemBeforeClearingEffect so no matter which comes first (clearing
// of the effect or this notification), the item is hidden properly before
// resetting the transform etc. and thus there is no flicker.
- hidingView->setVisible(false);
+ mHidingView->setVisible(false);
// Start the "show" phase if not yet started.
- if (viewSwitchFlags & Hb::ViewSwitchSequential) {
+ if (mViewSwitchFlags & Hb::ViewSwitchSequential) {
// Do not show targetView yet, leave it to the effect in order to
// prevent flickering.
if (status.reason != Hb::EffectCancelled) {
runViewSwitchEffectShow();
} else {
- targetView->setVisible(true);
+ mTargetView->setVisible(true);
viewSwitchEffectsFinished(status);
}
}
@@ -175,9 +177,10 @@
Q_UNUSED(status);
// Do not bother with item visibility here, the effect should manage it
// properly because the ShowItemOnFirstUpdate flag was set.
- viewSwitchRunning = false;
- if (HbMainWindowPrivate::d_ptr(mainWindow)->mDelayedConstructionHandled) {
- HbMainWindowPrivate::d_ptr(mainWindow)->_q_viewReady();
+ mViewSwitchRunning = false;
+ mMainWindow->setInteractive(true); // enable input events
+ if (HbMainWindowPrivate::d_ptr(mMainWindow)->mDelayedConstructionHandled) {
+ HbMainWindowPrivate::d_ptr(mMainWindow)->_q_viewReady();
}
}
@@ -189,21 +192,22 @@
// Cancel all on-going effects. Relying on the cancel() calls made by the
// start() functions would not be enough in all situations.
HbEffectInternal::cancelAll(0, true); // ignore looping effects, those are not view switch effects and must not be stopped here
- viewSwitchRunning = true;
+ mViewSwitchRunning = true;
// Make the new view the current one right away. This must be done asap to prevent
// messed up state in mainwindow, the stack widget, etc. due to events coming during
// the view switch animation.
// 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(targetView, false, false);
+ setCurrentWidget(mTargetView, false, false);
- hidingView = viewToHide;
- viewSwitchFlags = flags;
+ mHidingView = viewToHide;
+ mViewSwitchFlags = flags;
QGraphicsWidget *effectTarget = getEffectTarget(viewToHide, flags);
if (effectTarget) {
- QString event = getEffectEvent("hide", flags, viewToHide, targetView);
+ mMainWindow->setInteractive(false); // disable input while the effects are running
+ QString event = getEffectEvent("hide", flags, viewToHide, mTargetView);
HbEffectInternal::EffectFlags effectFlags =
HbEffectInternal::ClearEffectWhenFinished // the effect must not be persistent
| HbEffectInternal::HideRegItemBeforeClearingEffect; // to prevent unlikely, but possible flicker
@@ -221,13 +225,13 @@
*/
void HbContentWidget::runViewSwitchEffectShow()
{
- QGraphicsWidget *effectTarget = getEffectTarget(targetView, viewSwitchFlags);
+ QGraphicsWidget *effectTarget = getEffectTarget(mTargetView, mViewSwitchFlags);
if (effectTarget) {
- QString event = getEffectEvent("show", viewSwitchFlags, hidingView, targetView);
+ QString event = getEffectEvent("show", mViewSwitchFlags, mHidingView, mTargetView);
HbEffectInternal::EffectFlags effectFlags =
HbEffectInternal::ClearEffectWhenFinished
| HbEffectInternal::ShowItemOnFirstUpdate; // because targetView is not yet visible
- HbEffectInternal::start(targetView, effectTarget, effectFlags,
+ HbEffectInternal::start(mTargetView, effectTarget, effectFlags,
"HB_view", event, this, "viewSwitchEffectsFinished");
}
}
--- a/src/hbcore/gui/hbcontentwidget_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gui/hbcontentwidget_p.h Fri May 14 16:09:54 2010 +0300
@@ -44,7 +44,7 @@
void delayedConstruction();
void setTargetView(HbView *view);
void runViewSwitchEffectHide(HbView *viewToHide, Hb::ViewSwitchFlags flags);
- bool isSwitchingViews() const { return viewSwitchRunning; }
+ bool isSwitchingViews() const { return mViewSwitchRunning; }
private slots:
void hideEffectFinished(HbEffect::EffectStatus status);
@@ -61,11 +61,11 @@
QGraphicsWidget *getEffectTarget(HbView *view, Hb::ViewSwitchFlags flags);
void runViewSwitchEffectShow();
- bool viewSwitchRunning;
- HbView *targetView;
- HbView *hidingView;
- Hb::ViewSwitchFlags viewSwitchFlags;
- HbMainWindow *mainWindow;
+ bool mViewSwitchRunning;
+ HbView *mTargetView;
+ HbView *mHidingView;
+ Hb::ViewSwitchFlags mViewSwitchFlags;
+ HbMainWindow *mMainWindow;
};
#endif // HBCONTENTWIDGET_P_H
--- a/src/hbcore/gui/hbcssinspector_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gui/hbcssinspector_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -129,16 +129,23 @@
return hintText;
}
+static QString convertEffectiveSizeHintToText(const QGraphicsWidget *item, Qt::SizeHint which)
+{
+ QString hintText("(");
+ const QSizeF &size = item->effectiveSizeHint(which);
+ hintText += convertMeasurementToText(item, size.width()) + ",";
+ hintText += convertMeasurementToText(item, size.height()) + ")";
+ return hintText;
+}
+
static QString cssItemHintText(const QGraphicsItem *item)
{
QString sizeHint;
if (item->isWidget()) {
- const QGraphicsLayout *layout = (static_cast<const QGraphicsWidget *>(item))->layout();
- if(layout) {
- sizeHint += "(" + convertMeasurementToText( item, layout->minimumWidth() ) + "," + convertMeasurementToText( item, layout->minimumHeight() ) + ")|";
- sizeHint += "(" + convertMeasurementToText( item, layout->preferredWidth() ) + "," + convertMeasurementToText( item, layout->preferredHeight() ) +")|";
- sizeHint += "(" + convertMeasurementToText( item, layout->maximumWidth() ) + "," +convertMeasurementToText( item, layout->maximumHeight() ) + ")";
- }
+ const QGraphicsWidget *widget = static_cast<const QGraphicsWidget*>(item);
+ sizeHint += convertEffectiveSizeHintToText(widget, Qt::MinimumSize)+"|";
+ sizeHint += convertEffectiveSizeHintToText(widget, Qt::PreferredSize)+"|";
+ sizeHint += convertEffectiveSizeHintToText(widget, Qt::MaximumSize);
}
return sizeHint;
}
@@ -147,13 +154,12 @@
{
QRectF hintRect;
if (item->isWidget()) {
- if (item->isWidget()) {
- const QGraphicsLayout *layout = (static_cast<const QGraphicsWidget *>(item))->layout();
- if(layout) {
- hintRect.setWidth(layout->preferredWidth());
- hintRect.setHeight(layout->preferredHeight());
- }
- }
+ if (item->isWidget()) {
+ const QGraphicsWidget *widget = static_cast<const QGraphicsWidget*>(item);
+ const QSizeF &size = widget->effectiveSizeHint(Qt::PreferredSize);
+ hintRect.setWidth(size.width());
+ hintRect.setHeight(size.height());
+ }
}
return hintRect;
}
--- a/src/hbcore/gui/hbdialog.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gui/hbdialog.cpp Fri May 14 16:09:54 2010 +0300
@@ -27,7 +27,7 @@
#include "hbdialog_p.h"
#include "hbinstance.h"
#include "hbaction.h"
-#include "hbstyleoptionpopup.h"
+#include "hbstyleoptionpopup_p.h"
#include "hbdeviceprofile.h"
#include "hbevent.h"
#include "hbtoolbar_p.h"
@@ -55,24 +55,24 @@
@beta
@hbcore
\class HbDialog
- \brief HbDialog is a base class for different popup notes in Hb library.
+ \brief HbDialog is a base class for different dialogs in Hb library.
- \image html hbpopup.png A popup with a header widget, a list as a content widget,
- and two action buttons.
+ \image html hbpopup.png "A dialog with a header widget, a list as a content widget, and two action buttons."
- HbDialog is a concrete class. The content for a custom popup is implemented in
- a separate widget, which is set to the popup with method setContentWidget().
+ HbDialog is a concrete class. The content for a custom dialog is
+ implemented in a separate widget, which is set to the dialog with
+ method setContentWidget().
- Lastly shown popup is always positioned in Z order on the the top of already visible popups.
- A popup can be permanent or automatically dismissed after a time-out.
- Modal popups interrupt any other user interaction outside of the popup while they are visible,
- whereas non-modal popups do not.
- An example of how to create a simple modal popup and show it.
+ An example of how to create a simple modal dialog and show it.
\snippet{ultimatecodesnippet/ultimatecodesnippet.cpp,13}
- An example of how to create a non-modal popup and show it.
+ An example of how to handle dialog signals from previous example.
+ \snippet{ultimatecodesnippet/ultimatecodesnippet.cpp,53}
+
+ An example of how to create a non-modal dialog and show it.
\snippet{ultimatecodesnippet/ultimatecodesnippet.cpp,26}
+
*/
/*!
@@ -152,20 +152,9 @@
/*!
-* Constructs a popup with given \a parent graphics item.\n
-* Note: popups with \a parent set as 0 are behaving as real popups.
-* This is actually the intended use.
-*
-* However in some situation could be useful to embedd a popup into a QGraphicsItem.
-* In this case a non zero \a parent value must be passed.
-* Popups with parent items behaving just like any other QGraphicsWidget.
-* The following features are not supported (i.e. ignored) for popup with parents:
-*
-* - modality
-* - timeout
-* - unfadedItems
-* - dismissPolicy
-* - signal aboutToClose
+ Constructs a dialog with given \a parent graphics item.\n
+ Note: dialogs with \a parent set as 0 are behaving as real popups.
+ This is actually the intended use. \sa HbPopup::HbPopup
*/
HbDialog::HbDialog(QGraphicsItem *parent) :
HbPopup(*new HbDialogPrivate, parent)
@@ -187,16 +176,15 @@
}
/*!
-* Destroys the popup.
+ Destroys the popup.
*/
HbDialog::~HbDialog()
{
}
/*!
-@beta
-* It returns the widget which is being added to the heading area
-* \sa setHeadingWidget()
+ Returns the widget which is being added to the heading area
+ \sa setHeadingWidget()
*/
QGraphicsWidget * HbDialog::headingWidget() const
{
@@ -205,10 +193,9 @@
}
/*!
-@beta
-* Adds \a widget to the heading area. Ownership of the widget is transferred
-* to popup. If \a headingWidget is 0 the heading widget is removed.
-* \sa headingWidget()
+ Adds \a widget to the heading area. Ownership of the widget is transferred
+ to popup. If \a headingWidget is 0 the heading widget is removed.
+ \sa headingWidget()
*/
void HbDialog::setHeadingWidget(QGraphicsWidget *headingWidget)
{
@@ -218,9 +205,9 @@
}
/*!
-* Returns the content widget property of the popup.
-* HbDialog only draws a bordered rect, the rest is drawn by the content widget.
-* \sa setContentWidget()
+ Returns the content widget property of the popup.
+ HbDialog only draws a bordered rect, the rest is drawn by the content widget.
+ \sa setContentWidget()
*/
QGraphicsWidget *HbDialog::contentWidget() const
{
@@ -229,11 +216,11 @@
}
/*!
-* Sets the content widget property of the popup.
-* HbDialog only draws a bordered rect, the rest is drawn by the content widget.
-* Ownership of the widget is transferred
-* to popup. If \a contentWidget is 0 the content widget is removed.
-* \sa contentWidget()
+ Sets the content widget property of the popup.
+ HbDialog only draws a bordered rect, the rest is drawn by the content widget.
+ Ownership of the widget is transferred
+ to popup. If \a contentWidget is 0 the content widget is removed.
+ \sa contentWidget()
*/
void HbDialog::setContentWidget(QGraphicsWidget *contentWidget)
{
@@ -243,7 +230,7 @@
}
/*!
-\deprecated HbDialog::primaryAction() const
+ \deprecated HbDialog::primaryAction() const
is deprecated.
It returns the primary action added to the control area
\sa setPrimaryAction()
@@ -256,7 +243,7 @@
}
/*!
-\deprecated HbDialog::setPrimaryAction(HbAction*)
+ \deprecated HbDialog::setPrimaryAction(HbAction*)
is deprecated. Please use QGraphicsWidget::addAction() family of functions instead.
It adds the given action to the control area.
It is added to the left side of the control area if the layout direction of the application
@@ -280,7 +267,7 @@
}
/*!
-\deprecated HbDialog::secondaryAction() const
+ \deprecated HbDialog::secondaryAction() const
is deprecated.
It returns the secondary action added to the control area
\sa setSecondaryAction()
@@ -293,7 +280,7 @@
}
/*!
-\deprecated HbDialog::setSecondaryAction(HbAction*)
+ \deprecated HbDialog::setSecondaryAction(HbAction*)
is deprecated. Please use QGraphicsWidget::addAction() family of functions instead.
It adds the given action to the control area.
It is added to the right side of the control area if the layout direction of the application
@@ -313,37 +300,14 @@
}
/*!
-\deprecated HbDialog::exec()
- is deprecated.
- Please use HbDialog::open( QObject* receiver, const char* member ) instead.
- Executes the popup synchronously.
- Note: when popup is executed syncronously it is always modal.
-*/
-HbAction* HbDialog::exec()
-{
- HB_DEPRECATED("HbDialog::exec is deprecated. Use HbDialog::show() or HbDialog::open() instead!");
- Q_D(HbDialog);
+ Shows the dialog as modal dialog returning immediately.
- HbAction *action = 0;
- QPointer<QObject> guard = this;
- HbPopup::exec();
- if (!guard.isNull()) {
- action = d->closingAction;
- d->closingAction = 0;
- }
- return action;
-}
+ Connects finished(HbAction*) signal to the slot specified by \a receiver and
+ \a member. The signal will be disconnected from the slot when the
+ popup is closed.
-/*! @alpha
-*
-* Shows the dialog as modal dialog returning immediately.
-
-* Connects finished(HbAction*) signal to the slot specified by \a receiver and
-* \a member. The signal will be disconnected from the slot when the
-* popup is closed.
-*
-* For non modal popups, use show().
+ For non modal popups, use show().
*/
void HbDialog::open( QObject* receiver, const char* member )
@@ -361,7 +325,7 @@
}
/*!
-* \reimp
+ \reimp
*/
//
// Sets the focus to its content widget.
--- a/src/hbcore/gui/hbdialog.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gui/hbdialog.h Fri May 14 16:09:54 2010 +0300
@@ -28,7 +28,6 @@
#include <hbglobal.h>
#include <hbpopup.h>
-#include <hbstyleoptionpopup.h>
class HbAction;
class HbDialogPrivate;
@@ -57,7 +56,6 @@
int type() const { return Type; }
public slots:
- HbAction *exec();
void open( QObject* receiver = 0, const char* member = 0 );
signals:
--- a/src/hbcore/gui/hblongpressvisualizer.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gui/hblongpressvisualizer.cpp Fri May 14 16:09:54 2010 +0300
@@ -32,9 +32,12 @@
#include <hbiconanimationmanager.h>
#include <hbiconanimator.h>
#include <hbwidgetfeedback.h>
+#include <hbnamespace_p.h>
#include <QGraphicsScene>
/*!
+ @stable
+ @hbcore
\class HbLongPressVisualizer
\brief Displays the long press animation, that is, the small animated icon
@@ -107,6 +110,7 @@
mIconItem = new HbIconItem("qtg_anim_longtap");
mIconItem->hide();
mIconItem->setSize(mIconItem->defaultSize());
+ mIconItem->setZValue(HbPrivate::PopupZValueRangeEnd + 5000);
}
QGraphicsScene *targetScene = mainWindow->scene();
QGraphicsScene *oldScene = mIconItem->scene();
--- a/src/hbcore/gui/hbmainwindow.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gui/hbmainwindow.cpp Fri May 14 16:09:54 2010 +0300
@@ -39,8 +39,6 @@
#include "hbmainwindow_p.h"
#include "hbnamespace.h"
#include "hbnamespace_p.h"
-#include "hbsoftkey_p.h"
-#include "hbsoftkeygroup_p.h"
#include "hbtitlebar_p.h"
#include "hbstatusbar_p.h"
#include "hbstyle.h"
@@ -61,6 +59,7 @@
#include "hbscreen_p.h"
#include "hbmainwindoworientation_p.h"
#include "hbfeaturemanager_p.h"
+#include "hboogmwatcher_p.h"
#ifdef Q_OS_SYMBIAN
#include <coecntrl.h>
@@ -68,7 +67,7 @@
#endif
/*!
- @beta
+ @stable
@hbcore
\class HbMainWindow
@@ -143,15 +142,6 @@
*/
/*!
- \deprecated HbMainWindow::currentViewIndexChanged(int)
- is deprecated.
-
- \fn void HbMainWindow::currentViewIndexChanged(int index)
-
- This signal is emitted when the current view index changes.
- */
-
-/*!
\fn void HbMainWindow::aboutToChangeView(HbView *oldView, HbView *newView)
This signal is emitted before starting a view change. Note that it is only
@@ -267,6 +257,7 @@
#if defined(Q_WS_S60) || defined(HB_Q_WS_MAEMO)
setWindowState(Qt::WindowFullScreen);
#endif//Q_WS_S60
+
setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
setFrameShape(QFrame::NoFrame);
@@ -300,7 +291,7 @@
d->mEffectItem = d->mViewStackWidget;
d->mClippingItem->setStackWidget(d->mViewStackWidget);
connect(d->mViewStackWidget, SIGNAL(currentChanged(int)),
- this, SLOT(_q_viewChanged(int)));
+ this, SLOT(_q_viewChanged()));
connect(d->mViewStackWidget, SIGNAL(widgetRemoved(QGraphicsWidget*)),
this, SLOT(_q_viewRemoved(QGraphicsWidget*)));
@@ -320,14 +311,18 @@
d->mLayoutRect = rect;
d->mRootItem->setGeometry(rect);
d->mClippingItem->setGeometry(rect);
-
setSceneRect(0, 0, pSize.width(), pSize.height());
-
setTransformationAnchor(QGraphicsView::AnchorViewCenter);
- // Rest of the initialization is done later, see paintEvent().
-
-
+ // Initialize common translations. This must be done before
+ // creating any widget that can potentially use localized strings
+ // and therefore cannot be delayed.
+ d->initTranslations();
+
+ // Make sure the oogm watcher is initialized (so that wserv events
+ // are routed to it properly).
+ HbOogmWatcher::instance();
+
#ifdef HB_GESTURE_FW
// @todo remove after view auto-subscribes to gestures
viewport()->grabGesture(Qt::TapGesture);
@@ -337,6 +332,9 @@
viewport()->grabGesture(Qt::PinchGesture);
#endif
+
+ // Rest of the initialization is done later, see paintEvent().
+
}
/*!
@@ -361,6 +359,7 @@
HbInstancePrivate::d_ptr()->removeWindow(this);
delete d_ptr;
+
// to workaround problem when creating/destroying multiple hbmainwindow's in unit tests (win env)
#ifdef Q_OS_WIN
destroy();
@@ -480,23 +479,6 @@
}
/*!
- \deprecated HbMainWindow::removeView(int)
- is deprecated. Use HbMainWindow::removeView(QGraphicsWidget *widget) instead!
-
- Removes a view from a given \a index from the HbMainWindow object. The view is not deleted but returned to caller.
-
- \return the removed widget.
-
- \sa addView insertView
-*/
-QGraphicsWidget *HbMainWindow::removeView(int index)
-{
- HB_DEPRECATED("HbMainWindow::removeView is deprecated. Use HbMainWindow::removeView(QGraphicsWidget *widget) instead!");
- Q_D(HbMainWindow);
- return d->mViewStackWidget->removeAt(index);
-}
-
-/*!
Returns the current view of the HbMainWindow object.
\return pointer to the current view object, or 0 if undefined.
@@ -558,71 +540,6 @@
}
}
-
-/*!
- \deprecated HbMainWindow::currentViewIndex() const
- is deprecated. Use HbMainWindow::currentView() instead!
-
- Returns the current index of the HbMainWindow object.
- \return current index, or -1 if undefined.
-
- \sa setCurrentViewIndex setCurrentView currentView
-*/
-int HbMainWindow::currentViewIndex() const
-{
- HB_DEPRECATED("HbMainWindow::currentViewIndex is deprecated. Use HbMainWindow::currentView() instead!");
- Q_D(const HbMainWindow);
- return d->mViewStackWidget->currentIndex();
-}
-
-/*!
- \deprecated HbMainWindow::viewCount() const
- is deprecated. Use HbMainWindow::views().count() instead!
-
- Returns the count of view objects of the HbMainWindow object.
- \return view object count.
-
- \sa addView insertView
-*/
-int HbMainWindow::viewCount() const
-{
- HB_DEPRECATED("HbMainWindow::viewCount is deprecated. Use HbMainWindow::views().count() instead!");
- Q_D(const HbMainWindow);
- return d->mViewStackWidget->count();
-}
-
-/*!
- \deprecated HbMainWindow::indexOfView(HbView*) const
- is deprecated. Use HbMainWindow::views().indexOf(view) instead!
-
- Returns the index for a given \a view object of the HbMainWindow object.
- \return index of a view object.
-
- \sa currentViewIndex currentView
-*/
-int HbMainWindow::indexOfView(HbView *view) const
-{
- HB_DEPRECATED("HbMainWindow::indexOfView is deprecated. Use HbMainWindow::views().indexOf(view) instead!");
- Q_D(const HbMainWindow);
- return d->mViewStackWidget->indexOf(view);
-}
-
-/*!
- \deprecated HbMainWindow::viewAt(int) const
- is deprecated. Use HbMainWindow::views() instead!
-
- Returns \a view object for a given \a index of the HbMainWindow object.
- \return view object.
-
- \sa currentViewIndex currentView indexOfView
-*/
-HbView *HbMainWindow::viewAt(int index) const
-{
- HB_DEPRECATED("HbMainWindow::viewAt is deprecated. Use HbMainWindow::views() instead!");
- Q_D(const HbMainWindow);
- return qobject_cast<HbView *>(d->mViewStackWidget->widgetAt(index));
-}
-
/*!
Returns list of all views.
@@ -692,92 +609,6 @@
}
/*!
- \deprecated HbMainWindow::showItems(QFlags<Hb::SceneItem>)
- is deprecated. Use HbView::showItems instead.
-
- Sets \a items to be visible in main window.
-
- \sa isItemVisible() setItemVisible() hideItems() visibleItems()
-*/
-void HbMainWindow::showItems(Hb::SceneItems items)
-{
- HB_DEPRECATED("HbMainWindow::showItems is deprecated! Use HbView::showItems instead.");
- Q_D(HbMainWindow);
- if (d->mVisibleItems ^ items) {
- d->mVisibleItems |= items;
- d->updateVisibleItems();
- }
-}
-
-/*!
- \deprecated HbMainWindow::hideItems(QFlags<Hb::SceneItem>)
- is deprecated. Use HbView::hideItems instead.
-
- Sets \a items to be invisible in main window.
-
- \sa isItemVisible() setItemVisible() showItems() visibleItems()
-*/
-void HbMainWindow::hideItems(Hb::SceneItems items)
-{
- HB_DEPRECATED("HbMainWindow::hideItems is deprecated! Use HbView::hideItems instead.");
- Q_D(HbMainWindow);
- if (d->mVisibleItems & items) {
- d->mVisibleItems &= ~items;
- d->updateVisibleItems();
- }
-}
-
-/*!
- \deprecated HbMainWindow::visibleItems() const
- is deprecated. Use HbView::visibleItems instead.
-
- Returns visible items.
-
- \sa isItemVisible() setItemVisible() hideItems() showItems()
-
-*/
-Hb::SceneItems HbMainWindow::visibleItems() const
-{
- HB_DEPRECATED("HbMainWindow::visibleItems is deprecated! Use HbView::visibleItems instead.");
- Q_D(const HbMainWindow);
- return d->mVisibleItems;
-}
-
-/*!
- \deprecated HbMainWindow::isItemVisible(Hb::SceneItem) const
- is deprecated. Use HbView::isItemVisible instead.
-
- Returns \c true if \a item is set to be visible.
-
- \sa setItemVisible() hideItems() showItems() visibleItems()
-
-*/
-bool HbMainWindow::isItemVisible(Hb::SceneItem item) const
-{
- HB_DEPRECATED("HbMainWindow::isItemVisible is deprecated! Use HbView::isItemVisible instead.");
- Q_D(const HbMainWindow);
- return d->mVisibleItems & item;
-}
-
-/*!
- \deprecated HbMainWindow::setItemVisible(Hb::SceneItem, bool)
- is deprecated. Use HbView::setItemVisible instead.
-
- Sets \a item to be \a visible in main window.
-
- \sa isItemVisible() hideItems() showItems() visibleItems()
-*/
-void HbMainWindow::setItemVisible(Hb::SceneItem item, bool visible)
-{
- HB_DEPRECATED("HbMainWindow::setItemVisible is deprecated! Use HbView::setItemVisible instead.");
- if (visible) {
- showItems(item);
- } else {
- hideItems(item);
- }
-}
-
-/*!
Returns empty drawable window.
Returned window is inherited from CCoeControl in Symbian platform
@@ -839,53 +670,6 @@
Q_D(const HbMainWindow);
return d->mLayoutRect;
}
-/*!
- \deprecated HbMainWindow::setCurrentViewIndex(int)
- is deprecated. Use setCurrentView() instead.
-
- Sets the current view from a given \a index of the HbMainWindow object.
-
- \sa currentView currentViewIndex setCurrentView
-*/
-void HbMainWindow::setCurrentViewIndex(int index)
-{
- HB_DEPRECATED("HbMainWindow::setCurrentViewIndex is deprecated! Use setCurrentView() instead.");
- Q_D(HbMainWindow);
- QGraphicsWidget *widget = d->mViewStackWidget->widgetAt(index);
- setCurrentView(qobject_cast<HbView*>(widget));
-}
-
-/*!
- \deprecated HbMainWindow::nextView()
- is deprecated. Use setCurrentView() instead.
-
- Switches to next view (view with bigger index).
- If current view is last view it does nothing.
- */
-void HbMainWindow::nextView()
-{
- HB_DEPRECATED("HbMainWindow::nextView is deprecated! Use setCurrentView() instead.");
- int index = currentViewIndex()+1;
- if( index<viewCount() ) {
- setCurrentViewIndex(index);
- }
-}
-
-/*!
- \deprecated HbMainWindow::previousView()
- is deprecated. Use setCurrentView() instead.
-
- Switches to previous view (view with smaller index).
- If current view is first view it does nothing.
- */
-void HbMainWindow::previousView()
-{
- HB_DEPRECATED("HbMainWindow::previousView is deprecated! Use setCurrentView() instead.");
- int index = currentViewIndex()-1;
- if( index>=0 ) {
- setCurrentViewIndex(index);
- }
-}
/*!
Sets the \a name for the background image for the given \a orientation. If
@@ -915,6 +699,31 @@
}
/*!
+ Sets the animations enabled when the orientation is changed automatically.
+ By default animations are enabled.
+
+ \sa automaticOrientationEffectEnabled()
+ */
+
+void HbMainWindow::setAutomaticOrientationEffectEnabled(bool enabled)
+{
+ Q_D(HbMainWindow);
+ d->mAutomaticOrientationChangeAnimation = enabled;
+}
+
+/*!
+ Returns boolean value to signify whether animations enabled/disabled during
+ automatic orientation change. By default animations are enabled.
+
+ \sa setAutomaticOrientationEffectEnabled()
+ */
+bool HbMainWindow::automaticOrientationEffectEnabled() const
+{
+ Q_D(const HbMainWindow);
+ return d->mAutomaticOrientationChangeAnimation;
+}
+
+/*!
Reimplemented from QWidget::changeEvent().
*/
void HbMainWindow::changeEvent(QEvent *event)
--- a/src/hbcore/gui/hbmainwindow.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gui/hbmainwindow.h Fri May 14 16:09:54 2010 +0300
@@ -43,11 +43,6 @@
{
Q_OBJECT
- //Deprecated
- Q_PROPERTY(int currentViewIndex READ currentViewIndex WRITE setCurrentViewIndex)
- //Deprecated
- Q_PROPERTY(int viewCount READ viewCount)
-
Q_PROPERTY(Qt::Orientation orientation
READ orientation
WRITE setOrientation
@@ -58,17 +53,6 @@
explicit HbMainWindow(QWidget *parent = 0, Hb::WindowFlags windowFlags = Hb::WindowFlagNone);
~HbMainWindow();
- // deprecated
- QGraphicsWidget *removeView(int index);
- // deprecated
- int currentViewIndex() const;
- // deprecated
- int viewCount() const;
- // deprecated
- int indexOfView(HbView *view) const;
- // deprecated
- HbView *viewAt(int index) const;
-
HbView *addView(QGraphicsWidget *widget = 0);
HbView *insertView(int index, QGraphicsWidget *widget = 0);
void removeView(QGraphicsWidget *widget);
@@ -79,18 +63,7 @@
Qt::Orientation orientation() const;
void setOrientation(Qt::Orientation orientation, bool animate = true);
void unsetOrientation(bool animate = true);
-
- // Deprecated
- void showItems(Hb::SceneItems items);
- // Deprecated
- void hideItems(Hb::SceneItems items);
- // Deprecated
- Hb::SceneItems visibleItems() const;
- // Deprecated
- bool isItemVisible(Hb::SceneItem item) const;
- // Deprecated
- void setItemVisible(Hb::SceneItem item, bool visible);
-
+
WId nativeBackgroundWindow();
void resetNativeBackgroundWindow();
@@ -99,20 +72,13 @@
void setBackgroundImageName(Qt::Orientation orientation, const QString &name);
QString backgroundImageName(Qt::Orientation orientation) const;
+ void setAutomaticOrientationEffectEnabled(bool enabled = true);
+ bool automaticOrientationEffectEnabled() const;
+
public slots:
- // Deprecated
- void setCurrentViewIndex(int index);
- // Deprecated
- void nextView();
- // Deprecated
- void previousView();
-
void broadcastEvent( int eventType );
signals:
- // deprecated
- void currentViewIndexChanged(int index);
-
void viewReady();
void aboutToChangeView(HbView *oldView, HbView *newView);
void currentViewChanged(HbView *view);
@@ -138,7 +104,7 @@
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(int))
+ 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 &))
Q_PRIVATE_SLOT(d_func(), void _q_viewToolBarChanged())
--- a/src/hbcore/gui/hbmainwindow_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gui/hbmainwindow_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -25,6 +25,7 @@
#include <QApplication>
#include <QGraphicsLayout>
+#include <QLocale>
#include <QDebug>
#include "hbgraphicsscene.h"
#include "hbindicatorbutton_p.h"
@@ -91,7 +92,11 @@
mDelayedConstructionHandled(false),
q_ptr(0),
mTheTestUtility(0),
- mIdleEventHandled(false)
+ mIdleEventHandled(false),
+ mNotifyOrientationChange(false),
+ mOrientationChangeNotified(false),
+ mToolbarWasAdded(false),
+ mAutomaticOrientationChangeAnimation(true)
#ifdef Q_OS_SYMBIAN
,
mNativeWindow(0)
@@ -117,11 +122,21 @@
Q_Q(HbMainWindow);
mGVWrapperItem.setMainWindow(*q);
- if (HbDeviceProfile::profile(q).touch()) {
- // Touch devices doesn't have visible primary or middle soft key
- mVisibleItems &= ~Hb::MiddleSoftKeyItem;
- mVisibleItems &= ~Hb::PrimarySoftKeyItem;
+}
+
+void HbMainWindowPrivate::initTranslations()
+{
+#ifdef Q_OS_SYMBIAN
+ QString lang = QLocale::system().name();
+ // Use Z drive. Anything else is insecure as anyone could install
+ // a fake common translation to C drive for example.
+ QString name = QLatin1String("Z:/resource/qt/translations/common_") + lang;
+ if (mCommonTranslator.load(name)) {
+ QCoreApplication::installTranslator(&mCommonTranslator);
+ } else {
+ qWarning("initTranslations: Failed to load translator based on name %s", qPrintable(name));
}
+#endif
}
HbToolBar *HbMainWindowPrivate::toolBar() const
@@ -142,8 +157,12 @@
// Add new toolbar
if (toolBar) {
toolBar->setParentItem(0);
- if (toolBar->scene() != mScene && (q->isItemVisible(Hb::ToolBarItem))) { // check just to avoid warnings
- // update the toolbar to use the current orientation and layout direction
+ HbView *currentView = q->currentView();
+ if (toolBar->scene() != mScene
+ && 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)){
@@ -152,8 +171,17 @@
}
HbToolBarPrivate *toolBarD = HbToolBarPrivate::d_ptr(toolBar);
toolBarD->mDoLayout = false;
- if (mViewStackWidget->isSwitchingViews()) {
+ // No "appear" effect when changing views or when the first
+ // toolbar is shown. The latter is needed to prevent bad UX when
+ // a splash screen containing a toolbar is shown before the
+ // mainwindow. Note that this mToolbarWasAdded check is only
+ // effective when one adds a toolbar with actions in it, it can
+ // be circumvented by setting an empty toolbar and then adding
+ // actions to it later. In that case the appear effect will be
+ // used normally.
+ if (mViewStackWidget->isSwitchingViews() || !mToolbarWasAdded) {
toolBarD->suppressNextAppearEffect();
+ mToolbarWasAdded = true;
}
mScene->addItem(toolBar); // top level
}
@@ -188,14 +216,17 @@
Q_Q(HbMainWindow);
if (mCurrentDockWidget != dockWidget) {
- // Remove old toolbar
+ // Remove old dock
removeDockWidgetFromLayout(mCurrentDockWidget);
- // Add new toolbar
+ // Add new dock
if (dockWidget) {
dockWidget->setParentItem(0);
- if (dockWidget->scene() != mScene && (q->isItemVisible(Hb::DockWidgetItem))) { // check just to avoid warnings
- mScene->addItem(dockWidget); // top level
+ if (dockWidget->scene() != mScene) {
+ HbView* currentView = q->currentView();
+ if (currentView && currentView->isItemVisible(Hb::DockWidgetItem)) {
+ mScene->addItem(dockWidget); // top level
+ }
}
dockWidget->setZValue(HbPrivate::DockWidgetZValue);
@@ -241,6 +272,8 @@
// cancel all effects
HbEffectInternal::cancelAll();
mOrientationChangeOngoing = true;
+ mNotifyOrientationChange = false;
+ mOrientationChangeNotified = false;
emit q->aboutToChangeOrientation();
emit q->aboutToChangeOrientation(orientation, mAnimateOrientationSwitch);
}
@@ -409,17 +442,18 @@
// re-layouting, skip if size does not change
if (mClippingItem->size() != newSize) {
mClippingItem->resize(newSize);
- mLayoutRect = QRectF(QPointF(0,0), newSize);
-
- // reset transformation
- q->resetTransform();
+ mLayoutRect = QRectF(QPointF(0,0), newSize);
- // if not default rotation, rotate to the defined angle no matter what the effect did
- if( mOrientation != mDefaultOrientation)
- q->rotate(mOrientationAngle);
+ // reset transformation
+ q->resetTransform();
+
+ // if not default rotation, rotate to the defined angle no matter what the effect did
+ if( mOrientation != mDefaultOrientation)
+ q->rotate(mOrientationAngle);
// handle actual orientation change only if the orientation really changes (not just a resize)
- if (mOrientationChangeOngoing) {
+ if (mOrientationChangeOngoing || mNotifyOrientationChange) {
+ mOrientationChangeNotified = true;
// signal only if layout changes (=orientation changes)
// Background item is re-layouted from device profile changed event
emit q->orientationChanged(mOrientation);
@@ -430,6 +464,7 @@
HbInputSettingProxy::instance()->setScreenOrientation(mOrientation);
}
}
+ mNotifyOrientationChange = false;
}
void HbMainWindowPrivate::rootItemFirstPhaseDone(const HbEffect::EffectStatus& status)
@@ -457,15 +492,16 @@
HbEffect::enable(&mGVWrapperItem);
postIdleEvent(HbMainWindowPrivate::IdleOrientationFinalEvent);
+ mNotifyOrientationChange = !mOrientationChangeNotified && mOrientationChangeOngoing;
mOrientationChangeOngoing = false;
}
-
+
void HbMainWindowPrivate::addOrientationChangeEffects()
{
// Effects for root item
// 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");
+ bool ret = HbEffectInternal::add(mEffectItem, "rootitem_orientation_firstPhase", "rootItemFirstPhase");
+ bool ret2 = HbEffectInternal::add(mEffectItem, "rootitem_orientation_finalPhase", "rootItemFinalPhase");
if (!ret || !ret2)
HbEffectInternal::remove(mEffectItem);
@@ -519,7 +555,7 @@
/*
Updates UI according to current view and sync it with the tab bar.
*/
-void HbMainWindowPrivate::_q_viewChanged(int index)
+void HbMainWindowPrivate::_q_viewChanged()
{
Q_Q(HbMainWindow);
@@ -543,7 +579,6 @@
mTitleBar->titlePane()->setText(QString());
}
- emit q->currentViewIndexChanged(index);
emit q->currentViewChanged(view);
}
@@ -575,7 +610,7 @@
Q_Q(HbMainWindow);
HbView *view = qobject_cast<HbView *>(q->sender());
if (view) {
- if(view == q->currentView()) {
+ if (view == q->currentView()) {
addToolBarToLayout(HbViewPrivate::d_ptr(view)->toolBar);
}
}
@@ -906,8 +941,10 @@
mClippingItem, SLOT(decoratorVisibilityChanged()));
mStatusBar->delayedConstruction();
- connect(mStatusBar, SIGNAL(notificationCountChanged(int)),
- mTitleBar, SIGNAL(notificationCountChanged(int)));
+ connect(mStatusBar, SIGNAL(activated(const QList<IndicatorClientInfo> &)),
+ mTitleBar, SIGNAL(activated(const QList<IndicatorClientInfo> &)));
+ connect(mStatusBar, SIGNAL(deactivated(const QList<IndicatorClientInfo> &)),
+ mTitleBar, SIGNAL(deactivated(const QList<IndicatorClientInfo> &)));
mFadeItem = new HbFadeItem;
mFadeItem->setZValue(HbPrivate::FadingItemZValue);
--- a/src/hbcore/gui/hbmainwindow_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gui/hbmainwindow_p.h Fri May 14 16:09:54 2010 +0300
@@ -30,6 +30,7 @@
#include <QTimeLine>
#include <QGraphicsWidget>
#include <QPointer>
+#include <QTranslator>
#include "hbglobal.h"
#include "hbmainwindow.h"
@@ -73,6 +74,7 @@
virtual ~HbMainWindowPrivate();
void init();
+ void initTranslations();
HbToolBar *toolBar() const;
void addToolBarToLayout(HbToolBar *toolBar);
@@ -117,10 +119,8 @@
QGraphicsWidget *mEffectItem;
Qt::Orientation mDefaultOrientation;
qreal mOrientationAngle;
-
QList<QGraphicsItem*> mItemList;
QList<QGraphicsItem*> mOrientationChangeEffectItems;
-
bool mAutomaticOrientationSwitch;
bool mUserOrientationSwitch;
bool mOrientationChangeOngoing;
@@ -128,13 +128,10 @@
bool mGVOrientationChangeEffectEnabled;
Qt::Orientation mOrientation;
Qt::Orientation mRequestedOrientation;
-
HbToolBar *mCurrentToolbar;
HbDockWidget *mCurrentDockWidget;
-
Hb::SceneItems mVisibleItems;
bool mForceSetOrientation; // for resize case
-
typedef QPointer<QGraphicsWidget> QGraphicsWidgetPtr;
struct BroadcastItem {
QEvent *mEvent;
@@ -142,23 +139,22 @@
};
QMap<int, BroadcastItem> mBroadcastItems;
HbDeviceProfile mCurrentProfile;
-
bool mDelayedConstructionHandled;
-
HbMainWindow *q_ptr;
HbTheTestUtility *mTheTestUtility;
HbGVWrapperItem mGVWrapperItem;
-
bool mIdleEventHandled;
- QRectF mLayoutRect;
-
+ QRectF mLayoutRect;
mutable HbDeviceProfile mAlternateProfile;
-
-
+ QPointer<HbView> mMenuView;
+ bool mNotifyOrientationChange;
+ bool mOrientationChangeNotified;
+ bool mToolbarWasAdded;
+ bool mAutomaticOrientationChangeAnimation;
+ QTranslator mCommonTranslator;
#ifdef Q_OS_SYMBIAN
HbNativeWindow *mNativeWindow;
#endif
- QPointer<HbView> mMenuView;
void rootItemFirstPhaseDone(const HbEffect::EffectStatus& status);
void rootItemFinalPhaseDone(const HbEffect::EffectStatus& status);
@@ -166,7 +162,7 @@
void addOrientationChangeEffects();
void addViewEffects();
- void _q_viewChanged(int);
+ void _q_viewChanged();
void _q_viewRemoved(QGraphicsWidget *widget);
void _q_viewTitleChanged(const QString &title);
void _q_viewToolBarChanged();
@@ -212,7 +208,7 @@
friend class HbMainWindowOrientation;
friend class HbScreen;
friend class HbSettingsWindow;
- friend class TestHbSensorOrientation;
+ friend class TestHbSensorOrientation;
};
#endif // HBMAINWINDOW_P_H
--- a/src/hbcore/gui/hbmenu.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gui/hbmenu.cpp Fri May 14 16:09:54 2010 +0300
@@ -129,7 +129,7 @@
{
Q_Q(HbMenu);
if (!menuItemView && q->actions().count()){
- menuItemView = new HbMenuListView(q, q);
+ menuItemView = new HbMenuListView(q, q);
HbStyle::setItemName(menuItemView, "content");
//This optimises case of options menu which otherwise updates its primitives twice.
if (menuType == HbMenu::OptionsMenu)
@@ -190,10 +190,10 @@
{
if (delayMenuConstruction)
return;
- if (actionEvent->action()->isVisible()){
- Q_Q(HbMenu);
- createMenuView();
- QObject::connect(actionEvent->action(), SIGNAL(triggered()), q, SLOT(_q_onActionTriggered()));
+ Q_Q(HbMenu);
+ QObject::connect(actionEvent->action(), SIGNAL(triggered()), q, SLOT(_q_onActionTriggered()));
+ if (actionEvent->action()->isVisible()){
+ createMenuView();
menuItemView->addActionItem(actionEvent->action());
}
}
@@ -255,9 +255,9 @@
if (!activeItem) {
activeAction(activeItem);
}
-
if (activeItem && activeItem->action() && activeItem->action()->isEnabled()) {
HbAction *hbAction = qobject_cast<HbAction *>(activeItem->action());
+ q->setActiveAction(hbAction);
if (!hbAction)
return;
HbMenu *subMenu = hbAction->menu();
@@ -284,7 +284,10 @@
if ( activeSubMenu ) {
activeSubMenu->disconnect();
}
+ timedOut = true;
q->close();
+ } else {
+ startTimeout();
}
}
@@ -304,7 +307,7 @@
}
/*!
-* closes the menu after Orientation change
+ closes the menu after Orientation change
*/
void HbMenuPrivate::closeMenuAfterOrientationChange()
{
@@ -518,100 +521,6 @@
}
}
-/*!
- \deprecated HbMenu::exec(HbAction*)
- is deprecated. Please use
- void HbMenu::open( QObject *receiver, const char *member ) or
- HbMenu::show() instead.
-
- Executes the menu synchronously so that given \a action
- is active.
-
- \param action is the action that is active when the menu is shown.
-
- Example usage:
- \code
- void MyGraphicsItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
- {
- HbMenu menu();
- menu.addAction(...);
- ...
- menu.setPreferredPos(event->scenePos(), HbPopup::BottomEdgeCenter);
- menu.exec();
- }
- \endcode
-
- \return the triggered HbAction in either the popup menu or one
- of its sub-menus, or 0 if no item was triggered (normally because
- the user closed or cancelled the menu).
- */
-HbAction *HbMenu::exec(HbAction *action)
-{
- HB_DEPRECATED("HbMenu::exec is deprecated. Use HbMenu::show() or HbMenu::open() instead!");
- Q_D(HbMenu);
- if (actions().count() == 0) {
- return 0;
- }
-
- if(!action)
- action = qobject_cast<HbAction*>(actions().first());
-
- setActiveAction(action);
-
- // Reset state variables
- d->resultAction = 0;
- d->actionTriggered = false;
-
- if (d->menuType == SubMenu && d->polished) {
- d->setSubMenuPosition();
- }
- QPointer<HbMenu> menuAlive(this);
- HbPopup::exec();
-
- // HbMenu can be deleted while exec
- if (menuAlive) {
- return d->resultAction;
- } else {
- return 0;
- }
-}
-
-/*!
- \deprecated HbMenu::exec(const QPointF&, HbAction*)
- is deprecated. Please use
- void HbMenu::open( QObject *receiver, const char *member ) or
- HbMenu::show() and setPreferredPos() instead.
-
- Executes the menu synchronously at \a pos so that given \a action
- is active.
-
- \param pos is the position at which the menu is shown.
- \param action is the action that is active when the menu is shown.
-
- Example usage:
- \code
- void MyGraphicsItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
- {
- HbMenu menu();
- menu.addAction(...);
- ...
- menu.exec(event->scenePos());
- }
- \endcode
-
- \return the triggered HbAction in either the popup menu or one
- of its sub-menus, or 0 if no item was triggered (normally because
- the user closed or cancelled the menu).
- */
-HbAction *HbMenu::exec(const QPointF &pos, HbAction *action )
-{
- Q_D(HbMenu);
- if (d->menuType == ContextMenu) {
- setPreferredPos(pos);
- }
- return exec(action);
-}
-
void HbMenu::showEvent(QShowEvent *event)
{
Q_UNUSED(event);
@@ -722,8 +631,8 @@
{
HbAction *action = new HbAction(this);
action->setSeparator(true);
- action->setEnabled(false);
- action->setVisible(false);
+ action->setEnabled(true);
+ action->setVisible(true);
insertAction(before, action);
return action;
}
@@ -837,10 +746,7 @@
return true;
}
}
- if (event->type() == QEvent::LayoutRequest) {
- if(d->menuItemView)
- d->menuItemView->contentWidget()->adjustSize();
- } else if (event->type() == QEvent::GraphicsSceneResize){
+ if (event->type() == QEvent::GraphicsSceneResize){
if (d->mSubMenuItem)
d->setSubMenuPosition();
}
@@ -873,6 +779,7 @@
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));
@@ -880,11 +787,23 @@
path.addRect(mapRectFromScene(clipRect));
return path.intersected(HbPopup::shape());
+ */
+
+ return HbPopup::shape();
}
-/*! @alpha
- *
- * Opens the menu and returns immediately.
+/*!
+
+ Opens the menu and returns immediately.
+
+ Connects triggered(HbAction*) signal to the slot specified by \a
+ receiver and \a member. The signal will be disconnected when menu
+ is closed.
+
+ An example of how to create a simple context menu and show it
+ \snippet{ultimatecodesnippet/ultimatecodesnippet.cpp,54}
+
+
*/
void HbMenu::open( QObject *receiver, const char *member )
{
--- a/src/hbcore/gui/hbmenu.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gui/hbmenu.h Fri May 14 16:09:54 2010 +0300
@@ -51,8 +51,6 @@
SubMenu
};
- HbAction *exec(const QPointF &pos, HbAction *action = 0);
-
using HbPopup::addAction;
HbAction *addAction(const QString &text);
HbAction *addAction(const QString &text, const QObject *receiver, const char *member);
@@ -80,7 +78,6 @@
QPainterPath shape() const;
public slots:
- HbAction *exec(HbAction *action = 0);
void open(QObject *receiver = 0, const char *member = 0);
signals:
--- a/src/hbcore/gui/hbmenucontainer_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gui/hbmenucontainer_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -113,9 +113,9 @@
{
Q_D(HbMenuContainer);
foreach (QAction *action, d->menu->actions()) {
+ QObject::connect(action, SIGNAL(triggered()), d->menu, SLOT(_q_onActionTriggered()));
if (action->isVisible()) {
- d->mVisibleActions.append(action);
- QObject::connect(action, SIGNAL(triggered()), d->menu, SLOT(_q_onActionTriggered()));
+ d->mVisibleActions.append(action);
addItem(action);
}
}
@@ -135,7 +135,7 @@
d->actionManager = new HbActionManager(HbView::OptionsMenu, d->menu, d->menu->mainWindow() );
}
if (d->actionManager && castedAction) {
- pos = d->actionManager->position(castedAction, d->menu->actions());
+ pos = d->actionManager->position(castedAction, d->mVisibleActions);
} else {
pos = d->mVisibleActions.indexOf(action);
}
--- a/src/hbcore/gui/hbmenuitem_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gui/hbmenuitem_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -29,7 +29,7 @@
#include "hbmenu_p.h"
#include "hbaction.h"
#include "hbstyle.h"
-#include "hbstyleoptionmenuitem.h"
+#include "hbstyleoptionmenuitem_p.h"
#include "hbframeitem.h"
#include "hbtextitem.h"
#include "hbevent.h"
--- a/src/hbcore/gui/hbmenuitem_p_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gui/hbmenuitem_p_p.h Fri May 14 16:09:54 2010 +0300
@@ -28,7 +28,7 @@
#include "hbglobal.h"
#include "hbwidget_p.h"
-#include "hbstyleoptionmenuitem.h"
+#include "hbstyleoptionmenuitem_p.h"
class HbMenu;
class HbMenuItem;
--- a/src/hbcore/gui/hbpopup.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gui/hbpopup.cpp Fri May 14 16:09:54 2010 +0300
@@ -33,6 +33,7 @@
#include "hbgraphicsscene_p.h"
#include "hbtooltip.h"
#include "hbglobal_p.h"
+#include "hbvgmaskeffect_p.h"
#include <QTimer>
#include <QGraphicsSceneMouseEvent>
#include <QShowEvent>
@@ -53,25 +54,19 @@
@beta
@hbcore
\class HbPopup
- \brief HbPopup is a base class for different popup notes in Hb library.
+ \brief HbPopup is a base class for different popups in Hb library.
- \image html hbpopup.png A popup with a header widget, a list as a content widget, and two
- action buttons.
+ Popup is a widget that is displayed above other widgets in the view.
- HbPopup is a concrete class. The content for a custom popup is implemented in
- a separate widget, which is set to the popup with method setContentWidget().
+ Lastly shown popup is always positioned in Z order on the the top
+ of already visible popups.
- Lastly shown popup is always positioned in Z order on the the top of already visible popups.
- A popup can be permanent or automatically dismissed after a time-out.
- Modal popups interrupt any other user interaction outside of the popup while they are visible,
- whereas non-modal popups do not.
+ A popup can be permanent or automatically dismissed after a
+ time-out. Modal popups interrupt any other user interaction
+ outside of the popup while they are visible, whereas non-modal
+ popups do not.
- An example of how to create a simple modal popup and show it.
- \snippet{ultimatecodesnippet/ultimatecodesnippet.cpp,13}
-
- An example of how to create a non-modal popup and show it.
- \snippet{ultimatecodesnippet/ultimatecodesnippet.cpp,26}
-
+ \sa HbDialog
*/
/*!
@@ -148,7 +143,8 @@
This enum defines available frame type values.
- The frame types defines what frame item backgrounds will be used by the popup.
+ The frame types defines what frame item backgrounds will be used
+ by the popup. Actual appearance is dependent on theme.
*/
/*!
@@ -285,7 +281,7 @@
preferredPosSet(false),
mStartEffect(false),
mScreenMargin(0.0),
- mPath(0),
+ mVgMaskEffect(0),
timeoutTimerInstance(0)
{
}
@@ -328,15 +324,11 @@
}
/*
-* *********** Begin of private features ***********
-*/
-
-/*
-* Sets the priority for a popup.
-* A popup with higher priority is always shown on top of a popup with lower priority.
-* In case of popups with same priority the lastly shown will be on top.
-* Default priority is HbPopup::Default
-* \sa priority()
+ Sets the priority for a popup.
+ A popup with higher priority is always shown on top of a popup with lower priority.
+ In case of popups with same priority the lastly shown will be on top.
+ Default priority is HbPopup::Default
+ \sa priority()
*/
void HbPopupPrivate::setPriority(quint8 priority)
{
@@ -346,9 +338,6 @@
priorityValue=priority;
}
-/*
-* *********** End of private features ***********
-*/
#ifdef HB_EFFECTS
void HbPopupPrivate::_q_delayedHide(HbEffect::EffectStatus status)
{
@@ -401,6 +390,22 @@
}
}
+void HbPopupPrivate::setTimeout(int msec)
+{
+ Q_Q(HbPopup);
+
+ int prevTimeout = timeout;
+ timeout = msec;
+ if (msec > 0) {
+ timeoutTimer()->setInterval(msec);
+ // If timeout was 0 and it is now set to something > 0 then start the timer.
+ if (q->isVisible() && prevTimeout <= 0)
+ startTimeout();
+ } else {
+ stopTimeout();
+ }
+}
+
QTimer *HbPopupPrivate::timeoutTimer()
{
Q_Q(HbPopup);
@@ -434,7 +439,11 @@
void HbPopupPrivate::handleBackgroundMousePressEvent()
{
+ Q_Q(HbPopup);
mousePressLocation = Background;
+ if (dismissPolicy & HbPopup::TapOutside) {
+ q->close();
+ }
}
void HbPopupPrivate::handleBackgroundMouseReleaseEvent(QGraphicsSceneMouseEvent *event)
@@ -461,17 +470,6 @@
}
}
}
- // Mouse is released within popup background
- else {
- // Handle cases only when TapOutside is set
- if (dismissPolicy & HbPopup::TapOutside) {
- // Close popup if mouse press is initiated within popup background
- // or TapInside is set
- if (mousePressLocation == Background || dismissPolicy & HbPopup::TapInside) {
- q->close();
- }
- }
- }
}
// reset mousePressLocation
@@ -540,13 +538,15 @@
void HbPopupPrivate::calculateShape()
{
+#if 0
Q_Q(HbPopup);
- if (mPath)
- delete mPath;
- mPath = new QPainterPath();
-#if 1
- QPixmap image(QSize(static_cast<int>(q->backgroundItem()->boundingRect().width() + 0.5),
- static_cast<int>(q->backgroundItem()->boundingRect().height() + 0.5)));
+ if (!mVgMaskEffect) {
+ mVgMaskEffect = new HbVgMaskEffect();
+ mVgMaskEffect->install(q);
+ }
+
+ QPixmap image(QSize(static_cast<int>(q->backgroundItem()->boundingRect().width()),
+ static_cast<int>(q->backgroundItem()->boundingRect().height())));
image.fill(Qt::transparent);
QPainter imagePainter(&image);
@@ -555,30 +555,26 @@
imagePainter.end();
- mPath->addRegion(image.mask());
-#else
- QRectF rect(-0.5, -0.5, q->boundingRect().width() + 0.5, q->boundingRect().height() + 0.5);
- mPath->addRoundedRect(rect, 12, 12);
+ mVgMaskEffect->setMask(image);
+
#endif
-
- mPath->translate(-0.5, -0.5);
}
/*!
-* Constructs a popup with given \a parent graphics item.\n
-* Note: popups with \a parent set as 0 are behaving as real popups.
-* This is actually the intended use.
-*
-* However in some situation could be useful to embedd a popup into a QGraphicsItem.
-* In this case a non zero \a parent value must be passed.
-* Popups with parent items behaving just like any other QGraphicsWidget.
-* The following features are not supported (i.e. ignored) for popup with parents:
-*
-* - modality
-* - timeout
-* - unfadedItems
-* - dismissPolicy
-* - signal aboutToClose
+ Constructs a popup with given \a parent graphics item.\n
+ Note: popups with \a parent set as 0 are behaving as real popups.
+ This is actually the intended use.
+
+ However in some situation could be useful to embedd a popup into a QGraphicsItem.
+ In this case a non zero \a parent value must be passed.
+ Popups with parent items behaving just like any other QGraphicsWidget.
+ The following features are not supported (i.e. ignored) for popup with parents:
+
+ - modality
+ - timeout
+ - unfadedItems
+ - dismissPolicy
+ - signal aboutToClose
*/
HbPopup::HbPopup(QGraphicsItem *parent) :
HbWidget(*new HbPopupPrivate,parent)
@@ -600,7 +596,7 @@
d->init();
}
/*!
-* Destroys the popup.
+ Destroys the popup.
*/
HbPopup::~HbPopup()
{
@@ -633,9 +629,9 @@
/*!
-* Returns the popup timeout property in milliseconds.
-* If this property is not set the deafult is HbPopup::StandardTimeout.
-* \sa setTimeout()
+ Returns the popup timeout property in milliseconds.
+ If this property is not set the deafult is HbPopup::StandardTimeout.
+ \sa setTimeout()
*/
int HbPopup::timeout() const
{
@@ -644,21 +640,22 @@
}
/*!
-* Sets the popup timeout property in milliseconds.
-* If timeout <= 0 then the popup is permanent and not closed automatically.
-* \sa timeout() setTimeout(HbPopup::DefaultTimeout) QGraphicsWidget::close()
+ Sets the popup timeout property in milliseconds.
+ If timeout <= 0 then the popup is permanent and not closed automatically.
+ \sa timeout() setTimeout(HbPopup::DefaultTimeout) QGraphicsWidget::close()
*/
void HbPopup::setTimeout(int timeout)
{
Q_D(HbPopup);
- d->timeout = timeout;
+ d->setTimeout(timeout);
+ //d->timeout = timeout;
}
/*!
-* It is a convenience overload of \a timeout() for setting HbPopup::DefaultTimeout values
-* to achieve common look & feel.
-* \sa enum DefaultTimeout
-* \sa timeout() setTimeout(int) QGraphicsWidget::close()
+ It is a convenience overload of \a timeout() for setting HbPopup::DefaultTimeout values
+ to achieve common look & feel.
+ \sa enum DefaultTimeout
+ \sa timeout() setTimeout(int) QGraphicsWidget::close()
*/
void HbPopup::setTimeout(HbPopup::DefaultTimeout timeout)
{
@@ -666,10 +663,10 @@
}
/*!
-* Returns the popup modality property.
-* A modal popup blocks any user initiated events outside of the popup
-* until it is closed.
-* \sa setModal()
+ Returns the popup modality property.
+ A modal popup blocks any user initiated events outside of the popup
+ until it is closed.
+ \sa setModal()
*/
bool HbPopup::isModal() const
{
@@ -678,8 +675,8 @@
}
/*!
-* Sets the popup modality property.
-* \sa isModal()
+ Sets the popup modality property.
+ \sa isModal()
*/
void HbPopup::setModal(bool enabled)
{
@@ -689,9 +686,9 @@
}
/*!
-* Sets the background of popup faded if \a fadeBackground is true otherwise
-* the background will not be faded.
-* \sa isBackgroundFaded()
+ Sets the background of popup faded if \a fadeBackground is true otherwise
+ the background will not be faded.
+ \sa isBackgroundFaded()
*/
void HbPopup::setBackgroundFaded(bool fadeBackground)
{
@@ -700,9 +697,9 @@
}
/*!
-* Returns if the background of the popup is faded or not.
-* Default: true
-* \sa isBackgroundFaded()
+ Returns if the background of the popup is faded or not.
+ Default: true
+ \sa isBackgroundFaded()
*/
bool HbPopup::isBackgroundFaded() const
{
@@ -711,9 +708,9 @@
}
/*!
-* Returns the dismiss policy of the popup.
-* Default is HbPopup::TapOutside.
-* \sa setDismissPolicy()
+ Returns the dismiss policy of the popup.
+ Default is HbPopup::TapOutside.
+ \sa setDismissPolicy()
*/
HbPopup::DismissPolicy HbPopup::dismissPolicy() const
{
@@ -722,9 +719,9 @@
}
/*!
-* Sets the dismiss policy property for the the popup.
-*
-* \sa dismissPolicy()
+ Sets the dismiss policy property for the the popup.
+
+ \sa dismissPolicy()
*/
void HbPopup::setDismissPolicy(HbPopup::DismissPolicy dismissPolicy)
{
@@ -733,9 +730,9 @@
}
/*!
-* Returns the frame type of the popup.
-* Default is HbPopup::Strong
-* \sa setFrameType()
+ Returns the frame type of the popup.
+ Default is HbPopup::Strong
+ \sa setFrameType()
*/
HbPopup::FrameType HbPopup::frameType() const
{
@@ -744,9 +741,9 @@
}
/*!
-* Sets the frame typeproperty for the the popup.
-*
-* \sa frameType()
+ Sets the frame typeproperty for the the popup.
+
+ \sa frameType()
*/
void HbPopup::setFrameType(HbPopup::FrameType frameType)
{
@@ -767,15 +764,14 @@
}
-/*! @alpha
-*
-* Shows the popup as modal popup returning immediately.
+/*!
+ Shows the popup as modal popup returning immediately.
-* Connects aboutToClose() signal to the slot specified by \a receiver and
-* \a member. The signal will be disconnected from the slot when the
-* popup is closed.
-*
-* For non modal popups, use show().
+ Connects aboutToClose() signal to the slot specified by \a receiver and
+ \a member. The signal will be disconnected from the slot when the
+ popup is closed.
+
+ For non modal popups, use show().
*/
void HbPopup::open( QObject *receiver, const char *member )
{
@@ -789,71 +785,6 @@
show();
}
-
-/*!
-\deprecated HbPopup::exec()
- is deprecated. Please use HbPopup::show() or
- void HbPopup::open( QObject *receiver, const char *member ) instead.
-
- Executes the popup synchronously.
- Note: when popup is executed syncronously it is always modal.
- This function is deprecated. use \sa open() or \sa show() instead.
-*/
-void HbPopup::exec()
-{
- HB_DEPRECATED("HbPopup::exec is deprecated. Use HbPopup::show() or HbPopup::open() instead!");
- Q_D(HbPopup);
-
- HbMainWindow* w(mainWindow());
- if (w) {
- disconnect(w, SIGNAL(aboutToChangeOrientation(Qt::Orientation, bool)), this, SLOT(_q_orientationChange(Qt::Orientation, bool)));
- connect( w, SIGNAL(aboutToChangeOrientation(Qt::Orientation, bool)), this, SLOT(_q_orientationChange(Qt::Orientation, bool)) );
- }
-
- if (!d->eventLoop) {
- // Prevent deleting popup in eventloop
- bool deleteOnClose = testAttribute(Qt::WA_DeleteOnClose);
- setAttribute(Qt::WA_DeleteOnClose, false);
-
- // Set popup to modal before eventloop
- bool wasShowModal = isModal();
- setModal(true);
-
- show();
-
- // Ungrab the mouse if it is currently grabbed
- // todo; currently needed menus to work ok, otherwise:
- // - quick multiple presses on menuitem causes multiple actions (menu relaunch?)
- // - closing menu with titlepane needs multiple presses (menu relaunch?)
- // Ungrab was removed when trying to fix problem when button pressed()-signal
- // was connected to menu launch. Button did not get anymore mouse release event.
- if (scene()) {
- QGraphicsItem *item = scene()->mouseGrabberItem();
- if (item) {
- item->ungrabMouse();
- }
- }
-
- QEventLoop eventLoop;
- d->eventLoop = &eventLoop;
- QPointer<QObject> guard = this;
- d->eventLoop->exec();
- if (guard.isNull()) {
- return;
- }
- d->eventLoop = 0;
-
- // Reset modality
- setModal(wasShowModal);
-
- if (deleteOnClose) {
- delete this;
- }
- } else {
- qWarning("HbPopup::exec: Recursive call detected");
- }
-}
-
/*!
\reimp
*/
@@ -861,6 +792,24 @@
{
Q_D(HbPopup);
+ /*if (change == QGraphicsItem::ItemVisibleHasChanged) {
+ if (value.toBool()) {
+ if(d->hasEffects && boundingRect().isValid()) {
+
+#ifdef HB_EFFECTS
+ QRectF extRect(0.0,
+ -boundingRect().height(),
+ boundingRect().width(),
+ 0);
+ HbEffect::start(this, d->effectType, "appear", 0, 0, QVariant(), extRect);
+#endif//HB_EFFECTS
+ d->mStartEffect = false;
+ } else {
+ d->mStartEffect = true;
+ }
+ }
+ }*/
+
if (change == QGraphicsItem::ItemVisibleChange) {
if (value.toBool()) {
if(!d->hasEffects){
@@ -916,7 +865,7 @@
}
/*!
-* Handles the popup position when Orientation changes
+ Handles the popup position when Orientation changes
*/
void HbPopup::handlePopupPos()
{
@@ -1000,20 +949,6 @@
HbWidgetFeedback::triggered(this, Hb::InstantPopupOpened);
}
- /*if(d->hasEffects && boundingRect().isValid()) {
-
- #ifdef HB_EFFECTS
- QRectF extRect(0.0,
- -boundingRect().height(),
- boundingRect().width(),
- 0);
- HbEffect::start(this, d->effectType, "appear", 0, 0, QVariant(), extRect);
- #endif//HB_EFFECTS
- d->mStartEffect = false;
- } else {
- d->mStartEffect = true;
- }*/
-
//workaround
resetTransform();
setOpacity(1);
@@ -1025,7 +960,7 @@
// If it is not permanent launch a timer for closing the popup
if (0 < d->timeout) {
d->timeoutTimer()->setInterval(d->timeout);
- d->timeoutTimer()->start();
+ d->startTimeout();
}
}
}
@@ -1143,7 +1078,7 @@
HbDialog popup;
...
popup.setPreferredPosition( QPointF(x,y), HbPopupBase::BottomEdgeCenter );
- popup.exec();
+ popup.show();
\endcode
*/
@@ -1170,13 +1105,13 @@
QPainterPath HbPopup::shape() const
{
-#if 1
- Q_D(const HbPopup);
+#if 0
+ /*Q_D(const HbPopup);
if (backgroundItem() && d->mPath) {
return *d->mPath;
} else {
return HbWidget::shape();
- }
+ }*/
#else
return HbWidget::shape();
#endif
--- a/src/hbcore/gui/hbpopup.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gui/hbpopup.h Fri May 14 16:09:54 2010 +0300
@@ -118,7 +118,6 @@
public slots:
void open( QObject *receiver = 0, const char *member = 0);
- void exec();
void handlePopupPos();
signals:
--- a/src/hbcore/gui/hbpopup_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gui/hbpopup_p.h Fri May 14 16:09:54 2010 +0300
@@ -30,6 +30,7 @@
#include "hbpopup.h"
#include "hbwidget_p.h"
#include "hbnamespace_p.h"
+#include "hbvgmaskeffect_p.h"
#ifdef HB_EFFECTS
#include "hbeffect.h"
#endif // HB_EFFECTS
@@ -122,6 +123,7 @@
void calculateShape();
static int timeoutValue(HbPopup::DefaultTimeout timeout);
+ void setTimeout(int msec);
void forceHide();
virtual void addPopupEffects();
@@ -131,7 +133,7 @@
QTimer *timeoutTimer();
void doSetModal( bool modal );
QString effectType;
- QPainterPath *mPath;
+ HbVgMaskEffect *mVgMaskEffect;
private:
static bool popupEffectsLoaded;
static HbPopupPrivate *d_ptr(HbPopup *popup) {
--- a/src/hbcore/gui/hbscreen.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gui/hbscreen.cpp Fri May 14 16:09:54 2010 +0300
@@ -35,6 +35,7 @@
#include "hbevent.h"
#include "hbmainwindow_p.h"
#include <QGraphicsLayout>
+#include <qcoreapplication.h>
/*!
\class HbScreen
@@ -262,6 +263,7 @@
HbToolBarPrivate::d_ptr(mTb)->mDoLayout = false;
}
repolish();
+ QCoreApplication::sendPostedEvents(this, QEvent::Polish);
}
void HbScreen::currentViewChanged(HbView* view)
--- a/src/hbcore/gui/hbscrollarea.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gui/hbscrollarea.cpp Fri May 14 16:09:54 2010 +0300
@@ -37,26 +37,26 @@
#include <QDebug>
/*!
- * @beta
- * @hbcore
- * \class HbScrollArea
- * \brief HbScrollArea provides a finger-touch enabled scrollable container class.
- *
- * HbScrollArea handles the events need to scroll the contents placed inside it. It also
- * handles the display of scrollbar while scrolling is occurring.
- *
- * HbScrollArea is used by constructing a QGraphicsWidget that contains the content to be
- * displayed, then calling the setContentWidget() method. The content widget must have its size
- * set appropriately either by associating a layout with the widget or by explicitly setting
- * the size (e.g. by calling QGraphicsWidget::setGeometry()).
- *
- * The class can be used by itself to provide default scrolling behavior or can be
- * subclassed to add touch feedback, selection feedback, etc.
- *
- * By default, the class provides dragging, flicking with animated follow-on, a
- * simple inertia algorithm for slowing the animated follow-on scrolling and
- * a bounce-back algorithm for animating the content back to its bounding
- * limits at the end of a drag or flick action.
+ @beta
+ @hbcore
+ \class HbScrollArea
+ \brief HbScrollArea provides a finger-touch enabled scrollable container class.
+
+ HbScrollArea handles the events need to scroll the contents placed inside it. It also
+ handles the display of scrollbar while scrolling is occurring.
+
+ HbScrollArea is used by constructing a QGraphicsWidget that contains the content to be
+ displayed, then calling the setContentWidget() method. The content widget must have its size
+ set appropriately either by associating a layout with the widget or by explicitly setting
+ the size (e.g. by calling QGraphicsWidget::setGeometry()).
+
+ The class can be used by itself to provide default scrolling behavior or can be
+ subclassed to add touch feedback, selection feedback, etc.
+
+ By default, the class provides dragging, flicking with animated follow-on, a
+ simple inertia algorithm for slowing the animated follow-on scrolling and
+ a bounce-back algorithm for animating the content back to its bounding
+ limits at the end of a drag or flick action.
*/
/*!
@@ -222,9 +222,9 @@
*/
/*!
- * Constructor
- *
- * \sa HbScrollArea::HbScrollArea
+ Constructor
+
+ \sa HbScrollArea::HbScrollArea
*/
HbScrollArea::HbScrollArea(QGraphicsItem* parent) :
HbWidget( *new HbScrollAreaPrivate, parent )
@@ -243,9 +243,9 @@
}
/*!
- * Destructor
- *
- * \sa HbScrollArea::~HbScrollArea
+ Destructor
+
+ \sa HbScrollArea::~HbScrollArea
*/
HbScrollArea::~HbScrollArea()
{
@@ -256,9 +256,9 @@
}
/*!
- * Returns a pointer to the QGraphicsWidget,which is the content of scrollable area.
- *
- * \sa HbScrollArea::setContentWidget()
+ Returns a pointer to the QGraphicsWidget,which is the content of scrollable area.
+
+ \sa HbScrollArea::setContentWidget()
*/
QGraphicsWidget* HbScrollArea::contentWidget() const
{
@@ -268,10 +268,10 @@
}
/*!
- * Assigns the QGraphicsWidget that is to be scrolled. The HbScrollArea widget takes ownership of
- * the QGraphicsWidget.
- *
- * \sa HbScrollArea::contentWidget()
+ Assigns the QGraphicsWidget that is to be scrolled. The HbScrollArea widget takes ownership of
+ the QGraphicsWidget.
+
+ \sa HbScrollArea::contentWidget()
*/
void HbScrollArea::setContentWidget(QGraphicsWidget* contents)
{
@@ -329,9 +329,9 @@
}
/*!
- * Returns the value of the clampingStyle property
- *
- * \sa HbScrollArea::setClampingStyle()
+ Returns the value of the clampingStyle property
+
+ \sa HbScrollArea::setClampingStyle()
*/
HbScrollArea::ClampingStyle HbScrollArea::clampingStyle() const
{
@@ -341,20 +341,20 @@
}
/*!
- * Sets the clampingStyle property that controls how the scrolling is constrained
- * relative to the contents of the scrolling area.
- *
- * Possible values for the clamping style include:
- *
- * StrictClamping - scrolling is limited to the bounding rectangle of the content item
- * BounceBackClamping - scrolling can go beyond the bounding rectangle of the content item, but bounces back to the
- * limits of the bounding rectangle when released or when inertia scrolling stops
- * NoClamping - scrolling is completely unclamped (this is usually used when the subclass implements its own
- * custom clamping behavior)
- *
- * The default value is BounceBackClamping.
- *
- * \sa HbScrollArea::clampingStyle()
+ Sets the clampingStyle property that controls how the scrolling is constrained
+ relative to the contents of the scrolling area.
+
+ Possible values for the clamping style include:
+
+ StrictClamping - scrolling is limited to the bounding rectangle of the content item
+ BounceBackClamping - scrolling can go beyond the bounding rectangle of the content item, but bounces back to the
+ limits of the bounding rectangle when released or when inertia scrolling stops
+ NoClamping - scrolling is completely unclamped (this is usually used when the subclass implements its own
+ custom clamping behavior)
+
+ The default value is BounceBackClamping.
+
+ \sa HbScrollArea::clampingStyle()
*/
void HbScrollArea::setClampingStyle(ClampingStyle value)
{
@@ -364,9 +364,9 @@
}
/*!
- * Returns the value of the scrollingStyle property
- *
- * \sa HbScrollArea::setScrollingStyle()
+ Returns the value of the scrollingStyle property
+
+ \sa HbScrollArea::setScrollingStyle()
*/
HbScrollArea::ScrollingStyle HbScrollArea::scrollingStyle() const
{
@@ -382,7 +382,7 @@
Possible values for the clamping style include:
Pan - dragging motion pans the view with no follow-on scrolling animation
- \deprecated PanOrFlick
+ \deprecated PanOrFlick
is deprecated.
PanWithFollowOn - dragging motion pans the view, velocity at end of drag motion triggers follow-on animated scrolling
@@ -403,9 +403,9 @@
}
/*!
- * Returns the value of the scrollDirections property.
- *
- * \sa HbScrollArea::setScrollDirections()
+ Returns the value of the scrollDirections property.
+
+ \sa HbScrollArea::setScrollDirections()
*/
Qt::Orientations HbScrollArea::scrollDirections() const
{
@@ -415,14 +415,14 @@
}
/*!
- * Sets the value of the scrollDirections property. This value is of
- * type Qt::Orientations and can set to either Qt::Horizontal to enable horizontal scrolling,
- * Qt::Vertical to enable vertical scrolling or (Qt::Horizontal | Qt::Vertical) to enable
- * scrolling in both directions.
- *
- * The default value is Qt::Vertical.
- *
- * \sa HbScrollArea::scrollDirections()
+ Sets the value of the scrollDirections property. This value is of
+ type Qt::Orientations and can set to either Qt::Horizontal to enable horizontal scrolling,
+ Qt::Vertical to enable vertical scrolling or (Qt::Horizontal | Qt::Vertical) to enable
+ scrolling in both directions.
+
+ The default value is Qt::Vertical.
+
+ \sa HbScrollArea::scrollDirections()
*/
void HbScrollArea::setScrollDirections(Qt::Orientations value)
{
@@ -438,9 +438,9 @@
}
/*!
- * Returns true if the inertia scrolling effect is enabled, false otherwise.
- *
- * \sa HbScrollArea::setFrictionEnabled()
+ Returns true if the inertia scrolling effect is enabled, false otherwise.
+
+ \sa HbScrollArea::setFrictionEnabled()
*/
bool HbScrollArea::frictionEnabled() const
{
@@ -450,10 +450,10 @@
}
/*!
- * Enables/disables the inertia scrolling effect.
- * By default, the inertia effect is enabled.
- *
- * \sa HbScrollArea::frictionEnabled()
+ Enables/disables the inertia scrolling effect.
+ By default, the inertia effect is enabled.
+
+ \sa HbScrollArea::frictionEnabled()
*/
void HbScrollArea::setFrictionEnabled(bool value)
{
@@ -495,7 +495,7 @@
}
/*
- * \reimp
+ \reimp
*/
QVariant HbScrollArea::itemChange(GraphicsItemChange change, const QVariant &value)
{
@@ -628,7 +628,7 @@
}
/*!
- * Returns true if a scrolling action is in progress, false otherwise.
+ Returns true if a scrolling action is in progress, false otherwise.
*/
bool HbScrollArea::isScrolling() const
{
@@ -638,7 +638,7 @@
}
/*!
- * Returns true if the scrolling is due to dragging as opposed to follow-on scrolling
+ Returns true if the scrolling is due to dragging as opposed to follow-on scrolling
*/
bool HbScrollArea::isDragging() const
{
@@ -648,12 +648,12 @@
}
/*!
- * Scrolls the view by the amount indicated by "delta".
- *
- * The function returns TRUE if the view was able to scroll, FALSE otherwise.
- *
- * The function is virtual so subclasses can override it to customize the behavior by, for example,
- * clamping the position so that at least one item in the view remains visible.
+ Scrolls the view by the amount indicated by "delta".
+
+ The function returns TRUE if the view was able to scroll, FALSE otherwise.
+
+ The function is virtual so subclasses can override it to customize the behavior by, for example,
+ clamping the position so that at least one item in the view remains visible.
*/
bool HbScrollArea::scrollByAmount(const QPointF& delta)
{
@@ -674,14 +674,7 @@
if(event->type() == QEvent::ApplicationLayoutDirectionChange
|| event->type() == QEvent::LayoutDirectionChange) {
d->changeLayoutDirection(layoutDirection());
- } else if (event->type() == QEvent::GraphicsSceneResize) {
- if (isVisible() && d->mContents) {
- if ( d->mIsAnimating ) {
- d->stopAnimating();
- }
- d->adjustContent();
- }
- } else if (event->type() == HbEvent::ChildFocusOut) {
+ } else if (event->type() == HbEvent::ChildFocusOut) {
//qDebug() << "focusout";
if ( !d->positionOutOfBounds() ) {
d->stopAnimating();
@@ -702,7 +695,10 @@
QSizePolicy contentPolicy = d->mContents->sizePolicy();
if (d->mScrollDirections & Qt::Vertical) {
- if (contentPolicy.verticalPolicy() != QSizePolicy::Ignored) {
+ if ((contentPolicy.verticalPolicy() & QSizePolicy::ExpandFlag) &&
+ (d->mContents->preferredHeight() < size().height())) {
+ newSize.setHeight(size().height());
+ } else if (contentPolicy.verticalPolicy() != QSizePolicy::Ignored) {
newSize.setHeight(d->mContents->preferredHeight());
}
} else {
@@ -710,7 +706,10 @@
}
if (d->mScrollDirections & Qt::Horizontal) {
- if (contentPolicy.horizontalPolicy() != QSizePolicy::Ignored) {
+ if ((contentPolicy.horizontalPolicy() & QSizePolicy::ExpandFlag) &&
+ (d->mContents->preferredWidth() < size().width())) {
+ newSize.setWidth(size().width());
+ } else if (contentPolicy.horizontalPolicy() != QSizePolicy::Ignored) {
newSize.setWidth(d->mContents->preferredWidth());
}
} else {
@@ -721,17 +720,26 @@
}
} else if (event->type() == QEvent::GraphicsSceneResize) {
if (d->mContents) {
+ if ( d->mIsAnimating ) {
+ d->stopAnimating();
+ }
QSizeF newSize = d->mContents->size();
+ bool sizeChanged = false;
if (!(d->mScrollDirections & Qt::Vertical)) {
newSize.setHeight(size().height());
+ sizeChanged = true;
}
if (!(d->mScrollDirections & Qt::Horizontal)) {
newSize.setWidth(size().width());
+ sizeChanged = true;
}
-
- d->mContents->resize(newSize);
+ if (sizeChanged) {
+ d->mContents->resize(newSize);
+ } else {
+ d->adjustContent();
+ }
}
}
}
@@ -1042,7 +1050,7 @@
}
/*
- * \reimp
+ \reimp
*/
void HbScrollArea::polish(HbStyleParameters& params)
{
--- a/src/hbcore/gui/hbscrollarea.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gui/hbscrollarea.h Fri May 14 16:09:54 2010 +0300
@@ -29,7 +29,6 @@
#include <hbwidget.h>
class HbScrollAreaPrivate;
-class HbGestureSceneFilter;
class HbScrollBar;
#ifdef HB_GESTURE_FW
--- a/src/hbcore/gui/hbscrollarea_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gui/hbscrollarea_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -25,12 +25,11 @@
#include "hbscrollarea_p.h"
#include "hbscrollarea.h"
-#include "hbstyleoption.h"
+#include "hbstyleoption_p.h"
#include "hbinstance.h"
#include "hbpangesture.h"
#include <hbscrollbar_p.h>
-#include <hbgesture.h>
#include <hbscrollbar.h>
#include <hbwidgetfeedback.h>
@@ -269,6 +268,10 @@
HbWidgetFeedback::triggered(q, Hb::InstantBoundaryReached);
}
}
+ stopScrolling();
+ // must return here, otherwise mIsScrolling will be false
+ // below and scrollingStarted will be emitted
+ return currentPosition != newPosition;
} else {
mBoundaryReached = false;
}
@@ -635,7 +638,11 @@
QRectF contentsBoundingRect = mContents->boundingRect();
QPointF alignedPosition = mContents->pos();
- if (mResetAlignment) {
+ bool xAlignmentNeeded = (!mAbleToScrollX && ((-alignedPosition.x() < leftBoundary()) ||
+ -alignedPosition.x() > rightBoundary()));
+ bool yAlignmentNeeded = (!mAbleToScrollY && ((-alignedPosition.y() < topBoundary()) ||
+ -alignedPosition.y() > bottomBoundary()));
+ if (mResetAlignment || xAlignmentNeeded || yAlignmentNeeded) {
if (mAlignment & Qt::AlignHCenter) {
alignedPosition.setX((scrollAreaBoundingRect.width() - contentsBoundingRect.width()) / 2.0);
} else if (mAlignment & Qt::AlignRight) {
--- a/src/hbcore/gui/hbscrollbar.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gui/hbscrollbar.cpp Fri May 14 16:09:54 2010 +0300
@@ -26,7 +26,7 @@
#include <hbscrollbar.h>
#include <hbscrollbar_p.h>
#include <hbwidget_p.h>
-#include <hbstyleoptionscrollbar.h>
+#include <hbstyleoptionscrollbar_p.h>
#include <hbwidgetfeedback.h>
#include <hbframeitem.h>
@@ -283,20 +283,6 @@
}
/*!
- Returns whether scrollbar is in interactive mode.
-
- \deprecated HbScrollBar::interactive() const
- is deprecated. Please use HbScrollBar::isInteractive() const instead.
-
- \sa HbScrollBar::isInteractive()
-*/
-bool HbScrollBar::interactive() const
-{
- qWarning() << "HbScrollBar::interactive() is DEPRECATED! Use HbScrollBar::isInteractive";
- return isInteractive();
-}
-
-/*!
Sets the value of interactive property. If this value is set
to true scrollbar is interactive, the user can change the scroll position by
dragging the thumb or pressing the groove. Dragging the thumb emits valueChanged
--- a/src/hbcore/gui/hbscrollbar.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gui/hbscrollbar.h Fri May 14 16:09:54 2010 +0300
@@ -53,9 +53,7 @@
int type() const { return Type; }
bool isInteractive() const;
- void setInteractive( bool enabled );
-
- bool interactive() const; // deprecated
+ void setInteractive( bool enabled );
QRectF boundingRect() const;
public slots:
--- a/src/hbcore/gui/hbsplash.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gui/hbsplash.cpp Fri May 14 16:09:54 2010 +0300
@@ -143,19 +143,48 @@
class HbSplashSrvClient : public RSessionBase
{
public:
+ HbSplashSrvClient();
+ ~HbSplashSrvClient();
bool Connect();
bool getSplash(RFile &f, const QString &ori, const QString &appId, const QString &screenId);
+private:
+ RMutex mMutex;
+ bool mMutexOk;
};
+HbSplashSrvClient::HbSplashSrvClient()
+{
+ _LIT(KHbSplashStartMutex, "hbsplstart");
+ mMutexOk = mMutex.OpenGlobal(KHbSplashStartMutex) == KErrNone;
+ if (!mMutexOk) {
+ mMutexOk = mMutex.CreateGlobal(KHbSplashStartMutex) == KErrNone;
+ }
+}
+
+HbSplashSrvClient::~HbSplashSrvClient()
+{
+ if (mMutexOk) {
+ if (mMutex.IsHeld()) {
+ mMutex.Signal();
+ }
+ mMutex.Close();
+ }
+}
+
bool HbSplashSrvClient::Connect()
{
+ if (mMutexOk) {
+ mMutex.Wait();
+ }
TVersion ver(hbsplash_version_major, hbsplash_version_minor, hbsplash_version_build);
int maxTries = 3;
+ bool ok = false;
while (maxTries--) {
TInt err = CreateSession(hbsplash_server_name, ver);
qDebug("[hbsplash] CreateSession result: %d", err);
if (err == KErrNone) {
- return true;
+ ok = true;
+ break;
/*
} else if (err == KErrNotFound || err == KErrServerTerminated) {
qDebug("[hbsplash] Server not running");
@@ -178,7 +207,7 @@
}
User::WaitForRequest(status);
server.Close();
- if (status.Int() != KErrNone) {
+ if (status.Int() != KErrNone && status.Int() != KErrAlreadyExists) {
qWarning("[hbsplash] Rendezvous failed (%d)", status.Int());
break;
}
@@ -189,8 +218,13 @@
break;
}
}
- qWarning("[hbsplash] cannot connect to splashgen server");
- return false;
+ if (!ok) {
+ qWarning("[hbsplash] cannot connect to splashgen server");
+ }
+ if (mMutexOk) {
+ mMutex.Signal();
+ }
+ return ok;
}
bool HbSplashSrvClient::getSplash(RFile &f, const QString &ori,
--- a/src/hbcore/gui/hbsplashscreen.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gui/hbsplashscreen.cpp Fri May 14 16:09:54 2010 +0300
@@ -50,6 +50,8 @@
#endif
/*!
+ @stable
+ @hbcore
\class HbSplashScreen
\brief Shows a splash screen suitable for the current application.
--- a/src/hbcore/gui/hbstackedwidget.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gui/hbstackedwidget.cpp Fri May 14 16:09:54 2010 +0300
@@ -28,6 +28,8 @@
#include "hbwidget_p.h"
/*!
+ @stable
+ @hbcore
\class HbStackedWidget
\brief HbStackedWidget manages geometries of stacked layout contents.
@@ -39,7 +41,6 @@
\snippet{stackedwidgetsample.cpp,1}
\sa HbStackedLayout
- \alpha
*/
--- a/src/hbcore/gui/hbtoolbar.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gui/hbtoolbar.cpp Fri May 14 16:09:54 2010 +0300
@@ -78,6 +78,12 @@
\fn int HbToolBar::type() const
*/
+/*!
+ \fn void HbToolBar::addAction(QAction *action)
+ Adds a new action to the toolbar. It's appended to the end
+ of the toolbar. Toolbar doesn't take ownership of the QAction.
+ */
+
// ======== MEMBER FUNCTIONS ========
/*!
@@ -127,7 +133,7 @@
\overload
Creates a new action with the given \a text. This action is added to
- the end of the toolbar.
+ the end of the toolbar. Toolbar retains ownership of the action.
*/
HbAction *HbToolBar::addAction( const QString &text )
{
@@ -140,7 +146,7 @@
\overload
Creates a new action with the given \a icon and \a text. This
- action is added to the end of the toolbar.
+ action is added to the end of the toolbar. Toolbar retains ownership of the action.
*/
HbAction *HbToolBar::addAction( const HbIcon &icon, const QString &text )
{
@@ -155,7 +161,7 @@
Creates a new action with the given \a text. This action is added to
the end of the toolbar. The action's \link HbAction::triggered()
triggered()\endlink signal is connected to \a member in \a
- receiver.
+ receiver. Toolbar retains ownership of the action.
*/
HbAction *HbToolBar::addAction( const QString &text, const QObject *receiver, const char *member )
{
@@ -171,7 +177,7 @@
Creates a new action with the icon \a icon and text \a text. This
action is added to the end of the toolbar. The action's \link
HbAction::triggered() triggered()\endlink signal is connected to \a
- member in \a receiver.
+ member in \a receiver. Toolbar retains ownership of the action.
*/
HbAction *HbToolBar::addAction( const HbIcon &icon, const QString &text, const QObject *receiver, const char *member )
{
@@ -234,16 +240,6 @@
}
/*!
- \deprecated HbToolBar::unsetOrientation()
- is deprecated.
- */
-void HbToolBar::unsetOrientation()
-{
- //Q_D(HbToolBar);
-
-}
-
-/*!
Emits areaChanged() whenever the tool bar's visibility or position changes.
*/
QVariant HbToolBar::itemChange( GraphicsItemChange change, const QVariant &value )
@@ -252,6 +248,12 @@
QVariant result = HbWidget::itemChange(change, value);
switch (change) {
+ case ItemVisibleHasChanged:
+ if (d->emitVisibilityChangeSignal && value.toBool()) {
+ QMetaObject::invokeMethod(&d->core, "visibilityChanged", Qt::DirectConnection);
+ d->emitVisibilityChangeSignal = false;
+ }
+ break;
case ItemVisibleChange:
if (d->mOrientationEffectsRunning)
return result;
@@ -259,10 +261,6 @@
if (d->mDoLayout && d->mDoLayoutPending) {
d->doLayout();
}
- if (d->emitVisibilityChangeSignal && value.toBool()) {
- QMetaObject::invokeMethod(&d->core, "visibilityChanged", Qt::QueuedConnection);
- d->emitVisibilityChangeSignal = false;
- }
if (!d->mDialogToolBar) {
d->doLazyInit();
d->delayedStartEffects = d->mDoLayoutPending && !d->mSuppressNextAppearEffect;
@@ -314,11 +312,6 @@
d->updateButtonsLayoutDirection();
}
- if (event->type() == QEvent::ParentChange && parentItem()) {
- setPos(-1000, -1000); // Not very nice workaround to toolbar flicker problem.
- // We will find a better solution later.
- }
-
QGraphicsWidget::changeEvent(event);
}
--- a/src/hbcore/gui/hbtoolbar.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gui/hbtoolbar.h Fri May 14 16:09:54 2010 +0300
@@ -39,7 +39,7 @@
{
Q_OBJECT
- Q_PROPERTY( Qt::Orientation orientation READ orientation WRITE setOrientation RESET unsetOrientation )
+ Q_PROPERTY( Qt::Orientation orientation READ orientation WRITE setOrientation)
public:
explicit HbToolBar( QGraphicsItem *parent = 0 );
@@ -62,7 +62,6 @@
public slots:
void setOrientation(Qt::Orientation orientation);
- void unsetOrientation();
protected:
HbToolBar( HbToolBarPrivate &dd, QGraphicsItem *parent = 0 );
--- a/src/hbcore/gui/hbtoolbar_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gui/hbtoolbar_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -379,7 +379,7 @@
actionManager = new HbActionManager(HbView::ToolBar, q, q->mainWindow());
}
if (actionManager){
- index = actionManager->position(action, q->actions());
+ index = actionManager->position(action, q->actions(), mVisibleToolButtons.count());
}
}
@@ -472,6 +472,10 @@
return;
QGraphicsItem *parentItem = q->parentItem();
+ if ( moreExtension && moreExtension->isVisible() ) {
+ moreExtension->hide();
+ }
+
if (parentItem && q->orientation() == Qt::Horizontal) {
QRectF extRect(0.0,
parentItem->boundingRect().height(),
--- a/src/hbcore/gui/hbtoolbutton.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gui/hbtoolbutton.cpp Fri May 14 16:09:54 2010 +0300
@@ -26,7 +26,7 @@
#include "hbtoolbutton.h"
#include "hbtoolbutton_p.h"
#include "hbtooltip.h"
-#include "hbstyleoptiontoolbutton.h"
+#include "hbstyleoptiontoolbutton_p.h"
#include "hbtoolbarextension.h"
#include "hbtoolbarextension_p.h"
#include "hbaction.h"
@@ -454,12 +454,20 @@
setChecked(d->action->isChecked());
setEnabled(d->action->isEnabled());
HbAction *hbAction = qobject_cast<HbAction *>(d->action);
- if (hbAction && (!hbAction->toolTip().isEmpty()) && (hbAction->toolTip() != toolTip())) {
+ if (hbAction && hbAction->toolTip() != toolTip()) {
+ // by default, HbAction does not have tooltip. If QAction
+ // does not have tooltip, it returns button text. This is
+ // here to enable empty tooltip text by using HbAction.
setToolTip(hbAction->toolTip());
} else if(!hbAction && d->action->toolTip() != toolTip()) {
setToolTip(d->action->toolTip());
}
setVisible(d->action->isVisible());
+ } else {
+ setCheckable(false);
+ setChecked(false);
+ setEnabled(false);
+ setToolTip(QString());
}
initStyleOption(&option);
@@ -473,8 +481,14 @@
if (d->iconItem) {
style()->updatePrimitive(d->iconItem, HbStyle::P_ToolButton_icon, &option);
if (d->action && d->action->icon().flags() & HbIcon::Colorized) {
- static_cast<HbIconItem *>(d->iconItem)->setFlags(HbIcon::Colorized);
+ static_cast<HbIconItem *>(d->iconItem)->setFlags(HbIcon::Colorized);
}
+ if (d->action && d->action->icon().mirroringMode() != HbIcon::Default) {
+ HbIconItem *iconItem = static_cast<HbIconItem *>(d->iconItem);
+ iconItem->setMirroringMode( d->action->icon().mirroringMode() );
+ }
+
+
}
}
--- a/src/hbcore/gui/hbtoolbutton_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gui/hbtoolbutton_p.h Fri May 14 16:09:54 2010 +0300
@@ -38,7 +38,7 @@
//
#include <hbicon.h>
-#include <hbstyleoptiontoolbutton.h>
+#include <hbstyleoptiontoolbutton_p.h>
#include <hbabstractbutton_p.h>
#include <QPointer>
@@ -86,7 +86,7 @@
QSizeF mButtonSize;
private:
- // Provided for HbToolBar & HbSoftKey who have to access
+ // Provided for HbToolBar who have to access
// HbToolButtonPrivate in order to hide the background
// and/or set the toolbar position of the tool button.
// NOTE: Still kept as private to track dependencies...
@@ -94,9 +94,7 @@
Q_ASSERT(button);
return button->d_func();
}
- friend class HbSoftKey;
friend class HbToolBar;
- friend class HbSoftKeyPrivate;
friend class HbToolBarPrivate;
friend class HbToolBarExtensionPrivate;
};
--- a/src/hbcore/gui/hbview.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gui/hbview.cpp Fri May 14 16:09:54 2010 +0300
@@ -35,70 +35,85 @@
#include "hbmainwindow_p.h"
#include "hbtitlebar_p.h"
#include "hbstatusbar_p.h"
-#include "hbsoftkeygroup_p.h"
#include "hbscreen_p.h"
#include "hbviewactionmanager_p.h"
#include "hbglobal_p.h"
#include <QPointer>
/*!
- @beta
+ @stable
@hbcore
\class HbView
- \brief HbView is a base class for all the views that can be set to HbMainWindow.
-
- HbView is a QGraphicsWidget, which contains a title, an icon, a menu and
- a tool bar for one view in HbMainWindow.
-
- HbMainWindow will handle updating title, icon, menu and tool bar, when
- the view is activated. Title is used in application's title pane area.
-
- HbView handles the visibility of tool bar, though HbMainWindow will
- reparent it when ever view comes active.
-
- Example 1 for creating a simple view
-
- \include view1/main.cpp
-
- Example 2 for creating view with title, icon, menu, toolbar and a widget.
-
- \include view2/main.cpp
+ \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
+ 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
+ // Hide all the chrome items
+ myView.setContentFullScreen(true)
+
+ // Show all the chrome items
+ myView.setContentFullScreen(false)
+
+ // Hide the toolbar
+ myView.hideItems(Hb::SceneItem::ToolBarItem)
+
+ // Show the toolbar
+ myView.showItems(Hb::SceneItem::ToolBarItem)
+ \endcode
+
+ \subsection _uc_002_hbview Creating a simple view
+ This code snippet shows the most basic way to create an application with a single view.
- \sa HbMenu
+ \code
+ #include <hbapplication.h>
+ #include <hbmainwindow.h>
+ #include <hbview.h>
+
+ int main(int argc, char *argv[])
+ {
+ HbApplication app(argc, argv);
+ HbMainWindow window;
+
+ HbView *view = new HbView();
+ view->setTitle("My View");
+
+ window.addView(view);
+
+ window.show();
+ return app.exec();
+ }
+ \endcode
+
+ \section _methodgroups_hbview Methods and properties grouped
+ \li \b Chrome: setViewFlags(), showItems(), hideItems(), visibleItems(), isItemVisible(), setItemVisible(), unsetVisibleItems(),visibleItemsChanged() [signal], setContentFullScreen(), contentFullScreenChanged() [signal], isContentFullScreen(), contentFullScreen [property]
+ \li \b Title: title(), setTitle(), titleChanged() [signal], title [property]
+ \li \b Icon: icon(), setIcon(), iconChanged() [signal], icon [property]
+ \li \b Menu: menu(), setMenu(), takeMenu()
+ \li \b Toolbar: toolBar(), setToolBar(), toolBarChanged() [signal], takeToolBar()
+ \li \b Actions: addAction(), setNavigationAction()
+ \li \b Event: event()
+ \li \b TitleBar: setTitleBarVisible()
+ \li \b StatusBar: setStatusBarVisible()
+ \li \b DockWidget: dockWidget(), setDockWidget(), dockWidgetChanged() [signal]
+ \li \b Widget: widget(), setWidget(), takeWidget()
+
+ \sa HbApplication, HbMainWindow, HbDocumentLoader, HbMenu, HbToolBar, HbDockWidget
*/
/*!
- \deprecated HbView::HbTitleBarFlag
- is deprecated. Use HbView::::HbViewFlag instead.
- \enum HbView::HbTitleBarFlag
- Defines policy for showing the HbTitleBar in the current HbView.
-*/
-/*!
- \var HbView::TitleBarFlagNone
- Titlebar is shown with the default attributes.
-*/
-/*!
- \var HbView::TitleBarMinimizable When this flag is set, there will be an
- indication in titlebar showing the possibility to minimize (swipe out of the
- screen) titlebar. */
-/*!
- \var HbView::TitleBarMinimized
- When this flag is set, the titlebar is shown in minimized state.
-*/
-/*!
- \var HbView::TitleBarHidden When this flag is set, the titlebar is not shown
- at all, so that even the titlebar handle is not shown and it is not possible
- to maximize the titlebar. */
-/*!
- \var HbView::TitleBarTransparent When this flag is set, the titlebar is
- shown normally, but as transparent. This flag is normally used in
- combination with TitleBarFloating flag. */
-/*!
- \var HbView::TitleBarFloating When this flag is set, the titlebar is shown
- on top of underlying content. Setting this flag also changes application
- area to start from the top of the screen. This flag is normally used in
- combination with TitleBarTransparent flag. */
-
-/*!
\enum HbView::HbViewFlag
Defines policy for showing the HbTitleBar in the current HbView.
*/
@@ -108,60 +123,111 @@
*/
/*!
\var HbView::ViewTitleBarMinimizable
- When this flag is set, there will be an indication in titlebar showing the possibility to minimize (swipe out of the screen) titlebar.
+ 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
- When this flag is set, the titlebar is shown in minimized state.
+ Show the title bar in minimized state.
*/
/*!
\var HbView::ViewTitleBarHidden
- When this flag is set, the titlebar is not shown at all, so that even the titlebar handle is not shown and it is not possible to maximize the titlebar.
+ 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
- When this flag is set, the titlebar is shown normally, but as transparent. This flag is normally used in combination with ViewTitleBarFloating flag.
+ Show normal style title bar but make it transparent. This flag is normally used in combination with TitleBarFloating flag.
*/
/*!
\var HbView::ViewTitleBarFloating
- When this flag is set, the titlebar is shown on top of underlying content. Setting this flag also changes application area to 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
- When this flag is set, the statusbar is not shown at all. This flag is normally used in combination with ViewTitleBarHidden flag.
+ Do not show the statusbar at all. This flag is normally used in combination with the ViewTitleBarHidden flag.
*/
/*!
\var HbView::ViewStatusBarTransparent
- When this flag is set, the statusbar is shown normally, but as 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
- When this flag is set, the statusbar is shown on top of underlying content. Setting this flag also changes application area to start from the top of the screen. This flag is normally used in combination with 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.
+*/
+
+/*!
+ \enum HbView::ActionContainer
+ Defines the default container when you add actions to a view.
+
+ \sa navigationAction()
+*/
+/*!
+ \var HbView::NotSpecified
+ Indicate that no particular action container is preferred.
+*/
+/*!
+ \var HbView::OptionsMenu
+ Indicate that the options menu is the preferred location for an action.
+*/
+/*!
+ \var HbView::ToolBar
+ Indicate that the tool bar is the preferred location for an action.
*/
/*!
\fn void HbView::titleChanged(const QString &title)
- This signal is emitted when the title changes.
+ This signal is emitted when the title is replaced by a different title.
+
+ \sa setTitle()
*/
/*!
\fn void HbView::iconChanged(const HbIcon &icon)
- This signal is emitted when the icon changes.
+ This signal is emitted when the icon is replaced by a different icon.
+
+ \sa setIcon()
*/
/*!
\fn void HbView::toolBarChanged()
- This signal is emitted when tool bar changes.
+ This signal is emitted when toolbar is replaced by a different toolbar.
+
+ \sa setToolBar()
*/
/*!
- \reimp
+ \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()
+*/
+
+/*!
\fn int HbView::type() const
*/
+/*!
+ \internal
+ */
HbViewPrivate::HbViewPrivate()
: mLayout(0),
menu(0),
@@ -172,7 +238,6 @@
mVisibleItemsSet(false),
mFullscreen(false),
mVisited(false),
- mTitleBarFlags(HbView::TitleBarFlagNone),
mViewFlags(HbView::ViewFlagNone),
actionManager(0),
preferredActionContainer(HbView::NotSpecified),
@@ -181,12 +246,15 @@
{
}
+/*!
+ \internal
+ */
HbViewPrivate::~HbViewPrivate()
{
}
/*!
- Constructs a view with given \a parent.
+ Constructs a view with the given \a parent.
*/
HbView::HbView(QGraphicsItem *parent) :
HbWidget(*new HbViewPrivate, parent)
@@ -206,7 +274,7 @@
}
/*!
- Destructs the view.
+ Destructor.
*/
HbView::~HbView()
{
@@ -223,9 +291,7 @@
}
/*!
- Returns the title of the view.
-
- The default value is a null string.
+ Returns the title of the view. If no title has been defined, the return value is a null string.
\sa setTitle()
*/
@@ -250,8 +316,7 @@
}
/*!
- Returns the icon of the view.
-
+ Returns the icon associated with the view.
The default value is a null icon.
\sa setIcon(), HbIcon::isNull()
@@ -263,7 +328,7 @@
}
/*!
- Sets the icon of the view. The icon is associated with view.
+ Sets the icon associated with the view.
\sa icon()
*/
@@ -277,7 +342,7 @@
}
/*!
- Returns the menu for the view. This function creates and returns an empty menu if it does not exist.
+ Returns the menu for the view. This function creates and returns an empty menu if one does not already exist.
Ownership is not transferred.
@@ -296,9 +361,9 @@
}
/*!
- Sets the menu for the view. Setting the menu to 0 will remove it from the view.
+ Sets the menu for the view. Setting the menu to 0 will remove any existing menu from the view.
- Takes the ownership of the \a menu.
+ The view takes ownership of the \a menu.
\sa HbMenu menu()
*/
@@ -316,12 +381,17 @@
d->menu->setLayoutDirection(mainWindow()->layoutDirection());
}
}
+ // Titlebar must be informed
+ if (mainWindow()) {
+ HbMainWindowPrivate::d_ptr(mainWindow())->mTitleBar->propertiesChanged();
+ }
}
}
/*!
- Returns the tool bar for the view. This function creates and returns an empty tool bar if it does not exist.
- The toolBarChanged() signal is not emitted if a new tool bar is created.
+ 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.
@@ -338,9 +408,9 @@
}
/*!
- Sets the toolbar for the view. Setting the tool bar to 0 will remove it from the view.
+ Sets the toolbar for the view. Setting the toolbar to 0 will remove it from the view.
- Takes the ownership of the \a toolBar, though it is not a parent.
+ The view takes ownership of the toolbar, but the view is not set as the parent.
\sa HbToolBar toolBar()
*/
@@ -357,11 +427,11 @@
}
/*!
-Removes the HbToolBar, which is set to view and returns it.
-The ownership of the \a HbToolBar is transferred to the caller.
+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 one wants to switch between
-different views without deleting previous toolbar.
+\note This function is particularly useful if you want to switch to a
+different view and keep the same toolbar.
\sa setToolBar()
*/
@@ -381,8 +451,8 @@
/*!
- Returns the dock widget for the view. This function creates and returns an empty dock widget if it does not exist.
- The dockWidgetChanged() signal is not emitted if a new dock widget is created.
+ Returns the dock widget belonging to the view. If the view does not have a dock widget, an empty dock widget is created and returned.
+ The dockWidgetChanged() signal is not emitted when a new dock widget is created by this method.
Ownership is not transferred.
@@ -399,9 +469,9 @@
}
/*!
- Sets the dock widget for the view. Setting the dock widget to 0 will remove it from the view.
+ Sets the dock widget for the view. Setting the dock widget to \c 0 will remove it from the view.
- Takes the ownership of the \a dockWidget, though it is not a parent.
+ This does take ownership of the \a dockWidget, but does not become the parent.
\sa HbDockWidget dockWidget()
*/
@@ -418,9 +488,9 @@
}
/*!
- Returns the widget if set, otherwise \c 0.
+ Returns the widget that makes up the view. If the widget has not been set, this method will return 0.
- \sa setWidget widget takeWidget
+ \sa setWidget takeWidget
*/
QGraphicsWidget *HbView::widget() const
{
@@ -429,10 +499,9 @@
}
/*!
- Sets the widget to be \a widget. Setting the widget to 0 will remove it from the view. Already set
- widget is deleted.
+ Sets the widget that makes up the view. Setting the \a widget value to 0 will delete the current widget.
- Takes the ownership of the \a widget.
+ The view takes the ownership of the \a widget.
\sa widget takeWidget
*/
@@ -464,15 +533,14 @@
}
/*!
-Removes the QGraphicsWidget, which is set to view and returns it.
-The ownership of the \a widget is transferred to the caller.
+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 one wants to switch between
-different widgets inside a view without deleting them.
+\note This function is particularly useful if you want to use
+different widgets in a view without deleting them.
\sa widget() setWidget()
*/
-
QGraphicsWidget *HbView::takeWidget()
{
Q_D(HbView);
@@ -492,10 +560,11 @@
}
/*!
- Sets \a items to be visible in this view. Changes will be visible
- instantly if the view is currently active, otherwise next time when
- view is activated. View's visibility flag overrides the similar
- setting in HbMainWindow.
+ 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()
*/
@@ -507,7 +576,6 @@
if (items & Hb::TitleBarItem) {
d->mViewFlags &= ~HbView::ViewTitleBarHidden;
- d->mTitleBarFlags &= ~HbView::TitleBarHidden;
}
if (items & Hb::StatusBarItem) {
d->mViewFlags &= ~HbView::ViewStatusBarHidden;
@@ -517,11 +585,13 @@
}
/*!
- Sets \a items to be invisible in this view. Changes will be visible
- instantly if the view is currently active, otherwise next time when
- view is activated. View's visibility flag overrides the similar
- setting in HbMainWindow.
+ Hides the given scene items 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 showItems() setItemVisible() isItemVisible() unsetVisibleItems() visibleItems() isContentFullScreen() setContentFullScreen()
*/
void HbView::hideItems(Hb::SceneItems items)
@@ -532,7 +602,6 @@
if (items & Hb::TitleBarItem) {
d->mViewFlags |= HbView::ViewTitleBarHidden;
- d->mTitleBarFlags |= HbView::TitleBarHidden;
}
if (items & Hb::StatusBarItem) {
d->mViewFlags |= HbView::ViewStatusBarHidden;
@@ -542,7 +611,7 @@
}
/*!
- Returns visible items of this view.
+ Returns the scene items that are visible in this view.
\sa isItemVisible() setItemVisible() hideItems() showItems() unsetVisibleItems() isContentFullScreen() setContentFullScreen()
@@ -558,7 +627,7 @@
}
/*!
- Returns \c true if \a item is set to be visible.
+ Returns \c true if \a item is set to be visible, otherwise returns \c false.
\sa setItemVisible() hideItems() showItems() unsetVisibleItems() visibleItems() isContentFullScreen() setContentFullScreen()
@@ -570,11 +639,14 @@
}
/*!
- Sets \a item to be \a visible in this view. Changes will be visible
- instantly if the view is currently active, otherwise next time when
- view is activated. View's visibility flag overrides the similar
- setting in HbMainWindow.
-
+ 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.
+
+ 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)
@@ -587,26 +659,6 @@
}
/*!
- \deprecated HbView::unsetVisibleItems()
- is deprecated.
-
- Resets the view specific definition of visible items and
- uses the HbMainWindow's default visible items. Changes will be visible
- instantly if the view is currently active, otherwise next time when
- view is activated.
-
- \sa setItemVisible() isItemVisible() hideItems() showItems() visibleItems() isContentFullScreen() setContentFullScreen()
-*/
-void HbView::unsetVisibleItems()
-{
- HB_DEPRECATED("HbMainWindow::unsetVisibleItems is deprecated!");
- Q_D(HbView);
- d->mVisibleItemsSet = false;
-
- emit visibleItemsChanged();
-}
-
-/*!
Returns \c true if view is set to use fullscreen.
\sa setContentFullScreen() setItemVisible() isItemVisible() hideItems() showItems() visibleItems()
@@ -618,10 +670,10 @@
}
/*!
- Sets the view to use full content area for drawing. Decorators like
- signal bar, title pane etc can be shown on top of view content area.
- Changes will be visible instantly if the view is currently active,
- otherwise next time when view is activated.
+ 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.
\sa isContentFullScreen() setItemVisible() isItemVisible() hideItems() showItems() visibleItems()
*/
@@ -635,27 +687,10 @@
}
/*!
- \deprecated HbView::titleBarFlags() const
- is deprecated. Use HbView::viewFlags() instead.
-
- Returns titlebar flags bit vector.
- It consists of bits specified in HbTitleBarFlag.
+ Returns the view flags bit vector.
+ This consists of values specified in HbViewFlag.
- \sa setTitleBarFlags()
-*/
-HbView::HbTitleBarFlags HbView::titleBarFlags() const
-{
- Q_D(const HbView);
- int statusBarFlagMask = ViewStatusBarHidden | ViewStatusBarTransparent | ViewStatusBarFloating;
- int flags(d->mViewFlags & ~statusBarFlagMask);
- return HbView::HbTitleBarFlags(flags);
-}
-
-/*!
- Returns view flags bit vector.
- It consists of bits specified in HbViewFlag.
-
- \sa setTitleBarFlags()
+ \sa setViewFlags()
*/
HbView::HbViewFlags HbView::viewFlags() const
{
@@ -664,24 +699,6 @@
}
/*!
- \deprecated HbView::setTitleBarFlags(HbView::HbTitleBarFlags flags)
- is deprecated. Use HbView::setViewFlags(HbView::HbViewFlags flags) instead.
-
- Sets the titlebar flags bit vector. It consists of bits specified
- in HbTitleBarFlag. These flags can be set before the view is
- added to the main window or while the view is active.
-
- \sa titleBarFlags()
-*/
-void HbView::setTitleBarFlags(HbView::HbTitleBarFlags flags)
-{
- const int statusBarFlagMask = ViewStatusBarHidden | ViewStatusBarTransparent | ViewStatusBarFloating;
-
- Q_D(HbView);
- setViewFlags(HbView::HbViewFlags((d->mViewFlags & statusBarFlagMask) | flags));
-}
-
-/*!
Sets the view flags bit vector. It consists of bits specified
in HbViewFlag. These flags can be set before the view is
added to the main window or while the view is active.
@@ -700,13 +717,13 @@
// Statusbar-animation
bool statusBarAnimating = false;
- HbStatusBar *statusBar = HbMainWindowPrivate::d_ptr(mainWindow())->mStatusBar;
- if ((d->mViewFlags & HbView::ViewStatusBarHidden) && statusBar->isVisible()) {
+ HbStatusBar *statusBar = HbMainWindowPrivate::d_ptr(mainWindow())->mStatusBar;
+ if ((d->mViewFlags & HbView::ViewStatusBarHidden) && !(originalFlags & HbView::ViewStatusBarHidden)) {
#ifdef HB_EFFECTS
HbEffect::start(statusBar, "statusbar", "disappear", this, "statusBarEffectFinished");
#endif // HB_EFFECTS
statusBarAnimating = true;
- } else if (!(d->mViewFlags & HbView::ViewStatusBarHidden) && !statusBar->isVisible()) {
+ } else if (!(d->mViewFlags & HbView::ViewStatusBarHidden) && (originalFlags & HbView::ViewStatusBarHidden)) {
#ifdef HB_EFFECTS
HbEffect::start(statusBar, "statusbar", "appear", this, "statusBarEffectFinished");
#endif // HB_EFFECTS
@@ -716,14 +733,14 @@
// Titlebar-animation
bool titleBarAnimating = false;
HbTitleBar *titleBar = HbMainWindowPrivate::d_ptr(mainWindow())->mTitleBar;
- if ((d->mViewFlags & HbView::ViewTitleBarHidden) && titleBar->isVisible()) {
+ if ((d->mViewFlags & HbView::ViewTitleBarHidden) && !(originalFlags & HbView::ViewTitleBarHidden)) {
#ifdef HB_EFFECTS
- HbEffect::start(titleBar, "titleBar", "disappear", this, "titleBarEffectFinished");
+ HbEffect::start(titleBar, "titlebar", "disappear", this, "titleBarEffectFinished");
#endif // HB_EFFECTS
titleBarAnimating = true;
- } else if (!(d->mViewFlags & HbView::ViewTitleBarHidden) && !titleBar->isVisible()) {
+ } else if (!(d->mViewFlags & HbView::ViewTitleBarHidden) && (originalFlags & HbView::ViewTitleBarHidden)) {
#ifdef HB_EFFECTS
- HbEffect::start(titleBar, "titleBar", "appear", this, "titleBarEffectFinished");
+ HbEffect::start(titleBar, "titlebar", "appear", this, "titleBarEffectFinished");
#endif // HB_EFFECTS
titleBarAnimating = true;
}
@@ -773,7 +790,12 @@
}
/*!
- Changes titlebar's visibility with pre-defined effect.
+ Changes the titlebar's visibility and uses the pre-defined effect.
+
+\note This is a convenience function which uses setViewFlags() to (un)set
+the HbView::ViewTitleBarHidden flag.
+
+\sa setViewFlags()
*/
void HbView::setTitleBarVisible(bool visible)
{
@@ -786,7 +808,12 @@
}
/*!
- Changes statusbar's visibility with pre-defined effect.
+ Changes the statusbar's visibility and uses the pre-defined effect.
+
+\note This is a convenience function which uses setViewFlags() to (un)set
+the HbView::ViewStatusBarHidden flag.
+
+\sa setViewFlags()
*/
void HbView::setStatusBarVisible(bool visible)
{
@@ -801,12 +828,15 @@
/*!
\overload
- The function adds \a action to preferred container's list of actions. The
- ownership of \a action is not transferred. The preferred container
- specifies the action container (options menu, toolbar) where the action is
- placed. If the container is the toolbar and the maximum toolbar button count
- is exceeded then the action may be moved to the options menu (if there are
- enough more prioritized actions).
+
+ 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)
{
@@ -816,7 +846,6 @@
}
/*!
- \reimp
*/
bool HbView::event(QEvent *event)
{
@@ -849,11 +878,11 @@
}
/*!
-Removes the HbMenu, which is set to view and returns it.
-The ownership of the \a HbMenu is transferred to the caller.
+Removes the menu from the view and returns it to the caller.
+Ownership of the menu is transferred to the caller.
-\note This function is particularly useful if one wants to switch between
-different views without deleting previous menu.
+\note This function is particularly useful if you want to switch between
+different views without deleting the menu.
\sa setMenu()
*/
@@ -868,6 +897,11 @@
menu->setParentItem(0);
}
+ // Titlebar must be informed
+ if (mainWindow()) {
+ HbMainWindowPrivate::d_ptr(mainWindow())->mTitleBar->propertiesChanged();
+ }
+
return menu;
}
@@ -877,13 +911,20 @@
*/
void HbView::titleBarEffectFinished(const HbEffect::EffectStatus &status)
{
- if (status.reason == Hb::EffectFinished || status.reason == Hb::EffectCancelled
- || status.reason == Hb::EffectNotStarted) {
- HbMainWindowPrivate::d_ptr(mainWindow())->mTitleBar->propertiesChanged();
- HbMainWindowPrivate::d_ptr(mainWindow())->mClippingItem->decoratorVisibilityChanged();
+ Q_D(HbView);
+
+ HbMainWindow *mw = mainWindow();
+
+ if (d->mNavigationActionSet) {
+ HbMainWindowPrivate::d_ptr(mw)->mTitleBar->setNavigationAction(d->mNavigationAction);
+ } else {
+ HbMainWindowPrivate::d_ptr(mw)->mTitleBar->setDefaultNavigationAction();
}
- if (mainWindow()) {
- HbTitleBar *titleBar = HbMainWindowPrivate::d_ptr(mainWindow())->mTitleBar;
+ HbMainWindowPrivate::d_ptr(mw)->mTitleBar->propertiesChanged();
+ HbMainWindowPrivate::d_ptr(mw)->mClippingItem->decoratorVisibilityChanged();
+
+ if (mw) {
+ HbTitleBar *titleBar = HbMainWindowPrivate::d_ptr(mw)->mTitleBar;
if (titleBar) {
if (status.effectEvent == "disappear") {
titleBar->setVisible(false);
@@ -895,21 +936,21 @@
}
/*
- Handles effect finished event for title bar animation
+ Handles the effect finished event for title bar animation
*/
void HbView::statusBarEffectFinished(const HbEffect::EffectStatus &status)
{
- HbStatusBar *statusBar = HbMainWindowPrivate::d_ptr(mainWindow())->mStatusBar;
+ HbMainWindow *mw = mainWindow();
+
+ HbStatusBar *statusBar = HbMainWindowPrivate::d_ptr(mw)->mStatusBar;
if (!statusBar) {
return;
}
- if (status.reason == Hb::EffectFinished || status.reason == Hb::EffectCancelled
- || status.reason == Hb::EffectNotStarted) {
- statusBar->propertiesChanged();
- HbMainWindowPrivate::d_ptr(mainWindow())->mClippingItem->decoratorVisibilityChanged();
- }
- if (mainWindow()) {
+ statusBar->propertiesChanged();
+ HbMainWindowPrivate::d_ptr(mw)->mClippingItem->decoratorVisibilityChanged();
+
+ if (mw) {
if (status.effectEvent == "disappear") {
statusBar->setVisible(false);
} else {
@@ -920,9 +961,10 @@
#endif // HB_EFFECTS
/*!
- Returns the currently set navigation action or 0 if there is none.
+ Returns the current navigation action. If no navigation action has been set, then
+ 0 is returned.
- If setNavigationAction() was not called before for this view at all then the
+ If setNavigationAction() has not been called for this view, then the
default action will be returned.
\sa setNavigationAction()
@@ -945,11 +987,11 @@
}
/*!
- Sets the navigation action, that is, the action that is associated with the
+ Sets the navigation action, i.e., the action associated with the
button that is typically located in the top-right corner. By default the
action is the "quit" action.
- \a action can also be 0 in which case the previous navigation action is
+ If you set the \a action to 0, the previous navigation action is
unset and no new one will be set.
Ownership of \a action is not taken.
--- a/src/hbcore/gui/hbview.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gui/hbview.h Fri May 14 16:09:54 2010 +0300
@@ -42,14 +42,11 @@
class HB_CORE_EXPORT HbView : public HbWidget
{
Q_OBJECT
- Q_ENUMS(HbTitleBarFlag)
- Q_FLAGS(HbTitleBarFlags)
Q_ENUMS(HbViewFlag)
Q_FLAGS(HbViewFlags)
Q_PROPERTY(QString title READ title WRITE setTitle)
Q_PROPERTY(HbIcon icon READ icon WRITE setIcon)
Q_PROPERTY(bool contentFullScreen READ isContentFullScreen WRITE setContentFullScreen)
- Q_PROPERTY(HbTitleBarFlags titleBarFlags READ titleBarFlags WRITE setTitleBarFlags)
public:
@@ -67,18 +64,6 @@
};
Q_DECLARE_FLAGS(HbViewFlags, HbViewFlag)
- // Deprecated
- enum HbTitleBarFlag
- {
- TitleBarFlagNone = 0,
- TitleBarMinimizable = 0x00000001,
- TitleBarMinimized = 0x00000002,
- TitleBarHidden = 0x00000004,
- TitleBarTransparent = 0x00000008,
- TitleBarFloating = 0x00000010
- };
- Q_DECLARE_FLAGS(HbTitleBarFlags, HbTitleBarFlag) // Deprecated
-
explicit HbView(QGraphicsItem *parent = 0);
virtual ~HbView();
@@ -108,11 +93,7 @@
bool isItemVisible(Hb::SceneItem item) const;
void setItemVisible(Hb::SceneItem item, bool visible);
- // Deprecated
- void unsetVisibleItems();
-
bool isContentFullScreen() const;
- HbTitleBarFlags titleBarFlags() const; // Deprecated
HbViewFlags viewFlags() const;
void setTitleBarVisible(bool visible);
void setStatusBarVisible(bool visible);
@@ -134,7 +115,6 @@
public slots:
void setTitle(const QString &title);
void setContentFullScreen(bool enable = true);
- void setTitleBarFlags(HbTitleBarFlags flags = TitleBarFlagNone); // Deprecated
void setViewFlags(HbViewFlags flags = ViewFlagNone);
signals:
@@ -161,6 +141,4 @@
Q_DISABLE_COPY(HbView)
};
-Q_DECLARE_OPERATORS_FOR_FLAGS(HbView::HbTitleBarFlags)
-
#endif // HBVIEW_H
--- a/src/hbcore/gui/hbview_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gui/hbview_p.h Fri May 14 16:09:54 2010 +0300
@@ -58,7 +58,6 @@
bool mVisibleItemsSet;
bool mFullscreen;
bool mVisited; //to be used by HbMainWindow for performance optimization
- HbView::HbTitleBarFlags mTitleBarFlags; // Deprecated
HbView::HbViewFlags mViewFlags;
HbViewActionManager *actionManager;
--- a/src/hbcore/gui/hbwidget.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gui/hbwidget.cpp Fri May 14 16:09:54 2010 +0300
@@ -28,7 +28,7 @@
#include "hbfocusgroup_p.h"
#include "hbevent.h"
#include "hbinstance.h"
-#include "hbstyleoption.h"
+#include "hbstyleoption_p.h"
#include "hbstyleparameters.h"
#include "hbgraphicsscene.h"
#include "hbgraphicsscene_p.h"
@@ -1367,43 +1367,3 @@
}
return primitive;
}
-
-/*!
-
- \deprecated HbWidget::overrideFeedback(Hb::InstantInteraction) const
- is deprecated. Effect overriding is done via properties.
-
- Default implementation of a virtual method for overriding instant feedback effects.
- Returns HbFeedback::NoOverride by default.
- Widgets can reimplement this method to override the default feedback effects (if
- there is a strong need not to use the default ones).
-
- \param interaction the interaction event triggered by the widget
-*/
-HbFeedback::InstantEffect HbWidget::overrideFeedback(Hb::InstantInteraction interaction) const {
- Q_UNUSED(interaction);
-
- return HbFeedback::NoOverride;
-}
-
-/*!
-
- \deprecated HbWidget::overrideContinuousFeedback(Hb::ContinuousInteraction, int*) const
- is deprecated. Effect overriding is done via properties.
-
- Default implementation of a virtual method for overriding continuous feedback effects.
- Returns HbFeedback::NoContinuousOverride by default.
- Widgets can reimplement this method to override the default continuous feedbacks
- and/or their intensity (if there is a strong need not to use the default ones).
-
- \param interaction the interaction event triggered by the widget
- \param intensity the default intensity of the effect; can be overriden to any value
- between HbFeedback::IntensityZero, HbFeedback::IntensityFull
-*/
-HbFeedback::ContinuousEffect HbWidget::overrideContinuousFeedback(Hb::ContinuousInteraction interaction, int *intensity) const {
- Q_UNUSED(interaction);
- Q_UNUSED(intensity);
-
- return HbFeedback::NoContinuousOverride;
-}
-
--- a/src/hbcore/gui/hbwidget.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gui/hbwidget.h Fri May 14 16:09:54 2010 +0300
@@ -120,9 +120,6 @@
void setBackgroundItem(QGraphicsItem *item, int zValue = -1);
QGraphicsItem *backgroundItem() const;
- virtual HbFeedback::InstantEffect overrideFeedback(Hb::InstantInteraction interaction) const; // deprecated
- virtual HbFeedback::ContinuousEffect overrideContinuousFeedback(Hb::ContinuousInteraction interaction, int *intensity) const; // deprecated
-
public slots:
virtual void recreatePrimitives();
virtual void updatePrimitives();
--- a/src/hbcore/gui/hbwidgetbase.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/gui/hbwidgetbase.cpp Fri May 14 16:09:54 2010 +0300
@@ -32,7 +32,7 @@
#include <hbeffect.h>
#include <hbeffectinternal_p.h>
#endif
-#include "hbstyleoption.h"
+#include "hbstyleoption_p.h"
#include "hbfontspec.h"
#include "hbwidgetbase.h"
#include "hbwidgetbase_p.h"
--- a/src/hbcore/hbcore.pro Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/hbcore.pro Fri May 14 16:09:54 2010 +0300
@@ -92,6 +92,11 @@
win32:INSTALLS += dlltarget
}
+contains(DEFINES, HB_HAVE_QT_MOBILITY) {
+ CONFIG += mobility
+ MOBILITY += publishsubscribe systeminfo
+}
+
#QMAKE_DISTCLEAN += $$hbNativePath($${HB_BUILD_DIR}/include/hbcore/*)
#QMAKE_DISTCLEAN += $$hbNativePath($${HB_BUILD_DIR}/include/hbcore/private/*)
@@ -100,6 +105,8 @@
TRANSLATIONS += i18n/translations/languages.ts
symbian {
+ defFilePath = defs
+
TARGET.EPOCALLOWDLLDATA = 1
TARGET.CAPABILITY = CAP_GENERAL_DLL
TARGET.UID3=0x20022EDC
@@ -178,6 +185,9 @@
BLD_INF_RULES.prj_exports += "$$section(PWD, ":", 1)/resources/centralrepository/2002C3AE.txt $${EPOCROOT}epoc32/data/z/private/10202BE9/2002C3AE.txt"
BLD_INF_RULES.prj_exports += "$$section(PWD, ":", 1)/resources/centralrepository/2002C3AE.txt $${EPOCROOT}epoc32/release/winscw/udeb/z/private/10202BE9/2002C3AE.txt"
BLD_INF_RULES.prj_exports += "$$section(PWD, ":", 1)/resources/centralrepository/2002C3AE.txt $${EPOCROOT}epoc32/release/winscw/urel/z/private/10202BE9/2002C3AE.txt"
+ BLD_INF_RULES.prj_exports += "$$section(PWD, ":", 1)/resources/centralrepository/20022E82.txt $${EPOCROOT}epoc32/data/z/private/10202BE9/20022E82.txt"
+ BLD_INF_RULES.prj_exports += "$$section(PWD, ":", 1)/resources/centralrepository/20022E82.txt $${EPOCROOT}epoc32/release/winscw/udeb/z/private/10202BE9/20022E82.txt"
+ BLD_INF_RULES.prj_exports += "$$section(PWD, ":", 1)/resources/centralrepository/20022E82.txt $${EPOCROOT}epoc32/release/winscw/urel/z/private/10202BE9/20022E82.txt"
}
hb_maemo_dui {
--- a/src/hbcore/i18n/hbextendedlocale.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/i18n/hbextendedlocale.cpp Fri May 14 16:09:54 2010 +0300
@@ -1705,7 +1705,7 @@
bool HbExtendedLocale::setStartOfWeek(WeekDay day)
{
#if defined(Q_OS_SYMBIAN)
- if((day < HbExtendedLocale::Monday) && (day > HbExtendedLocale::Monday ))
+ if((day < HbExtendedLocale::Monday) || (day > HbExtendedLocale::Sunday ))
return false;
_symbianLocale.LoadSystemSettings();
--- a/src/hbcore/i18n/hblanguageutil.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/i18n/hblanguageutil.cpp Fri May 14 16:09:54 2010 +0300
@@ -62,7 +62,7 @@
/*!
\brief Returns identifiers and localized names of all known languages.
- \return Localized names and integer identifiers of languages supported in a device
+ \return localized names and integer identifiers of languages supported in a device
*/
QHash<int, QString> readLanguageList()
{
@@ -107,6 +107,7 @@
\brief Changes the system UI language.
\param language identifier of the language
+ \return true if operation was successful
*/
bool setLocale( int language )
{
@@ -134,7 +135,7 @@
Language ID's returned by this functions may be used as language parameter for changeLanguage(int language) function.
Language IDs and names are OS specific and may vary across the platforms and releases.
- \return Localized names and integer identifiers of languages supported in a device
+ \return localized names and integer identifiers of languages supported in a device
*/
QHash<int, QString> HbLanguageUtil::supportedLanguages()
{
@@ -181,7 +182,7 @@
Language ID's returned by this functions may be used as language parameter for changeLanguage(int language) function.
Language IDs and names are OS specific and may vary across the platforms and releases.
- \return Localized names and integer identifiers of known languages
+ \return localized names and integer identifiers of known languages
*/
QHash<int, QString> HbLanguageUtil::allLanguages()
{
@@ -259,7 +260,7 @@
}
/*!
- \brief Returns ID of current language. Localized name
+ \brief Returns ID of current language.
\return identifier of current system language
*/
--- a/src/hbcore/i18n/hbtranslator.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/i18n/hbtranslator.cpp Fri May 14 16:09:54 2010 +0300
@@ -66,7 +66,7 @@
/*!
Searches translation file \a file from path \a path.
\code
- HbTranslator trans("/resource/qt/custom/", "customfile");
+ HbTranslator trans = new HbTranslator("/resource/qt/custom/", "customfile");
\endcode
*/
HbTranslator::HbTranslator(const QString &path, const QString &file): d(new HbTranslatorPrivate())
--- a/src/hbcore/image/hbframedrawer.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/image/hbframedrawer.cpp Fri May 14 16:09:54 2010 +0300
@@ -922,9 +922,9 @@
/*!
\internal
*/
-void HbFrameDrawerPrivate::reset( bool resetFrameCount )
+void HbFrameDrawerPrivate::reset(bool resetFrameCount, bool unloadedByServer)
{
- unLoadIcon();
+ unLoadIcon(unloadedByServer);
if ( resetFrameCount ) {
frameParts = 0;
}
@@ -1020,13 +1020,13 @@
return id;
}
-void HbFrameDrawerPrivate::unLoadIcon()
+void HbFrameDrawerPrivate::unLoadIcon(bool unloadedByServer)
{
HbIconLoader *loader = HbIconLoader::global();
if (icon) {
//If a consolidated (stitched) icon was created on the themeserver, then
//HbIconLoader::unloadIcon() is used to unload it.
- loader->unLoadIcon(icon->iconImpl());
+ loader->unLoadIcon(icon->iconImpl(),unloadedByServer);
icon->dispose();
icon = 0;
}
@@ -1054,6 +1054,26 @@
fallbackMaskableIconList.clear(); // vector of HbMaskableIconImpl*
}
+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) {
+ if (fallbackIcon && updatedFiles.contains(fallbackIcon->iconFileName())) {
+ unloadIcons = true;
+ break;
+ }
+ }
+ }
+
+ if (unloadIcons) {
+ unLoadIcon(true);
+ }
+}
+
/*! Constructs a new frame drawer item with the cacheFlag enabled by default.
*/
HbFrameDrawer::HbFrameDrawer(bool cacheFlag)
@@ -1287,7 +1307,10 @@
// Rasterize the frame parts now if that has not been done yet.
if (d->icon && (rect.toRect().size() != d->prevRect.size())) {
d->reset();
- }
+ }
+
+ // update the rendering mode
+ HbIconLoader::global()->updateRenderingMode(painter->paintEngine()->type());
d->prepareFrameIcon();
d->prevRect = rect.toRect();
// Paint the frame
@@ -1530,7 +1553,10 @@
*/
void HbFrameDrawer::themeChanged()
{
- d->reset();
+#ifndef HB_TOOL_INTERFACE
+ // This needs to be disabled to prevent full theme updates when using partial updates with tools.
+ d->reset(true, true);
+#endif
}
/*!
--- a/src/hbcore/image/hbframedrawer_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/image/hbframedrawer_p.h Fri May 14 16:09:54 2010 +0300
@@ -57,12 +57,14 @@
void paint(QPainter *painter);
- void reset( bool resetFrameCount = true );
+ void reset(bool resetFrameCount = true, bool unloadedByServer = false);
void resetMaskableIcon();
bool fillWholeRect() const;
QString multiPartIconId() const;
HbIconLoader::IconLoaderOptions iconLoaderOptions();
- void unLoadIcon();
+ void unLoadIcon(bool unloadedByServer = false);
+
+ void themeChange(const QStringList &updatedFiles);
private:
void calculateShrinkedNinePieceCorners(
--- a/src/hbcore/image/hbicon.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/image/hbicon.cpp Fri May 14 16:09:54 2010 +0300
@@ -809,7 +809,8 @@
/*!
* Equality operator. It compares the icon names for all the state and mode combinations.
-* The sizes set for the icons are not used for the comparison.
+* 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
{
@@ -818,7 +819,8 @@
/*!
* Inequality operator. It compares the icon names for all the state and mode combinations.
-* The sizes set for the icons are not used for the comparison.
+* 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
{
@@ -859,10 +861,16 @@
return true;
}
- if ( engine1->color() != engine2->color() )
+ if ( engine1->color() != engine2->color() ){
return true;
- else
- return false;
+ }
+
+ // two icons are considered different if their mirroring modes are different
+ if ( engine1->mirroringMode() != engine2->mirroringMode() ){
+ return true;
+ }
+
+ return false;
}
/*!
--- a/src/hbcore/image/hbiconanimationdatatypes_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/image/hbiconanimationdatatypes_p.h Fri May 14 16:09:54 2010 +0300
@@ -35,9 +35,7 @@
class HbIconAnimationData
{
public:
- HbIconAnimationData() : definitionFileName(0), def() {}
-public:
- QString *definitionFileName;
+ QString definitionFileName;
HbIconAnimationDefinition def;
};
--- a/src/hbcore/image/hbiconanimationmanager.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/image/hbiconanimationmanager.cpp Fri May 14 16:09:54 2010 +0300
@@ -65,12 +65,14 @@
bool HbIconAnimationManagerPrivate::addDefinitionFile(const QString &definitionFileName)
{
// Stop right away if the file has already been added.
- if (definitionFileNames.contains(definitionFileName)) {
- return true;
+ foreach (const QString &iconName, animations.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);
+ QString pathInTheme = HbIconLoader::global()->findSharedResource(definitionFileName, Hb::AnimationResource);
#ifdef HB_ICON_TRACES
qDebug() << definitionFileName << " => " << pathInTheme;
#endif
@@ -79,22 +81,17 @@
// realFileName will point to the name with the full path.
const QString *realFileName = pathInTheme.isEmpty() ? &definitionFileName : &pathInTheme;
- // Add filename in the list.
- definitionFileNames.append(definitionFileName);
- allDefNames.insert(definitionFileName);
-
// Parse the filename and add entries in the hash table, first try the themeserver.
- bool ret = parser.parseDefinitionFileShared(&definitionFileNames.last(),
+ bool ret = parser.parseDefinitionFileShared(definitionFileName,
animations, *realFileName);
if (!ret) {
// If themeserver did not return anything then try the file locally.
- ret = parser.parseDefinitionFile(&definitionFileNames.last(),
+ ret = parser.parseDefinitionFile(definitionFileName,
animations, *realFileName);
}
- // If parsing failed, remove the definition filename string from the list
- if (!ret) {
- definitionFileNames.removeLast();
+ if (ret) {
+ allDefNames.insert(definitionFileName);
}
return ret;
@@ -111,9 +108,8 @@
animations.remove(iconName);
// Add new definition
HbIconAnimationData data;
- data.definitionFileName = 0;
+ data.definitionFileName.clear();
data.def = definition;
-
animations.insert(iconName, data);
}
@@ -125,15 +121,13 @@
AnimHash::iterator i = animations.begin();
while (i != animations.end()) {
const HbIconAnimationData &data = *i;
- if (data.definitionFileName && *(data.definitionFileName) == definitionFileName) {
+ if (data.definitionFileName == definitionFileName) {
// Remove definition from hash and move iterator to next item
i = animations.erase(i);
} else {
++i;
}
}
- // Remove the filename string from the list also
- definitionFileNames.removeOne(definitionFileName);
}
/*!
@@ -150,7 +144,7 @@
HbIconAnimationDefinition HbIconAnimationManagerPrivate::getDefinition(const QString &iconName)
{
// This returns default constructed list if not found in hash
- return animations.value(iconName).def;
+ return animations.operator[](iconName).def;
}
/*!
@@ -212,16 +206,13 @@
// one).
foreach (const QString &iconName, animations.keys()) {
// Do not remove animations that were not created from files.
- if (animations.value(iconName).definitionFileName) {
+ if (!animations.operator[](iconName).definitionFileName.isEmpty()) {
animations.remove(iconName);
}
}
- definitionFileNames.clear();
- //
- // Cannot use definitionFileNames here because it is cleared upon every
- // theme change. Use allDefNames which contains all the names passed to
- // addDefinitionFile() since the creation of this instance. This enables to
- // work properly also in the following situation:
+ // Use allDefNames which contains all the names passed to
+ // addDefinitionFile() since the creation of this instance. This
+ // enables to work properly also in the following situation:
//
// 1. addDefinitionFile(somethingFromTheme)
//
--- a/src/hbcore/image/hbiconanimationmanager_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/image/hbiconanimationmanager_p.h Fri May 14 16:09:54 2010 +0300
@@ -30,7 +30,6 @@
#include "hbiconanimationparser_p.h"
#include "hbiconanimationdatatypes_p.h"
#include <hbglobal.h>
-#include <QStringList>
#include <QSet>
class HbForegroundWatcher;
@@ -76,8 +75,6 @@
HbIconAnimationParser parser;
- // Save some memory. Filenames are not duplicated in each item in AnimHash.
- QStringList definitionFileNames;
// Animation definitions are contained here
AnimHash animations;
--- a/src/hbcore/image/hbiconanimationparser.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/image/hbiconanimationparser.cpp Fri May 14 16:09:54 2010 +0300
@@ -47,7 +47,7 @@
}
bool HbIconAnimationParser::parseDefinitionFileShared(
- QString *fileName, AnimHash &animations, const QString &realFileName)
+ const QString &fileName, AnimHash &animations, const QString &realFileName)
{
#ifdef HB_ICON_TRACES
qDebug() << "HbIconAnimationParser: Trying to get" << realFileName << "via themeserver";
@@ -70,7 +70,7 @@
}
bool HbIconAnimationParser::parseDefinitionFile(
- QString *fileName, AnimHash &animations, const QString &realFileName)
+ const QString &fileName, AnimHash &animations, const QString &realFileName)
{
QFile file(realFileName);
@@ -96,7 +96,7 @@
}
bool HbIconAnimationParser::doParseFile(
- QString *fileName, AnimHash &animations)
+ const QString &fileName, AnimHash &animations)
{
bool ret = false;
@@ -122,7 +122,7 @@
* Returns true if at least one animation definition was added in the hash.
*/
bool HbIconAnimationParser::readAnimations(
- QString *fileName, AnimHash &animations)
+ const QString &fileName, AnimHash &animations)
{
Q_ASSERT(isStartElement() && name() == "animations");
--- a/src/hbcore/image/hbiconanimationparser_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/image/hbiconanimationparser_p.h Fri May 14 16:09:54 2010 +0300
@@ -39,12 +39,12 @@
HbIconAnimationParser();
~HbIconAnimationParser();
- bool parseDefinitionFileShared(QString *fileName, AnimHash &animations, const QString &realFileName);
- bool parseDefinitionFile(QString *fileName, AnimHash &animations, const QString &realFileName);
+ bool parseDefinitionFileShared(const QString &fileName, AnimHash &animations, const QString &realFileName);
+ bool parseDefinitionFile(const QString &fileName, AnimHash &animations, const QString &realFileName);
private:
- bool doParseFile(QString *fileName, AnimHash &animations);
- bool readAnimations(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/hbiconengine.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/image/hbiconengine.cpp Fri May 14 16:09:54 2010 +0300
@@ -723,13 +723,13 @@
d->appendLoadFail(mode, state);
}
}
- if (d->icon){
+ if (d->icon) {
+ d->pixmap = d->icon->pixmap();
// Draw badges on this pixmap
QPainter painter(&d->pixmap);
if (d->badgeInfo){
d->badgeInfo->paint(&painter, QRectF(QPointF(0, 0), pixelSize), mode, state, d->isMirrored());
}
- d->pixmap = d->icon->pixmap();
return d->pixmap;
}
}
@@ -794,11 +794,14 @@
{
// This method is called by QIcon and it should paint the icon with the size defined by 'rect'.
HbIconImpl* icon = NULL;
+
+ // update the rendering mode
+ HbIconLoader::global()->updateRenderingMode(painter->paintEngine()->type());
+
icon = paintHelper(rect.size(), Qt::KeepAspectRatio, mode, state);
if (icon){
icon->paint(painter, rect, Qt::AlignCenter);
- HbIconLoader *loader = HbIconLoader::global();
- loader->unLoadIcon(icon);
+ HbIconLoader::global()->unLoadIcon(icon);
icon->dispose();
}
@@ -855,6 +858,8 @@
d->state = state;
// 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());
d->icon = paintHelper(s, aspectRatioMode, mode, state);
if ( d->icon && d->icon->isCreatedOnServer() ) {
d->iconType = d->icon->iconData().type;
--- a/src/hbcore/image/hbiconimpl_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/image/hbiconimpl_p.h Fri May 14 16:09:54 2010 +0300
@@ -51,7 +51,8 @@
const QSizeF& keySize,
Qt::AspectRatioMode aspectRatioMode,
QIcon::Mode mode,
- bool mirrored):
+ bool mirrored,
+ HbRenderingMode renderMode):
sharedIconData(iconData),
fileName(name),
cacheKeySize(keySize),
@@ -61,7 +62,9 @@
defaultIconSize(QSize(0,0)),
createdOnServer(true),
iconRefCount(1),
- multiPieceIcon(false)
+ multiPieceIcon(false),
+ renderMode(renderMode)
+
{
}
@@ -154,6 +157,11 @@
{
Q_UNUSED(data);
}
+
+ HbRenderingMode iconRenderingMode() const
+ {
+ return renderMode;
+ }
protected:
virtual ~HbIconImpl()
@@ -171,6 +179,7 @@
uint iconRefCount;
QColor iconColor;
bool multiPieceIcon;
+ HbRenderingMode renderMode;
};
#endif // HBICONIMPL_P_H
--- a/src/hbcore/image/hbiconimplcreator_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/image/hbiconimplcreator_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -52,7 +52,8 @@
params.size,
params.aspectRatioMode,
params.mode,
- (params.mirrored && !params.mirroredIconFound));
+ (params.mirrored && !params.mirroredIconFound),
+ params.renderMode);
#endif
break;
case SGIMAGE:
@@ -62,7 +63,8 @@
params.size,
params.aspectRatioMode,
params.mode,
- (params.mirrored && !params.mirroredIconFound));
+ (params.mirrored && !params.mirroredIconFound),
+ params.renderMode);
#endif
break;
case OTHER_SUPPORTED_FORMATS:
@@ -71,7 +73,8 @@
params.size,
params.aspectRatioMode,
params.mode,
- (params.mirrored && !params.mirroredIconFound));
+ (params.mirrored && !params.mirroredIconFound),
+ params.renderMode);
break;
default:
break;
--- a/src/hbcore/image/hbiconimplcreator_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/image/hbiconimplcreator_p.h Fri May 14 16:09:54 2010 +0300
@@ -59,6 +59,8 @@
QString iconFileName;
// Pixmap where the icon is rasterized
QPixmap canvasPixmap;
+ // Icon's rendering mode ( Hardware / Software )
+ HbRenderingMode renderMode;
};
class HB_AUTOTEST_EXPORT HbIconImplCreator
--- a/src/hbcore/image/hbiconloader.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/image/hbiconloader.cpp Fri May 14 16:09:54 2010 +0300
@@ -24,6 +24,7 @@
****************************************************************************/
#include <hbiconloader_p.h>
+#include "hbthemecommon_p.h"
#include <QDir>
#include <QCoreApplication>
@@ -112,9 +113,10 @@
/* This method is supposed to work the same way
as the FindIconHelper in the Icon Theme Spec: */
- static QString findIconHelper(const QString &iconName,
+ static QString findSharedResourceHelper(const QString &resourceName,
bool mirrored,
bool& mirroredIconFound,
+ Hb::ResourceType itemType = Hb::IconResource,
bool useThemeIndex = true);
static QString findEffectHelper(const QString &effectName);
@@ -130,22 +132,13 @@
Qt::AspectRatioMode aspectRatioMode,
QIcon::Mode mode,
bool mirrored,
- const QColor &color);
+ const QColor &color,
+ HbRenderingMode renderMode);
#endif
-private:
- void createMirroredList();
-
public: // data
QString storedTheme;
- /*
- * List of icons that should be mirrored automatically in a mirrored layout.
- * This is initially read from a config file "mirrored.txt".
- */
- QStringList mirroredList;
- bool mirroredListCreated;
-
int sourceResolution;
int resolution;
qreal zoom;
@@ -173,7 +166,6 @@
HbIconLoaderPrivate::HbIconLoaderPrivate() :
storedTheme(HbTheme::instance()->name()),
- mirroredListCreated(false),
sourceResolution(144), // This is about the resolution of a Nokia N95 8GB
resolution(144),
zoom(1.0),
@@ -233,103 +225,62 @@
return suffix;
}
-QString HbIconLoaderPrivate::findIconHelper(const QString &iconName, bool mirrored, bool& mirroredIconFound, bool useThemeIndex)
+QString HbIconLoaderPrivate::findSharedResourceHelper(const QString &resourceName, bool mirrored, bool& mirroredIconFound, Hb::ResourceType itemType, bool useThemeIndex)
{
Q_UNUSED(useThemeIndex)
+ Q_UNUSED(itemType)
mirroredIconFound = false;
QString iconPath;
- if (QDir::isRelativePath(iconName)) {
- bool themeIndexUsed = false;
+ if (QDir::isRelativePath(resourceName)) {
#ifdef Q_OS_SYMBIAN
// Try to get themed icon information from theme index
- ThemeIndexTables &themeIndex = hbInstance->theme()->d_ptr->themeIndex;
- // Check if there is a valid theme index
- if (useThemeIndex && themeIndex.isValid()) {
- themeIndexUsed = true;
-
- int tableIndex;
- const HbThemeIndexItem *item = themeIndex.getItem(iconName, tableIndex);
-
- if (item) {
- const char *baseAddress = reinterpret_cast<const char *>(themeIndex.tables[tableIndex]);
-
- QString fullfilename;
-
- // Add drive letter of the used theme if the path does not point to a QT resource
- if (*(baseAddress + item->folderOffset) != ':') {
- fullfilename.append(themeIndex.drives[tableIndex]);
- fullfilename.append(':');
- }
- // Add folder
- fullfilename.append(baseAddress + item->folderOffset);
-
- if (mirrored) {
- if (item->mirroredExtOffset >= 0) {
- mirroredIconFound = true;
-
- fullfilename.append("mirrored\\");
- fullfilename.append(iconName);
- fullfilename.append(baseAddress + item->mirroredExtOffset);
-
- #ifdef THEME_INDEX_TRACES
- qDebug() << "ThemeIndex: Resolved icon filename:" << fullfilename.toUtf8();
- #endif
-
- return fullfilename;
- }
- }
-
- fullfilename.append(iconName);
- fullfilename.append(baseAddress + item->extOffset);
-
- #ifdef THEME_INDEX_TRACES
- qDebug() << "ThemeIndex: Resolved icon filename:" << fullfilename.toUtf8();
- #endif
-
- return fullfilename;
+ HbThemeIndexResource resource(resourceName);
+ if (resource.isValid()) {
+ if (mirrored) {
+ return resource.fullMirroredFileName();
+ } else {
+ return resource.fullFileName();
}
}
#endif // Q_OS_SYMBIAN
// If there was no theme index, search the icon in theme icon dirs (slow)
- if (!themeIndexUsed) {
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" + '/' + iconName, Hb::IconResource );
- if( !iconPath.isEmpty() ) {
- mirroredIconFound = true;
- break;
- }
- }
-
- iconPath = HbStandardDirs::findResource( dir + iconName, Hb::IconResource );
-
- // If the file was found in this dir, return the filename.
- if ( !iconPath.isEmpty() ) {
+ 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 {
// Absolute path. Do not scan through different theme directories.
- QString iconNameCopy(iconName);
+ QString iconNameCopy(resourceName);
if (mirrored) {
// If icon is mirrored, try to find the icon in a separate "mirrored" folder used for mirrored icons
// Find the directory part from the full filename
- int index1 = iconName.lastIndexOf('/');
- int index2 = iconName.lastIndexOf('\\');
-
+ int index1 = resourceName.lastIndexOf('/');
+ int index2 = resourceName.lastIndexOf('\\');
+
int index = index1 > index2 ? index1 : index2;
- QString iconNameCopy(iconName);
+ QString iconNameCopy(resourceName);
if (index > 0) {
- iconNameCopy.insert(index+1, QString("mirrored\\"));
+ iconNameCopy.insert(index+1, QString("mirrored/"));
}
iconPath = HbStandardDirs::findResource(iconNameCopy, Hb::IconResource);
@@ -338,8 +289,8 @@
return iconPath;
}
}
-
- iconPath = HbStandardDirs::findResource(iconName, Hb::IconResource);
+
+ iconPath = HbStandardDirs::findResource(resourceName, Hb::IconResource);
}
return iconPath;
@@ -480,15 +431,17 @@
bool HbIconLoaderPrivate::isAutomaticallyMirrored(const QString &iconName)
{
- if (!mirroredListCreated) {
- // Read the list of the mirrored icons from a file.
- createMirroredList();
- mirroredListCreated = true;
- }
+ 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
- // Check if the given icon name is found in the list of mirrored icons
- QList<QString>::const_iterator j = qBinaryFind(mirroredList, iconName);
- return (j != mirroredList.constEnd());
+ return false;
}
bool HbIconLoaderPrivate::isLayoutMirrored()
@@ -512,85 +465,12 @@
layoutMirrored = mirrored ? Mirrored : NotMirrored;
}
-void HbIconLoaderPrivate::createMirroredList()
-{
- /* Todo: mirrored.txt will be refactored
- // Find mirrored.txt file
- QString filename = HbStandardDirs::findResource("themes/themes/mirrored.txt", Hb::ThemeResource);
- if (filename.endsWith("mirrored.txt")) {
- // Try to read file
- QFile file(filename);
- if (file.open(QIODevice::ReadOnly)) {
- QString line;
-
- while(!file.atEnd()) {
- QByteArray dirtyLine = file.readLine();
- line = QString(dirtyLine).trimmed();
- // Skip empty lines and comment lines
- if (line.isEmpty() || line.at(0) == '#') {
- continue;
- }
- mirroredList.append(line);
- }
-
- // Sort the list
- qSort(mirroredList.begin(), mirroredList.end());
- }
- }
- */
- // button
- mirroredList << "qtg_fr_btn_normal" << "qtg_fr_btn_pressed" << "qtg_fr_btn_latched" << "qtg_fr_btn_highlight";
- mirroredList << "qtg_fr_btn_latched_highlight" << "qtg_fr_btn_disabled";
-
- // form
- mirroredList << "qtg_fr_form_value";
-
- // grid
- mirroredList << "qtg_fr_grid_normal" << "qtg_fr_grid_highlight" << "qtg_fr_grid_pressed";
-
- // list
- mirroredList << "qtg_fr_list_normal" << "qtg_fr_list_highlight" << "qtg_fr_list_pressed" << "qtg_fr_list_parent_normal";
- mirroredList << "qtg_fr_convlist_sent_normal" << "qtg_fr_convlist_sent_highlight" << "qtg_fr_convlist_sent_pressed";
- mirroredList << "qtg_fr_convlist_received_normal" << "qtg_fr_convlist_received_highlight" << "qtg_fr_convlist_received_pressed";
-
- // popup
- mirroredList << "qtg_fr_popup_list_normal" << "qtg_fr_popup_list_pressed" << "qtg_fr_popup_list_highlight" << "qtg_fr_popup_list_parent_normal";
- mirroredList << "qtg_fr_popup_grid_normal" << "qtg_fr_popup_grid_pressed" << "qtg_fr_popup_grid_highlight" << "qtg_graf_dimming_image";
- mirroredList << "qtg_fr_popup" << "qtg_fr_popup_secondary" << "qtg_fr_popup_preview";
-
- // progressive slider
- mirroredList << "qtg_fr_progslider_frame" << "qtg_fr_progslider_pressed" << "qtg_fr_progslider_loaded";
- mirroredList << "qtg_fr_progslider_played" << "qtg_graf_progslider_handle_normal" << "qtg_graf_progslider_handle_pressed";
-
- // slider
- mirroredList << "qtg_fr_slider_v_frame" << "qtg_fr_slider_v_filled" << "qtg_graf_slider_v_handle_normal" << "qtg_graf_slider_v_tick_minor";
- mirroredList << "qtg_graf_slider_v_tick_major" << "qtg_fr_slider_h_frame" << "qtg_fr_slider_h_filled" << "qtg_graf_slider_h_handle_normal";
- mirroredList << "qtg_graf_slider_h_tick_minor" << "qtg_graf_slider_h_tick_major";
-
- // tabs
- mirroredList << "qtg_fr_tab_active" << "qtg_fr_tab_passive_normal" << "qtg_fr_tab_passive_pressed" << "qtg_fr_tab_mask";
-
- // toolbar
- mirroredList << "qtg_fr_tb_h_normal" << "qtg_fr_tb_h_pressed" << "qtg_fr_tb_h_latched" << "qtg_fr_tb_h_disabled";
- mirroredList << "qtg_fr_tb_v_normal" << "qtg_fr_tb_v_pressed" << "qtg_fr_tb_v_latched" << "qtg_fr_tb_v_disabled";
-
- // toolbar extension
- mirroredList << "qtg_fr_tb_ext";
-
- // scrollbar
- mirroredList << "qtg_fr_scroll_v_handle" << "qtg_fr_scroll_v_frame" << "qtg_fr_scroll_h_handle" << "qtg_fr_scroll_h_frame";
-
- // status pane
- mirroredList << "qtg_fr_status_normal" << "qtg_fr_status_pressed" << "qtg_fr_status_latched" << "qtg_indi_status_options";
-
- qSort(mirroredList.begin(), mirroredList.end());
-}
-
#ifdef HB_ICONIMPL_CACHE
QByteArray HbIconLoaderPrivate::createCacheKeyFrom(const QString &iconName, const QSizeF &size,
- Qt::AspectRatioMode aspectRatioMode, QIcon::Mode mode, bool mirrored, const QColor &color)
+ Qt::AspectRatioMode aspectRatioMode, QIcon::Mode mode, bool mirrored, const QColor &color,
+ HbRenderingMode renderMode)
{
- static const int paramArraySize = 7;
+ static const int paramArraySize = 8;
// This uses QByteArray to improve performance compared to QString.
// It allows appending stuff with less heap allocations and conversions compared to using QString.
@@ -616,6 +496,8 @@
temp[6] = 0;
}
+ // Append render mode when creating cache key
+ temp[7] = renderMode;
cacheKey.append((char*)&(temp[0]), sizeof(int)*paramArraySize);
const QChar *iconNamePtr = iconName.constData();
@@ -635,11 +517,19 @@
setObjectName( appName );
d = new HbIconLoaderPrivate();
+ // Set default rendering mode to EHWRendering
+ renderMode = EHWRendering;
+
// Delete the icon loader when the application is destroyed.
connect(QCoreApplication::instance(), SIGNAL(aboutToQuit()), this, SLOT(destroy()));
connect(HbLayoutDirectionNotifier::instance(), SIGNAL(layoutDirectionChangeStarted()),
this, SLOT(updateLayoutDirection()));
+
+#ifdef HB_TOOL_INTERFACE
+ // This enables partial theme updates.
+ connect(&hbInstance->theme()->d_ptr->iconTheme, SIGNAL(iconsUpdated(QStringList)), this, SLOT(themeChange(QStringList)));
+#endif
}
HbIconLoader::~HbIconLoader()
@@ -691,30 +581,24 @@
// TODO: change this to simpler function call in Symbian OS env
if (QDir::isRelativePath(iconName)) {
#ifdef Q_OS_SYMBIAN
-
- // Try to get themed icon default size from theme index
- ThemeIndexTables &themeIndex = hbInstance->theme()->d_ptr->themeIndex;
- // Check if there is a valid theme index
- if (themeIndex.isValid()) {
- int tableIndex;
- const HbThemeIndexItem *item = themeIndex.getItem(iconName, tableIndex);
- if (item) {
- if (params.mirrored && item->mirroredDefaultSize.isValid()) {
- size = item->mirroredDefaultSize;
- } else {
- size = item->defaultSize;
- }
+ // Try to get themed icon information from theme index
+ HbThemeIndexResource resource(iconName);
+ if (resource.isValid()) {
+ // Try to get themed icon default size from theme index
+ if (params.mirrored && resource.mirroredItemSize().isValid()) {
+ size = resource.mirroredItemSize();
+ } 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);
- }
-
+ // 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
+#endif
} else { // Absolute path, use it directly without resolving anything.
params.iconFileName = iconName;
}
@@ -779,7 +663,7 @@
foreach (const QString &suffix, suffixList) {
bool dummy = false;
- QString path = HbIconLoaderPrivate::findIconHelper(name + suffix, false, dummy);
+ QString path = HbIconLoaderPrivate::findSharedResourceHelper(name + suffix, false, dummy);
if (path.isEmpty()) {
found = false;
break;
@@ -825,6 +709,11 @@
size = size * (qreal)(d->resolution) / (qreal)(d->sourceResolution) * d->zoom;
}
+void HbIconLoader::themeChange(const QStringList &updatedFiles)
+{
+ foreach (HbFrameDrawerPrivate *frameDrawer, this->frameDrawerInstanceList) frameDrawer->themeChange(updatedFiles);
+}
+
void HbIconLoader::destroy()
{
if (theLoader) {
@@ -897,12 +786,8 @@
/*!
\internal
- This is a wrapper for findIconHelper() (when the resource type is
- Hb::EffectIcon). It is used for getting AXML and other content from the
- themeserver.
-
- If \a resType is Hb::EffectResource then the file is searched among the
- effects in the theme.
+ This is a wrapper for findSharedResourceHelper(). It is used for getting
+ resources from the themeserver.
The return value is either same as \a name, when the file is not found in the
theme, or the full path and name to the file found in the theme. In certain
@@ -912,24 +797,7 @@
QString HbIconLoader::findSharedResource(const QString &name, Hb::ResourceType resType)
{
bool temp;
- if (resType == Hb::EffectResource) {
- QMap<int, QString> effectHier = HbThemeUtils::constructHierarchyListWithPathInfo(
- name, HbTheme::instance()->name(), Hb::EffectResource);
- HbStandardDirs::findResourceList(effectHier, Hb::EffectResource);
-
- // Just take the first value from the map. (note that maps are sorted by the key)
- foreach (const QString &file, effectHier) {
- return file;
- }
-
- // The map was empty, return empty string.
- return QString();
- } else {
- // Assume icon case (png, svg, axml, etc.)
-
- // TODO: theme index does not support currently axmls, so setting 'useThemeIndex' parameter to false
- return HbIconLoaderPrivate::findIconHelper(name, false, temp, false);
- }
+ return HbIconLoaderPrivate::findSharedResourceHelper(name, false, temp, resType);
}
/*!
@@ -986,8 +854,9 @@
// 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.iconName.startsWith(':')) {
+ && format != "GIF"
+ && !params.iconFileName.startsWith(':'))
+ {
QSizeF defSize = HbThemeClient::global()->getSharedIconDefaultSize(params.iconFileName);
if (defSize.isValid()) {
return defSize;
@@ -1099,7 +968,7 @@
QString HbIconLoader::resolveIconFileName(HbIconLoadingParams ¶ms)
{
// Search in theme (assume that we received a logical icon name).
- QString iconPath = d->findIconHelper(params.cleanIconName, params.mirrored, params.mirroredIconFound);
+ QString iconPath = d->findSharedResourceHelper(params.cleanIconName, params.mirrored, params.mirroredIconFound);
bool iconFound = !iconPath.isEmpty();
#ifdef HB_ICON_TRACES
qDebug() << params.cleanIconName << " => " << iconPath;
@@ -1114,7 +983,7 @@
// Use the 'unknown' icon, if needed, when the queried icon was not found.
if (!iconFound) {
if (params.options.testFlag(ReturnUnknownIcon)) {
- iconPath = d->findIconHelper(s_unknown, false, params.mirroredIconFound);
+ iconPath = d->findSharedResourceHelper(s_unknown, false, params.mirroredIconFound);
}
}
@@ -1145,7 +1014,8 @@
params.mode,
(params.mirrored && !params.mirroredIconFound),
params.options,
- params.color);
+ params.color,
+ params.renderMode);
//Creates HbIconImpl instance based on the type of data returned by themeserver.
//HbIconImpl thus created could be any one of the following impl-types:
@@ -1384,6 +1254,45 @@
}
/*!
+ * \fn void HbIconLoader::switchRenderingMode()
+ *
+ * This function gets notified when the rendering mode of the application changes e.g
+ * ( Hardware - Software rendering or vice versa ). If the mode is changed from
+ * Hardware to Software, all Hardware rendered icons will release the GPU resources.
+ * This function also initiates an IPC call to ThemeServer, so that the server
+ * can do its part of cleanup.
+ * \a newRenderMode new rendering mode of application
+ */
+
+void HbIconLoader::switchRenderingMode(HbRenderingMode newRenderMode)
+{
+#ifndef Q_OS_SYMBIAN
+ Q_UNUSED(newRenderMode)
+#endif
+
+#if defined(HB_SGIMAGE_ICON) || defined(HB_NVG_CS_ICON)
+ if (newRenderMode != renderMode) {
+ if (newRenderMode == ESWRendering) {
+ // switching from HW to SW mode
+ freeGpuIconData();
+ }
+ if (HbThemeClient::global()->switchRenderingMode(newRenderMode)) {
+ renderMode = newRenderMode;
+ }
+ }
+#endif
+}
+
+void HbIconLoader::updateRenderingMode(QPaintEngine::Type type)
+{
+ if (type == QPaintEngine::OpenVG) {
+ renderMode = EHWRendering;
+ } else {
+ renderMode = ESWRendering;
+ }
+}
+
+/*!
* \fn HbIconImpl* HbIconLoader::loadIcon()
*
* This function is responsible for loading a single-piece icon .
@@ -1443,6 +1352,7 @@
params.animationCreated = false;
params.mirroringHandled = false;
params.modeHandled = false;
+ params.renderMode = renderMode;
resolveCleanIconName(params);
// Step 1: Check if the icon has animation definition
@@ -1474,7 +1384,7 @@
#ifdef HB_ICONIMPL_CACHE
QByteArray cacheKey = d->createCacheKeyFrom( params.iconName, params.size, params.aspectRatioMode,
- params.mode, params.mirrored, params.color );
+ params.mode, params.mirrored, params.color, params.renderMode );
//look up in the local iconImplCache.
//If found return the ptr directly
if (iconImplCache.contains(cacheKey)) {
@@ -1619,7 +1529,7 @@
#if defined(HB_ICONIMPL_CACHE)
QByteArray cacheKey = d->createCacheKeyFrom(multiPartIconData.multiPartIconId, size,
- aspectRatioMode, mode, mirrored, color);
+ 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);
@@ -1635,7 +1545,7 @@
QStringList iconPathList;
for (int i = 0; i < listOfIcons.count(); i++) {
- QString path = d->findIconHelper(listOfIcons.at(i), mirrored, mirroredIconFound);
+ QString path = d->findSharedResourceHelper(listOfIcons.at(i), mirrored, mirroredIconFound);
if (!path.isEmpty()) {
iconPathList.append(path);
} else {
@@ -1651,7 +1561,7 @@
//the consolidated icon on themeserver
iconInfo = HbThemeClient::global()->getMultiPartIconInfo(iconPathList,
multiPartIconData, size, aspectRatioMode, mode,
- (mirrored && !mirroredIconFound), options, color);
+ (mirrored && !mirroredIconFound), options, color, renderMode);
#ifdef HB_ICON_TRACES
qDebug() << "HbIconLoader::getMultiPartIconInfo, offset from server: " << iconInfo.pixmapData.offset << iconPathList;
@@ -1707,7 +1617,8 @@
color,
HbIconLoader::AnyType,
HbIconLoader::AnyPurpose,
- multiPieceImpls);
+ multiPieceImpls,
+ renderMode);
#else
//For OS other than Symbian, call HbIconLoader::loadIcon to individually load icons
for (int i = 0; i < count; i++) {
@@ -1745,8 +1656,9 @@
icon->iconAspectRatioMode(),
icon->iconMode(),
icon->isMirrored(),
- icon->color()
- );
+ icon->color(),
+ icon->iconRenderingMode()
+ );
}
#ifdef HB_ICONIMPL_CACHE
int rem = iconImplCache.remove(iconImplCache.key(icon));
@@ -1798,15 +1710,16 @@
const QColor &color,
HbIconLoader::IconDataType type,
HbIconLoader::Purpose,
- QVector<HbIconImpl *> & iconImplList)
+ QVector<HbIconImpl *> & iconImplList,
+ HbRenderingMode currRenderMode)
{
- Q_UNUSED(type);
- QVector<int> posList;
+ Q_UNUSED(type);
+ QVector<int> posList;
#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 );
+ mode, mirrored, color, currRenderMode );
//look up in the local iconImplCache.
//If found return the ptr directly
HbIconImpl * ptr = 0;
@@ -1838,7 +1751,7 @@
int count = multiPartIconList.count();
if (count > 0) {
HbSharedIconInfoList iconInfoList = HbThemeClient::global()->getMultiIconInfo(multiPartIconList, sizeList,
- aspectRatioMode, mode, mirrored, options, color);
+ aspectRatioMode, mode, mirrored, options, color, currRenderMode);
HbIconImpl* impl = 0;
@@ -1859,7 +1772,7 @@
#ifdef HB_ICONIMPL_CACHE
QByteArray cacheKey = d->createCacheKeyFrom(multiPartIconList[i], sizeList.at(i) , aspectRatioMode,
- mode, mirrored, color);
+ 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();
@@ -1927,7 +1840,8 @@
multiPieceImpls[0]->iconAspectRatioMode(),
multiPieceImpls[0]->iconMode(),
multiPieceImpls[0]->isMirrored(),
- multiPieceImpls[0]->color()
+ multiPieceImpls[0]->color(),
+ multiPieceImpls[0]->iconRenderingMode()
);
}
}
--- a/src/hbcore/image/hbiconloader_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/image/hbiconloader_p.h Fri May 14 16:09:54 2010 +0300
@@ -33,6 +33,7 @@
#include <QStringList>
#include <QIcon> //krazy:exclude=qclasses
#include <QFlags>
+#include <QPaintEngine>
class HbFrameDrawerPrivate;
class HbIconLoaderPrivate;
@@ -137,7 +138,8 @@
QString findSharedResource(const QString &name,
Hb::ResourceType resType = Hb::IconResource);
-
+ void switchRenderingMode(HbRenderingMode newRenderMode);
+ void updateRenderingMode(QPaintEngine::Type type);
void storeIconEngineInfo( HbIconEngine *iconEngine );
void removeIconEngineInfo( HbIconEngine *iconEngine );
@@ -153,6 +155,7 @@
void defaultSizeAdjustmentChanged();
private slots:
+ void themeChange( const QStringList &updatedFiles );
void destroy();
void updateLayoutDirection();
@@ -172,7 +175,8 @@
const QColor &color,
HbIconLoader::IconDataType type,
HbIconLoader::Purpose,
- QVector<HbIconImpl *> & iconImplList);
+ QVector<HbIconImpl *> & iconImplList,
+ HbRenderingMode renderMode);
void loadSvgIcon(HbIconLoadingParams ¶ms);
void loadPictureIcon(HbIconLoadingParams ¶ms);
@@ -187,6 +191,7 @@
private:
Q_DISABLE_COPY (HbIconLoader)
HbIconLoaderPrivate *d;
+ HbRenderingMode renderMode;
};
Q_DECLARE_OPERATORS_FOR_FLAGS(HbIconLoader::IconLoaderOptions)
--- a/src/hbcore/image/hbnvgiconimpl_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/image/hbnvgiconimpl_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -42,6 +42,12 @@
#include "hbvgimageiconrenderer_p.h"
#include "hbpixmapiconrenderer_p.h"
+#define EGL_DESTROY_SURFACE(display, surface) \
+ if (surface != EGL_NO_SURFACE) { eglDestroySurface(display, surface); }
+
+#define EGL_DESTROY_CONTEXT(display, context) \
+ if (context != EGL_NO_CONTEXT) { eglDestroyContext(display, context); }
+
// Constants
static const int HB_BITS_PER_COLOR = 8;
@@ -50,13 +56,15 @@
const QSizeF& keySize,
Qt::AspectRatioMode aspectRatioMode,
QIcon::Mode mode,
- bool mirrored):
+ bool mirrored,
+ HbRenderingMode renderMode):
HbIconImpl(iconData,
name,
keySize,
aspectRatioMode,
mode,
- mirrored),
+ mirrored,
+ renderMode),
readyToRender(false),
specialCaseApplied(false),
nvgEngine(NULL),
@@ -181,7 +189,7 @@
QSize iconSize(width, height);
- vgSeti(VG_RENDERING_QUALITY, VG_RENDERING_QUALITY_BETTER);
+ vgSeti(VG_RENDERING_QUALITY, VG_RENDERING_QUALITY_FASTER);
HbNvgEngine::HbNvgErrorType errorType = drawNVGIcon(iconSize, *nvgEngine);
@@ -250,7 +258,7 @@
return currentPixmap;
}
- if (currentWriteSurface == EGL_NO_SURFACE) {
+ if (currentReadSurface == EGL_NO_SURFACE) {
//pixmap is called without EGL being initialized
const EGLint attribList2[] = {
@@ -269,11 +277,27 @@
VGImage surfaceImage;
HbNvgEngine localNvgEngine;
+ EGLContext newContext = EGL_NO_CONTEXT;
+ if (eglContext == EGL_NO_CONTEXT) {
+ newContext = eglCreateContext(display, config, EGL_NO_CONTEXT, 0);
+ 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_CONTEXT(display, newContext);
+ return currentPixmap;
+ }
+
surfaceImage = createVGImageFromNVG(display,
dummySurface,
dummySurface,
- eglContext,
+ newContext,
width,
height,
true,
@@ -290,22 +314,30 @@
}
if (surfaceImage == VG_INVALID_HANDLE) {
+ EGL_DESTROY_SURFACE(display, dummySurface);
+ EGL_DESTROY_CONTEXT(display, newContext);
return currentPixmap;
}
-
- eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
-
- if (dummySurface != EGL_NO_SURFACE) {
- eglDestroySurface(display, dummySurface);
- }
+ vgFinish();
+ QImage image;
+ if (newContext) {
+ image = QImage(width, height, QImage::Format_ARGB32_Premultiplied);
+ vgGetImageSubData(surfaceImage, image.bits(), image.bytesPerLine(),
+ 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();
+ image = QImage(width, height, QImage::Format_ARGB32_Premultiplied);
+ vgGetImageSubData(surfaceImage, image.bits(), image.bytesPerLine(),
+ VG_sARGB_8888_PRE, 0, 0, width, height);
+ }
+
+ vgDestroyImage(surfaceImage);
- prevEGLState.restore();
+ EGL_DESTROY_SURFACE(display, dummySurface);
+ EGL_DESTROY_CONTEXT(display, newContext);
- QImage image(width, height, QImage::Format_ARGB32_Premultiplied);
- vgGetImageSubData(surfaceImage, image.bits(), image.bytesPerLine(),
- VG_sARGB_8888_PRE, 0, 0, width, height);
-
- vgDestroyImage(surfaceImage);
currentPixmap = QPixmap::fromImage(image);
return currentPixmap;
}
@@ -456,24 +488,14 @@
return;
}
- QPainterPath intersect;
- if (!clipPath.isEmpty()) {
- QPainterPath piecePath;
- piecePath.addRect(rect);
- intersect = clipPath.intersected(piecePath);
- QRectF intRect = intersect.boundingRect();
- if (intersect.isEmpty()) {
+ if ((iconColor.isValid()) || (mode != QIcon::Normal) ||
+ multiPieceIcon || painter->opacity() != 1.0) {
+ if (drawRasterizedIcon(painter, topLeft, renderSize, clipPath)) {
return;
}
}
-
- if ((iconColor.isValid()) || (mode != QIcon::Normal) ||
- multiPieceIcon || painter->opacity() != 1.0) {
- if (drawRasterizedIcon(painter, topLeft, renderSize, intersect)) {
- return;
- }
- }
-
+
+ vgSeti(VG_RENDERING_QUALITY, VG_RENDERING_QUALITY_FASTER);
drawNVGIcon(painter, topLeft, renderSize, settings);
}
--- a/src/hbcore/image/hbnvgiconimpl_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/image/hbnvgiconimpl_p.h Fri May 14 16:09:54 2010 +0300
@@ -49,7 +49,8 @@
const QSizeF& keySize,
Qt::AspectRatioMode aspectRatioMode,
QIcon::Mode mode,
- bool mirrored);
+ bool mirrored,
+ HbRenderingMode renderMode);
~HbNvgIconImpl();
QPixmap pixmap();
--- a/src/hbcore/image/hbpixmapiconimpl_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/image/hbpixmapiconimpl_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -44,13 +44,15 @@
const QSizeF& keySize,
Qt::AspectRatioMode aspectRatioMode,
QIcon::Mode mode,
- bool mirrored):
+ bool mirrored,
+ HbRenderingMode renderMode):
HbIconImpl(iconData,
name,
keySize,
aspectRatioMode,
mode,
- mirrored),
+ mirrored,
+ renderMode),
pixmapIconRenderer(0)
{
retrievePixmapData();
--- a/src/hbcore/image/hbpixmapiconimpl_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/image/hbpixmapiconimpl_p.h Fri May 14 16:09:54 2010 +0300
@@ -38,7 +38,8 @@
const QSizeF& keySize,
Qt::AspectRatioMode aspectRatioMode,
QIcon::Mode mode,
- bool mirrored);
+ bool mirrored,
+ HbRenderingMode renderMode);
HbPixmapIconImpl(const QPixmap& pixmap, const QString& name = QString());
~HbPixmapIconImpl();
--- a/src/hbcore/image/hbsgimageiconimpl_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/image/hbsgimageiconimpl_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -43,18 +43,29 @@
typedef EGLBoolean(*pfnEglDestroyImageKHR)(EGLDisplay, EGLImageKHR);
typedef VGImage(*pfnVgCreateEGLImageTargetKHR)(VGeglImageKHR);
+// Constants
+static const int HB_BITS_PER_COLOR = 8;
+
+#define EGL_DESTROY_SURFACE(display, surface) \
+ if (surface != EGL_NO_SURFACE) { eglDestroySurface(display, surface); }
+
+#define EGL_DESTROY_CONTEXT(display, context) \
+ if (context != EGL_NO_CONTEXT) { eglDestroyContext(display, context); }
+
HbSgimageIconImpl::HbSgimageIconImpl(const HbSharedIconInfo &iconData,
const QString& name,
const QSizeF& keySize,
Qt::AspectRatioMode aspectRatioMode,
QIcon::Mode mode,
- bool mirrored):
+ bool mirrored,
+ HbRenderingMode renderMode):
HbIconImpl(iconData,
name,
keySize,
aspectRatioMode,
mode,
- mirrored),
+ mirrored,
+ renderMode),
vgImageRenderer(0),
pixmapIconRenderer(0)
{
@@ -77,8 +88,79 @@
return currentPixmap;
}
+ EGLDisplay display = eglGetCurrentDisplay();
+ if (display == EGL_NO_DISPLAY) {
+ display = eglGetDisplay(EGL_DEFAULT_DISPLAY);
+ eglInitialize(display, 0, 0);
+
+ if (eglBindAPI(EGL_OPENVG_API) == EGL_FALSE) {
+ return currentPixmap;
+ }
+ }
+ EGLContext eglContextPrev = eglGetCurrentContext();
+ EGLSurface eglSurfacePrevDraw = eglGetCurrentSurface(EGL_DRAW);
+ EGLSurface eglSurfacePrevRead = eglGetCurrentSurface(EGL_READ);
+
+ 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,
+ EGL_RED_SIZE, HB_BITS_PER_COLOR,
+ EGL_GREEN_SIZE, HB_BITS_PER_COLOR,
+ EGL_BLUE_SIZE, HB_BITS_PER_COLOR,
+ 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
+
+ const EGLint attribList2[] = {
+ EGL_WIDTH, contentSize.width(),
+ EGL_HEIGHT, contentSize.height(),
+ EGL_NONE
+ };
+
+ eglNewSurface = eglSurface = eglCreatePbufferSurface(display, config, attribList2);
+ if (eglSurface == EGL_NO_SURFACE) {
+ return currentPixmap;
+ }
+ }
+ eglNewContext = eglContext = eglCreateContext(display, config, EGL_NO_CONTEXT, 0);
+ 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);
+ EGL_DESTROY_CONTEXT(display, eglNewContext);
+ return currentPixmap;
+ }
+ }
+
+
VGImage localVgImage = getVgImageFromSgImage();
if (localVgImage == VG_INVALID_HANDLE) {
+ EGL_DESTROY_SURFACE(display, eglNewSurface);
+ EGL_DESTROY_CONTEXT(display, eglNewContext);
+ if (eglContextPrev) {
+ eglMakeCurrent(display, eglSurfacePrevDraw, eglSurfacePrevRead, eglContextPrev);
+ }
return currentPixmap;
}
@@ -99,6 +181,15 @@
vgDestroyImage(localVgImage);
+ 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_CONTEXT(display, eglNewContext);
+ }
+
+ if (eglContextPrev) {
+ eglMakeCurrent(display, eglSurfacePrevDraw, eglSurfacePrevRead, eglContextPrev);
+ }
return currentPixmap;
}
--- a/src/hbcore/image/hbsgimageiconimpl_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/image/hbsgimageiconimpl_p.h Fri May 14 16:09:54 2010 +0300
@@ -36,7 +36,7 @@
class HbVgImageIconRenderer;
class HbPixmapIconRenderer;
-class HB_AUTOTEST_EXPORT HbSgimageIconImpl : public HbIconImpl
+class HbSgimageIconImpl : public HbIconImpl
{
public :
HbSgimageIconImpl(const HbSharedIconInfo &iconData,
@@ -44,7 +44,8 @@
const QSizeF& keySize,
Qt::AspectRatioMode aspectRatioMode,
QIcon::Mode mode,
- bool mirrored);
+ bool mirrored,
+ HbRenderingMode renderMode);
~HbSgimageIconImpl();
QPixmap pixmap();
--- a/src/hbcore/image/hbvgimageiconrenderer.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/image/hbvgimageiconrenderer.cpp Fri May 14 16:09:54 2010 +0300
@@ -107,20 +107,36 @@
addedToStates = true;
}
- if (vgImage != VG_INVALID_HANDLE) {
-
+ if (vgImage != VG_INVALID_HANDLE) {
+ QPainterPath oldPath;
+ bool clipped = painter->hasClipping();
+
if (!clipPath.isEmpty()) {
+ if (!clipped) {
+ painter->setClipping(true);
+ }
+
+ QPainterPath intersect(clipPath);
+ if (clipped) {
+ oldPath = painter->clipPath();
+ 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) {
@@ -159,30 +175,8 @@
vgSeti(VG_IMAGE_MODE, VG_DRAW_IMAGE_MULTIPLY);
}
- VGint prevMask = 0;
- VGPath vgpath = VG_INVALID_HANDLE;
-
- if (!clipPath.isEmpty()) {
-
- QPaintDevice *pdev = painter->paintEngine()->paintDevice();
- int width = pdev->width();
- int height = pdev->height();
-
- vgMask(VG_INVALID_HANDLE, VG_CLEAR_MASK, 0, 0, width, height);
-
- vgpath = painterPathToVGPath(clipPath);
- vgRenderToMask(vgpath, VG_FILL_PATH, VG_UNION_MASK);
-
- prevMask = vgGeti(VG_MASKING);
- vgSeti(VG_MASKING, VG_TRUE);
- }
-
vgDrawImage(vgImage);
- if (!clipPath.isEmpty()) {
- vgSeti(VG_MASKING, VG_FALSE);
- }
-
vgSeti(VG_MATRIX_MODE, matrixMode);
vgSeti(VG_IMAGE_MODE, imageMode);
@@ -197,14 +191,14 @@
vgSeti(VG_BLEND_MODE, blendMode);
}
- if (prevMask) {
- vgSeti(VG_MASKING, prevMask);
- }
-
if (!clipPath.isEmpty()) {
- vgDestroyPath(vgpath);
- vgpath = VG_INVALID_HANDLE;
painter->endNativePainting();
+ if (!clipped) {
+ painter->setClipPath(oldPath, Qt::NoClip);
+ } else {
+ painter->setClipPath(oldPath);
+ }
+ painter->setClipping(clipped);
}
return true;
}
@@ -236,105 +230,3 @@
vgLoadMatrix(mat);
}
-VGPath HbVgImageIconRenderer::painterPathToVGPath(const QPainterPath& path)
-{
- int count = path.elementCount();
-
- // Creating vgpath is needed else clipling is failing,
- // vgpaintengine also doing the same way,
- // optimising by storing the path as member was tried but not giving expected output
- VGPath vgpath = vgCreatePath(VG_PATH_FORMAT_STANDARD,
- VG_PATH_DATATYPE_F,
- 1.0f, // scale
- 0.0f, // bias
- 0, // segmentCapacityHint
- 0, // coordCapacityHint
- VG_PATH_CAPABILITY_APPEND_TO);
-
- if (count == 0) {
- return vgpath;
- }
-
- const QPainterPath::Element *elements = &(path.elementAt(0));
-
- // Sizes chosen so that drawRoundedRect() paths fit in these arrays.
- QVarLengthArray<VGfloat, 48> coords;
- QVarLengthArray<VGubyte, 20> segments;
-
- int curvePos = 0;
- QPointF temp;
-
- // Keep track of the start and end of each sub-path. QPainterPath
- // does not have an "implicit close" flag like QVectorPath does.
- // We therefore have to detect closed paths by looking for a LineTo
- // element that connects back to the initial MoveTo element.
- qreal startx = 0.0;
- qreal starty = 0.0;
- qreal endx = 0.0;
- qreal endy = 0.0;
- bool haveStart = false;
- bool haveEnd = false;
-
- // Convert the members of the element array.
- for (int i = 0; i < count; ++i) {
- switch (elements[i].type) {
-
- case QPainterPath::MoveToElement: {
- if (haveStart && haveEnd && startx == endx && starty == endy) {
- // Implicitly close the previous sub-path.
- segments.append(VG_CLOSE_PATH);
- }
- startx = elements[i].x;
- starty = elements[i].y;
- coords.append(startx);
- coords.append(starty);
- haveStart = true;
- haveEnd = false;
- segments.append(VG_MOVE_TO_ABS);
- }
- break;
-
- case QPainterPath::LineToElement: {
- endx = elements[i].x;
- endy = elements[i].y;
- coords.append(endx);
- coords.append(endy);
- haveEnd = true;
- segments.append(VG_LINE_TO_ABS);
- }
- break;
-
- case QPainterPath::CurveToElement: {
- coords.append(elements[i].x);
- coords.append(elements[i].y);
- haveEnd = false;
- curvePos = 2;
- }
- break;
-
- case QPainterPath::CurveToDataElement: {
- coords.append(elements[i].x);
- coords.append(elements[i].y);
- haveEnd = false;
- curvePos += 2;
- if (curvePos == 6) {
- curvePos = 0;
- segments.append(VG_CUBIC_TO_ABS);
- }
- }
- break;
-
- }
- }
-
- if ( haveStart && haveEnd && (startx == endx) && (starty == endy) ) {
- // Implicitly close the last sub-path.
- segments.append(VG_CLOSE_PATH);
- }
-
- vgAppendPathData(vgpath, segments.count(),
- segments.constData(), coords.constData());
-
- return vgpath;
-}
-
--- a/src/hbcore/image/hbvgimageiconrenderer_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/image/hbvgimageiconrenderer_p.h Fri May 14 16:09:54 2010 +0300
@@ -75,7 +75,6 @@
private:
void applyIconProperties();
- VGPath painterPathToVGPath(const QPainterPath& path);
void updatePainterTransformation(QPainter * painter, const QPointF & pos);
VGImage vgImage;
--- a/src/hbcore/indicatorplugins/hbindicatorinterface.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/indicatorplugins/hbindicatorinterface.cpp Fri May 14 16:09:54 2010 +0300
@@ -31,7 +31,7 @@
\brief HbIndicatorInterface is an abstract base class
for all indicator implementations
- Indicators are displayed in the status indicator area and/or in universal indicator menu.
+ Indicators are displayed in the status indicator area and/or in indicator menu.
Applications can create custom indicators by implementing this abstract class and HbIndicatorPluginInterface.
Each indicator is identified by its type-string (See indicatorType). Clients use HbIndicator-class to activate
and deactivate indicators.
@@ -54,32 +54,10 @@
\sa HbIndicatorPluginInterface, HbIndicator
- \alpha
+ \stable
\hbcore
*/
-/*!
- \enum HbIndicatorInterface::GroupPriority
- Defines indicator group priority. This determines where the indicator is shown: in indicator area or only
- in indicator menu etc.
-
- \deprecated HbIndicatorInterface::GroupPriority
- is deprecated. Please use HbIndicatorInterface::Category instead.
-*/
-/*!
- \var HbIndicatorInterface::GroupPriority HbIndicatorInterface::GroupPriorityHigh
- High priority indicators are visible in the status area as long as the process is ongoing.
-*/
-/*!
- \var HbIndicatorInterface::GroupPriority HbIndicatorInterface::GroupPriorityAverage
- Average priority indicators are used together with notifications (discreet popup)
- The indicator will appear shortly in the status pane.
-*/
-/*!
- \var HbIndicatorInterface::GroupPriority HbIndicatorInterface::GroupPriorityLow
- Low priority indicators are shown only in universal indicator menu.
-*/
-
/*!
\enum HbIndicatorInterface::Category
Defines indicator group category. This determines where the indicator is shown.
@@ -120,39 +98,31 @@
An indicator has set of data elements associated with it, each with its own role.
*/
/*!
- \var HbIndicatorInterface::DataRole HbIndicatorInterface::IconNameRole
- Indicator icon path role. This is the primary icon shown in indicator status area. If there's no data
- for this role, the icon path is retrieved using DataRole::DecorationPathRole instead. The icon must be located
- in a directory, where all possible client applications are able to read it.
+ \var HbIndicatorInterface::DataRole HbIndicatorInterface::DecorationNameRole
+ Role to the icon path, which is used as a decoration in indicator menu.
+ The icon must be located in a directory, where all possible client applications are able to read it.
The icon cannot be located in the plugin's resources.
*/
-/*!
- \var HbIndicatorInterface::DataRole HbIndicatorInterface::DecorationNameRole
- role to the icon path, which is used as a decoration in universal indicator menu.
-*/
/*!
\var HbIndicatorInterface::DataRole HbIndicatorInterface::MonoDecorationNameRole
- role to the icon path, which is used as a decoration in the status bar area.
+ Role to the icon path, which is used as a decoration in the status bar area.
+ The icon must be located in a directory, where all possible client applications are able to read it.
+ The icon cannot be located in the plugin's resources.
+ For the progress indicators this MonoDecorationNameRole is not used and the progress indicator
+ is not configurable.
*/
/*!
\var HbIndicatorInterface::DataRole HbIndicatorInterface::PrimaryTextRole
- Primary indicator text shown in universal indicator menu.
+ Primary indicator text shown in indicator menu.
*/
/*!
\var HbIndicatorInterface::DataRole HbIndicatorInterface::SecondaryTextRole
- Secondary indicator text shown in universal indicator menu.
+ Secondary indicator text shown in indicator menu.
*/
-/*!
- \var HbIndicatorInterface::DataRole HbIndicatorInterface::TextRole
- Indicator text shown in universal indicator popup.
-
- \deprecated HbIndicatorInterface::TextRole
- is deprecated. Please use HbIndicatorInterface::PrimaryTextRole instead.
-*/
/*!
\enum HbIndicatorInterface::RequestType
@@ -170,16 +140,9 @@
/*!
\fn virtual QVariant HbIndicatorInterface::indicatorData(int role) const = 0
- Returns the data stored under the given role. The indicator should at least have data elements for
- HbIndicatorInterface::TextRole and HbIndicatorInterface::DecorationNameRole. If data element for
- HbIndicatorInterface::IconNameRole doesn't exist, the same icon retrieved by \c DecorationNameRole
- is used both in status indicator area and universal indicator popup. If the indicator is
- low priority indicator, it is shown only in universal indicator popup, and data element for
- \c IconNameRole is ignored
-
- \a role the data role for the indicator. A value from the HbIndicatorInterface::DataRole - enum.
-
- For the roles not supported by the plugin, invalid QVariant should be returned.
+ Returns the data stored under the given role.
+ For the roles not supported by the plugin, empty QVariant (QVariant()) should be returned.
+ \sa HbIndicatorInterface::DataRole.
*/
/*!
@@ -212,27 +175,12 @@
{
this->indicatorType = indicatorType;
this->category = category;
- this->groupPriority = HbIndicatorInterface::GroupPriorityHigh; //temp
- this->interactionTypes = interactionTypes;
- }
-
- //deprecated
- void init(const QString &indicatorType,
- HbIndicatorInterface::GroupPriority groupPriority,
- HbIndicatorInterface::InteractionTypes interactionTypes)
- {
- this->indicatorType = indicatorType;
- this->groupPriority = groupPriority;
- this->category = (groupPriority == HbIndicatorInterface::GroupPriorityLow)
- ? HbIndicatorInterface::SettingCategory
- : HbIndicatorInterface::NotificationCategory;
this->interactionTypes = interactionTypes;
}
public:
QString indicatorType;
HbIndicatorInterface::Category category;
- HbIndicatorInterface::GroupPriority groupPriority; //deprecated
HbIndicatorInterface::InteractionTypes interactionTypes;
};
@@ -272,17 +220,6 @@
}
/*!
- \deprecated HbIndicatorInterface::groupPriority() const
- is deprecated. Please use HbIndicatorInterface::category() instead.
-
- returns the priority group the indicator belongs to.
- */
-HbIndicatorInterface::GroupPriority HbIndicatorInterface::groupPriority() const
-{
- return d->groupPriority;
-}
-
-/*!
processes the requests from the client.
Calls handleClientRequest. Does default handling for the request,
@@ -337,26 +274,6 @@
}
/*!
- Constructs an indicator.
-
- \a indicatorType contains the type of the indicator,
- \a indicatorGroup indicator group priority the object belongs to,
- \a interactionTypes interaction type flags for the object
-
- \deprecated HbIndicatorInterface::HbIndicatorInterface(const QString&, HbIndicatorInterface::GroupPriority, HbIndicatorInterface::InteractionTypes)
- is deprecated, use the other constructor.
-
- \deprecated HbIndicatorInterface::HbIndicatorInterface__sub_object(const QString&, HbIndicatorInterface::GroupPriority, QFlags<HbIndicatorInterface::InteractionType>)
-
-*/
-HbIndicatorInterface::HbIndicatorInterface(const QString &indicatorType,
- GroupPriority indicatorGroup, InteractionTypes interactionTypes) :
- d(new HbIndicatorInterfacePrivate())
-{
- d->init(indicatorType, indicatorGroup, interactionTypes);
-}
-
-/*!
Handles the requests sent from the client
\a type is a type of the request.
\a parameter is extra parameter from the client. Can be invalid, if not given.
--- a/src/hbcore/indicatorplugins/hbindicatorinterface.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/indicatorplugins/hbindicatorinterface.h Fri May 14 16:09:54 2010 +0300
@@ -44,13 +44,6 @@
SettingCategory
};
- //deprecated
- enum GroupPriority{
- GroupPriorityHigh,
- GroupPriorityAverage,
- GroupPriorityLow
- };
-
enum InteractionType {
NoInteraction = 0x00,
InteractionActivated = 0x01
@@ -58,12 +51,10 @@
Q_DECLARE_FLAGS(InteractionTypes, InteractionType)
enum DataRole {
- IconNameRole, //deprecated
DecorationNameRole,
MonoDecorationNameRole,
PrimaryTextRole,
- SecondaryTextRole,
- TextRole = PrimaryTextRole
+ SecondaryTextRole
};
enum RequestType {
@@ -73,7 +64,6 @@
QString indicatorType() const;
InteractionTypes interactionTypes() const;
- GroupPriority groupPriority() const; //deprecated
Category category() const;
void processClientRequest(RequestType type, const QVariant ¶meter);
virtual bool handleInteraction(InteractionType type);
@@ -86,8 +76,6 @@
protected:
HbIndicatorInterface(const QString &indicatorType,
- GroupPriority indicatorGroup, InteractionTypes interactionTypes); //deprecated.
- HbIndicatorInterface(const QString &indicatorType,
Category category, InteractionTypes interactionTypes);
virtual bool handleClientRequest(RequestType type, const QVariant ¶meter);
--- a/src/hbcore/indicatorplugins/hbindicatorplugininterface.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/indicatorplugins/hbindicatorplugininterface.cpp Fri May 14 16:09:54 2010 +0300
@@ -42,6 +42,9 @@
indicator, the framework calls accessAllowed() allowing the plugin to inspect client's security
credentials. By returning false, the plugin denies client access.
+ Plugins are loaded by a Device Dialog server. For information on installing plugins, refer to
+ HbDeviceDialogPlugin documentation.
+
here's an example of how to create a simple indicator plugin.
If plugin implements only one indicator, the pluginInterface class can also inherit from
HbIndicatorInterface. Example header-file:
@@ -55,9 +58,9 @@
based on HbIndicatorInterface.
\snippet{unit\unittest_hbindicator\codesnippetplugin\hbcodesnippetplugin.cpp,2}
- \sa HbIndicator, HbIndicatorInterface
+ \sa HbIndicator, HbIndicatorInterface, HbDeviceDialogPlugin
- \alpha
+ \stable
\hbcore
*/
@@ -71,9 +74,6 @@
\fn virtual bool HbIndicatorPluginInterface::accessAllowed(
const QString &indicatorType, const QVariantMap &securityInfo) const
- <b>Notice: This function has implementation until deprecation period ends.
- After that it will be pure virtual.</b>
-
Checks if client is allowed to activate or deactivate the indicator. The
implementation is operating system dependent. On Symbian this may involve checking client's
platform security capabilities or secure ID for example.
@@ -87,26 +87,6 @@
*/
/*!
- \fn virtual bool HbIndicatorPluginInterface::accessAllowed(
- const QString &indicatorType, const HbSecurityInfo *securityInfo) const
-
- Checks if client is allowed to activate or deactivate the indicator. The
- implementation is operating system dependent. On Symbian this may involve checking client's
- platform security capabilities or secure ID for example.
-
- \a indicatorType contains indicator type.
- \a securityInfo contains information for security check. Information is operating system dependent.
-
- Should return true if client is allowed to activate and deactivate the indicator.
-
- Note! Not implemented yet. Plugin implementors should always return true from this function.
-
- \deprecated HbIndicatorPluginInterface::accessAllowed(const QString &, const HbSecurityInfo *) const
- is deprecated. Replaced by IndicatorPluginInterface::accessAllowed(const QString &indicatorType, const QVariantMap &securityInfo) const
-
-*/
-
-/*!
\fn virtual HbIndicatorInterface *HbIndicatorPluginInterface::createIndicator(const QString &indicatorType) = 0
creates an indicator of type \a indicatorType. Ownership is passed to the caller.
\sa HbIndicatorPluginInterface::indicatorTypes()
--- a/src/hbcore/indicatorplugins/hbindicatorplugininterface.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/indicatorplugins/hbindicatorplugininterface.h Fri May 14 16:09:54 2010 +0300
@@ -33,20 +33,13 @@
#include <QtGlobal>
class HbIndicatorInterface;
-class HbSecurityInfo; // deprecated
class HB_CORE_EXPORT HbIndicatorPluginInterface
{
public:
virtual QStringList indicatorTypes() const = 0;
- // Deprecated
virtual bool accessAllowed(const QString &indicatorType,
- const HbSecurityInfo *securityInfo) const /*= 0; implementation provided temporarily for deprecation period*/
- {Q_UNUSED(indicatorType); Q_UNUSED(securityInfo); return true;}
- // End deprecated
- virtual bool accessAllowed(const QString &indicatorType,
- const QVariantMap &securityInfo) const /*= 0; will be pure virtual when deprecation period ends*/
- {Q_UNUSED(indicatorType); Q_UNUSED(securityInfo); return true;}
+ const QVariantMap &securityInfo) const = 0;
virtual HbIndicatorInterface *createIndicator(const QString &indicatorType) = 0;
virtual int error() const = 0;
virtual ~HbIndicatorPluginInterface() {}
--- a/src/hbcore/indicatorplugins/hbindicatorpluginmanager.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/indicatorplugins/hbindicatorpluginmanager.cpp Fri May 14 16:09:54 2010 +0300
@@ -27,6 +27,7 @@
#include <QApplication>
#include <QVariantMap>
#include <hbindicatorpluginmanager_p.h>
+#include <hbdevicedialogpluginmanager_p.h>
#include <hbindicatorplugininterface.h>
#include <hbindicatorinterface.h>
#include <hbdevicedialogtrace_p.h>
@@ -45,9 +46,12 @@
QObject(parent), mNameCache(pluginKeys)
{
// Get list of plugin directories to watch/scan
- const QStringList pathList = pluginPathList();
- for (int i = 0; i < pathList.length(); i++) {
- updateCachePath(pathList.at(i));
+ int readOnlyPaths;
+ mPluginPathList = HbDeviceDialogPluginManager::pluginPathList("/indicators/", readOnlyPaths);
+
+ // Scan only read-only drives at startup to ensure installed plugins cannot affect device boot
+ for(int i = 0; i < readOnlyPaths; i++) {
+ updateCachePath(mPluginPathList.at(i), true);
}
}
@@ -174,9 +178,8 @@
emit indicatorActivated(indicator);
indicatorInfo->statusAreaIconPath = statusAreaIconPath(indicator);
emit indicatorActivated(IndicatorClientInfo(
- indicator->indicatorType(),
- indicatorInfo->statusAreaIconPath,
- indicator->category()));
+ indicator->indicatorType(), indicatorInfo->statusAreaIconPath,
+ indicator->category(), hasMenuData(*indicator)));
connect(indicator, SIGNAL(dataChanged()), SLOT(indicatorDataChanged()));
connect(indicator, SIGNAL(userActivated(QVariantMap)), SLOT(userActivateIndicator(QVariantMap)));
@@ -208,9 +211,8 @@
emit indicatorRemoved(indicator);
emit indicatorRemoved(IndicatorClientInfo(
- indicator->indicatorType(),
- statusAreaPath,
- indicator->category()));
+ indicator->indicatorType(), statusAreaPath, indicator->category(),
+ hasMenuData(*indicator)));
//plugin-interface may also be HbIndicatorInterface.
//in that case, don't delete.
@@ -253,8 +255,8 @@
QString path(indicatorInfo.statusAreaIconPath);
if (!path.isEmpty()) {
- IndicatorClientInfo clientInfo(
- indicator->indicatorType(), path, category);
+ IndicatorClientInfo clientInfo(indicator->indicatorType(), path,
+ category, hasMenuData(*indicator));
clientInfoList.append(clientInfo);
}
}
@@ -346,9 +348,8 @@
indicatorInfo->statusAreaIconPath = statusAreaPath;
emit indicatorUpdated(IndicatorClientInfo(
- indicator->indicatorType(),
- indicatorInfo->statusAreaIconPath,
- indicator->category()));
+ indicator->indicatorType(), indicatorInfo->statusAreaIconPath,
+ indicator->category(), hasMenuData(*indicator)));
}
}
}
@@ -393,11 +394,10 @@
int HbIndicatorPluginManager::scanPlugins(const QString &indicatorType)
{
TRACE_ENTRY
- const QStringList pathList = pluginPathList();
- const QString fileNameFilter = pluginFileNameFilter();
+ const QString fileNameFilter = HbDeviceDialogPluginManager::pluginFileNameFilter();
int index = -1;
- foreach (const QString &path, pathList) {
+ foreach (const QString &path, mPluginPathList) {
QDir pluginDir(path, fileNameFilter, QDir::NoSort, QDir::Files | QDir::Readable);
foreach (const QString &fileName, pluginDir.entryList()) {
index = loadPlugin(indicatorType, pluginDir.absoluteFilePath(fileName));
@@ -493,7 +493,7 @@
}
// Update plugin name cache watch/scan list
-void HbIndicatorPluginManager::updateCachePath(const QString &path)
+void HbIndicatorPluginManager::updateCachePath(const QString &path, bool updateReadOnly)
{
QString dirPath = HbPluginNameCache::directoryPath(path);
QFileInfo fileInfo(dirPath);
@@ -502,57 +502,15 @@
if (fileInfo.isWritable()) {
mNameCache.addWatchPath(dirPath);
} else {
- mNameCache.scanDirectory(dirPath);
+ if (updateReadOnly) {
+ mNameCache.scanDirectory(dirPath);
+ }
}
} else {
mNameCache.removeWatchPath(dirPath);
}
}
-// Generate directory path list to search plugins
-QStringList HbIndicatorPluginManager::pluginPathList()
-{
- QStringList pluginPathList;
-
-#if defined(Q_OS_SYMBIAN)
- const QString pluginRelativePath("resource/plugins/indicators/");
-
- QFileInfoList driveInfoList = QDir::drives();
-
- foreach (const QFileInfo &driveInfo, driveInfoList) {
- const QString drive = driveInfo.absolutePath();
- if (drive.startsWith("z:", Qt::CaseInsensitive) ||
- drive.startsWith("c:", Qt::CaseInsensitive)) {
- QString path(drive + pluginRelativePath);
- pluginPathList << path;
- }
- }
-#elif defined(Q_OS_WIN32) || defined(Q_OS_UNIX)
- pluginPathList << qApp->applicationDirPath() + '/' << HB_PLUGINS_DIR"/indicators/";
-#endif
-
- // Plugin name caching differentiates directory and file names by trailing slash in a name
- for (int i = 0; i < pluginPathList.length(); i++) {
- Q_ASSERT(pluginPathList.at(i).endsWith('/'));
- }
-
- return pluginPathList;
-}
-
-// Generate plugin file name filter
-QString HbIndicatorPluginManager::pluginFileNameFilter()
-{
-#if defined(Q_OS_LINUX)
- return QString("*.so");
-#elif defined(Q_OS_MAC)
- return QString("*.dylib");
-#elif defined(Q_OS_WIN32)
- return QString("*.dll");
-#else
- return QString("*.qtplugin");
-#endif
-}
-
// Return keys (indicator types) the plugin implements
QStringList HbIndicatorPluginManager::pluginKeys(QObject *pluginInstance)
{
@@ -560,3 +518,14 @@
qobject_cast<HbIndicatorPluginInterface*>(pluginInstance);
return plugin ? plugin->indicatorTypes() : QStringList();
}
+
+bool HbIndicatorPluginManager::hasMenuData(const HbIndicatorInterface &indicator) const
+{
+ if (!indicator.indicatorData(HbIndicatorInterface::PrimaryTextRole).toString().isEmpty()
+ || !indicator.indicatorData(HbIndicatorInterface::SecondaryTextRole).toString().isEmpty()
+ || !indicator.indicatorData(HbIndicatorInterface::DecorationNameRole).toString().isEmpty()) {
+ return true;
+ }
+
+ return false;
+}
--- a/src/hbcore/indicatorplugins/hbindicatorpluginmanager_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/indicatorplugins/hbindicatorpluginmanager_p.h Fri May 14 16:09:54 2010 +0300
@@ -110,16 +110,17 @@
QString statusAreaIconPath(
const HbIndicatorInterface *indicator) const;
- void updateCachePath(const QString &path);
- static QStringList pluginPathList();
- static QString pluginFileNameFilter();
+ void updateCachePath(const QString &path, bool updateReadOnly = false);
static QStringList pluginKeys(QObject *pluginInstance);
+ bool hasMenuData(const HbIndicatorInterface &indicator) const;
+
private:
Q_DISABLE_COPY(HbIndicatorPluginManager)
QList<PluginInfo> mPlugins;
HbPluginNameCache mNameCache;
+ QStringList mPluginPathList;
};
#endif // HBINDICATORPLUGINMANAGER_H
--- a/src/hbcore/inputfw/hbinputdef.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/inputfw/hbinputdef.h Fri May 14 16:09:54 2010 +0300
@@ -75,9 +75,9 @@
HbKeyboardVirtualQwerty = 0x00000002 | HbTouchInputMask| HbQwertyKeyboardMask, /**< Touchscreen version of qwerty keyboard */
HbKeyboardSctPortrait = 0x00000003 | HbTouchInputMask, /**< Special character selection keypad for portrait view */
HbKeyboardSctLandscape = 0x00000004 | HbTouchInputMask| HbQwertyKeyboardMask, /**< Special character selection keypad for landscape view */
- HbKeyboardHwr = 0x00000005 | HbTouchInputMask| HbHwrKeyboardMask, /**< Hand writing recognition keypad */
- 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 */
+ 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 */
};
Q_DECLARE_FLAGS(HbKeyboardType, HbKeyboardTypeFlag)
@@ -120,10 +120,10 @@
HbInputModeIndicPhonetic = 0x00000001 | HbIndicModeMask, /**< Indic phonetic input mode */
// Handwriting modes
- HbInputModeHwrLatin = 0x00000001 | HbHwrModeMask, /**< Latin based hand writing recognition */
- HbInputModeHwrLatinFull = 0x00000002 | HbHwrModeMask, /**< Latin based hand writing recognition, full screen */
- HbInputModeHwrChinese = 0x00000003 | HbHwrModeMask, /**< Chinese hand writing recognition */
- HbInputModeHwrChineseFull = 0x00000004 | HbHwrModeMask, /**< Chinese hand writing recognition, full screen */
+ HbInputModeHwrLatin = 0x00000001 | HbHwrModeMask, /**< Latin based hand writing recognition */
+ HbInputModeHwrLatinFull = 0x00000002 | HbHwrModeMask, /**< Latin based hand writing recognition, full screen */
+ HbInputModeHwrChinese = 0x00000003 | HbHwrModeMask | HbChineseModeMask, /**< Chinese hand writing recognition */
+ HbInputModeHwrChineseFull = 0x00000004 | HbHwrModeMask | HbChineseModeMask, /**< Chinese hand writing recognition, full screen */
// Custom made mode that does not belong to any pre-existing category
HbInputModeCustom = HbChineseModeMask - 1 /**< Custom input mode */
@@ -198,12 +198,10 @@
enum HbEditorConstraint
{
HbEditorConstraintNone = 0,
- HbEditorConstraintsNoSecondaryChannel = 0x01, /**< DEPRECATED */
- HbEditorConstraintOnlySecondaryChannel = 0x02, /**< DEPRECATED */
- HbEditorConstraintAutoCompletingField = 0x04, /**< This is auto-completing editor. It remeber what has been typed previously to same editor class. */
- HbEditorConstraintIgnoreFocus = 0x08, /**< Editor rejects input framework focus. */
- HbEditorConstraintFixedInputMode = 0x10, /**< Editor doesn't allow initial input mode to be changed. */
- HbEditorConstraintLatinAlphabetOnly = 0x20 /**< Editor allows only languages and input modes that produce latin alphabets. */
+ HbEditorConstraintAutoCompletingField = 0x01, /**< This is auto-completing editor. It remebers what has been typed previously to same editor class. */
+ HbEditorConstraintIgnoreFocus = 0x02, /**< Editor rejects input framework focus. */
+ HbEditorConstraintFixedInputMode = 0x04, /**< Editor doesn't allow initial input mode to be changed. */
+ HbEditorConstraintLatinAlphabetOnly = 0x08 /**< Editor allows only languages and input modes that produce latin alphabets. */
};
Q_DECLARE_FLAGS(HbEditorConstraints, HbEditorConstraint)
--- a/src/hbcore/inputfw/hbinputeditorinterface.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/inputfw/hbinputeditorinterface.cpp Fri May 14 16:09:54 2010 +0300
@@ -107,30 +107,6 @@
}
/*!
-\deprecated HbEditorInterface::inputMode() const
- is deprecated. Use mode() instead.
-Returns active editor input mode. Returned value is HbInputMethodType.
-
-\sa setInputMode
-*/
-int HbEditorInterface::inputMode() const
-{
- return mode();
-}
-
-/*!
-\deprecated HbEditorInterface::setInputMode(int)
- is deprecated. Use setMode() instead.
-Sets active editor input mode.
-
-\sa inputMode
-*/
-void HbEditorInterface::setInputMode(int inputMode)
-{
- setMode(static_cast<HbInputModeType>(inputMode));
-}
-
-/*!
Returns active editor input mode.
\sa setInputMode
@@ -163,31 +139,6 @@
}
/*!
-\deprecated HbEditorInterface::constraints() const
- is deprecated. Use inputConstraints() instead.
-Returns editor constraints. Returned value is a bit vector consisting of
-HbEditorConstraint bits.
-
-\sa setConstraints
-*/
-int HbEditorInterface::constraints() const
-{
- return inputConstraints();
-}
-
-/*!
-\deprecated HbEditorInterface::setConstraints(int)
- is deprecated. Use setInputConstraints() instead.
-Sets editor constraints.
-
-\sa constraints
-*/
-void HbEditorInterface::setConstraints(int constraints)
-{
- setInputConstraints(static_cast<HbEditorConstraints>(constraints));
-}
-
-/*!
Returns editor constraints. The returned value is a combination of HbEditorConstraint flags.
\sa setEditorConstraints
@@ -256,31 +207,6 @@
}
/*!
-\deprecated HbEditorInterface::localDigitType() const
- is deprecated. Use digitType() instead.
-Returns local digit type setting. If this value is set, it will override device wide
-digit type setting. Returned value is HbInputDigitType.
-
-\sa setLocalDigitType
-*/
-int HbEditorInterface::localDigitType() const
-{
- return digitType();
-}
-
-/*!
-\deprecated HbEditorInterface::setLocalDigitType(int)
- is deprecated. Use setDigitType() instead.
-Sets local digit type.
-
-\sa localDigitType
-*/
-void HbEditorInterface::setLocalDigitType(int digitType)
-{
- setDigitType(static_cast<HbInputDigitType>(digitType));
-}
-
-/*!
Returns local digit type setting. If this value is set, it will override device wide
digit type setting.
@@ -627,28 +553,16 @@
}
/*!
-\deprecated void HbEditorInterface::setUpAsPhoneNumberEditor()
- is deprecated. Instead use setInputMethodHints() of QGraphicsItem(HbAbstractEdit) to setup editor.
-*/
-void HbEditorInterface::setUpAsPhoneNumberEditor()
-{
- setInputMode(HbInputModeNumeric);
- mPrivate->setInputMethodHints(Qt::ImhDialableCharactersOnly | Qt::ImhNoPredictiveText);
- setConstraints(HbEditorConstraintFixedInputMode);
- setFilter(HbPhoneNumberFilter::instance());
-}
-
-/*!
A convinience method for setting up the editor as completing email field.
*/
void HbEditorInterface::setUpAsCompletingEmailField()
{
- setInputMode(HbInputModeNone);
- setConstraints(HbEditorConstraintLatinAlphabetOnly | HbEditorConstraintAutoCompletingField);
+ setMode(HbInputModeNone);
+ setInputConstraints((HbEditorConstraint)(HbEditorConstraintLatinAlphabetOnly | HbEditorConstraintAutoCompletingField));
setFilter(HbEmailAddressFilter::instance());
setEditorClass(HbInputEditorClassEmail);
setExtraDictionaryId(HbInputEditorClassEmail);
- setLocalDigitType(HbDigitTypeNone);
+ setDigitType(HbDigitTypeNone);
mPrivate->setInputMethodHints(Qt::ImhNoPredictiveText | Qt::ImhPreferLowercase);
}
@@ -657,12 +571,12 @@
*/
void HbEditorInterface::setUpAsCompletingUrlField()
{
- setInputMode(HbInputModeNone);
- setConstraints(HbEditorConstraintLatinAlphabetOnly | HbEditorConstraintAutoCompletingField);
+ setMode(HbInputModeNone);
+ setInputConstraints((HbEditorConstraint)(HbEditorConstraintLatinAlphabetOnly | HbEditorConstraintAutoCompletingField));
setFilter(HbUrlFilter::instance());
setEditorClass(HbInputEditorClassUrl);
setExtraDictionaryId(HbInputEditorClassUrl);
- setLocalDigitType(HbDigitTypeNone);
+ setDigitType(HbDigitTypeNone);
mPrivate->setInputMethodHints(Qt::ImhNoPredictiveText | Qt::ImhPreferLowercase);
}
@@ -678,8 +592,8 @@
*/
void HbEditorInterface::setUpAsLatinAlphabetOnlyEditor()
{
- setInputMode(HbInputModeNone);
- setConstraints(HbEditorConstraintLatinAlphabetOnly);
+ setMode(HbInputModeNone);
+ setInputConstraints(HbEditorConstraintLatinAlphabetOnly);
mPrivate->setInputMethodHints(Qt::ImhNoPredictiveText);
}
--- a/src/hbcore/inputfw/hbinputeditorinterface.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/inputfw/hbinputeditorinterface.h Fri May 14 16:09:54 2010 +0300
@@ -49,18 +49,12 @@
HbTextCase textCase() const;
void setTextCase(HbTextCase textCase);
- int inputMode() const;
- void setInputMode(int inputMode);
HbInputModeType mode() const;
- void setMode(HbInputModeType inputMode);
- int constraints() const;
- void setConstraints(int constraints);
+ void setMode(HbInputModeType inputMode);
HbEditorConstraints inputConstraints() const;
void setInputConstraints(HbEditorConstraints constraints);
HbInputFilter *filter() const;
void setFilter(HbInputFilter *filter);
- int localDigitType() const;
- void setLocalDigitType(int digitType);
HbInputDigitType digitType() const;
void setDigitType(HbInputDigitType digitType);
void addAction(HbAction *action);
@@ -81,8 +75,7 @@
QObject* editor() const;
HbVkbHost *vkbHost() const;
-public: // Convinience methods for setting up standard editor types.
- void setUpAsPhoneNumberEditor();
+public: // Convinience methods for setting up standard editor types.
void setUpAsCompletingEmailField();
void setUpAsCompletingUrlField();
void setUpAsLatinAlphabetOnlyEditor();
--- a/src/hbcore/inputfw/hbinputfocusobject.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/inputfw/hbinputfocusobject.cpp Fri May 14 16:09:54 2010 +0300
@@ -35,8 +35,7 @@
#include "hbinputeditorinterface.h"
#include "hbinputvkbhost.h"
#include "hbinputstandardfilters.h"
-
-const qreal HbInputVkbZPlaneEpsilon = 0.5;
+#include "hbnamespace_p.h"
/*!
@alpha
@@ -234,26 +233,6 @@
}
/*!
-\deprecated HbInputFocusObject::cursorLeft(int)
- is deprecated. Use HbInputFocusObject::cursorLeft(Qt::KeyboardModifiers modifiers) instead.
-Sends left arrow key press to focused editor.
-*/
-void HbInputFocusObject::cursorLeft(int modifiers)
-{
- cursorLeft(static_cast<Qt::KeyboardModifiers>(modifiers));
-}
-
-/*!
-\deprecated HbInputFocusObject::cursorRight(int)
- is deprecated. Use HbInputFocusObject::cursorRight(Qt::KeyboardModifiers modifiers) instead.
-Sends right arrow key press to focused editor.
-*/
-void HbInputFocusObject::cursorRight(int modifiers)
-{
- cursorRight(static_cast<Qt::KeyboardModifiers>(modifiers));
-}
-
-/*!
Sends left arrow key press to focused editor.
*/
void HbInputFocusObject::cursorLeft(Qt::KeyboardModifiers modifiers)
@@ -395,7 +374,7 @@
result += parent->zValue();
}
- return result + HbInputVkbZPlaneEpsilon;
+ return result + HbPrivate::VKBValueUnit;
}
return 0.0;
--- a/src/hbcore/inputfw/hbinputfocusobject.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/inputfw/hbinputfocusobject.h Fri May 14 16:09:54 2010 +0300
@@ -59,8 +59,6 @@
QString editorTextSelection();
QString editorSurroundingText();
HbEditorInterface& editorInterface() const;
- void cursorLeft(int modifiers);
- void cursorRight(int modifiers);
void cursorLeft(Qt::KeyboardModifiers modifiers = Qt::NoModifier);
void cursorRight(Qt::KeyboardModifiers modifiers = Qt::NoModifier);
void releaseFocus();
--- a/src/hbcore/inputfw/hbinputlanguagedatabase.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/inputfw/hbinputlanguagedatabase.h Fri May 14 16:09:54 2010 +0300
@@ -26,7 +26,7 @@
#define HB_LANGUAGE_DATABASE_H
#include <QObject>
-#include <QVector>
+#include <QList>
#include <hbinputdef.h>
@@ -37,10 +37,10 @@
{
}
- virtual int HostId() const=0;
- virtual int LanguageCode() const=0;
- virtual char* LanguageData(void* aNativeParams=0) const=0;
- virtual int NativeId() const=0;
+ virtual int hostId() const = 0;
+ virtual int languageCode() const = 0;
+ virtual char* languageData(void* aNativeParams = 0) const = 0;
+ virtual int nativeId() const = 0;
};
class HB_CORE_EXPORT HbLanguageDatabaseInterface : public QObject
@@ -51,40 +51,10 @@
virtual ~HbLanguageDatabaseInterface()
{
}
- virtual void ListLanguages(QVector<int>& aResult) = 0;
- virtual HbLanguageDatabase* LanguageDatabase(int aLanguage) = 0;
+ virtual QList<int> listLanguages() = 0;
+ virtual HbLanguageDatabase* languageDatabase(int aLanguage) = 0;
};
-/*!
-\deprecated HbLanguageDatabase::HostId() const
- is deprecated. Use upcoming lower case version instead.
-*/
-
-/*!
-\deprecated HbLanguageDatabase::LanguageCode() const
- is deprecated. Use upcoming lower case version instead.
-*/
-
-/*!
-\deprecated HbLanguageDatabase::LanguageData(void*) const
- is deprecated. Use upcoming lower case version instead.
-*/
-
-/*!
-\deprecated HbLanguageDatabase::NativeId() const
- is deprecated. Use upcoming lower case version instead.
-*/
-
-/*!
-\deprecated HbLanguageDatabaseInterface::ListLanguages(QVector<int>&)
- is deprecated. Use upcoming lower case version instead.
-*/
-
-/*!
-\deprecated HbLanguageDatabaseInterface::LanguageDatabase(int)
- is deprecated. Use upcoming lower case version instead.
-*/
-
#endif // HB_LANGUAGE_DATABASE_H
// End of file
--- a/src/hbcore/inputfw/hbinputmethod.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/inputfw/hbinputmethod.cpp Fri May 14 16:09:54 2010 +0300
@@ -233,33 +233,6 @@
}
/*!
-\deprecated HbInputMethod::activeHwKeyboardChanged(HbKeyboardType)
- is deprecated.
-*/
-void HbInputMethod::activeHwKeyboardChanged(HbKeyboardType newKeyboard)
-{
- Q_UNUSED(newKeyboard);
- Q_D(HbInputMethod);
-
- // Do here whatever needs to be done on HbInputMethod level, then
- // call virtual ActiveKeyboardChanged() in case plugin needs to do something.
- // ...
- d->refreshState();
-}
-
-/*!
-\deprecated HbInputMethod::activeTouchKeyboardChanged(HbKeyboardType)
- is deprecated.
-*/
-void HbInputMethod::activeTouchKeyboardChanged(HbKeyboardType newKeyboard)
-{
- Q_UNUSED(newKeyboard);
- Q_D(HbInputMethod);
-
- d->refreshState();
-}
-
-/*!
This slot is connected to the setting proxy activeKeyboard attribute. It will
activate proper state when the signal is received.
*/
@@ -284,25 +257,6 @@
}
/*!
-\deprecated HbInputMethod::predictiveInputStateChanged(int newStatus)
- is deprecated.
-*/
-void HbInputMethod::predictiveInputStateChanged(int newStatus)
-{
- Q_UNUSED(newStatus);
-}
-
-/*!
-\deprecated HbInputMethod::predictiveInputStateChanged(HbKeyboardSettingFlags, bool)
- is deprecated.
-*/
-void HbInputMethod::predictiveInputStateChanged(HbKeyboardSettingFlags keyboardType, bool newState)
-{
- Q_UNUSED(keyboardType);
- Q_UNUSED(newState);
-}
-
-/*!
The framework calls this method when an input capable widget receives UI focus. This is empty
default implementation and the inheriting class should override it.
@@ -373,7 +327,7 @@
bool readOnly = false;
if (HbEditorInterface::isConnected(widget)) {
HbEditorInterface eInt(widget);
- if (eInt.constraints() & HbEditorConstraintIgnoreFocus) {
+ if (eInt.inputConstraints() & HbEditorConstraintIgnoreFocus) {
readOnly = true;
}
}
@@ -426,28 +380,14 @@
/*!
Checks if the destroyed widget is currently focused and clears the focus
if needed. This method should not be overridden.
-
-\sa focusObjectDestroyed
*/
void HbInputMethod::widgetDestroyed(QWidget* widget)
{
Q_D(HbInputMethod);
if (d->mFocusObject && d->mFocusObject->object() == widget) {
- releaseFocus();
- }
-}
-
-/*!
-\deprecated HbInputMethod::focusObjectDestroyed(const HbInputFocusObject*)
- is deprecated.
-*/
-void HbInputMethod::focusObjectDestroyed(const HbInputFocusObject* focusObject)
-{
- Q_D(HbInputMethod);
-
- if (focusObject && focusObject == d->mFocusObject) {
- releaseFocus();
+ delete d->mFocusObject;
+ d->mFocusObject = 0;
}
}
@@ -526,25 +466,6 @@
}
/*!
-\deprecated HbInputMethod::receiveText(const QString&)
- is deprecated.
-*/
-void HbInputMethod::receiveText(const QString& string)
-{
- Q_UNUSED(string);
-}
-
-/*!
-\deprecated HbInputMethod::candidatePopupClosed(int closingKey)
- is deprecated.
-*/
-void HbInputMethod::candidatePopupClosed(int closingKey)
-{
- Q_UNUSED(closingKey);
- // Empty default implementation
-}
-
-/*!
The framework calls this method when device-wide input language changes.
The base class implementation is empty so any input method interested in
language switch events should implement it. Note that this method reports
@@ -571,16 +492,6 @@
}
/*!
-\deprecated HbInputMethod::predictiveInputStatusChanged(int newStatus)
- is deprecated.
-*/
-void HbInputMethod::predictiveInputStatusChanged(int newStatus)
-{
- Q_UNUSED(newStatus);
- // Empty default implementation.
-}
-
-/*!
Returns true if given input mode is allowed in active editor.
*/
bool HbInputMethod::modeAllowedInEditor(HbInputModeType mode) const
@@ -725,18 +636,6 @@
}
/*!
-\deprecated HbInputMethod::releaseFocus()
- is deprecated.
-*/
-void HbInputMethod::releaseFocus()
-{
- Q_D(HbInputMethod);
-
- delete d->mFocusObject;
- d->mFocusObject = 0;
-}
-
-/*!
Receives the screen orientation signal. Will determine correct input state for new
orientation and find state handler for it.
*/
@@ -828,8 +727,7 @@
HbInputMethod* active = activeInputMethod();
if (active) {
- active->focusLost(false);
- active->releaseFocus();
+ active->focusLost(false);
delete active->d_ptr->mFocusObject;
active->d_ptr->mFocusObject = 0;
}
@@ -872,21 +770,15 @@
*/
void HbInputMethod::editorDeleted(QObject *obj)
{
+ Q_D(HbInputMethod);
Q_UNUSED(obj);
focusLost();
- releaseFocus();
- reset();
-}
-/*!
-\deprecated HbInputMethod::orientationContextSwitchInProgress()
- is deprecated.
-*/
-bool HbInputMethod::orientationContextSwitchInProgress()
-{
- Q_D(HbInputMethod);
- return d->mIsOrientationContextSwitchInProgress;
+ delete d->mFocusObject;
+ d->mFocusObject = 0;
+
+ reset();
}
// End of file
--- a/src/hbcore/inputfw/hbinputmethod.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/inputfw/hbinputmethod.h Fri May 14 16:09:54 2010 +0300
@@ -66,7 +66,6 @@
void widgetDestroyed(QWidget* widget);
void setFocusWidget(QWidget* widget);
- void focusObjectDestroyed(const HbInputFocusObject* focusObject);
HbInputState inputState() const;
bool activateState(const HbInputState& state);
@@ -78,12 +77,9 @@
protected:
virtual void inputStateActivated(const HbInputState& newState);
virtual void inputLanguageChanged(const HbInputLanguage &newLanguage);
- virtual void secondaryInputLanguageChanged(const HbInputLanguage &newLanguage);
- virtual void predictiveInputStatusChanged(int newStatus);
+ virtual void secondaryInputLanguageChanged(const HbInputLanguage &newLanguage);
bool stateChangeInProgress() const;
- bool orientationContextSwitchInProgress();
- void releaseFocus();
HbInputLanguage activeLanguage() const;
bool modeAllowedInEditor(HbInputModeType mode) const;
@@ -94,13 +90,7 @@
public slots:
void globalInputLanguageChanged(const HbInputLanguage &newLanguage);
void globalSecondaryInputLanguageChanged(const HbInputLanguage &newLanguage);
- void activeHwKeyboardChanged(HbKeyboardType newKeyboard);
- void activeTouchKeyboardChanged(HbKeyboardType newKeyboard);
- void activeKeyboardChanged(HbKeyboardType newKeyboard);
- void predictiveInputStateChanged(int newState);
- virtual void predictiveInputStateChanged(HbKeyboardSettingFlags keyboardType, bool newState);
- void receiveText(const QString& string);
- virtual void candidatePopupClosed(int closingKey = 0);
+ void activeKeyboardChanged(HbKeyboardType newKeyboard);
void orientationChanged(Qt::Orientation orientation);
virtual void orientationAboutToChange();
void editorDeleted(QObject *obj);
--- a/src/hbcore/inputfw/hbinputmethod_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/inputfw/hbinputmethod_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -41,6 +41,7 @@
/// @cond
/*!
+\internal
Destructs the object.
*/
HbInputMethodPrivate::~HbInputMethodPrivate()
@@ -49,6 +50,7 @@
}
/*!
+\internal
Returns input filter of the focused editor.
*/
HbInputFilter *HbInputMethodPrivate::editorFilter() const
@@ -61,18 +63,20 @@
}
/*!
+\internal
Returns constraint flags of the focused editor.
*/
int HbInputMethodPrivate::editorConstraints() const
{
if (mFocusObject) {
- return mFocusObject->editorInterface().constraints();
+ return mFocusObject->editorInterface().inputConstraints();
}
return 0;
}
/*!
+\internal
Reads input state information from focused editor using editor interface and creates a local copy of it.
Finds out correct values for those fields that have not been initialized by the client application.
*/
@@ -111,18 +115,20 @@
}
/*!
+\internal
Transfers local copy of the input state back to the editor using editor interface.
*/
void HbInputMethodPrivate::inputStateToEditor(const HbInputState& source)
{
if (mFocusObject) {
mFocusObject->editorInterface().setLastFocusedState(source);
- mFocusObject->editorInterface().setInputMode(source.inputMode());
+ mFocusObject->editorInterface().setMode(source.inputMode());
mFocusObject->editorInterface().setTextCase(source.textCase());
}
}
/*!
+\internal
Returns input language for current input state. Ususally it is same as the global input language but
in case of latin only -editors it may be english if the global input language isn't valid for latin only -editors.
*/
@@ -133,7 +139,7 @@
if (ret.undefined()) {
ret = HbInputSettingProxy::instance()->globalInputLanguage();
if (mFocusObject) {
- if ((mFocusObject->editorInterface().constraints() & HbEditorConstraintLatinAlphabetOnly) &&
+ if ((mFocusObject->editorInterface().inputConstraints() & HbEditorConstraintLatinAlphabetOnly) &&
!ret.isLatinAlphabetLanguage()) {
// This is latin alphabet flagged editor, but the language isn't
// latin alphabet language. Switch to english locally.
@@ -146,6 +152,7 @@
}
/*!
+\internal
Returns true if given input mode is valid in focused editor.
*/
bool HbInputMethodPrivate::modeAllowedInEditor(HbInputModeType mode) const
@@ -160,7 +167,7 @@
}
if (constraints & HbEditorConstraintFixedInputMode){
- if (!mFocusObject || mFocusObject->editorInterface().inputMode() != mode) {
+ if (!mFocusObject || mFocusObject->editorInterface().mode() != mode) {
// This is fixed mode editor but proposed mode is something else.
// Reject.
return false;
@@ -176,6 +183,7 @@
}
/*!
+\internal
Returns true if given state is valid in focused editor.
*/
bool HbInputMethodPrivate::stateAllowedInEditor(const HbInputState& state)
@@ -202,53 +210,7 @@
}
/*!
-Goes through the given list of input modes, generates input state for each mode and finds
-out if there is state handler for that state. If a handler is found, returns it and
-fills 'state'parameter with values from generated state.
-*/
-HbInputMethod* HbInputMethodPrivate::findInitialStateHandler(const QVector<HbInputModeProperties>& modes,
- HbInputState& state)
-{
- state = HbInputState();
- HbInputMethod* master = 0;
-
- HbInputState inState;
-
- foreach (HbInputModeProperties mode, modes) {
- if (modeAllowedInEditor(mode.inputMode())) {
- stateFromMode(mode, inState);
- master = HbInputModeCache::instance()->findStateHandler(inState);
- if (master) {
- state = inState;
- break;
- }
- }
- }
-
- return master;
-}
-
-/*!
-Creates input state from input mode.
-*/
-void HbInputMethodPrivate::stateFromMode(const HbInputModeProperties& mode, HbInputState& state)
-{
- state.setKeyboard(activeKeyboard());
- state.setInputMode(mode.inputMode());
- state.setLanguage(mode.language());
-
- if (state.language().isCaseSensitiveLanguage() && HbInputUtils::isCaseSensitiveMode(mode.inputMode())) {
- if (automaticTextCaseNeeded()) {
- state.setTextCase(HbTextCaseAutomatic);
- } else {
- state.setTextCase(HbTextCaseLower);
- }
- } else {
- state.setTextCase(HbTextCaseNone);
- }
-}
-
-/*!
+\internal
Finds state handler for given input state.
*/
HbInputMethod* HbInputMethodPrivate::findStateHandler(HbInputState& state)
@@ -264,6 +226,7 @@
}
/*!
+\internal
Returns input language for current input state. Ususally it is same as the global input language but
in case of latin only -editors it may be english if the global input language isn't valid for latin only -editors.
*/
@@ -277,10 +240,11 @@
lang = QLocale::English;
}
- return HbInputLanguage(lang);
+ return lang;
}
/*!
+\internal
Returns true if auto-capitalisation is needed in current cursor position.
*/
bool HbInputMethodPrivate::automaticTextCaseNeeded() const
@@ -336,6 +300,7 @@
}
/*!
+\internal
Returns true if the concept of text case applies to current input language and input state.
*/
bool HbInputMethodPrivate::textCaseApplies() const
@@ -355,6 +320,7 @@
}
/*!
+\internal
Returns the active keyboard.
*/
HbKeyboardType HbInputMethodPrivate::activeKeyboard() const
@@ -369,6 +335,7 @@
}
/*!
+\internal
Takes care of the part of focus in operation that is common to both QWidgets and QGraphicsWidgets.
*/
void HbInputMethodPrivate::setFocusCommon()
@@ -438,6 +405,7 @@
}
/*!
+\internal
Refreshes input state. Stores local edit state back to the editor and calls child class' inputMethodActived method.
*/
void HbInputMethodPrivate::refreshState()
@@ -449,6 +417,7 @@
}
/*!
+\internal
Returns true if given focus object is same as currently focused or points to same editor instance.
*/
bool HbInputMethodPrivate::compareWithCurrentFocusObject(HbInputFocusObject* focusObject) const
@@ -470,6 +439,7 @@
}
/*!
+\internal
Creates and returns new input context proxy.
*/
QInputContext* HbInputMethodPrivate::newProxy()
@@ -478,6 +448,7 @@
}
/*!
+\internal
Returns true if currently focused editor is fixed text case editor.
*/
bool HbInputMethodPrivate::isFixedCaseEditor() const
@@ -490,6 +461,7 @@
}
/*!
+\internal
Returns true if focused editor is lower case -only editor.
*/
bool HbInputMethodPrivate::isLowerCaseOnlyEditor() const
@@ -502,6 +474,7 @@
}
/*!
+\internal
Returns true if focused editor is upper case -only editor.
*/
bool HbInputMethodPrivate::isUpperCaseOnlyEditor() const
@@ -514,6 +487,7 @@
}
/*!
+\internal
This method is needed during context switch operation. It transfers relevant parts of input
method's internal state to the input method that is about to assume control.
*/
@@ -547,6 +521,7 @@
}
/*!
+\internal
Passes control to another input method instance. Context switch
happens when there is a need to change input state but currently active input method
is not able to handle new input state. Framework then finds a new state handler and
@@ -589,7 +564,8 @@
}
/*!
-Cosntructs the first input state for an editor that hasn't been focused before.
+\internal
+Constructs the first input state for an editor that hasn't been focused before.
*/
void HbInputMethodPrivate::editorRootState(HbInputState &result) const
{
@@ -607,7 +583,8 @@
}
/*!
-Reutunrs initial text case for an editor that hasn't been focused before.
+\internal
+Reuturns initial text case for an editor that hasn't been focused before.
*/
HbTextCase HbInputMethodPrivate::initialTextCase(HbInputModeType inputMode) const
{
@@ -651,6 +628,7 @@
}
/*!
+\internal
Finds the first input mode for an editor that hasn't been focus before.
*/
HbInputModeType HbInputMethodPrivate::initialInputMode(const HbInputLanguage &language) const
@@ -658,9 +636,9 @@
HbInputModeType ret = HbInputModeNone;
if (mFocusObject) {
- if (mFocusObject->editorInterface().constraints() & HbEditorConstraintFixedInputMode) {
+ if (mFocusObject->editorInterface().inputConstraints() & HbEditorConstraintFixedInputMode) {
// This is fixed mode editor, always trust what editor interface gives us.
- ret = (HbInputModeType)mFocusObject->editorInterface().inputMode();
+ ret = (HbInputModeType)mFocusObject->editorInterface().mode();
} else {
// Editor doesn't have mode asigned. Propose default mode.
Qt::InputMethodHints hints = mFocusObject->inputMethodHints();
@@ -677,6 +655,7 @@
}
/*!
+\internal
Constructs latin input state. Non-latin input methods that wish to switch to latin mode
can use this input state as a parameter for activateState() method.
*/
@@ -689,6 +668,7 @@
}
/*!
+\internal
Returns the default input mode for given language.
*/
HbInputModeType HbInputMethodPrivate::defaultInputMode(const HbInputLanguage &inputLanguage) const
@@ -707,13 +687,14 @@
}
/*!
+\internal
A convenience method for setting up the editor as digits only editor.
*/
void HbInputMethodPrivate::setUpFocusedObjectAsDigitsOnlyEditor()
{
if(mFocusObject) {
- mFocusObject->editorInterface().setInputMode(HbInputModeNumeric);
- mFocusObject->editorInterface().setConstraints(HbEditorConstraintFixedInputMode);
+ mFocusObject->editorInterface().setMode(HbInputModeNumeric);
+ mFocusObject->editorInterface().setInputConstraints(HbEditorConstraintFixedInputMode);
if(!mFocusObject->editorInterface().filter()) {
mFocusObject->editorInterface().setFilter(HbDigitsOnlyFilter::instance());
}
@@ -722,13 +703,14 @@
}
/*!
+\internal
A convenience method for setting up the editor as formatted only editor
*/
void HbInputMethodPrivate::setUpFocusedObjectAsFormattedNumberEditor()
{
if(mFocusObject) {
- mFocusObject->editorInterface().setInputMode(HbInputModeNumeric);
- mFocusObject->editorInterface().setConstraints(HbEditorConstraintFixedInputMode);
+ mFocusObject->editorInterface().setMode(HbInputModeNumeric);
+ mFocusObject->editorInterface().setInputConstraints(HbEditorConstraintFixedInputMode);
if(!mFocusObject->editorInterface().filter()) {
mFocusObject->editorInterface().setFilter(HbFormattedNumbersFilter::instance());
}
@@ -737,13 +719,14 @@
}
/*!
+\internal
A convenience method for setting up the editor as phone number editor
*/
void HbInputMethodPrivate::setUpFocusedObjectAsPhoneNumberEditor()
{
if(mFocusObject) {
- mFocusObject->editorInterface().setInputMode(HbInputModeNumeric);
- mFocusObject->editorInterface().setConstraints(HbEditorConstraintFixedInputMode);
+ mFocusObject->editorInterface().setMode(HbInputModeNumeric);
+ mFocusObject->editorInterface().setInputConstraints(HbEditorConstraintFixedInputMode);
if(!mFocusObject->editorInterface().filter()) {
mFocusObject->editorInterface().setFilter(HbPhoneNumberFilter::instance());
}
@@ -752,13 +735,14 @@
}
/*!
+\internal
A convenience method for setting up the editor as email editor
*/
void HbInputMethodPrivate::setUpFocusedObjectAsEmailEditor()
{
if(mFocusObject) {
- mFocusObject->editorInterface().setInputMode(HbInputModeNone);
- mFocusObject->editorInterface().setConstraints(HbEditorConstraintLatinAlphabetOnly);
+ mFocusObject->editorInterface().setMode(HbInputModeNone);
+ mFocusObject->editorInterface().setInputConstraints(HbEditorConstraintLatinAlphabetOnly);
if(!mFocusObject->editorInterface().filter()) {
mFocusObject->editorInterface().setFilter(HbEmailAddressFilter::instance());
}
@@ -767,13 +751,14 @@
}
}
/*!
+\internal
A convenience method for setting up the editor as url editor
*/
void HbInputMethodPrivate::setUpFocusedObjectAsUrlEditor()
{
if(mFocusObject) {
- mFocusObject->editorInterface().setInputMode(HbInputModeNone);
- mFocusObject->editorInterface().setConstraints(HbEditorConstraintLatinAlphabetOnly);
+ mFocusObject->editorInterface().setMode(HbInputModeNone);
+ mFocusObject->editorInterface().setInputConstraints(HbEditorConstraintLatinAlphabetOnly);
if(!mFocusObject->editorInterface().filter()) {
mFocusObject->editorInterface().setFilter(HbUrlFilter::instance());
}
@@ -782,7 +767,6 @@
}
}
-
/// @endcond
// End of file
--- a/src/hbcore/inputfw/hbinputmethod_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/inputfw/hbinputmethod_p.h Fri May 14 16:09:54 2010 +0300
@@ -46,8 +46,7 @@
mFocusObject(0),
mInputState(HbInputModeNone, HbTextCaseNone, HbKeyboardNone),
mFocusLocked(false),
- mStateChangeInProgress(false),
- mIsOrientationContextSwitchInProgress(false)
+ mStateChangeInProgress(false)
{}
~HbInputMethodPrivate();
@@ -58,8 +57,6 @@
HbInputLanguage activeLanguage() const;
bool modeAllowedInEditor(HbInputModeType mode) const;
bool stateAllowedInEditor(const HbInputState& state);
- void stateFromMode(const HbInputModeProperties& mode, HbInputState& state);
- HbInputMethod* findInitialStateHandler(const QVector<HbInputModeProperties>& modes, HbInputState& state);
HbInputMethod* findStateHandler(HbInputState& startingState);
HbInputLanguage findStateLanguage() const;
bool automaticTextCaseNeeded() const;
@@ -91,9 +88,15 @@
HbInputFocusObject* mFocusObject;
HbInputState mInputState;
bool mFocusLocked;
- bool mStateChangeInProgress;
- bool mIsOrientationContextSwitchInProgress;
+ bool mStateChangeInProgress;
QList<HbInputModeProperties> mInputModes;
+
+private: // For unit test.
+ static HbInputMethodPrivate *d_ptr(HbInputMethod *inputMethod) {
+ Q_ASSERT(inputMethod);
+ return inputMethod->d_func();
+ }
+ friend class TestHbInputMethodPrivate;
};
#endif // HB_INPUT_METHOD_P_H
--- a/src/hbcore/inputfw/hbinputmethodnull.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/inputfw/hbinputmethodnull.cpp Fri May 14 16:09:54 2010 +0300
@@ -85,15 +85,7 @@
*/
bool HbInputMethodNull::filterEvent(const QEvent* event)
{
- if (!event || event->type() != QEvent::KeyPress) {
- return false;
- }
-
- if (focusObject() && !(focusObject()->editorInterface().constraints() & HbEditorConstraintOnlySecondaryChannel)) {
- qDebug("WARNING: HbInputMethodNull::filterEvent called without HbEditorConstraintOnlySecondaryChannel.");
- qDebug(" Is everything ok?");
- }
-
+ Q_UNUSED(event);
return false;
}
--- a/src/hbcore/inputfw/hbinputmodeproperties.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/inputfw/hbinputmodeproperties.h Fri May 14 16:09:54 2010 +0300
@@ -119,27 +119,12 @@
return iLanguage.asString() + QString(" ") + QString::number(iMode) + QString(" ") + QString::number(iKeyboard);
}
-public:
+private:
HbInputModeType iMode;
HbInputLanguage iLanguage;
HbKeyboardType iKeyboard;
};
-/*!
-\deprecated HbInputModeProperties::iMode
- is deprecated. It will become private.
-*/
-
-/*!
-\deprecated HbInputModeProperties::iLanguage
- is deprecated. It will become private.
-*/
-
-/*!
-\deprecated HbInputModeProperties::iKeyboard
- is deprecated. It will become private.
-*/
-
#endif // HB_INPUT_MODE_PROPERTIES_H
// End of file
--- a/src/hbcore/inputfw/hbinputpredictionfactory.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/inputfw/hbinputpredictionfactory.cpp Fri May 14 16:09:54 2010 +0300
@@ -46,7 +46,6 @@
\sa HbPredictionBase
\sa HbPredictionEngine
\sa HbPredictionEngineChinese
-\sa HbPredictionEngineJapanese
*/
/// @cond
--- a/src/hbcore/inputfw/hbinputsettingproxy.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/inputfw/hbinputsettingproxy.cpp Fri May 14 16:09:54 2010 +0300
@@ -367,7 +367,6 @@
\sa disconnectObservingObject
\sa globalInputLanguageChanged
-\sa activeHwKeyboardChanged
\sa predictiveInputStateChanged
\sa orientationAboutToChange
\sa orientationChanged
@@ -383,18 +382,8 @@
connect(this, SIGNAL(globalInputLanguageChanged(const HbInputLanguage &)), aObserver, SLOT(globalInputLanguageChanged(const HbInputLanguage &)));
connect(this, SIGNAL(globalSecondaryInputLanguageChanged(const HbInputLanguage &)), aObserver, SLOT(globalSecondaryInputLanguageChanged(const HbInputLanguage &)));
connect(this, SIGNAL(activeKeyboardChanged(HbKeyboardType)), aObserver, SLOT(activeKeyboardChanged(HbKeyboardType)));
- connect(this, SIGNAL(activeHwKeyboardChanged(HbKeyboardType)), aObserver, SLOT(activeHwKeyboardChanged(HbKeyboardType)));
- connect(this, SIGNAL(activeTouchKeyboardChanged(HbKeyboardType)), aObserver, SLOT(activeTouchKeyboardChanged(HbKeyboardType)));
- connect(this, SIGNAL(predictiveInputStateChanged(HbKeyboardSettingFlags, bool)), aObserver, SLOT(predictiveInputStateChanged(HbKeyboardSettingFlags, bool)));
connect(this, SIGNAL(orientationAboutToChange()), aObserver, SLOT(orientationAboutToChange()));
connect(this, SIGNAL(orientationChanged(Qt::Orientation)), aObserver, SLOT(orientationChanged(Qt::Orientation)));
-/* Setting listeners not implemented yet
- connect(this, SIGNAL(characterPreviewStateForQwertyChanged(bool)), aObserver, SLOT(characterPreviewStateForQwertyChanged(bool)));
- connect(this, SIGNAL(keypressTimeoutChanged(int)), aObserver, SLOT(keypressTimeoutChanged(int)));
- connect(this, SIGNAL(autocompletionStateChanged(HbKeyboardSettingFlags, bool)), aObserver, SLOT(autocompletionStateChanged(HbKeyboardSettingFlags, bool)));
- connect(this, SIGNAL(typingCorrectionLevelChanged(HbTypingCorrectionLevel)), aObserver, SLOT(typingCorrectionLevelChanged(HbTypingCorrectionLevel)));
- connect(this, SIGNAL(primaryCandidateModeChanged(HbPrimaryCandidateMode)), aObserver, SLOT(primaryCandidateModeChanged(HbPrimaryCandidateMode)));
-*/
}
}
@@ -408,19 +397,9 @@
if (aObserver) {
disconnect(this, SIGNAL(globalInputLanguageChanged(const HbInputLanguage &)), aObserver, SLOT(globalInputLanguageChanged(const HbInputLanguage &)));
disconnect(this, SIGNAL(globalSecondaryInputLanguageChanged(const HbInputLanguage &)), aObserver, SLOT(globalSecondaryInputLanguageChanged(const HbInputLanguage &)));
- disconnect(this, SIGNAL(predictiveInputStateChanged(HbKeyboardSettingFlags, bool)), aObserver, SLOT(predictiveInputStateChanged(HbKeyboardSettingFlags, bool)));
disconnect(this, SIGNAL(activeKeyboardChanged(HbKeyboardType)), aObserver, SLOT(activeKeyboardChanged(HbKeyboardType)));
- disconnect(this, SIGNAL(activeHwKeyboardChanged(HbKeyboardType)), aObserver, SLOT(activeHwKeyboardChanged(HbKeyboardType)));
- disconnect(this, SIGNAL(activeTouchKeyboardChanged(HbKeyboardType)), aObserver, SLOT(activeTouchKeyboardChanged(HbKeyboardType)));
disconnect(this, SIGNAL(orientationAboutToChange()), aObserver, SLOT(orientationAboutToChange()));
disconnect(this, SIGNAL(orientationChanged(Qt::Orientation)), aObserver, SLOT(orientationChanged(Qt::Orientation)));
-/* Setting listeners not implemented yet
- disconnect(this, SIGNAL(characterPreviewStateForQwertyChanged(bool)), aObserver, SLOT(characterPreviewStateForQwertyChanged(bool)));
- disconnect(this, SIGNAL(keypressTimeoutChanged(int)), aObserver, SLOT(keypressTimeoutChanged(int)));
- disconnect(this, SIGNAL(autocompletionStateChanged(HbKeyboardSettingFlags, bool)), aObserver, SLOT(autocompletionStateChanged(HbKeyboardSettingFlags, bool)));
- disconnect(this, SIGNAL(typingCorrectionLevelChanged(HbTypingCorrectionLevel)), aObserver, SLOT(typingCorrectionLevelChanged(HbTypingCorrectionLevel)));
- disconnect(this, SIGNAL(primaryCandidateModeChanged(HbPrimaryCandidateMode)), aObserver, SLOT(primaryCandidateModeChanged(HbPrimaryCandidateMode)));
-*/
}
}
@@ -474,8 +453,6 @@
{
aListOfAvailableKeyboards.append(HbKeyboard12Key);
aListOfAvailableKeyboards.append(HbKeyboardQwerty);
-
-//Read the prData and get the list of keyboards from the device profile
}
/*!
@@ -659,24 +636,6 @@
}
/*!
-\deprecated HbInputSettingProxy::predictiveInputStatus()
- is deprecated. Use predictiveInputStatusForITUT or predictiveInputStatusForQwerty instead.
-*/
-int HbInputSettingProxy::predictiveInputStatus() const
-{
- return predictiveInputStatusForActiveKeyboard();
-}
-
-/*!
-\deprecated HbInputSettingProxy::setPredictiveInputStatus(int newStatus)
- is deprecated. Use setPredictiveInputStatusForITUT or setPredictiveInputStatusForQwerty instead.
-*/
-void HbInputSettingProxy::setPredictiveInputStatus(int newStatus)
-{
- setPredictiveInputStatusForActiveKeyboard(newStatus);
-}
-
-/*!
Returns the status of predictive input feature. Returns true if any one of given
keyboard types has the prediction enabled. An editor instance may still forbid
predictive input feature, even if the device wide status allows it.
--- a/src/hbcore/inputfw/hbinputsettingproxy.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/inputfw/hbinputsettingproxy.h Fri May 14 16:09:54 2010 +0300
@@ -67,8 +67,6 @@
void setActiveKeyboard(HbKeyboardType keyboard);
void setActiveHwKeyboard(HbKeyboardType keyboard);
void setActiveTouchKeyboard(HbKeyboardType keyboard);
- int predictiveInputStatus() const;
- void setPredictiveInputStatus(int newStatus);
bool predictiveInputStatus(HbKeyboardSettingFlags keyboardType) const;
void setPredictiveInputStatus(HbKeyboardSettingFlags keyboardType, bool newStatus);
bool predictiveInputStatusForActiveKeyboard() const;
--- a/src/hbcore/inputfw/hbinpututils.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/inputfw/hbinpututils.cpp Fri May 14 16:09:54 2010 +0300
@@ -130,7 +130,7 @@
For example Chinese and Japanese modes do not have text case.
*/
bool HbInputUtils::isCaseSensitiveMode(HbInputModeType inputMode)
-{
+{
if (isChineseInputMode(inputMode)) {
return false;
}
@@ -193,16 +193,6 @@
}
/*!
-\deprecated HbInputUtils::isInputPluginInPermanentMemory(const QString&)
- is deprecated.
-*/
-bool HbInputUtils::isInputPluginInPermanentMemory(const QString& pluginFileName)
-{
- Q_UNUSED(pluginFileName)
- return false;
-}
-
-/*!
Lists all the input languages that the set of available input methods supports. Excludes custom input methods.
*/
void HbInputUtils::listSupportedInputLanguages(QList<HbInputLanguage>& results)
--- a/src/hbcore/inputfw/hbinpututils.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/inputfw/hbinpututils.h Fri May 14 16:09:54 2010 +0300
@@ -57,7 +57,6 @@
static void listAvailableLanguageDatabasePlugins(QStringList& result, const QString& subfolder);
static HbLanguageDatabaseInterface* languageDatabasePluginInstance(const QString& pluginFileName, const QString& subfolder);
- static bool isInputPluginInPermanentMemory(const QString& pluginFileName);
static void listSupportedInputLanguages(QList<HbInputLanguage>& results);
static QWidget* createWrapperWidget(QGraphicsWidget* graphicsWidget);
--- a/src/hbcore/inputfw/hbinputvirtualkeyboard.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/inputfw/hbinputvirtualkeyboard.cpp Fri May 14 16:09:54 2010 +0300
@@ -30,7 +30,7 @@
\class HbVirtualKeyboard
\brief Abstract base class for virtual keyboards.
-This class is an abstract base class for virtual keyaboards. This class is
+This class is an abstract base class for virtual keyaboards. It is
not reponsible for the visual appearance of the keyboard, but contains methods that HbVkbHost
class needs when interacting with the keyboard. The actual Qt widget inheriting from this
class will fill and layout the keyboard contents.
--- a/src/hbcore/inputfw/hbinputvkbhost.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/inputfw/hbinputvkbhost.cpp Fri May 14 16:09:54 2010 +0300
@@ -77,14 +77,6 @@
*/
/*!
-\fn virtual int HbVkbHost::priority() const
-\deprecated HbVkbHost::priority() const
- is deprecated.
-Returns priority. When the framework searches virtual keyboard host for an editor, it traverses all of its parent
-widgets and returns host that has highest priority.
-*/
-
-/*!
\fn virtual QSizeF HbVkbHost::keyboardArea() const
Returns the size of a rectangular area of the screen where virtual keyboard will be displayed. If
virtual keyboard's preferredKeyboardSize method returns larger area than returned by this method,
@@ -92,14 +84,6 @@
*/
/*!
-\fn virtual void HbVkbHost::preferredSizeChanged(const QSizeF& newSize) = 0
-\deprecated HbVkbHost::preferredSizeChanged(const QSizeF&)
- is deprecated.
-Virtual keyboard uses this method for notifying if its preferred size changes
-while the keyboard is on the screen.
-*/
-
-/*!
\fn virtual HbVirtualKeyboard* activeKeypad() const = 0
Returns active virtual keyboard. Returns zero if there is no active keyboard.
*/
--- a/src/hbcore/inputfw/hbinputvkbhost.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/inputfw/hbinputvkbhost.h Fri May 14 16:09:54 2010 +0300
@@ -44,17 +44,6 @@
public:
/*!
- \deprecated
- Enumerates known virtual keyboard host priorities.
- NOTE: all these values are deprecated.
- */
- enum HbVkbHostPriority {
- HbVkbHostPriorityDefault = 1000,
- HbVkbHostPriorityPopup = 2000,
- HbVkbHostPriorityCustom = 5000
- };
-
- /*!
Enumerates different keypad states.
*/
enum HbVkbStatus {
@@ -69,10 +58,8 @@
virtual void openMinimizedKeypad(HbVirtualKeyboard *vkb, HbInputMethod* owner) = 0;
virtual void closeKeypad(bool animationAllowed = true) = 0;
virtual void minimizeKeypad(bool animationAllowed = true) = 0;
- virtual HbVkbStatus keypadStatus() const = 0;
- virtual int priority() const = 0;
+ virtual HbVkbStatus keypadStatus() const = 0;
virtual QSizeF keyboardArea() const = 0;
- virtual void preferredSizeChanged(const QSizeF& newSize) = 0;
virtual HbVirtualKeyboard* activeKeypad() const = 0;
virtual QRectF applicationArea() const = 0;
virtual HbVkbStatus keypadStatusBeforeOrientationChange() const = 0;
--- a/src/hbcore/inputfw/hbinputvkbhostbridge.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/inputfw/hbinputvkbhostbridge.cpp Fri May 14 16:09:54 2010 +0300
@@ -132,14 +132,6 @@
/*!
\reimp
-*/
-int HbVkbHostBridge::priority() const
-{
- return 0;
-}
-
-/*!
-\reimp
*/
QSizeF HbVkbHostBridge::keyboardArea() const
{
@@ -154,17 +146,6 @@
/*!
\reimp
*/
-void HbVkbHostBridge::preferredSizeChanged(const QSizeF& newSize)
-{
- Q_D(HbVkbHostBridge);
- if (d->mActiveHost) {
- d->mActiveHost->preferredSizeChanged(newSize);
- }
-}
-
-/*!
-\reimp
-*/
HbVirtualKeyboard* HbVkbHostBridge::activeKeypad() const
{
Q_D(const HbVkbHostBridge);
--- a/src/hbcore/inputfw/hbinputvkbhostbridge.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/inputfw/hbinputvkbhostbridge.h Fri May 14 16:09:54 2010 +0300
@@ -43,9 +43,7 @@
void closeKeypad(bool animationAllowed);
void minimizeKeypad(bool animationAllowed);
HbVkbStatus keypadStatus() const;
- int priority() const;
- QSizeF keyboardArea() const;
- void preferredSizeChanged(const QSizeF& newSize);
+ QSizeF keyboardArea() const;
HbVirtualKeyboard* activeKeypad() const;
QRectF applicationArea() const;
HbVkbStatus keypadStatusBeforeOrientationChange() const;
--- a/src/hbcore/primitives/hbrepeaticonitem_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/primitives/hbrepeaticonitem_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -129,9 +129,7 @@
{
Q_UNUSED(option);
Q_UNUSED(widget);
-
- // if(boundingRect().isValid()) { // There is no geomtry set at any point ?
- if(!mConnected) {
+ if(!mConnected) {
connect(&mTimer,SIGNAL(timeout()),this,SLOT(updateAnimation()));
}
// Chec the status of timer
@@ -163,7 +161,6 @@
newblit.setMask(mMask);
}
painter->drawPixmap(QPointF(0,0),newblit);
- // }
}
--- a/src/hbcore/resources/actionmanager/action_template_menu_horizontal.xml Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/actionmanager/action_template_menu_horizontal.xml Fri May 14 16:09:54 2010 +0300
@@ -6,14 +6,14 @@
<action commandrole="NewRole"/>
<action commandrole="DeleteRole"/>
<action commandrole="ClearRole"/>
- <action commandrole="SettingsRole"/>
<action commandrole="SendRole"/>
<action commandrole="PrintRole"/>
<action commandrole="EditRole"/>
<action commandrole="CopyRole"/>
<action commandrole="PasteRole"/>
<action commandrole="HelpRole"/>
+ <action commandrole="OtherRole"/>
<action commandrole="QuitRole"/>
+ <action commandrole="SettingsRole"/>
<action commandrole="ExitRole"/>
- <action commandrole="OtherRole"/>
</distributiontemplate>
--- a/src/hbcore/resources/actionmanager/action_template_menu_vertical.xml Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/actionmanager/action_template_menu_vertical.xml Fri May 14 16:09:54 2010 +0300
@@ -6,14 +6,14 @@
<action commandrole="NewRole"/>
<action commandrole="DeleteRole"/>
<action commandrole="ClearRole"/>
- <action commandrole="SettingsRole"/>
<action commandrole="SendRole"/>
<action commandrole="PrintRole"/>
<action commandrole="EditRole"/>
<action commandrole="CopyRole"/>
<action commandrole="PasteRole"/>
<action commandrole="HelpRole"/>
+ <action commandrole="OtherRole"/>
<action commandrole="QuitRole"/>
+ <action commandrole="SettingsRole"/>
<action commandrole="ExitRole"/>
- <action commandrole="OtherRole"/>
</distributiontemplate>
\ No newline at end of file
--- a/src/hbcore/resources/actionmanager/distribution_guide_horizontal.xml Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/actionmanager/distribution_guide_horizontal.xml Fri May 14 16:09:54 2010 +0300
@@ -2,12 +2,4 @@
<distributionguide>
<toolbar maxcount="3"/>
<default container="OptionsMenu"/>
- <distributionitem>
- <action commandrole="OpenRole"/>
- <placement container="ToolBar"/>
- </distributionitem>
- <distributionitem>
- <action commandrole="ExitRole"/>
- <placement container="ToolBar"/>
- </distributionitem>
</distributionguide>
--- a/src/hbcore/resources/actionmanager/distribution_guide_vertical.xml Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/actionmanager/distribution_guide_vertical.xml Fri May 14 16:09:54 2010 +0300
@@ -2,12 +2,4 @@
<distributionguide>
<toolbar maxcount="4"/>
<default container="OptionsMenu"/>
- <distributionitem>
- <action commandrole="OptionsRole"/>
- <placement container="ToolBar"/>
- </distributionitem>
- <distributionitem>
- <action commandrole="ExitRole"/>
- <placement container="ToolBar"/>
- </distributionitem>
</distributionguide>
Binary file src/hbcore/resources/centralrepository/20022E82.txt has changed
--- a/src/hbcore/resources/hbvariant_default.qrc Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/hbvariant_default.qrc Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,5 @@
<RCC>
<qresource prefix="/">
<file alias="typefaces.xml">variant/typefaces_default.xml</file>
- <file alias="typeface_metrics_nokia_sans.xml">variant/typeface_metrics_nokia_sans.xml</file>
- <file alias="typeface_metrics_nokia_sans_title_semibold.xml">variant/typeface_metrics_nokia_sans_title_semibold.xml</file>
- <file alias="typeface_metrics_ocr_a_extended.xml">variant/typeface_metrics_ocr_a_extended.xml</file>
</qresource>
</RCC>
--- a/src/hbcore/resources/hbvariant_s60.qrc Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/hbvariant_s60.qrc Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,5 @@
<RCC>
<qresource prefix="/">
<file alias="typefaces.xml">variant/typefaces_s60.xml</file>
- <file alias="typeface_metrics_series_60_sans.xml">variant/typeface_metrics_series_60_sans.xml</file>
- <file alias="typeface_metrics_series_60_sans_titlesmbd.xml">variant/typeface_metrics_series_60_sans_titlesmbd.xml</file>
- <file alias="typeface_metrics_series_60_zdigi.xml">variant/typeface_metrics_series_60_zdigi.xml</file>
</qresource>
</RCC>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/effects/hbdefault/fade_effect.fxml Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="ASCII"?>
+<layers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://www.nokia.com/FXML">
+ <comment>Created using carbide.fx 1.x; FxML revision 0.xx; Platform 9.2 </comment>
+ <visual src="Item" />
+ <layergroup>
+ <visual src="Item" />
+ <filter name="Brightness And Contrast" type="brightness_contrast">
+ <param name="opacity">1.0</param>
+ <param name="brightness">-0.25</param>
+ <param name="contrast">0.5</param>
+ </filter>
+ <blending>darken</blending>
+ </layergroup>
+</layers>
--- a/src/hbcore/resources/themes/effects/hbdefault/groupbox_collapse.fxml Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/effects/hbdefault/groupbox_collapse.fxml Fri May 14 16:09:54 2010 +0300
@@ -1,17 +1,11 @@
<layers>
- <visual>
- <param name="translation_y" type="anim">
- <duration>0.3</duration>
- <style>outquad</style>
- <keyframe at="0.0">0.0</keyframe>
- <keyframe at="1.0">1.0</keyframe>
- <start ref="visual.top">1.0</start>
- <end ref="visual.height">-1.0</end>
- </param>
- <param name="opacity" type="anim">
+ <visual>
+
+ <param name="opacity" type="anim">
<duration>0.3</duration>
<keyframe at="0.0">1.0</keyframe>
<keyframe at="1.0">0.0</keyframe>
</param>
- </visual>
+
+ </visual>
</layers>
\ No newline at end of file
--- a/src/hbcore/resources/themes/effects/hbdefault/groupbox_expand.fxml Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/effects/hbdefault/groupbox_expand.fxml Fri May 14 16:09:54 2010 +0300
@@ -1,19 +1,12 @@
<layers>
- <visual>
- <param name="translation_y" type="anim">
- <duration>0.3</duration>
- <style>outquad</style>
- <keyframe at="0.0">0.0</keyframe>
- <keyframe at="1.0">1.0</keyframe>
- <start ref="visual.height">-1.0</start>
- <end ref="visual.top">1</end>
- </param>
- <param name="opacity" type="anim">
+ <visual>
+
+ <param name="opacity" type="anim">
<duration>0.3</duration>
<keyframe at="0.0">0.0</keyframe>
<keyframe at="1.0">1.0</keyframe>
</param>
- </visual>
+ </visual>
</layers>
--- a/src/hbcore/resources/themes/effects/hbdefault/indicator_move_left.fxml Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/effects/hbdefault/indicator_move_left.fxml Fri May 14 16:09:54 2010 +0300
@@ -1,12 +1,12 @@
<layers>
- <visual>
- <param name="translation_x" type="anim">
- <duration>0.3</duration>
- <style>inoutquad</style>
- <keyframe at="0.0">0.0</keyframe>
- <keyframe at="1.0">-1.0</keyframe>
- <start ref="visual.left">1.0</start>
- <end ref="visual.right">1.0</end>
- </param>
- </visual>
-</layers>
\ No newline at end of file
+<visual>
+ <param name="translation_x" type="anim">
+ <duration>0.3</duration>
+ <style>inoutquad</style>
+ <keyframe at="0.0">0.0</keyframe>
+ <keyframe at="1.0">1.0</keyframe>
+ <start ref="visual.right">1.0</start>
+ <end ref="visual.left">1.0</end>
+ </param>
+</visual>
+</layers>
--- a/src/hbcore/resources/themes/effects/hbdefault/radiobuttonlistviewitem_press.fxml Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/effects/hbdefault/radiobuttonlistviewitem_press.fxml Fri May 14 16:09:54 2010 +0300
@@ -1,13 +1,4 @@
<layers>
-<visual>
-
-<param name="opacity" type="anim">
-<duration>0.3</duration>
-<style>linear</style>
-<keyframe at="0.0">0.0</keyframe>
-<keyframe at="1.0">1.0</keyframe>
-</param>
-
-</visual>
+ <visual />
</layers>
--- a/src/hbcore/resources/themes/effects/hbdefault/radiobuttonlistviewitem_release.fxml Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/effects/hbdefault/radiobuttonlistviewitem_release.fxml Fri May 14 16:09:54 2010 +0300
@@ -1,13 +1,4 @@
<layers>
-<visual>
-
-<param name="opacity" type="anim">
-<duration>0.3</duration>
-<style>linear</style>
-<keyframe at="0.0">1.0</keyframe>
-<keyframe at="1.0">0.0</keyframe>
-</param>
-
-</visual>
+ <visual />
</layers>
--- a/src/hbcore/resources/themes/effects/hbdefault/titlebar_minimize.fxml Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/effects/hbdefault/titlebar_minimize.fxml Fri May 14 16:09:54 2010 +0300
@@ -5,8 +5,9 @@
<style>inoutquad</style>
<keyframe at="0.0">0.0</keyframe>
<keyframe at="1.0">1.0</keyframe>
- <start ref="visual.left">1.0</start>
- <end ref="screen.right">1</end>
+ <start ref="extrect.left">1.0</start>
+ <end ref="extrect.right">1</end>
+
</param>
</visual>
</layers>
--- a/src/hbcore/resources/themes/effects/hbdefault/toolbar_appear.fxml Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/effects/hbdefault/toolbar_appear.fxml Fri May 14 16:09:54 2010 +0300
@@ -5,7 +5,7 @@
<style>outquad</style>
<keyframe at="0.0">0.0</keyframe>
<keyframe at="1.0">1.0</keyframe>
- <start ref="screen.bottom">1.0</start>
+ <start ref="visual.bottom">1.0</start>
<end ref="visual.top">1</end>
</param>
</visual>
--- a/src/hbcore/resources/themes/effects/hbdefault/toolbar_disappear.fxml Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/effects/hbdefault/toolbar_disappear.fxml Fri May 14 16:09:54 2010 +0300
@@ -6,7 +6,7 @@
<keyframe at="0">0</keyframe>
<keyframe at="0">0</keyframe>
<start ref="visual.top">1</start>
- <end ref="screen.bottom">1</end>
+ <end ref="visual.bottom">1</end>
</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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_1.svg Fri May 14 16:09:54 2010 +0300
@@ -1,12 +1,128 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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="M25.999,1.732c-0.031,0-0.065,0.002-0.097,0.002v5.709c0.031,0,0.064,0,0.097,0 c10.233,0,18.558,8.326,18.558,18.557c0,10.234-8.324,18.557-18.558,18.557c-10.104,0-18.351-8.117-18.556-18.176H1.732 c0.205,13.207,11.012,23.887,24.267,23.887c13.38,0,24.269-10.885,24.269-24.268C50.268,12.62,39.379,1.732,25.999,1.732z" fill="url(#SVGID_1_)"/>
-<defs>
-<linearGradient gradientTransform="matrix(1 0 0 1 -603.5 -638.5)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="631.2676" x2="625.2834" y1="674.0195" y2="641.8002">
-<stop offset="0" style="stop-color:#0067B1"/>
-<stop offset="1" style="stop-color:#0069B1;stop-opacity:0.25"/>
-</linearGradient>
-</defs>
+<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">
+<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">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M28.76,4.005c-6.258,0.293-11.932,2.791-16.268,6.734l3.189,3.189 C19.2,10.791,23.746,8.8,28.76,8.514V4.005z" fill="url(#SVGID_1_)"/>
+<radialGradient cx="37.875" cy="9.875" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="21.1896">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M10.74,12.493C6.793,16.833,4.293,22.51,4,28.761h4.514c0.286-5.014,2.277-9.56,5.415-13.08 L10.74,12.493z" fill="url(#SVGID_2_)"/>
+<radialGradient cx="37.875" cy="9.875" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="21.1896">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M4.004,31.24c0.295,6.256,2.793,11.93,6.736,16.266l3.188-3.188 c-3.137-3.52-5.128-8.064-5.414-13.078H4.004z" fill="url(#SVGID_3_)"/>
+<radialGradient cx="37.875" cy="9.875" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="21.1896">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M47.506,10.74C43.166,6.794,37.49,4.294,31.24,4v4.514c5.014,0.286,9.56,2.277,13.078,5.415 L47.506,10.74z" fill="url(#SVGID_4_)"/>
+<radialGradient cx="37.875" cy="9.875" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_5_" r="21.1896">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M49.26,47.507c3.947-4.34,6.447-10.017,6.74-16.267h-4.514c-0.286,5.014-2.277,9.56-5.415,13.078 L49.26,47.507z" fill="url(#SVGID_5_)"/>
+<radialGradient cx="37.875" cy="9.875" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="21.1896">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M55.996,28.761c-0.295-6.258-2.793-11.932-6.736-16.268l-3.188,3.188 c3.138,3.52,5.129,8.066,5.415,13.08H55.996z" fill="url(#SVGID_6_)"/>
+<radialGradient cx="37.875" cy="9.875" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="21.1896">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M31.24,55.996c6.256-0.294,11.932-2.792,16.268-6.735l-3.189-3.188 C40.8,49.209,36.254,51.2,31.24,51.486V55.996z" fill="url(#SVGID_7_)"/>
+<radialGradient cx="37.875" cy="9.875" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="21.1896">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M12.494,49.258C16.834,53.205,22.51,55.706,28.76,56v-4.514c-5.014-0.286-9.56-2.277-13.079-5.415 L12.494,49.258z" fill="url(#SVGID_8_)"/>
+</g>
+<radialGradient cx="37.875" cy="9.875" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="21.1896">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M28.76,12.65V8.514c-5.014,0.286-9.56,2.277-13.079,5.415l2.925,2.925 C21.368,14.458,24.886,12.924,28.76,12.65z" fill="url(#SVGID_9_)"/>
+<radialGradient cx="37.875" cy="9.875" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="21.1896">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M16.853,18.606l-2.925-2.925c-3.138,3.52-5.128,8.066-5.415,13.08h4.137 C12.924,24.887,14.457,21.368,16.853,18.606z" fill="url(#SVGID_10_)"/>
+<radialGradient cx="37.875" cy="9.875" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_11_" r="21.1896">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M12.65,31.24H8.514c0.286,5.014,2.277,9.559,5.414,13.078l2.925-2.925 C14.457,38.632,12.924,35.113,12.65,31.24z" fill="url(#SVGID_11_)"/>
+<radialGradient cx="37.875" cy="9.875" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_12_" r="21.1896">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M41.394,16.854l2.925-2.925C40.8,10.791,36.254,8.8,31.24,8.514v4.137 C35.113,12.924,38.632,14.458,41.394,16.854z" fill="url(#SVGID_12_)"/>
+<radialGradient cx="37.875" cy="9.875" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_13_" r="21.1896">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M43.146,41.394l2.925,2.925c3.138-3.519,5.129-8.064,5.415-13.078H47.35 C47.076,35.113,45.542,38.632,43.146,41.394z" fill="url(#SVGID_13_)"/>
+<radialGradient cx="37.875" cy="9.875" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_14_" r="21.1896">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M47.35,28.761h4.137c-0.286-5.014-2.277-9.56-5.415-13.08l-2.925,2.925 C45.543,21.368,47.076,24.887,47.35,28.761z" fill="url(#SVGID_14_)"/>
+<radialGradient cx="37.875" cy="9.875" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_15_" r="21.1896">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M31.24,47.35v4.137c5.014-0.286,9.56-2.277,13.078-5.414l-2.925-2.925 C38.631,45.543,35.113,47.076,31.24,47.35z" fill="url(#SVGID_15_)"/>
+<radialGradient cx="37.875" cy="9.875" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_16_" r="21.1896">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M18.605,43.146l-2.925,2.925c3.519,3.138,8.065,5.129,13.079,5.415V47.35 C24.886,47.076,21.367,45.542,18.605,43.146z" fill="url(#SVGID_16_)"/>
+</g>
+<path d="M28.76,12.65V8.514c-5.014,0.286-9.56,2.277-13.079,5.415l2.925,2.925 C21.368,14.458,24.886,12.924,28.76,12.65z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M16.853,18.606l-2.925-2.925c-3.138,3.52-5.128,8.066-5.415,13.08h4.137 C12.924,24.887,14.457,21.368,16.853,18.606z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M12.65,31.24H8.514c0.286,5.014,2.277,9.559,5.414,13.078l2.925-2.925 C14.457,38.632,12.924,35.113,12.65,31.24z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M41.394,16.854l2.925-2.925C40.8,10.791,36.254,8.8,31.24,8.514v4.137 C35.113,12.924,38.632,14.458,41.394,16.854z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M43.146,41.394l2.925,2.925c3.138-3.519,5.129-8.064,5.415-13.078H47.35 C47.076,35.113,45.542,38.632,43.146,41.394z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M47.35,28.761h4.137c-0.286-5.014-2.277-9.56-5.415-13.08l-2.925,2.925 C45.543,21.368,47.076,24.887,47.35,28.761z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M31.24,47.35v4.137c5.014-0.286,9.56-2.277,13.078-5.414l-2.925-2.925 C38.631,45.543,35.113,47.076,31.24,47.35z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M18.605,43.146l-2.925,2.925c3.519,3.138,8.065,5.129,13.079,5.415V47.35 C24.886,47.076,21.367,45.542,18.605,43.146z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_10.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_10.svg Fri May 14 16:09:54 2010 +0300
@@ -1,12 +1,128 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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="M11.734,6.369c-0.025,0.018-0.051,0.039-0.076,0.057l3.355,4.619 c0.023-0.018,0.053-0.038,0.078-0.057c8.279-6.014,19.906-4.172,25.922,4.105c6.016,8.279,4.172,19.905-4.107,25.92 c-8.176,5.939-19.617,4.221-25.695-3.799L6.59,40.57c7.93,10.566,22.949,12.854,33.674,5.063 c10.824-7.864,13.234-23.071,5.369-33.897C37.768,0.911,22.561-1.496,11.734,6.369z" fill="url(#SVGID_1_)"/>
-<defs>
-<linearGradient gradientTransform="matrix(0.809 -0.5878 0.5878 0.809 -809.3743 -387.0681)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="434.7861" x2="428.8017" y1="834.7246" y2="802.5044">
-<stop offset="0" style="stop-color:#0067B1"/>
-<stop offset="1" style="stop-color:#0069B1;stop-opacity:0.25"/>
-</linearGradient>
-</defs>
+<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">
+<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">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M28.76,4.005c-6.258,0.293-11.932,2.791-16.268,6.734l3.189,3.189 C19.2,10.791,23.746,8.8,28.76,8.514V4.005z" fill="url(#SVGID_1_)"/>
+<radialGradient cx="31.375" cy="8.375" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="22.4099">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M10.74,12.493C6.793,16.833,4.293,22.51,4,28.761h4.514c0.286-5.014,2.277-9.56,5.415-13.08 L10.74,12.493z" fill="url(#SVGID_2_)"/>
+<radialGradient cx="31.375" cy="8.375" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="22.4099">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M4.004,31.24c0.295,6.256,2.793,11.93,6.736,16.266l3.188-3.188 c-3.137-3.52-5.128-8.064-5.414-13.078H4.004z" fill="url(#SVGID_3_)"/>
+<radialGradient cx="31.375" cy="8.375" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="22.4099">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M47.506,10.74C43.166,6.794,37.49,4.294,31.24,4v4.514c5.014,0.286,9.56,2.277,13.078,5.415 L47.506,10.74z" fill="url(#SVGID_4_)"/>
+<radialGradient cx="31.375" cy="8.375" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_5_" r="22.4099">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M49.26,47.507c3.947-4.34,6.447-10.017,6.74-16.267h-4.514c-0.286,5.014-2.277,9.56-5.415,13.078 L49.26,47.507z" fill="url(#SVGID_5_)"/>
+<radialGradient cx="31.375" cy="8.375" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="22.4099">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M55.996,28.761c-0.295-6.258-2.793-11.932-6.736-16.268l-3.188,3.188 c3.138,3.52,5.129,8.066,5.415,13.08H55.996z" fill="url(#SVGID_6_)"/>
+<radialGradient cx="31.375" cy="8.375" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="22.4099">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M31.24,55.996c6.256-0.294,11.932-2.792,16.268-6.735l-3.189-3.188 C40.8,49.209,36.254,51.2,31.24,51.486V55.996z" fill="url(#SVGID_7_)"/>
+<radialGradient cx="31.375" cy="8.375" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="22.4099">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M12.494,49.258C16.834,53.205,22.51,55.706,28.76,56v-4.514c-5.014-0.286-9.56-2.277-13.079-5.415 L12.494,49.258z" fill="url(#SVGID_8_)"/>
+</g>
+<radialGradient cx="31.375" cy="8.375" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="22.4099">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M28.76,12.65V8.514c-5.014,0.286-9.56,2.277-13.079,5.415l2.925,2.925 C21.368,14.458,24.886,12.924,28.76,12.65z" fill="url(#SVGID_9_)"/>
+<radialGradient cx="31.375" cy="8.375" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="22.4099">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M16.853,18.606l-2.925-2.925c-3.138,3.52-5.128,8.066-5.415,13.08h4.137 C12.924,24.887,14.457,21.368,16.853,18.606z" fill="url(#SVGID_10_)"/>
+<radialGradient cx="31.375" cy="8.375" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_11_" r="22.4099">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M12.65,31.24H8.514c0.286,5.014,2.277,9.559,5.414,13.078l2.925-2.925 C14.457,38.632,12.924,35.113,12.65,31.24z" fill="url(#SVGID_11_)"/>
+<radialGradient cx="31.375" cy="8.375" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_12_" r="22.4099">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M41.394,16.854l2.925-2.925C40.8,10.791,36.254,8.8,31.24,8.514v4.137 C35.113,12.924,38.632,14.458,41.394,16.854z" fill="url(#SVGID_12_)"/>
+<radialGradient cx="31.375" cy="8.375" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_13_" r="22.4099">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M43.146,41.394l2.925,2.925c3.138-3.519,5.129-8.064,5.415-13.078H47.35 C47.076,35.113,45.542,38.632,43.146,41.394z" fill="url(#SVGID_13_)"/>
+<radialGradient cx="31.375" cy="8.375" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_14_" r="22.4099">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M47.35,28.761h4.137c-0.286-5.014-2.277-9.56-5.415-13.08l-2.925,2.925 C45.543,21.368,47.076,24.887,47.35,28.761z" fill="url(#SVGID_14_)"/>
+<radialGradient cx="31.375" cy="8.375" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_15_" r="22.4099">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M31.24,47.35v4.137c5.014-0.286,9.56-2.277,13.078-5.414l-2.925-2.925 C38.631,45.543,35.113,47.076,31.24,47.35z" fill="url(#SVGID_15_)"/>
+<radialGradient cx="31.375" cy="8.375" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_16_" r="22.4099">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M18.605,43.146l-2.925,2.925c3.519,3.138,8.065,5.129,13.079,5.415V47.35 C24.886,47.076,21.367,45.542,18.605,43.146z" fill="url(#SVGID_16_)"/>
+</g>
+<path d="M28.76,12.65V8.514c-5.014,0.286-9.56,2.277-13.079,5.415l2.925,2.925 C21.368,14.458,24.886,12.924,28.76,12.65z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M16.853,18.606l-2.925-2.925c-3.138,3.52-5.128,8.066-5.415,13.08h4.137 C12.924,24.887,14.457,21.368,16.853,18.606z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M12.65,31.24H8.514c0.286,5.014,2.277,9.559,5.414,13.078l2.925-2.925 C14.457,38.632,12.924,35.113,12.65,31.24z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M41.394,16.854l2.925-2.925C40.8,10.791,36.254,8.8,31.24,8.514v4.137 C35.113,12.924,38.632,14.458,41.394,16.854z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M43.146,41.394l2.925,2.925c3.138-3.519,5.129-8.064,5.415-13.078H47.35 C47.076,35.113,45.542,38.632,43.146,41.394z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M47.35,28.761h4.137c-0.286-5.014-2.277-9.56-5.415-13.08l-2.925,2.925 C45.543,21.368,47.076,24.887,47.35,28.761z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M31.24,47.35v4.137c5.014-0.286,9.56-2.277,13.078-5.414l-2.925-2.925 C38.631,45.543,35.113,47.076,31.24,47.35z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M18.605,43.146l-2.925,2.925c3.519,3.138,8.065,5.129,13.079,5.415V47.35 C24.886,47.076,21.367,45.542,18.605,43.146z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_2.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_2.svg Fri May 14 16:09:54 2010 +0300
@@ -1,12 +1,128 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 baseProfile="tiny" height="52px" version="1.1" viewBox="0 1 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="M40.264,6.367c-0.025-0.02-0.055-0.038-0.078-0.057l-3.355,4.621 c0.023,0.018,0.053,0.037,0.078,0.055c8.277,6.017,10.119,17.644,4.105,25.921c-6.016,8.278-17.643,10.12-25.922,4.104 C6.916,35.072,5.018,23.658,10.764,15.4l-4.619-3.356c-7.598,10.806-5.133,25.797,5.59,33.588c10.826,7.865,26.033,5.459,33.9-5.368 C53.498,29.439,51.088,14.23,40.264,6.367z" fill="url(#SVGID_1_)"/>
-<defs>
-<linearGradient gradientTransform="matrix(0.809 0.5878 -0.5878 0.809 -288.5716 -720.7115)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="695.1816" x2="689.1973" y1="428.7139" y2="396.4937">
-<stop offset="0" style="stop-color:#0067B1"/>
-<stop offset="1" style="stop-color:#0069B1;stop-opacity:0.25"/>
-</linearGradient>
-</defs>
+<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">
+<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">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M28.76,4.005c-6.258,0.293-11.932,2.791-16.268,6.734l3.189,3.189 C19.2,10.791,23.746,8.8,28.76,8.514V4.005z" fill="url(#SVGID_1_)"/>
+<radialGradient cx="50.125" cy="22.125" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="21.5193">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M10.74,12.493C6.793,16.833,4.293,22.51,4,28.761h4.514c0.286-5.014,2.277-9.56,5.415-13.08 L10.74,12.493z" fill="url(#SVGID_2_)"/>
+<radialGradient cx="50.125" cy="22.125" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="21.5193">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M4.004,31.24c0.295,6.256,2.793,11.93,6.736,16.266l3.188-3.188 c-3.137-3.52-5.128-8.064-5.414-13.078H4.004z" fill="url(#SVGID_3_)"/>
+<radialGradient cx="50.125" cy="22.125" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="21.5193">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M47.506,10.74C43.166,6.794,37.49,4.294,31.24,4v4.514c5.014,0.286,9.56,2.277,13.078,5.415 L47.506,10.74z" fill="url(#SVGID_4_)"/>
+<radialGradient cx="50.125" cy="22.125" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_5_" r="21.5193">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M49.26,47.507c3.947-4.34,6.447-10.017,6.74-16.267h-4.514c-0.286,5.014-2.277,9.56-5.415,13.078 L49.26,47.507z" fill="url(#SVGID_5_)"/>
+<radialGradient cx="50.125" cy="22.125" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="21.5192">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M55.996,28.761c-0.295-6.258-2.793-11.932-6.736-16.268l-3.188,3.188 c3.138,3.52,5.129,8.066,5.415,13.08H55.996z" fill="url(#SVGID_6_)"/>
+<radialGradient cx="50.125" cy="22.125" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="21.5193">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M31.24,55.996c6.256-0.294,11.932-2.792,16.268-6.735l-3.189-3.188 C40.8,49.209,36.254,51.2,31.24,51.486V55.996z" fill="url(#SVGID_7_)"/>
+<radialGradient cx="50.125" cy="22.125" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="21.5193">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M12.494,49.258C16.834,53.205,22.51,55.706,28.76,56v-4.514c-5.014-0.286-9.56-2.277-13.079-5.415 L12.494,49.258z" fill="url(#SVGID_8_)"/>
+</g>
+<radialGradient cx="50.125" cy="22.125" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="21.5193">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M28.76,12.65V8.514c-5.014,0.286-9.56,2.277-13.079,5.415l2.925,2.925 C21.368,14.458,24.886,12.924,28.76,12.65z" fill="url(#SVGID_9_)"/>
+<radialGradient cx="50.125" cy="22.125" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="21.5193">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M16.853,18.606l-2.925-2.925c-3.138,3.52-5.128,8.066-5.415,13.08h4.137 C12.924,24.887,14.457,21.368,16.853,18.606z" fill="url(#SVGID_10_)"/>
+<radialGradient cx="50.125" cy="22.125" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_11_" r="21.5193">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M12.65,31.24H8.514c0.286,5.014,2.277,9.559,5.414,13.078l2.925-2.925 C14.457,38.632,12.924,35.113,12.65,31.24z" fill="url(#SVGID_11_)"/>
+<radialGradient cx="50.125" cy="22.125" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_12_" r="21.5193">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M41.394,16.854l2.925-2.925C40.8,10.791,36.254,8.8,31.24,8.514v4.137 C35.113,12.924,38.632,14.458,41.394,16.854z" fill="url(#SVGID_12_)"/>
+<radialGradient cx="50.125" cy="22.125" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_13_" r="21.5193">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M43.146,41.394l2.925,2.925c3.138-3.519,5.129-8.064,5.415-13.078H47.35 C47.076,35.113,45.542,38.632,43.146,41.394z" fill="url(#SVGID_13_)"/>
+<radialGradient cx="50.125" cy="22.125" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_14_" r="21.5193">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M47.35,28.761h4.137c-0.286-5.014-2.277-9.56-5.415-13.08l-2.925,2.925 C45.543,21.368,47.076,24.887,47.35,28.761z" fill="url(#SVGID_14_)"/>
+<radialGradient cx="50.125" cy="22.125" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_15_" r="21.5192">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M31.24,47.35v4.137c5.014-0.286,9.56-2.277,13.078-5.414l-2.925-2.925 C38.631,45.543,35.113,47.076,31.24,47.35z" fill="url(#SVGID_15_)"/>
+<radialGradient cx="50.125" cy="22.125" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_16_" r="21.5193">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M18.605,43.146l-2.925,2.925c3.519,3.138,8.065,5.129,13.079,5.415V47.35 C24.886,47.076,21.367,45.542,18.605,43.146z" fill="url(#SVGID_16_)"/>
+</g>
+<path d="M28.76,12.65V8.514c-5.014,0.286-9.56,2.277-13.079,5.415l2.925,2.925 C21.368,14.458,24.886,12.924,28.76,12.65z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M16.853,18.606l-2.925-2.925c-3.138,3.52-5.128,8.066-5.415,13.08h4.137 C12.924,24.887,14.457,21.368,16.853,18.606z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M12.65,31.24H8.514c0.286,5.014,2.277,9.559,5.414,13.078l2.925-2.925 C14.457,38.632,12.924,35.113,12.65,31.24z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M41.394,16.854l2.925-2.925C40.8,10.791,36.254,8.8,31.24,8.514v4.137 C35.113,12.924,38.632,14.458,41.394,16.854z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M43.146,41.394l2.925,2.925c3.138-3.519,5.129-8.064,5.415-13.078H47.35 C47.076,35.113,45.542,38.632,43.146,41.394z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M47.35,28.761h4.137c-0.286-5.014-2.277-9.56-5.415-13.08l-2.925,2.925 C45.543,21.368,47.076,24.887,47.35,28.761z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M31.24,47.35v4.137c5.014-0.286,9.56-2.277,13.078-5.414l-2.925-2.925 C38.631,45.543,35.113,47.076,31.24,47.35z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M18.605,43.146l-2.925,2.925c3.519,3.138,8.065,5.129,13.079,5.415V47.35 C24.886,47.076,21.367,45.542,18.605,43.146z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_3.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_3.svg Fri May 14 16:09:54 2010 +0300
@@ -1,12 +1,128 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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="M49.078,18.5c-0.01-0.029-0.02-0.063-0.029-0.091l-5.432,1.765c0.01,0.029,0.021,0.063,0.029,0.092 c3.164,9.732-2.184,20.221-11.912,23.383C22,46.811,11.514,41.466,8.352,31.732C5.229,22.123,10.4,11.773,19.904,8.471l-1.766-5.433 C5.641,7.313-1.176,20.893,2.918,33.498c4.137,12.725,17.854,19.717,30.58,15.582S53.213,31.225,49.078,18.5z" fill="url(#SVGID_1_)"/>
-<defs>
-<linearGradient gradientTransform="matrix(0.309 0.9511 -0.9511 0.309 13.5896 -602.8)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="603.6143" x2="597.6299" y1="192.0293" y2="159.8088">
-<stop offset="0" style="stop-color:#3B86BF"/>
-<stop offset="1" style="stop-color:#0069B1;stop-opacity:0.25"/>
-</linearGradient>
-</defs>
+<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">
+<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">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M28.76,4.005c-6.258,0.293-11.932,2.791-16.268,6.734l3.189,3.189 C19.2,10.791,23.746,8.8,28.76,8.514V4.005z" fill="url(#SVGID_1_)"/>
+<radialGradient cx="49.875" cy="38.125" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="21.3373">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M10.74,12.493C6.793,16.833,4.293,22.51,4,28.761h4.514c0.286-5.014,2.277-9.56,5.415-13.08 L10.74,12.493z" fill="url(#SVGID_2_)"/>
+<radialGradient cx="49.875" cy="38.125" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="21.3373">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M4.004,31.24c0.295,6.256,2.793,11.93,6.736,16.266l3.188-3.188 c-3.137-3.52-5.128-8.064-5.414-13.078H4.004z" fill="url(#SVGID_3_)"/>
+<radialGradient cx="49.875" cy="38.125" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="21.3373">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M47.506,10.74C43.166,6.794,37.49,4.294,31.24,4v4.514c5.014,0.286,9.56,2.277,13.078,5.415 L47.506,10.74z" fill="url(#SVGID_4_)"/>
+<radialGradient cx="49.875" cy="38.125" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_5_" r="21.3373">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M49.26,47.507c3.947-4.34,6.447-10.017,6.74-16.267h-4.514c-0.286,5.014-2.277,9.56-5.415,13.078 L49.26,47.507z" fill="url(#SVGID_5_)"/>
+<radialGradient cx="49.875" cy="38.125" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="21.3373">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M55.996,28.761c-0.295-6.258-2.793-11.932-6.736-16.268l-3.188,3.188 c3.138,3.52,5.129,8.066,5.415,13.08H55.996z" fill="url(#SVGID_6_)"/>
+<radialGradient cx="49.875" cy="38.125" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="21.3373">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M31.24,55.996c6.256-0.294,11.932-2.792,16.268-6.735l-3.189-3.188 C40.8,49.209,36.254,51.2,31.24,51.486V55.996z" fill="url(#SVGID_7_)"/>
+<radialGradient cx="49.875" cy="38.125" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="21.3373">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M12.494,49.258C16.834,53.205,22.51,55.706,28.76,56v-4.514c-5.014-0.286-9.56-2.277-13.079-5.415 L12.494,49.258z" fill="url(#SVGID_8_)"/>
+</g>
+<radialGradient cx="49.875" cy="38.125" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="21.3373">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M28.76,12.65V8.514c-5.014,0.286-9.56,2.277-13.079,5.415l2.925,2.925 C21.368,14.458,24.886,12.924,28.76,12.65z" fill="url(#SVGID_9_)"/>
+<radialGradient cx="49.875" cy="38.125" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="21.3373">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M16.853,18.606l-2.925-2.925c-3.138,3.52-5.128,8.066-5.415,13.08h4.137 C12.924,24.887,14.457,21.368,16.853,18.606z" fill="url(#SVGID_10_)"/>
+<radialGradient cx="49.875" cy="38.125" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_11_" r="21.3373">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M12.65,31.24H8.514c0.286,5.014,2.277,9.559,5.414,13.078l2.925-2.925 C14.457,38.632,12.924,35.113,12.65,31.24z" fill="url(#SVGID_11_)"/>
+<radialGradient cx="49.875" cy="38.125" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_12_" r="21.3373">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M41.394,16.854l2.925-2.925C40.8,10.791,36.254,8.8,31.24,8.514v4.137 C35.113,12.924,38.632,14.458,41.394,16.854z" fill="url(#SVGID_12_)"/>
+<radialGradient cx="49.875" cy="38.125" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_13_" r="21.3373">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M43.146,41.394l2.925,2.925c3.138-3.519,5.129-8.064,5.415-13.078H47.35 C47.076,35.113,45.542,38.632,43.146,41.394z" fill="url(#SVGID_13_)"/>
+<radialGradient cx="49.875" cy="38.125" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_14_" r="21.3373">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M47.35,28.761h4.137c-0.286-5.014-2.277-9.56-5.415-13.08l-2.925,2.925 C45.543,21.368,47.076,24.887,47.35,28.761z" fill="url(#SVGID_14_)"/>
+<radialGradient cx="49.875" cy="38.125" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_15_" r="21.3373">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M31.24,47.35v4.137c5.014-0.286,9.56-2.277,13.078-5.414l-2.925-2.925 C38.631,45.543,35.113,47.076,31.24,47.35z" fill="url(#SVGID_15_)"/>
+<radialGradient cx="49.875" cy="38.125" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_16_" r="21.3373">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M18.605,43.146l-2.925,2.925c3.519,3.138,8.065,5.129,13.079,5.415V47.35 C24.886,47.076,21.367,45.542,18.605,43.146z" fill="url(#SVGID_16_)"/>
+</g>
+<path d="M28.76,12.65V8.514c-5.014,0.286-9.56,2.277-13.079,5.415l2.925,2.925 C21.368,14.458,24.886,12.924,28.76,12.65z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M16.853,18.606l-2.925-2.925c-3.138,3.52-5.128,8.066-5.415,13.08h4.137 C12.924,24.887,14.457,21.368,16.853,18.606z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M12.65,31.24H8.514c0.286,5.014,2.277,9.559,5.414,13.078l2.925-2.925 C14.457,38.632,12.924,35.113,12.65,31.24z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M41.394,16.854l2.925-2.925C40.8,10.791,36.254,8.8,31.24,8.514v4.137 C35.113,12.924,38.632,14.458,41.394,16.854z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M43.146,41.394l2.925,2.925c3.138-3.519,5.129-8.064,5.415-13.078H47.35 C47.076,35.113,45.542,38.632,43.146,41.394z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M47.35,28.761h4.137c-0.286-5.014-2.277-9.56-5.415-13.08l-2.925,2.925 C45.543,21.368,47.076,24.887,47.35,28.761z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M31.24,47.35v4.137c5.014-0.286,9.56-2.277,13.078-5.414l-2.925-2.925 C38.631,45.543,35.113,47.076,31.24,47.35z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M18.605,43.146l-2.925,2.925c3.519,3.138,8.065,5.129,13.079,5.415V47.35 C24.886,47.076,21.367,45.542,18.605,43.146z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_4.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_4.svg Fri May 14 16:09:54 2010 +0300
@@ -1,12 +1,128 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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="M49.08,33.498c0.01-0.03,0.02-0.063,0.029-0.092l-5.432-1.766c-0.01,0.029-0.021,0.063-0.029,0.092 c-3.162,9.732-13.652,15.076-23.383,11.916C10.531,40.486,5.189,29.997,8.352,20.264C11.475,10.652,21.742,5.32,31.373,8.234 l1.766-5.432C20.514-1.084,7.018,5.893,2.922,18.499c-4.135,12.726,2.852,26.444,15.58,30.581 C31.227,53.215,44.945,46.223,49.08,33.498z" fill="url(#SVGID_1_)"/>
-<defs>
-<linearGradient gradientTransform="matrix(-0.309 0.9511 -0.9511 -0.309 189.1018 -329.3094)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="390.0723" x2="384.0879" y1="54.8574" y2="22.6369">
-<stop offset="0" style="stop-color:#0067B1"/>
-<stop offset="1" style="stop-color:#0069B1;stop-opacity:0.25"/>
-</linearGradient>
-</defs>
+<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">
+<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">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M28.76,4.005c-6.258,0.293-11.932,2.791-16.268,6.734l3.189,3.189 C19.2,10.791,23.746,8.8,28.76,8.514V4.005z" fill="url(#SVGID_1_)"/>
+<radialGradient cx="38.5" cy="49.375" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="20.7308">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M10.74,12.493C6.793,16.833,4.293,22.51,4,28.761h4.514c0.286-5.014,2.277-9.56,5.415-13.08 L10.74,12.493z" fill="url(#SVGID_2_)"/>
+<radialGradient cx="38.5" cy="49.375" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="20.7308">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M4.004,31.24c0.295,6.256,2.793,11.93,6.736,16.266l3.188-3.188 c-3.137-3.52-5.128-8.064-5.414-13.078H4.004z" fill="url(#SVGID_3_)"/>
+<radialGradient cx="38.5" cy="49.375" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="20.7308">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M47.506,10.74C43.166,6.794,37.49,4.294,31.24,4v4.514c5.014,0.286,9.56,2.277,13.078,5.415 L47.506,10.74z" fill="url(#SVGID_4_)"/>
+<radialGradient cx="38.5" cy="49.375" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_5_" r="20.7308">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M49.26,47.507c3.947-4.34,6.447-10.017,6.74-16.267h-4.514c-0.286,5.014-2.277,9.56-5.415,13.078 L49.26,47.507z" fill="url(#SVGID_5_)"/>
+<radialGradient cx="38.5" cy="49.375" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="20.7308">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M55.996,28.761c-0.295-6.258-2.793-11.932-6.736-16.268l-3.188,3.188 c3.138,3.52,5.129,8.066,5.415,13.08H55.996z" fill="url(#SVGID_6_)"/>
+<radialGradient cx="38.5" cy="49.375" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="20.7308">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M31.24,55.996c6.256-0.294,11.932-2.792,16.268-6.735l-3.189-3.188 C40.8,49.209,36.254,51.2,31.24,51.486V55.996z" fill="url(#SVGID_7_)"/>
+<radialGradient cx="38.5" cy="49.375" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="20.7308">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M12.494,49.258C16.834,53.205,22.51,55.706,28.76,56v-4.514c-5.014-0.286-9.56-2.277-13.079-5.415 L12.494,49.258z" fill="url(#SVGID_8_)"/>
+</g>
+<radialGradient cx="38.5" cy="49.375" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="20.7308">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M28.76,12.65V8.514c-5.014,0.286-9.56,2.277-13.079,5.415l2.925,2.925 C21.368,14.458,24.886,12.924,28.76,12.65z" fill="url(#SVGID_9_)"/>
+<radialGradient cx="38.5" cy="49.375" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="20.7308">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M16.853,18.606l-2.925-2.925c-3.138,3.52-5.128,8.066-5.415,13.08h4.137 C12.924,24.887,14.457,21.368,16.853,18.606z" fill="url(#SVGID_10_)"/>
+<radialGradient cx="38.5" cy="49.375" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_11_" r="20.7308">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M12.65,31.24H8.514c0.286,5.014,2.277,9.559,5.414,13.078l2.925-2.925 C14.457,38.632,12.924,35.113,12.65,31.24z" fill="url(#SVGID_11_)"/>
+<radialGradient cx="38.5" cy="49.375" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_12_" r="20.7308">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M41.394,16.854l2.925-2.925C40.8,10.791,36.254,8.8,31.24,8.514v4.137 C35.113,12.924,38.632,14.458,41.394,16.854z" fill="url(#SVGID_12_)"/>
+<radialGradient cx="38.5" cy="49.375" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_13_" r="20.7308">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M43.146,41.394l2.925,2.925c3.138-3.519,5.129-8.064,5.415-13.078H47.35 C47.076,35.113,45.542,38.632,43.146,41.394z" fill="url(#SVGID_13_)"/>
+<radialGradient cx="38.5" cy="49.375" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_14_" r="20.7308">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M47.35,28.761h4.137c-0.286-5.014-2.277-9.56-5.415-13.08l-2.925,2.925 C45.543,21.368,47.076,24.887,47.35,28.761z" fill="url(#SVGID_14_)"/>
+<radialGradient cx="38.5" cy="49.375" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_15_" r="20.7308">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M31.24,47.35v4.137c5.014-0.286,9.56-2.277,13.078-5.414l-2.925-2.925 C38.631,45.543,35.113,47.076,31.24,47.35z" fill="url(#SVGID_15_)"/>
+<radialGradient cx="38.5" cy="49.375" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_16_" r="20.7308">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M18.605,43.146l-2.925,2.925c3.519,3.138,8.065,5.129,13.079,5.415V47.35 C24.886,47.076,21.367,45.542,18.605,43.146z" fill="url(#SVGID_16_)"/>
+</g>
+<path d="M28.76,12.65V8.514c-5.014,0.286-9.56,2.277-13.079,5.415l2.925,2.925 C21.368,14.458,24.886,12.924,28.76,12.65z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M16.853,18.606l-2.925-2.925c-3.138,3.52-5.128,8.066-5.415,13.08h4.137 C12.924,24.887,14.457,21.368,16.853,18.606z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M12.65,31.24H8.514c0.286,5.014,2.277,9.559,5.414,13.078l2.925-2.925 C14.457,38.632,12.924,35.113,12.65,31.24z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M41.394,16.854l2.925-2.925C40.8,10.791,36.254,8.8,31.24,8.514v4.137 C35.113,12.924,38.632,14.458,41.394,16.854z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M43.146,41.394l2.925,2.925c3.138-3.519,5.129-8.064,5.415-13.078H47.35 C47.076,35.113,45.542,38.632,43.146,41.394z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M47.35,28.761h4.137c-0.286-5.014-2.277-9.56-5.415-13.08l-2.925,2.925 C45.543,21.368,47.076,24.887,47.35,28.761z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M31.24,47.35v4.137c5.014-0.286,9.56-2.277,13.078-5.414l-2.925-2.925 C38.631,45.543,35.113,47.076,31.24,47.35z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M18.605,43.146l-2.925,2.925c3.519,3.138,8.065,5.129,13.079,5.415V47.35 C24.886,47.076,21.367,45.542,18.605,43.146z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_5.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_5.svg Fri May 14 16:09:54 2010 +0300
@@ -1,12 +1,128 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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="M40.265,45.632c0.025-0.019,0.053-0.039,0.078-0.057l-3.357-4.62 c-0.023,0.02-0.051,0.038-0.076,0.057c-8.279,6.016-19.908,4.174-25.921-4.104c-6.016-8.28-4.172-19.905,4.107-25.922 c8.176-5.939,19.617-4.219,25.695,3.8l4.619-3.356C37.482,0.863,22.463-1.424,11.738,6.367C0.914,14.232-1.496,29.438,6.369,40.266 C14.232,51.09,29.439,53.497,40.265,45.632z" fill="url(#SVGID_1_)"/>
-<defs>
-<linearGradient gradientTransform="matrix(-0.809 0.5878 -0.5878 -0.809 170.3323 -4.893)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="136.6899" x2="130.7054" y1="69.3574" y2="37.1362">
-<stop offset="0" style="stop-color:#0067B1"/>
-<stop offset="1" style="stop-color:#0069B1;stop-opacity:0.25"/>
-</linearGradient>
-</defs>
+<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">
+<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">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M28.76,4.005c-6.258,0.293-11.932,2.791-16.268,6.734l3.189,3.189 C19.2,10.791,23.746,8.8,28.76,8.514V4.005z" fill="url(#SVGID_1_)"/>
+<radialGradient cx="21.75" cy="49.875" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="21.7313">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M10.74,12.493C6.793,16.833,4.293,22.51,4,28.761h4.514c0.286-5.014,2.277-9.56,5.415-13.08 L10.74,12.493z" fill="url(#SVGID_2_)"/>
+<radialGradient cx="21.75" cy="49.875" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="21.7313">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M4.004,31.24c0.295,6.256,2.793,11.93,6.736,16.266l3.188-3.188 c-3.137-3.52-5.128-8.064-5.414-13.078H4.004z" fill="url(#SVGID_3_)"/>
+<radialGradient cx="21.75" cy="49.875" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="21.7313">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M47.506,10.74C43.166,6.794,37.49,4.294,31.24,4v4.514c5.014,0.286,9.56,2.277,13.078,5.415 L47.506,10.74z" fill="url(#SVGID_4_)"/>
+<radialGradient cx="21.75" cy="49.875" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_5_" r="21.7313">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M49.26,47.507c3.947-4.34,6.447-10.017,6.74-16.267h-4.514c-0.286,5.014-2.277,9.56-5.415,13.078 L49.26,47.507z" fill="url(#SVGID_5_)"/>
+<radialGradient cx="21.75" cy="49.875" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="21.7313">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M55.996,28.761c-0.295-6.258-2.793-11.932-6.736-16.268l-3.188,3.188 c3.138,3.52,5.129,8.066,5.415,13.08H55.996z" fill="url(#SVGID_6_)"/>
+<radialGradient cx="21.75" cy="49.875" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="21.7313">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M31.24,55.996c6.256-0.294,11.932-2.792,16.268-6.735l-3.189-3.188 C40.8,49.209,36.254,51.2,31.24,51.486V55.996z" fill="url(#SVGID_7_)"/>
+<radialGradient cx="21.75" cy="49.875" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="21.7313">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M12.494,49.258C16.834,53.205,22.51,55.706,28.76,56v-4.514c-5.014-0.286-9.56-2.277-13.079-5.415 L12.494,49.258z" fill="url(#SVGID_8_)"/>
+</g>
+<radialGradient cx="21.75" cy="49.875" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="21.7313">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M28.76,12.65V8.514c-5.014,0.286-9.56,2.277-13.079,5.415l2.925,2.925 C21.368,14.458,24.886,12.924,28.76,12.65z" fill="url(#SVGID_9_)"/>
+<radialGradient cx="21.75" cy="49.875" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="21.7313">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M16.853,18.606l-2.925-2.925c-3.138,3.52-5.128,8.066-5.415,13.08h4.137 C12.924,24.887,14.457,21.368,16.853,18.606z" fill="url(#SVGID_10_)"/>
+<radialGradient cx="21.75" cy="49.875" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_11_" r="21.7313">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M12.65,31.24H8.514c0.286,5.014,2.277,9.559,5.414,13.078l2.925-2.925 C14.457,38.632,12.924,35.113,12.65,31.24z" fill="url(#SVGID_11_)"/>
+<radialGradient cx="21.75" cy="49.875" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_12_" r="21.7313">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M41.394,16.854l2.925-2.925C40.8,10.791,36.254,8.8,31.24,8.514v4.137 C35.113,12.924,38.632,14.458,41.394,16.854z" fill="url(#SVGID_12_)"/>
+<radialGradient cx="21.75" cy="49.875" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_13_" r="21.7313">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M43.146,41.394l2.925,2.925c3.138-3.519,5.129-8.064,5.415-13.078H47.35 C47.076,35.113,45.542,38.632,43.146,41.394z" fill="url(#SVGID_13_)"/>
+<radialGradient cx="21.75" cy="49.875" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_14_" r="21.7313">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M47.35,28.761h4.137c-0.286-5.014-2.277-9.56-5.415-13.08l-2.925,2.925 C45.543,21.368,47.076,24.887,47.35,28.761z" fill="url(#SVGID_14_)"/>
+<radialGradient cx="21.75" cy="49.875" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_15_" r="21.7313">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M31.24,47.35v4.137c5.014-0.286,9.56-2.277,13.078-5.414l-2.925-2.925 C38.631,45.543,35.113,47.076,31.24,47.35z" fill="url(#SVGID_15_)"/>
+<radialGradient cx="21.75" cy="49.875" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_16_" r="21.7313">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M18.605,43.146l-2.925,2.925c3.519,3.138,8.065,5.129,13.079,5.415V47.35 C24.886,47.076,21.367,45.542,18.605,43.146z" fill="url(#SVGID_16_)"/>
+</g>
+<path d="M28.76,12.65V8.514c-5.014,0.286-9.56,2.277-13.079,5.415l2.925,2.925 C21.368,14.458,24.886,12.924,28.76,12.65z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M16.853,18.606l-2.925-2.925c-3.138,3.52-5.128,8.066-5.415,13.08h4.137 C12.924,24.887,14.457,21.368,16.853,18.606z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M12.65,31.24H8.514c0.286,5.014,2.277,9.559,5.414,13.078l2.925-2.925 C14.457,38.632,12.924,35.113,12.65,31.24z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M41.394,16.854l2.925-2.925C40.8,10.791,36.254,8.8,31.24,8.514v4.137 C35.113,12.924,38.632,14.458,41.394,16.854z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M43.146,41.394l2.925,2.925c3.138-3.519,5.129-8.064,5.415-13.078H47.35 C47.076,35.113,45.542,38.632,43.146,41.394z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M47.35,28.761h4.137c-0.286-5.014-2.277-9.56-5.415-13.08l-2.925,2.925 C45.543,21.368,47.076,24.887,47.35,28.761z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M31.24,47.35v4.137c5.014-0.286,9.56-2.277,13.078-5.414l-2.925-2.925 C38.631,45.543,35.113,47.076,31.24,47.35z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M18.605,43.146l-2.925,2.925c3.519,3.138,8.065,5.129,13.079,5.415V47.35 C24.886,47.076,21.367,45.542,18.605,43.146z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_6.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_6.svg Fri May 14 16:09:54 2010 +0300
@@ -1,12 +1,128 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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="M26.002,50.267c0.031,0,0.064,0,0.096,0v-5.711c-0.029,0-0.063,0-0.096,0 c-10.234,0-18.559-8.324-18.559-18.555c0-10.235,8.324-18.558,18.559-18.558c10.106,0,18.352,8.117,18.555,18.177h5.711 C50.065,12.412,39.258,1.732,26.002,1.732c-13.379,0-24.27,10.886-24.27,24.269C1.732,39.38,12.623,50.267,26.002,50.267z" fill="url(#SVGID_1_)"/>
-<defs>
-<linearGradient gradientTransform="matrix(-1 0 0 -1 -35.5381 246.5381)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-59.7715" x2="-65.756" y1="230.0591" y2="197.8378">
-<stop offset="0" style="stop-color:#0067B1"/>
-<stop offset="1" style="stop-color:#0069B1;stop-opacity:0.25"/>
-</linearGradient>
-</defs>
+<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">
+<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">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M28.76,4.005c-6.258,0.293-11.932,2.791-16.268,6.734l3.189,3.189 C19.2,10.791,23.746,8.8,28.76,8.514V4.005z" fill="url(#SVGID_1_)"/>
+<radialGradient cx="10" cy="38" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="21.5657">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M10.74,12.493C6.793,16.833,4.293,22.51,4,28.761h4.514c0.286-5.014,2.277-9.56,5.415-13.08 L10.74,12.493z" fill="url(#SVGID_2_)"/>
+<radialGradient cx="10" cy="38" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="21.5657">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M4.004,31.24c0.295,6.256,2.793,11.93,6.736,16.266l3.188-3.188 c-3.137-3.52-5.128-8.064-5.414-13.078H4.004z" fill="url(#SVGID_3_)"/>
+<radialGradient cx="10" cy="38" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="21.5657">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M47.506,10.74C43.166,6.794,37.49,4.294,31.24,4v4.514c5.014,0.286,9.56,2.277,13.078,5.415 L47.506,10.74z" fill="url(#SVGID_4_)"/>
+<radialGradient cx="10" cy="38" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_5_" r="21.5657">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M49.26,47.507c3.947-4.34,6.447-10.017,6.74-16.267h-4.514c-0.286,5.014-2.277,9.56-5.415,13.078 L49.26,47.507z" fill="url(#SVGID_5_)"/>
+<radialGradient cx="10" cy="38" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="21.5657">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M55.996,28.761c-0.295-6.258-2.793-11.932-6.736-16.268l-3.188,3.188 c3.138,3.52,5.129,8.066,5.415,13.08H55.996z" fill="url(#SVGID_6_)"/>
+<radialGradient cx="10" cy="38" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="21.5657">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M31.24,55.996c6.256-0.294,11.932-2.792,16.268-6.735l-3.189-3.188 C40.8,49.209,36.254,51.2,31.24,51.486V55.996z" fill="url(#SVGID_7_)"/>
+<radialGradient cx="10" cy="38" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="21.5657">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M12.494,49.258C16.834,53.205,22.51,55.706,28.76,56v-4.514c-5.014-0.286-9.56-2.277-13.079-5.415 L12.494,49.258z" fill="url(#SVGID_8_)"/>
+</g>
+<radialGradient cx="10" cy="38" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="21.5657">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M28.76,12.65V8.514c-5.014,0.286-9.56,2.277-13.079,5.415l2.925,2.925 C21.368,14.458,24.886,12.924,28.76,12.65z" fill="url(#SVGID_9_)"/>
+<radialGradient cx="10" cy="38" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="21.5657">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M16.853,18.606l-2.925-2.925c-3.138,3.52-5.128,8.066-5.415,13.08h4.137 C12.924,24.887,14.457,21.368,16.853,18.606z" fill="url(#SVGID_10_)"/>
+<radialGradient cx="10" cy="38" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_11_" r="21.5657">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M12.65,31.24H8.514c0.286,5.014,2.277,9.559,5.414,13.078l2.925-2.925 C14.457,38.632,12.924,35.113,12.65,31.24z" fill="url(#SVGID_11_)"/>
+<radialGradient cx="10" cy="38" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_12_" r="21.5657">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M41.394,16.854l2.925-2.925C40.8,10.791,36.254,8.8,31.24,8.514v4.137 C35.113,12.924,38.632,14.458,41.394,16.854z" fill="url(#SVGID_12_)"/>
+<radialGradient cx="10" cy="38" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_13_" r="21.5657">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M43.146,41.394l2.925,2.925c3.138-3.519,5.129-8.064,5.415-13.078H47.35 C47.076,35.113,45.542,38.632,43.146,41.394z" fill="url(#SVGID_13_)"/>
+<radialGradient cx="10" cy="38" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_14_" r="21.5657">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M47.35,28.761h4.137c-0.286-5.014-2.277-9.56-5.415-13.08l-2.925,2.925 C45.543,21.368,47.076,24.887,47.35,28.761z" fill="url(#SVGID_14_)"/>
+<radialGradient cx="10" cy="38" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_15_" r="21.5657">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M31.24,47.35v4.137c5.014-0.286,9.56-2.277,13.078-5.414l-2.925-2.925 C38.631,45.543,35.113,47.076,31.24,47.35z" fill="url(#SVGID_15_)"/>
+<radialGradient cx="10" cy="38" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_16_" r="21.5657">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M18.605,43.146l-2.925,2.925c3.519,3.138,8.065,5.129,13.079,5.415V47.35 C24.886,47.076,21.367,45.542,18.605,43.146z" fill="url(#SVGID_16_)"/>
+</g>
+<path d="M28.76,12.65V8.514c-5.014,0.286-9.56,2.277-13.079,5.415l2.925,2.925 C21.368,14.458,24.886,12.924,28.76,12.65z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M16.853,18.606l-2.925-2.925c-3.138,3.52-5.128,8.066-5.415,13.08h4.137 C12.924,24.887,14.457,21.368,16.853,18.606z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M12.65,31.24H8.514c0.286,5.014,2.277,9.559,5.414,13.078l2.925-2.925 C14.457,38.632,12.924,35.113,12.65,31.24z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M41.394,16.854l2.925-2.925C40.8,10.791,36.254,8.8,31.24,8.514v4.137 C35.113,12.924,38.632,14.458,41.394,16.854z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M43.146,41.394l2.925,2.925c3.138-3.519,5.129-8.064,5.415-13.078H47.35 C47.076,35.113,45.542,38.632,43.146,41.394z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M47.35,28.761h4.137c-0.286-5.014-2.277-9.56-5.415-13.08l-2.925,2.925 C45.543,21.368,47.076,24.887,47.35,28.761z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M31.24,47.35v4.137c5.014-0.286,9.56-2.277,13.078-5.414l-2.925-2.925 C38.631,45.543,35.113,47.076,31.24,47.35z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M18.605,43.146l-2.925,2.925c3.519,3.138,8.065,5.129,13.079,5.415V47.35 C24.886,47.076,21.367,45.542,18.605,43.146z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_7.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_7.svg Fri May 14 16:09:54 2010 +0300
@@ -1,12 +1,128 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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="M11.738,45.633c0.025,0.02,0.053,0.039,0.078,0.057l3.355-4.619 c-0.023-0.018-0.051-0.037-0.078-0.057c-8.279-6.016-10.119-17.644-4.107-25.92C17.004,6.814,28.63,4.975,36.91,10.988 c8.174,5.941,10.072,17.354,4.326,25.612l4.619,3.357c7.6-10.807,5.133-25.797-5.59-33.588C29.439-1.496,14.232,0.91,6.367,11.736 S0.914,37.77,11.738,45.633z" fill="url(#SVGID_1_)"/>
-<defs>
-<linearGradient gradientTransform="matrix(-0.809 -0.5878 0.5878 -0.809 -349.8818 328.9452)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-124.2505" x2="-130.235" y1="475.5562" y2="443.3352">
-<stop offset="0" style="stop-color:#0067B1"/>
-<stop offset="1" style="stop-color:#0069B1;stop-opacity:0.25"/>
-</linearGradient>
-</defs>
+<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">
+<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">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M28.76,4.005c-6.258,0.293-11.932,2.791-16.268,6.734l3.189,3.189 C19.2,10.791,23.746,8.8,28.76,8.514V4.005z" fill="url(#SVGID_1_)"/>
+<radialGradient cx="10" cy="22.125" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="22.3299">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M10.74,12.493C6.793,16.833,4.293,22.51,4,28.761h4.514c0.286-5.014,2.277-9.56,5.415-13.08 L10.74,12.493z" fill="url(#SVGID_2_)"/>
+<radialGradient cx="10" cy="22.125" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="22.3299">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M4.004,31.24c0.295,6.256,2.793,11.93,6.736,16.266l3.188-3.188 c-3.137-3.52-5.128-8.064-5.414-13.078H4.004z" fill="url(#SVGID_3_)"/>
+<radialGradient cx="10" cy="22.125" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="22.3299">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M47.506,10.74C43.166,6.794,37.49,4.294,31.24,4v4.514c5.014,0.286,9.56,2.277,13.078,5.415 L47.506,10.74z" fill="url(#SVGID_4_)"/>
+<radialGradient cx="10" cy="22.125" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_5_" r="22.3299">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M49.26,47.507c3.947-4.34,6.447-10.017,6.74-16.267h-4.514c-0.286,5.014-2.277,9.56-5.415,13.078 L49.26,47.507z" fill="url(#SVGID_5_)"/>
+<radialGradient cx="10" cy="22.125" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="22.3299">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M55.996,28.761c-0.295-6.258-2.793-11.932-6.736-16.268l-3.188,3.188 c3.138,3.52,5.129,8.066,5.415,13.08H55.996z" fill="url(#SVGID_6_)"/>
+<radialGradient cx="10" cy="22.125" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="22.3299">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M31.24,55.996c6.256-0.294,11.932-2.792,16.268-6.735l-3.189-3.188 C40.8,49.209,36.254,51.2,31.24,51.486V55.996z" fill="url(#SVGID_7_)"/>
+<radialGradient cx="10" cy="22.125" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="22.3299">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M12.494,49.258C16.834,53.205,22.51,55.706,28.76,56v-4.514c-5.014-0.286-9.56-2.277-13.079-5.415 L12.494,49.258z" fill="url(#SVGID_8_)"/>
+</g>
+<radialGradient cx="10" cy="22.125" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="22.3299">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M28.76,12.65V8.514c-5.014,0.286-9.56,2.277-13.079,5.415l2.925,2.925 C21.368,14.458,24.886,12.924,28.76,12.65z" fill="url(#SVGID_9_)"/>
+<radialGradient cx="10" cy="22.125" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="22.3299">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M16.853,18.606l-2.925-2.925c-3.138,3.52-5.128,8.066-5.415,13.08h4.137 C12.924,24.887,14.457,21.368,16.853,18.606z" fill="url(#SVGID_10_)"/>
+<radialGradient cx="10" cy="22.125" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_11_" r="22.3299">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M12.65,31.24H8.514c0.286,5.014,2.277,9.559,5.414,13.078l2.925-2.925 C14.457,38.632,12.924,35.113,12.65,31.24z" fill="url(#SVGID_11_)"/>
+<radialGradient cx="10" cy="22.125" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_12_" r="22.3299">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M41.394,16.854l2.925-2.925C40.8,10.791,36.254,8.8,31.24,8.514v4.137 C35.113,12.924,38.632,14.458,41.394,16.854z" fill="url(#SVGID_12_)"/>
+<radialGradient cx="10" cy="22.125" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_13_" r="22.3299">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M43.146,41.394l2.925,2.925c3.138-3.519,5.129-8.064,5.415-13.078H47.35 C47.076,35.113,45.542,38.632,43.146,41.394z" fill="url(#SVGID_13_)"/>
+<radialGradient cx="10" cy="22.125" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_14_" r="22.3299">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M47.35,28.761h4.137c-0.286-5.014-2.277-9.56-5.415-13.08l-2.925,2.925 C45.543,21.368,47.076,24.887,47.35,28.761z" fill="url(#SVGID_14_)"/>
+<radialGradient cx="10" cy="22.125" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_15_" r="22.3299">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M31.24,47.35v4.137c5.014-0.286,9.56-2.277,13.078-5.414l-2.925-2.925 C38.631,45.543,35.113,47.076,31.24,47.35z" fill="url(#SVGID_15_)"/>
+<radialGradient cx="10" cy="22.125" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_16_" r="22.3299">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M18.605,43.146l-2.925,2.925c3.519,3.138,8.065,5.129,13.079,5.415V47.35 C24.886,47.076,21.367,45.542,18.605,43.146z" fill="url(#SVGID_16_)"/>
+</g>
+<path d="M28.76,12.65V8.514c-5.014,0.286-9.56,2.277-13.079,5.415l2.925,2.925 C21.368,14.458,24.886,12.924,28.76,12.65z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M16.853,18.606l-2.925-2.925c-3.138,3.52-5.128,8.066-5.415,13.08h4.137 C12.924,24.887,14.457,21.368,16.853,18.606z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M12.65,31.24H8.514c0.286,5.014,2.277,9.559,5.414,13.078l2.925-2.925 C14.457,38.632,12.924,35.113,12.65,31.24z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M41.394,16.854l2.925-2.925C40.8,10.791,36.254,8.8,31.24,8.514v4.137 C35.113,12.924,38.632,14.458,41.394,16.854z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M43.146,41.394l2.925,2.925c3.138-3.519,5.129-8.064,5.415-13.078H47.35 C47.076,35.113,45.542,38.632,43.146,41.394z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M47.35,28.761h4.137c-0.286-5.014-2.277-9.56-5.415-13.08l-2.925,2.925 C45.543,21.368,47.076,24.887,47.35,28.761z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M31.24,47.35v4.137c5.014-0.286,9.56-2.277,13.078-5.414l-2.925-2.925 C38.631,45.543,35.113,47.076,31.24,47.35z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M18.605,43.146l-2.925,2.925c3.519,3.138,8.065,5.129,13.079,5.415V47.35 C24.886,47.076,21.367,45.542,18.605,43.146z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_8.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_8.svg Fri May 14 16:09:54 2010 +0300
@@ -1,12 +1,128 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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="M2.922,33.501c0.008,0.028,0.02,0.062,0.029,0.091l5.432-1.765c-0.01-0.028-0.021-0.062-0.031-0.091 c-3.162-9.733,2.184-20.223,11.914-23.385C30,5.189,40.487,10.535,43.649,20.268c3.123,9.611-2.049,19.961-11.553,23.265 l1.764,5.431c12.498-4.275,19.316-17.854,15.221-30.459C44.946,5.777,31.229-1.215,18.5,2.921 C5.775,7.057-1.213,20.775,2.922,33.501z" fill="url(#SVGID_1_)"/>
-<defs>
-<linearGradient gradientTransform="matrix(-0.309 -0.9511 0.9511 -0.309 -652.6261 210.8405)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-32.1201" x2="-38.1047" y1="712.0537" y2="679.8328">
-<stop offset="0" style="stop-color:#0067B1"/>
-<stop offset="1" style="stop-color:#0069B1;stop-opacity:0.25"/>
-</linearGradient>
-</defs>
+<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">
+<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">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M28.76,4.005c-6.258,0.293-11.932,2.791-16.268,6.734l3.189,3.189 C19.2,10.791,23.746,8.8,28.76,8.514V4.005z" fill="url(#SVGID_1_)"/>
+<radialGradient cx="21.75" cy="10.25" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="21.6348">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M10.74,12.493C6.793,16.833,4.293,22.51,4,28.761h4.514c0.286-5.014,2.277-9.56,5.415-13.08 L10.74,12.493z" fill="url(#SVGID_2_)"/>
+<radialGradient cx="21.75" cy="10.25" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="21.6348">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M4.004,31.24c0.295,6.256,2.793,11.93,6.736,16.266l3.188-3.188 c-3.137-3.52-5.128-8.064-5.414-13.078H4.004z" fill="url(#SVGID_3_)"/>
+<radialGradient cx="21.75" cy="10.25" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="21.6348">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M47.506,10.74C43.166,6.794,37.49,4.294,31.24,4v4.514c5.014,0.286,9.56,2.277,13.078,5.415 L47.506,10.74z" fill="url(#SVGID_4_)"/>
+<radialGradient cx="21.75" cy="10.25" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_5_" r="21.6348">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M49.26,47.507c3.947-4.34,6.447-10.017,6.74-16.267h-4.514c-0.286,5.014-2.277,9.56-5.415,13.078 L49.26,47.507z" fill="url(#SVGID_5_)"/>
+<radialGradient cx="21.75" cy="10.25" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="21.6348">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M55.996,28.761c-0.295-6.258-2.793-11.932-6.736-16.268l-3.188,3.188 c3.138,3.52,5.129,8.066,5.415,13.08H55.996z" fill="url(#SVGID_6_)"/>
+<radialGradient cx="21.75" cy="10.25" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="21.6348">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M31.24,55.996c6.256-0.294,11.932-2.792,16.268-6.735l-3.189-3.188 C40.8,49.209,36.254,51.2,31.24,51.486V55.996z" fill="url(#SVGID_7_)"/>
+<radialGradient cx="21.75" cy="10.25" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="21.6348">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M12.494,49.258C16.834,53.205,22.51,55.706,28.76,56v-4.514c-5.014-0.286-9.56-2.277-13.079-5.415 L12.494,49.258z" fill="url(#SVGID_8_)"/>
+</g>
+<radialGradient cx="21.75" cy="10.25" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="21.6348">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M28.76,12.65V8.514c-5.014,0.286-9.56,2.277-13.079,5.415l2.925,2.925 C21.368,14.458,24.886,12.924,28.76,12.65z" fill="url(#SVGID_9_)"/>
+<radialGradient cx="21.75" cy="10.25" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="21.6348">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M16.853,18.606l-2.925-2.925c-3.138,3.52-5.128,8.066-5.415,13.08h4.137 C12.924,24.887,14.457,21.368,16.853,18.606z" fill="url(#SVGID_10_)"/>
+<radialGradient cx="21.75" cy="10.25" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_11_" r="21.6348">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M12.65,31.24H8.514c0.286,5.014,2.277,9.559,5.414,13.078l2.925-2.925 C14.457,38.632,12.924,35.113,12.65,31.24z" fill="url(#SVGID_11_)"/>
+<radialGradient cx="21.75" cy="10.25" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_12_" r="21.6348">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M41.394,16.854l2.925-2.925C40.8,10.791,36.254,8.8,31.24,8.514v4.137 C35.113,12.924,38.632,14.458,41.394,16.854z" fill="url(#SVGID_12_)"/>
+<radialGradient cx="21.75" cy="10.25" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_13_" r="21.6348">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M43.146,41.394l2.925,2.925c3.138-3.519,5.129-8.064,5.415-13.078H47.35 C47.076,35.113,45.542,38.632,43.146,41.394z" fill="url(#SVGID_13_)"/>
+<radialGradient cx="21.75" cy="10.25" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_14_" r="21.6348">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M47.35,28.761h4.137c-0.286-5.014-2.277-9.56-5.415-13.08l-2.925,2.925 C45.543,21.368,47.076,24.887,47.35,28.761z" fill="url(#SVGID_14_)"/>
+<radialGradient cx="21.75" cy="10.25" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_15_" r="21.6348">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M31.24,47.35v4.137c5.014-0.286,9.56-2.277,13.078-5.414l-2.925-2.925 C38.631,45.543,35.113,47.076,31.24,47.35z" fill="url(#SVGID_15_)"/>
+<radialGradient cx="21.75" cy="10.25" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_16_" r="21.6348">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M18.605,43.146l-2.925,2.925c3.519,3.138,8.065,5.129,13.079,5.415V47.35 C24.886,47.076,21.367,45.542,18.605,43.146z" fill="url(#SVGID_16_)"/>
+</g>
+<path d="M28.76,12.65V8.514c-5.014,0.286-9.56,2.277-13.079,5.415l2.925,2.925 C21.368,14.458,24.886,12.924,28.76,12.65z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M16.853,18.606l-2.925-2.925c-3.138,3.52-5.128,8.066-5.415,13.08h4.137 C12.924,24.887,14.457,21.368,16.853,18.606z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M12.65,31.24H8.514c0.286,5.014,2.277,9.559,5.414,13.078l2.925-2.925 C14.457,38.632,12.924,35.113,12.65,31.24z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M41.394,16.854l2.925-2.925C40.8,10.791,36.254,8.8,31.24,8.514v4.137 C35.113,12.924,38.632,14.458,41.394,16.854z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M43.146,41.394l2.925,2.925c3.138-3.519,5.129-8.064,5.415-13.078H47.35 C47.076,35.113,45.542,38.632,43.146,41.394z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M47.35,28.761h4.137c-0.286-5.014-2.277-9.56-5.415-13.08l-2.925,2.925 C45.543,21.368,47.076,24.887,47.35,28.761z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M31.24,47.35v4.137c5.014-0.286,9.56-2.277,13.078-5.414l-2.925-2.925 C38.631,45.543,35.113,47.076,31.24,47.35z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M18.605,43.146l-2.925,2.925c3.519,3.138,8.065,5.129,13.079,5.415V47.35 C24.886,47.076,21.367,45.542,18.605,43.146z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_9.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_loading_9.svg Fri May 14 16:09:54 2010 +0300
@@ -1,13 +1,128 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 baseProfile="tiny" height="52px" version="1.1" viewBox="0.001 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.002"/>
-<path d="M2.92,18.503c-0.01,0.03-0.02,0.063-0.027,0.091l5.432,1.764c0.01-0.027,0.02-0.061,0.029-0.09 c3.164-9.733,13.65-15.078,23.383-11.916c9.73,3.162,15.076,13.651,11.912,23.383C40.525,41.346,30.26,46.68,20.627,43.764 l-1.764,5.432C31.49,53.084,44.984,46.105,49.08,33.5C53.215,20.773,46.229,7.055,33.5,2.919C20.773-1.214,7.057,5.777,2.92,18.503z " fill="url(#SVGID_1_)"/>
-<defs>
-<linearGradient gradientTransform="matrix(0.309 -0.9511 0.9511 0.309 -828.1402 -62.6477)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="181.373" x2="175.3885" y1="849.2324" y2="817.0112">
-<stop offset="0" style="stop-color:#0067B1"/>
-<stop offset="0.9939" style="stop-color:#0069B1;stop-opacity:0.25"/>
-<stop offset="1" style="stop-color:#0069B1;stop-opacity:0.25"/>
-</linearGradient>
-</defs>
+<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">
+<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">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M28.76,4.005c-6.258,0.293-11.932,2.791-16.268,6.734l3.189,3.189 C19.2,10.791,23.746,8.8,28.76,8.514V4.005z" fill="url(#SVGID_1_)"/>
+<radialGradient cx="28.625" cy="8.625" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="21.9264">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M10.74,12.493C6.793,16.833,4.293,22.51,4,28.761h4.514c0.286-5.014,2.277-9.56,5.415-13.08 L10.74,12.493z" fill="url(#SVGID_2_)"/>
+<radialGradient cx="28.625" cy="8.625" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="21.9264">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M4.004,31.24c0.295,6.256,2.793,11.93,6.736,16.266l3.188-3.188 c-3.137-3.52-5.128-8.064-5.414-13.078H4.004z" fill="url(#SVGID_3_)"/>
+<radialGradient cx="28.625" cy="8.625" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="21.9264">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M47.506,10.74C43.166,6.794,37.49,4.294,31.24,4v4.514c5.014,0.286,9.56,2.277,13.078,5.415 L47.506,10.74z" fill="url(#SVGID_4_)"/>
+<radialGradient cx="28.625" cy="8.625" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_5_" r="21.9264">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M49.26,47.507c3.947-4.34,6.447-10.017,6.74-16.267h-4.514c-0.286,5.014-2.277,9.56-5.415,13.078 L49.26,47.507z" fill="url(#SVGID_5_)"/>
+<radialGradient cx="28.625" cy="8.625" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="21.9264">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M55.996,28.761c-0.295-6.258-2.793-11.932-6.736-16.268l-3.188,3.188 c3.138,3.52,5.129,8.066,5.415,13.08H55.996z" fill="url(#SVGID_6_)"/>
+<radialGradient cx="28.625" cy="8.625" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="21.9264">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M31.24,55.996c6.256-0.294,11.932-2.792,16.268-6.735l-3.189-3.188 C40.8,49.209,36.254,51.2,31.24,51.486V55.996z" fill="url(#SVGID_7_)"/>
+<radialGradient cx="28.625" cy="8.625" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="21.9264">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M12.494,49.258C16.834,53.205,22.51,55.706,28.76,56v-4.514c-5.014-0.286-9.56-2.277-13.079-5.415 L12.494,49.258z" fill="url(#SVGID_8_)"/>
+</g>
+<radialGradient cx="28.625" cy="8.625" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="21.9264">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M28.76,12.65V8.514c-5.014,0.286-9.56,2.277-13.079,5.415l2.925,2.925 C21.368,14.458,24.886,12.924,28.76,12.65z" fill="url(#SVGID_9_)"/>
+<radialGradient cx="28.625" cy="8.625" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="21.9264">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M16.853,18.606l-2.925-2.925c-3.138,3.52-5.128,8.066-5.415,13.08h4.137 C12.924,24.887,14.457,21.368,16.853,18.606z" fill="url(#SVGID_10_)"/>
+<radialGradient cx="28.625" cy="8.625" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_11_" r="21.9264">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M12.65,31.24H8.514c0.286,5.014,2.277,9.559,5.414,13.078l2.925-2.925 C14.457,38.632,12.924,35.113,12.65,31.24z" fill="url(#SVGID_11_)"/>
+<radialGradient cx="28.625" cy="8.625" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_12_" r="21.9264">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M41.394,16.854l2.925-2.925C40.8,10.791,36.254,8.8,31.24,8.514v4.137 C35.113,12.924,38.632,14.458,41.394,16.854z" fill="url(#SVGID_12_)"/>
+<radialGradient cx="28.625" cy="8.625" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_13_" r="21.9264">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M43.146,41.394l2.925,2.925c3.138-3.519,5.129-8.064,5.415-13.078H47.35 C47.076,35.113,45.542,38.632,43.146,41.394z" fill="url(#SVGID_13_)"/>
+<radialGradient cx="28.625" cy="8.625" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_14_" r="21.9264">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M47.35,28.761h4.137c-0.286-5.014-2.277-9.56-5.415-13.08l-2.925,2.925 C45.543,21.368,47.076,24.887,47.35,28.761z" fill="url(#SVGID_14_)"/>
+<radialGradient cx="28.625" cy="8.625" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_15_" r="21.9264">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M31.24,47.35v4.137c5.014-0.286,9.56-2.277,13.078-5.414l-2.925-2.925 C38.631,45.543,35.113,47.076,31.24,47.35z" fill="url(#SVGID_15_)"/>
+<radialGradient cx="28.625" cy="8.625" gradientTransform="matrix(1.0306 0 0 1.0306 -5.2776 -0.9193)" gradientUnits="userSpaceOnUse" id="SVGID_16_" r="21.9264">
+<stop offset="0" style="stop-color:#B2F56E"/>
+<stop offset="0.32" style="stop-color:#B2F56E"/>
+<stop offset="0.73" style="stop-color:#5CBF1B"/>
+<stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M18.605,43.146l-2.925,2.925c3.519,3.138,8.065,5.129,13.079,5.415V47.35 C24.886,47.076,21.367,45.542,18.605,43.146z" fill="url(#SVGID_16_)"/>
+</g>
+<path d="M28.76,12.65V8.514c-5.014,0.286-9.56,2.277-13.079,5.415l2.925,2.925 C21.368,14.458,24.886,12.924,28.76,12.65z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M16.853,18.606l-2.925-2.925c-3.138,3.52-5.128,8.066-5.415,13.08h4.137 C12.924,24.887,14.457,21.368,16.853,18.606z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M12.65,31.24H8.514c0.286,5.014,2.277,9.559,5.414,13.078l2.925-2.925 C14.457,38.632,12.924,35.113,12.65,31.24z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M41.394,16.854l2.925-2.925C40.8,10.791,36.254,8.8,31.24,8.514v4.137 C35.113,12.924,38.632,14.458,41.394,16.854z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M43.146,41.394l2.925,2.925c3.138-3.519,5.129-8.064,5.415-13.078H47.35 C47.076,35.113,45.542,38.632,43.146,41.394z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M47.35,28.761h4.137c-0.286-5.014-2.277-9.56-5.415-13.08l-2.925,2.925 C45.543,21.368,47.076,24.887,47.35,28.761z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M31.24,47.35v4.137c5.014-0.286,9.56-2.277,13.078-5.414l-2.925-2.925 C38.631,45.543,35.113,47.076,31.24,47.35z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
+<path d="M18.605,43.146l-2.925,2.925c3.519,3.138,8.065,5.129,13.079,5.415V47.35 C24.886,47.076,21.367,45.542,18.605,43.146z" fill="#FFFFFF" fill-opacity="0.17" stroke-opacity="0.17"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_1.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_1.svg Fri May 14 16:09:54 2010 +0300
@@ -1,13 +1,33 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 baseProfile="tiny" height="72px" version="1.1" viewBox="0 0 72 72" width="72px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<path d="M13.801,35.3c0.199-5.6,2.4-10.7,6-14.5L10,11.1C4,17.4,0.201,25.9,0,35.3H13.801z" fill="#0067B1"/>
-<path d="M20.801,19.8c3.8-3.6,8.9-5.8,14.5-6V0C25.9,0.2,17.4,4,11,10L20.801,19.8z" fill="#0067B1"/>
-<path d="M36.701,0v13.8c5.6,0.2,10.699,2.4,14.5,6L61,10C54.701,4,46.1,0.2,36.701,0z" fill="#82C341"/>
-<path d="M19.801,51.2c-3.6-3.8-5.801-8.9-6-14.5H0C0.201,46.1,4,54.7,10,61L19.801,51.2z" fill="#0067B1"/>
-<path d="M52.201,20.8c3.6,3.8,5.799,8.9,6,14.5H72C71.801,25.9,68,17.4,62,11L52.201,20.8z" fill="#82C341"/>
-<path d="M35.301,58.2c-5.6-0.2-10.7-2.4-14.5-6l-9.7,9.8c6.3,6.1,14.8,9.9,24.3,10V58.2H35.301z" fill="#0067B1"/>
-<path d="M51.201,52.2c-3.801,3.6-8.9,5.8-14.5,6V72C46.1,71.8,54.6,68,61,62L51.201,52.2z" fill="#424242"/>
-<polygon fill="#0067B1" points="41.301,6.9 36.701,13.8 36.701,0 "/>
-<path d="M58.301,36.7L58.301,36.7c-0.201,5.6-2.5,10.7-6.1,14.5L62,61c6.1-6.3,9.9-14.8,10-24.3H58.301z" fill="#424242"/>
+<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">
+<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"/>
+</linearGradient>
+<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="url(#SVGID_1_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="11.0552" x2="35.3105" y1="9.9063" y2="9.9063">
+<stop offset="0" style="stop-color:#3B87C0"/>
+<stop offset="1" style="stop-color:#0069B2"/>
+</linearGradient>
+<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="url(#SVGID_2_)"/>
+<path d="M36.7,0v13.8c5.6,0.2,10.7,2.4,14.5,6L61,10C54.7,4,46.1,0.2,36.7,0z" fill="#5AB85B"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="0" x2="19.814" y1="48.8647" y2="48.8647">
+<stop offset="0" style="stop-color:#3B87C0"/>
+<stop offset="1" style="stop-color:#0069B2"/>
+</linearGradient>
+<path d="M19.8,51.2c-3.6-3.8-5.8-8.9-6-14.5H0C0.2,46.1,4,54.7,10,61L19.8,51.2z" fill="url(#SVGID_3_)"/>
+<path d="M52.2,20.8c3.6,3.8,5.8,8.9,6,14.5H72c-0.2-9.4-4-17.9-10-24.3L52.2,20.8z" fill="#5AB85B"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="11.0552" x2="35.3105" y1="62.1421" y2="62.1421">
+<stop offset="0" style="stop-color:#3B87C0"/>
+<stop offset="1" style="stop-color:#0069B2"/>
+</linearGradient>
+<path d="M35.3,58.2c-5.6-0.2-10.7-2.4-14.5-6L11.1,62c6.3,6.1,14.8,9.9,24.3,10V58.2z" fill="url(#SVGID_4_)"/>
+<path d="M51.2,52.2c-3.8,3.6-8.9,5.8-14.5,6V72c9.4-0.2,17.9-4,24.3-10L51.2,52.2z" fill="#424242"/>
+<linearGradient gradientTransform="matrix(1 0 0 1 -1269.75 -3487.3887)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="1306.4873" x2="1311.042" y1="3494.2671" y2="3494.2671">
+<stop offset="0" style="stop-color:#3B87C0"/>
+<stop offset="1" style="stop-color:#0069B2"/>
+</linearGradient>
+<polygon fill="url(#SVGID_5_)" points="41.3,6.9 36.7,13.8 36.7,0 41.3,6.9 "/>
+<path d="M58.3,36.7L58.3,36.7c-0.2,5.6-2.5,10.7-6.1,14.5L62,61c6.1-6.3,9.9-14.8,10-24.3H58.3z" fill="#424242"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_2.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_2.svg Fri May 14 16:09:54 2010 +0300
@@ -1,13 +1,33 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 baseProfile="tiny" height="72px" version="1.1" viewBox="0 0 72 72" width="72px" 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="#0067B1"/>
-<path d="M20.8,19.8c3.801-3.6,8.9-5.8,14.5-6V0c-9.4,0.2-17.9,4-24.3,10L20.8,19.8z" fill="#0067B1"/>
-<path d="M36.7,0v13.8c5.599,0.2,10.701,2.4,14.5,6L61,10C54.699,4,46.1,0.2,36.7,0z" fill="#0067B1"/>
-<path d="M19.8,51.2c-3.6-3.8-5.8-8.9-6-14.5H0C0.2,46.1,4,54.7,10,61L19.8,51.2z" fill="#0067B1"/>
-<path d="M52.199,20.8c3.6,3.8,5.801,8.9,6,14.5H72C71.799,25.9,68,17.4,62,11L52.199,20.8z" fill="#82C341"/>
-<path d="M35.3,58.2c-5.6-0.2-10.699-2.4-14.5-6L11.101,62c6.299,6.1,14.799,9.9,24.299,10V58.2H35.3z" fill="#424242"/>
-<path d="M51.199,52.2c-3.799,3.6-8.9,5.8-14.5,6V72c9.4-0.2,17.9-4,24.3-10L51.199,52.2z" fill="#424242"/>
-<polygon fill="#0067B1" points="60.299,19.1 52.199,20.8 62,11.1 "/>
-<path d="M58.299,36.7L58.299,36.7c-0.199,5.6-2.5,10.7-6.1,14.5L62,61c6.1-6.3,9.9-14.8,10-24.3H58.299z" fill="#82C341"/>
+<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">
+<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"/>
+</linearGradient>
+<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="url(#SVGID_1_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="11.0552" x2="35.3105" y1="9.9063" y2="9.9063">
+<stop offset="0" style="stop-color:#3B87C0"/>
+<stop offset="1" style="stop-color:#0069B2"/>
+</linearGradient>
+<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="url(#SVGID_2_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="36.7383" x2="60.9922" y1="9.9063" y2="9.9063">
+<stop offset="0" style="stop-color:#3B87C0"/>
+<stop offset="1" style="stop-color:#0069B2"/>
+</linearGradient>
+<path d="M36.7,0v13.8c5.6,0.2,10.7,2.4,14.5,6L61,10C54.7,4,46.1,0.2,36.7,0z" fill="url(#SVGID_3_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="0" x2="19.814" y1="48.8647" y2="48.8647">
+<stop offset="0" style="stop-color:#3B87C0"/>
+<stop offset="1" style="stop-color:#0069B2"/>
+</linearGradient>
+<path d="M19.8,51.2c-3.6-3.8-5.8-8.9-6-14.5H0C0.2,46.1,4,54.7,10,61L19.8,51.2z" fill="url(#SVGID_4_)"/>
+<path d="M52.2,20.8c3.6,3.8,5.8,8.9,6,14.5H72c-0.2-9.4-4-17.9-10-24.3L52.2,20.8z" fill="#5AB85B"/>
+<path d="M35.3,58.2c-5.6-0.2-10.7-2.4-14.5-6L11.1,62c6.3,6.1,14.8,9.9,24.3,10V58.2z" fill="#424242"/>
+<path d="M51.2,52.2c-3.8,3.6-8.9,5.8-14.5,6V72c9.4-0.2,17.9-4,24.3-10L51.2,52.2z" fill="#424242"/>
+<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 1584.3986 -3389.3784)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="1327.9453" x2="1332.5" y1="3487.8726" y2="3487.8726">
+<stop offset="0" style="stop-color:#3B87C0"/>
+<stop offset="1" style="stop-color:#0069B2"/>
+</linearGradient>
+<polygon fill="url(#SVGID_5_)" points="60.3,19.1 52.2,20.8 62,11.1 60.3,19.1 "/>
+<path d="M58.3,36.7L58.3,36.7c-0.2,5.6-2.5,10.7-6.1,14.5L62,61c6.1-6.3,9.9-14.8,10-24.3H58.3z" fill="#5AB85B"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_3.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_3.svg Fri May 14 16:09:54 2010 +0300
@@ -1,13 +1,33 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 baseProfile="tiny" height="72px" version="1.1" viewBox="0 0 72 72" width="72px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<path d="M13.799,35.3c0.201-5.6,2.4-10.7,6-14.5L10,11.1C4,17.4,0.199,25.9,0,35.3H13.799z" fill="#0067B1"/>
-<path d="M20.799,19.8c3.801-3.6,8.9-5.8,14.5-6V0C25.899,0.2,17.399,4,11,10L20.799,19.8z" fill="#0067B1"/>
-<path d="M36.699,0v13.8c5.6,0.2,10.701,2.4,14.5,6L61,10C54.699,4,46.1,0.2,36.699,0z" fill="#0067B1"/>
-<path d="M19.799,51.2c-3.6-3.8-5.799-8.9-6-14.5H0C0.199,46.1,4,54.7,10,61L19.799,51.2z" fill="#424242"/>
-<path d="M52.199,20.8c3.6,3.8,5.801,8.9,6,14.5H72C71.799,25.9,68,17.4,62,11L52.199,20.8z" fill="#0067B1"/>
-<path d="M35.299,58.2c-5.6-0.2-10.699-2.4-14.5-6L11.1,62c6.3,6.1,14.8,9.9,24.3,10V58.2H35.299z" fill="#424242"/>
-<path d="M51.199,52.2c-3.799,3.6-8.9,5.8-14.5,6V72C46.1,71.8,54.6,68,61,62L51.199,52.2z" fill="#82C341"/>
-<path d="M58.299,36.7L58.299,36.7c-0.199,5.6-2.5,10.7-6.1,14.5L62,61c6.1-6.3,9.9-14.8,10-24.3H58.299z" fill="#82C341"/>
-<polygon fill="#0067B1" points="65.199,41.3 58.299,36.7 72,36.7 "/>
+<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">
+<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"/>
+</linearGradient>
+<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="url(#SVGID_1_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="11.0552" x2="35.3105" y1="9.9063" y2="9.9063">
+<stop offset="0" style="stop-color:#3B87C0"/>
+<stop offset="1" style="stop-color:#0069B2"/>
+</linearGradient>
+<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="url(#SVGID_2_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="36.7383" x2="60.9922" y1="9.9063" y2="9.9063">
+<stop offset="0" style="stop-color:#3B87C0"/>
+<stop offset="1" style="stop-color:#0069B2"/>
+</linearGradient>
+<path d="M36.7,0v13.8c5.6,0.2,10.7,2.4,14.5,6L61,10C54.7,4,46.1,0.2,36.7,0z" fill="url(#SVGID_3_)"/>
+<path d="M19.8,51.2c-3.6-3.8-5.8-8.9-6-14.5H0C0.2,46.1,4,54.7,10,61L19.8,51.2z" fill="#424242"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="52.2354" x2="72.0469" y1="23.1826" y2="23.1826">
+<stop offset="0" style="stop-color:#3B87C0"/>
+<stop offset="1" style="stop-color:#0069B2"/>
+</linearGradient>
+<path d="M52.2,20.8c3.6,3.8,5.8,8.9,6,14.5H72c-0.2-9.4-4-17.9-10-24.3L52.2,20.8z" fill="url(#SVGID_4_)"/>
+<path d="M35.3,58.2c-5.6-0.2-10.7-2.4-14.5-6L11.1,62c6.3,6.1,14.8,9.9,24.3,10V58.2z" fill="#424242"/>
+<path d="M51.2,52.2c-3.8,3.6-8.9,5.8-14.5,6V72c9.4-0.2,17.9-4,24.3-10L51.2,52.2z" fill="#5AB85B"/>
+<path d="M58.3,36.7L58.3,36.7c-0.2,5.6-2.5,10.7-6.1,14.5L62,61c6.1-6.3,9.9-14.8,10-24.3H58.3z" fill="#5AB85B"/>
+<linearGradient gradientTransform="matrix(0 1 -1 0 3546.5811 -1312.6934)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="1349.4316" x2="1353.9863" y1="3481.4136" y2="3481.4136">
+<stop offset="0" style="stop-color:#3B87C0"/>
+<stop offset="1" style="stop-color:#0069B2"/>
+</linearGradient>
+<polygon fill="url(#SVGID_5_)" points="65.2,41.3 58.3,36.7 72,36.7 65.2,41.3 "/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_4.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_4.svg Fri May 14 16:09:54 2010 +0300
@@ -1,13 +1,33 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 baseProfile="tiny" height="72px" version="1.1" viewBox="0 0 72 72" width="72px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<path d="M13.799,35.3c0.201-5.6,2.4-10.7,6-14.5L10,11.1C4,17.4,0.199,25.9,0,35.3H13.799z" fill="#424242"/>
-<path d="M20.799,19.8c3.801-3.6,8.9-5.8,14.5-6V0C25.899,0.2,17.399,4,11,10L20.799,19.8z" fill="#0067B1"/>
-<path d="M36.699,0v13.8c5.6,0.2,10.701,2.4,14.5,6L61,10C54.699,4,46.1,0.2,36.699,0z" fill="#0067B1"/>
-<path d="M19.799,51.2c-3.6-3.8-5.799-8.9-6-14.5H0C0.199,46.1,4,54.7,10,61L19.799,51.2z" fill="#424242"/>
-<path d="M52.199,20.8c3.6,3.8,5.801,8.9,6,14.5H72C71.799,25.9,68,17.4,62,11L52.199,20.8z" fill="#0067B1"/>
-<path d="M35.299,58.2c-5.6-0.2-10.699-2.4-14.5-6L11.1,62c6.3,6.1,14.8,9.9,24.3,10V58.2H35.299z" fill="#82C341"/>
-<path d="M51.199,52.2c-3.799,3.6-8.9,5.8-14.5,6V72C46.1,71.8,54.6,68,61,62L51.199,52.2z" fill="#82C341"/>
-<path d="M58.299,36.7L58.299,36.7c-0.199,5.6-2.5,10.7-6.1,14.5L62,61c6.1-6.3,9.9-14.8,10-24.3H58.299z" fill="#0067B1"/>
-<polygon fill="#0067B1" points="52.9,60.3 51.299,52.2 61,62 "/>
+<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">
+<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"/>
+<stop offset="1" style="stop-color:#0069B2"/>
+</linearGradient>
+<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="url(#SVGID_1_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="36.7383" x2="60.9922" y1="9.9063" y2="9.9063">
+<stop offset="0" style="stop-color:#3B87C0"/>
+<stop offset="1" style="stop-color:#0069B2"/>
+</linearGradient>
+<path d="M36.7,0v13.8c5.6,0.2,10.7,2.4,14.5,6L61,10C54.7,4,46.1,0.2,36.7,0z" fill="url(#SVGID_2_)"/>
+<path d="M19.8,51.2c-3.6-3.8-5.8-8.9-6-14.5H0C0.2,46.1,4,54.7,10,61L19.8,51.2z" fill="#424242"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="52.2354" x2="72.0469" y1="23.1826" y2="23.1826">
+<stop offset="0" style="stop-color:#3B87C0"/>
+<stop offset="1" style="stop-color:#0069B2"/>
+</linearGradient>
+<path d="M52.2,20.8c3.6,3.8,5.8,8.9,6,14.5H72c-0.2-9.4-4-17.9-10-24.3L52.2,20.8z" fill="url(#SVGID_3_)"/>
+<path d="M35.3,58.2c-5.6-0.2-10.7-2.4-14.5-6L11.1,62c6.3,6.1,14.8,9.9,24.3,10V58.2z" fill="#5AB85B"/>
+<path d="M51.2,52.2c-3.8,3.6-8.9,5.8-14.5,6V72c9.4-0.2,17.9-4,24.3-10L51.2,52.2z" fill="#5AB85B"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="52.2354" x2="72.0469" y1="48.8647" y2="48.8647">
+<stop offset="0" style="stop-color:#3B87C0"/>
+<stop offset="1" style="stop-color:#0069B2"/>
+</linearGradient>
+<path d="M58.3,36.7L58.3,36.7c-0.2,5.6-2.5,10.7-6.1,14.5L62,61c6.1-6.3,9.9-14.8,10-24.3H58.3z" fill="url(#SVGID_4_)"/>
+<linearGradient gradientTransform="matrix(-0.7071 0.7071 -0.7071 -0.7071 3493.6553 1560.1959)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="1367.8477" x2="1372.4023" y1="3493.5483" y2="3493.5483">
+<stop offset="0" style="stop-color:#3B87C0"/>
+<stop offset="1" style="stop-color:#0069B2"/>
+</linearGradient>
+<polygon fill="url(#SVGID_5_)" points="52.9,60.3 51.3,52.2 61,62 52.9,60.3 "/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_5.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_5.svg Fri May 14 16:09:54 2010 +0300
@@ -1,13 +1,33 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 baseProfile="tiny" height="72px" version="1.1" viewBox="0 0 72 72" width="72px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<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">
<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.801-3.6,8.9-5.8,14.5-6V0c-9.4,0.2-17.9,4-24.3,10L20.8,19.8z" fill="#424242"/>
-<path d="M36.701,0v13.8c5.6,0.2,10.699,2.4,14.5,6L61,10C54.701,4,46.099,0.2,36.701,0z" fill="#0067B1"/>
-<path d="M19.8,51.2c-3.6-3.8-5.8-8.9-6-14.5H0C0.2,46.1,4,54.7,10,61L19.8,51.2z" fill="#82C341"/>
-<path d="M52.201,20.8c3.6,3.8,5.799,8.9,6,14.5H72C71.8,25.9,68,17.4,62,11L52.201,20.8z" fill="#0067B1"/>
-<path d="M35.3,58.2c-5.6-0.2-10.699-2.4-14.5-6L11.101,62c6.299,6.1,14.799,9.9,24.299,10V58.2H35.3z" fill="#82C341"/>
-<path d="M51.201,52.2c-3.801,3.6-8.9,5.8-14.5,6V72C46.099,71.8,54.599,68,61,62L51.201,52.2z" fill="#0067B1"/>
-<path d="M58.3,36.7L58.3,36.7c-0.201,5.6-2.5,10.7-6.1,14.5L62,61c6.1-6.3,9.9-14.8,10-24.3H58.3z" fill="#0067B1"/>
-<polygon fill="#0067B1" points="30.8,65.2 35.3,58.3 35.3,72 "/>
+<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">
+<stop offset="0" style="stop-color:#3B87C0"/>
+<stop offset="1" style="stop-color:#0069B2"/>
+</linearGradient>
+<path d="M36.7,0v13.8c5.6,0.2,10.7,2.4,14.5,6L61,10C54.7,4,46.1,0.2,36.7,0z" fill="url(#SVGID_1_)"/>
+<path d="M19.8,51.2c-3.6-3.8-5.8-8.9-6-14.5H0C0.2,46.1,4,54.7,10,61L19.8,51.2z" fill="#5AB85B"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="52.2354" x2="72.0469" y1="23.1826" y2="23.1826">
+<stop offset="0" style="stop-color:#3B87C0"/>
+<stop offset="1" style="stop-color:#0069B2"/>
+</linearGradient>
+<path d="M52.2,20.8c3.6,3.8,5.8,8.9,6,14.5H72c-0.2-9.4-4-17.9-10-24.3L52.2,20.8z" fill="url(#SVGID_2_)"/>
+<path d="M35.3,58.2c-5.6-0.2-10.7-2.4-14.5-6L11.1,62c6.3,6.1,14.8,9.9,24.3,10V58.2z" fill="#5AB85B"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="36.7383" x2="60.9922" y1="62.1421" y2="62.1421">
+<stop offset="0" style="stop-color:#3B87C0"/>
+<stop offset="1" style="stop-color:#0069B2"/>
+</linearGradient>
+<path d="M51.2,52.2c-3.8,3.6-8.9,5.8-14.5,6V72c9.4-0.2,17.9-4,24.3-10L51.2,52.2z" fill="url(#SVGID_3_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="52.2354" x2="72.0469" y1="48.8647" y2="48.8647">
+<stop offset="0" style="stop-color:#3B87C0"/>
+<stop offset="1" style="stop-color:#0069B2"/>
+</linearGradient>
+<path d="M58.3,36.7L58.3,36.7c-0.2,5.6-2.5,10.7-6.1,14.5L62,61c6.1-6.3,9.9-14.8,10-24.3H58.3z" fill="url(#SVGID_4_)"/>
+<linearGradient gradientTransform="matrix(-1 0 0 -1 1424.6426 3552.2568)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="1389.332" x2="1393.8867" y1="3487.0864" y2="3487.0864">
+<stop offset="0" style="stop-color:#3B87C0"/>
+<stop offset="1" style="stop-color:#0069B2"/>
+</linearGradient>
+<polygon fill="url(#SVGID_5_)" points="30.8,65.2 35.3,58.3 35.3,72 30.8,65.2 "/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_6.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_6.svg Fri May 14 16:09:54 2010 +0300
@@ -1,13 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 baseProfile="tiny" height="72px" version="1.1" viewBox="0 0 72 72" width="72px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<path d="M13.801,35.3c0.199-5.6,2.4-10.7,6-14.5L10,11.1C4,17.4,0.201,25.9,0,35.3H13.801z" fill="#424242"/>
-<path d="M20.801,19.8c3.8-3.6,8.9-5.8,14.5-6V0C25.9,0.2,17.4,4,11,10L20.801,19.8z" fill="#424242"/>
-<path d="M36.701,0v13.8c5.6,0.2,10.699,2.4,14.5,6L61,10C54.701,4,46.1,0.2,36.701,0z" fill="#0067B1"/>
-<path d="M19.801,51.201c-3.6-3.801-5.801-8.9-6-14.5H0c0.201,9.398,4,18,10,24.299L19.801,51.201z" fill="#82C341"/>
-<path d="M52.201,20.8c3.6,3.8,5.799,8.9,6,14.5H72C71.801,25.9,68,17.4,62,11L52.201,20.8z" fill="#0067B1"/>
-<path d="M35.301,58.201c-5.6-0.201-10.7-2.4-14.5-6L11.101,62c6.3,6.1,14.8,9.9,24.3,10V58.201H35.301z" fill="#0067B1"/>
-<path d="M51.201,52.201c-3.801,3.6-8.9,5.799-14.5,6V72C46.1,71.8,54.6,68,61,62L51.201,52.201z" fill="#0067B1"/>
-<path d="M58.301,36.701L58.301,36.701c-0.201,5.6-2.5,10.699-6.1,14.5L62,61c6.1-6.299,9.9-14.799,10-24.299H58.301z " fill="#0067B1"/>
-<polygon fill="#0067B1" points="11.5,52.9 19.601,51.3 9.9,61 "/>
+<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">
+<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">
+<stop offset="0" style="stop-color:#3B87C0"/>
+<stop offset="1" style="stop-color:#0069B2"/>
+</linearGradient>
+<path d="M36.7,0v13.8c5.6,0.2,10.7,2.4,14.5,6L61,10C54.7,4,46.1,0.2,36.7,0z" fill="url(#SVGID_1_)"/>
+<path d="M19.8,51.2c-3.6-3.8-5.8-8.9-6-14.5H0C0.2,46.1,4,54.7,10,61L19.8,51.2z" fill="#5AB85B"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="52.2354" x2="72.0469" y1="23.1826" y2="23.1826">
+<stop offset="0" style="stop-color:#3B87C0"/>
+<stop offset="1" style="stop-color:#0069B2"/>
+</linearGradient>
+<path d="M52.2,20.8c3.6,3.8,5.8,8.9,6,14.5H72c-0.2-9.4-4-17.9-10-24.3L52.2,20.8z" fill="url(#SVGID_2_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="11.0552" x2="35.3105" y1="62.1421" y2="62.1421">
+<stop offset="0" style="stop-color:#3B87C0"/>
+<stop offset="1" style="stop-color:#0069B2"/>
+</linearGradient>
+<path d="M35.3,58.2c-5.6-0.2-10.7-2.4-14.5-6L11.1,62c6.3,6.1,14.8,9.9,24.3,10V58.2z" fill="url(#SVGID_3_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="36.7383" x2="60.9922" y1="62.1421" y2="62.1421">
+<stop offset="0" style="stop-color:#3B87C0"/>
+<stop offset="1" style="stop-color:#0069B2"/>
+</linearGradient>
+<path d="M51.2,52.2c-3.8,3.6-8.9,5.8-14.5,6V72c9.4-0.2,17.9-4,24.3-10L51.2,52.2z" fill="url(#SVGID_4_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="52.2354" x2="72.0469" y1="48.8647" y2="48.8647">
+<stop offset="0" style="stop-color:#3B87C0"/>
+<stop offset="1" style="stop-color:#0069B2"/>
+</linearGradient>
+<path d="M58.3,36.7L58.3,36.7c-0.2,5.6-2.5,10.7-6.1,14.5L62,61c6.1-6.3,9.9-14.8,10-24.3H58.3z" fill="url(#SVGID_5_)"/>
+<linearGradient gradientTransform="matrix(-0.7071 -0.7071 0.7071 -0.7071 -1461.6281 3526.3462)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="1409.8438" x2="1414.3984" y1="3497.7866" y2="3497.7866">
+<stop offset="0" style="stop-color:#3B87C0"/>
+<stop offset="1" style="stop-color:#0069B2"/>
+</linearGradient>
+<polygon fill="url(#SVGID_6_)" points="11.5,52.9 19.6,51.3 9.9,61 11.5,52.9 "/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_7.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_7.svg Fri May 14 16:09:54 2010 +0300
@@ -1,13 +1,41 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 baseProfile="tiny" height="72px" version="1.1" viewBox="0 0 72 72" width="72px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
+<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">
<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-6V0C25.9,0.2,17.4,4,11,10L20.8,19.8z" fill="#424242"/>
-<path d="M36.7,0v13.8c5.6,0.2,10.7,2.4,14.5,6L61,10C54.7,4,46.1,0.2,36.7,0z" fill="#0067B1"/>
-<path d="M19.8,51.201c-3.6-3.801-5.8-8.9-6-14.5H0c0.2,9.398,4,18,10,24.299L19.8,51.201z" fill="#0067B1"/>
-<path d="M52.2,20.8c3.6,3.8,5.8,8.9,6,14.5H72C71.8,25.9,68,17.4,62,11L52.2,20.8z" fill="#0067B1"/>
-<path d="M35.3,58.201c-5.6-0.201-10.7-2.4-14.5-6L11.1,62C17.4,68.099,25.9,71.9,35.4,72V58.201H35.3z" fill="#0067B1"/>
-<path d="M51.2,52.201c-3.8,3.6-8.9,5.799-14.5,6V72C46.1,71.8,54.6,68,61,62L51.2,52.201z" fill="#0067B1"/>
-<path d="M58.3,36.701L58.3,36.701c-0.2,5.6-2.5,10.699-6.1,14.5L62,61c6.1-6.299,9.9-14.799,10-24.299H58.3z" fill="#0067B1"/>
-<polygon fill="#0067B1" points="6.9,30.8 13.8,35.3 0,35.3 "/>
+<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">
+<stop offset="0" style="stop-color:#3B87C0"/>
+<stop offset="1" style="stop-color:#0069B2"/>
+</linearGradient>
+<path d="M36.7,0v13.8c5.6,0.2,10.7,2.4,14.5,6L61,10C54.7,4,46.1,0.2,36.7,0z" fill="url(#SVGID_1_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="0" x2="19.814" y1="48.8647" y2="48.8647">
+<stop offset="0" style="stop-color:#3B87C0"/>
+<stop offset="1" style="stop-color:#0069B2"/>
+</linearGradient>
+<path d="M19.8,51.2c-3.6-3.8-5.8-8.9-6-14.5H0C0.2,46.1,4,54.7,10,61L19.8,51.2z" fill="url(#SVGID_2_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="52.2354" x2="72.0469" y1="23.1826" y2="23.1826">
+<stop offset="0" style="stop-color:#3B87C0"/>
+<stop offset="1" style="stop-color:#0069B2"/>
+</linearGradient>
+<path d="M52.2,20.8c3.6,3.8,5.8,8.9,6,14.5H72c-0.2-9.4-4-17.9-10-24.3L52.2,20.8z" fill="url(#SVGID_3_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="11.0552" x2="35.3105" y1="62.1421" y2="62.1421">
+<stop offset="0" style="stop-color:#3B87C0"/>
+<stop offset="1" style="stop-color:#0069B2"/>
+</linearGradient>
+<path d="M35.3,58.2c-5.6-0.2-10.7-2.4-14.5-6L11.1,62c6.3,6.1,14.8,9.9,24.3,10V58.2z" fill="url(#SVGID_4_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="36.7383" x2="60.9922" y1="62.1421" y2="62.1421">
+<stop offset="0" style="stop-color:#3B87C0"/>
+<stop offset="1" style="stop-color:#0069B2"/>
+</linearGradient>
+<path d="M51.2,52.2c-3.8,3.6-8.9,5.8-14.5,6V72c9.4-0.2,17.9-4,24.3-10L51.2,52.2z" fill="url(#SVGID_5_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="52.2354" x2="72.0469" y1="48.8647" y2="48.8647">
+<stop offset="0" style="stop-color:#3B87C0"/>
+<stop offset="1" style="stop-color:#0069B2"/>
+</linearGradient>
+<path d="M58.3,36.7L58.3,36.7c-0.2,5.6-2.5,10.7-6.1,14.5L62,61c6.1-6.3,9.9-14.8,10-24.3H58.3z" fill="url(#SVGID_6_)"/>
+<linearGradient gradientTransform="matrix(0 -1 1 0 -3505.6865 1466.1221)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="1430.8135" x2="1435.3682" y1="3512.5659" y2="3512.5659">
+<stop offset="0" style="stop-color:#3B87C0"/>
+<stop offset="1" style="stop-color:#0069B2"/>
+</linearGradient>
+<polygon fill="url(#SVGID_7_)" points="6.9,30.8 13.8,35.3 0,35.3 6.9,30.8 "/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_8.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_8.svg Fri May 14 16:09:54 2010 +0300
@@ -1,13 +1,45 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 baseProfile="tiny" height="72px" version="1.1" viewBox="0 0 72 72" width="72px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<path d="M13.799,35.3c0.201-5.6,2.4-10.7,6-14.5L10,11.1C4,17.4,0.199,25.9,0,35.3H13.799z" fill="#0067B1"/>
-<path d="M20.799,19.8c3.801-3.6,8.9-5.8,14.5-6V0C25.9,0.2,17.4,4,11,10L20.799,19.8z" fill="#424242"/>
-<path d="M36.699,0v13.8c5.6,0.2,10.702,2.4,14.5,6L61,10C54.699,4,46.1,0.2,36.699,0z" fill="#0067B1"/>
-<path d="M19.799,51.2c-3.6-3.799-5.799-8.9-6-14.5H0C0.199,46.1,4,54.7,10,61L19.799,51.2z" fill="#0067B1"/>
-<path d="M52.199,20.8c3.6,3.8,5.801,8.9,6,14.5H72C71.799,25.9,68,17.4,62,11L52.199,20.8z" fill="#0067B1"/>
-<path d="M35.299,58.2c-5.6-0.199-10.699-2.4-14.5-6L11.1,62C17.4,68.1,25.9,71.901,35.4,72V58.2H35.299z" fill="#0067B1"/>
-<path d="M51.199,52.2c-3.799,3.6-8.9,5.801-14.5,6V72C46.1,71.799,54.6,68,61,62L51.199,52.2z" fill="#0067B1"/>
-<path d="M58.299,36.7L58.299,36.7c-0.199,5.6-2.5,10.701-6.1,14.5L62,61C68.1,54.7,71.9,46.2,72,36.7H58.299z" fill="#0067B1"/>
-<polygon fill="#0067B1" points="19.1,11.7 20.799,19.8 11.1,10.1 "/>
+<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">
+<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"/>
+</linearGradient>
+<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="url(#SVGID_1_)"/>
+<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_2_" x1="36.7383" x2="60.9922" y1="9.9063" y2="9.9063">
+<stop offset="0" style="stop-color:#3B87C0"/>
+<stop offset="1" style="stop-color:#0069B2"/>
+</linearGradient>
+<path d="M36.7,0v13.8c5.6,0.2,10.7,2.4,14.5,6L61,10C54.7,4,46.1,0.2,36.7,0z" fill="url(#SVGID_2_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="0" x2="19.814" y1="48.8647" y2="48.8647">
+<stop offset="0" style="stop-color:#3B87C0"/>
+<stop offset="1" style="stop-color:#0069B2"/>
+</linearGradient>
+<path d="M19.8,51.2c-3.6-3.8-5.8-8.9-6-14.5H0C0.2,46.1,4,54.7,10,61L19.8,51.2z" fill="url(#SVGID_3_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="52.2354" x2="72.0469" y1="23.1826" y2="23.1826">
+<stop offset="0" style="stop-color:#3B87C0"/>
+<stop offset="1" style="stop-color:#0069B2"/>
+</linearGradient>
+<path d="M52.2,20.8c3.6,3.8,5.8,8.9,6,14.5H72c-0.2-9.4-4-17.9-10-24.3L52.2,20.8z" fill="url(#SVGID_4_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="11.0552" x2="35.3105" y1="62.1421" y2="62.1421">
+<stop offset="0" style="stop-color:#3B87C0"/>
+<stop offset="1" style="stop-color:#0069B2"/>
+</linearGradient>
+<path d="M35.3,58.2c-5.6-0.2-10.7-2.4-14.5-6L11.1,62c6.3,6.1,14.8,9.9,24.3,10V58.2z" fill="url(#SVGID_5_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="36.7383" x2="60.9922" y1="62.1421" y2="62.1421">
+<stop offset="0" style="stop-color:#3B87C0"/>
+<stop offset="1" style="stop-color:#0069B2"/>
+</linearGradient>
+<path d="M51.2,52.2c-3.8,3.6-8.9,5.8-14.5,6V72c9.4-0.2,17.9-4,24.3-10L51.2,52.2z" fill="url(#SVGID_6_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="52.2354" x2="72.0469" y1="48.8647" y2="48.8647">
+<stop offset="0" style="stop-color:#3B87C0"/>
+<stop offset="1" style="stop-color:#0069B2"/>
+</linearGradient>
+<path d="M58.3,36.7L58.3,36.7c-0.2,5.6-2.5,10.7-6.1,14.5L62,61c6.1-6.3,9.9-14.8,10-24.3H58.3z" fill="url(#SVGID_7_)"/>
+<linearGradient gradientTransform="matrix(0.7071 -0.7071 0.7071 0.7071 -3490.3384 -1437.3785)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="1452.3613" x2="1456.915" y1="3506.2817" y2="3506.2817">
+<stop offset="0" style="stop-color:#3B87C0"/>
+<stop offset="1" style="stop-color:#0069B2"/>
+</linearGradient>
+<polygon fill="url(#SVGID_8_)" points="19.1,11.7 20.8,19.8 11.1,10.1 19.1,11.7 "/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_9.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_longtap_9.svg Fri May 14 16:09:54 2010 +0300
@@ -1,12 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 baseProfile="tiny" height="72px" version="1.1" viewBox="0 0 72 72" width="72px" x="0px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-<path d="M13.799,35.3c0.201-5.6,2.4-10.7,6-14.5L10,11.1C4,17.4,0.199,25.9,0,35.3H13.799z" fill="#0067B1"/>
-<path d="M20.799,19.8c3.801-3.6,8.9-5.8,14.5-6V0C25.9,0.2,17.4,4,11,10L20.799,19.8z" fill="#0067B1"/>
-<path d="M36.7,0v13.8c5.599,0.2,10.701,2.4,14.5,6L61,10C54.699,4,46.1,0.2,36.7,0z" fill="#0067B1"/>
-<path d="M19.799,51.2c-3.6-3.8-5.799-8.9-6-14.5H0C0.199,46.1,4,54.7,10,61L19.799,51.2z" fill="#0067B1"/>
-<path d="M52.199,20.8c3.6,3.8,5.801,8.9,6,14.5H72C71.799,25.9,68,17.4,62,11L52.199,20.8z" fill="#0067B1"/>
-<path d="M35.299,58.2c-5.6-0.2-10.699-2.4-14.5-6L11.1,62C17.4,68.1,25.9,71.9,35.4,72V58.2H35.299z" fill="#0067B1"/>
-<path d="M51.199,52.2c-3.799,3.6-8.9,5.8-14.5,6V72c9.4-0.2,17.9-4,24.3-10L51.199,52.2z" fill="#0067B1"/>
-<path d="M58.299,36.7L58.299,36.7c-0.199,5.6-2.5,10.7-6.1,14.5L62,61c6.1-6.3,9.9-14.8,10-24.3H58.299z" fill="#0067B1"/>
+<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">
+<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"/>
+</linearGradient>
+<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="url(#SVGID_1_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="11.0552" x2="35.3105" y1="9.9063" y2="9.9063">
+<stop offset="0" style="stop-color:#3B87C0"/>
+<stop offset="1" style="stop-color:#0069B2"/>
+</linearGradient>
+<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="url(#SVGID_2_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="36.7383" x2="60.9922" y1="9.9063" y2="9.9063">
+<stop offset="0" style="stop-color:#3B87C0"/>
+<stop offset="1" style="stop-color:#0069B2"/>
+</linearGradient>
+<path d="M36.7,0v13.8c5.6,0.2,10.7,2.4,14.5,6L61,10C54.7,4,46.1,0.2,36.7,0z" fill="url(#SVGID_3_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="0" x2="19.814" y1="48.8647" y2="48.8647">
+<stop offset="0" style="stop-color:#3B87C0"/>
+<stop offset="1" style="stop-color:#0069B2"/>
+</linearGradient>
+<path d="M19.8,51.2c-3.6-3.8-5.8-8.9-6-14.5H0C0.2,46.1,4,54.7,10,61L19.8,51.2z" fill="url(#SVGID_4_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="52.2354" x2="72.0469" y1="23.1826" y2="23.1826">
+<stop offset="0" style="stop-color:#3B87C0"/>
+<stop offset="1" style="stop-color:#0069B2"/>
+</linearGradient>
+<path d="M52.2,20.8c3.6,3.8,5.8,8.9,6,14.5H72c-0.2-9.4-4-17.9-10-24.3L52.2,20.8z" fill="url(#SVGID_5_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="11.0552" x2="35.3105" y1="62.1421" y2="62.1421">
+<stop offset="0" style="stop-color:#3B87C0"/>
+<stop offset="1" style="stop-color:#0069B2"/>
+</linearGradient>
+<path d="M35.3,58.2c-5.6-0.2-10.7-2.4-14.5-6L11.1,62c6.3,6.1,14.8,9.9,24.3,10V58.2z" fill="url(#SVGID_6_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="36.7383" x2="60.9922" y1="62.1421" y2="62.1421">
+<stop offset="0" style="stop-color:#3B87C0"/>
+<stop offset="1" style="stop-color:#0069B2"/>
+</linearGradient>
+<path d="M51.2,52.2c-3.8,3.6-8.9,5.8-14.5,6V72c9.4-0.2,17.9-4,24.3-10L51.2,52.2z" fill="url(#SVGID_7_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="52.2354" x2="72.0469" y1="48.8647" y2="48.8647">
+<stop offset="0" style="stop-color:#3B87C0"/>
+<stop offset="1" style="stop-color:#0069B2"/>
+</linearGradient>
+<path d="M58.3,36.7L58.3,36.7c-0.2,5.6-2.5,10.7-6.1,14.5L62,61c6.1-6.3,9.9-14.8,10-24.3H58.3z" fill="url(#SVGID_8_)"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_1.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_1.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_10.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_11.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_12.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_13.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_14.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_15.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_16.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_2.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_3.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_4.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_5.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_6.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_7.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_8.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_screenlock_swipe_9.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_1.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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>
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_10.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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>
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_2.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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>
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_3.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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>
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_4.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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>
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_5.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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>
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_6.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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>
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_7.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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>
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_8.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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>
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_anim_small_loading_9.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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>
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_disabled_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_disabled_bl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_disabled_br.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_disabled_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_disabled_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_disabled_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_disabled_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_disabled_tl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_disabled_tr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_highlight_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_highlight_bl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_highlight_br.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_highlight_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_highlight_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_highlight_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_highlight_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_highlight_tl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_highlight_tr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_latched_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_latched_bl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_latched_br.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_latched_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_latched_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_latched_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_latched_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_latched_tl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_latched_tr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_normal_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_normal_bl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_normal_br.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_normal_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_normal_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_normal_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_normal_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_normal_tl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_normal_tr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_pressed_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_pressed_bl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_pressed_br.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_pressed_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_pressed_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_pressed_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_pressed_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_pressed_tl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_btn_pressed_tr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_character_preview_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_character_preview_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_character_preview_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_disabled_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_disabled_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_disabled_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_edit_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_edit_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_edit_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_highlight_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_highlight_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_highlight_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_latched_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_latched_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_latched_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_normal_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_normal_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_normal_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_pressed_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_pressed_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_combobox_pressed_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_bl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_br.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_tl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_form_heading_tr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_highlight_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_highlight_bl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_highlight_br.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_highlight_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_highlight_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_highlight_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_highlight_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_highlight_tl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_highlight_tr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_latched_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_latched_bl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_latched_br.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_latched_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_latched_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_latched_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_latched_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_latched_tl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_latched_tr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_normal_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_normal_bl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_normal_br.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_normal_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_normal_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_normal_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_normal_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_normal_tl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_normal_tr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_organize_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_organize_bl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_organize_br.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_organize_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_organize_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_organize_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_organize_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_organize_tl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_organize_tr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_pressed_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_pressed_bl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_pressed_br.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_pressed_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_pressed_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_pressed_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_pressed_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_pressed_tl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_grid_pressed_tr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_bl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_br.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_bl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_br.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_tl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_highlight_tr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_bl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_br.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_tl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_normal_tr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_bl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_br.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_tl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_pressed_tr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_tl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_groupbox_tr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_bl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_br.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_tl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_disabled_tr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_bl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_br.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_tl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_latched_tr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_bl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_br.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_tl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_normal_tr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_bl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_br.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_tl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_function_pressed_tr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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_)"/>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_accented_normal_b.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,16 @@
+<?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="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" 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"/>
+<rect fill="url(#SVGID_1_)" height="7" width="50"/>
+<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="50" y="6"/>
+<rect fill="none" height="10" width="50"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="24.9995" x2="24.9995" y1="-37.9995" y2="7.0883">
+<stop offset="0" style="stop-color:#E1E1E6"/>
+<stop offset="1" style="stop-color:#B4B4B9"/>
+</linearGradient>
+</defs>
+</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_accented_normal_bl.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,16 @@
+<?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="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" 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"/>
+<path d="M2,0v2c0,2.757,2.243,5,5,5h3V0H2z" fill="url(#SVGID_1_)"/>
+<path d="M7,6C4.794,6,3,4.205,3,2V0H2v2c0,2.757,2.243,5,5,5h3V6H7z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<rect fill="none" height="10" width="10"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="6" x2="6" y1="-37.9995" y2="7.0883">
+<stop offset="0" style="stop-color:#E1E1E6"/>
+<stop offset="1" style="stop-color:#B4B4B9"/>
+</linearGradient>
+</defs>
+</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_accented_normal_br.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,16 @@
+<?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="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" 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"/>
+<path d="M0,0v7h3c2.757,0,5-2.243,5-5V0H0z" fill="url(#SVGID_1_)"/>
+<path d="M7,0v2c0,2.205-1.794,4-4,4H0v1h3c2.757,0,5-2.243,5-5V0H7z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<rect fill="none" height="10" width="10"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4" x2="4" y1="-37.9995" y2="7.0883">
+<stop offset="0" style="stop-color:#E1E1E6"/>
+<stop offset="1" style="stop-color:#B4B4B9"/>
+</linearGradient>
+</defs>
+</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_accented_normal_c.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,12 @@
+<?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 50 30" width="50px" x="0px" y="0px">
+<rect fill="none" height="30" width="50"/>
+<rect fill="url(#SVGID_1_)" height="30" width="50"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="24.9995" x2="24.9995" y1="-8" y2="37.0886">
+<stop offset="0" style="stop-color:#E1E1E6"/>
+<stop offset="1" style="stop-color:#B4B4B9"/>
+</linearGradient>
+</defs>
+</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_accented_normal_l.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,15 @@
+<?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 10 30" width="10px" x="0px" 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"/>
+<rect fill="#FFFFFF" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="1" x="2"/>
+<rect fill="none" height="30" width="10"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="6" x2="6" y1="-8" y2="37.0886">
+<stop offset="0" style="stop-color:#E1E1E6"/>
+<stop offset="1" style="stop-color:#B4B4B9"/>
+</linearGradient>
+</defs>
+</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_accented_normal_r.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,15 @@
+<?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 10 30" width="10px" x="0px" 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"/>
+<rect fill="#FFFFFF" fill-opacity="0.4" height="30" stroke-opacity="0.4" width="1" x="7"/>
+<rect fill="none" height="30" width="10"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4" x2="4" y1="-8" y2="37.0886">
+<stop offset="0" style="stop-color:#E1E1E6"/>
+<stop offset="1" style="stop-color:#B4B4B9"/>
+</linearGradient>
+</defs>
+</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_accented_normal_t.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,15 @@
+<?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="10px" version="1.1" viewBox="0 0 50 10" width="50px" x="0px" 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"/>
+<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="50" y="2"/>
+<rect fill="none" height="10" width="50"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="24.9995" x2="24.9995" y1="2" y2="47.0878">
+<stop offset="0" style="stop-color:#E1E1E6"/>
+<stop offset="1" style="stop-color:#B4B4B9"/>
+</linearGradient>
+</defs>
+</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_accented_normal_tl.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,15 @@
+<?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="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" 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_)"/>
+<path d="M7,2C4.243,2,2,4.243,2,7v3h1V7c0-2.205,1.794-4,4-4h3V2H7z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<rect fill="none" height="10" width="10"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="6" x2="6" y1="2" y2="47.0878">
+<stop offset="0" style="stop-color:#E1E1E6"/>
+<stop offset="1" style="stop-color:#B4B4B9"/>
+</linearGradient>
+</defs>
+</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_accented_normal_tr.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,15 @@
+<?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="10px" version="1.1" viewBox="0 0 10 10" width="10px" x="0px" 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_)"/>
+<path d="M3,2H0v1h3c2.206,0,4,1.795,4,4v3h1V7C8,4.243,5.757,2,3,2z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<rect fill="none" height="10" width="10"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4" x2="4" y1="2" y2="47.0878">
+<stop offset="0" style="stop-color:#E1E1E6"/>
+<stop offset="1" style="stop-color:#B4B4B9"/>
+</linearGradient>
+</defs>
+</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_b.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_bl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_br.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_tl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_disabled_tr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_bl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_br.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_tl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_latched_tr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_bl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_br.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_tl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_normal_tr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_bl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_br.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_tl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_btn_keypad_pressed_tr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_h_bg_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<rect fill="none" height="15" width="15"/>
<rect fill="url(#SVGID_1_)" height="15" width="15"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_h_bg_l.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_h_bg_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<rect fill="none" height="15" width="15"/>
<rect fill="url(#SVGID_1_)" height="15" width="15"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_h_bg_r.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_h_bg_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<rect fill="none" height="15" width="15"/>
<rect fill="url(#SVGID_1_)" height="15" width="15"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_v_bg_b.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_v_bg_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<rect fill="none" height="15" width="15"/>
<rect fill="url(#SVGID_1_)" height="15" width="15"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_v_bg_c.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_v_bg_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<rect fill="none" height="15" width="15"/>
<rect fill="url(#SVGID_1_)" height="15" width="15"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_v_bg_t.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_input_v_bg_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<rect fill="none" height="15" width="15"/>
<rect fill="url(#SVGID_1_)" height="15" width="15"/>
<defs>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_b.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_bl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_br.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_tl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_highlight_tr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_bl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_br.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_tl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_lineedit_normal_tr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_highlight_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_highlight_bl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_highlight_br.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_highlight_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_highlight_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_highlight_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_highlight_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_highlight_tl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_highlight_tr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_latched_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_latched_bl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_latched_br.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_latched_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_latched_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_latched_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_latched_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_latched_tl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_latched_tr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_new_item_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_new_item_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_new_item_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_normal_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_normal_bl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_normal_br.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_normal_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_normal_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_normal_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_normal_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_normal_tl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_normal_tr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_parent_normal_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_parent_normal_bl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_parent_normal_br.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_parent_normal_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_parent_normal_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_parent_normal_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_parent_normal_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_parent_normal_tl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_parent_normal_tr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_pressed_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_pressed_bl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_pressed_br.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_pressed_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_pressed_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_pressed_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_pressed_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_pressed_tl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_pressed_tr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_bl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_br.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_tl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_list_separator_tr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_bl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_br.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_highlight_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_highlight_bl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_highlight_br.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_highlight_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_highlight_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_highlight_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_highlight_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_highlight_tl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_highlight_tr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_latched_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_latched_bl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_latched_br.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_latched_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_latched_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_latched_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_latched_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_latched_tl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_latched_tr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_normal_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_normal_bl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_normal_br.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_normal_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_normal_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_normal_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_normal_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_normal_tl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_normal_tr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_pressed_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_pressed_bl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_pressed_br.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_pressed_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_pressed_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_pressed_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_pressed_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_pressed_tl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_grid_pressed_tr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_heading_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_heading_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_heading_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_highlight_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_highlight_bl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_highlight_br.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_highlight_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_highlight_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_highlight_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_highlight_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_highlight_tl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_highlight_tr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_latched_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_latched_bl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_latched_br.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_latched_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_latched_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_latched_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_latched_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_latched_tl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_latched_tr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_normal_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_normal_bl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_normal_br.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_normal_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_normal_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_normal_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_normal_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_normal_tl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_normal_tr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_parent_normal_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_parent_normal_bl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_parent_normal_br.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_parent_normal_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_parent_normal_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_parent_normal_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_parent_normal_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_parent_normal_tl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_parent_normal_tr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_pressed_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_pressed_bl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_pressed_br.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_pressed_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_pressed_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_pressed_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_pressed_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_pressed_tl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_list_pressed_tr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_preview_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_preview_bl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_preview_br.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_preview_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_preview_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_preview_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_preview_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_preview_tl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_preview_tr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_secondary_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_secondary_bl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_secondary_br.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_secondary_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_secondary_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_secondary_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_secondary_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_secondary_tl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_secondary_tr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_disabled_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_disabled_cl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_disabled_cr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_disabled_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_disabled_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_highlight_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_highlight_cl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_highlight_cr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_highlight_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_highlight_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_normal_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_normal_cl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_normal_cr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_normal_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_normal_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_pressed_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_pressed_cl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_pressed_cr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_pressed_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_sk_pressed_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_tl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_tr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_bl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_br.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_normal_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_normal_bl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_normal_br.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_normal_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg 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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_normal_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_normal_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_normal_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_normal_tl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_grid_normal_tr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_bl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_br.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_tl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_list_normal_tr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_tl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_popup_trans_tr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_h_filled_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_h_filled_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_h_filled_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_h_frame_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_h_frame_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_h_frame_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_h_mask_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_h_mask_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_h_mask_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_filled_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<path d="M5,14c0,2.757,2.243,5,5,5s5-2.243,5-5V0H5V14z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_filled_c.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_filled_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_filled_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<path d="M5,6c0-2.757,2.243-5,5-5s5,2.243,5,5v14H5V6z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_frame_b.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_frame_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<path d="M4,14c0,3.3,2.7,6,6,6s6-2.7,6-6V0H4V14z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_frame_c.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_frame_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_frame_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<path d="M4,6c0-3.3,2.7-6,6-6s6,2.7,6,6v14H4V6z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_mask_b.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_mask_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_mask_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progbar_v_mask_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,9 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<rect fill="none" height="20" width="20"/>
-<rect fill="none" height="20" width="20" x="0"/>
+<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"/>
-<rect fill="none" height="20" width="20" x="0" y="20"/>
-<rect height="20" width="10" x="5" y="20"/>
</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_frame_disabled_c.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,9 @@
+<?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="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" 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"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="20" y="1"/>
+<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="20" y="18"/>
+</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_frame_disabled_l.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,8 @@
+<?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="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" 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"/>
+<path d="M9,2h11V1H9c-4.962,0-9,4.037-9,9s4.038,9,9,9h11v-1H9c-4.411,0-8-3.589-8-8S4.589,2,9,2z" fill-opacity="0.2" stroke-opacity="0.2"/>
+</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_frame_disabled_r.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,9 @@
+<?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="20px" version="1.1" viewBox="0 0 20 20" width="20px" x="0px" 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"/>
+<path d="M11,1H0v1h11c4.411,0,8,3.589,8,8s-3.589,8-8,8H0v1h11c4.963,0,9-4.037,9-9S15.963,1,11,1z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<rect fill="none" height="20" width="20"/>
+</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_frame_normal_c.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_frame_normal_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_frame_normal_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_frame_normal_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_frame_pressed_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_frame_pressed_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_frame_pressed_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_loaded_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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"/>
-<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="20" y="2"/>
-<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="20" y="17"/>
+<rect fill="url(#SVGID_1_)" fill-opacity="0.6" height="16" stroke-opacity="0.6" width="20" y="2"/>
+<rect fill="#FFFFFF" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="20" y="2"/>
+<rect fill="#FFFFFF" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="20" y="17"/>
<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="9.9995" x2="9.9995" y1="2" y2="18.0005">
-<stop offset="0" style="stop-color:#E6E6E6"/>
-<stop offset="1" style="stop-color:#DCDCDC"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2" y2="18.0005">
+<stop offset="0" style="stop-color:#66B8CC"/>
+<stop offset="1" style="stop-color:#3F89A9"/>
</linearGradient>
</defs>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_loaded_l.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_loaded_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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_)"/>
-<path d="M9,3h11V2H9c-4.4,0-8,3.6-8,8s3.6,8,8,8h11v-1H9c-3.86,0-7-3.141-7-7S5.14,3,9,3z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<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"/>
+<path d="M9,3h11V2H9c-4.4,0-8,3.6-8,8s3.6,8,8,8h11v-1H9c-3.86,0-7-3.141-7-7S5.14,3,9,3z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="10.5" x2="10.5" y1="2" y2="18.0005">
-<stop offset="0" style="stop-color:#E6E6E6"/>
-<stop offset="1" style="stop-color:#DCDCDC"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2" y2="18.0005">
+<stop offset="0" style="stop-color:#66B8CC"/>
+<stop offset="1" style="stop-color:#3F89A9"/>
</linearGradient>
</defs>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_loaded_r.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_loaded_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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_)"/>
-<path d="M11,3H0V2h11c4.4,0,8,3.6,8,8s-3.6,8-8,8H0v-1h11c3.859,0,7-3.141,7-7S14.859,3,11,3z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<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"/>
+<path d="M11,3H0V2h11c4.4,0,8,3.6,8,8s-3.6,8-8,8H0v-1h11c3.859,0,7-3.141,7-7S14.859,3,11,3z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
<rect fill="none" height="20" width="20"/>
<defs>
-<linearGradient gradientTransform="matrix(-1 0 0 1 -2497 0)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2506.5" x2="-2506.5" y1="2" y2="18.0005">
-<stop offset="0" style="stop-color:#E6E6E6"/>
-<stop offset="1" style="stop-color:#DCDCDC"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2" y2="18.0005">
+<stop offset="0" style="stop-color:#66B8CC"/>
+<stop offset="1" style="stop-color:#3F89A9"/>
</linearGradient>
</defs>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_played_c.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_played_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_played_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_progslider_played_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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_)"/>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_disabled_b.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,8 @@
+<?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="220px" version="1.1" viewBox="0 0 220 220" width="220px" x="0px" 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 "/>
+<rect fill="none" height="220" width="220"/>
+</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_disabled_c.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,8 @@
+<?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="220px" version="1.1" viewBox="0 0 220 220" width="220px" x="0px" 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"/>
+<rect fill="none" height="220" width="220"/>
+</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_disabled_l.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,8 @@
+<?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="220px" version="1.1" viewBox="0 0 220 220" width="220px" x="0px" 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 "/>
+<rect fill="none" height="220" width="220"/>
+</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_disabled_r.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,8 @@
+<?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="220px" version="1.1" viewBox="0 0 220 220" width="220px" x="0px" 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"/>
+<polygon fill="#787878" points="176,99 194,110 176,121 "/>
+</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_disabled_t.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,8 @@
+<?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="220px" version="1.1" viewBox="0 0 220 220" width="220px" x="0px" 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"/>
+<polygon fill="#787878" points="99,44 110,26 121,44 "/>
+</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_normal_b.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,16 @@
+<?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="220px" version="1.1" viewBox="0 0 220 220" width="220px" x="0px" 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_)"/>
+<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.4" stroke-opacity="0.4"/>
+<polygon fill="#3C3C3C" points="121,176 110,194 99,176 "/>
+<rect fill="none" height="220" width="220"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="110" x2="110" y1="8.0005" y2="212.0619">
+<stop offset="0" style="stop-color:#FAFAFF"/>
+<stop offset="1" style="stop-color:#DCDCE1"/>
+</linearGradient>
+</defs>
+</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_normal_c.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,16 @@
+<?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="220px" version="1.1" viewBox="0 0 220 220" width="220px" x="0px" 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"/>
+<path d="M110,126c-8.822,0-16-7.178-16-16s7.178-16,16-16s16,7.178,16,16S118.822,126,110,126L110,126 z" fill="#141414" fill-opacity="0.4" stroke-opacity="0.4"/>
+<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"/>
+<rect fill="none" height="220" width="220"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="109.9995" x2="109.9995" y1="63" y2="157.0005">
+<stop offset="0" style="stop-color:#E6E6EB"/>
+<stop offset="1" style="stop-color:#B4B4B9"/>
+</linearGradient>
+</defs>
+</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_normal_l.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,16 @@
+<?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="220px" version="1.1" viewBox="0 0 220 220" width="220px" x="0px" 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_)"/>
+<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.4" stroke-opacity="0.4"/>
+<polygon fill="#3C3C3C" points="44,121 26,110 44,99 "/>
+<rect fill="none" height="220" width="220"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="40.9722" x2="40.9722" y1="8" y2="212.0615">
+<stop offset="0" style="stop-color:#FAFAFF"/>
+<stop offset="1" style="stop-color:#DCDCE1"/>
+</linearGradient>
+</defs>
+</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_normal_r.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,16 @@
+<?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="220px" version="1.1" viewBox="0 0 220 220" width="220px" x="0px" 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_)"/>
+<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.4" stroke-opacity="0.4"/>
+<rect fill="none" height="220" width="220"/>
+<polygon fill="#3C3C3C" points="176,99 194,110 176,121 "/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="179.0273" x2="179.0273" y1="8" y2="212.0615">
+<stop offset="0" style="stop-color:#FAFAFF"/>
+<stop offset="1" style="stop-color:#DCDCE1"/>
+</linearGradient>
+</defs>
+</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_normal_t.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,16 @@
+<?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="220px" version="1.1" viewBox="0 0 220 220" width="220px" x="0px" 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"/>
+<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_)"/>
+<path d="M110,8C83.131,8,57.824,18.363,38.62,37.205l36.739,36.739C84.716,64.944,96.979,60,110,60 s25.283,4.944,34.642,13.944l36.739-36.739C162.176,18.363,136.869,8,110,8z M144.621,72.551C135.176,63.804,122.922,59,110,59 c-12.921,0-25.176,4.804-34.622,13.551L40.044,37.215C58.962,19.012,83.764,9,110,9c26.236,0,51.037,10.012,69.956,28.215 L144.621,72.551z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<polygon fill="#3C3C3C" points="99,44 110,26 121,44 "/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="110" x2="110" y1="8" y2="212.0614">
+<stop offset="0" style="stop-color:#FAFAFF"/>
+<stop offset="1" style="stop-color:#DCDCE1"/>
+</linearGradient>
+</defs>
+</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_pressed_b.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,15 @@
+<?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="220px" version="1.1" viewBox="0 0 220 220" width="220px" x="0px" 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"/>
+<polygon fill="#FFFFFF" points="121,176 110,194 99,176 "/>
+<rect fill="none" height="220" width="220"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="110.0005" x2="110.0005" y1="212" y2="146.0557">
+<stop offset="0" style="stop-color:#65B8CC"/>
+<stop offset="1" style="stop-color:#306D8C"/>
+</linearGradient>
+</defs>
+</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_pressed_c.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,14 @@
+<?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="220px" version="1.1" viewBox="0 0 220 220" width="220px" x="0px" 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"/>
+<rect fill="none" height="220" width="220"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="110.0005" x2="110.0005" y1="158" y2="62.0005">
+<stop offset="0" style="stop-color:#65B8CC"/>
+<stop offset="1" style="stop-color:#306D8C"/>
+</linearGradient>
+</defs>
+</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_pressed_l.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,15 @@
+<?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="220px" version="1.1" viewBox="0 0 220 220" width="220px" x="0px" 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"/>
+<polygon fill="#FFFFFF" points="44,121 26,110 44,99 "/>
+<rect fill="none" height="220" width="220"/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="8" x2="73.9443" y1="110" y2="110">
+<stop offset="0" style="stop-color:#65B8CC"/>
+<stop offset="1" style="stop-color:#306D8C"/>
+</linearGradient>
+</defs>
+</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_pressed_r.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,15 @@
+<?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="220px" version="1.1" viewBox="0 0 220 220" width="220px" x="0px" 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"/>
+<rect fill="none" height="220" width="220"/>
+<polygon fill="#FFFFFF" points="176,99 194,110 176,121 "/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="212" x2="146.0557" y1="109.9995" y2="109.9995">
+<stop offset="0" style="stop-color:#65B8CC"/>
+<stop offset="1" style="stop-color:#306D8C"/>
+</linearGradient>
+</defs>
+</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_rocker_pressed_t.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,15 @@
+<?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="220px" version="1.1" viewBox="0 0 220 220" width="220px" x="0px" 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_)"/>
+<path d="M110,8C83.131,8,57.824,18.363,38.62,37.205l36.739,36.739C84.716,64.944,96.979,60,110,60 s25.283,4.944,34.642,13.944l36.739-36.739C162.176,18.363,136.869,8,110,8z M144.621,72.551C135.176,63.804,122.922,59,110,59 c-12.921,0-25.176,4.804-34.622,13.551L40.044,37.215C58.962,19.012,83.764,9,110,9c26.236,0,51.037,10.012,69.956,28.215 L144.621,72.551z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<polygon fill="#FFFFFF" points="99,44 110,26 121,44 "/>
+<defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="110" x2="110" y1="8" y2="73.9443">
+<stop offset="0" style="stop-color:#65B8CC"/>
+<stop offset="1" style="stop-color:#306D8C"/>
+</linearGradient>
+</defs>
+</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_frame_normal_c.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_frame_normal_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_frame_normal_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_frame_normal_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_frame_pressed_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_frame_pressed_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_frame_pressed_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_handle_normal_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_handle_normal_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_handle_normal_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_handle_pressed_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_handle_pressed_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_active_handle_pressed_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_frame_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_frame_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_frame_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_handle_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_handle_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_h_handle_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_frame_normal_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_frame_normal_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_frame_normal_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_frame_pressed_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_frame_pressed_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_frame_pressed_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_handle_normal_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_handle_normal_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_handle_normal_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_handle_pressed_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_handle_pressed_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_active_handle_pressed_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_frame_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_frame_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_frame_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_handle_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_handle_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_scroll_v_handle_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_filled_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_filled_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_filled_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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_normal_c.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_frame_normal_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_frame_normal_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_frame_normal_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_frame_pressed_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_frame_pressed_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_h_frame_pressed_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_filled_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<path d="M5,10c0,2.757,2.243,5,5,5s5-2.243,5-5V0H5V10z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_filled_c.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_filled_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_filled_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<path d="M5,10c0-2.757,2.243-5,5-5s5,2.243,5,5v10H5V10z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_frame_normal_b.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_frame_normal_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<path d="M4,10c0,3.3,2.7,6,6,6s6-2.7,6-6V0H4V10z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_frame_normal_c.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_frame_normal_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_frame_normal_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<path d="M4,10c0-3.3,2.7-6,6-6s6,2.7,6,6v10H4V10z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_frame_pressed_b.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_frame_pressed_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<path d="M4,10c0,3.3,2.7,6,6,6s6-2.7,6-6V0H4V10z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_frame_pressed_c.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_frame_pressed_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_slider_v_frame_pressed_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<rect fill="none" height="20" width="20"/>
<rect fill="none" height="20" width="20"/>
<path d="M4,10c0-3.3,2.7-6,6-6s6,2.7,6,6v10H4V10z" fill="url(#SVGID_1_)"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_statusbar_c.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_statusbar_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_statusbar_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_statusbar_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_statusbar_trans_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_statusbar_trans_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_statusbar_trans_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_active_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_active_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_active_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_mask_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_mask_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_mask_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_passive_normal_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_passive_normal_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_passive_normal_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_passive_pressed_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_passive_pressed_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tab_passive_pressed_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_disabled_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_disabled_cl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_disabled_cr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_disabled_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_disabled_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_highlight_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_highlight_cl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_highlight_cr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_highlight_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_highlight_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_latched_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_latched_cl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_latched_cr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_latched_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_latched_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_normal_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_normal_cl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_normal_cr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_normal_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_normal_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_pressed_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_pressed_cl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_pressed_cr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_pressed_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_h_pressed_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_disabled_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_disabled_cl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_disabled_cr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_disabled_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_disabled_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_highlight_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_highlight_cl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_highlight_cr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_highlight_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_highlight_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_latched_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_latched_cl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_latched_cr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_latched_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_latched_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_normal_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_normal_cl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_normal_cr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_normal_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_normal_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_pressed_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_pressed_cl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_pressed_cr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_pressed_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_h_pressed_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_disabled_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_disabled_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_disabled_cb.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_disabled_ct.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_disabled_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_highlight_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<rect fill="none" height="30" width="60" x="0"/>
<linearGradient gradientTransform="matrix(0 -1 1 0 4392.5005 -1675.5)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-1690.5" x2="-1690.5" y1="-4392.5" y2="-4332.5">
<stop offset="0" style="stop-color:#3C3C3C"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_highlight_c.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_highlight_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<rect fill="none" height="30" width="60" x="0"/>
<linearGradient gradientTransform="matrix(0 -1 1 0 4332.5005 -1615.5)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-1630.5" x2="-1630.5" y1="-4332.5" y2="-4272.5">
<stop offset="0" style="stop-color:#3C3C3C"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_highlight_cb.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_highlight_cb.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<rect fill="none" height="30" width="60" x="0"/>
<linearGradient gradientTransform="matrix(0 -1 1 0 4362.5005 -1645.5)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-1660.5" x2="-1660.5" y1="-4362.5" y2="-4302.5">
<stop offset="0" style="stop-color:#3C3C3C"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_highlight_ct.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_highlight_ct.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<rect fill="none" height="30" width="60" x="0"/>
<linearGradient gradientTransform="matrix(0 -1 1 0 4302.5005 -1585.5)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-1600.5" x2="-1600.5" y1="-4302.5" y2="-4242.5">
<stop offset="0" style="stop-color:#3C3C3C"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_highlight_t.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_highlight_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<rect fill="none" height="30" width="60" x="0"/>
<linearGradient gradientTransform="matrix(0 -1 1 0 4272.5005 -1555.5)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-1570.5" x2="-1570.5" y1="-4272.5" y2="-4212.5">
<stop offset="0" style="stop-color:#3C3C3C"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_latched_b.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_latched_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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" x="59"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_latched_c.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_latched_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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" x="59"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_latched_cb.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_latched_cb.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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" x="59"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_latched_ct.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_latched_ct.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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" x="59"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_latched_t.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_latched_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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" x="59"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_normal_b.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_normal_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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" x="59"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_normal_c.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_normal_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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" x="59"/>
<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_cb.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_normal_cb.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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" x="59"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_normal_ct.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_normal_ct.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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" x="59" y="0"/>
<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_normal_t.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_normal_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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" x="59" y="0"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_pressed_b.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_pressed_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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" x="59"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_pressed_c.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_pressed_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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" x="59"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_pressed_cb.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_pressed_cb.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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" x="59"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_pressed_ct.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_pressed_ct.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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" x="59"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_pressed_t.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_trans_v_pressed_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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" x="59"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_disabled_b.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_disabled_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_disabled_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_disabled_cb.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_disabled_ct.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_disabled_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_highlight_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<rect fill="none" height="30" width="60" x="0"/>
<rect fill="url(#SVGID_1_)" height="30" width="60"/>
<polygon fill-opacity="0.2" points="0,30 60,30 60,29 1,29 1,0 0,0 " stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_highlight_c.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_highlight_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_highlight_cb.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_highlight_cb.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<rect fill="none" height="30" width="60" x="0"/>
<rect fill="url(#SVGID_1_)" height="30" width="60"/>
<polygon fill-opacity="0.2" points="0,30 60,30 60,29 1,29 1,0 0,0 " stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_highlight_ct.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_highlight_ct.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<rect fill="none" height="30" width="60" x="0"/>
<rect fill="url(#SVGID_1_)" height="30" width="60"/>
<polygon fill-opacity="0.2" points="0,30 1,30 1,1 60,1 60,0 0,0 " stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_highlight_t.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_highlight_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<rect fill="none" height="30" width="60" x="0"/>
<rect fill="url(#SVGID_1_)" height="30" width="60"/>
<polygon fill-opacity="0.2" points="0,30 1,30 1,1 60,1 60,0 0,0 " stroke-opacity="0.2"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_latched_b.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_latched_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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" x="59"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_latched_c.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_latched_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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" x="59"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_latched_cb.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_latched_cb.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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" x="59"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_latched_ct.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_latched_ct.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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" x="59" y="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_latched_t.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_latched_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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" x="59" y="1"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_normal_b.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_normal_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<rect fill="none" height="30" width="60" x="0"/>
<linearGradient gradientTransform="matrix(0 -1 1 0 730.5 -3081.5)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-3096.5005" x2="-3096.5005" y1="-731" y2="-670.73">
<stop offset="0" style="stop-color:#FAFAFF"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_normal_c.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_normal_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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" x="59"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_normal_cb.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_normal_cb.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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" x="59"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_normal_ct.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_normal_ct.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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" x="59"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_normal_t.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_normal_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<rect fill="none" height="30" width="60" x="0"/>
<linearGradient gradientTransform="matrix(0 -1 1 0 610.5 -2961.5)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2976.5005" x2="-2976.5005" y1="-611" y2="-550.73">
<stop offset="0" style="stop-color:#FAFAFF"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_pressed_b.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_pressed_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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" x="59"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_pressed_c.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_pressed_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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" x="59"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_pressed_cb.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_pressed_cb.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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" x="59"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_pressed_ct.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_pressed_ct.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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" x="59"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_pressed_t.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tb_v_pressed_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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" x="59"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_b.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_bl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_br.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_tl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_highlight_tr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_bl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_br.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_tl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_textedit_normal_tr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_highlight_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_highlight_cl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_highlight_cr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_highlight_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_highlight_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_latched_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_latched_cl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_latched_cr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_latched_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_latched_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_normal_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_normal_cl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_normal_cr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_normal_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_normal_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_pressed_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_pressed_cl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_pressed_cr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_pressed_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_pressed_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_highlight_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_highlight_cl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_highlight_cr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_highlight_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_highlight_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_latched_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_latched_cl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_latched_cr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_latched_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_latched_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_normal_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_normal_cl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_normal_cr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_normal_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_normal_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_pressed_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_pressed_cl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_pressed_cr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_pressed_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_titlebar_trans_pressed_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_bl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_br.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_tl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_bg_tr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_highlight_pri_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_highlight_pri_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_highlight_pri_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_highlight_sec_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_highlight_sec_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_highlight_sec_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_b.svg Fri May 14 16:09:54 2010 +0300
@@ -1,15 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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_)" fill-opacity="0.7" height="8" stroke-opacity="0.7" width="50"/>
-<rect fill="none" height="10" width="50"/>
+<svg xmlns="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">
+<rect fill="url(#SVGID_1_)" height="9.5" width="50"/>
+<rect fill="#FFFFFF" height="1" width="50" y="9"/>
<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="24.9995" x2="24.9995" y1="-57.9995" y2="8.0034">
-<stop offset="0" style="stop-color:#505050"/>
-<stop offset="0.2" style="stop-color:#FFFFFF;stop-opacity:0"/>
-<stop offset="0.8" style="stop-color:#F9F9F9;stop-opacity:0"/>
-<stop offset="1" style="stop-color:#3C3C3C"/>
+<linearGradient gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 47.9308 -77.3724)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-86.8726" x2="-17.8726" y1="-22.9307" y2="-22.9307">
+<stop offset="0" style="stop-color:#505050;stop-opacity:0.7"/>
+<stop offset="0.3" style="stop-color:#FFFFFF;stop-opacity:0"/>
+<stop offset="0.7" style="stop-color:#F9F9F9;stop-opacity:0"/>
+<stop offset="1" style="stop-color:#3C3C3C;stop-opacity:0.7"/>
</linearGradient>
</defs>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_bl.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_bl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,15 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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,0v4c0,2.206,1.794,4,4,4h4V0H2z" fill="url(#SVGID_1_)" fill-opacity="0.7" stroke-opacity="0.7"/>
-<rect fill="none" height="10" width="10"/>
+<svg xmlns="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">
+<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>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="6" x2="6" y1="-57.9995" y2="8.0034">
-<stop offset="0" style="stop-color:#505050"/>
-<stop offset="0.2" style="stop-color:#FFFFFF;stop-opacity:0"/>
-<stop offset="0.8" style="stop-color:#F9F9F9;stop-opacity:0"/>
-<stop offset="1" style="stop-color:#3C3C3C"/>
+<linearGradient gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 27.9303 -97.3719)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-106.8726" x2="-37.8726" y1="-22.6802" y2="-22.6802">
+<stop offset="0" style="stop-color:#505050;stop-opacity:0.7"/>
+<stop offset="0.3" style="stop-color:#FFFFFF;stop-opacity:0"/>
+<stop offset="0.7" style="stop-color:#F9F9F9;stop-opacity:0"/>
+<stop offset="1" style="stop-color:#3C3C3C;stop-opacity:0.7"/>
</linearGradient>
</defs>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_br.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_br.svg Fri May 14 16:09:54 2010 +0300
@@ -1,15 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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,0v8h4c2.206,0,4-1.794,4-4V0H0z" fill="url(#SVGID_1_)" fill-opacity="0.7" stroke-opacity="0.7"/>
-<rect fill="none" height="10" width="10"/>
+<svg xmlns="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">
+<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>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4" x2="4" y1="-57.9995" y2="8.0034">
-<stop offset="0" style="stop-color:#505050"/>
-<stop offset="0.2" style="stop-color:#FFFFFF;stop-opacity:0"/>
-<stop offset="0.8" style="stop-color:#F9F9F9;stop-opacity:0"/>
-<stop offset="1" style="stop-color:#3C3C3C"/>
+<linearGradient gradientTransform="matrix(4.375628e-008 -1 -1 -4.375628e-008 -17.9298 -97.3719)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-106.8726" x2="-37.8726" y1="-22.6797" y2="-22.6797">
+<stop offset="0" style="stop-color:#505050;stop-opacity:0.7"/>
+<stop offset="0.3" style="stop-color:#FFFFFF;stop-opacity:0"/>
+<stop offset="0.7" style="stop-color:#F9F9F9;stop-opacity:0"/>
+<stop offset="1" style="stop-color:#3C3C3C;stop-opacity:0.7"/>
</linearGradient>
</defs>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_c.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_c.svg Fri May 14 16:09:54 2010 +0300
@@ -1,14 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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_)" fill-opacity="0.7" height="50" stroke-opacity="0.7" width="50"/>
+<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">
+<rect fill="url(#SVGID_1_)" height="50" width="50"/>
<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="24.9995" x2="24.9995" y1="-8" y2="58.0036">
-<stop offset="0" style="stop-color:#505050"/>
-<stop offset="0.2" style="stop-color:#FFFFFF;stop-opacity:0"/>
-<stop offset="0.8" style="stop-color:#F9F9F9;stop-opacity:0"/>
-<stop offset="1" style="stop-color:#3C3C3C"/>
+<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">
+<stop offset="0" style="stop-color:#505050;stop-opacity:0.7"/>
+<stop offset="0.3" style="stop-color:#FFFFFF;stop-opacity:0"/>
+<stop offset="0.7" style="stop-color:#F9F9F9;stop-opacity:0"/>
+<stop offset="1" style="stop-color:#3C3C3C;stop-opacity:0.7"/>
</linearGradient>
</defs>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_l.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_l.svg Fri May 14 16:09:54 2010 +0300
@@ -1,15 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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_)" fill-opacity="0.7" height="50" stroke-opacity="0.7" width="8" x="2"/>
-<rect fill="none" height="50" width="10"/>
+<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">
+<rect fill="url(#SVGID_1_)" height="50" width="9.5" x="0.5" y="0"/>
+<rect fill="#FFFFFF" height="50" width="1"/>
<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="6" x2="6" y1="-8" y2="58.0036">
-<stop offset="0" style="stop-color:#505050"/>
-<stop offset="0.2" style="stop-color:#FFFFFF;stop-opacity:0"/>
-<stop offset="0.8" style="stop-color:#F9F9F9;stop-opacity:0"/>
-<stop offset="1" style="stop-color:#3C3C3C"/>
+<linearGradient gradientTransform="matrix(4.375628e-008 -1 -1 -4.375628e-008 2.0702 -77.3719)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-136.8726" x2="-67.8726" y1="-3.1797" y2="-3.1797">
+<stop offset="0" style="stop-color:#505050;stop-opacity:0.7"/>
+<stop offset="0.3" style="stop-color:#FFFFFF;stop-opacity:0"/>
+<stop offset="0.7" style="stop-color:#F9F9F9;stop-opacity:0"/>
+<stop offset="1" style="stop-color:#3C3C3C;stop-opacity:0.7"/>
</linearGradient>
</defs>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_r.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_r.svg Fri May 14 16:09:54 2010 +0300
@@ -1,15 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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_)" fill-opacity="0.7" height="50" stroke-opacity="0.7" width="8"/>
-<rect fill="none" height="50" width="10"/>
+<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">
+<rect fill="url(#SVGID_1_)" height="50" width="9.5" y="0"/>
+<rect fill="#FFFFFF" height="50" width="1" x="9"/>
<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4" x2="4" y1="-8" y2="58.0036">
-<stop offset="0" style="stop-color:#505050"/>
-<stop offset="0.2" style="stop-color:#FFFFFF;stop-opacity:0"/>
-<stop offset="0.8" style="stop-color:#F9F9F9;stop-opacity:0"/>
-<stop offset="1" style="stop-color:#3C3C3C"/>
+<linearGradient gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 7.9303 -77.3719)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-136.8726" x2="-67.8726" y1="-3.1802" y2="-3.1802">
+<stop offset="0" style="stop-color:#505050;stop-opacity:0.7"/>
+<stop offset="0.3" style="stop-color:#FFFFFF;stop-opacity:0"/>
+<stop offset="0.7" style="stop-color:#F9F9F9;stop-opacity:0"/>
+<stop offset="1" style="stop-color:#3C3C3C;stop-opacity:0.7"/>
</linearGradient>
</defs>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_t.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_t.svg Fri May 14 16:09:54 2010 +0300
@@ -1,15 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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_)" fill-opacity="0.7" height="8" stroke-opacity="0.7" width="50" y="2"/>
-<rect fill="none" height="10" width="50"/>
+<svg xmlns="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">
+<rect fill="url(#SVGID_1_)" height="9.5" width="50" y="0.5"/>
+<rect fill="#FFFFFF" height="1" width="50"/>
<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="24.9995" x2="24.9995" y1="2" y2="68.003">
-<stop offset="0" style="stop-color:#505050"/>
-<stop offset="0.2" style="stop-color:#FFFFFF;stop-opacity:0"/>
-<stop offset="0.8" style="stop-color:#F9F9F9;stop-opacity:0"/>
-<stop offset="1" style="stop-color:#3C3C3C"/>
+<linearGradient gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 47.9308 -77.3724)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-146.8726" x2="-77.8726" y1="-22.9307" y2="-22.9307">
+<stop offset="0" style="stop-color:#505050;stop-opacity:0.7"/>
+<stop offset="0.3" style="stop-color:#FFFFFF;stop-opacity:0"/>
+<stop offset="0.7" style="stop-color:#F9F9F9;stop-opacity:0"/>
+<stop offset="1" style="stop-color:#3C3C3C;stop-opacity:0.7"/>
</linearGradient>
</defs>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_tl.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_tl.svg Fri May 14 16:09:54 2010 +0300
@@ -1,15 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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,2C3.794,2,2,3.794,2,6v4h8V2H6z" fill="url(#SVGID_1_)" fill-opacity="0.7" stroke-opacity="0.7"/>
-<rect fill="none" height="10" width="10"/>
+<svg xmlns="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">
+<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>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="6" x2="6" y1="2" y2="68.003">
-<stop offset="0" style="stop-color:#505050"/>
-<stop offset="0.2" style="stop-color:#FFFFFF;stop-opacity:0"/>
-<stop offset="0.8" style="stop-color:#F9F9F9;stop-opacity:0"/>
-<stop offset="1" style="stop-color:#3C3C3C"/>
+<linearGradient gradientTransform="matrix(-4.371139e-008 -1 1 -4.371139e-008 27.9308 -97.3724)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-166.8726" x2="-97.8726" y1="-22.6807" y2="-22.6807">
+<stop offset="0" style="stop-color:#505050;stop-opacity:0.7"/>
+<stop offset="0.3" style="stop-color:#FFFFFF;stop-opacity:0"/>
+<stop offset="0.7" style="stop-color:#F9F9F9;stop-opacity:0"/>
+<stop offset="1" style="stop-color:#3C3C3C;stop-opacity:0.7"/>
</linearGradient>
</defs>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_tr.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_fr_tumbler_overlay_tr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,15 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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,6c0-2.206-1.794-4-4-4H0v8h8V6z" fill="url(#SVGID_1_)" fill-opacity="0.7" stroke-opacity="0.7"/>
-<rect fill="none" height="10" width="10"/>
+<svg xmlns="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">
+<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>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4" x2="4" y1="2" y2="68.003">
-<stop offset="0" style="stop-color:#505050"/>
-<stop offset="0.2" style="stop-color:#FFFFFF;stop-opacity:0"/>
-<stop offset="0.8" style="stop-color:#F9F9F9;stop-opacity:0"/>
-<stop offset="1" style="stop-color:#3C3C3C"/>
+<linearGradient gradientTransform="matrix(4.375628e-008 -1 -1 -4.375628e-008 -17.9303 -97.3724)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-166.8726" x2="-97.8726" y1="-22.6802" y2="-22.6802">
+<stop offset="0" style="stop-color:#505050;stop-opacity:0.7"/>
+<stop offset="0.3" style="stop-color:#FFFFFF;stop-opacity:0"/>
+<stop offset="0.7" style="stop-color:#F9F9F9;stop-opacity:0"/>
+<stop offset="1" style="stop-color:#3C3C3C;stop-opacity:0.7"/>
</linearGradient>
</defs>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_battery_bg.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_battery_bg.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_battery_full.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_battery_low.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_battery_medium.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_colorpicker_empty.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_colorpicker_filled.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_colorpicker_mask.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<svg xmlns="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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_combobox_button_disabled.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_combobox_button_highlight.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_combobox_button_latched.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_combobox_button_normal.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_combobox_button_pressed.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_dimming_image.svg Fri May 14 16:09:54 2010 +0300
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_editor_case_capital.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_editor_case_numeric.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_editor_case_small.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_editor_case_text.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_editor_handle_begin.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_editor_handle_end.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_input_h_swipe.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<linearGradient gradientTransform="matrix(0 -1 1 0 -4113.5 1613.5)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="1550.499" x2="1550.499" y1="4113.5" y2="4128">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_input_v_swipe.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_progbar_h_wait.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_progbar_v_wait.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<rect fill="none" height="20" width="20"/>
<linearGradient gradientTransform="matrix(0 -1 1 0 -1158 852)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="842" x2="842" y1="1163" y2="1173">
<stop offset="0" style="stop-color:#66B8CC"/>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_progslider_handle_disabled.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,8 @@
+<?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="28px" version="1.1" viewBox="0 0 28 28" width="28px" x="0px" y="0px">
+<path d="M14,28C6.28,28,0,21.719,0,14C0,6.28,6.28,0,14,0c7.719,0,14,6.28,14,14 C28,21.719,21.719,28,14,28L14,28z" fill-opacity="0.1" stroke-opacity="0.1"/>
+<rect fill="none" height="28" width="28"/>
+<circle cx="14" cy="14" fill="#969696" fill-opacity="0.8" r="12.923" stroke-opacity="0.8"/>
+<path d="M14,1.077C6.863,1.077,1.077,6.862,1.077,14S6.863,26.924,14,26.924 S26.924,21.138,26.924,14S21.137,1.077,14,1.077z M14,25.846C7.468,25.846,2.154,20.531,2.154,14C2.154,7.468,7.468,2.154,14,2.154 c6.531,0,11.846,5.314,11.846,11.846C25.846,20.531,20.531,25.846,14,25.846z" fill-opacity="0.2" stroke-opacity="0.2"/>
+</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_progslider_handle_normal.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_progslider_handle_normal.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<rect fill="none" height="40" width="40"/>
<path d="M20,40C8.971,40,0,31.027,0,20C0,8.971,8.971,0,20,0c11.025,0,20,8.971,20,20 C40,31.027,31.025,40,20,40L20,40z" fill-opacity="0.1" stroke-opacity="0.1"/>
<circle cx="20" cy="20" fill="url(#SVGID_1_)" r="18.462"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_progslider_handle_pressed.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_progslider_handle_pressed.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<rect fill="none" height="40" width="40"/>
<path d="M20,40C8.972,40,0,31.027,0,20C0,8.971,8.972,0,20,0c11.025,0,20,8.972,20,20 C40,31.027,31.025,40,20,40L20,40z" fill-opacity="0.1" stroke-opacity="0.1"/>
<circle cx="20" cy="20" fill="url(#SVGID_1_)" r="18.462"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_ratingslider_rated.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_ratingslider_rated.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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"/>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_ratingslider_rated_disabled.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,7 @@
+<?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="25px" version="1.1" viewBox="0 0 25 25" width="25px" x="0px" 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"/>
+</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_ratingslider_unrated.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_ratingslider_unrated.svg Fri May 14 16:09:54 2010 +0300
@@ -1,11 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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-5.505-3.984h6.782l2.085-6.436l2.081,6.436h6.787 l-5.5,3.984L17.977,21.235z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<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"/>
+<polygon fill-opacity="0.3" points="10.417,10.814 12.502,4.379 14.583,10.814 23.073,10.814 24.455,9.813 15.312,9.813 12.506,1.13 9.689,9.813 0.545,9.813 1.928,10.814 "/>
<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="12.4995" x2="12.4995" y1="1.1299" y2="23.8706">
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="12.5005" x2="12.5005" y1="23.8701" y2="1.1304">
<stop offset="0" style="stop-color:#E6E6E6"/>
<stop offset="1" style="stop-color:#DCDCDC"/>
</linearGradient>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_ratingslider_unrated_disabled.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,8 @@
+<?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="25px" version="1.1" viewBox="0 0 25 25" width="25px" x="0px" 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"/>
+<polygon fill-opacity="0.2" points="10.417,10.814 12.502,4.379 14.583,10.814 23.073,10.814 24.455,9.813 15.312,9.813 12.506,1.13 9.689,9.813 0.545,9.813 1.928,10.814 "/>
+</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_screen_bg_lsc.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_screen_bg_lsc.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_screen_bg_prt.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_signal_bg.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_signal_full.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_signal_low.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_signal_medium.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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_normal.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_h_handle_normal.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_h_handle_pressed.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_h_tick_major.svg Fri May 14 16:09:54 2010 +0300
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_h_tick_minor.svg Fri May 14 16:09:54 2010 +0300
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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_normal.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_v_handle_normal.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_v_handle_pressed.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_v_tick_major.svg Fri May 14 16:09:54 2010 +0300
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_slider_v_tick_minor.svg Fri May 14 16:09:54 2010 +0300
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<circle cx="1.5" cy="1.5" fill="#B2B2B2" r="1.5"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_space_itut.svg Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-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="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_graf_space_vkb.svg Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-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 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 "/>
-</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_titlebar_handle_normal.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_titlebar_handle_normal.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_titlebar_handle_pressed.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_titlebar_minimize.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_trackpoint_activated.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_trackpoint_normal.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_trackpoint_pressed.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_graf_tumbler_divider.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?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 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">
+<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">
<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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_about.svg Fri May 14 16:09:54 2010 +0300
@@ -1,137 +1,137 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2.001" y2="57.8555">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+ <stop offset="0.0667" style="stop-color:#D1D7D9"/>
+ <stop offset="0.2606" style="stop-color:#BDC2C4"/>
+ <stop offset="0.6606" style="stop-color:#949DA1"/>
+ <stop offset="0.9636" style="stop-color:#ADB3B5"/>
+ <stop offset="1" style="stop-color:#595C5E"/>
</linearGradient>
<path d="M48.027,54.932c0,1.693-1.375,3.069-3.068,3.069h-29.92c-1.693,0-3.066-1.376-3.066-3.069V5.07 c0-1.696,1.373-3.069,3.066-3.069h29.92c1.693,0,3.068,1.373,3.068,3.069V54.932z" fill="url(#SVGID_1_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="2.001" y2="56.899">
-<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"/>
+ <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="M44.959,2.001h-29.92c-1.693,0-3.066,1.373-3.066,3.069v49.861c0,0.82,0.324,1.56,0.848,2.11 c-0.047-0.187-0.08-0.377-0.08-0.575v-1.535V6.602V5.07c0-1.271,1.031-2.304,2.299-2.304h29.92c1.268,0,2.301,1.033,2.301,2.304 v1.531v48.33v1.535c0,0.198-0.033,0.389-0.08,0.575c0.521-0.551,0.848-1.29,0.848-2.11V5.07C48.027,3.374,46.652,2.001,44.959,2.001 z" fill="url(#SVGID_2_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="5.8916" y2="43.4283">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+ <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="37.589" stroke-opacity="0.6" width="31.453" x="14.273" y="5.836"/>
+<rect fill="url(#SVGID_3_)" height="37.589" opacity="0.6" width="31.453" x="14.273" y="5.836"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="29.999" x2="29.999" y1="6.6548" y2="42.6624">
-<stop offset="0" style="stop-color:#6E6E6E"/>
-<stop offset="1" style="stop-color:#333333"/>
+ <stop offset="0" style="stop-color:#6E6E6E"/>
+ <stop offset="1" style="stop-color:#333333"/>
</linearGradient>
<rect fill="url(#SVGID_4_)" height="36.058" width="29.92" x="15.039" y="6.602"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30" x2="30" y1="7.4214" y2="41.894">
-<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"/>
+ <stop offset="0" style="stop-color:#3BC8EB"/>
+ <stop offset="0.3879" style="stop-color:#2D9BD2"/>
+ <stop offset="0.8909" style="stop-color:#1347BA"/>
</linearGradient>
<rect fill="url(#SVGID_5_)" height="34.521" width="28.383" x="15.809" y="7.37"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="30" x2="30" y1="7.9712" y2="21.69">
-<stop offset="0" style="stop-color:#85EFFF"/>
-<stop offset="1" style="stop-color:#3BA1D9"/>
+ <stop offset="0" style="stop-color:#85EFFF"/>
+ <stop offset="1" style="stop-color:#3BA1D9"/>
</linearGradient>
<polygon fill="url(#SVGID_6_)" points="44.191,19.644 15.809,22.712 15.809,8.137 44.191,8.137 "/>
<rect fill="#9FE4FF" height="0.767" width="28.383" x="15.809" y="7.37"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="30.2236" x2="30.2236" y1="5.8726" y2="2.8032">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#D1D7D9"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#D1D7D9"/>
</linearGradient>
<path d="M26.832,5.836c-0.861,0-1.535-0.563-1.535-1.279v-0.51c0-0.718,0.674-1.28,1.535-1.28h6.785 c0.859,0,1.533,0.563,1.533,1.28v0.51c0,0.716-0.674,1.279-1.533,1.279H26.832z" fill="url(#SVGID_7_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="30.2236" x2="30.2236" y1="3.2158" y2="5.1992">
-<stop offset="0" style="stop-color:#6C7375"/>
-<stop offset="1" style="stop-color:#BDC2C4"/>
+ <stop offset="0" style="stop-color:#6C7375"/>
+ <stop offset="1" style="stop-color:#BDC2C4"/>
</linearGradient>
<path d="M34.383,4.557c0,0.283-0.342,0.514-0.766,0.514h-6.785c-0.424,0-0.768-0.23-0.768-0.514v-0.51 c0-0.283,0.344-0.512,0.768-0.512h6.785c0.424,0,0.766,0.229,0.766,0.512V4.557z" fill="url(#SVGID_8_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="29.8818" x2="29.8818" y1="44.2236" y2="55.628">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#FFFFFF"/>
+ <stop offset="0" style="stop-color:#B6BBBD"/>
+ <stop offset="1" style="stop-color:#FFFFFF"/>
</linearGradient>
-<path d="M27.109,55.7c-1.645,0-2.98-1.323-2.98-2.951v-5.606c0-1.627,1.336-2.951,2.98-2.951 h5.545c1.645,0,2.98,1.324,2.98,2.951v5.606c0,1.628-1.336,2.951-2.98,2.951H27.109z" fill="url(#SVGID_9_)" fill-opacity="0.6" stroke-opacity="0.6"/>
-<path d="M27.105,54.932c-1.219,0-2.211-0.979-2.211-2.183v-5.606c0-1.204,0.992-2.183,2.211-2.183 h5.553c1.219,0,2.209,0.979,2.209,2.183v5.606c0,1.204-0.99,2.183-2.209,2.183H27.105z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M27.109,55.7c-1.645,0-2.98-1.323-2.98-2.951v-5.606c0-1.627,1.336-2.951,2.98-2.951 h5.545c1.645,0,2.98,1.324,2.98,2.951v5.606c0,1.628-1.336,2.951-2.98,2.951H27.109z" fill="url(#SVGID_9_)" opacity="0.6"/>
+<path d="M27.105,54.932c-1.219,0-2.211-0.979-2.211-2.183v-5.606c0-1.204,0.992-2.183,2.211-2.183 h5.553c1.219,0,2.209,0.979,2.209,2.183v5.606c0,1.204-0.99,2.183-2.209,2.183H27.105z" fill="#020202" opacity="0.5"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="29.8818" x2="29.8818" y1="45.6865" y2="54.1806">
-<stop offset="0" style="stop-color:#A6A8AB"/>
-<stop offset="0.703" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#808184"/>
+ <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="M34.102,52.749c0,0.783-0.645,1.417-1.438,1.417h-5.566c-0.793,0-1.436-0.634-1.436-1.417v-5.606 c0-0.783,0.643-1.417,1.436-1.417h5.566c0.793,0,1.438,0.634,1.438,1.417V52.749z" fill="url(#SVGID_10_)"/>
-<path d="M28.73,52.632c-0.846,0-1.533-0.688-1.533-1.534v-2.303c0-0.847,0.688-1.534,1.533-1.534 h2.303c0.846,0,1.533,0.688,1.533,1.534v2.303c0,0.847-0.688,1.534-1.533,1.534H28.73z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M28.73,52.632c-0.846,0-1.533-0.688-1.533-1.534v-2.303c0-0.847,0.688-1.534,1.533-1.534 h2.303c0.846,0,1.533,0.688,1.533,1.534v2.303c0,0.847-0.688,1.534-1.533,1.534H28.73z" fill="#020202" opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="29.8809" x2="29.8809" y1="48.0103" y2="51.8696">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+ <stop offset="0.0667" style="stop-color:#D1D7D9"/>
+ <stop offset="0.2606" style="stop-color:#BDC2C4"/>
+ <stop offset="0.6606" style="stop-color:#949DA1"/>
+ <stop offset="0.9636" style="stop-color:#ADB3B5"/>
+ <stop offset="1" style="stop-color:#595C5E"/>
</linearGradient>
<path d="M28.73,51.863c-0.422,0-0.768-0.345-0.768-0.766v-2.303c0-0.422,0.346-0.767,0.768-0.767h2.303 c0.42,0,0.766,0.345,0.766,0.767v2.303c0,0.421-0.346,0.766-0.766,0.766H28.73z" fill="url(#SVGID_11_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="17.667" x2="17.667" y1="44.917" y2="54.1816">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+ <stop offset="0" style="stop-color:#B6BBBD"/>
+ <stop offset="1" style="stop-color:#F0FBFF"/>
</linearGradient>
-<path d="M17.223,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307 c0-1.624,1.324-2.948,2.949-2.948h0.887c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H17.223z" fill="url(#SVGID_12_)" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M17.223,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307 c0-1.624,1.324-2.948,2.949-2.948h0.887c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H17.223z" fill="url(#SVGID_12_)" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="17.665" x2="17.665" y1="45.6899" y2="53.4106">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+ <stop offset="0" style="stop-color:#231F20"/>
+ <stop offset="1" style="stop-color:#6D6E70"/>
</linearGradient>
-<path d="M17.223,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307 c0-1.201,0.98-2.183,2.184-2.183h0.887c1.205,0,2.182,0.981,2.182,2.183v3.307c0,1.204-0.977,2.183-2.182,2.183H17.223z" fill="url(#SVGID_13_)" fill-opacity="0.7" stroke-opacity="0.7"/>
+<path d="M17.223,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307 c0-1.201,0.98-2.183,2.184-2.183h0.887c1.205,0,2.182,0.981,2.182,2.183v3.307c0,1.204-0.977,2.183-2.182,2.183H17.223z" fill="url(#SVGID_13_)" opacity="0.7"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="17.667" x2="17.667" y1="46.4658" y2="52.6426">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+ <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="M19.525,51.215c0,0.783-0.635,1.417-1.416,1.417h-0.887c-0.779,0-1.414-0.634-1.414-1.417v-3.307 c0-0.78,0.635-1.414,1.414-1.414h0.887c0.781,0,1.416,0.634,1.416,1.414V51.215z" fill="url(#SVGID_14_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="41.6719" x2="41.6719" y1="44.917" y2="54.1816">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+ <stop offset="0" style="stop-color:#B6BBBD"/>
+ <stop offset="1" style="stop-color:#F0FBFF"/>
</linearGradient>
-<path d="M41.229,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307 c0-1.624,1.324-2.948,2.949-2.948h0.885c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H41.229z" fill="url(#SVGID_15_)" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M41.229,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307 c0-1.624,1.324-2.948,2.949-2.948h0.885c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H41.229z" fill="url(#SVGID_15_)" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="41.6709" x2="41.6709" y1="45.6899" y2="53.4106">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+ <stop offset="0" style="stop-color:#231F20"/>
+ <stop offset="1" style="stop-color:#6D6E70"/>
</linearGradient>
-<path d="M41.229,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307 c0-1.201,0.98-2.183,2.184-2.183h0.885c1.205,0,2.184,0.981,2.184,2.183v3.307c0,1.204-0.979,2.183-2.184,2.183H41.229z" fill="url(#SVGID_16_)" fill-opacity="0.7" stroke-opacity="0.7"/>
+<path d="M41.229,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307 c0-1.201,0.98-2.183,2.184-2.183h0.885c1.205,0,2.184,0.981,2.184,2.183v3.307c0,1.204-0.979,2.183-2.184,2.183H41.229z" fill="url(#SVGID_16_)" opacity="0.7"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="41.6719" x2="41.6719" y1="46.4658" y2="52.6426">
-<stop offset="0" style="stop-color:#FFC142"/>
-<stop offset="0.7455" style="stop-color:#CF4E18"/>
-<stop offset="1" style="stop-color:#B52100"/>
+ <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="M43.531,51.215c0,0.783-0.637,1.417-1.418,1.417h-0.885c-0.781,0-1.416-0.634-1.416-1.417v-3.307 c0-0.78,0.635-1.414,1.416-1.414h0.885c0.781,0,1.418,0.634,1.418,1.414V51.215z" fill="url(#SVGID_17_)"/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
<rect fill="none" height="30" width="30"/>
-<path d="M15,30C6.729,30,0,23.271,0,15C0,6.729,6.729,0,15,0s15,6.729,15,15C30,23.271,23.271,30,15,30L15,30z" fill-opacity="0.35" stroke-opacity="0.35"/>
-<path d="M15.159,10.697c0.525,0,0.947-0.13,1.264-0.39 c0.316-0.259,0.474-0.615,0.474-1.07c0-0.44-0.164-0.795-0.49-1.061c-0.326-0.264-0.741-0.398-1.248-0.398 c-0.531,0-0.951,0.132-1.261,0.395c-0.311,0.262-0.465,0.617-0.465,1.064c0,0.455,0.159,0.812,0.474,1.07 C14.224,10.567,14.641,10.697,15.159,10.697z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M15.159,10.369c0.525,0,0.947-0.129,1.264-0.389 c0.316-0.26,0.474-0.615,0.474-1.07c0-0.441-0.164-0.795-0.49-1.061c-0.326-0.266-0.741-0.398-1.248-0.398 c-0.531,0-0.951,0.13-1.261,0.394c-0.311,0.263-0.465,0.616-0.465,1.064c0,0.455,0.159,0.812,0.474,1.07 C14.224,10.24,14.641,10.369,15.159,10.369z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M15,30C6.729,30,0,23.271,0,15C0,6.729,6.729,0,15,0s15,6.729,15,15C30,23.271,23.271,30,15,30L15,30z" opacity="0.35"/>
+<path d="M15.159,10.697c0.525,0,0.947-0.13,1.264-0.39 c0.316-0.259,0.474-0.615,0.474-1.07c0-0.44-0.164-0.795-0.49-1.061c-0.326-0.264-0.741-0.398-1.248-0.398 c-0.531,0-0.951,0.132-1.261,0.395c-0.311,0.262-0.465,0.617-0.465,1.064c0,0.455,0.159,0.812,0.474,1.07 C14.224,10.567,14.641,10.697,15.159,10.697z" enable-background="new " opacity="0.1"/>
+<path d="M15.159,10.369c0.525,0,0.947-0.129,1.264-0.389 c0.316-0.26,0.474-0.615,0.474-1.07c0-0.441-0.164-0.795-0.49-1.061c-0.326-0.266-0.741-0.398-1.248-0.398 c-0.531,0-0.951,0.13-1.261,0.394c-0.311,0.263-0.465,0.616-0.465,1.064c0,0.455,0.159,0.812,0.474,1.07 C14.224,10.24,14.641,10.369,15.159,10.369z" enable-background="new " opacity="0.2"/>
<radialGradient cx="-2178.8628" cy="3345.4287" gradientTransform="matrix(1 0 0 -1 2194 3347.6641)" gradientUnits="userSpaceOnUse" id="SVGID_1__" r="26.49">
-<stop offset="0" style="stop-color:#AFED23"/>
-<stop offset="0.8121" style="stop-color:#358C0C"/>
-<stop offset="1" style="stop-color:#67AD1A"/>
+ <stop offset="0" style="stop-color:#AFED23"/>
+ <stop offset="0.8121" style="stop-color:#358C0C"/>
+ <stop offset="1" style="stop-color:#67AD1A"/>
</radialGradient>
<path d="M15,29C7.28,29,1,22.72,1,15S7.28,1,15,1c7.721,0,14,6.28,14,14S22.72,29,15,29L15,29z" fill="url(#SVGID_1__)"/>
-<polygon fill-opacity="0.1" points="12.46,13.847 13.555,13.847 13.555,23.318 16.741,23.318 16.741,12.032 12.46,12.032 " stroke-opacity="0.1"/>
-<polygon fill-opacity="0.2" points="12.46,13.519 13.555,13.519 13.555,22.99 16.741,22.99 16.741,11.704 12.46,11.704 " stroke-opacity="0.2"/>
+<polygon enable-background="new " opacity="0.1" points="12.46,13.847 13.555,13.847 13.555,23.318 16.741,23.318 16.741,12.032 12.46,12.032 "/>
+<polygon enable-background="new " opacity="0.2" points="12.46,13.519 13.555,13.519 13.555,22.99 16.741,22.99 16.741,11.704 12.46,11.704 "/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3347.6641)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-2179.3994" x2="-2179.3994" y1="3340.2148" y2="3324.8184">
-<stop offset="0" style="stop-color:#F6FDFF"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+ <stop offset="0" style="stop-color:#F6FDFF"/>
+ <stop offset="1" style="stop-color:#ADB3B5"/>
</linearGradient>
<polygon fill="url(#SVGID_2__)" points="12.46,13.191 13.555,13.191 13.555,22.663 16.741,22.663 16.741,11.377 12.46,11.377 "/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3347.6641)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="-2178.8477" x2="-2178.8477" y1="3340.2158" y2="3324.8235">
-<stop offset="0" style="stop-color:#F6FDFF"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+ <stop offset="0" style="stop-color:#F6FDFF"/>
+ <stop offset="1" style="stop-color:#ADB3B5"/>
</linearGradient>
<path d="M15.148,10.205c0.524,0,0.945-0.129,1.262-0.389c0.316-0.259,0.475-0.615,0.475-1.07 c0-0.441-0.163-0.795-0.489-1.061c-0.327-0.264-0.743-0.397-1.248-0.397c-0.531,0-0.952,0.131-1.262,0.394 c-0.312,0.262-0.466,0.617-0.466,1.064c0,0.455,0.159,0.812,0.477,1.07C14.212,10.076,14.63,10.205,15.148,10.205z" fill="url(#SVGID_3__)"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_accessibility.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,37 @@
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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 4.499 4.5)">
+<defs>
+</defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="25.4995" x2="25.4995" y1="0.2427" y2="51.2432">
+ <stop offset="0" style="stop-color:#A1DCFF"/>
+ <stop offset="0.3879" style="stop-color:#2A93EE"/>
+ <stop offset="0.6788" style="stop-color:#085BC2"/>
+ <stop offset="1" style="stop-color:#36B5FF"/>
+</linearGradient>
+<circle cx="25.5" cy="25.5" fill="url(#SVGID_1_)" r="25.5"/>
+<radialGradient cx="25.7441" cy="2.915" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="46.8724">
+ <stop offset="0.1576" style="stop-color:#36B5FF"/>
+ <stop offset="0.8242" style="stop-color:#1B66D8"/>
+ <stop offset="1" style="stop-color:#2183E0"/>
+</radialGradient>
+<path d="M25.501,50.272c-13.66,0-24.771-11.112-24.771-24.772S11.841,0.729,25.501,0.729 S50.273,11.84,50.273,25.5S39.161,50.272,25.501,50.272L25.501,50.272z" fill="url(#SVGID_2_)"/>
+<circle cx="25.501" cy="14.888" r="6.123"/>
+<path d="M43.229,20.204c-0.633-1-1.957-1.298-2.957-0.664c-16.645,10.542-27.534,0.682-27.996,0.251 c-0.858-0.809-2.209-0.772-3.022,0.084c-0.815,0.858-0.781,2.214,0.077,3.029c0.072,0.068,4.009,3.7,10.66,5.141v15.618h11.02 V28.031c3.536-0.742,7.409-2.245,11.556-4.87C43.565,22.528,43.863,21.204,43.229,20.204z"/>
+<circle cx="25.501" cy="15.5" r="6.123"/>
+<path d="M43.229,20.816c-0.633-1-1.957-1.298-2.957-0.664c-16.645,10.542-27.534,0.682-27.996,0.251 c-0.858-0.809-2.209-0.772-3.022,0.084c-0.815,0.858-0.781,2.214,0.077,3.029c0.072,0.068,4.009,3.7,10.66,5.141v15.618h11.02 V28.644c3.536-0.742,7.409-2.245,11.556-4.87C43.565,23.14,43.863,21.816,43.229,20.816z"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="25.5005" x2="25.5005" y1="8.1533" y2="43.6655">
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="0.5273" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#CAD1D4"/>
+</linearGradient>
+<circle cx="25.501" cy="14.276" fill="url(#SVGID_3_)" r="6.123"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="26.1128" x2="26.1128" y1="8.1528" y2="43.6647">
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="0.5273" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#CAD1D4"/>
+</linearGradient>
+<path d="M43.229,19.592c-0.633-1-1.957-1.298-2.957-0.664c-16.645,10.542-27.534,0.682-27.996,0.251 c-0.858-0.809-2.209-0.772-3.022,0.084c-0.815,0.858-0.781,2.214,0.077,3.029c0.072,0.068,4.009,3.701,10.66,5.141v15.618h11.02 V27.419c3.536-0.742,7.409-2.245,11.556-4.87C43.565,21.916,43.863,20.592,43.229,19.592z" fill="url(#SVGID_4_)"/>
+</g>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_active_call.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_active_call.svg Fri May 14 16:09:54 2010 +0300
@@ -1,33 +1,33 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
-<stop offset="0.297" style="stop-color:#A7E722"/>
-<stop offset="0.6667" style="stop-color:#428C0F"/>
-<stop offset="0.7939" style="stop-color:#5CA617"/>
-<stop offset="1" style="stop-color:#5CA617"/>
+ <stop offset="0.297" style="stop-color:#A7E722"/>
+ <stop offset="0.6667" style="stop-color:#428C0F"/>
+ <stop offset="0.7939" style="stop-color:#5CA617"/>
</radialGradient>
<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737 c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108 c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274 c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-2.477-2.889-8.594-5.015-10.752-5.399 c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571C11.203,27.277,3.722,37.795,2.668,40.352 c-1.108,2.691-0.581,4.645-0.236,6.567c0.387,2.158,2.511,8.275,5.4,10.752c0.718,0.616,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-1639.3428" x2="-1638.9111" y1="-2494.9824" y2="-2491.4067">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+ <stop offset="0" style="stop-color:#559D13"/>
+ <stop offset="1" style="stop-color:#284F09"/>
</linearGradient>
<path d="M35.172,17.107c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967 c0.535,0.492,0.873,0.588,1.301,0.274c0.047-0.034,0.063-0.046,0.064-0.046c0.252-0.184,1.031-0.739,2.119-1.514 c-0.252-0.205-3.469-2.809-4.801-2.956C36.855,15.598,35.172,17.107,35.172,17.107z" fill="url(#SVGID_2_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -1696.8304 4072.5859)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1639.3467" x2="-1638.9149" y1="4063.0557" y2="4066.6318">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+ <stop offset="0" style="stop-color:#559D13"/>
+ <stop offset="1" style="stop-color:#284F09"/>
</linearGradient>
<path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.714c0.376,0.665,2.351,3.067,2.967,3.737 c0.492,0.53,0.587,0.869,0.274,1.297c-0.035,0.049-0.046,0.063-0.046,0.063c-0.183,0.253-0.738,1.032-1.515,2.12 c-0.203-0.252-2.807-3.469-2.956-4.8C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
-<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112 C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711 c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571 C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617 C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B5DC77" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737 c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108 c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274 c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982 c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273 c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107 c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736 c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606 c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B5DC77" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112 C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711 c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571 C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617 C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B5DC77" opacity="0.5"/>
+<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737 c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108 c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274 c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982 c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273 c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107 c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736 c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606 c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B5DC77" opacity="0.6"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -608.1406 2931.3247)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-1610.522" x2="-1610.522" y1="-2533.3467" y2="-2471.428">
-<stop offset="0" style="stop-color:#447F0F"/>
-<stop offset="0.5" style="stop-color:#284F09"/>
-<stop offset="1" style="stop-color:#40790E"/>
+ <stop offset="0" style="stop-color:#447F0F"/>
+ <stop offset="0.5" style="stop-color:#284F09"/>
+ <stop offset="1" style="stop-color:#40790E"/>
</linearGradient>
-<path d="M2.899,45.012c1.275-2.776,10.299-14.805,18.804-23.31 c8.505-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26 c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.534,18.958c-8.562,8.562-17.667,20.715-18.96,23.535 c-0.038,0.086-0.063,0.165-0.101,0.25c0.071,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_4_)" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M2.899,45.012c1.275-2.776,10.299-14.805,18.804-23.31 c8.505-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26 c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.534,18.958c-8.562,8.562-17.667,20.715-18.96,23.535 c-0.038,0.086-0.063,0.165-0.101,0.25c0.071,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_4_)" opacity="0.5"/>
<rect fill="none" height="60" width="60"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_active_mode.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_active_mode.svg Fri May 14 16:09:54 2010 +0300
@@ -1,145 +1,140 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2.001" y2="57.8555">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+ <stop offset="0.0667" style="stop-color:#D1D7D9"/>
+ <stop offset="0.2606" style="stop-color:#BDC2C4"/>
+ <stop offset="0.6606" style="stop-color:#949DA1"/>
+ <stop offset="0.9636" style="stop-color:#ADB3B5"/>
+ <stop offset="1" style="stop-color:#595C5E"/>
</linearGradient>
<path d="M48.027,54.932c0,1.693-1.375,3.069-3.068,3.069h-29.92c-1.693,0-3.066-1.376-3.066-3.069V5.07 c0-1.696,1.373-3.069,3.066-3.069h29.92c1.693,0,3.068,1.373,3.068,3.069V54.932z" fill="url(#SVGID_1_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="2.001" y2="56.899">
-<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"/>
+ <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="M44.959,2.001h-29.92c-1.693,0-3.066,1.373-3.066,3.069v49.861c0,0.82,0.324,1.56,0.848,2.11 c-0.047-0.187-0.08-0.377-0.08-0.575v-1.535V6.602V5.07c0-1.271,1.031-2.304,2.299-2.304h29.92c1.268,0,2.301,1.033,2.301,2.304 v1.531v48.33v1.535c0,0.198-0.033,0.389-0.08,0.575c0.521-0.551,0.848-1.29,0.848-2.11V5.07C48.027,3.374,46.652,2.001,44.959,2.001 z" fill="url(#SVGID_2_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="5.8916" y2="43.4283">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+ <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="37.589" stroke-opacity="0.6" width="31.453" x="14.273" y="5.836"/>
+<rect fill="url(#SVGID_3_)" height="37.589" opacity="0.6" width="31.453" x="14.273" y="5.836"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="29.999" x2="29.999" y1="6.6548" y2="42.6624">
-<stop offset="0" style="stop-color:#6E6E6E"/>
-<stop offset="1" style="stop-color:#333333"/>
+ <stop offset="0" style="stop-color:#6E6E6E"/>
+ <stop offset="1" style="stop-color:#333333"/>
</linearGradient>
<rect fill="url(#SVGID_4_)" height="36.058" width="29.92" x="15.039" y="6.602"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30" x2="30" y1="7.4214" y2="41.894">
-<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"/>
+ <stop offset="0" style="stop-color:#3BC8EB"/>
+ <stop offset="0.3879" style="stop-color:#2D9BD2"/>
+ <stop offset="0.8909" style="stop-color:#1347BA"/>
</linearGradient>
<rect fill="url(#SVGID_5_)" height="34.521" width="28.383" x="15.809" y="7.37"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="30" x2="30" y1="7.9712" y2="21.69">
-<stop offset="0" style="stop-color:#85EFFF"/>
-<stop offset="1" style="stop-color:#3BA1D9"/>
+ <stop offset="0" style="stop-color:#85EFFF"/>
+ <stop offset="1" style="stop-color:#3BA1D9"/>
</linearGradient>
<polygon fill="url(#SVGID_6_)" points="44.191,19.644 15.809,22.712 15.809,8.137 44.191,8.137 "/>
<rect fill="#9FE4FF" height="0.767" width="28.383" x="15.809" y="7.37"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="30.2236" x2="30.2236" y1="5.8726" y2="2.8032">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#D1D7D9"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#D1D7D9"/>
</linearGradient>
<path d="M26.832,5.836c-0.861,0-1.535-0.563-1.535-1.279v-0.51c0-0.718,0.674-1.28,1.535-1.28h6.785 c0.859,0,1.533,0.563,1.533,1.28v0.51c0,0.716-0.674,1.279-1.533,1.279H26.832z" fill="url(#SVGID_7_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="30.2236" x2="30.2236" y1="3.2158" y2="5.1992">
-<stop offset="0" style="stop-color:#6C7375"/>
-<stop offset="1" style="stop-color:#BDC2C4"/>
+ <stop offset="0" style="stop-color:#6C7375"/>
+ <stop offset="1" style="stop-color:#BDC2C4"/>
</linearGradient>
<path d="M34.383,4.557c0,0.283-0.342,0.514-0.766,0.514h-6.785c-0.424,0-0.768-0.23-0.768-0.514v-0.51 c0-0.283,0.344-0.512,0.768-0.512h6.785c0.424,0,0.766,0.229,0.766,0.512V4.557z" fill="url(#SVGID_8_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="29.8818" x2="29.8818" y1="44.2236" y2="55.628">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#FFFFFF"/>
+ <stop offset="0" style="stop-color:#B6BBBD"/>
+ <stop offset="1" style="stop-color:#FFFFFF"/>
</linearGradient>
-<path d="M27.109,55.7c-1.645,0-2.98-1.323-2.98-2.951v-5.606c0-1.627,1.336-2.951,2.98-2.951 h5.545c1.645,0,2.98,1.324,2.98,2.951v5.606c0,1.628-1.336,2.951-2.98,2.951H27.109z" fill="url(#SVGID_9_)" fill-opacity="0.6" stroke-opacity="0.6"/>
-<path d="M27.105,54.932c-1.219,0-2.211-0.979-2.211-2.183v-5.606c0-1.204,0.992-2.183,2.211-2.183 h5.553c1.219,0,2.209,0.979,2.209,2.183v5.606c0,1.204-0.99,2.183-2.209,2.183H27.105z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M27.109,55.7c-1.645,0-2.98-1.323-2.98-2.951v-5.606c0-1.627,1.336-2.951,2.98-2.951 h5.545c1.645,0,2.98,1.324,2.98,2.951v5.606c0,1.628-1.336,2.951-2.98,2.951H27.109z" fill="url(#SVGID_9_)" opacity="0.6"/>
+<path d="M27.105,54.932c-1.219,0-2.211-0.979-2.211-2.183v-5.606c0-1.204,0.992-2.183,2.211-2.183 h5.553c1.219,0,2.209,0.979,2.209,2.183v5.606c0,1.204-0.99,2.183-2.209,2.183H27.105z" fill="#020202" opacity="0.5"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="29.8818" x2="29.8818" y1="45.6865" y2="54.1806">
-<stop offset="0" style="stop-color:#A6A8AB"/>
-<stop offset="0.703" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#808184"/>
+ <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="M34.102,52.749c0,0.783-0.645,1.417-1.438,1.417h-5.566c-0.793,0-1.436-0.634-1.436-1.417v-5.606 c0-0.783,0.643-1.417,1.436-1.417h5.566c0.793,0,1.438,0.634,1.438,1.417V52.749z" fill="url(#SVGID_10_)"/>
-<path d="M28.73,52.632c-0.846,0-1.533-0.688-1.533-1.534v-2.303c0-0.847,0.688-1.534,1.533-1.534 h2.303c0.846,0,1.533,0.688,1.533,1.534v2.303c0,0.847-0.688,1.534-1.533,1.534H28.73z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M28.73,52.632c-0.846,0-1.533-0.688-1.533-1.534v-2.303c0-0.847,0.688-1.534,1.533-1.534 h2.303c0.846,0,1.533,0.688,1.533,1.534v2.303c0,0.847-0.688,1.534-1.533,1.534H28.73z" fill="#020202" opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="29.8809" x2="29.8809" y1="48.0103" y2="51.8696">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+ <stop offset="0.0667" style="stop-color:#D1D7D9"/>
+ <stop offset="0.2606" style="stop-color:#BDC2C4"/>
+ <stop offset="0.6606" style="stop-color:#949DA1"/>
+ <stop offset="0.9636" style="stop-color:#ADB3B5"/>
+ <stop offset="1" style="stop-color:#595C5E"/>
</linearGradient>
<path d="M28.73,51.863c-0.422,0-0.768-0.345-0.768-0.766v-2.303c0-0.422,0.346-0.767,0.768-0.767h2.303 c0.42,0,0.766,0.345,0.766,0.767v2.303c0,0.421-0.346,0.766-0.766,0.766H28.73z" fill="url(#SVGID_11_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="17.667" x2="17.667" y1="44.917" y2="54.1816">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+ <stop offset="0" style="stop-color:#B6BBBD"/>
+ <stop offset="1" style="stop-color:#F0FBFF"/>
</linearGradient>
-<path d="M17.223,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307 c0-1.624,1.324-2.948,2.949-2.948h0.887c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H17.223z" fill="url(#SVGID_12_)" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M17.223,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307 c0-1.624,1.324-2.948,2.949-2.948h0.887c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H17.223z" fill="url(#SVGID_12_)" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="17.665" x2="17.665" y1="45.6899" y2="53.4106">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+ <stop offset="0" style="stop-color:#231F20"/>
+ <stop offset="1" style="stop-color:#6D6E70"/>
</linearGradient>
-<path d="M17.223,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307 c0-1.201,0.98-2.183,2.184-2.183h0.887c1.205,0,2.182,0.981,2.182,2.183v3.307c0,1.204-0.977,2.183-2.182,2.183H17.223z" fill="url(#SVGID_13_)" fill-opacity="0.7" stroke-opacity="0.7"/>
+<path d="M17.223,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307 c0-1.201,0.98-2.183,2.184-2.183h0.887c1.205,0,2.182,0.981,2.182,2.183v3.307c0,1.204-0.977,2.183-2.182,2.183H17.223z" fill="url(#SVGID_13_)" opacity="0.7"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="17.667" x2="17.667" y1="46.4658" y2="52.6426">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+ <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="M19.525,51.215c0,0.783-0.635,1.417-1.416,1.417h-0.887c-0.779,0-1.414-0.634-1.414-1.417v-3.307 c0-0.78,0.635-1.414,1.414-1.414h0.887c0.781,0,1.416,0.634,1.416,1.414V51.215z" fill="url(#SVGID_14_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="41.6719" x2="41.6719" y1="44.917" y2="54.1816">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+ <stop offset="0" style="stop-color:#B6BBBD"/>
+ <stop offset="1" style="stop-color:#F0FBFF"/>
</linearGradient>
-<path d="M41.229,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307 c0-1.624,1.324-2.948,2.949-2.948h0.885c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H41.229z" fill="url(#SVGID_15_)" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M41.229,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307 c0-1.624,1.324-2.948,2.949-2.948h0.885c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H41.229z" fill="url(#SVGID_15_)" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="41.6709" x2="41.6709" y1="45.6899" y2="53.4106">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+ <stop offset="0" style="stop-color:#231F20"/>
+ <stop offset="1" style="stop-color:#6D6E70"/>
</linearGradient>
-<path d="M41.229,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307 c0-1.201,0.98-2.183,2.184-2.183h0.885c1.205,0,2.184,0.981,2.184,2.183v3.307c0,1.204-0.979,2.183-2.184,2.183H41.229z" fill="url(#SVGID_16_)" fill-opacity="0.7" stroke-opacity="0.7"/>
+<path d="M41.229,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307 c0-1.201,0.98-2.183,2.184-2.183h0.885c1.205,0,2.184,0.981,2.184,2.183v3.307c0,1.204-0.979,2.183-2.184,2.183H41.229z" fill="url(#SVGID_16_)" opacity="0.7"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="41.6719" x2="41.6719" y1="46.4658" y2="52.6426">
-<stop offset="0" style="stop-color:#FFC142"/>
-<stop offset="0.7455" style="stop-color:#CF4E18"/>
-<stop offset="1" style="stop-color:#B52100"/>
+ <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="M43.531,51.215c0,0.783-0.637,1.417-1.418,1.417h-0.885c-0.781,0-1.416-0.634-1.416-1.417v-3.307 c0-0.78,0.635-1.414,1.416-1.414h0.885c0.781,0,1.418,0.634,1.418,1.414V51.215z" fill="url(#SVGID_17_)"/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<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"/>
-<path d="M29.58,12.911L19.063,2.596c-0.339-0.333-0.685-0.402-0.916-0.402c-0.564,0-1.165,0.449-1.165,1.281v4.399 h-7.73c-0.842,0-1.525,0.689-1.525,1.537v4.051c0,0.847,0.684,1.535,1.525,1.535h19.482c0.555,0,0.998-0.273,1.186-0.73 C30.105,13.808,29.979,13.301,29.58,12.911z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<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" opacity="0.35"/>
+<path d="M29.58,12.911L19.063,2.596c-0.339-0.333-0.685-0.402-0.916-0.402c-0.564,0-1.165,0.449-1.165,1.281v4.399 h-7.73c-0.842,0-1.525,0.689-1.525,1.537v4.051c0,0.847,0.684,1.535,1.525,1.535h19.482c0.555,0,0.998-0.273,1.186-0.73 C30.105,13.808,29.979,13.301,29.58,12.911z" opacity="0.35"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="11.1406" x2="11.1406" y1="16.103" y2="27.0009">
-<stop offset="0" style="stop-color:#CDEDBD"/>
-<stop offset="0.9879" style="stop-color:#139900"/>
-<stop offset="1" style="stop-color:#139900"/>
+ <stop offset="0" style="stop-color:#CDEDBD"/>
+ <stop offset="0.9879" style="stop-color:#139900"/>
</linearGradient>
<path d="M21.279,20.589c0,0.294-0.236,0.538-0.527,0.538h-8.205c-0.287,0-0.525,0.241-0.525,0.537v4.861 c0,0.295-0.172,0.37-0.38,0.165L1.125,16.373c-0.211-0.205-0.144-0.372,0.145-0.372h19.482c0.289,0,0.527,0.241,0.527,0.537V20.589z " fill="url(#SVGID_1__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="11.7783" x2="11.7783" y1="17.0737" y2="24.8819">
-<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"/>
+ <stop offset="0" style="stop-color:#82C94C"/>
+ <stop offset="0.2545" style="stop-color:#439020"/>
+ <stop offset="0.5091" style="stop-color:#0D4D07"/>
</linearGradient>
<path d="M3.336,17.06h16.885v3.009h-7.674c-0.872,0-1.584,0.715-1.584,1.596v2.878L3.336,17.06z" fill="url(#SVGID_2__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="18.8643" x2="18.8643" y1="3.2227" y2="14.1618">
-<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"/>
+ <stop offset="0.4909" style="stop-color:#CDEDBD"/>
+ <stop offset="0.9879" style="stop-color:#139900"/>
</linearGradient>
<path d="M8.727,9.411c0-0.296,0.235-0.537,0.525-0.537h8.206c0.288,0,0.524-0.242,0.524-0.538V3.475 c0-0.297,0.172-0.37,0.381-0.165l10.516,10.315c0.211,0.205,0.144,0.372-0.145,0.372H9.252c-0.289,0-0.525-0.241-0.525-0.535V9.411z " fill="url(#SVGID_3__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="18.2266" x2="18.2266" y1="5.4292" y2="12.9712">
-<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"/>
+ <stop offset="0" style="stop-color:#B2F56E"/>
+ <stop offset="0.703" style="stop-color:#439020"/>
+ <stop offset="0.9879" style="stop-color:#0D4D07"/>
</linearGradient>
<path d="M9.785,12.938V9.933h7.673c0.872,0,1.583-0.718,1.583-1.597V5.458l7.627,7.48H9.785z" fill="url(#SVGID_4__)"/>
<rect fill="none" height="30" width="30" x="0.002"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_add_contact_picture.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_add_contact_picture.svg Fri May 14 16:09:54 2010 +0300
@@ -1,111 +1,105 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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">
-<stop offset="0" style="stop-color:#949494"/>
-<stop offset="1" style="stop-color:#393939"/>
+ <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">
-<stop offset="0" style="stop-color:#7A7A7A"/>
-<stop offset="0.7515" style="stop-color:#0A0A0A"/>
-<stop offset="1" style="stop-color:#5F5F5F"/>
+ <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"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<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"/>
+<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" 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"/>
+ <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"/>
+ <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"/>
+ <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"/>
</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"/>
+ <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"/>
+ <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"/>
+<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" 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"/>
+ <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"/>
+ <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"/>
+ <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"/>
+ <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"/>
</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"/>
+ <stop offset="0.3091" style="stop-color:#A700F5"/>
+ <stop offset="0.4364" style="stop-color:#5E008A"/>
+ <stop offset="0.8061" 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"/>
+ <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"/>
+ <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"/>
+<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_)" 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"/>
+ <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>
+</svg>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_als.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,266 @@
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="39.5586" x2="39.5586" y1="1" y2="45.1092">
+ <stop offset="0.0667" style="stop-color:#D1D7D9"/>
+ <stop offset="0.2606" style="stop-color:#BDC2C4"/>
+ <stop offset="0.6606" style="stop-color:#949DA1"/>
+ <stop offset="0.9636" style="stop-color:#ADB3B5"/>
+ <stop offset="1" style="stop-color:#595C5E"/>
+</linearGradient>
+<path d="M53.992,42.767c0,1.357-1.1,2.457-2.457,2.457H27.581c-1.356,0-2.457-1.1-2.457-2.457V3.456 C25.124,2.099,26.225,1,27.581,1h23.954c1.357,0,2.457,1.099,2.457,2.456V42.767z" fill="url(#SVGID_1_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="39.5586" x2="39.5586" y1="1" y2="44.3417">
+ <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="M51.535,1H27.581c-1.356,0-2.457,1.099-2.457,2.456v39.311c0,0.655,0.261,1.247,0.68,1.688 c-0.038-0.147-0.065-0.3-0.065-0.459v-1.229V4.685V3.456c0-1.017,0.827-1.842,1.842-1.842h23.954c1.018,0,1.844,0.825,1.844,1.842 v1.229v38.082v1.229c0,0.159-0.027,0.312-0.066,0.459c0.42-0.44,0.68-1.032,0.68-1.688V3.456C53.992,2.099,52.893,1,51.535,1z" fill="url(#SVGID_2_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="39.5586" x2="39.5586" y1="4.1138" y2="33.5567">
+ <stop offset="0" style="stop-color:#B6BBBD"/>
+ <stop offset="1" style="stop-color:#F0FBFF"/>
+</linearGradient>
+<rect fill="url(#SVGID_3_)" height="29.483" opacity="0.6" width="25.184" x="26.967" y="4.07"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="39.5586" x2="39.5586" y1="4.7266" y2="32.9417">
+ <stop offset="0" style="stop-color:#6E6E6E"/>
+ <stop offset="1" style="stop-color:#333333"/>
+</linearGradient>
+<rect fill="url(#SVGID_4_)" height="28.254" width="23.954" x="27.581" y="4.685"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="39.5586" x2="39.5586" y1="5.2988" y2="32.3247">
+ <stop offset="0" style="stop-color:#A6A6A6"/>
+ <stop offset="1" style="stop-color:#585858"/>
+</linearGradient>
+<rect fill="url(#SVGID_5_)" height="27.025" width="22.727" x="28.195" y="5.299"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="39.5586" x2="39.5586" y1="5.7876" y2="16.1937">
+ <stop offset="0" style="stop-color:#D8D8D8"/>
+ <stop offset="1" style="stop-color:#8B8B8B"/>
+</linearGradient>
+<polygon fill="url(#SVGID_6_)" points="50.922,14.514 28.195,16.969 28.195,5.913 50.922,5.913 "/>
+<rect enable-background="new " fill="#FFFFFF" height="0.614" opacity="0.7" width="22.727" x="28.195" y="5.299"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="39.4639" x2="39.4639" y1="34.1924" y2="43.3226">
+ <stop offset="0" style="stop-color:#B6BBBD"/>
+ <stop offset="1" style="stop-color:#FFFFFF"/>
+</linearGradient>
+<path d="M37.244,43.381c-1.316,0-2.387-1.06-2.387-2.362v-4.489 c0-1.303,1.07-2.362,2.387-2.362h4.439c1.316,0,2.387,1.06,2.387,2.362v4.489c0,1.303-1.07,2.362-2.387,2.362H37.244z" fill="url(#SVGID_7_)" opacity="0.6"/>
+<path d="M37.24,42.767c-0.975,0-1.77-0.784-1.77-1.748v-4.489c0-0.964,0.795-1.747,1.77-1.747h4.447 c0.975,0,1.77,0.783,1.77,1.747v4.489c0,0.964-0.795,1.748-1.77,1.748H37.24z" fill="#020202" opacity="0.5"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="39.4639" x2="39.4639" y1="35.3643" y2="42.1641">
+ <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="M42.842,41.019c0,0.627-0.516,1.134-1.15,1.134h-4.455c-0.635,0-1.15-0.507-1.15-1.134v-4.489 c0-0.626,0.516-1.134,1.15-1.134h4.455c0.635,0,1.15,0.508,1.15,1.134V41.019z" fill="url(#SVGID_8_)"/>
+<path d="M38.543,40.924c-0.678,0-1.229-0.55-1.229-1.229v-1.843c0-0.679,0.551-1.228,1.229-1.228 h1.842c0.678,0,1.229,0.549,1.229,1.228v1.843c0,0.679-0.551,1.229-1.229,1.229H38.543z" fill="#020202" opacity="0.2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="39.4639" x2="39.4639" y1="37.2236" y2="40.3145">
+ <stop offset="0.0667" style="stop-color:#D1D7D9"/>
+ <stop offset="0.2606" style="stop-color:#BDC2C4"/>
+ <stop offset="0.6606" style="stop-color:#949DA1"/>
+ <stop offset="0.9636" style="stop-color:#ADB3B5"/>
+ <stop offset="1" style="stop-color:#595C5E"/>
+</linearGradient>
+<path d="M38.543,40.31c-0.338,0-0.615-0.276-0.615-0.614v-1.843c0-0.338,0.277-0.614,0.615-0.614h1.842 c0.338,0,0.615,0.276,0.615,0.614v1.843c0,0.338-0.277,0.614-0.615,0.614H38.543z" fill="url(#SVGID_9_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="29.6831" x2="29.6831" y1="34.748" y2="42.165">
+ <stop offset="0" style="stop-color:#B6BBBD"/>
+ <stop offset="1" style="stop-color:#F0FBFF"/>
+</linearGradient>
+<path d="M29.329,42.152c-1.302,0-2.362-1.06-2.362-2.362v-2.646 c0-1.303,1.06-2.362,2.362-2.362h0.709c1.302,0,2.362,1.06,2.362,2.362v2.646c0,1.303-1.061,2.362-2.362,2.362H29.329z" fill="url(#SVGID_10_)" opacity="0.4"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="29.6831" x2="29.6831" y1="35.3672" y2="41.5488">
+ <stop offset="0" style="stop-color:#231F20"/>
+ <stop offset="1" style="stop-color:#6D6E70"/>
+</linearGradient>
+<path d="M29.329,41.538c-0.963,0-1.748-0.784-1.748-1.748v-2.646 c0-0.963,0.785-1.749,1.748-1.749h0.709c0.964,0,1.747,0.786,1.747,1.749v2.646c0,0.964-0.783,1.748-1.747,1.748H29.329z" fill="url(#SVGID_11_)" opacity="0.7"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="29.6831" x2="29.6831" y1="35.9873" y2="40.9326">
+ <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="M31.172,39.79c0,0.626-0.508,1.134-1.134,1.134h-0.709c-0.625,0-1.134-0.508-1.134-1.134v-2.646 c0-0.627,0.508-1.135,1.134-1.135h0.709c0.626,0,1.134,0.508,1.134,1.135V39.79z" fill="url(#SVGID_12_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="48.9043" x2="48.9043" y1="34.748" y2="42.165">
+ <stop offset="0" style="stop-color:#B6BBBD"/>
+ <stop offset="1" style="stop-color:#F0FBFF"/>
+</linearGradient>
+<path d="M48.549,42.152c-1.301,0-2.361-1.06-2.361-2.362v-2.646 c0-1.303,1.061-2.362,2.361-2.362h0.709c1.303,0,2.363,1.06,2.363,2.362v2.646c0,1.303-1.061,2.362-2.363,2.362H48.549z" fill="url(#SVGID_13_)" opacity="0.4"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="48.9033" x2="48.9033" y1="35.3672" y2="41.5488">
+ <stop offset="0" style="stop-color:#231F20"/>
+ <stop offset="1" style="stop-color:#6D6E70"/>
+</linearGradient>
+<path d="M48.549,41.538c-0.963,0-1.748-0.784-1.748-1.748v-2.646 c0-0.963,0.785-1.749,1.748-1.749h0.709c0.965,0,1.748,0.786,1.748,1.749v2.646c0,0.964-0.783,1.748-1.748,1.748H48.549z" fill="url(#SVGID_14_)" opacity="0.7"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="48.9043" x2="48.9043" y1="35.9873" y2="40.9326">
+ <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="M50.393,39.79c0,0.626-0.51,1.134-1.135,1.134h-0.709c-0.625,0-1.133-0.508-1.133-1.134v-2.646 c0-0.627,0.508-1.135,1.133-1.135h0.709c0.625,0,1.135,0.508,1.135,1.135V39.79z" fill="url(#SVGID_15_)"/>
+<path d="M45.141,28.398H33.898v-1.411c0-1.2,0.271-2.36,0.813-3.484c0.543-1.122,1.955-2.538,4.24-4.246 c1.324-0.989,2.172-1.764,2.541-2.325c0.369-0.561,0.555-1.121,0.555-1.677c0-0.893-0.32-1.597-0.959-2.108 c-0.639-0.515-1.465-0.771-2.482-0.771c-0.854,0-2.328,0.198-4.42,0.59v-2.086c1.785-0.375,3.35-0.561,4.693-0.561 c1.967,0,3.502,0.434,4.607,1.301c1.102,0.868,1.654,2.052,1.654,3.549c0,0.652-0.135,1.327-0.402,2.023 c-0.27,0.695-0.689,1.332-1.26,1.908c-0.57,0.574-1.395,1.271-2.469,2.086c-1.219,0.911-2.059,1.62-2.52,2.124 c-0.461,0.503-0.813,1.031-1.051,1.582c-0.24,0.553-0.369,1.083-0.389,1.592h8.09V28.398z" fill="#FFFFFF"/>
+<path d="M28.771,6.527h-3.647v36.239c0,0.166,0.018,0.327,0.049,0.482c0.024,0.127,0.066,0.247,0.111,0.366 c0.009,0.025,0.014,0.055,0.024,0.079c0.366,0.896,1.244,1.529,2.272,1.529h4.876V10.213C32.457,8.181,30.804,6.527,28.771,6.527z" opacity="0.1"/>
+<path d="M28.771,7.142h-3.647v35.625c0,0.166,0.018,0.327,0.049,0.482c0.024,0.127,0.066,0.247,0.111,0.366 c0.009,0.025,0.014,0.055,0.024,0.079c0.366,0.896,1.244,1.529,2.272,1.529h4.261V10.213C31.842,8.52,30.465,7.142,28.771,7.142z" opacity="0.25"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="16.7939" x2="16.7939" y1="7.7559" y2="51.8661">
+ <stop offset="0.0667" style="stop-color:#D1D7D9"/>
+ <stop offset="0.2606" style="stop-color:#BDC2C4"/>
+ <stop offset="0.6606" style="stop-color:#949DA1"/>
+ <stop offset="0.9636" style="stop-color:#ADB3B5"/>
+ <stop offset="1" style="stop-color:#595C5E"/>
+</linearGradient>
+<path d="M31.229,49.522c0,1.357-1.1,2.458-2.457,2.458H4.816c-1.356,0-2.457-1.101-2.457-2.458v-39.31 c0-1.357,1.101-2.457,2.457-2.457h23.955c1.357,0,2.457,1.1,2.457,2.457V49.522z" fill="url(#SVGID_16_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="16.7939" x2="16.7939" y1="7.7559" y2="51.0995">
+ <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="M28.771,7.756H4.816c-1.356,0-2.457,1.1-2.457,2.457v39.31c0,0.656,0.26,1.249,0.68,1.689 c-0.039-0.148-0.066-0.302-0.066-0.46v-1.229V11.441v-1.229c0-1.017,0.827-1.843,1.843-1.843h23.955 c1.017,0,1.842,0.826,1.842,1.843v1.229v38.081v1.229c0,0.158-0.025,0.312-0.064,0.46c0.418-0.44,0.68-1.033,0.68-1.689v-39.31 C31.229,8.855,30.129,7.756,28.771,7.756z" fill="url(#SVGID_17_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="16.7939" x2="16.7939" y1="10.8696" y2="40.3126">
+ <stop offset="0" style="stop-color:#B6BBBD"/>
+ <stop offset="1" style="stop-color:#F0FBFF"/>
+</linearGradient>
+<rect fill="url(#SVGID_18_)" height="29.483" opacity="0.6" width="25.184" x="4.202" y="10.826"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="16.7939" x2="16.7939" y1="11.4834" y2="39.6986">
+ <stop offset="0" style="stop-color:#6E6E6E"/>
+ <stop offset="1" style="stop-color:#333333"/>
+</linearGradient>
+<rect fill="url(#SVGID_19_)" height="28.254" width="23.955" x="4.816" y="11.441"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="16.7939" x2="16.7939" y1="12.0547" y2="39.0815">
+ <stop offset="0" style="stop-color:#A6A6A6"/>
+ <stop offset="1" style="stop-color:#585858"/>
+</linearGradient>
+<rect fill="url(#SVGID_20_)" height="27.026" width="22.727" x="5.431" y="12.055"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="16.7939" x2="16.7939" y1="12.5435" y2="22.9495">
+ <stop offset="0" style="stop-color:#D8D8D8"/>
+ <stop offset="1" style="stop-color:#8B8B8B"/>
+</linearGradient>
+<polygon fill="url(#SVGID_21_)" points="28.157,21.27 5.431,23.725 5.431,12.669 28.157,12.669 "/>
+<rect enable-background="new " fill="#FFFFFF" height="0.614" opacity="0.7" width="22.727" x="5.431" y="12.055"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="16.6992" x2="16.6992" y1="40.9492" y2="50.0804">
+ <stop offset="0" style="stop-color:#B6BBBD"/>
+ <stop offset="1" style="stop-color:#FFFFFF"/>
+</linearGradient>
+<path d="M14.479,50.139c-1.316,0-2.387-1.062-2.387-2.363v-4.489 c0-1.303,1.071-2.362,2.387-2.362h4.44c1.315,0,2.387,1.06,2.387,2.362v4.489c0,1.302-1.071,2.363-2.387,2.363H14.479z" fill="url(#SVGID_22_)" opacity="0.6"/>
+<path d="M14.476,49.522c-0.975,0-1.769-0.783-1.769-1.747v-4.489c0-0.965,0.794-1.748,1.769-1.748 h4.447c0.975,0,1.769,0.783,1.769,1.748v4.489c0,0.964-0.794,1.747-1.769,1.747H14.476z" fill="#020202" opacity="0.5"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_23_" x1="16.6992" x2="16.6992" y1="42.1211" y2="48.9199">
+ <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="M20.077,47.775c0,0.626-0.515,1.133-1.149,1.133h-4.457c-0.634,0-1.15-0.507-1.15-1.133v-4.489 c0-0.625,0.516-1.134,1.15-1.134h4.457c0.634,0,1.149,0.509,1.149,1.134V47.775z" fill="url(#SVGID_23_)"/>
+<path d="M15.777,47.68c-0.677,0-1.228-0.55-1.228-1.229v-1.842c0-0.678,0.551-1.229,1.228-1.229h1.843 c0.677,0,1.229,0.551,1.229,1.229v1.842c0,0.679-0.551,1.229-1.229,1.229H15.777z" fill="#020202" opacity="0.2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_24_" x1="16.6997" x2="16.6997" y1="43.9805" y2="47.0723">
+ <stop offset="0.0667" style="stop-color:#D1D7D9"/>
+ <stop offset="0.2606" style="stop-color:#BDC2C4"/>
+ <stop offset="0.6606" style="stop-color:#949DA1"/>
+ <stop offset="0.9636" style="stop-color:#ADB3B5"/>
+ <stop offset="1" style="stop-color:#595C5E"/>
+</linearGradient>
+<path d="M15.777,47.067c-0.337,0-0.613-0.278-0.613-0.616v-1.842c0-0.338,0.276-0.614,0.613-0.614h1.843 c0.337,0,0.614,0.276,0.614,0.614v1.842c0,0.338-0.277,0.616-0.614,0.616H15.777z" fill="url(#SVGID_24_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="6.9185" x2="6.9185" y1="41.5039" y2="48.9209">
+ <stop offset="0" style="stop-color:#B6BBBD"/>
+ <stop offset="1" style="stop-color:#F0FBFF"/>
+</linearGradient>
+<path d="M6.564,48.908c-1.303,0-2.362-1.06-2.362-2.361V43.9c0-1.303,1.06-2.362,2.362-2.362 h0.708c1.303,0,2.362,1.06,2.362,2.362v2.646c0,1.302-1.059,2.361-2.362,2.361H6.564z" fill="url(#SVGID_25_)" opacity="0.4"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_26_" x1="6.9189" x2="6.9189" y1="42.124" y2="48.3067">
+ <stop offset="0" style="stop-color:#231F20"/>
+ <stop offset="1" style="stop-color:#6D6E70"/>
+</linearGradient>
+<path d="M6.564,48.296c-0.964,0-1.748-0.785-1.748-1.749V43.9 c0-0.963,0.784-1.748,1.748-1.748h0.708c0.965,0,1.749,0.785,1.749,1.748v2.646c0,0.964-0.784,1.749-1.749,1.749H6.564z" fill="url(#SVGID_26_)" opacity="0.7"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_27_" x1="6.9185" x2="6.9185" y1="42.7441" y2="47.6885">
+ <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="M8.407,46.547c0,0.626-0.508,1.133-1.134,1.133H6.564c-0.625,0-1.134-0.507-1.134-1.133V43.9 c0-0.627,0.508-1.134,1.134-1.134h0.708c0.626,0,1.134,0.507,1.134,1.134V46.547z" fill="url(#SVGID_27_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_28_" x1="26.1392" x2="26.1392" y1="41.5039" y2="48.9209">
+ <stop offset="0" style="stop-color:#B6BBBD"/>
+ <stop offset="1" style="stop-color:#F0FBFF"/>
+</linearGradient>
+<path d="M25.785,48.908c-1.303,0-2.362-1.06-2.362-2.361V43.9c0-1.303,1.06-2.362,2.362-2.362 h0.708c1.303,0,2.362,1.06,2.362,2.362v2.646c0,1.302-1.06,2.361-2.362,2.361H25.785z" fill="url(#SVGID_28_)" opacity="0.4"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_29_" x1="26.1392" x2="26.1392" y1="42.124" y2="48.3067">
+ <stop offset="0" style="stop-color:#231F20"/>
+ <stop offset="1" style="stop-color:#6D6E70"/>
+</linearGradient>
+<path d="M25.785,48.296c-0.965,0-1.749-0.785-1.749-1.749V43.9 c0-0.963,0.784-1.748,1.749-1.748h0.708c0.964,0,1.748,0.785,1.748,1.748v2.646c0,0.964-0.784,1.749-1.748,1.749H25.785z" fill="url(#SVGID_29_)" opacity="0.7"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_30_" x1="26.1392" x2="26.1392" y1="42.7441" y2="47.6885">
+ <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="M27.627,46.547c0,0.626-0.508,1.133-1.134,1.133h-0.708c-0.626,0-1.134-0.507-1.134-1.133V43.9 c0-0.627,0.508-1.134,1.134-1.134h0.708c0.626,0,1.134,0.507,1.134,1.134V46.547z" fill="url(#SVGID_30_)"/>
+<path d="M22.736,35.155H11.479v-1.944h4.089V20.226l-4.089,0.764v-1.944l5.629-1.856h1.541v16.022h4.088V35.155z" fill="#FFFFFF"/>
+<path d="M53.357,31.105c-0.514-0.514-1.412-0.886-2.137-0.886H35.314c-1.004,0-1.822,0.815-1.822,1.819v13.185h18.043 c1.029,0,1.908-0.634,2.273-1.529c0.01-0.024,0.014-0.052,0.023-0.075c0.045-0.119,0.086-0.241,0.111-0.37 c0.033-0.155,0.049-0.316,0.049-0.482V31.74L53.357,31.105z" opacity="0.1"/>
+<path d="M52.924,31.541c-0.396-0.396-1.145-0.706-1.703-0.706H35.314c-0.666,0-1.207,0.539-1.207,1.204v13.185 h17.428c1.029,0,1.908-0.634,2.273-1.529c0.01-0.024,0.014-0.052,0.023-0.075c0.045-0.119,0.086-0.241,0.111-0.37 c0.033-0.155,0.049-0.316,0.049-0.482V32.609L52.924,31.541z" opacity="0.25"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_31_" x1="46.1797" x2="46.1797" y1="31.418" y2="59.0309">
+ <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="M57.047,59H35.314c-0.328,0-0.594-0.266-0.594-0.592V32.039c0-0.324,0.266-0.591,0.594-0.591h15.906 c0.396,0,0.988,0.247,1.27,0.526l4.625,4.621c0.279,0.282,0.523,0.874,0.523,1.271v20.542C57.639,58.734,57.375,59,57.047,59 L57.047,59z" fill="url(#SVGID_31_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_32_" x1="46.1816" x2="46.1816" y1="32.1338" y2="58.3145">
+ <stop offset="0" style="stop-color:#E6E9E8"/>
+ <stop offset="1" style="stop-color:#ADB2B5"/>
+</linearGradient>
+<path d="M56.957,58.314H35.406V32.134h15.814c0.213,0,0.633,0.174,0.785,0.326l4.625,4.62 c0.15,0.153,0.326,0.572,0.326,0.786V58.314L56.957,58.314z" fill="url(#SVGID_32_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_33_" x1="44.8232" x2="44.8232" y1="56.125" y2="42.3986">
+ <stop offset="0" style="stop-color:#666666"/>
+ <stop offset="1" style="stop-color:#282828"/>
+</linearGradient>
+<rect fill="url(#SVGID_33_)" height="13.831" width="16.127" x="36.76" y="42.347"/>
+<rect fill="#FFFFFF" height="0.685" opacity="0.4" width="16.127" x="36.76" y="56.178"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_34_" x1="39.0664" x2="39.0664" y1="43.0127" y2="55.1728">
+ <stop offset="0" style="stop-color:#FFF173"/>
+ <stop offset="0.33" style="stop-color:#F1BC35"/>
+ <stop offset="0.66" style="stop-color:#E5B029"/>
+ <stop offset="1" style="stop-color:#FFA102"/>
+</linearGradient>
+<rect fill="url(#SVGID_34_)" height="3.772" width="2.934" x="37.6" y="51.523"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_35_" x1="46.2803" x2="46.2803" y1="43.1504" y2="55.0011">
+ <stop offset="0" style="stop-color:#FFF173"/>
+ <stop offset="0.33" style="stop-color:#F1BC35"/>
+ <stop offset="0.66" style="stop-color:#E5B029"/>
+ <stop offset="1" style="stop-color:#FFA102"/>
+</linearGradient>
+<rect fill="url(#SVGID_35_)" height="3.771" width="2.713" x="44.924" y="43.142"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_36_" x1="42.7275" x2="42.7275" y1="43.1504" y2="55.0011">
+ <stop offset="0" style="stop-color:#FFF173"/>
+ <stop offset="0.33" style="stop-color:#F1BC35"/>
+ <stop offset="0.66" style="stop-color:#E5B029"/>
+ <stop offset="1" style="stop-color:#FFA102"/>
+</linearGradient>
+<rect fill="url(#SVGID_36_)" height="3.771" width="2.713" x="41.371" y="43.142"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_37_" x1="50.25" x2="50.25" y1="43.1504" y2="55.0011">
+ <stop offset="0" style="stop-color:#FFF173"/>
+ <stop offset="0.33" style="stop-color:#F1BC35"/>
+ <stop offset="0.66" style="stop-color:#E5B029"/>
+ <stop offset="1" style="stop-color:#FFA102"/>
+</linearGradient>
+<rect fill="url(#SVGID_37_)" height="3.771" width="3.551" x="48.475" y="43.142"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_38_" x1="46.2803" x2="46.2803" y1="43.0127" y2="55.1728">
+ <stop offset="0" style="stop-color:#FFF173"/>
+ <stop offset="0.33" style="stop-color:#F1BC35"/>
+ <stop offset="0.66" style="stop-color:#E5B029"/>
+ <stop offset="1" style="stop-color:#FFA102"/>
+</linearGradient>
+<rect fill="url(#SVGID_38_)" height="3.772" width="2.713" x="44.924" y="51.523"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_39_" x1="42.7275" x2="42.7275" y1="43.0127" y2="55.1728">
+ <stop offset="0" style="stop-color:#FFF173"/>
+ <stop offset="0.33" style="stop-color:#F1BC35"/>
+ <stop offset="0.66" style="stop-color:#E5B029"/>
+ <stop offset="1" style="stop-color:#FFA102"/>
+</linearGradient>
+<rect fill="url(#SVGID_39_)" height="3.772" width="2.713" x="41.371" y="51.523"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_40_" x1="44.8125" x2="44.8125" y1="43.1504" y2="54.9801">
+ <stop offset="0" style="stop-color:#FFF173"/>
+ <stop offset="0.33" style="stop-color:#F1BC35"/>
+ <stop offset="0.66" style="stop-color:#E5B029"/>
+ <stop offset="1" style="stop-color:#FFA102"/>
+</linearGradient>
+<polygon fill="url(#SVGID_40_)" points="40.486,47.752 40.486,43.142 37.6,43.142 37.6,50.685 52.025,50.685 52.025,47.752 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_41_" x1="50.25" x2="50.25" y1="43.0127" y2="55.1728">
+ <stop offset="0" style="stop-color:#FFF173"/>
+ <stop offset="0.33" style="stop-color:#F1BC35"/>
+ <stop offset="0.66" style="stop-color:#E5B029"/>
+ <stop offset="1" style="stop-color:#FFA102"/>
+</linearGradient>
+<rect fill="url(#SVGID_41_)" height="3.772" width="3.551" x="48.475" y="51.523"/>
+<rect fill="none" height="60" width="60"/>
+</g>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_application.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_application.svg Fri May 14 16:09:54 2010 +0300
@@ -1,61 +1,67 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
-<linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 3743.9824)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2266.5317" x2="-2266.5317" y1="-3740.9238" y2="-3730.1428">
-<stop offset="0" style="stop-color:#AFED23"/>
-<stop offset="1" style="stop-color:#7DC51A"/>
-</linearGradient>
-<path d="M53.46,11.174l-2.885-6.015c0,0-0.652-1.714-2.693-2.042H12.091 c-2.04,0.327-2.693,2.042-2.693,2.042l-2.886,6.015c-0.699,0.789-0.862,1.795-0.897,2.395h48.747 C54.326,12.969,54.163,11.963,53.46,11.174z" fill="url(#SVGID_1_)"/>
-<linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 3743.9824)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2266.5195" x2="-2266.5195" y1="-3734.1553" y2="-3685.6365">
-<stop offset="0" style="stop-color:#AFED23"/>
-<stop offset="0.1394" style="stop-color:#AFED23"/>
-<stop offset="0.6909" style="stop-color:#3E8A0D"/>
-<stop offset="0.9515" style="stop-color:#7EF524"/>
-<stop offset="1" style="stop-color:#7EF524"/>
-</linearGradient>
-<path d="M54.386,53.631c0,1.926-1.558,3.484-3.481,3.484H9.099c-1.926,0-3.484-1.561-3.484-3.484V13.567 c0-1.923,1.558-3.483,3.484-3.483h41.806c1.921,0,3.481,1.56,3.481,3.483V53.631L54.386,53.631z" fill="url(#SVGID_2_)"/>
-<linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 3743.9824)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2266.5181" x2="-2266.5181" y1="-3734.0898" y2="-3698.1501">
-<stop offset="0" style="stop-color:#67AD1A"/>
-<stop offset="1" style="stop-color:#358C0C"/>
-</linearGradient>
-<path d="M12.583,44.923h34.835c1.927,0,3.486-1.561,3.486-3.485V10.084H9.099v31.353 C9.099,43.362,10.657,44.923,12.583,44.923z" fill="url(#SVGID_3_)"/>
-<linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 3743.9824)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-2266.5195" x2="-2266.5195" y1="-3702.2539" y2="-3686.2131">
-<stop offset="0" style="stop-color:#358C0C"/>
-<stop offset="0.7758" style="stop-color:#67AD1A"/>
-<stop offset="1" style="stop-color:#AFED23"/>
-</linearGradient>
-<path d="M49.22,44.408c-0.414,0.252-0.873,0.408-1.372,0.469c-0.115,0.027-0.248,0.046-0.43,0.046H12.583 c-0.183,0-0.317-0.019-0.429-0.046c-0.497-0.062-0.96-0.217-1.37-0.469l-4.68,10.979c0.605,1.029,1.714,1.729,2.995,1.729h41.806 c1.28,0,2.386-0.7,2.992-1.729L49.22,44.408z" fill="url(#SVGID_4_)"/>
-<linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 3743.9824)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-2266.5195" x2="-2266.5195" y1="-3702.0195" y2="-3687.3784">
-<stop offset="0" style="stop-color:#0C4A06"/>
-<stop offset="0.3152" style="stop-color:#0A5E1C"/>
-<stop offset="0.7394" style="stop-color:#41AD1A"/>
-<stop offset="1" style="stop-color:#89D920"/>
-</linearGradient>
-<path d="M10.784,46.15c0.41,0.248,0.873,0.409,1.37,0.474 c0.113,0.025,0.249,0.041,0.429,0.041h34.835c0.182,0,0.315-0.016,0.43-0.041c0.499-0.064,0.958-0.223,1.372-0.474l4.199,9.857 c0.177-0.193,0.345-0.393,0.478-0.62L49.22,44.408c-0.412,0.252-0.873,0.408-1.372,0.469c-0.116,0.027-0.248,0.046-0.428,0.046 H12.583c-0.183,0-0.317-0.019-0.429-0.046c-0.497-0.062-0.96-0.217-1.37-0.469l-4.68,10.979c0.13,0.228,0.298,0.43,0.477,0.62 L10.784,46.15z" fill="url(#SVGID_5_)" fill-opacity="0.3" stroke-opacity="0.3"/>
-<linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 3743.9824)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-2266.5181" x2="-2266.5181" y1="-3734.0898" y2="-3698.1499">
-<stop offset="0" style="stop-color:#87CC1F"/>
-<stop offset="0.6182" style="stop-color:#086311"/>
-<stop offset="1" style="stop-color:#06421E"/>
-</linearGradient>
-<path d="M9.099,10.084v31.353c0,1.926,1.558,3.485,3.484,3.485 h34.835c1.927,0,3.486-1.56,3.486-3.485V10.084H9.099z M49.162,41.437c0,0.963-0.786,1.744-1.744,1.744H12.583 c-0.96,0-1.744-0.781-1.744-1.744V11.826h38.323V41.437L49.162,41.437z" fill="url(#SVGID_6_)" fill-opacity="0.3" stroke-opacity="0.3"/>
-<linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 3743.9824)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="-2266.5181" x2="-2266.5181" y1="-3740.9043" y2="-3733.7168">
-<stop offset="0" style="stop-color:#AFED23"/>
-<stop offset="1" style="stop-color:#358C0C"/>
-</linearGradient>
-<path d="M50.904,6.6c0-1.922-1.561-3.482-3.486-3.482H12.583c-1.926,0-3.484,1.56-3.484,3.482v3.484h41.806 V6.6z" fill="url(#SVGID_7_)"/>
-<path d="M9.099,10.084h41.806c1.129,0,2.117,0.546,2.761,1.382 c-0.071-0.099-0.125-0.202-0.205-0.293l-2.885-6.015c0,0-0.652-1.714-2.695-2.042H12.091c-2.04,0.327-2.693,2.042-2.693,2.042 l-2.886,6.015c-0.244,0.275-0.405,0.575-0.538,0.876C6.541,10.89,7.717,10.084,9.099,10.084z" fill="#C7FF5A" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M53.867,11.76c0.016,0.025,0.027,0.053,0.046,0.081C53.896,11.811,53.883,11.788,53.867,11.76z" fill="#C7FF5A"/>
-<path d="M5.826,12.412c-0.01,0.023-0.017,0.048-0.023,0.074C5.812,12.461,5.816,12.435,5.826,12.412z" fill="#C7FF5A"/>
-<linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 3743.9824)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="-2266.5195" x2="-2266.5195" y1="-3734.1553" y2="-3685.636">
-<stop offset="0" style="stop-color:#D4FFA8"/>
-<stop offset="0.6848" style="stop-color:#75D911"/>
-<stop offset="1" style="stop-color:#7EF524"/>
-</linearGradient>
-<path d="M50.904,10.084H9.099c-1.926,0-3.484,1.56-3.484,3.483v40.064c0,1.926,1.558,3.484,3.484,3.484 h41.806c1.921,0,3.481-1.561,3.481-3.484V13.567C54.386,11.645,52.828,10.084,50.904,10.084z M52.646,53.631 c0,0.964-0.786,1.745-1.742,1.745H9.099c-0.958,0-1.744-0.781-1.744-1.745V13.567c0-0.961,0.784-1.741,1.744-1.741h41.806 c0.956,0,1.741,0.781,1.741,1.741L52.646,53.631L52.646,53.631z" fill="url(#SVGID_8_)"/>
+
+ <linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 3743.9824)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2266.5317" x2="-2266.5317" y1="-3740.9238" y2="-3730.1428">
+ <stop offset="0" style="stop-color:#AFED23"/>
+ <stop offset="1" style="stop-color:#7DC51A"/>
+ </linearGradient>
+ <path d="M53.46,11.174l-2.885-6.015c0,0-0.652-1.714-2.693-2.042H12.091 c-2.04,0.327-2.693,2.042-2.693,2.042l-2.886,6.015c-0.699,0.789-0.862,1.795-0.897,2.395h48.747 C54.326,12.969,54.163,11.963,53.46,11.174z" fill="url(#SVGID_1_)"/>
+
+ <linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 3743.9824)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2266.5195" x2="-2266.5195" y1="-3734.1553" y2="-3685.6365">
+ <stop offset="0.1394" style="stop-color:#AFED23"/>
+ <stop offset="0.6909" style="stop-color:#3E8A0D"/>
+ <stop offset="0.9515" style="stop-color:#7EF524"/>
+ </linearGradient>
+ <path d="M54.386,53.631c0,1.926-1.558,3.484-3.481,3.484H9.099c-1.926,0-3.484-1.561-3.484-3.484V13.567 c0-1.923,1.558-3.483,3.484-3.483h41.806c1.921,0,3.481,1.56,3.481,3.483V53.631L54.386,53.631z" fill="url(#SVGID_2_)"/>
+
+ <linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 3743.9824)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2266.5181" x2="-2266.5181" y1="-3734.0898" y2="-3698.1501">
+ <stop offset="0" style="stop-color:#67AD1A"/>
+ <stop offset="1" style="stop-color:#358C0C"/>
+ </linearGradient>
+ <path d="M12.583,44.923h34.835c1.927,0,3.486-1.561,3.486-3.485V10.084H9.099v31.353 C9.099,43.362,10.657,44.923,12.583,44.923z" fill="url(#SVGID_3_)"/>
+
+ <linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 3743.9824)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-2266.5195" x2="-2266.5195" y1="-3702.2539" y2="-3686.2131">
+ <stop offset="0" style="stop-color:#358C0C"/>
+ <stop offset="0.7758" style="stop-color:#67AD1A"/>
+ <stop offset="1" style="stop-color:#AFED23"/>
+ </linearGradient>
+ <path d="M49.22,44.408c-0.414,0.252-0.873,0.408-1.372,0.469c-0.115,0.027-0.248,0.046-0.43,0.046H12.583 c-0.183,0-0.317-0.019-0.429-0.046c-0.497-0.062-0.96-0.217-1.37-0.469l-4.68,10.979c0.605,1.029,1.714,1.729,2.995,1.729h41.806 c1.28,0,2.386-0.7,2.992-1.729L49.22,44.408z" fill="url(#SVGID_4_)"/>
+
+ <linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 3743.9824)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-2266.5195" x2="-2266.5195" y1="-3702.0195" y2="-3687.3784">
+ <stop offset="0" style="stop-color:#0C4A06"/>
+ <stop offset="0.3152" style="stop-color:#0A5E1C"/>
+ <stop offset="0.7394" style="stop-color:#41AD1A"/>
+ <stop offset="1" style="stop-color:#89D920"/>
+ </linearGradient>
+ <path d="M10.784,46.15c0.41,0.248,0.873,0.409,1.37,0.474 c0.113,0.025,0.249,0.041,0.429,0.041h34.835c0.182,0,0.315-0.016,0.43-0.041c0.499-0.064,0.958-0.223,1.372-0.474l4.199,9.857 c0.177-0.193,0.345-0.393,0.478-0.62L49.22,44.408c-0.412,0.252-0.873,0.408-1.372,0.469c-0.116,0.027-0.248,0.046-0.428,0.046 H12.583c-0.183,0-0.317-0.019-0.429-0.046c-0.497-0.062-0.96-0.217-1.37-0.469l-4.68,10.979c0.13,0.228,0.298,0.43,0.477,0.62 L10.784,46.15z" enable-background="new " fill="url(#SVGID_5_)" opacity="0.3"/>
+
+ <linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 3743.9824)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-2266.5181" x2="-2266.5181" y1="-3734.0898" y2="-3698.1499">
+ <stop offset="0" style="stop-color:#87CC1F"/>
+ <stop offset="0.6182" style="stop-color:#086311"/>
+ <stop offset="1" style="stop-color:#06421E"/>
+ </linearGradient>
+ <path d="M9.099,10.084v31.353c0,1.926,1.558,3.485,3.484,3.485 h34.835c1.927,0,3.486-1.56,3.486-3.485V10.084H9.099z M49.162,41.437c0,0.963-0.786,1.744-1.744,1.744H12.583 c-0.96,0-1.744-0.781-1.744-1.744V11.826h38.323V41.437L49.162,41.437z" enable-background="new " fill="url(#SVGID_6_)" opacity="0.3"/>
+
+ <linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 3743.9824)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="-2266.5181" x2="-2266.5181" y1="-3740.9043" y2="-3733.7168">
+ <stop offset="0" style="stop-color:#AFED23"/>
+ <stop offset="1" style="stop-color:#358C0C"/>
+ </linearGradient>
+ <path d="M50.904,6.6c0-1.922-1.561-3.482-3.486-3.482H12.583c-1.926,0-3.484,1.56-3.484,3.482v3.484h41.806 V6.6z" fill="url(#SVGID_7_)"/>
+ <path d="M9.099,10.084h41.806c1.129,0,2.117,0.546,2.761,1.382 c-0.071-0.099-0.125-0.202-0.205-0.293l-2.885-6.015c0,0-0.652-1.714-2.695-2.042H12.091c-2.04,0.327-2.693,2.042-2.693,2.042 l-2.886,6.015c-0.244,0.275-0.405,0.575-0.538,0.876C6.541,10.89,7.717,10.084,9.099,10.084z" enable-background="new " fill="#C7FF5A" opacity="0.5"/>
+ <path d="M53.867,11.76c0.016,0.025,0.027,0.053,0.046,0.081C53.896,11.811,53.883,11.788,53.867,11.76z" fill="#C7FF5A"/>
+ <path d="M5.826,12.412c-0.01,0.023-0.017,0.048-0.023,0.074C5.812,12.461,5.816,12.435,5.826,12.412z" fill="#C7FF5A"/>
+
+ <linearGradient gradientTransform="matrix(1 0 0 1 2296.5195 3743.9824)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="-2266.5195" x2="-2266.5195" y1="-3734.1553" y2="-3685.636">
+ <stop offset="0" style="stop-color:#D4FFA8"/>
+ <stop offset="0.6848" style="stop-color:#75D911"/>
+ <stop offset="1" style="stop-color:#7EF524"/>
+ </linearGradient>
+ <path d="M50.904,10.084H9.099c-1.926,0-3.484,1.56-3.484,3.483v40.064c0,1.926,1.558,3.484,3.484,3.484 h41.806c1.921,0,3.481-1.561,3.481-3.484V13.567C54.386,11.645,52.828,10.084,50.904,10.084z M52.646,53.631 c0,0.964-0.786,1.745-1.742,1.745H9.099c-0.958,0-1.744-0.781-1.744-1.745V13.567c0-0.961,0.784-1.741,1.744-1.741h41.806 c0.956,0,1.741,0.781,1.741,1.741L52.646,53.631L52.646,53.631z" fill="url(#SVGID_8_)"/>
</g>
<rect fill="none" height="60" width="60"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_applications_download.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_applications_download.svg Fri May 14 16:09:54 2010 +0300
@@ -1,44 +1,47 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<stop offset="0" style="stop-color:#D49757"/>
-<stop offset="0.6182" style="stop-color:#8A4117"/>
-<stop offset="1" style="stop-color:#702200"/>
+ <stop offset="0" style="stop-color:#D49757"/>
+ <stop offset="0.6182" style="stop-color:#8A4117"/>
+ <stop offset="1" style="stop-color:#702200"/>
</linearGradient>
<path d="M53.646,12.358c0,0-22.377,0-22.842,0c-0.463,0-1.002-0.202-1.332-1.01 c-0.207-0.705-0.764-2.297-0.764-2.297c-0.211-0.652-0.494-1.234-1.436-1.234H6.697c-0.824,0-1.428,0.7-1.428,1.562v14.438h49.814 v-9.968C55.084,12.989,54.473,12.358,53.646,12.358z" fill="url(#SVGID_1_)"/>
-<path d="M53.646,12.358c0,0-22.377,0-22.842,0 c-0.463,0-1.002-0.202-1.332-1.01c-0.207-0.705-0.764-2.297-0.764-2.297c-0.211-0.652-0.494-1.234-1.436-1.234H6.697 c-0.824,0-1.428,0.7-1.428,1.562v0.727c0-0.861,0.604-1.562,1.428-1.562h20.576c0.941,0,1.225,0.584,1.436,1.236 c0,0,0.557,1.591,0.764,2.296c0.33,0.806,0.869,1.011,1.332,1.011c0.465,0,22.842,0,22.842,0c0.826,0,1.439,0.628,1.439,1.489 v-0.728C55.084,12.989,54.473,12.358,53.646,12.358z" fill="#FFF7F5" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M53.646,12.358c0,0-22.377,0-22.842,0 c-0.463,0-1.002-0.202-1.332-1.01c-0.207-0.705-0.764-2.297-0.764-2.297c-0.211-0.652-0.494-1.234-1.436-1.234H6.697 c-0.824,0-1.428,0.7-1.428,1.562v0.727c0-0.861,0.604-1.562,1.428-1.562h20.576c0.941,0,1.225,0.584,1.436,1.236 c0,0,0.557,1.591,0.764,2.296c0.33,0.806,0.869,1.011,1.332,1.011c0.465,0,22.842,0,22.842,0c0.826,0,1.439,0.628,1.439,1.489 v-0.728C55.084,12.989,54.473,12.358,53.646,12.358z" enable-background="new " fill="#FFF7F5" opacity="0.5"/>
<rect height="8.728" width="46.906" x="6.73" y="15.817"/>
<rect fill="#F2F2F2" height="7.271" width="45.451" x="7.457" y="16.545"/>
-<polygon fill="#231F20" fill-opacity="0.4" points="55.084,22.362 5.27,22.362 5.27,21.636 55.084,21.636 " stroke-opacity="0.4"/>
-<polygon fill="#231F20" fill-opacity="0.15" points="55.084,21.636 5.27,21.636 5.27,20.908 55.084,20.908 " stroke-opacity="0.15"/>
-<polygon fill="#231F20" fill-opacity="0.05" points="55.084,20.908 5.27,20.908 5.27,20.182 55.084,20.182 " stroke-opacity="0.05"/>
+<polygon enable-background="new " fill="#231F20" opacity="0.4" points="55.084,22.362 5.27,22.362 5.27,21.636 55.084,21.636 "/>
+<polygon enable-background="new " fill="#231F20" opacity="0.15" points="55.084,21.636 5.27,21.636 5.27,20.908 55.084,20.908 "/>
+<polygon enable-background="new " fill="#231F20" opacity="0.05" points="55.084,20.908 5.27,20.908 5.27,20.182 55.084,20.182 "/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 4100.9688)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2164" x2="-2164" y1="4048.7861" y2="4078.6064">
-<stop offset="0" style="stop-color:#C79101"/>
-<stop offset="0.0303" style="stop-color:#C79101"/>
-<stop offset="0.0364" style="stop-color:#FEEFA7"/>
-<stop offset="0.3273" style="stop-color:#FEE570"/>
-<stop offset="0.6727" style="stop-color:#F0C12B"/>
-<stop offset="1" style="stop-color:#E6A501"/>
+ <stop offset="0.0303" style="stop-color:#C79101"/>
+ <stop offset="0.0364" style="stop-color:#FEEFA7"/>
+ <stop offset="0.3273" style="stop-color:#FEE570"/>
+ <stop offset="0.6727" style="stop-color:#F0C12B"/>
+ <stop offset="1" style="stop-color:#E6A501"/>
</linearGradient>
<path d="M56.273,22.362H3.727C2.191,22.362,2,24.065,2,24.065l2.549,25.934 c0.307,2.028,1.822,2.184,2.182,2.184c0.072,0,46.465,0,46.539,0c0.357,0,1.875-0.155,2.18-2.184L58,24.065 C58,24.065,57.809,22.362,56.273,22.362z" fill="url(#SVGID_2_)"/>
<path d="M3.727,23.091h52.547c1.178,0,1.563,0.995,1.68,1.464L58,24.065c0,0-0.191-1.703-1.727-1.703H3.727 C2.191,22.362,2,24.065,2,24.065l0.047,0.489C2.164,24.086,2.549,23.091,3.727,23.091z" fill="#FCF3D0"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 4100.9688)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2164.0166" x2="-2164.0166" y1="4048.7861" y2="4053.1504">
-<stop offset="0" style="stop-color:#FCDA5E"/>
-<stop offset="1" style="stop-color:#FFB418"/>
+ <stop offset="0" style="stop-color:#FCDA5E"/>
+ <stop offset="1" style="stop-color:#FFB418"/>
</linearGradient>
-<path d="M4.334,47.818l0.215,2.181 c0.307,2.028,1.822,2.184,2.182,2.184c0.072,0,46.465,0,46.539,0c0.357,0,1.875-0.155,2.18-2.184l0.184-2.181H4.334z" fill="url(#SVGID_3_)" fill-opacity="0.25" stroke-opacity="0.25"/>
+<path d="M4.334,47.818l0.215,2.181 c0.307,2.028,1.822,2.184,2.182,2.184c0.072,0,46.465,0,46.539,0c0.357,0,1.875-0.155,2.18-2.184l0.184-2.181H4.334z" enable-background="new " fill="url(#SVGID_3_)" opacity="0.25"/>
<rect fill="none" height="59.999" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<polygon fill="none" points="30.096,0 0.096,0 0.096,14.833 0,14.833 0.096,14.933 0.096,30 14.601,30 15.021,30.438 15.447,30 30.096,30 30.096,14.963 30.215,14.841 30.096,14.841 "/>
-<polygon fill-opacity="0.35" points="0,14.833 3.596,14.828 3.625,14.859 8.375,14.859 8.375,0 21.73,0.001 21.73,14.843 30.215,14.841 15.021,30.438 " stroke-opacity="0.35"/>
+<polygon opacity="0.35" points="0,14.833 3.596,14.828 3.625,14.859 8.375,14.859 8.375,0 21.73,0.001 21.73,14.843 30.215,14.841 15.021,30.438 "/>
<linearGradient gradientTransform="matrix(1 1.000000e-004 1.000000e-004 -1 2191.3389 2985.8491)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-2176.5142" x2="-2176.5142" y1="2984.646" y2="2957.3247">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+ <stop offset="0" style="stop-color:#C6FF45"/>
+ <stop offset="0.7273" style="stop-color:#66A00E"/>
+ <stop offset="1" style="stop-color:#387300"/>
</linearGradient>
<polygon fill="url(#SVGID_1__)" points="2.846,15.859 15.025,28.575 27.398,15.845 20.732,15.843 20.727,1.292 9.375,1.291 9.375,15.859 "/>
<line fill="none" x1="20.727" x2="9.375" y1="1.297" y2="1.296"/>
@@ -46,10 +49,10 @@
<polygon fill="#E7FFB9" points="20.555,15.867 27.527,15.867 27,16.458 20.555,16.458 "/>
<polygon fill="#E7FFB9" points="2.459,15.859 9.365,15.859 9.365,16.451 3.08,16.451 "/>
<linearGradient gradientTransform="matrix(1 1.000000e-004 1.000000e-004 -1 2191.3389 2985.8491)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-2165.6621" x2="-2187.9482" y1="2963.2173" y2="2963.2173">
-<stop offset="0" style="stop-color:#AAE535"/>
-<stop offset="1" style="stop-color:#5D9C0A"/>
+ <stop offset="0" style="stop-color:#AAE535"/>
+ <stop offset="1" style="stop-color:#5D9C0A"/>
</linearGradient>
<polygon fill="url(#SVGID_2__)" points="27.016,15.844 15.025,28.15 3.172,15.829 2.348,15.83 15.025,29 27.842,15.844 "/>
<rect fill="none" height="30" width="30" x="0.096"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_applications_games.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_applications_games.svg Fri May 14 16:09:54 2010 +0300
@@ -1,269 +1,267 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<stop offset="0" style="stop-color:#D49757"/>
-<stop offset="0.6182" style="stop-color:#8A4117"/>
-<stop offset="1" style="stop-color:#702200"/>
+ <stop offset="0" style="stop-color:#D49757"/>
+ <stop offset="0.6182" style="stop-color:#8A4117"/>
+ <stop offset="1" style="stop-color:#702200"/>
</linearGradient>
<path d="M53.646,12.358c0,0-22.377,0-22.842,0c-0.463,0-1.002-0.202-1.332-1.01 c-0.207-0.705-0.764-2.297-0.764-2.297c-0.211-0.652-0.494-1.234-1.436-1.234H6.697c-0.824,0-1.428,0.7-1.428,1.562v14.438h49.814 v-9.968C55.084,12.989,54.473,12.358,53.646,12.358z" fill="url(#SVGID_1_)"/>
-<path d="M53.646,12.358c0,0-22.377,0-22.842,0 c-0.463,0-1.002-0.202-1.332-1.01c-0.207-0.705-0.764-2.297-0.764-2.297c-0.211-0.652-0.494-1.234-1.436-1.234H6.697 c-0.824,0-1.428,0.7-1.428,1.562v0.727c0-0.861,0.604-1.562,1.428-1.562h20.576c0.941,0,1.225,0.584,1.436,1.236 c0,0,0.557,1.591,0.764,2.296c0.33,0.806,0.869,1.011,1.332,1.011c0.465,0,22.842,0,22.842,0c0.826,0,1.439,0.628,1.439,1.489 v-0.728C55.084,12.989,54.473,12.358,53.646,12.358z" fill="#FFF7F5" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M53.646,12.358c0,0-22.377,0-22.842,0 c-0.463,0-1.002-0.202-1.332-1.01c-0.207-0.705-0.764-2.297-0.764-2.297c-0.211-0.652-0.494-1.234-1.436-1.234H6.697 c-0.824,0-1.428,0.7-1.428,1.562v0.727c0-0.861,0.604-1.562,1.428-1.562h20.576c0.941,0,1.225,0.584,1.436,1.236 c0,0,0.557,1.591,0.764,2.296c0.33,0.806,0.869,1.011,1.332,1.011c0.465,0,22.842,0,22.842,0c0.826,0,1.439,0.628,1.439,1.489 v-0.728C55.084,12.989,54.473,12.358,53.646,12.358z" enable-background="new " fill="#FFF7F5" opacity="0.5"/>
<rect height="8.728" width="46.906" x="6.73" y="15.817"/>
<rect fill="#F2F2F2" height="7.271" width="45.451" x="7.457" y="16.545"/>
-<polygon fill="#231F20" fill-opacity="0.4" points="55.084,22.362 5.27,22.362 5.27,21.636 55.084,21.636 " stroke-opacity="0.4"/>
-<polygon fill="#231F20" fill-opacity="0.15" points="55.084,21.636 5.27,21.636 5.27,20.908 55.084,20.908 " stroke-opacity="0.15"/>
-<polygon fill="#231F20" fill-opacity="0.05" points="55.084,20.908 5.27,20.908 5.27,20.182 55.084,20.182 " stroke-opacity="0.05"/>
+<polygon enable-background="new " fill="#231F20" opacity="0.4" points="55.084,22.362 5.27,22.362 5.27,21.636 55.084,21.636 "/>
+<polygon enable-background="new " fill="#231F20" opacity="0.15" points="55.084,21.636 5.27,21.636 5.27,20.908 55.084,20.908 "/>
+<polygon enable-background="new " fill="#231F20" opacity="0.05" points="55.084,20.908 5.27,20.908 5.27,20.182 55.084,20.182 "/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 4100.9688)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2164" x2="-2164" y1="4048.7861" y2="4078.6064">
-<stop offset="0" style="stop-color:#C79101"/>
-<stop offset="0.0303" style="stop-color:#C79101"/>
-<stop offset="0.0364" style="stop-color:#FEEFA7"/>
-<stop offset="0.3273" style="stop-color:#FEE570"/>
-<stop offset="0.6727" style="stop-color:#F0C12B"/>
-<stop offset="1" style="stop-color:#E6A501"/>
+ <stop offset="0.0303" style="stop-color:#C79101"/>
+ <stop offset="0.0364" style="stop-color:#FEEFA7"/>
+ <stop offset="0.3273" style="stop-color:#FEE570"/>
+ <stop offset="0.6727" style="stop-color:#F0C12B"/>
+ <stop offset="1" style="stop-color:#E6A501"/>
</linearGradient>
<path d="M56.273,22.362H3.727C2.191,22.362,2,24.065,2,24.065l2.549,25.934 c0.307,2.028,1.822,2.184,2.182,2.184c0.072,0,46.465,0,46.539,0c0.357,0,1.875-0.155,2.18-2.184L58,24.065 C58,24.065,57.809,22.362,56.273,22.362z" fill="url(#SVGID_2_)"/>
<path d="M3.727,23.091h52.547c1.178,0,1.563,0.995,1.68,1.464L58,24.065c0,0-0.191-1.703-1.727-1.703H3.727 C2.191,22.362,2,24.065,2,24.065l0.047,0.489C2.164,24.086,2.549,23.091,3.727,23.091z" fill="#FCF3D0"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 4100.9688)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2164.0166" x2="-2164.0166" y1="4048.7861" y2="4053.1504">
-<stop offset="0" style="stop-color:#FCDA5E"/>
-<stop offset="1" style="stop-color:#FFB418"/>
+ <stop offset="0" style="stop-color:#FCDA5E"/>
+ <stop offset="1" style="stop-color:#FFB418"/>
</linearGradient>
-<path d="M4.334,47.818l0.215,2.181 c0.307,2.028,1.822,2.184,2.182,2.184c0.072,0,46.465,0,46.539,0c0.357,0,1.875-0.155,2.18-2.184l0.184-2.181H4.334z" fill="url(#SVGID_3_)" fill-opacity="0.25" stroke-opacity="0.25"/>
+<path d="M4.334,47.818l0.215,2.181 c0.307,2.028,1.822,2.184,2.182,2.184c0.072,0,46.465,0,46.539,0c0.357,0,1.875-0.155,2.18-2.184l0.184-2.181H4.334z" enable-background="new " fill="url(#SVGID_3_)" opacity="0.25"/>
<rect fill="none" height="59.999" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
-<path d="M26.458,25.825c-1.436,0-2.695-0.801-3.367-2.143c-0.775-1.542-2.788-6.932-2.788-6.932 c-0.324-0.144-0.635-0.312-0.932-0.503h-8.742c-0.348,0.224-0.715,0.417-1.1,0.576c0,0-1.844,5.316-2.617,6.86 c-0.674,1.342-1.933,2.143-3.368,2.143c-1.565,0-2.854-0.985-3.138-2.395C0.088,21.848,0,10.468,0,10.468 c0.014-3.823,3.107-6.905,6.896-6.905c1.332,0,2.617,0.381,3.734,1.105h8.738c1.117-0.725,2.403-1.105,3.735-1.105 c3.451,0,6.322,2.556,6.818,5.874c0,0-0.121,12.96-0.328,13.995C29.313,24.84,28.022,25.825,26.458,25.825L26.458,25.825z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M26.458,25.825c-1.436,0-2.695-0.801-3.367-2.143c-0.775-1.542-2.788-6.932-2.788-6.932 c-0.324-0.144-0.635-0.312-0.932-0.503h-8.742c-0.348,0.224-0.715,0.417-1.1,0.576c0,0-1.844,5.316-2.617,6.86 c-0.674,1.342-1.933,2.143-3.368,2.143c-1.565,0-2.854-0.985-3.138-2.395C0.088,21.848,0,10.468,0,10.468 c0.014-3.823,3.107-6.905,6.896-6.905c1.332,0,2.617,0.381,3.734,1.105h8.738c1.117-0.725,2.403-1.105,3.735-1.105 c3.451,0,6.322,2.556,6.818,5.874c0,0-0.121,12.96-0.328,13.995C29.313,24.84,28.022,25.825,26.458,25.825L26.458,25.825z" opacity="0.35"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-2179.1841" x2="-2179.1841" y1="3223.6826" y2="3213.8577">
-<stop offset="0" style="stop-color:#E9F0F2"/>
-<stop offset="0.0424" style="stop-color:#E9F0F2"/>
-<stop offset="0.5394" style="stop-color:#A8B2B8"/>
-<stop offset="1" style="stop-color:#A1AAAD"/>
+ <stop offset="0.0424" style="stop-color:#E9F0F2"/>
+ <stop offset="0.5394" style="stop-color:#A8B2B8"/>
+ <stop offset="1" style="stop-color:#A1AAAD"/>
</linearGradient>
<rect fill="url(#SVGID_1__)" height="9.579" width="12.896" x="8.368" y="5.668"/>
<rect fill="#FFFFFF" height="0.368" width="12.526" x="8.737" y="5.668"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-2193.1895" x2="-2186.1226" y1="3212.127" y2="3210.9614">
-<stop offset="0" style="stop-color:#949899"/>
-<stop offset="0.3273" style="stop-color:#B0B5B8"/>
-<stop offset="0.7212" style="stop-color:#848D8F"/>
-<stop offset="1" style="stop-color:#8A9294"/>
+ <stop offset="0" style="stop-color:#949899"/>
+ <stop offset="0.3273" style="stop-color:#B0B5B8"/>
+ <stop offset="0.7212" style="stop-color:#848D8F"/>
+ <stop offset="1" style="stop-color:#8A9294"/>
</linearGradient>
<path d="M1,10.437c0,0,0,10.875,0.387,12.798c0.386,1.924,3.473,2.309,4.631,0 c1.158-2.309,3.088-7.796,3.088-7.796s-1.543-3.848-3.473-4.616C3.703,10.052,1,10.437,1,10.437z" fill="url(#SVGID_2__)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="-2193.2305" x2="-2186.1636" y1="3211.8779" y2="3210.7124">
-<stop offset="0" style="stop-color:#646263"/>
-<stop offset="0.2" style="stop-color:#303030"/>
-<stop offset="0.7212" style="stop-color:#141414"/>
-<stop offset="1" style="stop-color:#262626"/>
+ <stop offset="0" style="stop-color:#646263"/>
+ <stop offset="0.2" style="stop-color:#303030"/>
+ <stop offset="0.7212" style="stop-color:#141414"/>
+ <stop offset="1" style="stop-color:#262626"/>
</linearGradient>
-<path d="M6.018,22.615c-1.158,2.308-4.245,1.924-4.631,0 c-0.331-1.648-0.378-9.855-0.385-12.178H1c0,0,0,10.875,0.387,12.798c0.386,1.924,3.473,2.309,4.631,0 c1.158-2.309,3.088-7.796,3.088-7.796s-0.041-0.104-0.119-0.281C8.547,16.383,7.003,20.649,6.018,22.615z" fill="url(#SVGID_3__)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M6.018,22.615c-1.158,2.308-4.245,1.924-4.631,0 c-0.331-1.648-0.378-9.855-0.385-12.178H1c0,0,0,10.875,0.387,12.798c0.386,1.924,3.473,2.309,4.631,0 c1.158-2.309,3.088-7.796,3.088-7.796s-0.041-0.104-0.119-0.281C8.547,16.383,7.003,20.649,6.018,22.615z" enable-background="new " fill="url(#SVGID_3__)" opacity="0.3"/>
<linearGradient gradientTransform="matrix(-1 0 0 -1 -3497.2295 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-3526.4194" x2="-3519.3518" y1="3212.127" y2="3210.9612">
-<stop offset="0" style="stop-color:#949899"/>
-<stop offset="0.3273" style="stop-color:#B0B5B8"/>
-<stop offset="0.7212" style="stop-color:#848D8F"/>
-<stop offset="1" style="stop-color:#8A9294"/>
+ <stop offset="0" style="stop-color:#949899"/>
+ <stop offset="0.3273" style="stop-color:#B0B5B8"/>
+ <stop offset="0.7212" style="stop-color:#848D8F"/>
+ <stop offset="1" style="stop-color:#8A9294"/>
</linearGradient>
<path d="M29,10.437c0,0,0,10.875-0.387,12.798c-0.385,1.924-3.473,2.309-4.631,0 c-1.158-2.309-3.088-7.796-3.088-7.796s1.545-3.848,3.475-4.616C26.299,10.052,29,10.437,29,10.437z" fill="url(#SVGID_4_)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-2172.3784" x2="-2165.251" y1="3212.6367" y2="3211.4612">
-<stop offset="0" style="stop-color:#646263"/>
-<stop offset="0.2" style="stop-color:#303030"/>
-<stop offset="0.7212" style="stop-color:#141414"/>
-<stop offset="1" style="stop-color:#262626"/>
+ <stop offset="0" style="stop-color:#646263"/>
+ <stop offset="0.2" style="stop-color:#303030"/>
+ <stop offset="0.7212" style="stop-color:#141414"/>
+ <stop offset="1" style="stop-color:#262626"/>
</linearGradient>
-<path d="M28.614,22.615c-0.385,1.924-3.473,2.308-4.631,0 c-0.986-1.965-2.53-6.231-2.967-7.458c-0.078,0.177-0.121,0.281-0.121,0.281s1.93,5.487,3.088,7.796 c1.158,2.309,4.246,1.924,4.631,0C29,21.312,29,10.437,29,10.437l0,0C28.993,12.76,28.946,20.967,28.614,22.615z" fill="url(#SVGID_5_)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M28.614,22.615c-0.385,1.924-3.473,2.308-4.631,0 c-0.986-1.965-2.53-6.231-2.967-7.458c-0.078,0.177-0.121,0.281-0.121,0.281s1.93,5.487,3.088,7.796 c1.158,2.309,4.246,1.924,4.631,0C29,21.312,29,10.437,29,10.437l0,0C28.993,12.76,28.946,20.967,28.614,22.615z" enable-background="new " fill="url(#SVGID_5_)" opacity="0.3"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-2183.0532" x2="-2183.0532" y1="3223.5195" y2="3214.0896">
-<stop offset="0" style="stop-color:#646263"/>
-<stop offset="0.2" style="stop-color:#303030"/>
-<stop offset="0.7212" style="stop-color:#141414"/>
-<stop offset="1" style="stop-color:#262626"/>
+ <stop offset="0" style="stop-color:#646263"/>
+ <stop offset="0.2" style="stop-color:#303030"/>
+ <stop offset="0.7212" style="stop-color:#141414"/>
+ <stop offset="1" style="stop-color:#262626"/>
</linearGradient>
-<path d="M8.368,15.247h3.101c1.265-1.209,2.057-2.907,2.057-4.79 c0-1.884-0.792-3.581-2.057-4.79H8.368V15.247z" fill="url(#SVGID_6_)" fill-opacity="0.05" stroke-opacity="0.05"/>
+<path d="M8.368,15.247h3.101c1.265-1.209,2.057-2.907,2.057-4.79 c0-1.884-0.792-3.581-2.057-4.79H8.368V15.247z" enable-background="new " fill="url(#SVGID_6_)" opacity="0.05"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="-2183.2368" x2="-2183.2368" y1="3223.5195" y2="3214.0896">
-<stop offset="0" style="stop-color:#646263"/>
-<stop offset="0.2" style="stop-color:#303030"/>
-<stop offset="0.7212" style="stop-color:#141414"/>
-<stop offset="1" style="stop-color:#262626"/>
+ <stop offset="0" style="stop-color:#646263"/>
+ <stop offset="0.2" style="stop-color:#303030"/>
+ <stop offset="0.7212" style="stop-color:#141414"/>
+ <stop offset="1" style="stop-color:#262626"/>
</linearGradient>
-<path d="M8.368,15.247h2.556c1.364-1.149,2.234-2.87,2.234-4.79 c0-1.92-0.87-3.64-2.234-4.79H8.368V15.247z" fill="url(#SVGID_7_)" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M8.368,15.247h2.556c1.364-1.149,2.234-2.87,2.234-4.79 c0-1.92-0.87-3.64-2.234-4.79H8.368V15.247z" enable-background="new " fill="url(#SVGID_7_)" opacity="0.1"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="-2188.9473" x2="-2188.9473" y1="3218.873" y2="3212.23">
-<stop offset="0" style="stop-color:#646263"/>
-<stop offset="0.2" style="stop-color:#303030"/>
-<stop offset="0.7212" style="stop-color:#141414"/>
-<stop offset="1" style="stop-color:#262626"/>
+ <stop offset="0" style="stop-color:#646263"/>
+ <stop offset="0.2" style="stop-color:#303030"/>
+ <stop offset="0.7212" style="stop-color:#141414"/>
+ <stop offset="1" style="stop-color:#262626"/>
</linearGradient>
-<path d="M5.633,10.822C3.703,10.052,1,10.437,1,10.437 s0,1.299,0.016,3.077c1.108,2.121,3.326,3.575,5.881,3.575c0.587,0,1.154-0.085,1.697-0.229c0.311-0.85,0.512-1.421,0.512-1.421 S7.563,11.591,5.633,10.822z" fill="url(#SVGID_8_)" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M5.633,10.822C3.703,10.052,1,10.437,1,10.437 s0,1.299,0.016,3.077c1.108,2.121,3.326,3.575,5.881,3.575c0.587,0,1.154-0.085,1.697-0.229c0.311-0.85,0.512-1.421,0.512-1.421 S7.563,11.591,5.633,10.822z" enable-background="new " fill="url(#SVGID_8_)" opacity="0.1"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="-2188.9473" x2="-2188.9473" y1="3218.877" y2="3212.5967">
-<stop offset="0" style="stop-color:#646263"/>
-<stop offset="0.2" style="stop-color:#303030"/>
-<stop offset="0.7212" style="stop-color:#141414"/>
-<stop offset="1" style="stop-color:#262626"/>
+ <stop offset="0" style="stop-color:#646263"/>
+ <stop offset="0.2" style="stop-color:#303030"/>
+ <stop offset="0.7212" style="stop-color:#141414"/>
+ <stop offset="1" style="stop-color:#262626"/>
</linearGradient>
-<path d="M5.633,10.822C3.703,10.052,1,10.437,1,10.437 s0,0.86,0.009,2.139c0.873,2.413,3.179,4.146,5.888,4.146c0.643,0,1.266-0.1,1.851-0.281c0.221-0.611,0.358-1.001,0.358-1.001 S7.563,11.591,5.633,10.822z" fill="url(#SVGID_9_)" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M5.633,10.822C3.703,10.052,1,10.437,1,10.437 s0,0.86,0.009,2.139c0.873,2.413,3.179,4.146,5.888,4.146c0.643,0,1.266-0.1,1.851-0.281c0.221-0.611,0.358-1.001,0.358-1.001 S7.563,11.591,5.633,10.822z" enable-background="new " fill="url(#SVGID_9_)" opacity="0.2"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="-2187.1045" x2="-2187.1045" y1="3224.4238" y2="3213.1807">
-<stop offset="0" style="stop-color:#E9F0F2"/>
-<stop offset="0.0424" style="stop-color:#E9F0F2"/>
-<stop offset="0.4" style="stop-color:#D4D9DB"/>
-<stop offset="0.7333" style="stop-color:#B0BCBF"/>
-<stop offset="1" style="stop-color:#D0DADE"/>
+ <stop offset="0.0424" style="stop-color:#E9F0F2"/>
+ <stop offset="0.4" style="stop-color:#D4D9DB"/>
+ <stop offset="0.7333" style="stop-color:#B0BCBF"/>
+ <stop offset="1" style="stop-color:#D0DADE"/>
</linearGradient>
<path d="M6.896,4.747c3.152,0,5.709,2.557,5.709,5.71c0,3.155-2.557,5.71-5.709,5.71 c-3.156,0-5.711-2.556-5.711-5.71C1.186,7.304,3.74,4.747,6.896,4.747z" fill="url(#SVGID_10_)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="-2187.105" x2="-2187.105" y1="3224.6045" y2="3212.999">
-<stop offset="0" style="stop-color:#F6FDFF"/>
-<stop offset="0.0424" style="stop-color:#F6FDFF"/>
-<stop offset="0.4" style="stop-color:#E6EBED"/>
-<stop offset="0.7333" style="stop-color:#B0BCBF"/>
-<stop offset="1" style="stop-color:#D0DADE"/>
+ <stop offset="0.0424" style="stop-color:#F6FDFF"/>
+ <stop offset="0.4" style="stop-color:#E6EBED"/>
+ <stop offset="0.7333" style="stop-color:#B0BCBF"/>
+ <stop offset="1" style="stop-color:#D0DADE"/>
</linearGradient>
<path d="M6.896,4.563C3.639,4.563,1,7.202,1,10.458c0,3.254,2.639,5.894,5.896,5.894 c3.254,0,5.894-2.64,5.894-5.894C12.79,7.202,10.15,4.563,6.896,4.563z M6.896,15.984c-3.049,0-5.528-2.479-5.528-5.526 s2.479-5.526,5.528-5.526c3.046,0,5.524,2.479,5.524,5.526S9.942,15.984,6.896,15.984z" fill="url(#SVGID_11_)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="-2175.1309" x2="-2175.1309" y1="3223.5195" y2="3214.0898">
-<stop offset="0" style="stop-color:#646263"/>
-<stop offset="0.2" style="stop-color:#303030"/>
-<stop offset="0.7212" style="stop-color:#141414"/>
-<stop offset="1" style="stop-color:#262626"/>
+ <stop offset="0" style="stop-color:#646263"/>
+ <stop offset="0.2" style="stop-color:#303030"/>
+ <stop offset="0.7212" style="stop-color:#141414"/>
+ <stop offset="1" style="stop-color:#262626"/>
</linearGradient>
-<path d="M16.475,10.458c0,1.883,0.792,3.58,2.058,4.79h2.731 V5.668h-2.731C17.267,6.876,16.475,8.574,16.475,10.458z" fill="url(#SVGID_12_)" fill-opacity="0.05" stroke-opacity="0.05"/>
+<path d="M16.475,10.458c0,1.883,0.792,3.58,2.058,4.79h2.731 V5.668h-2.731C17.267,6.876,16.475,8.574,16.475,10.458z" enable-background="new " fill="url(#SVGID_12_)" opacity="0.05"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="-2174.9473" x2="-2174.9473" y1="3223.5195" y2="3214.0898">
-<stop offset="0" style="stop-color:#646263"/>
-<stop offset="0.2" style="stop-color:#303030"/>
-<stop offset="0.7212" style="stop-color:#141414"/>
-<stop offset="1" style="stop-color:#262626"/>
+ <stop offset="0" style="stop-color:#646263"/>
+ <stop offset="0.2" style="stop-color:#303030"/>
+ <stop offset="0.7212" style="stop-color:#141414"/>
+ <stop offset="1" style="stop-color:#262626"/>
</linearGradient>
-<path d="M16.842,10.458c0,1.919,0.87,3.64,2.236,4.79h2.186 V5.668h-2.186C17.712,6.817,16.842,8.537,16.842,10.458z" fill="url(#SVGID_13_)" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M16.842,10.458c0,1.919,0.87,3.64,2.236,4.79h2.186 V5.668h-2.186C17.712,6.817,16.842,8.537,16.842,10.458z" enable-background="new " fill="url(#SVGID_13_)" opacity="0.1"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="-2169.0527" x2="-2169.0527" y1="3218.874" y2="3212.231">
-<stop offset="0" style="stop-color:#646263"/>
-<stop offset="0.2" style="stop-color:#303030"/>
-<stop offset="0.7212" style="stop-color:#141414"/>
-<stop offset="1" style="stop-color:#262626"/>
+ <stop offset="0" style="stop-color:#646263"/>
+ <stop offset="0.2" style="stop-color:#303030"/>
+ <stop offset="0.7212" style="stop-color:#141414"/>
+ <stop offset="1" style="stop-color:#262626"/>
</linearGradient>
-<path d="M28.985,13.515C29,11.735,29,10.437,29,10.437 s-2.701-0.384-4.631,0.386c-1.93,0.769-3.475,4.616-3.475,4.616s0.202,0.571,0.512,1.422c0.543,0.144,1.112,0.229,1.698,0.229 C25.659,17.089,27.875,15.636,28.985,13.515z" fill="url(#SVGID_14_)" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M28.985,13.515C29,11.735,29,10.437,29,10.437 s-2.701-0.384-4.631,0.386c-1.93,0.769-3.475,4.616-3.475,4.616s0.202,0.571,0.512,1.422c0.543,0.144,1.112,0.229,1.698,0.229 C25.659,17.089,27.875,15.636,28.985,13.515z" enable-background="new " fill="url(#SVGID_14_)" opacity="0.1"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="-2169.0527" x2="-2169.0527" y1="3218.877" y2="3212.5967">
-<stop offset="0" style="stop-color:#646263"/>
-<stop offset="0.2" style="stop-color:#303030"/>
-<stop offset="0.7212" style="stop-color:#141414"/>
-<stop offset="1" style="stop-color:#262626"/>
+ <stop offset="0" style="stop-color:#646263"/>
+ <stop offset="0.2" style="stop-color:#303030"/>
+ <stop offset="0.7212" style="stop-color:#141414"/>
+ <stop offset="1" style="stop-color:#262626"/>
</linearGradient>
-<path d="M28.991,12.575C29,11.297,29,10.437,29,10.437 s-2.701-0.384-4.631,0.386c-1.93,0.769-3.475,4.616-3.475,4.616s0.138,0.39,0.359,1.001c0.586,0.182,1.208,0.281,1.85,0.281 C25.815,16.721,28.12,14.988,28.991,12.575z" fill="url(#SVGID_15_)" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M28.991,12.575C29,11.297,29,10.437,29,10.437 s-2.701-0.384-4.631,0.386c-1.93,0.769-3.475,4.616-3.475,4.616s0.138,0.39,0.359,1.001c0.586,0.182,1.208,0.281,1.85,0.281 C25.815,16.721,28.12,14.988,28.991,12.575z" enable-background="new " fill="url(#SVGID_15_)" opacity="0.2"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="-2170.8945" x2="-2170.8945" y1="3224.4238" y2="3213.1809">
-<stop offset="0" style="stop-color:#E9F0F2"/>
-<stop offset="0.0424" style="stop-color:#E9F0F2"/>
-<stop offset="0.4" style="stop-color:#D4D9DB"/>
-<stop offset="0.7333" style="stop-color:#B0BCBF"/>
-<stop offset="1" style="stop-color:#D0DADE"/>
+ <stop offset="0.0424" style="stop-color:#E9F0F2"/>
+ <stop offset="0.4" style="stop-color:#D4D9DB"/>
+ <stop offset="0.7333" style="stop-color:#B0BCBF"/>
+ <stop offset="1" style="stop-color:#D0DADE"/>
</linearGradient>
<path d="M23.104,4.747c3.154,0,5.713,2.557,5.713,5.71c0,3.155-2.559,5.71-5.713,5.71 c-3.152,0-5.709-2.556-5.709-5.71C17.395,7.304,19.952,4.747,23.104,4.747z" fill="url(#SVGID_16_)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="-2170.8945" x2="-2170.8945" y1="3224.6045" y2="3212.9993">
-<stop offset="0" style="stop-color:#F6FDFF"/>
-<stop offset="0.0424" style="stop-color:#F6FDFF"/>
-<stop offset="0.4" style="stop-color:#E6EBED"/>
-<stop offset="0.7333" style="stop-color:#B0BCBF"/>
-<stop offset="1" style="stop-color:#D0DADE"/>
+ <stop offset="0.0424" style="stop-color:#F6FDFF"/>
+ <stop offset="0.4" style="stop-color:#E6EBED"/>
+ <stop offset="0.7333" style="stop-color:#B0BCBF"/>
+ <stop offset="1" style="stop-color:#D0DADE"/>
</linearGradient>
<path d="M23.104,4.563c-3.254,0-5.894,2.64-5.894,5.895c0,3.254,2.64,5.894,5.894,5.894 c3.258,0,5.896-2.64,5.896-5.894C29,7.202,26.362,4.563,23.104,4.563z M23.104,15.984c-3.046,0-5.525-2.479-5.525-5.526 s2.479-5.526,5.525-5.526c3.051,0,5.527,2.479,5.527,5.526S26.155,15.984,23.104,15.984z" fill="url(#SVGID_17_)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="-2187.106" x2="-2187.106" y1="3221.9912" y2="3215.072">
-<stop offset="0" style="stop-color:#646263"/>
-<stop offset="0.2" style="stop-color:#303030"/>
-<stop offset="0.7212" style="stop-color:#141414"/>
-<stop offset="1" style="stop-color:#262626"/>
+ <stop offset="0" style="stop-color:#646263"/>
+ <stop offset="0.2" style="stop-color:#303030"/>
+ <stop offset="0.7212" style="stop-color:#141414"/>
+ <stop offset="1" style="stop-color:#262626"/>
</linearGradient>
-<path d="M6.58,14.142c-0.437,0-0.79-0.355-0.79-0.791v-1.419 H4.369c-0.436,0-0.791-0.354-0.791-0.791v-0.683c0-0.436,0.355-0.79,0.791-0.79H5.79V8.299c0-0.435,0.354-0.789,0.79-0.789h0.683 c0.437,0,0.791,0.354,0.791,0.789v1.369h1.419c0.438,0,0.737,0.354,0.737,0.79v0.683c0,0.437-0.3,0.791-0.737,0.791H8.054v1.419 c0,0.436-0.354,0.791-0.791,0.791H6.58z" fill="url(#SVGID_18_)" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M6.58,14.142c-0.437,0-0.79-0.355-0.79-0.791v-1.419 H4.369c-0.436,0-0.791-0.354-0.791-0.791v-0.683c0-0.436,0.355-0.79,0.791-0.79H5.79V8.299c0-0.435,0.354-0.789,0.79-0.789h0.683 c0.437,0,0.791,0.354,0.791,0.789v1.369h1.419c0.438,0,0.737,0.354,0.737,0.79v0.683c0,0.437-0.3,0.791-0.737,0.791H8.054v1.419 c0,0.436-0.354,0.791-0.791,0.791H6.58z" enable-background="new " fill="url(#SVGID_18_)" opacity="0.4"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="-2187.106" x2="-2187.106" y1="3222.3604" y2="3215.4402">
-<stop offset="0" style="stop-color:#646263"/>
-<stop offset="0.2" style="stop-color:#666666"/>
-<stop offset="0.7212" style="stop-color:#141414"/>
-<stop offset="1" style="stop-color:#262626"/>
+ <stop offset="0" style="stop-color:#646263"/>
+ <stop offset="0.2" style="stop-color:#666666"/>
+ <stop offset="0.7212" style="stop-color:#141414"/>
+ <stop offset="1" style="stop-color:#262626"/>
</linearGradient>
<path d="M6.58,13.773c-0.437,0-0.79-0.354-0.79-0.79v-1.421H4.369c-0.436,0-0.791-0.354-0.791-0.79V10.09 c0-0.436,0.355-0.79,0.791-0.79H5.79V7.931c0-0.435,0.354-0.79,0.79-0.79h0.683c0.437,0,0.791,0.355,0.791,0.79V9.3h1.419 c0.438,0,0.737,0.354,0.737,0.79v0.683c0,0.436-0.3,0.79-0.737,0.79H8.054v1.421c0,0.436-0.354,0.79-0.791,0.79H6.58z" fill="url(#SVGID_19_)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="-2187.1055" x2="-2187.1055" y1="3221.9668" y2="3215.8157">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.3879" style="stop-color:#7B7E80"/>
-<stop offset="0.7152" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#63686A"/>
+ <stop offset="0" style="stop-color:#A0A3A6"/>
+ <stop offset="0.3879" style="stop-color:#7B7E80"/>
+ <stop offset="0.7152" style="stop-color:#474B4D"/>
+ <stop offset="1" style="stop-color:#63686A"/>
</linearGradient>
<path d="M9.473,9.668H7.685V7.931c0-0.232-0.187-0.421-0.421-0.421H6.58c-0.233,0-0.422,0.188-0.422,0.421 v1.737H4.369c-0.234,0-0.422,0.188-0.422,0.422v0.683c0,0.233,0.188,0.422,0.422,0.422h1.789v1.789c0,0.232,0.188,0.422,0.422,0.422 h0.684c0.234,0,0.421-0.189,0.421-0.422v-1.789h1.788c0.234,0,0.369-0.189,0.369-0.422V10.09C9.842,9.856,9.707,9.668,9.473,9.668z" fill="url(#SVGID_20_)"/>
-<path d="M4.369,10.036h1.789V9.668H4.369c-0.234,0-0.422,0.188-0.422,0.422v0.368 C3.947,10.225,4.135,10.036,4.369,10.036z" fill="#FFFFFF" fill-opacity="0.75" stroke-opacity="0.75"/>
-<path d="M6.58,7.878h0.683c0.235,0,0.422,0.189,0.422,0.421V7.931c0-0.232-0.187-0.421-0.422-0.421 H6.58c-0.234,0-0.422,0.188-0.422,0.421v0.368C6.158,8.067,6.347,7.878,6.58,7.878z" fill="#FFFFFF" fill-opacity="0.75" stroke-opacity="0.75"/>
-<path d="M9.473,9.668H7.685v0.368h1.788c0.234,0,0.369,0.189,0.369,0.422V10.09 C9.842,9.856,9.707,9.668,9.473,9.668z" fill="#FFFFFF" fill-opacity="0.75" stroke-opacity="0.75"/>
+<path d="M4.369,10.036h1.789V9.668H4.369c-0.234,0-0.422,0.188-0.422,0.422v0.368 C3.947,10.225,4.135,10.036,4.369,10.036z" fill="#FFFFFF" opacity="0.75"/>
+<path d="M6.58,7.878h0.683c0.235,0,0.422,0.189,0.422,0.421V7.931c0-0.232-0.187-0.421-0.422-0.421 H6.58c-0.234,0-0.422,0.188-0.422,0.421v0.368C6.158,8.067,6.347,7.878,6.58,7.878z" fill="#FFFFFF" opacity="0.75"/>
+<path d="M9.473,9.668H7.685v0.368h1.788c0.234,0,0.369,0.189,0.369,0.422V10.09 C9.842,9.856,9.707,9.668,9.473,9.668z" fill="#FFFFFF" opacity="0.75"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="-2168.3159" x2="-2168.3159" y1="3219.7852" y2="3217.5706">
-<stop offset="0" style="stop-color:#646263"/>
-<stop offset="0.2" style="stop-color:#303030"/>
-<stop offset="0.7212" style="stop-color:#141414"/>
-<stop offset="1" style="stop-color:#262626"/>
+ <stop offset="0" style="stop-color:#646263"/>
+ <stop offset="0.2" style="stop-color:#303030"/>
+ <stop offset="0.7212" style="stop-color:#141414"/>
+ <stop offset="1" style="stop-color:#262626"/>
</linearGradient>
-<path d="M25.682,11.932c-0.607,0-1.104-0.497-1.104-1.106 c0-0.608,0.496-1.104,1.104-1.104c0.611,0,1.107,0.496,1.107,1.104C26.79,11.435,26.293,11.932,25.682,11.932L25.682,11.932z" fill="url(#SVGID_21_)" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M25.682,11.932c-0.607,0-1.104-0.497-1.104-1.106 c0-0.608,0.496-1.104,1.104-1.104c0.611,0,1.107,0.496,1.107,1.104C26.79,11.435,26.293,11.932,25.682,11.932L25.682,11.932z" enable-background="new " fill="url(#SVGID_21_)" opacity="0.4"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="-2168.3159" x2="-2168.3159" y1="3220.0801" y2="3217.8655">
-<stop offset="0" style="stop-color:#646263"/>
-<stop offset="0.2" style="stop-color:#666666"/>
-<stop offset="0.7212" style="stop-color:#141414"/>
-<stop offset="1" style="stop-color:#262626"/>
+ <stop offset="0" style="stop-color:#646263"/>
+ <stop offset="0.2" style="stop-color:#666666"/>
+ <stop offset="0.7212" style="stop-color:#141414"/>
+ <stop offset="1" style="stop-color:#262626"/>
</linearGradient>
<path d="M25.682,11.637c-0.607,0-1.104-0.498-1.104-1.106c0-0.61,0.496-1.104,1.104-1.104 c0.611,0,1.107,0.495,1.107,1.104C26.79,11.141,26.293,11.637,25.682,11.637L25.682,11.637z" fill="url(#SVGID_22_)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_23_" x1="-2168.3159" x2="-2168.3159" y1="3219.6377" y2="3218.1604">
-<stop offset="0" style="stop-color:#F0653D"/>
-<stop offset="0.103" style="stop-color:#C94832"/>
-<stop offset="0.7515" style="stop-color:#89181F"/>
-<stop offset="1" style="stop-color:#961A22"/>
+ <stop offset="0" style="stop-color:#F0653D"/>
+ <stop offset="0.103" style="stop-color:#C94832"/>
+ <stop offset="0.7515" style="stop-color:#89181F"/>
+ <stop offset="1" style="stop-color:#961A22"/>
</linearGradient>
<circle cx="25.682" cy="10.531" fill="url(#SVGID_23_)" r="0.737"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_24_" x1="-2173.4736" x2="-2173.4736" y1="3219.6211" y2="3217.4065">
-<stop offset="0" style="stop-color:#646263"/>
-<stop offset="0.2" style="stop-color:#303030"/>
-<stop offset="0.7212" style="stop-color:#141414"/>
-<stop offset="1" style="stop-color:#262626"/>
+ <stop offset="0" style="stop-color:#646263"/>
+ <stop offset="0.2" style="stop-color:#303030"/>
+ <stop offset="0.7212" style="stop-color:#141414"/>
+ <stop offset="1" style="stop-color:#262626"/>
</linearGradient>
-<path d="M20.525,11.932c-0.608,0-1.104-0.497-1.104-1.106 c0-0.608,0.496-1.104,1.104-1.104c0.609,0,1.106,0.496,1.106,1.104C21.631,11.435,21.135,11.932,20.525,11.932L20.525,11.932z" fill="url(#SVGID_24_)" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M20.525,11.932c-0.608,0-1.104-0.497-1.104-1.106 c0-0.608,0.496-1.104,1.104-1.104c0.609,0,1.106,0.496,1.106,1.104C21.631,11.435,21.135,11.932,20.525,11.932L20.525,11.932z" enable-background="new " fill="url(#SVGID_24_)" opacity="0.4"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="-2173.4736" x2="-2173.4736" y1="3219.916" y2="3217.7014">
-<stop offset="0" style="stop-color:#646263"/>
-<stop offset="0.2" style="stop-color:#666666"/>
-<stop offset="0.7212" style="stop-color:#141414"/>
-<stop offset="1" style="stop-color:#262626"/>
+ <stop offset="0" style="stop-color:#646263"/>
+ <stop offset="0.2" style="stop-color:#666666"/>
+ <stop offset="0.7212" style="stop-color:#141414"/>
+ <stop offset="1" style="stop-color:#262626"/>
</linearGradient>
<path d="M20.525,11.637c-0.608,0-1.104-0.498-1.104-1.106c0-0.61,0.496-1.104,1.104-1.104 c0.609,0,1.106,0.495,1.106,1.104C21.631,11.141,21.135,11.637,20.525,11.637L20.525,11.637z" fill="url(#SVGID_25_)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_26_" x1="-2173.4741" x2="-2173.4741" y1="3219.5283" y2="3218.051">
-<stop offset="0" style="stop-color:#AFED23"/>
-<stop offset="0.7394" style="stop-color:#358C0C"/>
-<stop offset="1" style="stop-color:#67AD1A"/>
+ <stop offset="0" style="stop-color:#AFED23"/>
+ <stop offset="0.7394" style="stop-color:#358C0C"/>
+ <stop offset="1" style="stop-color:#67AD1A"/>
</linearGradient>
<circle cx="20.525" cy="10.531" fill="url(#SVGID_26_)" r="0.737"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_27_" x1="-2170.895" x2="-2170.895" y1="3222.2549" y2="3220.0405">
-<stop offset="0" style="stop-color:#646263"/>
-<stop offset="0.2" style="stop-color:#303030"/>
-<stop offset="0.7212" style="stop-color:#141414"/>
-<stop offset="1" style="stop-color:#262626"/>
+ <stop offset="0" style="stop-color:#646263"/>
+ <stop offset="0.2" style="stop-color:#303030"/>
+ <stop offset="0.7212" style="stop-color:#141414"/>
+ <stop offset="1" style="stop-color:#262626"/>
</linearGradient>
-<path d="M23.104,9.352C22.495,9.352,22,8.857,22,8.247 c0-0.61,0.494-1.106,1.104-1.106s1.105,0.496,1.105,1.106C24.209,8.855,23.713,9.352,23.104,9.352L23.104,9.352z" fill="url(#SVGID_27_)" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M23.104,9.352C22.495,9.352,22,8.857,22,8.247 c0-0.61,0.494-1.106,1.104-1.106s1.105,0.496,1.105,1.106C24.209,8.855,23.713,9.352,23.104,9.352L23.104,9.352z" enable-background="new " fill="url(#SVGID_27_)" opacity="0.4"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_28_" x1="-2170.895" x2="-2170.895" y1="3222.6221" y2="3220.4084">
-<stop offset="0" style="stop-color:#646263"/>
-<stop offset="0.2" style="stop-color:#666666"/>
-<stop offset="0.7212" style="stop-color:#141414"/>
-<stop offset="1" style="stop-color:#262626"/>
+ <stop offset="0" style="stop-color:#646263"/>
+ <stop offset="0.2" style="stop-color:#666666"/>
+ <stop offset="0.7212" style="stop-color:#141414"/>
+ <stop offset="1" style="stop-color:#262626"/>
</linearGradient>
<path d="M23.104,8.984C22.495,8.984,22,8.488,22,7.878c0-0.609,0.494-1.104,1.104-1.104 s1.105,0.496,1.105,1.104C24.209,8.488,23.713,8.984,23.104,8.984L23.104,8.984z" fill="url(#SVGID_28_)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_29_" x1="-2170.896" x2="-2170.896" y1="3222.2158" y2="3220.7397">
-<stop offset="0" style="stop-color:#FEEFA7"/>
-<stop offset="0.5091" style="stop-color:#FFC501"/>
-<stop offset="1" style="stop-color:#F6A800"/>
+ <stop offset="0" style="stop-color:#FEEFA7"/>
+ <stop offset="0.5091" style="stop-color:#FFC501"/>
+ <stop offset="1" style="stop-color:#F6A800"/>
</linearGradient>
<circle cx="23.104" cy="7.878" fill="url(#SVGID_29_)" r="0.737"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_30_" x1="-2170.895" x2="-2170.895" y1="3216.9248" y2="3214.7102">
-<stop offset="0" style="stop-color:#646263"/>
-<stop offset="0.2" style="stop-color:#303030"/>
-<stop offset="0.7212" style="stop-color:#141414"/>
-<stop offset="1" style="stop-color:#262626"/>
+ <stop offset="0" style="stop-color:#646263"/>
+ <stop offset="0.2" style="stop-color:#303030"/>
+ <stop offset="0.7212" style="stop-color:#141414"/>
+ <stop offset="1" style="stop-color:#262626"/>
</linearGradient>
-<path d="M23.104,14.51c-0.609,0-1.104-0.496-1.104-1.104 c0-0.61,0.494-1.106,1.104-1.106s1.105,0.496,1.105,1.106C24.209,14.014,23.713,14.51,23.104,14.51L23.104,14.51z" fill="url(#SVGID_30_)" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M23.104,14.51c-0.609,0-1.104-0.496-1.104-1.104 c0-0.61,0.494-1.106,1.104-1.106s1.105,0.496,1.105,1.106C24.209,14.014,23.713,14.51,23.104,14.51L23.104,14.51z" enable-background="new " fill="url(#SVGID_30_)" opacity="0.4"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_31_" x1="-2170.895" x2="-2170.895" y1="3217.292" y2="3215.0784">
-<stop offset="0" style="stop-color:#646263"/>
-<stop offset="0.2" style="stop-color:#666666"/>
-<stop offset="0.7212" style="stop-color:#141414"/>
-<stop offset="1" style="stop-color:#262626"/>
+ <stop offset="0" style="stop-color:#646263"/>
+ <stop offset="0.2" style="stop-color:#666666"/>
+ <stop offset="0.7212" style="stop-color:#141414"/>
+ <stop offset="1" style="stop-color:#262626"/>
</linearGradient>
<path d="M23.104,14.142c-0.609,0-1.104-0.497-1.104-1.106c0-0.61,0.494-1.104,1.104-1.104 s1.105,0.495,1.105,1.104C24.209,13.645,23.713,14.142,23.104,14.142L23.104,14.142z" fill="url(#SVGID_31_)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3229.2773)" gradientUnits="userSpaceOnUse" id="SVGID_32_" x1="-2170.896" x2="-2170.896" y1="3216.9424" y2="3215.4653">
-<stop offset="0" style="stop-color:#96E9FA"/>
-<stop offset="0.7333" style="stop-color:#005BCC"/>
-<stop offset="1" style="stop-color:#0087D9"/>
+ <stop offset="0" style="stop-color:#96E9FA"/>
+ <stop offset="0.7333" style="stop-color:#005BCC"/>
+ <stop offset="1" style="stop-color:#0087D9"/>
</linearGradient>
<circle cx="23.104" cy="13.036" fill="url(#SVGID_32_)" r="0.737"/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_applications_office.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_applications_office.svg Fri May 14 16:09:54 2010 +0300
@@ -1,226 +1,354 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<stop offset="0" style="stop-color:#D49757"/>
-<stop offset="0.6182" style="stop-color:#8A4117"/>
-<stop offset="1" style="stop-color:#702200"/>
+ <stop offset="0" style="stop-color:#D49757"/>
+ <stop offset="0.6182" style="stop-color:#8A4117"/>
+ <stop offset="1" style="stop-color:#702200"/>
</linearGradient>
<path d="M53.646,12.358c0,0-22.377,0-22.842,0c-0.463,0-1.002-0.202-1.332-1.01 c-0.207-0.705-0.764-2.297-0.764-2.297c-0.211-0.652-0.494-1.234-1.436-1.234H6.697c-0.824,0-1.428,0.7-1.428,1.562v14.438h49.814 v-9.968C55.084,12.989,54.473,12.358,53.646,12.358z" fill="url(#SVGID_1_)"/>
-<path d="M53.646,12.358c0,0-22.377,0-22.842,0 c-0.463,0-1.002-0.202-1.332-1.01c-0.207-0.705-0.764-2.297-0.764-2.297c-0.211-0.652-0.494-1.234-1.436-1.234H6.697 c-0.824,0-1.428,0.7-1.428,1.562v0.727c0-0.861,0.604-1.562,1.428-1.562h20.576c0.941,0,1.225,0.584,1.436,1.236 c0,0,0.557,1.591,0.764,2.296c0.33,0.806,0.869,1.011,1.332,1.011c0.465,0,22.842,0,22.842,0c0.826,0,1.439,0.628,1.439,1.489 v-0.728C55.084,12.989,54.473,12.358,53.646,12.358z" fill="#FFF7F5" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M53.646,12.358c0,0-22.377,0-22.842,0 c-0.463,0-1.002-0.202-1.332-1.01c-0.207-0.705-0.764-2.297-0.764-2.297c-0.211-0.652-0.494-1.234-1.436-1.234H6.697 c-0.824,0-1.428,0.7-1.428,1.562v0.727c0-0.861,0.604-1.562,1.428-1.562h20.576c0.941,0,1.225,0.584,1.436,1.236 c0,0,0.557,1.591,0.764,2.296c0.33,0.806,0.869,1.011,1.332,1.011c0.465,0,22.842,0,22.842,0c0.826,0,1.439,0.628,1.439,1.489 v-0.728C55.084,12.989,54.473,12.358,53.646,12.358z" enable-background="new " fill="#FFF7F5" opacity="0.5"/>
<rect height="8.728" width="46.906" x="6.73" y="15.817"/>
<rect fill="#F2F2F2" height="7.271" width="45.451" x="7.457" y="16.545"/>
-<polygon fill="#231F20" fill-opacity="0.4" points="55.084,22.362 5.27,22.362 5.27,21.636 55.084,21.636 " stroke-opacity="0.4"/>
-<polygon fill="#231F20" fill-opacity="0.15" points="55.084,21.636 5.27,21.636 5.27,20.908 55.084,20.908 " stroke-opacity="0.15"/>
-<polygon fill="#231F20" fill-opacity="0.05" points="55.084,20.908 5.27,20.908 5.27,20.182 55.084,20.182 " stroke-opacity="0.05"/>
+<polygon enable-background="new " fill="#231F20" opacity="0.4" points="55.084,22.362 5.27,22.362 5.27,21.636 55.084,21.636 "/>
+<polygon enable-background="new " fill="#231F20" opacity="0.15" points="55.084,21.636 5.27,21.636 5.27,20.908 55.084,20.908 "/>
+<polygon enable-background="new " fill="#231F20" opacity="0.05" points="55.084,20.908 5.27,20.908 5.27,20.182 55.084,20.182 "/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 4100.9688)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2164" x2="-2164" y1="4048.7861" y2="4078.6064">
-<stop offset="0" style="stop-color:#C79101"/>
-<stop offset="0.0303" style="stop-color:#C79101"/>
-<stop offset="0.0364" style="stop-color:#FEEFA7"/>
-<stop offset="0.3273" style="stop-color:#FEE570"/>
-<stop offset="0.6727" style="stop-color:#F0C12B"/>
-<stop offset="1" style="stop-color:#E6A501"/>
+ <stop offset="0.0303" style="stop-color:#C79101"/>
+ <stop offset="0.0364" style="stop-color:#FEEFA7"/>
+ <stop offset="0.3273" style="stop-color:#FEE570"/>
+ <stop offset="0.6727" style="stop-color:#F0C12B"/>
+ <stop offset="1" style="stop-color:#E6A501"/>
</linearGradient>
<path d="M56.273,22.362H3.727C2.191,22.362,2,24.065,2,24.065l2.549,25.934 c0.307,2.028,1.822,2.184,2.182,2.184c0.072,0,46.465,0,46.539,0c0.357,0,1.875-0.155,2.18-2.184L58,24.065 C58,24.065,57.809,22.362,56.273,22.362z" fill="url(#SVGID_2_)"/>
<path d="M3.727,23.091h52.547c1.178,0,1.563,0.995,1.68,1.464L58,24.065c0,0-0.191-1.703-1.727-1.703H3.727 C2.191,22.362,2,24.065,2,24.065l0.047,0.489C2.164,24.086,2.549,23.091,3.727,23.091z" fill="#FCF3D0"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 4100.9688)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2164.0166" x2="-2164.0166" y1="4048.7861" y2="4053.1504">
-<stop offset="0" style="stop-color:#FCDA5E"/>
-<stop offset="1" style="stop-color:#FFB418"/>
+ <stop offset="0" style="stop-color:#FCDA5E"/>
+ <stop offset="1" style="stop-color:#FFB418"/>
</linearGradient>
-<path d="M4.334,47.818l0.215,2.181 c0.307,2.028,1.822,2.184,2.182,2.184c0.072,0,46.465,0,46.539,0c0.357,0,1.875-0.155,2.18-2.184l0.184-2.181H4.334z" fill="url(#SVGID_3_)" fill-opacity="0.25" stroke-opacity="0.25"/>
+<path d="M4.334,47.818l0.215,2.181 c0.307,2.028,1.822,2.184,2.182,2.184c0.072,0,46.465,0,46.539,0c0.357,0,1.875-0.155,2.18-2.184l0.184-2.181H4.334z" enable-background="new " fill="url(#SVGID_3_)" opacity="0.25"/>
<rect fill="none" height="59.999" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="14.94" x2="14.94" y1="3.354" y2="10.7">
+
<stop offset="0" stop-color="#6B6B6B"/>
+
<stop offset="0.7697" stop-color="#5E5E5E"/>
+
<stop offset="1" stop-color="#363636"/>
+
</linearGradient>
<path d="M24.17,10.71v-6.744c0.011-0.331-0.264-0.601-0.603-0.601h-17.24c-0.338,0-0.613,0.27-0.613,0.601v6.747h18.45z" fill="url(#SVGID_1__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="14.94" x2="14.94" y1="4.357" y2="9.705">
+
<stop offset="0" stop-color="#E6E6E6"/>
+
<stop offset="0.8182" stop-color="#7C7E87"/>
+
<stop offset="1" stop-color="#94979D"/>
+
</linearGradient>
<rect fill="url(#SVGID_2__)" height="5.348" width="16.45" x="6.72" y="4.365"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="14.94" x2="14.94" y1="4.906" y2="9.21">
+
<stop offset="0" stop-color="#686C6E"/>
+
<stop offset="1" stop-color="#CAD3D6"/>
+
</linearGradient>
<path d="M7.863,9.182c-0.338,0-0.612-0.28-0.612-0.625v-3.036c0-0.346,0.274-0.625,0.612-0.625h14.16c0.338,0,0.613,0.279,0.613,0.625v3.035c0,0.345-0.275,0.625-0.613,0.625h-14.16z" fill="url(#SVGID_3__)" fill-opacity="0.8" stroke-opacity="0.8"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="14.94" x2="14.94" y1="-0.0059" y2="10.68">
+
<stop offset="0" stop-color="#45E8FF"/>
+
<stop offset="0.1455" stop-color="#45E8FF"/>
+
<stop offset="0.5576" stop-color="#30A4D5"/>
+
<stop offset="0.8727" stop-color="#1347BA"/>
+
<stop offset="1" stop-color="#1C65C3"/>
+
</linearGradient>
<rect fill="url(#SVGID_4_)" height="3.035" width="14.16" x="7.863" y="5.521"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="14.94" x2="14.94" y1="1.943" y2="9.68">
+
<stop offset="0" stop-color="#45E8FF"/>
+
<stop offset="0.1455" stop-color="#45E8FF"/>
+
<stop offset="0.5576" stop-color="#4FADD5"/>
+
<stop offset="0.8727" stop-color="#1347BA"/>
+
<stop offset="1" stop-color="#1C65C3"/>
+
</linearGradient>
<polygon fill="url(#SVGID_5_)" points="7.863,6.937,22.02,6.413,22.02,5.521,7.863,5.521"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="14.94" x2="14.94" y1="10.47" y2="25.65">
+
<stop offset="0" stop-color="#6B6B6B"/>
+
<stop offset="0.7212" stop-color="#363636"/>
+
<stop offset="0.9636" stop-color="#5E5E5E"/>
+
<stop offset="1" stop-color="#5E5E5E"/>
+
</linearGradient>
<path d="M5.72,10.67v14.39c0,0.338,0.274,0.613,0.612,0.613h17.22c0.339,0,0.612-0.275,0.612-0.613v-14.39h-18.45z" fill="url(#SVGID_6_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="14.94" x2="14.94" y1="11.49" y2="24.65">
+
<stop offset="0" stop-color="#E6E6E6"/>
+
<stop offset="0.8182" stop-color="#7C7E87"/>
+
<stop offset="1" stop-color="#94979D"/>
+
</linearGradient>
<rect fill="url(#SVGID_7_)" height="13" width="16.45" x="6.72" y="11.67"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="9.716" x2="9.716" y1="12.96" y2="17.11">
+
<stop offset="0" stop-color="#646263"/>
+
<stop offset="0.2" stop-color="#4D4D4D"/>
+
<stop offset="0.7212" stop-color="#242424"/>
+
<stop offset="1" stop-color="#373737"/>
+
</linearGradient>
<path d="M8.644,17.01c-0.512,0-0.928-0.416-0.928-0.928v-2.144c0-0.512,0.416-0.928,0.928-0.928h2.145c0.512,0,0.928,0.416,0.928,0.928v2.144c0,0.512-0.416,0.928-0.928,0.928h-2.146z" fill="url(#SVGID_8_)" fill-opacity="0.8" stroke-opacity="0.8"/>
<path d="M10.79,17.01h-2.146c-0.512,0-0.928-0.416-0.928-0.928v0.656c0,0.512,0.416,0.928,0.928,0.928h2.145c0.512,0,0.928-0.416,0.928-0.928v-0.656c0,0.51-0.42,0.93-0.93,0.93z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="9.716" x2="9.716" y1="13.47" y2="16.59">
+
<stop offset="0" stop-color="#E4EBED"/>
+
<stop offset="0.2606" stop-color="#D6DCDE"/>
+
<stop offset="0.6606" stop-color="#B6C3C7"/>
+
<stop offset="0.9758" stop-color="#D2D9DB"/>
+
<stop offset="1" stop-color="#D2D9DB"/>
+
</linearGradient>
<path d="M11.22,16.08c0,0.234-0.192,0.428-0.428,0.428h-2.146c-0.235,0-0.428-0.193-0.428-0.428v-2.144c0-0.236,0.192-0.428,0.428-0.428h2.145c0.235,0,0.428,0.191,0.428,0.428v2.142z" fill="url(#SVGID_9_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="14.72" x2="14.72" y1="12.96" y2="17.11">
+
<stop offset="0" stop-color="#646263"/>
+
<stop offset="0.2" stop-color="#4D4D4D"/>
+
<stop offset="0.7212" stop-color="#242424"/>
+
<stop offset="1" stop-color="#373737"/>
+
</linearGradient>
<path d="M13.64,17.01c-0.512,0-0.928-0.416-0.928-0.928v-2.144c0-0.512,0.416-0.928,0.928-0.928h2.145c0.512,0,0.928,0.416,0.928,0.928v2.144c0,0.512-0.416,0.928-0.928,0.928h-2.136z" fill="url(#SVGID_10_)" fill-opacity="0.8" stroke-opacity="0.8"/>
<path d="M15.79,17.01h-2.145c-0.512,0-0.928-0.416-0.928-0.928v0.656c0,0.512,0.416,0.928,0.928,0.928h2.145c0.512,0,0.928-0.416,0.928-0.928v-0.656c0.01,0.51-0.41,0.93-0.92,0.93z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="14.72" x2="14.72" y1="13.47" y2="16.59">
+
<stop offset="0" stop-color="#E4EBED"/>
+
<stop offset="0.2606" stop-color="#D6DCDE"/>
+
<stop offset="0.6606" stop-color="#B6C3C7"/>
+
<stop offset="0.9758" stop-color="#D2D9DB"/>
+
<stop offset="1" stop-color="#D2D9DB"/>
+
</linearGradient>
<path d="M16.22,16.08c0,0.234-0.192,0.428-0.428,0.428h-2.145c-0.235,0-0.428-0.193-0.428-0.428v-2.144c0-0.236,0.192-0.428,0.428-0.428h2.145c0.235,0,0.428,0.191,0.428,0.428v2.142z" fill="url(#SVGID_11_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="19.72" x2="19.72" y1="12.96" y2="17.11">
+
<stop offset="0" stop-color="#646263"/>
+
<stop offset="0.2" stop-color="#4D4D4D"/>
+
<stop offset="0.7212" stop-color="#242424"/>
+
<stop offset="1" stop-color="#373737"/>
+
</linearGradient>
<path d="M18.64,17.01c-0.512,0-0.928-0.416-0.928-0.928v-2.144c0-0.512,0.416-0.928,0.928-0.928h2.145c0.512,0,0.928,0.416,0.928,0.928v2.144c0,0.512-0.416,0.928-0.928,0.928h-2.136z" fill="url(#SVGID_12_)" fill-opacity="0.8" stroke-opacity="0.8"/>
<path d="M20.79,17.01h-2.145c-0.512,0-0.928-0.416-0.928-0.928v0.656c0,0.512,0.416,0.928,0.928,0.928h2.145c0.512,0,0.928-0.416,0.928-0.928v-0.656c0.01,0.51-0.41,0.93-0.92,0.93z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="19.72" x2="19.72" y1="13.47" y2="16.59">
+
<stop offset="0" stop-color="#A0A3A6"/>
+
<stop offset="0.1333" stop-color="#838688"/>
+
<stop offset="0.2606" stop-color="#7B7E80"/>
+
<stop offset="0.6606" stop-color="#474B4D"/>
+
<stop offset="1" stop-color="#707577"/>
+
</linearGradient>
<path d="M21.22,16.08c0,0.234-0.192,0.428-0.428,0.428h-2.145c-0.235,0-0.428-0.193-0.428-0.428v-2.144c0-0.236,0.192-0.428,0.428-0.428h2.145c0.235,0,0.428,0.191,0.428,0.428v2.142z" fill="url(#SVGID_13_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="9.716" x2="9.716" y1="18.63" y2="22.78">
+
<stop offset="0" stop-color="#646263"/>
+
<stop offset="0.2" stop-color="#4D4D4D"/>
+
<stop offset="0.7212" stop-color="#242424"/>
+
<stop offset="1" stop-color="#373737"/>
+
</linearGradient>
<path d="M8.644,22.68c-0.512,0-0.928-0.416-0.928-0.928v-2.145c0-0.512,0.416-0.928,0.928-0.928h2.145c0.512,0,0.928,0.416,0.928,0.928v2.145c0,0.512-0.416,0.928-0.928,0.928h-2.146z" fill="url(#SVGID_14_)" fill-opacity="0.8" stroke-opacity="0.8"/>
<path d="M10.79,22.68h-2.146c-0.512,0-0.928-0.416-0.928-0.928v0.656c0,0.512,0.416,0.928,0.928,0.928h2.145c0.512,0,0.928-0.416,0.928-0.928v-0.656c0,0.51-0.42,0.93-0.93,0.93z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="9.716" x2="9.716" y1="19.14" y2="22.25">
+
<stop offset="0" stop-color="#E4EBED"/>
+
<stop offset="0.2606" stop-color="#D6DCDE"/>
+
<stop offset="0.6606" stop-color="#B6C3C7"/>
+
<stop offset="0.9758" stop-color="#D2D9DB"/>
+
<stop offset="1" stop-color="#D2D9DB"/>
+
</linearGradient>
<path d="M11.22,21.75c0,0.236-0.192,0.428-0.428,0.428h-2.146c-0.235,0-0.428-0.191-0.428-0.428v-2.145c0-0.234,0.192-0.428,0.428-0.428h2.145c0.235,0,0.428,0.193,0.428,0.428v2.148z" fill="url(#SVGID_15_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="14.72" x2="14.72" y1="18.63" y2="22.78">
+
<stop offset="0" stop-color="#646263"/>
+
<stop offset="0.2" stop-color="#4D4D4D"/>
+
<stop offset="0.7212" stop-color="#242424"/>
+
<stop offset="1" stop-color="#373737"/>
+
</linearGradient>
<path d="M13.64,22.68c-0.512,0-0.928-0.416-0.928-0.928v-2.145c0-0.512,0.416-0.928,0.928-0.928h2.145c0.512,0,0.928,0.416,0.928,0.928v2.145c0,0.512-0.416,0.928-0.928,0.928h-2.136z" fill="url(#SVGID_16_)" fill-opacity="0.8" stroke-opacity="0.8"/>
<path d="M15.79,22.68h-2.145c-0.512,0-0.928-0.416-0.928-0.928v0.656c0,0.512,0.416,0.928,0.928,0.928h2.145c0.512,0,0.928-0.416,0.928-0.928v-0.656c0.01,0.51-0.41,0.93-0.92,0.93z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="14.72" x2="14.72" y1="19.14" y2="22.25">
+
<stop offset="0" stop-color="#E4EBED"/>
+
<stop offset="0.2606" stop-color="#D6DCDE"/>
+
<stop offset="0.6606" stop-color="#B6C3C7"/>
+
<stop offset="0.9758" stop-color="#D2D9DB"/>
+
<stop offset="1" stop-color="#D2D9DB"/>
+
</linearGradient>
<path d="M16.22,21.75c0,0.236-0.192,0.428-0.428,0.428h-2.145c-0.235,0-0.428-0.191-0.428-0.428v-2.145c0-0.234,0.192-0.428,0.428-0.428h2.145c0.235,0,0.428,0.193,0.428,0.428v2.148z" fill="url(#SVGID_17_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="19.72" x2="19.72" y1="18.63" y2="22.78">
+
<stop offset="0" stop-color="#646263"/>
+
<stop offset="0.2" stop-color="#4D4D4D"/>
+
<stop offset="0.7212" stop-color="#242424"/>
+
<stop offset="1" stop-color="#373737"/>
+
</linearGradient>
<path d="M18.64,22.68c-0.512,0-0.928-0.416-0.928-0.928v-2.145c0-0.512,0.416-0.928,0.928-0.928h2.145c0.512,0,0.928,0.416,0.928,0.928v2.145c0,0.512-0.416,0.928-0.928,0.928h-2.136z" fill="url(#SVGID_18_)" fill-opacity="0.8" stroke-opacity="0.8"/>
<path d="M20.79,22.68h-2.145c-0.512,0-0.928-0.416-0.928-0.928v0.656c0,0.512,0.416,0.928,0.928,0.928h2.145c0.512,0,0.928-0.416,0.928-0.928v-0.656c0.01,0.51-0.41,0.93-0.92,0.93z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="19.72" x2="19.72" y1="19.14" y2="22.25">
+
<stop offset="0" stop-color="#F0653D"/>
+
<stop offset="0.103" stop-color="#C94832"/>
+
<stop offset="0.7515" stop-color="#89181F"/>
+
<stop offset="1" stop-color="#961A22"/>
+
</linearGradient>
<path d="M21.22,21.75c0,0.236-0.192,0.428-0.428,0.428h-2.145c-0.235,0-0.428-0.191-0.428-0.428v-2.145c0-0.234,0.192-0.428,0.428-0.428h2.145c0.235,0,0.428,0.193,0.428,0.428v2.148z" fill="url(#SVGID_19_)"/>
<polygon fill-opacity="0.35" fill-rule="evenodd" points="24.17,10.71,24.17,10.67,24.17,9.891,15.62,18.44,16,18.81,10.34,24.48,10.47,24.62,9.831,24.63,9.57,25.67,16.5,25.67,19.68,22.5,20.06,22.87,24.17,18.76" stroke-opacity="0.35"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 327.5859 -136.9729)" gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="-109.7" x2="-105.4" y1="322.8" y2="322.8">
+
<stop offset="0" stop-color="#262626"/>
+
<stop offset="0.3091" stop-color="#A2A2A2"/>
+
<stop offset="0.8606" stop-color="#000000"/>
+
<stop offset="1" stop-color="#000000"/>
+
</linearGradient>
<path d="M27.23,11.26c-0.834-0.834-1.765-1.257-2.077-0.943l-7.364,7.362,3.021,3.021,7.364-7.363c0.32-0.31-0.11-1.24-0.94-2.08z" fill="url(#SVGID_20_)" fill-rule="evenodd"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 327.5859 -136.9729)" gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="-109.2" x2="-106" y1="333.2" y2="333.2">
+
<stop offset="0" stop-color="#CECECE"/>
+
<stop offset="0.3818" stop-color="#FFFFFF"/>
+
<stop offset="0.7455" stop-color="#8B8B8B"/>
+
<stop offset="1" stop-color="#B2B2B2"/>
+
</linearGradient>
<polygon fill="url(#SVGID_21_)" fill-rule="evenodd" points="14.39,26.37,12.12,24.1,17.41,18.81,19.68,21.08"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 0.0471 -0.0471 72.2638 118.3492)" gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="-109.2" x2="-106" y1="358.1" y2="358.1">
+
<stop offset="0" stop-color="#B2B2B2"/>
+
<stop offset="0.3818" stop-color="#FFFFFF"/>
+
<stop offset="0.8" stop-color="#4D4D4D"/>
+
<stop offset="1" stop-color="#B2B2B2"/>
+
</linearGradient>
<polygon fill="url(#SVGID_22_)" fill-rule="evenodd" points="14.39,26.37,12.12,24.1,11.75,24.48,14.01,26.75"/>
<rect fill="#020202" fill-opacity="0.2" fill-rule="evenodd" height="0.534" stroke-opacity="0.2" transform="matrix(0.7071 0.7071 -0.7071 0.7071 19.772 -6.7045)" width="3.204" x="16.38" y="20.25"/>
<rect fill="#020202" fill-opacity="0.5" fill-rule="evenodd" height="0.534" stroke-opacity="0.5" transform="matrix(0.7068 0.7074 -0.7074 0.7068 19.6277 -7.0812)" width="3.205" x="16.75" y="19.87"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 327.5859 -136.9729)" gradientUnits="userSpaceOnUse" id="SVGID_23_" x1="-109.2" x2="-106" y1="339.6" y2="339.6">
+
<stop offset="0" stop-color="#878A8C"/>
+
<stop offset="0.2606" stop-color="#E7EDF0"/>
+
<stop offset="0.7455" stop-color="#5B6163"/>
+
<stop offset="1" stop-color="#959A9C"/>
+
</linearGradient>
<path d="M13.64,26.37l-0.756-0.756-0.755-0.754c-0.755,0.754-1.51,0.754-1.51,0.754l-0.756,3.021,3.021-0.756c0,0.01,0-0.75,0.76-1.5z" fill="url(#SVGID_23_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 327.5859 -136.9729)" gradientUnits="userSpaceOnUse" id="SVGID_24_" x1="-109.7" x2="-105.4" y1="329" y2="329">
+
<stop offset="0" stop-color="#CECECE"/>
+
<stop offset="0.3818" stop-color="#FFFFFF"/>
+
<stop offset="0.7455" stop-color="#8B8B8B"/>
+
<stop offset="1" stop-color="#B2B2B2"/>
+
</linearGradient>
<polygon fill="url(#SVGID_24_)" fill-rule="evenodd" points="20.06,21.46,17.04,18.44,17.79,17.68,20.81,20.7"/>
<path d="M11.22,25.46l1.807,1.807c0.059-0.148,0.146-0.313,0.267-0.488l-1.584-1.584c-0.18,0.12-0.35,0.21-0.5,0.26z" fill="#020202" fill-opacity="0.1" fill-rule="evenodd" stroke-opacity="0.1"/>
<path d="M13.3,26.78c0.094-0.135,0.2-0.273,0.341-0.414l-0.756-0.756-0.755-0.754c-0.141,0.139-0.279,0.246-0.414,0.34l1.59,1.58z" fill="#020202" fill-opacity="0.3" fill-rule="evenodd" stroke-opacity="0.3"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 327.5859 -136.9729)" gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="-108.1" x2="-107" y1="338.8" y2="338.8">
+
<stop offset="0" stop-color="#666666"/>
+
<stop offset="0.3455" stop-color="#969696"/>
+
<stop offset="0.7818" stop-color="#3B3B3B"/>
+
<stop offset="1" stop-color="#2B2B2B"/>
+
</linearGradient>
<path d="M12.31,26.94c-0.104,0.104-0.357,0.02-0.565-0.189-0.209-0.209-0.293-0.461-0.189-0.566,0.104-0.104,0.358-0.02,0.566,0.189,0.21,0.21,0.3,0.46,0.19,0.57z" fill="url(#SVGID_25_)" fill-rule="evenodd"/>
<rect fill="none" fill-rule="evenodd" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_applications_user.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_applications_user.svg Fri May 14 16:09:54 2010 +0300
@@ -1,90 +1,91 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<stop offset="0" style="stop-color:#D49757"/>
-<stop offset="0.6182" style="stop-color:#8A4117"/>
-<stop offset="1" style="stop-color:#702200"/>
+ <stop offset="0" style="stop-color:#D49757"/>
+ <stop offset="0.6182" style="stop-color:#8A4117"/>
+ <stop offset="1" style="stop-color:#702200"/>
</linearGradient>
<path d="M53.646,12.358c0,0-22.377,0-22.842,0c-0.463,0-1.002-0.202-1.332-1.01 c-0.207-0.705-0.764-2.297-0.764-2.297c-0.211-0.652-0.494-1.234-1.436-1.234H6.697c-0.824,0-1.428,0.7-1.428,1.562v14.438h49.814 v-9.968C55.084,12.989,54.473,12.358,53.646,12.358z" fill="url(#SVGID_1_)"/>
-<path d="M53.646,12.358c0,0-22.377,0-22.842,0 c-0.463,0-1.002-0.202-1.332-1.01c-0.207-0.705-0.764-2.297-0.764-2.297c-0.211-0.652-0.494-1.234-1.436-1.234H6.697 c-0.824,0-1.428,0.7-1.428,1.562v0.727c0-0.861,0.604-1.562,1.428-1.562h20.576c0.941,0,1.225,0.584,1.436,1.236 c0,0,0.557,1.591,0.764,2.296c0.33,0.806,0.869,1.011,1.332,1.011c0.465,0,22.842,0,22.842,0c0.826,0,1.439,0.628,1.439,1.489 v-0.728C55.084,12.989,54.473,12.358,53.646,12.358z" fill="#FFF7F5" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M53.646,12.358c0,0-22.377,0-22.842,0 c-0.463,0-1.002-0.202-1.332-1.01c-0.207-0.705-0.764-2.297-0.764-2.297c-0.211-0.652-0.494-1.234-1.436-1.234H6.697 c-0.824,0-1.428,0.7-1.428,1.562v0.727c0-0.861,0.604-1.562,1.428-1.562h20.576c0.941,0,1.225,0.584,1.436,1.236 c0,0,0.557,1.591,0.764,2.296c0.33,0.806,0.869,1.011,1.332,1.011c0.465,0,22.842,0,22.842,0c0.826,0,1.439,0.628,1.439,1.489 v-0.728C55.084,12.989,54.473,12.358,53.646,12.358z" enable-background="new " fill="#FFF7F5" opacity="0.5"/>
<rect height="8.728" width="46.906" x="6.73" y="15.817"/>
<rect fill="#F2F2F2" height="7.271" width="45.451" x="7.457" y="16.545"/>
-<polygon fill="#231F20" fill-opacity="0.4" points="55.084,22.362 5.27,22.362 5.27,21.636 55.084,21.636 " stroke-opacity="0.4"/>
-<polygon fill="#231F20" fill-opacity="0.15" points="55.084,21.636 5.27,21.636 5.27,20.908 55.084,20.908 " stroke-opacity="0.15"/>
-<polygon fill="#231F20" fill-opacity="0.05" points="55.084,20.908 5.27,20.908 5.27,20.182 55.084,20.182 " stroke-opacity="0.05"/>
+<polygon enable-background="new " fill="#231F20" opacity="0.4" points="55.084,22.362 5.27,22.362 5.27,21.636 55.084,21.636 "/>
+<polygon enable-background="new " fill="#231F20" opacity="0.15" points="55.084,21.636 5.27,21.636 5.27,20.908 55.084,20.908 "/>
+<polygon enable-background="new " fill="#231F20" opacity="0.05" points="55.084,20.908 5.27,20.908 5.27,20.182 55.084,20.182 "/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 4100.9688)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2164" x2="-2164" y1="4048.7861" y2="4078.6064">
-<stop offset="0" style="stop-color:#C79101"/>
-<stop offset="0.0303" style="stop-color:#C79101"/>
-<stop offset="0.0364" style="stop-color:#FEEFA7"/>
-<stop offset="0.3273" style="stop-color:#FEE570"/>
-<stop offset="0.6727" style="stop-color:#F0C12B"/>
-<stop offset="1" style="stop-color:#E6A501"/>
+ <stop offset="0.0303" style="stop-color:#C79101"/>
+ <stop offset="0.0364" style="stop-color:#FEEFA7"/>
+ <stop offset="0.3273" style="stop-color:#FEE570"/>
+ <stop offset="0.6727" style="stop-color:#F0C12B"/>
+ <stop offset="1" style="stop-color:#E6A501"/>
</linearGradient>
<path d="M56.273,22.362H3.727C2.191,22.362,2,24.065,2,24.065l2.549,25.934 c0.307,2.028,1.822,2.184,2.182,2.184c0.072,0,46.465,0,46.539,0c0.357,0,1.875-0.155,2.18-2.184L58,24.065 C58,24.065,57.809,22.362,56.273,22.362z" fill="url(#SVGID_2_)"/>
<path d="M3.727,23.091h52.547c1.178,0,1.563,0.995,1.68,1.464L58,24.065c0,0-0.191-1.703-1.727-1.703H3.727 C2.191,22.362,2,24.065,2,24.065l0.047,0.489C2.164,24.086,2.549,23.091,3.727,23.091z" fill="#FCF3D0"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 4100.9688)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2164.0166" x2="-2164.0166" y1="4048.7861" y2="4053.1504">
-<stop offset="0" style="stop-color:#FCDA5E"/>
-<stop offset="1" style="stop-color:#FFB418"/>
+ <stop offset="0" style="stop-color:#FCDA5E"/>
+ <stop offset="1" style="stop-color:#FFB418"/>
</linearGradient>
-<path d="M4.334,47.818l0.215,2.181 c0.307,2.028,1.822,2.184,2.182,2.184c0.072,0,46.465,0,46.539,0c0.357,0,1.875-0.155,2.18-2.184l0.184-2.181H4.334z" fill="url(#SVGID_3_)" fill-opacity="0.25" stroke-opacity="0.25"/>
+<path d="M4.334,47.818l0.215,2.181 c0.307,2.028,1.822,2.184,2.182,2.184c0.072,0,46.465,0,46.539,0c0.357,0,1.875-0.155,2.18-2.184l0.184-2.181H4.334z" enable-background="new " fill="url(#SVGID_3_)" opacity="0.25"/>
<rect fill="none" height="59.999" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
-<path d="M4.714,29.284C3.218,29.284,2,28.067,2,26.572V6.857 c0-0.395,0.088-0.781,0.263-1.15l-0.001,0C2.327,5.56,2.428,5.352,2.591,5.139l1.37-2.852c0.162-0.437,0.824-1.362,2.067-1.561 l0.079-0.013h17.772l0.079,0.013c1.242,0.201,1.905,1.124,2.101,1.638l1.345,2.795c0.016,0.022,0.03,0.045,0.045,0.069 c0.355,0.465,0.55,1.034,0.55,1.628l0.001,19.715c0,1.495-1.218,2.712-2.714,2.712H4.714z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<defs>
+</defs>
+<path d="M4.714,29.284C3.218,29.284,2,28.067,2,26.572V6.857 c0-0.395,0.088-0.781,0.263-1.15l-0.001,0C2.327,5.56,2.428,5.352,2.591,5.139l1.37-2.852c0.162-0.437,0.824-1.362,2.067-1.561 l0.079-0.013h17.772l0.079,0.013c1.242,0.201,1.905,1.124,2.101,1.638l1.345,2.795c0.016,0.022,0.03,0.045,0.045,0.069 c0.355,0.465,0.55,1.034,0.55,1.628l0.001,19.715c0,1.495-1.218,2.712-2.714,2.712H4.714z" enable-background="new " opacity="0.35"/>
<linearGradient gradientTransform="matrix(1 0 0 1 -303.5 -404.5)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="318.4922" x2="318.4922" y1="406.1846" y2="411.4904">
-<stop offset="0" style="stop-color:#AFED23"/>
-<stop offset="1" style="stop-color:#7DC51A"/>
+ <stop offset="0" style="stop-color:#AFED23"/>
+ <stop offset="1" style="stop-color:#7DC51A"/>
</linearGradient>
<path d="M26.543,5.679l-1.418-2.959c0,0-0.321-0.844-1.326-1.005H6.186C5.183,1.875,4.862,2.721,4.862,2.721 L3.441,5.679C3.097,6.067,3.016,6.563,2.999,6.857h23.985C26.97,6.563,26.889,6.067,26.543,5.679z" fill="url(#SVGID_1__)"/>
<linearGradient gradientTransform="matrix(1 0 0 1 -303.5 -404.5)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="318.5" x2="318.5" y1="409.5186" y2="433.3899">
-<stop offset="0" style="stop-color:#AFED23"/>
-<stop offset="0.14" style="stop-color:#AFED23"/>
-<stop offset="0.69" style="stop-color:#3E8A0D"/>
-<stop offset="0.95" style="stop-color:#7EF524"/>
-<stop offset="1" style="stop-color:#7EF524"/>
+ <stop offset="0.14" style="stop-color:#AFED23"/>
+ <stop offset="0.69" style="stop-color:#3E8A0D"/>
+ <stop offset="0.95" style="stop-color:#7EF524"/>
</linearGradient>
<path d="M26.999,26.572c0,0.943-0.768,1.712-1.714,1.712H4.714C3.766,28.284,3,27.516,3,26.572V6.857 C3,5.91,3.768,5.143,4.714,5.143h20.57c0.947,0,1.714,0.767,1.714,1.714L26.999,26.572L26.999,26.572z" fill="url(#SVGID_2__)"/>
<linearGradient gradientTransform="matrix(1 0 0 1 -303.5 -404.5)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="318.5" x2="318.5" y1="409.5498" y2="427.2303">
-<stop offset="0" style="stop-color:#67AD1A"/>
-<stop offset="1" style="stop-color:#358C0C"/>
+ <stop offset="0" style="stop-color:#67AD1A"/>
+ <stop offset="1" style="stop-color:#358C0C"/>
</linearGradient>
<path d="M6.429,22.284h17.142c0.947,0,1.714-0.767,1.714-1.713V5.142H4.714V20.57 C4.714,21.518,5.481,22.284,6.429,22.284z" fill="url(#SVGID_3__)"/>
<linearGradient gradientTransform="matrix(1 0 0 1 -303.5 -404.5)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="318.5" x2="318.5" y1="425.2158" y2="433.1063">
-<stop offset="0" style="stop-color:#358C0C"/>
-<stop offset="0.78" style="stop-color:#67AD1A"/>
-<stop offset="1" style="stop-color:#AFED23"/>
+ <stop offset="0" style="stop-color:#358C0C"/>
+ <stop offset="0.78" style="stop-color:#67AD1A"/>
+ <stop offset="1" style="stop-color:#AFED23"/>
</linearGradient>
<path d="M24.455,22.034c-0.201,0.12-0.429,0.199-0.673,0.23c-0.058,0.014-0.122,0.021-0.211,0.021H6.429 c-0.09,0-0.157-0.008-0.213-0.021c-0.244-0.031-0.471-0.108-0.673-0.23l-2.302,5.4c0.298,0.506,0.844,0.849,1.473,0.849h20.57 c0.629,0,1.174-0.343,1.475-0.849L24.455,22.034z" fill="url(#SVGID_4_)"/>
<linearGradient gradientTransform="matrix(1 0 0 1 -303.5 -404.5)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="318.5" x2="318.5" y1="425.333" y2="432.5319">
-<stop offset="0" style="stop-color:#0C4A06"/>
-<stop offset="0.32" style="stop-color:#0A5E1C"/>
-<stop offset="0.74" style="stop-color:#41AD1A"/>
-<stop offset="1" style="stop-color:#89D920"/>
+ <stop offset="0" style="stop-color:#0C4A06"/>
+ <stop offset="0.32" style="stop-color:#0A5E1C"/>
+ <stop offset="0.74" style="stop-color:#41AD1A"/>
+ <stop offset="1" style="stop-color:#89D920"/>
</linearGradient>
-<path d="M5.543,22.89c0.202,0.122,0.429,0.201,0.673,0.233 c0.056,0.013,0.124,0.021,0.213,0.021h17.142c0.089,0,0.153-0.011,0.209-0.021c0.246-0.031,0.472-0.111,0.675-0.233l2.066,4.85 c0.089-0.093,0.17-0.193,0.237-0.305l-2.301-5.4c-0.204,0.122-0.432,0.201-0.678,0.23c-0.056,0.014-0.12,0.022-0.209,0.022H6.429 c-0.09,0-0.157-0.009-0.213-0.022c-0.244-0.029-0.471-0.108-0.673-0.23l-2.302,5.4c0.065,0.111,0.148,0.211,0.236,0.305L5.543,22.89 z" fill="url(#SVGID_5_)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M5.543,22.89c0.202,0.122,0.429,0.201,0.673,0.233 c0.056,0.013,0.124,0.021,0.213,0.021h17.142c0.089,0,0.153-0.011,0.209-0.021c0.246-0.031,0.472-0.111,0.675-0.233l2.066,4.85 c0.089-0.093,0.17-0.193,0.237-0.305l-2.301-5.4c-0.204,0.122-0.432,0.201-0.678,0.23c-0.056,0.014-0.12,0.022-0.209,0.022H6.429 c-0.09,0-0.157-0.009-0.213-0.022c-0.244-0.029-0.471-0.108-0.673-0.23l-2.302,5.4c0.065,0.111,0.148,0.211,0.236,0.305L5.543,22.89 z" enable-background="new " fill="url(#SVGID_5_)" opacity="0.3"/>
<linearGradient gradientTransform="matrix(1 0 0 1 -303.5 -404.5)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="318.5" x2="318.5" y1="409.5498" y2="427.229">
-<stop offset="0" style="stop-color:#87CC1F"/>
-<stop offset="0.62" style="stop-color:#086311"/>
-<stop offset="1" style="stop-color:#06421E"/>
+ <stop offset="0" style="stop-color:#87CC1F"/>
+ <stop offset="0.62" style="stop-color:#086311"/>
+ <stop offset="1" style="stop-color:#06421E"/>
</linearGradient>
-<path d="M4.714,5.143v15.428c0,0.946,0.767,1.713,1.715,1.713 h17.142c0.947,0,1.714-0.767,1.714-1.713V5.143H4.714z M24.427,20.57c0,0.473-0.386,0.858-0.856,0.858H6.429 c-0.473,0-0.86-0.385-0.86-0.858V6h18.857V20.57L24.427,20.57z" fill="url(#SVGID_6_)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M4.714,5.143v15.428c0,0.946,0.767,1.713,1.715,1.713 h17.142c0.947,0,1.714-0.767,1.714-1.713V5.143H4.714z M24.427,20.57c0,0.473-0.386,0.858-0.856,0.858H6.429 c-0.473,0-0.86-0.385-0.86-0.858V6h18.857V20.57L24.427,20.57z" enable-background="new " fill="url(#SVGID_6_)" opacity="0.3"/>
<linearGradient gradientTransform="matrix(1 0 0 1 -303.5 -404.5)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="318.499" x2="318.499" y1="406.1982" y2="409.7297">
-<stop offset="0" style="stop-color:#AFED23"/>
-<stop offset="1" style="stop-color:#358C0C"/>
+ <stop offset="0" style="stop-color:#AFED23"/>
+ <stop offset="1" style="stop-color:#358C0C"/>
</linearGradient>
<path d="M25.284,3.428c0-0.947-0.766-1.714-1.714-1.714H6.429c-0.948,0-1.715,0.767-1.715,1.714v1.713h20.57 V3.428z" fill="url(#SVGID_7_)"/>
-<path d="M4.714,5.143h20.57c0.556,0,1.045,0.268,1.358,0.68 c-0.035-0.049-0.061-0.099-0.1-0.144l-1.419-2.958c0,0-0.321-0.844-1.325-1.006H6.186C5.183,1.875,4.862,2.721,4.862,2.721 L3.441,5.679C3.32,5.815,3.242,5.963,3.177,6.111C3.454,5.54,4.035,5.143,4.714,5.143z" fill="#C7FF5A" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M4.714,5.143h20.57c0.556,0,1.045,0.268,1.358,0.68 c-0.035-0.049-0.061-0.099-0.1-0.144l-1.419-2.958c0,0-0.321-0.844-1.325-1.006H6.186C5.183,1.875,4.862,2.721,4.862,2.721 L3.441,5.679C3.32,5.815,3.242,5.963,3.177,6.111C3.454,5.54,4.035,5.143,4.714,5.143z" enable-background="new " fill="#C7FF5A" opacity="0.5"/>
<path d="M26.743,5.967c0.008,0.013,0.013,0.027,0.022,0.04C26.759,5.991,26.751,5.982,26.743,5.967z" fill="#C7FF5A"/>
<path d="M3.051,5.824C3.047,5.836,3.043,5.847,3.04,5.86C3.043,5.849,3.047,5.836,3.051,5.824z" fill="#C7FF5A"/>
<linearGradient gradientTransform="matrix(1 0 0 1 -303.5 -404.5)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="318.5" x2="318.5" y1="409.5186" y2="433.3899">
-<stop offset="0" style="stop-color:#D4FFA8"/>
-<stop offset="0.68" style="stop-color:#75D911"/>
-<stop offset="1" style="stop-color:#7EF524"/>
+ <stop offset="0" style="stop-color:#D4FFA8"/>
+ <stop offset="0.68" style="stop-color:#75D911"/>
+ <stop offset="1" style="stop-color:#7EF524"/>
</linearGradient>
<path d="M25.284,5.143H4.714C3.766,5.143,3,5.91,3,6.857V26.57c0,0.945,0.767,1.714,1.713,1.714h20.57 c0.947,0,1.714-0.769,1.714-1.714V6.857C26.999,5.91,26.231,5.143,25.284,5.143z M26.143,26.572c0,0.472-0.388,0.856-0.858,0.856 H4.714c-0.471,0-0.858-0.385-0.858-0.856V6.857C3.856,6.384,4.241,6,4.714,6h20.57c0.471,0,0.858,0.384,0.858,0.857V26.572z" fill="url(#SVGID_8_)"/>
<rect fill="none" height="29.998" width="29.998"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_avatar.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_avatar.svg Fri May 14 16:09:54 2010 +0300
@@ -1,16 +1,29 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bell.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bell.svg Fri May 14 16:09:54 2010 +0300
@@ -1,63 +1,65 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<stop offset="0" style="stop-color:#676B6D"/>
-<stop offset="0.297" style="stop-color:#A0A3A6"/>
-<stop offset="0.7091" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+ <stop offset="0" style="stop-color:#676B6D"/>
+ <stop offset="0.297" style="stop-color:#A0A3A6"/>
+ <stop offset="0.7091" style="stop-color:#474B4D"/>
+ <stop offset="1" style="stop-color:#707577"/>
</linearGradient>
<path d="M15.172,29.313L15.172,29.313c-4.057,4.059-3.887,10.822,0.402,15.109 c4.285,4.285,11.057,4.465,15.113,0.406l0,0L15.172,29.313z" fill="url(#SVGID_1_)"/>
<linearGradient gradientTransform="matrix(1 0 0 1 0 9.765625e-004)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="5.5908" x2="42.1352" y1="17.8457" y2="54.3901">
-<stop offset="0" style="stop-color:#FFB533"/>
-<stop offset="0.2" style="stop-color:#FFE692"/>
-<stop offset="0.3879" style="stop-color:#FBD072"/>
-<stop offset="0.4182" style="stop-color:#F7BC54"/>
-<stop offset="0.6667" style="stop-color:#ED8C0D"/>
-<stop offset="0.8545" style="stop-color:#F9C967"/>
-<stop offset="1" style="stop-color:#FFB81F"/>
+ <stop offset="0" style="stop-color:#FFB533"/>
+ <stop offset="0.2" style="stop-color:#FFE692"/>
+ <stop offset="0.3879" style="stop-color:#FBD072"/>
+ <stop offset="0.4182" style="stop-color:#F7BC54"/>
+ <stop offset="0.6667" style="stop-color:#ED8C0D"/>
+ <stop offset="0.8545" style="stop-color:#F9C967"/>
+ <stop offset="1" style="stop-color:#FFB81F"/>
</linearGradient>
<path d="M42.727,47.441L12.559,17.273c-4.08-1.461-5.623-0.41-7.496,1.463L2,21.799L38.201,58l3.064-3.063 C43.137,53.064,44.188,51.521,42.727,47.441z" fill="url(#SVGID_2_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -785.9789 1292.5154)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-320.21" x2="-311.6052" y1="-1501.5957" y2="-1501.5957">
-<stop offset="0" style="stop-color:#FFB533"/>
-<stop offset="0.1939" style="stop-color:#FFE692"/>
-<stop offset="0.703" style="stop-color:#ED8C0D"/>
-<stop offset="0.8848" style="stop-color:#F9C967"/>
-<stop offset="1" style="stop-color:#FFB81F"/>
+ <stop offset="0" style="stop-color:#FFB533"/>
+ <stop offset="0.1939" style="stop-color:#FFE692"/>
+ <stop offset="0.703" style="stop-color:#ED8C0D"/>
+ <stop offset="0.8848" style="stop-color:#F9C967"/>
+ <stop offset="1" style="stop-color:#FFB81F"/>
</linearGradient>
<path d="M53.285,12.75l1.51-1.51c1.658-1.658,1.658-4.375,0-6.033c-1.66-1.66-4.375-1.66-6.035,0 l-1.508,1.508L53.285,12.75z" fill="url(#SVGID_3_)"/>
-<path d="M53.285,12.75l1.51-1.51c0.09-0.09,0.158-0.195,0.238-0.293 c-0.771-1.162-1.666-2.268-2.689-3.289c-1.023-1.023-2.127-1.92-3.291-2.691c-0.096,0.082-0.201,0.148-0.293,0.24l-1.508,1.508 L53.285,12.75z" fill="#873900" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M52.91,7.092c-0.984-0.984-2.045-1.848-3.16-2.598c-0.354,0.189-0.691,0.414-0.988,0.711 L47.818,6.15l6.033,6.033l0.943-0.943c0.297-0.297,0.521-0.637,0.713-0.99C54.756,9.137,53.893,8.076,52.91,7.092z" fill="#873900" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M53.285,12.75l1.51-1.51c0.09-0.09,0.158-0.195,0.238-0.293 c-0.771-1.162-1.666-2.268-2.689-3.289c-1.023-1.023-2.127-1.92-3.291-2.691c-0.096,0.082-0.201,0.148-0.293,0.24l-1.508,1.508 L53.285,12.75z" fill="#873900" opacity="0.2"/>
+<path d="M52.91,7.092c-0.984-0.984-2.045-1.848-3.16-2.598c-0.354,0.189-0.691,0.414-0.988,0.711 L47.818,6.15l6.033,6.033l0.943-0.943c0.297-0.297,0.521-0.637,0.713-0.99C54.756,9.137,53.893,8.076,52.91,7.092z" fill="#873900" opacity="0.1"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="51.8164" x2="27.3908" y1="8.1841" y2="32.6097">
-<stop offset="0" style="stop-color:#FDE6B1"/>
-<stop offset="1" style="stop-color:#EF951A"/>
+ <stop offset="0" style="stop-color:#FDE6B1"/>
+ <stop offset="1" style="stop-color:#EF951A"/>
</linearGradient>
<path d="M42.727,47.441l9.051-9.051c8.297-8.295,8.297-21.871,0-30.168c-8.295-8.297-21.871-8.297-30.168,0 l-9.051,9.051L42.727,47.441z" fill="url(#SVGID_4_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="25.4072" x2="54.0366" y1="5.9873" y2="34.6167">
-<stop offset="0" style="stop-color:#FFB533"/>
-<stop offset="0.2545" style="stop-color:#FFE692"/>
-<stop offset="0.503" style="stop-color:#F8C15B"/>
-<stop offset="0.5152" style="stop-color:#F6B84E"/>
-<stop offset="0.6667" style="stop-color:#ED8C0D"/>
-<stop offset="0.8545" style="stop-color:#F9C967"/>
-<stop offset="1" style="stop-color:#FFB81F"/>
+ <stop offset="0" style="stop-color:#FFB533"/>
+ <stop offset="0.2545" style="stop-color:#FFE692"/>
+ <stop offset="0.503" style="stop-color:#F8C15B"/>
+ <stop offset="0.5152" style="stop-color:#F6B84E"/>
+ <stop offset="0.6667" style="stop-color:#ED8C0D"/>
+ <stop offset="0.8545" style="stop-color:#F9C967"/>
+ <stop offset="1" style="stop-color:#FFB81F"/>
</linearGradient>
<path d="M13.689,17.273l8.486-8.484c3.861-3.861,9.018-5.988,14.518-5.988c5.502,0,10.658,2.127,14.52,5.988 s5.988,9.018,5.988,14.518c0,5.502-2.127,10.658-5.988,14.52l-8.486,8.484L13.689,17.273z" fill="url(#SVGID_5_)"/>
-<rect fill="#873900" fill-opacity="0.2" height="0.801" stroke-opacity="0.2" transform="matrix(0.7071 0.7071 -0.7071 0.7071 30.8495 -10.3756)" width="42.664" x="6.617" y="31.65"/>
-<path d="M26.412,47.342c0.285-0.082,0.57-0.174,0.85-0.281L12.939,32.738c-0.107,0.279-0.199,0.563-0.281,0.85 L26.412,47.342z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<rect fill="#873900" fill-opacity="0.1" height="0.8" stroke-opacity="0.1" transform="matrix(0.7071 0.7071 -0.7071 0.7071 30.6155 -10.9417)" width="42.664" x="7.184" y="31.086"/>
-<path d="M25.439,47.572c0.311-0.059,0.617-0.127,0.92-0.213L12.641,33.641c-0.086,0.303-0.156,0.609-0.215,0.918 L25.439,47.572z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M8.873,16.604l34.523,34.525c0.072-0.971-0.119-2.148-0.67-3.688L12.559,17.273 C11.021,16.721,9.844,16.531,8.873,16.604z" fill="#FFF6C9" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M12.559,17.273c-0.391-0.141-0.758-0.256-1.105-0.352l31.625,31.625 c-0.094-0.346-0.211-0.715-0.352-1.105L12.559,17.273z" fill="#FFF6C9" fill-opacity="0.5" stroke-opacity="0.5"/>
-<rect fill="#753200" fill-opacity="0.2" height="0.801" stroke-opacity="0.2" transform="matrix(0.7071 0.7071 -0.7071 0.7071 33.985 -2.8095)" width="51.198" x="-5.215" y="39.217"/>
-<rect fill="#753200" fill-opacity="0.1" height="0.798" stroke-opacity="0.1" transform="matrix(0.7071 0.7071 -0.7071 0.7071 33.7481 -3.3767)" width="51.198" x="-4.649" y="38.652"/>
+<rect fill="#873900" height="0.801" opacity="0.2" transform="matrix(0.7071 0.7071 -0.7071 0.7071 30.8495 -10.3756)" width="42.664" x="6.617" y="31.65"/>
+<path d="M26.412,47.342c0.285-0.082,0.57-0.174,0.85-0.281L12.939,32.738c-0.107,0.279-0.199,0.563-0.281,0.85 L26.412,47.342z" opacity="0.2"/>
+<rect fill="#873900" height="0.8" opacity="0.1" transform="matrix(0.7071 0.7071 -0.7071 0.7071 30.6155 -10.9417)" width="42.664" x="7.184" y="31.086"/>
+<path d="M25.439,47.572c0.311-0.059,0.617-0.127,0.92-0.213L12.641,33.641c-0.086,0.303-0.156,0.609-0.215,0.918 L25.439,47.572z" opacity="0.1"/>
+<path d="M8.873,16.604l34.523,34.525c0.072-0.971-0.119-2.148-0.67-3.688L12.559,17.273 C11.021,16.721,9.844,16.531,8.873,16.604z" fill="#FFF6C9" opacity="0.5"/>
+<path d="M12.559,17.273c-0.391-0.141-0.758-0.256-1.105-0.352l31.625,31.625 c-0.094-0.346-0.211-0.715-0.352-1.105L12.559,17.273z" fill="#FFF6C9" opacity="0.5"/>
+<rect fill="#753200" height="0.801" opacity="0.2" transform="matrix(0.7071 0.7071 -0.7071 0.7071 33.985 -2.8095)" width="51.198" x="-5.215" y="39.217"/>
+<rect fill="#753200" height="0.798" opacity="0.1" transform="matrix(0.7071 0.7071 -0.7071 0.7071 33.7481 -3.3767)" width="51.198" x="-4.649" y="38.652"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="42.4766" x2="42.4766" y1="3.564" y2="32.0729">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#F9C966"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#F9C966"/>
</linearGradient>
-<path d="M53.869,30.98c-4.629-2.719-9.43-6.51-13.885-10.965S31.738,10.76,29.021,6.131 l-0.475-0.807l0.871-0.344c2.313-0.91,4.752-1.371,7.254-1.371c5.23,0,10.324,2.094,13.975,5.746 c5.551,5.549,7.268,13.883,4.373,21.229l-0.344,0.869L53.869,30.98z" fill="url(#SVGID_6_)" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M53.869,30.98c-4.629-2.719-9.43-6.51-13.885-10.965S31.738,10.76,29.021,6.131 l-0.475-0.807l0.871-0.344c2.313-0.91,4.752-1.371,7.254-1.371c5.23,0,10.324,2.094,13.975,5.746 c5.551,5.549,7.268,13.883,4.373,21.229l-0.344,0.869L53.869,30.98z" fill="url(#SVGID_6_)" opacity="0.5"/>
<rect fill="none" height="60" width="60"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth.svg Fri May 14 16:09:54 2010 +0300
@@ -1,28 +1,29 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
+ <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"/>
+ <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"/>
+ <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>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth_active_connection.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth_active_connection.svg Fri May 14 16:09:54 2010 +0300
@@ -1,61 +1,59 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
+ <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"/>
+ <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"/>
+ <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)">
+<defs>
+</defs>
<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"/>
-<path d="M29.58,12.911L19.063,2.596c-0.339-0.333-0.685-0.402-0.916-0.402c-0.564,0-1.165,0.449-1.165,1.281v4.399 h-7.73c-0.842,0-1.525,0.689-1.525,1.537v4.051c0,0.847,0.684,1.535,1.525,1.535h19.482c0.555,0,0.998-0.273,1.186-0.73 C30.105,13.808,29.979,13.301,29.58,12.911z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<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" opacity="0.35"/>
+<path d="M29.58,12.911L19.063,2.596c-0.339-0.333-0.685-0.402-0.916-0.402c-0.564,0-1.165,0.449-1.165,1.281v4.399 h-7.73c-0.842,0-1.525,0.689-1.525,1.537v4.051c0,0.847,0.684,1.535,1.525,1.535h19.482c0.555,0,0.998-0.273,1.186-0.73 C30.105,13.808,29.979,13.301,29.58,12.911z" opacity="0.35"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="11.1406" x2="11.1406" y1="16.103" y2="27.0009">
-<stop offset="0" style="stop-color:#CDEDBD"/>
-<stop offset="0.9879" style="stop-color:#139900"/>
-<stop offset="1" style="stop-color:#139900"/>
+ <stop offset="0" style="stop-color:#CDEDBD"/>
+ <stop offset="0.9879" style="stop-color:#139900"/>
</linearGradient>
<path d="M21.279,20.589c0,0.294-0.236,0.538-0.527,0.538h-8.205c-0.287,0-0.525,0.241-0.525,0.537v4.861 c0,0.295-0.172,0.37-0.38,0.165L1.125,16.373c-0.211-0.205-0.144-0.372,0.145-0.372h19.482c0.289,0,0.527,0.241,0.527,0.537V20.589z " fill="url(#SVGID_1__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="11.7783" x2="11.7783" y1="17.0737" y2="24.8819">
-<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"/>
+ <stop offset="0" style="stop-color:#82C94C"/>
+ <stop offset="0.2545" style="stop-color:#439020"/>
+ <stop offset="0.5091" style="stop-color:#0D4D07"/>
</linearGradient>
<path d="M3.336,17.06h16.885v3.009h-7.674c-0.872,0-1.584,0.715-1.584,1.596v2.878L3.336,17.06z" fill="url(#SVGID_2__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="18.8643" x2="18.8643" y1="3.2227" y2="14.1618">
-<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"/>
+ <stop offset="0.4909" style="stop-color:#CDEDBD"/>
+ <stop offset="0.9879" style="stop-color:#139900"/>
</linearGradient>
<path d="M8.727,9.411c0-0.296,0.235-0.537,0.525-0.537h8.206c0.288,0,0.524-0.242,0.524-0.538V3.475 c0-0.297,0.172-0.37,0.381-0.165l10.516,10.315c0.211,0.205,0.144,0.372-0.145,0.372H9.252c-0.289,0-0.525-0.241-0.525-0.535V9.411z " fill="url(#SVGID_3__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="18.2266" x2="18.2266" y1="5.4292" y2="12.9712">
-<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"/>
+ <stop offset="0" style="stop-color:#B2F56E"/>
+ <stop offset="0.703" style="stop-color:#439020"/>
+ <stop offset="0.9879" style="stop-color:#0D4D07"/>
</linearGradient>
<path d="M9.785,12.938V9.933h7.673c0.872,0,1.583-0.718,1.583-1.597V5.458l7.627,7.48H9.785z" fill="url(#SVGID_4_)"/>
<rect fill="none" height="30" width="30" x="0.002"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth_hide.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth_hide.svg Fri May 14 16:09:54 2010 +0300
@@ -1,28 +1,29 @@
-<?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 fill-opacity="None" stroke-opacity="None">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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 opacity="None">
+<defs>
+</defs>
<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"/>
+ <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"/>
+ <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"/>
+ <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>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth_multiple_connection.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth_multiple_connection.svg Fri May 14 16:09:54 2010 +0300
@@ -1,60 +1,58 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
+ <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"/>
+ <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"/>
+ <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)">
+<defs>
+</defs>
<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"/>
+<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" 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"/>
+ <stop offset="0.4909" style="stop-color:#CDEDBD"/>
+ <stop offset="0.9879" 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"/>
+ <stop offset="0" style="stop-color:#B2F56E"/>
+ <stop offset="0.703" style="stop-color:#439020"/>
+ <stop offset="0.9879" 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"/>
+ <stop offset="0" style="stop-color:#CDEDBD"/>
+ <stop offset="0.9879" 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"/>
+ <stop offset="0" style="stop-color:#82C94C"/>
+ <stop offset="0.2545" style="stop-color:#439020"/>
+ <stop offset="0.5091" 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>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth_off.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_bluetooth_off.svg Fri May 14 16:09:54 2010 +0300
@@ -1,39 +1,42 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
+ <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"/>
+ <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"/>
+ <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(2 0 0 2 0 0)">
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
-<rect fill-opacity="0.35" height="33.866" stroke-opacity="0.35" transform="matrix(-0.6985 0.7156 -0.7156 -0.6985 35.9922 14.2223)" width="3.706" x="13.147" y="-2.239"/>
+<rect height="33.866" opacity="0.35" transform="matrix(-0.6985 0.7156 -0.7156 -0.6985 35.9922 14.2223)" width="3.706" x="13.147" y="-2.239"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -257 670.6689)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="260" x2="284" y1="655.9761" y2="655.9761">
-<stop offset="0" style="stop-color:#FF4D00"/>
-<stop offset="0.8424" style="stop-color:#CC1414"/>
-<stop offset="1" style="stop-color:#FF4D00"/>
+ <stop offset="0" style="stop-color:#FF4D00"/>
+ <stop offset="0.8424" style="stop-color:#CC1414"/>
+ <stop offset="1" style="stop-color:#FF4D00"/>
</linearGradient>
<polygon fill="url(#SVGID_1__)" points="25.809,26.431 3,4.177 4.191,2.956 27,25.21 "/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_browser.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_browser.svg Fri May 14 16:09:54 2010 +0300
@@ -1,63 +1,61 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<stop offset="0" style="stop-color:#004E8C"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#004E8C"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</linearGradient>
<path d="M57.998,30.001C57.998,45.464,45.461,58,30,58C14.535,58,1.998,45.464,1.998,30.001 C1.998,14.54,14.535,2,30,2C45.461,2,57.998,14.54,57.998,30.001z" fill="url(#SVGID_1_)"/>
<radialGradient cx="26.9434" cy="12.7056" gradientTransform="matrix(0.9953 0 0 0.9952 2.7861 7.6702)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="33.8669">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#94FFFF"/>
+ <stop offset="0.5" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</radialGradient>
<circle cx="29.999" cy="30.001" fill="url(#SVGID_2_)" r="27.282"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="29.999" x2="29.999" y1="2.4785" y2="57.4196">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#88D6EB"/>
+ <stop offset="0" style="stop-color:#31A7F8"/>
+ <stop offset="0.497" style="stop-color:#1E74DC"/>
+ <stop offset="1" style="stop-color:#88D6EB"/>
</linearGradient>
-<path d="M30,2.718c-15.066,0-27.283,12.218-27.283,27.283c0,15.069,12.217,27.28,27.283,27.28 c15.07,0,27.281-12.211,27.281-27.28C57.281,14.937,45.07,2.718,30,2.718z M30,54.894c-14.166,0-25.691-11.524-25.691-25.688 C4.309,15.04,15.834,3.515,30,3.515S55.689,15.04,55.689,29.206C55.689,43.37,44.166,54.894,30,54.894z" fill="url(#SVGID_3_)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M30,2.718c-15.066,0-27.283,12.218-27.283,27.283c0,15.069,12.217,27.28,27.283,27.28 c15.07,0,27.281-12.211,27.281-27.28C57.281,14.937,45.07,2.718,30,2.718z M30,54.894c-14.166,0-25.691-11.524-25.691-25.688 C4.309,15.04,15.834,3.515,30,3.515S55.689,15.04,55.689,29.206C55.689,43.37,44.166,54.894,30,54.894z" fill="url(#SVGID_3_)" opacity="0.3"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="3.1621" x2="7.498" y1="33.7139" y2="33.7139">
-<stop offset="0" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#58595B"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
-<path d="M5.277,29.556C4.988,29.17,4.332,29.17,4.041,29.17c-0.57,0-0.873,0.406-0.879,0.804 v0.028v0.041c0,0.702,0.039,1.489,0.123,2.446c0.018,0.179,0.039,0.36,0.061,0.54l0.033,0.263c0.072,0.566,0.158,1.125,0.256,1.665 l0.043,0.237c0.043,0.213,0.084,0.424,0.129,0.633c0.117,0.53,0.26,1.08,0.434,1.687c0.025,0.087,0.049,0.175,0.07,0.26 c0.039,0.142,0.076,0.283,0.121,0.419l0.004,0.02l0.016,0.043c-0.002-0.011-0.01-0.03-0.012-0.048l1.564-0.106 c0.025-0.243,0.033-0.497,0.025-0.751C6.016,36.956,6,36.467,5.889,36.056l1.455-1.951l0.154-0.213v-0.264v-1.52v-0.331 l-0.232-0.232L5.277,29.556z" fill="url(#SVGID_4_)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M5.277,29.556C4.988,29.17,4.332,29.17,4.041,29.17c-0.57,0-0.873,0.406-0.879,0.804 v0.028v0.041c0,0.702,0.039,1.489,0.123,2.446c0.018,0.179,0.039,0.36,0.061,0.54l0.033,0.263c0.072,0.566,0.158,1.125,0.256,1.665 l0.043,0.237c0.043,0.213,0.084,0.424,0.129,0.633c0.117,0.53,0.26,1.08,0.434,1.687c0.025,0.087,0.049,0.175,0.07,0.26 c0.039,0.142,0.076,0.283,0.121,0.419l0.004,0.02l0.016,0.043c-0.002-0.011-0.01-0.03-0.012-0.048l1.564-0.106 c0.025-0.243,0.033-0.497,0.025-0.751C6.016,36.956,6,36.467,5.889,36.056l1.455-1.951l0.154-0.213v-0.264v-1.52v-0.331 l-0.232-0.232L5.277,29.556z" fill="url(#SVGID_4_)" opacity="0.3"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="11.5254" x2="56.9043" y1="25.7695" y2="25.7695">
-<stop offset="0" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#58595B"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
-<path d="M56.896,24.654c-0.02-0.103-0.039-0.176-0.057-0.25 c-0.016-0.055-0.027-0.109-0.037-0.162c-0.141-0.646-0.313-1.314-0.514-1.994l-0.023-0.074c-0.041-0.153-0.086-0.306-0.135-0.457 c-0.248-0.767-0.514-1.5-0.797-2.177c-0.035-0.085-0.074-0.163-0.109-0.245l-0.059-0.131c-0.268-0.619-0.568-1.238-0.883-1.833 l-0.041-0.077c-0.061-0.117-0.119-0.236-0.184-0.353c-0.385-0.695-0.789-1.358-1.199-1.974c-0.043-0.065-0.092-0.134-0.141-0.202 c-0.031-0.041-0.059-0.081-0.086-0.121c-0.395-0.571-0.807-1.126-1.236-1.656l-0.084-0.106c-0.059-0.071-0.115-0.146-0.176-0.218 c-0.498-0.596-1.023-1.174-1.566-1.72c-0.072-0.074-0.152-0.15-0.23-0.226l-0.064-0.062c-0.49-0.481-1.01-0.956-1.547-1.402 l-0.104-0.091c-0.055-0.048-0.107-0.096-0.164-0.139c-0.582-0.48-1.215-0.952-1.875-1.405c-0.08-0.055-0.164-0.109-0.248-0.162 l-0.1-0.066c-0.594-0.393-1.213-0.77-1.834-1.114l-0.098-0.055c-0.051-0.029-0.102-0.059-0.152-0.088 c-0.693-0.371-1.414-0.72-2.146-1.035L40.82,4.985l-0.199-0.083c-0.193-0.079-0.387-0.147-0.578-0.215 c-0.102-0.035-0.199-0.069-0.299-0.104l-0.371-0.138l-0.33,0.212c-0.223,0.14-1.098,0.64-1.613,0.934 c-0.574-0.077-1.961-0.251-3.359-0.386c0.432-0.042,1.025-0.09,1.869-0.146l0.117-1.573L35.994,3.47 c-0.051-0.014-0.102-0.025-0.152-0.037L35.723,3.41l-0.098-0.02c-0.857-0.172-1.662-0.297-2.461-0.38L33.16,3.009l-0.109-0.01 c-0.914-0.093-1.844-0.139-2.762-0.139c-0.809,0-1.648,0.042-2.564,0.13c-0.145,0.013-0.281,0.029-0.422,0.043 c-0.906,0.101-1.697,0.221-2.447,0.373L24.83,3.411l-0.018,0.003c-0.789,0.163-1.582,0.367-2.428,0.624 c-0.074,0.022-0.15,0.048-0.227,0.071l-0.17,0.056c-0.713,0.23-1.412,0.485-2.084,0.762c-0.057,0.023-0.094,0.037-0.131,0.051 l-0.102,0.041c-0.738,0.314-1.475,0.668-2.205,1.06c-0.078,0.041-0.156,0.087-0.232,0.13l-0.094,0.055 c-0.205,0.113-0.412,0.242-0.617,0.37L16.258,6.8l-1.461,0.893l1.623,0.542c0.242,0.082,0.504,0.123,0.773,0.123 c0.875,0,1.721-0.43,2.402-0.776c0.273-0.138,0.678-0.344,0.848-0.376c0.199,0.06,0.396,0.089,0.596,0.089 c0.746,0,1.354-0.401,1.893-0.754l0.145-0.094c0.174-0.057,0.473-0.167,1.07-0.391c0.607-0.229,1.717-0.645,2.01-0.715 c0.578-0.006,1.264-0.088,1.752-0.392c0.459,0.075,1.273,0.204,2.115,0.314C29.961,5.301,29.9,5.341,29.85,5.391 c-0.273,0.251-1.742,0.696-2.195,0.755c-0.848,0.106-1.186,0.532-1.322,0.871c-0.176,0.439-0.068,0.878,0.104,1.235 c-0.32,0.212-0.713,0.448-1.049,0.625c0-0.007,0.002-0.015,0.004-0.024c0.121-0.675,0.209-1.163-0.119-1.556 c-0.166-0.2-0.414-0.314-0.676-0.314c-0.387,0-0.688,0.239-0.93,0.473c-0.68,0.656-1.09,1.476-1.246,1.783l-0.027,0.059 l-0.025,0.044c-0.293,0.563-0.414,0.962-0.25,2.207c-0.074,0.051-0.287,0.132-0.582,0.132c-0.041,0-0.076-0.002-0.105-0.005 c-0.191-0.205-0.453-0.322-0.752-0.322l0,0c-0.684,0-1.619,0.771-2.773,2.292l-0.371,0.49l0.377,0.484l0.354,0.449 c-5.51,4.257-5.551,4.5-5.609,4.855c-0.01,0.032-0.057,0.18-0.123,0.383c-0.822,2.552-1.275,4.46-0.834,5.482 c1.025,2.368,2.182,4.579,3.68,4.701c0.133,0.011,0.277,0.017,0.434,0.017c1.373,0,3.6-0.416,4.668-0.635 c0.197,0.371,0.436,0.804,0.568,1.04l0.238,0.421l0.484-0.016c0,0,0.26-0.008,0.584-0.008c0.375,0,0.625,0.011,0.787,0.022 c0.584,1.708,1.699,5.643,1.492,6.459l-0.004,0.004c-1.885,2.821,0.4,6.499,1.494,8.269c0.088,0.14,0.168,0.266,0.232,0.374 c0.424,1.204,0.934,2.002,2.02,2.002c0.078,0,0.16-0.005,0.244-0.009c0.063-0.004,0.125-0.007,0.191-0.007 c0.121,0,0.207,0.014,0.293,0.045l0.1,0.036l0.105,0.01c0.205,0.017,0.4,0.045,0.592,0.071c0.334,0.047,0.68,0.095,1.031,0.095 c0.941,0,1.689-0.357,2.336-1.119c0.021-0.004,0.045-0.005,0.068-0.008c0.678-0.095,0.932-0.433,1.018-0.737 c0.051-0.05,0.117-0.112,0.172-0.164c0.268-0.244,0.584-0.537,0.803-0.88c0.1-0.059,0.213-0.125,0.338-0.2 c0.219-0.134,0.465-0.283,0.658-0.382c0.172-0.052,0.322-0.153,0.436-0.293c0.273-0.335,0.217-0.717,0.172-1.023 c-0.047-0.318-0.092-0.642,0.078-0.99c0.965-0.465,2.68-1.608,2.957-1.796v0.022c-0.02,0.153-0.064,0.563-0.133,0.822 c-0.363,0.366-0.67,0.919-0.766,1.105l-0.063,0.121l-0.02,0.137c-0.023,0.18-0.123,1.11,0.4,1.712 c0.264,0.301,0.641,0.468,1.063,0.468c0.131,0,0.271-0.017,0.416-0.05c1.342-0.304,3.723-3.531,3.916-5.312 c0.096-0.859-0.24-1.534-0.918-1.852l-0.506-0.24l-0.398,0.396l-1.469,1.471c-0.498,0.046-0.887,0.193-1.148,0.425 c0.016-0.627-0.047-1.27-0.113-1.896c-0.201-1.891-0.24-3.097,0.92-3.915l0.059-0.043l0.051-0.051 c0.418-0.426,0.883-0.799,1.373-1.193c1.15-0.924,2.34-1.878,3.047-3.604l0.031-0.074c0.227-0.59,0.568-1.478,0.104-2.158 c-0.115-0.167-0.359-0.426-0.814-0.518c0.604-0.242,1.066-0.435,1.111-0.452l0.141-0.059l0.109-0.104l2.48-2.381l0.363-0.35 l-0.16-0.479c-0.021-0.062-0.158-0.438-0.537-0.977c0.725,0.099,1.344,0.272,1.549,0.427c0.074,0.163,0.221,0.519,0.379,0.892 c2.732,6.435,3.115,6.766,3.824,6.777c0.027,0,0.049,0.002,0.066,0.005c0.057,0.002,0.109,0.006,0.156,0.006 c0.404,0,0.635-0.207,0.736-0.331c0.297-0.357,0.215-0.795,0.184-0.959l-0.012-0.056c-0.033-0.384-0.012-2.113,0.045-3.536 c0.004,0.004,0.006,0.008,0.008,0.013l1.463-0.58L56.896,24.654z M35.391,16.784c-0.113,0.005-0.238,0.012-0.367,0.017 c-0.422,0.018-0.902,0.04-1.377,0.04c-1.25,0-1.533-0.155-1.564-0.171c-0.146-0.107-0.297-0.188-0.457-0.246 c0.285-0.063,0.607-0.279,0.939-0.924c0.33,0.636,0.773,1.198,1.457,1.198c0.184,0,0.363-0.045,0.531-0.131 C34.783,16.568,35.162,16.7,35.391,16.784z M34.9,13.303c-0.094,0-0.172-0.005-0.23-0.009c0.064-0.167,0.141-0.264,0.201-0.319 c0.08,0.122,0.186,0.229,0.305,0.32C35.078,13.301,34.986,13.303,34.9,13.303z M29.932,14.974c0.428,0.837,0.744,1.198,0.994,1.355 c-0.619,0.049-1.086,0.443-1.469,0.817c-0.271-0.09-0.74-0.374-0.879-0.572c-0.084-0.117-0.18-0.217-0.287-0.304 C28.969,16.077,29.564,15.447,29.932,14.974z M27.57,14.355l-0.889-0.043l-2.975-0.146c0.361-0.299,0.707-0.579,0.91-0.745 c0.055-0.02,0.27-0.078,0.793-0.078c0.314,0,0.617,0.021,0.809,0.037L27.57,14.355z" fill="url(#SVGID_5_)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M56.896,24.654c-0.02-0.103-0.039-0.176-0.057-0.25 c-0.016-0.055-0.027-0.109-0.037-0.162c-0.141-0.646-0.313-1.314-0.514-1.994l-0.023-0.074c-0.041-0.153-0.086-0.306-0.135-0.457 c-0.248-0.767-0.514-1.5-0.797-2.177c-0.035-0.085-0.074-0.163-0.109-0.245l-0.059-0.131c-0.268-0.619-0.568-1.238-0.883-1.833 l-0.041-0.077c-0.061-0.117-0.119-0.236-0.184-0.353c-0.385-0.695-0.789-1.358-1.199-1.974c-0.043-0.065-0.092-0.134-0.141-0.202 c-0.031-0.041-0.059-0.081-0.086-0.121c-0.395-0.571-0.807-1.126-1.236-1.656l-0.084-0.106c-0.059-0.071-0.115-0.146-0.176-0.218 c-0.498-0.596-1.023-1.174-1.566-1.72c-0.072-0.074-0.152-0.15-0.23-0.226l-0.064-0.062c-0.49-0.481-1.01-0.956-1.547-1.402 l-0.104-0.091c-0.055-0.048-0.107-0.096-0.164-0.139c-0.582-0.48-1.215-0.952-1.875-1.405c-0.08-0.055-0.164-0.109-0.248-0.162 l-0.1-0.066c-0.594-0.393-1.213-0.77-1.834-1.114l-0.098-0.055c-0.051-0.029-0.102-0.059-0.152-0.088 c-0.693-0.371-1.414-0.72-2.146-1.035L40.82,4.985l-0.199-0.083c-0.193-0.079-0.387-0.147-0.578-0.215 c-0.102-0.035-0.199-0.069-0.299-0.104l-0.371-0.138l-0.33,0.212c-0.223,0.14-1.098,0.64-1.613,0.934 c-0.574-0.077-1.961-0.251-3.359-0.386c0.432-0.042,1.025-0.09,1.869-0.146l0.117-1.573L35.994,3.47 c-0.051-0.014-0.102-0.025-0.152-0.037L35.723,3.41l-0.098-0.02c-0.857-0.172-1.662-0.297-2.461-0.38L33.16,3.009l-0.109-0.01 c-0.914-0.093-1.844-0.139-2.762-0.139c-0.809,0-1.648,0.042-2.564,0.13c-0.145,0.013-0.281,0.029-0.422,0.043 c-0.906,0.101-1.697,0.221-2.447,0.373L24.83,3.411l-0.018,0.003c-0.789,0.163-1.582,0.367-2.428,0.624 c-0.074,0.022-0.15,0.048-0.227,0.071l-0.17,0.056c-0.713,0.23-1.412,0.485-2.084,0.762c-0.057,0.023-0.094,0.037-0.131,0.051 l-0.102,0.041c-0.738,0.314-1.475,0.668-2.205,1.06c-0.078,0.041-0.156,0.087-0.232,0.13l-0.094,0.055 c-0.205,0.113-0.412,0.242-0.617,0.37L16.258,6.8l-1.461,0.893l1.623,0.542c0.242,0.082,0.504,0.123,0.773,0.123 c0.875,0,1.721-0.43,2.402-0.776c0.273-0.138,0.678-0.344,0.848-0.376c0.199,0.06,0.396,0.089,0.596,0.089 c0.746,0,1.354-0.401,1.893-0.754l0.145-0.094c0.174-0.057,0.473-0.167,1.07-0.391c0.607-0.229,1.717-0.645,2.01-0.715 c0.578-0.006,1.264-0.088,1.752-0.392c0.459,0.075,1.273,0.204,2.115,0.314C29.961,5.301,29.9,5.341,29.85,5.391 c-0.273,0.251-1.742,0.696-2.195,0.755c-0.848,0.106-1.186,0.532-1.322,0.871c-0.176,0.439-0.068,0.878,0.104,1.235 c-0.32,0.212-0.713,0.448-1.049,0.625c0-0.007,0.002-0.015,0.004-0.024c0.121-0.675,0.209-1.163-0.119-1.556 c-0.166-0.2-0.414-0.314-0.676-0.314c-0.387,0-0.688,0.239-0.93,0.473c-0.68,0.656-1.09,1.476-1.246,1.783l-0.027,0.059 l-0.025,0.044c-0.293,0.563-0.414,0.962-0.25,2.207c-0.074,0.051-0.287,0.132-0.582,0.132c-0.041,0-0.076-0.002-0.105-0.005 c-0.191-0.205-0.453-0.322-0.752-0.322l0,0c-0.684,0-1.619,0.771-2.773,2.292l-0.371,0.49l0.377,0.484l0.354,0.449 c-5.51,4.257-5.551,4.5-5.609,4.855c-0.01,0.032-0.057,0.18-0.123,0.383c-0.822,2.552-1.275,4.46-0.834,5.482 c1.025,2.368,2.182,4.579,3.68,4.701c0.133,0.011,0.277,0.017,0.434,0.017c1.373,0,3.6-0.416,4.668-0.635 c0.197,0.371,0.436,0.804,0.568,1.04l0.238,0.421l0.484-0.016c0,0,0.26-0.008,0.584-0.008c0.375,0,0.625,0.011,0.787,0.022 c0.584,1.708,1.699,5.643,1.492,6.459l-0.004,0.004c-1.885,2.821,0.4,6.499,1.494,8.269c0.088,0.14,0.168,0.266,0.232,0.374 c0.424,1.204,0.934,2.002,2.02,2.002c0.078,0,0.16-0.005,0.244-0.009c0.063-0.004,0.125-0.007,0.191-0.007 c0.121,0,0.207,0.014,0.293,0.045l0.1,0.036l0.105,0.01c0.205,0.017,0.4,0.045,0.592,0.071c0.334,0.047,0.68,0.095,1.031,0.095 c0.941,0,1.689-0.357,2.336-1.119c0.021-0.004,0.045-0.005,0.068-0.008c0.678-0.095,0.932-0.433,1.018-0.737 c0.051-0.05,0.117-0.112,0.172-0.164c0.268-0.244,0.584-0.537,0.803-0.88c0.1-0.059,0.213-0.125,0.338-0.2 c0.219-0.134,0.465-0.283,0.658-0.382c0.172-0.052,0.322-0.153,0.436-0.293c0.273-0.335,0.217-0.717,0.172-1.023 c-0.047-0.318-0.092-0.642,0.078-0.99c0.965-0.465,2.68-1.608,2.957-1.796v0.022c-0.02,0.153-0.064,0.563-0.133,0.822 c-0.363,0.366-0.67,0.919-0.766,1.105l-0.063,0.121l-0.02,0.137c-0.023,0.18-0.123,1.11,0.4,1.712 c0.264,0.301,0.641,0.468,1.063,0.468c0.131,0,0.271-0.017,0.416-0.05c1.342-0.304,3.723-3.531,3.916-5.312 c0.096-0.859-0.24-1.534-0.918-1.852l-0.506-0.24l-0.398,0.396l-1.469,1.471c-0.498,0.046-0.887,0.193-1.148,0.425 c0.016-0.627-0.047-1.27-0.113-1.896c-0.201-1.891-0.24-3.097,0.92-3.915l0.059-0.043l0.051-0.051 c0.418-0.426,0.883-0.799,1.373-1.193c1.15-0.924,2.34-1.878,3.047-3.604l0.031-0.074c0.227-0.59,0.568-1.478,0.104-2.158 c-0.115-0.167-0.359-0.426-0.814-0.518c0.604-0.242,1.066-0.435,1.111-0.452l0.141-0.059l0.109-0.104l2.48-2.381l0.363-0.35 l-0.16-0.479c-0.021-0.062-0.158-0.438-0.537-0.977c0.725,0.099,1.344,0.272,1.549,0.427c0.074,0.163,0.221,0.519,0.379,0.892 c2.732,6.435,3.115,6.766,3.824,6.777c0.027,0,0.049,0.002,0.066,0.005c0.057,0.002,0.109,0.006,0.156,0.006 c0.404,0,0.635-0.207,0.736-0.331c0.297-0.357,0.215-0.795,0.184-0.959l-0.012-0.056c-0.033-0.384-0.012-2.113,0.045-3.536 c0.004,0.004,0.006,0.008,0.008,0.013l1.463-0.58L56.896,24.654z M35.391,16.784c-0.113,0.005-0.238,0.012-0.367,0.017 c-0.422,0.018-0.902,0.04-1.377,0.04c-1.25,0-1.533-0.155-1.564-0.171c-0.146-0.107-0.297-0.188-0.457-0.246 c0.285-0.063,0.607-0.279,0.939-0.924c0.33,0.636,0.773,1.198,1.457,1.198c0.184,0,0.363-0.045,0.531-0.131 C34.783,16.568,35.162,16.7,35.391,16.784z M34.9,13.303c-0.094,0-0.172-0.005-0.23-0.009c0.064-0.167,0.141-0.264,0.201-0.319 c0.08,0.122,0.186,0.229,0.305,0.32C35.078,13.301,34.986,13.303,34.9,13.303z M29.932,14.974c0.428,0.837,0.744,1.198,0.994,1.355 c-0.619,0.049-1.086,0.443-1.469,0.817c-0.271-0.09-0.74-0.374-0.879-0.572c-0.084-0.117-0.18-0.217-0.287-0.304 C28.969,16.077,29.564,15.447,29.932,14.974z M27.57,14.355l-0.889-0.043l-2.975-0.146c0.361-0.299,0.707-0.579,0.91-0.745 c0.055-0.02,0.27-0.078,0.793-0.078c0.314,0,0.617,0.021,0.809,0.037L27.57,14.355z" fill="url(#SVGID_5_)" opacity="0.3"/>
<radialGradient cx="27.8105" cy="3.104" gradientTransform="matrix(0.9953 0 0 0.9952 2.7861 7.6702)" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="30.9363">
-<stop offset="0" style="stop-color:#7AF200"/>
-<stop offset="0.3152" style="stop-color:#7AF200"/>
-<stop offset="0.7273" style="stop-color:#1CAD0F"/>
-<stop offset="1" style="stop-color:#007A3A"/>
+ <stop offset="0.3152" style="stop-color:#7AF200"/>
+ <stop offset="0.7273" style="stop-color:#1CAD0F"/>
+ <stop offset="1" style="stop-color:#007A3A"/>
</radialGradient>
<path d="M3.957,29.985c0,0,0,0,0,0.002c0,0.01,0.002,0.014,0.002,0.021c0,0.813,0.051,1.615,0.119,2.41 c0.023,0.259,0.063,0.52,0.092,0.781c0.07,0.544,0.15,1.082,0.248,1.615c0.055,0.283,0.107,0.567,0.166,0.845 c0.123,0.553,0.266,1.097,0.422,1.632c0.063,0.222,0.113,0.447,0.184,0.663C5.197,37.978,5.207,38,5.213,38.023 c0.021-0.212,0.027-0.427,0.021-0.648c-0.053-1.568-0.303-1.367-0.303-1.367l1.771-2.381v-1.52L4.625,30.03 C4.625,30.03,3.959,29.926,3.957,29.985z" fill="url(#SVGID_6_)"/>
<radialGradient cx="27.8096" cy="3.1069" gradientTransform="matrix(0.9953 0 0 0.9952 2.7861 7.6702)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="30.9388">
-<stop offset="0" style="stop-color:#7AF200"/>
-<stop offset="0.3152" style="stop-color:#7AF200"/>
-<stop offset="0.7273" style="stop-color:#1CAD0F"/>
-<stop offset="1" style="stop-color:#007A3A"/>
+ <stop offset="0.3152" style="stop-color:#7AF200"/>
+ <stop offset="0.7273" style="stop-color:#1CAD0F"/>
+ <stop offset="1" style="stop-color:#007A3A"/>
</radialGradient>
<path d="M20.631,6.433c0.766,0.252,1.395-0.26,2.109-0.717c0.252-0.051,3.055-1.17,3.357-1.17 c0.301,0,1.32-0.04,1.572-0.444c0,0,4.387,0.763,5.049,0.508c0.359-0.141,1.869-0.26,3.17-0.346 c-0.074-0.016-0.141-0.037-0.213-0.052c-0.07-0.014-0.141-0.026-0.211-0.04c-0.814-0.163-1.637-0.295-2.475-0.378 c-0.006,0-0.012,0-0.02-0.004c-0.881-0.088-1.775-0.135-2.682-0.135c-0.84,0-1.67,0.05-2.492,0.127 c-0.143,0.015-0.287,0.031-0.434,0.046c-0.793,0.086-1.578,0.203-2.35,0.357C25,4.191,24.986,4.192,24.973,4.193 c-0.801,0.166-1.584,0.371-2.355,0.606c-0.133,0.039-0.26,0.085-0.393,0.125c-0.684,0.221-1.357,0.466-2.02,0.737 c-0.076,0.034-0.156,0.063-0.234,0.095c-0.727,0.31-1.438,0.654-2.129,1.024c-0.104,0.056-0.203,0.116-0.307,0.175 c-0.299,0.165-0.576,0.349-0.861,0.525C18.098,7.957,19.877,6.178,20.631,6.433z" fill="url(#SVGID_7_)"/>
<radialGradient cx="27.8066" cy="3.105" gradientTransform="matrix(0.9953 0 0 0.9952 2.7861 7.6702)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="30.9346">
-<stop offset="0" style="stop-color:#B2F56E"/>
-<stop offset="0.3152" style="stop-color:#B2F56E"/>
-<stop offset="0.7273" style="stop-color:#5CBF1B"/>
-<stop offset="1" style="stop-color:#227A00"/>
+ <stop offset="0.3152" style="stop-color:#B2F56E"/>
+ <stop offset="0.7273" style="stop-color:#5CBF1B"/>
+ <stop offset="1" style="stop-color:#227A00"/>
</radialGradient>
<path d="M56.111,24.787c-0.027-0.133-0.064-0.258-0.09-0.388c-0.141-0.65-0.307-1.292-0.494-1.924 c-0.051-0.171-0.102-0.346-0.154-0.515c-0.23-0.718-0.484-1.426-0.773-2.113c-0.051-0.121-0.109-0.24-0.16-0.358 c-0.266-0.606-0.553-1.201-0.861-1.782c-0.07-0.139-0.143-0.282-0.217-0.417c-0.365-0.657-0.75-1.297-1.166-1.919 c-0.068-0.107-0.15-0.21-0.223-0.316c-0.379-0.553-0.777-1.086-1.195-1.605c-0.086-0.103-0.166-0.209-0.254-0.313 c-0.482-0.578-0.986-1.135-1.518-1.669c-0.09-0.092-0.188-0.183-0.281-0.272c-0.482-0.475-0.984-0.933-1.506-1.369 c-0.09-0.073-0.17-0.151-0.26-0.223c-0.584-0.478-1.195-0.933-1.822-1.362c-0.109-0.075-0.223-0.148-0.334-0.219 c-0.578-0.384-1.174-0.747-1.785-1.085c-0.084-0.045-0.16-0.094-0.244-0.141c-0.68-0.363-1.371-0.696-2.082-1.003 c-0.125-0.053-0.256-0.103-0.379-0.155c-0.277-0.115-0.563-0.206-0.844-0.309c-0.334,0.213-1.881,1.088-1.881,1.088 s-6.717-0.917-7.174-0.462c-0.459,0.462-2.248,0.929-2.656,0.981c-0.406,0.053-1.25,0.27-0.238,1.518 c-0.152,0.155-3.039,2.165-3.039,1.25c0-0.916,0.645-2.552-0.26-1.676c-0.652,0.631-1.039,1.483-1.127,1.643 c-0.211,0.409-0.342,0.604-0.188,1.773c0.154,1.171-1.869,1.164-2.004,0.862c-0.363-0.813-2.363,1.821-2.363,1.821l0.844,1.082 c0,0-5.893,4.539-5.941,4.844c-0.053,0.307-1.523,4.247-1.016,5.418c0.512,1.174,1.797,4.127,3.016,4.226 c1.598,0.131,5.469-0.73,5.469-0.73c0.104,0.257,0.834,1.556,0.834,1.556s1.896-0.063,2.004,0.143 c0.035,0.069,2.287,6.693,1.543,7.571c-1.773,2.656,1.014,6.548,1.789,7.864c0.775,2.262,1.277,1.25,2.297,1.62 c1.258,0.108,2.318,0.573,3.385-0.8c0.309-0.255,0.836-0.054,0.836-0.408c0-0.198,0.912-0.781,1.146-1.33 c0.248-0.114,0.881-0.542,1.313-0.748c0.391-0.025-0.371-1.071,0.402-2.177c0.836-0.33,3.088-1.849,3.088-1.849 c0.104-2.227-1.094-4.979,1.141-6.559c1.445-1.47,3.336-2.306,4.256-4.544c0.252-0.661,0.818-2.014-0.813-1.609 c-1.531,0.386-3.238,0.474-2.432-0.201c-0.092-0.828-1.111-1.218-2.023-2.026c-0.473-1.117-1.215-3.108-1.215-3.108l-1.621-2.463 l0.203-0.508l1.926,2.836l1.926,2.328c0.707,2.33,1.314,2.535,1.314,2.535c1.068-0.377,3.596-1.419,3.596-1.419l2.484-2.381 c0,0-0.256-0.761-1.264-1.722l-0.764-0.455c-0.166,0.467-1.049,0.642-1.049,0.642l-2.145-2.564l0.801-0.162l0.613,1.171l1.473,0.509 c0,0,0.408-0.298,1.166,0.484c0.619-0.051,3.029,0.117,3.594,0.832c0.109,0.142,2.986,7.325,3.555,7.336 c0.248,0.001,0.43,0.099,0.348-0.335c-0.102-0.205,0-4.717,0.154-5.683c0.385-0.821,0.445-0.002,1.357,1.553 C56.121,24.862,56.119,24.824,56.111,24.787z M30.797,7.378c0.201-0.6,1.367-0.804,1.367-0.804s-0.334,0.618-0.258,0.937 c0.08,0.322-0.533,0.524-0.6,1.282c-0.066,0.755-1.459,0.313-1.574,0.047C29.617,8.577,30.592,7.977,30.797,7.378z M35.793,17.571 c-0.865,0-3.455,0.257-4.17-0.253c-0.711-0.508-1.266,0.052-1.781,0.562c-0.334,0.331-1.559-0.339-1.916-0.848 c-0.355-0.509-1.553-0.472-1.553-0.472l0.271-1.452l-3.445-0.167l-1.957,0.574l-1.844,0.052l1.031-0.491l1.287-0.304 c0,0,1.867-1.536,2.43-1.993c0.475-0.388,2.365-0.169,2.365-0.169l2.074,1.497c0,0-0.459,1.174-0.662,1.426 c0.76-0.05,1.658-1.436,1.658-1.436c-1.621-1.488-1.555-1.992-1.555-1.992l2.133,1.498l0.021,0.013c0,0,0.865,2.035,1.225,2.035 c0.352,0,0.809-1.401,0.809-1.401l0.609-0.153c0.27,0.642,0.773,2.094,1.381,1.754c0.35-0.193,0.928-0.017,1.588,0.236 c0.664,0.255,1.115-0.137,1.654,0.337C37.381,18.519,36.15,17.674,35.793,17.571z M37.148,14.068c-0.891-0.339-3.9,0.766-3.229-1.04 c0.359-0.975,1.281-1.179,1.598-0.531c0.082,0.267,1.084,0.679,1.076,0.117c-0.006-0.562,1.01-0.86,1.154-0.441 C37.207,12.563,39.863,14.589,37.148,14.068z M42.816,15.78c-0.492-0.397,0.223-0.738-0.506-1.359 c-1.041-0.895-1.855-1.278-0.436-2.002c1.754-0.221,0.283,0.559,0.576,1.027c0.156,0.247,1.039,1.08,1.73,2.103 C44.756,16.397,43.307,16.175,42.816,15.78z" fill="url(#SVGID_8_)"/>
<radialGradient cx="27.8125" cy="3.1055" gradientTransform="matrix(0.9953 0 0 0.9952 2.7861 7.6702)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="30.9328">
-<stop offset="0" style="stop-color:#7AF200"/>
-<stop offset="0.3152" style="stop-color:#7AF200"/>
-<stop offset="0.7273" style="stop-color:#1CAD0F"/>
-<stop offset="1" style="stop-color:#007A3A"/>
+ <stop offset="0.3152" style="stop-color:#7AF200"/>
+ <stop offset="0.7273" style="stop-color:#1CAD0F"/>
+ <stop offset="1" style="stop-color:#007A3A"/>
</radialGradient>
<path d="M43.523,38.979l-1.689,1.688c0,0-1.016,0-1.064,0.406c-0.023,0.174-0.082,0.927-0.252,1.315 c-0.338,0.235-0.742,1.012-0.742,1.012s-0.211,1.504,0.912,1.249C41.809,44.395,45.256,39.795,43.523,38.979z" fill="url(#SVGID_9_)"/>
<rect fill="none" height="60" width="60"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calculator.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calculator.svg Fri May 14 16:09:54 2010 +0300
@@ -1,75 +1,71 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="60" width="60"/>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="20.2573" y2="56.9514">
-<stop offset="0" style="stop-color:#B5B9BC"/>
-<stop offset="0.8182" style="stop-color:#7C7E87"/>
-<stop offset="1" style="stop-color:#94979D"/>
+ <stop offset="0" style="stop-color:#B5B9BC"/>
+ <stop offset="0.8182" style="stop-color:#7C7E87"/>
+ <stop offset="1" style="stop-color:#94979D"/>
</linearGradient>
<path d="M8.918,20.754v34.767C8.918,56.336,9.58,57,10.396,57h39.207c0.816,0,1.479-0.664,1.479-1.479V20.754 H8.918z" fill="url(#SVGID_1_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="20.2573" y2="56.9514">
-<stop offset="0" style="stop-color:#6B6B6B"/>
-<stop offset="0.7212" style="stop-color:#363636"/>
-<stop offset="0.9636" style="stop-color:#5E5E5E"/>
-<stop offset="1" style="stop-color:#5E5E5E"/>
+ <stop offset="0" style="stop-color:#6B6B6B"/>
+ <stop offset="0.7212" style="stop-color:#363636"/>
+ <stop offset="0.9636" style="stop-color:#5E5E5E"/>
</linearGradient>
<path d="M50.344,20.754v0.739V54.78v0.74c0,0.408-0.332,0.74-0.74,0.74H10.396 c-0.404,0-0.738-0.332-0.738-0.74v-0.74V21.493v-0.739h-0.74v34.767C8.918,56.336,9.58,57,10.396,57h39.207 c0.816,0,1.479-0.664,1.479-1.479V20.754H50.344z" fill="url(#SVGID_2_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="20.2671" y2="56.2123">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#CED3D6"/>
-<stop offset="0.6606" style="stop-color:#CEDBE0"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+ <stop offset="0.0667" style="stop-color:#D1D7D9"/>
+ <stop offset="0.2606" style="stop-color:#CED3D6"/>
+ <stop offset="0.6606" style="stop-color:#CEDBE0"/>
+ <stop offset="1" style="stop-color:#ADB3B5"/>
</linearGradient>
-<path d="M49.604,21.119v34.402H10.447l0.021-34.767H9.658v34.767 c0,0.409,0.381,0.74,0.789,0.74h39.156c0.408,0,0.738-0.331,0.738-0.74V21.119H49.604z" fill="url(#SVGID_3_)" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M49.604,21.119v34.402H10.447l0.021-34.767H9.658v34.767 c0,0.409,0.381,0.74,0.789,0.74h39.156c0.408,0,0.738-0.331,0.738-0.74V21.119H49.604z" fill="url(#SVGID_3_)" opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="30" x2="30" y1="2.9741" y2="20.728">
-<stop offset="0" style="stop-color:#B5B9BC"/>
-<stop offset="0.8182" style="stop-color:#7C7E87"/>
-<stop offset="1" style="stop-color:#94979D"/>
+ <stop offset="0" style="stop-color:#B5B9BC"/>
+ <stop offset="0.8182" style="stop-color:#7C7E87"/>
+ <stop offset="1" style="stop-color:#94979D"/>
</linearGradient>
<path d="M51.082,20.754V4.451C51.107,3.649,50.443,3,49.627,3H10.4C9.584,3,8.918,3.649,8.918,4.451v16.303 H51.082z" fill="url(#SVGID_4_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30.001" x2="30.001" y1="3.7144" y2="20.729">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#CED3D6"/>
-<stop offset="0.6606" style="stop-color:#CEDBE0"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+ <stop offset="0.0667" style="stop-color:#D1D7D9"/>
+ <stop offset="0.2606" style="stop-color:#CED3D6"/>
+ <stop offset="0.6606" style="stop-color:#CEDBE0"/>
+ <stop offset="1" style="stop-color:#ADB3B5"/>
</linearGradient>
-<path d="M50.16,3.96c-0.139-0.142-0.328-0.221-0.533-0.221H10.4 c-0.408,0-0.742,0.319-0.742,0.711v0.74v14.824v0.74h40.684l0.002-15.586v-0.74C50.348,4.254,50.281,4.088,50.16,3.96z M49.604,5.167v14.847H10.396V4.451l39.23,0.029L49.604,5.167z" fill="url(#SVGID_5_)" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M50.16,3.96c-0.139-0.142-0.328-0.221-0.533-0.221H10.4 c-0.408,0-0.742,0.319-0.742,0.711v0.74v14.824v0.74h40.684l0.002-15.586v-0.74C50.348,4.254,50.281,4.088,50.16,3.96z M49.604,5.167v14.847H10.396V4.451l39.23,0.029L49.604,5.167z" fill="url(#SVGID_5_)" opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="30" x2="30" y1="2.9741" y2="20.728">
-<stop offset="0" style="stop-color:#6B6B6B"/>
-<stop offset="0.7212" style="stop-color:#363636"/>
-<stop offset="0.9636" style="stop-color:#5E5E5E"/>
-<stop offset="1" style="stop-color:#5E5E5E"/>
+ <stop offset="0" style="stop-color:#6B6B6B"/>
+ <stop offset="0.7212" style="stop-color:#363636"/>
+ <stop offset="0.9636" style="stop-color:#5E5E5E"/>
</linearGradient>
<path d="M49.627,3H10.4C9.584,3,8.918,3.649,8.918,4.451v16.303h0.74v-0.74V5.19v-0.74 c0-0.392,0.334-0.711,0.742-0.711h39.227c0.205,0,0.395,0.079,0.533,0.221c0.121,0.127,0.188,0.294,0.184,0.467v0.74l0,0 l-0.002,15.586h0.74V4.451C51.107,3.649,50.443,3,49.627,3z" fill="url(#SVGID_6_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="30.001" x2="30.001" y1="6.7217" y2="17.1228">
-<stop offset="0" style="stop-color:#686C6E"/>
-<stop offset="1" style="stop-color:#CAD3D6"/>
+ <stop offset="0" style="stop-color:#686C6E"/>
+ <stop offset="1" style="stop-color:#CAD3D6"/>
</linearGradient>
-<path d="M14.098,17.055c-0.816,0-1.48-0.678-1.48-1.509V8.208c0-0.833,0.664-1.509,1.48-1.509 h31.805c0.816,0,1.482,0.676,1.482,1.509v7.337c0,0.831-0.666,1.509-1.482,1.509H14.098z" fill="url(#SVGID_7_)" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M14.098,17.055c-0.816,0-1.48-0.678-1.48-1.509V8.208c0-0.833,0.664-1.509,1.48-1.509 h31.805c0.816,0,1.482,0.676,1.482,1.509v7.337c0,0.831-0.666,1.509-1.482,1.509H14.098z" fill="url(#SVGID_7_)" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="29.998" x2="29.998" y1="7.4897" y2="16.4665">
-<stop offset="0" style="stop-color:#171717"/>
-<stop offset="1" style="stop-color:#2E2E2E"/>
+ <stop offset="0" style="stop-color:#171717"/>
+ <stop offset="1" style="stop-color:#2E2E2E"/>
</linearGradient>
<path d="M46.637,15.545c0,0.417-0.334,0.754-0.742,0.754H14.098c-0.408,0-0.738-0.337-0.738-0.754V8.208 c0-0.417,0.33-0.755,0.738-0.755h31.797c0.408,0,0.742,0.338,0.742,0.755V15.545z" fill="url(#SVGID_8_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="29.9961" x2="29.9961" y1="-5.1528" y2="20.6866">
-<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"/>
+ <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_9_)" height="7.337" width="31.797" x="14.098" y="8.208"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="29.9961" x2="29.9961" y1="-0.4434" y2="18.2631">
-<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"/>
+ <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_10_)" points="14.098,11.63 45.895,10.364 45.895,8.208 14.098,8.208 "/>
<path d="M25.531,14.36H22.34v-0.551h1.158v-3.681l-1.158,0.215V9.792l1.596-0.525h0.436v4.542h1.16V14.36z" fill="#FFFFFF"/>
@@ -79,198 +75,189 @@
<path d="M42.4,11.122h0.172c0.549,0,0.969,0.137,1.266,0.405c0.293,0.271,0.441,0.654,0.441,1.152 c0,0.57-0.152,1-0.451,1.284c-0.301,0.284-0.75,0.426-1.35,0.426c-0.438,0-0.828-0.049-1.17-0.147v-0.595 c0.395,0.103,0.77,0.155,1.123,0.155c0.299,0,0.535-0.083,0.699-0.246c0.166-0.163,0.25-0.446,0.25-0.848 c0-0.332-0.094-0.583-0.279-0.749c-0.188-0.169-0.467-0.251-0.84-0.251c-0.246,0-0.494,0.011-0.738,0.038V9.27h2.625v0.547H42.4 V11.122z" fill="#FFFFFF"/>
<circle cx="30.79" cy="13.831" fill="#FFFFFF" r="0.595"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="43.3145" x2="43.3145" y1="45.8735" y2="52.5934">
-<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"/>
+ <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="M41.467,52.562c-0.816,0-1.48-0.664-1.48-1.48v-3.698c0-0.815,0.664-1.479,1.48-1.479 h3.697c0.816,0,1.479,0.664,1.479,1.479v3.698c0,0.816-0.662,1.48-1.479,1.48H41.467z" fill="url(#SVGID_11_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M45.164,52.562h-3.697c-0.816,0-1.48-0.664-1.48-1.48v0.74c0,0.816,0.664,1.48,1.48,1.48 h3.697c0.816,0,1.479-0.664,1.479-1.48v-0.74C46.643,51.897,45.98,52.562,45.164,52.562z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M41.467,52.562c-0.816,0-1.48-0.664-1.48-1.48v-3.698c0-0.815,0.664-1.479,1.48-1.479 h3.697c0.816,0,1.479,0.664,1.479,1.479v3.698c0,0.816-0.662,1.48-1.479,1.48H41.467z" fill="url(#SVGID_11_)" opacity="0.8"/>
+<path d="M45.164,52.562h-3.697c-0.816,0-1.48-0.664-1.48-1.48v0.74c0,0.816,0.664,1.48,1.48,1.48 h3.697c0.816,0,1.479-0.664,1.479-1.48v-0.74C46.643,51.897,45.98,52.562,45.164,52.562z" fill="#231F20" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="43.3154" x2="43.3154" y1="46.5791" y2="51.9528">
-<stop offset="0" style="stop-color:#F0653D"/>
-<stop offset="0.103" style="stop-color:#C94832"/>
-<stop offset="0.7515" style="stop-color:#89181F"/>
-<stop offset="1" style="stop-color:#961A22"/>
+ <stop offset="0" style="stop-color:#F0653D"/>
+ <stop offset="0.103" style="stop-color:#C94832"/>
+ <stop offset="0.7515" style="stop-color:#89181F"/>
+ <stop offset="1" style="stop-color:#961A22"/>
</linearGradient>
<path d="M45.904,51.082c0,0.41-0.332,0.74-0.74,0.74h-3.697c-0.408,0-0.74-0.33-0.74-0.74v-3.698 c0-0.409,0.332-0.74,0.74-0.74h3.697c0.408,0,0.74,0.331,0.74,0.74V51.082z" fill="url(#SVGID_12_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="34.4385" x2="34.4385" y1="45.8735" y2="52.5934">
-<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"/>
+ <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="M32.592,52.562c-0.818,0-1.482-0.664-1.482-1.48v-3.698 c0-0.815,0.664-1.479,1.482-1.479h3.697c0.816,0,1.479,0.664,1.479,1.479v3.698c0,0.816-0.662,1.48-1.479,1.48H32.592z" fill="url(#SVGID_13_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M36.289,52.562h-3.697c-0.818,0-1.482-0.664-1.482-1.48v0.74c0,0.816,0.664,1.48,1.482,1.48 h3.697c0.816,0,1.479-0.664,1.479-1.48v-0.74C37.768,51.897,37.105,52.562,36.289,52.562z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M32.592,52.562c-0.818,0-1.482-0.664-1.482-1.48v-3.698 c0-0.815,0.664-1.479,1.482-1.479h3.697c0.816,0,1.479,0.664,1.479,1.479v3.698c0,0.816-0.662,1.48-1.479,1.48H32.592z" fill="url(#SVGID_13_)" opacity="0.8"/>
+<path d="M36.289,52.562h-3.697c-0.818,0-1.482-0.664-1.482-1.48v0.74c0,0.816,0.664,1.48,1.482,1.48 h3.697c0.816,0,1.479-0.664,1.479-1.48v-0.74C37.768,51.897,37.105,52.562,36.289,52.562z" fill="#231F20" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="34.4385" x2="34.4385" y1="46.5791" y2="51.9528">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.2606" style="stop-color:#D6DCDE"/>
-<stop offset="0.6606" style="stop-color:#B6C3C7"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+ <stop offset="0" style="stop-color:#E4EBED"/>
+ <stop offset="0.2606" style="stop-color:#D6DCDE"/>
+ <stop offset="0.6606" style="stop-color:#B6C3C7"/>
+ <stop offset="0.9758" style="stop-color:#D2D9DB"/>
</linearGradient>
<path d="M37.027,51.082c0,0.41-0.33,0.74-0.738,0.74h-3.697c-0.412,0-0.742-0.33-0.742-0.74v-3.698 c0-0.409,0.33-0.74,0.742-0.74h3.697c0.408,0,0.738,0.331,0.738,0.74V51.082z" fill="url(#SVGID_14_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="25.5625" x2="25.5625" y1="45.8735" y2="52.5934">
-<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"/>
+ <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.713,52.562c-0.816,0-1.479-0.664-1.479-1.48v-3.698 c0-0.815,0.662-1.479,1.479-1.479h3.699c0.816,0,1.479,0.664,1.479,1.479v3.698c0,0.816-0.662,1.48-1.479,1.48H23.713z" fill="url(#SVGID_15_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M27.412,52.562h-3.699c-0.816,0-1.479-0.664-1.479-1.48v0.74c0,0.816,0.662,1.48,1.479,1.48 h3.699c0.816,0,1.479-0.664,1.479-1.48v-0.74C28.891,51.897,28.229,52.562,27.412,52.562z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M23.713,52.562c-0.816,0-1.479-0.664-1.479-1.48v-3.698 c0-0.815,0.662-1.479,1.479-1.479h3.699c0.816,0,1.479,0.664,1.479,1.479v3.698c0,0.816-0.662,1.48-1.479,1.48H23.713z" fill="url(#SVGID_15_)" opacity="0.8"/>
+<path d="M27.412,52.562h-3.699c-0.816,0-1.479-0.664-1.479-1.48v0.74c0,0.816,0.662,1.48,1.479,1.48 h3.699c0.816,0,1.479-0.664,1.479-1.48v-0.74C28.891,51.897,28.229,52.562,27.412,52.562z" fill="#231F20" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="25.5615" x2="25.5615" y1="46.5791" y2="51.9528">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.2606" style="stop-color:#D6DCDE"/>
-<stop offset="0.6606" style="stop-color:#B6C3C7"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+ <stop offset="0" style="stop-color:#E4EBED"/>
+ <stop offset="0.2606" style="stop-color:#D6DCDE"/>
+ <stop offset="0.6606" style="stop-color:#B6C3C7"/>
+ <stop offset="0.9758" style="stop-color:#D2D9DB"/>
</linearGradient>
<path d="M28.15,51.082c0,0.41-0.33,0.74-0.738,0.74h-3.699c-0.408,0-0.74-0.33-0.74-0.74v-3.698 c0-0.409,0.332-0.74,0.74-0.74h3.699c0.408,0,0.738,0.331,0.738,0.74V51.082z" fill="url(#SVGID_16_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="16.6846" x2="16.6846" y1="45.8735" y2="52.5934">
-<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"/>
+ <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.836,52.562c-0.816,0-1.48-0.664-1.48-1.48v-3.698c0-0.815,0.664-1.479,1.48-1.479h3.699 c0.816,0,1.479,0.664,1.479,1.479v3.698c0,0.816-0.662,1.48-1.479,1.48H14.836z" fill="url(#SVGID_17_)"/>
-<path d="M18.535,52.562h-3.699c-0.816,0-1.48-0.664-1.48-1.48v0.74c0,0.816,0.664,1.48,1.48,1.48 h3.699c0.816,0,1.479-0.664,1.479-1.48v-0.74C20.014,51.897,19.352,52.562,18.535,52.562z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M18.535,52.562h-3.699c-0.816,0-1.48-0.664-1.48-1.48v0.74c0,0.816,0.664,1.48,1.48,1.48 h3.699c0.816,0,1.479-0.664,1.479-1.48v-0.74C20.014,51.897,19.352,52.562,18.535,52.562z" fill="#231F20" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="16.6865" x2="16.6865" y1="46.5791" y2="51.9528">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.2606" style="stop-color:#D6DCDE"/>
-<stop offset="0.6606" style="stop-color:#B6C3C7"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+ <stop offset="0" style="stop-color:#E4EBED"/>
+ <stop offset="0.2606" style="stop-color:#D6DCDE"/>
+ <stop offset="0.6606" style="stop-color:#B6C3C7"/>
+ <stop offset="0.9758" style="stop-color:#D2D9DB"/>
</linearGradient>
<path d="M19.275,51.082c0,0.41-0.332,0.74-0.74,0.74h-3.699c-0.408,0-0.738-0.33-0.738-0.74v-3.698 c0-0.409,0.33-0.74,0.738-0.74h3.699c0.408,0,0.74,0.331,0.74,0.74V51.082z" fill="url(#SVGID_18_)"/>
-<path d="M45.164,42.206h-3.697c-0.816,0-1.48-0.664-1.48-1.48v0.74c0,0.814,0.664,1.479,1.48,1.479 h3.697c0.816,0,1.479-0.665,1.479-1.479v-0.74C46.643,41.542,45.98,42.206,45.164,42.206z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M45.164,42.206h-3.697c-0.816,0-1.48-0.664-1.48-1.48v0.74c0,0.814,0.664,1.479,1.48,1.479 h3.697c0.816,0,1.479-0.665,1.479-1.479v-0.74C46.643,41.542,45.98,42.206,45.164,42.206z" fill="#231F20" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="43.3145" x2="43.3145" y1="35.5479" y2="42.1745">
-<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"/>
+ <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="M41.467,42.206c-0.816,0-1.48-0.664-1.48-1.48v-3.698c0-0.816,0.664-1.479,1.48-1.479 h3.697c0.816,0,1.479,0.664,1.479,1.479v3.698c0,0.816-0.662,1.48-1.479,1.48H41.467z" fill="url(#SVGID_19_)" fill-opacity="0.9" stroke-opacity="0.9"/>
+<path d="M41.467,42.206c-0.816,0-1.48-0.664-1.48-1.48v-3.698c0-0.816,0.664-1.479,1.48-1.479 h3.697c0.816,0,1.479,0.664,1.479,1.479v3.698c0,0.816-0.662,1.48-1.479,1.48H41.467z" fill="url(#SVGID_19_)" opacity="0.9"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="43.3154" x2="43.3154" y1="36.2231" y2="41.5973">
-<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"/>
+ <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="M45.904,40.726c0,0.409-0.332,0.74-0.74,0.74h-3.697c-0.408,0-0.74-0.331-0.74-0.74v-3.698 c0-0.409,0.332-0.74,0.74-0.74h3.697c0.408,0,0.74,0.331,0.74,0.74V40.726z" fill="url(#SVGID_20_)"/>
-<rect fill="#231F20" fill-opacity="0.5" height="0.739" stroke-opacity="0.5" width="40.686" x="9.658" y="20.754"/>
-<path d="M36.289,42.206h-3.697c-0.818,0-1.482-0.664-1.482-1.48v0.74c0,0.814,0.664,1.479,1.482,1.479 h3.697c0.816,0,1.479-0.665,1.479-1.479v-0.74C37.768,41.542,37.105,42.206,36.289,42.206z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<rect fill="#231F20" height="0.739" opacity="0.5" width="40.686" x="9.658" y="20.754"/>
+<path d="M36.289,42.206h-3.697c-0.818,0-1.482-0.664-1.482-1.48v0.74c0,0.814,0.664,1.479,1.482,1.479 h3.697c0.816,0,1.479-0.665,1.479-1.479v-0.74C37.768,41.542,37.105,42.206,36.289,42.206z" fill="#231F20" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="34.4385" x2="34.4385" y1="35.5479" y2="42.1745">
-<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"/>
+ <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="M32.592,42.206c-0.818,0-1.482-0.664-1.482-1.48v-3.698 c0-0.816,0.664-1.479,1.482-1.479h3.697c0.816,0,1.479,0.664,1.479,1.479v3.698c0,0.816-0.662,1.48-1.479,1.48H32.592z" fill="url(#SVGID_21_)" fill-opacity="0.8" stroke-opacity="0.8"/>
+<path d="M32.592,42.206c-0.818,0-1.482-0.664-1.482-1.48v-3.698 c0-0.816,0.664-1.479,1.482-1.479h3.697c0.816,0,1.479,0.664,1.479,1.479v3.698c0,0.816-0.662,1.48-1.479,1.48H32.592z" fill="url(#SVGID_21_)" opacity="0.8"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="34.4385" x2="34.4385" y1="36.2231" y2="41.5973">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.2606" style="stop-color:#D6DCDE"/>
-<stop offset="0.6606" style="stop-color:#B6C3C7"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+ <stop offset="0" style="stop-color:#E4EBED"/>
+ <stop offset="0.2606" style="stop-color:#D6DCDE"/>
+ <stop offset="0.6606" style="stop-color:#B6C3C7"/>
+ <stop offset="0.9758" style="stop-color:#D2D9DB"/>
</linearGradient>
<path d="M37.027,40.726c0,0.409-0.33,0.74-0.738,0.74h-3.697c-0.412,0-0.742-0.331-0.742-0.74v-3.698 c0-0.409,0.33-0.74,0.742-0.74h3.697c0.408,0,0.738,0.331,0.738,0.74V40.726z" fill="url(#SVGID_22_)"/>
-<path d="M27.412,42.206h-3.699c-0.816,0-1.479-0.664-1.479-1.48v0.74c0,0.814,0.662,1.479,1.479,1.479 h3.699c0.816,0,1.479-0.665,1.479-1.479v-0.74C28.891,41.542,28.229,42.206,27.412,42.206z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M27.412,42.206h-3.699c-0.816,0-1.479-0.664-1.479-1.48v0.74c0,0.814,0.662,1.479,1.479,1.479 h3.699c0.816,0,1.479-0.665,1.479-1.479v-0.74C28.891,41.542,28.229,42.206,27.412,42.206z" fill="#231F20" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_23_" x1="25.5625" x2="25.5625" y1="35.5479" y2="42.1745">
-<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"/>
+ <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.713,42.206c-0.816,0-1.479-0.664-1.479-1.48v-3.698 c0-0.816,0.662-1.479,1.479-1.479h3.699c0.816,0,1.479,0.664,1.479,1.479v3.698c0,0.816-0.662,1.48-1.479,1.48H23.713z" fill="url(#SVGID_23_)" fill-opacity="0.8" stroke-opacity="0.8"/>
+<path d="M23.713,42.206c-0.816,0-1.479-0.664-1.479-1.48v-3.698 c0-0.816,0.662-1.479,1.479-1.479h3.699c0.816,0,1.479,0.664,1.479,1.479v3.698c0,0.816-0.662,1.48-1.479,1.48H23.713z" fill="url(#SVGID_23_)" opacity="0.8"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_24_" x1="25.5615" x2="25.5615" y1="36.2231" y2="41.5973">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.2606" style="stop-color:#D6DCDE"/>
-<stop offset="0.6606" style="stop-color:#B6C3C7"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+ <stop offset="0" style="stop-color:#E4EBED"/>
+ <stop offset="0.2606" style="stop-color:#D6DCDE"/>
+ <stop offset="0.6606" style="stop-color:#B6C3C7"/>
+ <stop offset="0.9758" style="stop-color:#D2D9DB"/>
</linearGradient>
<path d="M28.15,40.726c0,0.409-0.33,0.74-0.738,0.74h-3.699c-0.408,0-0.74-0.331-0.74-0.74v-3.698 c0-0.409,0.332-0.74,0.74-0.74h3.699c0.408,0,0.738,0.331,0.738,0.74V40.726z" fill="url(#SVGID_24_)"/>
-<path d="M18.535,42.206h-3.699c-0.816,0-1.48-0.664-1.48-1.48v0.74c0,0.814,0.664,1.479,1.48,1.479 h3.699c0.816,0,1.479-0.665,1.479-1.479v-0.74C20.014,41.542,19.352,42.206,18.535,42.206z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M18.535,42.206h-3.699c-0.816,0-1.48-0.664-1.48-1.48v0.74c0,0.814,0.664,1.479,1.48,1.479 h3.699c0.816,0,1.479-0.665,1.479-1.479v-0.74C20.014,41.542,19.352,42.206,18.535,42.206z" fill="#231F20" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="16.6846" x2="16.6846" y1="35.5479" y2="42.1745">
-<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"/>
+ <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.836,42.206c-0.816,0-1.48-0.664-1.48-1.48v-3.698c0-0.816,0.664-1.479,1.48-1.479 h3.699c0.816,0,1.479,0.664,1.479,1.479v3.698c0,0.816-0.662,1.48-1.479,1.48H14.836z" fill="url(#SVGID_25_)" fill-opacity="0.8" stroke-opacity="0.8"/>
+<path d="M14.836,42.206c-0.816,0-1.48-0.664-1.48-1.48v-3.698c0-0.816,0.664-1.479,1.48-1.479 h3.699c0.816,0,1.479,0.664,1.479,1.479v3.698c0,0.816-0.662,1.48-1.479,1.48H14.836z" fill="url(#SVGID_25_)" opacity="0.8"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_26_" x1="16.6865" x2="16.6865" y1="36.2231" y2="41.5973">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.2606" style="stop-color:#D6DCDE"/>
-<stop offset="0.6606" style="stop-color:#B6C3C7"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+ <stop offset="0" style="stop-color:#E4EBED"/>
+ <stop offset="0.2606" style="stop-color:#D6DCDE"/>
+ <stop offset="0.6606" style="stop-color:#B6C3C7"/>
+ <stop offset="0.9758" style="stop-color:#D2D9DB"/>
</linearGradient>
<path d="M19.275,40.726c0,0.409-0.332,0.74-0.74,0.74h-3.699c-0.408,0-0.738-0.331-0.738-0.74v-3.698 c0-0.409,0.33-0.74,0.738-0.74h3.699c0.408,0,0.74,0.331,0.74,0.74V40.726z" fill="url(#SVGID_26_)"/>
-<path d="M45.164,31.849h-3.697c-0.816,0-1.48-0.664-1.48-1.479v0.74c0,0.815,0.664,1.479,1.48,1.479 h3.697c0.816,0,1.479-0.665,1.479-1.479v-0.74C46.643,31.185,45.98,31.849,45.164,31.849z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M45.164,31.849h-3.697c-0.816,0-1.48-0.664-1.48-1.479v0.74c0,0.815,0.664,1.479,1.48,1.479 h3.697c0.816,0,1.479-0.665,1.479-1.479v-0.74C46.643,31.185,45.98,31.849,45.164,31.849z" fill="#231F20" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_27_" x1="43.3145" x2="43.3145" y1="25.208" y2="31.91">
-<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"/>
+ <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="M41.467,31.849c-0.816,0-1.48-0.664-1.48-1.479v-3.699 c0-0.815,0.664-1.479,1.48-1.479h3.697c0.816,0,1.479,0.664,1.479,1.479v3.699c0,0.815-0.662,1.479-1.479,1.479H41.467z" fill="url(#SVGID_27_)" fill-opacity="0.9" stroke-opacity="0.9"/>
+<path d="M41.467,31.849c-0.816,0-1.48-0.664-1.48-1.479v-3.699 c0-0.815,0.664-1.479,1.48-1.479h3.697c0.816,0,1.479,0.664,1.479,1.479v3.699c0,0.815-0.662,1.479-1.479,1.479H41.467z" fill="url(#SVGID_27_)" opacity="0.9"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_28_" x1="43.3154" x2="43.3154" y1="25.8672" y2="31.2414">
-<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"/>
+ <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="M45.904,30.37c0,0.409-0.332,0.74-0.74,0.74h-3.697c-0.408,0-0.74-0.331-0.74-0.74v-3.699 c0-0.408,0.332-0.739,0.74-0.739h3.697c0.408,0,0.74,0.331,0.74,0.739V30.37z" fill="url(#SVGID_28_)"/>
-<path d="M36.289,31.849h-3.697c-0.818,0-1.482-0.664-1.482-1.479v0.74 c0,0.815,0.664,1.479,1.482,1.479h3.697c0.816,0,1.479-0.665,1.479-1.479v-0.74C37.768,31.185,37.105,31.849,36.289,31.849z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M36.289,31.849h-3.697c-0.818,0-1.482-0.664-1.482-1.479v0.74 c0,0.815,0.664,1.479,1.482,1.479h3.697c0.816,0,1.479-0.665,1.479-1.479v-0.74C37.768,31.185,37.105,31.849,36.289,31.849z" fill="#231F20" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_29_" x1="34.4385" x2="34.4385" y1="25.208" y2="31.91">
-<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"/>
+ <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="M32.592,31.849c-0.818,0-1.482-0.664-1.482-1.479v-3.699 c0-0.815,0.664-1.479,1.482-1.479h3.697c0.816,0,1.479,0.664,1.479,1.479v3.699c0,0.815-0.662,1.479-1.479,1.479H32.592z" fill="url(#SVGID_29_)" fill-opacity="0.8" stroke-opacity="0.8"/>
+<path d="M32.592,31.849c-0.818,0-1.482-0.664-1.482-1.479v-3.699 c0-0.815,0.664-1.479,1.482-1.479h3.697c0.816,0,1.479,0.664,1.479,1.479v3.699c0,0.815-0.662,1.479-1.479,1.479H32.592z" fill="url(#SVGID_29_)" opacity="0.8"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_30_" x1="34.4385" x2="34.4385" y1="25.8672" y2="31.2414">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.2606" style="stop-color:#D6DCDE"/>
-<stop offset="0.6606" style="stop-color:#B6C3C7"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+ <stop offset="0" style="stop-color:#E4EBED"/>
+ <stop offset="0.2606" style="stop-color:#D6DCDE"/>
+ <stop offset="0.6606" style="stop-color:#B6C3C7"/>
+ <stop offset="0.9758" style="stop-color:#D2D9DB"/>
</linearGradient>
<path d="M37.027,30.37c0,0.409-0.33,0.74-0.738,0.74h-3.697c-0.412,0-0.742-0.331-0.742-0.74v-3.699 c0-0.408,0.33-0.739,0.742-0.739h3.697c0.408,0,0.738,0.331,0.738,0.739V30.37z" fill="url(#SVGID_30_)"/>
-<path d="M27.412,31.849h-3.699c-0.816,0-1.479-0.664-1.479-1.479v0.74 c0,0.815,0.662,1.479,1.479,1.479h3.699c0.816,0,1.479-0.665,1.479-1.479v-0.74C28.891,31.185,28.229,31.849,27.412,31.849z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M27.412,31.849h-3.699c-0.816,0-1.479-0.664-1.479-1.479v0.74 c0,0.815,0.662,1.479,1.479,1.479h3.699c0.816,0,1.479-0.665,1.479-1.479v-0.74C28.891,31.185,28.229,31.849,27.412,31.849z" fill="#231F20" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_31_" x1="25.5625" x2="25.5625" y1="25.127" y2="31.9908">
-<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"/>
+ <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.713,31.849c-0.816,0-1.479-0.664-1.479-1.479v-3.699 c0-0.815,0.662-1.479,1.479-1.479h3.699c0.816,0,1.479,0.664,1.479,1.479v3.699c0,0.815-0.662,1.479-1.479,1.479H23.713z" fill="url(#SVGID_31_)" fill-opacity="0.8" stroke-opacity="0.8"/>
+<path d="M23.713,31.849c-0.816,0-1.479-0.664-1.479-1.479v-3.699 c0-0.815,0.662-1.479,1.479-1.479h3.699c0.816,0,1.479,0.664,1.479,1.479v3.699c0,0.815-0.662,1.479-1.479,1.479H23.713z" fill="url(#SVGID_31_)" opacity="0.8"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_32_" x1="25.5615" x2="25.5615" y1="25.8672" y2="31.2414">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.2606" style="stop-color:#D6DCDE"/>
-<stop offset="0.6606" style="stop-color:#B6C3C7"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+ <stop offset="0" style="stop-color:#E4EBED"/>
+ <stop offset="0.2606" style="stop-color:#D6DCDE"/>
+ <stop offset="0.6606" style="stop-color:#B6C3C7"/>
+ <stop offset="0.9758" style="stop-color:#D2D9DB"/>
</linearGradient>
<path d="M28.15,30.37c0,0.409-0.33,0.74-0.738,0.74h-3.699c-0.408,0-0.74-0.331-0.74-0.74v-3.699 c0-0.408,0.332-0.739,0.74-0.739h3.699c0.408,0,0.738,0.331,0.738,0.739V30.37z" fill="url(#SVGID_32_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_33_" x1="16.6846" x2="16.6846" y1="25.127" y2="31.9099">
-<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"/>
+ <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.836,31.849c-0.816,0-1.48-0.664-1.48-1.479v-3.699 c0-0.815,0.664-1.479,1.48-1.479h3.699c0.816,0,1.479,0.664,1.479,1.479v3.699c0,0.815-0.662,1.479-1.479,1.479H14.836z" fill="url(#SVGID_33_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M18.535,31.849h-3.699c-0.816,0-1.48-0.664-1.48-1.479v0.74c0,0.815,0.664,1.479,1.48,1.479 h3.699c0.816,0,1.479-0.665,1.479-1.479v-0.74C20.014,31.185,19.352,31.849,18.535,31.849z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M14.836,31.849c-0.816,0-1.48-0.664-1.48-1.479v-3.699 c0-0.815,0.664-1.479,1.48-1.479h3.699c0.816,0,1.479,0.664,1.479,1.479v3.699c0,0.815-0.662,1.479-1.479,1.479H14.836z" fill="url(#SVGID_33_)" opacity="0.8"/>
+<path d="M18.535,31.849h-3.699c-0.816,0-1.48-0.664-1.48-1.479v0.74c0,0.815,0.664,1.479,1.48,1.479 h3.699c0.816,0,1.479-0.665,1.479-1.479v-0.74C20.014,31.185,19.352,31.849,18.535,31.849z" fill="#231F20" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_34_" x1="16.6865" x2="16.6865" y1="25.8672" y2="31.2414">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.2606" style="stop-color:#D6DCDE"/>
-<stop offset="0.6606" style="stop-color:#B6C3C7"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+ <stop offset="0" style="stop-color:#E4EBED"/>
+ <stop offset="0.2606" style="stop-color:#D6DCDE"/>
+ <stop offset="0.6606" style="stop-color:#B6C3C7"/>
+ <stop offset="0.9758" style="stop-color:#D2D9DB"/>
</linearGradient>
<path d="M19.275,30.37c0,0.409-0.332,0.74-0.74,0.74h-3.699c-0.408,0-0.738-0.331-0.738-0.74v-3.699 c0-0.408,0.33-0.739,0.738-0.739h3.699c0.408,0,0.74,0.331,0.74,0.739V30.37z" fill="url(#SVGID_34_)"/>
-<rect fill="#FFFFFF" fill-opacity="0.6" height="0.74" stroke-opacity="0.6" width="40.686" x="9.658" y="22.233"/>
-<rect fill="#231F20" fill-opacity="0.3" height="0.74" stroke-opacity="0.3" width="40.686" x="9.658" y="21.493"/>
+<rect fill="#FFFFFF" height="0.74" opacity="0.6" width="40.686" x="9.658" y="22.233"/>
+<rect fill="#231F20" height="0.74" opacity="0.3" width="40.686" x="9.658" y="21.493"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calendar.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calendar.svg Fri May 14 16:09:54 2010 +0300
@@ -1,105 +1,102 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-72.52" x2="-72.52" y1="30.8438" y2="-15.6104">
-<stop offset="0" style="stop-color:#ECF3F5"/>
-<stop offset="0.2" style="stop-color:#ECF3F5"/>
-<stop offset="0.8606" style="stop-color:#7E878A"/>
-<stop offset="1" style="stop-color:#B0B8BB"/>
+ <stop offset="0.2" style="stop-color:#ECF3F5"/>
+ <stop offset="0.8606" style="stop-color:#7E878A"/>
+ <stop offset="1" style="stop-color:#B0B8BB"/>
</linearGradient>
<path d="M55.5,8.382h-51C3.672,8.382,3,9.054,3,9.883v43.161c0,0.827,0.672,1.499,1.5,1.499h51 c0.828,0,1.5-0.671,1.5-1.499V9.883C57,9.054,56.328,8.382,55.5,8.382L55.5,8.382z" fill="url(#SVGID_1_)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-72.52" x2="-72.52" y1="29.8403" y2="-14.5312">
-<stop offset="0" style="stop-color:#DDE3E6"/>
-<stop offset="0.2364" style="stop-color:#C9CED1"/>
-<stop offset="0.9636" style="stop-color:#899396"/>
-<stop offset="1" style="stop-color:#899396"/>
+ <stop offset="0" style="stop-color:#DDE3E6"/>
+ <stop offset="0.2364" style="stop-color:#C9CED1"/>
+ <stop offset="0.9636" style="stop-color:#899396"/>
</linearGradient>
<path d="M4.5,53.784c-0.41,0-0.742-0.333-0.742-0.741V9.883C3.758,9.472,4.09,9.14,4.5,9.14h51 c0.412,0,0.742,0.333,0.742,0.743v43.161c0,0.408-0.33,0.741-0.742,0.741L4.5,53.784L4.5,53.784z" fill="url(#SVGID_2_)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-72.5571" x2="-72.5571" y1="27.8345" y2="-12.7649">
-<stop offset="0" style="stop-color:#707173"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#707173"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
-<rect fill="url(#SVGID_3_)" fill-opacity="0.4" height="41.06" stroke-opacity="0.4" width="48.965" x="5.48" y="10.892"/>
+<rect enable-background="new " fill="url(#SVGID_3_)" height="41.06" opacity="0.4" width="48.965" x="5.48" y="10.892"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-72.5347" x2="-72.5348" y1="16.5146" y2="-11.7964">
-<stop offset="0" style="stop-color:#737373"/>
-<stop offset="0.6606" style="stop-color:#737373"/>
-<stop offset="1" style="stop-color:#DEDEDE"/>
+ <stop offset="0.6606" style="stop-color:#737373"/>
+ <stop offset="1" style="stop-color:#DEDEDE"/>
</linearGradient>
<rect fill="url(#SVGID_4_)" height="27.871" width="46.163" x="6.904" y="22.815"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-69.3926" x2="-77.4889" y1="-7.9272" y2="18.5136">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#CCCCCC"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#CCCCCC"/>
</linearGradient>
<path d="M43.459,48.54c-3.66,0.956-14.168,2.085-14.168,2.085H6.918V22.754H53.08 c0,0-0.666,18.598-1.311,21.188C51.203,46.232,48.729,47.163,43.459,48.54z" fill="url(#SVGID_5_)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-72.521" x2="-72.521" y1="26.7407" y2="16.4258">
-<stop offset="0" style="stop-color:#FF7042"/>
-<stop offset="1" style="stop-color:#991B23"/>
+ <stop offset="0" style="stop-color:#FF7042"/>
+ <stop offset="1" style="stop-color:#991B23"/>
</linearGradient>
<rect fill="url(#SVGID_6_)" height="10.453" width="46.162" x="6.918" y="12.301"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="-61.6943" x2="-59.3015" y1="-6.646" y2="-11.1237">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
-<path d="M42.891,49.125c-3.358,0.65-7.975,1.264-14.292,1.327 l23.638-11.177c0,0,0.021,2.432-0.467,4.668C51.77,43.941,51.377,47.479,42.891,49.125z" fill="url(#SVGID_7_)" fill-opacity="0.42" stroke-opacity="0.42"/>
+<path d="M42.891,49.125c-3.358,0.65-7.975,1.264-14.292,1.327 l23.638-11.177c0,0,0.021,2.432-0.467,4.668C51.77,43.941,51.377,47.479,42.891,49.125z" enable-background="new " fill="url(#SVGID_7_)" opacity="0.42"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="-61.2495" x2="-62.6952" y1="-11.4277" y2="-8.2283">
-<stop offset="0" style="stop-color:#9C9C9C"/>
-<stop offset="1" style="stop-color:#FFFFFF"/>
+ <stop offset="0" style="stop-color:#9C9C9C"/>
+ <stop offset="1" style="stop-color:#FFFFFF"/>
</linearGradient>
<path d="M27.945,50.618c0,0,13.764-0.12,18.883-7.134c0,0,3.664,4.517,4.941,0.457 C51.229,46.73,46.316,50.721,27.945,50.618z" fill="url(#SVGID_8_)"/>
<path d="M46.938,44.23c0,0,2.734,2.875,4.287,0.957c0.293-0.438,0.467-0.869,0.545-1.272 c-1.276,4.058-4.94-0.46-4.94-0.46c-5.119,7.016-18.883,7.136-18.883,7.136C34.328,50.591,43.756,48.591,46.938,44.23z" fill="#FFFFFF"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="-79.5366" x2="-79.5366" y1="-6.4883" y2="11.8389">
-<stop offset="0" style="stop-color:#303030"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#303030"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
<polygon fill="url(#SVGID_9_)" points="24.822,27.157 22.977,27.157 17.369,28.926 17.369,30.961 21.361,30.024 21.361,44.113 17.369,44.236 17.369,46.27 28.598,45.881 28.598,43.891 24.822,44.007 "/>
<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="-65.4268" x2="-65.4268" y1="-6.4873" y2="11.8388">
-<stop offset="0" style="stop-color:#303030"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#303030"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
<path d="M34.727,43.525c0.033-0.73,0.23-1.407,0.59-2.027c0.361-0.619,0.806-1.191,1.328-1.711 c0.527-0.52,1.256-1.17,2.188-1.947c1.672-1.374,2.729-2.488,3.179-3.354c0.452-0.857,0.68-1.729,0.68-2.61 c0-1.567-0.502-2.753-1.504-3.557c-1-0.807-2.463-1.21-4.39-1.21c-1.557,0-3.159,0.251-4.803,0.754v2.204h0.024 c1.566-0.56,2.902-0.841,4.002-0.846c1.045-0.004,1.826,0.232,2.349,0.707c0.521,0.476,0.782,1.183,0.782,2.128 c0,0.537-0.161,1.082-0.481,1.631c-0.325,0.549-1.101,1.332-2.332,2.35c-1.022,0.854-1.868,1.641-2.539,2.355 c-0.672,0.717-1.233,1.582-1.692,2.592c-0.455,1.011-0.685,2.16-0.685,3.451v1.348l11.341-0.391v-2.111L34.727,43.525z" fill="url(#SVGID_10_)"/>
-<rect fill="#231F20" fill-opacity="0.4" height="7.614" stroke-opacity="0.4" width="6.012" x="41.637" y="8.382"/>
-<rect fill="#231F20" fill-opacity="0.4" height="7.614" stroke-opacity="0.4" width="6.012" x="12.631" y="8.382"/>
+<rect enable-background="new " fill="#231F20" height="7.614" opacity="0.4" width="6.012" x="41.637" y="8.382"/>
+<rect enable-background="new " fill="#231F20" height="7.614" opacity="0.4" width="6.012" x="12.631" y="8.382"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="-60.8442" x2="-54.6872" y1="21.8984" y2="21.8984">
-<stop offset="0" style="stop-color:#FB6C41"/>
-<stop offset="0.497" style="stop-color:#FFB69E"/>
-<stop offset="1" style="stop-color:#FB6C41"/>
+ <stop offset="0" style="stop-color:#FB6C41"/>
+ <stop offset="0.497" style="stop-color:#FFB69E"/>
+ <stop offset="1" style="stop-color:#FB6C41"/>
</linearGradient>
<ellipse cx="44.676" cy="17.082" fill="url(#SVGID_11_)" rx="3.049" ry="2.87"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="-89.8911" x2="-83.7336" y1="21.8984" y2="21.8984">
-<stop offset="0" style="stop-color:#FB6C41"/>
-<stop offset="0.497" style="stop-color:#FFB69E"/>
-<stop offset="1" style="stop-color:#FB6C41"/>
+ <stop offset="0" style="stop-color:#FB6C41"/>
+ <stop offset="0.497" style="stop-color:#FFB69E"/>
+ <stop offset="1" style="stop-color:#FB6C41"/>
</linearGradient>
<ellipse cx="15.629" cy="17.082" fill="url(#SVGID_12_)" rx="3.049" ry="2.87"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="-57.8442" x2="-57.8442" y1="24.9229" y2="19.7907">
-<stop offset="0" style="stop-color:#4A050A"/>
-<stop offset="1" style="stop-color:#B00F25"/>
+ <stop offset="0" style="stop-color:#4A050A"/>
+ <stop offset="1" style="stop-color:#B00F25"/>
</linearGradient>
<path d="M47.725,16.346c0,1.686-1.367,3.05-3.049,3.05c-1.684,0-3.049-1.364-3.049-3.05 c0-1.681,1.365-3.048,3.049-3.048C46.357,13.297,47.725,14.665,47.725,16.346z" fill="url(#SVGID_13_)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="-60.0093" x2="-55.6903" y1="27.0977" y2="27.0977">
-<stop offset="0" style="stop-color:#B6B4B5"/>
-<stop offset="0.1152" style="stop-color:#FFFCFE"/>
-<stop offset="0.6788" style="stop-color:#595959"/>
-<stop offset="0.9455" style="stop-color:#D4D3D3"/>
-<stop offset="1" style="stop-color:#D4D3D3"/>
+ <stop offset="0" style="stop-color:#B6B4B5"/>
+ <stop offset="0.1152" style="stop-color:#FFFCFE"/>
+ <stop offset="0.6788" style="stop-color:#595959"/>
+ <stop offset="0.9455" style="stop-color:#D4D3D3"/>
</linearGradient>
<path d="M44.676,5.458c-1.201,0-2.176,0.977-2.176,2.178v8.494c0,1.202,0.975,2.177,2.176,2.177 s2.178-0.975,2.178-2.177V7.636C46.854,6.435,45.877,5.458,44.676,5.458z" fill="url(#SVGID_14_)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="-86.8911" x2="-86.8911" y1="24.9229" y2="19.7907">
-<stop offset="0" style="stop-color:#4A050A"/>
-<stop offset="1" style="stop-color:#B00F25"/>
+ <stop offset="0" style="stop-color:#4A050A"/>
+ <stop offset="1" style="stop-color:#B00F25"/>
</linearGradient>
<path d="M18.678,16.346c0,1.686-1.365,3.05-3.051,3.05c-1.684,0-3.047-1.364-3.047-3.05 c0-1.681,1.363-3.048,3.047-3.048C17.313,13.297,18.678,14.665,18.678,16.346z" fill="url(#SVGID_15_)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="-89.0562" x2="-84.7366" y1="27.0977" y2="27.0977">
-<stop offset="0" style="stop-color:#B6B4B5"/>
-<stop offset="0.1152" style="stop-color:#FFFCFE"/>
-<stop offset="0.6788" style="stop-color:#595959"/>
-<stop offset="0.9455" style="stop-color:#D4D3D3"/>
-<stop offset="1" style="stop-color:#D4D3D3"/>
+ <stop offset="0" style="stop-color:#B6B4B5"/>
+ <stop offset="0.1152" style="stop-color:#FFFCFE"/>
+ <stop offset="0.6788" style="stop-color:#595959"/>
+ <stop offset="0.9455" style="stop-color:#D4D3D3"/>
</linearGradient>
<path d="M15.627,5.458c-1.201,0-2.174,0.977-2.174,2.178v8.494c0,1.202,0.973,2.177,2.174,2.177 c1.203,0,2.18-0.975,2.18-2.177V7.636C17.807,6.435,16.83,5.458,15.627,5.458z" fill="url(#SVGID_16_)"/>
<polygon fill="#701619" points="53.08,23.051 6.918,23.051 6.918,22.455 53.08,22.455 "/>
<rect fill="none" height="60" width="60"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calendar_alarm.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calendar_alarm.svg Fri May 14 16:09:54 2010 +0300
@@ -1,165 +1,164 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-72.52" x2="-72.52" y1="30.8438" y2="-15.6104">
-<stop offset="0" style="stop-color:#ECF3F5"/>
-<stop offset="0.2" style="stop-color:#ECF3F5"/>
-<stop offset="0.8606" style="stop-color:#7E878A"/>
-<stop offset="1" style="stop-color:#B0B8BB"/>
+ <stop offset="0.2" style="stop-color:#ECF3F5"/>
+ <stop offset="0.8606" style="stop-color:#7E878A"/>
+ <stop offset="1" style="stop-color:#B0B8BB"/>
</linearGradient>
<path d="M55.5,8.382h-51C3.672,8.382,3,9.054,3,9.883v43.161c0,0.827,0.672,1.499,1.5,1.499h51 c0.828,0,1.5-0.671,1.5-1.499V9.883C57,9.054,56.328,8.382,55.5,8.382L55.5,8.382z" fill="url(#SVGID_1_)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-72.52" x2="-72.52" y1="29.8403" y2="-14.5312">
-<stop offset="0" style="stop-color:#DDE3E6"/>
-<stop offset="0.2364" style="stop-color:#C9CED1"/>
-<stop offset="0.9636" style="stop-color:#899396"/>
-<stop offset="1" style="stop-color:#899396"/>
+ <stop offset="0" style="stop-color:#DDE3E6"/>
+ <stop offset="0.2364" style="stop-color:#C9CED1"/>
+ <stop offset="0.9636" style="stop-color:#899396"/>
</linearGradient>
<path d="M4.5,53.784c-0.41,0-0.742-0.333-0.742-0.741V9.883C3.758,9.472,4.09,9.14,4.5,9.14h51 c0.412,0,0.742,0.333,0.742,0.743v43.161c0,0.408-0.33,0.741-0.742,0.741L4.5,53.784L4.5,53.784z" fill="url(#SVGID_2_)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-72.5571" x2="-72.5571" y1="27.8345" y2="-12.7649">
-<stop offset="0" style="stop-color:#707173"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#707173"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
-<rect fill="url(#SVGID_3_)" fill-opacity="0.4" height="41.06" stroke-opacity="0.4" width="48.965" x="5.48" y="10.892"/>
+<rect enable-background="new " fill="url(#SVGID_3_)" height="41.06" opacity="0.4" width="48.965" x="5.48" y="10.892"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-72.5347" x2="-72.5348" y1="16.5146" y2="-11.7964">
-<stop offset="0" style="stop-color:#737373"/>
-<stop offset="0.6606" style="stop-color:#737373"/>
-<stop offset="1" style="stop-color:#DEDEDE"/>
+ <stop offset="0.6606" style="stop-color:#737373"/>
+ <stop offset="1" style="stop-color:#DEDEDE"/>
</linearGradient>
<rect fill="url(#SVGID_4_)" height="27.871" width="46.163" x="6.904" y="22.815"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-69.3926" x2="-77.4889" y1="-7.9272" y2="18.5136">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#CCCCCC"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#CCCCCC"/>
</linearGradient>
<path d="M43.459,48.54c-3.66,0.956-14.168,2.085-14.168,2.085H6.918V22.754H53.08 c0,0-0.666,18.598-1.311,21.188C51.203,46.232,48.729,47.163,43.459,48.54z" fill="url(#SVGID_5_)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-72.521" x2="-72.521" y1="26.7407" y2="16.4258">
-<stop offset="0" style="stop-color:#FF7042"/>
-<stop offset="1" style="stop-color:#991B23"/>
+ <stop offset="0" style="stop-color:#FF7042"/>
+ <stop offset="1" style="stop-color:#991B23"/>
</linearGradient>
<rect fill="url(#SVGID_6_)" height="10.453" width="46.162" x="6.918" y="12.301"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="-61.6943" x2="-59.3015" y1="-6.646" y2="-11.1237">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
-<path d="M42.891,49.125c-3.358,0.65-7.975,1.264-14.292,1.327 l23.638-11.177c0,0,0.021,2.432-0.467,4.668C51.77,43.941,51.377,47.479,42.891,49.125z" fill="url(#SVGID_7_)" fill-opacity="0.42" stroke-opacity="0.42"/>
+<path d="M42.891,49.125c-3.358,0.65-7.975,1.264-14.292,1.327 l23.638-11.177c0,0,0.021,2.432-0.467,4.668C51.77,43.941,51.377,47.479,42.891,49.125z" enable-background="new " fill="url(#SVGID_7_)" opacity="0.42"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="-61.2495" x2="-62.6952" y1="-11.4277" y2="-8.2283">
-<stop offset="0" style="stop-color:#9C9C9C"/>
-<stop offset="1" style="stop-color:#FFFFFF"/>
+ <stop offset="0" style="stop-color:#9C9C9C"/>
+ <stop offset="1" style="stop-color:#FFFFFF"/>
</linearGradient>
<path d="M27.945,50.618c0,0,13.764-0.12,18.883-7.134c0,0,3.664,4.517,4.941,0.457 C51.229,46.73,46.316,50.721,27.945,50.618z" fill="url(#SVGID_8_)"/>
<path d="M46.938,44.23c0,0,2.734,2.875,4.287,0.957c0.293-0.438,0.467-0.869,0.545-1.272 c-1.276,4.058-4.94-0.46-4.94-0.46c-5.119,7.016-18.883,7.136-18.883,7.136C34.328,50.591,43.756,48.591,46.938,44.23z" fill="#FFFFFF"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="-79.5366" x2="-79.5366" y1="-6.4883" y2="11.8389">
-<stop offset="0" style="stop-color:#303030"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#303030"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
<polygon fill="url(#SVGID_9_)" points="24.822,27.157 22.977,27.157 17.369,28.926 17.369,30.961 21.361,30.024 21.361,44.113 17.369,44.236 17.369,46.27 28.598,45.881 28.598,43.891 24.822,44.007 "/>
<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="-65.4268" x2="-65.4268" y1="-6.4873" y2="11.8388">
-<stop offset="0" style="stop-color:#303030"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#303030"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
<path d="M34.727,43.525c0.033-0.73,0.23-1.407,0.59-2.027c0.361-0.619,0.806-1.191,1.328-1.711 c0.527-0.52,1.256-1.17,2.188-1.947c1.672-1.374,2.729-2.488,3.179-3.354c0.452-0.857,0.68-1.729,0.68-2.61 c0-1.567-0.502-2.753-1.504-3.557c-1-0.807-2.463-1.21-4.39-1.21c-1.557,0-3.159,0.251-4.803,0.754v2.204h0.024 c1.566-0.56,2.902-0.841,4.002-0.846c1.045-0.004,1.826,0.232,2.349,0.707c0.521,0.476,0.782,1.183,0.782,2.128 c0,0.537-0.161,1.082-0.481,1.631c-0.325,0.549-1.101,1.332-2.332,2.35c-1.022,0.854-1.868,1.641-2.539,2.355 c-0.672,0.717-1.233,1.582-1.692,2.592c-0.455,1.011-0.685,2.16-0.685,3.451v1.348l11.341-0.391v-2.111L34.727,43.525z" fill="url(#SVGID_10_)"/>
-<rect fill="#231F20" fill-opacity="0.4" height="7.614" stroke-opacity="0.4" width="6.012" x="41.637" y="8.382"/>
-<rect fill="#231F20" fill-opacity="0.4" height="7.614" stroke-opacity="0.4" width="6.012" x="12.631" y="8.382"/>
+<rect enable-background="new " fill="#231F20" height="7.614" opacity="0.4" width="6.012" x="41.637" y="8.382"/>
+<rect enable-background="new " fill="#231F20" height="7.614" opacity="0.4" width="6.012" x="12.631" y="8.382"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="-60.8442" x2="-54.6872" y1="21.8984" y2="21.8984">
-<stop offset="0" style="stop-color:#FB6C41"/>
-<stop offset="0.497" style="stop-color:#FFB69E"/>
-<stop offset="1" style="stop-color:#FB6C41"/>
+ <stop offset="0" style="stop-color:#FB6C41"/>
+ <stop offset="0.497" style="stop-color:#FFB69E"/>
+ <stop offset="1" style="stop-color:#FB6C41"/>
</linearGradient>
<ellipse cx="44.676" cy="17.082" fill="url(#SVGID_11_)" rx="3.049" ry="2.87"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="-89.8911" x2="-83.7336" y1="21.8984" y2="21.8984">
-<stop offset="0" style="stop-color:#FB6C41"/>
-<stop offset="0.497" style="stop-color:#FFB69E"/>
-<stop offset="1" style="stop-color:#FB6C41"/>
+ <stop offset="0" style="stop-color:#FB6C41"/>
+ <stop offset="0.497" style="stop-color:#FFB69E"/>
+ <stop offset="1" style="stop-color:#FB6C41"/>
</linearGradient>
<ellipse cx="15.629" cy="17.082" fill="url(#SVGID_12_)" rx="3.049" ry="2.87"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="-57.8442" x2="-57.8442" y1="24.9229" y2="19.7907">
-<stop offset="0" style="stop-color:#4A050A"/>
-<stop offset="1" style="stop-color:#B00F25"/>
+ <stop offset="0" style="stop-color:#4A050A"/>
+ <stop offset="1" style="stop-color:#B00F25"/>
</linearGradient>
<path d="M47.725,16.346c0,1.686-1.367,3.05-3.049,3.05c-1.684,0-3.049-1.364-3.049-3.05 c0-1.681,1.365-3.048,3.049-3.048C46.357,13.297,47.725,14.665,47.725,16.346z" fill="url(#SVGID_13_)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="-60.0093" x2="-55.6903" y1="27.0977" y2="27.0977">
-<stop offset="0" style="stop-color:#B6B4B5"/>
-<stop offset="0.1152" style="stop-color:#FFFCFE"/>
-<stop offset="0.6788" style="stop-color:#595959"/>
-<stop offset="0.9455" style="stop-color:#D4D3D3"/>
-<stop offset="1" style="stop-color:#D4D3D3"/>
+ <stop offset="0" style="stop-color:#B6B4B5"/>
+ <stop offset="0.1152" style="stop-color:#FFFCFE"/>
+ <stop offset="0.6788" style="stop-color:#595959"/>
+ <stop offset="0.9455" style="stop-color:#D4D3D3"/>
</linearGradient>
<path d="M44.676,5.458c-1.201,0-2.176,0.977-2.176,2.178v8.494c0,1.202,0.975,2.177,2.176,2.177 s2.178-0.975,2.178-2.177V7.636C46.854,6.435,45.877,5.458,44.676,5.458z" fill="url(#SVGID_14_)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="-86.8911" x2="-86.8911" y1="24.9229" y2="19.7907">
-<stop offset="0" style="stop-color:#4A050A"/>
-<stop offset="1" style="stop-color:#B00F25"/>
+ <stop offset="0" style="stop-color:#4A050A"/>
+ <stop offset="1" style="stop-color:#B00F25"/>
</linearGradient>
<path d="M18.678,16.346c0,1.686-1.365,3.05-3.051,3.05c-1.684,0-3.047-1.364-3.047-3.05 c0-1.681,1.363-3.048,3.047-3.048C17.313,13.297,18.678,14.665,18.678,16.346z" fill="url(#SVGID_15_)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="-89.0562" x2="-84.7366" y1="27.0977" y2="27.0977">
-<stop offset="0" style="stop-color:#B6B4B5"/>
-<stop offset="0.1152" style="stop-color:#FFFCFE"/>
-<stop offset="0.6788" style="stop-color:#595959"/>
-<stop offset="0.9455" style="stop-color:#D4D3D3"/>
-<stop offset="1" style="stop-color:#D4D3D3"/>
+ <stop offset="0" style="stop-color:#B6B4B5"/>
+ <stop offset="0.1152" style="stop-color:#FFFCFE"/>
+ <stop offset="0.6788" style="stop-color:#595959"/>
+ <stop offset="0.9455" style="stop-color:#D4D3D3"/>
</linearGradient>
<path d="M15.627,5.458c-1.201,0-2.174,0.977-2.174,2.178v8.494c0,1.202,0.973,2.177,2.174,2.177 c1.203,0,2.18-0.975,2.18-2.177V7.636C17.807,6.435,16.83,5.458,15.627,5.458z" fill="url(#SVGID_16_)"/>
<polygon fill="#701619" points="53.08,23.051 6.918,23.051 6.918,22.455 53.08,22.455 "/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<polygon fill="none" points="0.414,0 0.414,10.485 0,10.899 0.414,11.313 0.414,30 19.1,30 19.514,30.414 19.928,30 30.414,30 30.414,0 "/>
-<path d="M13.769,24.668c-0.003,0.001-0.44,0.125-0.44,0.125l-0.022-0.021L12.8,24.867l-0.025-0.025 c-0.205,0.02-0.411,0.03-0.618,0.03c-1.746,0-3.402-0.694-4.662-1.954c-1.416-1.414-2.113-3.354-1.924-5.279L5.55,17.618l0.09-0.501 L5.634,17.11l0.032-0.128c0.023-0.113,0.049-0.226,0.079-0.338L0,10.899l2.238-2.238c0.623-0.625,1.393-1.296,2.627-1.358 C4.924,7.3,4.988,7.298,5.054,7.298c0.11,0,0.226,0.005,0.346,0.015L5.58,7.334c0.188,0.025,0.352,0.054,0.521,0.092 c0,0,0.277,0.066,0.313,0.076l4.098-4.098C12.707,1.209,15.636,0,18.76,0c2.05,0,4.037,0.526,5.792,1.527 c0.53-0.355,1.14-0.541,1.763-0.541c0.834,0,1.616,0.323,2.203,0.91c1.08,1.08,1.205,2.759,0.375,3.979 c2.574,4.525,1.834,10.311-1.883,14.027l-4.096,4.096c0,0.002,0.068,0.29,0.068,0.29c0.044,0.201,0.072,0.357,0.092,0.505 c0.011,0.083,0.021,0.159,0.026,0.23c0.015,0.178,0.019,0.354,0.011,0.519c-0.062,1.237-0.732,2.009-1.357,2.634l-2.24,2.238 L13.769,24.668z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M13.769,24.668c-0.003,0.001-0.44,0.125-0.44,0.125l-0.022-0.021L12.8,24.867l-0.025-0.025 c-0.205,0.02-0.411,0.03-0.618,0.03c-1.746,0-3.402-0.694-4.662-1.954c-1.416-1.414-2.113-3.354-1.924-5.279L5.55,17.618l0.09-0.501 L5.634,17.11l0.032-0.128c0.023-0.113,0.049-0.226,0.079-0.338L0,10.899l2.238-2.238c0.623-0.625,1.393-1.296,2.627-1.358 C4.924,7.3,4.988,7.298,5.054,7.298c0.11,0,0.226,0.005,0.346,0.015L5.58,7.334c0.188,0.025,0.352,0.054,0.521,0.092 c0,0,0.277,0.066,0.313,0.076l4.098-4.098C12.707,1.209,15.636,0,18.76,0c2.05,0,4.037,0.526,5.792,1.527 c0.53-0.355,1.14-0.541,1.763-0.541c0.834,0,1.616,0.323,2.203,0.91c1.08,1.08,1.205,2.759,0.375,3.979 c2.574,4.525,1.834,10.311-1.883,14.027l-4.096,4.096c0,0.002,0.068,0.29,0.068,0.29c0.044,0.201,0.072,0.357,0.092,0.505 c0.011,0.083,0.021,0.159,0.026,0.23c0.015,0.178,0.019,0.354,0.011,0.519c-0.062,1.237-0.732,2.009-1.357,2.634l-2.24,2.238 L13.769,24.668z" opacity="0.35"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -924.0166 637.3657)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="218.7148" x2="229.6865" y1="-1096.7686" y2="-1096.7686">
-<stop offset="0" style="stop-color:#676B6D"/>
-<stop offset="0.297" style="stop-color:#A0A3A6"/>
-<stop offset="0.7091" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+ <stop offset="0" style="stop-color:#676B6D"/>
+ <stop offset="0.297" style="stop-color:#A0A3A6"/>
+ <stop offset="0.7091" style="stop-color:#474B4D"/>
+ <stop offset="1" style="stop-color:#707577"/>
</linearGradient>
<path d="M8,14.656L8,14.656c-2.029,2.029-1.943,5.411,0.201,7.555c2.143,2.143,5.527,2.232,7.557,0.203l0,0 L8,14.656z" fill="url(#SVGID_1__)"/>
<linearGradient gradientTransform="matrix(1 0 0 1 0 9.765625e-004)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="3.21" x2="21.4822" y1="8.9229" y2="27.1951">
-<stop offset="0" style="stop-color:#FFB533"/>
-<stop offset="0.2" style="stop-color:#FFE692"/>
-<stop offset="0.3879" style="stop-color:#FBD072"/>
-<stop offset="0.4182" style="stop-color:#F7BC54"/>
-<stop offset="0.6667" style="stop-color:#ED8C0D"/>
-<stop offset="0.8545" style="stop-color:#F9C967"/>
-<stop offset="1" style="stop-color:#FFB81F"/>
+ <stop offset="0" style="stop-color:#FFB533"/>
+ <stop offset="0.2" style="stop-color:#FFE692"/>
+ <stop offset="0.3879" style="stop-color:#FBD072"/>
+ <stop offset="0.4182" style="stop-color:#F7BC54"/>
+ <stop offset="0.6667" style="stop-color:#ED8C0D"/>
+ <stop offset="0.8545" style="stop-color:#F9C967"/>
+ <stop offset="1" style="stop-color:#FFB81F"/>
</linearGradient>
<path d="M21.777,23.721L6.693,8.637c-2.041-0.73-2.813-0.205-3.748,0.731l-1.531,1.531L19.514,29l1.533-1.531 C21.982,26.532,22.508,25.761,21.777,23.721z" fill="url(#SVGID_2__)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -924.0166 637.3657)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="221.9707" x2="226.2741" y1="-1120.2998" y2="-1120.2998">
-<stop offset="0" style="stop-color:#FFB533"/>
-<stop offset="0.1939" style="stop-color:#FFE692"/>
-<stop offset="0.703" style="stop-color:#ED8C0D"/>
-<stop offset="0.8848" style="stop-color:#F9C967"/>
-<stop offset="1" style="stop-color:#FFB81F"/>
+ <stop offset="0" style="stop-color:#FFB533"/>
+ <stop offset="0.1939" style="stop-color:#FFE692"/>
+ <stop offset="0.703" style="stop-color:#ED8C0D"/>
+ <stop offset="0.8848" style="stop-color:#F9C967"/>
+ <stop offset="1" style="stop-color:#FFB81F"/>
</linearGradient>
<path d="M27.057,6.375l0.754-0.755c0.83-0.829,0.83-2.188,0-3.017c-0.83-0.83-2.188-0.83-3.018,0 l-0.754,0.754L27.057,6.375z" fill="url(#SVGID_3__)"/>
-<path d="M27.057,6.375l0.754-0.755c0.045-0.045,0.08-0.098,0.119-0.146 c-0.385-0.581-0.832-1.134-1.344-1.645c-0.512-0.512-1.064-0.96-1.646-1.346c-0.047,0.041-0.1,0.074-0.146,0.12l-0.754,0.754 L27.057,6.375z" fill="#873900" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M26.869,3.546c-0.492-0.492-1.023-0.924-1.58-1.299c-0.178,0.095-0.346,0.207-0.494,0.355 l-0.473,0.473l3.018,3.017l0.471-0.472c0.148-0.148,0.262-0.318,0.357-0.495C27.791,4.568,27.359,4.038,26.869,3.546z" fill="#873900" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M27.057,6.375l0.754-0.755c0.045-0.045,0.08-0.098,0.119-0.146 c-0.385-0.581-0.832-1.134-1.344-1.645c-0.512-0.512-1.064-0.96-1.646-1.346c-0.047,0.041-0.1,0.074-0.146,0.12l-0.754,0.754 L27.057,6.375z" fill="#873900" opacity="0.2"/>
+<path d="M26.869,3.546c-0.492-0.492-1.023-0.924-1.58-1.299c-0.178,0.095-0.346,0.207-0.494,0.355 l-0.473,0.473l3.018,3.017l0.471-0.472c0.148-0.148,0.262-0.318,0.357-0.495C27.791,4.568,27.359,4.038,26.869,3.546z" fill="#873900" opacity="0.1"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="26.3223" x2="14.1095" y1="4.0923" y2="16.3051">
-<stop offset="0" style="stop-color:#FDE6B1"/>
-<stop offset="1" style="stop-color:#EF951A"/>
+ <stop offset="0" style="stop-color:#FDE6B1"/>
+ <stop offset="1" style="stop-color:#EF951A"/>
</linearGradient>
<path d="M21.777,23.721l4.525-4.525c4.148-4.147,4.148-10.936,0-15.084s-10.936-4.148-15.084,0L6.693,8.637 L21.777,23.721z" fill="url(#SVGID_4__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="13.1172" x2="27.4319" y1="2.9941" y2="17.3088">
-<stop offset="0" style="stop-color:#FFB533"/>
-<stop offset="0.2545" style="stop-color:#FFE692"/>
-<stop offset="0.503" style="stop-color:#F8C15B"/>
-<stop offset="0.5152" style="stop-color:#F6B84E"/>
-<stop offset="0.6667" style="stop-color:#ED8C0D"/>
-<stop offset="0.8545" style="stop-color:#F9C967"/>
-<stop offset="1" style="stop-color:#FFB81F"/>
+ <stop offset="0" style="stop-color:#FFB533"/>
+ <stop offset="0.2545" style="stop-color:#FFE692"/>
+ <stop offset="0.503" style="stop-color:#F8C15B"/>
+ <stop offset="0.5152" style="stop-color:#F6B84E"/>
+ <stop offset="0.6667" style="stop-color:#ED8C0D"/>
+ <stop offset="0.8545" style="stop-color:#F9C967"/>
+ <stop offset="1" style="stop-color:#FFB81F"/>
</linearGradient>
<path d="M7.258,8.637l4.244-4.242C13.432,2.464,16.01,1.4,18.76,1.4c2.752,0,5.33,1.063,7.26,2.994 c1.932,1.931,2.994,4.509,2.994,7.259c0,2.751-1.063,5.329-2.994,7.26l-4.242,4.242L7.258,8.637z" fill="url(#SVGID_5__)"/>
-<rect fill="#873900" fill-opacity="0.2" height="0.401" stroke-opacity="0.2" transform="matrix(0.7071 0.7071 -0.7071 0.7071 15.546 -5.4806)" width="21.332" x="3.723" y="15.825"/>
-<path d="M13.619,23.671c0.143-0.041,0.285-0.087,0.426-0.141l-7.162-7.161c-0.053,0.14-0.1,0.281-0.141,0.425 L13.619,23.671z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<rect fill="#873900" fill-opacity="0.1" height="0.4" stroke-opacity="0.1" transform="matrix(0.7071 0.7071 -0.7071 0.7071 15.429 -5.7637)" width="21.332" x="4.006" y="15.543"/>
-<path d="M13.133,23.786c0.156-0.029,0.309-0.063,0.461-0.106L6.734,16.82c-0.043,0.151-0.078,0.305-0.107,0.459 L13.133,23.786z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M4.85,8.302l17.262,17.263c0.037-0.485-0.059-1.074-0.334-1.844L6.693,8.637 C5.924,8.36,5.336,8.266,4.85,8.302z" fill="#FFF6C9" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M6.693,8.637c-0.195-0.07-0.379-0.128-0.553-0.176l15.813,15.813 c-0.047-0.173-0.105-0.357-0.176-0.553L6.693,8.637z" fill="#FFF6C9" fill-opacity="0.5" stroke-opacity="0.5"/>
-<rect fill="#753200" fill-opacity="0.2" height="0.401" stroke-opacity="0.2" transform="matrix(0.7071 0.7071 -0.7071 0.7071 17.1142 -1.697)" width="25.598" x="-2.194" y="19.608"/>
-<rect fill="#753200" fill-opacity="0.1" height="0.398" stroke-opacity="0.1" transform="matrix(0.7071 0.7071 -0.7071 0.7071 16.9952 -1.9808)" width="25.599" x="-1.911" y="19.326"/>
+<rect fill="#873900" height="0.401" opacity="0.2" transform="matrix(0.7071 0.7071 -0.7071 0.7071 15.546 -5.4806)" width="21.332" x="3.723" y="15.825"/>
+<path d="M13.619,23.671c0.143-0.041,0.285-0.087,0.426-0.141l-7.162-7.161c-0.053,0.14-0.1,0.281-0.141,0.425 L13.619,23.671z" opacity="0.2"/>
+<rect fill="#873900" height="0.4" opacity="0.1" transform="matrix(0.7071 0.7071 -0.7071 0.7071 15.429 -5.7637)" width="21.332" x="4.006" y="15.543"/>
+<path d="M13.133,23.786c0.156-0.029,0.309-0.063,0.461-0.106L6.734,16.82c-0.043,0.151-0.078,0.305-0.107,0.459 L13.133,23.786z" opacity="0.1"/>
+<path d="M4.85,8.302l17.262,17.263c0.037-0.485-0.059-1.074-0.334-1.844L6.693,8.637 C5.924,8.36,5.336,8.266,4.85,8.302z" fill="#FFF6C9" opacity="0.5"/>
+<path d="M6.693,8.637c-0.195-0.07-0.379-0.128-0.553-0.176l15.813,15.813 c-0.047-0.173-0.105-0.357-0.176-0.553L6.693,8.637z" fill="#FFF6C9" opacity="0.5"/>
+<rect fill="#753200" height="0.401" opacity="0.2" transform="matrix(0.7071 0.7071 -0.7071 0.7071 17.1142 -1.697)" width="25.598" x="-2.194" y="19.608"/>
+<rect fill="#753200" height="0.398" opacity="0.1" transform="matrix(0.7071 0.7071 -0.7071 0.7071 16.9952 -1.9808)" width="25.599" x="-1.911" y="19.326"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6__" x1="21.6523" x2="21.6523" y1="1.7822" y2="16.0367">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#F9C966"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#F9C966"/>
</linearGradient>
-<path d="M27.348,15.49c-2.314-1.359-4.715-3.255-6.941-5.482 c-2.229-2.228-4.123-4.628-5.482-6.942l-0.236-0.403l0.436-0.172c1.156-0.455,2.375-0.686,3.627-0.686 c2.615,0,5.162,1.047,6.986,2.873c2.775,2.774,3.635,6.941,2.188,10.614l-0.172,0.435L27.348,15.49z" fill="url(#SVGID_6__)" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M27.348,15.49c-2.314-1.359-4.715-3.255-6.941-5.482 c-2.229-2.228-4.123-4.628-5.482-6.942l-0.236-0.403l0.436-0.172c1.156-0.455,2.375-0.686,3.627-0.686 c2.615,0,5.162,1.047,6.986,2.873c2.775,2.774,3.635,6.941,2.188,10.614l-0.172,0.435L27.348,15.49z" fill="url(#SVGID_6__)" opacity="0.5"/>
<rect fill="none" height="30" width="30" x="0.414"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calendar_dynamic.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_calendar_dynamic.svg Fri May 14 16:09:54 2010 +0300
@@ -1,95 +1,92 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="8.1353" y2="54.5899">
-<stop offset="0" style="stop-color:#ECF3F5"/>
-<stop offset="0.2" style="stop-color:#ECF3F5"/>
-<stop offset="0.8606" style="stop-color:#7E878A"/>
-<stop offset="1" style="stop-color:#B0B8BB"/>
+ <stop offset="0.2" style="stop-color:#ECF3F5"/>
+ <stop offset="0.8606" style="stop-color:#7E878A"/>
+ <stop offset="1" style="stop-color:#B0B8BB"/>
</linearGradient>
<path d="M55.5,8.382h-51C3.673,8.382,3,9.054,3,9.883v43.16c0,0.828,0.673,1.499,1.5,1.499h51 c0.828,0,1.5-0.671,1.5-1.499V9.883C57,9.054,56.328,8.382,55.5,8.382L55.5,8.382z" fill="url(#SVGID_1_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="9.1396" y2="53.5106">
-<stop offset="0" style="stop-color:#DDE3E6"/>
-<stop offset="0.2364" style="stop-color:#C9CED1"/>
-<stop offset="0.9636" style="stop-color:#899396"/>
-<stop offset="1" style="stop-color:#899396"/>
+ <stop offset="0" style="stop-color:#DDE3E6"/>
+ <stop offset="0.2364" style="stop-color:#C9CED1"/>
+ <stop offset="0.9636" style="stop-color:#899396"/>
</linearGradient>
-<path d="M4.5,53.784c-0.409,0-0.742-0.333-0.742-0.741V9.883 c0-0.411,0.333-0.743,0.742-0.743h51c0.412,0,0.742,0.333,0.742,0.743v43.16c0,0.408-0.33,0.741-0.742,0.741H4.5z" fill="url(#SVGID_2_)" fill-rule="evenodd"/>
+<path clip-rule="evenodd" d="M4.5,53.784c-0.409,0-0.742-0.333-0.742-0.741V9.883 c0-0.411,0.333-0.743,0.742-0.743h51c0.412,0,0.742,0.333,0.742,0.743v43.16c0,0.408-0.33,0.741-0.742,0.741H4.5z" fill="url(#SVGID_2_)" fill-rule="evenodd"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="29.9629" x2="29.9629" y1="11.1455" y2="51.7439">
-<stop offset="0" style="stop-color:#707173"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#707173"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
-<rect fill="url(#SVGID_3_)" fill-opacity="0.4" height="41.06" stroke-opacity="0.4" width="48.965" x="5.48" y="10.892"/>
+<rect fill="url(#SVGID_3_)" height="41.06" opacity="0.4" width="48.965" x="5.48" y="10.892"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="29.9854" x2="29.9853" y1="22.4663" y2="50.7773">
-<stop offset="0" style="stop-color:#737373"/>
-<stop offset="0.6606" style="stop-color:#737373"/>
-<stop offset="1" style="stop-color:#DEDEDE"/>
+ <stop offset="0.6606" style="stop-color:#737373"/>
+ <stop offset="1" style="stop-color:#DEDEDE"/>
</linearGradient>
-<rect fill="url(#SVGID_4_)" fill-rule="evenodd" height="27.871" width="46.162" x="6.904" y="22.815"/>
+<rect clip-rule="evenodd" fill="url(#SVGID_4_)" fill-rule="evenodd" height="27.871" width="46.162" x="6.904" y="22.815"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="33.1284" x2="25.0323" y1="46.9072" y2="20.4671">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#CCCCCC"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#CCCCCC"/>
</linearGradient>
-<path d="M43.46,48.54c-3.661,0.956-14.169,2.085-14.169,2.085H6.919 V22.754h46.162c0,0-0.667,18.597-1.312,21.188C51.203,46.232,48.729,47.162,43.46,48.54z" fill="url(#SVGID_5_)" fill-rule="evenodd"/>
+<path clip-rule="evenodd" d="M43.46,48.54c-3.661,0.956-14.169,2.085-14.169,2.085H6.919 V22.754h46.162c0,0-0.667,18.597-1.312,21.188C51.203,46.232,48.729,47.162,43.46,48.54z" fill="url(#SVGID_5_)" fill-rule="evenodd"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="30" x2="30" y1="12.2397" y2="22.5541">
-<stop offset="0" style="stop-color:#FF7042"/>
-<stop offset="1" style="stop-color:#991B23"/>
+ <stop offset="0" style="stop-color:#FF7042"/>
+ <stop offset="1" style="stop-color:#991B23"/>
</linearGradient>
-<rect fill="url(#SVGID_6_)" fill-rule="evenodd" height="10.453" width="46.162" x="6.919" y="12.301"/>
+<rect clip-rule="evenodd" fill="url(#SVGID_6_)" fill-rule="evenodd" height="10.453" width="46.162" x="6.919" y="12.301"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="40.8252" x2="43.2182" y1="45.627" y2="50.105">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
-<path d="M42.892,49.125 c-3.36,0.65-7.976,1.264-14.294,1.326l23.639-11.176c0,0,0.021,2.431-0.467,4.667C51.77,43.942,51.377,47.479,42.892,49.125z" fill="url(#SVGID_7_)" fill-opacity="0.42" fill-rule="evenodd" stroke-opacity="0.42"/>
+<path clip-rule="evenodd" d="M42.892,49.125 c-3.36,0.65-7.976,1.264-14.294,1.326l23.639-11.176c0,0,0.021,2.431-0.467,4.667C51.77,43.942,51.377,47.479,42.892,49.125z" fill="url(#SVGID_7_)" fill-rule="evenodd" opacity="0.42"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="41.271" x2="39.8252" y1="50.4082" y2="47.2086">
-<stop offset="0" style="stop-color:#9C9C9C"/>
-<stop offset="1" style="stop-color:#FFFFFF"/>
+ <stop offset="0" style="stop-color:#9C9C9C"/>
+ <stop offset="1" style="stop-color:#FFFFFF"/>
</linearGradient>
-<path d="M27.946,50.618c0,0,13.763-0.12,18.882-7.134 c0,0,3.664,4.517,4.941,0.458C51.229,46.73,46.316,50.721,27.946,50.618z" fill="url(#SVGID_8_)" fill-rule="evenodd"/>
-<path d="M46.938,44.23c0,0,2.733,2.877,4.287,0.958 c0.292-0.438,0.466-0.869,0.544-1.273c-1.277,4.058-4.941-0.46-4.941-0.46c-5.119,7.016-18.882,7.136-18.882,7.136 C34.328,50.591,43.756,48.591,46.938,44.23z" fill="#FFFFFF" fill-rule="evenodd"/>
-<rect fill="#231F20" fill-opacity="0.4" fill-rule="evenodd" height="7.614" stroke-opacity="0.4" width="6.012" x="41.637" y="8.382"/>
-<rect fill="#231F20" fill-opacity="0.4" fill-rule="evenodd" height="7.614" stroke-opacity="0.4" width="6.012" x="12.631" y="8.382"/>
+<path clip-rule="evenodd" d="M27.946,50.618c0,0,13.763-0.12,18.882-7.134 c0,0,3.664,4.517,4.941,0.458C51.229,46.73,46.316,50.721,27.946,50.618z" fill="url(#SVGID_8_)" fill-rule="evenodd"/>
+<path clip-rule="evenodd" d="M46.938,44.23c0,0,2.733,2.877,4.287,0.958 c0.292-0.438,0.466-0.869,0.544-1.273c-1.277,4.058-4.941-0.46-4.941-0.46c-5.119,7.016-18.882,7.136-18.882,7.136 C34.328,50.591,43.756,48.591,46.938,44.23z" fill="#FFFFFF" fill-rule="evenodd"/>
+<rect clip-rule="evenodd" fill="#231F20" fill-rule="evenodd" height="7.614" opacity="0.4" width="6.012" x="41.637" y="8.382"/>
+<rect clip-rule="evenodd" fill="#231F20" fill-rule="evenodd" height="7.614" opacity="0.4" width="6.012" x="12.631" y="8.382"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="41.6763" x2="47.8338" y1="17.0825" y2="17.0825">
-<stop offset="0" style="stop-color:#FB6C41"/>
-<stop offset="0.497" style="stop-color:#FFB69E"/>
-<stop offset="1" style="stop-color:#FB6C41"/>
+ <stop offset="0" style="stop-color:#FB6C41"/>
+ <stop offset="0.497" style="stop-color:#FFB69E"/>
+ <stop offset="1" style="stop-color:#FB6C41"/>
</linearGradient>
-<ellipse cx="44.676" cy="17.082" fill="url(#SVGID_9_)" fill-rule="evenodd" rx="3.049" ry="2.87"/>
+<ellipse clip-rule="evenodd" cx="44.676" cy="17.082" fill="url(#SVGID_9_)" fill-rule="evenodd" rx="3.049" ry="2.87"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="12.6294" x2="18.7869" y1="17.0825" y2="17.0825">
-<stop offset="0" style="stop-color:#FB6C41"/>
-<stop offset="0.497" style="stop-color:#FFB69E"/>
-<stop offset="1" style="stop-color:#FB6C41"/>
+ <stop offset="0" style="stop-color:#FB6C41"/>
+ <stop offset="0.497" style="stop-color:#FFB69E"/>
+ <stop offset="1" style="stop-color:#FB6C41"/>
</linearGradient>
-<ellipse cx="15.629" cy="17.082" fill="url(#SVGID_10_)" fill-rule="evenodd" rx="3.049" ry="2.87"/>
+<ellipse clip-rule="evenodd" cx="15.629" cy="17.082" fill="url(#SVGID_10_)" fill-rule="evenodd" rx="3.049" ry="2.87"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="44.6758" x2="44.6758" y1="14.0566" y2="19.1892">
-<stop offset="0" style="stop-color:#4A050A"/>
-<stop offset="1" style="stop-color:#B00F25"/>
+ <stop offset="0" style="stop-color:#4A050A"/>
+ <stop offset="1" style="stop-color:#B00F25"/>
</linearGradient>
-<path d="M47.725,16.346c0,1.686-1.366,3.05-3.049,3.05 c-1.684,0-3.049-1.364-3.049-3.05c0-1.681,1.365-3.048,3.049-3.048C46.358,13.297,47.725,14.665,47.725,16.346z" fill="url(#SVGID_11_)" fill-rule="evenodd"/>
+<path clip-rule="evenodd" d="M47.725,16.346c0,1.686-1.366,3.05-3.049,3.05 c-1.684,0-3.049-1.364-3.049-3.05c0-1.681,1.365-3.048,3.049-3.048C46.358,13.297,47.725,14.665,47.725,16.346z" fill="url(#SVGID_11_)" fill-rule="evenodd"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="42.5112" x2="46.8307" y1="11.8828" y2="11.8828">
-<stop offset="0" style="stop-color:#B6B4B5"/>
-<stop offset="0.1152" style="stop-color:#FFFCFE"/>
-<stop offset="0.6788" style="stop-color:#595959"/>
-<stop offset="0.9455" style="stop-color:#D4D3D3"/>
-<stop offset="1" style="stop-color:#D4D3D3"/>
+ <stop offset="0" style="stop-color:#B6B4B5"/>
+ <stop offset="0.1152" style="stop-color:#FFFCFE"/>
+ <stop offset="0.6788" style="stop-color:#595959"/>
+ <stop offset="0.9455" style="stop-color:#D4D3D3"/>
</linearGradient>
-<path d="M44.676,5.458c-1.201,0-2.176,0.977-2.176,2.178v8.494 c0,1.202,0.975,2.177,2.176,2.177s2.178-0.975,2.178-2.177V7.636C46.854,6.435,45.877,5.458,44.676,5.458z" fill="url(#SVGID_12_)" fill-rule="evenodd"/>
+<path clip-rule="evenodd" d="M44.676,5.458c-1.201,0-2.176,0.977-2.176,2.178v8.494 c0,1.202,0.975,2.177,2.176,2.177s2.178-0.975,2.178-2.177V7.636C46.854,6.435,45.877,5.458,44.676,5.458z" fill="url(#SVGID_12_)" fill-rule="evenodd"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="15.6289" x2="15.6289" y1="14.0566" y2="19.1892">
-<stop offset="0" style="stop-color:#4A050A"/>
-<stop offset="1" style="stop-color:#B00F25"/>
+ <stop offset="0" style="stop-color:#4A050A"/>
+ <stop offset="1" style="stop-color:#B00F25"/>
</linearGradient>
-<path d="M18.678,16.346c0,1.686-1.365,3.05-3.05,3.05 c-1.684,0-3.048-1.364-3.048-3.05c0-1.681,1.364-3.048,3.048-3.048C17.313,13.297,18.678,14.665,18.678,16.346z" fill="url(#SVGID_13_)" fill-rule="evenodd"/>
+<path clip-rule="evenodd" d="M18.678,16.346c0,1.686-1.365,3.05-3.05,3.05 c-1.684,0-3.048-1.364-3.048-3.05c0-1.681,1.364-3.048,3.048-3.048C17.313,13.297,18.678,14.665,18.678,16.346z" fill="url(#SVGID_13_)" fill-rule="evenodd"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="13.4644" x2="17.7848" y1="11.8828" y2="11.8828">
-<stop offset="0" style="stop-color:#B6B4B5"/>
-<stop offset="0.1152" style="stop-color:#FFFCFE"/>
-<stop offset="0.6788" style="stop-color:#595959"/>
-<stop offset="0.9455" style="stop-color:#D4D3D3"/>
-<stop offset="1" style="stop-color:#D4D3D3"/>
+ <stop offset="0" style="stop-color:#B6B4B5"/>
+ <stop offset="0.1152" style="stop-color:#FFFCFE"/>
+ <stop offset="0.6788" style="stop-color:#595959"/>
+ <stop offset="0.9455" style="stop-color:#D4D3D3"/>
</linearGradient>
-<path d="M15.628,5.458c-1.202,0-2.175,0.977-2.175,2.178v8.494 c0,1.202,0.973,2.177,2.175,2.177s2.18-0.975,2.18-2.177V7.636C17.808,6.435,16.83,5.458,15.628,5.458z" fill="url(#SVGID_14_)" fill-rule="evenodd"/>
+<path clip-rule="evenodd" d="M15.628,5.458c-1.202,0-2.175,0.977-2.175,2.178v8.494 c0,1.202,0.973,2.177,2.175,2.177s2.18-0.975,2.18-2.177V7.636C17.808,6.435,16.83,5.458,15.628,5.458z" fill="url(#SVGID_14_)" fill-rule="evenodd"/>
<polygon fill="#701619" points="53.081,23.051 6.919,23.051 6.919,22.455 53.081,22.455 53.081,23.051 "/>
-<rect fill="none" fill-rule="evenodd" height="60" width="60"/>
+<rect clip-rule="evenodd" fill="none" fill-rule="evenodd" height="60" width="60"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_assistant.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_assistant.svg Fri May 14 16:09:54 2010 +0300
@@ -1,152 +1,153 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
-<stop offset="0.297" style="stop-color:#A7E722"/>
-<stop offset="0.6667" style="stop-color:#428C0F"/>
-<stop offset="0.7939" style="stop-color:#5CA617"/>
-<stop offset="1" style="stop-color:#5CA617"/>
+ <stop offset="0.297" style="stop-color:#A7E722"/>
+ <stop offset="0.6667" style="stop-color:#428C0F"/>
+ <stop offset="0.7939" style="stop-color:#5CA617"/>
</radialGradient>
<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737 c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108 c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274 c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-2.477-2.889-8.594-5.015-10.752-5.399 c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571C11.203,27.277,3.722,37.795,2.668,40.352 c-1.108,2.691-0.581,4.645-0.236,6.567c0.387,2.158,2.511,8.275,5.4,10.752c0.718,0.616,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-1639.3428" x2="-1638.9111" y1="-2494.9824" y2="-2491.4067">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+ <stop offset="0" style="stop-color:#559D13"/>
+ <stop offset="1" style="stop-color:#284F09"/>
</linearGradient>
<path d="M35.172,17.107c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967 c0.535,0.492,0.873,0.588,1.301,0.274c0.047-0.034,0.063-0.046,0.064-0.046c0.252-0.184,1.031-0.739,2.119-1.514 c-0.252-0.205-3.469-2.809-4.801-2.956C36.855,15.598,35.172,17.107,35.172,17.107z" fill="url(#SVGID_2_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -1696.8304 4072.5859)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1639.3467" x2="-1638.9149" y1="4063.0557" y2="4066.6318">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+ <stop offset="0" style="stop-color:#559D13"/>
+ <stop offset="1" style="stop-color:#284F09"/>
</linearGradient>
<path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.714c0.376,0.665,2.351,3.067,2.967,3.737 c0.492,0.53,0.587,0.869,0.274,1.297c-0.035,0.049-0.046,0.063-0.046,0.063c-0.183,0.253-0.738,1.032-1.515,2.12 c-0.203-0.252-2.807-3.469-2.956-4.8C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
-<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112 C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711 c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571 C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617 C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B5DC77" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737 c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108 c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274 c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982 c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273 c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107 c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736 c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606 c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B5DC77" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112 C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711 c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571 C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617 C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B5DC77" opacity="0.5"/>
+<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737 c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108 c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274 c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982 c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273 c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107 c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736 c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606 c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B5DC77" opacity="0.6"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -608.1406 2931.3247)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-1610.522" x2="-1610.522" y1="-2533.3467" y2="-2471.428">
-<stop offset="0" style="stop-color:#447F0F"/>
-<stop offset="0.5" style="stop-color:#284F09"/>
-<stop offset="1" style="stop-color:#40790E"/>
+ <stop offset="0" style="stop-color:#447F0F"/>
+ <stop offset="0.5" style="stop-color:#284F09"/>
+ <stop offset="1" style="stop-color:#40790E"/>
</linearGradient>
-<path d="M2.899,45.012c1.275-2.776,10.299-14.805,18.804-23.31 c8.505-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26 c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.534,18.958c-8.562,8.562-17.667,20.715-18.96,23.535 c-0.038,0.086-0.063,0.165-0.101,0.25c0.071,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_4_)" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M2.899,45.012c1.275-2.776,10.299-14.805,18.804-23.31 c8.505-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26 c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.534,18.958c-8.562,8.562-17.667,20.715-18.96,23.535 c-0.038,0.086-0.063,0.165-0.101,0.25c0.071,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_4_)" opacity="0.5"/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<path d="M30,0.001H14.961C14.955,0.001,14.949,0,14.943,0c-0.006,0-0.012,0.001-0.019,0.001H0v30h30V0.001z" fill="none"/>
<rect fill="none" height="30" width="30" y="0.001"/>
-<path d="M28.736,18.376c0.006-0.225,0.008-0.446-0.004-0.649c-0.002-0.063-0.008-0.122-0.02-0.228 c-0.018-0.208-0.035-0.415-0.068-0.609c-0.01-0.063-0.023-0.122-0.053-0.255c-0.037-0.18-0.072-0.357-0.121-0.521 c-0.02-0.068-0.043-0.131-0.066-0.192l-0.936,0.352l0.896-0.462c-0.047-0.14-0.098-0.279-0.154-0.406 c-0.035-0.079-0.076-0.149-0.115-0.22l-0.865,0.502l0.805-0.611c-0.057-0.108-0.115-0.215-0.178-0.306 c-0.064-0.094-0.133-0.174-0.205-0.252l-0.066-0.078c-0.061-0.076-0.125-0.149-0.197-0.217c-0.158-0.144-0.311-0.233-0.379-0.271 l0.063-0.398h-0.217c-0.018-0.405-0.047-0.809-0.088-1.203c0.014-0.257,0.016-0.514,0.021-0.819 c0.004-0.072,0.008-0.146,0.008-0.203c0-0.065-0.049-1.029-0.049-1.029c-0.006-0.074-0.018-0.146-0.037-0.245 c-0.043-0.41-0.105-0.811-0.189-1.234c-0.01-0.077-0.02-0.153-0.057-0.299c0,0-0.107-0.409-0.164-0.609 c-0.016-0.063-0.033-0.127-0.078-0.267c-0.016-0.036-0.031-0.072-0.049-0.109c-0.404-1.208-1.006-2.3-1.736-3.177l-0.084-0.135 l-0.057-0.066c-0.045-0.052-0.094-0.101-0.174-0.179c-0.145-0.161-0.297-0.316-0.455-0.472c-0.135-0.131-0.275-0.261-0.422-0.387 c-0.164-0.143-0.332-0.282-0.545-0.447c-0.031-0.027-0.117-0.1-0.117-0.1l-0.068-0.048c-0.076-0.054-0.156-0.104-0.236-0.152 l-0.092-0.058c-0.166-0.109-0.334-0.219-0.531-0.336c-0.043-0.028-0.225-0.134-0.225-0.134c-0.076-0.041-0.156-0.079-0.238-0.117 l-0.15-0.074c-0.186-0.095-0.371-0.188-0.557-0.271l-0.072-0.036l-0.172-0.073c-0.102-0.042-0.209-0.079-0.316-0.116l-0.098-0.035 C18.303,0.378,16.66,0,14.943,0c-3.277,0-6.254,1.365-8.416,3.851c0,0-0.074,0.042-0.088,0.049c-0.102,0.04-0.201,0.082-0.33,0.142 L6.088,4.048L5.908,4.14c0,0-0.043,0.032-0.051,0.038C5.732,4.245,5.611,4.316,5.516,4.38L4.975,4.731v0.058 c-1.043,0.897-2.107,2.544-2.125,5.53c0,0,0.002,0.221,0.008,0.355c0.006,0.26,0.014,0.522,0.039,0.858l0,0l0.006,0.119 c0.018,0.194,0.037,0.393,0.07,0.65l0.084,0.609c-0.025,0.351-0.045,0.689-0.055,1.025c-0.148,0.088-0.277,0.184-0.396,0.293 c-0.055,0.051-0.107,0.11-0.15,0.166c-0.109,0.116-0.217,0.235-0.318,0.385c-0.049,0.072-0.094,0.154-0.139,0.237L1.93,15.142 c-0.049,0.085-0.096,0.17-0.141,0.269c-0.057,0.125-0.105,0.264-0.152,0.402l0.945,0.323l-0.984-0.215 c-0.023,0.061-0.045,0.122-0.066,0.191c-0.057,0.194-0.1,0.402-0.143,0.626l-0.029,0.14c-0.037,0.226-0.061,0.463-0.078,0.709 L1.27,17.703c-0.014,0.241-0.012,0.489-0.004,0.729v0.122l0.041,0.001l-0.039,0.002l0.004,0.159c0.18,2.729,1.537,4.709,3.225,4.709 l0.066-0.003c0.033,0.007,0.068,0.012,0.104,0.017l0.314,0.518h0.018c1.168,1.754,3.143,3.851,6.264,4.856 c0.137,0.088,0.277,0.173,0.42,0.254c0.105,0.06,0.211,0.116,0.322,0.173c0.189,0.096,0.383,0.184,0.566,0.259 c0.115,0.049,0.229,0.096,0.348,0.139c0.217,0.075,0.434,0.135,0.734,0.208c0.076,0.021,0.154,0.041,0.236,0.056 c0.363,0.067,0.697,0.1,1.018,0.1c0.369,0,0.715-0.029,1.049-0.071c0.1-0.012,0.199-0.027,0.301-0.044 c0.256-0.042,0.504-0.096,0.809-0.176l0.174-0.046c0.24-0.073,0.469-0.155,0.691-0.247l0.229-0.095l0.018-0.02 c1.295-0.59,2.434-1.545,3.477-2.911l0.057-0.075l0.09-0.18c0.49-0.765,0.957-1.572,1.398-2.416l0.01,0.018 c0,0,0.344-0.712,0.385-0.799c0.455,0.389,0.947,0.495,1.277,0.518l0.145,0.005c0.139,0,0.281-0.013,0.424-0.038l0.066,0.002 c1.689,0,3.045-1.98,3.227-4.714C28.734,18.665,28.738,18.451,28.736,18.376z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M28.736,18.376c0.006-0.225,0.008-0.446-0.004-0.649c-0.002-0.063-0.008-0.122-0.02-0.228 c-0.018-0.208-0.035-0.415-0.068-0.609c-0.01-0.063-0.023-0.122-0.053-0.255c-0.037-0.18-0.072-0.357-0.121-0.521 c-0.02-0.068-0.043-0.131-0.066-0.192l-0.936,0.352l0.896-0.462c-0.047-0.14-0.098-0.279-0.154-0.406 c-0.035-0.079-0.076-0.149-0.115-0.22l-0.865,0.502l0.805-0.611c-0.057-0.108-0.115-0.215-0.178-0.306 c-0.064-0.094-0.133-0.174-0.205-0.252l-0.066-0.078c-0.061-0.076-0.125-0.149-0.197-0.217c-0.158-0.144-0.311-0.233-0.379-0.271 l0.063-0.398h-0.217c-0.018-0.405-0.047-0.809-0.088-1.203c0.014-0.257,0.016-0.514,0.021-0.819 c0.004-0.072,0.008-0.146,0.008-0.203c0-0.065-0.049-1.029-0.049-1.029c-0.006-0.074-0.018-0.146-0.037-0.245 c-0.043-0.41-0.105-0.811-0.189-1.234c-0.01-0.077-0.02-0.153-0.057-0.299c0,0-0.107-0.409-0.164-0.609 c-0.016-0.063-0.033-0.127-0.078-0.267c-0.016-0.036-0.031-0.072-0.049-0.109c-0.404-1.208-1.006-2.3-1.736-3.177l-0.084-0.135 l-0.057-0.066c-0.045-0.052-0.094-0.101-0.174-0.179c-0.145-0.161-0.297-0.316-0.455-0.472c-0.135-0.131-0.275-0.261-0.422-0.387 c-0.164-0.143-0.332-0.282-0.545-0.447c-0.031-0.027-0.117-0.1-0.117-0.1l-0.068-0.048c-0.076-0.054-0.156-0.104-0.236-0.152 l-0.092-0.058c-0.166-0.109-0.334-0.219-0.531-0.336c-0.043-0.028-0.225-0.134-0.225-0.134c-0.076-0.041-0.156-0.079-0.238-0.117 l-0.15-0.074c-0.186-0.095-0.371-0.188-0.557-0.271l-0.072-0.036l-0.172-0.073c-0.102-0.042-0.209-0.079-0.316-0.116l-0.098-0.035 C18.303,0.378,16.66,0,14.943,0c-3.277,0-6.254,1.365-8.416,3.851c0,0-0.074,0.042-0.088,0.049c-0.102,0.04-0.201,0.082-0.33,0.142 L6.088,4.048L5.908,4.14c0,0-0.043,0.032-0.051,0.038C5.732,4.245,5.611,4.316,5.516,4.38L4.975,4.731v0.058 c-1.043,0.897-2.107,2.544-2.125,5.53c0,0,0.002,0.221,0.008,0.355c0.006,0.26,0.014,0.522,0.039,0.858l0,0l0.006,0.119 c0.018,0.194,0.037,0.393,0.07,0.65l0.084,0.609c-0.025,0.351-0.045,0.689-0.055,1.025c-0.148,0.088-0.277,0.184-0.396,0.293 c-0.055,0.051-0.107,0.11-0.15,0.166c-0.109,0.116-0.217,0.235-0.318,0.385c-0.049,0.072-0.094,0.154-0.139,0.237L1.93,15.142 c-0.049,0.085-0.096,0.17-0.141,0.269c-0.057,0.125-0.105,0.264-0.152,0.402l0.945,0.323l-0.984-0.215 c-0.023,0.061-0.045,0.122-0.066,0.191c-0.057,0.194-0.1,0.402-0.143,0.626l-0.029,0.14c-0.037,0.226-0.061,0.463-0.078,0.709 L1.27,17.703c-0.014,0.241-0.012,0.489-0.004,0.729v0.122l0.041,0.001l-0.039,0.002l0.004,0.159c0.18,2.729,1.537,4.709,3.225,4.709 l0.066-0.003c0.033,0.007,0.068,0.012,0.104,0.017l0.314,0.518h0.018c1.168,1.754,3.143,3.851,6.264,4.856 c0.137,0.088,0.277,0.173,0.42,0.254c0.105,0.06,0.211,0.116,0.322,0.173c0.189,0.096,0.383,0.184,0.566,0.259 c0.115,0.049,0.229,0.096,0.348,0.139c0.217,0.075,0.434,0.135,0.734,0.208c0.076,0.021,0.154,0.041,0.236,0.056 c0.363,0.067,0.697,0.1,1.018,0.1c0.369,0,0.715-0.029,1.049-0.071c0.1-0.012,0.199-0.027,0.301-0.044 c0.256-0.042,0.504-0.096,0.809-0.176l0.174-0.046c0.24-0.073,0.469-0.155,0.691-0.247l0.229-0.095l0.018-0.02 c1.295-0.59,2.434-1.545,3.477-2.911l0.057-0.075l0.09-0.18c0.49-0.765,0.957-1.572,1.398-2.416l0.01,0.018 c0,0,0.344-0.712,0.385-0.799c0.455,0.389,0.947,0.495,1.277,0.518l0.145,0.005c0.139,0,0.281-0.013,0.424-0.038l0.066,0.002 c1.689,0,3.045-1.98,3.227-4.714C28.734,18.665,28.738,18.451,28.736,18.376z" opacity="0.35"/>
<radialGradient cx="-4272.6958" cy="-2826.3394" gradientTransform="matrix(0.4209 0 0 0.4195 1813.6772 1193.3445)" gradientUnits="userSpaceOnUse" id="SVGID_1__" r="50.7847">
-<stop offset="0" style="stop-color:#FFE2D9"/>
-<stop offset="0.5091" style="stop-color:#FFC6B3"/>
-<stop offset="0.7636" style="stop-color:#FFA98E"/>
-<stop offset="1" style="stop-color:#E88160"/>
+ <stop offset="0" style="stop-color:#FFE2D9"/>
+ <stop offset="0.5091" style="stop-color:#FFC6B3"/>
+ <stop offset="0.7636" style="stop-color:#FFA98E"/>
+ <stop offset="1" style="stop-color:#E88160"/>
</radialGradient>
<path d="M25.389,15.734c-0.051-0.023-0.109-0.029-0.166-0.046v-0.001c-0.01-0.003-0.02-0.004-0.031-0.006 c-0.084-0.021-0.164-0.041-0.25-0.045C14.48,13.817,9.682,8.021,9.32,9.556c-0.289,1.219-3.221,3.863-4.758,5.179 c0.014,0.062,0.02,0.111,0.035,0.171c0,0,0.053,0.271,0.168,0.729c-0.121,0.014-0.24,0.039-0.355,0.088 c-0.979,0.413-1.285,2.014-0.684,3.58c0.596,1.563,1.873,2.502,2.852,2.089c0.061-0.025,0.113-0.067,0.166-0.104 c0.566,1.277,1.268,2.646,2.119,4.018c1.432,1.7,3.623,3.694,6.043,3.694c2.93,0,4.719-1.601,5.951-3.216 c0.035-0.069,0.064-0.132,0.1-0.188c0.912-1.426,1.652-2.856,2.252-4.188c0.955,0.331,2.182-0.559,2.791-2.063 C26.633,17.789,26.357,16.172,25.389,15.734z" fill="url(#SVGID_1__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="10.7998" x2="19.8362" y1="30.4028" y2="21.437">
-<stop offset="0" style="stop-color:#FFC6B3"/>
-<stop offset="1" style="stop-color:#FFA98E"/>
+ <stop offset="0" style="stop-color:#FFC6B3"/>
+ <stop offset="1" style="stop-color:#FFA98E"/>
</linearGradient>
<path d="M14.477,28.181c-1.781,0-3.578-0.829-4.9-2.08C10.975,27.572,12.857,29,14.906,29 c2.93,0,4.719-1.601,5.951-3.216c0.035-0.069,0.064-0.132,0.1-0.188c0.912-1.426,1.652-2.856,2.252-4.188 C19.879,27.229,17.404,28.181,14.477,28.181z" fill="url(#SVGID_2__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="14.8223" x2="14.8223" y1="1.3467" y2="14.6545">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.3758" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+ <stop offset="0" style="stop-color:#8A5D3B"/>
+ <stop offset="0.3758" style="stop-color:#632F00"/>
+ <stop offset="1" style="stop-color:#361700"/>
</linearGradient>
<path d="M14.615,1.151c-3.629,0-5.373,1.65-6.721,3.372c-2.188,0.339-5.66,2.344-3.209,11.141 c1.535-1.317,4.346-4.89,4.635-6.108c0.365-1.549,5.246,4.369,15.902,6.132c0.127-0.492,0.182-0.782,0.182-0.782 C27.078,7.396,23.438,1.444,14.615,1.151z" fill="url(#SVGID_3__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="19.375" x2="7.3168" y1="14.0776" y2="6.9192">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.3636" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+ <stop offset="0" style="stop-color:#8A5D3B"/>
+ <stop offset="0.3636" style="stop-color:#632F00"/>
+ <stop offset="1" style="stop-color:#361700"/>
</linearGradient>
<path d="M9.332,8.835c0,0,5.217,6.854,15.818,6.842C25.15,15.677,20.156,14.894,9.332,8.835z" fill="url(#SVGID_4__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="6.2285" x2="6.3344" y1="5.5264" y2="13.1843">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.3758" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+ <stop offset="0" style="stop-color:#8A5D3B"/>
+ <stop offset="0.3758" style="stop-color:#632F00"/>
+ <stop offset="1" style="stop-color:#361700"/>
</linearGradient>
<path d="M8.076,5.032c0,0-5.105,0.307-3.211,8.964C4.865,13.996,4.24,8.067,8.076,5.032z" fill="url(#SVGID_5_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="16.5127" x2="16.1374" y1="2.4868" y2="5.9564">
-<stop offset="0" style="stop-color:#A87C4F"/>
-<stop offset="1" style="stop-color:#632F00"/>
+ <stop offset="0" style="stop-color:#A87C4F"/>
+ <stop offset="1" style="stop-color:#632F00"/>
</linearGradient>
<path d="M17.088,6.231c-2.377-0.338-6.398-2.445-7.977-1.694c0,0,5.16-5.888,14.27,0.818 C23.381,5.355,21.211,6.819,17.088,6.231z" fill="url(#SVGID_6_)"/>
-<path d="M14.906,29c1.008,0,1.877-0.191,2.641-0.508c0.219-0.284,0.35-0.608,0.35-0.962 c0-1.137-1.271-2.026-2.895-2.026c-0.975,0-1.861,0.333-2.387,0.871c-2.586-0.645-4.225-2.271-5.199-3.676 c0.191,0.386,0.396,0.776,0.613,1.169c0.006,0.01,0.01,0.021,0.016,0.03c0.219,0.396,0.449,0.794,0.693,1.194l0,0 c0.018,0.031,0.035,0.061,0.055,0.094c0.008,0.015,0.018,0.027,0.027,0.043c0.016,0.026,0.029,0.05,0.043,0.076 C10.295,27.006,12.486,29,14.906,29z" fill="#020202" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M4.039,19.958c0.051,0.078,0.098,0.153,0.145,0.229c0.115,0.174,0.242,0.337,0.369,0.481l0,0 c0.623,0.679,1.387,0.993,2.025,0.724c0.061-0.025,0.113-0.067,0.166-0.104c0.031,0.07,0.068,0.145,0.1,0.215 c0.213-0.626,0.311-1.44,0.287-2.506c-0.004-0.219-0.012-0.443-0.029-0.672c-0.094-1.413-0.336-2.495-0.719-3.22l-0.041-0.581 l0.008-0.197C6.436,7.803,9.889,3.421,14.943,3.421c5.088,0,8.543,4.423,8.596,11.01l0.006,0.054l-0.059,0.897 c-0.307,0.713-0.502,1.701-0.586,2.943c-0.018,0.229-0.023,0.453-0.033,0.712c-0.02,1.024,0.08,1.843,0.293,2.477 c0.016-0.035,0.035-0.07,0.049-0.105c0.75,0.259,1.664-0.238,2.318-1.189l0,0c0.088-0.126,0.17-0.264,0.252-0.403 c0.076-0.151,0.152-0.304,0.221-0.471c0.633-1.556,0.357-3.173-0.611-3.61c-0.051-0.023-0.109-0.029-0.166-0.046v-0.001 c0.127-0.492,0.182-0.782,0.182-0.782c0.063-0.284,0.117-0.566,0.164-0.848c0.014-0.076,0.025-0.157,0.039-0.235 c0.035-0.214,0.064-0.429,0.09-0.642c0.008-0.068,0.014-0.139,0.021-0.207c0.061-0.561,0.086-1.11,0.078-1.646 c0-0.048-0.002-0.097-0.004-0.144c-0.004-0.243-0.014-0.48-0.037-0.717c0-0.027-0.002-0.055-0.004-0.082 c-0.047-0.539-0.127-1.063-0.242-1.571c-0.006-0.024-0.014-0.05-0.021-0.074c-0.057-0.244-0.119-0.484-0.193-0.721 c-0.002-0.004-0.004-0.01-0.004-0.01c-0.463-1.186-1.051-2.256-1.75-3.196c-0.002-0.002-0.002-0.002-0.002-0.002 c-0.461-0.538-0.99-1.023-1.584-1.456c-0.006-0.005-0.014-0.01-0.02-0.016c-0.287-0.203-0.588-0.393-0.902-0.572 c-0.029-0.016-0.057-0.029-0.084-0.045c-0.305-0.169-0.629-0.327-0.965-0.471c-0.041-0.017-0.082-0.035-0.125-0.054 c-0.332-0.137-0.68-0.263-1.039-0.376c-0.053-0.017-0.104-0.031-0.154-0.046c-0.363-0.107-0.738-0.206-1.133-0.285 c-0.051-0.011-0.102-0.022-0.154-0.031c-0.402-0.079-0.818-0.146-1.246-0.196c-0.039-0.005-0.078-0.007-0.119-0.013 c-0.451-0.049-0.916-0.084-1.398-0.1c-3.629,0-5.373,1.65-6.721,3.372C7.748,4.545,7.598,4.576,7.441,4.615l-0.02,0.004 C7.27,4.66,7.117,4.707,6.959,4.765C6.953,4.767,6.947,4.767,6.941,4.771C6.783,4.831,6.625,4.898,6.465,4.979 c-0.004,0.003-0.008,0.003-0.01,0.004c-0.162,0.084-0.322,0.18-0.48,0.287v0.003c-0.977,1.45-1.701,3.185-2.127,5.142 c0,0.349,0.014,0.72,0.049,1.107c0,0.006,0,0.011,0,0.011c0.018,0.192,0.035,0.389,0.061,0.587c0.002,0.02,0.006,0.038,0.008,0.057 c0.023,0.187,0.049,0.377,0.08,0.574c0.004,0.037,0.012,0.078,0.016,0.117c0.031,0.179,0.061,0.361,0.1,0.549 c0.01,0.064,0.023,0.131,0.037,0.196c0.031,0.169,0.064,0.333,0.102,0.508c0.023,0.101,0.053,0.207,0.074,0.311 c0.033,0.146,0.066,0.286,0.104,0.435c0.063,0.256,0.131,0.516,0.207,0.783c-0.094,0.015-0.186,0.035-0.273,0.073 c-0.979,0.413-1.285,2.014-0.684,3.58c0.063,0.167,0.137,0.324,0.217,0.477C3.975,19.841,4.006,19.9,4.039,19.958z M4.758,15.599 c0.002,0.013,0.006,0.023,0.008,0.036c-0.02,0.002-0.041,0.007-0.061,0.01C4.721,15.63,4.74,15.614,4.758,15.599z" fill="#020202" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M14.906,29c1.008,0,1.877-0.191,2.641-0.508c0.219-0.284,0.35-0.608,0.35-0.962 c0-1.137-1.271-2.026-2.895-2.026c-0.975,0-1.861,0.333-2.387,0.871c-2.586-0.645-4.225-2.271-5.199-3.676 c0.191,0.386,0.396,0.776,0.613,1.169c0.006,0.01,0.01,0.021,0.016,0.03c0.219,0.396,0.449,0.794,0.693,1.194l0,0 c0.018,0.031,0.035,0.061,0.055,0.094c0.008,0.015,0.018,0.027,0.027,0.043c0.016,0.026,0.029,0.05,0.043,0.076 C10.295,27.006,12.486,29,14.906,29z" fill="#020202" opacity="0.3"/>
+<path d="M4.039,19.958c0.051,0.078,0.098,0.153,0.145,0.229c0.115,0.174,0.242,0.337,0.369,0.481l0,0 c0.623,0.679,1.387,0.993,2.025,0.724c0.061-0.025,0.113-0.067,0.166-0.104c0.031,0.07,0.068,0.145,0.1,0.215 c0.213-0.626,0.311-1.44,0.287-2.506c-0.004-0.219-0.012-0.443-0.029-0.672c-0.094-1.413-0.336-2.495-0.719-3.22l-0.041-0.581 l0.008-0.197C6.436,7.803,9.889,3.421,14.943,3.421c5.088,0,8.543,4.423,8.596,11.01l0.006,0.054l-0.059,0.897 c-0.307,0.713-0.502,1.701-0.586,2.943c-0.018,0.229-0.023,0.453-0.033,0.712c-0.02,1.024,0.08,1.843,0.293,2.477 c0.016-0.035,0.035-0.07,0.049-0.105c0.75,0.259,1.664-0.238,2.318-1.189l0,0c0.088-0.126,0.17-0.264,0.252-0.403 c0.076-0.151,0.152-0.304,0.221-0.471c0.633-1.556,0.357-3.173-0.611-3.61c-0.051-0.023-0.109-0.029-0.166-0.046v-0.001 c0.127-0.492,0.182-0.782,0.182-0.782c0.063-0.284,0.117-0.566,0.164-0.848c0.014-0.076,0.025-0.157,0.039-0.235 c0.035-0.214,0.064-0.429,0.09-0.642c0.008-0.068,0.014-0.139,0.021-0.207c0.061-0.561,0.086-1.11,0.078-1.646 c0-0.048-0.002-0.097-0.004-0.144c-0.004-0.243-0.014-0.48-0.037-0.717c0-0.027-0.002-0.055-0.004-0.082 c-0.047-0.539-0.127-1.063-0.242-1.571c-0.006-0.024-0.014-0.05-0.021-0.074c-0.057-0.244-0.119-0.484-0.193-0.721 c-0.002-0.004-0.004-0.01-0.004-0.01c-0.463-1.186-1.051-2.256-1.75-3.196c-0.002-0.002-0.002-0.002-0.002-0.002 c-0.461-0.538-0.99-1.023-1.584-1.456c-0.006-0.005-0.014-0.01-0.02-0.016c-0.287-0.203-0.588-0.393-0.902-0.572 c-0.029-0.016-0.057-0.029-0.084-0.045c-0.305-0.169-0.629-0.327-0.965-0.471c-0.041-0.017-0.082-0.035-0.125-0.054 c-0.332-0.137-0.68-0.263-1.039-0.376c-0.053-0.017-0.104-0.031-0.154-0.046c-0.363-0.107-0.738-0.206-1.133-0.285 c-0.051-0.011-0.102-0.022-0.154-0.031c-0.402-0.079-0.818-0.146-1.246-0.196c-0.039-0.005-0.078-0.007-0.119-0.013 c-0.451-0.049-0.916-0.084-1.398-0.1c-3.629,0-5.373,1.65-6.721,3.372C7.748,4.545,7.598,4.576,7.441,4.615l-0.02,0.004 C7.27,4.66,7.117,4.707,6.959,4.765C6.953,4.767,6.947,4.767,6.941,4.771C6.783,4.831,6.625,4.898,6.465,4.979 c-0.004,0.003-0.008,0.003-0.01,0.004c-0.162,0.084-0.322,0.18-0.48,0.287v0.003c-0.977,1.45-1.701,3.185-2.127,5.142 c0,0.349,0.014,0.72,0.049,1.107c0,0.006,0,0.011,0,0.011c0.018,0.192,0.035,0.389,0.061,0.587c0.002,0.02,0.006,0.038,0.008,0.057 c0.023,0.187,0.049,0.377,0.08,0.574c0.004,0.037,0.012,0.078,0.016,0.117c0.031,0.179,0.061,0.361,0.1,0.549 c0.01,0.064,0.023,0.131,0.037,0.196c0.031,0.169,0.064,0.333,0.102,0.508c0.023,0.101,0.053,0.207,0.074,0.311 c0.033,0.146,0.066,0.286,0.104,0.435c0.063,0.256,0.131,0.516,0.207,0.783c-0.094,0.015-0.186,0.035-0.273,0.073 c-0.979,0.413-1.285,2.014-0.684,3.58c0.063,0.167,0.137,0.324,0.217,0.477C3.975,19.841,4.006,19.9,4.039,19.958z M4.758,15.599 c0.002,0.013,0.006,0.023,0.008,0.036c-0.02,0.002-0.041,0.007-0.061,0.01C4.721,15.63,4.74,15.614,4.758,15.599z" fill="#020202" opacity="0.3"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="4.5703" x2="15.5801" y1="24.3438" y2="24.3438">
-<stop offset="0" style="stop-color:#454647"/>
-<stop offset="0.4727" style="stop-color:#BDBEC3"/>
-<stop offset="1" style="stop-color:#E4E6EB"/>
+ <stop offset="0" style="stop-color:#454647"/>
+ <stop offset="0.4727" style="stop-color:#BDBEC3"/>
+ <stop offset="1" style="stop-color:#E4E6EB"/>
</linearGradient>
<path d="M15.002,28.398c-7.861,0-10.377-7.274-10.4-7.347c-0.104-0.304,0.061-0.633,0.367-0.732 c0.303-0.102,0.631,0.062,0.732,0.364c0.088,0.268,2.289,6.558,9.301,6.558c0.318,0,0.578,0.261,0.578,0.579 C15.58,28.142,15.32,28.398,15.002,28.398L15.002,28.398z" fill="url(#SVGID_7_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="4.5801" x2="15.5801" y1="24.6323" y2="24.6323">
-<stop offset="0" style="stop-color:#A6A8AB"/>
-<stop offset="0.7394" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#808184"/>
+ <stop offset="0" style="stop-color:#A6A8AB"/>
+ <stop offset="0.7394" style="stop-color:#58595B"/>
+ <stop offset="1" style="stop-color:#808184"/>
</linearGradient>
<path d="M15.002,27.82c-7.535,0-9.852-6.954-9.852-6.954H4.58c0,0.064,0,0.124,0.021,0.186 c0.023,0.072,2.539,7.347,10.4,7.347c0.318,0,0.578-0.257,0.578-0.578H15.002z" fill="url(#SVGID_8_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="14.9443" x2="14.9443" y1="15.605" y2="2.9585">
-<stop offset="0" style="stop-color:#39393B"/>
-<stop offset="0.0424" style="stop-color:#808184"/>
-<stop offset="0.3333" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#A6A8AB"/>
+ <stop offset="0" style="stop-color:#39393B"/>
+ <stop offset="0.0424" style="stop-color:#808184"/>
+ <stop offset="0.3333" style="stop-color:#58595B"/>
+ <stop offset="1" style="stop-color:#A6A8AB"/>
</linearGradient>
<path d="M25.432,14.492L25.432,14.492L25.432,14.492c-0.01-8.527-4.396-12.747-10.43-12.747 S4.58,5.965,4.572,14.492l0,0l0,0c0,0.006,0-0.005,0-0.005v0.005l-0.193,5.98l1.77-0.114l-0.387-5.834 c0.021-7.47,4.131-11.683,9.182-11.683c5.049,0,9.156,4.212,9.18,11.679l-0.381,5.838l1.768,0.114L25.432,14.492L25.432,14.492 C25.432,14.492,25.432,14.498,25.432,14.492z" fill="url(#SVGID_9_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="14.9434" x2="14.9434" y1="10.8926" y2="1.3884">
-<stop offset="0" style="stop-color:#9C9DA1"/>
-<stop offset="0.0545" style="stop-color:#9C9DA1"/>
-<stop offset="0.3333" style="stop-color:#88898C"/>
-<stop offset="1" style="stop-color:#E3E6EB"/>
+ <stop offset="0.0545" style="stop-color:#9C9DA1"/>
+ <stop offset="0.3333" style="stop-color:#88898C"/>
+ <stop offset="1" style="stop-color:#E3E6EB"/>
</linearGradient>
<path d="M25.895,14.554h-0.002C25.885,6.026,20.977,1,14.943,1C8.914,1,4.002,6.026,3.992,14.554v0.009 v0.017h0.002l0.578,0.495C4.762,6.837,9.027,1.745,14.943,1.745c5.922,0,10.303,5.084,10.488,13.329l0.461-0.495h0.002l-0.002-0.011 L25.895,14.554z" fill="url(#SVGID_10_)"/>
-<path d="M4.635,13.914c-0.041,0-0.086,0-0.129,0.004c-0.166,0.012-0.332,0.048-0.492,0.101 c-0.008,0.181-0.021,0.351-0.021,0.535v0.009v0.017h0.002l0.086,1.333l0.135-0.009l0.088-0.037c0.092-0.036,0.188-0.062,0.332-0.067 c0.693,0,1.172,1.212,1.311,3.328c0.014,0.191,0.021,0.38,0.023,0.564h0.133l-0.34-5.167c0-0.07,0.01-0.136,0.01-0.205 C5.449,14.052,5.072,13.914,4.635,13.914z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M5.701,20.684c-0.102-0.303-0.43-0.466-0.732-0.364c-0.307,0.1-0.471,0.429-0.367,0.732 c0.008,0.023,0.289,0.831,0.941,1.904c0.371-0.112,0.682-0.33,0.926-0.663C5.959,21.424,5.727,20.767,5.701,20.684z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M4.635,13.914c-0.041,0-0.086,0-0.129,0.004c-0.166,0.012-0.332,0.048-0.492,0.101 c-0.008,0.181-0.021,0.351-0.021,0.535v0.009v0.017h0.002l0.086,1.333l0.135-0.009l0.088-0.037c0.092-0.036,0.188-0.062,0.332-0.067 c0.693,0,1.172,1.212,1.311,3.328c0.014,0.191,0.021,0.38,0.023,0.564h0.133l-0.34-5.167c0-0.07,0.01-0.136,0.01-0.205 C5.449,14.052,5.072,13.914,4.635,13.914z" fill="#020202" opacity="0.2"/>
+<path d="M5.701,20.684c-0.102-0.303-0.43-0.466-0.732-0.364c-0.307,0.1-0.471,0.429-0.367,0.732 c0.008,0.023,0.289,0.831,0.941,1.904c0.371-0.112,0.682-0.33,0.926-0.663C5.959,21.424,5.727,20.767,5.701,20.684z" fill="#020202" opacity="0.2"/>
<linearGradient gradientTransform="matrix(-1.1528 0.0088 -0.0088 1.0194 -260.3646 8.1097)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="-229.8506" x2="-229.8506" y1="6.7896" y2="15.8948">
-<stop offset="0" style="stop-color:#A6A8AB"/>
-<stop offset="0.8303" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#808184"/>
+ <stop offset="0" style="stop-color:#A6A8AB"/>
+ <stop offset="0.8303" style="stop-color:#58595B"/>
+ <stop offset="1" style="stop-color:#808184"/>
</linearGradient>
<path d="M2.451,18.632c0.146,2.2,1.32,3.912,2.621,3.826c1.301-0.087,1.596-1.895,1.451-4.094 c-0.143-2.199-0.676-3.955-1.977-3.868S2.307,16.433,2.451,18.632z" fill="url(#SVGID_11_)"/>
<linearGradient gradientTransform="matrix(-1 0 0 1 -239.0674 0)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="-243.1118" x2="-243.1118" y1="14.311" y2="22.5257">
-<stop offset="0" style="stop-color:#7A7A7A"/>
-<stop offset="0.7818" style="stop-color:#212121"/>
-<stop offset="1" style="stop-color:#666666"/>
+ <stop offset="0" style="stop-color:#7A7A7A"/>
+ <stop offset="0.7818" style="stop-color:#212121"/>
+ <stop offset="1" style="stop-color:#666666"/>
</linearGradient>
<path d="M2.27,18.649c0.143,2.158,1.172,3.849,2.301,3.772c1.131-0.074,1.371-1.848,1.229-4.004 c-0.143-2.159-0.615-3.885-1.744-3.811C2.928,14.684,2.127,16.491,2.27,18.649z" fill="url(#SVGID_12_)"/>
<linearGradient gradientTransform="matrix(-1 0 0 1 -239.0674 0)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="-242.6147" x2="-242.6147" y1="14.103" y2="22.1363">
-<stop offset="0" style="stop-color:#BDC3C4"/>
-<stop offset="0.3515" style="stop-color:#DDE3E6"/>
-<stop offset="0.6545" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+ <stop offset="0" style="stop-color:#BDC3C4"/>
+ <stop offset="0.3515" style="stop-color:#DDE3E6"/>
+ <stop offset="0.6545" style="stop-color:#949DA1"/>
+ <stop offset="0.9636" style="stop-color:#ADB3B5"/>
+ <stop offset="1" style="stop-color:#595C5E"/>
</linearGradient>
<path d="M3.678,14.938c0.625,0.681,0.889,2.033,0.949,3.574c0.053,1.407-0.047,2.636-0.531,3.396 c-0.828-0.358-1.516-1.714-1.625-3.381C2.357,16.833,2.879,15.374,3.678,14.938z" fill="url(#SVGID_13_)"/>
-<path d="M4.055,15.332c0.006,0,0.014,0.002,0.014,0.002c0.158-0.063,0.316-0.101,0.479-0.112 c1.301-0.086,1.834,1.669,1.977,3.867c0.014,0.198,0.021,0.394,0.027,0.586c0.012-0.414,0.002-0.853-0.027-1.311 c-0.143-2.199-0.676-3.955-1.977-3.868c-0.162,0.009-0.32,0.05-0.471,0.113c0,0-0.016-0.002-0.021-0.002 c-1.105,0.072-1.889,1.809-1.789,3.903C2.354,16.754,3.082,15.397,4.055,15.332z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M25.367,13.914c-0.488,0-0.902,0.172-1.25,0.507c0.002,0.033,0.006,0.066,0.006,0.1 l-0.338,5.171h0.246c0.006-0.185,0.014-0.373,0.025-0.564c0.139-2.113,0.615-3.327,1.359-3.327h0.004 c0.092,0.005,0.188,0.03,0.281,0.066l0.086,0.037l0.02,0.002l0.086-1.326h0.002l-0.002-0.011l0.002-0.015h-0.002 c0-0.195-0.016-0.377-0.02-0.569c-0.123-0.034-0.248-0.06-0.379-0.066C25.451,13.914,25.408,13.914,25.367,13.914z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M4.055,15.332c0.006,0,0.014,0.002,0.014,0.002c0.158-0.063,0.316-0.101,0.479-0.112 c1.301-0.086,1.834,1.669,1.977,3.867c0.014,0.198,0.021,0.394,0.027,0.586c0.012-0.414,0.002-0.853-0.027-1.311 c-0.143-2.199-0.676-3.955-1.977-3.868c-0.162,0.009-0.32,0.05-0.471,0.113c0,0-0.016-0.002-0.021-0.002 c-1.105,0.072-1.889,1.809-1.789,3.903C2.354,16.754,3.082,15.397,4.055,15.332z" fill="#FFFFFF" opacity="0.3"/>
+<path d="M25.367,13.914c-0.488,0-0.902,0.172-1.25,0.507c0.002,0.033,0.006,0.066,0.006,0.1 l-0.338,5.171h0.246c0.006-0.185,0.014-0.373,0.025-0.564c0.139-2.113,0.615-3.327,1.359-3.327h0.004 c0.092,0.005,0.188,0.03,0.281,0.066l0.086,0.037l0.02,0.002l0.086-1.326h0.002l-0.002-0.011l0.002-0.015h-0.002 c0-0.195-0.016-0.377-0.02-0.569c-0.123-0.034-0.248-0.06-0.379-0.066C25.451,13.914,25.408,13.914,25.367,13.914z" fill="#020202" opacity="0.2"/>
<linearGradient gradientTransform="matrix(1.1528 0.0088 0.0088 1.0194 453.5628 8.1097)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="-371.4248" x2="-371.4248" y1="8.0117" y2="17.117">
-<stop offset="0" style="stop-color:#A6A8AB"/>
-<stop offset="0.8303" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#808184"/>
+ <stop offset="0" style="stop-color:#A6A8AB"/>
+ <stop offset="0.8303" style="stop-color:#58595B"/>
+ <stop offset="1" style="stop-color:#808184"/>
</linearGradient>
<path d="M27.551,18.632c-0.146,2.2-1.318,3.912-2.619,3.826c-1.303-0.087-1.598-1.895-1.453-4.094 s0.676-3.955,1.979-3.868C26.758,14.583,27.695,16.433,27.551,18.632z" fill="url(#SVGID_14_)"/>
<linearGradient gradientTransform="matrix(1 0 0 1 432.2656 0)" gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="-406.3081" x2="-406.3081" y1="14.311" y2="22.5257">
-<stop offset="0" style="stop-color:#7A7A7A"/>
-<stop offset="0.7818" style="stop-color:#212121"/>
-<stop offset="1" style="stop-color:#666666"/>
+ <stop offset="0" style="stop-color:#7A7A7A"/>
+ <stop offset="0.7818" style="stop-color:#212121"/>
+ <stop offset="1" style="stop-color:#666666"/>
</linearGradient>
<path d="M27.732,18.649c-0.143,2.158-1.172,3.849-2.301,3.772c-1.129-0.074-1.373-1.848-1.227-4.004 c0.139-2.159,0.613-3.885,1.742-3.811C27.076,14.684,27.873,16.491,27.732,18.649z" fill="url(#SVGID_15_)"/>
<linearGradient gradientTransform="matrix(1 0 0 1 432.2656 0)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="-405.8105" x2="-405.8105" y1="14.103" y2="22.1363">
-<stop offset="0" style="stop-color:#BDC3C4"/>
-<stop offset="0.3515" style="stop-color:#DDE3E6"/>
-<stop offset="0.6545" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+ <stop offset="0" style="stop-color:#BDC3C4"/>
+ <stop offset="0.3515" style="stop-color:#DDE3E6"/>
+ <stop offset="0.6545" style="stop-color:#949DA1"/>
+ <stop offset="0.9636" style="stop-color:#ADB3B5"/>
+ <stop offset="1" style="stop-color:#595C5E"/>
</linearGradient>
<path d="M26.322,14.938c-0.621,0.681-0.889,2.033-0.947,3.574c-0.051,1.407,0.049,2.636,0.531,3.396 c0.83-0.358,1.516-1.714,1.625-3.381C27.643,16.833,27.123,15.374,26.322,14.938z" fill="url(#SVGID_16_)"/>
-<path d="M25.947,15.332l-0.021,0.002c-0.15-0.063-0.307-0.101-0.469-0.112 c-1.303-0.086-1.834,1.669-1.979,3.867c-0.016,0.198-0.021,0.394-0.025,0.586c-0.016-0.414-0.004-0.853,0.025-1.311 c0.145-2.199,0.676-3.955,1.979-3.868c0.162,0.009,0.318,0.05,0.469,0.113l0.021-0.002c1.104,0.072,1.891,1.809,1.789,3.903 C27.648,16.754,26.922,15.397,25.947,15.332z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M25.947,15.332l-0.021,0.002c-0.15-0.063-0.307-0.101-0.469-0.112 c-1.303-0.086-1.834,1.669-1.979,3.867c-0.016,0.198-0.021,0.394-0.025,0.586c-0.016-0.414-0.004-0.853,0.025-1.311 c0.145-2.199,0.676-3.955,1.979-3.868c0.162,0.009,0.318,0.05,0.469,0.113l0.021-0.002c1.104,0.072,1.891,1.809,1.789,3.903 C27.648,16.754,26.922,15.397,25.947,15.332z" fill="#FFFFFF" opacity="0.3"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="15.002" x2="15.002" y1="26.0142" y2="28.9689">
-<stop offset="0" style="stop-color:#7A7A7A"/>
-<stop offset="0.7818" style="stop-color:#212121"/>
-<stop offset="1" style="stop-color:#666666"/>
+ <stop offset="0" style="stop-color:#7A7A7A"/>
+ <stop offset="0.7818" style="stop-color:#212121"/>
+ <stop offset="1" style="stop-color:#666666"/>
</linearGradient>
<ellipse cx="15.002" cy="27.53" fill="url(#SVGID_17_)" rx="2.316" ry="1.449"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_car.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_car.svg Fri May 14 16:09:54 2010 +0300
@@ -1,107 +1,149 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
-<stop offset="0.297" style="stop-color:#A7E722"/>
-<stop offset="0.6667" style="stop-color:#428C0F"/>
-<stop offset="0.7939" style="stop-color:#5CA617"/>
-<stop offset="1" style="stop-color:#5CA617"/>
+ <stop offset="0.297" style="stop-color:#A7E722"/>
+ <stop offset="0.6667" style="stop-color:#428C0F"/>
+ <stop offset="0.7939" style="stop-color:#5CA617"/>
</radialGradient>
<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737 c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108 c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274 c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-2.477-2.889-8.594-5.015-10.752-5.399 c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571C11.203,27.277,3.722,37.795,2.668,40.352 c-1.108,2.691-0.581,4.645-0.236,6.567c0.387,2.158,2.511,8.275,5.4,10.752c0.718,0.616,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-1639.3428" x2="-1638.9111" y1="-2494.9824" y2="-2491.4067">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+ <stop offset="0" style="stop-color:#559D13"/>
+ <stop offset="1" style="stop-color:#284F09"/>
</linearGradient>
<path d="M35.172,17.107c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967 c0.535,0.492,0.873,0.588,1.301,0.274c0.047-0.034,0.063-0.046,0.064-0.046c0.252-0.184,1.031-0.739,2.119-1.514 c-0.252-0.205-3.469-2.809-4.801-2.956C36.855,15.598,35.172,17.107,35.172,17.107z" fill="url(#SVGID_2_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -1696.8304 4072.5859)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1639.3467" x2="-1638.9149" y1="4063.0557" y2="4066.6318">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+ <stop offset="0" style="stop-color:#559D13"/>
+ <stop offset="1" style="stop-color:#284F09"/>
</linearGradient>
<path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.714c0.376,0.665,2.351,3.067,2.967,3.737 c0.492,0.53,0.587,0.869,0.274,1.297c-0.035,0.049-0.046,0.063-0.046,0.063c-0.183,0.253-0.738,1.032-1.515,2.12 c-0.203-0.252-2.807-3.469-2.956-4.8C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
-<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112 C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711 c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571 C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617 C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B5DC77" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737 c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108 c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274 c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982 c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273 c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107 c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736 c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606 c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B5DC77" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112 C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711 c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571 C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617 C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B5DC77" opacity="0.5"/>
+<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737 c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108 c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274 c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982 c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273 c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107 c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736 c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606 c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B5DC77" opacity="0.6"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -608.1406 2931.3247)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-1610.522" x2="-1610.522" y1="-2533.3467" y2="-2471.428">
-<stop offset="0" style="stop-color:#447F0F"/>
-<stop offset="0.5" style="stop-color:#284F09"/>
-<stop offset="1" style="stop-color:#40790E"/>
+ <stop offset="0" style="stop-color:#447F0F"/>
+ <stop offset="0.5" style="stop-color:#284F09"/>
+ <stop offset="1" style="stop-color:#40790E"/>
</linearGradient>
-<path d="M2.899,45.012c1.275-2.776,10.299-14.805,18.804-23.31 c8.505-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26 c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.534,18.958c-8.562,8.562-17.667,20.715-18.96,23.535 c-0.038,0.086-0.063,0.165-0.101,0.25c0.071,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_4_)" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M2.899,45.012c1.275-2.776,10.299-14.805,18.804-23.31 c8.505-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26 c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.534,18.958c-8.562,8.562-17.667,20.715-18.96,23.535 c-0.038,0.086-0.063,0.165-0.101,0.25c0.071,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_4_)" opacity="0.5"/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
<path d="M27.61,11.99l-1.636-5.233c-0.38-1.531-2.51-3.757-4.97-3.757h-12c-2.461,0-4.588,2.226-4.955,3.701l-1.652,5.291c-0.846,0.74-1.393,1.81-1.393,3.01v6c0,0.883,0.391,1.67,1,2.22v1.78c0,1.103,1.01,2,2.25,2h2.5c1.24,0,2.25-0.9,2.25-2v-1h12v1c0,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-6c0-1.2-0.55-2.28-1.39-3.01z" fill-opacity="0.6" stroke-opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="5.5" x2="5.5" y1="22" y2="26">
+
<stop offset="0" stop-color="#000000"/>
+
<stop offset="0.6848" stop-color="#000000"/>
+
<stop offset="1" stop-color="#646464"/>
+
</linearGradient>
<path d="M3,22v3c0,0.55,0.563,1,1.25,1h2.5c0.688,0,1.25-0.45,1.25-1v-3h-5z" fill="url(#SVGID_1__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="24.5" x2="24.5" y1="22" y2="26">
+
<stop offset="0" stop-color="#000000"/>
+
<stop offset="0.6848" stop-color="#000000"/>
+
<stop offset="1" stop-color="#646464"/>
+
</linearGradient>
<path d="M22,22v3c0,0.55,0.563,1,1.25,1h2.5c0.688,0,1.25-0.45,1.25-1v-3h-5z" fill="url(#SVGID_2__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="15" x2="15" y1="4.062" y2="14.94">
+
<stop offset="0" stop-color="#F7CC01"/>
+
<stop offset="1" stop-color="#FFAB01"/>
+
</linearGradient>
<path d="M27.5,15l-2.5-8c-0.267-1.067-2-3-4-3h-12c-2,0-3.733,1.933-4,3l-2.5,8h25z" fill="url(#SVGID_3__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="15" x2="15" y1="5.545" y2="13.46">
+
<stop offset="0" stop-color="#4D4D4D"/>
+
<stop offset="1" stop-color="#000000"/>
+
</linearGradient>
<path d="M4.541,13.5l1.891-6.053c0.14-0.549,1.33-1.947,2.568-1.947h12c1.238,0,2.428,1.398,2.545,1.863l1.916,6.137h-20.92z" fill="url(#SVGID_4__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="2" x2="28" y1="17.5" y2="17.5">
+
<stop offset="0" stop-color="#FFC501"/>
+
<stop offset="1" stop-color="#FFB701"/>
+
</linearGradient>
<path d="M25,12h-20c-1.65,0-3,1.35-3,3v6c0,1.1,0.9,2,2,2h22c1.1,0,2-0.9,2-2v-6c0-1.65-1.35-3-3-3z" fill="url(#SVGID_5_)"/>
<path d="M7.416,12l1.04,3.383c0.452,1.47,2.004,2.62,3.544,2.62h6c1.535,0,3.092-1.15,3.544-2.617l1.04-3.38h-15.16z" fill="#FFFFFF" fill-opacity="0.35" stroke-opacity="0.35"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="6" x2="6" y1="18" y2="13">
+
<stop offset="0" stop-color="#F0B901"/>
+
<stop offset="1" stop-color="#ED7E00"/>
+
</linearGradient>
<path d="M6,18c-1.654,0-3-1.121-3-2.5s1.346-2.5,3-2.5,3,1.121,3,2.5-1.346,2.5-3,2.5z" fill="url(#SVGID_6_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="6" x2="6" y1="13.83" y2="17.17">
+
<stop offset="0" stop-color="#FAFAFA"/>
+
<stop offset="1" stop-color="#C8C8D2"/>
+
</linearGradient>
<ellipse cx="6" cy="15.5" fill="url(#SVGID_7_)" rx="2" ry="1.666"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="24" x2="24" y1="18" y2="13">
+
<stop offset="0" stop-color="#F0B901"/>
+
<stop offset="1" stop-color="#ED7E00"/>
+
</linearGradient>
<path d="M24,18c-1.654,0-3-1.121-3-2.5s1.346-2.5,3-2.5,3,1.121,3,2.5-1.35,2.5-3,2.5z" fill="url(#SVGID_8_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="24" x2="24" y1="13.83" y2="17.17">
+
<stop offset="0" stop-color="#FAFAFA"/>
+
<stop offset="1" stop-color="#C8C8D2"/>
+
</linearGradient>
<ellipse cx="24" cy="15.5" fill="url(#SVGID_9_)" rx="2" ry="1.666"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="2" x2="28" y1="19.5" y2="19.5">
+
<stop offset="0" stop-color="#FF9000"/>
+
<stop offset="0.511" stop-color="#FFC501"/>
+
<stop offset="1" stop-color="#FF8800"/>
+
</linearGradient>
<rect fill="url(#SVGID_10_)" height="1" width="26" x="2" y="19"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="15" x2="15" y1="17" y2="12">
+
<stop offset="0" stop-color="#D67900"/>
+
<stop offset="1" stop-color="#FFC501"/>
+
</linearGradient>
<path d="M8.461,12l0.951,3.088c0.323,1.05,1.488,1.91,2.588,1.91h6c1.1,0,2.265-0.86,2.588-1.912l0.95-3.09h-13.08z" fill="url(#SVGID_11_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="15" x2="15" y1="12.06" y2="16.44">
+
<stop offset="0" stop-color="#FFE896"/>
+
<stop offset="1" stop-color="#FFB701"/>
+
</linearGradient>
<path d="M8.984,12l0.905,2.941c0.261,0.85,1.231,1.56,2.111,1.56h6c0.884,0,1.85-0.714,2.11-1.559l0.91-2.94h-12.04z" fill="url(#SVGID_12_)"/>
<path d="M23.22,8.01l-0.164-0.523c-0.08-0.288-1.08-1.487-2.06-1.487h-12c-0.965,0-1.99,1.203-2.092,1.596l-0.625,2.003,16.94-1.589z" fill="#FFFFFF" fill-opacity="0.25" stroke-opacity="0.25"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="15" x2="15" y1="23" y2="21">
+
<stop offset="0" stop-color="#565656"/>
+
<stop offset="1" stop-color="#212121"/>
+
</linearGradient>
<path d="M22,21h-14c-1.1,0-2,0.9-2,2h18c0-1.1-0.9-2-2-2z" fill="url(#SVGID_13_)"/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_duration.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_duration.svg Fri May 14 16:09:54 2010 +0300
@@ -1,78 +1,79 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<stop offset="0" style="stop-color:#3AC5EA"/>
-<stop offset="0.297" style="stop-color:#3AC5EA"/>
-<stop offset="0.6667" style="stop-color:#1754C9"/>
-<stop offset="0.7939" style="stop-color:#33ADE1"/>
-<stop offset="1" style="stop-color:#33ADE1"/>
+ <stop offset="0.297" style="stop-color:#3AC5EA"/>
+ <stop offset="0.6667" style="stop-color:#1754C9"/>
+ <stop offset="0.7939" style="stop-color:#33ADE1"/>
</radialGradient>
<path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333c-0.617-0.665-2.567-3.083-2.968-3.735 c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956c6.191-6.192,9.085-7.646,9.956-8.107 c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967c0.534,0.492,0.872,0.588,1.299,0.274 c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778c-2.476-2.889-8.594-5.015-10.751-5.399 c-1.923-0.345-3.876-0.872-6.567,0.235c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352 c-1.108,2.691-0.581,4.645-0.236,6.567c0.386,2.158,2.51,8.275,5.399,10.752c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2070.7568" x2="-2070.3252" y1="-2266.8511" y2="-2263.2749">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+ <stop offset="0" style="stop-color:#2685D2"/>
+ <stop offset="1" style="stop-color:#081D45"/>
</linearGradient>
<path d="M35.172,17.108c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967 c0.534,0.492,0.872,0.588,1.299,0.274c0.048-0.035,0.062-0.046,0.064-0.046c0.253-0.184,1.032-0.738,2.12-1.514 c-0.251-0.204-3.468-2.809-4.8-2.956C36.857,15.598,35.172,17.108,35.172,17.108z" fill="url(#SVGID_2_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -2128.2356 5114.0977)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2070.7607" x2="-2070.3289" y1="5104.5752" y2="5108.1523">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+ <stop offset="0" style="stop-color:#2685D2"/>
+ <stop offset="1" style="stop-color:#081D45"/>
</linearGradient>
<path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.713c0.376,0.666,2.351,3.069,2.967,3.738 c0.493,0.531,0.587,0.869,0.274,1.298c-0.035,0.047-0.046,0.062-0.046,0.062c-0.183,0.253-0.738,1.032-1.515,2.119 c-0.204-0.252-2.807-3.467-2.956-4.799C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="47.9224" x2="3.9991" y1="3.9307" y2="47.854">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+ <stop offset="0" style="stop-color:#ABEEFF"/>
+ <stop offset="1" style="stop-color:#539FDE"/>
</linearGradient>
-<path d="M2.979,47.467c-0.344-1.925-0.873-3.878,0.235-6.567 c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.341,4.269,40.9,3.215c2.691-1.108,4.644-0.581,6.567-0.236 c1.981,0.354,7.296,2.178,10.069,4.711c-2.552-2.815-8.496-4.879-10.617-5.258c-1.923-0.345-3.876-0.872-6.567,0.235 c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567 c0.378,2.122,2.441,8.065,5.258,10.617C5.156,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M2.979,47.467c-0.344-1.925-0.873-3.878,0.235-6.567 c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.341,4.269,40.9,3.215c2.691-1.108,4.644-0.581,6.567-0.236 c1.981,0.354,7.296,2.178,10.069,4.711c-2.552-2.815-8.496-4.879-10.617-5.258c-1.923-0.345-3.876-0.872-6.567,0.235 c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567 c0.378,2.122,2.441,8.065,5.258,10.617C5.156,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="54.3535" x2="3.9474" y1="3.2017" y2="53.6078">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+ <stop offset="0" style="stop-color:#ABEEFF"/>
+ <stop offset="1" style="stop-color:#539FDE"/>
</linearGradient>
-<path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333 c-0.617-0.665-2.567-3.083-2.968-3.735c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956 c6.191-6.192,9.085-7.646,9.956-8.107c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967 c0.534,0.492,0.872,0.588,1.299,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778 c-0.292-0.339-0.634-0.665-1.013-0.982c0.49,0.657,0.198,1.134-0.607,1.666C54.65,9.447,41.576,18.739,40.825,19.29 c-0.431,0.314-0.767,0.219-1.3-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.948-0.436-1.71-0.034 c-0.871,0.46-3.764,1.914-9.956,8.106c-6.193,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.319,1.135,0.035,1.711 c0.4,0.651,2.351,3.069,2.967,3.736c0.493,0.533,0.559,0.896,0.259,1.332c-0.517,0.755-9.828,13.794-10.76,15.195 c-0.533,0.803-1.008,1.098-1.665,0.606c0.314,0.378,0.644,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_5_)" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333 c-0.617-0.665-2.567-3.083-2.968-3.735c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956 c6.191-6.192,9.085-7.646,9.956-8.107c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967 c0.534,0.492,0.872,0.588,1.299,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778 c-0.292-0.339-0.634-0.665-1.013-0.982c0.49,0.657,0.198,1.134-0.607,1.666C54.65,9.447,41.576,18.739,40.825,19.29 c-0.431,0.314-0.767,0.219-1.3-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.948-0.436-1.71-0.034 c-0.871,0.46-3.764,1.914-9.956,8.106c-6.193,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.319,1.135,0.035,1.711 c0.4,0.651,2.351,3.069,2.967,3.736c0.493,0.533,0.559,0.896,0.259,1.332c-0.517,0.755-9.828,13.794-10.76,15.195 c-0.533,0.803-1.008,1.098-1.665,0.606c0.314,0.378,0.644,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_5_)" opacity="0.6"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -141.776 3075.0667)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-2041.9355" x2="-2041.9355" y1="-2305.2153" y2="-2243.2966">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="0.5091" style="stop-color:#081D45"/>
-<stop offset="1" style="stop-color:#2275BD"/>
+ <stop offset="0" style="stop-color:#2685D2"/>
+ <stop offset="0.5091" style="stop-color:#081D45"/>
+ <stop offset="1" style="stop-color:#2275BD"/>
</linearGradient>
<path d="M2.899,45.012c1.275-2.777,10.299-14.804,18.804-23.31c8.505-8.506,20.532-17.529,23.308-18.803 c0.527-0.241,1.02-0.411,1.493-0.545c-0.511-0.096-1.03-0.19-1.565-0.26c-0.086,0.036-0.163,0.063-0.25,0.102 c-2.818,1.293-14.971,10.397-23.533,18.959C12.595,29.717,3.489,41.869,2.195,44.688c-0.038,0.087-0.063,0.166-0.101,0.25 c0.07,0.535,0.166,1.055,0.259,1.565C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_6_)"/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
-<path d="M14.999,30C6.729,30,0,23.271,0,15S6.729,0,14.999,0C23.271,0,30,6.729,30,15S23.271,30,14.999,30L14.999,30 z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M14.999,30C6.729,30,0,23.271,0,15S6.729,0,14.999,0C23.271,0,30,6.729,30,15S23.271,30,14.999,30L14.999,30 z" opacity="0.35"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="15" x2="15" y1="1.1948" y2="28.8709">
-<stop offset="0" style="stop-color:#BDC2C4"/>
-<stop offset="1" style="stop-color:#454B4D"/>
+ <stop offset="0" style="stop-color:#BDC2C4"/>
+ <stop offset="1" style="stop-color:#454B4D"/>
</linearGradient>
<path d="M14.999,29C7.281,29,1,22.72,1,15S7.281,1,14.999,1C22.72,1,29,7.28,29,15S22.72,29,14.999,29 L14.999,29z" fill="url(#SVGID_1__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="15" x2="15" y1="1.5835" y2="28.5506">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.2364" style="stop-color:#BDC2C4"/>
-<stop offset="1" style="stop-color:#697173"/>
+ <stop offset="0" style="stop-color:#D1D7D9"/>
+ <stop offset="0.2364" style="stop-color:#BDC2C4"/>
+ <stop offset="1" style="stop-color:#697173"/>
</linearGradient>
<circle cx="15" cy="15" fill="url(#SVGID_2__)" r="13.611"/>
-<path d="M15.474,15.476c4.559,0,8.961-0.286,13.127-0.81C28.425,7.305,22.406,1.389,14.999,1.389 c-7.36,0-13.357,5.847-13.6,13.151C5.846,15.143,10.568,15.476,15.474,15.476z" fill="#F1F1F2" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M15.474,15.476c4.559,0,8.961-0.286,13.127-0.81C28.425,7.305,22.406,1.389,14.999,1.389 c-7.36,0-13.357,5.847-13.6,13.151C5.846,15.143,10.568,15.476,15.474,15.476z" fill="#F1F1F2" opacity="0.35"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="1.5186" x2="28.6768" y1="8.2915" y2="8.2915">
-<stop offset="0" style="stop-color:#C0C5C7"/>
-<stop offset="0.2" style="stop-color:#F7FDFF"/>
-<stop offset="0.8" style="stop-color:#F7FDFF"/>
-<stop offset="1" style="stop-color:#CDD3D5"/>
+ <stop offset="0" style="stop-color:#C0C5C7"/>
+ <stop offset="0.2" style="stop-color:#F7FDFF"/>
+ <stop offset="0.8" style="stop-color:#F7FDFF"/>
+ <stop offset="1" style="stop-color:#CDD3D5"/>
</linearGradient>
<path d="M14.999,1.778c7.453,0,13.503,5.99,13.605,13.416c0.002-0.063,0.007-0.129,0.007-0.194 c0-7.517-6.095-13.611-13.612-13.611C7.482,1.389,1.389,7.483,1.389,15c0,0.065,0.003,0.131,0.005,0.194 C1.498,7.769,7.548,1.778,14.999,1.778z" fill="url(#SVGID_3__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="14.999" x2="14.999" y1="27.249" y2="2.9914">
-<stop offset="0" style="stop-color:#BDC2C4"/>
-<stop offset="1" style="stop-color:#454B4D"/>
+ <stop offset="0" style="stop-color:#BDC2C4"/>
+ <stop offset="1" style="stop-color:#454B4D"/>
</linearGradient>
<path d="M14.999,27.055C8.352,27.055,2.944,21.648,2.944,15S8.352,2.945,14.999,2.945 c6.648,0,12.056,5.406,12.056,12.055S21.647,27.055,14.999,27.055L14.999,27.055z" fill="url(#SVGID_4__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="15.001" x2="15.001" y1="26.3296" y2="3.0368">
-<stop offset="0" style="stop-color:#FAF9F9"/>
-<stop offset="0.4" style="stop-color:#FAF9F9"/>
-<stop offset="1" style="stop-color:#808184"/>
+ <stop offset="0.4" style="stop-color:#FAF9F9"/>
+ <stop offset="1" style="stop-color:#808184"/>
</linearGradient>
<path d="M14.999,26.666C8.566,26.666,3.333,21.432,3.333,15S8.566,3.334,14.999,3.334S26.668,8.568,26.668,15 S21.432,26.666,14.999,26.666L14.999,26.666z" fill="url(#SVGID_5__)"/>
-<path d="M14.999,15.832c3.849,0,7.521-0.322,10.89-0.905C25.848,8.956,20.98,4.111,14.999,4.111 c-5.979,0-10.846,4.845-10.886,10.815C7.479,15.51,11.15,15.832,14.999,15.832z" fill="#FFFFFF" fill-opacity="0.7" stroke-opacity="0.7"/>
+<path d="M14.999,15.832c3.849,0,7.521-0.322,10.89-0.905C25.848,8.956,20.98,4.111,14.999,4.111 c-5.979,0-10.846,4.845-10.886,10.815C7.479,15.51,11.15,15.832,14.999,15.832z" fill="#FFFFFF" opacity="0.7"/>
<rect fill="#404041" height="2.335" width="0.777" x="14.611" y="4.396"/>
<rect fill="#404041" height="2.333" width="0.777" x="14.611" y="23.842"/>
<rect fill="#404041" height="0.779" width="2.333" x="23.556" y="14.896"/>
@@ -85,23 +86,23 @@
<rect fill="#404041" height="1.882" transform="matrix(0.8678 -0.497 0.497 0.8678 -9.1555 13.0056)" width="0.627" x="19.548" y="22.766"/>
<rect fill="#404041" height="1.884" transform="matrix(0.497 -0.8678 0.8678 0.497 -5.7368 10.9541)" width="0.627" x="6.267" y="9.483"/>
<rect fill="#404041" height="1.882" transform="matrix(0.4991 -0.8665 0.8665 0.4991 -5.7273 30.3844)" width="0.63" x="23.105" y="19.206"/>
-<path d="M15.953,15.552c-0.04-0.188-0.133-0.352-0.261-0.482l1.34-4.418l-1.117-0.34l-1.392,4.587 c-0.24,0.138-0.42,0.372-0.475,0.653h-2.55v0.389h2.55c0.009,0.05,0.024,0.101,0.043,0.148L8.091,22.09l0.505,0.506l5.978-5.979 c0.129,0.063,0.273,0.102,0.427,0.102c0.471,0,0.862-0.333,0.953-0.777h9.158v-0.389H15.953z" fill="#231F20" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M15.953,15.552c-0.04-0.188-0.133-0.352-0.261-0.482l1.34-4.418l-1.117-0.34l-1.392,4.587 c-0.24,0.138-0.42,0.372-0.475,0.653h-2.55v0.389h2.55c0.009,0.05,0.024,0.101,0.043,0.148L8.091,22.09l0.505,0.506l5.978-5.979 c0.129,0.063,0.273,0.102,0.427,0.102c0.471,0,0.862-0.333,0.953-0.777h9.158v-0.389H15.953z" fill="#231F20" opacity="0.2"/>
<linearGradient gradientTransform="matrix(0.9569 0.2903 -0.2903 0.9569 409.6663 189.0642)" gradientUnits="userSpaceOnUse" id="SVGID_6__" x1="-428.2788" x2="-428.2788" y1="-57.4336" y2="-51.435">
-<stop offset="0" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#231F20"/>
+ <stop offset="0" style="stop-color:#58595B"/>
+ <stop offset="1" style="stop-color:#231F20"/>
</linearGradient>
<polygon fill="url(#SVGID_6__)" points="17.032,10.101 15.915,9.763 14.22,15.344 15.339,15.684 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="8.3799" x2="15.2201" y1="21.7544" y2="14.9142">
-<stop offset="0" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#231F20"/>
+ <stop offset="0" style="stop-color:#58595B"/>
+ <stop offset="1" style="stop-color:#231F20"/>
</linearGradient>
<polygon fill="url(#SVGID_7_)" points="15.479,15.16 14.974,14.655 8.091,21.539 8.596,22.044 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="18.3057" x2="18.3057" y1="14.9443" y2="15.5124">
-<stop offset="0" style="stop-color:#FF0000"/>
-<stop offset="1" style="stop-color:#A8000B"/>
+ <stop offset="0" style="stop-color:#FF0000"/>
+ <stop offset="1" style="stop-color:#A8000B"/>
</linearGradient>
<path d="M25.111,15h-9.158c-0.091-0.442-0.482-0.778-0.953-0.778S14.138,14.558,14.049,15h-2.55v0.389h2.55 c0.089,0.443,0.48,0.778,0.951,0.778s0.862-0.335,0.953-0.778h9.158V15z" fill="url(#SVGID_8_)"/>
<circle cx="15" cy="15.194" fill="#F99792" r="0.583"/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_fax.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_fax.svg Fri May 14 16:09:54 2010 +0300
@@ -1,296 +1,291 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
-<stop offset="0.297" style="stop-color:#A7E722"/>
-<stop offset="0.6667" style="stop-color:#428C0F"/>
-<stop offset="0.7939" style="stop-color:#5CA617"/>
-<stop offset="1" style="stop-color:#5CA617"/>
+ <stop offset="0.297" style="stop-color:#A7E722"/>
+ <stop offset="0.6667" style="stop-color:#428C0F"/>
+ <stop offset="0.7939" style="stop-color:#5CA617"/>
</radialGradient>
<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737 c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108 c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274 c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-2.477-2.889-8.594-5.015-10.752-5.399 c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571C11.203,27.277,3.722,37.795,2.668,40.352 c-1.108,2.691-0.581,4.645-0.236,6.567c0.387,2.158,2.511,8.275,5.4,10.752c0.718,0.616,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-1639.3428" x2="-1638.9111" y1="-2494.9824" y2="-2491.4067">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+ <stop offset="0" style="stop-color:#559D13"/>
+ <stop offset="1" style="stop-color:#284F09"/>
</linearGradient>
<path d="M35.172,17.107c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967 c0.535,0.492,0.873,0.588,1.301,0.274c0.047-0.034,0.063-0.046,0.064-0.046c0.252-0.184,1.031-0.739,2.119-1.514 c-0.252-0.205-3.469-2.809-4.801-2.956C36.855,15.598,35.172,17.107,35.172,17.107z" fill="url(#SVGID_2_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -1696.8304 4072.5859)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1639.3467" x2="-1638.9149" y1="4063.0557" y2="4066.6318">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+ <stop offset="0" style="stop-color:#559D13"/>
+ <stop offset="1" style="stop-color:#284F09"/>
</linearGradient>
<path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.714c0.376,0.665,2.351,3.067,2.967,3.737 c0.492,0.53,0.587,0.869,0.274,1.297c-0.035,0.049-0.046,0.063-0.046,0.063c-0.183,0.253-0.738,1.032-1.515,2.12 c-0.203-0.252-2.807-3.469-2.956-4.8C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
-<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112 C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711 c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571 C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617 C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B5DC77" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737 c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108 c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274 c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982 c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273 c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107 c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736 c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606 c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B5DC77" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112 C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711 c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571 C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617 C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B5DC77" opacity="0.5"/>
+<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737 c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108 c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274 c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982 c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273 c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107 c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736 c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606 c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B5DC77" opacity="0.6"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -608.1406 2931.3247)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-1610.522" x2="-1610.522" y1="-2533.3467" y2="-2471.428">
-<stop offset="0" style="stop-color:#447F0F"/>
-<stop offset="0.5" style="stop-color:#284F09"/>
-<stop offset="1" style="stop-color:#40790E"/>
+ <stop offset="0" style="stop-color:#447F0F"/>
+ <stop offset="0.5" style="stop-color:#284F09"/>
+ <stop offset="1" style="stop-color:#40790E"/>
</linearGradient>
-<path d="M2.899,45.012c1.275-2.776,10.299-14.805,18.804-23.31 c8.505-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26 c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.534,18.958c-8.562,8.562-17.667,20.715-18.96,23.535 c-0.038,0.086-0.063,0.165-0.101,0.25c0.071,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_4_)" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M2.899,45.012c1.275-2.776,10.299-14.805,18.804-23.31 c8.505-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26 c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.534,18.958c-8.562,8.562-17.667,20.715-18.96,23.535 c-0.038,0.086-0.063,0.165-0.101,0.25c0.071,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_4_)" opacity="0.5"/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<polygon fill="none" points="0,11.605 0,11.61 0,22.205 0,22.21 0,30 30,30 30,0 0,0 "/>
-<path d="M4.541,29.085v-2.15c-0.734-0.043-1.318-0.653-1.318-1.397v-0.819 H2.514C1.128,24.718,0,23.591,0,22.205V11.61c0-1.387,1.128-2.515,2.514-2.515h0.703V8.334h0.006v-1.58 c0-0.744,0.584-1.354,1.318-1.397V0.915H25.46v4.441c0.734,0.043,1.318,0.653,1.318,1.397v1.58l0.005,0.762h0.704 c1.386,0,2.513,1.128,2.513,2.515v10.595c0,1.386-1.127,2.513-2.513,2.513h-0.709v0.819c0,0.744-0.584,1.354-1.318,1.397v2.15H4.541 z" fill-opacity="0.35" fill-rule="evenodd" stroke-opacity="0.35"/>
+<path clip-rule="evenodd" d="M4.541,29.085v-2.15c-0.734-0.043-1.318-0.653-1.318-1.397v-0.819 H2.514C1.128,24.718,0,23.591,0,22.205V11.61c0-1.387,1.128-2.515,2.514-2.515h0.703V8.334h0.006v-1.58 c0-0.744,0.584-1.354,1.318-1.397V0.915H25.46v4.441c0.734,0.043,1.318,0.653,1.318,1.397v1.58l0.005,0.762h0.704 c1.386,0,2.513,1.128,2.513,2.515v10.595c0,1.386-1.127,2.513-2.513,2.513h-0.709v0.819c0,0.744-0.584,1.354-1.318,1.397v2.15H4.541 z" fill-rule="evenodd" opacity="0.35"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="15.0005" x2="15.0005" 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"/>
+ <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.754 c0-0.221,0.179-0.399,0.399-0.399h20.756c0.221,0,0.399,0.179,0.399,0.399V10.497z" fill="url(#SVGID_1__)"/>
-<rect fill="#020202" fill-opacity="0.3" height="0.38" 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"/>
+<rect fill="#020202" height="0.38" opacity="0.3" width="21.567" x="4.217" y="9.712"/>
+<rect fill="#020202" height="0.378" opacity="0.15" width="21.567" x="4.217" y="9.334"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="15.0005" x2="15.0005" 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"/>
+ <stop offset="0" style="stop-color:#D9D9D9"/>
+ <stop offset="0.5382" style="stop-color:#B3B3B3"/>
</linearGradient>
<rect fill="url(#SVGID_2__)" height="8.323" width="18.919" x="5.541" y="1.915"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="15.0005" x2="15.0005" y1="1.835" y2="9.598">
-<stop offset="0" style="stop-color:#EDEDED"/>
-<stop offset="1" style="stop-color:#BDBDBD"/>
+ <stop offset="0" style="stop-color:#EDEDED"/>
+ <stop offset="1" style="stop-color:#BDBDBD"/>
</linearGradient>
<polygon fill="url(#SVGID_3__)" points="24.46,5.21 24.46,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.376" stroke-opacity="0.5" width="13.621" x="8.19" y="7.213"/>
-<rect fill="#020202" fill-opacity="0.2" height="0.379" stroke-opacity="0.2" width="13.621" x="8.19" y="6.834"/>
-<rect fill="#020202" fill-opacity="0.2" height="0.38" stroke-opacity="0.2" width="18.919" x="5.541" y="9.712"/>
-<rect fill="#020202" fill-opacity="0.1" height="0.378" stroke-opacity="0.1" width="18.919" x="5.541" y="9.334"/>
-<rect fill="#020202" fill-opacity="0.03" height="0.379" stroke-opacity="0.03" width="18.919" x="5.541" y="8.955"/>
-<rect fill="#020202" fill-opacity="0.5" height="0.376" stroke-opacity="0.5" width="13.621" x="8.19" y="4.942"/>
-<rect fill="#020202" fill-opacity="0.2" height="0.38" 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.42,4.539 c0,0,1.93-2.649,2.467-1.208C24.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.42,3.781 c0,0,1.93-2.271,2.467-0.45C24.188,3.855,21.738,1.864,12.572,1.916z" fill="#050505" fill-opacity="0.1" fill-rule="evenodd" stroke-opacity="0.1"/>
+<rect fill="#020202" height="0.376" opacity="0.5" width="13.621" x="8.19" y="7.213"/>
+<rect fill="#020202" height="0.379" opacity="0.2" width="13.621" x="8.19" y="6.834"/>
+<rect fill="#020202" height="0.38" opacity="0.2" width="18.919" x="5.541" y="9.712"/>
+<rect fill="#020202" height="0.378" opacity="0.1" width="18.919" x="5.541" y="9.334"/>
+<rect fill="#020202" height="0.379" opacity="0.03" width="18.919" x="5.541" y="8.955"/>
+<rect fill="#020202" height="0.376" opacity="0.5" width="13.621" x="8.19" y="4.942"/>
+<rect fill="#020202" height="0.38" opacity="0.2" width="13.621" x="8.19" y="4.563"/>
+<path clip-rule="evenodd" d="M12.572,1.916c0,0,6.867,1.039,9.42,4.539 c0,0,1.93-2.649,2.467-1.208C24.188,3.855,21.738,1.864,12.572,1.916z" fill="#050505" fill-rule="evenodd" opacity="0.05"/>
+<path clip-rule="evenodd" d="M12.572,1.916c0,0,6.867,0.282,9.42,3.781 c0,0,1.93-2.271,2.467-0.45C24.188,3.855,21.738,1.864,12.572,1.916z" fill="#050505" fill-rule="evenodd" opacity="0.1"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="18.876" x2="18.1627" y1="2.2437" y2="4.8932">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.0061" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#D9D9D9"/>
+ <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.059,9.42,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"/>
+<path clip-rule="evenodd" d="M12.572,1.916c0,0,6.867,0.059,9.42,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">
-<stop offset="0" style="stop-color:#BDC3C4"/>
-<stop offset="0.3515" style="stop-color:#DDE3E6"/>
-<stop offset="0.6545" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+ <stop offset="0" style="stop-color:#BDC3C4"/>
+ <stop offset="0.3515" style="stop-color:#DDE3E6"/>
+ <stop offset="0.6545" style="stop-color:#949DA1"/>
+ <stop offset="0.9636" style="stop-color:#ADB3B5"/>
+ <stop offset="1" style="stop-color:#595C5E"/>
</linearGradient>
<path d="M29,22.205c0,0.835-0.677,1.513-1.513,1.513H2.514C1.678,23.718,1,23.04,1,22.205V11.61 c0-0.835,0.678-1.515,1.514-1.515h24.973c0.836,0,1.513,0.68,1.513,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">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.3273" style="stop-color:#BDC2C4"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+ <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.819c0,0.221,0.179,0.399,0.399,0.399h20.756c0.221,0,0.399-0.179,0.399-0.399v-1.819 H4.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"/>
+<rect fill="#020202" height="0.377" opacity="0.3" width="21.551" x="4.226" y="23.729"/>
+<rect fill="#020202" height="0.379" 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">
-<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"/>
+ <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.775,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.135v-0.378V11.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.378c0,0.625-0.509,1.135-1.135,1.135c0.836,0,1.513-0.678,1.513-1.513V11.61C29,10.775,28.323,10.096,27.487,10.096 z" fill="url(#SVGID_7_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="10.4932" x2="10.4932" y1="11.9312" y2="15.3514">
-<stop offset="0" style="stop-color:#686C6E"/>
-<stop offset="1" style="stop-color:#E4EEF2"/>
+ <stop offset="0" style="stop-color:#686C6E"/>
+ <stop offset="1" style="stop-color:#E4EEF2"/>
</linearGradient>
-<path d="M5.005,15.329c-0.417,0-0.758-0.344-0.758-0.766v-1.874 c0-0.423,0.34-0.766,0.758-0.766h10.978c0.417,0,0.757,0.343,0.757,0.766v1.874c0,0.422-0.34,0.766-0.757,0.766H5.005z" fill="url(#SVGID_8_)" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M5.005,15.329c-0.417,0-0.758-0.344-0.758-0.766v-1.874 c0-0.423,0.34-0.766,0.758-0.766h10.978c0.417,0,0.757,0.343,0.757,0.766v1.874c0,0.422-0.34,0.766-0.757,0.766H5.005z" fill="url(#SVGID_8_)" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="10.4912" x2="10.4912" y1="12.3164" y2="14.996">
-<stop offset="0" style="stop-color:#171717"/>
-<stop offset="1" style="stop-color:#2E2E2E"/>
+ <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.378-0.173-0.378-0.383v-1.874 c0-0.213,0.169-0.384,0.378-0.384h10.972c0.209,0,0.379,0.171,0.379,0.384V14.563z" fill="url(#SVGID_9_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="10.4912" x2="10.4912" y1="9.2769" y2="15.8769">
-<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"/>
+ <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.874" width="10.972" x="5.005" y="12.689"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="10.4912" x2="10.4912" 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"/>
+ <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.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"/>
+ <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.397,0.324-0.723,0.723-0.723h0.717c0.399,0,0.722,0.325,0.722,0.723v0.717c0,0.398-0.323,0.722-0.722,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.399,0,0.722-0.324,0.722-0.724v-0.36C25.992,13.762,25.669,14.085,25.27,14.085z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M24.553,14.085c-0.398,0-0.723-0.323-0.723-0.722v-0.717 c0-0.397,0.324-0.723,0.723-0.723h0.717c0.399,0,0.722,0.325,0.722,0.723v0.717c0,0.398-0.323,0.722-0.722,0.722H24.553z" fill="url(#SVGID_12_)" 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.399,0,0.722-0.324,0.722-0.724v-0.36C25.992,13.762,25.669,14.085,25.27,14.085z" fill="#231F20" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="24.9111" x2="24.9111" 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"/>
+ <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.631,13.363c0,0.201-0.162,0.36-0.361,0.36h-0.717c-0.2,0-0.362-0.159-0.362-0.36v-0.717 c0-0.201,0.163-0.362,0.362-0.362h0.717c0.199,0,0.361,0.161,0.361,0.362V13.363z" fill="url(#SVGID_13_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="22.0195" x2="22.0195" 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"/>
+ <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,14.085c-0.398,0-0.723-0.323-0.723-0.722v-0.717 c0-0.397,0.325-0.723,0.723-0.723h0.716c0.398,0,0.723,0.325,0.723,0.723v0.717c0,0.398-0.325,0.722-0.723,0.722H21.662z" fill="url(#SVGID_14_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M22.378,14.085h-0.716c-0.398,0-0.723-0.323-0.723-0.722v0.36 c0,0.399,0.325,0.724,0.723,0.724h0.716c0.398,0,0.723-0.324,0.723-0.724v-0.36C23.101,13.762,22.776,14.085,22.378,14.085z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M21.662,14.085c-0.398,0-0.723-0.323-0.723-0.722v-0.717 c0-0.397,0.325-0.723,0.723-0.723h0.716c0.398,0,0.723,0.325,0.723,0.723v0.717c0,0.398-0.325,0.722-0.723,0.722H21.662z" fill="url(#SVGID_14_)" opacity="0.8"/>
+<path d="M22.378,14.085h-0.716c-0.398,0-0.723-0.323-0.723-0.722v0.36 c0,0.399,0.325,0.724,0.723,0.724h0.716c0.398,0,0.723-0.324,0.723-0.724v-0.36C23.101,13.762,22.776,14.085,22.378,14.085z" fill="#231F20" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="22.02" x2="22.02" 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"/>
+ <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.74,13.363c0,0.201-0.163,0.36-0.362,0.36h-0.716c-0.2,0-0.362-0.159-0.362-0.36v-0.717 c0-0.201,0.162-0.362,0.362-0.362h0.716c0.2,0,0.362,0.161,0.362,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">
-<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"/>
+ <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.399,0-0.723-0.323-0.723-0.722v-0.717 c0-0.397,0.324-0.723,0.723-0.723h0.716c0.399,0,0.723,0.325,0.723,0.723v0.717c0,0.398-0.324,0.722-0.723,0.722H18.77z" fill="url(#SVGID_16_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M19.486,14.085H18.77c-0.399,0-0.723-0.323-0.723-0.722v0.36c0,0.399,0.324,0.724,0.723,0.724 h0.716c0.399,0,0.723-0.324,0.723-0.724v-0.36C20.209,13.762,19.885,14.085,19.486,14.085z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M18.77,14.085c-0.399,0-0.723-0.323-0.723-0.722v-0.717 c0-0.397,0.324-0.723,0.723-0.723h0.716c0.399,0,0.723,0.325,0.723,0.723v0.717c0,0.398-0.324,0.722-0.723,0.722H18.77z" fill="url(#SVGID_16_)" opacity="0.8"/>
+<path d="M19.486,14.085H18.77c-0.399,0-0.723-0.323-0.723-0.722v0.36c0,0.399,0.324,0.724,0.723,0.724 h0.716c0.399,0,0.723-0.324,0.723-0.724v-0.36C20.209,13.762,19.885,14.085,19.486,14.085z" fill="#231F20" 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"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+ <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="M19.848,13.363c0,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.201,0.162-0.362,0.361-0.362h0.716c0.2,0,0.362,0.161,0.362,0.362V13.363z" fill="url(#SVGID_17_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="24.9111" x2="24.9111" y1="14.7876" y2="17.0325">
-<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"/>
+ <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.324-0.723-0.724v-0.717 c0-0.399,0.324-0.723,0.723-0.723h0.717c0.399,0,0.722,0.323,0.722,0.723v0.717c0,0.399-0.323,0.724-0.722,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.324-0.723-0.724v0.36c0,0.4,0.324,0.724,0.723,0.724 h0.717c0.399,0,0.722-0.323,0.722-0.724v-0.36C25.992,16.653,25.669,16.978,25.27,16.978z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M24.553,16.978c-0.398,0-0.723-0.324-0.723-0.724v-0.717 c0-0.399,0.324-0.723,0.723-0.723h0.717c0.399,0,0.722,0.323,0.722,0.723v0.717c0,0.399-0.323,0.724-0.722,0.724H24.553z" fill="url(#SVGID_18_)" opacity="0.8"/>
+<path d="M25.27,16.978h-0.717c-0.398,0-0.723-0.324-0.723-0.724v0.36c0,0.4,0.324,0.724,0.723,0.724 h0.717c0.399,0,0.722-0.323,0.722-0.724v-0.36C25.992,16.653,25.669,16.978,25.27,16.978z" fill="#231F20" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="24.9111" x2="24.9111" y1="15.1587" y2="16.6506">
-<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"/>
+ <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.631,16.254c0,0.201-0.162,0.36-0.361,0.36h-0.717c-0.2,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.7876" y2="17.0325">
-<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"/>
+ <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.723-0.324-0.723-0.724v-0.717 c0-0.399,0.325-0.723,0.723-0.723h0.716c0.398,0,0.723,0.323,0.723,0.723v0.717c0,0.399-0.325,0.724-0.723,0.724H21.662z" fill="url(#SVGID_20_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M22.378,16.978h-0.716c-0.398,0-0.723-0.324-0.723-0.724v0.36c0,0.4,0.325,0.724,0.723,0.724 h0.716c0.398,0,0.723-0.323,0.723-0.724v-0.36C23.101,16.653,22.776,16.978,22.378,16.978z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M21.662,16.978c-0.398,0-0.723-0.324-0.723-0.724v-0.717 c0-0.399,0.325-0.723,0.723-0.723h0.716c0.398,0,0.723,0.323,0.723,0.723v0.717c0,0.399-0.325,0.724-0.723,0.724H21.662z" fill="url(#SVGID_20_)" opacity="0.8"/>
+<path d="M22.378,16.978h-0.716c-0.398,0-0.723-0.324-0.723-0.724v0.36c0,0.4,0.325,0.724,0.723,0.724 h0.716c0.398,0,0.723-0.323,0.723-0.724v-0.36C23.101,16.653,22.776,16.978,22.378,16.978z" fill="#231F20" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="22.02" x2="22.02" y1="15.1587" y2="16.6506">
-<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"/>
+ <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.74,16.254c0,0.201-0.163,0.36-0.362,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.362,0.161,0.362,0.36V16.254z" fill="url(#SVGID_21_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="19.1279" x2="19.1279" y1="14.7876" y2="17.0325">
-<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"/>
+ <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.399,0-0.723-0.324-0.723-0.724v-0.717 c0-0.399,0.324-0.723,0.723-0.723h0.716c0.399,0,0.723,0.323,0.723,0.723v0.717c0,0.399-0.324,0.724-0.723,0.724H18.77z" fill="url(#SVGID_22_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M19.486,16.978H18.77c-0.399,0-0.723-0.324-0.723-0.724v0.36c0,0.4,0.324,0.724,0.723,0.724 h0.716c0.399,0,0.723-0.323,0.723-0.724v-0.36C20.209,16.653,19.885,16.978,19.486,16.978z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M18.77,16.978c-0.399,0-0.723-0.324-0.723-0.724v-0.717 c0-0.399,0.324-0.723,0.723-0.723h0.716c0.399,0,0.723,0.323,0.723,0.723v0.717c0,0.399-0.324,0.724-0.723,0.724H18.77z" fill="url(#SVGID_22_)" opacity="0.8"/>
+<path d="M19.486,16.978H18.77c-0.399,0-0.723-0.324-0.723-0.724v0.36c0,0.4,0.324,0.724,0.723,0.724 h0.716c0.399,0,0.723-0.323,0.723-0.724v-0.36C20.209,16.653,19.885,16.978,19.486,16.978z" fill="#231F20" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_23_" x1="19.1279" x2="19.1279" y1="15.1587" y2="16.6506">
-<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"/>
+ <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="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">
-<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"/>
+ <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.399,0,0.722,0.325,0.722,0.724v0.716c0,0.4-0.323,0.723-0.722,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.399,0,0.722-0.324,0.722-0.725v-0.361C25.992,19.546,25.669,19.868,25.27,19.868z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<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.399,0,0.722,0.325,0.722,0.724v0.716c0,0.4-0.323,0.723-0.722,0.723H24.553z" fill="url(#SVGID_24_)" 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.399,0,0.722-0.324,0.722-0.725v-0.361C25.992,19.546,25.669,19.868,25.27,19.868z" fill="#231F20" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="24.9111" x2="24.9111" y1="18.0513" y2="19.5432">
-<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"/>
+ <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.631,19.146c0,0.199-0.162,0.361-0.361,0.361h-0.717c-0.2,0-0.362-0.162-0.362-0.361V18.43 c0-0.199,0.163-0.36,0.362-0.36h0.717c0.199,0,0.361,0.161,0.361,0.36V19.146z" fill="url(#SVGID_25_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_26_" x1="22.0195" x2="22.0195" y1="17.6792" y2="19.9231">
-<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"/>
+ <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.723-0.322-0.723-0.723V18.43 c0-0.398,0.325-0.724,0.723-0.724h0.716c0.398,0,0.723,0.325,0.723,0.724v0.716c0,0.4-0.325,0.723-0.723,0.723H21.662z" fill="url(#SVGID_26_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M22.378,19.868h-0.716c-0.398,0-0.723-0.322-0.723-0.723v0.361c0,0.4,0.325,0.725,0.723,0.725 h0.716c0.398,0,0.723-0.324,0.723-0.725v-0.361C23.101,19.546,22.776,19.868,22.378,19.868z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M21.662,19.868c-0.398,0-0.723-0.322-0.723-0.723V18.43 c0-0.398,0.325-0.724,0.723-0.724h0.716c0.398,0,0.723,0.325,0.723,0.724v0.716c0,0.4-0.325,0.723-0.723,0.723H21.662z" fill="url(#SVGID_26_)" opacity="0.8"/>
+<path d="M22.378,19.868h-0.716c-0.398,0-0.723-0.322-0.723-0.723v0.361c0,0.4,0.325,0.725,0.723,0.725 h0.716c0.398,0,0.723-0.324,0.723-0.725v-0.361C23.101,19.546,22.776,19.868,22.378,19.868z" fill="#231F20" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_27_" x1="22.02" x2="22.02" y1="18.0513" y2="19.5432">
-<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"/>
+ <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.74,19.146c0,0.199-0.163,0.361-0.362,0.361h-0.716c-0.2,0-0.362-0.162-0.362-0.361V18.43 c0-0.199,0.162-0.36,0.362-0.36h0.716c0.2,0,0.362,0.161,0.362,0.36V19.146z" fill="url(#SVGID_27_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_28_" x1="19.1279" x2="19.1279" y1="17.6792" y2="19.9231">
-<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"/>
+ <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.399,0-0.723-0.322-0.723-0.723V18.43 c0-0.398,0.324-0.724,0.723-0.724h0.716c0.399,0,0.723,0.325,0.723,0.724v0.716c0,0.4-0.324,0.723-0.723,0.723H18.77z" fill="url(#SVGID_28_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M19.486,19.868H18.77c-0.399,0-0.723-0.322-0.723-0.723v0.361c0,0.4,0.324,0.725,0.723,0.725 h0.716c0.399,0,0.723-0.324,0.723-0.725v-0.361C20.209,19.546,19.885,19.868,19.486,19.868z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M18.77,19.868c-0.399,0-0.723-0.322-0.723-0.723V18.43 c0-0.398,0.324-0.724,0.723-0.724h0.716c0.399,0,0.723,0.325,0.723,0.724v0.716c0,0.4-0.324,0.723-0.723,0.723H18.77z" fill="url(#SVGID_28_)" opacity="0.8"/>
+<path d="M19.486,19.868H18.77c-0.399,0-0.723-0.322-0.723-0.723v0.361c0,0.4,0.324,0.725,0.723,0.725 h0.716c0.399,0,0.723-0.324,0.723-0.725v-0.361C20.209,19.546,19.885,19.868,19.486,19.868z" fill="#231F20" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_29_" x1="19.1279" x2="19.1279" y1="18.0513" y2="19.5432">
-<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"/>
+ <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="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.36,0.361-0.36h0.716c0.2,0,0.362,0.161,0.362,0.36V19.146z" fill="url(#SVGID_29_)"/>
<linearGradient gradientTransform="matrix(-1 0 0 -1 -7634.4854 1952.6084)" gradientUnits="userSpaceOnUse" id="SVGID_30_" x1="-7649.4858" x2="-7649.4858" y1="1924.5239" y2="1930.8613">
-<stop offset="0" style="stop-color:#D9D9D9"/>
-<stop offset="0.5382" style="stop-color:#B3B3B3"/>
-<stop offset="1" style="stop-color:#B3B3B3"/>
+ <stop offset="0" style="stop-color:#D9D9D9"/>
+ <stop offset="0.5382" style="stop-color:#B3B3B3"/>
</linearGradient>
<rect fill="url(#SVGID_30_)" height="6.053" width="18.919" x="5.541" y="22.032"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_31_" x1="15.0005" x2="15.0005" y1="21.604" y2="23.7331">
-<stop offset="0" style="stop-color:#171717"/>
-<stop offset="1" style="stop-color:#2E2E2E"/>
+ <stop offset="0" style="stop-color:#171717"/>
+ <stop offset="1" style="stop-color:#2E2E2E"/>
</linearGradient>
<path d="M24.568,21.584H5.433c-0.21,0-0.382,0.172-0.382,0.383v1.751H24.95v-1.751 C24.95,21.756,24.779,21.584,24.568,21.584z" fill="url(#SVGID_31_)"/>
-<path d="M24.568,21.206H5.433c-0.21,0-0.382,0.171-0.382,0.384v0.377 c0-0.211,0.171-0.383,0.382-0.383h19.135c0.211,0,0.382,0.172,0.382,0.383V21.59C24.95,21.377,24.779,21.206,24.568,21.206z" fill="#FFFFFF" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M24.568,21.206H5.433c-0.21,0-0.382,0.171-0.382,0.384v0.377 c0-0.211,0.171-0.383,0.382-0.383h19.135c0.211,0,0.382,0.172,0.382,0.383V21.59C24.95,21.377,24.779,21.206,24.568,21.206z" fill="#FFFFFF" opacity="0.35"/>
<linearGradient gradientTransform="matrix(-1 0 0 -1 -7634.4854 1952.6084)" gradientUnits="userSpaceOnUse" id="SVGID_32_" x1="-7649.4858" x2="-7649.4858" y1="1924.4653" y2="1930.1107">
-<stop offset="0" style="stop-color:#EDEDED"/>
-<stop offset="1" style="stop-color:#BDBDBD"/>
+ <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.46,22.032 24.46,28.085 17.334,28.085 13.432,27.889 6.298,25.848 5.729,25.252 "/>
-<rect fill="#020202" fill-opacity="0.3" height="0.38" stroke-opacity="0.3" width="18.919" x="5.541" y="22.032"/>
-<rect fill="#020202" fill-opacity="0.15" height="0.378" stroke-opacity="0.15" width="18.919" x="5.541" y="22.412"/>
-<rect fill="#020202" fill-opacity="0.05" height="0.378" stroke-opacity="0.05" width="18.919" x="5.541" y="22.79"/>
-<rect fill="#020202" fill-opacity="0.5" height="0.376" stroke-opacity="0.5" width="13.621" x="8.19" y="24.682"/>
-<rect fill="#020202" fill-opacity="0.2" height="0.38" stroke-opacity="0.2" width="13.621" x="8.19" y="25.058"/>
-<path d="M17.429,28.084c0,0-6.867-1.039-9.421-4.539 c0,0-1.929,2.649-2.467,1.208C5.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.929,2.271-2.467,0.45C5.813,26.145,8.263,28.136,17.429,28.084z" fill="#050505" fill-opacity="0.1" fill-rule="evenodd" stroke-opacity="0.1"/>
+<rect fill="#020202" height="0.38" opacity="0.3" width="18.919" x="5.541" y="22.032"/>
+<rect fill="#020202" height="0.378" opacity="0.15" width="18.919" x="5.541" y="22.412"/>
+<rect fill="#020202" height="0.378" opacity="0.05" width="18.919" x="5.541" y="22.79"/>
+<rect fill="#020202" height="0.376" opacity="0.5" width="13.621" x="8.19" y="24.682"/>
+<rect fill="#020202" height="0.38" opacity="0.2" width="13.621" x="8.19" y="25.058"/>
+<path clip-rule="evenodd" d="M17.429,28.084c0,0-6.867-1.039-9.421-4.539 c0,0-1.929,2.649-2.467,1.208C5.813,26.145,8.263,28.136,17.429,28.084z" fill="#050505" fill-rule="evenodd" opacity="0.05"/>
+<path clip-rule="evenodd" d="M17.429,28.084c0,0-6.867-0.282-9.421-3.781 c0,0-1.929,2.271-2.467,0.45C5.813,26.145,8.263,28.136,17.429,28.084z" fill="#050505" fill-rule="evenodd" opacity="0.1"/>
<linearGradient gradientTransform="matrix(-1 0 0 -1 -7634.4854 1952.6084)" gradientUnits="userSpaceOnUse" id="SVGID_33_" x1="-7645.6104" x2="-7646.3232" y1="1924.8521" y2="1927.5011">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.0061" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#D9D9D9"/>
+ <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.059-9.421-3.56 c0,0-1.829,2.256-2.467,0.229C5.813,26.145,8.263,28.136,17.429,28.084z" fill="url(#SVGID_33_)" fill-rule="evenodd"/>
+<path clip-rule="evenodd" d="M17.429,28.084c0,0-6.867-0.059-9.421-3.56 c0,0-1.829,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"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_fax_home.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_fax_home.svg Fri May 14 16:09:54 2010 +0300
@@ -1,314 +1,308 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
-<stop offset="0.297" style="stop-color:#A7E722"/>
-<stop offset="0.6667" style="stop-color:#428C0F"/>
-<stop offset="0.7939" style="stop-color:#5CA617"/>
-<stop offset="1" style="stop-color:#5CA617"/>
+ <stop offset="0.297" style="stop-color:#A7E722"/>
+ <stop offset="0.6667" style="stop-color:#428C0F"/>
+ <stop offset="0.7939" style="stop-color:#5CA617"/>
</radialGradient>
<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737 c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108 c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274 c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-2.477-2.889-8.594-5.015-10.752-5.399 c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571C11.203,27.277,3.722,37.795,2.668,40.352 c-1.108,2.691-0.581,4.645-0.236,6.567c0.387,2.158,2.511,8.275,5.4,10.752c0.718,0.616,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-1639.3428" x2="-1638.9111" y1="-2494.9824" y2="-2491.4067">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+ <stop offset="0" style="stop-color:#559D13"/>
+ <stop offset="1" style="stop-color:#284F09"/>
</linearGradient>
<path d="M35.172,17.107c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967 c0.535,0.492,0.873,0.588,1.301,0.274c0.047-0.034,0.063-0.046,0.064-0.046c0.252-0.184,1.031-0.739,2.119-1.514 c-0.252-0.205-3.469-2.809-4.801-2.956C36.855,15.598,35.172,17.107,35.172,17.107z" fill="url(#SVGID_2_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -1696.8304 4072.5859)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1639.3467" x2="-1638.9149" y1="4063.0557" y2="4066.6318">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+ <stop offset="0" style="stop-color:#559D13"/>
+ <stop offset="1" style="stop-color:#284F09"/>
</linearGradient>
<path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.714c0.376,0.665,2.351,3.067,2.967,3.737 c0.492,0.53,0.587,0.869,0.274,1.297c-0.035,0.049-0.046,0.063-0.046,0.063c-0.183,0.253-0.738,1.032-1.515,2.12 c-0.203-0.252-2.807-3.469-2.956-4.8C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
-<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112 C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711 c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571 C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617 C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B5DC77" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737 c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108 c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274 c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982 c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273 c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107 c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736 c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606 c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B5DC77" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112 C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711 c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571 C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617 C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B5DC77" opacity="0.5"/>
+<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737 c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108 c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274 c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982 c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273 c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107 c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736 c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606 c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B5DC77" opacity="0.6"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -608.1406 2931.3247)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-1610.522" x2="-1610.522" y1="-2533.3467" y2="-2471.428">
-<stop offset="0" style="stop-color:#447F0F"/>
-<stop offset="0.5" style="stop-color:#284F09"/>
-<stop offset="1" style="stop-color:#40790E"/>
+ <stop offset="0" style="stop-color:#447F0F"/>
+ <stop offset="0.5" style="stop-color:#284F09"/>
+ <stop offset="1" style="stop-color:#40790E"/>
</linearGradient>
-<path d="M2.899,45.012c1.275-2.776,10.299-14.805,18.804-23.31 c8.505-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26 c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.534,18.958c-8.562,8.562-17.667,20.715-18.96,23.535 c-0.038,0.086-0.063,0.165-0.101,0.25c0.071,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_4_)" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M2.899,45.012c1.275-2.776,10.299-14.805,18.804-23.31 c8.505-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26 c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.534,18.958c-8.562,8.562-17.667,20.715-18.96,23.535 c-0.038,0.086-0.063,0.165-0.101,0.25c0.071,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_4_)" opacity="0.5"/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<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"/>
+<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" opacity="0.35"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="15.0005" x2="15.0005" 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"/>
+ <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__)"/>
-<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"/>
+<rect fill="#020202" height="0.379" opacity="0.3" width="21.567" x="4.217" y="9.712"/>
+<rect fill="#020202" height="0.378" 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">
-<stop offset="0" style="stop-color:#D9D9D9"/>
-<stop offset="0.5382" style="stop-color:#B3B3B3"/>
-<stop offset="1" style="stop-color:#B3B3B3"/>
+ <stop offset="0" style="stop-color:#D9D9D9"/>
+ <stop offset="0.5382" 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">
-<stop offset="0" style="stop-color:#EDEDED"/>
-<stop offset="1" style="stop-color:#BDBDBD"/>
+ <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"/>
-<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"/>
+<rect fill="#020202" height="0.377" opacity="0.5" width="13.621" x="8.19" y="7.212"/>
+<rect fill="#020202" height="0.379" opacity="0.2" width="13.621" x="8.19" y="6.833"/>
+<rect fill="#020202" height="0.379" opacity="0.2" width="18.918" x="5.541" y="9.712"/>
+<rect fill="#020202" height="0.378" opacity="0.1" width="18.918" x="5.541" y="9.334"/>
+<rect fill="#020202" height="0.379" opacity="0.03" width="18.918" x="5.541" y="8.955"/>
+<rect fill="#020202" height="0.377" opacity="0.5" width="13.621" x="8.19" y="4.941"/>
+<rect fill="#020202" height="0.379" opacity="0.2" width="13.621" x="8.19" y="4.563"/>
+<path clip-rule="evenodd" 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-rule="evenodd" opacity="0.05"/>
+<path clip-rule="evenodd" 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-rule="evenodd" opacity="0.1"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="18.876" x2="18.1629" 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"/>
+ <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"/>
+<path clip-rule="evenodd" 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">
-<stop offset="0" style="stop-color:#BDC3C4"/>
-<stop offset="0.3515" style="stop-color:#DDE3E6"/>
-<stop offset="0.6545" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+ <stop offset="0" style="stop-color:#BDC3C4"/>
+ <stop offset="0.3515" style="stop-color:#DDE3E6"/>
+ <stop offset="0.6545" style="stop-color:#949DA1"/>
+ <stop offset="0.9636" style="stop-color:#ADB3B5"/>
+ <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">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.3273" style="stop-color:#BDC2C4"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+ <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"/>
+<rect fill="#020202" height="0.377" opacity="0.3" width="21.551" x="4.226" y="23.729"/>
+<rect fill="#020202" height="0.379" 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">
-<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"/>
+ <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">
-<stop offset="0" style="stop-color:#686C6E"/>
-<stop offset="1" style="stop-color:#E4EEF2"/>
+ <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"/>
+<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_)" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="10.4912" x2="10.4912" y1="12.3164" y2="14.996">
-<stop offset="0" style="stop-color:#171717"/>
-<stop offset="1" style="stop-color:#2E2E2E"/>
+ <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">
-<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"/>
+ <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">
-<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"/>
+ <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">
-<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"/>
+ <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"/>
+<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_)" 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" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="24.9111" x2="24.9111" 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"/>
+ <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.631,13.363c0,0.2-0.162,0.36-0.361,0.36h-0.717c-0.199,0-0.362-0.16-0.362-0.36v-0.717 c0-0.2,0.163-0.362,0.362-0.362h0.717c0.199,0,0.361,0.162,0.361,0.362V13.363z" fill="url(#SVGID_13_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="22.0195" x2="22.0195" 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"/>
+ <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,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"/>
+<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_)" 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" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="22.02" x2="22.02" 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"/>
+ <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">
-<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"/>
+ <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"/>
+<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_)" 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" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="19.1284" x2="19.1284" 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"/>
+ <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="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">
-<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"/>
+ <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"/>
+<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_)" 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" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="24.9111" x2="24.9111" y1="15.1587" y2="16.6506">
-<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"/>
+ <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.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">
-<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"/>
+ <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"/>
+<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_)" 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" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="22.02" x2="22.02" y1="15.1587" y2="16.6506">
-<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"/>
+ <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">
-<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"/>
+ <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"/>
+<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_)" 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" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_23_" x1="19.1284" x2="19.1284" y1="15.1587" y2="16.6506">
-<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"/>
+ <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="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">
-<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"/>
+ <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"/>
+<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_)" 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" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="24.9111" x2="24.9111" y1="18.0503" y2="19.5432">
-<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"/>
+ <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.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">
-<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"/>
+ <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"/>
+<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_)" 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" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_27_" x1="22.02" x2="22.02" y1="18.0503" y2="19.5432">
-<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"/>
+ <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">
-<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"/>
+ <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"/>
+<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_)" 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" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_29_" x1="19.1284" x2="19.1284" y1="18.0503" y2="19.5432">
-<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"/>
+ <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="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">
-<stop offset="0" style="stop-color:#D9D9D9"/>
-<stop offset="0.5382" style="stop-color:#B3B3B3"/>
-<stop offset="1" style="stop-color:#B3B3B3"/>
+ <stop offset="0" style="stop-color:#D9D9D9"/>
+ <stop offset="0.5382" 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">
-<stop offset="0" style="stop-color:#171717"/>
-<stop offset="1" style="stop-color:#2E2E2E"/>
+ <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"/>
+<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" 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">
-<stop offset="0" style="stop-color:#EDEDED"/>
-<stop offset="1" style="stop-color:#BDBDBD"/>
+ <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 "/>
-<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"/>
+<rect fill="#020202" height="0.38" opacity="0.3" width="18.918" x="5.541" y="22.032"/>
+<rect fill="#020202" height="0.378" opacity="0.15" width="18.918" x="5.541" y="22.412"/>
+<rect fill="#020202" height="0.379" opacity="0.05" width="18.918" x="5.541" y="22.79"/>
+<rect fill="#020202" height="0.377" opacity="0.5" width="13.621" x="8.19" y="24.682"/>
+<rect fill="#020202" height="0.379" opacity="0.2" width="13.621" x="8.19" y="25.059"/>
+<path clip-rule="evenodd" 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-rule="evenodd" opacity="0.05"/>
+<path clip-rule="evenodd" 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-rule="evenodd" 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">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.0061" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#D9D9D9"/>
+ <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"/>
+<path clip-rule="evenodd" 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"/>
+ <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="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"/>
+ <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 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 "/>
+<polygon 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 "/>
<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 "/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_fax_work.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_fax_work.svg Fri May 14 16:09:54 2010 +0300
@@ -1,313 +1,307 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
-<stop offset="0.297" style="stop-color:#A7E722"/>
-<stop offset="0.6667" style="stop-color:#428C0F"/>
-<stop offset="0.7939" style="stop-color:#5CA617"/>
-<stop offset="1" style="stop-color:#5CA617"/>
+ <stop offset="0.297" style="stop-color:#A7E722"/>
+ <stop offset="0.6667" style="stop-color:#428C0F"/>
+ <stop offset="0.7939" style="stop-color:#5CA617"/>
</radialGradient>
<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737 c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108 c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274 c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-2.477-2.889-8.594-5.015-10.752-5.399 c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571C11.203,27.277,3.722,37.795,2.668,40.352 c-1.108,2.691-0.581,4.645-0.236,6.567c0.387,2.158,2.511,8.275,5.4,10.752c0.718,0.616,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-1639.3428" x2="-1638.9111" y1="-2494.9824" y2="-2491.4067">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+ <stop offset="0" style="stop-color:#559D13"/>
+ <stop offset="1" style="stop-color:#284F09"/>
</linearGradient>
<path d="M35.172,17.107c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967 c0.535,0.492,0.873,0.588,1.301,0.274c0.047-0.034,0.063-0.046,0.064-0.046c0.252-0.184,1.031-0.739,2.119-1.514 c-0.252-0.205-3.469-2.809-4.801-2.956C36.855,15.598,35.172,17.107,35.172,17.107z" fill="url(#SVGID_2_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -1696.8304 4072.5859)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1639.3467" x2="-1638.9149" y1="4063.0557" y2="4066.6318">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+ <stop offset="0" style="stop-color:#559D13"/>
+ <stop offset="1" style="stop-color:#284F09"/>
</linearGradient>
<path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.714c0.376,0.665,2.351,3.067,2.967,3.737 c0.492,0.53,0.587,0.869,0.274,1.297c-0.035,0.049-0.046,0.063-0.046,0.063c-0.183,0.253-0.738,1.032-1.515,2.12 c-0.203-0.252-2.807-3.469-2.956-4.8C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
-<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112 C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711 c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571 C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617 C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B5DC77" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737 c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108 c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274 c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982 c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273 c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107 c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736 c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606 c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B5DC77" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112 C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711 c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571 C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617 C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B5DC77" opacity="0.5"/>
+<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737 c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108 c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274 c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982 c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273 c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107 c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736 c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606 c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B5DC77" opacity="0.6"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -608.1406 2931.3247)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-1610.522" x2="-1610.522" y1="-2533.3467" y2="-2471.428">
-<stop offset="0" style="stop-color:#447F0F"/>
-<stop offset="0.5" style="stop-color:#284F09"/>
-<stop offset="1" style="stop-color:#40790E"/>
+ <stop offset="0" style="stop-color:#447F0F"/>
+ <stop offset="0.5" style="stop-color:#284F09"/>
+ <stop offset="1" style="stop-color:#40790E"/>
</linearGradient>
-<path d="M2.899,45.012c1.275-2.776,10.299-14.805,18.804-23.31 c8.505-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26 c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.534,18.958c-8.562,8.562-17.667,20.715-18.96,23.535 c-0.038,0.086-0.063,0.165-0.101,0.25c0.071,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_4_)" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M2.899,45.012c1.275-2.776,10.299-14.805,18.804-23.31 c8.505-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26 c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.534,18.958c-8.562,8.562-17.667,20.715-18.96,23.535 c-0.038,0.086-0.063,0.165-0.101,0.25c0.071,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_4_)" opacity="0.5"/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<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"/>
+<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" opacity="0.35"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="15" x2="15" 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"/>
+ <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.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"/>
+<rect fill="#020202" height="0.379" opacity="0.3" width="21.567" x="4.217" y="9.712"/>
+<rect fill="#020202" height="0.378" 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">
-<stop offset="0" style="stop-color:#D9D9D9"/>
-<stop offset="0.5382" style="stop-color:#B3B3B3"/>
-<stop offset="1" style="stop-color:#B3B3B3"/>
+ <stop offset="0" style="stop-color:#D9D9D9"/>
+ <stop offset="0.5382" 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">
-<stop offset="0" style="stop-color:#EDEDED"/>
-<stop offset="1" style="stop-color:#BDBDBD"/>
+ <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.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.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"/>
+<rect fill="#020202" height="0.377" opacity="0.5" width="13.621" x="8.189" y="7.212"/>
+<rect fill="#020202" height="0.379" opacity="0.2" width="13.621" x="8.189" y="6.833"/>
+<rect fill="#020202" height="0.379" opacity="0.2" width="18.918" x="5.541" y="9.712"/>
+<rect fill="#020202" height="0.378" opacity="0.1" width="18.918" x="5.541" y="9.334"/>
+<rect fill="#020202" height="0.379" opacity="0.03" width="18.918" x="5.541" y="8.955"/>
+<rect fill="#020202" height="0.377" opacity="0.5" width="13.621" x="8.189" y="4.941"/>
+<rect fill="#020202" height="0.379" opacity="0.2" width="13.621" x="8.189" y="4.563"/>
+<path clip-rule="evenodd" 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-rule="evenodd" opacity="0.05"/>
+<path clip-rule="evenodd" 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-rule="evenodd" 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"/>
+ <stop offset="0.0061" style="stop-color:#FFFFFF"/>
+ <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"/>
+<path clip-rule="evenodd" 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">
-<stop offset="0" style="stop-color:#BDC3C4"/>
-<stop offset="0.3515" style="stop-color:#DDE3E6"/>
-<stop offset="0.6545" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+ <stop offset="0" style="stop-color:#BDC3C4"/>
+ <stop offset="0.3515" style="stop-color:#DDE3E6"/>
+ <stop offset="0.6545" style="stop-color:#949DA1"/>
+ <stop offset="0.9636" style="stop-color:#ADB3B5"/>
+ <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">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.3273" style="stop-color:#BDC2C4"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+ <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.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"/>
+<rect fill="#020202" height="0.377" opacity="0.3" width="21.552" x="4.225" y="23.729"/>
+<rect fill="#020202" height="0.379" 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">
-<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"/>
+ <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.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">
-<stop offset="0" style="stop-color:#686C6E"/>
-<stop offset="1" style="stop-color:#E4EEF2"/>
+ <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"/>
+<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_)" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="10.4902" x2="10.4902" y1="12.3164" y2="14.996">
-<stop offset="0" style="stop-color:#171717"/>
-<stop offset="1" style="stop-color:#2E2E2E"/>
+ <stop offset="0" style="stop-color:#171717"/>
+ <stop offset="1" style="stop-color:#2E2E2E"/>
</linearGradient>
<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"/>
+ <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.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"/>
+ <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.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"/>
+ <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.992,13.762,25.668,14.085,25.27,14.085z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<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_)" 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.992,13.762,25.668,14.085,25.27,14.085z" fill="#231F20" 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"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+ <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.631,13.363c0,0.2-0.162,0.36-0.361,0.36h-0.717c-0.199,0-0.362-0.16-0.362-0.36v-0.717 c0-0.2,0.163-0.362,0.362-0.362h0.717c0.199,0,0.361,0.162,0.361,0.362V13.363z" fill="url(#SVGID_13_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="22.0195" x2="22.0195" 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"/>
+ <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.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"/>
+<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_)" 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" 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"/>
+ <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.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"/>
+ <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.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"/>
+<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_)" opacity="0.8"/>
+<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" 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"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+ <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="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">
-<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"/>
+ <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.992,16.652,25.668,16.978,25.27,16.978z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<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_)" 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" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="24.9102" x2="24.9102" y1="15.1587" y2="16.6506">
-<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"/>
+ <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.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">
-<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"/>
+ <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.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"/>
+<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_)" 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" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="22.0195" x2="22.0195" y1="15.1587" y2="16.6506">
-<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"/>
+ <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.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">
-<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"/>
+ <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.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"/>
+<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_)" 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" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_23_" x1="19.1279" x2="19.1279" y1="15.1587" y2="16.6506">
-<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"/>
+ <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="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">
-<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"/>
+ <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.992,19.546,25.668,19.868,25.27,19.868z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<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_)" 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" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="24.9102" x2="24.9102" y1="18.0503" y2="19.5432">
-<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"/>
+ <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.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">
-<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"/>
+ <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.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"/>
+<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_)" 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" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_27_" x1="22.0195" x2="22.0195" y1="18.0503" y2="19.5432">
-<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"/>
+ <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.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">
-<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"/>
+ <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.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"/>
+<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_)" 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" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_29_" x1="19.1279" x2="19.1279" y1="18.0503" y2="19.5432">
-<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"/>
+ <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="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">
-<stop offset="0" style="stop-color:#D9D9D9"/>
-<stop offset="0.5382" style="stop-color:#B3B3B3"/>
-<stop offset="1" style="stop-color:#B3B3B3"/>
+ <stop offset="0" style="stop-color:#D9D9D9"/>
+ <stop offset="0.5382" 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">
-<stop offset="0" style="stop-color:#171717"/>
-<stop offset="1" style="stop-color:#2E2E2E"/>
+ <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"/>
+<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" 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">
-<stop offset="0" style="stop-color:#EDEDED"/>
-<stop offset="1" style="stop-color:#BDBDBD"/>
+ <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.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.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"/>
+<rect fill="#020202" height="0.38" opacity="0.3" width="18.918" x="5.541" y="22.032"/>
+<rect fill="#020202" height="0.378" opacity="0.15" width="18.918" x="5.541" y="22.412"/>
+<rect fill="#020202" height="0.379" opacity="0.05" width="18.918" x="5.541" y="22.79"/>
+<rect fill="#020202" height="0.377" opacity="0.5" width="13.621" x="8.189" y="24.682"/>
+<rect fill="#020202" height="0.379" opacity="0.2" width="13.621" x="8.189" y="25.059"/>
+<path clip-rule="evenodd" 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-rule="evenodd" opacity="0.05"/>
+<path clip-rule="evenodd" 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-rule="evenodd" 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">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.0061" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#D9D9D9"/>
+ <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"/>
+<path clip-rule="evenodd" 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"/>
+ <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="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"/>
+ <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,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" 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"/>
+<rect height="6.103" opacity="0.3" width="1.017" x="22.518" y="19.329"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_group.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_group.svg Fri May 14 16:09:54 2010 +0300
@@ -1,213 +1,323 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
-<stop offset="0.297" style="stop-color:#A7E722"/>
-<stop offset="0.6667" style="stop-color:#428C0F"/>
-<stop offset="0.7939" style="stop-color:#5CA617"/>
-<stop offset="1" style="stop-color:#5CA617"/>
+ <stop offset="0.297" style="stop-color:#A7E722"/>
+ <stop offset="0.6667" style="stop-color:#428C0F"/>
+ <stop offset="0.7939" style="stop-color:#5CA617"/>
</radialGradient>
<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737 c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108 c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274 c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-2.477-2.889-8.594-5.015-10.752-5.399 c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571C11.203,27.277,3.722,37.795,2.668,40.352 c-1.108,2.691-0.581,4.645-0.236,6.567c0.387,2.158,2.511,8.275,5.4,10.752c0.718,0.616,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-1639.3428" x2="-1638.9111" y1="-2494.9824" y2="-2491.4067">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+ <stop offset="0" style="stop-color:#559D13"/>
+ <stop offset="1" style="stop-color:#284F09"/>
</linearGradient>
<path d="M35.172,17.107c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967 c0.535,0.492,0.873,0.588,1.301,0.274c0.047-0.034,0.063-0.046,0.064-0.046c0.252-0.184,1.031-0.739,2.119-1.514 c-0.252-0.205-3.469-2.809-4.801-2.956C36.855,15.598,35.172,17.107,35.172,17.107z" fill="url(#SVGID_2_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -1696.8304 4072.5859)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1639.3467" x2="-1638.9149" y1="4063.0557" y2="4066.6318">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+ <stop offset="0" style="stop-color:#559D13"/>
+ <stop offset="1" style="stop-color:#284F09"/>
</linearGradient>
<path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.714c0.376,0.665,2.351,3.067,2.967,3.737 c0.492,0.53,0.587,0.869,0.274,1.297c-0.035,0.049-0.046,0.063-0.046,0.063c-0.183,0.253-0.738,1.032-1.515,2.12 c-0.203-0.252-2.807-3.469-2.956-4.8C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
-<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112 C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711 c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571 C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617 C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B5DC77" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737 c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108 c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274 c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982 c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273 c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107 c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736 c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606 c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B5DC77" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112 C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711 c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571 C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617 C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B5DC77" opacity="0.5"/>
+<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737 c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108 c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274 c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982 c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273 c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107 c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736 c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606 c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B5DC77" opacity="0.6"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -608.1406 2931.3247)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-1610.522" x2="-1610.522" y1="-2533.3467" y2="-2471.428">
-<stop offset="0" style="stop-color:#447F0F"/>
-<stop offset="0.5" style="stop-color:#284F09"/>
-<stop offset="1" style="stop-color:#40790E"/>
+ <stop offset="0" style="stop-color:#447F0F"/>
+ <stop offset="0.5" style="stop-color:#284F09"/>
+ <stop offset="1" style="stop-color:#40790E"/>
</linearGradient>
-<path d="M2.899,45.012c1.275-2.776,10.299-14.805,18.804-23.31 c8.505-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26 c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.534,18.958c-8.562,8.562-17.667,20.715-18.96,23.535 c-0.038,0.086-0.063,0.165-0.101,0.25c0.071,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_4_)" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M2.899,45.012c1.275-2.776,10.299-14.805,18.804-23.31 c8.505-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26 c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.534,18.958c-8.562,8.562-17.667,20.715-18.96,23.535 c-0.038,0.086-0.063,0.165-0.101,0.25c0.071,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_4_)" opacity="0.5"/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
<rect fill="none" height="30" width="30"/>
<radialGradient cx="669.4" cy="-594.3" gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_1__" r="11.1">
+
<stop offset="0" stop-color="#FFA98E"/>
+
<stop offset="0.2" stop-color="#FFA98E"/>
+
<stop offset="0.96" stop-color="#D45D36"/>
+
<stop offset="1" stop-color="#D45D36"/>
+
</radialGradient>
<path d="M23.46,18.68c-0.521-0.226-0.506-1.339-0.291-1.675,0.038-0.059,0.072-0.117,0.107-0.176h-4.365c0.035,0.059,0.069,0.116,0.107,0.176,0.215,0.336,0.23,1.448-0.291,1.675-0.522,0.228,2.428,2.202,2.428,2.202s2.81-1.98,2.29-2.2z" fill="url(#SVGID_1__)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="669.2" x2="669.2" y1="-588.9" y2="-598.1">
+
<stop offset="0" stop-color="#3BC8EB"/>
+
<stop offset="0.39" stop-color="#2D9BD2"/>
+
<stop offset="0.89" stop-color="#1347BA"/>
+
<stop offset="1" stop-color="#1347BA"/>
+
</linearGradient>
<path d="M26.59,19.84c-0.549-0.286-3.27-1.238-3.322-1.299l-2.078,1.729-2.233-1.795c-0.063,0.092-2.752,1.035-3.374,1.365-0.713,0.377-1.877,1.246-1.877,3.207h14.76c0-1.97-1.33-2.93-1.88-3.21z" fill="url(#SVGID_2__)"/>
-<polygon fill="#020202" fill-opacity="0.3" points="18.45,18.69,21.19,20.88,23.77,18.74,23.27,18.54,21.19,20.27,18.96,18.47" stroke-opacity="0.3" style="enable-background:new;"/>
+<polygon fill="#020202" opacity="0.3" points="18.45,18.69,21.19,20.88,23.77,18.74,23.27,18.54,21.19,20.27,18.96,18.47" style="enable-background:new;"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="669.2" x2="669.2" y1="-594.1" y2="-589.1">
+
<stop offset="0" stop-color="#3BC8EB"/>
+
<stop offset="1" stop-color="#2D9BD2"/>
+
</linearGradient>
<polygon fill="url(#SVGID_3__)" points="21.19,20.88,18.45,18.69,18.29,18.76,21.19,21.07,23.93,18.8,23.77,18.74"/>
<radialGradient cx="669.9" cy="-573.8" gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_4__" r="14.9">
+
<stop offset="0" stop-color="#FFE2D9"/>
+
<stop offset="0.51" stop-color="#FFC6B3"/>
+
<stop offset="0.76" stop-color="#FFA98E"/>
+
<stop offset="1" stop-color="#E88160"/>
+
</radialGradient>
<path d="M24.71,13.56c-0.019-0.008-0.04-0.009-0.06-0.015v-0.001c-0.004-0.001-0.006-0.002-0.006-0.002-0.033-0.008-0.063-0.014-0.094-0.016-3.644-0.635-5.317-2.654-5.442-2.119-0.101,0.425-1.122,1.346-1.657,1.805,0.004,0.021,0.008,0.039,0.012,0.06,0,0,0.02,0.094,0.06,0.254-0.042,0.005-0.084,0.014-0.124,0.03-0.341,0.145-0.447,0.702-0.238,1.248,0.209,0.545,0.652,0.871,0.994,0.728,0.021-0.009,0.039-0.023,0.058-0.036,0.198,0.445,0.44,0.922,0.739,1.4,0.498,0.594,1.262,1.287,2.105,1.287,1.02,0,1.645-0.559,2.072-1.121,0.012-0.023,0.022-0.047,0.034-0.064,0.317-0.497,0.575-0.996,0.785-1.46,0.333,0.115,0.761-0.194,0.974-0.719,0.23-0.53,0.14-1.09-0.2-1.25z" fill="url(#SVGID_4__)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="666.5" x2="672.8" y1="-589.1" y2="-582.8">
+
<stop offset="0" stop-color="#FFC6B3"/>
+
<stop offset="1" stop-color="#FFA98E"/>
+
</linearGradient>
<path d="M20.91,17.9c-0.621,0-1.246-0.289-1.707-0.727,0.486,0.514,1.143,1.012,1.857,1.012,1.02,0,1.645-0.559,2.072-1.121,0.011-0.023,0.021-0.047,0.034-0.064,0.317-0.497,0.575-0.996,0.785-1.46-1.15,2.03-2.01,2.36-3.03,2.36z" fill="url(#SVGID_5_)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="669.1" x2="669.1" y1="-569.1" y2="-578.4">
+
<stop offset="0" stop-color="#8A5D3B"/>
+
<stop offset="0.38" stop-color="#632F00"/>
+
<stop offset="1" stop-color="#361700"/>
+
</linearGradient>
<path d="M20.95,8.483c-1.265,0-1.872,0.574-2.341,1.175-0.764,0.117-1.974,0.817-1.119,3.882,0.535-0.459,1.514-1.703,1.614-2.128,0.128-0.54,1.828,1.521,5.542,2.137,0.045-0.172,0.063-0.272,0.063-0.272,0.6-2.62-0.67-4.694-3.75-4.797z" fill="url(#SVGID_6_)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="672.2" x2="663.8" y1="-578" y2="-573">
+
<stop offset="0" stop-color="#8A5D3B"/>
+
<stop offset="0.36" stop-color="#632F00"/>
+
<stop offset="1" stop-color="#361700"/>
+
</linearGradient>
<path d="M19.11,11.16s1.818,2.389,5.512,2.384c0,0-1.73-0.27-5.51-2.38z" fill="url(#SVGID_7_)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="663.1" x2="663.1" y1="-572" y2="-577.3">
+
<stop offset="0" stop-color="#8A5D3B"/>
+
<stop offset="0.38" stop-color="#632F00"/>
+
<stop offset="1" stop-color="#361700"/>
+
</linearGradient>
<path d="M18.68,9.836s-1.78,0.106-1.12,3.123c0,0-0.22-2.07,1.12-3.124z" fill="url(#SVGID_8_)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="670.2" x2="670" y1="-569.9" y2="-572.3">
+
<stop offset="0" stop-color="#A87C4F"/>
+
<stop offset="1" stop-color="#632F00"/>
+
</linearGradient>
<path d="M21.82,10.25c-0.828-0.118-2.23-0.853-2.779-0.59,0,0,1.799-2.053,4.971,0.284,0,0.004-0.76,0.516-2.19,0.306z" fill="url(#SVGID_9_)"/>
<radialGradient cx="645" cy="-594.3" gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="11.1">
+
<stop offset="0" stop-color="#FFA98E"/>
+
<stop offset="0.2" stop-color="#FFA98E"/>
+
<stop offset="0.96" stop-color="#D45D36"/>
+
<stop offset="1" stop-color="#D45D36"/>
+
</radialGradient>
<path d="M11.28,18.68c-0.521-0.226-0.505-1.339-0.29-1.675,0.037-0.059,0.072-0.117,0.108-0.176h-4.371c0.035,0.059,0.069,0.116,0.107,0.176,0.215,0.336,0.23,1.448-0.29,1.675-0.523,0.228,2.427,2.202,2.427,2.202s2.827-1.98,2.307-2.2z" fill="url(#SVGID_10_)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="644.8" x2="644.8" y1="-588.9" y2="-598.1">
+
<stop offset="0" stop-color="#3BC8EB"/>
+
<stop offset="0.39" stop-color="#2D9BD2"/>
+
<stop offset="0.89" stop-color="#1347BA"/>
+
<stop offset="1" stop-color="#1347BA"/>
+
</linearGradient>
<path d="M14.42,19.84c-0.549-0.286-3.271-1.238-3.322-1.299l-2.079,1.729-2.233-1.795c-0.063,0.092-2.752,1.035-3.375,1.365-0.712,0.377-1.876,1.246-1.876,3.207h14.76c-0.01-1.97-1.34-2.93-1.88-3.21z" fill="url(#SVGID_11_)"/>
-<polygon fill="#020202" fill-opacity="0.3" points="6.272,18.69,9.015,20.88,11.59,18.74,11.09,18.54,9.015,20.27,6.781,18.47" stroke-opacity="0.3" style="enable-background:new;"/>
+<polygon fill="#020202" opacity="0.3" points="6.272,18.69,9.015,20.88,11.59,18.74,11.09,18.54,9.015,20.27,6.781,18.47" style="enable-background:new;"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="644.9" x2="644.9" y1="-594.1" y2="-589.1">
+
<stop offset="0" stop-color="#3BC8EB"/>
+
<stop offset="1" stop-color="#2D9BD2"/>
+
</linearGradient>
<polygon fill="url(#SVGID_12_)" points="9.015,20.88,6.271,18.69,6.113,18.76,9.015,21.07,11.75,18.8,11.59,18.74"/>
<radialGradient cx="645.6" cy="-573.8" gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_13_" r="14.9">
+
<stop offset="0" stop-color="#FFE2D9"/>
+
<stop offset="0.51" stop-color="#FFC6B3"/>
+
<stop offset="0.76" stop-color="#FFA98E"/>
+
<stop offset="1" stop-color="#E88160"/>
+
</radialGradient>
<path d="M12.53,13.56c-0.019-0.008-0.04-0.009-0.059-0.015v-0.001c-0.004-0.001-0.007-0.002-0.012-0.002-0.028-0.008-0.057-0.014-0.087-0.016-3.645-0.635-5.317-2.654-5.443-2.119-0.102,0.425-1.123,1.346-1.658,1.805,0.004,0.021,0.008,0.039,0.012,0.06,0,0,0.02,0.094,0.06,0.254-0.043,0.005-0.085,0.014-0.124,0.03-0.341,0.145-0.447,0.702-0.239,1.248,0.209,0.545,0.653,0.871,0.995,0.728,0.021-0.009,0.039-0.023,0.058-0.036,0.198,0.445,0.44,0.922,0.738,1.4,0.499,0.594,1.263,1.287,2.106,1.287,1.02,0,1.645-0.559,2.073-1.121,0.011-0.023,0.022-0.047,0.034-0.064,0.318-0.497,0.576-0.996,0.785-1.46,0.334,0.115,0.761-0.194,0.973-0.719,0.23-0.53,0.14-1.09-0.2-1.25z" fill="url(#SVGID_13_)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="642.2" x2="648.5" y1="-589.1" y2="-582.8">
+
<stop offset="0" stop-color="#FFC6B3"/>
+
<stop offset="1" stop-color="#FFA98E"/>
+
</linearGradient>
<path d="M8.729,17.9c-0.621,0-1.247-0.289-1.708-0.727,0.487,0.514,1.144,1.012,1.858,1.012,1.02,0,1.645-0.559,2.073-1.121,0.011-0.023,0.022-0.047,0.034-0.064,0.318-0.497,0.576-0.996,0.785-1.46-1.15,2.03-2.011,2.36-3.031,2.36z" fill="url(#SVGID_14_)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="644.7" x2="644.7" y1="-569.1" y2="-578.4">
+
<stop offset="0" stop-color="#8A5D3B"/>
+
<stop offset="0.38" stop-color="#632F00"/>
+
<stop offset="1" stop-color="#361700"/>
+
</linearGradient>
<path d="M8.776,8.483c-1.265,0-1.872,0.574-2.342,1.175-0.763,0.117-1.973,0.817-1.118,3.882,0.535-0.459,1.514-1.703,1.615-2.128,0.127-0.54,1.828,1.521,5.542,2.137,0.043-0.172,0.063-0.272,0.063-0.272,0.59-2.62-0.68-4.694-3.754-4.797z" fill="url(#SVGID_15_)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="647.9" x2="639.5" y1="-578" y2="-573">
+
<stop offset="0" stop-color="#8A5D3B"/>
+
<stop offset="0.36" stop-color="#632F00"/>
+
<stop offset="1" stop-color="#361700"/>
+
</linearGradient>
<path d="M6.936,11.16s1.818,2.389,5.513,2.384c0,0-1.74-0.27-5.514-2.38z" fill="url(#SVGID_16_)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="638.7" x2="638.8" y1="-572.3" y2="-577.7">
+
<stop offset="0" stop-color="#8A5D3B"/>
+
<stop offset="0.38" stop-color="#632F00"/>
+
<stop offset="1" stop-color="#361700"/>
+
</linearGradient>
<path d="M6.498,9.836s-1.779,0.106-1.119,3.123c0,0-0.218-2.07,1.119-3.124z" fill="url(#SVGID_17_)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="645.9" x2="645.6" y1="-569.9" y2="-572.3">
+
<stop offset="0" stop-color="#A87C4F"/>
+
<stop offset="1" stop-color="#632F00"/>
+
</linearGradient>
<path d="M9.639,10.25c-0.828-0.118-2.23-0.853-2.78-0.59,0,0,1.8-2.053,4.973,0.284,0,0.004-0.76,0.516-2.191,0.306z" fill="url(#SVGID_18_)"/>
-<path d="M23.32,20.43c-0.506-0.264-2.081-0.849-3.348-1.317l-0.711-0.265-0.128-0.053-0.166-0.063-0.317-0.128-0.196,0.086c-0.001,0.002-0.003,0.002-0.004,0.003h-0.001c-0.826,0.323-2.406,0.897-2.865,1.143-0.178,0.095-0.385,0.222-0.596,0.388-0.221-0.183-0.426-0.311-0.573-0.388-0.395-0.205-1.904-0.753-2.746-1.067l-0.078-0.031-0.002,0.001-0.349-0.142-0.317,0.139c-0.311,0.122-0.693,0.268-1.103,0.424l-0.038,0.014c-1.21,0.461-2.582,0.982-3.107,1.262-1.177,0.625-2.025,1.51-2.525,2.609h21.66c-0.77-1.62-2.12-2.41-2.48-2.6z" fill="#231F20" fill-opacity="0.15" stroke-opacity="0.15" style="enable-background:new;"/>
-<path d="M9.052,11.44c-0.561,0.477-0.712,1.432-0.349,2.38,0.342,0.894,1.048,1.494,1.758,1.494h0.002c0.106,0.221,0.217,0.439,0.331,0.654h-0.033l0.271,0.448s0.071,0.115,0.154,0.253c0.226-0.383,0.424-0.765,0.586-1.123,0.334,0.115,0.761-0.194,0.973-0.719,0.22-0.542,0.125-1.106-0.212-1.259-0.019-0.008-0.04-0.009-0.059-0.015v-0.001c-0.004-0.001-0.007-0.002-0.012-0.002-0.028-0.008-0.057-0.014-0.087-0.016-0.007-0.002-0.012-0.003-0.019-0.005-0.015-0.003-0.032-0.007-0.05-0.011,0.057,0.011,0.109,0.023,0.167,0.033,0.043-0.172,0.063-0.272,0.063-0.272,0.583-2.617-0.686-4.69-3.761-4.793-0.006,0-0.01,0.001-0.017,0.001-0.072,0.839,0.021,1.822,0.3,2.962z" fill="#231F20" fill-opacity="0.15" stroke-opacity="0.15" style="enable-background:new;"/>
-<path d="M18.61,9.658c-0.764,0.117-1.973,0.817-1.119,3.879-0.033,0.006-0.064,0.011-0.096,0.023-0.342,0.145-0.447,0.702-0.238,1.248,0.209,0.545,0.652,0.871,0.994,0.728,0.021-0.009,0.039-0.023,0.058-0.036,0.165,0.371,0.364,0.766,0.599,1.163,0.263-0.441,0.512-0.897,0.736-1.369,0.646-0.077,1.279-0.639,1.605-1.444,0.371-0.919,0.253-1.873-0.272-2.37,0.235-1.062,0.272-2.073,0.117-2.993-0.015-0.001-0.028-0.003-0.043-0.003-1.26-0.001-1.87,0.574-2.34,1.174zm-1.11,3.882c0.007-0.006,0.015-0.013,0.021-0.019,0,0.005,0.002,0.008,0.002,0.013,0,0-0.01,0.01-0.02,0.01zm1.76-2.21c-0.009-0.002-0.021-0.007-0.029-0.008,0.01,0,0.02,0.01,0.03,0.01z" fill="#231F20" fill-opacity="0.15" stroke-opacity="0.15" style="enable-background:new;"/>
-<path d="M23.19,20.69c-0.49-0.256-2.057-0.836-3.314-1.305l-0.719-0.266-0.123-0.051-0.172-0.065-0.484-0.194c-0.016-0.021-0.027-0.051-0.041-0.073-0.85,0.327-2.31,0.862-2.746,1.097-0.179,0.094-0.386,0.221-0.597,0.387-0.221-0.182-0.426-0.311-0.573-0.387-0.395-0.205-1.904-0.754-2.746-1.068l-0.042-0.018-0.596,0.261c-0.32,0.125-0.719,0.276-1.144,0.438-1.202,0.457-2.565,0.975-3.074,1.244-1.071,0.568-1.857,1.363-2.338,2.35h21.01c-0.76-1.46-1.98-2.18-2.3-2.35z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3" style="enable-background:new;"/>
-<path d="M8.979,13.71c0.298,0.78,0.894,1.304,1.481,1.304,0.062,0,0.122-0.005,0.181-0.017,0.202,0.433,0.419,0.854,0.651,1.261h-0.009l0.068,0.113c0.155-0.283,0.3-0.563,0.419-0.829,0.334,0.115,0.761-0.194,0.973-0.719,0.22-0.542,0.125-1.106-0.212-1.259-0.019-0.008-0.04-0.009-0.059-0.015v-0.001c-0.004-0.001-0.007-0.002-0.012-0.002-0.028-0.008-0.057-0.014-0.087-0.016-0.007-0.002-0.012-0.003-0.019-0.005-0.015-0.003-0.032-0.007-0.05-0.011,0.057,0.011,0.109,0.023,0.167,0.033,0.043-0.172,0.063-0.272,0.063-0.272,0.564-2.535-0.613-4.556-3.483-4.772-0.08,0.847,0.026,1.864,0.336,3.057-0.57,0.33-0.751,1.24-0.404,2.15z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3" style="enable-background:new;"/>
-<path d="M18.61,9.658c-0.764,0.117-1.973,0.817-1.119,3.879-0.033,0.006-0.064,0.011-0.096,0.023-0.342,0.145-0.447,0.702-0.238,1.248,0.209,0.545,0.652,0.871,0.994,0.728,0.021-0.009,0.039-0.023,0.058-0.036,0.124,0.278,0.269,0.569,0.429,0.864,0.256-0.439,0.497-0.891,0.715-1.357,0.014,0.001,0.025,0.001,0.039,0.001,0.58,0,1.177-0.511,1.483-1.27,0.358-0.884,0.21-1.785-0.325-2.144,0.025-0.106,0.036-0.166,0.036-0.166,0.233-1.043,0.267-2.035,0.11-2.931-1.08,0.083-1.64,0.612-2.08,1.169zm-1.11,3.882c0.007-0.006,0.015-0.013,0.021-0.019,0,0.005,0.002,0.008,0.002,0.013,0,0-0.01,0.01-0.02,0.01zm1.76-2.21c-0.009-0.002-0.021-0.007-0.029-0.008,0.01,0,0.02,0.01,0.03,0.01z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3" style="enable-background:new;"/>
+<path d="M23.32,20.43c-0.506-0.264-2.081-0.849-3.348-1.317l-0.711-0.265-0.128-0.053-0.166-0.063-0.317-0.128-0.196,0.086c-0.001,0.002-0.003,0.002-0.004,0.003h-0.001c-0.826,0.323-2.406,0.897-2.865,1.143-0.178,0.095-0.385,0.222-0.596,0.388-0.221-0.183-0.426-0.311-0.573-0.388-0.395-0.205-1.904-0.753-2.746-1.067l-0.078-0.031-0.002,0.001-0.349-0.142-0.317,0.139c-0.311,0.122-0.693,0.268-1.103,0.424l-0.038,0.014c-1.21,0.461-2.582,0.982-3.107,1.262-1.177,0.625-2.025,1.51-2.525,2.609h21.66c-0.77-1.62-2.12-2.41-2.48-2.6z" fill="#231F20" opacity="0.15" style="enable-background:new;"/>
+<path d="M9.052,11.44c-0.561,0.477-0.712,1.432-0.349,2.38,0.342,0.894,1.048,1.494,1.758,1.494h0.002c0.106,0.221,0.217,0.439,0.331,0.654h-0.033l0.271,0.448s0.071,0.115,0.154,0.253c0.226-0.383,0.424-0.765,0.586-1.123,0.334,0.115,0.761-0.194,0.973-0.719,0.22-0.542,0.125-1.106-0.212-1.259-0.019-0.008-0.04-0.009-0.059-0.015v-0.001c-0.004-0.001-0.007-0.002-0.012-0.002-0.028-0.008-0.057-0.014-0.087-0.016-0.007-0.002-0.012-0.003-0.019-0.005-0.015-0.003-0.032-0.007-0.05-0.011,0.057,0.011,0.109,0.023,0.167,0.033,0.043-0.172,0.063-0.272,0.063-0.272,0.583-2.617-0.686-4.69-3.761-4.793-0.006,0-0.01,0.001-0.017,0.001-0.072,0.839,0.021,1.822,0.3,2.962z" fill="#231F20" opacity="0.15" style="enable-background:new;"/>
+<path d="M18.61,9.658c-0.764,0.117-1.973,0.817-1.119,3.879-0.033,0.006-0.064,0.011-0.096,0.023-0.342,0.145-0.447,0.702-0.238,1.248,0.209,0.545,0.652,0.871,0.994,0.728,0.021-0.009,0.039-0.023,0.058-0.036,0.165,0.371,0.364,0.766,0.599,1.163,0.263-0.441,0.512-0.897,0.736-1.369,0.646-0.077,1.279-0.639,1.605-1.444,0.371-0.919,0.253-1.873-0.272-2.37,0.235-1.062,0.272-2.073,0.117-2.993-0.015-0.001-0.028-0.003-0.043-0.003-1.26-0.001-1.87,0.574-2.34,1.174zm-1.11,3.882c0.007-0.006,0.015-0.013,0.021-0.019,0,0.005,0.002,0.008,0.002,0.013,0,0-0.01,0.01-0.02,0.01zm1.76-2.21c-0.009-0.002-0.021-0.007-0.029-0.008,0.01,0,0.02,0.01,0.03,0.01z" fill="#231F20" opacity="0.15" style="enable-background:new;"/>
+<path d="M23.19,20.69c-0.49-0.256-2.057-0.836-3.314-1.305l-0.719-0.266-0.123-0.051-0.172-0.065-0.484-0.194c-0.016-0.021-0.027-0.051-0.041-0.073-0.85,0.327-2.31,0.862-2.746,1.097-0.179,0.094-0.386,0.221-0.597,0.387-0.221-0.182-0.426-0.311-0.573-0.387-0.395-0.205-1.904-0.754-2.746-1.068l-0.042-0.018-0.596,0.261c-0.32,0.125-0.719,0.276-1.144,0.438-1.202,0.457-2.565,0.975-3.074,1.244-1.071,0.568-1.857,1.363-2.338,2.35h21.01c-0.76-1.46-1.98-2.18-2.3-2.35z" fill="#231F20" opacity="0.3" style="enable-background:new;"/>
+<path d="M8.979,13.71c0.298,0.78,0.894,1.304,1.481,1.304,0.062,0,0.122-0.005,0.181-0.017,0.202,0.433,0.419,0.854,0.651,1.261h-0.009l0.068,0.113c0.155-0.283,0.3-0.563,0.419-0.829,0.334,0.115,0.761-0.194,0.973-0.719,0.22-0.542,0.125-1.106-0.212-1.259-0.019-0.008-0.04-0.009-0.059-0.015v-0.001c-0.004-0.001-0.007-0.002-0.012-0.002-0.028-0.008-0.057-0.014-0.087-0.016-0.007-0.002-0.012-0.003-0.019-0.005-0.015-0.003-0.032-0.007-0.05-0.011,0.057,0.011,0.109,0.023,0.167,0.033,0.043-0.172,0.063-0.272,0.063-0.272,0.564-2.535-0.613-4.556-3.483-4.772-0.08,0.847,0.026,1.864,0.336,3.057-0.57,0.33-0.751,1.24-0.404,2.15z" fill="#231F20" opacity="0.3" style="enable-background:new;"/>
+<path d="M18.61,9.658c-0.764,0.117-1.973,0.817-1.119,3.879-0.033,0.006-0.064,0.011-0.096,0.023-0.342,0.145-0.447,0.702-0.238,1.248,0.209,0.545,0.652,0.871,0.994,0.728,0.021-0.009,0.039-0.023,0.058-0.036,0.124,0.278,0.269,0.569,0.429,0.864,0.256-0.439,0.497-0.891,0.715-1.357,0.014,0.001,0.025,0.001,0.039,0.001,0.58,0,1.177-0.511,1.483-1.27,0.358-0.884,0.21-1.785-0.325-2.144,0.025-0.106,0.036-0.166,0.036-0.166,0.233-1.043,0.267-2.035,0.11-2.931-1.08,0.083-1.64,0.612-2.08,1.169zm-1.11,3.882c0.007-0.006,0.015-0.013,0.021-0.019,0,0.005,0.002,0.008,0.002,0.013,0,0-0.01,0.01-0.02,0.01zm1.76-2.21c-0.009-0.002-0.021-0.007-0.029-0.008,0.01,0,0.02,0.01,0.03,0.01z" fill="#231F20" opacity="0.3" style="enable-background:new;"/>
<radialGradient cx="657.3" cy="-597.7" gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_19_" r="16.23">
+
<stop offset="0" stop-color="#FFA98E"/>
+
<stop offset="0.2" stop-color="#FFA98E"/>
+
<stop offset="0.96" stop-color="#D45D36"/>
+
<stop offset="1" stop-color="#D45D36"/>
+
</radialGradient>
<path d="M18.46,19.26c-0.764-0.332-0.738-1.957-0.424-2.448,0.055-0.086,0.104-0.172,0.156-0.258h-6.385c0.053,0.086,0.103,0.172,0.157,0.258,0.315,0.491,0.34,2.116-0.424,2.448-0.764,0.331,3.549,3.219,3.549,3.219s4.11-2.89,3.35-3.22z" fill="url(#SVGID_19_)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="657" x2="657" y1="-589.9" y2="-603.3">
+
<stop offset="0" stop-color="#FF7236"/>
+
<stop offset="1" stop-color="#BA1212"/>
+
</linearGradient>
<path d="M23.05,20.96c-0.803-0.418-4.781-1.811-4.857-1.896l-3.04,2.524-3.266-2.623c-0.09,0.134-4.023,1.512-4.934,1.995-1.042,0.553-2.743,1.822-2.743,4.688h21.59c0-2.87-1.94-4.28-2.74-4.69z" fill="url(#SVGID_20_)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="657.1" x2="657.1" y1="-589" y2="-596.9">
+
<stop offset="0" stop-color="#BC1C24"/>
+
<stop offset="1" stop-color="#6B1C24"/>
+
</linearGradient>
<polygon fill="url(#SVGID_21_)" points="11.14,19.28,15.15,22.48,18.92,19.35,18.19,19.06,15.15,21.58,11.89,18.96"/>
<path d="M11.33,19.79s-5.72,1.493-5.72,5.502h-0.823c0-2.46,1.922-4.38,6.543-5.5z" fill="#FF7B56"/>
<path d="M18.6,19.7s5.72,1.494,5.72,5.502h0.824c0-2.47-1.92-4.38-6.54-5.5z" fill="#FF7B56"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="657.1" x2="657.1" y1="-597.5" y2="-590.2">
+
<stop offset="0" stop-color="#FFA98E"/>
+
<stop offset="0.96" stop-color="#D45D36"/>
+
<stop offset="1" stop-color="#D45D36"/>
+
</linearGradient>
<polygon fill="url(#SVGID_22_)" points="15.15,22.48,11.14,19.28,10.91,19.39,15.15,22.77,19.15,19.44,18.92,19.35"/>
<radialGradient cx="658.1" cy="-567.8" gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_23_" r="21.78">
+
<stop offset="0" stop-color="#FFE2D9"/>
+
<stop offset="0.51" stop-color="#FFC6B3"/>
+
<stop offset="0.76" stop-color="#FFA98E"/>
+
<stop offset="1" stop-color="#E88160"/>
+
</radialGradient>
<path d="M20.29,11.79c-0.026-0.013-0.058-0.015-0.086-0.022v-0.002c-0.005-0.001-0.01-0.002-0.017-0.003-0.041-0.011-0.084-0.021-0.127-0.022-5.331-0.928-7.775-3.88-7.959-3.099-0.147,0.622-1.641,1.968-2.424,2.639,0.007,0.03,0.01,0.057,0.018,0.087,0,0,0.027,0.138,0.086,0.372-0.062,0.007-0.123,0.02-0.182,0.045-0.498,0.21-0.654,1.026-0.349,1.823,0.305,0.798,0.956,1.274,1.454,1.065,0.03-0.014,0.057-0.035,0.085-0.054,0.289,0.65,0.645,1.348,1.079,2.047,0.729,0.866,1.846,1.883,3.079,1.883,1.49,0,2.404-0.815,3.031-1.64,0.017-0.033,0.031-0.066,0.053-0.095,0.465-0.728,0.842-1.455,1.145-2.134,0.488,0.168,1.113-0.284,1.424-1.051,0.35-0.81,0.21-1.63-0.29-1.85z" fill="url(#SVGID_23_)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_24_" x1="653.2" x2="662.4" y1="-590.1" y2="-580.9">
+
<stop offset="0" stop-color="#FFC6B3"/>
+
<stop offset="1" stop-color="#FFA98E"/>
+
</linearGradient>
<path d="M14.73,18.13c-0.908,0-1.822-0.423-2.496-1.06,0.713,0.748,1.672,1.478,2.716,1.478,1.491,0,2.403-0.815,3.032-1.64,0.016-0.033,0.031-0.066,0.051-0.095,0.465-0.728,0.842-1.455,1.146-2.134-1.7,2.95-2.96,3.44-4.45,3.44z" fill="url(#SVGID_24_)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="656.8" x2="656.8" y1="-560.9" y2="-574.5">
+
<stop offset="0" stop-color="#8A5D3B"/>
+
<stop offset="0.38" stop-color="#632F00"/>
+
<stop offset="1" stop-color="#361700"/>
+
</linearGradient>
<path d="M14.8,4.357c-1.847,0-2.736,0.84-3.423,1.718-1.12,0.172-2.884,1.195-1.636,5.675,0.783-0.67,2.214-2.489,2.361-3.111,0.186-0.788,2.672,2.226,8.103,3.124,0.063-0.251,0.093-0.398,0.093-0.398,0.86-3.821-0.99-6.853-5.49-7.003z" fill="url(#SVGID_25_)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_26_" x1="661.5" x2="649.2" y1="-573.9" y2="-566.6">
+
<stop offset="0" stop-color="#8A5D3B"/>
+
<stop offset="0.36" stop-color="#632F00"/>
+
<stop offset="1" stop-color="#361700"/>
+
</linearGradient>
<path d="M12.11,8.272s2.658,3.492,8.059,3.485c0,0-2.54-0.4-8.06-3.488z" fill="url(#SVGID_26_)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_27_" x1="648.1" x2="648.2" y1="-565.2" y2="-573">
+
<stop offset="0" stop-color="#8A5D3B"/>
+
<stop offset="0.38" stop-color="#632F00"/>
+
<stop offset="1" stop-color="#361700"/>
+
</linearGradient>
<path d="M11.47,6.335s-2.603,0.155-1.637,4.566c0.003,0-0.315-3.019,1.637-4.565z" fill="url(#SVGID_27_)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_28_" x1="658.5" x2="658.2" y1="-562.1" y2="-565.6">
+
<stop offset="0" stop-color="#A87C4F"/>
+
<stop offset="1" stop-color="#632F00"/>
+
</linearGradient>
<path d="M16.06,6.946c-1.212-0.173-3.263-1.247-4.065-0.863,0,0,2.63-3,7.271,0.415,0,0-1.11,0.747-3.21,0.448z" fill="url(#SVGID_28_)"/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_landline.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_landline.svg Fri May 14 16:09:54 2010 +0300
@@ -1,255 +1,253 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
-<stop offset="0.297" style="stop-color:#A7E722"/>
-<stop offset="0.6667" style="stop-color:#428C0F"/>
-<stop offset="0.7939" style="stop-color:#5CA617"/>
-<stop offset="1" style="stop-color:#5CA617"/>
+ <stop offset="0.297" style="stop-color:#A7E722"/>
+ <stop offset="0.6667" style="stop-color:#428C0F"/>
+ <stop offset="0.7939" style="stop-color:#5CA617"/>
</radialGradient>
<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737 c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108 c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274 c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-2.477-2.889-8.594-5.015-10.752-5.399 c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571C11.203,27.277,3.722,37.795,2.668,40.352 c-1.108,2.691-0.581,4.645-0.236,6.567c0.387,2.158,2.511,8.275,5.4,10.752c0.718,0.616,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-1639.3428" x2="-1638.9111" y1="-2494.9824" y2="-2491.4067">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+ <stop offset="0" style="stop-color:#559D13"/>
+ <stop offset="1" style="stop-color:#284F09"/>
</linearGradient>
<path d="M35.172,17.107c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967 c0.535,0.492,0.873,0.588,1.301,0.274c0.047-0.034,0.063-0.046,0.064-0.046c0.252-0.184,1.031-0.739,2.119-1.514 c-0.252-0.205-3.469-2.809-4.801-2.956C36.855,15.598,35.172,17.107,35.172,17.107z" fill="url(#SVGID_2_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -1696.8304 4072.5859)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1639.3467" x2="-1638.9149" y1="4063.0557" y2="4066.6318">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+ <stop offset="0" style="stop-color:#559D13"/>
+ <stop offset="1" style="stop-color:#284F09"/>
</linearGradient>
<path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.714c0.376,0.665,2.351,3.067,2.967,3.737 c0.492,0.53,0.587,0.869,0.274,1.297c-0.035,0.049-0.046,0.063-0.046,0.063c-0.183,0.253-0.738,1.032-1.515,2.12 c-0.203-0.252-2.807-3.469-2.956-4.8C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
-<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112 C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711 c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571 C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617 C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B5DC77" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737 c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108 c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274 c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982 c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273 c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107 c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736 c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606 c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B5DC77" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112 C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711 c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571 C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617 C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B5DC77" opacity="0.5"/>
+<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737 c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108 c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274 c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982 c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273 c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107 c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736 c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606 c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B5DC77" opacity="0.6"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -608.1406 2931.3247)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-1610.522" x2="-1610.522" y1="-2533.3467" y2="-2471.428">
-<stop offset="0" style="stop-color:#447F0F"/>
-<stop offset="0.5" style="stop-color:#284F09"/>
-<stop offset="1" style="stop-color:#40790E"/>
+ <stop offset="0" style="stop-color:#447F0F"/>
+ <stop offset="0.5" style="stop-color:#284F09"/>
+ <stop offset="1" style="stop-color:#40790E"/>
</linearGradient>
-<path d="M2.899,45.012c1.275-2.776,10.299-14.805,18.804-23.31 c8.505-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26 c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.534,18.958c-8.562,8.562-17.667,20.715-18.96,23.535 c-0.038,0.086-0.063,0.165-0.101,0.25c0.071,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_4_)" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M2.899,45.012c1.275-2.776,10.299-14.805,18.804-23.31 c8.505-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26 c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.534,18.958c-8.562,8.562-17.667,20.715-18.96,23.535 c-0.038,0.086-0.063,0.165-0.101,0.25c0.071,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_4_)" opacity="0.5"/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<polygon fill="none" points="0,8 0,25.294 0,30 30,30 30,25.294 30,8 30,0 0,0 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="15" x2="15" y1="2.1646" y2="28.4294">
-<stop offset="0" style="stop-color:#252629"/>
-<stop offset="1" style="stop-color:#5A5D61"/>
+ <stop offset="0" style="stop-color:#252629"/>
+ <stop offset="1" style="stop-color:#5A5D61"/>
</linearGradient>
-<path d="M2.647,27.941C1.188,27.941,0,26.754,0,25.294V8c0-1.295,0.936-2.376,2.167-2.603 c0.436-1.91,2.147-3.339,4.187-3.339h0.822c2.024,0,3.726,1.407,4.177,3.295h15.999C28.813,5.354,30,6.541,30,8v17.294 c0,1.46-1.188,2.647-2.647,2.647H2.647z" fill="url(#SVGID_1__)" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M2.647,27.941C1.188,27.941,0,26.754,0,25.294V8c0-1.295,0.936-2.376,2.167-2.603 c0.436-1.91,2.147-3.339,4.187-3.339h0.822c2.024,0,3.726,1.407,4.177,3.295h15.999C28.813,5.354,30,6.541,30,8v17.294 c0,1.46-1.188,2.647-2.647,2.647H2.647z" fill="url(#SVGID_1__)" opacity="0.35"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="15" x2="15" y1="6.1143" y2="26.7021">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+ <stop offset="0.0667" style="stop-color:#D1D7D9"/>
+ <stop offset="0.2606" style="stop-color:#BDC2C4"/>
+ <stop offset="0.6606" style="stop-color:#949DA1"/>
+ <stop offset="0.9636" style="stop-color:#ADB3B5"/>
+ <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_2__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="15" x2="15" y1="6.1143" y2="26.7021">
-<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"/>
+ <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.682,0,1.234,0.554,1.234,1.235v0.412 v16.882v0.411c0,0.683-0.552,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_3__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" 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"/>
+ <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.647c0.456,0,0.824,0.369,0.824,0.824v1.646c0,0.454-0.368,0.822-0.824,0.822H23.647z" fill="url(#SVGID_4__)" fill-opacity="0.8" stroke-opacity="0.8"/>
+<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.647c0.456,0,0.824,0.369,0.824,0.824v1.646c0,0.454-0.368,0.822-0.824,0.822H23.647z" fill="url(#SVGID_4__)" opacity="0.8"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="24.4707" x2="24.4707" y1="21.146" y2="23.7092">
-<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"/>
+ <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.647c-0.228,0-0.412-0.184-0.412-0.411v-1.646 c0-0.229,0.184-0.412,0.412-0.412h1.647c0.227,0,0.411,0.183,0.411,0.412V23.235z" fill="url(#SVGID_5_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" 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"/>
+ <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.454,0,0.825,0.369,0.825,0.824v1.646c0,0.454-0.371,0.822-0.825,0.822H19.118z" fill="url(#SVGID_6_)" fill-opacity="0.8" stroke-opacity="0.8"/>
+<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.454,0,0.825,0.369,0.825,0.824v1.646c0,0.454-0.371,0.822-0.825,0.822H19.118z" fill="url(#SVGID_6_)" opacity="0.8"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="19.9409" x2="19.9409" y1="21.146" y2="23.7092">
-<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"/>
+ <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.413,0.411h-1.646c-0.228,0-0.413-0.184-0.413-0.411v-1.646 c0-0.229,0.185-0.412,0.413-0.412h1.646c0.229,0,0.413,0.183,0.413,0.412V23.235z" fill="url(#SVGID_7_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" 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"/>
+ <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.455,0,0.825,0.369,0.825,0.824v1.646c0,0.454-0.371,0.822-0.825,0.822H14.587z" fill="url(#SVGID_8_)" fill-opacity="0.8" stroke-opacity="0.8"/>
+<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.455,0,0.825,0.369,0.825,0.824v1.646c0,0.454-0.371,0.822-0.825,0.822H14.587z" fill="url(#SVGID_8_)" opacity="0.8"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="15.4121" x2="15.4121" y1="21.146" y2="23.7092">
-<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"/>
+ <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.411-0.184-0.411-0.411v-1.646 c0-0.229,0.184-0.412,0.411-0.412h1.647c0.229,0,0.413,0.183,0.413,0.412V23.235z" fill="url(#SVGID_9_)"/>
-<path d="M25.294,19.942h-1.647c-0.455,0-0.824-0.369-0.824-0.825v0.412 c0,0.455,0.369,0.824,0.824,0.824h1.647c0.456,0,0.824-0.369,0.824-0.824v-0.412C26.118,19.573,25.75,19.942,25.294,19.942z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M25.294,19.942h-1.647c-0.455,0-0.824-0.369-0.824-0.825v0.412 c0,0.455,0.369,0.824,0.824,0.824h1.647c0.456,0,0.824-0.369,0.824-0.824v-0.412C26.118,19.573,25.75,19.942,25.294,19.942z" fill="#231F20" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" 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"/>
+ <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.647c0.456,0,0.824,0.37,0.824,0.822v1.647c0,0.456-0.368,0.825-0.824,0.825H23.647z" fill="url(#SVGID_10_)" fill-opacity="0.8" stroke-opacity="0.8"/>
+<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.647c0.456,0,0.824,0.37,0.824,0.822v1.647c0,0.456-0.368,0.825-0.824,0.825H23.647z" fill="url(#SVGID_10_)" opacity="0.8"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="24.4707" x2="24.4707" y1="17.0278" y2="19.592">
-<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"/>
+ <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.647c-0.228,0-0.412-0.184-0.412-0.412V17.47 c0-0.226,0.184-0.411,0.412-0.411h1.647c0.227,0,0.411,0.186,0.411,0.411V19.117z" fill="url(#SVGID_11_)"/>
-<path d="M20.764,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.454,0,0.825-0.369,0.825-0.824v-0.412C21.589,19.573,21.218,19.942,20.764,19.942z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M20.764,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.454,0,0.825-0.369,0.825-0.824v-0.412C21.589,19.573,21.218,19.942,20.764,19.942z" fill="#231F20" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" 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"/>
+ <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.454,0,0.825,0.37,0.825,0.822v1.647c0,0.456-0.371,0.825-0.825,0.825H19.118z" fill="url(#SVGID_12_)" fill-opacity="0.8" stroke-opacity="0.8"/>
+<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.454,0,0.825,0.37,0.825,0.822v1.647c0,0.456-0.371,0.825-0.825,0.825H19.118z" fill="url(#SVGID_12_)" opacity="0.8"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="19.9409" x2="19.9409" y1="17.0278" y2="19.592">
-<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"/>
+ <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.413,0.412h-1.646c-0.228,0-0.413-0.184-0.413-0.412V17.47 c0-0.226,0.185-0.411,0.413-0.411h1.646c0.229,0,0.413,0.186,0.413,0.411V19.117z" fill="url(#SVGID_13_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" 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"/>
+ <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.455,0,0.825,0.37,0.825,0.822v1.647c0,0.456-0.371,0.825-0.825,0.825H14.587z" fill="url(#SVGID_14_)" 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.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"/>
+<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.455,0,0.825,0.37,0.825,0.822v1.647c0,0.456-0.371,0.825-0.825,0.825H14.587z" fill="url(#SVGID_14_)" 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.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" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="15.4121" x2="15.4121" y1="17.0278" y2="19.592">
-<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"/>
+ <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.411-0.184-0.411-0.412V17.47 c0-0.226,0.184-0.411,0.411-0.411h1.647c0.229,0,0.413,0.186,0.413,0.411V19.117z" fill="url(#SVGID_15_)"/>
-<path d="M25.294,15.822h-1.647c-0.455,0-0.824-0.369-0.824-0.822v0.411 c0,0.455,0.369,0.824,0.824,0.824h1.647c0.456,0,0.824-0.369,0.824-0.824V15C26.118,15.453,25.75,15.822,25.294,15.822z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M25.294,15.822h-1.647c-0.455,0-0.824-0.369-0.824-0.822v0.411 c0,0.455,0.369,0.824,0.824,0.824h1.647c0.456,0,0.824-0.369,0.824-0.824V15C26.118,15.453,25.75,15.822,25.294,15.822z" fill="#231F20" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" 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"/>
+ <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.647c0.456,0,0.824,0.37,0.824,0.822V15c0,0.453-0.368,0.822-0.824,0.822H23.647z" fill="url(#SVGID_16_)" 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.647c0.456,0,0.824,0.37,0.824,0.822V15c0,0.453-0.368,0.822-0.824,0.822H23.647z" fill="url(#SVGID_16_)" opacity="0.8"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" 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"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+ <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,15c0,0.228-0.184,0.411-0.411,0.411h-1.647c-0.228,0-0.412-0.184-0.412-0.411v-1.647 c0-0.228,0.184-0.411,0.412-0.411h1.647c0.227,0,0.411,0.184,0.411,0.411V15z" fill="url(#SVGID_17_)"/>
-<path d="M20.764,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.454,0,0.825-0.369,0.825-0.824V15C21.589,15.453,21.218,15.822,20.764,15.822z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M20.764,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.454,0,0.825-0.369,0.825-0.824V15C21.589,15.453,21.218,15.822,20.764,15.822z" fill="#231F20" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" 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"/>
+ <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.454,0,0.825,0.37,0.825,0.822V15c0,0.453-0.371,0.822-0.825,0.822H19.118z" fill="url(#SVGID_18_)" fill-opacity="0.8" stroke-opacity="0.8"/>
+<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.454,0,0.825,0.37,0.825,0.822V15c0,0.453-0.371,0.822-0.825,0.822H19.118z" fill="url(#SVGID_18_)" opacity="0.8"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="19.9409" x2="19.9409" 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"/>
+ <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.413,0.411h-1.646c-0.228,0-0.413-0.184-0.413-0.411v-1.647 c0-0.228,0.185-0.411,0.413-0.411h1.646c0.229,0,0.413,0.184,0.413,0.411V15z" fill="url(#SVGID_19_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20_" 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"/>
+ <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.455,0,0.825,0.37,0.825,0.822V15c0,0.453-0.371,0.822-0.825,0.822H14.587z" fill="url(#SVGID_20_)" 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.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"/>
+<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.455,0,0.825,0.37,0.825,0.822V15c0,0.453-0.371,0.822-0.825,0.822H14.587z" fill="url(#SVGID_20_)" 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.455,0,0.825-0.369,0.825-0.824V15C17.06,15.453,16.689,15.822,16.234,15.822z" fill="#231F20" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="15.4121" x2="15.4121" 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"/>
+ <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.411-0.184-0.411-0.411v-1.647 c0-0.228,0.184-0.411,0.411-0.411h1.647c0.229,0,0.413,0.184,0.413,0.411V15z" fill="url(#SVGID_21_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22_" 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"/>
+ <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.833V8.423 c0-0.461,0.371-0.834,0.825-0.834h13.181c0.454,0,0.823,0.373,0.823,0.834v2.449c0,0.459-0.369,0.833-0.823,0.833H13.354z" fill="url(#SVGID_22_)" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M13.354,11.705c-0.454,0-0.825-0.374-0.825-0.833V8.423 c0-0.461,0.371-0.834,0.825-0.834h13.181c0.454,0,0.823,0.373,0.823,0.834v2.449c0,0.459-0.369,0.833-0.823,0.833H13.354z" fill="url(#SVGID_22_)" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_23_" x1="19.9419" x2="19.9419" y1="8.0195" y2="11.3512">
-<stop offset="0" style="stop-color:#171717"/>
-<stop offset="1" style="stop-color:#2E2E2E"/>
+ <stop offset="0" style="stop-color:#171717"/>
+ <stop offset="1" style="stop-color:#2E2E2E"/>
</linearGradient>
<path d="M26.942,10.872c0,0.23-0.183,0.417-0.411,0.417H13.354c-0.227,0-0.412-0.187-0.412-0.417V8.423 c0-0.23,0.185-0.417,0.412-0.417h13.177c0.228,0,0.411,0.187,0.411,0.417V10.872z" fill="url(#SVGID_23_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_24_" x1="19.9424" x2="19.9424" y1="3.9624" y2="12.5882">
-<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"/>
+ <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_24_)" height="2.449" width="13.177" x="13.354" y="8.423"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_25_" 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"/>
+ <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_25_)" 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.12,4.117h0.822c2.27,0,4.118-1.848,4.118-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.044,0,3.706-1.662,3.706-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"/>
+<path d="M2.234,21.177c0,2.27,1.849,4.117,4.12,4.117h0.822c2.27,0,4.118-1.848,4.118-4.117V6.354 H4.706H2.647c-0.147,0-0.277,0.046-0.413,0.083V21.177z" fill="#050505" opacity="0.1"/>
+<path d="M6.354,24.883h0.822c2.044,0,3.706-1.662,3.706-3.706V6.354H4.706H2.647v14.823 C2.647,23.221,4.31,24.883,6.354,24.883z" fill="#050505" opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_26_" x1="6.7656" x2="6.7656" y1="3.1465" y2="24.8746">
-<stop offset="0" style="stop-color:#727678"/>
-<stop offset="0.7394" style="stop-color:#252629"/>
-<stop offset="1" style="stop-color:#494C4F"/>
+ <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_26_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_27_" 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"/>
+ <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_27_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_28_" 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"/>
+ <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_28_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_29_" x1="6.7646" x2="6.7646" y1="2.7354" y2="24.6079">
-<stop offset="0" style="stop-color:#A0A7A8"/>
-<stop offset="0.7576" style="stop-color:#252629"/>
-<stop offset="1" style="stop-color:#1F2021"/>
+ <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.236,0.244V22h3.292V5.772 C8.03,5.615,7.614,5.528,7.176,5.528z" fill="url(#SVGID_29_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_30_" 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"/>
+ <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_30_)"/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_landline_home.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_landline_home.svg Fri May 14 16:09:54 2010 +0300
@@ -1,269 +1,266 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
-<stop offset="0.297" style="stop-color:#A7E722"/>
-<stop offset="0.6667" style="stop-color:#428C0F"/>
-<stop offset="0.7939" style="stop-color:#5CA617"/>
-<stop offset="1" style="stop-color:#5CA617"/>
+ <stop offset="0.297" style="stop-color:#A7E722"/>
+ <stop offset="0.6667" style="stop-color:#428C0F"/>
+ <stop offset="0.7939" style="stop-color:#5CA617"/>
</radialGradient>
<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737 c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108 c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274 c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-2.477-2.889-8.594-5.015-10.752-5.399 c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571C11.203,27.277,3.722,37.795,2.668,40.352 c-1.108,2.691-0.581,4.645-0.236,6.567c0.387,2.158,2.511,8.275,5.4,10.752c0.718,0.616,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-1639.3428" x2="-1638.9111" y1="-2494.9824" y2="-2491.4067">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+ <stop offset="0" style="stop-color:#559D13"/>
+ <stop offset="1" style="stop-color:#284F09"/>
</linearGradient>
<path d="M35.172,17.107c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967 c0.535,0.492,0.873,0.588,1.301,0.274c0.047-0.034,0.063-0.046,0.064-0.046c0.252-0.184,1.031-0.739,2.119-1.514 c-0.252-0.205-3.469-2.809-4.801-2.956C36.855,15.598,35.172,17.107,35.172,17.107z" fill="url(#SVGID_2_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -1696.8304 4072.5859)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1639.3467" x2="-1638.9149" y1="4063.0557" y2="4066.6318">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+ <stop offset="0" style="stop-color:#559D13"/>
+ <stop offset="1" style="stop-color:#284F09"/>
</linearGradient>
<path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.714c0.376,0.665,2.351,3.067,2.967,3.737 c0.492,0.53,0.587,0.869,0.274,1.297c-0.035,0.049-0.046,0.063-0.046,0.063c-0.183,0.253-0.738,1.032-1.515,2.12 c-0.203-0.252-2.807-3.469-2.956-4.8C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
-<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112 C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711 c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571 C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617 C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B5DC77" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737 c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108 c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274 c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982 c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273 c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107 c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736 c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606 c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B5DC77" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112 C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711 c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571 C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617 C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B5DC77" opacity="0.5"/>
+<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737 c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108 c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274 c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982 c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273 c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107 c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736 c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606 c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B5DC77" opacity="0.6"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -608.1406 2931.3247)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-1610.522" x2="-1610.522" y1="-2533.3467" y2="-2471.428">
-<stop offset="0" style="stop-color:#447F0F"/>
-<stop offset="0.5" style="stop-color:#284F09"/>
-<stop offset="1" style="stop-color:#40790E"/>
+ <stop offset="0" style="stop-color:#447F0F"/>
+ <stop offset="0.5" style="stop-color:#284F09"/>
+ <stop offset="1" style="stop-color:#40790E"/>
</linearGradient>
-<path d="M2.899,45.012c1.275-2.776,10.299-14.805,18.804-23.31 c8.505-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26 c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.534,18.958c-8.562,8.562-17.667,20.715-18.96,23.535 c-0.038,0.086-0.063,0.165-0.101,0.25c0.071,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_4_)" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M2.899,45.012c1.275-2.776,10.299-14.805,18.804-23.31 c8.505-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26 c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.534,18.958c-8.562,8.562-17.667,20.715-18.96,23.535 c-0.038,0.086-0.063,0.165-0.101,0.25c0.071,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_4_)" opacity="0.5"/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<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"/>
+<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" opacity="0.35"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="15" x2="15" y1="6.1143" y2="26.7021">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+ <stop offset="0.0667" style="stop-color:#D1D7D9"/>
+ <stop offset="0.2606" style="stop-color:#BDC2C4"/>
+ <stop offset="0.6606" style="stop-color:#949DA1"/>
+ <stop offset="0.9636" style="stop-color:#ADB3B5"/>
+ <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">
-<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"/>
+ <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__)"/>
<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"/>
+ <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"/>
+<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__)" opacity="0.8"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="24.4707" x2="24.4707" y1="21.146" y2="23.7092">
-<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"/>
+ <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">
-<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"/>
+ <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"/>
+<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_)" opacity="0.8"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="19.9404" x2="19.9404" y1="21.146" y2="23.7092">
-<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"/>
+ <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">
-<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"/>
+ <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"/>
+<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_)" opacity="0.8"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="15.4121" x2="15.4121" y1="21.146" y2="23.7092">
-<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"/>
+ <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="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" 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"/>
+ <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"/>
+<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_)" opacity="0.8"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="24.4707" x2="24.4707" y1="17.0278" y2="19.592">
-<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"/>
+ <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"/>
+<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" 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"/>
+ <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"/>
+<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_)" opacity="0.8"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="19.9404" x2="19.9404" y1="17.0278" y2="19.592">
-<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"/>
+ <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">
-<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"/>
+ <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"/>
+<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_)" 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" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="15.4121" x2="15.4121" y1="17.0278" y2="19.592">
-<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"/>
+ <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="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" 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"/>
+ <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.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_)" 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"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+ <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,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"/>
+<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" 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"/>
+ <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"/>
+<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_)" 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"/>
+ <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">
-<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"/>
+ <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"/>
+<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_)" 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" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="15.4121" x2="15.4121" 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"/>
+ <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_)"/>
<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"/>
+ <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"/>
+<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_)" 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"/>
+ <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_)"/>
<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"/>
+ <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.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"/>
+ <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.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"/>
+<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" 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" opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="6.7656" x2="6.7656" y1="3.1465" y2="24.8746">
-<stop offset="0" style="stop-color:#727678"/>
-<stop offset="0.7394" style="stop-color:#252629"/>
-<stop offset="1" style="stop-color:#494C4F"/>
+ <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_)"/>
<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"/>
+ <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_)"/>
<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"/>
+ <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">
-<stop offset="0" style="stop-color:#A0A7A8"/>
-<stop offset="0.7576" style="stop-color:#252629"/>
-<stop offset="1" style="stop-color:#1F2021"/>
+ <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_)"/>
<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"/>
+ <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_)"/>
<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"/>
+ <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="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"/>
+ <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_)"/>
-<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 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 "/>
+<polygon 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 "/>
<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 "/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_landline_work.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_landline_work.svg Fri May 14 16:09:54 2010 +0300
@@ -1,268 +1,265 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
-<stop offset="0.297" style="stop-color:#A7E722"/>
-<stop offset="0.6667" style="stop-color:#428C0F"/>
-<stop offset="0.7939" style="stop-color:#5CA617"/>
-<stop offset="1" style="stop-color:#5CA617"/>
+ <stop offset="0.297" style="stop-color:#A7E722"/>
+ <stop offset="0.6667" style="stop-color:#428C0F"/>
+ <stop offset="0.7939" style="stop-color:#5CA617"/>
</radialGradient>
<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737 c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108 c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274 c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-2.477-2.889-8.594-5.015-10.752-5.399 c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571C11.203,27.277,3.722,37.795,2.668,40.352 c-1.108,2.691-0.581,4.645-0.236,6.567c0.387,2.158,2.511,8.275,5.4,10.752c0.718,0.616,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-1639.3428" x2="-1638.9111" y1="-2494.9824" y2="-2491.4067">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+ <stop offset="0" style="stop-color:#559D13"/>
+ <stop offset="1" style="stop-color:#284F09"/>
</linearGradient>
<path d="M35.172,17.107c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967 c0.535,0.492,0.873,0.588,1.301,0.274c0.047-0.034,0.063-0.046,0.064-0.046c0.252-0.184,1.031-0.739,2.119-1.514 c-0.252-0.205-3.469-2.809-4.801-2.956C36.855,15.598,35.172,17.107,35.172,17.107z" fill="url(#SVGID_2_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -1696.8304 4072.5859)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1639.3467" x2="-1638.9149" y1="4063.0557" y2="4066.6318">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+ <stop offset="0" style="stop-color:#559D13"/>
+ <stop offset="1" style="stop-color:#284F09"/>
</linearGradient>
<path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.714c0.376,0.665,2.351,3.067,2.967,3.737 c0.492,0.53,0.587,0.869,0.274,1.297c-0.035,0.049-0.046,0.063-0.046,0.063c-0.183,0.253-0.738,1.032-1.515,2.12 c-0.203-0.252-2.807-3.469-2.956-4.8C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
-<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112 C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711 c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571 C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617 C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B5DC77" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737 c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108 c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274 c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982 c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273 c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107 c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736 c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606 c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B5DC77" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112 C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711 c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571 C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617 C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B5DC77" opacity="0.5"/>
+<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737 c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108 c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274 c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982 c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273 c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107 c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736 c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606 c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B5DC77" opacity="0.6"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -608.1406 2931.3247)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-1610.522" x2="-1610.522" y1="-2533.3467" y2="-2471.428">
-<stop offset="0" style="stop-color:#447F0F"/>
-<stop offset="0.5" style="stop-color:#284F09"/>
-<stop offset="1" style="stop-color:#40790E"/>
+ <stop offset="0" style="stop-color:#447F0F"/>
+ <stop offset="0.5" style="stop-color:#284F09"/>
+ <stop offset="1" style="stop-color:#40790E"/>
</linearGradient>
-<path d="M2.899,45.012c1.275-2.776,10.299-14.805,18.804-23.31 c8.505-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26 c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.534,18.958c-8.562,8.562-17.667,20.715-18.96,23.535 c-0.038,0.086-0.063,0.165-0.101,0.25c0.071,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_4_)" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M2.899,45.012c1.275-2.776,10.299-14.805,18.804-23.31 c8.505-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26 c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.534,18.958c-8.562,8.562-17.667,20.715-18.96,23.535 c-0.038,0.086-0.063,0.165-0.101,0.25c0.071,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_4_)" opacity="0.5"/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<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"/>
+<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" opacity="0.35"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="15" x2="15" y1="6.1143" y2="26.7021">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+ <stop offset="0.0667" style="stop-color:#D1D7D9"/>
+ <stop offset="0.2606" style="stop-color:#BDC2C4"/>
+ <stop offset="0.6606" style="stop-color:#949DA1"/>
+ <stop offset="0.9636" style="stop-color:#ADB3B5"/>
+ <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">
-<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"/>
+ <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__)"/>
<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"/>
+ <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"/>
+<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__)" opacity="0.8"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="24.4707" x2="24.4707" y1="21.146" y2="23.7092">
-<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"/>
+ <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">
-<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"/>
+ <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"/>
+<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_)" opacity="0.8"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="19.9414" x2="19.9414" y1="21.146" y2="23.7092">
-<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"/>
+ <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">
-<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"/>
+ <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"/>
+<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_)" opacity="0.8"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="15.4121" x2="15.4121" y1="21.146" y2="23.7092">
-<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"/>
+ <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="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" 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"/>
+ <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"/>
+<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_)" opacity="0.8"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="24.4707" x2="24.4707" y1="17.0278" y2="19.592">
-<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"/>
+ <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"/>
+<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" 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"/>
+ <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"/>
+<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_)" opacity="0.8"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="19.9414" x2="19.9414" y1="17.0278" y2="19.592">
-<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"/>
+ <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">
-<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"/>
+ <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"/>
+<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_)" 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" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="15.4121" x2="15.4121" y1="17.0278" y2="19.592">
-<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"/>
+ <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="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" 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"/>
+ <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.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_)" 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"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.6606" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+ <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,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"/>
+<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" 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"/>
+ <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"/>
+<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_)" 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"/>
+ <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">
-<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"/>
+ <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"/>
+<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_)" 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" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="15.4121" x2="15.4121" 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"/>
+ <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_)"/>
<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"/>
+ <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"/>
+<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_)" 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"/>
+ <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">
-<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"/>
+ <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">
-<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"/>
+ <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"/>
+<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" 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" opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="6.7656" x2="6.7656" y1="3.1465" y2="24.8746">
-<stop offset="0" style="stop-color:#727678"/>
-<stop offset="0.7394" style="stop-color:#252629"/>
-<stop offset="1" style="stop-color:#494C4F"/>
+ <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">
-<stop offset="0" style="stop-color:#B5BCBF"/>
-<stop offset="1" style="stop-color:#494C4F"/>
+ <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">
-<stop offset="0" style="stop-color:#D5DDE0"/>
-<stop offset="1" style="stop-color:#494C4F"/>
+ <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">
-<stop offset="0" style="stop-color:#A0A7A8"/>
-<stop offset="0.7576" style="stop-color:#252629"/>
-<stop offset="1" style="stop-color:#1F2021"/>
+ <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">
-<stop offset="0" style="stop-color:#252629"/>
-<stop offset="1" style="stop-color:#5A5D61"/>
+ <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_)"/>
<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"/>
+ <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="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"/>
+ <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,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" 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"/>
+<rect height="6.103" opacity="0.3" width="1.017" x="22.518" y="19.329"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_mobile.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_mobile.svg Fri May 14 16:09:54 2010 +0300
@@ -1,131 +1,129 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
-<stop offset="0.297" style="stop-color:#A7E722"/>
-<stop offset="0.6667" style="stop-color:#428C0F"/>
-<stop offset="0.7939" style="stop-color:#5CA617"/>
-<stop offset="1" style="stop-color:#5CA617"/>
+ <stop offset="0.297" style="stop-color:#A7E722"/>
+ <stop offset="0.6667" style="stop-color:#428C0F"/>
+ <stop offset="0.7939" style="stop-color:#5CA617"/>
</radialGradient>
<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737 c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108 c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274 c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-2.477-2.889-8.594-5.015-10.752-5.399 c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571C11.203,27.277,3.722,37.795,2.668,40.352 c-1.108,2.691-0.581,4.645-0.236,6.567c0.387,2.158,2.511,8.275,5.4,10.752c0.718,0.616,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-1639.3428" x2="-1638.9111" y1="-2494.9824" y2="-2491.4067">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+ <stop offset="0" style="stop-color:#559D13"/>
+ <stop offset="1" style="stop-color:#284F09"/>
</linearGradient>
<path d="M35.172,17.107c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967 c0.535,0.492,0.873,0.588,1.301,0.274c0.047-0.034,0.063-0.046,0.064-0.046c0.252-0.184,1.031-0.739,2.119-1.514 c-0.252-0.205-3.469-2.809-4.801-2.956C36.855,15.598,35.172,17.107,35.172,17.107z" fill="url(#SVGID_2_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -1696.8304 4072.5859)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1639.3467" x2="-1638.9149" y1="4063.0557" y2="4066.6318">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+ <stop offset="0" style="stop-color:#559D13"/>
+ <stop offset="1" style="stop-color:#284F09"/>
</linearGradient>
<path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.714c0.376,0.665,2.351,3.067,2.967,3.737 c0.492,0.53,0.587,0.869,0.274,1.297c-0.035,0.049-0.046,0.063-0.046,0.063c-0.183,0.253-0.738,1.032-1.515,2.12 c-0.203-0.252-2.807-3.469-2.956-4.8C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
-<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112 C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711 c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571 C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617 C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B5DC77" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737 c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108 c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274 c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982 c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273 c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107 c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736 c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606 c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B5DC77" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112 C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711 c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571 C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617 C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B5DC77" opacity="0.5"/>
+<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737 c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108 c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274 c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982 c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273 c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107 c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736 c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606 c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B5DC77" opacity="0.6"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -608.1406 2931.3247)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-1610.522" x2="-1610.522" y1="-2533.3467" y2="-2471.428">
-<stop offset="0" style="stop-color:#447F0F"/>
-<stop offset="0.5" style="stop-color:#284F09"/>
-<stop offset="1" style="stop-color:#40790E"/>
+ <stop offset="0" style="stop-color:#447F0F"/>
+ <stop offset="0.5" style="stop-color:#284F09"/>
+ <stop offset="1" style="stop-color:#40790E"/>
</linearGradient>
-<path d="M2.899,45.012c1.275-2.776,10.299-14.805,18.804-23.31 c8.505-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26 c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.534,18.958c-8.562,8.562-17.667,20.715-18.96,23.535 c-0.038,0.086-0.063,0.165-0.101,0.25c0.071,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_4_)" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M2.899,45.012c1.275-2.776,10.299-14.805,18.804-23.31 c8.505-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26 c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.534,18.958c-8.562,8.562-17.667,20.715-18.96,23.535 c-0.038,0.086-0.063,0.165-0.101,0.25c0.071,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_4_)" opacity="0.5"/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<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.039-0.041l-0.057-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.534v24.933 c0,0.171-0.018,0.337-0.051,0.498c-0.027,0.135-0.066,0.262-0.113,0.387c-0.074,0.188-0.137,0.314-0.207,0.428l-0.039,0.065 c-0.072,0.111-0.156,0.214-0.244,0.313C23.828,29.72,23.178,30,22.479,30H7.52z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M7.52,30c-0.699,0-1.352-0.281-1.836-0.793l-0.039-0.041l-0.057-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.534v24.933 c0,0.171-0.018,0.337-0.051,0.498c-0.027,0.135-0.066,0.262-0.113,0.387c-0.074,0.188-0.137,0.314-0.207,0.428l-0.039,0.065 c-0.072,0.111-0.156,0.214-0.244,0.313C23.828,29.72,23.178,30,22.479,30H7.52z" opacity="0.35"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="14.999" x2="14.999" y1="1" y2="28.9273">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+ <stop offset="0.0667" style="stop-color:#D1D7D9"/>
+ <stop offset="0.2606" style="stop-color:#BDC2C4"/>
+ <stop offset="0.6606" style="stop-color:#949DA1"/>
+ <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">
-<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"/>
+ <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">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+ <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"/>
+<rect fill="url(#SVGID_3__)" height="18.795" 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">
-<stop offset="0" style="stop-color:#6E6E6E"/>
-<stop offset="1" style="stop-color:#333333"/>
+ <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">
-<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"/>
+ <stop offset="0" style="stop-color:#3BC8EB"/>
+ <stop offset="0.3879" style="stop-color:#2D9BD2"/>
+ <stop offset="0.8909" 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">
-<stop offset="0" style="stop-color:#85EFFF"/>
-<stop offset="1" style="stop-color:#3BA1D9"/>
+ <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">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#FFFFFF"/>
+ <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"/>
+<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_)" 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" opacity="0.5"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="14.9404" x2="14.9404" 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"/>
+ <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">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+ <stop offset="0.0667" style="stop-color:#D1D7D9"/>
+ <stop offset="0.2606" style="stop-color:#BDC2C4"/>
+ <stop offset="0.6606" style="stop-color:#949DA1"/>
+ <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_)"/>
<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"/>
+ <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.443c0.814,0,1.477,0.66,1.477,1.474v1.652c0,0.815-0.662,1.476-1.477,1.476H8.609z" fill="url(#SVGID_10_)" fill-opacity="0.4" stroke-opacity="0.4"/>
+<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.443c0.814,0,1.477,0.66,1.477,1.474v1.652c0,0.815-0.662,1.476-1.477,1.476H8.609z" fill="url(#SVGID_10_)" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="8.832" x2="8.832" y1="22.8452" y2="26.7065">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+ <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.443 c0.604,0,1.092,0.49,1.092,1.092v1.652c0,0.603-0.488,1.093-1.092,1.093H8.609z" fill="url(#SVGID_11_)" fill-opacity="0.7" stroke-opacity="0.7"/>
+<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.443 c0.604,0,1.092,0.49,1.092,1.092v1.652c0,0.603-0.488,1.093-1.092,1.093H8.609z" fill="url(#SVGID_11_)" opacity="0.7"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="8.833" x2="8.833" y1="23.2339" y2="26.3218">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+ <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.709,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.443c0.393,0,0.709,0.315,0.709,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">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+ <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"/>
+<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_)" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="20.835" x2="20.835" y1="22.8452" y2="26.7065">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+ <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"/>
+<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_)" opacity="0.7"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="20.8359" x2="20.8359" y1="23.2339" y2="26.3218">
-<stop offset="0" style="stop-color:#FFC142"/>
-<stop offset="0.7455" style="stop-color:#CF4E18"/>
-<stop offset="1" style="stop-color:#B52100"/>
+ <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_)"/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_mobile_home.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_mobile_home.svg Fri May 14 16:09:54 2010 +0300
@@ -1,149 +1,146 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
-<stop offset="0.297" style="stop-color:#A7E722"/>
-<stop offset="0.6667" style="stop-color:#428C0F"/>
-<stop offset="0.7939" style="stop-color:#5CA617"/>
-<stop offset="1" style="stop-color:#5CA617"/>
+ <stop offset="0.297" style="stop-color:#A7E722"/>
+ <stop offset="0.6667" style="stop-color:#428C0F"/>
+ <stop offset="0.7939" style="stop-color:#5CA617"/>
</radialGradient>
<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737 c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108 c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274 c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-2.477-2.889-8.594-5.015-10.752-5.399 c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571C11.203,27.277,3.722,37.795,2.668,40.352 c-1.108,2.691-0.581,4.645-0.236,6.567c0.387,2.158,2.511,8.275,5.4,10.752c0.718,0.616,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-1639.3428" x2="-1638.9111" y1="-2494.9824" y2="-2491.4067">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+ <stop offset="0" style="stop-color:#559D13"/>
+ <stop offset="1" style="stop-color:#284F09"/>
</linearGradient>
<path d="M35.172,17.107c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967 c0.535,0.492,0.873,0.588,1.301,0.274c0.047-0.034,0.063-0.046,0.064-0.046c0.252-0.184,1.031-0.739,2.119-1.514 c-0.252-0.205-3.469-2.809-4.801-2.956C36.855,15.598,35.172,17.107,35.172,17.107z" fill="url(#SVGID_2_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -1696.8304 4072.5859)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1639.3467" x2="-1638.9149" y1="4063.0557" y2="4066.6318">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+ <stop offset="0" style="stop-color:#559D13"/>
+ <stop offset="1" style="stop-color:#284F09"/>
</linearGradient>
<path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.714c0.376,0.665,2.351,3.067,2.967,3.737 c0.492,0.53,0.587,0.869,0.274,1.297c-0.035,0.049-0.046,0.063-0.046,0.063c-0.183,0.253-0.738,1.032-1.515,2.12 c-0.203-0.252-2.807-3.469-2.956-4.8C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
-<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112 C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711 c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571 C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617 C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B5DC77" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737 c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108 c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274 c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982 c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273 c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107 c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736 c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606 c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B5DC77" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112 C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711 c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571 C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617 C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B5DC77" opacity="0.5"/>
+<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737 c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108 c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274 c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982 c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273 c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107 c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736 c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606 c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B5DC77" opacity="0.6"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -608.1406 2931.3247)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-1610.522" x2="-1610.522" y1="-2533.3467" y2="-2471.428">
-<stop offset="0" style="stop-color:#447F0F"/>
-<stop offset="0.5" style="stop-color:#284F09"/>
-<stop offset="1" style="stop-color:#40790E"/>
+ <stop offset="0" style="stop-color:#447F0F"/>
+ <stop offset="0.5" style="stop-color:#284F09"/>
+ <stop offset="1" style="stop-color:#40790E"/>
</linearGradient>
-<path d="M2.899,45.012c1.275-2.776,10.299-14.805,18.804-23.31 c8.505-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26 c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.534,18.958c-8.562,8.562-17.667,20.715-18.96,23.535 c-0.038,0.086-0.063,0.165-0.101,0.25c0.071,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_4_)" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M2.899,45.012c1.275-2.776,10.299-14.805,18.804-23.31 c8.505-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26 c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.534,18.958c-8.562,8.562-17.667,20.715-18.96,23.535 c-0.038,0.086-0.063,0.165-0.101,0.25c0.071,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_4_)" opacity="0.5"/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<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"/>
+<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" opacity="0.35"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="15" x2="15" y1="1" y2="28.9273">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+ <stop offset="0.0667" style="stop-color:#D1D7D9"/>
+ <stop offset="0.2606" style="stop-color:#BDC2C4"/>
+ <stop offset="0.6606" style="stop-color:#949DA1"/>
+ <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">
-<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"/>
+ <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">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+ <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"/>
+<rect fill="url(#SVGID_3__)" height="18.795" 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">
-<stop offset="0" style="stop-color:#6E6E6E"/>
-<stop offset="1" style="stop-color:#333333"/>
+ <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">
-<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"/>
+ <stop offset="0" style="stop-color:#3BC8EB"/>
+ <stop offset="0.3879" style="stop-color:#2D9BD2"/>
+ <stop offset="0.8909" 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">
-<stop offset="0" style="stop-color:#85EFFF"/>
-<stop offset="1" style="stop-color:#3BA1D9"/>
+ <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">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#FFFFFF"/>
+ <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"/>
+<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_)" 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" opacity="0.5"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="14.9404" x2="14.9404" 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"/>
+ <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">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+ <stop offset="0.0667" style="stop-color:#D1D7D9"/>
+ <stop offset="0.2606" style="stop-color:#BDC2C4"/>
+ <stop offset="0.6606" style="stop-color:#949DA1"/>
+ <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_)"/>
<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"/>
+ <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"/>
+<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_)" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="8.833" x2="8.833" y1="22.8452" y2="26.7065">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+ <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"/>
+<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_)" opacity="0.7"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="8.834" x2="8.834" y1="23.2339" y2="26.3218">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+ <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_)"/>
<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"/>
+ <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"/>
+<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_)" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="20.8359" x2="20.8359" y1="22.8452" y2="26.7065">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+ <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"/>
+<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_)" opacity="0.7"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="20.8359" x2="20.8359" y1="23.2339" y2="26.3218">
-<stop offset="0" style="stop-color:#FFC142"/>
-<stop offset="0.7455" style="stop-color:#CF4E18"/>
-<stop offset="1" style="stop-color:#B52100"/>
+ <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"/>
+ <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="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"/>
+ <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"/>
-<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 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 "/>
+<polygon 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 "/>
<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 "/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_mobile_work.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_mobile_work.svg Fri May 14 16:09:54 2010 +0300
@@ -1,148 +1,145 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
-<stop offset="0.297" style="stop-color:#A7E722"/>
-<stop offset="0.6667" style="stop-color:#428C0F"/>
-<stop offset="0.7939" style="stop-color:#5CA617"/>
-<stop offset="1" style="stop-color:#5CA617"/>
+ <stop offset="0.297" style="stop-color:#A7E722"/>
+ <stop offset="0.6667" style="stop-color:#428C0F"/>
+ <stop offset="0.7939" style="stop-color:#5CA617"/>
</radialGradient>
<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737 c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108 c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274 c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-2.477-2.889-8.594-5.015-10.752-5.399 c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571C11.203,27.277,3.722,37.795,2.668,40.352 c-1.108,2.691-0.581,4.645-0.236,6.567c0.387,2.158,2.511,8.275,5.4,10.752c0.718,0.616,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-1639.3428" x2="-1638.9111" y1="-2494.9824" y2="-2491.4067">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+ <stop offset="0" style="stop-color:#559D13"/>
+ <stop offset="1" style="stop-color:#284F09"/>
</linearGradient>
<path d="M35.172,17.107c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967 c0.535,0.492,0.873,0.588,1.301,0.274c0.047-0.034,0.063-0.046,0.064-0.046c0.252-0.184,1.031-0.739,2.119-1.514 c-0.252-0.205-3.469-2.809-4.801-2.956C36.855,15.598,35.172,17.107,35.172,17.107z" fill="url(#SVGID_2_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -1696.8304 4072.5859)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1639.3467" x2="-1638.9149" y1="4063.0557" y2="4066.6318">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+ <stop offset="0" style="stop-color:#559D13"/>
+ <stop offset="1" style="stop-color:#284F09"/>
</linearGradient>
<path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.714c0.376,0.665,2.351,3.067,2.967,3.737 c0.492,0.53,0.587,0.869,0.274,1.297c-0.035,0.049-0.046,0.063-0.046,0.063c-0.183,0.253-0.738,1.032-1.515,2.12 c-0.203-0.252-2.807-3.469-2.956-4.8C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
-<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112 C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711 c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571 C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617 C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B5DC77" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737 c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108 c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274 c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982 c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273 c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107 c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736 c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606 c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B5DC77" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112 C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711 c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571 C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617 C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B5DC77" opacity="0.5"/>
+<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737 c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108 c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274 c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982 c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273 c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107 c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736 c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606 c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B5DC77" opacity="0.6"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -608.1406 2931.3247)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-1610.522" x2="-1610.522" y1="-2533.3467" y2="-2471.428">
-<stop offset="0" style="stop-color:#447F0F"/>
-<stop offset="0.5" style="stop-color:#284F09"/>
-<stop offset="1" style="stop-color:#40790E"/>
+ <stop offset="0" style="stop-color:#447F0F"/>
+ <stop offset="0.5" style="stop-color:#284F09"/>
+ <stop offset="1" style="stop-color:#40790E"/>
</linearGradient>
-<path d="M2.899,45.012c1.275-2.776,10.299-14.805,18.804-23.31 c8.505-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26 c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.534,18.958c-8.562,8.562-17.667,20.715-18.96,23.535 c-0.038,0.086-0.063,0.165-0.101,0.25c0.071,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_4_)" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M2.899,45.012c1.275-2.776,10.299-14.805,18.804-23.31 c8.505-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26 c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.534,18.958c-8.562,8.562-17.667,20.715-18.96,23.535 c-0.038,0.086-0.063,0.165-0.101,0.25c0.071,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_4_)" opacity="0.5"/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<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"/>
+<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" opacity="0.35"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="14.999" x2="14.999" y1="1" y2="28.9273">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+ <stop offset="0.0667" style="stop-color:#D1D7D9"/>
+ <stop offset="0.2606" style="stop-color:#BDC2C4"/>
+ <stop offset="0.6606" style="stop-color:#949DA1"/>
+ <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">
-<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"/>
+ <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">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+ <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"/>
+<rect fill="url(#SVGID_3__)" height="18.795" 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">
-<stop offset="0" style="stop-color:#6E6E6E"/>
-<stop offset="1" style="stop-color:#333333"/>
+ <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">
-<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"/>
+ <stop offset="0" style="stop-color:#3BC8EB"/>
+ <stop offset="0.3879" style="stop-color:#2D9BD2"/>
+ <stop offset="0.8909" 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">
-<stop offset="0" style="stop-color:#85EFFF"/>
-<stop offset="1" style="stop-color:#3BA1D9"/>
+ <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">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#FFFFFF"/>
+ <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"/>
+<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_)" 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" opacity="0.5"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="14.9404" x2="14.9404" 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"/>
+ <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">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+ <stop offset="0.0667" style="stop-color:#D1D7D9"/>
+ <stop offset="0.2606" style="stop-color:#BDC2C4"/>
+ <stop offset="0.6606" style="stop-color:#949DA1"/>
+ <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_)"/>
<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"/>
+ <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"/>
+<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_)" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="8.832" x2="8.832" y1="22.8452" y2="26.7065">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+ <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"/>
+<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_)" opacity="0.7"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="8.833" x2="8.833" y1="23.2339" y2="26.3218">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+ <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">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+ <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"/>
+<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_)" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="20.835" x2="20.835" y1="22.8452" y2="26.7065">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+ <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"/>
+<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_)" opacity="0.7"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="20.8359" x2="20.8359" y1="23.2339" y2="26.3218">
-<stop offset="0" style="stop-color:#FFC142"/>
-<stop offset="0.7455" style="stop-color:#CF4E18"/>
-<stop offset="1" style="stop-color:#B52100"/>
+ <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_)"/>
<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"/>
+ <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="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"/>
+ <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,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" 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"/>
+<rect height="6.103" opacity="0.3" width="1.018" x="22.516" y="19.329"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_muted.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_muted.svg Fri May 14 16:09:54 2010 +0300
@@ -1,40 +1,42 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
+<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" opacity="0.1"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="267.0962" x2="290.189" y1="468.0112" y2="468.0112">
-<stop offset="0" style="stop-color:#A8B1B3"/>
-<stop offset="0.3818" style="stop-color:#FFFFFF"/>
-<stop offset="0.7091" style="stop-color:#686E70"/>
-<stop offset="1" style="stop-color:#A6B0B3"/>
+ <stop offset="0" style="stop-color:#A8B1B3"/>
+ <stop offset="0.3818" style="stop-color:#FFFFFF"/>
+ <stop offset="0.7091" style="stop-color:#686E70"/>
+ <stop offset="1" style="stop-color:#A6B0B3"/>
</linearGradient>
<path d="M47.688,5.382c-4.507-4.509-11.819-4.509-16.327,0L21.019,15.725l16.328,16.328l10.341-10.342 C52.198,17.202,52.199,9.893,47.688,5.382z" fill="url(#SVGID_1_)"/>
-<path d="M47.688,5.382c-4.507-4.509-11.819-4.509-16.327,0l-1.634,1.633 c4.51-4.509,9.643-2.331,14.151,2.178c4.511,4.51,6.687,9.644,2.178,14.151l1.632-1.633C52.198,17.202,52.199,9.893,47.688,5.382z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M47.688,5.382c-4.507-4.509-11.819-4.509-16.327,0l-1.634,1.633 c4.51-4.509,11.821-4.509,16.33,0c4.51,4.511,4.508,11.821,0,16.329l1.632-1.633C52.198,17.202,52.199,9.893,47.688,5.382z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M47.688,5.382c-4.507-4.509-11.819-4.509-16.327,0l-1.634,1.633 c4.51-4.509,9.643-2.331,14.151,2.178c4.511,4.51,6.687,9.644,2.178,14.151l1.632-1.633C52.198,17.202,52.199,9.893,47.688,5.382z" fill="#FFFFFF" opacity="0.2"/>
+<path d="M47.688,5.382c-4.507-4.509-11.819-4.509-16.327,0l-1.634,1.633 c4.51-4.509,11.821-4.509,16.33,0c4.51,4.511,4.508,11.821,0,16.329l1.632-1.633C52.198,17.202,52.199,9.893,47.688,5.382z" fill="#FFFFFF" opacity="0.2"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="267.0962" x2="290.1899" y1="493.0283" y2="493.0283">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.3818" style="stop-color:#7A7A7A"/>
-<stop offset="0.7091" style="stop-color:#1A1A1A"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.3818" style="stop-color:#7A7A7A"/>
+ <stop offset="0.7091" style="stop-color:#1A1A1A"/>
+ <stop offset="1" style="stop-color:#4D4D4D"/>
</linearGradient>
<path d="M21.019,15.725l-8.709,8.707c-4.51,4.51-4.51,11.821,0,16.33c4.508,4.51,11.821,4.51,16.33,0 l8.708-8.709L21.019,15.725z" fill="url(#SVGID_2_)"/>
-<path d="M16.664,36.407c-4.51-4.509-8.318-8.01-3.81-12.52l-0.544,0.544c-4.51,4.51-4.51,11.821,0,16.33 c4.508,4.51,11.821,4.51,16.33,0l0.543-0.545C24.674,44.728,21.173,40.916,16.664,36.407z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M15.031,38.04c-4.508-4.508-6.685-9.643-2.177-14.152l-0.544,0.544c-4.51,4.51-4.51,11.821,0,16.33 c4.508,4.51,11.821,4.51,16.33,0l0.543-0.545C24.674,44.728,19.541,42.55,15.031,38.04z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M13.398,39.674C8.889,35.164,7.8,28.941,12.31,24.432l0,0c-4.51,4.51-4.51,11.821,0,16.33 c4.508,4.51,11.821,4.51,16.33,0l0,0C24.131,45.271,17.909,44.183,13.398,39.674z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M16.664,36.407c-4.51-4.509-8.318-8.01-3.81-12.52l-0.544,0.544c-4.51,4.51-4.51,11.821,0,16.33 c4.508,4.51,11.821,4.51,16.33,0l0.543-0.545C24.674,44.728,21.173,40.916,16.664,36.407z" opacity="0.1"/>
+<path d="M15.031,38.04c-4.508-4.508-6.685-9.643-2.177-14.152l-0.544,0.544c-4.51,4.51-4.51,11.821,0,16.33 c4.508,4.51,11.821,4.51,16.33,0l0.543-0.545C24.674,44.728,19.541,42.55,15.031,38.04z" opacity="0.2"/>
+<path d="M13.398,39.674C8.889,35.164,7.8,28.941,12.31,24.432l0,0c-4.51,4.51-4.51,11.821,0,16.33 c4.508,4.51,11.821,4.51,16.33,0l0,0C24.131,45.271,17.909,44.183,13.398,39.674z" opacity="0.2"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="266.3257" x2="290.9585" y1="483.7915" y2="483.7915">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.3818" style="stop-color:#7A7A7A"/>
-<stop offset="0.7091" style="stop-color:#1A1A1A"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.3818" style="stop-color:#7A7A7A"/>
+ <stop offset="0.7091" style="stop-color:#1A1A1A"/>
+ <stop offset="1" style="stop-color:#4D4D4D"/>
</linearGradient>
<path d="M34.626,35.862c-0.301,0.3-0.79,0.3-1.09,0L17.208,19.534c-0.299-0.3-0.299-0.789,0-1.089 l2.721-2.721c0.301-0.3,0.791-0.3,1.09,0l16.328,16.328c0.3,0.3,0.3,0.79,0,1.089L34.626,35.862z" fill="url(#SVGID_3_)"/>
-<path d="M37.347,32.053L21.019,15.725c-0.3-0.3-0.79-0.3-1.09,0l-0.544,0.544 c0.301-0.299,0.79-0.299,1.09,0l16.328,16.328c0.3,0.3,0.3,0.79,0,1.089l0.544-0.544C37.647,32.843,37.647,32.353,37.347,32.053z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<rect fill-opacity="0.1" height="0.77" stroke-opacity="0.1" transform="matrix(0.7071 0.7071 -0.7071 0.7071 27.5824 -8.4675)" width="23.093" x="12.465" y="28.674"/>
-<rect fill="#FFFFFF" fill-opacity="0.2" height="0.771" stroke-opacity="0.2" transform="matrix(0.7071 0.7071 -0.7071 0.7071 25.326 -13.911)" width="23.091" x="17.909" y="23.23"/>
-<rect fill-opacity="0.2" height="0.769" stroke-opacity="0.2" transform="matrix(0.7071 0.7071 -0.7071 0.7071 27.3549 -9.0122)" width="23.091" x="13.01" y="28.13"/>
-<rect fill-opacity="0.4" height="0.769" stroke-opacity="0.4" transform="matrix(0.7071 0.7071 -0.7071 0.7071 27.131 -9.5558)" width="23.092" x="13.554" y="27.586"/>
+<path d="M37.347,32.053L21.019,15.725c-0.3-0.3-0.79-0.3-1.09,0l-0.544,0.544 c0.301-0.299,0.79-0.299,1.09,0l16.328,16.328c0.3,0.3,0.3,0.79,0,1.089l0.544-0.544C37.647,32.843,37.647,32.353,37.347,32.053z" fill="#FFFFFF" opacity="0.2"/>
+<rect height="0.77" opacity="0.1" transform="matrix(0.7071 0.7071 -0.7071 0.7071 27.5824 -8.4675)" width="23.093" x="12.465" y="28.674"/>
+<rect fill="#FFFFFF" height="0.771" opacity="0.2" transform="matrix(0.7071 0.7071 -0.7071 0.7071 25.326 -13.911)" width="23.091" x="17.909" y="23.23"/>
+<rect height="0.769" opacity="0.2" transform="matrix(0.7071 0.7071 -0.7071 0.7071 27.3549 -9.0122)" width="23.091" x="13.01" y="28.13"/>
+<rect height="0.769" opacity="0.4" transform="matrix(0.7071 0.7071 -0.7071 0.7071 27.131 -9.5558)" width="23.092" x="13.554" y="27.586"/>
<path d="M22.652,15.179c0.301-0.299,0.301-0.786,0-1.087l-1.089,1.087C21.864,15.481,22.351,15.48,22.652,15.179z" fill="#FFFFFF"/>
<path d="M27.005,10.824c0.301-0.3,0.301-0.787,0-1.088l-1.087,1.088C26.217,11.126,26.705,11.125,27.005,10.824z" fill="#FFFFFF"/>
<path d="M31.361,6.471c0.291-0.291,0.293-0.753,0.021-1.055c-0.19,0.167-0.384,0.329-0.566,0.511l-0.544,0.544 C30.571,6.771,31.059,6.771,31.361,6.471z" fill="#FFFFFF"/>
@@ -57,207 +59,187 @@
<circle cx="36.803" cy="16.269" fill="#FFFFFF" r="0.769"/>
<circle cx="41.157" cy="11.914" fill="#FFFFFF" r="0.77"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="267.4819" x2="267.4819" y1="462.314" y2="479.7079">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
-<stop offset="0.7152" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.2" style="stop-color:#504E4E"/>
+ <stop offset="0.7152" style="stop-color:#000000"/>
</linearGradient>
<path d="M23.196,14.637c0.301-0.302,0.301-0.788,0-1.091l-1.088,1.091 C22.409,14.937,22.895,14.937,23.196,14.637z" fill="url(#SVGID_4_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="267.481" x2="267.481" y1="462.3311" y2="479.7029">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
-<stop offset="0.7152" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.2" style="stop-color:#504E4E"/>
+ <stop offset="0.7152" style="stop-color:#000000"/>
</linearGradient>
<path d="M27.549,10.28c0.302-0.3,0.302-0.788,0-1.088l-1.087,1.088C26.763,10.582,27.249,10.581,27.549,10.28 z" fill="url(#SVGID_5_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="267.481" x2="267.481" y1="462.3467" y2="479.6524">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
-<stop offset="0.7152" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.2" style="stop-color:#504E4E"/>
+ <stop offset="0.7152" style="stop-color:#000000"/>
</linearGradient>
<path d="M31.903,5.927c0.292-0.291,0.294-0.754,0.023-1.057c-0.192,0.168-0.386,0.33-0.566,0.512 l-0.545,0.545C31.116,6.228,31.603,6.228,31.903,5.927z" fill="url(#SVGID_6_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="270.9458" x2="270.9458" y1="462.3418" y2="479.7027">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
-<stop offset="0.7152" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.2" style="stop-color:#504E4E"/>
+ <stop offset="0.7152" style="stop-color:#000000"/>
</linearGradient>
<circle cx="27.549" cy="14.635" fill="url(#SVGID_7_)" r="0.769"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="270.9458" x2="270.9458" y1="462.3311" y2="479.6974">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
-<stop offset="0.7152" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.2" style="stop-color:#504E4E"/>
+ <stop offset="0.7152" style="stop-color:#000000"/>
</linearGradient>
<circle cx="31.905" cy="10.28" fill="url(#SVGID_8_)" r="0.769"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="270.9458" x2="270.9458" y1="462.3247" y2="479.6966">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
-<stop offset="0.7152" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.2" style="stop-color:#504E4E"/>
+ <stop offset="0.7152" style="stop-color:#000000"/>
</linearGradient>
<circle cx="36.26" cy="5.926" fill="url(#SVGID_9_)" r="0.769"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="274.7954" x2="274.7954" y1="462.314" y2="479.7079">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
-<stop offset="0.7152" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.2" style="stop-color:#504E4E"/>
+ <stop offset="0.7152" style="stop-color:#000000"/>
</linearGradient>
<circle cx="28.094" cy="19.534" fill="url(#SVGID_10_)" r="0.77"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="274.7944" x2="274.7944" y1="462.3257" y2="479.7086">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
-<stop offset="0.7152" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.2" style="stop-color:#504E4E"/>
+ <stop offset="0.7152" style="stop-color:#000000"/>
</linearGradient>
<circle cx="32.448" cy="15.181" fill="url(#SVGID_11_)" r="0.77"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="274.7944" x2="274.7944" y1="462.3267" y2="479.6985">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
-<stop offset="0.7152" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.2" style="stop-color:#504E4E"/>
+ <stop offset="0.7152" style="stop-color:#000000"/>
</linearGradient>
<circle cx="36.803" cy="10.825" fill="url(#SVGID_12_)" r="0.769"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="289.8052" x2="289.8052" y1="462.335" y2="479.7068">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
-<stop offset="0.7152" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.2" style="stop-color:#504E4E"/>
+ <stop offset="0.7152" style="stop-color:#000000"/>
</linearGradient>
<path d="M38.437,29.876c-0.301,0.301-0.301,0.788,0,1.088l1.088-1.088 C39.225,29.574,38.737,29.575,38.437,29.876z" fill="url(#SVGID_13_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="289.8052" x2="289.8052" y1="462.3247" y2="479.7076">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
-<stop offset="0.7152" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.2" style="stop-color:#504E4E"/>
+ <stop offset="0.7152" style="stop-color:#000000"/>
</linearGradient>
<path d="M42.79,25.521c-0.301,0.301-0.301,0.787,0,1.09l1.088-1.09C43.579,25.22,43.091,25.22,42.79,25.521z " fill="url(#SVGID_14_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="289.8032" x2="289.8032" y1="462.3516" y2="479.6407">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
-<stop offset="0.7152" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.2" style="stop-color:#504E4E"/>
+ <stop offset="0.7152" style="stop-color:#000000"/>
</linearGradient>
<path d="M48.201,21.146c-0.302-0.274-0.765-0.271-1.057,0.02c-0.301,0.302-0.301,0.788,0,1.089l0.544-0.544 C47.871,21.529,48.034,21.335,48.201,21.146z" fill="url(#SVGID_15_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="286.3403" x2="286.3403" y1="462.3247" y2="479.7076">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
-<stop offset="0.7152" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.2" style="stop-color:#504E4E"/>
+ <stop offset="0.7152" style="stop-color:#000000"/>
</linearGradient>
<circle cx="38.436" cy="25.521" fill="url(#SVGID_16_)" r="0.77"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="286.3403" x2="286.3403" y1="462.3271" y2="479.7046">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
-<stop offset="0.7152" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.2" style="stop-color:#504E4E"/>
+ <stop offset="0.7152" style="stop-color:#000000"/>
</linearGradient>
<circle cx="42.79" cy="21.167" fill="url(#SVGID_17_)" r="0.77"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="286.3403" x2="286.3403" y1="462.3262" y2="479.7036">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
-<stop offset="0.7152" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.2" style="stop-color:#504E4E"/>
+ <stop offset="0.7152" style="stop-color:#000000"/>
</linearGradient>
<path d="M47.688,17.357c-0.297,0.3-0.786,0.3-1.088,0c-0.301-0.301-0.301-0.788,0-1.089s0.787-0.301,1.088,0 C47.991,16.569,47.989,17.057,47.688,17.357z" fill="url(#SVGID_18_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="282.4907" x2="282.4907" y1="462.3296" y2="479.707">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
-<stop offset="0.7152" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.2" style="stop-color:#504E4E"/>
+ <stop offset="0.7152" style="stop-color:#000000"/>
</linearGradient>
<path d="M34.08,25.521c-0.298,0.301-0.786,0.301-1.088,0c-0.301-0.301-0.301-0.788,0-1.089 c0.301-0.3,0.789-0.301,1.088,0C34.383,24.734,34.381,25.22,34.08,25.521z" fill="url(#SVGID_19_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="282.4917" x2="282.4917" y1="462.3237" y2="479.7066">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
-<stop offset="0.7152" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.2" style="stop-color:#504E4E"/>
+ <stop offset="0.7152" style="stop-color:#000000"/>
</linearGradient>
<circle cx="37.892" cy="20.622" fill="url(#SVGID_20_)" r="0.77"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="282.4917" x2="282.4917" y1="462.3267" y2="479.7041">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
-<stop offset="0.7152" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.2" style="stop-color:#504E4E"/>
+ <stop offset="0.7152" style="stop-color:#000000"/>
</linearGradient>
<circle cx="42.246" cy="16.269" fill="url(#SVGID_21_)" r="0.77"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="278.6431" x2="278.6431" y1="462.3335" y2="479.7054">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
-<stop offset="0.7152" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.2" style="stop-color:#504E4E"/>
+ <stop offset="0.7152" style="stop-color:#000000"/>
</linearGradient>
<circle cx="32.992" cy="20.078" fill="url(#SVGID_22_)" r="0.769"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_23_" x1="278.6431" x2="278.6431" y1="462.3223" y2="479.7107">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
-<stop offset="0.7152" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.2" style="stop-color:#504E4E"/>
+ <stop offset="0.7152" style="stop-color:#000000"/>
</linearGradient>
<circle cx="37.347" cy="15.724" fill="url(#SVGID_23_)" r="0.77"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_24_" x1="278.6431" x2="278.6431" y1="462.3242" y2="479.7016">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
-<stop offset="0.7152" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.2" style="stop-color:#504E4E"/>
+ <stop offset="0.7152" style="stop-color:#000000"/>
</linearGradient>
<circle cx="41.702" cy="11.369" fill="url(#SVGID_24_)" r="0.769"/>
<linearGradient gradientTransform="matrix(1 0 0 1 -374.1758 -502.9102)" gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="404.7837" x2="396.38" y1="554.8911" y2="554.8911">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2545" style="stop-color:#1A1A1A"/>
-<stop offset="0.6182" style="stop-color:#7A7A7A"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.2545" style="stop-color:#1A1A1A"/>
+ <stop offset="0.6182" style="stop-color:#7A7A7A"/>
+ <stop offset="1" style="stop-color:#4D4D4D"/>
</linearGradient>
<path d="M30.288,54.397c-0.001,1.216-0.979,2.203-2.185,2.203h-3.328c-1.207,0-2.185-0.987-2.185-2.2v-5.618 c0-1.215,0.978-1.42,2.185-1.42h3.327c1.207,0,2.184,0.205,2.184,1.42L30.288,54.397z" fill="url(#SVGID_25_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_26_" x1="14.8921" x2="37.9844" y1="56.0747" y2="56.0747">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.3818" style="stop-color:#999999"/>
-<stop offset="0.7515" style="stop-color:#1A1A1A"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.3818" style="stop-color:#999999"/>
+ <stop offset="0.7515" style="stop-color:#1A1A1A"/>
+ <stop offset="1" style="stop-color:#4D4D4D"/>
</linearGradient>
<path d="M37.937,58c0.032-0.767,0.048-0.92,0.048-1.078v-0.506c0-1.251-1.026-2.267-2.292-2.267H17.186 c-1.266,0-2.293,1.016-2.293,2.267v0.506c0,0.158,0.019,0.312,0.049,1.078H37.937z" fill="url(#SVGID_26_)"/>
-<path d="M15.032,55.661h22.811c-0.101-0.282-0.255-0.537-0.453-0.755H15.488 C15.29,55.124,15.135,55.379,15.032,55.661z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M14.904,57.243c0.009,0.154,0.02,0.381,0.035,0.757h22.997c0.017-0.376,0.028-0.603,0.037-0.757H14.904z" fill-opacity="0.35" stroke-opacity="0.35"/>
-<path d="M15.488,54.906H37.39c-0.42-0.462-1.021-0.757-1.698-0.757H17.186 C16.509,54.149,15.908,54.444,15.488,54.906z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M30,49.086v-0.304c0-1.215-0.906-1.42-2.022-1.42h-3.079c-1.115,0-2.02,0.205-2.02,1.42v0.304 c0.391,0.721,1.147,1.216,2.02,1.216h3.079C28.854,50.302,29.606,49.807,30,49.086z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M29.518,47.992v-0.294c-0.371-0.265-0.918-0.336-1.54-0.336h-3.079c-0.62,0-1.169,0.071-1.539,0.336v0.294 c0,0.85,0.69,1.54,1.539,1.54h3.079C28.827,49.532,29.518,48.842,29.518,47.992z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M28.64,40.762l1.648-1.649V25.67c0-0.298-0.062-0.58-0.164-0.84l-1.305-1.307 c-0.261-0.104-0.542-0.163-0.841-0.163h-3.079c-1.273,0-2.309,1.036-2.309,2.31v18.275C24.807,43.534,26.924,42.476,28.64,40.762z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M28.64,40.762l0.878-0.879V25.67c0-0.85-0.691-1.54-1.54-1.54h-3.079c-0.849,0-1.539,0.69-1.539,1.54v18.097 C25.293,43.269,27.125,42.275,28.64,40.762z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M15.032,55.661h22.811c-0.101-0.282-0.255-0.537-0.453-0.755H15.488 C15.29,55.124,15.135,55.379,15.032,55.661z" fill="#FFFFFF" opacity="0.2"/>
+<path d="M14.904,57.243c0.009,0.154,0.02,0.381,0.035,0.757h22.997c0.017-0.376,0.028-0.603,0.037-0.757H14.904z" opacity="0.35"/>
+<path d="M15.488,54.906H37.39c-0.42-0.462-1.021-0.757-1.698-0.757H17.186 C16.509,54.149,15.908,54.444,15.488,54.906z" fill="#FFFFFF" opacity="0.4"/>
+<path d="M30,49.086v-0.304c0-1.215-0.906-1.42-2.022-1.42h-3.079c-1.115,0-2.02,0.205-2.02,1.42v0.304 c0.391,0.721,1.147,1.216,2.02,1.216h3.079C28.854,50.302,29.606,49.807,30,49.086z" opacity="0.1"/>
+<path d="M29.518,47.992v-0.294c-0.371-0.265-0.918-0.336-1.54-0.336h-3.079c-0.62,0-1.169,0.071-1.539,0.336v0.294 c0,0.85,0.69,1.54,1.539,1.54h3.079C28.827,49.532,29.518,48.842,29.518,47.992z" opacity="0.2"/>
+<path d="M28.64,40.762l1.648-1.649V25.67c0-0.298-0.062-0.58-0.164-0.84l-1.305-1.307 c-0.261-0.104-0.542-0.163-0.841-0.163h-3.079c-1.273,0-2.309,1.036-2.309,2.31v18.275C24.807,43.534,26.924,42.476,28.64,40.762z" opacity="0.1"/>
+<path d="M28.64,40.762l0.878-0.879V25.67c0-0.85-0.691-1.54-1.54-1.54h-3.079c-0.849,0-1.539,0.69-1.539,1.54v18.097 C25.293,43.269,27.125,42.275,28.64,40.762z" opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_27_" x1="26.4395" x2="26.4395" y1="25.1289" y2="48.4234">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.3818" style="stop-color:#7A7A7A"/>
-<stop offset="0.7091" style="stop-color:#1A1A1A"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.3818" style="stop-color:#7A7A7A"/>
+ <stop offset="0.7091" style="stop-color:#1A1A1A"/>
+ <stop offset="1" style="stop-color:#4D4D4D"/>
</linearGradient>
<path d="M28.748,47.992c0,0.426-0.344,0.77-0.77,0.77h-3.079c-0.425,0-0.768-0.344-0.768-0.77V25.67 c0-0.425,0.343-0.771,0.768-0.771h3.079c0.426,0,0.77,0.346,0.77,0.771V47.992z" fill="url(#SVGID_27_)"/>
-<path d="M26.439,29.237c-2.124,0-3.849-1.727-3.849-3.848c0-2.123,1.725-3.85,3.849-3.85 c2.121,0,3.848,1.727,3.848,3.85C30.288,27.511,28.56,29.237,26.439,29.237L26.439,29.237z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M26.439,29.237c-2.124,0-3.849-1.727-3.849-3.848c0-2.123,1.725-3.85,3.849-3.85 c2.121,0,3.848,1.727,3.848,3.85C30.288,27.511,28.56,29.237,26.439,29.237L26.439,29.237z" opacity="0.35"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_28_" x1="26.439" x2="26.439" y1="22.3696" y2="28.3803">
-<stop offset="0" style="stop-color:#9D9B9C"/>
-<stop offset="0.1515" style="stop-color:#D6D4D4"/>
-<stop offset="0.703" style="stop-color:#555557"/>
-<stop offset="0.9879" style="stop-color:#575757"/>
-<stop offset="1" style="stop-color:#575757"/>
+ <stop offset="0" style="stop-color:#9D9B9C"/>
+ <stop offset="0.1515" style="stop-color:#D6D4D4"/>
+ <stop offset="0.703" style="stop-color:#555557"/>
+ <stop offset="0.9879" style="stop-color:#575757"/>
</linearGradient>
<circle cx="26.439" cy="25.39" fill="url(#SVGID_28_)" r="3.079"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_29_" x1="26.4385" x2="26.4385" y1="23.8794" y2="26.8862">
-<stop offset="0" style="stop-color:#646464"/>
-<stop offset="1" style="stop-color:#EBEBEB"/>
+ <stop offset="0" style="stop-color:#646464"/>
+ <stop offset="1" style="stop-color:#EBEBEB"/>
</linearGradient>
<path d="M26.439,26.93c-0.851,0-1.541-0.691-1.541-1.54c0-0.85,0.69-1.54,1.541-1.54 c0.847,0,1.539,0.69,1.539,1.54C27.978,26.238,27.287,26.93,26.439,26.93L26.439,26.93z" fill="url(#SVGID_29_)"/>
-<rect fill-opacity="0.2" height="0.769" stroke-opacity="0.2" width="7.697" x="22.59" y="53.381"/>
-<rect fill-opacity="0.1" height="0.77" stroke-opacity="0.1" width="7.697" x="22.59" y="52.611"/>
+<rect height="0.769" opacity="0.2" width="7.697" x="22.59" y="53.381"/>
+<rect height="0.77" opacity="0.1" width="7.697" x="22.59" y="52.611"/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(2 0 0 2 0 0)">
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
-<rect fill-opacity="0.35" height="33.866" stroke-opacity="0.35" transform="matrix(-0.6985 0.7156 -0.7156 -0.6985 35.9922 14.2223)" width="3.706" x="13.147" y="-2.239"/>
+<rect height="33.866" opacity="0.35" transform="matrix(-0.6985 0.7156 -0.7156 -0.6985 35.9922 14.2223)" width="3.706" x="13.147" y="-2.239"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -257 670.6689)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="260" x2="284" y1="655.9761" y2="655.9761">
-<stop offset="0" style="stop-color:#FF4D00"/>
-<stop offset="0.8424" style="stop-color:#CC1414"/>
-<stop offset="1" style="stop-color:#FF4D00"/>
+ <stop offset="0" style="stop-color:#FF4D00"/>
+ <stop offset="0.8424" style="stop-color:#CC1414"/>
+ <stop offset="1" style="stop-color:#FF4D00"/>
</linearGradient>
<polygon fill="url(#SVGID_1__)" points="25.809,26.431 3,4.177 4.191,2.956 27,25.21 "/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_pager.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_pager.svg Fri May 14 16:09:54 2010 +0300
@@ -1,113 +1,111 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
-<stop offset="0.297" style="stop-color:#A7E722"/>
-<stop offset="0.6667" style="stop-color:#428C0F"/>
-<stop offset="0.7939" style="stop-color:#5CA617"/>
-<stop offset="1" style="stop-color:#5CA617"/>
+ <stop offset="0.297" style="stop-color:#A7E722"/>
+ <stop offset="0.6667" style="stop-color:#428C0F"/>
+ <stop offset="0.7939" style="stop-color:#5CA617"/>
</radialGradient>
<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737 c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108 c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274 c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-2.477-2.889-8.594-5.015-10.752-5.399 c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571C11.203,27.277,3.722,37.795,2.668,40.352 c-1.108,2.691-0.581,4.645-0.236,6.567c0.387,2.158,2.511,8.275,5.4,10.752c0.718,0.616,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-1639.3428" x2="-1638.9111" y1="-2494.9824" y2="-2491.4067">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+ <stop offset="0" style="stop-color:#559D13"/>
+ <stop offset="1" style="stop-color:#284F09"/>
</linearGradient>
<path d="M35.172,17.107c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967 c0.535,0.492,0.873,0.588,1.301,0.274c0.047-0.034,0.063-0.046,0.064-0.046c0.252-0.184,1.031-0.739,2.119-1.514 c-0.252-0.205-3.469-2.809-4.801-2.956C36.855,15.598,35.172,17.107,35.172,17.107z" fill="url(#SVGID_2_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -1696.8304 4072.5859)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1639.3467" x2="-1638.9149" y1="4063.0557" y2="4066.6318">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+ <stop offset="0" style="stop-color:#559D13"/>
+ <stop offset="1" style="stop-color:#284F09"/>
</linearGradient>
<path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.714c0.376,0.665,2.351,3.067,2.967,3.737 c0.492,0.53,0.587,0.869,0.274,1.297c-0.035,0.049-0.046,0.063-0.046,0.063c-0.183,0.253-0.738,1.032-1.515,2.12 c-0.203-0.252-2.807-3.469-2.956-4.8C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
-<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112 C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711 c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571 C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617 C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B5DC77" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737 c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108 c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274 c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982 c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273 c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107 c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736 c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606 c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B5DC77" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112 C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711 c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571 C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617 C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B5DC77" opacity="0.5"/>
+<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737 c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108 c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274 c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982 c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273 c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107 c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736 c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606 c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B5DC77" opacity="0.6"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -608.1406 2931.3247)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-1610.522" x2="-1610.522" y1="-2533.3467" y2="-2471.428">
-<stop offset="0" style="stop-color:#447F0F"/>
-<stop offset="0.5" style="stop-color:#284F09"/>
-<stop offset="1" style="stop-color:#40790E"/>
+ <stop offset="0" style="stop-color:#447F0F"/>
+ <stop offset="0.5" style="stop-color:#284F09"/>
+ <stop offset="1" style="stop-color:#40790E"/>
</linearGradient>
-<path d="M2.899,45.012c1.275-2.776,10.299-14.805,18.804-23.31 c8.505-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26 c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.534,18.958c-8.562,8.562-17.667,20.715-18.96,23.535 c-0.038,0.086-0.063,0.165-0.101,0.25c0.071,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_4_)" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M2.899,45.012c1.275-2.776,10.299-14.805,18.804-23.31 c8.505-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26 c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.534,18.958c-8.562,8.562-17.667,20.715-18.96,23.535 c-0.038,0.086-0.063,0.165-0.101,0.25c0.071,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_4_)" opacity="0.5"/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<polygon fill="none" points="0,6.354 0,23.646 0,30 30,30 30,23.646 30,6.354 30,0 0,0 "/>
-<path d="M2.647,26.295C1.188,26.295,0,25.106,0,23.646V6.354c0-1.46,1.188-2.648,2.647-2.648h24.706 C28.813,3.705,30,4.894,30,6.354v17.293c0,1.46-1.188,2.648-2.646,2.648H2.647z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M2.647,26.295C1.188,26.295,0,25.106,0,23.646V6.354c0-1.46,1.188-2.648,2.647-2.648h24.706 C28.813,3.705,30,4.894,30,6.354v17.293c0,1.46-1.188,2.648-2.646,2.648H2.647z" opacity="0.35"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="15" x2="15" y1="4.4658" y2="25.0557">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+ <stop offset="0.0667" style="stop-color:#D1D7D9"/>
+ <stop offset="0.2606" style="stop-color:#BDC2C4"/>
+ <stop offset="0.6606" style="stop-color:#949DA1"/>
+ <stop offset="0.9636" style="stop-color:#ADB3B5"/>
+ <stop offset="1" style="stop-color:#595C5E"/>
</linearGradient>
<path d="M29,23.646c0,0.91-0.738,1.648-1.646,1.648H2.647C1.738,25.295,1,24.557,1,23.646V6.354 c0-0.91,0.738-1.648,1.647-1.648h24.706C28.262,4.705,29,5.443,29,6.354V23.646z" fill="url(#SVGID_1__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="15" x2="15" y1="4.4658" y2="25.0557">
-<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"/>
+ <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.354,4.705H2.647C1.738,4.705,1,5.443,1,6.354v17.293c0,0.91,0.738,1.648,1.647,1.648 c-0.681,0-1.235-0.554-1.235-1.236v-0.412V6.764v-0.41c0-0.682,0.555-1.235,1.235-1.235h24.706c0.683,0,1.234,0.554,1.234,1.235 v0.41v16.883v0.412c0,0.683-0.552,1.236-1.234,1.236c0.908,0,1.646-0.738,1.646-1.648V6.354C29,5.443,28.262,4.705,27.354,4.705z" fill="url(#SVGID_2__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="15.002" x2="15.002" y1="7.4736" y2="16.6938">
-<stop offset="0" style="stop-color:#686C6E"/>
-<stop offset="1" style="stop-color:#E4EEF2"/>
+ <stop offset="0" style="stop-color:#686C6E"/>
+ <stop offset="1" style="stop-color:#E4EEF2"/>
</linearGradient>
-<path d="M4.032,16.634c-0.455,0-0.825-0.374-0.825-0.832V8.288c0-0.459,0.37-0.834,0.825-0.834 h21.938c0.455,0,0.826,0.375,0.826,0.834v7.514c0,0.458-0.371,0.832-0.826,0.832H4.032z" fill="url(#SVGID_3__)" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M4.032,16.634c-0.455,0-0.825-0.374-0.825-0.832V8.288c0-0.459,0.37-0.834,0.825-0.834 h21.938c0.455,0,0.826,0.375,0.826,0.834v7.514c0,0.458-0.371,0.832-0.826,0.832H4.032z" fill="url(#SVGID_3__)" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="14.9995" x2="14.9995" y1="7.9063" y2="16.3741">
-<stop offset="0" style="stop-color:#171717"/>
-<stop offset="1" style="stop-color:#2E2E2E"/>
+ <stop offset="0" style="stop-color:#171717"/>
+ <stop offset="1" style="stop-color:#2E2E2E"/>
</linearGradient>
<path d="M26.379,15.802c0,0.229-0.184,0.415-0.413,0.415H4.032c-0.229,0-0.412-0.186-0.412-0.415V8.288 c0-0.231,0.184-0.416,0.412-0.416h21.934c0.229,0,0.413,0.185,0.413,0.416V15.802z" fill="url(#SVGID_4__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="14.999" x2="14.999" y1="-5.395" y2="21.0669">
-<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"/>
+ <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_5_)" height="7.514" width="21.934" x="4.032" y="8.288"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="14.999" x2="14.999" y1="0.04" y2="17.8522">
-<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"/>
+ <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_6_)" points="4.032,11.536 25.966,10.833 25.966,8.278 4.032,8.278 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="17.6641" x2="17.6641" y1="18.374" y2="21.7321">
-<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"/>
+ <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.734,21.702c-0.453,0-0.822-0.371-0.822-0.826V19.23 c0-0.454,0.369-0.824,0.822-0.824h5.856c0.455,0,0.825,0.37,0.825,0.824v1.646c0,0.455-0.37,0.826-0.825,0.826H14.734z" fill="url(#SVGID_7_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M20.591,21.702h-5.856c-0.453,0-0.822-0.371-0.822-0.826v0.412 c0,0.454,0.369,0.823,0.822,0.823h5.856c0.455,0,0.825-0.369,0.825-0.823v-0.412C21.416,21.331,21.046,21.702,20.591,21.702z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M14.734,21.702c-0.453,0-0.822-0.371-0.822-0.826V19.23 c0-0.454,0.369-0.824,0.822-0.824h5.856c0.455,0,0.825,0.37,0.825,0.824v1.646c0,0.455-0.37,0.826-0.825,0.826H14.734z" fill="url(#SVGID_7_)" opacity="0.8"/>
+<path d="M20.591,21.702h-5.856c-0.453,0-0.822-0.371-0.822-0.826v0.412 c0,0.454,0.369,0.823,0.822,0.823h5.856c0.455,0,0.825-0.369,0.825-0.823v-0.412C21.416,21.331,21.046,21.702,20.591,21.702z" fill="#231F20" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="17.6631" x2="17.6631" y1="18.7876" y2="21.3508">
-<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"/>
+ <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.004,20.876c0,0.229-0.184,0.412-0.413,0.412h-5.856c-0.229,0-0.412-0.184-0.412-0.412V19.23 c0-0.228,0.184-0.412,0.412-0.412h5.856c0.229,0,0.413,0.185,0.413,0.412V20.876z" fill="url(#SVGID_8_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="7.77" x2="7.77" y1="18.374" y2="21.7321">
-<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"/>
+ <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="M4.842,21.702c-0.452,0-0.823-0.371-0.823-0.826V19.23 c0-0.454,0.371-0.824,0.823-0.824h5.857c0.455,0,0.822,0.37,0.822,0.824v1.646c0,0.455-0.367,0.826-0.822,0.826H4.842z" fill="url(#SVGID_9_)" fill-opacity="0.8" stroke-opacity="0.8"/>
-<path d="M10.699,21.702H4.842c-0.452,0-0.823-0.371-0.823-0.826v0.412 c0,0.454,0.371,0.823,0.823,0.823h5.857c0.455,0,0.822-0.369,0.822-0.823v-0.412C11.521,21.331,11.154,21.702,10.699,21.702z" fill="#231F20" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M4.842,21.702c-0.452,0-0.823-0.371-0.823-0.826V19.23 c0-0.454,0.371-0.824,0.823-0.824h5.857c0.455,0,0.822,0.37,0.822,0.824v1.646c0,0.455-0.367,0.826-0.822,0.826H4.842z" fill="url(#SVGID_9_)" opacity="0.8"/>
+<path d="M10.699,21.702H4.842c-0.452,0-0.823-0.371-0.823-0.826v0.412 c0,0.454,0.371,0.823,0.823,0.823h5.857c0.455,0,0.822-0.369,0.822-0.823v-0.412C11.521,21.331,11.154,21.702,10.699,21.702z" fill="#231F20" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="7.772" x2="7.772" y1="18.7876" y2="21.3508">
-<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"/>
+ <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="M11.112,20.876c0,0.229-0.185,0.412-0.413,0.412H4.842c-0.227,0-0.41-0.184-0.41-0.412V19.23 c0-0.228,0.184-0.412,0.41-0.412h5.857c0.229,0,0.413,0.185,0.413,0.412V20.876z" fill="url(#SVGID_10_)"/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_service.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_service.svg Fri May 14 16:09:54 2010 +0300
@@ -1,73 +1,75 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<stop offset="0" style="stop-color:#3AC5EA"/>
-<stop offset="0.297" style="stop-color:#3AC5EA"/>
-<stop offset="0.6667" style="stop-color:#1754C9"/>
-<stop offset="0.7939" style="stop-color:#33ADE1"/>
-<stop offset="1" style="stop-color:#33ADE1"/>
+ <stop offset="0.297" style="stop-color:#3AC5EA"/>
+ <stop offset="0.6667" style="stop-color:#1754C9"/>
+ <stop offset="0.7939" style="stop-color:#33ADE1"/>
</radialGradient>
<path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333c-0.617-0.665-2.567-3.083-2.968-3.735 c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956c6.191-6.192,9.085-7.646,9.956-8.107 c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967c0.534,0.492,0.872,0.588,1.299,0.274 c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778c-2.476-2.889-8.594-5.015-10.751-5.399 c-1.923-0.345-3.876-0.872-6.567,0.235c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352 c-1.108,2.691-0.581,4.645-0.236,6.567c0.386,2.158,2.51,8.275,5.399,10.752c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2070.7568" x2="-2070.3252" y1="-2266.8511" y2="-2263.2749">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+ <stop offset="0" style="stop-color:#2685D2"/>
+ <stop offset="1" style="stop-color:#081D45"/>
</linearGradient>
<path d="M35.172,17.108c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967 c0.534,0.492,0.872,0.588,1.299,0.274c0.048-0.035,0.062-0.046,0.064-0.046c0.253-0.184,1.032-0.738,2.12-1.514 c-0.251-0.204-3.468-2.809-4.8-2.956C36.857,15.598,35.172,17.108,35.172,17.108z" fill="url(#SVGID_2_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -2128.2356 5114.0977)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2070.7607" x2="-2070.3289" y1="5104.5752" y2="5108.1523">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+ <stop offset="0" style="stop-color:#2685D2"/>
+ <stop offset="1" style="stop-color:#081D45"/>
</linearGradient>
<path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.713c0.376,0.666,2.351,3.069,2.967,3.738 c0.493,0.531,0.587,0.869,0.274,1.298c-0.035,0.047-0.046,0.062-0.046,0.062c-0.183,0.253-0.738,1.032-1.515,2.119 c-0.204-0.252-2.807-3.467-2.956-4.799C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="47.9224" x2="3.9991" y1="3.9307" y2="47.854">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+ <stop offset="0" style="stop-color:#ABEEFF"/>
+ <stop offset="1" style="stop-color:#539FDE"/>
</linearGradient>
-<path d="M2.979,47.467c-0.344-1.925-0.873-3.878,0.235-6.567 c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.341,4.269,40.9,3.215c2.691-1.108,4.644-0.581,6.567-0.236 c1.981,0.354,7.296,2.178,10.069,4.711c-2.552-2.815-8.496-4.879-10.617-5.258c-1.923-0.345-3.876-0.872-6.567,0.235 c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567 c0.378,2.122,2.441,8.065,5.258,10.617C5.156,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M2.979,47.467c-0.344-1.925-0.873-3.878,0.235-6.567 c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.341,4.269,40.9,3.215c2.691-1.108,4.644-0.581,6.567-0.236 c1.981,0.354,7.296,2.178,10.069,4.711c-2.552-2.815-8.496-4.879-10.617-5.258c-1.923-0.345-3.876-0.872-6.567,0.235 c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567 c0.378,2.122,2.441,8.065,5.258,10.617C5.156,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="54.3535" x2="3.9474" y1="3.2017" y2="53.6078">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+ <stop offset="0" style="stop-color:#ABEEFF"/>
+ <stop offset="1" style="stop-color:#539FDE"/>
</linearGradient>
-<path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333 c-0.617-0.665-2.567-3.083-2.968-3.735c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956 c6.191-6.192,9.085-7.646,9.956-8.107c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967 c0.534,0.492,0.872,0.588,1.299,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778 c-0.292-0.339-0.634-0.665-1.013-0.982c0.49,0.657,0.198,1.134-0.607,1.666C54.65,9.447,41.576,18.739,40.825,19.29 c-0.431,0.314-0.767,0.219-1.3-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.948-0.436-1.71-0.034 c-0.871,0.46-3.764,1.914-9.956,8.106c-6.193,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.319,1.135,0.035,1.711 c0.4,0.651,2.351,3.069,2.967,3.736c0.493,0.533,0.559,0.896,0.259,1.332c-0.517,0.755-9.828,13.794-10.76,15.195 c-0.533,0.803-1.008,1.098-1.665,0.606c0.314,0.378,0.644,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_5_)" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333 c-0.617-0.665-2.567-3.083-2.968-3.735c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956 c6.191-6.192,9.085-7.646,9.956-8.107c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967 c0.534,0.492,0.872,0.588,1.299,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778 c-0.292-0.339-0.634-0.665-1.013-0.982c0.49,0.657,0.198,1.134-0.607,1.666C54.65,9.447,41.576,18.739,40.825,19.29 c-0.431,0.314-0.767,0.219-1.3-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.948-0.436-1.71-0.034 c-0.871,0.46-3.764,1.914-9.956,8.106c-6.193,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.319,1.135,0.035,1.711 c0.4,0.651,2.351,3.069,2.967,3.736c0.493,0.533,0.559,0.896,0.259,1.332c-0.517,0.755-9.828,13.794-10.76,15.195 c-0.533,0.803-1.008,1.098-1.665,0.606c0.314,0.378,0.644,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_5_)" opacity="0.6"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -141.776 3075.0667)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-2041.9355" x2="-2041.9355" y1="-2305.2153" y2="-2243.2966">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="0.5091" style="stop-color:#081D45"/>
-<stop offset="1" style="stop-color:#2275BD"/>
+ <stop offset="0" style="stop-color:#2685D2"/>
+ <stop offset="0.5091" style="stop-color:#081D45"/>
+ <stop offset="1" style="stop-color:#2275BD"/>
</linearGradient>
<path d="M2.899,45.012c1.275-2.777,10.299-14.804,18.804-23.31c8.505-8.506,20.532-17.529,23.308-18.803 c0.527-0.241,1.02-0.411,1.493-0.545c-0.511-0.096-1.03-0.19-1.565-0.26c-0.086,0.036-0.163,0.063-0.25,0.102 c-2.818,1.293-14.971,10.397-23.533,18.959C12.595,29.717,3.489,41.869,2.195,44.688c-0.038,0.087-0.063,0.166-0.101,0.25 c0.07,0.535,0.166,1.055,0.259,1.565C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_6_)"/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
-<path d="M15,29.5C7.004,29.5,0.5,22.996,0.5,15C0.5,7.004,7.004,0.5,15,0.5 c7.995,0,14.5,6.505,14.5,14.5S22.995,29.5,15,29.5L15,29.5z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M15,29.5C7.004,29.5,0.5,22.996,0.5,15C0.5,7.004,7.004,0.5,15,0.5 c7.995,0,14.5,6.505,14.5,14.5S22.995,29.5,15,29.5L15,29.5z" enable-background="new " opacity="0.35"/>
<radialGradient cx="435.2295" cy="910.6348" gradientTransform="matrix(0.618 0 0 0.618 -253.9715 -552.4329)" gradientUnits="userSpaceOnUse" id="SVGID_1__" r="28.704">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#94FFFF"/>
+ <stop offset="0.5" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</radialGradient>
<circle cx="15" cy="15" fill="url(#SVGID_1__)" r="13.464"/>
-<path d="M27.983,14.263c-0.299-5.259-3.704-9.788-8.679-11.54l-0.605,0.1L15.18,2.15 l-4.386,2.615l-0.165,1.102H8.083l1.006,1.71L6.365,9.8l-0.635,2.744l2.25,3.987l2.297-0.469l0.839,0.723l0.655,0.064l0.433,1.691 l-0.571,1.484l2.084,5.332h2.126l2.107-1.701v-0.695l0.557-0.863l0.459-0.236c-0.116,0.18-0.3,0.586-0.3,0.586 c-0.02,0.139,0.299,2.855,1.234,2.643c0.711-0.16,3.248-4.873,3.296-5.322c0.096-0.887-0.387-1.252-0.683-1.391l-0.329-0.156 l-1.515,1.52c-0.162,0.012-0.309,0.039-0.44,0.078v-1.26l1.645-1.605l0.837-2.698l1.275-1.038l-0.28-0.508l0.962-0.926l-0.538-0.979 l0.41,0.049l2.396,5.362l0.49-0.39c-0.015-0.262-0.043-0.521-0.073-0.779L27.983,14.263z M15.161,8.231l-0.2-0.535h1.202 l0.586,1.316h-0.871V8.23L15.161,8.231L15.161,8.231z M19.129,10.882l0.961,1.402l0.064,0.168l-0.984-0.595l-0.234-0.848 L19.129,10.882z M20.573,13.331l0.29,0.29l-0.375,0.084l-0.085-0.104L20.573,13.331z M13.06,3.903l0.611,0.946l-0.694,0.212 l-0.271-0.154L13.06,3.903z" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M27.983,14.263c-0.299-5.259-3.704-9.788-8.679-11.54l-0.605,0.1L15.18,2.15 l-4.386,2.615l-0.165,1.102H8.083l1.006,1.71L6.365,9.8l-0.635,2.744l2.25,3.987l2.297-0.469l0.839,0.723l0.655,0.064l0.433,1.691 l-0.571,1.484l2.084,5.332h2.126l2.107-1.701v-0.695l0.557-0.863l0.459-0.236c-0.116,0.18-0.3,0.586-0.3,0.586 c-0.02,0.139,0.299,2.855,1.234,2.643c0.711-0.16,3.248-4.873,3.296-5.322c0.096-0.887-0.387-1.252-0.683-1.391l-0.329-0.156 l-1.515,1.52c-0.162,0.012-0.309,0.039-0.44,0.078v-1.26l1.645-1.605l0.837-2.698l1.275-1.038l-0.28-0.508l0.962-0.926l-0.538-0.979 l0.41,0.049l2.396,5.362l0.49-0.39c-0.015-0.262-0.043-0.521-0.073-0.779L27.983,14.263z M15.161,8.231l-0.2-0.535h1.202 l0.586,1.316h-0.871V8.23L15.161,8.231L15.161,8.231z M19.129,10.882l0.961,1.402l0.064,0.168l-0.984-0.595l-0.234-0.848 L19.129,10.882z M20.573,13.331l0.29,0.29l-0.375,0.084l-0.085-0.104L20.573,13.331z M13.06,3.903l0.611,0.946l-0.694,0.212 l-0.271-0.154L13.06,3.903z" enable-background="new " opacity="0.3"/>
<linearGradient gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="333.1904" x2="333.1904" y1="416.6045" y2="431.9054">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#C8E4EB"/>
+ <stop offset="0" style="stop-color:#31A7F8"/>
+ <stop offset="0.497" style="stop-color:#1E74DC"/>
+ <stop offset="1" style="stop-color:#C8E4EB"/>
</linearGradient>
-<path d="M15,1.536C7.564,1.536,1.536,7.565,1.536,15 c0,7.439,6.029,13.464,13.464,13.464c7.438,0,13.465-6.027,13.465-13.464C28.465,7.565,22.438,1.536,15,1.536z M15,27.428 C8.146,27.428,2.571,21.854,2.571,15C2.571,8.147,8.146,2.571,15,2.571S27.428,8.147,27.428,15 C27.428,21.854,21.854,27.428,15,27.428z" fill="url(#SVGID_2__)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M15,1.536C7.564,1.536,1.536,7.565,1.536,15 c0,7.439,6.029,13.464,13.464,13.464c7.438,0,13.465-6.027,13.465-13.464C28.465,7.565,22.438,1.536,15,1.536z M15,27.428 C8.146,27.428,2.571,21.854,2.571,15C2.571,8.147,8.146,2.571,15,2.571S27.428,8.147,27.428,15 C27.428,21.854,21.854,27.428,15,27.428z" enable-background="new " fill="url(#SVGID_2__)" opacity="0.3"/>
<radialGradient cx="333.6309" cy="418.627" gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_3__" r="9.0429">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+ <stop offset="0" style="stop-color:#94FF26"/>
+ <stop offset="0.3152" style="stop-color:#94FF26"/>
+ <stop offset="0.7273" style="stop-color:#1FC211"/>
+ <stop offset="1" style="stop-color:#0BA133"/>
</radialGradient>
<path d="M22.296,18.848l-1.401,1.402c0,0-0.848,0-0.887,0.336c-0.02,0.145-0.065,0.771-0.208,1.094 c-0.282,0.195-0.619,0.842-0.619,0.842s-0.175,1.25,0.761,1.037C20.871,23.35,23.734,19.523,22.296,18.848z" fill="url(#SVGID_3__)"/>
<radialGradient cx="333.6299" cy="418.6211" gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_4__" r="10.4663">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+ <stop offset="0" style="stop-color:#94FF26"/>
+ <stop offset="0.3152" style="stop-color:#94FF26"/>
+ <stop offset="0.7273" style="stop-color:#1FC211"/>
+ <stop offset="1" style="stop-color:#0BA133"/>
</radialGradient>
<path d="M19.132,3.213c-0.23,0.087-0.387,0.146-0.387,0.146l-3.463-0.663L13.583,3.76l0.894,1.383 l-1.563,0.48l-0.842-0.48l0.296-0.84l-1.098,0.76l-0.196,1.324H8.988L9.759,7.7l-2.932,2.39l-0.552,2.387l1.088,2.107L8.018,15 l2.297-0.469l0.839,0.721l0.763,0.074l0.83,3.246l-0.552,1.436l1.22,2.697l0.343,1.119h2.126l1.202-0.65l0.905-1.053V20.85 l1.724-0.881v-1.885l0.681-1.297l1.521-1.366l0.363-1.585l-1.988,0.443l-0.522-0.637l0.371-0.594l-1.411-0.854l-0.601-2.164 l1.042-0.68l0.96,1.402l0.359,0.922l0.722,0.721l0.842,0.44l0.936-0.151l1.039-1l-0.731-1.334l-0.921,0.24l-0.833-0.991l0.791-0.552 l2.482,0.301v0.883l2.161,4.452l0.491-0.393C27.176,9.158,23.783,4.849,19.132,3.213z M18.004,9.23l-1.134,0.3h-1.511V8.749h-1.443 L12.774,9.05l-1.741-0.482l-0.482-0.901l2.404-0.541h2.406L15,6.164h1.202l0.67,1.503l1.134,0.398V9.23H18.004z M20.589,7.247 l-2.044-0.361V6.165l1.022-0.24l0.3-0.36l0.722,0.6V7.247L20.589,7.247z" fill="url(#SVGID_4__)"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_voip.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,105 @@
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
+<rect fill="none" height="60" width="60"/>
+<rect fill="none" height="60" width="60"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2162.3384" x2="-2162.3384" y1="3603.7246" y2="3654.8755">
+ <stop offset="0" style="stop-color:#004E8C"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
+</linearGradient>
+<circle cx="31.662" cy="27.76" fill="url(#SVGID_1_)" r="25.76"/>
+<radialGradient cx="-2106.918" cy="3745.7734" gradientTransform="matrix(0.961 0 0 -0.9609 2056.0444 3618.1604)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="32.2687">
+ <stop offset="0" style="stop-color:#94FFFF"/>
+ <stop offset="0.5" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
+</radialGradient>
+<path d="M56.761,27.759c0,13.864-11.234,25.097-25.099,25.097c-13.863,0-25.101-11.232-25.101-25.097 c0-13.859,11.239-25.099,25.101-25.099C45.53,2.66,56.761,13.899,56.761,27.759z" fill="url(#SVGID_2_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2162.3384" x2="-2162.3384" y1="3654.5078" y2="3603.9641">
+ <stop offset="0" style="stop-color:#31A7F8"/>
+ <stop offset="0.497" style="stop-color:#1E74DC"/>
+ <stop offset="1" style="stop-color:#88D6EB"/>
+</linearGradient>
+<path d="M31.663,2.66c-13.863,0-25.101,11.239-25.101,25.099 c0,13.864,11.239,25.097,25.101,25.097c13.864,0,25.099-11.232,25.099-25.097C56.761,13.899,45.53,2.66,31.663,2.66z M31.663,50.659 c-13.033,0-23.638-10.598-23.638-23.63c0-13.034,10.603-23.637,23.638-23.637c13.033,0,23.634,10.603,23.634,23.637 C55.296,40.06,44.696,50.659,31.663,50.659z" enable-background="new " fill="url(#SVGID_3_)" opacity="0.3"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-2187.0283" x2="-2183.0366" y1="3625.7734" y2="3625.7734">
+ <stop offset="0" style="stop-color:#58595B"/>
+ <stop offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<path d="M8.918,27.351c-0.268-0.357-0.871-0.357-1.137-0.357 c-0.525,0-0.804,0.376-0.809,0.742v0.023l0.001,0.038c-0.001,0.646,0.035,1.37,0.113,2.251c0.016,0.164,0.036,0.331,0.057,0.498 l0.028,0.241c0.067,0.521,0.145,1.033,0.235,1.531l0.041,0.218c0.038,0.198,0.075,0.391,0.117,0.583 c0.107,0.488,0.238,0.993,0.399,1.552c0.023,0.08,0.044,0.159,0.065,0.239c0.036,0.132,0.07,0.261,0.11,0.388l0.006,0.017 l0.014,0.04c-0.003-0.012-0.009-0.028-0.012-0.045l1.44-0.097c0.022-0.227,0.028-0.46,0.022-0.691 c-0.012-0.364-0.025-0.813-0.129-1.191l1.337-1.796l0.145-0.194v-0.244v-1.4v-0.303l-0.215-0.215L8.918,27.351z" enable-background="new " fill="url(#SVGID_4_)" opacity="0.3"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-2179.3354" x2="-2137.5874" y1="3633.083" y2="3633.083">
+ <stop offset="0" style="stop-color:#58595B"/>
+ <stop offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<path d="M56.406,22.84c-0.019-0.094-0.034-0.161-0.052-0.229 c-0.013-0.051-0.024-0.101-0.034-0.15c-0.128-0.595-0.285-1.208-0.472-1.832l-0.02-0.071c-0.041-0.14-0.082-0.281-0.127-0.42 c-0.227-0.706-0.473-1.38-0.732-2.003c-0.031-0.078-0.066-0.149-0.1-0.226l-0.055-0.119c-0.246-0.57-0.523-1.139-0.813-1.688 l-0.036-0.071c-0.057-0.107-0.111-0.216-0.17-0.321c-0.354-0.642-0.728-1.251-1.103-1.819c-0.04-0.06-0.085-0.122-0.13-0.184 c-0.027-0.038-0.054-0.075-0.078-0.111c-0.363-0.525-0.743-1.037-1.138-1.525l-0.076-0.099c-0.053-0.065-0.106-0.133-0.161-0.199 c-0.459-0.55-0.941-1.08-1.441-1.583c-0.068-0.067-0.139-0.138-0.211-0.209l-0.061-0.057c-0.45-0.44-0.93-0.878-1.422-1.289 l-0.097-0.083c-0.05-0.046-0.101-0.087-0.15-0.128c-0.536-0.441-1.118-0.875-1.725-1.291c-0.075-0.052-0.153-0.101-0.229-0.15 l-0.092-0.061c-0.546-0.362-1.115-0.709-1.688-1.023l-0.085-0.052c-0.049-0.028-0.096-0.054-0.144-0.082 c-0.636-0.341-1.3-0.66-1.976-0.951l-0.17-0.068l-0.186-0.077c-0.177-0.073-0.355-0.136-0.531-0.197 c-0.093-0.03-0.182-0.063-0.275-0.097l-0.339-0.127l-0.308,0.195c-0.203,0.129-1.01,0.589-1.484,0.859 c-0.526-0.07-1.801-0.23-3.089-0.355c0.396-0.036,0.946-0.082,1.719-0.133l0.108-1.446l-0.059-0.017 c-0.047-0.012-0.092-0.024-0.139-0.035l-0.111-0.021l-0.088-0.017c-0.789-0.159-1.529-0.273-2.264-0.351L34.57,2.925l-0.103-0.011 c-0.84-0.083-1.693-0.127-2.539-0.127c-0.744,0-1.517,0.04-2.361,0.122c-0.13,0.013-0.256,0.025-0.385,0.038 C28.35,3.041,27.62,3.151,26.93,3.292l-0.024,0.002l-0.017,0.003c-0.727,0.149-1.457,0.338-2.232,0.573 c-0.068,0.022-0.139,0.044-0.207,0.067l-0.156,0.052c-0.658,0.212-1.303,0.444-1.92,0.7c-0.051,0.021-0.086,0.032-0.121,0.046 l-0.094,0.038c-0.678,0.288-1.354,0.615-2.028,0.977c-0.073,0.037-0.142,0.079-0.212,0.118l-0.084,0.054 c-0.189,0.103-0.381,0.223-0.569,0.34l-0.244,0.153l-1.345,0.821l1.494,0.499c0.223,0.076,0.463,0.111,0.711,0.111 c0.805,0,1.582-0.395,2.209-0.713c0.252-0.125,0.627-0.317,0.779-0.346c0.182,0.054,0.369,0.082,0.55,0.082 c0.685,0,1.244-0.368,1.739-0.694l0.135-0.087c0.16-0.052,0.434-0.154,0.98-0.359c0.561-0.209,1.58-0.593,1.854-0.658 c0.527-0.005,1.16-0.079,1.609-0.359c0.422,0.07,1.174,0.188,1.945,0.289c-0.057,0.034-0.112,0.07-0.158,0.115 c-0.251,0.232-1.605,0.642-2.02,0.695c-0.779,0.098-1.092,0.49-1.217,0.801c-0.163,0.403-0.064,0.808,0.094,1.139 c-0.295,0.194-0.656,0.41-0.966,0.575c0,0,0.003-0.015,0.005-0.023c0.111-0.622,0.191-1.071-0.11-1.431 c-0.153-0.184-0.38-0.289-0.624-0.289c-0.354,0-0.631,0.22-0.854,0.436c-0.626,0.604-1.004,1.356-1.145,1.641l-0.026,0.052 l-0.023,0.042c-0.271,0.519-0.382,0.887-0.231,2.028c-0.064,0.05-0.264,0.124-0.534,0.124c-0.036,0-0.07-0.001-0.095-0.004 c-0.176-0.189-0.42-0.298-0.693-0.298l0,0c-0.63,0-1.488,0.709-2.551,2.107l-0.342,0.451l0.347,0.446l0.323,0.411 c-5.066,3.918-5.104,4.14-5.157,4.468c-0.009,0.03-0.054,0.165-0.115,0.352c-0.754,2.348-1.174,4.104-0.765,5.044 c0.942,2.179,2.006,4.212,3.383,4.325c0.122,0.01,0.256,0.015,0.398,0.015c1.265,0,3.311-0.382,4.295-0.584 c0.182,0.341,0.402,0.738,0.527,0.956l0.217,0.39l0.445-0.015c0.004,0,0.239-0.009,0.539-0.009c0.342,0,0.573,0.011,0.723,0.021 c0.536,1.571,1.563,5.189,1.373,5.943l-0.004,0.002c-1.732,2.597,0.368,5.982,1.377,7.607c0.078,0.129,0.15,0.244,0.213,0.345 c0.389,1.108,0.861,1.841,1.856,1.841c0.075,0,0.149-0.004,0.227-0.01c0.058-0.002,0.115-0.004,0.175-0.004 c0.109,0,0.189,0.012,0.271,0.042l0.09,0.032l0.097,0.008c0.187,0.016,0.368,0.042,0.544,0.068c0.309,0.042,0.625,0.084,0.947,0.084 c0.868,0,1.555-0.327,2.148-1.028c0.023-0.003,0.044-0.005,0.067-0.008c0.622-0.086,0.854-0.398,0.935-0.678 c0.045-0.047,0.107-0.104,0.157-0.15c0.245-0.226,0.538-0.493,0.739-0.811c0.091-0.054,0.193-0.114,0.311-0.183 c0.2-0.124,0.428-0.26,0.605-0.352c0.157-0.05,0.297-0.142,0.401-0.271c0.251-0.31,0.2-0.659,0.157-0.941 c-0.041-0.291-0.084-0.592,0.072-0.911c0.889-0.428,2.466-1.479,2.721-1.652l-0.002,0.021c-0.016,0.141-0.057,0.517-0.119,0.757 c-0.336,0.335-0.617,0.845-0.704,1.018l-0.06,0.113l-0.018,0.125c-0.023,0.164-0.113,1.021,0.367,1.575 c0.242,0.277,0.59,0.432,0.978,0.432c0.124,0,0.253-0.016,0.384-0.047c1.234-0.279,3.426-3.249,3.604-4.888 c0.086-0.789-0.223-1.409-0.846-1.703l-0.465-0.221l-0.367,0.364l-1.352,1.353c-0.457,0.043-0.814,0.179-1.057,0.393 c0.014-0.578-0.043-1.17-0.104-1.745c-0.186-1.74-0.222-2.848,0.846-3.602l0.054-0.04l0.046-0.047 c0.387-0.392,0.813-0.734,1.264-1.099c1.059-0.85,2.152-1.729,2.804-3.315l0.027-0.067c0.209-0.543,0.524-1.361,0.097-1.984 c-0.107-0.155-0.33-0.395-0.75-0.478c0.556-0.225,0.98-0.399,1.023-0.417l0.129-0.052l0.1-0.097l2.281-2.19l0.334-0.321 l-0.146-0.441c-0.021-0.057-0.144-0.401-0.494-0.897c0.666,0.09,1.236,0.251,1.424,0.393c0.069,0.147,0.207,0.477,0.352,0.822 c2.512,5.918,2.863,6.224,3.518,6.233c0.025,0,0.045,0.002,0.061,0.005c0.055,0.002,0.101,0.004,0.145,0.004 c0.371,0,0.584-0.188,0.677-0.303c0.273-0.328,0.196-0.73,0.169-0.88l-0.01-0.052c-0.031-0.354-0.012-1.946,0.039-3.254 c0.004,0.002,0.004,0.006,0.008,0.011l1.346-0.534L56.406,22.84z M36.622,15.6c-0.104,0.004-0.217,0.009-0.338,0.014 c-0.388,0.02-0.828,0.038-1.268,0.038c-1.147,0-1.409-0.142-1.438-0.157c-0.135-0.1-0.275-0.174-0.42-0.226 c0.26-0.059,0.557-0.259,0.863-0.853c0.303,0.586,0.712,1.104,1.342,1.104c0.171,0,0.332-0.043,0.488-0.122 C36.063,15.401,36.413,15.522,36.622,15.6z M36.17,12.397c-0.086,0-0.156-0.004-0.211-0.009c0.059-0.153,0.129-0.243,0.186-0.293 c0.071,0.111,0.169,0.209,0.277,0.294C36.334,12.395,36.252,12.397,36.17,12.397z M31.6,13.933c0.394,0.771,0.686,1.103,0.916,1.246 c-0.57,0.047-1.001,0.409-1.354,0.752c-0.248-0.081-0.678-0.343-0.808-0.526c-0.075-0.106-0.165-0.199-0.265-0.279 C30.713,14.948,31.262,14.369,31.6,13.933z M29.428,13.366l-0.817-0.039l-2.737-0.134c0.332-0.275,0.65-0.534,0.837-0.686 c0.05-0.018,0.246-0.073,0.728-0.073c0.291,0,0.569,0.021,0.746,0.035L29.428,13.366z" enable-background="new " fill="url(#SVGID_5_)" opacity="0.3"/>
+<radialGradient cx="-2106.0845" cy="3754.9141" gradientTransform="matrix(0.961 0 0 -0.9609 2056.0444 3618.1604)" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="29.4754">
+ <stop offset="0.3152" style="stop-color:#7AF200"/>
+ <stop offset="0.7273" style="stop-color:#1CAD0F"/>
+ <stop offset="1" style="stop-color:#007A3A"/>
+</radialGradient>
+<path d="M7.703,27.745L7.703,27.745c0,0.009,0.001,0.014,0.001,0.022c0,0.747,0.047,1.484,0.112,2.218 c0.021,0.236,0.056,0.476,0.083,0.718c0.065,0.5,0.14,0.998,0.228,1.488c0.051,0.258,0.097,0.521,0.152,0.774 c0.114,0.508,0.244,1.008,0.386,1.501c0.06,0.204,0.107,0.411,0.169,0.61c0.009,0.023,0.019,0.04,0.023,0.061 c0.02-0.189,0.026-0.39,0.02-0.594C8.83,33.103,8.6,33.288,8.6,33.288l1.629-2.19v-1.402l-1.91-1.908 C8.319,27.787,7.704,27.69,7.703,27.745z" fill="url(#SVGID_6_)"/>
+<radialGradient cx="-2106.0928" cy="3754.918" gradientTransform="matrix(0.961 0 0 -0.9609 2056.0444 3618.1604)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="29.4765">
+ <stop offset="0.3152" style="stop-color:#7AF200"/>
+ <stop offset="0.7273" style="stop-color:#1CAD0F"/>
+ <stop offset="1" style="stop-color:#007A3A"/>
+</radialGradient>
+<path d="M23.042,6.076c0.706,0.233,1.282-0.24,1.939-0.66c0.231-0.049,2.81-1.076,3.089-1.076 s1.216-0.036,1.448-0.409c0,0,4.035,0.702,4.644,0.468c0.33-0.13,1.723-0.24,2.914-0.317c-0.066-0.014-0.127-0.036-0.195-0.05 c-0.064-0.015-0.125-0.023-0.191-0.035c-0.75-0.152-1.505-0.272-2.277-0.35c-0.008,0-0.012,0-0.02-0.003 c-0.81-0.082-1.633-0.124-2.467-0.124c-0.773,0-1.535,0.045-2.291,0.117c-0.133,0.015-0.266,0.025-0.397,0.043 c-0.731,0.079-1.456,0.186-2.165,0.328c-0.013,0.005-0.025,0.005-0.037,0.008c-0.736,0.152-1.459,0.34-2.168,0.559 c-0.121,0.035-0.238,0.077-0.362,0.115c-0.626,0.202-1.248,0.427-1.856,0.678c-0.071,0.031-0.145,0.057-0.215,0.087 c-0.67,0.286-1.322,0.602-1.96,0.941c-0.097,0.053-0.188,0.108-0.282,0.163c-0.271,0.149-0.527,0.32-0.793,0.481 C20.713,7.479,22.349,5.842,23.042,6.076z" fill="url(#SVGID_7_)"/>
+<radialGradient cx="-2106.0928" cy="3754.9209" gradientTransform="matrix(0.961 0 0 -0.9609 2056.0444 3618.1604)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="29.4743">
+ <stop offset="0.3152" style="stop-color:#B2F56E"/>
+ <stop offset="0.7273" style="stop-color:#5CBF1B"/>
+ <stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M55.685,22.962c-0.026-0.122-0.06-0.237-0.083-0.356c-0.127-0.601-0.28-1.19-0.455-1.773 c-0.045-0.154-0.092-0.316-0.143-0.474c-0.211-0.659-0.445-1.31-0.709-1.941c-0.047-0.112-0.1-0.223-0.15-0.331 c-0.242-0.56-0.504-1.104-0.789-1.639c-0.066-0.128-0.131-0.259-0.199-0.383c-0.336-0.604-0.691-1.194-1.074-1.768 c-0.064-0.1-0.137-0.192-0.203-0.292c-0.35-0.507-0.717-0.997-1.102-1.477c-0.078-0.094-0.152-0.192-0.233-0.287 c-0.442-0.532-0.909-1.044-1.396-1.534c-0.082-0.085-0.172-0.17-0.259-0.252c-0.444-0.437-0.907-0.857-1.387-1.258 c-0.079-0.069-0.157-0.139-0.237-0.206c-0.537-0.439-1.1-0.857-1.678-1.254c-0.1-0.069-0.203-0.135-0.307-0.2 c-0.531-0.354-1.079-0.686-1.643-0.998c-0.074-0.042-0.148-0.087-0.225-0.129c-0.625-0.336-1.262-0.642-1.916-0.924 c-0.117-0.049-0.232-0.096-0.348-0.145c-0.254-0.104-0.521-0.188-0.777-0.282c-0.306,0.195-1.729,1.001-1.729,1.001 s-6.18-0.846-6.602-0.426c-0.423,0.426-2.068,0.854-2.441,0.903c-0.376,0.049-1.151,0.247-0.221,1.396 c-0.139,0.141-2.795,1.99-2.795,1.15s0.594-2.348-0.24-1.54c-0.599,0.577-0.957,1.364-1.034,1.51 c-0.195,0.375-0.315,0.554-0.174,1.632c0.142,1.077-1.719,1.07-1.845,0.791c-0.332-0.746-2.174,1.676-2.174,1.676l0.776,0.996 c0,0-5.421,4.177-5.468,4.456c-0.048,0.282-1.399,3.907-0.93,4.984c0.468,1.079,1.652,3.797,2.771,3.888 c1.47,0.12,5.032-0.673,5.032-0.673c0.097,0.236,0.768,1.43,0.768,1.43s1.747-0.058,1.843,0.133 c0.033,0.063,2.104,6.157,1.422,6.965c-1.632,2.444,0.932,6.024,1.645,7.235c0.715,2.08,1.176,1.148,2.115,1.489 c1.155,0.101,2.129,0.528,3.111-0.735c0.285-0.235,0.77-0.049,0.77-0.376c0-0.183,0.84-0.718,1.057-1.223 c0.226-0.105,0.811-0.498,1.205-0.688c0.36-0.023-0.34-0.986,0.372-2.002c0.769-0.303,2.842-1.7,2.842-1.7 c0.095-2.05-1.01-4.581,1.05-6.033c1.326-1.355,3.068-2.126,3.912-4.183c0.232-0.61,0.756-1.854-0.744-1.48 c-1.41,0.354-2.981,0.435-2.236-0.187c-0.086-0.761-1.022-1.12-1.863-1.863c-0.436-1.028-1.118-2.86-1.118-2.86l-1.491-2.266 l0.186-0.468l1.773,2.609l1.771,2.142c0.65,2.143,1.209,2.33,1.209,2.33c0.98-0.345,3.311-1.305,3.311-1.305l2.281-2.19 c0,0-0.233-0.697-1.16-1.583l-0.703-0.418c-0.152,0.43-0.965,0.59-0.965,0.59l-1.973-2.361l0.733-0.147l0.565,1.076l1.356,0.47 c0,0,0.377-0.274,1.073,0.446c0.568-0.047,2.788,0.108,3.306,0.765c0.102,0.13,2.748,6.739,3.271,6.749 c0.229,0.002,0.395,0.091,0.32-0.309c-0.094-0.188,0-4.338,0.14-5.229c0.354-0.753,0.412-0.002,1.25,1.428 C55.696,23.033,55.692,22.997,55.685,22.962z M32.397,6.947c0.184-0.552,1.258-0.739,1.258-0.739s-0.308,0.568-0.236,0.859 c0.072,0.298-0.49,0.483-0.554,1.182c-0.061,0.694-1.343,0.287-1.447,0.043C31.311,8.049,32.208,7.497,32.397,6.947z M36.993,16.324 c-0.795,0-3.18,0.235-3.834-0.234c-0.658-0.467-1.168,0.05-1.639,0.52c-0.311,0.303-1.434-0.314-1.765-0.782 c-0.325-0.467-1.429-0.434-1.429-0.434l0.251-1.335l-3.171-0.154l-1.802,0.528l-1.694,0.05l0.95-0.454l1.181-0.278 c0,0,1.721-1.414,2.235-1.834c0.435-0.356,2.177-0.155,2.177-0.155l1.91,1.378c0,0-0.424,1.08-0.611,1.312 c0.701-0.047,1.525-1.321,1.525-1.321c-1.488-1.368-1.428-1.832-1.428-1.832l1.963,1.377l0.02,0.012c0,0,0.795,1.874,1.127,1.874 c0.326,0,0.744-1.289,0.744-1.289l0.559-0.142c0.248,0.593,0.715,1.929,1.272,1.614c0.323-0.177,0.854-0.015,1.462,0.218 c0.611,0.235,1.025-0.124,1.521,0.31C38.452,17.195,37.321,16.419,36.993,16.324z M38.239,13.102 c-0.818-0.311-3.587,0.704-2.969-0.957c0.33-0.896,1.179-1.083,1.469-0.487c0.076,0.247,0.998,0.625,0.99,0.108 c-0.006-0.518,0.928-0.791,1.063-0.406C38.293,11.716,40.737,13.58,38.239,13.102z M43.454,14.675 c-0.453-0.364,0.205-0.679-0.465-1.252c-0.959-0.822-1.708-1.176-0.401-1.841c1.612-0.202,0.263,0.515,0.529,0.943 c0.144,0.23,0.956,0.996,1.593,1.938C45.238,15.244,43.905,15.038,43.454,14.675z" fill="url(#SVGID_8_)"/>
+<radialGradient cx="-2106.0933" cy="3754.916" gradientTransform="matrix(0.961 0 0 -0.9609 2056.0444 3618.1604)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="29.4698">
+ <stop offset="0.3152" style="stop-color:#7AF200"/>
+ <stop offset="0.7273" style="stop-color:#1CAD0F"/>
+ <stop offset="1" style="stop-color:#007A3A"/>
+</radialGradient>
+<path d="M44.104,36.019l-1.555,1.552c0,0-0.934,0-0.979,0.378c-0.021,0.159-0.075,0.853-0.23,1.209 c-0.311,0.217-0.684,0.931-0.684,0.931s-0.191,1.382,0.839,1.146C42.526,41.001,45.698,36.77,44.104,36.019z" fill="url(#SVGID_9_)"/>
+<path d="M32.02,52.439c1.859,0,3.664-0.209,5.408-0.589 c-0.047-0.059-0.086-0.12-0.137-0.174l-9.057-9.324c-0.522-0.537-1.239-0.847-1.97-0.847c-0.685,0-1.324,0.265-1.804,0.751 l-1.373,1.418l-0.568,0.573l-0.524,0.537c-1.987-1.927-3.765-4.139-5.697-7.06c-1.067-1.62-1.986-3.592-2.57-4.956l-0.213-0.51 c0,0-0.291-0.718-0.39-0.975l-0.032-0.082c-0.081-0.211-0.153-0.408-0.221-0.601l-0.031-0.083l2.215-0.77 c1.222-0.414,1.915-1.688,1.638-3.071l-0.009-0.045l-1.386-4.235l-2.734-8.158c-0.193-0.582-0.564-1.064-1.032-1.394 c-2.904,4.096-4.617,9.095-4.617,14.496C6.917,41.205,18.155,52.439,32.02,52.439z" enable-background="new " fill="#020202" opacity="0.1"/>
+<path d="M32.02,52.439c1.563,0,3.09-0.15,4.576-0.422l-8.889-9.153 c-0.386-0.396-0.912-0.624-1.442-0.624c-0.485,0-0.936,0.188-1.274,0.531l-1.381,1.42l-0.561,0.568l-0.51,0.523l0.004,0.005 l-0.523,0.535c-2.243-2.087-4.219-4.489-6.334-7.693c-1.095-1.661-2.036-3.678-2.634-5.074l-0.19-0.45l-0.029-0.071 c0,0-0.292-0.723-0.393-0.981l-0.035-0.087c-0.082-0.216-0.156-0.415-0.229-0.614c0,0-0.144-0.406-0.174-0.493l0.085-0.354 l2.731-0.951c0.866-0.294,1.355-1.214,1.161-2.187l-0.008-0.044l-1.373-4.188l-2.734-8.161c-0.144-0.43-0.412-0.781-0.752-1.024 c-2.648,3.98-4.198,8.756-4.198,13.893C6.917,41.205,18.155,52.439,32.02,52.439z" enable-background="new " fill="#020202" opacity="0.2"/>
+<radialGradient cx="-2983.5728" cy="4023.543" gradientTransform="matrix(0.9654 -0.0107 -0.0107 -0.9654 2968.4299 3872.1846)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="42.6078">
+ <stop offset="0.8364" style="stop-color:#E9F0F2"/>
+ <stop offset="0.8909" style="stop-color:#AAB1B5"/>
+ <stop offset="0.9515" style="stop-color:#7C878C"/>
+ <stop offset="1" style="stop-color:#838F94"/>
+</radialGradient>
+<path d="M22.051,46.847c-2.873-2.563-5.037-5.372-6.979-8.311c-1.865-2.832-3.556-7.079-4.079-8.93 l-7.54-10.621c-0.429,0.711-1.107,3.264-0.794,6.717c0.316,3.454,3.534,11.814,7.313,17.545c3.782,5.731,9.389,11.118,11.269,12.311 c2.959,1.878,6.523,2.493,7.608,2.439c0,0,1.002-0.118,2.367-0.597C31.803,57.196,22.051,46.847,22.051,46.847z" fill="url(#SVGID_10_)"/>
+<path d="M12.413,33.434c-0.661-1.542-1.174-2.953-1.418-3.827L3.658,19.27 c-0.077,0.108-0.12,0.173-0.12,0.173c-0.126,0.207-0.266,0.55-0.406,0.977c-0.142,0.722-0.214,1.466-0.202,2.229 C3.002,28.046,7.083,32.497,12.413,33.434z" enable-background="new " opacity="0.05"/>
+<path d="M12.099,32.685c-0.507-1.242-0.899-2.348-1.104-3.078l-7.363-10.37 C3.548,19.356,3.5,19.429,3.5,19.429c-0.118,0.195-0.25,0.522-0.383,0.925c-0.134,0.682-0.202,1.383-0.19,2.105 C2.997,27.635,6.961,31.889,12.099,32.685z" enable-background="new " opacity="0.05"/>
+<path d="M3.443,19.407c-0.105,0.177-0.226,0.472-0.348,0.839 c-0.123,0.617-0.183,1.256-0.172,1.911c0.064,4.82,3.858,8.755,8.702,9.323c-0.278-0.742-0.495-1.39-0.632-1.874L3.596,19.185 C3.496,19.325,3.443,19.407,3.443,19.407z" enable-background="new " opacity="0.1"/>
+<radialGradient cx="-3022.0488" cy="4026.5146" gradientTransform="matrix(0.9664 -0.0083 -0.013 -0.9569 2980.2107 3844.9014)" gradientUnits="userSpaceOnUse" id="SVGID_11_" r="14.7389">
+ <stop offset="0.0424" style="stop-color:#D1D8D9"/>
+ <stop offset="0.4" style="stop-color:#BBC0C2"/>
+ <stop offset="0.7333" style="stop-color:#7C8C91"/>
+ <stop offset="1" style="stop-color:#A7B3B7"/>
+</radialGradient>
+<path d="M10.993,29.606l1.577-0.554c0,0-3.343-14.954-4.669-14.266c-0.667,0.348-0.66,0.538-1.335,1.026 c-2.014,1.464-3.112,3.174-3.112,3.174c-0.092,0.155-0.197,0.415-0.303,0.737c-0.105,0.54-0.161,1.102-0.153,1.672 c0.06,4.353,3.581,7.891,8.007,8.225C11,29.616,10.995,29.611,10.993,29.606z" fill="url(#SVGID_11_)"/>
+<path d="M21.933,48.33c-0.311,0.874-0.481,1.802-0.47,2.769 c0.031,2.291,1.062,4.354,2.695,5.889c2.064,0.771,3.951,1.047,4.689,1.01c0,0,1.002-0.118,2.367-0.597 c0.492-0.171-6.277-7.469-8.48-9.823L21.933,48.33z" enable-background="new " opacity="0.05"/>
+<path d="M22.125,47.537c-0.313,0.871-0.481,1.799-0.47,2.766 c0.043,3.142,1.947,5.86,4.748,7.363c0.927,0.218,1.705,0.318,2.198,0.331c0.013,0,0.032,0.002,0.045,0c0,0,1-0.115,2.37-0.594 c0.508-0.179-6.761-7.982-8.693-10.055L22.125,47.537z" enable-background="new " opacity="0.1"/>
+<radialGradient cx="-3005.0166" cy="3996.4961" gradientTransform="matrix(0.9664 -0.0083 -0.013 -0.9569 2980.2107 3844.9014)" gradientUnits="userSpaceOnUse" id="SVGID_12_" r="14.9991">
+ <stop offset="0.0424" style="stop-color:#D1D8D9"/>
+ <stop offset="0.4" style="stop-color:#BBC0C2"/>
+ <stop offset="0.7333" style="stop-color:#7C8C91"/>
+ <stop offset="1" style="stop-color:#A7B3B7"/>
+</radialGradient>
+<path d="M33.125,56.564c0.785-0.42,0.984-0.408,1.625-0.887c1.178-0.891-10.615-10.968-10.615-10.968 l-2.057,2.111c-0.277,0.833-0.428,1.724-0.415,2.648c0.062,4.526,3.869,8.17,8.542,8.24C30.997,57.499,32.036,57.146,33.125,56.564z " fill="url(#SVGID_12_)"/>
+<path d="M11.808,29.311l0.762-0.258c0,0-3.343-14.954-4.669-14.266 c-0.35,0.181-0.515,0.322-0.688,0.481L11.808,29.311z" enable-background="new " fill="#020202" opacity="0.1"/>
+<linearGradient gradientTransform="matrix(0.9999 -0.0111 -0.0111 -0.9999 3135.2356 3906.9067)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="-3082.8984" x2="-3077.6428" y1="3928.3984" y2="3911.7034">
+ <stop offset="0.0424" style="stop-color:#E9F0F2"/>
+ <stop offset="0.4" style="stop-color:#D4D9DB"/>
+ <stop offset="0.7333" style="stop-color:#98AAAD"/>
+ <stop offset="1" style="stop-color:#D0DADE"/>
+</linearGradient>
+<path d="M12.57,29.056l2.016-0.703c0.523-0.176,0.792-0.756,0.676-1.346l-1.356-4.141l-2.734-8.162 c-0.214-0.641-0.854-1.006-1.43-0.813c0,0-0.515,0.211-1.837,0.898L12.57,29.056z" fill="url(#SVGID_13_)"/>
+<path d="M24.135,44.708l-0.563,0.568l10.516,10.866 c0.227-0.158,0.457-0.313,0.662-0.468C35.928,54.784,24.135,44.708,24.135,44.708z" enable-background="new " fill="#020202" opacity="0.1"/>
+<linearGradient gradientTransform="matrix(0.9999 -0.0111 -0.0111 -0.9999 3135.2356 3906.9067)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="-3066.7827" x2="-3055.8347" y1="3897.6836" y2="3885.627">
+ <stop offset="0.0424" style="stop-color:#E9F0F2"/>
+ <stop offset="0.4" style="stop-color:#D4D9DB"/>
+ <stop offset="0.7333" style="stop-color:#98AAAD"/>
+ <stop offset="1" style="stop-color:#D0DADE"/>
+</linearGradient>
+<path d="M34.749,55.673c1.176-0.889,1.558-1.273,1.558-1.273c0.438-0.448,0.407-1.204-0.071-1.697 l-9.057-9.322c-0.478-0.496-1.222-0.544-1.66-0.097l-1.383,1.425L34.749,55.673z" fill="url(#SVGID_14_)"/>
+</g>
+</svg>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_voip_home.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,148 @@
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
+<rect fill="none" height="60" width="60"/>
+<rect fill="none" height="60" width="60"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2162.3384" x2="-2162.3384" y1="3603.7246" y2="3654.8755">
+ <stop offset="0" style="stop-color:#004E8C"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
+</linearGradient>
+<circle cx="31.662" cy="27.76" fill="url(#SVGID_1_)" r="25.76"/>
+<radialGradient cx="-2106.918" cy="3745.7734" gradientTransform="matrix(0.961 0 0 -0.9609 2056.0444 3618.1604)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="32.2687">
+ <stop offset="0" style="stop-color:#94FFFF"/>
+ <stop offset="0.5" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
+</radialGradient>
+<path d="M56.761,27.759c0,13.864-11.234,25.097-25.099,25.097c-13.863,0-25.101-11.232-25.101-25.097 c0-13.859,11.239-25.099,25.101-25.099C45.53,2.66,56.761,13.899,56.761,27.759z" fill="url(#SVGID_2_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2162.3384" x2="-2162.3384" y1="3654.5078" y2="3603.9641">
+ <stop offset="0" style="stop-color:#31A7F8"/>
+ <stop offset="0.497" style="stop-color:#1E74DC"/>
+ <stop offset="1" style="stop-color:#88D6EB"/>
+</linearGradient>
+<path d="M31.663,2.66c-13.863,0-25.101,11.239-25.101,25.099 c0,13.864,11.239,25.097,25.101,25.097c13.864,0,25.099-11.232,25.099-25.097C56.761,13.899,45.53,2.66,31.663,2.66z M31.663,50.659 c-13.033,0-23.638-10.598-23.638-23.63c0-13.034,10.603-23.637,23.638-23.637c13.033,0,23.634,10.603,23.634,23.637 C55.296,40.06,44.696,50.659,31.663,50.659z" enable-background="new " fill="url(#SVGID_3_)" opacity="0.3"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-2187.0283" x2="-2183.0366" y1="3625.7734" y2="3625.7734">
+ <stop offset="0" style="stop-color:#58595B"/>
+ <stop offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<path d="M8.918,27.351c-0.268-0.357-0.871-0.357-1.137-0.357 c-0.525,0-0.804,0.376-0.809,0.742v0.023l0.001,0.038c-0.001,0.646,0.035,1.37,0.113,2.251c0.016,0.164,0.036,0.331,0.057,0.498 l0.028,0.241c0.067,0.521,0.145,1.033,0.235,1.531l0.041,0.218c0.038,0.198,0.075,0.391,0.117,0.583 c0.107,0.488,0.238,0.993,0.399,1.552c0.023,0.08,0.044,0.159,0.065,0.239c0.036,0.132,0.07,0.261,0.11,0.388l0.006,0.017 l0.014,0.04c-0.003-0.012-0.009-0.028-0.012-0.045l1.44-0.097c0.022-0.227,0.028-0.46,0.022-0.691 c-0.012-0.364-0.025-0.813-0.129-1.191l1.337-1.796l0.145-0.194v-0.244v-1.4v-0.303l-0.215-0.215L8.918,27.351z" enable-background="new " fill="url(#SVGID_4_)" opacity="0.3"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-2179.3354" x2="-2137.5874" y1="3633.083" y2="3633.083">
+ <stop offset="0" style="stop-color:#58595B"/>
+ <stop offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<path d="M56.406,22.84c-0.019-0.094-0.034-0.161-0.052-0.229 c-0.013-0.051-0.024-0.101-0.034-0.15c-0.128-0.595-0.285-1.208-0.472-1.832l-0.02-0.071c-0.041-0.14-0.082-0.281-0.127-0.42 c-0.227-0.706-0.473-1.38-0.732-2.003c-0.031-0.078-0.066-0.149-0.1-0.226l-0.055-0.119c-0.246-0.57-0.523-1.139-0.813-1.688 l-0.036-0.071c-0.057-0.107-0.111-0.216-0.17-0.321c-0.354-0.642-0.728-1.251-1.103-1.819c-0.04-0.06-0.085-0.122-0.13-0.184 c-0.027-0.038-0.054-0.075-0.078-0.111c-0.363-0.525-0.743-1.037-1.138-1.525l-0.076-0.099c-0.053-0.065-0.106-0.133-0.161-0.199 c-0.459-0.55-0.941-1.08-1.441-1.583c-0.068-0.067-0.139-0.138-0.211-0.209l-0.061-0.057c-0.45-0.44-0.93-0.878-1.422-1.289 l-0.097-0.083c-0.05-0.046-0.101-0.087-0.15-0.128c-0.536-0.441-1.118-0.875-1.725-1.291c-0.075-0.052-0.153-0.101-0.229-0.15 l-0.092-0.061c-0.546-0.362-1.115-0.709-1.688-1.023l-0.085-0.052c-0.049-0.028-0.096-0.054-0.144-0.082 c-0.636-0.341-1.3-0.66-1.976-0.951l-0.17-0.068l-0.186-0.077c-0.177-0.073-0.355-0.136-0.531-0.197 c-0.093-0.03-0.182-0.063-0.275-0.097l-0.339-0.127l-0.308,0.195c-0.203,0.129-1.01,0.589-1.484,0.859 c-0.526-0.07-1.801-0.23-3.089-0.355c0.396-0.036,0.946-0.082,1.719-0.133l0.108-1.446l-0.059-0.017 c-0.047-0.012-0.092-0.024-0.139-0.035l-0.111-0.021l-0.088-0.017c-0.789-0.159-1.529-0.273-2.264-0.351L34.57,2.925l-0.103-0.011 c-0.84-0.083-1.693-0.127-2.539-0.127c-0.744,0-1.517,0.04-2.361,0.122c-0.13,0.013-0.256,0.025-0.385,0.038 C28.35,3.041,27.62,3.151,26.93,3.292l-0.024,0.002l-0.017,0.003c-0.727,0.149-1.457,0.338-2.232,0.573 c-0.068,0.022-0.139,0.044-0.207,0.067l-0.156,0.052c-0.658,0.212-1.303,0.444-1.92,0.7c-0.051,0.021-0.086,0.032-0.121,0.046 l-0.094,0.038c-0.678,0.288-1.354,0.615-2.028,0.977c-0.073,0.037-0.142,0.079-0.212,0.118l-0.084,0.054 c-0.189,0.103-0.381,0.223-0.569,0.34l-0.244,0.153l-1.345,0.821l1.494,0.499c0.223,0.076,0.463,0.111,0.711,0.111 c0.805,0,1.582-0.395,2.209-0.713c0.252-0.125,0.627-0.317,0.779-0.346c0.182,0.054,0.369,0.082,0.55,0.082 c0.685,0,1.244-0.368,1.739-0.694l0.135-0.087c0.16-0.052,0.434-0.154,0.98-0.359c0.561-0.209,1.58-0.593,1.854-0.658 c0.527-0.005,1.16-0.079,1.609-0.359c0.422,0.07,1.174,0.188,1.945,0.289c-0.057,0.034-0.112,0.07-0.158,0.115 c-0.251,0.232-1.605,0.642-2.02,0.695c-0.779,0.098-1.092,0.49-1.217,0.801c-0.163,0.403-0.064,0.808,0.094,1.139 c-0.295,0.194-0.656,0.41-0.966,0.575c0,0,0.003-0.015,0.005-0.023c0.111-0.622,0.191-1.071-0.11-1.431 c-0.153-0.184-0.38-0.289-0.624-0.289c-0.354,0-0.631,0.22-0.854,0.436c-0.626,0.604-1.004,1.356-1.145,1.641l-0.026,0.052 l-0.023,0.042c-0.271,0.519-0.382,0.887-0.231,2.028c-0.064,0.05-0.264,0.124-0.534,0.124c-0.036,0-0.07-0.001-0.095-0.004 c-0.176-0.189-0.42-0.298-0.693-0.298l0,0c-0.63,0-1.488,0.709-2.551,2.107l-0.342,0.451l0.347,0.446l0.323,0.411 c-5.066,3.918-5.104,4.14-5.157,4.468c-0.009,0.03-0.054,0.165-0.115,0.352c-0.754,2.348-1.174,4.104-0.765,5.044 c0.942,2.179,2.006,4.212,3.383,4.325c0.122,0.01,0.256,0.015,0.398,0.015c1.265,0,3.311-0.382,4.295-0.584 c0.182,0.341,0.402,0.738,0.527,0.956l0.217,0.39l0.445-0.015c0.004,0,0.239-0.009,0.539-0.009c0.342,0,0.573,0.011,0.723,0.021 c0.536,1.571,1.563,5.189,1.373,5.943l-0.004,0.002c-1.732,2.597,0.368,5.982,1.377,7.607c0.078,0.129,0.15,0.244,0.213,0.345 c0.389,1.108,0.861,1.841,1.856,1.841c0.075,0,0.149-0.004,0.227-0.01c0.058-0.002,0.115-0.004,0.175-0.004 c0.109,0,0.189,0.012,0.271,0.042l0.09,0.032l0.097,0.008c0.187,0.016,0.368,0.042,0.544,0.068c0.309,0.042,0.625,0.084,0.947,0.084 c0.868,0,1.555-0.327,2.148-1.028c0.023-0.003,0.044-0.005,0.067-0.008c0.622-0.086,0.854-0.398,0.935-0.678 c0.045-0.047,0.107-0.104,0.157-0.15c0.245-0.226,0.538-0.493,0.739-0.811c0.091-0.054,0.193-0.114,0.311-0.183 c0.2-0.124,0.428-0.26,0.605-0.352c0.157-0.05,0.297-0.142,0.401-0.271c0.251-0.31,0.2-0.659,0.157-0.941 c-0.041-0.291-0.084-0.592,0.072-0.911c0.889-0.428,2.466-1.479,2.721-1.652l-0.002,0.021c-0.016,0.141-0.057,0.517-0.119,0.757 c-0.336,0.335-0.617,0.845-0.704,1.018l-0.06,0.113l-0.018,0.125c-0.023,0.164-0.113,1.021,0.367,1.575 c0.242,0.277,0.59,0.432,0.978,0.432c0.124,0,0.253-0.016,0.384-0.047c1.234-0.279,3.426-3.249,3.604-4.888 c0.086-0.789-0.223-1.409-0.846-1.703l-0.465-0.221l-0.367,0.364l-1.352,1.353c-0.457,0.043-0.814,0.179-1.057,0.393 c0.014-0.578-0.043-1.17-0.104-1.745c-0.186-1.74-0.222-2.848,0.846-3.602l0.054-0.04l0.046-0.047 c0.387-0.392,0.813-0.734,1.264-1.099c1.059-0.85,2.152-1.729,2.804-3.315l0.027-0.067c0.209-0.543,0.524-1.361,0.097-1.984 c-0.107-0.155-0.33-0.395-0.75-0.478c0.556-0.225,0.98-0.399,1.023-0.417l0.129-0.052l0.1-0.097l2.281-2.19l0.334-0.321 l-0.146-0.441c-0.021-0.057-0.144-0.401-0.494-0.897c0.666,0.09,1.236,0.251,1.424,0.393c0.069,0.147,0.207,0.477,0.352,0.822 c2.512,5.918,2.863,6.224,3.518,6.233c0.025,0,0.045,0.002,0.061,0.005c0.055,0.002,0.101,0.004,0.145,0.004 c0.371,0,0.584-0.188,0.677-0.303c0.273-0.328,0.196-0.73,0.169-0.88l-0.01-0.052c-0.031-0.354-0.012-1.946,0.039-3.254 c0.004,0.002,0.004,0.006,0.008,0.011l1.346-0.534L56.406,22.84z M36.622,15.6c-0.104,0.004-0.217,0.009-0.338,0.014 c-0.388,0.02-0.828,0.038-1.268,0.038c-1.147,0-1.409-0.142-1.438-0.157c-0.135-0.1-0.275-0.174-0.42-0.226 c0.26-0.059,0.557-0.259,0.863-0.853c0.303,0.586,0.712,1.104,1.342,1.104c0.171,0,0.332-0.043,0.488-0.122 C36.063,15.401,36.413,15.522,36.622,15.6z M36.17,12.397c-0.086,0-0.156-0.004-0.211-0.009c0.059-0.153,0.129-0.243,0.186-0.293 c0.071,0.111,0.169,0.209,0.277,0.294C36.334,12.395,36.252,12.397,36.17,12.397z M31.6,13.933c0.394,0.771,0.686,1.103,0.916,1.246 c-0.57,0.047-1.001,0.409-1.354,0.752c-0.248-0.081-0.678-0.343-0.808-0.526c-0.075-0.106-0.165-0.199-0.265-0.279 C30.713,14.948,31.262,14.369,31.6,13.933z M29.428,13.366l-0.817-0.039l-2.737-0.134c0.332-0.275,0.65-0.534,0.837-0.686 c0.05-0.018,0.246-0.073,0.728-0.073c0.291,0,0.569,0.021,0.746,0.035L29.428,13.366z" enable-background="new " fill="url(#SVGID_5_)" opacity="0.3"/>
+<radialGradient cx="-2106.0845" cy="3754.9141" gradientTransform="matrix(0.961 0 0 -0.9609 2056.0444 3618.1604)" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="29.4754">
+ <stop offset="0.3152" style="stop-color:#7AF200"/>
+ <stop offset="0.7273" style="stop-color:#1CAD0F"/>
+ <stop offset="1" style="stop-color:#007A3A"/>
+</radialGradient>
+<path d="M7.703,27.745L7.703,27.745c0,0.009,0.001,0.014,0.001,0.022c0,0.747,0.047,1.484,0.112,2.218 c0.021,0.236,0.056,0.476,0.083,0.718c0.065,0.5,0.14,0.998,0.228,1.488c0.051,0.258,0.097,0.521,0.152,0.774 c0.114,0.508,0.244,1.008,0.386,1.501c0.06,0.204,0.107,0.411,0.169,0.61c0.009,0.023,0.019,0.04,0.023,0.061 c0.02-0.189,0.026-0.39,0.02-0.594C8.83,33.103,8.6,33.288,8.6,33.288l1.629-2.19v-1.402l-1.91-1.908 C8.319,27.787,7.704,27.69,7.703,27.745z" fill="url(#SVGID_6_)"/>
+<radialGradient cx="-2106.0928" cy="3754.918" gradientTransform="matrix(0.961 0 0 -0.9609 2056.0444 3618.1604)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="29.4765">
+ <stop offset="0.3152" style="stop-color:#7AF200"/>
+ <stop offset="0.7273" style="stop-color:#1CAD0F"/>
+ <stop offset="1" style="stop-color:#007A3A"/>
+</radialGradient>
+<path d="M23.042,6.076c0.706,0.233,1.282-0.24,1.939-0.66c0.231-0.049,2.81-1.076,3.089-1.076 s1.216-0.036,1.448-0.409c0,0,4.035,0.702,4.644,0.468c0.33-0.13,1.723-0.24,2.914-0.317c-0.066-0.014-0.127-0.036-0.195-0.05 c-0.064-0.015-0.125-0.023-0.191-0.035c-0.75-0.152-1.505-0.272-2.277-0.35c-0.008,0-0.012,0-0.02-0.003 c-0.81-0.082-1.633-0.124-2.467-0.124c-0.773,0-1.535,0.045-2.291,0.117c-0.133,0.015-0.266,0.025-0.397,0.043 c-0.731,0.079-1.456,0.186-2.165,0.328c-0.013,0.005-0.025,0.005-0.037,0.008c-0.736,0.152-1.459,0.34-2.168,0.559 c-0.121,0.035-0.238,0.077-0.362,0.115c-0.626,0.202-1.248,0.427-1.856,0.678c-0.071,0.031-0.145,0.057-0.215,0.087 c-0.67,0.286-1.322,0.602-1.96,0.941c-0.097,0.053-0.188,0.108-0.282,0.163c-0.271,0.149-0.527,0.32-0.793,0.481 C20.713,7.479,22.349,5.842,23.042,6.076z" fill="url(#SVGID_7_)"/>
+<radialGradient cx="-2106.0928" cy="3754.9209" gradientTransform="matrix(0.961 0 0 -0.9609 2056.0444 3618.1604)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="29.4743">
+ <stop offset="0.3152" style="stop-color:#B2F56E"/>
+ <stop offset="0.7273" style="stop-color:#5CBF1B"/>
+ <stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M55.685,22.962c-0.026-0.122-0.06-0.237-0.083-0.356c-0.127-0.601-0.28-1.19-0.455-1.773 c-0.045-0.154-0.092-0.316-0.143-0.474c-0.211-0.659-0.445-1.31-0.709-1.941c-0.047-0.112-0.1-0.223-0.15-0.331 c-0.242-0.56-0.504-1.104-0.789-1.639c-0.066-0.128-0.131-0.259-0.199-0.383c-0.336-0.604-0.691-1.194-1.074-1.768 c-0.064-0.1-0.137-0.192-0.203-0.292c-0.35-0.507-0.717-0.997-1.102-1.477c-0.078-0.094-0.152-0.192-0.233-0.287 c-0.442-0.532-0.909-1.044-1.396-1.534c-0.082-0.085-0.172-0.17-0.259-0.252c-0.444-0.437-0.907-0.857-1.387-1.258 c-0.079-0.069-0.157-0.139-0.237-0.206c-0.537-0.439-1.1-0.857-1.678-1.254c-0.1-0.069-0.203-0.135-0.307-0.2 c-0.531-0.354-1.079-0.686-1.643-0.998c-0.074-0.042-0.148-0.087-0.225-0.129c-0.625-0.336-1.262-0.642-1.916-0.924 c-0.117-0.049-0.232-0.096-0.348-0.145c-0.254-0.104-0.521-0.188-0.777-0.282c-0.306,0.195-1.729,1.001-1.729,1.001 s-6.18-0.846-6.602-0.426c-0.423,0.426-2.068,0.854-2.441,0.903c-0.376,0.049-1.151,0.247-0.221,1.396 c-0.139,0.141-2.795,1.99-2.795,1.15s0.594-2.348-0.24-1.54c-0.599,0.577-0.957,1.364-1.034,1.51 c-0.195,0.375-0.315,0.554-0.174,1.632c0.142,1.077-1.719,1.07-1.845,0.791c-0.332-0.746-2.174,1.676-2.174,1.676l0.776,0.996 c0,0-5.421,4.177-5.468,4.456c-0.048,0.282-1.399,3.907-0.93,4.984c0.468,1.079,1.652,3.797,2.771,3.888 c1.47,0.12,5.032-0.673,5.032-0.673c0.097,0.236,0.768,1.43,0.768,1.43s1.747-0.058,1.843,0.133 c0.033,0.063,2.104,6.157,1.422,6.965c-1.632,2.444,0.932,6.024,1.645,7.235c0.715,2.08,1.176,1.148,2.115,1.489 c1.155,0.101,2.129,0.528,3.111-0.735c0.285-0.235,0.77-0.049,0.77-0.376c0-0.183,0.84-0.718,1.057-1.223 c0.226-0.105,0.811-0.498,1.205-0.688c0.36-0.023-0.34-0.986,0.372-2.002c0.769-0.303,2.842-1.7,2.842-1.7 c0.095-2.05-1.01-4.581,1.05-6.033c1.326-1.355,3.068-2.126,3.912-4.183c0.232-0.61,0.756-1.854-0.744-1.48 c-1.41,0.354-2.981,0.435-2.236-0.187c-0.086-0.761-1.022-1.12-1.863-1.863c-0.436-1.028-1.118-2.86-1.118-2.86l-1.491-2.266 l0.186-0.468l1.773,2.609l1.771,2.142c0.65,2.143,1.209,2.33,1.209,2.33c0.98-0.345,3.311-1.305,3.311-1.305l2.281-2.19 c0,0-0.233-0.697-1.16-1.583l-0.703-0.418c-0.152,0.43-0.965,0.59-0.965,0.59l-1.973-2.361l0.733-0.147l0.565,1.076l1.356,0.47 c0,0,0.377-0.274,1.073,0.446c0.568-0.047,2.788,0.108,3.306,0.765c0.102,0.13,2.748,6.739,3.271,6.749 c0.229,0.002,0.395,0.091,0.32-0.309c-0.094-0.188,0-4.338,0.14-5.229c0.354-0.753,0.412-0.002,1.25,1.428 C55.696,23.033,55.692,22.997,55.685,22.962z M32.397,6.947c0.184-0.552,1.258-0.739,1.258-0.739s-0.308,0.568-0.236,0.859 c0.072,0.298-0.49,0.483-0.554,1.182c-0.061,0.694-1.343,0.287-1.447,0.043C31.311,8.049,32.208,7.497,32.397,6.947z M36.993,16.324 c-0.795,0-3.18,0.235-3.834-0.234c-0.658-0.467-1.168,0.05-1.639,0.52c-0.311,0.303-1.434-0.314-1.765-0.782 c-0.325-0.467-1.429-0.434-1.429-0.434l0.251-1.335l-3.171-0.154l-1.802,0.528l-1.694,0.05l0.95-0.454l1.181-0.278 c0,0,1.721-1.414,2.235-1.834c0.435-0.356,2.177-0.155,2.177-0.155l1.91,1.378c0,0-0.424,1.08-0.611,1.312 c0.701-0.047,1.525-1.321,1.525-1.321c-1.488-1.368-1.428-1.832-1.428-1.832l1.963,1.377l0.02,0.012c0,0,0.795,1.874,1.127,1.874 c0.326,0,0.744-1.289,0.744-1.289l0.559-0.142c0.248,0.593,0.715,1.929,1.272,1.614c0.323-0.177,0.854-0.015,1.462,0.218 c0.611,0.235,1.025-0.124,1.521,0.31C38.452,17.195,37.321,16.419,36.993,16.324z M38.239,13.102 c-0.818-0.311-3.587,0.704-2.969-0.957c0.33-0.896,1.179-1.083,1.469-0.487c0.076,0.247,0.998,0.625,0.99,0.108 c-0.006-0.518,0.928-0.791,1.063-0.406C38.293,11.716,40.737,13.58,38.239,13.102z M43.454,14.675 c-0.453-0.364,0.205-0.679-0.465-1.252c-0.959-0.822-1.708-1.176-0.401-1.841c1.612-0.202,0.263,0.515,0.529,0.943 c0.144,0.23,0.956,0.996,1.593,1.938C45.238,15.244,43.905,15.038,43.454,14.675z" fill="url(#SVGID_8_)"/>
+<radialGradient cx="-2106.0933" cy="3754.916" gradientTransform="matrix(0.961 0 0 -0.9609 2056.0444 3618.1604)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="29.4698">
+ <stop offset="0.3152" style="stop-color:#7AF200"/>
+ <stop offset="0.7273" style="stop-color:#1CAD0F"/>
+ <stop offset="1" style="stop-color:#007A3A"/>
+</radialGradient>
+<path d="M44.104,36.019l-1.555,1.552c0,0-0.934,0-0.979,0.378c-0.021,0.159-0.075,0.853-0.23,1.209 c-0.311,0.217-0.684,0.931-0.684,0.931s-0.191,1.382,0.839,1.146C42.526,41.001,45.698,36.77,44.104,36.019z" fill="url(#SVGID_9_)"/>
+<path d="M32.02,52.439c1.859,0,3.664-0.209,5.408-0.589 c-0.047-0.059-0.086-0.12-0.137-0.174l-9.057-9.324c-0.522-0.537-1.239-0.847-1.97-0.847c-0.685,0-1.324,0.265-1.804,0.751 l-1.373,1.418l-0.568,0.573l-0.524,0.537c-1.987-1.927-3.765-4.139-5.697-7.06c-1.067-1.62-1.986-3.592-2.57-4.956l-0.213-0.51 c0,0-0.291-0.718-0.39-0.975l-0.032-0.082c-0.081-0.211-0.153-0.408-0.221-0.601l-0.031-0.083l2.215-0.77 c1.222-0.414,1.915-1.688,1.638-3.071l-0.009-0.045l-1.386-4.235l-2.734-8.158c-0.193-0.582-0.564-1.064-1.032-1.394 c-2.904,4.096-4.617,9.095-4.617,14.496C6.917,41.205,18.155,52.439,32.02,52.439z" enable-background="new " fill="#020202" opacity="0.1"/>
+<path d="M32.02,52.439c1.563,0,3.09-0.15,4.576-0.422l-8.889-9.153 c-0.386-0.396-0.912-0.624-1.442-0.624c-0.485,0-0.936,0.188-1.274,0.531l-1.381,1.42l-0.561,0.568l-0.51,0.523l0.004,0.005 l-0.523,0.535c-2.243-2.087-4.219-4.489-6.334-7.693c-1.095-1.661-2.036-3.678-2.634-5.074l-0.19-0.45l-0.029-0.071 c0,0-0.292-0.723-0.393-0.981l-0.035-0.087c-0.082-0.216-0.156-0.415-0.229-0.614c0,0-0.144-0.406-0.174-0.493l0.085-0.354 l2.731-0.951c0.866-0.294,1.355-1.214,1.161-2.187l-0.008-0.044l-1.373-4.188l-2.734-8.161c-0.144-0.43-0.412-0.781-0.752-1.024 c-2.648,3.98-4.198,8.756-4.198,13.893C6.917,41.205,18.155,52.439,32.02,52.439z" enable-background="new " fill="#020202" opacity="0.2"/>
+<radialGradient cx="-2983.5728" cy="4023.543" gradientTransform="matrix(0.9654 -0.0107 -0.0107 -0.9654 2968.4299 3872.1846)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="42.6078">
+ <stop offset="0.8364" style="stop-color:#E9F0F2"/>
+ <stop offset="0.8909" style="stop-color:#AAB1B5"/>
+ <stop offset="0.9515" style="stop-color:#7C878C"/>
+ <stop offset="1" style="stop-color:#838F94"/>
+</radialGradient>
+<path d="M22.051,46.847c-2.873-2.563-5.037-5.372-6.979-8.311c-1.865-2.832-3.556-7.079-4.079-8.93 l-7.54-10.621c-0.429,0.711-1.107,3.264-0.794,6.717c0.316,3.454,3.534,11.814,7.313,17.545c3.782,5.731,9.389,11.118,11.269,12.311 c2.959,1.878,6.523,2.493,7.608,2.439c0,0,1.002-0.118,2.367-0.597C31.803,57.196,22.051,46.847,22.051,46.847z" fill="url(#SVGID_10_)"/>
+<path d="M12.413,33.434c-0.661-1.542-1.174-2.953-1.418-3.827L3.658,19.27 c-0.077,0.108-0.12,0.173-0.12,0.173c-0.126,0.207-0.266,0.55-0.406,0.977c-0.142,0.722-0.214,1.466-0.202,2.229 C3.002,28.046,7.083,32.497,12.413,33.434z" enable-background="new " opacity="0.05"/>
+<path d="M12.099,32.685c-0.507-1.242-0.899-2.348-1.104-3.078l-7.363-10.37 C3.548,19.356,3.5,19.429,3.5,19.429c-0.118,0.195-0.25,0.522-0.383,0.925c-0.134,0.682-0.202,1.383-0.19,2.105 C2.997,27.635,6.961,31.889,12.099,32.685z" enable-background="new " opacity="0.05"/>
+<path d="M3.443,19.407c-0.105,0.177-0.226,0.472-0.348,0.839 c-0.123,0.617-0.183,1.256-0.172,1.911c0.064,4.82,3.858,8.755,8.702,9.323c-0.278-0.742-0.495-1.39-0.632-1.874L3.596,19.185 C3.496,19.325,3.443,19.407,3.443,19.407z" enable-background="new " opacity="0.1"/>
+<radialGradient cx="-3022.0488" cy="4026.5146" gradientTransform="matrix(0.9664 -0.0083 -0.013 -0.9569 2980.2107 3844.9014)" gradientUnits="userSpaceOnUse" id="SVGID_11_" r="14.7389">
+ <stop offset="0.0424" style="stop-color:#D1D8D9"/>
+ <stop offset="0.4" style="stop-color:#BBC0C2"/>
+ <stop offset="0.7333" style="stop-color:#7C8C91"/>
+ <stop offset="1" style="stop-color:#A7B3B7"/>
+</radialGradient>
+<path d="M10.993,29.606l1.577-0.554c0,0-3.343-14.954-4.669-14.266c-0.667,0.348-0.66,0.538-1.335,1.026 c-2.014,1.464-3.112,3.174-3.112,3.174c-0.092,0.155-0.197,0.415-0.303,0.737c-0.105,0.54-0.161,1.102-0.153,1.672 c0.06,4.353,3.581,7.891,8.007,8.225C11,29.616,10.995,29.611,10.993,29.606z" fill="url(#SVGID_11_)"/>
+<path d="M21.933,48.33c-0.311,0.874-0.481,1.802-0.47,2.769 c0.031,2.291,1.062,4.354,2.695,5.889c2.064,0.771,3.951,1.047,4.689,1.01c0,0,1.002-0.118,2.367-0.597 c0.492-0.171-6.277-7.469-8.48-9.823L21.933,48.33z" enable-background="new " opacity="0.05"/>
+<path d="M22.125,47.537c-0.313,0.871-0.481,1.799-0.47,2.766 c0.043,3.142,1.947,5.86,4.748,7.363c0.927,0.218,1.705,0.318,2.198,0.331c0.013,0,0.032,0.002,0.045,0c0,0,1-0.115,2.37-0.594 c0.508-0.179-6.761-7.982-8.693-10.055L22.125,47.537z" enable-background="new " opacity="0.1"/>
+<radialGradient cx="-3005.0166" cy="3996.4961" gradientTransform="matrix(0.9664 -0.0083 -0.013 -0.9569 2980.2107 3844.9014)" gradientUnits="userSpaceOnUse" id="SVGID_12_" r="14.9991">
+ <stop offset="0.0424" style="stop-color:#D1D8D9"/>
+ <stop offset="0.4" style="stop-color:#BBC0C2"/>
+ <stop offset="0.7333" style="stop-color:#7C8C91"/>
+ <stop offset="1" style="stop-color:#A7B3B7"/>
+</radialGradient>
+<path d="M33.125,56.564c0.785-0.42,0.984-0.408,1.625-0.887c1.178-0.891-10.615-10.968-10.615-10.968 l-2.057,2.111c-0.277,0.833-0.428,1.724-0.415,2.648c0.062,4.526,3.869,8.17,8.542,8.24C30.997,57.499,32.036,57.146,33.125,56.564z " fill="url(#SVGID_12_)"/>
+<path d="M11.808,29.311l0.762-0.258c0,0-3.343-14.954-4.669-14.266 c-0.35,0.181-0.515,0.322-0.688,0.481L11.808,29.311z" enable-background="new " fill="#020202" opacity="0.1"/>
+<linearGradient gradientTransform="matrix(0.9999 -0.0111 -0.0111 -0.9999 3135.2356 3906.9067)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="-3082.8984" x2="-3077.6428" y1="3928.3984" y2="3911.7034">
+ <stop offset="0.0424" style="stop-color:#E9F0F2"/>
+ <stop offset="0.4" style="stop-color:#D4D9DB"/>
+ <stop offset="0.7333" style="stop-color:#98AAAD"/>
+ <stop offset="1" style="stop-color:#D0DADE"/>
+</linearGradient>
+<path d="M12.57,29.056l2.016-0.703c0.523-0.176,0.792-0.756,0.676-1.346l-1.356-4.141l-2.734-8.162 c-0.214-0.641-0.854-1.006-1.43-0.813c0,0-0.515,0.211-1.837,0.898L12.57,29.056z" fill="url(#SVGID_13_)"/>
+<path d="M24.135,44.708l-0.563,0.568l10.516,10.866 c0.227-0.158,0.457-0.313,0.662-0.468C35.928,54.784,24.135,44.708,24.135,44.708z" enable-background="new " fill="#020202" opacity="0.1"/>
+<linearGradient gradientTransform="matrix(0.9999 -0.0111 -0.0111 -0.9999 3135.2356 3906.9067)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="-3066.7827" x2="-3055.8347" y1="3897.6836" y2="3885.627">
+ <stop offset="0.0424" style="stop-color:#E9F0F2"/>
+ <stop offset="0.4" style="stop-color:#D4D9DB"/>
+ <stop offset="0.7333" style="stop-color:#98AAAD"/>
+ <stop offset="1" style="stop-color:#D0DADE"/>
+</linearGradient>
+<path d="M34.749,55.673c1.176-0.889,1.558-1.273,1.558-1.273c0.438-0.448,0.407-1.204-0.071-1.697 l-9.057-9.322c-0.478-0.496-1.222-0.544-1.66-0.097l-1.383,1.425L34.749,55.673z" fill="url(#SVGID_14_)"/>
+</g>
+<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
+<polygon fill="none" points="30.414,14.408 30.414,0 0.414,0 0.414,14.41 0,14.824 0.414,15.237 0.414,30 30.414,30 30.414,15.236 30.828,14.821 "/>
+<path d="M2.749,29.823V17.57L0,14.824l0.706-0.707C1.213,13.608,13.143,1.649,13.861,0.962 c0.387-0.368,0.914-0.786,1.589-0.786c0.687,0,1.172,0.42,1.518,0.785c0.457,0.484,8.802,8.816,13.151,13.154l0.708,0.706 l-2.747,2.749v12.253H2.749z" opacity="0.35"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="15.415" x2="15.415" y1="28.6694" y2="12.5688">
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="0.6606" style="stop-color:#E0E1E2"/>
+ <stop offset="1" style="stop-color:#B9BCBD"/>
+</linearGradient>
+<polygon fill="url(#SVGID_1__)" points="27.081,28.823 3.749,28.823 3.749,14.473 15.414,5.489 27.081,14.473 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="15.415" x2="15.415" y1="17.313" y2="28.6013">
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="0.6606" style="stop-color:#E0E1E2"/>
+ <stop offset="1" style="stop-color:#B9BCBD"/>
+</linearGradient>
+<path d="M15.414,6.668l10.736,8.264V27.89H4.682V14.932L15.414,6.668 M15.414,5.489L3.749,14.473v14.351 h23.333V14.473L15.414,5.489L15.414,5.489z" fill="url(#SVGID_2__)"/>
+<polygon opacity="0.2" points="27.081,18.033 27.081,14.473 15.414,5.489 3.749,14.473 3.749,18.322 15.414,8.99 "/>
+<polygon fill="#727272" points="27.081,18.033 27.081,14.473 15.414,5.489 3.749,14.473 3.749,18.322 15.414,6.655 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="15.416" x2="15.416" y1="17.9946" y2="29.1519">
+ <stop offset="0" style="stop-color:#D07100"/>
+ <stop offset="1" style="stop-color:#A23600"/>
+</linearGradient>
+<rect fill="url(#SVGID_3__)" height="10.501" width="7.001" x="11.916" y="18.322"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="15.416" x2="15.416" y1="28.7466" y2="18.3602">
+ <stop offset="0" style="stop-color:#D07100"/>
+ <stop offset="1" style="stop-color:#A23600"/>
+</linearGradient>
+<path d="M17.98,19.257v8.633h-5.133v-8.633H17.98 M18.917,18.322h-7.001v10.501h7.001V18.322L18.917,18.322z" fill="url(#SVGID_4__)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="15.4136" x2="15.4136" y1="0.0352" y2="17.7271">
+ <stop offset="0" style="stop-color:#DE8029"/>
+ <stop offset="0.2606" style="stop-color:#DE4E29"/>
+ <stop offset="1" style="stop-color:#D82E09"/>
+</linearGradient>
+<path d="M15.414,5.489l11.667,11.667l2.333-2.333c0,0-12.586-12.554-13.171-13.175 c-0.587-0.62-0.965-0.652-1.689,0.035c-0.719,0.688-13.14,13.14-13.14,13.14l2.335,2.333L15.414,5.489z" fill="url(#SVGID_5__)"/>
+<radialGradient cx="15.2969" cy="1.7559" gradientUnits="userSpaceOnUse" id="SVGID_6__" r="18.6679">
+ <stop offset="0" style="stop-color:#F7D481"/>
+ <stop offset="1" style="stop-color:#F5340A"/>
+</radialGradient>
+<path d="M14.553,2.616c0.724-0.688,1.102-0.653,1.689-0.034c0.516,0.549,10.433,10.442,12.705,12.709 l0.467-0.468c0,0-12.586-12.554-13.171-13.175c-0.587-0.62-0.965-0.652-1.689,0.035c-0.719,0.688-13.14,13.14-13.14,13.14 l0.467,0.465C4.134,13.029,13.917,3.225,14.553,2.616z" fill="url(#SVGID_6__)"/>
+<rect height="1.168" opacity="0.2" width="7.001" x="11.916" y="18.322"/>
+<rect fill="none" height="30" width="30" x="0.414"/>
+</g>
+</svg>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_call_voip_work.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,270 @@
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
+<rect fill="none" height="60" width="60"/>
+<rect fill="none" height="60" width="60"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2162.3384" x2="-2162.3384" y1="3603.7246" y2="3654.8755">
+ <stop offset="0" style="stop-color:#004E8C"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
+</linearGradient>
+<circle cx="31.662" cy="27.76" fill="url(#SVGID_1_)" r="25.76"/>
+<radialGradient cx="-2106.918" cy="3745.7734" gradientTransform="matrix(0.961 0 0 -0.9609 2056.0444 3618.1604)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="32.2687">
+ <stop offset="0" style="stop-color:#94FFFF"/>
+ <stop offset="0.5" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
+</radialGradient>
+<path d="M56.761,27.759c0,13.864-11.234,25.097-25.099,25.097c-13.863,0-25.101-11.232-25.101-25.097 c0-13.859,11.239-25.099,25.101-25.099C45.53,2.66,56.761,13.899,56.761,27.759z" fill="url(#SVGID_2_)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2162.3384" x2="-2162.3384" y1="3654.5078" y2="3603.9641">
+ <stop offset="0" style="stop-color:#31A7F8"/>
+ <stop offset="0.497" style="stop-color:#1E74DC"/>
+ <stop offset="1" style="stop-color:#88D6EB"/>
+</linearGradient>
+<path d="M31.663,2.66c-13.863,0-25.101,11.239-25.101,25.099 c0,13.864,11.239,25.097,25.101,25.097c13.864,0,25.099-11.232,25.099-25.097C56.761,13.899,45.53,2.66,31.663,2.66z M31.663,50.659 c-13.033,0-23.638-10.598-23.638-23.63c0-13.034,10.603-23.637,23.638-23.637c13.033,0,23.634,10.603,23.634,23.637 C55.296,40.06,44.696,50.659,31.663,50.659z" enable-background="new " fill="url(#SVGID_3_)" opacity="0.3"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-2187.0283" x2="-2183.0366" y1="3625.7734" y2="3625.7734">
+ <stop offset="0" style="stop-color:#58595B"/>
+ <stop offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<path d="M8.918,27.351c-0.268-0.357-0.871-0.357-1.137-0.357 c-0.525,0-0.804,0.376-0.809,0.742v0.023l0.001,0.038c-0.001,0.646,0.035,1.37,0.113,2.251c0.016,0.164,0.036,0.331,0.057,0.498 l0.028,0.241c0.067,0.521,0.145,1.033,0.235,1.531l0.041,0.218c0.038,0.198,0.075,0.391,0.117,0.583 c0.107,0.488,0.238,0.993,0.399,1.552c0.023,0.08,0.044,0.159,0.065,0.239c0.036,0.132,0.07,0.261,0.11,0.388l0.006,0.017 l0.014,0.04c-0.003-0.012-0.009-0.028-0.012-0.045l1.44-0.097c0.022-0.227,0.028-0.46,0.022-0.691 c-0.012-0.364-0.025-0.813-0.129-1.191l1.337-1.796l0.145-0.194v-0.244v-1.4v-0.303l-0.215-0.215L8.918,27.351z" enable-background="new " fill="url(#SVGID_4_)" opacity="0.3"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-2179.3354" x2="-2137.5874" y1="3633.083" y2="3633.083">
+ <stop offset="0" style="stop-color:#58595B"/>
+ <stop offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<path d="M56.406,22.84c-0.019-0.094-0.034-0.161-0.052-0.229 c-0.013-0.051-0.024-0.101-0.034-0.15c-0.128-0.595-0.285-1.208-0.472-1.832l-0.02-0.071c-0.041-0.14-0.082-0.281-0.127-0.42 c-0.227-0.706-0.473-1.38-0.732-2.003c-0.031-0.078-0.066-0.149-0.1-0.226l-0.055-0.119c-0.246-0.57-0.523-1.139-0.813-1.688 l-0.036-0.071c-0.057-0.107-0.111-0.216-0.17-0.321c-0.354-0.642-0.728-1.251-1.103-1.819c-0.04-0.06-0.085-0.122-0.13-0.184 c-0.027-0.038-0.054-0.075-0.078-0.111c-0.363-0.525-0.743-1.037-1.138-1.525l-0.076-0.099c-0.053-0.065-0.106-0.133-0.161-0.199 c-0.459-0.55-0.941-1.08-1.441-1.583c-0.068-0.067-0.139-0.138-0.211-0.209l-0.061-0.057c-0.45-0.44-0.93-0.878-1.422-1.289 l-0.097-0.083c-0.05-0.046-0.101-0.087-0.15-0.128c-0.536-0.441-1.118-0.875-1.725-1.291c-0.075-0.052-0.153-0.101-0.229-0.15 l-0.092-0.061c-0.546-0.362-1.115-0.709-1.688-1.023l-0.085-0.052c-0.049-0.028-0.096-0.054-0.144-0.082 c-0.636-0.341-1.3-0.66-1.976-0.951l-0.17-0.068l-0.186-0.077c-0.177-0.073-0.355-0.136-0.531-0.197 c-0.093-0.03-0.182-0.063-0.275-0.097l-0.339-0.127l-0.308,0.195c-0.203,0.129-1.01,0.589-1.484,0.859 c-0.526-0.07-1.801-0.23-3.089-0.355c0.396-0.036,0.946-0.082,1.719-0.133l0.108-1.446l-0.059-0.017 c-0.047-0.012-0.092-0.024-0.139-0.035l-0.111-0.021l-0.088-0.017c-0.789-0.159-1.529-0.273-2.264-0.351L34.57,2.925l-0.103-0.011 c-0.84-0.083-1.693-0.127-2.539-0.127c-0.744,0-1.517,0.04-2.361,0.122c-0.13,0.013-0.256,0.025-0.385,0.038 C28.35,3.041,27.62,3.151,26.93,3.292l-0.024,0.002l-0.017,0.003c-0.727,0.149-1.457,0.338-2.232,0.573 c-0.068,0.022-0.139,0.044-0.207,0.067l-0.156,0.052c-0.658,0.212-1.303,0.444-1.92,0.7c-0.051,0.021-0.086,0.032-0.121,0.046 l-0.094,0.038c-0.678,0.288-1.354,0.615-2.028,0.977c-0.073,0.037-0.142,0.079-0.212,0.118l-0.084,0.054 c-0.189,0.103-0.381,0.223-0.569,0.34l-0.244,0.153l-1.345,0.821l1.494,0.499c0.223,0.076,0.463,0.111,0.711,0.111 c0.805,0,1.582-0.395,2.209-0.713c0.252-0.125,0.627-0.317,0.779-0.346c0.182,0.054,0.369,0.082,0.55,0.082 c0.685,0,1.244-0.368,1.739-0.694l0.135-0.087c0.16-0.052,0.434-0.154,0.98-0.359c0.561-0.209,1.58-0.593,1.854-0.658 c0.527-0.005,1.16-0.079,1.609-0.359c0.422,0.07,1.174,0.188,1.945,0.289c-0.057,0.034-0.112,0.07-0.158,0.115 c-0.251,0.232-1.605,0.642-2.02,0.695c-0.779,0.098-1.092,0.49-1.217,0.801c-0.163,0.403-0.064,0.808,0.094,1.139 c-0.295,0.194-0.656,0.41-0.966,0.575c0,0,0.003-0.015,0.005-0.023c0.111-0.622,0.191-1.071-0.11-1.431 c-0.153-0.184-0.38-0.289-0.624-0.289c-0.354,0-0.631,0.22-0.854,0.436c-0.626,0.604-1.004,1.356-1.145,1.641l-0.026,0.052 l-0.023,0.042c-0.271,0.519-0.382,0.887-0.231,2.028c-0.064,0.05-0.264,0.124-0.534,0.124c-0.036,0-0.07-0.001-0.095-0.004 c-0.176-0.189-0.42-0.298-0.693-0.298l0,0c-0.63,0-1.488,0.709-2.551,2.107l-0.342,0.451l0.347,0.446l0.323,0.411 c-5.066,3.918-5.104,4.14-5.157,4.468c-0.009,0.03-0.054,0.165-0.115,0.352c-0.754,2.348-1.174,4.104-0.765,5.044 c0.942,2.179,2.006,4.212,3.383,4.325c0.122,0.01,0.256,0.015,0.398,0.015c1.265,0,3.311-0.382,4.295-0.584 c0.182,0.341,0.402,0.738,0.527,0.956l0.217,0.39l0.445-0.015c0.004,0,0.239-0.009,0.539-0.009c0.342,0,0.573,0.011,0.723,0.021 c0.536,1.571,1.563,5.189,1.373,5.943l-0.004,0.002c-1.732,2.597,0.368,5.982,1.377,7.607c0.078,0.129,0.15,0.244,0.213,0.345 c0.389,1.108,0.861,1.841,1.856,1.841c0.075,0,0.149-0.004,0.227-0.01c0.058-0.002,0.115-0.004,0.175-0.004 c0.109,0,0.189,0.012,0.271,0.042l0.09,0.032l0.097,0.008c0.187,0.016,0.368,0.042,0.544,0.068c0.309,0.042,0.625,0.084,0.947,0.084 c0.868,0,1.555-0.327,2.148-1.028c0.023-0.003,0.044-0.005,0.067-0.008c0.622-0.086,0.854-0.398,0.935-0.678 c0.045-0.047,0.107-0.104,0.157-0.15c0.245-0.226,0.538-0.493,0.739-0.811c0.091-0.054,0.193-0.114,0.311-0.183 c0.2-0.124,0.428-0.26,0.605-0.352c0.157-0.05,0.297-0.142,0.401-0.271c0.251-0.31,0.2-0.659,0.157-0.941 c-0.041-0.291-0.084-0.592,0.072-0.911c0.889-0.428,2.466-1.479,2.721-1.652l-0.002,0.021c-0.016,0.141-0.057,0.517-0.119,0.757 c-0.336,0.335-0.617,0.845-0.704,1.018l-0.06,0.113l-0.018,0.125c-0.023,0.164-0.113,1.021,0.367,1.575 c0.242,0.277,0.59,0.432,0.978,0.432c0.124,0,0.253-0.016,0.384-0.047c1.234-0.279,3.426-3.249,3.604-4.888 c0.086-0.789-0.223-1.409-0.846-1.703l-0.465-0.221l-0.367,0.364l-1.352,1.353c-0.457,0.043-0.814,0.179-1.057,0.393 c0.014-0.578-0.043-1.17-0.104-1.745c-0.186-1.74-0.222-2.848,0.846-3.602l0.054-0.04l0.046-0.047 c0.387-0.392,0.813-0.734,1.264-1.099c1.059-0.85,2.152-1.729,2.804-3.315l0.027-0.067c0.209-0.543,0.524-1.361,0.097-1.984 c-0.107-0.155-0.33-0.395-0.75-0.478c0.556-0.225,0.98-0.399,1.023-0.417l0.129-0.052l0.1-0.097l2.281-2.19l0.334-0.321 l-0.146-0.441c-0.021-0.057-0.144-0.401-0.494-0.897c0.666,0.09,1.236,0.251,1.424,0.393c0.069,0.147,0.207,0.477,0.352,0.822 c2.512,5.918,2.863,6.224,3.518,6.233c0.025,0,0.045,0.002,0.061,0.005c0.055,0.002,0.101,0.004,0.145,0.004 c0.371,0,0.584-0.188,0.677-0.303c0.273-0.328,0.196-0.73,0.169-0.88l-0.01-0.052c-0.031-0.354-0.012-1.946,0.039-3.254 c0.004,0.002,0.004,0.006,0.008,0.011l1.346-0.534L56.406,22.84z M36.622,15.6c-0.104,0.004-0.217,0.009-0.338,0.014 c-0.388,0.02-0.828,0.038-1.268,0.038c-1.147,0-1.409-0.142-1.438-0.157c-0.135-0.1-0.275-0.174-0.42-0.226 c0.26-0.059,0.557-0.259,0.863-0.853c0.303,0.586,0.712,1.104,1.342,1.104c0.171,0,0.332-0.043,0.488-0.122 C36.063,15.401,36.413,15.522,36.622,15.6z M36.17,12.397c-0.086,0-0.156-0.004-0.211-0.009c0.059-0.153,0.129-0.243,0.186-0.293 c0.071,0.111,0.169,0.209,0.277,0.294C36.334,12.395,36.252,12.397,36.17,12.397z M31.6,13.933c0.394,0.771,0.686,1.103,0.916,1.246 c-0.57,0.047-1.001,0.409-1.354,0.752c-0.248-0.081-0.678-0.343-0.808-0.526c-0.075-0.106-0.165-0.199-0.265-0.279 C30.713,14.948,31.262,14.369,31.6,13.933z M29.428,13.366l-0.817-0.039l-2.737-0.134c0.332-0.275,0.65-0.534,0.837-0.686 c0.05-0.018,0.246-0.073,0.728-0.073c0.291,0,0.569,0.021,0.746,0.035L29.428,13.366z" enable-background="new " fill="url(#SVGID_5_)" opacity="0.3"/>
+<radialGradient cx="-2106.0845" cy="3754.9141" gradientTransform="matrix(0.961 0 0 -0.9609 2056.0444 3618.1604)" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="29.4754">
+ <stop offset="0.3152" style="stop-color:#7AF200"/>
+ <stop offset="0.7273" style="stop-color:#1CAD0F"/>
+ <stop offset="1" style="stop-color:#007A3A"/>
+</radialGradient>
+<path d="M7.703,27.745L7.703,27.745c0,0.009,0.001,0.014,0.001,0.022c0,0.747,0.047,1.484,0.112,2.218 c0.021,0.236,0.056,0.476,0.083,0.718c0.065,0.5,0.14,0.998,0.228,1.488c0.051,0.258,0.097,0.521,0.152,0.774 c0.114,0.508,0.244,1.008,0.386,1.501c0.06,0.204,0.107,0.411,0.169,0.61c0.009,0.023,0.019,0.04,0.023,0.061 c0.02-0.189,0.026-0.39,0.02-0.594C8.83,33.103,8.6,33.288,8.6,33.288l1.629-2.19v-1.402l-1.91-1.908 C8.319,27.787,7.704,27.69,7.703,27.745z" fill="url(#SVGID_6_)"/>
+<radialGradient cx="-2106.0928" cy="3754.918" gradientTransform="matrix(0.961 0 0 -0.9609 2056.0444 3618.1604)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="29.4765">
+ <stop offset="0.3152" style="stop-color:#7AF200"/>
+ <stop offset="0.7273" style="stop-color:#1CAD0F"/>
+ <stop offset="1" style="stop-color:#007A3A"/>
+</radialGradient>
+<path d="M23.042,6.076c0.706,0.233,1.282-0.24,1.939-0.66c0.231-0.049,2.81-1.076,3.089-1.076 s1.216-0.036,1.448-0.409c0,0,4.035,0.702,4.644,0.468c0.33-0.13,1.723-0.24,2.914-0.317c-0.066-0.014-0.127-0.036-0.195-0.05 c-0.064-0.015-0.125-0.023-0.191-0.035c-0.75-0.152-1.505-0.272-2.277-0.35c-0.008,0-0.012,0-0.02-0.003 c-0.81-0.082-1.633-0.124-2.467-0.124c-0.773,0-1.535,0.045-2.291,0.117c-0.133,0.015-0.266,0.025-0.397,0.043 c-0.731,0.079-1.456,0.186-2.165,0.328c-0.013,0.005-0.025,0.005-0.037,0.008c-0.736,0.152-1.459,0.34-2.168,0.559 c-0.121,0.035-0.238,0.077-0.362,0.115c-0.626,0.202-1.248,0.427-1.856,0.678c-0.071,0.031-0.145,0.057-0.215,0.087 c-0.67,0.286-1.322,0.602-1.96,0.941c-0.097,0.053-0.188,0.108-0.282,0.163c-0.271,0.149-0.527,0.32-0.793,0.481 C20.713,7.479,22.349,5.842,23.042,6.076z" fill="url(#SVGID_7_)"/>
+<radialGradient cx="-2106.0928" cy="3754.9209" gradientTransform="matrix(0.961 0 0 -0.9609 2056.0444 3618.1604)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="29.4743">
+ <stop offset="0.3152" style="stop-color:#B2F56E"/>
+ <stop offset="0.7273" style="stop-color:#5CBF1B"/>
+ <stop offset="1" style="stop-color:#227A00"/>
+</radialGradient>
+<path d="M55.685,22.962c-0.026-0.122-0.06-0.237-0.083-0.356c-0.127-0.601-0.28-1.19-0.455-1.773 c-0.045-0.154-0.092-0.316-0.143-0.474c-0.211-0.659-0.445-1.31-0.709-1.941c-0.047-0.112-0.1-0.223-0.15-0.331 c-0.242-0.56-0.504-1.104-0.789-1.639c-0.066-0.128-0.131-0.259-0.199-0.383c-0.336-0.604-0.691-1.194-1.074-1.768 c-0.064-0.1-0.137-0.192-0.203-0.292c-0.35-0.507-0.717-0.997-1.102-1.477c-0.078-0.094-0.152-0.192-0.233-0.287 c-0.442-0.532-0.909-1.044-1.396-1.534c-0.082-0.085-0.172-0.17-0.259-0.252c-0.444-0.437-0.907-0.857-1.387-1.258 c-0.079-0.069-0.157-0.139-0.237-0.206c-0.537-0.439-1.1-0.857-1.678-1.254c-0.1-0.069-0.203-0.135-0.307-0.2 c-0.531-0.354-1.079-0.686-1.643-0.998c-0.074-0.042-0.148-0.087-0.225-0.129c-0.625-0.336-1.262-0.642-1.916-0.924 c-0.117-0.049-0.232-0.096-0.348-0.145c-0.254-0.104-0.521-0.188-0.777-0.282c-0.306,0.195-1.729,1.001-1.729,1.001 s-6.18-0.846-6.602-0.426c-0.423,0.426-2.068,0.854-2.441,0.903c-0.376,0.049-1.151,0.247-0.221,1.396 c-0.139,0.141-2.795,1.99-2.795,1.15s0.594-2.348-0.24-1.54c-0.599,0.577-0.957,1.364-1.034,1.51 c-0.195,0.375-0.315,0.554-0.174,1.632c0.142,1.077-1.719,1.07-1.845,0.791c-0.332-0.746-2.174,1.676-2.174,1.676l0.776,0.996 c0,0-5.421,4.177-5.468,4.456c-0.048,0.282-1.399,3.907-0.93,4.984c0.468,1.079,1.652,3.797,2.771,3.888 c1.47,0.12,5.032-0.673,5.032-0.673c0.097,0.236,0.768,1.43,0.768,1.43s1.747-0.058,1.843,0.133 c0.033,0.063,2.104,6.157,1.422,6.965c-1.632,2.444,0.932,6.024,1.645,7.235c0.715,2.08,1.176,1.148,2.115,1.489 c1.155,0.101,2.129,0.528,3.111-0.735c0.285-0.235,0.77-0.049,0.77-0.376c0-0.183,0.84-0.718,1.057-1.223 c0.226-0.105,0.811-0.498,1.205-0.688c0.36-0.023-0.34-0.986,0.372-2.002c0.769-0.303,2.842-1.7,2.842-1.7 c0.095-2.05-1.01-4.581,1.05-6.033c1.326-1.355,3.068-2.126,3.912-4.183c0.232-0.61,0.756-1.854-0.744-1.48 c-1.41,0.354-2.981,0.435-2.236-0.187c-0.086-0.761-1.022-1.12-1.863-1.863c-0.436-1.028-1.118-2.86-1.118-2.86l-1.491-2.266 l0.186-0.468l1.773,2.609l1.771,2.142c0.65,2.143,1.209,2.33,1.209,2.33c0.98-0.345,3.311-1.305,3.311-1.305l2.281-2.19 c0,0-0.233-0.697-1.16-1.583l-0.703-0.418c-0.152,0.43-0.965,0.59-0.965,0.59l-1.973-2.361l0.733-0.147l0.565,1.076l1.356,0.47 c0,0,0.377-0.274,1.073,0.446c0.568-0.047,2.788,0.108,3.306,0.765c0.102,0.13,2.748,6.739,3.271,6.749 c0.229,0.002,0.395,0.091,0.32-0.309c-0.094-0.188,0-4.338,0.14-5.229c0.354-0.753,0.412-0.002,1.25,1.428 C55.696,23.033,55.692,22.997,55.685,22.962z M32.397,6.947c0.184-0.552,1.258-0.739,1.258-0.739s-0.308,0.568-0.236,0.859 c0.072,0.298-0.49,0.483-0.554,1.182c-0.061,0.694-1.343,0.287-1.447,0.043C31.311,8.049,32.208,7.497,32.397,6.947z M36.993,16.324 c-0.795,0-3.18,0.235-3.834-0.234c-0.658-0.467-1.168,0.05-1.639,0.52c-0.311,0.303-1.434-0.314-1.765-0.782 c-0.325-0.467-1.429-0.434-1.429-0.434l0.251-1.335l-3.171-0.154l-1.802,0.528l-1.694,0.05l0.95-0.454l1.181-0.278 c0,0,1.721-1.414,2.235-1.834c0.435-0.356,2.177-0.155,2.177-0.155l1.91,1.378c0,0-0.424,1.08-0.611,1.312 c0.701-0.047,1.525-1.321,1.525-1.321c-1.488-1.368-1.428-1.832-1.428-1.832l1.963,1.377l0.02,0.012c0,0,0.795,1.874,1.127,1.874 c0.326,0,0.744-1.289,0.744-1.289l0.559-0.142c0.248,0.593,0.715,1.929,1.272,1.614c0.323-0.177,0.854-0.015,1.462,0.218 c0.611,0.235,1.025-0.124,1.521,0.31C38.452,17.195,37.321,16.419,36.993,16.324z M38.239,13.102 c-0.818-0.311-3.587,0.704-2.969-0.957c0.33-0.896,1.179-1.083,1.469-0.487c0.076,0.247,0.998,0.625,0.99,0.108 c-0.006-0.518,0.928-0.791,1.063-0.406C38.293,11.716,40.737,13.58,38.239,13.102z M43.454,14.675 c-0.453-0.364,0.205-0.679-0.465-1.252c-0.959-0.822-1.708-1.176-0.401-1.841c1.612-0.202,0.263,0.515,0.529,0.943 c0.144,0.23,0.956,0.996,1.593,1.938C45.238,15.244,43.905,15.038,43.454,14.675z" fill="url(#SVGID_8_)"/>
+<radialGradient cx="-2106.0933" cy="3754.916" gradientTransform="matrix(0.961 0 0 -0.9609 2056.0444 3618.1604)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="29.4698">
+ <stop offset="0.3152" style="stop-color:#7AF200"/>
+ <stop offset="0.7273" style="stop-color:#1CAD0F"/>
+ <stop offset="1" style="stop-color:#007A3A"/>
+</radialGradient>
+<path d="M44.104,36.019l-1.555,1.552c0,0-0.934,0-0.979,0.378c-0.021,0.159-0.075,0.853-0.23,1.209 c-0.311,0.217-0.684,0.931-0.684,0.931s-0.191,1.382,0.839,1.146C42.526,41.001,45.698,36.77,44.104,36.019z" fill="url(#SVGID_9_)"/>
+<path d="M32.02,52.439c1.859,0,3.664-0.209,5.408-0.589 c-0.047-0.059-0.086-0.12-0.137-0.174l-9.057-9.324c-0.522-0.537-1.239-0.847-1.97-0.847c-0.685,0-1.324,0.265-1.804,0.751 l-1.373,1.418l-0.568,0.573l-0.524,0.537c-1.987-1.927-3.765-4.139-5.697-7.06c-1.067-1.62-1.986-3.592-2.57-4.956l-0.213-0.51 c0,0-0.291-0.718-0.39-0.975l-0.032-0.082c-0.081-0.211-0.153-0.408-0.221-0.601l-0.031-0.083l2.215-0.77 c1.222-0.414,1.915-1.688,1.638-3.071l-0.009-0.045l-1.386-4.235l-2.734-8.158c-0.193-0.582-0.564-1.064-1.032-1.394 c-2.904,4.096-4.617,9.095-4.617,14.496C6.917,41.205,18.155,52.439,32.02,52.439z" enable-background="new " fill="#020202" opacity="0.1"/>
+<path d="M32.02,52.439c1.563,0,3.09-0.15,4.576-0.422l-8.889-9.153 c-0.386-0.396-0.912-0.624-1.442-0.624c-0.485,0-0.936,0.188-1.274,0.531l-1.381,1.42l-0.561,0.568l-0.51,0.523l0.004,0.005 l-0.523,0.535c-2.243-2.087-4.219-4.489-6.334-7.693c-1.095-1.661-2.036-3.678-2.634-5.074l-0.19-0.45l-0.029-0.071 c0,0-0.292-0.723-0.393-0.981l-0.035-0.087c-0.082-0.216-0.156-0.415-0.229-0.614c0,0-0.144-0.406-0.174-0.493l0.085-0.354 l2.731-0.951c0.866-0.294,1.355-1.214,1.161-2.187l-0.008-0.044l-1.373-4.188l-2.734-8.161c-0.144-0.43-0.412-0.781-0.752-1.024 c-2.648,3.98-4.198,8.756-4.198,13.893C6.917,41.205,18.155,52.439,32.02,52.439z" enable-background="new " fill="#020202" opacity="0.2"/>
+<radialGradient cx="-2983.5728" cy="4023.543" gradientTransform="matrix(0.9654 -0.0107 -0.0107 -0.9654 2968.4299 3872.1846)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="42.6078">
+ <stop offset="0.8364" style="stop-color:#E9F0F2"/>
+ <stop offset="0.8909" style="stop-color:#AAB1B5"/>
+ <stop offset="0.9515" style="stop-color:#7C878C"/>
+ <stop offset="1" style="stop-color:#838F94"/>
+</radialGradient>
+<path d="M22.051,46.847c-2.873-2.563-5.037-5.372-6.979-8.311c-1.865-2.832-3.556-7.079-4.079-8.93 l-7.54-10.621c-0.429,0.711-1.107,3.264-0.794,6.717c0.316,3.454,3.534,11.814,7.313,17.545c3.782,5.731,9.389,11.118,11.269,12.311 c2.959,1.878,6.523,2.493,7.608,2.439c0,0,1.002-0.118,2.367-0.597C31.803,57.196,22.051,46.847,22.051,46.847z" fill="url(#SVGID_10_)"/>
+<path d="M12.413,33.434c-0.661-1.542-1.174-2.953-1.418-3.827L3.658,19.27 c-0.077,0.108-0.12,0.173-0.12,0.173c-0.126,0.207-0.266,0.55-0.406,0.977c-0.142,0.722-0.214,1.466-0.202,2.229 C3.002,28.046,7.083,32.497,12.413,33.434z" enable-background="new " opacity="0.05"/>
+<path d="M12.099,32.685c-0.507-1.242-0.899-2.348-1.104-3.078l-7.363-10.37 C3.548,19.356,3.5,19.429,3.5,19.429c-0.118,0.195-0.25,0.522-0.383,0.925c-0.134,0.682-0.202,1.383-0.19,2.105 C2.997,27.635,6.961,31.889,12.099,32.685z" enable-background="new " opacity="0.05"/>
+<path d="M3.443,19.407c-0.105,0.177-0.226,0.472-0.348,0.839 c-0.123,0.617-0.183,1.256-0.172,1.911c0.064,4.82,3.858,8.755,8.702,9.323c-0.278-0.742-0.495-1.39-0.632-1.874L3.596,19.185 C3.496,19.325,3.443,19.407,3.443,19.407z" enable-background="new " opacity="0.1"/>
+<radialGradient cx="-3022.0488" cy="4026.5146" gradientTransform="matrix(0.9664 -0.0083 -0.013 -0.9569 2980.2107 3844.9014)" gradientUnits="userSpaceOnUse" id="SVGID_11_" r="14.7389">
+ <stop offset="0.0424" style="stop-color:#D1D8D9"/>
+ <stop offset="0.4" style="stop-color:#BBC0C2"/>
+ <stop offset="0.7333" style="stop-color:#7C8C91"/>
+ <stop offset="1" style="stop-color:#A7B3B7"/>
+</radialGradient>
+<path d="M10.993,29.606l1.577-0.554c0,0-3.343-14.954-4.669-14.266c-0.667,0.348-0.66,0.538-1.335,1.026 c-2.014,1.464-3.112,3.174-3.112,3.174c-0.092,0.155-0.197,0.415-0.303,0.737c-0.105,0.54-0.161,1.102-0.153,1.672 c0.06,4.353,3.581,7.891,8.007,8.225C11,29.616,10.995,29.611,10.993,29.606z" fill="url(#SVGID_11_)"/>
+<path d="M21.933,48.33c-0.311,0.874-0.481,1.802-0.47,2.769 c0.031,2.291,1.062,4.354,2.695,5.889c2.064,0.771,3.951,1.047,4.689,1.01c0,0,1.002-0.118,2.367-0.597 c0.492-0.171-6.277-7.469-8.48-9.823L21.933,48.33z" enable-background="new " opacity="0.05"/>
+<path d="M22.125,47.537c-0.313,0.871-0.481,1.799-0.47,2.766 c0.043,3.142,1.947,5.86,4.748,7.363c0.927,0.218,1.705,0.318,2.198,0.331c0.013,0,0.032,0.002,0.045,0c0,0,1-0.115,2.37-0.594 c0.508-0.179-6.761-7.982-8.693-10.055L22.125,47.537z" enable-background="new " opacity="0.1"/>
+<radialGradient cx="-3005.0166" cy="3996.4961" gradientTransform="matrix(0.9664 -0.0083 -0.013 -0.9569 2980.2107 3844.9014)" gradientUnits="userSpaceOnUse" id="SVGID_12_" r="14.9991">
+ <stop offset="0.0424" style="stop-color:#D1D8D9"/>
+ <stop offset="0.4" style="stop-color:#BBC0C2"/>
+ <stop offset="0.7333" style="stop-color:#7C8C91"/>
+ <stop offset="1" style="stop-color:#A7B3B7"/>
+</radialGradient>
+<path d="M33.125,56.564c0.785-0.42,0.984-0.408,1.625-0.887c1.178-0.891-10.615-10.968-10.615-10.968 l-2.057,2.111c-0.277,0.833-0.428,1.724-0.415,2.648c0.062,4.526,3.869,8.17,8.542,8.24C30.997,57.499,32.036,57.146,33.125,56.564z " fill="url(#SVGID_12_)"/>
+<path d="M11.808,29.311l0.762-0.258c0,0-3.343-14.954-4.669-14.266 c-0.35,0.181-0.515,0.322-0.688,0.481L11.808,29.311z" enable-background="new " fill="#020202" opacity="0.1"/>
+<linearGradient gradientTransform="matrix(0.9999 -0.0111 -0.0111 -0.9999 3135.2356 3906.9067)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="-3082.8984" x2="-3077.6428" y1="3928.3984" y2="3911.7034">
+ <stop offset="0.0424" style="stop-color:#E9F0F2"/>
+ <stop offset="0.4" style="stop-color:#D4D9DB"/>
+ <stop offset="0.7333" style="stop-color:#98AAAD"/>
+ <stop offset="1" style="stop-color:#D0DADE"/>
+</linearGradient>
+<path d="M12.57,29.056l2.016-0.703c0.523-0.176,0.792-0.756,0.676-1.346l-1.356-4.141l-2.734-8.162 c-0.214-0.641-0.854-1.006-1.43-0.813c0,0-0.515,0.211-1.837,0.898L12.57,29.056z" fill="url(#SVGID_13_)"/>
+<path d="M24.135,44.708l-0.563,0.568l10.516,10.866 c0.227-0.158,0.457-0.313,0.662-0.468C35.928,54.784,24.135,44.708,24.135,44.708z" enable-background="new " fill="#020202" opacity="0.1"/>
+<linearGradient gradientTransform="matrix(0.9999 -0.0111 -0.0111 -0.9999 3135.2356 3906.9067)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="-3066.7827" x2="-3055.8347" y1="3897.6836" y2="3885.627">
+ <stop offset="0.0424" style="stop-color:#E9F0F2"/>
+ <stop offset="0.4" style="stop-color:#D4D9DB"/>
+ <stop offset="0.7333" style="stop-color:#98AAAD"/>
+ <stop offset="1" style="stop-color:#D0DADE"/>
+</linearGradient>
+<path d="M34.749,55.673c1.176-0.889,1.558-1.273,1.558-1.273c0.438-0.448,0.407-1.204-0.071-1.697 l-9.057-9.322c-0.478-0.496-1.222-0.544-1.66-0.097l-1.383,1.425L34.749,55.673z" fill="url(#SVGID_14_)"/>
+</g>
+<g transform="matrix(1 0 0 1 30 30)">
+<rect fill="none" height="30" width="30"/>
+<rect fill="none" height="30" width="30"/>
+<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="654.6" x2="654.6" y1="-558.3" y2="-601.7">
+
+<stop offset="0" stop-color="#DFE1E6"/>
+
+<stop offset="1" stop-color="#BDBEC3"/>
+
+</linearGradient>
+<rect fill="url(#SVGID_1__)" height="21.5" width="17.33" x="5.158" y="3.499"/>
+<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="654.6" x2="654.6" y1="-558.9" y2="-602.2">
+
+<stop offset="0" stop-color="#E7E9EF"/>
+
+<stop offset="1" stop-color="#C8C9CE"/>
+
+</linearGradient>
+<path d="M21.99,3.999v20.5h-16.33v-20.5h16.33m0.5-0.501h-17.33v21.5h17.33v-21.5z" fill="url(#SVGID_2__)"/>
+<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="642.6" x2="642.6" y1="-567.9" y2="-562.2">
+
+<stop offset="0" stop-color="#75BCFF"/>
+
+<stop offset="1" stop-color="#0070A1"/>
+
+</linearGradient>
+<rect fill="url(#SVGID_3__)" height="3" width="3" x="6.324" y="5.146"/>
+<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="650.6" x2="650.6" y1="-567.9" y2="-562.2">
+
+<stop offset="0" stop-color="#75BCFF"/>
+
+<stop offset="1" stop-color="#0070A1"/>
+
+</linearGradient>
+<rect fill="url(#SVGID_4__)" height="3" width="3" x="10.32" y="5.146"/>
+<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="666.6" x2="666.6" y1="-567.9" y2="-562.2">
+
+<stop offset="0" stop-color="#75BCFF"/>
+
+<stop offset="1" stop-color="#0070A1"/>
+
+</linearGradient>
+<rect fill="url(#SVGID_5__)" height="3" width="3" x="18.32" y="5.146"/>
+<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_6__" x1="658.6" x2="658.6" y1="-567.9" y2="-562.2">
+
+<stop offset="0" stop-color="#75BCFF"/>
+
+<stop offset="1" stop-color="#0070A1"/>
+
+</linearGradient>
+<rect fill="url(#SVGID_6__)" height="3" width="3" x="14.32" y="5.146"/>
+<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_7__" x1="642.6" x2="642.6" y1="-576.5" y2="-570.8">
+
+<stop offset="0" stop-color="#75BCFF"/>
+
+<stop offset="1" stop-color="#0070A1"/>
+
+</linearGradient>
+<rect fill="url(#SVGID_7__)" height="3" width="3" x="6.324" y="9.458"/>
+<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_8__" x1="650.6" x2="650.6" y1="-576.5" y2="-570.8">
+
+<stop offset="0" stop-color="#75BCFF"/>
+
+<stop offset="1" stop-color="#0070A1"/>
+
+</linearGradient>
+<rect fill="url(#SVGID_8__)" height="3" width="3" x="10.32" y="9.458"/>
+<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_9__" x1="666.6" x2="666.6" y1="-576.5" y2="-570.8">
+
+<stop offset="0" stop-color="#75BCFF"/>
+
+<stop offset="1" stop-color="#0070A1"/>
+
+</linearGradient>
+<rect fill="url(#SVGID_9__)" height="3" width="3" x="18.32" y="9.458"/>
+<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_10__" x1="658.6" x2="658.6" y1="-576.5" y2="-570.8">
+
+<stop offset="0" stop-color="#75BCFF"/>
+
+<stop offset="1" stop-color="#0070A1"/>
+
+</linearGradient>
+<rect fill="url(#SVGID_10__)" height="3" width="3" x="14.32" y="9.458"/>
+<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_11__" x1="642.6" x2="642.6" y1="-594.5" y2="-588.8">
+
+<stop offset="0" stop-color="#75BCFF"/>
+
+<stop offset="1" stop-color="#0070A1"/>
+
+</linearGradient>
+<rect fill="url(#SVGID_11__)" height="3" width="3" x="6.324" y="18.46"/>
+<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_12__" x1="650.6" x2="650.6" y1="-594.5" y2="-588.8">
+
+<stop offset="0" stop-color="#75BCFF"/>
+
+<stop offset="1" stop-color="#0070A1"/>
+
+</linearGradient>
+<rect fill="url(#SVGID_12__)" height="3" width="3" x="10.32" y="18.46"/>
+<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_13__" x1="666.6" x2="666.6" y1="-594.5" y2="-588.8">
+
+<stop offset="0" stop-color="#75BCFF"/>
+
+<stop offset="1" stop-color="#0070A1"/>
+
+</linearGradient>
+<rect fill="url(#SVGID_13__)" height="3" width="3" x="18.32" y="18.46"/>
+<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_14__" x1="658.6" x2="658.6" y1="-594.5" y2="-588.8">
+
+<stop offset="0" stop-color="#75BCFF"/>
+
+<stop offset="1" stop-color="#0070A1"/>
+
+</linearGradient>
+<rect fill="url(#SVGID_14__)" height="3" width="3" x="14.32" y="18.46"/>
+<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="642.6" x2="642.6" y1="-585.5" y2="-579.8">
+
+<stop offset="0" stop-color="#75BCFF"/>
+
+<stop offset="1" stop-color="#0070A1"/>
+
+</linearGradient>
+<rect fill="url(#SVGID_15_)" height="3" width="3" x="6.324" y="13.96"/>
+<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="650.6" x2="650.6" y1="-585.5" y2="-579.8">
+
+<stop offset="0" stop-color="#75BCFF"/>
+
+<stop offset="1" stop-color="#0070A1"/>
+
+</linearGradient>
+<rect fill="url(#SVGID_16_)" height="3" width="3" x="10.32" y="13.96"/>
+<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="666.6" x2="666.6" y1="-585.5" y2="-579.8">
+
+<stop offset="0" stop-color="#75BCFF"/>
+
+<stop offset="1" stop-color="#0070A1"/>
+
+</linearGradient>
+<rect fill="url(#SVGID_17_)" height="3" width="3" x="18.32" y="13.96"/>
+<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="658.6" x2="658.6" y1="-585.5" y2="-579.8">
+
+<stop offset="0" stop-color="#75BCFF"/>
+
+<stop offset="1" stop-color="#0070A1"/>
+
+</linearGradient>
+<rect fill="url(#SVGID_18_)" height="3" width="3" x="14.32" y="13.96"/>
+<polygon opacity="0.3" points="22.49,25,22.49,14.85,12.51,11.92,12.51,25" style="enable-background:new;"/>
+<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="665.4" x2="665.4" y1="-582.2" y2="-604.8">
+
+<stop offset="0" stop-color="#CCCCCC"/>
+
+<stop offset="1" stop-color="#949494"/>
+
+</linearGradient>
+<polygon fill="url(#SVGID_19_)" points="24.84,16.25,13.51,12.92,13.51,26.5,24.84,26.5"/>
+<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="665.4" x2="665.4" y1="-582" y2="-605.1">
+
+<stop offset="0" stop-color="#DBDDE2"/>
+
+<stop offset="1" stop-color="#B5B6BA"/>
+
+</linearGradient>
+<path d="M14.01,13.58l10.33,3.039v9.38h-10.33v-12.42m-0.5-0.665v13.58h11.33v-10.25l-11.33-3.33z" fill="url(#SVGID_20_)"/>
+</g>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_camera.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_camera.svg Fri May 14 16:09:54 2010 +0300
@@ -1,116 +1,121 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
-<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-95.8955" x2="-86.1685" y1="26.209" y2="26.209">
-<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="M16.419,15.417v-3.748c0-0.885-0.653-1.544-1.453-1.544H8.124c-0.799,0-1.456,0.659-1.456,1.544 v3.748H16.419z" fill="url(#SVGID_1_)"/>
-<radialGradient cx="-92.3433" cy="12.1729" gradientTransform="matrix(0.931 0 0 -0.9385 97.5175 22.6984)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="3.803">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="1" style="stop-color:#D9D9D9"/>
-</radialGradient>
-<path d="M14.967,10.125H8.124c-0.799,0-1.456,0.659-1.456,1.544v0.756c0-0.885,0.657-1.544,1.456-1.544 h6.843c0.8,0,1.453,0.659,1.453,1.544v-0.756C16.419,10.785,15.766,10.125,14.967,10.125z" fill="url(#SVGID_2_)"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-72.52" x2="-72.52" y1="28.4741" y2="-10.9595">
-<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="M55.499,10.563H20.561c-0.824,0-1.499,0.687-1.499,1.528v1.896H4.5C3.676,13.986,3,14.674,3,15.514 v32.833c0,0.841,0.676,1.528,1.499,1.528h51c0.824,0,1.501-0.688,1.501-1.528V12.09C57,11.248,56.323,10.563,55.499,10.563z" fill="url(#SVGID_3_)"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-53.6201" x2="-53.6201" y1="25.9531" y2="19.4839">
-<stop offset="0" style="stop-color:#808080"/>
-<stop offset="1" style="stop-color:#E6E6E6"/>
-</linearGradient>
-<polygon fill="url(#SVGID_4_)" points="53.955,19.492 43.843,19.491 43.847,12.998 53.957,12.999 "/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-53.6196" x2="-53.6196" y1="20.0713" y2="25.4231">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#3B3B3B"/>
-</linearGradient>
-<rect fill="url(#SVGID_5_)" height="5.401" width="8.838" x="44.481" y="13.544"/>
-<path d="M45.764,31.913c-0.004,8.315-6.746,16.519-15.062,16.514 c-8.314-0.003-15.053-8.207-15.053-16.522c0.004-8.318,6.746-15.053,15.063-15.052C39.028,16.856,45.766,23.597,45.764,31.913z" fill="#231F20" fill-opacity="0.5" stroke-opacity="0.5"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-71.814" x2="-71.814" y1="22.7822" y2="-7.386">
-<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>
-<path d="M45.706,31.304c-0.001,8.285-6.718,14.998-15.004,14.994c-8.283-0.002-14.997-6.721-14.996-15.003 c0.004-8.286,6.722-14.998,15.007-14.996C38.996,16.304,45.708,23.02,45.706,31.304z" fill="url(#SVGID_6_)"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="-71.813" x2="-71.813" y1="22.1294" y2="-6.4378">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="1" style="stop-color:#606769"/>
-</linearGradient>
-<path d="M44.956,31.308c-0.003,7.868-6.385,14.245-14.254,14.241c-7.874-0.003-14.252-6.382-14.245-14.254 c0-7.87,6.381-14.248,14.253-14.246C38.583,17.054,44.96,23.437,44.956,31.308z" fill="url(#SVGID_7_)"/>
-<linearGradient gradientTransform="matrix(1 3.000000e-004 3.000000e-004 -1 101.8093 38.1828)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="-79.3252" x2="-62.8855" y1="15.0825" y2="-1.3573">
-<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>
-<path d="M42.332,31.304c-0.003,6.42-5.213,11.621-11.63,11.62c-6.42-0.001-11.623-5.209-11.62-11.627 c0.002-6.423,5.208-11.626,11.624-11.623C37.13,19.677,42.332,24.881,42.332,31.304z" fill="url(#SVGID_8_)"/>
-<radialGradient cx="-71.3799" cy="23.7412" gradientTransform="matrix(0.9226 2.793056e-004 2.793056e-004 -0.9226 97.7313 54.1515)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="13.5274">
-<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="30.706" cy="31.3" fill="url(#SVGID_9_)" r="10.874"/>
-<radialGradient cx="-77.2124" cy="16.4063" gradientTransform="matrix(0.9306 0 0 -0.9306 97.6075 39.1861)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="21.5485">
-<stop offset="0" style="stop-color:#242424"/>
-<stop offset="0.4303" style="stop-color:#242424"/>
-<stop offset="0.7818" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
-</radialGradient>
-<circle cx="30.706" cy="31.299" fill="url(#SVGID_10_)" r="9"/>
-<radialGradient cx="-77.0063" cy="63.8779" gradientTransform="matrix(0.911 2.793056e-004 2.793056e-004 -0.9111 98.5755 77.6866)" gradientUnits="userSpaceOnUse" id="SVGID_11_" r="23.6394">
-<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="M38.581,31.3c-0.001,4.35-3.529,7.876-7.879,7.874c-4.345-0.002-7.872-3.529-7.872-7.877 c0.005-4.351,3.531-7.872,7.875-7.872C35.059,23.427,38.583,26.952,38.581,31.3z" fill="url(#SVGID_11_)"/>
-<radialGradient cx="-74.5239" cy="146.7813" gradientTransform="matrix(0.911 2.793056e-004 2.793056e-004 -0.8674 98.575 165.1664)" gradientUnits="userSpaceOnUse" id="SVGID_12_" r="9.5976">
-<stop offset="0" style="stop-color:#48630C"/>
-<stop offset="0.7879" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
-</radialGradient>
-<path d="M38.581,31.575c-0.001,4.14-3.529,7.498-7.879,7.496c-4.345-0.001-7.872-3.36-7.872-7.5 c0,0,2.698,4.573,7.872,4.573C35.879,36.146,38.581,31.575,38.581,31.575z" fill="url(#SVGID_12_)"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="-90.6953" x2="-90.6953" y1="20.1304" y2="14.8813">
-<stop offset="0" style="stop-color:#808080"/>
-<stop offset="1" style="stop-color:#E6E6E6"/>
-</linearGradient>
-<circle cx="11.825" cy="21.428" fill="url(#SVGID_13_)" r="2.625"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="-90.6958" x2="-90.6958" y1="15.1157" y2="19.8095">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#3B3B3B"/>
-</linearGradient>
-<circle cx="11.824" cy="21.428" fill="url(#SVGID_14_)" r="2.25"/>
-<path d="M11.825,21.659c0.774,0,1.459-0.348,1.931-0.889 c-0.285-0.796-1.038-1.37-1.931-1.37c-0.894,0-1.647,0.573-1.933,1.37C10.364,21.311,11.05,21.659,11.825,21.659z" fill="#FFFFFF" fill-opacity="0.25" stroke-opacity="0.25"/>
-<polygon fill="#F1F1F2" fill-opacity="0.2" points="44.699,15.053 53.168,15.085 53.168,13.772 44.699,13.772 " stroke-opacity="0.2"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="-71.854" x2="-71.854" y1="17.3643" y2="7.7548">
-<stop offset="0" style="stop-color:#F8FBFF"/>
-<stop offset="1" style="stop-color:#808080"/>
-</linearGradient>
-<path d="M30.668,31.179c3.489,0,6.777-0.529,9.679-1.461 c-0.823-4.604-4.839-8.102-9.679-8.102c-4.843,0-8.856,3.498-9.682,8.101C23.889,30.649,27.178,31.179,30.668,31.179z" fill="url(#SVGID_15_)" fill-opacity="0.35" stroke-opacity="0.35"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="-72.52" x2="-72.52" y1="28.5479" y2="-10.8621">
-<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="M55.499,10.563H20.561c-0.824,0-1.499,0.687-1.499,1.528v1.896H4.5C3.676,13.986,3,14.674,3,15.514 v32.833c0,0.841,0.676,1.528,1.499,1.528c0,0-0.749-0.414-0.749-1.528V15.514c0-0.426,0.337-0.772,0.749-0.772h14.564h0.749v-0.756 v-1.897c0-0.426,0.337-0.772,0.75-0.772h34.939c0.413,0,0.749,0.346,0.749,0.772v36.256c0,1.208-0.749,1.527-0.749,1.527 c0.824,0,1.499-0.688,1.499-1.527V12.09C57,11.248,56.323,10.563,55.499,10.563z" fill="url(#SVGID_16_)"/>
+
+ <linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-95.8955" x2="-86.1685" y1="26.209" y2="26.209">
+ <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="M16.419,15.417v-3.748c0-0.885-0.653-1.544-1.453-1.544H8.124c-0.799,0-1.456,0.659-1.456,1.544 v3.748H16.419z" fill="url(#SVGID_1_)"/>
+
+ <radialGradient cx="-92.3433" cy="12.1729" gradientTransform="matrix(0.931 0 0 -0.9385 97.5175 22.6984)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="3.803">
+ <stop offset="0" style="stop-color:#F2F2F2"/>
+ <stop offset="1" style="stop-color:#D9D9D9"/>
+ </radialGradient>
+ <path d="M14.967,10.125H8.124c-0.799,0-1.456,0.659-1.456,1.544v0.756c0-0.885,0.657-1.544,1.456-1.544 h6.843c0.8,0,1.453,0.659,1.453,1.544v-0.756C16.419,10.785,15.766,10.125,14.967,10.125z" fill="url(#SVGID_2_)"/>
+
+ <linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-72.52" x2="-72.52" y1="28.4741" y2="-10.9595">
+ <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"/>
+ </linearGradient>
+ <path d="M55.499,10.563H20.561c-0.824,0-1.499,0.687-1.499,1.528v1.896H4.5C3.676,13.986,3,14.674,3,15.514 v32.833c0,0.841,0.676,1.528,1.499,1.528h51c0.824,0,1.501-0.688,1.501-1.528V12.09C57,11.248,56.323,10.563,55.499,10.563z" fill="url(#SVGID_3_)"/>
+
+ <linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-53.6201" x2="-53.6201" y1="25.9531" y2="19.4839">
+ <stop offset="0" style="stop-color:#808080"/>
+ <stop offset="1" style="stop-color:#E6E6E6"/>
+ </linearGradient>
+ <polygon fill="url(#SVGID_4_)" points="53.955,19.492 43.843,19.491 43.847,12.998 53.957,12.999 "/>
+
+ <linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-53.6196" x2="-53.6196" y1="20.0713" y2="25.4231">
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#3B3B3B"/>
+ </linearGradient>
+ <rect fill="url(#SVGID_5_)" height="5.401" width="8.838" x="44.481" y="13.544"/>
+ <path d="M45.764,31.913c-0.004,8.315-6.746,16.519-15.062,16.514 c-8.314-0.003-15.053-8.207-15.053-16.522c0.004-8.318,6.746-15.053,15.063-15.052C39.028,16.856,45.766,23.597,45.764,31.913z" enable-background="new " fill="#231F20" opacity="0.5"/>
+
+ <linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-71.814" x2="-71.814" y1="22.7822" y2="-7.386">
+ <stop offset="0.1091" style="stop-color:#CFCFCF"/>
+ <stop offset="0.6848" style="stop-color:#121212"/>
+ <stop offset="1" style="stop-color:#A6A6A6"/>
+ </linearGradient>
+ <path d="M45.706,31.304c-0.001,8.285-6.718,14.998-15.004,14.994c-8.283-0.002-14.997-6.721-14.996-15.003 c0.004-8.286,6.722-14.998,15.007-14.996C38.996,16.304,45.708,23.02,45.706,31.304z" fill="url(#SVGID_6_)"/>
+
+ <linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="-71.813" x2="-71.813" y1="22.1294" y2="-6.4378">
+ <stop offset="0" style="stop-color:#F2F2F2"/>
+ <stop offset="1" style="stop-color:#606769"/>
+ </linearGradient>
+ <path d="M44.956,31.308c-0.003,7.868-6.385,14.245-14.254,14.241c-7.874-0.003-14.252-6.382-14.245-14.254 c0-7.87,6.381-14.248,14.253-14.246C38.583,17.054,44.96,23.437,44.956,31.308z" fill="url(#SVGID_7_)"/>
+
+ <linearGradient gradientTransform="matrix(1 3.000000e-004 3.000000e-004 -1 101.8093 38.1828)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="-79.3252" x2="-62.8855" y1="15.0825" y2="-1.3573">
+ <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>
+ <path d="M42.332,31.304c-0.003,6.42-5.213,11.621-11.63,11.62c-6.42-0.001-11.623-5.209-11.62-11.627 c0.002-6.423,5.208-11.626,11.624-11.623C37.13,19.677,42.332,24.881,42.332,31.304z" fill="url(#SVGID_8_)"/>
+
+ <radialGradient cx="-71.3799" cy="23.7412" gradientTransform="matrix(0.9226 2.793056e-004 2.793056e-004 -0.9226 97.7313 54.1515)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="13.5274">
+ <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"/>
+ </radialGradient>
+ <circle cx="30.706" cy="31.3" fill="url(#SVGID_9_)" r="10.874"/>
+
+ <radialGradient cx="-77.2124" cy="16.4063" gradientTransform="matrix(0.9306 0 0 -0.9306 97.6075 39.1861)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="21.5485">
+ <stop offset="0.4303" style="stop-color:#242424"/>
+ <stop offset="0.7818" style="stop-color:#000000"/>
+ </radialGradient>
+ <circle cx="30.706" cy="31.299" fill="url(#SVGID_10_)" r="9"/>
+
+ <radialGradient cx="-77.0063" cy="63.8779" gradientTransform="matrix(0.911 2.793056e-004 2.793056e-004 -0.9111 98.5755 77.6866)" gradientUnits="userSpaceOnUse" id="SVGID_11_" r="23.6394">
+ <stop offset="0.3091" style="stop-color:#A700F5"/>
+ <stop offset="0.4364" style="stop-color:#5E008A"/>
+ <stop offset="0.8061" style="stop-color:#0E1402"/>
+ </radialGradient>
+ <path d="M38.581,31.3c-0.001,4.35-3.529,7.876-7.879,7.874c-4.345-0.002-7.872-3.529-7.872-7.877 c0.005-4.351,3.531-7.872,7.875-7.872C35.059,23.427,38.583,26.952,38.581,31.3z" fill="url(#SVGID_11_)"/>
+
+ <radialGradient cx="-74.5239" cy="146.7813" gradientTransform="matrix(0.911 2.793056e-004 2.793056e-004 -0.8674 98.575 165.1664)" gradientUnits="userSpaceOnUse" id="SVGID_12_" r="9.5976">
+ <stop offset="0" style="stop-color:#48630C"/>
+ <stop offset="0.7879" style="stop-color:#000000"/>
+ </radialGradient>
+ <path d="M38.581,31.575c-0.001,4.14-3.529,7.498-7.879,7.496c-4.345-0.001-7.872-3.36-7.872-7.5 c0,0,2.698,4.573,7.872,4.573C35.879,36.146,38.581,31.575,38.581,31.575z" fill="url(#SVGID_12_)"/>
+
+ <linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="-90.6953" x2="-90.6953" y1="20.1304" y2="14.8813">
+ <stop offset="0" style="stop-color:#808080"/>
+ <stop offset="1" style="stop-color:#E6E6E6"/>
+ </linearGradient>
+ <circle cx="11.825" cy="21.428" fill="url(#SVGID_13_)" r="2.625"/>
+
+ <linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="-90.6958" x2="-90.6958" y1="15.1157" y2="19.8095">
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#3B3B3B"/>
+ </linearGradient>
+ <circle cx="11.824" cy="21.428" fill="url(#SVGID_14_)" r="2.25"/>
+ <path d="M11.825,21.659c0.774,0,1.459-0.348,1.931-0.889 c-0.285-0.796-1.038-1.37-1.931-1.37c-0.894,0-1.647,0.573-1.933,1.37C10.364,21.311,11.05,21.659,11.825,21.659z" enable-background="new " fill="#FFFFFF" opacity="0.25"/>
+ <polygon enable-background="new " fill="#F1F1F2" opacity="0.2" points="44.699,15.053 53.168,15.085 53.168,13.772 44.699,13.772 "/>
+
+ <linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="-71.854" x2="-71.854" y1="17.3643" y2="7.7548">
+ <stop offset="0" style="stop-color:#F8FBFF"/>
+ <stop offset="1" style="stop-color:#808080"/>
+ </linearGradient>
+ <path d="M30.668,31.179c3.489,0,6.777-0.529,9.679-1.461 c-0.823-4.604-4.839-8.102-9.679-8.102c-4.843,0-8.856,3.498-9.682,8.101C23.889,30.649,27.178,31.179,30.668,31.179z" enable-background="new " fill="url(#SVGID_15_)" opacity="0.35"/>
+
+ <linearGradient gradientTransform="matrix(1 0 0 -1 102.52 38.9805)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="-72.52" x2="-72.52" y1="28.5479" y2="-10.8621">
+ <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="M55.499,10.563H20.561c-0.824,0-1.499,0.687-1.499,1.528v1.896H4.5C3.676,13.986,3,14.674,3,15.514 v32.833c0,0.841,0.676,1.528,1.499,1.528c0,0-0.749-0.414-0.749-1.528V15.514c0-0.426,0.337-0.772,0.749-0.772h14.564h0.749v-0.756 v-1.897c0-0.426,0.337-0.772,0.75-0.772h34.939c0.413,0,0.749,0.346,0.749,0.772v36.256c0,1.208-0.749,1.527-0.749,1.527 c0.824,0,1.499-0.688,1.499-1.527V12.09C57,11.248,56.323,10.563,55.499,10.563z" fill="url(#SVGID_16_)"/>
</g>
<rect fill="none" height="60" width="60"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_car.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_car.svg Fri May 14 16:09:54 2010 +0300
@@ -1,79 +1,155 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
+
<stop offset="0.3091" stop-color="#8C8C8C"/>
+
<stop offset="0.6848" stop-color="#000000"/>
+
<stop offset="1" stop-color="#646464"/>
+
</linearGradient>
+
<path d="M16.68,48.77c0,0.746-0.605,1.352-1.351,1.352h-5.06c-0.747,0-1.352-0.605-1.352-1.352v-12.07c0-0.746,0.604-1.352,1.352-1.352h5.063c0.745,0,1.351,0.605,1.351,1.352v12.07z" fill="url(#SVGID_1_)"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="47.33" x2="47.33" y1="35.35" y2="50.12">
+
<stop offset="0" stop-color="#7B7B7B"/>
+
<stop offset="0.1455" stop-color="#565656"/>
+
<stop offset="0.3091" stop-color="#8C8C8C"/>
+
<stop offset="0.6848" stop-color="#000000"/>
+
<stop offset="1" stop-color="#646464"/>
+
</linearGradient>
+
<path d="M51.21,48.77c0,0.746-0.604,1.352-1.352,1.352h-5.063c-0.746,0-1.351-0.605-1.351-1.352v-12.07c0-0.746,0.604-1.352,1.351-1.352h5.063c0.747,0,1.352,0.605,1.352,1.352v12.07z" fill="url(#SVGID_2_)"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="9.878" y2="33.23">
+
<stop offset="0" stop-color="#FEE377"/>
+
<stop offset="0.511" stop-color="#FFC501"/>
+
<stop offset="1" stop-color="#FF8800"/>
+
</linearGradient>
+
<path d="M45.96,12.92c-0.27-0.631-0.71-1.577-2.432-1.892-1.956-0.358-5.486-1.15-13.37-1.15-7.882,0-11.74,0.76-13.69,1.15-1.576,0.314-2.163,1.261-2.433,1.892-0.271,0.631-4.412,9.908-4.774,14.77l2.342,5.314h36.79l2.342-5.314c-0.36-4.86-4.51-14.14-4.78-14.77z" fill="url(#SVGID_3_)"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="7.499" x2="52.5" y1="35.35" y2="35.35">
+
<stop offset="0" stop-color="#DA8C00"/>
+
<stop offset="0.25" stop-color="#F7B901"/>
+
<stop offset="0.75" stop-color="#FFC501"/>
+
<stop offset="1" stop-color="#DA8C00"/>
+
</linearGradient>
+
<path d="M52.45,30.84c-0.067-0.902-0.405-3.941-4.505-4.662-4.098-0.721-4.746,2.434-7.296,4.527-2.938,2.414-6.791,2.117-10.48,2.117-3.692,0-7.869,0.297-10.81-2.117-2.55-2.094-3.198-5.248-7.296-4.527-4.099,0.721-4.438,3.76-4.504,4.662-0.361,4.863,1.222,10.61,1.892,12.43,0.444,1.211,2.161,1.352,2.161,1.352h36.79s1.675-0.006,2.161-1.352c0.66-1.82,2.26-7.56,1.9-12.43z" fill="url(#SVGID_4_)"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="12.06" x2="47.95" y1="21.09" y2="21.09">
+
<stop offset="0" stop-color="#FF9000"/>
+
<stop offset="0.511" stop-color="#FFC501"/>
+
<stop offset="1" stop-color="#FF8800"/>
+
</linearGradient>
+
<path d="M43.53,11.03c-1.956-0.358-5.486-1.15-13.37-1.15-7.882,0-11.74,0.76-13.69,1.15-0.256,0.051-0.48,0.119-0.687,0.199-1.815,3.072-4.801,14.6-3.728,14.42,4.098-0.721,4.746,2.432,7.296,4.525,2.94,2.414,7.117,2.117,10.81,2.117s7.546,0.297,10.48-2.117c2.55-2.094,3.198-5.246,7.296-4.525,1.073,0.188-1.803-11.35-3.688-14.42-0.21-0.09-0.45-0.16-0.72-0.21z" fill="url(#SVGID_5_)"/>
+
<path d="M12.06,26.18c4.098-0.721,4.746,2.434,7.296,4.527,2.94,2.414,7.117,2.117,10.81,2.117s7.546,0.297,10.48-2.117c2.55-2.094,3.198-5.248,7.296-4.527,1.225,0.216,2.107,0.64,2.753,1.149-0.04-0.358-0.093-0.73-0.163-1.121-0.631-0.454-1.465-0.83-2.59-1.028-4.098-0.721-4.746,2.434-7.296,4.527-2.938,2.414-6.791,2.287-10.48,2.287-3.692,0-7.869,0.127-10.81-2.287-2.55-2.094-3.198-5.248-7.296-4.527-1.125,0.198-1.959,0.574-2.589,1.028-0.07,0.391-0.124,0.763-0.164,1.12,0.642-0.51,1.523-0.93,2.753-1.15z" fill="#191919" fill-opacity="0.2" stroke-opacity="0.2"/>
+
<path d="M15.36,12.64c2.108-0.423,6.285-1.245,14.81-1.245s12.34,0.857,14.46,1.245c0.126,0.023,0.243,0.051,0.356,0.08-0.255-0.603-0.504-1.113-0.738-1.494-0.212-0.078-0.451-0.146-0.725-0.195-1.956-0.358-5.486-1.15-13.37-1.15-7.882,0-11.74,0.76-13.69,1.15-0.256,0.051-0.48,0.119-0.687,0.199-0.224,0.378-0.465,0.885-0.714,1.481,0.1-0.04,0.2-0.06,0.3-0.08z" fill="#FFFFFF" fill-opacity="0.35" stroke-opacity="0.35"/>
+
<path d="M10.92,27.73c0.374-0.066,0.729-0.1,1.053-0.1,1.844,0,2.712,1.051,3.914,2.506,0.601,0.725,1.28,1.545,2.15,2.26,2.786,2.287,6.491,2.479,9.747,2.479,0.408,0,0.816-0.002,1.22-0.006,0.393-0.004,0.783-0.006,1.167-0.006,0.388,0,0.777,0.002,1.166,0.006,0.395,0.004,0.791,0.006,1.186,0.006,3.247,0,6.649-0.191,9.437-2.479,0.869-0.715,1.55-1.537,2.149-2.262,1.202-1.453,2.07-2.504,3.913-2.504,0.325,0,0.681,0.033,1.055,0.1,1.315,0.23,2.316,0.721,3.007,1.457-0.471-1.18-1.56-2.553-4.143-3.008-4.098-0.721-4.746,2.434-7.296,4.527-2.938,2.414-6.791,2.117-10.48,2.117-3.692,0-7.869,0.297-10.81-2.117-2.55-2.094-3.198-5.248-7.296-4.527-2.581,0.455-3.67,1.826-4.14,3.006,0.684-0.75,1.685-1.24,3-1.47z" fill="#FFFFFF" fill-opacity="0.35" stroke-opacity="0.35"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="30" x2="30" y1="44.67" y2="40.16">
+
<stop offset="0" stop-color="#565656"/>
+
<stop offset="1" stop-color="#212121"/>
+
</linearGradient>
+
<path d="M43.28,39.76h-26.56c-1.493,0-2.702,1.209-2.702,2.701v2.162h31.97v-2.162c-0.01-1.49-1.22-2.7-2.71-2.7z" fill="url(#SVGID_6_)"/>
+
<path d="M43.28,39.76h-26.56c-1.493,0-2.702,1.209-2.702,2.701v0.811c0-1.492,1.209-2.701,2.702-2.701h26.56c1.492,0,2.702,1.209,2.702,2.701v-0.811c0-1.49-1.21-2.7-2.7-2.7z" fill="#1A1A1A"/>
+
<ellipse cx="12.55" cy="31.72" fill="#191919" fill-opacity="0.2" rx="3.535" ry="3.172" stroke-opacity="0.2" transform="matrix(-0.9635 0.2678 -0.2678 -0.9635 33.1405 58.9116)"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="9.062" x2="15.88" y1="32.08" y2="30.19">
+
<stop offset="0" stop-color="#565656"/>
+
<stop offset="0.489" stop-color="#000000"/>
+
<stop offset="1" stop-color="#646464"/>
+
</linearGradient>
+
<path d="M9.063,32.08c0.47,1.688,2.374,2.631,4.255,2.109,1.882-0.523,3.026-2.314,2.558-4.004-0.47-1.688-2.375-2.631-4.256-2.107-1.883,0.52-3.028,2.31-2.557,4z" fill="url(#SVGID_7_)"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="12.2" x2="12.2" y1="28.05" y2="32.98">
+
<stop offset="0" stop-color="#F2F2F2"/>
+
<stop offset="1" stop-color="#949DA1"/>
+
</linearGradient>
+
<path d="M12,32.98c-1.176,0-2.15-0.668-2.427-1.66-0.165-0.592-0.059-1.225,0.299-1.785,0.376-0.588,0.977-1.02,1.693-1.219,0.274-0.076,0.554-0.115,0.83-0.115,1.177,0,2.151,0.668,2.428,1.66,0.349,1.254-0.546,2.602-1.994,3.004-0.27,0.08-0.55,0.12-0.83,0.12z" fill="url(#SVGID_8_)"/>
+
<ellipse cx="47.4" cy="31.72" fill="#191919" fill-opacity="0.2" rx="3.535" ry="3.172" stroke-opacity="0.2" transform="matrix(0.9635 0.2678 -0.2678 0.9635 10.2266 -11.5377)"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="44.02" x2="51.04" y1="31.13" y2="31.13">
+
<stop offset="0" stop-color="#565656"/>
+
<stop offset="0.489" stop-color="#000000"/>
+
<stop offset="1" stop-color="#646464"/>
-</linearGradient>
-<path d="M50.94,32.08c-0.469,1.688-2.374,2.631-4.254,2.109-1.882-0.523-3.027-2.314-2.558-4.004,0.47-1.688,2.375-2.631,4.255-2.107,1.88,0.52,3.02,2.31,2.56,4z" fill="url(#SVGID_9_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="47.8" x2="47.8" y1="28.09" y2="33.05">
-<stop offset="0" stop-color="#F2F2F2"/>
-<stop offset="1" stop-color="#949DA1"/>
+
</linearGradient>
-<path d="M48,32.98c-0.279,0-0.558-0.039-0.83-0.115-1.448-0.402-2.343-1.75-1.994-3.004,0.276-0.992,1.251-1.66,2.428-1.66,0.277,0,0.557,0.039,0.83,0.115,0.717,0.199,1.318,0.633,1.693,1.219,0.358,0.561,0.464,1.193,0.299,1.785-0.28,0.99-1.26,1.66-2.43,1.66z" fill="url(#SVGID_10_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="30" x2="30" y1="12.81" y2="24.63">
-<stop offset="0" stop-color="#4D4D4D"/>
-<stop offset="1" stop-color="#000000"/>
+
+<path d="M50.94,32.08c-0.469,1.688-2.374,2.631-4.254,2.109-1.882-0.523-3.027-2.314-2.558-4.004,0.47-1.688,2.375-2.631,4.255-2.107,1.88,0.52,3.02,2.31,2.56,4z" fill="url(#SVGID_9_)"/>
+
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="47.8" x2="47.8" y1="28.09" y2="33.05">
+
+<stop offset="0" stop-color="#F2F2F2"/>
+
+<stop offset="1" stop-color="#949DA1"/>
+
</linearGradient>
+
+<path d="M48,32.98c-0.279,0-0.558-0.039-0.83-0.115-1.448-0.402-2.343-1.75-1.994-3.004,0.276-0.992,1.251-1.66,2.428-1.66,0.277,0,0.557,0.039,0.83,0.115,0.717,0.199,1.318,0.633,1.693,1.219,0.358,0.561,0.464,1.193,0.299,1.785-0.28,0.99-1.26,1.66-2.43,1.66z" fill="url(#SVGID_10_)"/>
+
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="30" x2="30" y1="12.81" y2="24.63">
+
+<stop offset="0" stop-color="#4D4D4D"/>
+
+<stop offset="1" stop-color="#000000"/>
+
+</linearGradient>
+
<path d="M47.27,23.35c-0.226-0.722-2.567-8.243-2.567-8.243s-0.067-0.812-1.081-1.014c-0.992-0.198-5.62-1.284-13.73-1.284-8.106,0-12.52,1.086-13.51,1.284-1.014,0.202-1.081,1.014-1.081,1.014s-2.341,7.521-2.566,8.243c-0.169,0.539,0.473,0.473,0.473,0.473s5.519,0.811,16.6,0.811,16.99-0.811,16.99-0.811,0.65,0.07,0.48-0.47z" fill="url(#SVGID_11_)"/>
+
<path d="M43.51,14.62l-0.249-0.052c-3.887-0.811-8.385-1.222-13.37-1.222-7.414,0-11.7,0.91-13.1,1.21-0.123,0.025-0.224,0.047-0.304,0.063-0.563,0.112-0.641,0.47-0.649,0.541l-0.009,0.06-0.013,0.043s-0.959,3.078-1.71,5.489l30.53-4.027c-0.271-0.868-0.456-1.462-0.456-1.462l-0.015-0.059-0.006-0.044c0-0.07-0.07-0.43-0.64-0.54z" fill="#FFFFFF" fill-opacity="0.25" stroke-opacity="0.25"/>
+
<rect fill="none" height="60" width="60"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_cellinfo.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,99 @@
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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)">
+<defs>
+</defs>
+<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"/>
+ <stop offset="0.8121" style="stop-color:#358C0C"/>
+ <stop offset="1" style="stop-color:#67AD1A"/>
+</linearGradient>
+<path d="M36.798,40.658l0.643-0.473c3.23-2.377,5.16-6.169,5.16-10.144c0-4.03-1.969-7.854-5.27-10.226 l-0.652-0.472l3.785-5.18l0.645,0.466c4.941,3.569,7.893,9.329,7.893,15.412c0,6.022-2.906,11.752-7.771,15.324l-0.646,0.474 L36.798,40.658z" fill="url(#SVGID_1_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="43" x2="43" y1="15.2793" y2="44.7212">
+ <stop offset="0" style="stop-color:#F3FFA8"/>
+ <stop offset="0.7455" style="stop-color:#529E24"/>
+ <stop offset="1" style="stop-color:#B2D872"/>
+</linearGradient>
+<path d="M43.399,30.042c0,4.425-2.166,8.347-5.486,10.788l2.844,3.891c4.512-3.313,7.443-8.652,7.443-14.679 c0-6.079-2.982-11.459-7.561-14.763l-2.84,3.887C41.185,21.601,43.399,25.563,43.399,30.042z" fill="url(#SVGID_2_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="43.1543" x2="43.1543" y1="16.4082" y2="43.5854">
+ <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="M39.017,40.984c3.26-2.692,5.184-6.725,5.184-10.942c0-4.278-1.965-8.344-5.293-11.036l1.898-2.598 c4.145,3.291,6.596,8.328,6.596,13.634c0,5.25-2.41,10.253-6.482,13.543L39.017,40.984z" fill="url(#SVGID_3_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="17.1611" x2="17.1611" y1="14.1646" y2="45.8403">
+ <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="M18.77,45.366C13.904,41.794,11,36.064,11,30.042c0-6.083,2.95-11.843,7.892-15.412l0.646-0.466 l3.785,5.18l-0.655,0.472c-3.298,2.372-5.267,6.195-5.267,10.226c0,3.975,1.929,7.767,5.16,10.144l0.642,0.473l-3.785,5.182 L18.77,45.366z" fill="url(#SVGID_4_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="17.0005" x2="17.0005" y1="15.2793" y2="44.7212">
+ <stop offset="0" style="stop-color:#F3FFA8"/>
+ <stop offset="0.7455" style="stop-color:#529E24"/>
+ <stop offset="1" style="stop-color:#B2D872"/>
+</linearGradient>
+<path d="M19.243,44.721l2.842-3.891c-3.318-2.441-5.485-6.363-5.485-10.788c0-4.479,2.216-8.441,5.601-10.876 l-2.84-3.887c-4.579,3.304-7.561,8.684-7.561,14.763C11.8,36.068,14.731,41.408,19.243,44.721z" fill="url(#SVGID_5_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="16.8462" x2="16.8462" y1="16.4082" y2="43.5854">
+ <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="M19.081,43.585c-4.072-3.29-6.481-8.293-6.481-13.543c0-5.306,2.451-10.343,6.595-13.634l1.898,2.598 c-3.328,2.691-5.293,6.758-5.293,11.036c0,4.218,1.923,8.25,5.183,10.942L19.081,43.585z" fill="url(#SVGID_6_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="49.9961" x2="49.9961" y1="6.896" y2="53.105">
+ <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="M42.112,47.93l0.643-0.472c5.539-4.067,8.846-10.577,8.846-17.417c0-6.893-3.35-13.435-8.959-17.499 l-0.65-0.47l3.781-5.176l0.645,0.468c7.254,5.261,11.584,13.737,11.584,22.677c0,8.881-4.285,17.326-11.463,22.59l-0.646,0.474 L42.112,47.93z" fill="url(#SVGID_7_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="50.1563" x2="50.1562" y1="8.0127" y2="51.9849">
+ <stop offset="0" style="stop-color:#F3FFA8"/>
+ <stop offset="0.7455" style="stop-color:#529E24"/>
+ <stop offset="1" style="stop-color:#B2D872"/>
+</linearGradient>
+<path d="M52.399,30.041c0,7.406-3.615,13.98-9.172,18.063l2.838,3.881C52.815,47.035,57.2,39.051,57.2,30.041 c0-9.063-4.436-17.086-11.252-22.028l-2.836,3.883C48.733,15.969,52.399,22.583,52.399,30.041z" fill="url(#SVGID_8_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="50.3115" x2="50.3115" y1="9.1377" y2="50.856">
+ <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="M44.337,48.264c5.564-4.389,8.863-11.143,8.863-18.223c0-7.138-3.342-13.922-8.977-18.312 l1.893-2.592c6.455,4.986,10.283,12.739,10.283,20.903c0,8.107-3.785,15.828-10.168,20.814L44.337,48.264z" fill="url(#SVGID_9_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="10.0039" x2="10.0039" y1="6.896" y2="53.105">
+ <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="M13.461,52.631C6.285,47.367,2,38.922,2,30.041c0-8.94,4.33-17.416,11.582-22.677l0.646-0.468 l3.781,5.176l-0.65,0.47C11.749,16.606,8.4,23.148,8.4,30.041c0,6.84,3.307,13.35,8.845,17.417l0.643,0.472l-3.781,5.175 L13.461,52.631z" fill="url(#SVGID_10_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="9.8442" x2="9.8442" y1="8.0127" y2="51.9849">
+ <stop offset="0" style="stop-color:#F3FFA8"/>
+ <stop offset="0.7455" style="stop-color:#529E24"/>
+ <stop offset="1" style="stop-color:#B2D872"/>
+</linearGradient>
+<path d="M13.935,51.984l2.836-3.881C11.215,44.021,7.6,37.447,7.6,30.041c0-7.458,3.667-14.072,9.289-18.145 l-2.837-3.883C7.236,12.955,2.8,20.979,2.8,30.041C2.8,39.051,7.185,47.035,13.935,51.984z" fill="url(#SVGID_11_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="9.688" x2="9.688" y1="9.1377" y2="50.856">
+ <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="M13.769,50.855C7.386,45.869,3.6,38.148,3.6,30.041c0-8.164,3.83-15.917,10.283-20.903l1.894,2.592 C10.141,16.119,6.8,22.903,6.8,30.041c0,7.08,3.299,13.834,8.863,18.223L13.769,50.855z" fill="url(#SVGID_12_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="29.9995" x2="29.9995" y1="21.2617" y2="38.6788">
+ <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="M29.999,38.799c-4.852,0-8.799-3.947-8.799-8.799c0-4.854,3.948-8.801,8.799-8.801 c4.854,0,8.801,3.947,8.801,8.801C38.8,34.852,34.853,38.799,29.999,38.799L29.999,38.799z" fill="url(#SVGID_13_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="30" x2="30" y1="22.0557" y2="37.8893">
+ <stop offset="0" style="stop-color:#F3FFA8"/>
+ <stop offset="0.7455" style="stop-color:#529E24"/>
+ <stop offset="1" style="stop-color:#B2D872"/>
+</linearGradient>
+<path d="M29.999,37.998c-4.411,0-8-3.588-8-7.998c0-4.414,3.588-8.001,8-8.001 c4.412,0,8.002,3.587,8.002,8.001C38.001,34.41,34.411,37.998,29.999,37.998L29.999,37.998z" fill="url(#SVGID_14_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="29.9995" x2="29.9995" y1="22.8486" y2="37.1012">
+ <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="M29.999,37.199c-3.969,0-7.2-3.23-7.2-7.199c0-3.971,3.23-7.203,7.2-7.203 c3.971,0,7.201,3.232,7.201,7.203C37.2,33.969,33.97,37.199,29.999,37.199L29.999,37.199z" fill="url(#SVGID_15_)"/>
+<rect fill="none" height="60" width="60.001"/>
+</g>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_clock.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_clock.svg Fri May 14 16:09:54 2010 +0300
@@ -1,39 +1,40 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2.3896" y2="57.7417">
-<stop offset="0" style="stop-color:#BDC2C4"/>
-<stop offset="1" style="stop-color:#454B4D"/>
+ <stop offset="0" style="stop-color:#BDC2C4"/>
+ <stop offset="1" style="stop-color:#454B4D"/>
</linearGradient>
<path d="M29.999,58C14.56,58,2,45.44,2,30C2,14.562,14.56,2,29.999,2C45.44,2,58,14.562,58,30 C58,45.44,45.44,58,29.999,58L29.999,58z" fill="url(#SVGID_1_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="29.999" x2="29.999" y1="3.1675" y2="57.1007">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.2364" style="stop-color:#BDC2C4"/>
-<stop offset="1" style="stop-color:#697173"/>
+ <stop offset="0" style="stop-color:#D1D7D9"/>
+ <stop offset="0.2364" style="stop-color:#BDC2C4"/>
+ <stop offset="1" style="stop-color:#697173"/>
</linearGradient>
<circle cx="29.999" cy="30" fill="url(#SVGID_2_)" r="27.222"/>
-<path d="M30.948,30.95c9.117,0,17.921-0.57,26.256-1.616C56.849,14.609,44.81,2.778,29.999,2.778 C15.274,2.778,3.286,14.472,2.8,29.08C11.691,30.286,21.138,30.95,30.948,30.95z" fill="#F1F1F2" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M30.948,30.95c9.117,0,17.921-0.57,26.256-1.616C56.849,14.609,44.81,2.778,29.999,2.778 C15.274,2.778,3.286,14.472,2.8,29.08C11.691,30.286,21.138,30.95,30.948,30.95z" fill="#F1F1F2" opacity="0.35"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="3.0361" x2="57.3516" y1="16.5835" y2="16.5835">
-<stop offset="0" style="stop-color:#C0C5C7"/>
-<stop offset="0.2" style="stop-color:#F7FDFF"/>
-<stop offset="0.8" style="stop-color:#F7FDFF"/>
-<stop offset="1" style="stop-color:#CDD3D5"/>
+ <stop offset="0" style="stop-color:#C0C5C7"/>
+ <stop offset="0.2" style="stop-color:#F7FDFF"/>
+ <stop offset="0.8" style="stop-color:#F7FDFF"/>
+ <stop offset="1" style="stop-color:#CDD3D5"/>
</linearGradient>
<path d="M29.999,3.556c14.902,0,27.004,11.979,27.212,26.833c0.003-0.129,0.01-0.258,0.01-0.389 c0-15.034-12.188-27.222-27.222-27.222C14.964,2.778,2.776,14.966,2.776,30c0,0.131,0.009,0.26,0.01,0.389 C2.996,15.536,15.097,3.556,29.999,3.556z" fill="url(#SVGID_3_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="29.999" x2="29.999" y1="54.4995" y2="5.9818">
-<stop offset="0" style="stop-color:#BDC2C4"/>
-<stop offset="1" style="stop-color:#454B4D"/>
+ <stop offset="0" style="stop-color:#BDC2C4"/>
+ <stop offset="1" style="stop-color:#454B4D"/>
</linearGradient>
<path d="M29.999,54.111C16.704,54.111,5.888,43.295,5.888,30S16.704,5.89,29.999,5.89 S54.109,16.705,54.109,30S43.294,54.111,29.999,54.111L29.999,54.111z" fill="url(#SVGID_4_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30" x2="30" y1="52.6606" y2="6.0737">
-<stop offset="0" style="stop-color:#FAF9F9"/>
-<stop offset="0.4" style="stop-color:#FAF9F9"/>
-<stop offset="1" style="stop-color:#808184"/>
+ <stop offset="0.4" style="stop-color:#FAF9F9"/>
+ <stop offset="1" style="stop-color:#808184"/>
</linearGradient>
<path d="M29.999,53.333C17.133,53.333,6.667,42.867,6.667,30c0-12.865,10.466-23.333,23.332-23.333 c12.865,0,23.334,10.468,23.334,23.333C53.333,42.867,42.864,53.333,29.999,53.333L29.999,53.333z" fill="url(#SVGID_5_)"/>
-<path d="M29.999,31.667c7.696,0,15.042-0.647,21.777-1.814c-0.084-11.94-9.816-21.63-21.777-21.63 c-11.959,0-21.694,9.69-21.773,21.63C14.959,31.02,22.304,31.667,29.999,31.667z" fill="#FFFFFF" fill-opacity="0.7" stroke-opacity="0.7"/>
+<path d="M29.999,31.667c7.696,0,15.042-0.647,21.777-1.814c-0.084-11.94-9.816-21.63-21.777-21.63 c-11.959,0-21.694,9.69-21.773,21.63C14.959,31.02,22.304,31.667,29.999,31.667z" fill="#FFFFFF" opacity="0.7"/>
<rect fill="#404041" height="4.667" width="1.556" x="29.221" y="8.795"/>
<rect fill="#404041" height="4.667" width="1.556" x="29.221" y="47.684"/>
<rect fill="#404041" height="1.556" width="4.667" x="47.11" y="29.795"/>
@@ -46,27 +47,27 @@
<rect fill="#404041" height="3.766" transform="matrix(0.8661 -0.4999 0.4999 0.8661 -18.3816 26.2067)" width="1.256" x="39.095" y="45.529"/>
<rect fill="#404041" height="3.767" transform="matrix(0.4993 -0.8664 0.8664 0.4993 -11.4765 21.8413)" width="1.256" x="12.532" y="18.967"/>
<rect fill="#404041" height="3.765" transform="matrix(0.4992 -0.8665 0.8665 0.4992 -11.4567 60.7682)" width="1.256" x="46.211" y="38.412"/>
-<path d="M31.904,31.103c-0.075-0.374-0.265-0.705-0.521-0.966l2.68-8.833l-2.232-0.678l-2.783,9.17 c-0.484,0.274-0.84,0.745-0.953,1.307h-5.096v0.777h5.096c0.021,0.103,0.052,0.203,0.088,0.298L16.18,44.181l1.011,1.011 l11.957-11.959c0.257,0.126,0.545,0.204,0.853,0.204c0.94,0,1.725-0.667,1.904-1.556h18.317v-0.777H31.904z" fill="#231F20" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M31.904,31.103c-0.075-0.374-0.265-0.705-0.521-0.966l2.68-8.833l-2.232-0.678l-2.783,9.17 c-0.484,0.274-0.84,0.745-0.953,1.307h-5.096v0.777h5.096c0.021,0.103,0.052,0.203,0.088,0.298L16.18,44.181l1.011,1.011 l11.957-11.959c0.257,0.126,0.545,0.204,0.853,0.204c0.94,0,1.725-0.667,1.904-1.556h18.317v-0.777H31.904z" fill="#231F20" opacity="0.2"/>
<linearGradient gradientTransform="matrix(0.9569 0.2903 -0.2903 0.9569 665.0903 147.1071)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-641.8813" x2="-641.8813" y1="61.4336" y2="73.4297">
-<stop offset="0" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#231F20"/>
+ <stop offset="0" style="stop-color:#58595B"/>
+ <stop offset="1" style="stop-color:#231F20"/>
</linearGradient>
<polygon fill="url(#SVGID_6_)" points="34.063,20.202 31.831,19.525 28.442,30.688 30.677,31.366 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="16.7598" x2="30.4403" y1="43.5093" y2="29.8287">
-<stop offset="0" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#231F20"/>
+ <stop offset="0" style="stop-color:#58595B"/>
+ <stop offset="1" style="stop-color:#231F20"/>
</linearGradient>
<polygon fill="url(#SVGID_7_)" points="30.958,30.321 29.948,29.311 16.18,43.078 17.19,44.088 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="36.6104" x2="36.6104" y1="29.8896" y2="31.0254">
-<stop offset="0" style="stop-color:#FF0000"/>
-<stop offset="1" style="stop-color:#A8000B"/>
+ <stop offset="0" style="stop-color:#FF0000"/>
+ <stop offset="1" style="stop-color:#A8000B"/>
</linearGradient>
<path d="M50.222,30H31.904c-0.18-0.887-0.964-1.556-1.904-1.556c-0.942,0-1.726,0.669-1.905,1.556h-5.096 v0.778h5.096c0.18,0.889,0.963,1.556,1.905,1.556c0.94,0,1.725-0.667,1.904-1.556h18.317V30z" fill="url(#SVGID_8_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="29.999" x2="29.999" y1="29.1577" y2="31.5575">
-<stop offset="0" style="stop-color:#FFE2D9"/>
-<stop offset="1" style="stop-color:#F23D3D"/>
+ <stop offset="0" style="stop-color:#FFE2D9"/>
+ <stop offset="1" style="stop-color:#F23D3D"/>
</linearGradient>
<circle cx="30" cy="30.389" fill="url(#SVGID_9_)" r="1.167"/>
<rect fill="none" height="60" width="60"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_clock_home.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_clock_home.svg Fri May 14 16:09:54 2010 +0300
@@ -1,39 +1,40 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2.3896" y2="57.7417">
-<stop offset="0" style="stop-color:#BDC2C4"/>
-<stop offset="1" style="stop-color:#454B4D"/>
+ <stop offset="0" style="stop-color:#BDC2C4"/>
+ <stop offset="1" style="stop-color:#454B4D"/>
</linearGradient>
<path d="M29.999,58C14.56,58,2,45.44,2,30C2,14.562,14.56,2,29.999,2C45.44,2,58,14.562,58,30 C58,45.44,45.44,58,29.999,58L29.999,58z" fill="url(#SVGID_1_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="29.999" x2="29.999" y1="3.1675" y2="57.1007">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.2364" style="stop-color:#BDC2C4"/>
-<stop offset="1" style="stop-color:#697173"/>
+ <stop offset="0" style="stop-color:#D1D7D9"/>
+ <stop offset="0.2364" style="stop-color:#BDC2C4"/>
+ <stop offset="1" style="stop-color:#697173"/>
</linearGradient>
<circle cx="29.999" cy="30" fill="url(#SVGID_2_)" r="27.222"/>
-<path d="M30.948,30.95c9.117,0,17.921-0.57,26.256-1.616C56.849,14.609,44.81,2.778,29.999,2.778 C15.274,2.778,3.286,14.472,2.8,29.08C11.691,30.286,21.138,30.95,30.948,30.95z" fill="#F1F1F2" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M30.948,30.95c9.117,0,17.921-0.57,26.256-1.616C56.849,14.609,44.81,2.778,29.999,2.778 C15.274,2.778,3.286,14.472,2.8,29.08C11.691,30.286,21.138,30.95,30.948,30.95z" fill="#F1F1F2" opacity="0.35"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="3.0361" x2="57.3516" y1="16.5835" y2="16.5835">
-<stop offset="0" style="stop-color:#C0C5C7"/>
-<stop offset="0.2" style="stop-color:#F7FDFF"/>
-<stop offset="0.8" style="stop-color:#F7FDFF"/>
-<stop offset="1" style="stop-color:#CDD3D5"/>
+ <stop offset="0" style="stop-color:#C0C5C7"/>
+ <stop offset="0.2" style="stop-color:#F7FDFF"/>
+ <stop offset="0.8" style="stop-color:#F7FDFF"/>
+ <stop offset="1" style="stop-color:#CDD3D5"/>
</linearGradient>
<path d="M29.999,3.556c14.902,0,27.004,11.979,27.212,26.833c0.003-0.129,0.01-0.258,0.01-0.389 c0-15.034-12.188-27.222-27.222-27.222C14.964,2.778,2.776,14.966,2.776,30c0,0.131,0.009,0.26,0.01,0.389 C2.996,15.536,15.097,3.556,29.999,3.556z" fill="url(#SVGID_3_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="29.999" x2="29.999" y1="54.4995" y2="5.9818">
-<stop offset="0" style="stop-color:#BDC2C4"/>
-<stop offset="1" style="stop-color:#454B4D"/>
+ <stop offset="0" style="stop-color:#BDC2C4"/>
+ <stop offset="1" style="stop-color:#454B4D"/>
</linearGradient>
<path d="M29.999,54.111C16.704,54.111,5.888,43.295,5.888,30S16.704,5.89,29.999,5.89 S54.109,16.705,54.109,30S43.294,54.111,29.999,54.111L29.999,54.111z" fill="url(#SVGID_4_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30" x2="30" y1="52.6606" y2="6.0737">
-<stop offset="0" style="stop-color:#FAF9F9"/>
-<stop offset="0.4" style="stop-color:#FAF9F9"/>
-<stop offset="1" style="stop-color:#808184"/>
+ <stop offset="0.4" style="stop-color:#FAF9F9"/>
+ <stop offset="1" style="stop-color:#808184"/>
</linearGradient>
<path d="M29.999,53.333C17.133,53.333,6.667,42.867,6.667,30c0-12.865,10.466-23.333,23.332-23.333 c12.865,0,23.334,10.468,23.334,23.333C53.333,42.867,42.864,53.333,29.999,53.333L29.999,53.333z" fill="url(#SVGID_5_)"/>
-<path d="M29.999,31.667c7.696,0,15.042-0.647,21.777-1.814c-0.084-11.94-9.816-21.63-21.777-21.63 c-11.959,0-21.694,9.69-21.773,21.63C14.959,31.02,22.304,31.667,29.999,31.667z" fill="#FFFFFF" fill-opacity="0.7" stroke-opacity="0.7"/>
+<path d="M29.999,31.667c7.696,0,15.042-0.647,21.777-1.814c-0.084-11.94-9.816-21.63-21.777-21.63 c-11.959,0-21.694,9.69-21.773,21.63C14.959,31.02,22.304,31.667,29.999,31.667z" fill="#FFFFFF" opacity="0.7"/>
<rect fill="#404041" height="4.667" width="1.556" x="29.221" y="8.795"/>
<rect fill="#404041" height="4.667" width="1.556" x="29.221" y="47.684"/>
<rect fill="#404041" height="1.556" width="4.667" x="47.11" y="29.795"/>
@@ -46,68 +47,70 @@
<rect fill="#404041" height="3.766" transform="matrix(0.8661 -0.4999 0.4999 0.8661 -18.3816 26.2067)" width="1.256" x="39.095" y="45.529"/>
<rect fill="#404041" height="3.767" transform="matrix(0.4993 -0.8664 0.8664 0.4993 -11.4765 21.8413)" width="1.256" x="12.532" y="18.967"/>
<rect fill="#404041" height="3.765" transform="matrix(0.4992 -0.8665 0.8665 0.4992 -11.4567 60.7682)" width="1.256" x="46.211" y="38.412"/>
-<path d="M31.904,31.103c-0.075-0.374-0.265-0.705-0.521-0.966l2.68-8.833l-2.232-0.678l-2.783,9.17 c-0.484,0.274-0.84,0.745-0.953,1.307h-5.096v0.777h5.096c0.021,0.103,0.052,0.203,0.088,0.298L16.18,44.181l1.011,1.011 l11.957-11.959c0.257,0.126,0.545,0.204,0.853,0.204c0.94,0,1.725-0.667,1.904-1.556h18.317v-0.777H31.904z" fill="#231F20" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M31.904,31.103c-0.075-0.374-0.265-0.705-0.521-0.966l2.68-8.833l-2.232-0.678l-2.783,9.17 c-0.484,0.274-0.84,0.745-0.953,1.307h-5.096v0.777h5.096c0.021,0.103,0.052,0.203,0.088,0.298L16.18,44.181l1.011,1.011 l11.957-11.959c0.257,0.126,0.545,0.204,0.853,0.204c0.94,0,1.725-0.667,1.904-1.556h18.317v-0.777H31.904z" fill="#231F20" opacity="0.2"/>
<linearGradient gradientTransform="matrix(0.9569 0.2903 -0.2903 0.9569 665.0903 147.1071)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-641.8813" x2="-641.8813" y1="61.4336" y2="73.4297">
-<stop offset="0" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#231F20"/>
+ <stop offset="0" style="stop-color:#58595B"/>
+ <stop offset="1" style="stop-color:#231F20"/>
</linearGradient>
<polygon fill="url(#SVGID_6_)" points="34.063,20.202 31.831,19.525 28.442,30.688 30.677,31.366 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="16.7598" x2="30.4403" y1="43.5093" y2="29.8287">
-<stop offset="0" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#231F20"/>
+ <stop offset="0" style="stop-color:#58595B"/>
+ <stop offset="1" style="stop-color:#231F20"/>
</linearGradient>
<polygon fill="url(#SVGID_7_)" points="30.958,30.321 29.948,29.311 16.18,43.078 17.19,44.088 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="36.6104" x2="36.6104" y1="29.8896" y2="31.0254">
-<stop offset="0" style="stop-color:#FF0000"/>
-<stop offset="1" style="stop-color:#A8000B"/>
+ <stop offset="0" style="stop-color:#FF0000"/>
+ <stop offset="1" style="stop-color:#A8000B"/>
</linearGradient>
<path d="M50.222,30H31.904c-0.18-0.887-0.964-1.556-1.904-1.556c-0.942,0-1.726,0.669-1.905,1.556h-5.096 v0.778h5.096c0.18,0.889,0.963,1.556,1.905,1.556c0.94,0,1.725-0.667,1.904-1.556h18.317V30z" fill="url(#SVGID_8_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="29.999" x2="29.999" y1="29.1577" y2="31.5575">
-<stop offset="0" style="stop-color:#FFE2D9"/>
-<stop offset="1" style="stop-color:#F23D3D"/>
+ <stop offset="0" style="stop-color:#FFE2D9"/>
+ <stop offset="1" style="stop-color:#F23D3D"/>
</linearGradient>
<circle cx="30" cy="30.389" fill="url(#SVGID_9_)" r="1.167"/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<polygon fill="none" points="30.414,14.408 30.414,0 0.414,0 0.414,14.41 0,14.824 0.414,15.237 0.414,30 30.414,30 30.414,15.236 30.828,14.821 "/>
-<path d="M2.749,29.823V17.57L0,14.824l0.706-0.707C1.213,13.608,13.143,1.649,13.861,0.962 c0.387-0.368,0.914-0.786,1.589-0.786c0.687,0,1.172,0.42,1.518,0.785c0.457,0.484,8.802,8.816,13.151,13.154l0.708,0.706 l-2.747,2.749v12.253H2.749z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M2.749,29.823V17.57L0,14.824l0.706-0.707C1.213,13.608,13.143,1.649,13.861,0.962 c0.387-0.368,0.914-0.786,1.589-0.786c0.687,0,1.172,0.42,1.518,0.785c0.457,0.484,8.802,8.816,13.151,13.154l0.708,0.706 l-2.747,2.749v12.253H2.749z" opacity="0.35"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="15.415" x2="15.415" y1="28.6694" y2="12.5688">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.6606" style="stop-color:#E0E1E2"/>
-<stop offset="1" style="stop-color:#B9BCBD"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="0.6606" style="stop-color:#E0E1E2"/>
+ <stop offset="1" style="stop-color:#B9BCBD"/>
</linearGradient>
<polygon fill="url(#SVGID_1__)" points="27.081,28.823 3.749,28.823 3.749,14.473 15.414,5.489 27.081,14.473 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="15.415" x2="15.415" y1="17.313" y2="28.6013">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.6606" style="stop-color:#E0E1E2"/>
-<stop offset="1" style="stop-color:#B9BCBD"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="0.6606" style="stop-color:#E0E1E2"/>
+ <stop offset="1" style="stop-color:#B9BCBD"/>
</linearGradient>
<path d="M15.414,6.668l10.736,8.264V27.89H4.682V14.932L15.414,6.668 M15.414,5.489L3.749,14.473v14.351 h23.333V14.473L15.414,5.489L15.414,5.489z" fill="url(#SVGID_2__)"/>
-<polygon fill-opacity="0.2" points="27.081,18.033 27.081,14.473 15.414,5.489 3.749,14.473 3.749,18.322 15.414,8.99 " stroke-opacity="0.2"/>
+<polygon opacity="0.2" points="27.081,18.033 27.081,14.473 15.414,5.489 3.749,14.473 3.749,18.322 15.414,8.99 "/>
<polygon fill="#727272" points="27.081,18.033 27.081,14.473 15.414,5.489 3.749,14.473 3.749,18.322 15.414,6.655 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="15.416" x2="15.416" y1="17.9946" y2="29.1519">
-<stop offset="0" style="stop-color:#D07100"/>
-<stop offset="1" style="stop-color:#A23600"/>
+ <stop offset="0" style="stop-color:#D07100"/>
+ <stop offset="1" style="stop-color:#A23600"/>
</linearGradient>
<rect fill="url(#SVGID_3__)" height="10.501" width="7.001" x="11.916" y="18.322"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="15.416" x2="15.416" y1="28.7466" y2="18.3602">
-<stop offset="0" style="stop-color:#D07100"/>
-<stop offset="1" style="stop-color:#A23600"/>
+ <stop offset="0" style="stop-color:#D07100"/>
+ <stop offset="1" style="stop-color:#A23600"/>
</linearGradient>
<path d="M17.98,19.257v8.633h-5.133v-8.633H17.98 M18.917,18.322h-7.001v10.501h7.001V18.322L18.917,18.322z" fill="url(#SVGID_4__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="15.4136" x2="15.4136" y1="0.0352" y2="17.7271">
-<stop offset="0" style="stop-color:#DE8029"/>
-<stop offset="0.2606" style="stop-color:#DE4E29"/>
-<stop offset="1" style="stop-color:#D82E09"/>
+ <stop offset="0" style="stop-color:#DE8029"/>
+ <stop offset="0.2606" style="stop-color:#DE4E29"/>
+ <stop offset="1" style="stop-color:#D82E09"/>
</linearGradient>
<path d="M15.414,5.489l11.667,11.667l2.333-2.333c0,0-12.586-12.554-13.171-13.175 c-0.587-0.62-0.965-0.652-1.689,0.035c-0.719,0.688-13.14,13.14-13.14,13.14l2.335,2.333L15.414,5.489z" fill="url(#SVGID_5__)"/>
<radialGradient cx="15.2969" cy="1.7559" gradientUnits="userSpaceOnUse" id="SVGID_6__" r="18.6679">
-<stop offset="0" style="stop-color:#F7D481"/>
-<stop offset="1" style="stop-color:#F5340A"/>
+ <stop offset="0" style="stop-color:#F7D481"/>
+ <stop offset="1" style="stop-color:#F5340A"/>
</radialGradient>
<path d="M14.553,2.616c0.724-0.688,1.102-0.653,1.689-0.034c0.516,0.549,10.433,10.442,12.705,12.709 l0.467-0.468c0,0-12.586-12.554-13.171-13.175c-0.587-0.62-0.965-0.652-1.689,0.035c-0.719,0.688-13.14,13.14-13.14,13.14 l0.467,0.465C4.134,13.029,13.917,3.225,14.553,2.616z" fill="url(#SVGID_6__)"/>
-<rect fill-opacity="0.2" height="1.168" stroke-opacity="0.2" width="7.001" x="11.916" y="18.322"/>
+<rect height="1.168" opacity="0.2" width="7.001" x="11.916" y="18.322"/>
<rect fill="none" height="30" width="30" x="0.414"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_clock_night_home.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_clock_night_home.svg Fri May 14 16:09:54 2010 +0300
@@ -1,29 +1,30 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
<linearGradient gradientTransform="matrix(1 0 0 1 -144.0156 -215.7637)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="174.0137" x2="174.0137" y1="218.3223" y2="272.2545">
-<stop offset="0" style="stop-color:#989897"/>
-<stop offset="0.24" style="stop-color:#676767"/>
-<stop offset="1" style="stop-color:#4E4E4E"/>
+ <stop offset="0" style="stop-color:#989897"/>
+ <stop offset="0.24" style="stop-color:#676767"/>
+ <stop offset="1" style="stop-color:#4E4E4E"/>
</linearGradient>
<circle cx="29.998" cy="29.385" fill="url(#SVGID_1_)" r="27.222"/>
-<path d="M30.948,30.335c9.117,0,17.92-0.568,26.256-1.615 C56.847,13.996,44.81,2.165,29.998,2.165c-14.724,0-26.712,11.695-27.2,26.301C11.689,29.67,21.137,30.335,30.948,30.335z" fill="#4E4E4E" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M30.948,30.335c9.117,0,17.92-0.568,26.256-1.615 C56.847,13.996,44.81,2.165,29.998,2.165c-14.724,0-26.712,11.695-27.2,26.301C11.689,29.67,21.137,30.335,30.948,30.335z" enable-background="new " fill="#4E4E4E" opacity="0.35"/>
<path d="M29.998,2.941c14.903,0,27.005,11.98,27.212,26.833c0-0.129,0.01-0.258,0.01-0.388 c0-15.035-12.188-27.222-27.222-27.222S2.776,14.352,2.776,29.386c0,0.131,0.008,0.259,0.009,0.388 C2.995,14.92,15.095,2.941,29.998,2.941z" fill="#B3B2B3"/>
<linearGradient gradientTransform="matrix(1 0 0 1 -144.0156 -215.7637)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="174.0137" x2="174.0137" y1="269.6514" y2="221.1329">
-<stop offset="0" style="stop-color:#BCC1C2"/>
-<stop offset="1" style="stop-color:#474C4D"/>
+ <stop offset="0" style="stop-color:#BCC1C2"/>
+ <stop offset="1" style="stop-color:#474C4D"/>
</linearGradient>
<path d="M29.998,53.496c-13.295,0-24.111-10.816-24.111-24.111c0-13.296,10.815-24.113,24.111-24.113 c13.294,0,24.114,10.817,24.114,24.113C54.112,42.68,43.292,53.496,29.998,53.496L29.998,53.496z" fill="url(#SVGID_2_)"/>
<radialGradient cx="174.0127" cy="287.1436" gradientTransform="matrix(1 0 0 1 -144.0156 -215.7637)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="84.7752">
-<stop offset="0" style="stop-color:#343433"/>
-<stop offset="0.4" style="stop-color:#343433"/>
-<stop offset="1" style="stop-color:#4E4E4E"/>
+ <stop offset="0.4" style="stop-color:#343433"/>
+ <stop offset="1" style="stop-color:#4E4E4E"/>
</radialGradient>
<path d="M29.998,52.719c-12.864,0-23.332-10.466-23.332-23.333c0-12.865,10.468-23.333,23.332-23.333 c12.866,0,23.331,10.469,23.331,23.333C53.329,42.253,42.864,52.719,29.998,52.719L29.998,52.719z" fill="url(#SVGID_3_)"/>
-<path d="M29.998,31.052c7.696,0,15.042-0.647,21.776-1.813 C51.692,17.3,41.958,7.609,29.998,7.609c-11.958,0-21.694,9.689-21.775,21.629C14.958,30.405,22.302,31.052,29.998,31.052z" fill="#676767" fill-opacity="0.7" stroke-opacity="0.7"/>
+<path d="M29.998,31.052c7.696,0,15.042-0.647,21.776-1.813 C51.692,17.3,41.958,7.609,29.998,7.609c-11.958,0-21.694,9.689-21.775,21.629C14.958,30.405,22.302,31.052,29.998,31.052z" enable-background="new " fill="#676767" opacity="0.7"/>
<rect fill="#F3F2F2" height="4.668" width="1.554" x="29.223" y="8.179"/>
<rect fill="#F3F2F2" height="4.667" width="1.554" x="29.223" y="47.069"/>
<rect fill="#F3F2F2" height="1.555" width="4.668" x="47.108" y="29.182"/>
@@ -36,68 +37,70 @@
<rect fill="#F3F2F2" height="3.763" transform="matrix(-0.8665 0.4992 -0.4992 -0.8665 97.4898 67.514)" width="1.258" x="39.087" y="44.913"/>
<rect fill="#F3F2F2" height="3.765" transform="matrix(-0.5002 0.8659 -0.8659 -0.5002 37.2642 18.9665)" width="1.255" x="12.531" y="18.355"/>
<rect fill="#F3F2F2" height="3.765" transform="matrix(-0.5008 0.8656 -0.8656 -0.5008 104.6477 19.0248)" width="1.256" x="46.21" y="37.806"/>
-<path d="M31.903,30.489c-0.078-0.374-0.264-0.705-0.521-0.967l2.68-8.833 l-2.234-0.677l-2.781,9.17c-0.484,0.275-0.84,0.744-0.954,1.307h-5.095v0.779h5.096c0.023,0.102,0.052,0.201,0.088,0.298 L16.178,43.564l1.008,1.01l11.961-11.957c0.257,0.127,0.543,0.203,0.851,0.203c0.941,0,1.725-0.667,1.906-1.558h18.318v-0.775 L31.903,30.489L31.903,30.489z" fill="#231F20" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M31.903,30.489c-0.078-0.374-0.264-0.705-0.521-0.967l2.68-8.833 l-2.234-0.677l-2.781,9.17c-0.484,0.275-0.84,0.744-0.954,1.307h-5.095v0.779h5.096c0.023,0.102,0.052,0.201,0.088,0.298 L16.178,43.564l1.008,1.01l11.961-11.957c0.257,0.127,0.543,0.203,0.851,0.203c0.941,0,1.725-0.667,1.906-1.558h18.318v-0.775 L31.903,30.489L31.903,30.489z" enable-background="new " fill="#231F20" opacity="0.2"/>
<linearGradient gradientTransform="matrix(1 0 0 1 -144.0156 -215.7637)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="177.0596" x2="173.5786" y1="234.6855" y2="246.1574">
-<stop offset="0" style="stop-color:#E5E5E5"/>
-<stop offset="1" style="stop-color:#989897"/>
+ <stop offset="0" style="stop-color:#E5E5E5"/>
+ <stop offset="1" style="stop-color:#989897"/>
</linearGradient>
<polygon fill="url(#SVGID_4_)" points="34.062,19.587 31.829,18.911 28.442,30.074 30.675,30.75 "/>
<linearGradient gradientTransform="matrix(1 0 0 1 -144.0156 -215.7637)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="160.7793" x2="174.448" y1="258.6592" y2="244.9778">
-<stop offset="0" style="stop-color:#E5E5E5"/>
-<stop offset="1" style="stop-color:#989897"/>
+ <stop offset="0" style="stop-color:#E5E5E5"/>
+ <stop offset="1" style="stop-color:#989897"/>
</linearGradient>
<polygon fill="url(#SVGID_5_)" points="30.956,29.708 29.947,28.696 16.179,42.464 17.188,43.474 "/>
<linearGradient gradientTransform="matrix(1 0 0 1 -144.0156 -215.7637)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="180.625" x2="180.625" y1="245.041" y2="246.1719">
-<stop offset="0" style="stop-color:#EC2224"/>
-<stop offset="1" style="stop-color:#A71E22"/>
+ <stop offset="0" style="stop-color:#EC2224"/>
+ <stop offset="1" style="stop-color:#A71E22"/>
</linearGradient>
<path d="M50.222,29.386H31.903c-0.182-0.887-0.965-1.556-1.906-1.556c-0.942,0-1.725,0.668-1.905,1.556 h-5.096v0.777h5.096c0.181,0.888,0.963,1.556,1.905,1.556c0.941,0,1.725-0.668,1.906-1.556h18.318V29.386z" fill="url(#SVGID_6_)"/>
<linearGradient gradientTransform="matrix(1 0 0 1 -144.0156 -215.7637)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="174.0137" x2="174.0137" y1="244.3047" y2="246.7054">
-<stop offset="0" style="stop-color:#FCE1D8"/>
-<stop offset="1" style="stop-color:#EE3F3F"/>
+ <stop offset="0" style="stop-color:#FCE1D8"/>
+ <stop offset="1" style="stop-color:#EE3F3F"/>
</linearGradient>
<circle cx="29.998" cy="29.774" fill="url(#SVGID_7_)" r="1.166"/>
<rect fill="none" height="59.996" width="59.995"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<polygon fill="none" points="30.414,14.408 30.414,0 0.414,0 0.414,14.41 0,14.824 0.414,15.237 0.414,30 30.414,30 30.414,15.236 30.828,14.821 "/>
-<path d="M2.749,29.823V17.57L0,14.824l0.706-0.707C1.213,13.608,13.143,1.649,13.861,0.962 c0.387-0.368,0.914-0.786,1.589-0.786c0.687,0,1.172,0.42,1.518,0.785c0.457,0.484,8.802,8.816,13.151,13.154l0.708,0.706 l-2.747,2.749v12.253H2.749z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M2.749,29.823V17.57L0,14.824l0.706-0.707C1.213,13.608,13.143,1.649,13.861,0.962 c0.387-0.368,0.914-0.786,1.589-0.786c0.687,0,1.172,0.42,1.518,0.785c0.457,0.484,8.802,8.816,13.151,13.154l0.708,0.706 l-2.747,2.749v12.253H2.749z" opacity="0.35"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="15.415" x2="15.415" y1="28.6694" y2="12.5688">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.6606" style="stop-color:#E0E1E2"/>
-<stop offset="1" style="stop-color:#B9BCBD"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="0.6606" style="stop-color:#E0E1E2"/>
+ <stop offset="1" style="stop-color:#B9BCBD"/>
</linearGradient>
<polygon fill="url(#SVGID_1__)" points="27.081,28.823 3.749,28.823 3.749,14.473 15.414,5.489 27.081,14.473 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="15.415" x2="15.415" y1="17.313" y2="28.6013">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.6606" style="stop-color:#E0E1E2"/>
-<stop offset="1" style="stop-color:#B9BCBD"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="0.6606" style="stop-color:#E0E1E2"/>
+ <stop offset="1" style="stop-color:#B9BCBD"/>
</linearGradient>
<path d="M15.414,6.668l10.736,8.264V27.89H4.682V14.932L15.414,6.668 M15.414,5.489L3.749,14.473v14.351 h23.333V14.473L15.414,5.489L15.414,5.489z" fill="url(#SVGID_2__)"/>
-<polygon fill-opacity="0.2" points="27.081,18.033 27.081,14.473 15.414,5.489 3.749,14.473 3.749,18.322 15.414,8.99 " stroke-opacity="0.2"/>
+<polygon opacity="0.2" points="27.081,18.033 27.081,14.473 15.414,5.489 3.749,14.473 3.749,18.322 15.414,8.99 "/>
<polygon fill="#727272" points="27.081,18.033 27.081,14.473 15.414,5.489 3.749,14.473 3.749,18.322 15.414,6.655 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="15.416" x2="15.416" y1="17.9946" y2="29.1519">
-<stop offset="0" style="stop-color:#D07100"/>
-<stop offset="1" style="stop-color:#A23600"/>
+ <stop offset="0" style="stop-color:#D07100"/>
+ <stop offset="1" style="stop-color:#A23600"/>
</linearGradient>
<rect fill="url(#SVGID_3__)" height="10.501" width="7.001" x="11.916" y="18.322"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="15.416" x2="15.416" y1="28.7466" y2="18.3602">
-<stop offset="0" style="stop-color:#D07100"/>
-<stop offset="1" style="stop-color:#A23600"/>
+ <stop offset="0" style="stop-color:#D07100"/>
+ <stop offset="1" style="stop-color:#A23600"/>
</linearGradient>
<path d="M17.98,19.257v8.633h-5.133v-8.633H17.98 M18.917,18.322h-7.001v10.501h7.001V18.322L18.917,18.322z" fill="url(#SVGID_4__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="15.4136" x2="15.4136" y1="0.0352" y2="17.7271">
-<stop offset="0" style="stop-color:#DE8029"/>
-<stop offset="0.2606" style="stop-color:#DE4E29"/>
-<stop offset="1" style="stop-color:#D82E09"/>
+ <stop offset="0" style="stop-color:#DE8029"/>
+ <stop offset="0.2606" style="stop-color:#DE4E29"/>
+ <stop offset="1" style="stop-color:#D82E09"/>
</linearGradient>
<path d="M15.414,5.489l11.667,11.667l2.333-2.333c0,0-12.586-12.554-13.171-13.175 c-0.587-0.62-0.965-0.652-1.689,0.035c-0.719,0.688-13.14,13.14-13.14,13.14l2.335,2.333L15.414,5.489z" fill="url(#SVGID_5__)"/>
<radialGradient cx="15.2969" cy="1.7559" gradientUnits="userSpaceOnUse" id="SVGID_6__" r="18.6679">
-<stop offset="0" style="stop-color:#F7D481"/>
-<stop offset="1" style="stop-color:#F5340A"/>
+ <stop offset="0" style="stop-color:#F7D481"/>
+ <stop offset="1" style="stop-color:#F5340A"/>
</radialGradient>
<path d="M14.553,2.616c0.724-0.688,1.102-0.653,1.689-0.034c0.516,0.549,10.433,10.442,12.705,12.709 l0.467-0.468c0,0-12.586-12.554-13.171-13.175c-0.587-0.62-0.965-0.652-1.689,0.035c-0.719,0.688-13.14,13.14-13.14,13.14 l0.467,0.465C4.134,13.029,13.917,3.225,14.553,2.616z" fill="url(#SVGID_6__)"/>
-<rect fill-opacity="0.2" height="1.168" stroke-opacity="0.2" width="7.001" x="11.916" y="18.322"/>
+<rect height="1.168" opacity="0.2" width="7.001" x="11.916" y="18.322"/>
<rect fill="none" height="30" width="30" x="0.414"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_computer.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_computer.svg Fri May 14 16:09:54 2010 +0300
@@ -1,69 +1,71 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="9.9121" x2="50.0859" y1="30" y2="30">
-<stop offset="0" style="stop-color:#B4BDBF"/>
-<stop offset="0.2667" style="stop-color:#E5EBED"/>
-<stop offset="0.703" style="stop-color:#8D9699"/>
-<stop offset="1" style="stop-color:#B7BDBF"/>
+ <stop offset="0" style="stop-color:#B4BDBF"/>
+ <stop offset="0.2667" style="stop-color:#E5EBED"/>
+ <stop offset="0.703" style="stop-color:#8D9699"/>
+ <stop offset="1" style="stop-color:#B7BDBF"/>
</linearGradient>
<path d="M48.539,2H11.463c-0.854,0-1.551,0.69-1.551,1.536V58h40.174V3.536C50.086,2.69,49.39,2,48.539,2z" fill="url(#SVGID_1_)"/>
-<path d="M48.539,2c0.851,0,1.547,0.69,1.547,1.536V58H9.912V3.536C9.912,2.69,10.609,2,11.463,2 H48.539 M48.539,3.218H11.463c-0.181,0-0.333,0.146-0.333,0.318v53.246h37.739V3.536C48.869,3.364,48.717,3.218,48.539,3.218 L48.539,3.218z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M48.539,2c0.851,0,1.547,0.69,1.547,1.536V58H9.912V3.536C9.912,2.69,10.609,2,11.463,2 H48.539 M48.539,3.218H11.463c-0.181,0-0.333,0.146-0.333,0.318v53.246h37.739V3.536C48.869,3.364,48.717,3.218,48.539,3.218 L48.539,3.218z" fill="#FFFFFF" opacity="0.5"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="19.0908" y2="9.5508">
-<stop offset="0" style="stop-color:#808080"/>
-<stop offset="1" style="stop-color:#303030"/>
+ <stop offset="0" style="stop-color:#808080"/>
+ <stop offset="1" style="stop-color:#303030"/>
</linearGradient>
<rect fill="url(#SVGID_2_)" height="9.738" width="33.269" x="13.365" y="9.353"/>
-<rect fill="#FFFFFF" fill-opacity="0.25" height="1.218" stroke-opacity="0.25" width="33.269" x="13.365" y="19.091"/>
+<rect fill="#FFFFFF" height="1.218" opacity="0.25" width="33.269" x="13.365" y="19.091"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="10.6196" y2="17.8277">
-<stop offset="0" style="stop-color:#8B8B8B"/>
-<stop offset="1" style="stop-color:#454545"/>
+ <stop offset="0" style="stop-color:#8B8B8B"/>
+ <stop offset="1" style="stop-color:#454545"/>
</linearGradient>
<rect fill="url(#SVGID_3_)" height="7.305" width="30.831" x="14.585" y="10.569"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="30" x2="30" y1="11.542" y2="16.6561">
-<stop offset="0" style="stop-color:#525252"/>
-<stop offset="1" style="stop-color:#1C1C1C"/>
+ <stop offset="0" style="stop-color:#525252"/>
+ <stop offset="1" style="stop-color:#1C1C1C"/>
</linearGradient>
<rect fill="url(#SVGID_4_)" height="4.869" width="28.397" x="15.802" y="11.787"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="20.0391" x2="20.0391" y1="12.8813" y2="15.4384">
-<stop offset="0" style="stop-color:#17BFFF"/>
-<stop offset="1" style="stop-color:#0D5186"/>
+ <stop offset="0" style="stop-color:#17BFFF"/>
+ <stop offset="1" style="stop-color:#0D5186"/>
</linearGradient>
<rect fill="url(#SVGID_5_)" height="2.435" width="6.125" x="16.977" y="13.004"/>
-<rect fill="#FFFFFF" fill-opacity="0.25" height="1.218" stroke-opacity="0.25" width="6.125" x="16.977" y="13.004"/>
+<rect fill="#FFFFFF" height="1.218" opacity="0.25" width="6.125" x="16.977" y="13.004"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="42.9824" x2="42.9824" y1="25.0635" y2="32.5999">
-<stop offset="0" style="stop-color:#576266"/>
-<stop offset="1" style="stop-color:#C4C4C4"/>
+ <stop offset="0" style="stop-color:#576266"/>
+ <stop offset="1" style="stop-color:#C4C4C4"/>
</linearGradient>
<path d="M42.981,32.482c-2.014,0-3.651-1.638-3.651-3.652c0-2.014,1.638-3.652,3.651-3.652 c2.015,0,3.652,1.639,3.652,3.652C46.634,30.845,44.996,32.482,42.981,32.482L42.981,32.482z" fill="url(#SVGID_6_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="42.9814" x2="42.9814" y1="26.3193" y2="31.3429">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+ <stop offset="0" style="stop-color:#C6FF45"/>
+ <stop offset="0.7273" style="stop-color:#66A00E"/>
+ <stop offset="1" style="stop-color:#387300"/>
</linearGradient>
<circle cx="42.981" cy="28.83" fill="url(#SVGID_7_)" r="2.435"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="30" x2="30" y1="53.2866" y2="48.5696">
-<stop offset="0" style="stop-color:#8B8B8B"/>
-<stop offset="1" style="stop-color:#454545"/>
+ <stop offset="0" style="stop-color:#8B8B8B"/>
+ <stop offset="1" style="stop-color:#454545"/>
</linearGradient>
<rect fill="url(#SVGID_8_)" height="4.869" width="25.565" x="17.217" y="48.544"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="22.6953" x2="22.6953" y1="52.1328" y2="49.7734">
-<stop offset="0" style="stop-color:#525252"/>
-<stop offset="1" style="stop-color:#1C1C1C"/>
+ <stop offset="0" style="stop-color:#525252"/>
+ <stop offset="1" style="stop-color:#1C1C1C"/>
</linearGradient>
<rect fill="url(#SVGID_9_)" height="2.436" width="6.087" x="19.651" y="49.761"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="30" x2="30" y1="52.1328" y2="49.7734">
-<stop offset="0" style="stop-color:#525252"/>
-<stop offset="1" style="stop-color:#1C1C1C"/>
+ <stop offset="0" style="stop-color:#525252"/>
+ <stop offset="1" style="stop-color:#1C1C1C"/>
</linearGradient>
<rect fill="url(#SVGID_10_)" height="2.436" width="6.087" x="26.956" y="49.761"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="37.3037" x2="37.3037" y1="52.2217" y2="49.7861">
-<stop offset="0" style="stop-color:#525252"/>
-<stop offset="1" style="stop-color:#1C1C1C"/>
+ <stop offset="0" style="stop-color:#525252"/>
+ <stop offset="1" style="stop-color:#1C1C1C"/>
</linearGradient>
<rect fill="url(#SVGID_11_)" height="2.436" width="6.088" x="34.26" y="49.761"/>
<rect fill="none" height="60" width="60"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_corrupted.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_corrupted.svg Fri May 14 16:09:54 2010 +0300
@@ -1,126 +1,126 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="18.3677" x2="18.3677" y1="9.4238" y2="48.3162">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="0.8727" style="stop-color:#A9ADAD"/>
-<stop offset="1" style="stop-color:#DBDCDD"/>
+ <stop offset="0" style="stop-color:#F2F2F2"/>
+ <stop offset="0.8727" style="stop-color:#A9ADAD"/>
+ <stop offset="1" style="stop-color:#DBDCDD"/>
</linearGradient>
<polygon fill="url(#SVGID_1_)" points="26.794,34.85 31.693,28.114 26.642,21.226 30.979,15.053 28.232,9.424 5.042,9.424 5.042,43.791 29.68,43.791 31.283,41.176 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="42.4102" x2="42.4102" y1="10.6484" y2="45.1921">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.6121" style="stop-color:#D4DADE"/>
-<stop offset="0.9152" style="stop-color:#E3E8E8"/>
-<stop offset="0.9818" style="stop-color:#FCFFFE"/>
-<stop offset="1" style="stop-color:#FCFFFE"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="0.6121" style="stop-color:#D4DADE"/>
+ <stop offset="0.9152" style="stop-color:#E3E8E8"/>
+ <stop offset="0.9818" style="stop-color:#FCFFFE"/>
</linearGradient>
<polygon fill="url(#SVGID_2_)" points="52.303,10.648 32.518,10.648 32.791,11.21 51.746,11.21 51.746,44.455 34.309,44.455 33.965,45.016 52.303,45.016 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="42.2686" x2="42.2686" y1="11.21" y2="44.6258">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="0.8727" style="stop-color:#A9ADAD"/>
-<stop offset="1" style="stop-color:#DBDCDD"/>
+ <stop offset="0" style="stop-color:#F2F2F2"/>
+ <stop offset="0.8727" style="stop-color:#A9ADAD"/>
+ <stop offset="1" style="stop-color:#DBDCDD"/>
</linearGradient>
<polygon fill="url(#SVGID_3_)" points="35.658,16.366 32.791,11.21 51.746,11.21 51.746,44.455 38.49,44.455 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="17.5327" x2="17.5327" y1="9.4238" y2="48.3162">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.6121" style="stop-color:#D4DADE"/>
-<stop offset="0.9152" style="stop-color:#E3E8E8"/>
-<stop offset="0.9818" style="stop-color:#FCFFFE"/>
-<stop offset="1" style="stop-color:#FCFFFE"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="0.6121" style="stop-color:#D4DADE"/>
+ <stop offset="0.9152" style="stop-color:#E3E8E8"/>
+ <stop offset="0.9818" style="stop-color:#FCFFFE"/>
</linearGradient>
<polygon fill="url(#SVGID_4_)" points="5.598,43.23 5.598,9.985 28.506,9.985 28.232,9.424 5.042,9.424 5.042,43.791 29.68,43.791 30.023,43.23 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="40.4873" x2="40.4873" y1="13.4229" y2="41.8574">
-<stop offset="0" style="stop-color:#B3B3B3"/>
-<stop offset="1" style="stop-color:#666666"/>
+ <stop offset="0" style="stop-color:#B3B3B3"/>
+ <stop offset="1" style="stop-color:#666666"/>
</linearGradient>
<polygon fill="url(#SVGID_5_)" points="50.047,13.577 33.947,13.577 35.264,16.277 30.928,22.45 35.979,29.337 31.08,36.074 34.701,41.176 50.047,41.176 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="19.5796" x2="19.5796" y1="9.4399" y2="48.3313">
-<stop offset="0" style="stop-color:#B3B3B3"/>
-<stop offset="1" style="stop-color:#666666"/>
+ <stop offset="0" style="stop-color:#B3B3B3"/>
+ <stop offset="1" style="stop-color:#666666"/>
</linearGradient>
<polygon fill="url(#SVGID_6_)" points="31.693,28.114 26.642,21.226 30.979,15.053 29.661,12.353 7.466,12.353 7.466,39.951 30.415,39.951 26.794,34.85 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="40.1436" x2="40.1436" y1="15.1265" y2="40.1341">
-<stop offset="0" style="stop-color:#41ACFA"/>
-<stop offset="1" style="stop-color:#8DC8E1"/>
+ <stop offset="0" style="stop-color:#41ACFA"/>
+ <stop offset="1" style="stop-color:#8DC8E1"/>
</linearGradient>
<polygon fill="url(#SVGID_7_)" points="49.359,14.213 34.256,14.213 35.264,16.277 30.928,22.45 35.979,29.337 31.08,36.074 34.348,40.678 49.359,40.678 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="33.7588" x2="33.7588" y1="11.124" y2="23.6764">
-<stop offset="0" style="stop-color:#F5F5F5"/>
-<stop offset="0.8061" style="stop-color:#37749E"/>
-<stop offset="1" style="stop-color:#D6D6D6"/>
+ <stop offset="0" style="stop-color:#F5F5F5"/>
+ <stop offset="0.8061" style="stop-color:#37749E"/>
+ <stop offset="1" style="stop-color:#D6D6D6"/>
</linearGradient>
<polygon fill="url(#SVGID_8_)" points="31.691,36.074 36.59,29.337 31.539,22.45 35.875,16.277 33.131,10.648 32.518,10.648 35.264,16.277 30.928,22.45 35.979,29.337 31.08,36.074 35.57,42.4 33.965,45.016 34.578,45.016 36.182,42.4 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="19.5513" x2="19.5513" y1="9.4399" y2="48.3321">
-<stop offset="0" style="stop-color:#41ACFA"/>
-<stop offset="1" style="stop-color:#8DC8E1"/>
+ <stop offset="0" style="stop-color:#41ACFA"/>
+ <stop offset="1" style="stop-color:#8DC8E1"/>
</linearGradient>
<polygon fill="url(#SVGID_9_)" points="26.642,21.226 30.979,15.053 29.971,12.989 8.124,12.989 8.124,39.453 26.794,34.85 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="28.8608" x2="28.8608" y1="9.2871" y2="21.281">
-<stop offset="0" style="stop-color:#F5F5F5"/>
-<stop offset="0.8061" style="stop-color:#37749E"/>
-<stop offset="1" style="stop-color:#D6D6D6"/>
+ <stop offset="0" style="stop-color:#F5F5F5"/>
+ <stop offset="0.8061" style="stop-color:#37749E"/>
+ <stop offset="1" style="stop-color:#D6D6D6"/>
</linearGradient>
<polygon fill="url(#SVGID_10_)" points="31.693,28.114 26.642,21.226 30.979,15.053 28.232,9.424 27.621,9.424 30.365,15.053 26.029,21.226 31.08,28.114 26.182,34.85 30.672,41.176 29.067,43.791 29.68,43.791 31.283,41.176 26.794,34.85 "/>
-<polygon fill="#FFFFFF" fill-opacity="0.05" points="50.047,39.947 33.828,39.947 34.701,41.176 50.047,41.176 " stroke-opacity="0.05"/>
-<polygon fill="#FFFFFF" fill-opacity="0.05" points="7.466,38.723 7.466,39.951 30.415,39.951 29.543,38.723 " stroke-opacity="0.05"/>
-<polygon fill="#FFFFFF" fill-opacity="0.05" points="50.047,39.234 33.322,39.234 34.701,41.176 50.047,41.176 " stroke-opacity="0.05"/>
-<polygon fill="#FFFFFF" fill-opacity="0.05" points="7.466,38.01 7.466,39.951 30.415,39.951 29.037,38.01 " stroke-opacity="0.05"/>
-<polygon fill="#FFFFFF" fill-opacity="0.05" points="50.047,38.521 32.816,38.521 34.701,41.176 50.047,41.176 " stroke-opacity="0.05"/>
-<polygon fill="#FFFFFF" fill-opacity="0.05" points="7.466,37.297 7.466,39.951 30.415,39.951 28.531,37.297 " stroke-opacity="0.05"/>
-<polygon fill="#FFFFFF" fill-opacity="0.05" points="50.047,37.811 32.311,37.811 34.701,41.176 50.047,41.176 " stroke-opacity="0.05"/>
-<polygon fill="#FFFFFF" fill-opacity="0.05" points="7.466,36.586 7.466,39.951 30.415,39.951 28.025,36.586 " stroke-opacity="0.05"/>
+<polygon fill="#FFFFFF" opacity="0.05" points="50.047,39.947 33.828,39.947 34.701,41.176 50.047,41.176 "/>
+<polygon fill="#FFFFFF" opacity="0.05" points="7.466,38.723 7.466,39.951 30.415,39.951 29.543,38.723 "/>
+<polygon fill="#FFFFFF" opacity="0.05" points="50.047,39.234 33.322,39.234 34.701,41.176 50.047,41.176 "/>
+<polygon fill="#FFFFFF" opacity="0.05" points="7.466,38.01 7.466,39.951 30.415,39.951 29.037,38.01 "/>
+<polygon fill="#FFFFFF" opacity="0.05" points="50.047,38.521 32.816,38.521 34.701,41.176 50.047,41.176 "/>
+<polygon fill="#FFFFFF" opacity="0.05" points="7.466,37.297 7.466,39.951 30.415,39.951 28.531,37.297 "/>
+<polygon fill="#FFFFFF" opacity="0.05" points="50.047,37.811 32.311,37.811 34.701,41.176 50.047,41.176 "/>
+<polygon fill="#FFFFFF" opacity="0.05" points="7.466,36.586 7.466,39.951 30.415,39.951 28.025,36.586 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="25.2661" x2="25.2661" y1="9.439" y2="48.3326">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#0071BB"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#0071BB"/>
</linearGradient>
<polygon fill="url(#SVGID_11_)" points="19.229,39.453 30.062,39.453 26.794,34.85 31.305,28.647 28.423,24.149 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="19.5298" x2="19.5298" y1="9.4395" y2="48.3322">
-<stop offset="0" style="stop-color:#146BAF"/>
-<stop offset="1" style="stop-color:#013B77"/>
+ <stop offset="0" style="stop-color:#146BAF"/>
+ <stop offset="1" style="stop-color:#013B77"/>
</linearGradient>
<polygon fill="url(#SVGID_12_)" points="8.999,39.453 30.062,39.453 22.98,34.85 28.856,32.014 21.617,19.762 "/>
<radialGradient cx="47.2637" cy="23.0933" gradientUnits="userSpaceOnUse" id="SVGID_13_" r="7.9973">
-<stop offset="0" style="stop-color:#3FA8F4"/>
-<stop offset="1" style="stop-color:#CDDBE1"/>
+ <stop offset="0" style="stop-color:#3FA8F4"/>
+ <stop offset="1" style="stop-color:#CDDBE1"/>
</radialGradient>
<circle cx="43.64" cy="19.906" fill="url(#SVGID_13_)" r="3.29"/>
-<polygon fill="#FFFFFF" fill-opacity="0.3" points="31.246,21.997 52.303,19.411 52.303,10.648 32.518,10.648 35.264,16.277 " stroke-opacity="0.3"/>
-<polygon fill="#FFFFFF" fill-opacity="0.3" points="5.042,23.459 26.961,20.772 30.979,15.053 28.232,9.424 5.042,9.424 " stroke-opacity="0.3"/>
+<polygon fill="#FFFFFF" opacity="0.3" points="31.246,21.997 52.303,19.411 52.303,10.648 32.518,10.648 35.264,16.277 "/>
+<polygon fill="#FFFFFF" opacity="0.3" points="5.042,23.459 26.961,20.772 30.979,15.053 28.232,9.424 5.042,9.424 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="20.458" x2="54.9136" y1="49.8662" y2="49.8662">
-<stop offset="0" style="stop-color:#C6C6C6"/>
-<stop offset="1" style="stop-color:#8C8C8C"/>
+ <stop offset="0" style="stop-color:#C6C6C6"/>
+ <stop offset="1" style="stop-color:#8C8C8C"/>
</linearGradient>
<polygon fill="url(#SVGID_14_)" points="54.957,49.154 31.426,49.154 30.553,50.578 54.957,50.578 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="15.2666" x2="52.9591" y1="48.6416" y2="48.6416">
-<stop offset="0" style="stop-color:#C6C6C6"/>
-<stop offset="1" style="stop-color:#8C8C8C"/>
+ <stop offset="0" style="stop-color:#C6C6C6"/>
+ <stop offset="1" style="stop-color:#8C8C8C"/>
</linearGradient>
<polygon fill="url(#SVGID_15_)" points="15.308,47.93 15.308,49.354 26.267,49.354 27.14,47.93 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="42.9424" x2="42.9424" y1="22.2153" y2="49.467">
-<stop offset="0" style="stop-color:#F5F5F5"/>
-<stop offset="0.8061" style="stop-color:#929497"/>
-<stop offset="1" style="stop-color:#D6D6D6"/>
+ <stop offset="0" style="stop-color:#F5F5F5"/>
+ <stop offset="0.8061" style="stop-color:#929497"/>
+ <stop offset="1" style="stop-color:#D6D6D6"/>
</linearGradient>
<polygon fill="url(#SVGID_16_)" points="54.957,22.215 31.092,22.215 30.928,22.45 35.979,29.337 31.08,36.074 35.57,42.4 31.303,49.354 54.957,49.354 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="23.5005" x2="23.5005" y1="21.022" y2="48.1933">
-<stop offset="0" style="stop-color:#F5F5F5"/>
-<stop offset="0.8061" style="stop-color:#929497"/>
-<stop offset="1" style="stop-color:#D6D6D6"/>
+ <stop offset="0" style="stop-color:#F5F5F5"/>
+ <stop offset="0.8061" style="stop-color:#929497"/>
+ <stop offset="1" style="stop-color:#D6D6D6"/>
</linearGradient>
<polygon fill="url(#SVGID_17_)" points="26.794,34.85 31.693,28.114 26.642,21.226 26.807,20.991 15.308,20.991 15.308,48.129 27.018,48.129 31.283,41.176 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="30.7891" x2="49.1836" y1="23.6563" y2="41.4616">
-<stop offset="0" style="stop-color:#F5F5F5"/>
-<stop offset="1" style="stop-color:#CCCCCC"/>
+ <stop offset="0" style="stop-color:#F5F5F5"/>
+ <stop offset="1" style="stop-color:#CCCCCC"/>
</linearGradient>
<polygon fill="url(#SVGID_18_)" points="36.59,29.337 31.691,36.074 36.182,42.4 32.291,48.74 54.346,48.74 54.346,22.828 31.816,22.828 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="23.4995" x2="23.4995" y1="21.7104" y2="47.4548">
-<stop offset="0" style="stop-color:#F5F5F5"/>
-<stop offset="1" style="stop-color:#CCCCCC"/>
+ <stop offset="0" style="stop-color:#F5F5F5"/>
+ <stop offset="1" style="stop-color:#CCCCCC"/>
</linearGradient>
<polygon fill="url(#SVGID_19_)" points="30.672,41.176 26.182,34.85 31.08,28.114 26.306,21.603 15.92,21.603 15.92,47.516 26.781,47.516 "/>
-<polygon fill-opacity="0.3" points="52.324,22.221 31.258,22.221 31.641,21.608 52.324,21.608 " stroke-opacity="0.3"/>
-<polygon fill-opacity="0.3" points="14.709,20.327 14.709,43.811 15.321,43.811 15.321,20.939 26.857,20.939 27.287,20.327 " stroke-opacity="0.3"/>
+<polygon opacity="0.3" points="52.324,22.221 31.258,22.221 31.641,21.608 52.324,21.608 "/>
+<polygon opacity="0.3" points="14.709,20.327 14.709,43.811 15.321,43.811 15.321,20.939 26.857,20.939 27.287,20.327 "/>
<rect fill="none" height="60" width="60"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_custom.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_custom.svg Fri May 14 16:09:54 2010 +0300
@@ -1,37 +1,71 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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">
+
<stop offset="0" stop-color="#FFE6DE"/>
+
<stop offset="1" stop-color="#DB7250"/>
+
</linearGradient>
+
<polygon fill="url(#SVGID_1)" points="30.74,19.22,42.88,25.07,30.74,30.93,24.88,43.07,19.03,30.93,6.883,25.07,19.03,19.22,24.88,7.074"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="24.88" x2="24.88" y1="10.64" y2="39.11">
+
<stop offset="0" stop-color="#FF7236"/>
+
<stop offset="0.79" stop-color="#D11414"/>
+
<stop offset="1" stop-color="#E8522A"/>
+
</linearGradient>
+
<polygon fill="url(#SVGID_2)" points="39.82,25.07,29.74,29.93,24.88,40.01,20.02,29.93,9.949,25.07,20.02,20.22,24.88,10.14,29.74,20.22"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="24.88" x2="24.88" y1="4.76" y2="45.29">
+
<stop offset="0" stop-color="#FF3030"/>
+
<stop offset="1" stop-color="#9C2D31"/>
+
</linearGradient>
+
<path d="M24.88,7.474l5.549,11.51,0.176,0.364,0.363,0.177,11.51,5.549-11.51,5.548-0.363,0.177-0.176,0.364-5.549,11.51-5.551-11.51-0.176-0.364-0.363-0.177-11.51-5.55,11.51-5.549,0.363-0.177,0.176-0.364,5.55-11.51m0-2.666l-6.59,13.67-13.68,6.59,13.68,6.591,6.592,13.68,6.592-13.68,13.67-6.591-13.67-6.59-6.6-13.67z" fill="url(#SVGID_3)"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="42.73" x2="42.73" y1="31.3" y2="53.78">
+
<stop offset="0" stop-color="#FFE6DE"/>
+
<stop offset="1" stop-color="#DB7250"/>
+
</linearGradient>
+
<polygon fill="url(#SVGID_4)" points="46.38,38.88,53.97,42.54,46.38,46.19,42.73,53.78,39.07,46.19,31.49,42.54,39.07,38.88,42.73,31.3"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="42.73" x2="42.73" y1="33.21" y2="51.86">
+
<stop offset="0" stop-color="#FF7236"/>
+
<stop offset="0.79" stop-color="#D11414"/>
+
<stop offset="1" stop-color="#E8522A"/>
+
</linearGradient>
+
<polygon fill="url(#SVGID_5)" points="52.06,42.54,45.76,45.57,42.73,51.86,39.7,45.57,33.4,42.54,39.7,39.5,42.73,33.21,45.76,39.5"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6" x1="42.73" x2="42.73" y1="29.85" y2="55.16">
+
<stop offset="0" stop-color="#FF3030"/>
+
<stop offset="1" stop-color="#9C2D31"/>
+
</linearGradient>
+
<path d="M42.73,31.54l3.465,7.188,0.109,0.227,0.229,0.11,7.188,3.466-7.2,3.46-0.229,0.11-0.109,0.227-3.465,7.187-3.465-7.187-0.109-0.227-0.22-0.11-7.188-3.465,7.188-3.466,0.229-0.11,0.109-0.227,3.46-7.19m0-1.66l-4.117,8.54-8.539,4.116,8.539,4.115,4.117,8.541,4.115-8.541,8.539-4.115-8.539-4.116-4.11-8.54z" fill="url(#SVGID_6)"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_data_import.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_data_import.svg Fri May 14 16:09:54 2010 +0300
@@ -1,198 +1,393 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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">
+
<stop offset="0" stop-color="#D1D7D9"/>
+
<stop offset="0.07" stop-color="#D1D7D9"/>
+
<stop offset="0.26" stop-color="#BDC2C4"/>
+
<stop offset="0.66" stop-color="#949DA1"/>
+
<stop offset="0.96" stop-color="#ADB3B5"/>
+
<stop offset="1" stop-color="#595C5E"/>
+
</linearGradient>
+
<path d="M31.22,42.85c0,1.354-1.097,2.449-2.449,2.449h-19.59c-1.353,0-2.449-1.096-2.449-2.449v-33.06c0-1.353,1.096-2.449,2.449-2.449h19.59c1.353,0,2.449,1.097,2.449,2.449v33.06z" fill="url(#SVGID_1)"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="18.98" x2="18.98" y1="7.35" y2="44.44">
+
<stop offset="0" stop-color="#D5D7DB"/>
+
<stop offset="0.67" stop-color="#85878A"/>
+
<stop offset="1" stop-color="#808184"/>
+
</linearGradient>
+
<path d="M28.77,7.346h-19.59c-1.353,0-2.449,1.097-2.449,2.449v33.06c0,0.654,0.26,1.244,0.677,1.684-0.038-0.147-0.065-0.299-0.065-0.459v-34.26c0-1.013,0.824-1.837,1.837-1.837h19.59c1.013,0,1.836,0.824,1.836,1.837v34.28c0,0.16-0.026,0.312-0.064,0.459,0.417-0.439,0.678-1.029,0.678-1.684v-33.06c-0.01-1.352-1.1-2.449-2.46-2.449z" fill="url(#SVGID_2)"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="18.98" x2="18.98" y1="10.44" y2="34.29">
+
<stop offset="0" stop-color="#878B8C"/>
+
<stop offset="1" stop-color="#B1BABD"/>
+
</linearGradient>
+
<rect fill="url(#SVGID_3)" fill-opacity="0.6" height="23.88" stroke-opacity="0.6" width="20.82" x="8.571" y="10.41"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="18.98" x2="18.98" y1="11.05" y2="33.67">
+
<stop offset="0" stop-color="#3D3D3D"/>
+
<stop offset="1" stop-color="#1A1A1A"/>
+
</linearGradient>
+
<rect fill="url(#SVGID_4)" height="22.65" width="19.59" x="9.183" y="11.02"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="18.98" x2="18.98" y1="11.66" y2="33.06">
+
<stop offset="0" stop-color="#3BC8EB"/>
+
<stop offset="0.39" stop-color="#2D9BD2"/>
+
<stop offset="0.89" stop-color="#1347BA"/>
+
<stop offset="1" stop-color="#1347BA"/>
+
</linearGradient>
+
<rect fill="url(#SVGID_5)" height="21.43" width="18.37" x="9.795" y="11.63"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6" x1="18.98" x2="18.98" y1="12.14" y2="20.78">
+
<stop offset="0" stop-color="#85EFFF"/>
+
<stop offset="1" stop-color="#3BA1D9"/>
+
</linearGradient>
+
<polygon fill="url(#SVGID_6)" points="28.16,18.98,9.795,21.43,9.795,12.24,28.16,12.24"/>
+
<rect fill="#9FE4FF" height="0.612" width="18.37" x="9.795" y="11.63"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7" x1="19.3" x2="19.3" y1="10.44" y2="7.99">
+
<stop offset="0" stop-color="#CFCFCF"/>
+
<stop offset="1" stop-color="#808385"/>
+
</linearGradient>
+
<path d="M17.11,10.41c-0.686,0-1.224-0.448-1.224-1.021v-0.41c0-0.572,0.538-1.021,1.224-1.021h4.37c0.686,0,1.224,0.448,1.224,1.021v0.408c0,0.573-0.538,1.021-1.224,1.021h-4.367z" fill="url(#SVGID_7)"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8" x1="19.3" x2="19.3" y1="8.32" y2="9.9">
+
<stop offset="0" stop-color="#343838"/>
+
<stop offset="1" stop-color="#7D8182"/>
+
</linearGradient>
+
<path d="M22.1,9.387c0,0.226-0.273,0.409-0.612,0.409h-4.37c-0.338,0-0.612-0.183-0.612-0.409v-0.408c0-0.226,0.274-0.408,0.612-0.408h4.37c0.338,0,0.612,0.183,0.612,0.408v0.408z" fill="url(#SVGID_8)"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9" x1="18.98" x2="18.98" y1="34.92" y2="43.41">
+
<stop offset="0" stop-color="#878B8C"/>
+
<stop offset="1" stop-color="#B1BABD"/>
+
</linearGradient>
+
<path d="M17.07,43.47c-1.312,0-2.379-1.057-2.379-2.355v-3.87c0-1.298,1.067-2.354,2.379-2.354h3.813c1.311,0,2.378,1.057,2.378,2.354v3.862c0,1.298-1.067,2.354-2.379,2.354h-3.808z" fill="url(#SVGID_9)" fill-opacity="0.6" stroke-opacity="0.6"/>
+
<path d="M17.07,42.85c-0.972,0-1.763-0.781-1.763-1.742v-3.86c0-0.961,0.791-1.742,1.763-1.742h3.82c0.972,0,1.763,0.781,1.763,1.742v3.862c0,0.96-0.791,1.741-1.763,1.741h-3.822z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10" x1="18.98" x2="18.98" y1="36.09" y2="42.25">
+
<stop offset="0" stop-color="#D1D7D9"/>
+
<stop offset="0.07" stop-color="#D1D7D9"/>
+
<stop offset="0.26" stop-color="#BDC2C4"/>
+
<stop offset="0.66" stop-color="#949DA1"/>
+
<stop offset="0.96" stop-color="#ADB3B5"/>
+
<stop offset="1" stop-color="#595C5E"/>
+
</linearGradient>
+
<path d="M22.04,41.11c0,0.625-0.514,1.131-1.146,1.131h-3.83c-0.633,0-1.146-0.506-1.146-1.131v-3.86c0-0.625,0.514-1.131,1.146-1.131h3.83c0.632,0,1.146,0.506,1.146,1.131v3.861z" fill="url(#SVGID_10)"/>
+
<path d="M18.37,41.02c-0.675,0-1.225-0.549-1.225-1.225v-1.225c0-0.676,0.549-1.225,1.225-1.225h1.224c0.675,0,1.225,0.549,1.225,1.225v1.225c0,0.676-0.549,1.225-1.225,1.225h-1.214z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11" x1="18.98" x2="18.98" y1="37.95" y2="40.41">
+
<stop offset="0" stop-color="#A6A8AB"/>
+
<stop offset="0.7" stop-color="#58595B"/>
+
<stop offset="1" stop-color="#808184"/>
+
</linearGradient>
+
<path d="M18.37,40.4c-0.337,0-0.612-0.275-0.612-0.612v-1.225c0-0.336,0.275-0.611,0.612-0.611h1.224c0.337,0,0.612,0.275,0.612,0.611v1.225c0,0.337-0.275,0.612-0.612,0.612h-1.224z" fill="url(#SVGID_11)"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12" x1="11.02" x2="11.02" y1="35.48" y2="42.25">
+
<stop offset="0" stop-color="#878B8C"/>
+
<stop offset="1" stop-color="#B1BABD"/>
+
</linearGradient>
+
<path d="M11.02,42.24c-1.35,0-2.449-1.057-2.449-2.355v-2.025c0-1.297,1.099-2.354,2.449-2.354s2.449,1.057,2.449,2.354v2.025c0,1.31-1.1,2.36-2.45,2.36z" fill="url(#SVGID_12)" fill-opacity="0.6" stroke-opacity="0.6"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13" x1="11.02" x2="11.02" y1="36.09" y2="41.64">
+
<stop offset="0" stop-color="#231F20"/>
+
<stop offset="1" stop-color="#6D6E70"/>
+
</linearGradient>
+
<path d="M11.02,41.63c-1,0-1.812-0.78-1.812-1.742v-2.025c0-0.961,0.813-1.742,1.812-1.742,1,0,1.812,0.781,1.812,1.743v2.025c0,0.97-0.81,1.75-1.81,1.75z" fill="url(#SVGID_13)" fill-opacity="0.7" stroke-opacity="0.7"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14" x1="11.02" x2="11.02" y1="36.71" y2="41.02">
+
<stop offset="0" stop-color="#C6FF45"/>
+
<stop offset="0.73" stop-color="#66A00E"/>
+
<stop offset="1" stop-color="#387300"/>
+
</linearGradient>
+
<path d="M12.2,39.89c0,0.625-0.526,1.131-1.175,1.131s-1.175-0.506-1.175-1.131v-2.025c0-0.623,0.526-1.129,1.175-1.129s1.175,0.506,1.175,1.13v2.027z" fill="url(#SVGID_14)"/>
+
<path d="M26.98,42.24c-1.374,0-2.493-1.057-2.493-2.355v-2.025c0-1.297,1.119-2.354,2.493-2.354h-0.089c1.375,0,2.494,1.057,2.494,2.354v2.025c0,1.298-1.119,2.354-2.493,2.354h0.091z" fill="url(#SVGID_12)" fill-opacity="0.6" stroke-opacity="0.6"/>
+
<path d="M26.98,41.63c-1.018,0-1.845-0.78-1.845-1.742v-2.025c0-0.961,0.828-1.742,1.845-1.742h-0.089c1.018,0,1.845,0.781,1.845,1.742v2.025c0,0.961-0.828,1.742-1.845,1.742h0.081z" fill="url(#SVGID_13)" fill-opacity="0.7" stroke-opacity="0.7"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17" x1="26.94" x2="26.94" y1="36.71" y2="41.02">
+
<stop offset="0" stop-color="#FFC142"/>
+
<stop offset="0.75" stop-color="#CF4E18"/>
+
<stop offset="1" stop-color="#B52100"/>
+
</linearGradient>
+
<path d="M28.09,39.89c0,0.625-0.536,1.131-1.196,1.131h0.089c-0.66,0-1.196-0.506-1.196-1.131v-2.025c0-0.624,0.536-1.13,1.196-1.13h-0.089c0.66,0,1.196,0.506,1.196,1.13v2.027z" fill="url(#SVGID_17)"/>
+
<rect fill="#020202" fill-opacity="0.2" height="37.96" stroke-opacity="0.2" width="1.225" x="21.43" y="7.346"/>
+
<rect fill="#020202" fill-opacity="0.1" height="37.96" stroke-opacity="0.1" width="2.449" x="22.04" y="7.346"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18" x1="37.04" x2="37.04" y1="7.35" y2="51.31">
+
<stop offset="0" stop-color="#D1D7D9"/>
+
<stop offset="0.07" stop-color="#D1D7D9"/>
+
<stop offset="0.26" stop-color="#BDC2C4"/>
+
<stop offset="0.66" stop-color="#949DA1"/>
+
<stop offset="0.96" stop-color="#ADB3B5"/>
+
<stop offset="1" stop-color="#595C5E"/>
+
</linearGradient>
+
<path d="M51.42,48.98c0,1.352-1.097,2.448-2.448,2.448h-23.87c-1.352,0-2.449-1.097-2.449-2.448v-39.18c0-1.353,1.097-2.449,2.449-2.449h23.88c1.352,0,2.448,1.097,2.448,2.449v39.18z" fill="url(#SVGID_18)"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19" x1="37.04" x2="37.04" y1="7.35" y2="50.55">
+
<stop offset="0" stop-color="#E4EBED"/>
+
<stop offset="0.07" stop-color="#E4EBED"/>
+
<stop offset="0.26" stop-color="#D6DCDE"/>
+
<stop offset="0.66" stop-color="#B2BEC2"/>
+
<stop offset="1" stop-color="#ADB3B5"/>
+
</linearGradient>
+
<path d="M48.98,7.346h-23.88c-1.352,0-2.449,1.097-2.449,2.449v39.18c0,0.652,0.26,1.242,0.677,1.683-0.038-0.147-0.065-0.3-0.065-0.459v-40.4c0-1.013,0.824-1.837,1.836-1.837h23.88c1.012,0,1.836,0.824,1.836,1.837v40.4c0,0.159-0.027,0.312-0.064,0.459,0.416-0.44,0.677-1.03,0.677-1.683v-39.18c-0.02-1.352-1.11-2.449-2.46-2.449z" fill="url(#SVGID_19)"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20" x1="37.04" x2="37.04" y1="10.45" y2="39.8">
+
<stop offset="0" stop-color="#B6BBBD"/>
+
<stop offset="1" stop-color="#F0FBFF"/>
+
</linearGradient>
+
<rect fill="url(#SVGID_20)" fill-opacity="0.6" height="29.39" stroke-opacity="0.6" width="25.1" x="24.49" y="10.41"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_21" x1="37.04" x2="37.04" y1="11.06" y2="39.18">
+
<stop offset="0" stop-color="#6E6E6E"/>
+
<stop offset="1" stop-color="#333333"/>
+
</linearGradient>
+
<rect fill="url(#SVGID_21)" height="28.16" width="23.88" x="25.1" y="11.02"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22" x1="37.04" x2="37.04" y1="11.67" y2="38.57">
+
<stop offset="0" stop-color="#3BC8EB"/>
+
<stop offset="0.39" stop-color="#2D9BD2"/>
+
<stop offset="0.89" stop-color="#1347BA"/>
+
<stop offset="1" stop-color="#1347BA"/>
+
</linearGradient>
+
<rect fill="url(#SVGID_22)" height="26.94" width="22.65" x="25.71" y="11.63"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_23" x1="37.04" x2="37.04" y1="12.12" y2="22.49">
+
<stop offset="0" stop-color="#85EFFF"/>
+
<stop offset="1" stop-color="#3BA1D9"/>
+
</linearGradient>
+
<polygon fill="url(#SVGID_23)" points="48.36,20.82,25.71,23.26,25.71,12.24,48.36,12.24"/>
+
<rect fill="#9FE4FF" height="0.612" width="22.65" x="25.71" y="11.63"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_24" x1="36.94" x2="36.94" y1="40.43" y2="49.53">
+
<stop offset="0" stop-color="#B6BBBD"/>
+
<stop offset="1" stop-color="#FFFFFF"/>
+
</linearGradient>
+
<path d="M34.73,49.59c-1.312,0-2.379-1.057-2.379-2.354v-4.48c0-1.299,1.067-2.355,2.379-2.355h4.426c1.313,0,2.379,1.057,2.379,2.355v4.475c0,1.297-1.066,2.354-2.379,2.354h-4.43z" fill="url(#SVGID_24)" fill-opacity="0.6" stroke-opacity="0.6"/>
+
<path d="M34.73,48.98c-0.972,0-1.763-0.781-1.763-1.742v-4.48c0-0.961,0.791-1.743,1.763-1.743h4.433c0.973,0,1.764,0.781,1.764,1.743v4.475c0,0.96-0.791,1.742-1.764,1.742h-4.432z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_25" x1="36.94" x2="36.94" y1="41.6" y2="48.37">
+
<stop offset="0" stop-color="#A6A8AB"/>
+
<stop offset="0.7" stop-color="#58595B"/>
+
<stop offset="1" stop-color="#808184"/>
+
</linearGradient>
+
<path d="M40.31,47.23c0,0.623-0.514,1.129-1.146,1.129h-4.442c-0.633,0-1.146-0.506-1.146-1.129v-4.47c0-0.625,0.514-1.131,1.146-1.131h4.442c0.632,0,1.146,0.506,1.146,1.131v4.474z" fill="url(#SVGID_25)"/>
+
<path d="M36.02,47.14c-0.676,0-1.225-0.549-1.225-1.225v-1.837c0-0.676,0.549-1.225,1.225-1.225h1.837c0.675,0,1.224,0.549,1.224,1.225v1.837c0,0.676-0.549,1.225-1.224,1.225h-1.835z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_26" x1="36.94" x2="36.94" y1="43.45" y2="46.53">
+
<stop offset="0" stop-color="#D1D7D9"/>
+
<stop offset="0.07" stop-color="#D1D7D9"/>
+
<stop offset="0.26" stop-color="#BDC2C4"/>
+
<stop offset="0.66" stop-color="#949DA1"/>
+
<stop offset="0.96" stop-color="#ADB3B5"/>
+
<stop offset="1" stop-color="#595C5E"/>
+
</linearGradient>
+
<path d="M36.02,46.53c-0.336,0-0.612-0.275-0.612-0.612v-1.837c0-0.336,0.276-0.611,0.612-0.611h1.837c0.337,0,0.612,0.275,0.612,0.611v1.837c0,0.337-0.275,0.612-0.612,0.612h-1.835z" fill="url(#SVGID_26)"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_27" x1="27.2" x2="27.2" y1="40.98" y2="48.38">
+
<stop offset="0" stop-color="#B6BBBD"/>
+
<stop offset="1" stop-color="#F0FBFF"/>
+
</linearGradient>
+
<path d="M26.84,48.36c-1.298,0-2.355-1.057-2.355-2.354v-2.639c0-1.297,1.057-2.354,2.355-2.354h0.706c1.298,0,2.354,1.057,2.354,2.354v2.638c0,1.297-1.057,2.354-2.354,2.354h-0.707z" fill="url(#SVGID_27)" fill-opacity="0.4" stroke-opacity="0.4"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_28" x1="27.2" x2="27.2" y1="41.6" y2="47.76">
+
<stop offset="0" stop-color="#231F20"/>
+
<stop offset="1" stop-color="#6D6E70"/>
+
</linearGradient>
+
<path d="M26.84,47.75c-0.961,0-1.743-0.781-1.743-1.742v-2.639c0-0.961,0.781-1.742,1.743-1.742h0.706c0.961,0,1.743,0.781,1.743,1.743v2.638c0,0.961-0.782,1.742-1.743,1.742h-0.707z" fill="url(#SVGID_28)" fill-opacity="0.7" stroke-opacity="0.7"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_29" x1="27.2" x2="27.2" y1="42.22" y2="47.15">
+
<stop offset="0" stop-color="#C6FF45"/>
+
<stop offset="0.73" stop-color="#66A00E"/>
+
<stop offset="1" stop-color="#387300"/>
+
</linearGradient>
+
<path d="M28.68,46.01c0,0.624-0.506,1.13-1.13,1.13h-0.706c-0.624,0-1.13-0.506-1.13-1.13v-2.639c0-0.623,0.506-1.129,1.13-1.129h0.706c0.624,0,1.13,0.506,1.13,1.13v2.64z" fill="url(#SVGID_29)"/>
+
<path d="M46,48.36c-1.299,0-2.355-1.057-2.355-2.354v-2.639c0-1.298,1.057-2.354,2.355-2.354h0.706c1.298,0,2.354,1.057,2.354,2.354v2.639c0,1.297-1.057,2.354-2.354,2.354h-0.71z" fill="url(#SVGID_27)" fill-opacity="0.4" stroke-opacity="0.4"/>
+
<path d="M46,47.75c-0.961,0-1.742-0.781-1.742-1.742v-2.639c0-0.961,0.78-1.742,1.742-1.742h0.706c0.96,0,1.742,0.781,1.742,1.742v2.639c0,0.96-0.781,1.742-1.742,1.742h-0.71z" fill="url(#SVGID_28)" fill-opacity="0.7" stroke-opacity="0.7"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_32" x1="46.35" x2="46.35" y1="42.22" y2="47.15">
+
<stop offset="0" stop-color="#FFC142"/>
+
<stop offset="0.75" stop-color="#CF4E18"/>
+
<stop offset="1" stop-color="#B52100"/>
+
</linearGradient>
+
<path d="M47.84,46.01c0,0.624-0.506,1.13-1.13,1.13h-0.71c-0.625,0-1.131-0.506-1.131-1.13v-2.639c0-0.624,0.506-1.13,1.131-1.13h0.706c0.624,0,1.13,0.506,1.13,1.13v2.64z" fill="url(#SVGID_32)"/>
+
<rect fill="none" height="60" width="60"/>
+
<polygon fill-opacity="0.1" points="24.28,35.94,16.11,35.94,16.11,26.48,24.28,26.48,24.28,20.36,35.76,31.51,24.28,41.94" stroke-opacity="0.1"/>
+
<polygon fill-opacity="0.2" points="24.89,35.32,16.72,35.32,16.73,27.09,24.89,27.09,24.89,21.8,34.88,31.51,24.9,40.5" stroke-opacity="0.2"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_33" x1="25.67" x2="25.67" y1="22.7" y2="38.5">
+
<stop offset="0" stop-color="#C6FF45"/>
+
<stop offset="0.73" stop-color="#66A00E"/>
+
<stop offset="1" stop-color="#387300"/>
+
</linearGradient>
+
<polygon fill="url(#SVGID_33)" points="25.51,39.07,34,30.89,25.5,22.64,25.5,27.09,17.34,27.09,17.34,34.71,25.5,34.71"/>
+
<polygon fill="#FFFFFF" points="34,30.89,25.5,22.64,25.5,23.25,33.68,31.2"/>
+
<polygon fill="#FFFFFF" points="17.34,27.7,25.5,27.7,25.5,27.09,17.34,27.09,17.34,34.71,17.34,34.71"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_default_server.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_default_server.svg Fri May 14 16:09:54 2010 +0300
@@ -1,176 +1,180 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
-<stop offset="0.3818" style="stop-color:#FFFFFF"/>
-<stop offset="0.7091" style="stop-color:#686E70"/>
-<stop offset="1" style="stop-color:#A6B0B3"/>
+ <stop offset="0" style="stop-color:#A8B1B3"/>
+ <stop offset="0.3818" style="stop-color:#FFFFFF"/>
+ <stop offset="0.7091" style="stop-color:#686E70"/>
+ <stop offset="1" style="stop-color:#A6B0B3"/>
</linearGradient>
<path d="M52.041,56.938c0,0.339-0.274,0.612-0.612,0.612H7.347c-0.338,0-0.612-0.273-0.612-0.612v-3.673 c0-0.339,0.274-0.612,0.612-0.612h44.082c0.338,0,0.612,0.273,0.612,0.612V56.938z" fill="url(#SVGID_1_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="10.4082" x2="49.5918" y1="22.6533" y2="22.6533">
-<stop offset="0" style="stop-color:#B4BDBF"/>
-<stop offset="0.2667" style="stop-color:#E5EBED"/>
-<stop offset="0.703" style="stop-color:#8D9699"/>
-<stop offset="1" style="stop-color:#B7BDBF"/>
+ <stop offset="0" style="stop-color:#B4BDBF"/>
+ <stop offset="0.2667" style="stop-color:#E5EBED"/>
+ <stop offset="0.703" style="stop-color:#8D9699"/>
+ <stop offset="1" style="stop-color:#B7BDBF"/>
</linearGradient>
<path d="M48.113,2.449H11.889c-0.815,0-1.48,0.668-1.48,1.485v38.923h39.184V3.935 C49.592,3.117,48.926,2.449,48.113,2.449z" fill="url(#SVGID_2_)"/>
<path d="M48.113,2.449c0.813,0,1.479,0.668,1.479,1.485v38.923H10.408V3.935c0-0.817,0.666-1.485,1.48-1.485H48.113 M48.113,3.626H11.889c-0.173,0-0.318,0.142-0.318,0.309v37.747H48.43V3.935C48.43,3.768,48.285,3.626,48.113,3.626L48.113,3.626z" fill="#FFFFFF"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="15.5947" y2="6.3742">
-<stop offset="0" style="stop-color:#808080"/>
-<stop offset="1" style="stop-color:#303030"/>
+ <stop offset="0" style="stop-color:#808080"/>
+ <stop offset="1" style="stop-color:#303030"/>
</linearGradient>
<rect fill="url(#SVGID_3_)" height="9.412" width="32.59" x="13.705" y="6.183"/>
-<rect fill="#FFFFFF" fill-opacity="0.25" height="1.177" stroke-opacity="0.25" width="32.59" x="13.705" y="15.595"/>
+<rect fill="#FFFFFF" height="1.177" opacity="0.25" width="32.59" x="13.705" y="15.595"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="30.0015" x2="30.0015" y1="7.4082" y2="14.3725">
-<stop offset="0" style="stop-color:#8B8B8B"/>
-<stop offset="1" style="stop-color:#454545"/>
+ <stop offset="0" style="stop-color:#8B8B8B"/>
+ <stop offset="1" style="stop-color:#454545"/>
</linearGradient>
<rect fill="url(#SVGID_4_)" height="7.058" width="30.263" x="14.87" y="7.359"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30.0005" x2="30.0005" y1="8.2974" y2="13.2402">
-<stop offset="0" style="stop-color:#525252"/>
-<stop offset="1" style="stop-color:#1C1C1C"/>
+ <stop offset="0" style="stop-color:#525252"/>
+ <stop offset="1" style="stop-color:#1C1C1C"/>
</linearGradient>
<rect fill="url(#SVGID_5_)" height="4.706" width="27.939" x="16.031" y="8.534"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="20.0767" x2="20.0767" y1="9.5928" y2="12.0647">
-<stop offset="0" style="stop-color:#17BFFF"/>
-<stop offset="1" style="stop-color:#0D5186"/>
+ <stop offset="0" style="stop-color:#17BFFF"/>
+ <stop offset="1" style="stop-color:#0D5186"/>
</linearGradient>
<rect fill="url(#SVGID_6_)" height="2.354" width="5.848" x="17.153" y="9.711"/>
-<rect fill="#FFFFFF" fill-opacity="0.25" height="1.176" stroke-opacity="0.25" width="5.848" x="17.153" y="9.711"/>
+<rect fill="#FFFFFF" height="1.176" opacity="0.25" width="5.848" x="17.153" y="9.711"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="30" x2="30" y1="28.0029" y2="18.7824">
-<stop offset="0" style="stop-color:#808080"/>
-<stop offset="1" style="stop-color:#303030"/>
+ <stop offset="0" style="stop-color:#808080"/>
+ <stop offset="1" style="stop-color:#303030"/>
</linearGradient>
<rect fill="url(#SVGID_7_)" height="9.412" width="32.59" x="13.705" y="18.591"/>
-<rect fill="#FFFFFF" fill-opacity="0.25" height="1.176" stroke-opacity="0.25" width="32.59" x="13.705" y="28.003"/>
+<rect fill="#FFFFFF" height="1.176" opacity="0.25" width="32.59" x="13.705" y="28.003"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="30.0015" x2="30.0015" y1="19.8154" y2="26.7816">
-<stop offset="0" style="stop-color:#8B8B8B"/>
-<stop offset="1" style="stop-color:#454545"/>
+ <stop offset="0" style="stop-color:#8B8B8B"/>
+ <stop offset="1" style="stop-color:#454545"/>
</linearGradient>
<rect fill="url(#SVGID_8_)" height="7.06" width="30.263" x="14.87" y="19.767"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="30.0005" x2="30.0005" y1="20.7056" y2="25.6484">
-<stop offset="0" style="stop-color:#525252"/>
-<stop offset="1" style="stop-color:#1C1C1C"/>
+ <stop offset="0" style="stop-color:#525252"/>
+ <stop offset="1" style="stop-color:#1C1C1C"/>
</linearGradient>
<rect fill="url(#SVGID_9_)" height="4.706" width="27.939" x="16.031" y="20.942"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="26.957" x2="31.9189" y1="50.5098" y2="50.5098">
-<stop offset="0" style="stop-color:#1A1A1A"/>
-<stop offset="0.3212" style="stop-color:#C7C7C7"/>
-<stop offset="0.6848" style="stop-color:#4D4D4D"/>
-<stop offset="0.8545" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#7A7A7A"/>
+ <stop offset="0" style="stop-color:#1A1A1A"/>
+ <stop offset="0.3212" style="stop-color:#C7C7C7"/>
+ <stop offset="0.6848" style="stop-color:#4D4D4D"/>
+ <stop offset="0.8545" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#7A7A7A"/>
</linearGradient>
<path d="M26.939,48.367v3.674c0,0.338,0.274,0.612,0.612,0.612h3.674c0.338,0,0.612-0.274,0.612-0.612 v-3.674H26.939z" fill="url(#SVGID_10_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="26.9565" x2="31.918" y1="48.6738" y2="48.6738">
-<stop offset="0" style="stop-color:#1A1A1A"/>
-<stop offset="0.3212" style="stop-color:#C7C7C7"/>
-<stop offset="0.6848" style="stop-color:#4D4D4D"/>
-<stop offset="0.8545" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#7A7A7A"/>
+ <stop offset="0" style="stop-color:#1A1A1A"/>
+ <stop offset="0.3212" style="stop-color:#C7C7C7"/>
+ <stop offset="0.6848" style="stop-color:#4D4D4D"/>
+ <stop offset="0.8545" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#7A7A7A"/>
</linearGradient>
<rect fill="url(#SVGID_11_)" height="0.612" width="4.897" x="26.938" y="48.367"/>
<g>
-<rect fill="none" height="60" width="60"/>
+ <rect fill="none" height="60" width="60"/>
</g>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="30.0005" x2="30.0005" y1="48.9316" y2="42.9805">
-<stop offset="0" style="stop-color:#808080"/>
-<stop offset="1" style="stop-color:#303030"/>
+ <stop offset="0" style="stop-color:#808080"/>
+ <stop offset="1" style="stop-color:#303030"/>
</linearGradient>
<rect fill="url(#SVGID_12_)" height="6.122" width="37.996" x="11.002" y="42.857"/>
-<rect fill-opacity="0.5" height="0.612" stroke-opacity="0.5" width="37.996" x="11.002" y="42.857"/>
-<rect fill-opacity="0.2" height="0.612" stroke-opacity="0.2" width="37.996" x="11.002" y="43.47"/>
+<rect height="0.612" opacity="0.5" width="37.996" x="11.002" y="42.857"/>
+<rect height="0.612" opacity="0.2" width="37.996" x="11.002" y="43.47"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="12.8589" x2="12.8589" y1="48.9404" y2="44.1797">
-<stop offset="0" style="stop-color:#999999"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+ <stop offset="0" style="stop-color:#999999"/>
+ <stop offset="1" style="stop-color:#4D4D4D"/>
</linearGradient>
<rect fill="url(#SVGID_13_)" height="4.897" width="2.476" x="11.621" y="44.082"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="17.8115" x2="17.8115" y1="48.9404" y2="44.1797">
-<stop offset="0" style="stop-color:#999999"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+ <stop offset="0" style="stop-color:#999999"/>
+ <stop offset="1" style="stop-color:#4D4D4D"/>
</linearGradient>
<rect fill="url(#SVGID_14_)" height="4.897" width="2.476" x="16.574" y="44.082"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="22.7642" x2="22.7642" y1="48.9404" y2="44.1797">
-<stop offset="0" style="stop-color:#999999"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+ <stop offset="0" style="stop-color:#999999"/>
+ <stop offset="1" style="stop-color:#4D4D4D"/>
</linearGradient>
<rect fill="url(#SVGID_15_)" height="4.897" width="2.476" x="21.526" y="44.082"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="27.7158" x2="27.7158" y1="48.9404" y2="44.1797">
-<stop offset="0" style="stop-color:#999999"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+ <stop offset="0" style="stop-color:#999999"/>
+ <stop offset="1" style="stop-color:#4D4D4D"/>
</linearGradient>
<rect fill="url(#SVGID_16_)" height="4.897" width="2.476" x="26.478" y="44.082"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="32.668" x2="32.668" y1="48.9404" y2="44.1797">
-<stop offset="0" style="stop-color:#999999"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+ <stop offset="0" style="stop-color:#999999"/>
+ <stop offset="1" style="stop-color:#4D4D4D"/>
</linearGradient>
<rect fill="url(#SVGID_17_)" height="4.897" width="2.477" x="31.43" y="44.082"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="37.6211" x2="37.6211" y1="48.9404" y2="44.1797">
-<stop offset="0" style="stop-color:#999999"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+ <stop offset="0" style="stop-color:#999999"/>
+ <stop offset="1" style="stop-color:#4D4D4D"/>
</linearGradient>
<rect fill="url(#SVGID_18_)" height="4.897" width="2.477" x="36.383" y="44.082"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="42.5723" x2="42.5723" y1="48.9404" y2="44.1797">
-<stop offset="0" style="stop-color:#999999"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+ <stop offset="0" style="stop-color:#999999"/>
+ <stop offset="1" style="stop-color:#4D4D4D"/>
</linearGradient>
<rect fill="url(#SVGID_19_)" height="4.897" width="2.477" x="41.334" y="44.082"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="47.5254" x2="47.5254" y1="48.9404" y2="44.1797">
-<stop offset="0" style="stop-color:#999999"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+ <stop offset="0" style="stop-color:#999999"/>
+ <stop offset="1" style="stop-color:#4D4D4D"/>
</linearGradient>
<rect fill="url(#SVGID_20_)" height="4.897" width="2.477" x="46.287" y="44.082"/>
-<rect fill-opacity="0.5" height="0.612" stroke-opacity="0.5" width="37.996" x="11.002" y="48.367"/>
-<rect fill="#CCCCCC" fill-opacity="0.5" height="0.612" stroke-opacity="0.5" width="37.996" x="11.002" y="47.755"/>
-<rect fill-opacity="0.3" height="0.612" stroke-opacity="0.3" width="4.897" x="26.938" y="48.979"/>
-<rect fill-opacity="0.1" height="0.612" stroke-opacity="0.1" width="4.897" x="26.938" y="49.592"/>
-<rect fill-opacity="0.3" height="4.897" stroke-opacity="0.3" width="0.612" x="18.979" y="52.653"/>
-<rect fill-opacity="0.3" height="4.897" stroke-opacity="0.3" width="0.612" x="39.184" y="52.653"/>
-<rect fill-opacity="0.1" height="4.897" stroke-opacity="0.1" width="0.612" x="18.367" y="52.653"/>
-<rect fill-opacity="0.1" height="4.897" stroke-opacity="0.1" width="0.612" x="39.796" y="52.653"/>
+<rect height="0.612" opacity="0.5" width="37.996" x="11.002" y="48.367"/>
+<rect fill="#CCCCCC" height="0.612" opacity="0.5" width="37.996" x="11.002" y="47.755"/>
+<rect height="0.612" opacity="0.3" width="4.897" x="26.938" y="48.979"/>
+<rect height="0.612" opacity="0.1" width="4.897" x="26.938" y="49.592"/>
+<rect height="4.897" opacity="0.3" width="0.612" x="18.979" y="52.653"/>
+<rect height="4.897" opacity="0.3" width="0.612" x="39.184" y="52.653"/>
+<rect height="4.897" opacity="0.1" width="0.612" x="18.367" y="52.653"/>
+<rect height="4.897" opacity="0.1" width="0.612" x="39.796" y="52.653"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="29.3872" x2="29.3872" y1="52.1279" y2="57.9301">
-<stop offset="0" style="stop-color:#1A1A1A"/>
-<stop offset="0.3212" style="stop-color:#C7C7C7"/>
-<stop offset="0.6848" style="stop-color:#4D4D4D"/>
-<stop offset="0.8545" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#7A7A7A"/>
+ <stop offset="0" style="stop-color:#1A1A1A"/>
+ <stop offset="0.3212" style="stop-color:#C7C7C7"/>
+ <stop offset="0.6848" style="stop-color:#4D4D4D"/>
+ <stop offset="0.8545" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#7A7A7A"/>
</linearGradient>
<rect fill="url(#SVGID_21_)" height="6.122" width="18.367" x="20.204" y="52.041"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="19.8979" x2="19.8979" y1="52.1279" y2="57.9301">
-<stop offset="0" style="stop-color:#1A1A1A"/>
-<stop offset="0.3212" style="stop-color:#C7C7C7"/>
-<stop offset="0.6848" style="stop-color:#4D4D4D"/>
-<stop offset="0.8545" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#7A7A7A"/>
+ <stop offset="0" style="stop-color:#1A1A1A"/>
+ <stop offset="0.3212" style="stop-color:#C7C7C7"/>
+ <stop offset="0.6848" style="stop-color:#4D4D4D"/>
+ <stop offset="0.8545" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#7A7A7A"/>
</linearGradient>
<path d="M19.592,52.653v4.897c0,0.339,0.274,0.612,0.612,0.612v-6.122 C19.866,52.041,19.592,52.314,19.592,52.653z" fill="url(#SVGID_22_)"/>
-<path d="M19.592,52.653v4.897c0,0.339,0.274,0.612,0.612,0.612v-6.122C19.866,52.041,19.592,52.314,19.592,52.653z" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M19.592,52.653v4.897c0,0.339,0.274,0.612,0.612,0.612v-6.122C19.866,52.041,19.592,52.314,19.592,52.653z" opacity="0.3"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_23_" x1="38.877" x2="38.877" y1="52.1279" y2="57.9301">
-<stop offset="0" style="stop-color:#1A1A1A"/>
-<stop offset="0.3212" style="stop-color:#C7C7C7"/>
-<stop offset="0.6848" style="stop-color:#4D4D4D"/>
-<stop offset="0.8545" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#7A7A7A"/>
+ <stop offset="0" style="stop-color:#1A1A1A"/>
+ <stop offset="0.3212" style="stop-color:#C7C7C7"/>
+ <stop offset="0.6848" style="stop-color:#4D4D4D"/>
+ <stop offset="0.8545" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#7A7A7A"/>
</linearGradient>
<path d="M38.571,52.041v6.122c0.339,0,0.612-0.273,0.612-0.612v-4.897 C39.184,52.314,38.91,52.041,38.571,52.041z" fill="url(#SVGID_23_)"/>
-<path d="M38.571,52.041v6.122c0.339,0,0.612-0.273,0.612-0.612v-4.897C39.184,52.314,38.91,52.041,38.571,52.041z" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M38.571,52.041v6.122c0.339,0,0.612-0.273,0.612-0.612v-4.897C39.184,52.314,38.91,52.041,38.571,52.041z" opacity="0.3"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
-<polygon fill-opacity="0.35" points="0.175,15.934 5.351,10.756 11.164,16.568 24.647,3.086 29.824,8.264 11.154,26.914 " stroke-opacity="0.35"/>
+<polygon opacity="0.35" points="0.175,15.934 5.351,10.756 11.164,16.568 24.647,3.086 29.824,8.264 11.154,26.914 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="15" x2="15" y1="3.0845" y2="22.1505">
-<stop offset="0" style="stop-color:#E3FFA3"/>
-<stop offset="0.7758" style="stop-color:#73B542"/>
-<stop offset="1" style="stop-color:#AFDD76"/>
+ <stop offset="0" style="stop-color:#E3FFA3"/>
+ <stop offset="0.7758" style="stop-color:#73B542"/>
+ <stop offset="1" style="stop-color:#AFDD76"/>
</linearGradient>
<polygon fill="url(#SVGID_1__)" points="28.41,8.264 24.647,4.5 11.164,17.982 5.351,12.17 1.589,15.934 11.154,25.5 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="14.999" x2="14.999" y1="4.6216" y2="21.2281">
-<stop offset="0" style="stop-color:#AFED23"/>
-<stop offset="0.8121" style="stop-color:#358C0C"/>
-<stop offset="1" style="stop-color:#67AD1A"/>
+ <stop offset="0" style="stop-color:#AFED23"/>
+ <stop offset="0.8121" style="stop-color:#358C0C"/>
+ <stop offset="1" style="stop-color:#67AD1A"/>
</linearGradient>
<polygon fill="url(#SVGID_2__)" points="2.943,15.934 5.351,13.524 11.164,19.337 24.647,5.854 27.055,8.263 11.154,24.146 "/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_device_lock.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_device_lock.svg Fri May 14 16:09:54 2010 +0300
@@ -1,110 +1,108 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2.001" y2="57.8555">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+ <stop offset="0.0667" style="stop-color:#D1D7D9"/>
+ <stop offset="0.2606" style="stop-color:#BDC2C4"/>
+ <stop offset="0.6606" style="stop-color:#949DA1"/>
+ <stop offset="0.9636" style="stop-color:#ADB3B5"/>
+ <stop offset="1" style="stop-color:#595C5E"/>
</linearGradient>
<path d="M48.027,54.932c0,1.693-1.375,3.069-3.068,3.069h-29.92c-1.693,0-3.066-1.376-3.066-3.069V5.07 c0-1.696,1.373-3.069,3.066-3.069h29.92c1.693,0,3.068,1.373,3.068,3.069V54.932z" fill="url(#SVGID_1_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="2.001" y2="56.899">
-<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"/>
+ <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="M44.959,2.001h-29.92c-1.693,0-3.066,1.373-3.066,3.069v49.861c0,0.82,0.324,1.56,0.848,2.11 c-0.047-0.187-0.08-0.377-0.08-0.575v-1.535V6.602V5.07c0-1.271,1.031-2.304,2.299-2.304h29.92c1.268,0,2.301,1.033,2.301,2.304 v1.531v48.33v1.535c0,0.198-0.033,0.389-0.08,0.575c0.521-0.551,0.848-1.29,0.848-2.11V5.07C48.027,3.374,46.652,2.001,44.959,2.001 z" fill="url(#SVGID_2_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="5.8916" y2="43.4283">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+ <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="37.589" stroke-opacity="0.6" width="31.453" x="14.273" y="5.836"/>
+<rect fill="url(#SVGID_3_)" height="37.589" opacity="0.6" width="31.453" x="14.273" y="5.836"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="29.999" x2="29.999" y1="6.6548" y2="42.6624">
-<stop offset="0" style="stop-color:#6E6E6E"/>
-<stop offset="1" style="stop-color:#333333"/>
+ <stop offset="0" style="stop-color:#6E6E6E"/>
+ <stop offset="1" style="stop-color:#333333"/>
</linearGradient>
<rect fill="url(#SVGID_4_)" height="36.058" width="29.92" x="15.039" y="6.602"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30" x2="30" y1="7.4214" y2="41.894">
-<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"/>
+ <stop offset="0" style="stop-color:#3BC8EB"/>
+ <stop offset="0.3879" style="stop-color:#2D9BD2"/>
+ <stop offset="0.8909" style="stop-color:#1347BA"/>
</linearGradient>
<rect fill="url(#SVGID_5_)" height="34.521" width="28.383" x="15.809" y="7.37"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="30" x2="30" y1="7.9712" y2="21.69">
-<stop offset="0" style="stop-color:#85EFFF"/>
-<stop offset="1" style="stop-color:#3BA1D9"/>
+ <stop offset="0" style="stop-color:#85EFFF"/>
+ <stop offset="1" style="stop-color:#3BA1D9"/>
</linearGradient>
<polygon fill="url(#SVGID_6_)" points="44.191,19.644 15.809,22.712 15.809,8.137 44.191,8.137 "/>
<rect fill="#9FE4FF" height="0.767" width="28.383" x="15.809" y="7.37"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="30.2236" x2="30.2236" y1="5.8726" y2="2.8032">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#D1D7D9"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#D1D7D9"/>
</linearGradient>
<path d="M26.832,5.836c-0.861,0-1.535-0.563-1.535-1.279v-0.51c0-0.718,0.674-1.28,1.535-1.28h6.785 c0.859,0,1.533,0.563,1.533,1.28v0.51c0,0.716-0.674,1.279-1.533,1.279H26.832z" fill="url(#SVGID_7_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="30.2236" x2="30.2236" y1="3.2158" y2="5.1992">
-<stop offset="0" style="stop-color:#6C7375"/>
-<stop offset="1" style="stop-color:#BDC2C4"/>
+ <stop offset="0" style="stop-color:#6C7375"/>
+ <stop offset="1" style="stop-color:#BDC2C4"/>
</linearGradient>
<path d="M34.383,4.557c0,0.283-0.342,0.514-0.766,0.514h-6.785c-0.424,0-0.768-0.23-0.768-0.514v-0.51 c0-0.283,0.344-0.512,0.768-0.512h6.785c0.424,0,0.766,0.229,0.766,0.512V4.557z" fill="url(#SVGID_8_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="29.8818" x2="29.8818" y1="44.2236" y2="55.628">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#FFFFFF"/>
+ <stop offset="0" style="stop-color:#B6BBBD"/>
+ <stop offset="1" style="stop-color:#FFFFFF"/>
</linearGradient>
-<path d="M27.109,55.7c-1.645,0-2.98-1.323-2.98-2.951v-5.606c0-1.627,1.336-2.951,2.98-2.951 h5.545c1.645,0,2.98,1.324,2.98,2.951v5.606c0,1.628-1.336,2.951-2.98,2.951H27.109z" fill="url(#SVGID_9_)" fill-opacity="0.6" stroke-opacity="0.6"/>
-<path d="M27.105,54.932c-1.219,0-2.211-0.979-2.211-2.183v-5.606c0-1.204,0.992-2.183,2.211-2.183 h5.553c1.219,0,2.209,0.979,2.209,2.183v5.606c0,1.204-0.99,2.183-2.209,2.183H27.105z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M27.109,55.7c-1.645,0-2.98-1.323-2.98-2.951v-5.606c0-1.627,1.336-2.951,2.98-2.951 h5.545c1.645,0,2.98,1.324,2.98,2.951v5.606c0,1.628-1.336,2.951-2.98,2.951H27.109z" fill="url(#SVGID_9_)" opacity="0.6"/>
+<path d="M27.105,54.932c-1.219,0-2.211-0.979-2.211-2.183v-5.606c0-1.204,0.992-2.183,2.211-2.183 h5.553c1.219,0,2.209,0.979,2.209,2.183v5.606c0,1.204-0.99,2.183-2.209,2.183H27.105z" fill="#020202" opacity="0.5"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="29.8818" x2="29.8818" y1="45.6865" y2="54.1806">
-<stop offset="0" style="stop-color:#A6A8AB"/>
-<stop offset="0.703" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#808184"/>
+ <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="M34.102,52.749c0,0.783-0.645,1.417-1.438,1.417h-5.566c-0.793,0-1.436-0.634-1.436-1.417v-5.606 c0-0.783,0.643-1.417,1.436-1.417h5.566c0.793,0,1.438,0.634,1.438,1.417V52.749z" fill="url(#SVGID_10_)"/>
-<path d="M28.73,52.632c-0.846,0-1.533-0.688-1.533-1.534v-2.303c0-0.847,0.688-1.534,1.533-1.534 h2.303c0.846,0,1.533,0.688,1.533,1.534v2.303c0,0.847-0.688,1.534-1.533,1.534H28.73z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M28.73,52.632c-0.846,0-1.533-0.688-1.533-1.534v-2.303c0-0.847,0.688-1.534,1.533-1.534 h2.303c0.846,0,1.533,0.688,1.533,1.534v2.303c0,0.847-0.688,1.534-1.533,1.534H28.73z" fill="#020202" opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="29.8809" x2="29.8809" y1="48.0103" y2="51.8696">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+ <stop offset="0.0667" style="stop-color:#D1D7D9"/>
+ <stop offset="0.2606" style="stop-color:#BDC2C4"/>
+ <stop offset="0.6606" style="stop-color:#949DA1"/>
+ <stop offset="0.9636" style="stop-color:#ADB3B5"/>
+ <stop offset="1" style="stop-color:#595C5E"/>
</linearGradient>
<path d="M28.73,51.863c-0.422,0-0.768-0.345-0.768-0.766v-2.303c0-0.422,0.346-0.767,0.768-0.767h2.303 c0.42,0,0.766,0.345,0.766,0.767v2.303c0,0.421-0.346,0.766-0.766,0.766H28.73z" fill="url(#SVGID_11_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="17.667" x2="17.667" y1="44.917" y2="54.1816">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+ <stop offset="0" style="stop-color:#B6BBBD"/>
+ <stop offset="1" style="stop-color:#F0FBFF"/>
</linearGradient>
-<path d="M17.223,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307 c0-1.624,1.324-2.948,2.949-2.948h0.887c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H17.223z" fill="url(#SVGID_12_)" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M17.223,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307 c0-1.624,1.324-2.948,2.949-2.948h0.887c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H17.223z" fill="url(#SVGID_12_)" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="17.665" x2="17.665" y1="45.6899" y2="53.4106">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+ <stop offset="0" style="stop-color:#231F20"/>
+ <stop offset="1" style="stop-color:#6D6E70"/>
</linearGradient>
-<path d="M17.223,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307 c0-1.201,0.98-2.183,2.184-2.183h0.887c1.205,0,2.182,0.981,2.182,2.183v3.307c0,1.204-0.977,2.183-2.182,2.183H17.223z" fill="url(#SVGID_13_)" fill-opacity="0.7" stroke-opacity="0.7"/>
+<path d="M17.223,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307 c0-1.201,0.98-2.183,2.184-2.183h0.887c1.205,0,2.182,0.981,2.182,2.183v3.307c0,1.204-0.977,2.183-2.182,2.183H17.223z" fill="url(#SVGID_13_)" opacity="0.7"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="17.667" x2="17.667" y1="46.4658" y2="52.6426">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+ <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="M19.525,51.215c0,0.783-0.635,1.417-1.416,1.417h-0.887c-0.779,0-1.414-0.634-1.414-1.417v-3.307 c0-0.78,0.635-1.414,1.414-1.414h0.887c0.781,0,1.416,0.634,1.416,1.414V51.215z" fill="url(#SVGID_14_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="41.6719" x2="41.6719" y1="44.917" y2="54.1816">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+ <stop offset="0" style="stop-color:#B6BBBD"/>
+ <stop offset="1" style="stop-color:#F0FBFF"/>
</linearGradient>
-<path d="M41.229,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307 c0-1.624,1.324-2.948,2.949-2.948h0.885c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H41.229z" fill="url(#SVGID_15_)" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M41.229,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307 c0-1.624,1.324-2.948,2.949-2.948h0.885c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H41.229z" fill="url(#SVGID_15_)" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="41.6709" x2="41.6709" y1="45.6899" y2="53.4106">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+ <stop offset="0" style="stop-color:#231F20"/>
+ <stop offset="1" style="stop-color:#6D6E70"/>
</linearGradient>
-<path d="M41.229,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307 c0-1.201,0.98-2.183,2.184-2.183h0.885c1.205,0,2.184,0.981,2.184,2.183v3.307c0,1.204-0.979,2.183-2.184,2.183H41.229z" fill="url(#SVGID_16_)" fill-opacity="0.7" stroke-opacity="0.7"/>
+<path d="M41.229,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307 c0-1.201,0.98-2.183,2.184-2.183h0.885c1.205,0,2.184,0.981,2.184,2.183v3.307c0,1.204-0.979,2.183-2.184,2.183H41.229z" fill="url(#SVGID_16_)" opacity="0.7"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="41.6719" x2="41.6719" y1="46.4658" y2="52.6426">
-<stop offset="0" style="stop-color:#FFC142"/>
-<stop offset="0.7455" style="stop-color:#CF4E18"/>
-<stop offset="1" style="stop-color:#B52100"/>
+ <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="M43.531,51.215c0,0.783-0.637,1.417-1.418,1.417h-0.885c-0.781,0-1.416-0.634-1.416-1.417v-3.307 c0-0.78,0.635-1.414,1.416-1.414h0.885c0.781,0,1.418,0.634,1.418,1.414V51.215z" fill="url(#SVGID_17_)"/>
<rect fill="none" height="60" width="60"/>
@@ -112,42 +110,42 @@
<g transform="matrix(1 0 0 1 30 30)">
<polygon fill="none" points="0,0 0,30 4.358,30 25.643,30 30,30 30,0 "/>
<g>
-<rect fill="none" height="30" width="30"/>
+ <rect fill="none" height="30" width="30"/>
</g>
-<path d="M4.358,30c-0.942,0-1.709-0.768-1.709-1.71V13.747 c0-0.943,0.767-1.711,1.709-1.711h0.663V9.979C5.099,4.471,9.63,0,15.122,0c5.491,0,10.022,4.471,10.101,9.966v2.07h0.42 c0.941,0,1.709,0.768,1.709,1.711V28.29c0,0.942-0.768,1.71-1.709,1.71H4.358z M20.145,12.036V9.979 c-0.058-2.692-2.312-4.9-5.021-4.9s-4.965,2.208-5.021,4.922v2.035H20.145z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M4.358,30c-0.942,0-1.709-0.768-1.709-1.71V13.747 c0-0.943,0.767-1.711,1.709-1.711h0.663V9.979C5.099,4.471,9.63,0,15.122,0c5.491,0,10.022,4.471,10.101,9.966v2.07h0.42 c0.941,0,1.709,0.768,1.709,1.711V28.29c0,0.942-0.768,1.71-1.709,1.71H4.358z M20.145,12.036V9.979 c-0.058-2.692-2.312-4.9-5.021-4.9s-4.965,2.208-5.021,4.922v2.035H20.145z" enable-background="new " opacity="0.35"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -361.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="273.6377" x2="291.5699" y1="-368.7476" y2="-368.7476">
-<stop offset="0" style="stop-color:#8C8C8C"/>
-<stop offset="0.5333" style="stop-color:#B3B3B3"/>
-<stop offset="1" style="stop-color:#808080"/>
+ <stop offset="0" style="stop-color:#8C8C8C"/>
+ <stop offset="0.5333" style="stop-color:#B3B3B3"/>
+ <stop offset="1" style="stop-color:#808080"/>
</linearGradient>
<path d="M15.122,1c-4.984,0-9.03,4.009-9.101,8.979v3.338H9.1V9.979c0.069-3.266,2.74-5.9,6.021-5.9 s5.951,2.635,6.021,5.9v4.477h3.078V9.979C24.152,5.009,20.107,1,15.122,1z" fill="url(#SVGID_1__)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -361.0195)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="274.1973" x2="291.0081" y1="-369.0322" y2="-369.0322">
-<stop offset="0" style="stop-color:#CCCCCC"/>
-<stop offset="0.5152" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#CCCCCC"/>
+ <stop offset="0" style="stop-color:#CCCCCC"/>
+ <stop offset="0.5152" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#CCCCCC"/>
</linearGradient>
<path d="M21.714,13.888V9.979c-0.077-3.574-3.032-6.469-6.592-6.469c-3.559,0-6.514,2.895-6.592,6.458v4.488 H6.591V9.979c0.065-4.636,3.893-8.41,8.531-8.41c4.64,0,8.465,3.774,8.53,8.418v3.9L21.714,13.888L21.714,13.888z" fill="url(#SVGID_2__)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -361.0195)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="274.5469" x2="290.6592" y1="-369.0322" y2="-369.0322">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.5" style="stop-color:#B3B3B3"/>
-<stop offset="1" style="stop-color:#FFFFFF"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="0.5" style="stop-color:#B3B3B3"/>
+ <stop offset="1" style="stop-color:#FFFFFF"/>
</linearGradient>
<path d="M6.945,14.102V9.979c0.063-4.44,3.731-8.055,8.177-8.055S23.234,5.542,23.3,9.99v3.541h-1.231V9.979 c-0.08-3.767-3.196-6.824-6.945-6.824c-3.75,0-6.865,3.053-6.946,6.805v4.142H6.945z" fill="url(#SVGID_3__)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -361.0195)" gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="271.1289" x2="293.832" y1="-382.0376" y2="-382.0376">
-<stop offset="0" style="stop-color:#ED8C0D"/>
-<stop offset="0.24" style="stop-color:#FFE692"/>
-<stop offset="0.75" style="stop-color:#ED8C0D"/>
-<stop offset="0.8667" style="stop-color:#FFB81F"/>
-<stop offset="1" style="stop-color:#ED8C0D"/>
+ <stop offset="0" style="stop-color:#ED8C0D"/>
+ <stop offset="0.24" style="stop-color:#FFE692"/>
+ <stop offset="0.75" style="stop-color:#ED8C0D"/>
+ <stop offset="0.8667" style="stop-color:#FFB81F"/>
+ <stop offset="1" style="stop-color:#ED8C0D"/>
</linearGradient>
<path d="M26.352,28.29c0,0.392-0.317,0.71-0.709,0.71H4.358c-0.392,0-0.709-0.318-0.709-0.71V13.747 c0-0.392,0.317-0.711,0.709-0.711h21.283c0.393,0,0.709,0.319,0.709,0.711V28.29H26.352z" fill="url(#SVGID_4__)"/>
-<path d="M25.643,13.036H4.358c-0.392,0-0.709,0.319-0.709,0.711v0.709 c0-0.392,0.317-0.709,0.709-0.709h21.283c0.393,0,0.709,0.317,0.709,0.709v-0.709C26.352,13.355,26.033,13.036,25.643,13.036z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M25.643,29H4.358c-0.392,0-0.709-0.318-0.709-0.71v-0.709 c0,0.392,0.317,0.709,0.709,0.709h21.283c0.393,0,0.709-0.317,0.709-0.709v0.709C26.352,28.682,26.033,29,25.643,29z" fill-opacity="0.25" stroke-opacity="0.25"/>
-<path d="M15,25.82c-0.689,0-1.25-0.562-1.25-1.25v-1.838 c-0.769-0.441-1.25-1.256-1.25-2.162c0-1.379,1.122-2.5,2.5-2.5c1.379,0,2.5,1.121,2.5,2.5c0,0.904-0.48,1.721-1.25,2.162v1.838 C16.25,25.26,15.689,25.82,15,25.82L15,25.82z" fill="#FFE591" fill-opacity="0.25" stroke-opacity="0.25"/>
+<path d="M25.643,13.036H4.358c-0.392,0-0.709,0.319-0.709,0.711v0.709 c0-0.392,0.317-0.709,0.709-0.709h21.283c0.393,0,0.709,0.317,0.709,0.709v-0.709C26.352,13.355,26.033,13.036,25.643,13.036z" enable-background="new " fill="#FFFFFF" opacity="0.4"/>
+<path d="M25.643,29H4.358c-0.392,0-0.709-0.318-0.709-0.71v-0.709 c0,0.392,0.317,0.709,0.709,0.709h21.283c0.393,0,0.709-0.317,0.709-0.709v0.709C26.352,28.682,26.033,29,25.643,29z" enable-background="new " opacity="0.25"/>
+<path d="M15,25.82c-0.689,0-1.25-0.562-1.25-1.25v-1.838 c-0.769-0.441-1.25-1.256-1.25-2.162c0-1.379,1.122-2.5,2.5-2.5c1.379,0,2.5,1.121,2.5,2.5c0,0.904-0.48,1.721-1.25,2.162v1.838 C16.25,25.26,15.689,25.82,15,25.82L15,25.82z" enable-background="new " fill="#FFE591" opacity="0.25"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -361.0195)" gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="282.4805" x2="282.4805" y1="-386.0986" y2="-379.7186">
-<stop offset="0" style="stop-color:#A67C52"/>
-<stop offset="1" style="stop-color:#603813"/>
+ <stop offset="0" style="stop-color:#A67C52"/>
+ <stop offset="1" style="stop-color:#603813"/>
</linearGradient>
<path d="M17,20.57c0-1.104-0.896-2-2-2c-1.104,0-2,0.896-2,2c0,0.839,0.518,1.555,1.25,1.852v2.148 c0,0.414,0.336,0.75,0.75,0.75s0.75-0.336,0.75-0.75v-2.148C16.482,22.125,17,21.409,17,20.57z" fill="url(#SVGID_5__)"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_device_update.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_device_update.svg Fri May 14 16:09:54 2010 +0300
@@ -1,121 +1,121 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2.001" y2="57.8555">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+ <stop offset="0.0667" style="stop-color:#D1D7D9"/>
+ <stop offset="0.2606" style="stop-color:#BDC2C4"/>
+ <stop offset="0.6606" style="stop-color:#949DA1"/>
+ <stop offset="0.9636" style="stop-color:#ADB3B5"/>
+ <stop offset="1" style="stop-color:#595C5E"/>
</linearGradient>
<path d="M48.027,54.932c0,1.693-1.375,3.069-3.068,3.069h-29.92c-1.693,0-3.066-1.376-3.066-3.069V5.07 c0-1.696,1.373-3.069,3.066-3.069h29.92c1.693,0,3.068,1.373,3.068,3.069V54.932z" fill="url(#SVGID_1_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="2.001" y2="56.899">
-<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"/>
+ <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="M44.959,2.001h-29.92c-1.693,0-3.066,1.373-3.066,3.069v49.861c0,0.82,0.324,1.56,0.848,2.11 c-0.047-0.187-0.08-0.377-0.08-0.575v-1.535V6.602V5.07c0-1.271,1.031-2.304,2.299-2.304h29.92c1.268,0,2.301,1.033,2.301,2.304 v1.531v48.33v1.535c0,0.198-0.033,0.389-0.08,0.575c0.521-0.551,0.848-1.29,0.848-2.11V5.07C48.027,3.374,46.652,2.001,44.959,2.001 z" fill="url(#SVGID_2_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="5.8916" y2="43.4283">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+ <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="37.589" stroke-opacity="0.6" width="31.453" x="14.273" y="5.836"/>
+<rect fill="url(#SVGID_3_)" height="37.589" opacity="0.6" width="31.453" x="14.273" y="5.836"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="29.999" x2="29.999" y1="6.6548" y2="42.6624">
-<stop offset="0" style="stop-color:#6E6E6E"/>
-<stop offset="1" style="stop-color:#333333"/>
+ <stop offset="0" style="stop-color:#6E6E6E"/>
+ <stop offset="1" style="stop-color:#333333"/>
</linearGradient>
<rect fill="url(#SVGID_4_)" height="36.058" width="29.92" x="15.039" y="6.602"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30" x2="30" y1="7.4214" y2="41.894">
-<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"/>
+ <stop offset="0" style="stop-color:#3BC8EB"/>
+ <stop offset="0.3879" style="stop-color:#2D9BD2"/>
+ <stop offset="0.8909" style="stop-color:#1347BA"/>
</linearGradient>
<rect fill="url(#SVGID_5_)" height="34.521" width="28.383" x="15.809" y="7.37"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="30" x2="30" y1="7.9712" y2="21.69">
-<stop offset="0" style="stop-color:#85EFFF"/>
-<stop offset="1" style="stop-color:#3BA1D9"/>
+ <stop offset="0" style="stop-color:#85EFFF"/>
+ <stop offset="1" style="stop-color:#3BA1D9"/>
</linearGradient>
<polygon fill="url(#SVGID_6_)" points="44.191,19.644 15.809,22.712 15.809,8.137 44.191,8.137 "/>
<rect fill="#9FE4FF" height="0.767" width="28.383" x="15.809" y="7.37"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="30.2236" x2="30.2236" y1="5.8726" y2="2.8032">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#D1D7D9"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#D1D7D9"/>
</linearGradient>
<path d="M26.832,5.836c-0.861,0-1.535-0.563-1.535-1.279v-0.51c0-0.718,0.674-1.28,1.535-1.28h6.785 c0.859,0,1.533,0.563,1.533,1.28v0.51c0,0.716-0.674,1.279-1.533,1.279H26.832z" fill="url(#SVGID_7_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="30.2236" x2="30.2236" y1="3.2158" y2="5.1992">
-<stop offset="0" style="stop-color:#6C7375"/>
-<stop offset="1" style="stop-color:#BDC2C4"/>
+ <stop offset="0" style="stop-color:#6C7375"/>
+ <stop offset="1" style="stop-color:#BDC2C4"/>
</linearGradient>
<path d="M34.383,4.557c0,0.283-0.342,0.514-0.766,0.514h-6.785c-0.424,0-0.768-0.23-0.768-0.514v-0.51 c0-0.283,0.344-0.512,0.768-0.512h6.785c0.424,0,0.766,0.229,0.766,0.512V4.557z" fill="url(#SVGID_8_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="29.8818" x2="29.8818" y1="44.2236" y2="55.628">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#FFFFFF"/>
+ <stop offset="0" style="stop-color:#B6BBBD"/>
+ <stop offset="1" style="stop-color:#FFFFFF"/>
</linearGradient>
-<path d="M27.109,55.7c-1.645,0-2.98-1.323-2.98-2.951v-5.606c0-1.627,1.336-2.951,2.98-2.951 h5.545c1.645,0,2.98,1.324,2.98,2.951v5.606c0,1.628-1.336,2.951-2.98,2.951H27.109z" fill="url(#SVGID_9_)" fill-opacity="0.6" stroke-opacity="0.6"/>
-<path d="M27.105,54.932c-1.219,0-2.211-0.979-2.211-2.183v-5.606c0-1.204,0.992-2.183,2.211-2.183 h5.553c1.219,0,2.209,0.979,2.209,2.183v5.606c0,1.204-0.99,2.183-2.209,2.183H27.105z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M27.109,55.7c-1.645,0-2.98-1.323-2.98-2.951v-5.606c0-1.627,1.336-2.951,2.98-2.951 h5.545c1.645,0,2.98,1.324,2.98,2.951v5.606c0,1.628-1.336,2.951-2.98,2.951H27.109z" fill="url(#SVGID_9_)" opacity="0.6"/>
+<path d="M27.105,54.932c-1.219,0-2.211-0.979-2.211-2.183v-5.606c0-1.204,0.992-2.183,2.211-2.183 h5.553c1.219,0,2.209,0.979,2.209,2.183v5.606c0,1.204-0.99,2.183-2.209,2.183H27.105z" fill="#020202" opacity="0.5"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="29.8818" x2="29.8818" y1="45.6865" y2="54.1806">
-<stop offset="0" style="stop-color:#A6A8AB"/>
-<stop offset="0.703" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#808184"/>
+ <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="M34.102,52.749c0,0.783-0.645,1.417-1.438,1.417h-5.566c-0.793,0-1.436-0.634-1.436-1.417v-5.606 c0-0.783,0.643-1.417,1.436-1.417h5.566c0.793,0,1.438,0.634,1.438,1.417V52.749z" fill="url(#SVGID_10_)"/>
-<path d="M28.73,52.632c-0.846,0-1.533-0.688-1.533-1.534v-2.303c0-0.847,0.688-1.534,1.533-1.534 h2.303c0.846,0,1.533,0.688,1.533,1.534v2.303c0,0.847-0.688,1.534-1.533,1.534H28.73z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M28.73,52.632c-0.846,0-1.533-0.688-1.533-1.534v-2.303c0-0.847,0.688-1.534,1.533-1.534 h2.303c0.846,0,1.533,0.688,1.533,1.534v2.303c0,0.847-0.688,1.534-1.533,1.534H28.73z" fill="#020202" opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="29.8809" x2="29.8809" y1="48.0103" y2="51.8696">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+ <stop offset="0.0667" style="stop-color:#D1D7D9"/>
+ <stop offset="0.2606" style="stop-color:#BDC2C4"/>
+ <stop offset="0.6606" style="stop-color:#949DA1"/>
+ <stop offset="0.9636" style="stop-color:#ADB3B5"/>
+ <stop offset="1" style="stop-color:#595C5E"/>
</linearGradient>
<path d="M28.73,51.863c-0.422,0-0.768-0.345-0.768-0.766v-2.303c0-0.422,0.346-0.767,0.768-0.767h2.303 c0.42,0,0.766,0.345,0.766,0.767v2.303c0,0.421-0.346,0.766-0.766,0.766H28.73z" fill="url(#SVGID_11_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="17.667" x2="17.667" y1="44.917" y2="54.1816">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+ <stop offset="0" style="stop-color:#B6BBBD"/>
+ <stop offset="1" style="stop-color:#F0FBFF"/>
</linearGradient>
-<path d="M17.223,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307 c0-1.624,1.324-2.948,2.949-2.948h0.887c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H17.223z" fill="url(#SVGID_12_)" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M17.223,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307 c0-1.624,1.324-2.948,2.949-2.948h0.887c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H17.223z" fill="url(#SVGID_12_)" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="17.665" x2="17.665" y1="45.6899" y2="53.4106">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+ <stop offset="0" style="stop-color:#231F20"/>
+ <stop offset="1" style="stop-color:#6D6E70"/>
</linearGradient>
-<path d="M17.223,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307 c0-1.201,0.98-2.183,2.184-2.183h0.887c1.205,0,2.182,0.981,2.182,2.183v3.307c0,1.204-0.977,2.183-2.182,2.183H17.223z" fill="url(#SVGID_13_)" fill-opacity="0.7" stroke-opacity="0.7"/>
+<path d="M17.223,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307 c0-1.201,0.98-2.183,2.184-2.183h0.887c1.205,0,2.182,0.981,2.182,2.183v3.307c0,1.204-0.977,2.183-2.182,2.183H17.223z" fill="url(#SVGID_13_)" opacity="0.7"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="17.667" x2="17.667" y1="46.4658" y2="52.6426">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+ <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="M19.525,51.215c0,0.783-0.635,1.417-1.416,1.417h-0.887c-0.779,0-1.414-0.634-1.414-1.417v-3.307 c0-0.78,0.635-1.414,1.414-1.414h0.887c0.781,0,1.416,0.634,1.416,1.414V51.215z" fill="url(#SVGID_14_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="41.6719" x2="41.6719" y1="44.917" y2="54.1816">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+ <stop offset="0" style="stop-color:#B6BBBD"/>
+ <stop offset="1" style="stop-color:#F0FBFF"/>
</linearGradient>
-<path d="M41.229,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307 c0-1.624,1.324-2.948,2.949-2.948h0.885c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H41.229z" fill="url(#SVGID_15_)" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M41.229,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307 c0-1.624,1.324-2.948,2.949-2.948h0.885c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H41.229z" fill="url(#SVGID_15_)" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="41.6709" x2="41.6709" y1="45.6899" y2="53.4106">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+ <stop offset="0" style="stop-color:#231F20"/>
+ <stop offset="1" style="stop-color:#6D6E70"/>
</linearGradient>
-<path d="M41.229,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307 c0-1.201,0.98-2.183,2.184-2.183h0.885c1.205,0,2.184,0.981,2.184,2.183v3.307c0,1.204-0.979,2.183-2.184,2.183H41.229z" fill="url(#SVGID_16_)" fill-opacity="0.7" stroke-opacity="0.7"/>
+<path d="M41.229,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307 c0-1.201,0.98-2.183,2.184-2.183h0.885c1.205,0,2.184,0.981,2.184,2.183v3.307c0,1.204-0.979,2.183-2.184,2.183H41.229z" fill="url(#SVGID_16_)" opacity="0.7"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="41.6719" x2="41.6719" y1="46.4658" y2="52.6426">
-<stop offset="0" style="stop-color:#FFC142"/>
-<stop offset="0.7455" style="stop-color:#CF4E18"/>
-<stop offset="1" style="stop-color:#B52100"/>
+ <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="M43.531,51.215c0,0.783-0.637,1.417-1.418,1.417h-0.885c-0.781,0-1.416-0.634-1.416-1.417v-3.307 c0-0.78,0.635-1.414,1.416-1.414h0.885c0.781,0,1.418,0.634,1.418,1.414V51.215z" fill="url(#SVGID_17_)"/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<polygon fill="none" points="30.096,0 0.096,0 0.096,14.833 0,14.833 0.096,14.933 0.096,30 14.601,30 15.021,30.438 15.447,30 30.096,30 30.096,14.963 30.215,14.841 30.096,14.841 "/>
-<polygon fill-opacity="0.35" points="0,14.833 3.596,14.828 3.625,14.859 8.375,14.859 8.375,0 21.73,0.001 21.73,14.843 30.215,14.841 15.021,30.438 " stroke-opacity="0.35"/>
+<polygon opacity="0.35" points="0,14.833 3.596,14.828 3.625,14.859 8.375,14.859 8.375,0 21.73,0.001 21.73,14.843 30.215,14.841 15.021,30.438 "/>
<linearGradient gradientTransform="matrix(1 1.000000e-004 1.000000e-004 -1 2191.3389 2985.8491)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-2176.5142" x2="-2176.5142" y1="2984.646" y2="2957.3247">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+ <stop offset="0" style="stop-color:#C6FF45"/>
+ <stop offset="0.7273" style="stop-color:#66A00E"/>
+ <stop offset="1" style="stop-color:#387300"/>
</linearGradient>
<polygon fill="url(#SVGID_1__)" points="2.846,15.859 15.025,28.575 27.398,15.845 20.732,15.843 20.727,1.292 9.375,1.291 9.375,15.859 "/>
<line fill="none" x1="20.727" x2="9.375" y1="1.297" y2="1.296"/>
@@ -123,10 +123,10 @@
<polygon fill="#E7FFB9" points="20.555,15.867 27.527,15.867 27,16.458 20.555,16.458 "/>
<polygon fill="#E7FFB9" points="2.459,15.859 9.365,15.859 9.365,16.451 3.08,16.451 "/>
<linearGradient gradientTransform="matrix(1 1.000000e-004 1.000000e-004 -1 2191.3389 2985.8491)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-2165.6621" x2="-2187.9482" y1="2963.2173" y2="2963.2173">
-<stop offset="0" style="stop-color:#AAE535"/>
-<stop offset="1" style="stop-color:#5D9C0A"/>
+ <stop offset="0" style="stop-color:#AAE535"/>
+ <stop offset="1" style="stop-color:#5D9C0A"/>
</linearGradient>
<polygon fill="url(#SVGID_2__)" points="27.016,15.844 15.025,28.15 3.172,15.829 2.348,15.83 15.025,29 27.842,15.844 "/>
<rect fill="none" height="30" width="30" x="0.096"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_dialer.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_dialer.svg Fri May 14 16:09:54 2010 +0300
@@ -1,46 +1,89 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
+
<stop offset="1" stop-color="#0087D9"/>
+
</linearGradient>
+
<rect fill="url(#SVGID_1)" height="10.42" width="10.42" x="11.96" y="5.674"/>
+
<rect fill="url(#SVGID_1)" height="10.42" width="10.42" x="24.7" y="5.674"/>
+
<rect fill="url(#SVGID_1)" height="10.42" width="10.42" x="37.61" y="5.674"/>
+
<rect fill="url(#SVGID_1)" height="10.42" width="10.42" x="11.96" y="18.25"/>
+
<rect fill="url(#SVGID_1)" height="10.42" width="10.42" x="24.7" y="18.25"/>
+
<rect fill="url(#SVGID_1)" height="10.42" width="10.42" x="37.61" y="18.25"/>
+
<rect fill="url(#SVGID_1)" height="10.42" width="10.42" x="11.96" y="30.99"/>
+
<rect fill="url(#SVGID_1)" height="10.42" width="10.42" x="24.7" y="30.99"/>
+
<rect fill="url(#SVGID_1)" height="10.43" width="10.42" x="24.7" y="43.9"/>
+
<rect fill="url(#SVGID_1)" height="10.42" width="10.42" x="37.61" y="30.99"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11" x1="17.17" x2="17.17" y1="5.67" y2="15.93">
+
<stop offset="0" stop-color="#73E3FF"/>
+
<stop offset="1" stop-color="#1347BA"/>
+
</linearGradient>
+
<path d="M21.16,6.898v7.976h-7.975v-7.972h7.981m1.229-1.224h-10.43v10.42h10.42v-10.43z" fill="url(#SVGID_11)"/>
+
<path d="M33.9,6.898v7.976h-7.97v-7.972h7.975m1.225-1.224h-10.42v10.42h10.42v-10.43z" fill="url(#SVGID_11)"/>
+
<path d="M46.81,6.898v7.976h-7.976v-7.972h7.98m1.22-1.224h-10.42v10.42h10.42v-10.43z" fill="url(#SVGID_11)"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14" x1="17.17" x2="17.17" y1="18.38" y2="28.63">
+
<stop offset="0" stop-color="#73E3FF"/>
-<stop offset="1" stop-color="#1347BA"/>
-</linearGradient>
-<path d="M21.16,19.48v7.977h-7.975v-7.977h7.981m1.229-1.23h-10.43v10.42h10.42v-10.43z" fill="url(#SVGID_14)"/>
-<path d="M33.9,19.48v7.977h-7.97v-7.977h7.975m1.225-1.23h-10.42v10.42h10.42v-10.43z" fill="url(#SVGID_14)"/>
-<path d="M46.81,19.48v7.977h-7.976v-7.977h7.98m1.22-1.23h-10.42v10.42h10.42v-10.43z" fill="url(#SVGID_14)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17" x1="17.17" x2="17.17" y1="31.39" y2="41.49">
-<stop offset="0" stop-color="#73E3FF"/>
+
<stop offset="1" stop-color="#1347BA"/>
+
</linearGradient>
-<path d="M21.16,32.22v7.975h-7.975v-7.975h7.981m1.229-1.23h-10.43v10.42h10.42v-10.42z" fill="url(#SVGID_17)"/>
-<path d="M33.9,32.22v7.975h-7.97v-7.975h7.975m1.225-1.23h-10.42v10.42h10.42v-10.42z" fill="url(#SVGID_17)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19" x1="29.92" x2="29.92" y1="43.94" y2="54.04">
+
+<path d="M21.16,19.48v7.977h-7.975v-7.977h7.981m1.229-1.23h-10.43v10.42h10.42v-10.43z" fill="url(#SVGID_14)"/>
+
+<path d="M33.9,19.48v7.977h-7.97v-7.977h7.975m1.225-1.23h-10.42v10.42h10.42v-10.43z" fill="url(#SVGID_14)"/>
+
+<path d="M46.81,19.48v7.977h-7.976v-7.977h7.98m1.22-1.23h-10.42v10.42h10.42v-10.43z" fill="url(#SVGID_14)"/>
+
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17" x1="17.17" x2="17.17" y1="31.39" y2="41.49">
+
<stop offset="0" stop-color="#73E3FF"/>
+
<stop offset="1" stop-color="#1347BA"/>
+
</linearGradient>
+
+<path d="M21.16,32.22v7.975h-7.975v-7.975h7.981m1.229-1.23h-10.43v10.42h10.42v-10.42z" fill="url(#SVGID_17)"/>
+
+<path d="M33.9,32.22v7.975h-7.97v-7.975h7.975m1.225-1.23h-10.42v10.42h10.42v-10.42z" fill="url(#SVGID_17)"/>
+
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19" x1="29.92" x2="29.92" y1="43.94" y2="54.04">
+
+<stop offset="0" stop-color="#73E3FF"/>
+
+<stop offset="1" stop-color="#1347BA"/>
+
+</linearGradient>
+
<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"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_dialled_voice_call.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_dialled_voice_call.svg Fri May 14 16:09:54 2010 +0300
@@ -1,62 +1,62 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<stop offset="0" style="stop-color:#3AC5EA"/>
-<stop offset="0.297" style="stop-color:#3AC5EA"/>
-<stop offset="0.6667" style="stop-color:#1754C9"/>
-<stop offset="0.7939" style="stop-color:#33ADE1"/>
-<stop offset="1" style="stop-color:#33ADE1"/>
+ <stop offset="0.297" style="stop-color:#3AC5EA"/>
+ <stop offset="0.6667" style="stop-color:#1754C9"/>
+ <stop offset="0.7939" style="stop-color:#33ADE1"/>
</radialGradient>
<path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333c-0.617-0.665-2.567-3.083-2.968-3.735 c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956c6.191-6.192,9.085-7.646,9.956-8.107 c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967c0.534,0.492,0.872,0.588,1.299,0.274 c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778c-2.476-2.889-8.594-5.015-10.751-5.399 c-1.923-0.345-3.876-0.872-6.567,0.235c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352 c-1.108,2.691-0.581,4.645-0.236,6.567c0.386,2.158,2.51,8.275,5.399,10.752c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2070.7568" x2="-2070.3252" y1="-2266.8511" y2="-2263.2749">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+ <stop offset="0" style="stop-color:#2685D2"/>
+ <stop offset="1" style="stop-color:#081D45"/>
</linearGradient>
<path d="M35.172,17.108c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967 c0.534,0.492,0.872,0.588,1.299,0.274c0.048-0.035,0.062-0.046,0.064-0.046c0.253-0.184,1.032-0.738,2.12-1.514 c-0.251-0.204-3.468-2.809-4.8-2.956C36.857,15.598,35.172,17.108,35.172,17.108z" fill="url(#SVGID_2_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -2128.2356 5114.0977)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2070.7607" x2="-2070.3289" y1="5104.5752" y2="5108.1523">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+ <stop offset="0" style="stop-color:#2685D2"/>
+ <stop offset="1" style="stop-color:#081D45"/>
</linearGradient>
<path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.713c0.376,0.666,2.351,3.069,2.967,3.738 c0.493,0.531,0.587,0.869,0.274,1.298c-0.035,0.047-0.046,0.062-0.046,0.062c-0.183,0.253-0.738,1.032-1.515,2.119 c-0.204-0.252-2.807-3.467-2.956-4.799C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="47.9224" x2="3.9991" y1="3.9307" y2="47.854">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+ <stop offset="0" style="stop-color:#ABEEFF"/>
+ <stop offset="1" style="stop-color:#539FDE"/>
</linearGradient>
-<path d="M2.979,47.467c-0.344-1.925-0.873-3.878,0.235-6.567 c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.341,4.269,40.9,3.215c2.691-1.108,4.644-0.581,6.567-0.236 c1.981,0.354,7.296,2.178,10.069,4.711c-2.552-2.815-8.496-4.879-10.617-5.258c-1.923-0.345-3.876-0.872-6.567,0.235 c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567 c0.378,2.122,2.441,8.065,5.258,10.617C5.156,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M2.979,47.467c-0.344-1.925-0.873-3.878,0.235-6.567 c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.341,4.269,40.9,3.215c2.691-1.108,4.644-0.581,6.567-0.236 c1.981,0.354,7.296,2.178,10.069,4.711c-2.552-2.815-8.496-4.879-10.617-5.258c-1.923-0.345-3.876-0.872-6.567,0.235 c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567 c0.378,2.122,2.441,8.065,5.258,10.617C5.156,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="54.3535" x2="3.9474" y1="3.2017" y2="53.6078">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+ <stop offset="0" style="stop-color:#ABEEFF"/>
+ <stop offset="1" style="stop-color:#539FDE"/>
</linearGradient>
-<path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333 c-0.617-0.665-2.567-3.083-2.968-3.735c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956 c6.191-6.192,9.085-7.646,9.956-8.107c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967 c0.534,0.492,0.872,0.588,1.299,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778 c-0.292-0.339-0.634-0.665-1.013-0.982c0.49,0.657,0.198,1.134-0.607,1.666C54.65,9.447,41.576,18.739,40.825,19.29 c-0.431,0.314-0.767,0.219-1.3-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.948-0.436-1.71-0.034 c-0.871,0.46-3.764,1.914-9.956,8.106c-6.193,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.319,1.135,0.035,1.711 c0.4,0.651,2.351,3.069,2.967,3.736c0.493,0.533,0.559,0.896,0.259,1.332c-0.517,0.755-9.828,13.794-10.76,15.195 c-0.533,0.803-1.008,1.098-1.665,0.606c0.314,0.378,0.644,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_5_)" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333 c-0.617-0.665-2.567-3.083-2.968-3.735c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956 c6.191-6.192,9.085-7.646,9.956-8.107c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967 c0.534,0.492,0.872,0.588,1.299,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778 c-0.292-0.339-0.634-0.665-1.013-0.982c0.49,0.657,0.198,1.134-0.607,1.666C54.65,9.447,41.576,18.739,40.825,19.29 c-0.431,0.314-0.767,0.219-1.3-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.948-0.436-1.71-0.034 c-0.871,0.46-3.764,1.914-9.956,8.106c-6.193,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.319,1.135,0.035,1.711 c0.4,0.651,2.351,3.069,2.967,3.736c0.493,0.533,0.559,0.896,0.259,1.332c-0.517,0.755-9.828,13.794-10.76,15.195 c-0.533,0.803-1.008,1.098-1.665,0.606c0.314,0.378,0.644,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_5_)" opacity="0.6"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -141.776 3075.0667)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-2041.9355" x2="-2041.9355" y1="-2305.2153" y2="-2243.2966">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="0.5091" style="stop-color:#081D45"/>
-<stop offset="1" style="stop-color:#2275BD"/>
+ <stop offset="0" style="stop-color:#2685D2"/>
+ <stop offset="0.5091" style="stop-color:#081D45"/>
+ <stop offset="1" style="stop-color:#2275BD"/>
</linearGradient>
<path d="M2.899,45.012c1.275-2.777,10.299-14.804,18.804-23.31c8.505-8.506,20.532-17.529,23.308-18.803 c0.527-0.241,1.02-0.411,1.493-0.545c-0.511-0.096-1.03-0.19-1.565-0.26c-0.086,0.036-0.163,0.063-0.25,0.102 c-2.818,1.293-14.971,10.397-23.533,18.959C12.595,29.717,3.489,41.869,2.195,44.688c-0.038,0.087-0.063,0.166-0.101,0.25 c0.07,0.535,0.166,1.055,0.259,1.565C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_6_)"/>
<rect fill="none" height="60" width="60"/>
</g>
<g>
+<defs>
+</defs>
<polygon fill="none" points="30.152,0.436 15.607,0.436 15.186,0 14.762,0.436 0.152,0.436 0.152,15.436 0,15.592 0.152,15.592 0.152,30.436 30.152,30.436 30.152,15.594 30.295,15.594 30.152,15.447 "/>
-<polygon fill-opacity="0.35" points="8.484,30.434 8.48,15.594 0.4,15.594 0,15.592 15.186,0 30.295,15.594 21.907,15.594 21.915,30.436 " stroke-opacity="0.35"/>
+<polygon opacity="0.35" points="8.484,30.434 8.48,15.594 0.4,15.594 0,15.592 15.186,0 30.295,15.594 21.907,15.594 21.915,30.436 "/>
<linearGradient gradientTransform="matrix(1 1.000000e-004 1.000000e-004 -1 2191.3389 2985.8438)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-2176.5103" x2="-2176.5103" y1="2985.5796" y2="2956.2766">
-<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="1" style="stop-color:#1347BA"/>
+ <stop offset="0.1455" style="stop-color:#45E8FF"/>
+ <stop offset="0.5576" style="stop-color:#30A4D5"/>
+ <stop offset="1" style="stop-color:#1347BA"/>
</linearGradient>
<polygon fill="url(#SVGID_1__)" points="27.438,14.594 15.184,1.861 2.814,14.594 9.48,14.594 9.484,29.142 20.91,29.145 20.907,14.594 "/>
<linearGradient gradientTransform="matrix(1 1.000000e-004 1.000000e-004 -1 2191.3389 2985.8438)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-2176.4844" x2="-2176.4844" y1="2984.1128" y2="2970.6938">
-<stop offset="0" style="stop-color:#B3FCFF"/>
-<stop offset="0.4182" style="stop-color:#B3FCFF"/>
-<stop offset="1" style="stop-color:#5FBAD8"/>
+ <stop offset="0.4182" style="stop-color:#B3FCFF"/>
+ <stop offset="1" style="stop-color:#5FBAD8"/>
</linearGradient>
<polygon fill="url(#SVGID_2__)" points="3.195,14.592 15.182,2.286 27.108,14.594 27.934,14.594 15.184,1.436 2.37,14.592 "/>
<line fill="none" x1="9.484" x2="20.91" y1="29.138" y2="29.14"/>
<polygon fill="#33AEDB" points="20.912,29.436 9.484,29.434 9.484,28.842 20.912,28.844 "/>
<rect fill="none" height="30" width="30" x="0.152" y="0.436"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email.svg Fri May 14 16:09:54 2010 +0300
@@ -1,27 +1,28 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="0.25" style="stop-color:#4F88BD"/>
-<stop offset="0.73" style="stop-color:#0055A3"/>
-<stop offset="1" style="stop-color:#64AEFB"/>
+ <stop offset="0" style="stop-color:#F2F2F2"/>
+ <stop offset="0.25" style="stop-color:#4F88BD"/>
+ <stop offset="0.73" style="stop-color:#0055A3"/>
+ <stop offset="1" style="stop-color:#64AEFB"/>
</linearGradient>
<path d="M30,57.997C14.562,57.997,2,45.439,2,30C2,14.564,14.562,2.002,30,2.002 c15.437,0,28,12.561,28,27.998C58,45.439,45.437,57.997,30,57.997L30,57.997z" fill="url(#SVGID_1_)"/>
<radialGradient cx="312.2188" cy="-353.9521" gradientTransform="matrix(1 0 0 -1 -282.4805 -346.0195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="51.3861">
-<stop offset="0" style="stop-color:#96E9FA"/>
-<stop offset="0.15" style="stop-color:#96E9FA"/>
-<stop offset="0.75" style="stop-color:#005BCC"/>
-<stop offset="1" style="stop-color:#0087D9"/>
+ <stop offset="0.15" style="stop-color:#96E9FA"/>
+ <stop offset="0.75" style="stop-color:#005BCC"/>
+ <stop offset="1" style="stop-color:#0087D9"/>
</radialGradient>
<path d="M57.198,30c0,15.023-12.18,27.198-27.198,27.198C14.979,57.198,2.802,45.023,2.802,30 C2.802,14.982,14.979,2.802,30,2.802C45.019,2.802,57.198,14.982,57.198,30z" fill="url(#SVGID_2_)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -346.0195)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="312.4805" x2="312.4805" y1="-357.0225" y2="-394.2217">
-<stop offset="0" style="stop-color:#0B81FA"/>
-<stop offset="1" style="stop-color:#47DAFA"/>
+ <stop offset="0" style="stop-color:#0B81FA"/>
+ <stop offset="1" style="stop-color:#47DAFA"/>
</linearGradient>
<path d="M29.998,48.545c-5.093,0-9.503-1.832-13.104-5.451c-3.609-3.623-5.436-8.038-5.436-13.12 c0-5.058,1.832-9.457,5.446-13.076c3.621-3.612,8.026-5.441,13.093-5.441c5.093,0,9.503,1.827,13.109,5.43 c3.604,3.604,5.436,8.005,5.436,13.087c0,2.963-0.612,5.579-1.812,7.774c-1.537,2.821-3.797,4.262-6.723,4.262 c-2.53,0-4.466-1.123-5.768-3.338c-1.409,1.153-3.133,1.736-5.143,1.736c-2.812,0-5.106-1.098-6.817-3.253 c-1.549-1.952-2.334-4.358-2.334-7.156c0-2.812,0.789-5.208,2.345-7.125c1.679-2.096,3.973-3.162,6.806-3.162 c1.447,0,2.702,0.278,3.753,0.827V20.13h5.344v13.714c0,2.966,1.27,2.966,1.813,2.966c0.39,0,1.587,0,2.543-2.438 c0.522-1.359,0.789-2.841,0.789-4.397c0-3.666-1.279-6.715-3.925-9.331c-2.603-2.575-5.772-3.881-9.419-3.881 c-3.71,0-6.776,1.26-9.374,3.85c-2.595,2.592-3.858,5.655-3.858,9.36c0,3.712,1.271,6.78,3.876,9.384 c2.57,2.581,5.713,3.884,9.355,3.884h0.798v5.305H29.998L29.998,48.545z M29.1,24.964c-1.16,0-2.03,0.509-2.665,1.547 c-0.594,0.959-0.894,2.133-0.894,3.488c0,4.619,2.029,5.152,3.558,5.152c1.513,0,3.529-0.549,3.529-5.321 C32.629,25.467,30.613,24.964,29.1,24.964L29.1,24.964z" fill="url(#SVGID_3_)"/>
<path d="M47.741,29.974c0,2.843-0.572,5.306-1.715,7.387c-1.39,2.563-3.396,3.846-6.018,3.846 c-2.552,0-4.395-1.282-5.543-3.846c-1.383,1.496-3.175,2.247-5.366,2.247c-2.57,0-4.629-0.982-6.188-2.95 c-1.44-1.818-2.164-4.029-2.164-6.659c0-2.641,0.726-4.844,2.164-6.617c1.539-1.917,3.601-2.871,6.188-2.871 c1.929,0,3.448,0.523,4.554,1.577v-1.156h3.741v12.913c0,2.511,0.868,3.767,2.613,3.767c1.424,0,2.519-0.985,3.287-2.947 c0.562-1.462,0.847-3.022,0.847-4.691c0-3.859-1.388-7.156-4.164-9.899c-2.771-2.744-6.101-4.111-9.982-4.111 c-3.896,0-7.209,1.36-9.939,4.083c-2.726,2.726-4.091,6.03-4.091,9.928c0,3.892,1.366,7.212,4.109,9.95 c2.733,2.745,6.045,4.118,9.922,4.118v3.703c-4.892,0-9.074-1.74-12.538-5.216c-3.468-3.483-5.203-7.674-5.203-12.555 c0-4.87,1.738-9.034,5.214-12.512c3.481-3.467,7.65-5.205,12.527-5.205c4.892,0,9.075,1.728,12.542,5.199 C46.006,20.913,47.741,25.087,47.741,29.974z M33.43,29.832c0-3.78-1.444-5.665-4.33-5.665c-1.443,0-2.563,0.64-3.346,1.932 c-0.68,1.087-1.01,2.386-1.01,3.901c0,3.971,1.449,5.954,4.354,5.954C31.985,35.954,33.43,33.915,33.43,29.832z" fill="#FFFFFF"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email_group.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email_group.svg Fri May 14 16:09:54 2010 +0300
@@ -1,25 +1,26 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="0.25" style="stop-color:#4F88BD"/>
-<stop offset="0.73" style="stop-color:#0055A3"/>
-<stop offset="1" style="stop-color:#64AEFB"/>
+ <stop offset="0" style="stop-color:#F2F2F2"/>
+ <stop offset="0.25" style="stop-color:#4F88BD"/>
+ <stop offset="0.73" style="stop-color:#0055A3"/>
+ <stop offset="1" style="stop-color:#64AEFB"/>
</linearGradient>
<path d="M30,57.997C14.562,57.997,2,45.439,2,30C2,14.564,14.562,2.002,30,2.002 c15.437,0,28,12.561,28,27.998C58,45.439,45.437,57.997,30,57.997L30,57.997z" fill="url(#SVGID_1_)"/>
<radialGradient cx="312.2188" cy="-353.9521" gradientTransform="matrix(1 0 0 -1 -282.4805 -346.0195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="51.3861">
-<stop offset="0" style="stop-color:#96E9FA"/>
-<stop offset="0.15" style="stop-color:#96E9FA"/>
-<stop offset="0.75" style="stop-color:#005BCC"/>
-<stop offset="1" style="stop-color:#0087D9"/>
+ <stop offset="0.15" style="stop-color:#96E9FA"/>
+ <stop offset="0.75" style="stop-color:#005BCC"/>
+ <stop offset="1" style="stop-color:#0087D9"/>
</radialGradient>
<path d="M57.198,30c0,15.023-12.18,27.198-27.198,27.198C14.979,57.198,2.802,45.023,2.802,30 C2.802,14.982,14.979,2.802,30,2.802C45.019,2.802,57.198,14.982,57.198,30z" fill="url(#SVGID_2_)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -346.0195)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="312.4805" x2="312.4805" y1="-357.0225" y2="-394.2217">
-<stop offset="0" style="stop-color:#0B81FA"/>
-<stop offset="1" style="stop-color:#47DAFA"/>
+ <stop offset="0" style="stop-color:#0B81FA"/>
+ <stop offset="1" style="stop-color:#47DAFA"/>
</linearGradient>
<path d="M29.998,48.545c-5.093,0-9.503-1.832-13.104-5.451c-3.609-3.623-5.436-8.038-5.436-13.12 c0-5.058,1.832-9.457,5.446-13.076c3.621-3.612,8.026-5.441,13.093-5.441c5.093,0,9.503,1.827,13.109,5.43 c3.604,3.604,5.436,8.005,5.436,13.087c0,2.963-0.612,5.579-1.812,7.774c-1.537,2.821-3.797,4.262-6.723,4.262 c-2.53,0-4.466-1.123-5.768-3.338c-1.409,1.153-3.133,1.736-5.143,1.736c-2.812,0-5.106-1.098-6.817-3.253 c-1.549-1.952-2.334-4.358-2.334-7.156c0-2.812,0.789-5.208,2.345-7.125c1.679-2.096,3.973-3.162,6.806-3.162 c1.447,0,2.702,0.278,3.753,0.827V20.13h5.344v13.714c0,2.966,1.27,2.966,1.813,2.966c0.39,0,1.587,0,2.543-2.438 c0.522-1.359,0.789-2.841,0.789-4.397c0-3.666-1.279-6.715-3.925-9.331c-2.603-2.575-5.772-3.881-9.419-3.881 c-3.71,0-6.776,1.26-9.374,3.85c-2.595,2.592-3.858,5.655-3.858,9.36c0,3.712,1.271,6.78,3.876,9.384 c2.57,2.581,5.713,3.884,9.355,3.884h0.798v5.305H29.998L29.998,48.545z M29.1,24.964c-1.16,0-2.03,0.509-2.665,1.547 c-0.594,0.959-0.894,2.133-0.894,3.488c0,4.619,2.029,5.152,3.558,5.152c1.513,0,3.529-0.549,3.529-5.321 C32.629,25.467,30.613,24.964,29.1,24.964L29.1,24.964z" fill="url(#SVGID_3_)"/>
<path d="M47.741,29.974c0,2.843-0.572,5.306-1.715,7.387c-1.39,2.563-3.396,3.846-6.018,3.846 c-2.552,0-4.395-1.282-5.543-3.846c-1.383,1.496-3.175,2.247-5.366,2.247c-2.57,0-4.629-0.982-6.188-2.95 c-1.44-1.818-2.164-4.029-2.164-6.659c0-2.641,0.726-4.844,2.164-6.617c1.539-1.917,3.601-2.871,6.188-2.871 c1.929,0,3.448,0.523,4.554,1.577v-1.156h3.741v12.913c0,2.511,0.868,3.767,2.613,3.767c1.424,0,2.519-0.985,3.287-2.947 c0.562-1.462,0.847-3.022,0.847-4.691c0-3.859-1.388-7.156-4.164-9.899c-2.771-2.744-6.101-4.111-9.982-4.111 c-3.896,0-7.209,1.36-9.939,4.083c-2.726,2.726-4.091,6.03-4.091,9.928c0,3.892,1.366,7.212,4.109,9.95 c2.733,2.745,6.045,4.118,9.922,4.118v3.703c-4.892,0-9.074-1.74-12.538-5.216c-3.468-3.483-5.203-7.674-5.203-12.555 c0-4.87,1.738-9.034,5.214-12.512c3.481-3.467,7.65-5.205,12.527-5.205c4.892,0,9.075,1.728,12.542,5.199 C46.006,20.913,47.741,25.087,47.741,29.974z M33.43,29.832c0-3.78-1.444-5.665-4.33-5.665c-1.443,0-2.563,0.64-3.346,1.932 c-0.68,1.087-1.01,2.386-1.01,3.901c0,3.971,1.449,5.954,4.354,5.954C31.985,35.954,33.43,33.915,33.43,29.832z" fill="#FFFFFF"/>
@@ -27,181 +28,291 @@
<g transform="matrix(1 0 0 1 30 30)">
<rect fill="none" height="30" width="30"/>
<radialGradient cx="669.4" cy="-594.3" gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_1__" r="11.1">
+
<stop offset="0" stop-color="#FFA98E"/>
+
<stop offset="0.2" stop-color="#FFA98E"/>
+
<stop offset="0.96" stop-color="#D45D36"/>
+
<stop offset="1" stop-color="#D45D36"/>
+
</radialGradient>
<path d="M23.46,18.68c-0.521-0.226-0.506-1.339-0.291-1.675,0.038-0.059,0.072-0.117,0.107-0.176h-4.365c0.035,0.059,0.069,0.116,0.107,0.176,0.215,0.336,0.23,1.448-0.291,1.675-0.522,0.228,2.428,2.202,2.428,2.202s2.81-1.98,2.29-2.2z" fill="url(#SVGID_1__)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="669.2" x2="669.2" y1="-588.9" y2="-598.1">
+
<stop offset="0" stop-color="#3BC8EB"/>
+
<stop offset="0.39" stop-color="#2D9BD2"/>
+
<stop offset="0.89" stop-color="#1347BA"/>
+
<stop offset="1" stop-color="#1347BA"/>
+
</linearGradient>
<path d="M26.59,19.84c-0.549-0.286-3.27-1.238-3.322-1.299l-2.078,1.729-2.233-1.795c-0.063,0.092-2.752,1.035-3.374,1.365-0.713,0.377-1.877,1.246-1.877,3.207h14.76c0-1.97-1.33-2.93-1.88-3.21z" fill="url(#SVGID_2__)"/>
-<polygon fill="#020202" fill-opacity="0.3" points="18.45,18.69,21.19,20.88,23.77,18.74,23.27,18.54,21.19,20.27,18.96,18.47" stroke-opacity="0.3" style="enable-background:new;"/>
+<polygon fill="#020202" opacity="0.3" points="18.45,18.69,21.19,20.88,23.77,18.74,23.27,18.54,21.19,20.27,18.96,18.47" style="enable-background:new;"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="669.2" x2="669.2" y1="-594.1" y2="-589.1">
+
<stop offset="0" stop-color="#3BC8EB"/>
+
<stop offset="1" stop-color="#2D9BD2"/>
+
</linearGradient>
<polygon fill="url(#SVGID_3__)" points="21.19,20.88,18.45,18.69,18.29,18.76,21.19,21.07,23.93,18.8,23.77,18.74"/>
<radialGradient cx="669.9" cy="-573.8" gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="14.9">
+
<stop offset="0" stop-color="#FFE2D9"/>
+
<stop offset="0.51" stop-color="#FFC6B3"/>
+
<stop offset="0.76" stop-color="#FFA98E"/>
+
<stop offset="1" stop-color="#E88160"/>
+
</radialGradient>
<path d="M24.71,13.56c-0.019-0.008-0.04-0.009-0.06-0.015v-0.001c-0.004-0.001-0.006-0.002-0.006-0.002-0.033-0.008-0.063-0.014-0.094-0.016-3.644-0.635-5.317-2.654-5.442-2.119-0.101,0.425-1.122,1.346-1.657,1.805,0.004,0.021,0.008,0.039,0.012,0.06,0,0,0.02,0.094,0.06,0.254-0.042,0.005-0.084,0.014-0.124,0.03-0.341,0.145-0.447,0.702-0.238,1.248,0.209,0.545,0.652,0.871,0.994,0.728,0.021-0.009,0.039-0.023,0.058-0.036,0.198,0.445,0.44,0.922,0.739,1.4,0.498,0.594,1.262,1.287,2.105,1.287,1.02,0,1.645-0.559,2.072-1.121,0.012-0.023,0.022-0.047,0.034-0.064,0.317-0.497,0.575-0.996,0.785-1.46,0.333,0.115,0.761-0.194,0.974-0.719,0.23-0.53,0.14-1.09-0.2-1.25z" fill="url(#SVGID_4_)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="666.5" x2="672.8" y1="-589.1" y2="-582.8">
+
<stop offset="0" stop-color="#FFC6B3"/>
+
<stop offset="1" stop-color="#FFA98E"/>
+
</linearGradient>
<path d="M20.91,17.9c-0.621,0-1.246-0.289-1.707-0.727,0.486,0.514,1.143,1.012,1.857,1.012,1.02,0,1.645-0.559,2.072-1.121,0.011-0.023,0.021-0.047,0.034-0.064,0.317-0.497,0.575-0.996,0.785-1.46-1.15,2.03-2.01,2.36-3.03,2.36z" fill="url(#SVGID_5_)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="669.1" x2="669.1" y1="-569.1" y2="-578.4">
+
<stop offset="0" stop-color="#8A5D3B"/>
+
<stop offset="0.38" stop-color="#632F00"/>
+
<stop offset="1" stop-color="#361700"/>
+
</linearGradient>
<path d="M20.95,8.483c-1.265,0-1.872,0.574-2.341,1.175-0.764,0.117-1.974,0.817-1.119,3.882,0.535-0.459,1.514-1.703,1.614-2.128,0.128-0.54,1.828,1.521,5.542,2.137,0.045-0.172,0.063-0.272,0.063-0.272,0.6-2.62-0.67-4.694-3.75-4.797z" fill="url(#SVGID_6_)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="672.2" x2="663.8" y1="-578" y2="-573">
+
<stop offset="0" stop-color="#8A5D3B"/>
+
<stop offset="0.36" stop-color="#632F00"/>
+
<stop offset="1" stop-color="#361700"/>
+
</linearGradient>
<path d="M19.11,11.16s1.818,2.389,5.512,2.384c0,0-1.73-0.27-5.51-2.38z" fill="url(#SVGID_7_)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="663.1" x2="663.1" y1="-572" y2="-577.3">
+
<stop offset="0" stop-color="#8A5D3B"/>
+
<stop offset="0.38" stop-color="#632F00"/>
+
<stop offset="1" stop-color="#361700"/>
+
</linearGradient>
<path d="M18.68,9.836s-1.78,0.106-1.12,3.123c0,0-0.22-2.07,1.12-3.124z" fill="url(#SVGID_8_)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="670.2" x2="670" y1="-569.9" y2="-572.3">
+
<stop offset="0" stop-color="#A87C4F"/>
+
<stop offset="1" stop-color="#632F00"/>
+
</linearGradient>
<path d="M21.82,10.25c-0.828-0.118-2.23-0.853-2.779-0.59,0,0,1.799-2.053,4.971,0.284,0,0.004-0.76,0.516-2.19,0.306z" fill="url(#SVGID_9_)"/>
<radialGradient cx="645" cy="-594.3" gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="11.1">
+
<stop offset="0" stop-color="#FFA98E"/>
+
<stop offset="0.2" stop-color="#FFA98E"/>
+
<stop offset="0.96" stop-color="#D45D36"/>
+
<stop offset="1" stop-color="#D45D36"/>
+
</radialGradient>
<path d="M11.28,18.68c-0.521-0.226-0.505-1.339-0.29-1.675,0.037-0.059,0.072-0.117,0.108-0.176h-4.371c0.035,0.059,0.069,0.116,0.107,0.176,0.215,0.336,0.23,1.448-0.29,1.675-0.523,0.228,2.427,2.202,2.427,2.202s2.827-1.98,2.307-2.2z" fill="url(#SVGID_10_)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="644.8" x2="644.8" y1="-588.9" y2="-598.1">
+
<stop offset="0" stop-color="#3BC8EB"/>
+
<stop offset="0.39" stop-color="#2D9BD2"/>
+
<stop offset="0.89" stop-color="#1347BA"/>
+
<stop offset="1" stop-color="#1347BA"/>
+
</linearGradient>
<path d="M14.42,19.84c-0.549-0.286-3.271-1.238-3.322-1.299l-2.079,1.729-2.233-1.795c-0.063,0.092-2.752,1.035-3.375,1.365-0.712,0.377-1.876,1.246-1.876,3.207h14.76c-0.01-1.97-1.34-2.93-1.88-3.21z" fill="url(#SVGID_11_)"/>
-<polygon fill="#020202" fill-opacity="0.3" points="6.272,18.69,9.015,20.88,11.59,18.74,11.09,18.54,9.015,20.27,6.781,18.47" stroke-opacity="0.3" style="enable-background:new;"/>
+<polygon fill="#020202" opacity="0.3" points="6.272,18.69,9.015,20.88,11.59,18.74,11.09,18.54,9.015,20.27,6.781,18.47" style="enable-background:new;"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="644.9" x2="644.9" y1="-594.1" y2="-589.1">
+
<stop offset="0" stop-color="#3BC8EB"/>
+
<stop offset="1" stop-color="#2D9BD2"/>
+
</linearGradient>
<polygon fill="url(#SVGID_12_)" points="9.015,20.88,6.271,18.69,6.113,18.76,9.015,21.07,11.75,18.8,11.59,18.74"/>
<radialGradient cx="645.6" cy="-573.8" gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_13_" r="14.9">
+
<stop offset="0" stop-color="#FFE2D9"/>
+
<stop offset="0.51" stop-color="#FFC6B3"/>
+
<stop offset="0.76" stop-color="#FFA98E"/>
+
<stop offset="1" stop-color="#E88160"/>
+
</radialGradient>
<path d="M12.53,13.56c-0.019-0.008-0.04-0.009-0.059-0.015v-0.001c-0.004-0.001-0.007-0.002-0.012-0.002-0.028-0.008-0.057-0.014-0.087-0.016-3.645-0.635-5.317-2.654-5.443-2.119-0.102,0.425-1.123,1.346-1.658,1.805,0.004,0.021,0.008,0.039,0.012,0.06,0,0,0.02,0.094,0.06,0.254-0.043,0.005-0.085,0.014-0.124,0.03-0.341,0.145-0.447,0.702-0.239,1.248,0.209,0.545,0.653,0.871,0.995,0.728,0.021-0.009,0.039-0.023,0.058-0.036,0.198,0.445,0.44,0.922,0.738,1.4,0.499,0.594,1.263,1.287,2.106,1.287,1.02,0,1.645-0.559,2.073-1.121,0.011-0.023,0.022-0.047,0.034-0.064,0.318-0.497,0.576-0.996,0.785-1.46,0.334,0.115,0.761-0.194,0.973-0.719,0.23-0.53,0.14-1.09-0.2-1.25z" fill="url(#SVGID_13_)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="642.2" x2="648.5" y1="-589.1" y2="-582.8">
+
<stop offset="0" stop-color="#FFC6B3"/>
+
<stop offset="1" stop-color="#FFA98E"/>
+
</linearGradient>
<path d="M8.729,17.9c-0.621,0-1.247-0.289-1.708-0.727,0.487,0.514,1.144,1.012,1.858,1.012,1.02,0,1.645-0.559,2.073-1.121,0.011-0.023,0.022-0.047,0.034-0.064,0.318-0.497,0.576-0.996,0.785-1.46-1.15,2.03-2.011,2.36-3.031,2.36z" fill="url(#SVGID_14_)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="644.7" x2="644.7" y1="-569.1" y2="-578.4">
+
<stop offset="0" stop-color="#8A5D3B"/>
+
<stop offset="0.38" stop-color="#632F00"/>
+
<stop offset="1" stop-color="#361700"/>
+
</linearGradient>
<path d="M8.776,8.483c-1.265,0-1.872,0.574-2.342,1.175-0.763,0.117-1.973,0.817-1.118,3.882,0.535-0.459,1.514-1.703,1.615-2.128,0.127-0.54,1.828,1.521,5.542,2.137,0.043-0.172,0.063-0.272,0.063-0.272,0.59-2.62-0.68-4.694-3.754-4.797z" fill="url(#SVGID_15_)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="647.9" x2="639.5" y1="-578" y2="-573">
+
<stop offset="0" stop-color="#8A5D3B"/>
+
<stop offset="0.36" stop-color="#632F00"/>
+
<stop offset="1" stop-color="#361700"/>
+
</linearGradient>
<path d="M6.936,11.16s1.818,2.389,5.513,2.384c0,0-1.74-0.27-5.514-2.38z" fill="url(#SVGID_16_)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="638.7" x2="638.8" y1="-572.3" y2="-577.7">
+
<stop offset="0" stop-color="#8A5D3B"/>
+
<stop offset="0.38" stop-color="#632F00"/>
+
<stop offset="1" stop-color="#361700"/>
+
</linearGradient>
<path d="M6.498,9.836s-1.779,0.106-1.119,3.123c0,0-0.218-2.07,1.119-3.124z" fill="url(#SVGID_17_)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="645.9" x2="645.6" y1="-569.9" y2="-572.3">
+
<stop offset="0" stop-color="#A87C4F"/>
+
<stop offset="1" stop-color="#632F00"/>
+
</linearGradient>
<path d="M9.639,10.25c-0.828-0.118-2.23-0.853-2.78-0.59,0,0,1.8-2.053,4.973,0.284,0,0.004-0.76,0.516-2.191,0.306z" fill="url(#SVGID_18_)"/>
-<path d="M23.32,20.43c-0.506-0.264-2.081-0.849-3.348-1.317l-0.711-0.265-0.128-0.053-0.166-0.063-0.317-0.128-0.196,0.086c-0.001,0.002-0.003,0.002-0.004,0.003h-0.001c-0.826,0.323-2.406,0.897-2.865,1.143-0.178,0.095-0.385,0.222-0.596,0.388-0.221-0.183-0.426-0.311-0.573-0.388-0.395-0.205-1.904-0.753-2.746-1.067l-0.078-0.031-0.002,0.001-0.349-0.142-0.317,0.139c-0.311,0.122-0.693,0.268-1.103,0.424l-0.038,0.014c-1.21,0.461-2.582,0.982-3.107,1.262-1.177,0.625-2.025,1.51-2.525,2.609h21.66c-0.77-1.62-2.12-2.41-2.48-2.6z" fill="#231F20" fill-opacity="0.15" stroke-opacity="0.15" style="enable-background:new;"/>
-<path d="M9.052,11.44c-0.561,0.477-0.712,1.432-0.349,2.38,0.342,0.894,1.048,1.494,1.758,1.494h0.002c0.106,0.221,0.217,0.439,0.331,0.654h-0.033l0.271,0.448s0.071,0.115,0.154,0.253c0.226-0.383,0.424-0.765,0.586-1.123,0.334,0.115,0.761-0.194,0.973-0.719,0.22-0.542,0.125-1.106-0.212-1.259-0.019-0.008-0.04-0.009-0.059-0.015v-0.001c-0.004-0.001-0.007-0.002-0.012-0.002-0.028-0.008-0.057-0.014-0.087-0.016-0.007-0.002-0.012-0.003-0.019-0.005-0.015-0.003-0.032-0.007-0.05-0.011,0.057,0.011,0.109,0.023,0.167,0.033,0.043-0.172,0.063-0.272,0.063-0.272,0.583-2.617-0.686-4.69-3.761-4.793-0.006,0-0.01,0.001-0.017,0.001-0.072,0.839,0.021,1.822,0.3,2.962z" fill="#231F20" fill-opacity="0.15" stroke-opacity="0.15" style="enable-background:new;"/>
-<path d="M18.61,9.658c-0.764,0.117-1.973,0.817-1.119,3.879-0.033,0.006-0.064,0.011-0.096,0.023-0.342,0.145-0.447,0.702-0.238,1.248,0.209,0.545,0.652,0.871,0.994,0.728,0.021-0.009,0.039-0.023,0.058-0.036,0.165,0.371,0.364,0.766,0.599,1.163,0.263-0.441,0.512-0.897,0.736-1.369,0.646-0.077,1.279-0.639,1.605-1.444,0.371-0.919,0.253-1.873-0.272-2.37,0.235-1.062,0.272-2.073,0.117-2.993-0.015-0.001-0.028-0.003-0.043-0.003-1.26-0.001-1.87,0.574-2.34,1.174zm-1.11,3.882c0.007-0.006,0.015-0.013,0.021-0.019,0,0.005,0.002,0.008,0.002,0.013,0,0-0.01,0.01-0.02,0.01zm1.76-2.21c-0.009-0.002-0.021-0.007-0.029-0.008,0.01,0,0.02,0.01,0.03,0.01z" fill="#231F20" fill-opacity="0.15" stroke-opacity="0.15" style="enable-background:new;"/>
-<path d="M23.19,20.69c-0.49-0.256-2.057-0.836-3.314-1.305l-0.719-0.266-0.123-0.051-0.172-0.065-0.484-0.194c-0.016-0.021-0.027-0.051-0.041-0.073-0.85,0.327-2.31,0.862-2.746,1.097-0.179,0.094-0.386,0.221-0.597,0.387-0.221-0.182-0.426-0.311-0.573-0.387-0.395-0.205-1.904-0.754-2.746-1.068l-0.042-0.018-0.596,0.261c-0.32,0.125-0.719,0.276-1.144,0.438-1.202,0.457-2.565,0.975-3.074,1.244-1.071,0.568-1.857,1.363-2.338,2.35h21.01c-0.76-1.46-1.98-2.18-2.3-2.35z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3" style="enable-background:new;"/>
-<path d="M8.979,13.71c0.298,0.78,0.894,1.304,1.481,1.304,0.062,0,0.122-0.005,0.181-0.017,0.202,0.433,0.419,0.854,0.651,1.261h-0.009l0.068,0.113c0.155-0.283,0.3-0.563,0.419-0.829,0.334,0.115,0.761-0.194,0.973-0.719,0.22-0.542,0.125-1.106-0.212-1.259-0.019-0.008-0.04-0.009-0.059-0.015v-0.001c-0.004-0.001-0.007-0.002-0.012-0.002-0.028-0.008-0.057-0.014-0.087-0.016-0.007-0.002-0.012-0.003-0.019-0.005-0.015-0.003-0.032-0.007-0.05-0.011,0.057,0.011,0.109,0.023,0.167,0.033,0.043-0.172,0.063-0.272,0.063-0.272,0.564-2.535-0.613-4.556-3.483-4.772-0.08,0.847,0.026,1.864,0.336,3.057-0.57,0.33-0.751,1.24-0.404,2.15z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3" style="enable-background:new;"/>
-<path d="M18.61,9.658c-0.764,0.117-1.973,0.817-1.119,3.879-0.033,0.006-0.064,0.011-0.096,0.023-0.342,0.145-0.447,0.702-0.238,1.248,0.209,0.545,0.652,0.871,0.994,0.728,0.021-0.009,0.039-0.023,0.058-0.036,0.124,0.278,0.269,0.569,0.429,0.864,0.256-0.439,0.497-0.891,0.715-1.357,0.014,0.001,0.025,0.001,0.039,0.001,0.58,0,1.177-0.511,1.483-1.27,0.358-0.884,0.21-1.785-0.325-2.144,0.025-0.106,0.036-0.166,0.036-0.166,0.233-1.043,0.267-2.035,0.11-2.931-1.08,0.083-1.64,0.612-2.08,1.169zm-1.11,3.882c0.007-0.006,0.015-0.013,0.021-0.019,0,0.005,0.002,0.008,0.002,0.013,0,0-0.01,0.01-0.02,0.01zm1.76-2.21c-0.009-0.002-0.021-0.007-0.029-0.008,0.01,0,0.02,0.01,0.03,0.01z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3" style="enable-background:new;"/>
+<path d="M23.32,20.43c-0.506-0.264-2.081-0.849-3.348-1.317l-0.711-0.265-0.128-0.053-0.166-0.063-0.317-0.128-0.196,0.086c-0.001,0.002-0.003,0.002-0.004,0.003h-0.001c-0.826,0.323-2.406,0.897-2.865,1.143-0.178,0.095-0.385,0.222-0.596,0.388-0.221-0.183-0.426-0.311-0.573-0.388-0.395-0.205-1.904-0.753-2.746-1.067l-0.078-0.031-0.002,0.001-0.349-0.142-0.317,0.139c-0.311,0.122-0.693,0.268-1.103,0.424l-0.038,0.014c-1.21,0.461-2.582,0.982-3.107,1.262-1.177,0.625-2.025,1.51-2.525,2.609h21.66c-0.77-1.62-2.12-2.41-2.48-2.6z" fill="#231F20" opacity="0.15" style="enable-background:new;"/>
+<path d="M9.052,11.44c-0.561,0.477-0.712,1.432-0.349,2.38,0.342,0.894,1.048,1.494,1.758,1.494h0.002c0.106,0.221,0.217,0.439,0.331,0.654h-0.033l0.271,0.448s0.071,0.115,0.154,0.253c0.226-0.383,0.424-0.765,0.586-1.123,0.334,0.115,0.761-0.194,0.973-0.719,0.22-0.542,0.125-1.106-0.212-1.259-0.019-0.008-0.04-0.009-0.059-0.015v-0.001c-0.004-0.001-0.007-0.002-0.012-0.002-0.028-0.008-0.057-0.014-0.087-0.016-0.007-0.002-0.012-0.003-0.019-0.005-0.015-0.003-0.032-0.007-0.05-0.011,0.057,0.011,0.109,0.023,0.167,0.033,0.043-0.172,0.063-0.272,0.063-0.272,0.583-2.617-0.686-4.69-3.761-4.793-0.006,0-0.01,0.001-0.017,0.001-0.072,0.839,0.021,1.822,0.3,2.962z" fill="#231F20" opacity="0.15" style="enable-background:new;"/>
+<path d="M18.61,9.658c-0.764,0.117-1.973,0.817-1.119,3.879-0.033,0.006-0.064,0.011-0.096,0.023-0.342,0.145-0.447,0.702-0.238,1.248,0.209,0.545,0.652,0.871,0.994,0.728,0.021-0.009,0.039-0.023,0.058-0.036,0.165,0.371,0.364,0.766,0.599,1.163,0.263-0.441,0.512-0.897,0.736-1.369,0.646-0.077,1.279-0.639,1.605-1.444,0.371-0.919,0.253-1.873-0.272-2.37,0.235-1.062,0.272-2.073,0.117-2.993-0.015-0.001-0.028-0.003-0.043-0.003-1.26-0.001-1.87,0.574-2.34,1.174zm-1.11,3.882c0.007-0.006,0.015-0.013,0.021-0.019,0,0.005,0.002,0.008,0.002,0.013,0,0-0.01,0.01-0.02,0.01zm1.76-2.21c-0.009-0.002-0.021-0.007-0.029-0.008,0.01,0,0.02,0.01,0.03,0.01z" fill="#231F20" opacity="0.15" style="enable-background:new;"/>
+<path d="M23.19,20.69c-0.49-0.256-2.057-0.836-3.314-1.305l-0.719-0.266-0.123-0.051-0.172-0.065-0.484-0.194c-0.016-0.021-0.027-0.051-0.041-0.073-0.85,0.327-2.31,0.862-2.746,1.097-0.179,0.094-0.386,0.221-0.597,0.387-0.221-0.182-0.426-0.311-0.573-0.387-0.395-0.205-1.904-0.754-2.746-1.068l-0.042-0.018-0.596,0.261c-0.32,0.125-0.719,0.276-1.144,0.438-1.202,0.457-2.565,0.975-3.074,1.244-1.071,0.568-1.857,1.363-2.338,2.35h21.01c-0.76-1.46-1.98-2.18-2.3-2.35z" fill="#231F20" opacity="0.3" style="enable-background:new;"/>
+<path d="M8.979,13.71c0.298,0.78,0.894,1.304,1.481,1.304,0.062,0,0.122-0.005,0.181-0.017,0.202,0.433,0.419,0.854,0.651,1.261h-0.009l0.068,0.113c0.155-0.283,0.3-0.563,0.419-0.829,0.334,0.115,0.761-0.194,0.973-0.719,0.22-0.542,0.125-1.106-0.212-1.259-0.019-0.008-0.04-0.009-0.059-0.015v-0.001c-0.004-0.001-0.007-0.002-0.012-0.002-0.028-0.008-0.057-0.014-0.087-0.016-0.007-0.002-0.012-0.003-0.019-0.005-0.015-0.003-0.032-0.007-0.05-0.011,0.057,0.011,0.109,0.023,0.167,0.033,0.043-0.172,0.063-0.272,0.063-0.272,0.564-2.535-0.613-4.556-3.483-4.772-0.08,0.847,0.026,1.864,0.336,3.057-0.57,0.33-0.751,1.24-0.404,2.15z" fill="#231F20" opacity="0.3" style="enable-background:new;"/>
+<path d="M18.61,9.658c-0.764,0.117-1.973,0.817-1.119,3.879-0.033,0.006-0.064,0.011-0.096,0.023-0.342,0.145-0.447,0.702-0.238,1.248,0.209,0.545,0.652,0.871,0.994,0.728,0.021-0.009,0.039-0.023,0.058-0.036,0.124,0.278,0.269,0.569,0.429,0.864,0.256-0.439,0.497-0.891,0.715-1.357,0.014,0.001,0.025,0.001,0.039,0.001,0.58,0,1.177-0.511,1.483-1.27,0.358-0.884,0.21-1.785-0.325-2.144,0.025-0.106,0.036-0.166,0.036-0.166,0.233-1.043,0.267-2.035,0.11-2.931-1.08,0.083-1.64,0.612-2.08,1.169zm-1.11,3.882c0.007-0.006,0.015-0.013,0.021-0.019,0,0.005,0.002,0.008,0.002,0.013,0,0-0.01,0.01-0.02,0.01zm1.76-2.21c-0.009-0.002-0.021-0.007-0.029-0.008,0.01,0,0.02,0.01,0.03,0.01z" fill="#231F20" opacity="0.3" style="enable-background:new;"/>
<radialGradient cx="657.3" cy="-597.7" gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_19_" r="16.23">
+
<stop offset="0" stop-color="#FFA98E"/>
+
<stop offset="0.2" stop-color="#FFA98E"/>
+
<stop offset="0.96" stop-color="#D45D36"/>
+
<stop offset="1" stop-color="#D45D36"/>
+
</radialGradient>
<path d="M18.46,19.26c-0.764-0.332-0.738-1.957-0.424-2.448,0.055-0.086,0.104-0.172,0.156-0.258h-6.385c0.053,0.086,0.103,0.172,0.157,0.258,0.315,0.491,0.34,2.116-0.424,2.448-0.764,0.331,3.549,3.219,3.549,3.219s4.11-2.89,3.35-3.22z" fill="url(#SVGID_19_)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="657" x2="657" y1="-589.9" y2="-603.3">
+
<stop offset="0" stop-color="#FF7236"/>
+
<stop offset="1" stop-color="#BA1212"/>
+
</linearGradient>
<path d="M23.05,20.96c-0.803-0.418-4.781-1.811-4.857-1.896l-3.04,2.524-3.266-2.623c-0.09,0.134-4.023,1.512-4.934,1.995-1.042,0.553-2.743,1.822-2.743,4.688h21.59c0-2.87-1.94-4.28-2.74-4.69z" fill="url(#SVGID_20_)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="657.1" x2="657.1" y1="-589" y2="-596.9">
+
<stop offset="0" stop-color="#BC1C24"/>
+
<stop offset="1" stop-color="#6B1C24"/>
+
</linearGradient>
<polygon fill="url(#SVGID_21_)" points="11.14,19.28,15.15,22.48,18.92,19.35,18.19,19.06,15.15,21.58,11.89,18.96"/>
<path d="M11.33,19.79s-5.72,1.493-5.72,5.502h-0.823c0-2.46,1.922-4.38,6.543-5.5z" fill="#FF7B56"/>
<path d="M18.6,19.7s5.72,1.494,5.72,5.502h0.824c0-2.47-1.92-4.38-6.54-5.5z" fill="#FF7B56"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="657.1" x2="657.1" y1="-597.5" y2="-590.2">
+
<stop offset="0" stop-color="#FFA98E"/>
+
<stop offset="0.96" stop-color="#D45D36"/>
+
<stop offset="1" stop-color="#D45D36"/>
+
</linearGradient>
<polygon fill="url(#SVGID_22_)" points="15.15,22.48,11.14,19.28,10.91,19.39,15.15,22.77,19.15,19.44,18.92,19.35"/>
<radialGradient cx="658.1" cy="-567.8" gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_23_" r="21.78">
+
<stop offset="0" stop-color="#FFE2D9"/>
+
<stop offset="0.51" stop-color="#FFC6B3"/>
+
<stop offset="0.76" stop-color="#FFA98E"/>
+
<stop offset="1" stop-color="#E88160"/>
+
</radialGradient>
<path d="M20.29,11.79c-0.026-0.013-0.058-0.015-0.086-0.022v-0.002c-0.005-0.001-0.01-0.002-0.017-0.003-0.041-0.011-0.084-0.021-0.127-0.022-5.331-0.928-7.775-3.88-7.959-3.099-0.147,0.622-1.641,1.968-2.424,2.639,0.007,0.03,0.01,0.057,0.018,0.087,0,0,0.027,0.138,0.086,0.372-0.062,0.007-0.123,0.02-0.182,0.045-0.498,0.21-0.654,1.026-0.349,1.823,0.305,0.798,0.956,1.274,1.454,1.065,0.03-0.014,0.057-0.035,0.085-0.054,0.289,0.65,0.645,1.348,1.079,2.047,0.729,0.866,1.846,1.883,3.079,1.883,1.49,0,2.404-0.815,3.031-1.64,0.017-0.033,0.031-0.066,0.053-0.095,0.465-0.728,0.842-1.455,1.145-2.134,0.488,0.168,1.113-0.284,1.424-1.051,0.35-0.81,0.21-1.63-0.29-1.85z" fill="url(#SVGID_23_)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_24_" x1="653.2" x2="662.4" y1="-590.1" y2="-580.9">
+
<stop offset="0" stop-color="#FFC6B3"/>
+
<stop offset="1" stop-color="#FFA98E"/>
+
</linearGradient>
<path d="M14.73,18.13c-0.908,0-1.822-0.423-2.496-1.06,0.713,0.748,1.672,1.478,2.716,1.478,1.491,0,2.403-0.815,3.032-1.64,0.016-0.033,0.031-0.066,0.051-0.095,0.465-0.728,0.842-1.455,1.146-2.134-1.7,2.95-2.96,3.44-4.45,3.44z" fill="url(#SVGID_24_)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="656.8" x2="656.8" y1="-560.9" y2="-574.5">
+
<stop offset="0" stop-color="#8A5D3B"/>
+
<stop offset="0.38" stop-color="#632F00"/>
+
<stop offset="1" stop-color="#361700"/>
+
</linearGradient>
<path d="M14.8,4.357c-1.847,0-2.736,0.84-3.423,1.718-1.12,0.172-2.884,1.195-1.636,5.675,0.783-0.67,2.214-2.489,2.361-3.111,0.186-0.788,2.672,2.226,8.103,3.124,0.063-0.251,0.093-0.398,0.093-0.398,0.86-3.821-0.99-6.853-5.49-7.003z" fill="url(#SVGID_25_)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_26_" x1="661.5" x2="649.2" y1="-573.9" y2="-566.6">
+
<stop offset="0" stop-color="#8A5D3B"/>
+
<stop offset="0.36" stop-color="#632F00"/>
+
<stop offset="1" stop-color="#361700"/>
+
</linearGradient>
<path d="M12.11,8.272s2.658,3.492,8.059,3.485c0,0-2.54-0.4-8.06-3.488z" fill="url(#SVGID_26_)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_27_" x1="648.1" x2="648.2" y1="-565.2" y2="-573">
+
<stop offset="0" stop-color="#8A5D3B"/>
+
<stop offset="0.38" stop-color="#632F00"/>
+
<stop offset="1" stop-color="#361700"/>
+
</linearGradient>
<path d="M11.47,6.335s-2.603,0.155-1.637,4.566c0.003,0-0.315-3.019,1.637-4.565z" fill="url(#SVGID_27_)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_28_" x1="658.5" x2="658.2" y1="-562.1" y2="-565.6">
+
<stop offset="0" stop-color="#A87C4F"/>
+
<stop offset="1" stop-color="#632F00"/>
+
</linearGradient>
<path d="M16.06,6.946c-1.212-0.173-3.263-1.247-4.065-0.863,0,0,2.63-3,7.271,0.415,0,0-1.11,0.747-3.21,0.448z" fill="url(#SVGID_28_)"/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email_home.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email_home.svg Fri May 14 16:09:54 2010 +0300
@@ -1,68 +1,71 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="0.25" style="stop-color:#4F88BD"/>
-<stop offset="0.73" style="stop-color:#0055A3"/>
-<stop offset="1" style="stop-color:#64AEFB"/>
+ <stop offset="0" style="stop-color:#F2F2F2"/>
+ <stop offset="0.25" style="stop-color:#4F88BD"/>
+ <stop offset="0.73" style="stop-color:#0055A3"/>
+ <stop offset="1" style="stop-color:#64AEFB"/>
</linearGradient>
<path d="M30,57.997C14.562,57.997,2,45.439,2,30C2,14.564,14.562,2.002,30,2.002 c15.437,0,28,12.561,28,27.998C58,45.439,45.437,57.997,30,57.997L30,57.997z" fill="url(#SVGID_1_)"/>
<radialGradient cx="312.2188" cy="-353.9521" gradientTransform="matrix(1 0 0 -1 -282.4805 -346.0195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="51.3861">
-<stop offset="0" style="stop-color:#96E9FA"/>
-<stop offset="0.15" style="stop-color:#96E9FA"/>
-<stop offset="0.75" style="stop-color:#005BCC"/>
-<stop offset="1" style="stop-color:#0087D9"/>
+ <stop offset="0.15" style="stop-color:#96E9FA"/>
+ <stop offset="0.75" style="stop-color:#005BCC"/>
+ <stop offset="1" style="stop-color:#0087D9"/>
</radialGradient>
<path d="M57.198,30c0,15.023-12.18,27.198-27.198,27.198C14.979,57.198,2.802,45.023,2.802,30 C2.802,14.982,14.979,2.802,30,2.802C45.019,2.802,57.198,14.982,57.198,30z" fill="url(#SVGID_2_)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -346.0195)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="312.4805" x2="312.4805" y1="-357.0225" y2="-394.2217">
-<stop offset="0" style="stop-color:#0B81FA"/>
-<stop offset="1" style="stop-color:#47DAFA"/>
+ <stop offset="0" style="stop-color:#0B81FA"/>
+ <stop offset="1" style="stop-color:#47DAFA"/>
</linearGradient>
<path d="M29.998,48.545c-5.093,0-9.503-1.832-13.104-5.451c-3.609-3.623-5.436-8.038-5.436-13.12 c0-5.058,1.832-9.457,5.446-13.076c3.621-3.612,8.026-5.441,13.093-5.441c5.093,0,9.503,1.827,13.109,5.43 c3.604,3.604,5.436,8.005,5.436,13.087c0,2.963-0.612,5.579-1.812,7.774c-1.537,2.821-3.797,4.262-6.723,4.262 c-2.53,0-4.466-1.123-5.768-3.338c-1.409,1.153-3.133,1.736-5.143,1.736c-2.812,0-5.106-1.098-6.817-3.253 c-1.549-1.952-2.334-4.358-2.334-7.156c0-2.812,0.789-5.208,2.345-7.125c1.679-2.096,3.973-3.162,6.806-3.162 c1.447,0,2.702,0.278,3.753,0.827V20.13h5.344v13.714c0,2.966,1.27,2.966,1.813,2.966c0.39,0,1.587,0,2.543-2.438 c0.522-1.359,0.789-2.841,0.789-4.397c0-3.666-1.279-6.715-3.925-9.331c-2.603-2.575-5.772-3.881-9.419-3.881 c-3.71,0-6.776,1.26-9.374,3.85c-2.595,2.592-3.858,5.655-3.858,9.36c0,3.712,1.271,6.78,3.876,9.384 c2.57,2.581,5.713,3.884,9.355,3.884h0.798v5.305H29.998L29.998,48.545z M29.1,24.964c-1.16,0-2.03,0.509-2.665,1.547 c-0.594,0.959-0.894,2.133-0.894,3.488c0,4.619,2.029,5.152,3.558,5.152c1.513,0,3.529-0.549,3.529-5.321 C32.629,25.467,30.613,24.964,29.1,24.964L29.1,24.964z" fill="url(#SVGID_3_)"/>
<path d="M47.741,29.974c0,2.843-0.572,5.306-1.715,7.387c-1.39,2.563-3.396,3.846-6.018,3.846 c-2.552,0-4.395-1.282-5.543-3.846c-1.383,1.496-3.175,2.247-5.366,2.247c-2.57,0-4.629-0.982-6.188-2.95 c-1.44-1.818-2.164-4.029-2.164-6.659c0-2.641,0.726-4.844,2.164-6.617c1.539-1.917,3.601-2.871,6.188-2.871 c1.929,0,3.448,0.523,4.554,1.577v-1.156h3.741v12.913c0,2.511,0.868,3.767,2.613,3.767c1.424,0,2.519-0.985,3.287-2.947 c0.562-1.462,0.847-3.022,0.847-4.691c0-3.859-1.388-7.156-4.164-9.899c-2.771-2.744-6.101-4.111-9.982-4.111 c-3.896,0-7.209,1.36-9.939,4.083c-2.726,2.726-4.091,6.03-4.091,9.928c0,3.892,1.366,7.212,4.109,9.95 c2.733,2.745,6.045,4.118,9.922,4.118v3.703c-4.892,0-9.074-1.74-12.538-5.216c-3.468-3.483-5.203-7.674-5.203-12.555 c0-4.87,1.738-9.034,5.214-12.512c3.481-3.467,7.65-5.205,12.527-5.205c4.892,0,9.075,1.728,12.542,5.199 C46.006,20.913,47.741,25.087,47.741,29.974z M33.43,29.832c0-3.78-1.444-5.665-4.33-5.665c-1.443,0-2.563,0.64-3.346,1.932 c-0.68,1.087-1.01,2.386-1.01,3.901c0,3.971,1.449,5.954,4.354,5.954C31.985,35.954,33.43,33.915,33.43,29.832z" fill="#FFFFFF"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<polygon fill="none" points="30.414,14.408 30.414,0 0.414,0 0.414,14.41 0,14.824 0.414,15.237 0.414,30 30.414,30 30.414,15.236 30.828,14.821 "/>
-<path d="M2.749,29.823V17.57L0,14.824l0.706-0.707C1.213,13.608,13.143,1.649,13.861,0.962 c0.387-0.368,0.914-0.786,1.589-0.786c0.687,0,1.172,0.42,1.518,0.785c0.457,0.484,8.802,8.816,13.151,13.154l0.708,0.706 l-2.747,2.749v12.253H2.749z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M2.749,29.823V17.57L0,14.824l0.706-0.707C1.213,13.608,13.143,1.649,13.861,0.962 c0.387-0.368,0.914-0.786,1.589-0.786c0.687,0,1.172,0.42,1.518,0.785c0.457,0.484,8.802,8.816,13.151,13.154l0.708,0.706 l-2.747,2.749v12.253H2.749z" opacity="0.35"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="15.415" x2="15.415" y1="28.6694" y2="12.5688">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.6606" style="stop-color:#E0E1E2"/>
-<stop offset="1" style="stop-color:#B9BCBD"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="0.6606" style="stop-color:#E0E1E2"/>
+ <stop offset="1" style="stop-color:#B9BCBD"/>
</linearGradient>
<polygon fill="url(#SVGID_1__)" points="27.081,28.823 3.749,28.823 3.749,14.473 15.414,5.489 27.081,14.473 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="15.415" x2="15.415" y1="17.313" y2="28.6013">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.6606" style="stop-color:#E0E1E2"/>
-<stop offset="1" style="stop-color:#B9BCBD"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="0.6606" style="stop-color:#E0E1E2"/>
+ <stop offset="1" style="stop-color:#B9BCBD"/>
</linearGradient>
<path d="M15.414,6.668l10.736,8.264V27.89H4.682V14.932L15.414,6.668 M15.414,5.489L3.749,14.473v14.351 h23.333V14.473L15.414,5.489L15.414,5.489z" fill="url(#SVGID_2__)"/>
-<polygon fill-opacity="0.2" points="27.081,18.033 27.081,14.473 15.414,5.489 3.749,14.473 3.749,18.322 15.414,8.99 " stroke-opacity="0.2"/>
+<polygon opacity="0.2" points="27.081,18.033 27.081,14.473 15.414,5.489 3.749,14.473 3.749,18.322 15.414,8.99 "/>
<polygon fill="#727272" points="27.081,18.033 27.081,14.473 15.414,5.489 3.749,14.473 3.749,18.322 15.414,6.655 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="15.416" x2="15.416" y1="17.9946" y2="29.1519">
-<stop offset="0" style="stop-color:#D07100"/>
-<stop offset="1" style="stop-color:#A23600"/>
+ <stop offset="0" style="stop-color:#D07100"/>
+ <stop offset="1" style="stop-color:#A23600"/>
</linearGradient>
<rect fill="url(#SVGID_3__)" height="10.501" width="7.001" x="11.916" y="18.322"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="15.416" x2="15.416" y1="28.7466" y2="18.3602">
-<stop offset="0" style="stop-color:#D07100"/>
-<stop offset="1" style="stop-color:#A23600"/>
+ <stop offset="0" style="stop-color:#D07100"/>
+ <stop offset="1" style="stop-color:#A23600"/>
</linearGradient>
<path d="M17.98,19.257v8.633h-5.133v-8.633H17.98 M18.917,18.322h-7.001v10.501h7.001V18.322L18.917,18.322z" fill="url(#SVGID_4_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="15.4136" x2="15.4136" y1="0.0352" y2="17.7271">
-<stop offset="0" style="stop-color:#DE8029"/>
-<stop offset="0.2606" style="stop-color:#DE4E29"/>
-<stop offset="1" style="stop-color:#D82E09"/>
+ <stop offset="0" style="stop-color:#DE8029"/>
+ <stop offset="0.2606" style="stop-color:#DE4E29"/>
+ <stop offset="1" style="stop-color:#D82E09"/>
</linearGradient>
<path d="M15.414,5.489l11.667,11.667l2.333-2.333c0,0-12.586-12.554-13.171-13.175 c-0.587-0.62-0.965-0.652-1.689,0.035c-0.719,0.688-13.14,13.14-13.14,13.14l2.335,2.333L15.414,5.489z" fill="url(#SVGID_5_)"/>
<radialGradient cx="15.2969" cy="1.7559" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="18.6679">
-<stop offset="0" style="stop-color:#F7D481"/>
-<stop offset="1" style="stop-color:#F5340A"/>
+ <stop offset="0" style="stop-color:#F7D481"/>
+ <stop offset="1" style="stop-color:#F5340A"/>
</radialGradient>
<path d="M14.553,2.616c0.724-0.688,1.102-0.653,1.689-0.034c0.516,0.549,10.433,10.442,12.705,12.709 l0.467-0.468c0,0-12.586-12.554-13.171-13.175c-0.587-0.62-0.965-0.652-1.689,0.035c-0.719,0.688-13.14,13.14-13.14,13.14 l0.467,0.465C4.134,13.029,13.917,3.225,14.553,2.616z" fill="url(#SVGID_6_)"/>
-<rect fill-opacity="0.2" height="1.168" stroke-opacity="0.2" width="7.001" x="11.916" y="18.322"/>
+<rect height="1.168" opacity="0.2" width="7.001" x="11.916" y="18.322"/>
<rect fill="none" height="30" width="30" x="0.414"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email_setup.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email_setup.svg Fri May 14 16:09:54 2010 +0300
@@ -1,50 +1,52 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="0.25" style="stop-color:#4F88BD"/>
-<stop offset="0.73" style="stop-color:#0055A3"/>
-<stop offset="1" style="stop-color:#64AEFB"/>
+ <stop offset="0" style="stop-color:#F2F2F2"/>
+ <stop offset="0.25" style="stop-color:#4F88BD"/>
+ <stop offset="0.73" style="stop-color:#0055A3"/>
+ <stop offset="1" style="stop-color:#64AEFB"/>
</linearGradient>
<path d="M30,57.997C14.562,57.997,2,45.439,2,30C2,14.564,14.562,2.002,30,2.002 c15.437,0,28,12.561,28,27.998C58,45.439,45.437,57.997,30,57.997L30,57.997z" fill="url(#SVGID_1_)"/>
<radialGradient cx="312.2188" cy="-353.9521" gradientTransform="matrix(1 0 0 -1 -282.4805 -346.0195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="51.3861">
-<stop offset="0" style="stop-color:#96E9FA"/>
-<stop offset="0.15" style="stop-color:#96E9FA"/>
-<stop offset="0.75" style="stop-color:#005BCC"/>
-<stop offset="1" style="stop-color:#0087D9"/>
+ <stop offset="0.15" style="stop-color:#96E9FA"/>
+ <stop offset="0.75" style="stop-color:#005BCC"/>
+ <stop offset="1" style="stop-color:#0087D9"/>
</radialGradient>
<path d="M57.198,30c0,15.023-12.18,27.198-27.198,27.198C14.979,57.198,2.802,45.023,2.802,30 C2.802,14.982,14.979,2.802,30,2.802C45.019,2.802,57.198,14.982,57.198,30z" fill="url(#SVGID_2_)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -346.0195)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="312.4805" x2="312.4805" y1="-357.0225" y2="-394.2217">
-<stop offset="0" style="stop-color:#0B81FA"/>
-<stop offset="1" style="stop-color:#47DAFA"/>
+ <stop offset="0" style="stop-color:#0B81FA"/>
+ <stop offset="1" style="stop-color:#47DAFA"/>
</linearGradient>
<path d="M29.998,48.545c-5.093,0-9.503-1.832-13.104-5.451c-3.609-3.623-5.436-8.038-5.436-13.12 c0-5.058,1.832-9.457,5.446-13.076c3.621-3.612,8.026-5.441,13.093-5.441c5.093,0,9.503,1.827,13.109,5.43 c3.604,3.604,5.436,8.005,5.436,13.087c0,2.963-0.612,5.579-1.812,7.774c-1.537,2.821-3.797,4.262-6.723,4.262 c-2.53,0-4.466-1.123-5.768-3.338c-1.409,1.153-3.133,1.736-5.143,1.736c-2.812,0-5.106-1.098-6.817-3.253 c-1.549-1.952-2.334-4.358-2.334-7.156c0-2.812,0.789-5.208,2.345-7.125c1.679-2.096,3.973-3.162,6.806-3.162 c1.447,0,2.702,0.278,3.753,0.827V20.13h5.344v13.714c0,2.966,1.27,2.966,1.813,2.966c0.39,0,1.587,0,2.543-2.438 c0.522-1.359,0.789-2.841,0.789-4.397c0-3.666-1.279-6.715-3.925-9.331c-2.603-2.575-5.772-3.881-9.419-3.881 c-3.71,0-6.776,1.26-9.374,3.85c-2.595,2.592-3.858,5.655-3.858,9.36c0,3.712,1.271,6.78,3.876,9.384 c2.57,2.581,5.713,3.884,9.355,3.884h0.798v5.305H29.998L29.998,48.545z M29.1,24.964c-1.16,0-2.03,0.509-2.665,1.547 c-0.594,0.959-0.894,2.133-0.894,3.488c0,4.619,2.029,5.152,3.558,5.152c1.513,0,3.529-0.549,3.529-5.321 C32.629,25.467,30.613,24.964,29.1,24.964L29.1,24.964z" fill="url(#SVGID_3_)"/>
<path d="M47.741,29.974c0,2.843-0.572,5.306-1.715,7.387c-1.39,2.563-3.396,3.846-6.018,3.846 c-2.552,0-4.395-1.282-5.543-3.846c-1.383,1.496-3.175,2.247-5.366,2.247c-2.57,0-4.629-0.982-6.188-2.95 c-1.44-1.818-2.164-4.029-2.164-6.659c0-2.641,0.726-4.844,2.164-6.617c1.539-1.917,3.601-2.871,6.188-2.871 c1.929,0,3.448,0.523,4.554,1.577v-1.156h3.741v12.913c0,2.511,0.868,3.767,2.613,3.767c1.424,0,2.519-0.985,3.287-2.947 c0.562-1.462,0.847-3.022,0.847-4.691c0-3.859-1.388-7.156-4.164-9.899c-2.771-2.744-6.101-4.111-9.982-4.111 c-3.896,0-7.209,1.36-9.939,4.083c-2.726,2.726-4.091,6.03-4.091,9.928c0,3.892,1.366,7.212,4.109,9.95 c2.733,2.745,6.045,4.118,9.922,4.118v3.703c-4.892,0-9.074-1.74-12.538-5.216c-3.468-3.483-5.203-7.674-5.203-12.555 c0-4.87,1.738-9.034,5.214-12.512c3.481-3.467,7.65-5.205,12.527-5.205c4.892,0,9.075,1.728,12.542,5.199 C46.006,20.913,47.741,25.087,47.741,29.974z M33.43,29.832c0-3.78-1.444-5.665-4.33-5.665c-1.443,0-2.563,0.64-3.346,1.932 c-0.68,1.087-1.01,2.386-1.01,3.901c0,3.971,1.449,5.954,4.354,5.954C31.985,35.954,33.43,33.915,33.43,29.832z" fill="#FFFFFF"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
-<path d="M15,29.505c-0.657,0-1.337-0.048-2.019-0.144l-0.594-0.082l-0.435-1.304c-0.171-0.517-0.3-1.313-0.3-1.854 v-0.687c-0.006-0.031-0.063-0.11-0.102-0.131l-1.339-0.548l-0.099-0.032c-0.06,0-0.112,0.021-0.127,0.031l-0.479,0.479 c-0.383,0.383-1.038,0.855-1.522,1.098l-1.232,0.612l-0.477-0.36c-1.081-0.815-2.042-1.775-2.856-2.854L3.057,23.25l0.616-1.23 c0.246-0.489,0.718-1.144,1.099-1.523l0.484-0.485c0.018-0.026,0.033-0.119,0.021-0.157L4.72,18.511 c-0.041-0.095-0.118-0.151-0.159-0.158l-0.676,0.001c-0.545,0-1.343-0.13-1.855-0.302l-1.303-0.434l-0.083-0.594 C0.548,16.346,0.5,15.666,0.5,15.005s0.048-1.34,0.144-2.02l0.083-0.594l1.305-0.434c0.507-0.171,1.306-0.301,1.853-0.301h0.687 c0.031-0.006,0.108-0.062,0.127-0.099l0.553-1.344c0.04-0.098,0.025-0.19,0-0.224L4.772,9.511C4.387,9.125,3.915,8.47,3.674,7.987 L3.059,6.758L3.42,6.279c0.814-1.079,1.774-2.04,2.855-2.855l0.479-0.362l1.231,0.617c0.486,0.244,1.14,0.715,1.522,1.097 l0.487,0.485c0.008,0.005,0.06,0.025,0.119,0.025l0.034-0.017l0.064-0.014l1.285-0.531c0.094-0.04,0.15-0.118,0.156-0.16l0-0.676 c0-0.543,0.129-1.34,0.301-1.854l0.435-1.304l0.594-0.083c0.676-0.095,1.356-0.143,2.02-0.143c0.662,0,1.342,0.048,2.02,0.143 l0.595,0.083l0.434,1.305c0.17,0.515,0.301,1.312,0.301,1.853v0.687c0.006,0.031,0.063,0.11,0.1,0.129l1.341,0.551l0.098,0.031 c0.061,0,0.113-0.02,0.129-0.031l0.478-0.478c0.385-0.385,1.038-0.856,1.521-1.098l1.233-0.613l0.476,0.36 c1.08,0.813,2.041,1.773,2.856,2.855l0.362,0.479L26.27,8.106c-0.253,0.506-0.391,0.758-1.04,1.407L24.744,10 c-0.017,0.026-0.032,0.119-0.021,0.158l0.557,1.344c0.04,0.093,0.117,0.15,0.158,0.156l0.678,0c0.544,0,1.343,0.13,1.854,0.302 l1.303,0.433l0.083,0.594c0.095,0.677,0.144,1.356,0.144,2.021c0,0.666-0.049,1.345-0.144,2.021l-0.085,0.593l-1.303,0.434 c-0.508,0.172-1.305,0.302-1.853,0.302h-0.688c-0.032,0.006-0.109,0.063-0.131,0.102l-0.547,1.339 c-0.04,0.097-0.026,0.191-0.002,0.226l0.479,0.479c0.383,0.381,0.857,1.038,1.099,1.525l0.613,1.226l-0.36,0.479 c-0.815,1.08-1.774,2.041-2.854,2.855l-0.479,0.361l-1.231-0.615c-0.485-0.244-1.14-0.716-1.521-1.097l-0.487-0.486 c-0.006-0.004-0.059-0.023-0.119-0.023l-0.031,0.017l-0.066,0.015l-1.284,0.529c-0.094,0.04-0.15,0.118-0.156,0.159v0.677 c0,0.54-0.129,1.337-0.301,1.853l-0.434,1.306l-0.595,0.082C16.335,29.457,15.656,29.505,15,29.505L15,29.505z M15,11.208 c-2.094,0-3.798,1.704-3.798,3.798c0,2.094,1.704,3.798,3.798,3.798s3.797-1.704,3.797-3.798C18.797,12.912,17.094,11.208,15,11.208 L15,11.208z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<defs>
+</defs>
+<path d="M15,29.505c-0.657,0-1.337-0.048-2.019-0.144l-0.594-0.082l-0.435-1.304c-0.171-0.517-0.3-1.313-0.3-1.854 v-0.687c-0.006-0.031-0.063-0.11-0.102-0.131l-1.339-0.548l-0.099-0.032c-0.06,0-0.112,0.021-0.127,0.031l-0.479,0.479 c-0.383,0.383-1.038,0.855-1.522,1.098l-1.232,0.612l-0.477-0.36c-1.081-0.815-2.042-1.775-2.856-2.854L3.057,23.25l0.616-1.23 c0.246-0.489,0.718-1.144,1.099-1.523l0.484-0.485c0.018-0.026,0.033-0.119,0.021-0.157L4.72,18.511 c-0.041-0.095-0.118-0.151-0.159-0.158l-0.676,0.001c-0.545,0-1.343-0.13-1.855-0.302l-1.303-0.434l-0.083-0.594 C0.548,16.346,0.5,15.666,0.5,15.005s0.048-1.34,0.144-2.02l0.083-0.594l1.305-0.434c0.507-0.171,1.306-0.301,1.853-0.301h0.687 c0.031-0.006,0.108-0.062,0.127-0.099l0.553-1.344c0.04-0.098,0.025-0.19,0-0.224L4.772,9.511C4.387,9.125,3.915,8.47,3.674,7.987 L3.059,6.758L3.42,6.279c0.814-1.079,1.774-2.04,2.855-2.855l0.479-0.362l1.231,0.617c0.486,0.244,1.14,0.715,1.522,1.097 l0.487,0.485c0.008,0.005,0.06,0.025,0.119,0.025l0.034-0.017l0.064-0.014l1.285-0.531c0.094-0.04,0.15-0.118,0.156-0.16l0-0.676 c0-0.543,0.129-1.34,0.301-1.854l0.435-1.304l0.594-0.083c0.676-0.095,1.356-0.143,2.02-0.143c0.662,0,1.342,0.048,2.02,0.143 l0.595,0.083l0.434,1.305c0.17,0.515,0.301,1.312,0.301,1.853v0.687c0.006,0.031,0.063,0.11,0.1,0.129l1.341,0.551l0.098,0.031 c0.061,0,0.113-0.02,0.129-0.031l0.478-0.478c0.385-0.385,1.038-0.856,1.521-1.098l1.233-0.613l0.476,0.36 c1.08,0.813,2.041,1.773,2.856,2.855l0.362,0.479L26.27,8.106c-0.253,0.506-0.391,0.758-1.04,1.407L24.744,10 c-0.017,0.026-0.032,0.119-0.021,0.158l0.557,1.344c0.04,0.093,0.117,0.15,0.158,0.156l0.678,0c0.544,0,1.343,0.13,1.854,0.302 l1.303,0.433l0.083,0.594c0.095,0.677,0.144,1.356,0.144,2.021c0,0.666-0.049,1.345-0.144,2.021l-0.085,0.593l-1.303,0.434 c-0.508,0.172-1.305,0.302-1.853,0.302h-0.688c-0.032,0.006-0.109,0.063-0.131,0.102l-0.547,1.339 c-0.04,0.097-0.026,0.191-0.002,0.226l0.479,0.479c0.383,0.381,0.857,1.038,1.099,1.525l0.613,1.226l-0.36,0.479 c-0.815,1.08-1.774,2.041-2.854,2.855l-0.479,0.361l-1.231-0.615c-0.485-0.244-1.14-0.716-1.521-1.097l-0.487-0.486 c-0.006-0.004-0.059-0.023-0.119-0.023l-0.031,0.017l-0.066,0.015l-1.284,0.529c-0.094,0.04-0.15,0.118-0.156,0.159v0.677 c0,0.54-0.129,1.337-0.301,1.853l-0.434,1.306l-0.595,0.082C16.335,29.457,15.656,29.505,15,29.505L15,29.505z M15,11.208 c-2.094,0-3.798,1.704-3.798,3.798c0,2.094,1.704,3.798,3.798,3.798s3.797-1.704,3.797-3.798C18.797,12.912,17.094,11.208,15,11.208 L15,11.208z" opacity="0.35"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -360.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="282.4795" x2="282.4795" y1="-361.4912" y2="-388.438">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.1" style="stop-color:#FFFFFF"/>
-<stop offset="0.74" style="stop-color:#929497"/>
-<stop offset="1" style="stop-color:#C8C8C8"/>
+ <stop offset="0.1" style="stop-color:#FFFFFF"/>
+ <stop offset="0.74" style="stop-color:#929497"/>
+ <stop offset="1" style="stop-color:#C8C8C8"/>
</linearGradient>
<path d="M26.116,12.624H25.43c-0.437,0-0.906-0.339-1.042-0.754l-0.531-1.285 c-0.196-0.389-0.105-0.96,0.204-1.269l0.485-0.486c0.615-0.615,0.659-0.759,0.916-1.271l0.349-0.695 c-0.761-1.008-1.659-1.906-2.668-2.666l-0.694,0.346c-0.389,0.195-0.961,0.608-1.271,0.917l-0.485,0.486 c-0.31,0.309-0.882,0.401-1.271,0.203L18.138,5.62c-0.417-0.137-0.755-0.608-0.755-1.044V3.889c0-0.437-0.113-1.134-0.251-1.548 l-0.246-0.735C16.269,1.519,15.641,1.472,15,1.472c-0.641,0-1.27,0.047-1.886,0.133L12.869,2.34 c-0.138,0.415-0.251,1.111-0.251,1.548v0.687c0,0.436-0.339,0.906-0.754,1.042l-1.285,0.53C10.19,6.346,9.62,6.254,9.311,5.946 L8.824,5.46C8.515,5.151,7.942,4.739,7.553,4.543L6.858,4.195C5.851,4.956,4.953,5.854,4.192,6.862l0.347,0.694 c0.195,0.391,0.608,0.963,0.917,1.272l0.486,0.486c0.309,0.309,0.4,0.88,0.202,1.269l-0.531,1.286 c-0.136,0.415-0.605,0.754-1.042,0.754H3.884c-0.438,0-1.134,0.112-1.548,0.252l-0.736,0.245c-0.086,0.617-0.134,1.245-0.134,1.886 c0,0.64,0.047,1.269,0.134,1.885l0.736,0.246c0.414,0.139,1.11,0.251,1.548,0.251h0.687c0.438,0,0.906,0.34,1.042,0.755l0.53,1.284 c0.198,0.389,0.106,0.961-0.203,1.269l-0.486,0.486c-0.309,0.308-0.721,0.882-0.917,1.271L4.19,23.146 c0.761,1.008,1.659,1.905,2.667,2.665l0.694-0.345c0.391-0.196,0.963-0.608,1.271-0.917l0.486-0.485 c0.309-0.309,0.881-0.401,1.27-0.203l1.284,0.529c0.416,0.138,0.755,0.608,0.755,1.044v0.687c0,0.438,0.113,1.133,0.251,1.549 l0.245,0.734c0.617,0.086,1.245,0.134,1.886,0.134c0.64,0,1.267-0.048,1.886-0.134l0.244-0.734c0.138-0.416,0.251-1.111,0.251-1.549 v-0.687c0-0.438,0.34-0.906,0.755-1.043l1.284-0.53c0.391-0.197,0.959-0.105,1.269,0.203l0.485,0.485 c0.31,0.309,0.882,0.721,1.272,0.917l0.695,0.347c1.008-0.76,1.904-1.657,2.665-2.666l-0.347-0.693 c-0.194-0.391-0.608-0.964-0.918-1.271l-0.483-0.486c-0.31-0.309-0.4-0.88-0.204-1.27l0.529-1.284 c0.14-0.416,0.607-0.755,1.044-0.755h0.688c0.435,0,1.132-0.111,1.547-0.251l0.736-0.246c0.087-0.615,0.134-1.245,0.134-1.885 c0-0.641-0.047-1.269-0.134-1.886l-0.736-0.245C27.249,12.736,26.553,12.624,26.116,12.624z M15,19.771 c-2.632,0-4.765-2.133-4.765-4.765c0-2.631,2.132-4.765,4.765-4.765c2.63,0,4.764,2.134,4.764,4.765 C19.764,17.638,17.63,19.771,15,19.771z" fill="url(#SVGID_1__)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -360.0195)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="277.6816" x2="287.2746" y1="-377.2241" y2="-377.2241">
-<stop offset="0" style="stop-color:#7A7A7A"/>
-<stop offset="0.5" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#7A7A7A"/>
+ <stop offset="0" style="stop-color:#7A7A7A"/>
+ <stop offset="0.5" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#7A7A7A"/>
</linearGradient>
<path d="M15,19.771c2.63,0,4.764-2.133,4.764-4.765c0-0.125-0.01-0.246-0.018-0.367 c-0.188,2.459-2.239,4.398-4.746,4.398c-2.508,0-4.558-1.939-4.746-4.398c-0.01,0.122-0.019,0.243-0.019,0.367 C10.235,17.638,12.367,19.771,15,19.771z" fill="url(#SVGID_2__)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -360.0195)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="282.4805" x2="282.4805" y1="-383.0635" y2="-366.7921">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.52" style="stop-color:#C8C8C8"/>
-<stop offset="1" style="stop-color:#929497"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="0.52" style="stop-color:#C8C8C8"/>
+ <stop offset="1" style="stop-color:#929497"/>
</linearGradient>
<path d="M15,6.52c-4.687,0-8.487,3.8-8.487,8.487s3.8,8.486,8.487,8.486s8.487-3.799,8.487-8.486 S19.687,6.52,15,6.52z M15,21.563c-3.621,0-6.559-2.935-6.559-6.557c0-3.622,2.937-6.558,6.559-6.558 c3.62,0,6.557,2.936,6.557,6.558C21.557,18.629,18.619,21.563,15,21.563z" fill="url(#SVGID_3__)"/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email_work.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_email_work.svg Fri May 14 16:09:54 2010 +0300
@@ -1,25 +1,26 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="0.25" style="stop-color:#4F88BD"/>
-<stop offset="0.73" style="stop-color:#0055A3"/>
-<stop offset="1" style="stop-color:#64AEFB"/>
+ <stop offset="0" style="stop-color:#F2F2F2"/>
+ <stop offset="0.25" style="stop-color:#4F88BD"/>
+ <stop offset="0.73" style="stop-color:#0055A3"/>
+ <stop offset="1" style="stop-color:#64AEFB"/>
</linearGradient>
<path d="M30,57.997C14.562,57.997,2,45.439,2,30C2,14.564,14.562,2.002,30,2.002 c15.437,0,28,12.561,28,27.998C58,45.439,45.437,57.997,30,57.997L30,57.997z" fill="url(#SVGID_1_)"/>
<radialGradient cx="312.2188" cy="-353.9521" gradientTransform="matrix(1 0 0 -1 -282.4805 -346.0195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="51.3861">
-<stop offset="0" style="stop-color:#96E9FA"/>
-<stop offset="0.15" style="stop-color:#96E9FA"/>
-<stop offset="0.75" style="stop-color:#005BCC"/>
-<stop offset="1" style="stop-color:#0087D9"/>
+ <stop offset="0.15" style="stop-color:#96E9FA"/>
+ <stop offset="0.75" style="stop-color:#005BCC"/>
+ <stop offset="1" style="stop-color:#0087D9"/>
</radialGradient>
<path d="M57.198,30c0,15.023-12.18,27.198-27.198,27.198C14.979,57.198,2.802,45.023,2.802,30 C2.802,14.982,14.979,2.802,30,2.802C45.019,2.802,57.198,14.982,57.198,30z" fill="url(#SVGID_2_)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -346.0195)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="312.4805" x2="312.4805" y1="-357.0225" y2="-394.2217">
-<stop offset="0" style="stop-color:#0B81FA"/>
-<stop offset="1" style="stop-color:#47DAFA"/>
+ <stop offset="0" style="stop-color:#0B81FA"/>
+ <stop offset="1" style="stop-color:#47DAFA"/>
</linearGradient>
<path d="M29.998,48.545c-5.093,0-9.503-1.832-13.104-5.451c-3.609-3.623-5.436-8.038-5.436-13.12 c0-5.058,1.832-9.457,5.446-13.076c3.621-3.612,8.026-5.441,13.093-5.441c5.093,0,9.503,1.827,13.109,5.43 c3.604,3.604,5.436,8.005,5.436,13.087c0,2.963-0.612,5.579-1.812,7.774c-1.537,2.821-3.797,4.262-6.723,4.262 c-2.53,0-4.466-1.123-5.768-3.338c-1.409,1.153-3.133,1.736-5.143,1.736c-2.812,0-5.106-1.098-6.817-3.253 c-1.549-1.952-2.334-4.358-2.334-7.156c0-2.812,0.789-5.208,2.345-7.125c1.679-2.096,3.973-3.162,6.806-3.162 c1.447,0,2.702,0.278,3.753,0.827V20.13h5.344v13.714c0,2.966,1.27,2.966,1.813,2.966c0.39,0,1.587,0,2.543-2.438 c0.522-1.359,0.789-2.841,0.789-4.397c0-3.666-1.279-6.715-3.925-9.331c-2.603-2.575-5.772-3.881-9.419-3.881 c-3.71,0-6.776,1.26-9.374,3.85c-2.595,2.592-3.858,5.655-3.858,9.36c0,3.712,1.271,6.78,3.876,9.384 c2.57,2.581,5.713,3.884,9.355,3.884h0.798v5.305H29.998L29.998,48.545z M29.1,24.964c-1.16,0-2.03,0.509-2.665,1.547 c-0.594,0.959-0.894,2.133-0.894,3.488c0,4.619,2.029,5.152,3.558,5.152c1.513,0,3.529-0.549,3.529-5.321 C32.629,25.467,30.613,24.964,29.1,24.964L29.1,24.964z" fill="url(#SVGID_3_)"/>
<path d="M47.741,29.974c0,2.843-0.572,5.306-1.715,7.387c-1.39,2.563-3.396,3.846-6.018,3.846 c-2.552,0-4.395-1.282-5.543-3.846c-1.383,1.496-3.175,2.247-5.366,2.247c-2.57,0-4.629-0.982-6.188-2.95 c-1.44-1.818-2.164-4.029-2.164-6.659c0-2.641,0.726-4.844,2.164-6.617c1.539-1.917,3.601-2.871,6.188-2.871 c1.929,0,3.448,0.523,4.554,1.577v-1.156h3.741v12.913c0,2.511,0.868,3.767,2.613,3.767c1.424,0,2.519-0.985,3.287-2.947 c0.562-1.462,0.847-3.022,0.847-4.691c0-3.859-1.388-7.156-4.164-9.899c-2.771-2.744-6.101-4.111-9.982-4.111 c-3.896,0-7.209,1.36-9.939,4.083c-2.726,2.726-4.091,6.03-4.091,9.928c0,3.892,1.366,7.212,4.109,9.95 c2.733,2.745,6.045,4.118,9.922,4.118v3.703c-4.892,0-9.074-1.74-12.538-5.216c-3.468-3.483-5.203-7.674-5.203-12.555 c0-4.87,1.738-9.034,5.214-12.512c3.481-3.467,7.65-5.205,12.527-5.205c4.892,0,9.075,1.728,12.542,5.199 C46.006,20.913,47.741,25.087,47.741,29.974z M33.43,29.832c0-3.78-1.444-5.665-4.33-5.665c-1.443,0-2.563,0.64-3.346,1.932 c-0.68,1.087-1.01,2.386-1.01,3.901c0,3.971,1.449,5.954,4.354,5.954C31.985,35.954,33.43,33.915,33.43,29.832z" fill="#FFFFFF"/>
@@ -28,105 +29,165 @@
<rect fill="none" height="30" width="30"/>
<rect fill="none" height="30" width="30"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="654.6" x2="654.6" y1="-558.3" y2="-601.7">
+
<stop offset="0" stop-color="#DFE1E6"/>
+
<stop offset="1" stop-color="#BDBEC3"/>
+
</linearGradient>
<rect fill="url(#SVGID_1__)" height="21.5" width="17.33" x="5.158" y="3.499"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="654.6" x2="654.6" y1="-558.9" y2="-602.2">
+
<stop offset="0" stop-color="#E7E9EF"/>
+
<stop offset="1" stop-color="#C8C9CE"/>
+
</linearGradient>
<path d="M21.99,3.999v20.5h-16.33v-20.5h16.33m0.5-0.501h-17.33v21.5h17.33v-21.5z" fill="url(#SVGID_2__)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="642.6" x2="642.6" y1="-567.9" y2="-562.2">
+
<stop offset="0" stop-color="#75BCFF"/>
+
<stop offset="1" stop-color="#0070A1"/>
+
</linearGradient>
<rect fill="url(#SVGID_3__)" height="3" width="3" x="6.324" y="5.146"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="650.6" x2="650.6" y1="-567.9" y2="-562.2">
+
<stop offset="0" stop-color="#75BCFF"/>
+
<stop offset="1" stop-color="#0070A1"/>
+
</linearGradient>
<rect fill="url(#SVGID_4_)" height="3" width="3" x="10.32" y="5.146"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="666.6" x2="666.6" y1="-567.9" y2="-562.2">
+
<stop offset="0" stop-color="#75BCFF"/>
+
<stop offset="1" stop-color="#0070A1"/>
+
</linearGradient>
<rect fill="url(#SVGID_5_)" height="3" width="3" x="18.32" y="5.146"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="658.6" x2="658.6" y1="-567.9" y2="-562.2">
+
<stop offset="0" stop-color="#75BCFF"/>
+
<stop offset="1" stop-color="#0070A1"/>
+
</linearGradient>
<rect fill="url(#SVGID_6_)" height="3" width="3" x="14.32" y="5.146"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="642.6" x2="642.6" y1="-576.5" y2="-570.8">
+
<stop offset="0" stop-color="#75BCFF"/>
+
<stop offset="1" stop-color="#0070A1"/>
+
</linearGradient>
<rect fill="url(#SVGID_7_)" height="3" width="3" x="6.324" y="9.458"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="650.6" x2="650.6" y1="-576.5" y2="-570.8">
+
<stop offset="0" stop-color="#75BCFF"/>
+
<stop offset="1" stop-color="#0070A1"/>
+
</linearGradient>
<rect fill="url(#SVGID_8_)" height="3" width="3" x="10.32" y="9.458"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="666.6" x2="666.6" y1="-576.5" y2="-570.8">
+
<stop offset="0" stop-color="#75BCFF"/>
+
<stop offset="1" stop-color="#0070A1"/>
+
</linearGradient>
<rect fill="url(#SVGID_9_)" height="3" width="3" x="18.32" y="9.458"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="658.6" x2="658.6" y1="-576.5" y2="-570.8">
+
<stop offset="0" stop-color="#75BCFF"/>
+
<stop offset="1" stop-color="#0070A1"/>
+
</linearGradient>
<rect fill="url(#SVGID_10_)" height="3" width="3" x="14.32" y="9.458"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="642.6" x2="642.6" y1="-594.5" y2="-588.8">
+
<stop offset="0" stop-color="#75BCFF"/>
+
<stop offset="1" stop-color="#0070A1"/>
+
</linearGradient>
<rect fill="url(#SVGID_11_)" height="3" width="3" x="6.324" y="18.46"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="650.6" x2="650.6" y1="-594.5" y2="-588.8">
+
<stop offset="0" stop-color="#75BCFF"/>
+
<stop offset="1" stop-color="#0070A1"/>
+
</linearGradient>
<rect fill="url(#SVGID_12_)" height="3" width="3" x="10.32" y="18.46"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="666.6" x2="666.6" y1="-594.5" y2="-588.8">
+
<stop offset="0" stop-color="#75BCFF"/>
+
<stop offset="1" stop-color="#0070A1"/>
+
</linearGradient>
<rect fill="url(#SVGID_13_)" height="3" width="3" x="18.32" y="18.46"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="658.6" x2="658.6" y1="-594.5" y2="-588.8">
+
<stop offset="0" stop-color="#75BCFF"/>
+
<stop offset="1" stop-color="#0070A1"/>
+
</linearGradient>
<rect fill="url(#SVGID_14_)" height="3" width="3" x="14.32" y="18.46"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="642.6" x2="642.6" y1="-585.5" y2="-579.8">
+
<stop offset="0" stop-color="#75BCFF"/>
+
<stop offset="1" stop-color="#0070A1"/>
+
</linearGradient>
<rect fill="url(#SVGID_15_)" height="3" width="3" x="6.324" y="13.96"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="650.6" x2="650.6" y1="-585.5" y2="-579.8">
+
<stop offset="0" stop-color="#75BCFF"/>
+
<stop offset="1" stop-color="#0070A1"/>
+
</linearGradient>
<rect fill="url(#SVGID_16_)" height="3" width="3" x="10.32" y="13.96"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="666.6" x2="666.6" y1="-585.5" y2="-579.8">
+
<stop offset="0" stop-color="#75BCFF"/>
+
<stop offset="1" stop-color="#0070A1"/>
+
</linearGradient>
<rect fill="url(#SVGID_17_)" height="3" width="3" x="18.32" y="13.96"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="658.6" x2="658.6" y1="-585.5" y2="-579.8">
+
<stop offset="0" stop-color="#75BCFF"/>
+
<stop offset="1" stop-color="#0070A1"/>
+
</linearGradient>
<rect fill="url(#SVGID_18_)" height="3" width="3" x="14.32" y="13.96"/>
-<polygon fill-opacity="0.3" points="22.49,25,22.49,14.85,12.51,11.92,12.51,25" stroke-opacity="0.3" style="enable-background:new;"/>
+<polygon opacity="0.3" points="22.49,25,22.49,14.85,12.51,11.92,12.51,25" style="enable-background:new;"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="665.4" x2="665.4" y1="-582.2" y2="-604.8">
+
<stop offset="0" stop-color="#CCCCCC"/>
+
<stop offset="1" stop-color="#949494"/>
+
</linearGradient>
<polygon fill="url(#SVGID_19_)" points="24.84,16.25,13.51,12.92,13.51,26.5,24.84,26.5"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="665.4" x2="665.4" y1="-582" y2="-605.1">
+
<stop offset="0" stop-color="#DBDDE2"/>
+
<stop offset="1" stop-color="#B5B6BA"/>
+
</linearGradient>
<path d="M14.01,13.58l10.33,3.039v9.38h-10.33v-12.42m-0.5-0.665v13.58h11.33v-10.25l-11.33-3.33z" fill="url(#SVGID_20_)"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_end_call.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_end_call.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
@@ -40,4 +40,4 @@
<path d="M6.355,27.326c2.275-0.843,14.095-2.529,23.646-2.53 c9.552,0,21.371,1.687,23.646,2.53c0.431,0.161,0.804,0.343,1.144,0.531c-0.233-0.341-0.472-0.685-0.733-1.024 c-0.069-0.028-0.127-0.056-0.196-0.082c-2.309-0.856-14.245-2.568-23.858-2.568c-9.616,0-21.553,1.71-23.862,2.566 c-0.07,0.028-0.128,0.058-0.198,0.085c-0.26,0.339-0.5,0.685-0.733,1.023C5.554,27.667,5.924,27.487,6.355,27.326z" fill="url(#SVGID_6_)" fill-opacity="0.5" stroke-opacity="0.5"/>
</g>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_fail.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_fail.svg Fri May 14 16:09:54 2010 +0300
@@ -1,25 +1,27 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="8.9082" y2="51.5718">
-<stop offset="0" style="stop-color:#E6E6E6"/>
-<stop offset="1" style="stop-color:#FFFFFF"/>
+ <stop offset="0" style="stop-color:#E6E6E6"/>
+ <stop offset="1" style="stop-color:#FFFFFF"/>
</linearGradient>
<path d="M30,8.67C18.217,8.67,8.666,18.218,8.666,30c0,11.783,9.551,21.334,21.334,21.334 S51.334,41.783,51.334,30C51.334,18.218,41.783,8.67,30,8.67z" fill="url(#SVGID_1_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="2.002" y2="57.8059">
-<stop offset="0" style="stop-color:#FFA680"/>
-<stop offset="0.7939" style="stop-color:#7D1212"/>
-<stop offset="1" style="stop-color:#F18769"/>
+ <stop offset="0" style="stop-color:#FFA680"/>
+ <stop offset="0.7939" style="stop-color:#7D1212"/>
+ <stop offset="1" style="stop-color:#F18769"/>
</linearGradient>
<path d="M30,2.002C14.535,2.002,2,14.534,2,30s12.535,28.002,28,28.002S58,45.466,58,30 S45.465,2.002,30,2.002z M30,9.307c3.941,0,7.619,1.127,10.758,3.047L12.355,40.763C10.43,37.623,9.305,33.948,9.305,30 C9.305,18.591,18.588,9.307,30,9.307z M30,50.697c-3.943,0-7.615-1.128-10.756-3.048l28.4-28.408 c1.922,3.141,3.051,6.817,3.051,10.759C50.695,41.413,41.41,50.697,30,50.697z" fill="url(#SVGID_2_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="2.752" y2="57.0611">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="0.7939" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#E8522A"/>
+ <stop offset="0" style="stop-color:#FF7236"/>
+ <stop offset="0.7939" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#E8522A"/>
</linearGradient>
<path d="M30,57.252C14.975,57.252,2.75,45.026,2.75,30C2.75,14.976,14.975,2.752,30,2.752 S57.25,14.976,57.25,30C57.25,45.026,45.025,57.252,30,57.252L30,57.252z M18.039,47.793l0.813,0.496 c3.381,2.066,7.234,3.158,11.148,3.158c11.824,0,21.445-9.621,21.445-21.447c0-3.914-1.094-7.77-3.162-11.15l-0.496-0.812 L18.039,47.793z M30,8.557C18.174,8.557,8.555,18.176,8.555,30c0,3.923,1.094,7.781,3.16,11.155l0.498,0.811l29.748-29.754 l-0.813-0.497C37.771,9.649,33.916,8.557,30,8.557L30,8.557z" fill="url(#SVGID_3_)"/>
<rect fill="none" height="60" width="60"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_favourites.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_favourites.svg Fri May 14 16:09:54 2010 +0300
@@ -1,35 +1,33 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="60" width="60"/>
+<linearGradient gradientTransform="matrix(0.9999 -0.0125 -0.0125 -0.9999 2215.6172 4551.269)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2128.8872" x2="-2128.8872" y1="4575.7925" y2="4523.3677">
+ <stop offset="0.3576" style="stop-color:#F2C352"/>
+ <stop offset="0.8909" style="stop-color:#DE7600"/>
+ <stop offset="1" style="stop-color:#E79A26"/>
+</linearGradient>
<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 "/>
<radialGradient cx="-2195.2817" cy="4635.3013" gradientTransform="matrix(0.9721 0 0 -0.9721 2163.7463 4516.3262)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="45.7877">
-<stop offset="0" style="stop-color:#FEE16E"/>
-<stop offset="0.1394" style="stop-color:#FEE16E"/>
-<stop offset="0.5515" style="stop-color:#FFC501"/>
-<stop offset="0.7273" style="stop-color:#F6A800"/>
-<stop offset="1" style="stop-color:#FED43A"/>
+ <stop offset="0.1394" style="stop-color:#FEE16E"/>
+ <stop offset="0.5515" style="stop-color:#FFC501"/>
+ <stop offset="0.7273" style="stop-color:#F6A800"/>
+ <stop offset="1" style="stop-color:#FED43A"/>
</radialGradient>
<polygon fill="url(#SVGID_2_)" points="17.67,36.354 5.021,24.329 22.26,21.604 29.787,5.86 37.705,21.411 55.006,23.705 42.662,36.041 45.828,53.201 30.281,45.274 14.936,53.589 "/>
<radialGradient cx="-2194.7852" cy="4599.8726" gradientTransform="matrix(0.9721 0 0 -0.9721 2163.7463 4516.3262)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="16.3968">
-<stop offset="0" style="stop-color:#FED95A"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+ <stop offset="0" style="stop-color:#FED95A"/>
+ <stop offset="1" style="stop-color:#FFC501"/>
</radialGradient>
<polygon fill="url(#SVGID_3_)" points="30.281,43.875 15.18,52.056 14.936,53.589 30.281,45.274 45.828,53.201 45.543,51.656 "/>
<radialGradient cx="-2194.771" cy="4629.7397" gradientTransform="matrix(0.9721 0 0 -0.9721 2163.7463 4516.3262)" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="63.637">
-<stop offset="0" style="stop-color:#FEF4CE"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+ <stop offset="0" style="stop-color:#FEF4CE"/>
+ <stop offset="1" style="stop-color:#FFC501"/>
</radialGradient>
<polygon fill="url(#SVGID_4_)" points="22.959,23.005 29.787,8.661 37.006,22.811 53.764,24.945 55.006,23.705 37.705,21.411 29.787,5.86 22.26,21.604 5.021,24.329 6.292,25.537 "/>
<rect fill="none" height="60" width="60"/>
-<defs>
-<linearGradient gradientTransform="matrix(0.9999 -0.0125 -0.0125 -0.9999 2215.6172 4551.269)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2128.8872" x2="-2128.8872" y1="4575.7925" y2="4523.3677">
-<stop offset="0" style="stop-color:#F2C352"/>
-<stop offset="0.3576" style="stop-color:#F2C352"/>
-<stop offset="0.8909" style="stop-color:#DE7600"/>
-<stop offset="1" style="stop-color:#E79A26"/>
-</linearGradient>
-</defs>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_filemgr.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_filemgr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,92 +1,100 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2.9995" y2="57.1831">
-<stop offset="0" style="stop-color:#989C9E"/>
-<stop offset="0.8182" style="stop-color:#44454A"/>
-<stop offset="1" style="stop-color:#5D5F63"/>
+ <stop offset="0" style="stop-color:#989C9E"/>
+ <stop offset="0.8182" style="stop-color:#44454A"/>
+ <stop offset="1" style="stop-color:#5D5F63"/>
</linearGradient>
<path d="M53.578,55.479c0,0.839-0.68,1.521-1.521,1.521H7.943c-0.84,0-1.521-0.681-1.521-1.521V4.521 C6.422,3.68,7.104,3,7.943,3h44.113c0.842,0,1.521,0.681,1.521,1.521V55.479z" fill="url(#SVGID_1_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="2.9995" y2="57.1831">
-<stop offset="0" style="stop-color:#D8DDE0"/>
-<stop offset="0.8182" style="stop-color:#5F6169"/>
-<stop offset="1" style="stop-color:#7D7F85"/>
+ <stop offset="0" style="stop-color:#D8DDE0"/>
+ <stop offset="0.8182" style="stop-color:#5F6169"/>
+ <stop offset="1" style="stop-color:#7D7F85"/>
</linearGradient>
<path d="M52.057,3H7.943C7.104,3,6.422,3.68,6.422,4.521v50.958C6.422,56.318,7.104,57,7.943,57h44.113 c0.842,0,1.521-0.681,1.521-1.521V4.521C53.578,3.68,52.898,3,52.057,3z M52.816,55.479c0,0.419-0.34,0.76-0.76,0.76H7.943 c-0.42,0-0.76-0.341-0.76-0.76V4.521c0-0.42,0.34-0.76,0.76-0.76h44.113c0.42,0,0.76,0.34,0.76,0.76V55.479z" fill="url(#SVGID_2_)"/>
-<path d="M49.773,26.578c0,0.839-0.68,1.521-1.52,1.521H11.746c-0.84,0-1.52-0.682-1.52-1.521V8.323 c0-0.84,0.68-1.521,1.52-1.521h36.508c0.84,0,1.52,0.68,1.52,1.521V26.578z" fill="url(#SVGID_3_)"/>
-<path d="M11.746,28.859c-1.258,0-2.281-1.023-2.281-2.281V8.323c0-1.258,1.023-2.281,2.281-2.281 h36.508c1.258,0,2.281,1.023,2.281,2.281v18.254c0,1.258-1.023,2.281-2.281,2.281H11.746z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="6.8027" y2="28.1705">
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="0.7879" style="stop-color:#A6A6A6"/>
+ <stop offset="1" style="stop-color:#B1B1B1"/>
+</linearGradient>
<path d="M49.773,26.578c0,0.839-0.68,1.521-1.52,1.521H11.746c-0.84,0-1.52-0.682-1.52-1.521V8.323 c0-0.84,0.68-1.521,1.52-1.521h36.508c0.84,0,1.52,0.68,1.52,1.521V26.578z" fill="url(#SVGID_3_)"/>
+<path d="M11.746,28.859c-1.258,0-2.281-1.023-2.281-2.281V8.323c0-1.258,1.023-2.281,2.281-2.281 h36.508c1.258,0,2.281,1.023,2.281,2.281v18.254c0,1.258-1.023,2.281-2.281,2.281H11.746z" fill="#020202" opacity="0.2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="30" x2="30" y1="6.8027" y2="28.1705">
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="0.7879" style="stop-color:#A6A6A6"/>
+ <stop offset="1" style="stop-color:#B1B1B1"/>
+</linearGradient>
+<path d="M49.773,26.578c0,0.839-0.68,1.521-1.52,1.521H11.746c-0.84,0-1.52-0.682-1.52-1.521V8.323 c0-0.84,0.68-1.521,1.52-1.521h36.508c0.84,0,1.52,0.68,1.52,1.521V26.578z" fill="url(#SVGID_4_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30" x2="30" y1="14.4082" y2="22.0395">
-<stop offset="0" style="stop-color:#5B5B5B"/>
-<stop offset="1" style="stop-color:#B0B0B0"/>
+ <stop offset="0" style="stop-color:#5B5B5B"/>
+ <stop offset="1" style="stop-color:#B0B0B0"/>
</linearGradient>
<rect fill="url(#SVGID_5_)" height="7.605" width="12.168" x="23.916" y="14.408"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="30" x2="30" y1="15.1685" y2="21.2736">
-<stop offset="0" style="stop-color:#E8E8E8"/>
-<stop offset="1" style="stop-color:#828282"/>
+ <stop offset="0" style="stop-color:#E8E8E8"/>
+ <stop offset="1" style="stop-color:#828282"/>
</linearGradient>
<rect fill="url(#SVGID_6_)" height="6.084" width="10.648" x="24.676" y="15.168"/>
-<path d="M48.254,6.803H11.746c-0.84,0-1.52,0.68-1.52,1.521v18.254c0,0.839,0.68,1.521,1.52,1.521 h36.508c0.84,0,1.52-0.682,1.52-1.521V8.323C49.773,7.483,49.094,6.803,48.254,6.803z M49.014,26.578c0,0.418-0.34,0.761-0.76,0.761 H11.746c-0.42,0-0.76-0.342-0.76-0.761V8.323c0-0.419,0.34-0.76,0.76-0.76h36.508c0.42,0,0.76,0.34,0.76,0.76V26.578z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
-<polygon fill="#FFFFFF" fill-opacity="0.6" points="23.916,22.014 36.084,22.014 35.324,21.253 23.916,21.253 " stroke-opacity="0.6"/>
-<path d="M10.227,36.464v-15.12c0-1.757,1.346-3.133,3.066-3.133h13.936 c2.424,0,2.928,2.088,3.094,2.775l-0.025,0.006c0.133,0.336,0.297,0.863,0.549,1.69c0.023,0.003,0.049,0.005,0.074,0.005 l15.703-0.001c1.738,0,3.15,1.404,3.15,3.131v10.647H10.227z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M10.986,35.704v-14.36c0-1.331,1.012-2.373,2.307-2.373h13.936 c1.824,0,2.182,1.479,2.354,2.193c0,0,0.408,1.323,0.633,2.06c0.1,0.144,0.43,0.223,0.705,0.223l15.703-0.002 c1.318,0,2.391,1.064,2.391,2.371v9.887H10.986z" fill="#020202" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M48.254,6.803H11.746c-0.84,0-1.52,0.68-1.52,1.521v18.254c0,0.839,0.68,1.521,1.52,1.521 h36.508c0.84,0,1.52-0.682,1.52-1.521V8.323C49.773,7.483,49.094,6.803,48.254,6.803z M49.014,26.578c0,0.418-0.34,0.761-0.76,0.761 H11.746c-0.42,0-0.76-0.342-0.76-0.761V8.323c0-0.419,0.34-0.76,0.76-0.76h36.508c0.42,0,0.76,0.34,0.76,0.76V26.578z" fill="#FFFFFF" opacity="0.5"/>
+<polygon fill="#FFFFFF" opacity="0.6" points="23.916,22.014 36.084,22.014 35.324,21.253 23.916,21.253 "/>
+<path d="M10.227,36.464v-15.12c0-1.757,1.346-3.133,3.066-3.133h13.936 c2.424,0,2.928,2.088,3.094,2.775l-0.025,0.006c0.133,0.336,0.297,0.863,0.549,1.69c0.023,0.003,0.049,0.005,0.074,0.005 l15.703-0.001c1.738,0,3.15,1.404,3.15,3.131v10.647H10.227z" fill="#020202" opacity="0.2"/>
+<path d="M10.986,35.704v-14.36c0-1.331,1.012-2.373,2.307-2.373h13.936 c1.824,0,2.182,1.479,2.354,2.193c0,0,0.408,1.323,0.633,2.06c0.1,0.144,0.43,0.223,0.705,0.223l15.703-0.002 c1.318,0,2.391,1.064,2.391,2.371v9.887H10.986z" fill="#020202" opacity="0.3"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="30" x2="30" y1="18.1982" y2="34.3475">
-<stop offset="0" style="stop-color:#FEEFA7"/>
-<stop offset="0.3273" style="stop-color:#FEE570"/>
-<stop offset="0.6485" style="stop-color:#F0C12B"/>
-<stop offset="1" style="stop-color:#E6A501"/>
+ <stop offset="0" style="stop-color:#FEEFA7"/>
+ <stop offset="0.3273" style="stop-color:#FEE570"/>
+ <stop offset="0.6485" style="stop-color:#F0C12B"/>
+ <stop offset="1" style="stop-color:#E6A501"/>
</linearGradient>
<path d="M46.623,23.446H30.992c0,0-1.135,0.069-1.484-0.693c-0.221-0.728-0.666-2.17-0.666-2.17 c-0.219-0.919-0.506-1.611-1.613-1.611H13.293c-0.881,0-1.547,0.722-1.547,1.611v13.6h36.508v-9.126 C48.254,24.168,47.502,23.446,46.623,23.446z" fill="url(#SVGID_7_)"/>
-<path d="M46.623,23.446H30.992c0,0-1.135,0.069-1.484-0.693c-0.221-0.728-0.666-2.17-0.666-2.17 c-0.219-0.919-0.506-1.611-1.613-1.611H13.293c-0.881,0-1.547,0.722-1.547,1.611v0.761c0-0.89,0.666-1.612,1.547-1.612h13.936 c1.107,0,1.395,0.693,1.613,1.612c0,0,0.445,1.44,0.666,2.17c0.35,0.76,1.484,0.692,1.484,0.692h15.631 c0.879,0,1.631,0.722,1.631,1.61v-0.761C48.254,24.168,47.502,23.446,46.623,23.446z" fill="#FCF3D0" fill-opacity="0.8" stroke-opacity="0.8"/>
+<path d="M46.623,23.446H30.992c0,0-1.135,0.069-1.484-0.693c-0.221-0.728-0.666-2.17-0.666-2.17 c-0.219-0.919-0.506-1.611-1.613-1.611H13.293c-0.881,0-1.547,0.722-1.547,1.611v0.761c0-0.89,0.666-1.612,1.547-1.612h13.936 c1.107,0,1.395,0.693,1.613,1.612c0,0,0.445,1.44,0.666,2.17c0.35,0.76,1.484,0.692,1.484,0.692h15.631 c0.879,0,1.631,0.722,1.631,1.61v-0.761C48.254,24.168,47.502,23.446,46.623,23.446z" fill="#FCF3D0" opacity="0.8"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="30" x2="30" y1="31.9014" y2="54.0325">
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="0.7879" style="stop-color:#A6A6A6"/>
+ <stop offset="1" style="stop-color:#B1B1B1"/>
+</linearGradient>
<path d="M50.535,52.436c0,0.839-0.682,1.521-1.521,1.521H10.986c-0.84,0-1.521-0.682-1.521-1.521V33.421 c0-0.84,0.682-1.52,1.521-1.52h38.027c0.84,0,1.521,0.68,1.521,1.52V52.436z" fill="url(#SVGID_8_)"/>
-<path d="M10.986,56.239c-1.678,0-3.043-1.365-3.043-3.042V34.183c0-1.678,1.365-3.042,3.043-3.042 h38.027c1.678,0,3.043,1.364,3.043,3.042v19.014c0,1.677-1.365,3.042-3.043,3.042H10.986z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M10.986,55.479c-1.26,0-2.283-1.023-2.283-2.282V34.183c0-1.258,1.023-2.281,2.283-2.281 h38.027c1.258,0,2.283,1.023,2.283,2.281v19.014c0,1.259-1.025,2.282-2.283,2.282H10.986z" fill="#020202" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M50.535,52.436c0,0.839-0.682,1.521-1.521,1.521H10.986c-0.84,0-1.521-0.682-1.521-1.521V33.421 c0-0.84,0.682-1.52,1.521-1.52h38.027c0.84,0,1.521,0.68,1.521,1.52V52.436z" fill="url(#SVGID_8_)"/>
+<path d="M10.986,56.239c-1.678,0-3.043-1.365-3.043-3.042V34.183c0-1.678,1.365-3.042,3.043-3.042 h38.027c1.678,0,3.043,1.364,3.043,3.042v19.014c0,1.677-1.365,3.042-3.043,3.042H10.986z" fill="#020202" opacity="0.2"/>
+<path d="M10.986,55.479c-1.26,0-2.283-1.023-2.283-2.282V34.183c0-1.258,1.023-2.281,2.283-2.281 h38.027c1.258,0,2.283,1.023,2.283,2.281v19.014c0,1.259-1.025,2.282-2.283,2.282H10.986z" fill="#020202" opacity="0.3"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="30" x2="30" y1="31.9014" y2="54.0325">
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="0.7879" style="stop-color:#A6A6A6"/>
+ <stop offset="1" style="stop-color:#B1B1B1"/>
+</linearGradient>
+<path d="M50.535,52.436c0,0.839-0.682,1.521-1.521,1.521H10.986c-0.84,0-1.521-0.682-1.521-1.521V33.421 c0-0.84,0.682-1.52,1.521-1.52h38.027c0.84,0,1.521,0.68,1.521,1.52V52.436z" fill="url(#SVGID_9_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="30" x2="30" y1="40.2671" y2="48.6622">
-<stop offset="0" style="stop-color:#5B5B5B"/>
-<stop offset="1" style="stop-color:#B0B0B0"/>
+ <stop offset="0" style="stop-color:#5B5B5B"/>
+ <stop offset="1" style="stop-color:#B0B0B0"/>
</linearGradient>
<rect fill="url(#SVGID_10_)" height="8.367" width="13.691" x="23.154" y="40.267"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="30" x2="30" y1="41.0278" y2="47.8963">
-<stop offset="0" style="stop-color:#E8E8E8"/>
-<stop offset="1" style="stop-color:#828282"/>
+ <stop offset="0" style="stop-color:#E8E8E8"/>
+ <stop offset="1" style="stop-color:#828282"/>
</linearGradient>
<rect fill="url(#SVGID_11_)" height="6.845" width="12.168" x="23.916" y="41.028"/>
-<path d="M49.014,31.901H10.986c-0.84,0-1.521,0.68-1.521,1.52v19.015c0,0.839,0.682,1.521,1.521,1.521 h38.027c0.84,0,1.521-0.682,1.521-1.521V33.421C50.535,32.581,49.854,31.901,49.014,31.901z M49.773,52.436 c0,0.419-0.34,0.761-0.76,0.761H10.986c-0.42,0-0.76-0.341-0.76-0.761V33.421c0-0.419,0.34-0.759,0.76-0.759h38.027 c0.42,0,0.76,0.34,0.76,0.759V52.436z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M49.014,31.901H10.986c-0.84,0-1.521,0.68-1.521,1.52v19.015c0,0.839,0.682,1.521,1.521,1.521 h38.027c0.84,0,1.521-0.682,1.521-1.521V33.421C50.535,32.581,49.854,31.901,49.014,31.901z M49.773,52.436 c0,0.419-0.34,0.761-0.76,0.761H10.986c-0.42,0-0.76-0.341-0.76-0.761V33.421c0-0.419,0.34-0.759,0.76-0.759h38.027 c0.42,0,0.76,0.34,0.76,0.759V52.436z" fill="#FFFFFF" opacity="0.5"/>
<polygon fill="#FFFFFF" points="20.814,31.901 22.639,37.226 37.359,37.226 39.184,31.901 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="30" x2="30" y1="31.9014" y2="36.4799">
-<stop offset="0" style="stop-color:#989C9E"/>
-<stop offset="0.8182" style="stop-color:#44454A"/>
-<stop offset="1" style="stop-color:#5D5F63"/>
+ <stop offset="0" style="stop-color:#989C9E"/>
+ <stop offset="0.8182" style="stop-color:#44454A"/>
+ <stop offset="1" style="stop-color:#5D5F63"/>
</linearGradient>
<polygon fill="url(#SVGID_12_)" points="36.846,36.464 23.154,36.464 21.635,31.901 38.365,31.901 "/>
<polygon fill="#FFFFFF" points="21.576,6.803 23.4,11.366 36.6,11.366 38.424,6.803 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="30" x2="30" y1="6.8027" y2="10.6184">
-<stop offset="0" style="stop-color:#989C9E"/>
-<stop offset="0.8182" style="stop-color:#44454A"/>
-<stop offset="1" style="stop-color:#5D5F63"/>
+ <stop offset="0" style="stop-color:#989C9E"/>
+ <stop offset="0.8182" style="stop-color:#44454A"/>
+ <stop offset="1" style="stop-color:#5D5F63"/>
</linearGradient>
<polygon fill="url(#SVGID_13_)" points="36.084,10.605 23.916,10.605 22.395,6.803 37.605,6.803 "/>
-<rect fill="#020202" fill-opacity="0.2" height="1.522" stroke-opacity="0.2" width="36.508" x="11.746" y="30.379"/>
-<rect fill="#020202" fill-opacity="0.1" height="0.76" stroke-opacity="0.1" width="36.508" x="11.746" y="29.62"/>
-<rect fill="#020202" fill-opacity="0.05" height="0.761" stroke-opacity="0.05" width="36.508" x="11.746" y="28.859"/>
-<polygon fill="#FFFFFF" fill-opacity="0.8" points="36.846,48.634 23.154,48.634 23.916,47.873 36.084,47.873 " stroke-opacity="0.8"/>
+<rect fill="#020202" height="1.522" opacity="0.2" width="36.508" x="11.746" y="30.379"/>
+<rect fill="#020202" height="0.76" opacity="0.1" width="36.508" x="11.746" y="29.62"/>
+<rect fill="#020202" height="0.761" opacity="0.05" width="36.508" x="11.746" y="28.859"/>
+<polygon fill="#FFFFFF" opacity="0.8" points="36.846,48.634 23.154,48.634 23.916,47.873 36.084,47.873 "/>
<rect fill="none" height="60" width="60"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="6.8027" y2="28.1705">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.7879" style="stop-color:#A6A6A6"/>
-<stop offset="1" style="stop-color:#B1B1B1"/>
-</linearGradient>
-</defs>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="30" x2="30" y1="31.9014" y2="54.0325">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.7879" style="stop-color:#A6A6A6"/>
-<stop offset="1" style="stop-color:#B1B1B1"/>
-</linearGradient>
-</defs>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_flash.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_flash.svg Fri May 14 16:09:54 2010 +0300
@@ -1,39 +1,39 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="60" width="60.001"/>
<radialGradient cx="-2784.4399" cy="950.8906" gradientTransform="matrix(2.2479 0 0 -2.2479 6289.1426 2167.5063)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="11.5664">
-<stop offset="0" style="stop-color:#C7D4E6"/>
-<stop offset="0.2865" style="stop-color:#C7D4E6"/>
-<stop offset="0.6966" style="stop-color:#7288A2"/>
-<stop offset="1" style="stop-color:#2B3842"/>
+ <stop offset="0" style="stop-color:#C7D4E6"/>
+ <stop offset="0.2865" style="stop-color:#C7D4E6"/>
+ <stop offset="0.6966" style="stop-color:#7288A2"/>
+ <stop offset="1" style="stop-color:#2B3842"/>
</radialGradient>
<path d="M30.001,4C44.36,4,55.999,15.639,55.999,30c0,14.355-11.639,26-25.998,26 C15.644,56,3.999,44.355,3.999,30C3.999,15.639,15.644,4,30.001,4z" fill="url(#SVGID_1_)"/>
-<path d="M10.954,21.855c14.129-24.376,34.65-9.408,38.398,0.283 c0.004,0.043,0.035,0.021,0.021-0.025c-1.256-9.354-9.393-16.57-19.244-16.57c-9.758,0-17.836,7.076-19.209,16.299 C10.909,21.906,10.941,21.922,10.954,21.855z" fill="url(#SVGID_2_)" fill-opacity="0.9" stroke-opacity="0.9"/>
+<linearGradient gradientTransform="matrix(1.1364 0 0 -1.1364 921.2343 225.8096)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-784.1318" x2="-784.1318" y1="179.2046" y2="193.8286">
+ <stop offset="0" style="stop-color:#627995"/>
+ <stop offset="0.8708" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#FFFFFF"/>
+</linearGradient>
+<path d="M10.954,21.855c14.129-24.376,34.65-9.408,38.398,0.283 c0.004,0.043,0.035,0.021,0.021-0.025c-1.256-9.354-9.393-16.57-19.244-16.57c-9.758,0-17.836,7.076-19.209,16.299 C10.909,21.906,10.941,21.922,10.954,21.855z" fill="url(#SVGID_2_)" opacity="0.9"/>
<radialGradient cx="-2784.6987" cy="972.9805" gradientTransform="matrix(2.2479 0 0 -2.2479 6289.1426 2167.5063)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="20.134">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.4831" style="stop-color:#FFFFFF"/>
-<stop offset="0.8989" style="stop-color:#627995"/>
-<stop offset="1" style="stop-color:#3F607E"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="0.4831" style="stop-color:#FFFFFF"/>
+ <stop offset="0.8989" style="stop-color:#627995"/>
+ <stop offset="1" style="stop-color:#3F607E"/>
</radialGradient>
<path d="M30.13,6.475c-9.691,0-17.723,6.912-19.182,15.391c4.369,2.057,7.584-2.965,17.989-2.326 c9.461,0.411,16.292,4.969,20.405,2.609C48.022,13.534,39.923,6.475,30.13,6.475z" fill="url(#SVGID_3_)"/>
<path d="M40.485,13.187c-9.441,0-13.418,7.935-15.832,14.851c-2.535,7.271-4.158,8.449-7.061,8.449h-0.861 c-0.667,0-1.205,0.537-1.205,1.203v6.673c0,0.671,0.538,1.206,1.205,1.206h0.861c8.631,0,12.34-6.012,14.545-11.559 c1.281,0,6.207,0,6.207,0c0.672,0,1.209-0.538,1.209-1.207v-6.672c0-0.671-0.537-1.207-1.209-1.207c0,0-1.121,0-2.246,0 c1.559-2.259,3.027-2.647,4.387-2.647h0.859c0.666,0,1.205-0.542,1.205-1.21v-6.672c0-0.663-0.539-1.207-1.205-1.207L40.485,13.187 L40.485,13.187z" fill="#1F2430"/>
<radialGradient cx="-2784.8672" cy="951.167" gradientTransform="matrix(2.2479 0 0 -2.2479 6289.1426 2167.5063)" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="6.1">
-<stop offset="0" style="stop-color:#1F2430"/>
-<stop offset="0.1011" style="stop-color:#1F2430"/>
-<stop offset="1" style="stop-color:#FFFFFF"/>
+ <stop offset="0" style="stop-color:#1F2430"/>
+ <stop offset="0.1011" style="stop-color:#1F2430"/>
+ <stop offset="1" style="stop-color:#FFFFFF"/>
</radialGradient>
<path d="M40.485,14.391c-8.629,0-12.268,7.097-14.693,14.041l0,0c-2.504,7.183-4.342,9.258-8.199,9.258 h-0.861v6.678h0.861c8.127,0,11.533-5.752,13.721-11.566c0.99,0,7.035,0,7.035,0v-6.67c0,0-2.956,0-4.377,0 c1.818-3.563,3.754-5.064,6.51-5.064h0.863v-6.674h-0.859V14.391z" fill="url(#SVGID_4_)"/>
<path d="M26.401,28.646L26.401,28.646c-2.291,6.567-4.151,9.69-9.023,9.69v5.38c8.25,0,11.383-5.817,13.486-11.557 c0.284,0,6.827,0,6.827,0v-5.387c0,0-4.159,0-4.751,0c2.047-4.433,4.256-6.352,7.752-6.352v-5.381 C32.188,15.041,28.753,21.918,26.401,28.646z" fill="#FFFFFF"/>
<path d="M30.13,6.475c-9.691,0-17.723,6.912-19.182,15.391c4.369,2.057,7.584-2.965,17.989-2.326 c9.461,0.411,16.292,4.969,20.405,2.609C48.022,13.534,39.923,6.475,30.13,6.475z" fill="#FFFFFF" fill-opacity="0.3"/>
<rect fill="none" height="60" width="60.001"/>
-<defs>
-<linearGradient gradientTransform="matrix(1.1364 0 0 -1.1364 921.2343 225.8096)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-784.1318" x2="-784.1318" y1="179.2046" y2="193.8286">
-<stop offset="0" style="stop-color:#627995"/>
-<stop offset="0.8708" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#FFFFFF"/>
-</linearGradient>
-</defs>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_folder.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_folder.svg Fri May 14 16:09:54 2010 +0300
@@ -1,35 +1,36 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<stop offset="0" style="stop-color:#D49757"/>
-<stop offset="0.6182" style="stop-color:#8A4117"/>
-<stop offset="1" style="stop-color:#702200"/>
+ <stop offset="0" style="stop-color:#D49757"/>
+ <stop offset="0.6182" style="stop-color:#8A4117"/>
+ <stop offset="1" style="stop-color:#702200"/>
</linearGradient>
<path d="M53.646,12.358c0,0-22.377,0-22.842,0c-0.463,0-1.002-0.202-1.332-1.01 c-0.207-0.705-0.764-2.297-0.764-2.297c-0.211-0.652-0.494-1.234-1.436-1.234H6.697c-0.824,0-1.428,0.7-1.428,1.562v14.438h49.814 v-9.968C55.084,12.989,54.473,12.358,53.646,12.358z" fill="url(#SVGID_1_)"/>
-<path d="M53.646,12.358c0,0-22.377,0-22.842,0 c-0.463,0-1.002-0.202-1.332-1.01c-0.207-0.705-0.764-2.297-0.764-2.297c-0.211-0.652-0.494-1.234-1.436-1.234H6.697 c-0.824,0-1.428,0.7-1.428,1.562v0.727c0-0.861,0.604-1.562,1.428-1.562h20.576c0.941,0,1.225,0.584,1.436,1.236 c0,0,0.557,1.591,0.764,2.296c0.33,0.806,0.869,1.011,1.332,1.011c0.465,0,22.842,0,22.842,0c0.826,0,1.439,0.628,1.439,1.489 v-0.728C55.084,12.989,54.473,12.358,53.646,12.358z" fill="#FFF7F5" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M53.646,12.358c0,0-22.377,0-22.842,0 c-0.463,0-1.002-0.202-1.332-1.01c-0.207-0.705-0.764-2.297-0.764-2.297c-0.211-0.652-0.494-1.234-1.436-1.234H6.697 c-0.824,0-1.428,0.7-1.428,1.562v0.727c0-0.861,0.604-1.562,1.428-1.562h20.576c0.941,0,1.225,0.584,1.436,1.236 c0,0,0.557,1.591,0.764,2.296c0.33,0.806,0.869,1.011,1.332,1.011c0.465,0,22.842,0,22.842,0c0.826,0,1.439,0.628,1.439,1.489 v-0.728C55.084,12.989,54.473,12.358,53.646,12.358z" enable-background="new " fill="#FFF7F5" opacity="0.5"/>
<rect height="8.728" width="46.906" x="6.73" y="15.817"/>
<rect fill="#F2F2F2" height="7.271" width="45.451" x="7.457" y="16.545"/>
-<polygon fill="#231F20" fill-opacity="0.4" points="55.084,22.362 5.27,22.362 5.27,21.636 55.084,21.636 " stroke-opacity="0.4"/>
-<polygon fill="#231F20" fill-opacity="0.15" points="55.084,21.636 5.27,21.636 5.27,20.908 55.084,20.908 " stroke-opacity="0.15"/>
-<polygon fill="#231F20" fill-opacity="0.05" points="55.084,20.908 5.27,20.908 5.27,20.182 55.084,20.182 " stroke-opacity="0.05"/>
+<polygon enable-background="new " fill="#231F20" opacity="0.4" points="55.084,22.362 5.27,22.362 5.27,21.636 55.084,21.636 "/>
+<polygon enable-background="new " fill="#231F20" opacity="0.15" points="55.084,21.636 5.27,21.636 5.27,20.908 55.084,20.908 "/>
+<polygon enable-background="new " fill="#231F20" opacity="0.05" points="55.084,20.908 5.27,20.908 5.27,20.182 55.084,20.182 "/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 4100.9688)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2164" x2="-2164" y1="4048.7861" y2="4078.6064">
-<stop offset="0" style="stop-color:#C79101"/>
-<stop offset="0.0303" style="stop-color:#C79101"/>
-<stop offset="0.0364" style="stop-color:#FEEFA7"/>
-<stop offset="0.3273" style="stop-color:#FEE570"/>
-<stop offset="0.6727" style="stop-color:#F0C12B"/>
-<stop offset="1" style="stop-color:#E6A501"/>
+ <stop offset="0.0303" style="stop-color:#C79101"/>
+ <stop offset="0.0364" style="stop-color:#FEEFA7"/>
+ <stop offset="0.3273" style="stop-color:#FEE570"/>
+ <stop offset="0.6727" style="stop-color:#F0C12B"/>
+ <stop offset="1" style="stop-color:#E6A501"/>
</linearGradient>
<path d="M56.273,22.362H3.727C2.191,22.362,2,24.065,2,24.065l2.549,25.934 c0.307,2.028,1.822,2.184,2.182,2.184c0.072,0,46.465,0,46.539,0c0.357,0,1.875-0.155,2.18-2.184L58,24.065 C58,24.065,57.809,22.362,56.273,22.362z" fill="url(#SVGID_2_)"/>
<path d="M3.727,23.091h52.547c1.178,0,1.563,0.995,1.68,1.464L58,24.065c0,0-0.191-1.703-1.727-1.703H3.727 C2.191,22.362,2,24.065,2,24.065l0.047,0.489C2.164,24.086,2.549,23.091,3.727,23.091z" fill="#FCF3D0"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 4100.9688)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2164.0166" x2="-2164.0166" y1="4048.7861" y2="4053.1504">
-<stop offset="0" style="stop-color:#FCDA5E"/>
-<stop offset="1" style="stop-color:#FFB418"/>
+ <stop offset="0" style="stop-color:#FCDA5E"/>
+ <stop offset="1" style="stop-color:#FFB418"/>
</linearGradient>
-<path d="M4.334,47.818l0.215,2.181 c0.307,2.028,1.822,2.184,2.182,2.184c0.072,0,46.465,0,46.539,0c0.357,0,1.875-0.155,2.18-2.184l0.184-2.181H4.334z" fill="url(#SVGID_3_)" fill-opacity="0.25" stroke-opacity="0.25"/>
+<path d="M4.334,47.818l0.215,2.181 c0.307,2.028,1.822,2.184,2.182,2.184c0.072,0,46.465,0,46.539,0c0.357,0,1.875-0.155,2.18-2.184l0.184-2.181H4.334z" enable-background="new " fill="url(#SVGID_3_)" opacity="0.25"/>
<rect fill="none" height="59.999" width="60"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_friend.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_friend.svg Fri May 14 16:09:54 2010 +0300
@@ -1,76 +1,75 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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"/>
+<defs>
+</defs>
+<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" enable-background="new " fill="#231F20" 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" enable-background="new " fill="#231F20" opacity="0.3"/>
<rect fill="none" height="60" width="60"/>
-<path d="M34.994,27.07c0.014-0.011,0.029-0.026,0.041-0.038 c0.002,0.009,0.005,0.016,0.008,0.026C35.025,27.061,35.012,27.068,34.994,27.07z M38.518,22.661L38.518,22.661 c-0.018-0.003-0.041-0.014-0.061-0.015C38.477,22.646,38.499,22.657,38.518,22.661z" fill="#231F20" fill-opacity="0.15" stroke-opacity="0.15"/>
+<path d="M34.994,27.07c0.014-0.011,0.029-0.026,0.041-0.038 c0.002,0.009,0.005,0.016,0.008,0.026C35.025,27.061,35.012,27.068,34.994,27.07z M38.518,22.661L38.518,22.661 c-0.018-0.003-0.041-0.014-0.061-0.015C38.477,22.646,38.499,22.657,38.518,22.661z" enable-background="new " fill="#231F20" opacity="0.15"/>
<radialGradient cx="297.79" cy="-375.7397" gradientTransform="matrix(1 0 0 -1 -267.4805 -330.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="16.2293">
-<stop offset="0" style="stop-color:#FFA98E"/>
-<stop offset="0.2" style="stop-color:#FFA98E"/>
-<stop offset="0.96" style="stop-color:#D45D36"/>
-<stop offset="1" style="stop-color:#D45D36"/>
+ <stop offset="0.2" style="stop-color:#FFA98E"/>
+ <stop offset="0.96" style="stop-color:#D45D36"/>
</radialGradient>
<path d="M36.914,38.52c-1.525-0.664-1.477-3.914-0.848-4.897c0.108-0.171,0.209-0.345,0.314-0.515H23.614 c0.105,0.17,0.204,0.344,0.314,0.515c0.63,0.983,0.679,4.233-0.848,4.897c-1.527,0.662,7.098,6.437,7.098,6.437 S38.441,39.182,36.914,38.52z" fill="url(#SVGID_1_)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -330.0195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="297.4756" x2="297.4756" y1="-367.9355" y2="-381.3027">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.39" style="stop-color:#2D9BD2"/>
-<stop offset="0.89" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#1347BA"/>
+ <stop offset="0" style="stop-color:#3BC8EB"/>
+ <stop offset="0.39" style="stop-color:#2D9BD2"/>
+ <stop offset="0.89" style="stop-color:#1347BA"/>
</linearGradient>
<path d="M46.094,41.906c-1.605-0.834-9.564-3.621-9.715-3.795L30.3,43.163l-6.531-5.247 c-0.18,0.27-8.046,3.023-9.866,3.992c-2.083,1.105-5.486,3.646-5.486,9.375h43.158C51.576,45.555,47.695,42.742,46.094,41.906z" fill="url(#SVGID_2_)"/>
-<polygon fill="#020202" fill-opacity="0.3" points="22.282,38.564 30.3,44.955 37.832,38.695 36.379,38.111 30.3,43.163 23.77,37.916 " stroke-opacity="0.3"/>
+<polygon enable-background="new " fill="#020202" opacity="0.3" points="22.282,38.564 30.3,44.955 37.832,38.695 36.379,38.111 30.3,43.163 23.77,37.916 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="9.5718" x2="22.6592" y1="45.0781" y2="45.0781">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+ <stop offset="0" style="stop-color:#3BC8EB"/>
+ <stop offset="1" style="stop-color:#2D9BD2"/>
</linearGradient>
<path d="M22.659,39.577c0,0-11.44,2.987-11.44,11.002c0,0-1.635,0.001-1.647,0 C9.572,45.65,13.418,41.818,22.659,39.577z" fill="url(#SVGID_3_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="37.1855" x2="50.2734" y1="44.8936" y2="44.8936">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+ <stop offset="0" style="stop-color:#3BC8EB"/>
+ <stop offset="1" style="stop-color:#2D9BD2"/>
</linearGradient>
<path d="M37.186,39.393c0,0,11.441,2.986,11.441,11.002c0,0,1.637,0,1.646,0 C50.273,45.465,46.428,41.633,37.186,39.393z" fill="url(#SVGID_4_)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -330.0195)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="297.5371" x2="297.5371" y1="-375.5508" y2="-368.1697">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+ <stop offset="0" style="stop-color:#3BC8EB"/>
+ <stop offset="1" style="stop-color:#2D9BD2"/>
</linearGradient>
<polygon fill="url(#SVGID_5_)" points="30.3,44.955 22.281,38.564 21.815,38.77 30.3,45.531 38.3,38.879 37.834,38.691 "/>
<radialGradient cx="298.5801" cy="-345.8398" gradientTransform="matrix(1 0 0 -1 -267.4805 -330.0195)" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="21.7801">
-<stop offset="0" style="stop-color:#FFE2D9"/>
-<stop offset="0.51" style="stop-color:#FFC6B3"/>
-<stop offset="0.76" style="stop-color:#FFA98E"/>
-<stop offset="1" style="stop-color:#E88160"/>
+ <stop offset="0" style="stop-color:#FFE2D9"/>
+ <stop offset="0.51" style="stop-color:#FFC6B3"/>
+ <stop offset="0.76" style="stop-color:#FFA98E"/>
+ <stop offset="1" style="stop-color:#E88160"/>
</radialGradient>
<path d="M40.584,23.573c-0.055-0.026-0.113-0.03-0.17-0.046c0-0.001,0-0.002,0-0.002 c-0.012-0.002-0.021-0.004-0.033-0.007c-0.084-0.021-0.168-0.041-0.256-0.045c-10.658-1.854-15.548-7.759-15.916-6.195 c-0.294,1.244-3.281,3.935-4.847,5.276c0.013,0.06,0.02,0.114,0.034,0.174c0,0,0.056,0.275,0.174,0.744 c-0.125,0.013-0.246,0.039-0.365,0.089c-0.995,0.42-1.308,2.053-0.698,3.647c0.61,1.594,1.913,2.548,2.909,2.13 c0.061-0.027,0.113-0.071,0.169-0.107c0.579,1.301,1.289,2.697,2.159,4.094c1.458,1.731,3.691,3.766,6.157,3.766 c2.983,0,4.808-1.633,6.063-3.278c0.031-0.068,0.063-0.133,0.103-0.189c0.931-1.453,1.684-2.911,2.293-4.268 c0.975,0.337,2.226-0.569,2.846-2.102C41.85,25.666,41.57,24.017,40.584,23.573z" fill="url(#SVGID_6_)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -330.0195)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="293.6279" x2="302.8386" y1="-368.1089" y2="-358.9682">
-<stop offset="0" style="stop-color:#FFC6B3"/>
-<stop offset="1" style="stop-color:#FFA98E"/>
+ <stop offset="0" style="stop-color:#FFC6B3"/>
+ <stop offset="1" style="stop-color:#FFA98E"/>
</linearGradient>
<path d="M29.463,36.254c-1.816,0-3.646-0.846-4.993-2.121c1.425,1.498,3.343,2.957,5.432,2.957 c2.982,0,4.809-1.633,6.064-3.279c0.031-0.067,0.063-0.133,0.101-0.188c0.932-1.453,1.684-2.911,2.295-4.268 C34.967,35.283,32.447,36.254,29.463,36.254z" fill="url(#SVGID_7_)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -330.0195)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="297.2969" x2="297.2969" y1="-338.9307" y2="-352.4902">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.38" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+ <stop offset="0" style="stop-color:#8A5D3B"/>
+ <stop offset="0.38" style="stop-color:#632F00"/>
+ <stop offset="1" style="stop-color:#361700"/>
</linearGradient>
<path d="M29.603,8.713c-3.695,0-5.473,1.68-6.845,3.436c-2.23,0.345-5.768,2.39-3.27,11.35 c1.565-1.341,4.427-4.978,4.722-6.222c0.371-1.577,5.343,4.451,16.205,6.248c0.127-0.501,0.185-0.797,0.185-0.797 C42.305,15.077,38.594,9.014,29.603,8.713z" fill="url(#SVGID_8_)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -330.0195)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="301.9326" x2="289.6528" y1="-351.9048" y2="-344.6049">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.36" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+ <stop offset="0" style="stop-color:#8A5D3B"/>
+ <stop offset="0.36" style="stop-color:#632F00"/>
+ <stop offset="1" style="stop-color:#361700"/>
</linearGradient>
<path d="M24.221,16.543c0,0,5.316,6.983,16.117,6.971C40.338,23.514,35.251,22.716,24.221,16.543z" fill="url(#SVGID_9_)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -330.0195)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="288.5391" x2="288.6491" y1="-343.1895" y2="-350.9899">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.38" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+ <stop offset="0" style="stop-color:#8A5D3B"/>
+ <stop offset="0.38" style="stop-color:#632F00"/>
+ <stop offset="1" style="stop-color:#361700"/>
</linearGradient>
<path d="M22.943,12.668c0,0-5.204,0.312-3.273,9.132C19.67,21.8,19.034,15.76,22.943,12.668z" fill="url(#SVGID_10_)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -330.0195)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="299.0225" x2="298.6326" y1="-340.0913" y2="-343.6304">
-<stop offset="0" style="stop-color:#A87C4F"/>
-<stop offset="1" style="stop-color:#632F00"/>
+ <stop offset="0" style="stop-color:#A87C4F"/>
+ <stop offset="1" style="stop-color:#632F00"/>
</linearGradient>
<path d="M32.126,13.891c-2.423-0.346-6.521-2.493-8.129-1.726c0,0,5.26-6,14.538,0.831 C38.535,12.997,36.326,14.489,32.126,13.891z" fill="url(#SVGID_11_)"/>
<rect fill="none" height="59.996" width="59.996"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_friends.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_friends.svg Fri May 14 16:09:54 2010 +0300
@@ -1,204 +1,197 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<stop offset="0" style="stop-color:#FFA98E"/>
-<stop offset="0.2" style="stop-color:#FFA98E"/>
-<stop offset="0.9628" style="stop-color:#D45D36"/>
-<stop offset="1" style="stop-color:#D45D36"/>
+ <stop offset="0.2" style="stop-color:#FFA98E"/>
+ <stop offset="0.9628" style="stop-color:#D45D36"/>
</radialGradient>
<path d="M48.205,37.917c-1.123-0.489-1.088-2.883-0.625-3.606c0.08-0.126,0.152-0.253,0.23-0.381h-9.4 c0.076,0.128,0.148,0.255,0.23,0.381c0.465,0.724,0.5,3.117-0.623,3.606c-1.125,0.487,5.227,4.738,5.227,4.738 S49.328,38.404,48.205,37.917z" fill="url(#SVGID_1_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="43.1104" x2="43.1104" y1="37.4727" y2="47.3145">
-<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"/>
+ <stop offset="0" style="stop-color:#3BC8EB"/>
+ <stop offset="0.3879" style="stop-color:#2D9BD2"/>
+ <stop offset="0.8909" style="stop-color:#1347BA"/>
</linearGradient>
<path d="M54.961,40.41c-1.182-0.614-7.041-2.667-7.15-2.795l-4.477,3.722l-4.811-3.864 c-0.133,0.198-5.924,2.227-7.264,2.938c-1.535,0.815-4.039,2.687-4.039,6.904H59C59,43.097,56.145,41.025,54.961,40.41z" fill="url(#SVGID_2_)"/>
-<polygon fill="#020202" fill-opacity="0.3" points="37.43,37.952 43.334,42.655 48.879,38.047 47.811,37.615 43.334,41.337 38.523,37.473 " stroke-opacity="0.3"/>
+<polygon fill="#020202" opacity="0.3" points="37.43,37.952 43.334,42.655 48.879,38.047 47.811,37.615 43.334,41.337 38.523,37.473 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="28.0684" x2="37.707" y1="42.7466" y2="42.7466">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+ <stop offset="0" style="stop-color:#3BC8EB"/>
+ <stop offset="1" style="stop-color:#2D9BD2"/>
</linearGradient>
<path d="M37.707,38.696c0,0-8.424,2.199-8.424,8.1c0,0-1.205,0.002-1.215,0 C28.068,43.167,30.902,40.347,37.707,38.696z" fill="url(#SVGID_3_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="48.4043" x2="58.041" y1="42.6099" y2="42.6099">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+ <stop offset="0" style="stop-color:#3BC8EB"/>
+ <stop offset="1" style="stop-color:#2D9BD2"/>
</linearGradient>
<path d="M48.404,38.56c0,0,8.424,2.199,8.424,8.101c0,0,1.203,0,1.213,0 C58.041,43.029,55.209,40.211,48.404,38.56z" fill="url(#SVGID_4_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="43.1553" x2="43.1553" y1="43.0781" y2="37.6438">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+ <stop offset="0" style="stop-color:#3BC8EB"/>
+ <stop offset="1" style="stop-color:#2D9BD2"/>
</linearGradient>
<polygon fill="url(#SVGID_5_)" points="43.334,42.655 37.428,37.952 37.086,38.1 43.334,43.078 49.225,38.182 48.881,38.042 "/>
<radialGradient cx="-69.8633" cy="-28.6533" gradientTransform="matrix(0.9351 0 0 0.9319 109.2457 47.9072)" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="17.154">
-<stop offset="0" style="stop-color:#FFE2D9"/>
-<stop offset="0.5091" style="stop-color:#FFC6B3"/>
-<stop offset="0.7636" style="stop-color:#FFA98E"/>
-<stop offset="1" style="stop-color:#E88160"/>
+ <stop offset="0" style="stop-color:#FFE2D9"/>
+ <stop offset="0.5091" style="stop-color:#FFC6B3"/>
+ <stop offset="0.7636" style="stop-color:#FFA98E"/>
+ <stop offset="1" style="stop-color:#E88160"/>
</radialGradient>
<path d="M50.906,26.909c-0.039-0.017-0.084-0.02-0.125-0.033v-0.002c-0.008-0.002-0.014-0.002-0.025-0.005 c-0.061-0.017-0.123-0.029-0.186-0.034c-7.85-1.364-11.451-5.712-11.723-4.563c-0.217,0.918-2.416,2.9-3.568,3.886 c0.008,0.047,0.016,0.086,0.023,0.129c0,0,0.043,0.203,0.129,0.548c-0.092,0.01-0.182,0.029-0.268,0.066 c-0.732,0.308-0.963,1.511-0.514,2.687c0.447,1.174,1.406,1.876,2.141,1.566c0.047-0.019,0.084-0.051,0.123-0.078 c0.428,0.957,0.951,1.985,1.594,3.013c1.074,1.279,2.717,2.775,4.531,2.775c2.197,0,3.541-1.204,4.467-2.413 c0.023-0.053,0.047-0.101,0.074-0.141c0.684-1.071,1.24-2.146,1.689-3.144c0.717,0.248,1.637-0.419,2.094-1.547 C51.838,28.452,51.633,27.236,50.906,26.909z" fill="url(#SVGID_6_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="40.2764" x2="47.0569" y1="37.6001" y2="30.8725">
-<stop offset="0" style="stop-color:#FFC6B3"/>
-<stop offset="1" style="stop-color:#FFA98E"/>
+ <stop offset="0" style="stop-color:#FFC6B3"/>
+ <stop offset="1" style="stop-color:#FFA98E"/>
</linearGradient>
<path d="M42.719,36.249c-1.34,0-2.686-0.624-3.68-1.562c1.051,1.103,2.463,2.177,4,2.177 c2.197,0,3.541-1.204,4.467-2.413c0.023-0.053,0.047-0.101,0.074-0.141c0.684-1.071,1.24-2.146,1.689-3.144 C46.77,35.533,44.914,36.249,42.719,36.249z" fill="url(#SVGID_7_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="42.9766" x2="42.9766" y1="16.1133" y2="26.0988">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.3758" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+ <stop offset="0" style="stop-color:#8A5D3B"/>
+ <stop offset="0.3758" style="stop-color:#632F00"/>
+ <stop offset="1" style="stop-color:#361700"/>
</linearGradient>
<path d="M42.818,15.967c-2.721,0-4.029,1.238-5.039,2.53c-1.645,0.254-4.246,1.762-2.408,8.359 c1.152-0.988,3.26-3.666,3.477-4.584c0.273-1.16,3.936,3.278,11.934,4.602c0.094-0.368,0.137-0.587,0.137-0.587 C52.172,20.654,49.439,16.188,42.818,15.967z" fill="url(#SVGID_8_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="46.3916" x2="37.3443" y1="25.6675" y2="20.2965">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.3636" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+ <stop offset="0" style="stop-color:#8A5D3B"/>
+ <stop offset="0.3636" style="stop-color:#632F00"/>
+ <stop offset="1" style="stop-color:#361700"/>
</linearGradient>
<path d="M38.855,21.734c0,0,3.916,5.142,11.869,5.133C50.725,26.867,46.98,26.279,38.855,21.734z" fill="url(#SVGID_9_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="36.5283" x2="36.6077" y1="19.2515" y2="24.9963">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.3758" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+ <stop offset="0" style="stop-color:#8A5D3B"/>
+ <stop offset="0.3758" style="stop-color:#632F00"/>
+ <stop offset="1" style="stop-color:#361700"/>
</linearGradient>
<path d="M37.916,18.881c0,0-3.834,0.23-2.412,6.725C35.504,25.605,35.037,21.157,37.916,18.881z" fill="url(#SVGID_10_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="44.2432" x2="43.9615" y1="16.9707" y2="19.5749">
-<stop offset="0" style="stop-color:#A87C4F"/>
-<stop offset="1" style="stop-color:#632F00"/>
+ <stop offset="0" style="stop-color:#A87C4F"/>
+ <stop offset="1" style="stop-color:#632F00"/>
</linearGradient>
<path d="M44.678,19.781c-1.785-0.255-4.803-1.836-5.986-1.272c0,0,3.873-4.417,10.705,0.612 C49.396,19.121,47.77,20.221,44.678,19.781z" fill="url(#SVGID_11_)"/>
<radialGradient cx="-98.5264" cy="-5.0225" gradientTransform="matrix(0.9351 0 0 0.9319 109.2457 47.9072)" gradientUnits="userSpaceOnUse" id="SVGID_12_" r="12.778">
-<stop offset="0" style="stop-color:#FFA98E"/>
-<stop offset="0.2" style="stop-color:#FFA98E"/>
-<stop offset="0.9628" style="stop-color:#D45D36"/>
-<stop offset="1" style="stop-color:#D45D36"/>
+ <stop offset="0.2" style="stop-color:#FFA98E"/>
+ <stop offset="0.9628" style="stop-color:#D45D36"/>
</radialGradient>
<path d="M21.984,37.917c-1.125-0.489-1.088-2.883-0.625-3.606c0.08-0.126,0.154-0.253,0.234-0.381h-9.402 c0.076,0.128,0.15,0.255,0.23,0.381c0.465,0.724,0.498,3.117-0.625,3.606c-1.125,0.487,5.227,4.738,5.227,4.738 S23.109,38.404,21.984,37.917z" fill="url(#SVGID_12_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="16.8906" x2="16.8906" y1="37.4727" y2="47.3145">
-<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"/>
+ <stop offset="0" style="stop-color:#3BC8EB"/>
+ <stop offset="0.3879" style="stop-color:#2D9BD2"/>
+ <stop offset="0.8909" style="stop-color:#1347BA"/>
</linearGradient>
<path d="M28.742,40.41c-1.182-0.614-7.041-2.667-7.15-2.795l-4.477,3.722l-4.811-3.864 c-0.133,0.198-5.926,2.227-7.266,2.938C3.506,41.226,1,43.097,1,47.314h31.781C32.781,43.097,29.924,41.025,28.742,40.41z" fill="url(#SVGID_13_)"/>
-<polygon fill="#020202" fill-opacity="0.3" points="11.209,37.952 17.115,42.655 22.66,38.047 21.592,37.615 17.115,41.337 12.305,37.473 " stroke-opacity="0.3"/>
+<polygon fill="#020202" opacity="0.3" points="11.209,37.952 17.115,42.655 22.66,38.047 21.592,37.615 17.115,41.337 12.305,37.473 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="1.8496" x2="11.4883" y1="42.7466" y2="42.7466">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+ <stop offset="0" style="stop-color:#3BC8EB"/>
+ <stop offset="1" style="stop-color:#2D9BD2"/>
</linearGradient>
<path d="M11.488,38.696c0,0-8.426,2.199-8.426,8.1c0,0-1.203,0.002-1.213,0 C1.85,43.167,4.682,40.347,11.488,38.696z" fill="url(#SVGID_14_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="22.1836" x2="31.8223" y1="42.6099" y2="42.6099">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+ <stop offset="0" style="stop-color:#3BC8EB"/>
+ <stop offset="1" style="stop-color:#2D9BD2"/>
</linearGradient>
<path d="M22.184,38.56c0,0,8.424,2.199,8.424,8.101c0,0,1.205,0,1.215,0 C31.822,43.029,28.99,40.211,22.184,38.56z" fill="url(#SVGID_15_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="16.9346" x2="16.9346" y1="43.0781" y2="37.6438">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+ <stop offset="0" style="stop-color:#3BC8EB"/>
+ <stop offset="1" style="stop-color:#2D9BD2"/>
</linearGradient>
<polygon fill="url(#SVGID_16_)" points="17.115,42.655 11.209,37.952 10.865,38.1 17.115,43.078 23.004,38.182 22.662,38.042 "/>
<radialGradient cx="-97.9023" cy="-28.6533" gradientTransform="matrix(0.9351 0 0 0.9319 109.2457 47.9072)" gradientUnits="userSpaceOnUse" id="SVGID_17_" r="17.154">
-<stop offset="0" style="stop-color:#FFE2D9"/>
-<stop offset="0.5091" style="stop-color:#FFC6B3"/>
-<stop offset="0.7636" style="stop-color:#FFA98E"/>
-<stop offset="1" style="stop-color:#E88160"/>
+ <stop offset="0" style="stop-color:#FFE2D9"/>
+ <stop offset="0.5091" style="stop-color:#FFC6B3"/>
+ <stop offset="0.7636" style="stop-color:#FFA98E"/>
+ <stop offset="1" style="stop-color:#E88160"/>
</radialGradient>
<path d="M24.686,26.909c-0.039-0.017-0.084-0.02-0.123-0.033v-0.002c-0.012-0.002-0.016-0.002-0.025-0.005 c-0.061-0.017-0.123-0.029-0.188-0.034c-7.848-1.364-11.451-5.712-11.721-4.563c-0.217,0.918-2.416,2.9-3.57,3.886 c0.01,0.047,0.016,0.086,0.025,0.129c0,0,0.041,0.203,0.127,0.548c-0.09,0.01-0.18,0.029-0.268,0.066 c-0.73,0.308-0.963,1.511-0.512,2.687c0.447,1.174,1.406,1.876,2.141,1.566c0.045-0.019,0.084-0.051,0.123-0.078 c0.428,0.957,0.951,1.985,1.59,3.013c1.076,1.279,2.719,2.775,4.535,2.775c2.197,0,3.541-1.204,4.467-2.413 c0.023-0.053,0.045-0.101,0.072-0.141c0.684-1.071,1.242-2.146,1.689-3.144c0.719,0.248,1.637-0.419,2.096-1.547 C25.617,28.452,25.414,27.236,24.686,26.909z" fill="url(#SVGID_17_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="14.0576" x2="20.8372" y1="37.5996" y2="30.873">
-<stop offset="0" style="stop-color:#FFC6B3"/>
-<stop offset="1" style="stop-color:#FFA98E"/>
+ <stop offset="0" style="stop-color:#FFC6B3"/>
+ <stop offset="1" style="stop-color:#FFA98E"/>
</linearGradient>
<path d="M16.5,36.249c-1.34,0-2.688-0.624-3.68-1.562c1.051,1.103,2.463,2.177,4,2.177 c2.197,0,3.541-1.204,4.467-2.413c0.023-0.053,0.045-0.101,0.072-0.141c0.684-1.071,1.242-2.146,1.689-3.144 C20.551,35.533,18.695,36.249,16.5,36.249z" fill="url(#SVGID_18_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="16.7578" x2="16.7578" y1="16.1133" y2="26.0988">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.3758" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+ <stop offset="0" style="stop-color:#8A5D3B"/>
+ <stop offset="0.3758" style="stop-color:#632F00"/>
+ <stop offset="1" style="stop-color:#361700"/>
</linearGradient>
<path d="M16.6,15.967c-2.721,0-4.031,1.238-5.039,2.53c-1.645,0.254-4.25,1.762-2.408,8.359 c1.15-0.988,3.26-3.666,3.477-4.584c0.273-1.16,3.936,3.278,11.934,4.602c0.092-0.368,0.137-0.587,0.137-0.587 C25.955,20.654,23.221,16.188,16.6,15.967z" fill="url(#SVGID_19_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="20.1719" x2="11.1239" y1="25.6675" y2="20.2961">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.3636" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+ <stop offset="0" style="stop-color:#8A5D3B"/>
+ <stop offset="0.3636" style="stop-color:#632F00"/>
+ <stop offset="1" style="stop-color:#361700"/>
</linearGradient>
<path d="M12.637,21.734c0,0,3.914,5.142,11.869,5.133C24.506,26.867,20.762,26.279,12.637,21.734z" fill="url(#SVGID_20_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="10.3096" x2="10.389" y1="19.2515" y2="24.9963">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.3758" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+ <stop offset="0" style="stop-color:#8A5D3B"/>
+ <stop offset="0.3758" style="stop-color:#632F00"/>
+ <stop offset="1" style="stop-color:#361700"/>
</linearGradient>
<path d="M11.697,18.881c0,0-3.834,0.23-2.412,6.725C9.285,25.605,8.818,21.157,11.697,18.881z" fill="url(#SVGID_21_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="18.0244" x2="17.7427" y1="16.9707" y2="19.5754">
-<stop offset="0" style="stop-color:#A87C4F"/>
-<stop offset="1" style="stop-color:#632F00"/>
+ <stop offset="0" style="stop-color:#A87C4F"/>
+ <stop offset="1" style="stop-color:#632F00"/>
</linearGradient>
<path d="M18.457,19.781c-1.783-0.255-4.803-1.836-5.984-1.272c0,0,3.873-4.417,10.705,0.612 C23.178,19.121,21.549,20.221,18.457,19.781z" fill="url(#SVGID_22_)"/>
-<path d="M47.916,41.694c-1.092-0.569-4.482-1.827-7.205-2.838l-1.533-0.569l-0.273-0.11l-0.359-0.139 l-0.686-0.275l-0.424,0.186c0,0-0.006,0.002-0.008,0.004h-0.002c-1.777,0.695-5.18,1.935-6.166,2.458 c-0.385,0.206-0.832,0.477-1.283,0.835c-0.475-0.392-0.914-0.667-1.234-0.835c-0.85-0.439-4.098-1.619-5.91-2.299l-0.17-0.069 l-0.004,0.005l-0.752-0.304l-0.684,0.299c-0.668,0.263-1.492,0.576-2.373,0.911l-0.08,0.031c-2.607,0.99-5.561,2.113-6.693,2.715 c-2.535,1.346-4.359,3.248-5.438,5.615h20.582h5.561h20.494C51.592,43.797,48.686,42.094,47.916,41.694z" fill="#231F20" fill-opacity="0.15" stroke-opacity="0.15"/>
-<path d="M17.193,22.325c-1.205,1.026-1.531,3.083-0.748,5.124c0.732,1.925,2.256,3.218,3.783,3.218 h0.002c0.23,0.475,0.467,0.945,0.713,1.408h-0.07l0.584,0.965c0,0,0.15,0.248,0.33,0.545c0.486-0.827,0.914-1.646,1.262-2.418 c0.719,0.248,1.637-0.419,2.096-1.547c0.473-1.168,0.27-2.384-0.459-2.711c-0.039-0.017-0.084-0.02-0.123-0.033v-0.002 c-0.012-0.002-0.016-0.002-0.025-0.005c-0.061-0.017-0.123-0.029-0.188-0.034c-0.014-0.002-0.027-0.006-0.041-0.008 c-0.029-0.006-0.07-0.015-0.105-0.023c0.121,0.023,0.232,0.049,0.359,0.07c0.092-0.368,0.137-0.587,0.137-0.587 c1.256-5.633-1.479-10.1-8.1-10.32c-0.012,0-0.021,0.003-0.033,0.003C16.395,17.765,16.594,19.881,17.193,22.325z" fill="#231F20" fill-opacity="0.15" stroke-opacity="0.15"/>
-<path d="M37.779,18.497c-1.645,0.254-4.246,1.76-2.41,8.354c-0.068,0.01-0.139,0.023-0.205,0.051 c-0.732,0.308-0.963,1.511-0.514,2.687c0.447,1.174,1.406,1.876,2.141,1.566c0.047-0.019,0.084-0.051,0.123-0.078 c0.359,0.799,0.787,1.648,1.289,2.504c0.564-0.949,1.1-1.934,1.586-2.947c1.395-0.166,2.754-1.375,3.457-3.109 c0.801-1.979,0.545-4.035-0.584-5.104c0.504-2.285,0.584-4.463,0.252-6.444c-0.033-0.002-0.063-0.006-0.096-0.009 C40.098,15.967,38.789,17.205,37.779,18.497z M35.381,26.849c0.014-0.014,0.029-0.027,0.043-0.041 c0.002,0.01,0.004,0.018,0.008,0.027C35.414,26.837,35.396,26.845,35.381,26.849z M39.174,22.101L39.174,22.101 c-0.02-0.004-0.047-0.015-0.066-0.018C39.127,22.086,39.152,22.097,39.174,22.101z" fill="#231F20" fill-opacity="0.15" stroke-opacity="0.15"/>
-<path d="M47.621,42.258c-1.053-0.549-4.424-1.8-7.133-2.807l-1.549-0.574l-0.264-0.108l-0.369-0.142 l-1.045-0.418c-0.033-0.047-0.057-0.107-0.088-0.16c-1.826,0.708-4.971,1.86-5.914,2.361c-0.385,0.206-0.832,0.477-1.283,0.835 c-0.475-0.392-0.914-0.667-1.234-0.835c-0.85-0.439-4.098-1.619-5.91-2.299l-0.092-0.037l-1.285,0.56 c-0.689,0.271-1.549,0.597-2.461,0.943c-2.59,0.986-5.525,2.101-6.619,2.681c-2.309,1.226-4,2.936-5.035,5.057h19.881h5.561h19.785 C50.957,44.163,48.33,42.626,47.621,42.258z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M17.037,27.223c0.641,1.68,1.924,2.807,3.191,2.807c0.131,0,0.264-0.012,0.391-0.037 c0.432,0.934,0.9,1.844,1.398,2.719H22l0.146,0.241c0.334-0.609,0.645-1.212,0.902-1.785c0.719,0.248,1.637-0.419,2.096-1.547 c0.473-1.168,0.27-2.384-0.459-2.711c-0.039-0.017-0.084-0.02-0.123-0.033v-0.002c-0.012-0.002-0.016-0.002-0.025-0.005 c-0.061-0.017-0.123-0.029-0.188-0.034c-0.014-0.002-0.027-0.006-0.041-0.008c-0.029-0.006-0.07-0.015-0.105-0.023 c0.121,0.023,0.232,0.049,0.359,0.07c0.092-0.368,0.137-0.587,0.137-0.587c1.215-5.457-1.322-9.807-7.5-10.273 c-0.182,1.82,0.049,4.01,0.717,6.578C16.682,23.301,16.289,25.27,17.037,27.223z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M37.779,18.497c-1.645,0.254-4.246,1.76-2.41,8.354c-0.068,0.01-0.139,0.023-0.205,0.051 c-0.732,0.308-0.963,1.511-0.514,2.687c0.447,1.174,1.406,1.876,2.141,1.566c0.047-0.019,0.084-0.051,0.123-0.078 c0.268,0.6,0.576,1.224,0.924,1.861c0.551-0.946,1.072-1.918,1.541-2.922c0.025,0.002,0.055,0.002,0.082,0.002 c1.25,0,2.533-1.101,3.195-2.734c0.773-1.902,0.453-3.844-0.701-4.617c0.053-0.229,0.078-0.355,0.078-0.355 c0.502-2.247,0.574-4.381,0.238-6.312C39.926,16.158,38.717,17.299,37.779,18.497z M35.381,26.849 c0.014-0.014,0.029-0.027,0.043-0.041c0.002,0.01,0.004,0.018,0.008,0.027C35.414,26.837,35.396,26.845,35.381,26.849z M39.174,22.101L39.174,22.101c-0.02-0.004-0.047-0.015-0.066-0.018C39.127,22.086,39.152,22.097,39.174,22.101z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M47.916,41.694c-1.092-0.569-4.482-1.827-7.205-2.838l-1.533-0.569l-0.273-0.11l-0.359-0.139 l-0.686-0.275l-0.424,0.186c0,0-0.006,0.002-0.008,0.004h-0.002c-1.777,0.695-5.18,1.935-6.166,2.458 c-0.385,0.206-0.832,0.477-1.283,0.835c-0.475-0.392-0.914-0.667-1.234-0.835c-0.85-0.439-4.098-1.619-5.91-2.299l-0.17-0.069 l-0.004,0.005l-0.752-0.304l-0.684,0.299c-0.668,0.263-1.492,0.576-2.373,0.911l-0.08,0.031c-2.607,0.99-5.561,2.113-6.693,2.715 c-2.535,1.346-4.359,3.248-5.438,5.615h20.582h5.561h20.494C51.592,43.797,48.686,42.094,47.916,41.694z" fill="#231F20" opacity="0.15"/>
+<path d="M17.193,22.325c-1.205,1.026-1.531,3.083-0.748,5.124c0.732,1.925,2.256,3.218,3.783,3.218 h0.002c0.23,0.475,0.467,0.945,0.713,1.408h-0.07l0.584,0.965c0,0,0.15,0.248,0.33,0.545c0.486-0.827,0.914-1.646,1.262-2.418 c0.719,0.248,1.637-0.419,2.096-1.547c0.473-1.168,0.27-2.384-0.459-2.711c-0.039-0.017-0.084-0.02-0.123-0.033v-0.002 c-0.012-0.002-0.016-0.002-0.025-0.005c-0.061-0.017-0.123-0.029-0.188-0.034c-0.014-0.002-0.027-0.006-0.041-0.008 c-0.029-0.006-0.07-0.015-0.105-0.023c0.121,0.023,0.232,0.049,0.359,0.07c0.092-0.368,0.137-0.587,0.137-0.587 c1.256-5.633-1.479-10.1-8.1-10.32c-0.012,0-0.021,0.003-0.033,0.003C16.395,17.765,16.594,19.881,17.193,22.325z" fill="#231F20" opacity="0.15"/>
+<path d="M37.779,18.497c-1.645,0.254-4.246,1.76-2.41,8.354c-0.068,0.01-0.139,0.023-0.205,0.051 c-0.732,0.308-0.963,1.511-0.514,2.687c0.447,1.174,1.406,1.876,2.141,1.566c0.047-0.019,0.084-0.051,0.123-0.078 c0.359,0.799,0.787,1.648,1.289,2.504c0.564-0.949,1.1-1.934,1.586-2.947c1.395-0.166,2.754-1.375,3.457-3.109 c0.801-1.979,0.545-4.035-0.584-5.104c0.504-2.285,0.584-4.463,0.252-6.444c-0.033-0.002-0.063-0.006-0.096-0.009 C40.098,15.967,38.789,17.205,37.779,18.497z M35.381,26.849c0.014-0.014,0.029-0.027,0.043-0.041 c0.002,0.01,0.004,0.018,0.008,0.027C35.414,26.837,35.396,26.845,35.381,26.849z M39.174,22.101L39.174,22.101 c-0.02-0.004-0.047-0.015-0.066-0.018C39.127,22.086,39.152,22.097,39.174,22.101z" fill="#231F20" opacity="0.15"/>
+<path d="M47.621,42.258c-1.053-0.549-4.424-1.8-7.133-2.807l-1.549-0.574l-0.264-0.108l-0.369-0.142 l-1.045-0.418c-0.033-0.047-0.057-0.107-0.088-0.16c-1.826,0.708-4.971,1.86-5.914,2.361c-0.385,0.206-0.832,0.477-1.283,0.835 c-0.475-0.392-0.914-0.667-1.234-0.835c-0.85-0.439-4.098-1.619-5.91-2.299l-0.092-0.037l-1.285,0.56 c-0.689,0.271-1.549,0.597-2.461,0.943c-2.59,0.986-5.525,2.101-6.619,2.681c-2.309,1.226-4,2.936-5.035,5.057h19.881h5.561h19.785 C50.957,44.163,48.33,42.626,47.621,42.258z" fill="#231F20" opacity="0.3"/>
+<path d="M17.037,27.223c0.641,1.68,1.924,2.807,3.191,2.807c0.131,0,0.264-0.012,0.391-0.037 c0.432,0.934,0.9,1.844,1.398,2.719H22l0.146,0.241c0.334-0.609,0.645-1.212,0.902-1.785c0.719,0.248,1.637-0.419,2.096-1.547 c0.473-1.168,0.27-2.384-0.459-2.711c-0.039-0.017-0.084-0.02-0.123-0.033v-0.002c-0.012-0.002-0.016-0.002-0.025-0.005 c-0.061-0.017-0.123-0.029-0.188-0.034c-0.014-0.002-0.027-0.006-0.041-0.008c-0.029-0.006-0.07-0.015-0.105-0.023 c0.121,0.023,0.232,0.049,0.359,0.07c0.092-0.368,0.137-0.587,0.137-0.587c1.215-5.457-1.322-9.807-7.5-10.273 c-0.182,1.82,0.049,4.01,0.717,6.578C16.682,23.301,16.289,25.27,17.037,27.223z" fill="#231F20" opacity="0.3"/>
+<path d="M37.779,18.497c-1.645,0.254-4.246,1.76-2.41,8.354c-0.068,0.01-0.139,0.023-0.205,0.051 c-0.732,0.308-0.963,1.511-0.514,2.687c0.447,1.174,1.406,1.876,2.141,1.566c0.047-0.019,0.084-0.051,0.123-0.078 c0.268,0.6,0.576,1.224,0.924,1.861c0.551-0.946,1.072-1.918,1.541-2.922c0.025,0.002,0.055,0.002,0.082,0.002 c1.25,0,2.533-1.101,3.195-2.734c0.773-1.902,0.453-3.844-0.701-4.617c0.053-0.229,0.078-0.355,0.078-0.355 c0.502-2.247,0.574-4.381,0.238-6.312C39.926,16.158,38.717,17.299,37.779,18.497z M35.381,26.849 c0.014-0.014,0.029-0.027,0.043-0.041c0.002,0.01,0.004,0.018,0.008,0.027C35.414,26.837,35.396,26.845,35.381,26.849z M39.174,22.101L39.174,22.101c-0.02-0.004-0.047-0.015-0.066-0.018C39.127,22.086,39.152,22.097,39.174,22.101z" fill="#231F20" opacity="0.3"/>
<radialGradient cx="-84.3965" cy="-1.04" gradientTransform="matrix(0.9351 0 0 0.9319 109.2457 47.9072)" gradientUnits="userSpaceOnUse" id="SVGID_23_" r="18.6813">
-<stop offset="0" style="stop-color:#FFA98E"/>
-<stop offset="0.2" style="stop-color:#FFA98E"/>
-<stop offset="0.9628" style="stop-color:#D45D36"/>
-<stop offset="1" style="stop-color:#D45D36"/>
+ <stop offset="0.2" style="stop-color:#FFA98E"/>
+ <stop offset="0.9628" style="stop-color:#D45D36"/>
</radialGradient>
<path d="M37.447,39.174c-1.643-0.715-1.59-4.214-0.912-5.273c0.117-0.186,0.225-0.37,0.338-0.554H23.129 c0.113,0.184,0.219,0.368,0.338,0.554c0.678,1.06,0.73,4.559-0.914,5.273c-1.645,0.713,7.641,6.929,7.641,6.929 S39.092,39.887,37.447,39.174z" fill="url(#SVGID_23_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_24_" x1="30.001" x2="30.001" y1="38.5244" y2="52.9141">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="1" style="stop-color:#BA1212"/>
+ <stop offset="0" style="stop-color:#FF7236"/>
+ <stop offset="1" style="stop-color:#BA1212"/>
</linearGradient>
<path d="M47.33,42.822c-1.729-0.9-10.297-3.901-10.459-4.089l-6.545,5.439l-7.031-5.648 c-0.193,0.289-8.662,3.257-10.621,4.298c-2.242,1.189-5.906,3.925-5.906,10.092h46.467C53.234,46.747,49.057,43.719,47.33,42.822z" fill="url(#SVGID_24_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="30.0654" x2="30.0654" y1="37.5811" y2="45.9985">
-<stop offset="0" style="stop-color:#BC1C24"/>
-<stop offset="1" style="stop-color:#6B1C24"/>
+ <stop offset="0" style="stop-color:#BC1C24"/>
+ <stop offset="1" style="stop-color:#6B1C24"/>
</linearGradient>
<polygon fill="url(#SVGID_25_)" points="21.695,39.225 30.326,46.103 38.436,39.365 36.871,38.733 30.326,44.173 23.295,38.524 "/>
<path d="M22.1,40.313c0,0-12.316,3.215-12.316,11.844c0,0-1.76,0.002-1.775,0C8.008,46.851,12.15,42.725,22.1,40.313 z" fill="#FF7B56"/>
<path d="M37.74,40.113c0,0,12.316,3.218,12.316,11.844c0,0,1.762,0,1.775,0C51.832,46.65,47.689,42.525,37.74,40.113 z" fill="#FF7B56"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_26_" x1="30.0645" x2="30.0645" y1="46.7217" y2="38.7736">
-<stop offset="0" style="stop-color:#FFA98E"/>
-<stop offset="0.9628" style="stop-color:#D45D36"/>
-<stop offset="1" style="stop-color:#D45D36"/>
+ <stop offset="0" style="stop-color:#FFA98E"/>
+ <stop offset="0.9628" style="stop-color:#D45D36"/>
</linearGradient>
<polygon fill="url(#SVGID_26_)" points="30.326,46.103 21.691,39.225 21.191,39.445 30.326,46.722 38.938,39.561 38.438,39.358 "/>
<radialGradient cx="-83.4844" cy="-35.5879" gradientTransform="matrix(0.9351 0 0 0.9319 109.2457 47.9072)" gradientUnits="userSpaceOnUse" id="SVGID_27_" r="25.0781">
-<stop offset="0" style="stop-color:#FFE2D9"/>
-<stop offset="0.5091" style="stop-color:#FFC6B3"/>
-<stop offset="0.7636" style="stop-color:#FFA98E"/>
-<stop offset="1" style="stop-color:#E88160"/>
+ <stop offset="0" style="stop-color:#FFE2D9"/>
+ <stop offset="0.5091" style="stop-color:#FFC6B3"/>
+ <stop offset="0.7636" style="stop-color:#FFA98E"/>
+ <stop offset="1" style="stop-color:#E88160"/>
</radialGradient>
<path d="M41.398,23.083c-0.059-0.027-0.125-0.031-0.184-0.051V23.03c-0.012-0.002-0.023-0.004-0.035-0.006 c-0.092-0.023-0.182-0.045-0.275-0.051c-11.475-1.996-16.738-8.354-17.135-6.67c-0.316,1.34-3.535,4.236-5.219,5.682 c0.014,0.064,0.021,0.121,0.035,0.188c0,0,0.063,0.296,0.188,0.801c-0.135,0.014-0.264,0.041-0.393,0.094 c-1.07,0.454-1.406,2.21-0.75,3.928c0.658,1.716,2.059,2.744,3.131,2.294c0.066-0.029,0.121-0.078,0.182-0.115 c0.625,1.4,1.389,2.901,2.326,4.406c1.568,1.865,3.973,4.055,6.627,4.055c3.213,0,5.18-1.758,6.529-3.53 c0.033-0.074,0.068-0.144,0.109-0.204c1.002-1.564,1.813-3.135,2.471-4.594c1.047,0.361,2.395-0.612,3.063-2.263 C42.76,25.336,42.461,23.561,41.398,23.083z" fill="url(#SVGID_27_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_28_" x1="25.8574" x2="35.7696" y1="38.709" y2="28.8743">
-<stop offset="0" style="stop-color:#FFC6B3"/>
-<stop offset="1" style="stop-color:#FFA98E"/>
+ <stop offset="0" style="stop-color:#FFC6B3"/>
+ <stop offset="1" style="stop-color:#FFA98E"/>
</linearGradient>
<path d="M29.426,36.734c-1.955,0-3.926-0.91-5.377-2.283c1.535,1.612,3.6,3.184,5.848,3.184 c3.213,0,5.18-1.758,6.529-3.53c0.033-0.074,0.068-0.144,0.109-0.204c1.002-1.564,1.813-3.135,2.471-4.594 C35.352,35.689,32.639,36.734,29.426,36.734z" fill="url(#SVGID_28_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_29_" x1="29.8047" x2="29.8047" y1="7.3003" y2="21.8973">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.3758" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+ <stop offset="0" style="stop-color:#8A5D3B"/>
+ <stop offset="0.3758" style="stop-color:#632F00"/>
+ <stop offset="1" style="stop-color:#361700"/>
</linearGradient>
<path d="M29.574,7.086c-3.977,0-5.891,1.809-7.369,3.699c-2.4,0.37-6.209,2.57-3.52,12.218 c1.684-1.444,4.768-5.359,5.084-6.699c0.398-1.697,5.75,4.792,17.445,6.727c0.137-0.541,0.197-0.857,0.197-0.857 C43.25,13.937,39.256,7.407,29.574,7.086z" fill="url(#SVGID_29_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_30_" x1="34.7979" x2="21.5721" y1="21.2656" y2="13.414">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.3636" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+ <stop offset="0" style="stop-color:#8A5D3B"/>
+ <stop offset="0.3636" style="stop-color:#632F00"/>
+ <stop offset="1" style="stop-color:#361700"/>
</linearGradient>
<path d="M23.783,15.516c0,0,5.723,7.517,17.35,7.504C41.133,23.02,35.656,22.159,23.783,15.516z" fill="url(#SVGID_30_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_31_" x1="20.3789" x2="20.495" y1="11.8853" y2="20.2845">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.3758" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+ <stop offset="0" style="stop-color:#8A5D3B"/>
+ <stop offset="0.3758" style="stop-color:#632F00"/>
+ <stop offset="1" style="stop-color:#361700"/>
</linearGradient>
<path d="M22.406,11.344c0,0-5.604,0.334-3.525,9.831C18.881,21.175,18.195,14.67,22.406,11.344z" fill="url(#SVGID_31_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_32_" x1="31.6582" x2="31.2464" y1="8.5503" y2="12.3578">
-<stop offset="0" style="stop-color:#A87C4F"/>
-<stop offset="1" style="stop-color:#632F00"/>
+ <stop offset="0" style="stop-color:#A87C4F"/>
+ <stop offset="1" style="stop-color:#632F00"/>
</linearGradient>
<path d="M32.291,12.66c-2.609-0.375-7.02-2.686-8.75-1.859c0,0,5.662-6.459,15.65,0.895 C39.191,11.695,36.813,13.303,32.291,12.66z" fill="url(#SVGID_32_)"/>
<rect fill="none" height="60" width="60"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ftu.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ftu.svg Fri May 14 16:09:54 2010 +0300
@@ -1,110 +1,108 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2.001" y2="57.8555">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+ <stop offset="0.0667" style="stop-color:#D1D7D9"/>
+ <stop offset="0.2606" style="stop-color:#BDC2C4"/>
+ <stop offset="0.6606" style="stop-color:#949DA1"/>
+ <stop offset="0.9636" style="stop-color:#ADB3B5"/>
+ <stop offset="1" style="stop-color:#595C5E"/>
</linearGradient>
<path d="M48.027,54.932c0,1.693-1.375,3.069-3.068,3.069h-29.92c-1.693,0-3.066-1.376-3.066-3.069V5.07 c0-1.696,1.373-3.069,3.066-3.069h29.92c1.693,0,3.068,1.373,3.068,3.069V54.932z" fill="url(#SVGID_1_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="2.001" y2="56.899">
-<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"/>
+ <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="M44.959,2.001h-29.92c-1.693,0-3.066,1.373-3.066,3.069v49.861c0,0.82,0.324,1.56,0.848,2.11 c-0.047-0.187-0.08-0.377-0.08-0.575v-1.535V6.602V5.07c0-1.271,1.031-2.304,2.299-2.304h29.92c1.268,0,2.301,1.033,2.301,2.304 v1.531v48.33v1.535c0,0.198-0.033,0.389-0.08,0.575c0.521-0.551,0.848-1.29,0.848-2.11V5.07C48.027,3.374,46.652,2.001,44.959,2.001 z" fill="url(#SVGID_2_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="5.8916" y2="43.4283">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+ <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="37.589" stroke-opacity="0.6" width="31.453" x="14.273" y="5.836"/>
+<rect fill="url(#SVGID_3_)" height="37.589" opacity="0.6" width="31.453" x="14.273" y="5.836"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="29.999" x2="29.999" y1="6.6548" y2="42.6624">
-<stop offset="0" style="stop-color:#6E6E6E"/>
-<stop offset="1" style="stop-color:#333333"/>
+ <stop offset="0" style="stop-color:#6E6E6E"/>
+ <stop offset="1" style="stop-color:#333333"/>
</linearGradient>
<rect fill="url(#SVGID_4_)" height="36.058" width="29.92" x="15.039" y="6.602"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30" x2="30" y1="7.4214" y2="41.894">
-<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"/>
+ <stop offset="0" style="stop-color:#3BC8EB"/>
+ <stop offset="0.3879" style="stop-color:#2D9BD2"/>
+ <stop offset="0.8909" style="stop-color:#1347BA"/>
</linearGradient>
<rect fill="url(#SVGID_5_)" height="34.521" width="28.383" x="15.809" y="7.37"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="30" x2="30" y1="7.9712" y2="21.69">
-<stop offset="0" style="stop-color:#85EFFF"/>
-<stop offset="1" style="stop-color:#3BA1D9"/>
+ <stop offset="0" style="stop-color:#85EFFF"/>
+ <stop offset="1" style="stop-color:#3BA1D9"/>
</linearGradient>
<polygon fill="url(#SVGID_6_)" points="44.191,19.644 15.809,22.712 15.809,8.137 44.191,8.137 "/>
<rect fill="#9FE4FF" height="0.767" width="28.383" x="15.809" y="7.37"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="30.2236" x2="30.2236" y1="5.8726" y2="2.8032">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#D1D7D9"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#D1D7D9"/>
</linearGradient>
<path d="M26.832,5.836c-0.861,0-1.535-0.563-1.535-1.279v-0.51c0-0.718,0.674-1.28,1.535-1.28h6.785 c0.859,0,1.533,0.563,1.533,1.28v0.51c0,0.716-0.674,1.279-1.533,1.279H26.832z" fill="url(#SVGID_7_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="30.2236" x2="30.2236" y1="3.2158" y2="5.1992">
-<stop offset="0" style="stop-color:#6C7375"/>
-<stop offset="1" style="stop-color:#BDC2C4"/>
+ <stop offset="0" style="stop-color:#6C7375"/>
+ <stop offset="1" style="stop-color:#BDC2C4"/>
</linearGradient>
<path d="M34.383,4.557c0,0.283-0.342,0.514-0.766,0.514h-6.785c-0.424,0-0.768-0.23-0.768-0.514v-0.51 c0-0.283,0.344-0.512,0.768-0.512h6.785c0.424,0,0.766,0.229,0.766,0.512V4.557z" fill="url(#SVGID_8_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="29.8818" x2="29.8818" y1="44.2236" y2="55.628">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#FFFFFF"/>
+ <stop offset="0" style="stop-color:#B6BBBD"/>
+ <stop offset="1" style="stop-color:#FFFFFF"/>
</linearGradient>
-<path d="M27.109,55.7c-1.645,0-2.98-1.323-2.98-2.951v-5.606c0-1.627,1.336-2.951,2.98-2.951 h5.545c1.645,0,2.98,1.324,2.98,2.951v5.606c0,1.628-1.336,2.951-2.98,2.951H27.109z" fill="url(#SVGID_9_)" fill-opacity="0.6" stroke-opacity="0.6"/>
-<path d="M27.105,54.932c-1.219,0-2.211-0.979-2.211-2.183v-5.606c0-1.204,0.992-2.183,2.211-2.183 h5.553c1.219,0,2.209,0.979,2.209,2.183v5.606c0,1.204-0.99,2.183-2.209,2.183H27.105z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M27.109,55.7c-1.645,0-2.98-1.323-2.98-2.951v-5.606c0-1.627,1.336-2.951,2.98-2.951 h5.545c1.645,0,2.98,1.324,2.98,2.951v5.606c0,1.628-1.336,2.951-2.98,2.951H27.109z" fill="url(#SVGID_9_)" opacity="0.6"/>
+<path d="M27.105,54.932c-1.219,0-2.211-0.979-2.211-2.183v-5.606c0-1.204,0.992-2.183,2.211-2.183 h5.553c1.219,0,2.209,0.979,2.209,2.183v5.606c0,1.204-0.99,2.183-2.209,2.183H27.105z" fill="#020202" opacity="0.5"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="29.8818" x2="29.8818" y1="45.6865" y2="54.1806">
-<stop offset="0" style="stop-color:#A6A8AB"/>
-<stop offset="0.703" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#808184"/>
+ <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="M34.102,52.749c0,0.783-0.645,1.417-1.438,1.417h-5.566c-0.793,0-1.436-0.634-1.436-1.417v-5.606 c0-0.783,0.643-1.417,1.436-1.417h5.566c0.793,0,1.438,0.634,1.438,1.417V52.749z" fill="url(#SVGID_10_)"/>
-<path d="M28.73,52.632c-0.846,0-1.533-0.688-1.533-1.534v-2.303c0-0.847,0.688-1.534,1.533-1.534 h2.303c0.846,0,1.533,0.688,1.533,1.534v2.303c0,0.847-0.688,1.534-1.533,1.534H28.73z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M28.73,52.632c-0.846,0-1.533-0.688-1.533-1.534v-2.303c0-0.847,0.688-1.534,1.533-1.534 h2.303c0.846,0,1.533,0.688,1.533,1.534v2.303c0,0.847-0.688,1.534-1.533,1.534H28.73z" fill="#020202" opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="29.8809" x2="29.8809" y1="48.0103" y2="51.8696">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+ <stop offset="0.0667" style="stop-color:#D1D7D9"/>
+ <stop offset="0.2606" style="stop-color:#BDC2C4"/>
+ <stop offset="0.6606" style="stop-color:#949DA1"/>
+ <stop offset="0.9636" style="stop-color:#ADB3B5"/>
+ <stop offset="1" style="stop-color:#595C5E"/>
</linearGradient>
<path d="M28.73,51.863c-0.422,0-0.768-0.345-0.768-0.766v-2.303c0-0.422,0.346-0.767,0.768-0.767h2.303 c0.42,0,0.766,0.345,0.766,0.767v2.303c0,0.421-0.346,0.766-0.766,0.766H28.73z" fill="url(#SVGID_11_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="17.667" x2="17.667" y1="44.917" y2="54.1816">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+ <stop offset="0" style="stop-color:#B6BBBD"/>
+ <stop offset="1" style="stop-color:#F0FBFF"/>
</linearGradient>
-<path d="M17.223,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307 c0-1.624,1.324-2.948,2.949-2.948h0.887c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H17.223z" fill="url(#SVGID_12_)" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M17.223,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307 c0-1.624,1.324-2.948,2.949-2.948h0.887c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H17.223z" fill="url(#SVGID_12_)" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="17.665" x2="17.665" y1="45.6899" y2="53.4106">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+ <stop offset="0" style="stop-color:#231F20"/>
+ <stop offset="1" style="stop-color:#6D6E70"/>
</linearGradient>
-<path d="M17.223,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307 c0-1.201,0.98-2.183,2.184-2.183h0.887c1.205,0,2.182,0.981,2.182,2.183v3.307c0,1.204-0.977,2.183-2.182,2.183H17.223z" fill="url(#SVGID_13_)" fill-opacity="0.7" stroke-opacity="0.7"/>
+<path d="M17.223,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307 c0-1.201,0.98-2.183,2.184-2.183h0.887c1.205,0,2.182,0.981,2.182,2.183v3.307c0,1.204-0.977,2.183-2.182,2.183H17.223z" fill="url(#SVGID_13_)" opacity="0.7"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="17.667" x2="17.667" y1="46.4658" y2="52.6426">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+ <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="M19.525,51.215c0,0.783-0.635,1.417-1.416,1.417h-0.887c-0.779,0-1.414-0.634-1.414-1.417v-3.307 c0-0.78,0.635-1.414,1.414-1.414h0.887c0.781,0,1.416,0.634,1.416,1.414V51.215z" fill="url(#SVGID_14_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="41.6719" x2="41.6719" y1="44.917" y2="54.1816">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+ <stop offset="0" style="stop-color:#B6BBBD"/>
+ <stop offset="1" style="stop-color:#F0FBFF"/>
</linearGradient>
-<path d="M41.229,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307 c0-1.624,1.324-2.948,2.949-2.948h0.885c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H41.229z" fill="url(#SVGID_15_)" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M41.229,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307 c0-1.624,1.324-2.948,2.949-2.948h0.885c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H41.229z" fill="url(#SVGID_15_)" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="41.6709" x2="41.6709" y1="45.6899" y2="53.4106">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+ <stop offset="0" style="stop-color:#231F20"/>
+ <stop offset="1" style="stop-color:#6D6E70"/>
</linearGradient>
-<path d="M41.229,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307 c0-1.201,0.98-2.183,2.184-2.183h0.885c1.205,0,2.184,0.981,2.184,2.183v3.307c0,1.204-0.979,2.183-2.184,2.183H41.229z" fill="url(#SVGID_16_)" fill-opacity="0.7" stroke-opacity="0.7"/>
+<path d="M41.229,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307 c0-1.201,0.98-2.183,2.184-2.183h0.885c1.205,0,2.184,0.981,2.184,2.183v3.307c0,1.204-0.979,2.183-2.184,2.183H41.229z" fill="url(#SVGID_16_)" opacity="0.7"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="41.6719" x2="41.6719" y1="46.4658" y2="52.6426">
-<stop offset="0" style="stop-color:#FFC142"/>
-<stop offset="0.7455" style="stop-color:#CF4E18"/>
-<stop offset="1" style="stop-color:#B52100"/>
+ <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="M43.531,51.215c0,0.783-0.637,1.417-1.418,1.417h-0.885c-0.781,0-1.416-0.634-1.416-1.417v-3.307 c0-0.78,0.635-1.414,1.416-1.414h0.885c0.781,0,1.418,0.634,1.418,1.414V51.215z" fill="url(#SVGID_17_)"/>
<rect fill="none" height="60" width="60"/>
@@ -112,46 +110,72 @@
<g transform="matrix(1 0 0 1 30 30)">
<rect fill="none" height="30" width="30"/>
<linearGradient gradientTransform="matrix(-1 0 0 1 -576.9805 -204.4805)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-595" x2="-595" y1="208" y2="226">
+
<stop offset="0" stop-color="#FFE6DE"/>
+
<stop offset="1" stop-color="#DB7250"/>
+
</linearGradient>
<polygon fill="url(#SVGID_1__)" points="17.98,3.537,20.9,9.609,26.98,12.54,20.9,15.46,17.98,21.54,15.05,15.46,8.977,12.54,15.05,9.609"/>
<linearGradient gradientTransform="matrix(-1 0 0 1 -576.9805 -204.4805)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-595" x2="-595" y1="209.5" y2="224.5">
+
<stop offset="0" stop-color="#FF7236"/>
+
<stop offset="0.79" stop-color="#D11414"/>
+
<stop offset="1" stop-color="#E8522A"/>
+
</linearGradient>
<polygon fill="url(#SVGID_2__)" points="15.55,10.11,17.98,5.07,20.4,10.11,25.44,12.54,20.4,14.96,17.98,20,15.55,14.96,10.51,12.54"/>
<linearGradient gradientTransform="matrix(-1 0 0 1 -576.9805 -204.4805)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="-595" x2="-595" y1="206.9" y2="227.1">
+
<stop offset="0" stop-color="#FF3030"/>
+
<stop offset="1" stop-color="#9C2D31"/>
+
</linearGradient>
<path d="M17.98,3.736l2.773,5.756,0.088,0.182,0.184,0.088,5.754,2.773-5.754,2.775-0.184,0.088-0.088,0.184-2.773,5.752-2.774-5.752-0.088-0.184-0.183-0.088-5.754-2.775,5.754-2.773,0.183-0.088,0.088-0.182,2.77-5.761m0-1.332l-3.3,6.836-6.837,3.295,6.836,3.297,3.295,6.838,3.297-6.838,6.836-3.297-6.85-3.3-3.29-6.836z" fill="url(#SVGID_3__)"/>
<linearGradient gradientTransform="matrix(-1 0 0 1 -576.9805 -204.4805)" gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="-585.2" x2="-585.2" y1="218.8" y2="226.2">
+
<stop offset="0" stop-color="#A6A8AB"/>
+
<stop offset="1" stop-color="#231F20"/>
+
</linearGradient>
-<path d="M6.725,19.12l-4.832,2.328,0.562,0.271h10.15c0.829,0,1.555-0.416,1.997-1.047l-3.222-1.553-2.329-4.832-2.336,4.83z" fill="url(#SVGID_4__)" fill-opacity="0.2" stroke-opacity="0.2" style="enable-background:new;"/>
+<path d="M6.725,19.12l-4.832,2.328,0.562,0.271h10.15c0.829,0,1.555-0.416,1.997-1.047l-3.222-1.553-2.329-4.832-2.336,4.83z" fill="url(#SVGID_4__)" opacity="0.2" style="enable-background:new;"/>
<linearGradient gradientTransform="matrix(-1 0 0 1 -576.9805 -204.4805)" gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="-585.4" x2="-585.4" y1="219.2" y2="226.2">
+
<stop offset="0" stop-color="#A9AAAD"/>
+
<stop offset="1" stop-color="#000000"/>
+
</linearGradient>
-<path d="M6.857,19.25l-4.55,2.193,0.562,0.27h9.735c0.764,0,1.442-0.35,1.891-0.896l-3.251-1.565-2.193-4.551-2.19,4.56z" fill="url(#SVGID_5__)" fill-opacity="0.4" stroke-opacity="0.4" style="enable-background:new;"/>
+<path d="M6.857,19.25l-4.55,2.193,0.562,0.27h9.735c0.764,0,1.442-0.35,1.891-0.896l-3.251-1.565-2.193-4.551-2.19,4.56z" fill="url(#SVGID_5__)" opacity="0.4" style="enable-background:new;"/>
<linearGradient gradientTransform="matrix(-1 0 0 1 -576.9805 -204.4805)" gradientUnits="userSpaceOnUse" id="SVGID_6__" x1="-586" x2="-586" y1="220.1" y2="231.4">
+
<stop offset="0" stop-color="#FFE6DE"/>
+
<stop offset="1" stop-color="#DB7250"/>
+
</linearGradient>
<polygon fill="url(#SVGID_6__)" points="9.052,15.65,10.88,19.44,14.67,21.27,10.88,23.09,9.052,26.88,7.225,23.09,3.434,21.27,7.225,19.44"/>
<linearGradient gradientTransform="matrix(-1 0 0 1 -576.9805 -204.4805)" gradientUnits="userSpaceOnUse" id="SVGID_7__" x1="-586" x2="-586" y1="221.1" y2="230.4">
+
<stop offset="0" stop-color="#FF7236"/>
+
<stop offset="0.79" stop-color="#D11414"/>
+
<stop offset="1" stop-color="#E8522A"/>
+
</linearGradient>
<polygon fill="url(#SVGID_7__)" points="7.536,19.75,9.052,16.6,10.57,19.75,13.71,21.27,10.57,22.78,9.052,25.93,7.536,22.78,4.391,21.27"/>
<linearGradient gradientTransform="matrix(-1 0 0 1 -576.9805 -204.4805)" gradientUnits="userSpaceOnUse" id="SVGID_8__" x1="-586" x2="-586" y1="219.4" y2="232.1">
+
<stop offset="0" stop-color="#FF3030"/>
+
<stop offset="1" stop-color="#9C2D31"/>
+
</linearGradient>
<path d="M9.052,15.77l1.732,3.594,0.055,0.115,0.114,0.055,3.594,1.73-3.594,1.731-0.114,0.055-0.055,0.115-1.728,3.58-1.732-3.59-0.055-0.115-0.115-0.06-3.594-1.732,3.594-1.729,0.114-0.056,0.055-0.114,1.733-3.6m0-0.83l-2.058,4.27-4.27,2.057,4.27,2.062,2.058,4.271,2.058-4.271,4.27-2.062-4.27-2.057-2.058-4.27z" fill="url(#SVGID_8__)"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_games.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_games.svg Fri May 14 16:09:54 2010 +0300
@@ -1,159 +1,160 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<stop offset="0" style="stop-color:#333333"/>
-<stop offset="1" style="stop-color:#A7A8A9"/>
+ <stop offset="0" style="stop-color:#333333"/>
+ <stop offset="1" style="stop-color:#A7A8A9"/>
</linearGradient>
<path d="M27.656,5.649l5.785,0.394l1.092,2.745L32.23,9.758l2.959,1.516l0.109,5.178l-3.068-0.485 l3.068,2.237c0,0-5.514,8.872-1.639,11.192l-4.416,2.117c0,0-5.463-3.121-1.531-9.217C31.645,16.203,27.656,5.649,27.656,5.649z" fill="url(#SVGID_1_)"/>
-<polygon fill="#FFFFFF" fill-opacity="0.5" points="32.23,11.271 35.189,12.787 35.268,16.447 35.299,16.452 35.189,11.273 33.85,10.588 " stroke-opacity="0.5"/>
+<polygon fill="#FFFFFF" opacity="0.5" points="32.23,11.271 35.189,12.787 35.268,16.447 35.299,16.452 35.189,11.273 33.85,10.588 "/>
<path d="M33.441,7.556l0.578,1.448l0.514-0.217l-1.092-2.745l-5.785-0.394c0,0,0.219,0.582,0.504,1.547L33.441,7.556 z" fill="#FFFFFF"/>
<path d="M32.23,17.48l2.457,1.791c0.357-0.659,0.611-1.067,0.611-1.067l-0.42-0.306L32.23,17.48z" fill="#FFFFFF"/>
<path d="M32.33,27.233c-0.115,0.987-0.037,1.904,0.348,2.633l0.982-0.471C32.854,28.914,32.457,28.143,32.33,27.233z " fill="#FFFFFF"/>
-<path d="M33.441,6.936l0.787,1.979l0.305-0.128l-1.092-2.745l-5.785-0.394 c0,0,0.125,0.335,0.309,0.913L33.441,6.936z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
-<polygon fill="#FFFFFF" fill-opacity="0.5" points="32.23,10.651 35.189,12.167 35.279,16.449 35.299,16.452 35.189,11.273 33.186,10.248 " stroke-opacity="0.5"/>
+<path d="M33.441,6.936l0.787,1.979l0.305-0.128l-1.092-2.745l-5.785-0.394 c0,0,0.125,0.335,0.309,0.913L33.441,6.936z" fill="#FFFFFF" opacity="0.5"/>
+<polygon fill="#FFFFFF" opacity="0.5" points="32.23,10.651 35.189,12.167 35.279,16.449 35.299,16.452 35.189,11.273 33.186,10.248 "/>
<path d="M32.299,26.955c-0.076,1.082,0.098,2.057,0.691,2.762l0.67-0.321C32.773,28.864,32.381,27.989,32.299,26.955 z" fill="#FFFFFF"/>
<path d="M32.23,16.86l2.701,1.97c0.223-0.394,0.367-0.625,0.367-0.625l-1.504-1.098L32.23,16.86z" fill="#FFFFFF"/>
-<path d="M32.883,12.973c0.137-1.023,0.125-1.99-0.025-2.895L32.23,9.758l0.521-0.22 c-0.266-1.135-0.76-2.168-1.496-3.093c-0.164-0.205-0.342-0.4-0.52-0.587l-3.08-0.209c0,0,3.988,10.554,0.057,16.647 c-3.932,6.096,1.531,9.217,1.531,9.217l0.713-0.34c-2.512-3.189-1.322-6.021,0.35-9.96c0.674-1.581,1.402-3.31,1.939-5.234 l-0.016-0.011l0.02,0.002C32.516,15.021,32.74,14.026,32.883,12.973z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M32.883,12.973c0.137-1.023,0.125-1.99-0.025-2.895L32.23,9.758l0.521-0.22 c-0.266-1.135-0.76-2.168-1.496-3.093c-0.164-0.205-0.342-0.4-0.52-0.587l-3.08-0.209c0,0,3.988,10.554,0.057,16.647 c-3.932,6.096,1.531,9.217,1.531,9.217l0.713-0.34c-2.512-3.189-1.322-6.021,0.35-9.96c0.674-1.581,1.402-3.31,1.939-5.234 l-0.016-0.011l0.02,0.002C32.516,15.021,32.74,14.026,32.883,12.973z" fill="#231F20" opacity="0.3"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="21.6943" x2="27.5643" y1="21.5898" y2="2.1062">
-<stop offset="0" style="stop-color:#2E3030"/>
-<stop offset="0.6545" style="stop-color:#6E6E6E"/>
-<stop offset="1" style="stop-color:#4D5152"/>
+ <stop offset="0" style="stop-color:#2E3030"/>
+ <stop offset="0.6545" style="stop-color:#6E6E6E"/>
+ <stop offset="1" style="stop-color:#4D5152"/>
</linearGradient>
<path d="M32.131,12.872c1.213-8.979-9.904-10.008-9.904-10.008L17.592,2c0,0-0.477,1.282,2.004,2.599 C15.244,7.53,6.963,13.376,6.555,15.737c-0.271,1.542,4.236,7.189,5.402,3.09c0.777-2.747,5.494-1.03,6.773-1.84 c1.045-0.661,2.186,0.291,2.186,0.291c-9.029,8.198-9.834,16.507-9.834,16.507v11.351h20.432V33.785 C23.324,27.117,30.877,22.202,32.131,12.872z" fill="url(#SVGID_2_)"/>
-<path d="M17.922,10.739l3.496-2.382C21.418,8.357,21.248,13.408,17.922,10.739z" fill="#FCFCFC" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M17.922,10.739l3.496-2.382C21.418,8.357,21.248,13.408,17.922,10.739z" fill="#FCFCFC" opacity="0.3"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="19.6699" x2="19.6699" y1="7.1016" y2="11.1458">
-<stop offset="0" style="stop-color:#1A1A1A"/>
-<stop offset="1" style="stop-color:#4E4E4E"/>
+ <stop offset="0" style="stop-color:#1A1A1A"/>
+ <stop offset="1" style="stop-color:#4E4E4E"/>
</linearGradient>
<path d="M17.922,10.385l3.496-2.243C21.418,8.142,20.67,12.024,17.922,10.385z" fill="url(#SVGID_3_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="9.5703" x2="33.0273" y1="46.6494" y2="46.6494">
-<stop offset="0" style="stop-color:#363636"/>
-<stop offset="0.6545" style="stop-color:#898C8C"/>
-<stop offset="1" style="stop-color:#565C5C"/>
+ <stop offset="0" style="stop-color:#363636"/>
+ <stop offset="0.6545" style="stop-color:#898C8C"/>
+ <stop offset="1" style="stop-color:#565C5C"/>
</linearGradient>
<path d="M33.027,46.647c0,0.838-0.672,1.516-1.514,1.516H10.965c-0.842,0-1.395-0.678-1.395-1.516l0,0 c0-0.835,0.553-1.511,1.395-1.511h20.549C32.355,45.136,33.027,45.812,33.027,46.647L33.027,46.647z" fill="url(#SVGID_4_)"/>
-<path d="M10.965,45.892h20.549c0.709,0,1.293,0.483,1.461,1.135c0.031-0.121,0.053-0.249,0.053-0.379 c0-0.835-0.672-1.511-1.514-1.511H10.965c-0.842,0-1.395,0.676-1.395,1.511c0,0.13,0.016,0.258,0.043,0.379 C9.756,46.375,10.256,45.892,10.965,45.892z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M10.965,45.892h20.549c0.709,0,1.293,0.483,1.461,1.135c0.031-0.121,0.053-0.249,0.053-0.379 c0-0.835-0.672-1.511-1.514-1.511H10.965c-0.842,0-1.395,0.676-1.395,1.511c0,0.13,0.016,0.258,0.043,0.379 C9.756,46.375,10.256,45.892,10.965,45.892z" fill="#FFFFFF" opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="17.2041" x2="34.1982" y1="20.5649" y2="5.97">
-<stop offset="0" style="stop-color:#2E3030"/>
-<stop offset="0.6545" style="stop-color:#6E6E6E"/>
-<stop offset="1" style="stop-color:#4D5152"/>
+ <stop offset="0" style="stop-color:#2E3030"/>
+ <stop offset="0.6545" style="stop-color:#6E6E6E"/>
+ <stop offset="1" style="stop-color:#4D5152"/>
</linearGradient>
<path d="M29.066,5.392l-9.162,11.402c0.576,0.123,1.012,0.483,1.012,0.483 c-0.455,0.413-0.875,0.825-1.289,1.238l0.043,0.192l12.477-5.991C32.576,9.154,31.045,6.858,29.066,5.392z" fill="url(#SVGID_5_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="14.5635" x2="32.4584" y1="20.1465" y2="24.9896">
-<stop offset="0" style="stop-color:#2E3030"/>
-<stop offset="0.6545" style="stop-color:#6E6E6E"/>
-<stop offset="1" style="stop-color:#4D5152"/>
+ <stop offset="0" style="stop-color:#2E3030"/>
+ <stop offset="0.6545" style="stop-color:#6E6E6E"/>
+ <stop offset="1" style="stop-color:#4D5152"/>
</linearGradient>
<path d="M32.131,12.872c0.129-0.939,0.113-1.786-0.002-2.559c-4.604,1.772-10.771,6.632-11.324,7.071 c-8.918,8.165-9.723,16.401-9.723,16.401v0.008l20.432-0.008C23.324,27.117,30.877,22.202,32.131,12.872z" fill="url(#SVGID_6_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="11.082" x2="31.5137" y1="39.4644" y2="39.4644">
-<stop offset="0" style="stop-color:#363636"/>
-<stop offset="0.6545" style="stop-color:#898C8C"/>
-<stop offset="1" style="stop-color:#565C5C"/>
+ <stop offset="0" style="stop-color:#363636"/>
+ <stop offset="0.6545" style="stop-color:#898C8C"/>
+ <stop offset="1" style="stop-color:#565C5C"/>
</linearGradient>
<rect fill="url(#SVGID_7_)" height="11.343" width="20.432" x="11.082" y="33.792"/>
<linearGradient gradientTransform="matrix(1.0123 0 0 1 -4.0079 0)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="13.707" x2="33.2224" y1="33.5234" y2="32.0012">
-<stop offset="0" style="stop-color:#2E3030"/>
-<stop offset="0.0545" style="stop-color:#2E3030"/>
-<stop offset="0.7333" style="stop-color:#8F8F8F"/>
-<stop offset="1" style="stop-color:#4D5152"/>
+ <stop offset="0.0545" style="stop-color:#2E3030"/>
+ <stop offset="0.7333" style="stop-color:#8F8F8F"/>
+ <stop offset="1" style="stop-color:#4D5152"/>
</linearGradient>
<path d="M11.082,33.785h20.432c-2.48-2.008-3.729-3.008-9.955-3.008 C13.785,30.777,11.082,33.785,11.082,33.785z" fill="url(#SVGID_8_)"/>
-<rect fill="#231F20" fill-opacity="0.5" height="0.758" stroke-opacity="0.5" width="20.432" x="11.082" y="44.378"/>
-<rect fill="#FFFFFF" fill-opacity="0.3" height="0.756" stroke-opacity="0.3" width="20.432" x="11.082" y="33.785"/>
-<rect fill="#FFFFFF" fill-opacity="0.2" height="0.758" stroke-opacity="0.2" width="20.432" x="11.082" y="34.541"/>
-<rect fill="#FFFFFF" fill-opacity="0.1" height="0.755" stroke-opacity="0.1" width="20.432" x="11.082" y="35.299"/>
-<rect fill="#231F20" fill-opacity="0.3" height="0.755" stroke-opacity="0.3" width="20.432" x="11.082" y="43.623"/>
-<rect fill="#231F20" fill-opacity="0.1" height="0.758" stroke-opacity="0.1" width="20.432" x="11.082" y="42.864"/>
+<rect fill="#231F20" height="0.758" opacity="0.5" width="20.432" x="11.082" y="44.378"/>
+<rect fill="#FFFFFF" height="0.756" opacity="0.3" width="20.432" x="11.082" y="33.785"/>
+<rect fill="#FFFFFF" height="0.758" opacity="0.2" width="20.432" x="11.082" y="34.541"/>
+<rect fill="#FFFFFF" height="0.755" opacity="0.1" width="20.432" x="11.082" y="35.299"/>
+<rect fill="#231F20" height="0.755" opacity="0.3" width="20.432" x="11.082" y="43.623"/>
+<rect fill="#231F20" height="0.758" opacity="0.1" width="20.432" x="11.082" y="42.864"/>
<path d="M27.799,28.044c-0.25,2.393,0.572,4.693,3.715,7.255v-1.514C29.037,31.77,28.006,29.913,27.799,28.044z" fill="#FFFFFF"/>
-<path d="M22.227,4.377c0,0,9.34,0.87,9.957,7.938c0.684-8.461-9.957-9.451-9.957-9.451L17.592,2 c0,0-0.266,0.718,0.639,1.633L22.227,4.377z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M11.082,33.785v1.514c0,0,0.805-8.31,9.834-16.508c0,0-0.469-0.386-1.078-0.493 C11.826,26.152,11.082,33.785,11.082,33.785z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M19.596,6.112c-0.479-0.254-0.846-0.504-1.127-0.748C13.955,8.452,6.932,13.567,6.555,15.737 c-0.043,0.241,0.033,0.586,0.195,0.978C8.086,14.098,15.545,8.84,19.596,6.112z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M11.082,33.785v0.756c0,0,0.805-8.309,9.834-16.507c0,0-0.195-0.157-0.49-0.297 C11.863,25.782,11.082,33.785,11.082,33.785z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M22.227,3.621c0,0,9.664,0.897,9.984,8.3c0.328-8.1-9.984-9.058-9.984-9.058L17.592,2 c0,0-0.111,0.305,0.061,0.768L22.227,3.621z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M22.227,4.377c0,0,9.34,0.87,9.957,7.938c0.684-8.461-9.957-9.451-9.957-9.451L17.592,2 c0,0-0.266,0.718,0.639,1.633L22.227,4.377z" fill="#FFFFFF" opacity="0.5"/>
+<path d="M11.082,33.785v1.514c0,0,0.805-8.31,9.834-16.508c0,0-0.469-0.386-1.078-0.493 C11.826,26.152,11.082,33.785,11.082,33.785z" fill="#FFFFFF" opacity="0.5"/>
+<path d="M19.596,6.112c-0.479-0.254-0.846-0.504-1.127-0.748C13.955,8.452,6.932,13.567,6.555,15.737 c-0.043,0.241,0.033,0.586,0.195,0.978C8.086,14.098,15.545,8.84,19.596,6.112z" fill="#FFFFFF" opacity="0.5"/>
+<path d="M11.082,33.785v0.756c0,0,0.805-8.309,9.834-16.507c0,0-0.195-0.157-0.49-0.297 C11.863,25.782,11.082,33.785,11.082,33.785z" fill="#FFFFFF" opacity="0.5"/>
+<path d="M22.227,3.621c0,0,9.664,0.897,9.984,8.3c0.328-8.1-9.984-9.058-9.984-9.058L17.592,2 c0,0-0.111,0.305,0.061,0.768L22.227,3.621z" fill="#FFFFFF" opacity="0.5"/>
<path d="M27.77,27.689c-0.119,2.25,0.777,4.435,3.744,6.851v-0.756C28.879,31.639,27.881,29.676,27.77,27.689z" fill="#FFFFFF"/>
-<path d="M19.596,5.356c-0.225-0.119-0.416-0.237-0.594-0.355C14.533,8.034,6.945,13.48,6.555,15.737 c-0.027,0.152-0.008,0.343,0.051,0.56C7.404,13.822,15.361,8.208,19.596,5.356z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M19.596,5.356c-0.225-0.119-0.416-0.237-0.594-0.355C14.533,8.034,6.945,13.48,6.555,15.737 c-0.027,0.152-0.008,0.343,0.051,0.56C7.404,13.822,15.361,8.208,19.596,5.356z" fill="#FFFFFF" opacity="0.5"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="47.9121" x2="55.8671" y1="28.4629" y2="29.2252">
-<stop offset="0" style="stop-color:#888F91"/>
-<stop offset="1" style="stop-color:#C9C9C9"/>
+ <stop offset="0" style="stop-color:#888F91"/>
+ <stop offset="1" style="stop-color:#C9C9C9"/>
</linearGradient>
<path d="M45.816,15.486l5.787,0.393l1.094,2.745l-2.303,0.97l2.957,1.516l0.107,5.178l-3.064-0.485 l3.064,2.238c0,0-5.514,8.872-1.639,11.192l-4.416,2.117c0,0-5.461-3.122-1.529-9.217C49.805,26.041,45.816,15.486,45.816,15.486z" fill="url(#SVGID_9_)"/>
-<polygon fill="#FFFFFF" fill-opacity="0.5" points="50.395,21.109 53.352,22.625 53.428,26.284 53.459,26.289 53.352,21.111 52.014,20.425 " stroke-opacity="0.5"/>
-<path d="M51.604,17.393l0.576,1.449l0.518-0.217l-1.094-2.745l-5.787-0.393 c0,0,0.221,0.584,0.506,1.547L51.604,17.393z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M50.395,27.317l2.455,1.792c0.355-0.659,0.609-1.067,0.609-1.067l-0.42-0.307L50.395,27.317z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<polygon fill="#FFFFFF" opacity="0.5" points="50.395,21.109 53.352,22.625 53.428,26.284 53.459,26.289 53.352,21.111 52.014,20.425 "/>
+<path d="M51.604,17.393l0.576,1.449l0.518-0.217l-1.094-2.745l-5.787-0.393 c0,0,0.221,0.584,0.506,1.547L51.604,17.393z" fill="#FFFFFF" opacity="0.5"/>
+<path d="M50.395,27.317l2.455,1.792c0.355-0.659,0.609-1.067,0.609-1.067l-0.42-0.307L50.395,27.317z" fill="#FFFFFF" opacity="0.5"/>
<path d="M50.492,37.07c-0.115,0.988-0.037,1.905,0.346,2.634l0.982-0.47C51.014,38.75,50.619,37.98,50.492,37.07z" fill="#FFFFFF"/>
-<path d="M51.604,16.773l0.789,1.979l0.305-0.127l-1.094-2.745l-5.787-0.393 c0,0,0.125,0.335,0.313,0.912L51.604,16.773z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
-<polygon fill="#FFFFFF" fill-opacity="0.5" points="50.395,20.488 53.352,22.003 53.441,26.287 53.459,26.289 53.352,21.111 51.35,20.085 " stroke-opacity="0.5"/>
+<path d="M51.604,16.773l0.789,1.979l0.305-0.127l-1.094-2.745l-5.787-0.393 c0,0,0.125,0.335,0.313,0.912L51.604,16.773z" fill="#FFFFFF" opacity="0.5"/>
+<polygon fill="#FFFFFF" opacity="0.5" points="50.395,20.488 53.352,22.003 53.441,26.287 53.459,26.289 53.352,21.111 51.35,20.085 "/>
<path d="M50.461,36.793c-0.076,1.082,0.1,2.057,0.691,2.762l0.668-0.321C50.934,38.703,50.543,37.826,50.461,36.793z " fill="#FFFFFF"/>
-<path d="M50.395,26.697l2.697,1.97c0.227-0.394,0.367-0.625,0.367-0.625l-1.504-1.099L50.395,26.697z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M51.795,22.912c0.119-0.9,0.127-1.758,0.043-2.579l-1.443-0.739l1.232-0.519 c-0.297-1.192-0.838-2.284-1.617-3.264c-0.012-0.015-0.025-0.029-0.039-0.043l-4.154-0.282c0,0,3.988,10.554,0.059,16.647 c-3.932,6.095,1.529,9.217,1.529,9.217l1.41-0.676c-2.369-2.885-1.332-5.364,0.352-9.328c0.65-1.533,1.355-3.199,1.898-5.053 l-0.67-0.49l0.77,0.121C51.428,24.971,51.652,23.974,51.795,22.912z" fill="#231F20" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M51.043,22.811c0.141-1.024,0.125-1.987-0.023-2.895l-0.625-0.321l0.521-0.22 c-0.27-1.134-0.764-2.168-1.5-3.092c-0.164-0.205-0.338-0.4-0.52-0.586l-3.08-0.21c0,0,3.988,10.554,0.059,16.647 c-3.932,6.095,1.529,9.217,1.529,9.217l0.713-0.341c-2.51-3.188-1.32-6.021,0.354-9.958c0.672-1.584,1.398-3.312,1.939-5.237 l-0.016-0.012l0.018,0.002C50.68,24.857,50.9,23.863,51.043,22.811z" fill="#231F20" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M28.693,31.644c0.158,0,0.375-0.017,0.619-0.072c-0.018-0.021-0.037-0.043-0.055-0.065 l1.316-0.63c0.396-0.384,0.758-0.951,1-1.798c0.039-0.138,0.135-0.432,1.217-0.519c-1.998-3.107,2.508-10.354,2.508-10.354 l-2.74-1.999c-7.863,5.659-9.123,7.896-9.336,9.108c-0.271,1.575,1.242,3.525,1.709,4.085 C25.795,30.422,27.146,31.644,28.693,31.644z" fill="#231F20" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M34.332,11.312c-0.064,0.176-0.518,1.574,0.83,3.061c-0.857,0.591-1.65,1.149-2.391,1.678 l2.527,0.4l-0.109-5.178l-0.707-0.362L34.332,11.312z" fill="#231F20" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M33.027,46.647c0-0.835-0.672-1.511-1.514-1.511V33.785c0,0-0.002-0.004-0.006-0.007 c-3.328,5.372-3.754,9.555-3.777,9.845v4.541h3.783C32.355,48.163,33.027,47.485,33.027,46.647z" fill="#231F20" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M35.229,13.167l-0.039-1.893l-0.027-0.015l-0.119,0.317 C35.002,11.689,34.799,12.333,35.229,13.167z" fill="#231F20" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M28.693,30.888c0.59,0,1.654-0.263,2.152-2.015c0.168-0.599,0.658-0.923,1.613-1.043 c-1.039-3.379,2.84-9.625,2.84-9.625l-2.096-1.528c-5.842,4.191-8.951,7.136-9.234,8.768c-0.174,0.997,0.725,2.489,1.543,3.467 C26.133,29.65,27.371,30.888,28.693,30.888z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M33.027,46.647c0-0.835-0.672-1.511-1.514-1.511v-9.898c-2.627,4.633-3.004,8.114-3.027,8.385 v4.541h3.027C32.355,48.163,33.027,47.485,33.027,46.647z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M35.299,16.452l-0.027-1.233c-0.492,0.34-0.971,0.676-1.432,1.001L35.299,16.452z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M50.395,26.697l2.697,1.97c0.227-0.394,0.367-0.625,0.367-0.625l-1.504-1.099L50.395,26.697z" fill="#FFFFFF" opacity="0.5"/>
+<path d="M51.795,22.912c0.119-0.9,0.127-1.758,0.043-2.579l-1.443-0.739l1.232-0.519 c-0.297-1.192-0.838-2.284-1.617-3.264c-0.012-0.015-0.025-0.029-0.039-0.043l-4.154-0.282c0,0,3.988,10.554,0.059,16.647 c-3.932,6.095,1.529,9.217,1.529,9.217l1.41-0.676c-2.369-2.885-1.332-5.364,0.352-9.328c0.65-1.533,1.355-3.199,1.898-5.053 l-0.67-0.49l0.77,0.121C51.428,24.971,51.652,23.974,51.795,22.912z" fill="#231F20" opacity="0.1"/>
+<path d="M51.043,22.811c0.141-1.024,0.125-1.987-0.023-2.895l-0.625-0.321l0.521-0.22 c-0.27-1.134-0.764-2.168-1.5-3.092c-0.164-0.205-0.338-0.4-0.52-0.586l-3.08-0.21c0,0,3.988,10.554,0.059,16.647 c-3.932,6.095,1.529,9.217,1.529,9.217l0.713-0.341c-2.51-3.188-1.32-6.021,0.354-9.958c0.672-1.584,1.398-3.312,1.939-5.237 l-0.016-0.012l0.018,0.002C50.68,24.857,50.9,23.863,51.043,22.811z" fill="#231F20" opacity="0.2"/>
+<path d="M28.693,31.644c0.158,0,0.375-0.017,0.619-0.072c-0.018-0.021-0.037-0.043-0.055-0.065 l1.316-0.63c0.396-0.384,0.758-0.951,1-1.798c0.039-0.138,0.135-0.432,1.217-0.519c-1.998-3.107,2.508-10.354,2.508-10.354 l-2.74-1.999c-7.863,5.659-9.123,7.896-9.336,9.108c-0.271,1.575,1.242,3.525,1.709,4.085 C25.795,30.422,27.146,31.644,28.693,31.644z" fill="#231F20" opacity="0.1"/>
+<path d="M34.332,11.312c-0.064,0.176-0.518,1.574,0.83,3.061c-0.857,0.591-1.65,1.149-2.391,1.678 l2.527,0.4l-0.109-5.178l-0.707-0.362L34.332,11.312z" fill="#231F20" opacity="0.1"/>
+<path d="M33.027,46.647c0-0.835-0.672-1.511-1.514-1.511V33.785c0,0-0.002-0.004-0.006-0.007 c-3.328,5.372-3.754,9.555-3.777,9.845v4.541h3.783C32.355,48.163,33.027,47.485,33.027,46.647z" fill="#231F20" opacity="0.1"/>
+<path d="M35.229,13.167l-0.039-1.893l-0.027-0.015l-0.119,0.317 C35.002,11.689,34.799,12.333,35.229,13.167z" fill="#231F20" opacity="0.5"/>
+<path d="M28.693,30.888c0.59,0,1.654-0.263,2.152-2.015c0.168-0.599,0.658-0.923,1.613-1.043 c-1.039-3.379,2.84-9.625,2.84-9.625l-2.096-1.528c-5.842,4.191-8.951,7.136-9.234,8.768c-0.174,0.997,0.725,2.489,1.543,3.467 C26.133,29.65,27.371,30.888,28.693,30.888z" fill="#231F20" opacity="0.3"/>
+<path d="M33.027,46.647c0-0.835-0.672-1.511-1.514-1.511v-9.898c-2.627,4.633-3.004,8.114-3.027,8.385 v4.541h3.027C32.355,48.163,33.027,47.485,33.027,46.647z" fill="#231F20" opacity="0.3"/>
+<path d="M35.299,16.452l-0.027-1.233c-0.492,0.34-0.971,0.676-1.432,1.001L35.299,16.452z" fill="#231F20" opacity="0.3"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="39.8555" x2="45.7253" y1="31.4277" y2="11.9445">
-<stop offset="0" style="stop-color:#8B8E8F"/>
-<stop offset="0.6545" style="stop-color:#C2C2C2"/>
-<stop offset="1" style="stop-color:#A0A9AB"/>
+ <stop offset="0" style="stop-color:#8B8E8F"/>
+ <stop offset="0.6545" style="stop-color:#C2C2C2"/>
+ <stop offset="1" style="stop-color:#A0A9AB"/>
</linearGradient>
<path d="M50.295,22.709c1.209-8.98-9.908-10.006-9.908-10.006l-4.635-0.864c0,0-0.475,1.282,2.004,2.598 c-4.35,2.931-12.631,8.778-13.041,11.138c-0.27,1.543,4.24,7.189,5.402,3.091c0.779-2.748,5.498-1.031,6.777-1.84 c1.043-0.661,2.184,0.289,2.184,0.289c-9.029,8.199-9.834,16.508-9.834,16.508v11.351h20.432V43.623 C41.486,36.955,49.037,32.04,50.295,22.709z" fill="url(#SVGID_10_)"/>
-<path d="M36.086,20.578l3.492-2.383C39.578,18.195,39.412,23.245,36.086,20.578z" fill="#FCFCFC" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M36.086,20.578l3.492-2.383C39.578,18.195,39.412,23.245,36.086,20.578z" fill="#FCFCFC" opacity="0.5"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="37.832" x2="37.832" y1="16.939" y2="20.9847">
-<stop offset="0" style="stop-color:#292929"/>
-<stop offset="1" style="stop-color:#868686"/>
+ <stop offset="0" style="stop-color:#292929"/>
+ <stop offset="1" style="stop-color:#868686"/>
</linearGradient>
<path d="M36.086,20.223l3.492-2.243C39.578,17.98,38.832,21.864,36.086,20.223z" fill="url(#SVGID_11_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="27.7305" x2="51.1914" y1="56.4868" y2="56.4868">
-<stop offset="0" style="stop-color:#8C8E8F"/>
-<stop offset="0.6545" style="stop-color:#D9D9D9"/>
-<stop offset="1" style="stop-color:#AEB2B3"/>
+ <stop offset="0" style="stop-color:#8C8E8F"/>
+ <stop offset="0.6545" style="stop-color:#D9D9D9"/>
+ <stop offset="1" style="stop-color:#AEB2B3"/>
</linearGradient>
<path d="M51.191,56.484c0,0.84-0.674,1.516-1.516,1.516H29.129c-0.846,0-1.398-0.676-1.398-1.516l0,0 c0-0.835,0.553-1.511,1.398-1.511h20.547C50.518,54.973,51.191,55.649,51.191,56.484L51.191,56.484z" fill="url(#SVGID_12_)"/>
-<path d="M29.129,55.729h20.547c0.711,0,1.293,0.482,1.461,1.134c0.029-0.121,0.055-0.246,0.055-0.379 c0-0.835-0.674-1.511-1.516-1.511H29.129c-0.846,0-1.398,0.676-1.398,1.511c0,0.133,0.02,0.258,0.043,0.379 C27.916,56.211,28.416,55.729,29.129,55.729z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M29.129,55.729h20.547c0.711,0,1.293,0.482,1.461,1.134c0.029-0.121,0.055-0.246,0.055-0.379 c0-0.835-0.674-1.511-1.516-1.511H29.129c-0.846,0-1.398,0.676-1.398,1.511c0,0.133,0.02,0.258,0.043,0.379 C27.916,56.211,28.416,55.729,29.129,55.729z" fill="#FFFFFF" opacity="0.3"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="35.3633" x2="52.3587" y1="30.4033" y2="15.8073">
-<stop offset="0" style="stop-color:#8B8E8F"/>
-<stop offset="0.6545" style="stop-color:#C2C2C2"/>
-<stop offset="1" style="stop-color:#A0A9AB"/>
+ <stop offset="0" style="stop-color:#8B8E8F"/>
+ <stop offset="0.6545" style="stop-color:#C2C2C2"/>
+ <stop offset="1" style="stop-color:#A0A9AB"/>
</linearGradient>
<path d="M47.227,15.23l-9.158,11.404c0.576,0.121,1.01,0.48,1.01,0.48c-0.455,0.413-0.875,0.826-1.287,1.241 l0.039,0.191l12.477-5.992C50.736,18.991,49.209,16.696,47.227,15.23z" fill="url(#SVGID_13_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="32.9014" x2="50.7963" y1="30.0332" y2="34.8763">
-<stop offset="0" style="stop-color:#8B8E8F"/>
-<stop offset="0.6545" style="stop-color:#C2C2C2"/>
-<stop offset="1" style="stop-color:#A0A9AB"/>
+ <stop offset="0" style="stop-color:#8B8E8F"/>
+ <stop offset="0.6545" style="stop-color:#C2C2C2"/>
+ <stop offset="1" style="stop-color:#A0A9AB"/>
</linearGradient>
<path d="M50.295,22.709c0.125-0.939,0.111-1.787-0.006-2.556c-4.604,1.769-10.771,6.629-11.32,7.068 c-8.92,8.164-9.725,16.401-9.725,16.401v0.007l20.432-0.007C41.486,36.955,49.037,32.04,50.295,22.709z" fill="url(#SVGID_14_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="29.2441" x2="49.6758" y1="49.3013" y2="49.3013">
-<stop offset="0" style="stop-color:#8C8E8F"/>
-<stop offset="0.6545" style="stop-color:#D9D9D9"/>
-<stop offset="1" style="stop-color:#AEB2B3"/>
+ <stop offset="0" style="stop-color:#8C8E8F"/>
+ <stop offset="0.6545" style="stop-color:#D9D9D9"/>
+ <stop offset="1" style="stop-color:#AEB2B3"/>
</linearGradient>
<rect fill="url(#SVGID_15_)" height="11.344" width="20.432" x="29.244" y="43.629"/>
-<rect fill="#231F20" fill-opacity="0.3" height="0.758" stroke-opacity="0.3" width="20.432" x="29.244" y="54.215"/>
-<rect fill="#FFFFFF" fill-opacity="0.5" height="0.755" stroke-opacity="0.5" width="20.432" x="29.244" y="43.623"/>
-<rect fill="#FFFFFF" fill-opacity="0.3" height="0.758" stroke-opacity="0.3" width="20.432" x="29.244" y="44.378"/>
-<rect fill="#FFFFFF" fill-opacity="0.1" height="0.756" stroke-opacity="0.1" width="20.432" x="29.244" y="45.136"/>
-<rect fill="#231F20" fill-opacity="0.2" height="0.755" stroke-opacity="0.2" width="20.432" x="29.244" y="53.459"/>
-<rect fill="#231F20" fill-opacity="0.1" height="0.758" stroke-opacity="0.1" width="20.432" x="29.244" y="52.702"/>
+<rect fill="#231F20" height="0.758" opacity="0.3" width="20.432" x="29.244" y="54.215"/>
+<rect fill="#FFFFFF" height="0.755" opacity="0.5" width="20.432" x="29.244" y="43.623"/>
+<rect fill="#FFFFFF" height="0.758" opacity="0.3" width="20.432" x="29.244" y="44.378"/>
+<rect fill="#FFFFFF" height="0.756" opacity="0.1" width="20.432" x="29.244" y="45.136"/>
+<rect fill="#231F20" height="0.755" opacity="0.2" width="20.432" x="29.244" y="53.459"/>
+<rect fill="#231F20" height="0.758" opacity="0.1" width="20.432" x="29.244" y="52.702"/>
<path d="M45.961,37.882c-0.248,2.392,0.57,4.695,3.715,7.254v-1.513C47.199,41.606,46.166,39.75,45.961,37.882z" fill="#FFFFFF"/>
-<path d="M40.387,14.214c0,0,9.34,0.869,9.961,7.937c0.682-8.461-9.961-9.449-9.961-9.449l-4.635-0.864 c0,0-0.266,0.719,0.643,1.634L40.387,14.214z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M29.244,43.623v1.513c0,0,0.805-8.31,9.834-16.507c0,0-0.467-0.386-1.078-0.492 C29.988,35.989,29.244,43.623,29.244,43.623z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M37.756,15.949c-0.479-0.253-0.842-0.504-1.127-0.748 c-4.512,3.087-11.537,8.203-11.914,10.373c-0.041,0.241,0.035,0.587,0.195,0.978C26.248,23.936,33.705,18.678,37.756,15.949z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M29.244,43.623v0.755c0,0,0.805-8.31,9.834-16.508c0,0-0.195-0.157-0.488-0.296 C30.025,35.62,29.244,43.623,29.244,43.623z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M40.387,13.458c0,0,9.664,0.898,9.988,8.3c0.328-8.099-9.988-9.055-9.988-9.055l-4.635-0.864 c0,0-0.111,0.304,0.061,0.768L40.387,13.458z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M40.387,14.214c0,0,9.34,0.869,9.961,7.937c0.682-8.461-9.961-9.449-9.961-9.449l-4.635-0.864 c0,0-0.266,0.719,0.643,1.634L40.387,14.214z" fill="#FFFFFF" opacity="0.5"/>
+<path d="M29.244,43.623v1.513c0,0,0.805-8.31,9.834-16.507c0,0-0.467-0.386-1.078-0.492 C29.988,35.989,29.244,43.623,29.244,43.623z" fill="#FFFFFF" opacity="0.5"/>
+<path d="M37.756,15.949c-0.479-0.253-0.842-0.504-1.127-0.748 c-4.512,3.087-11.537,8.203-11.914,10.373c-0.041,0.241,0.035,0.587,0.195,0.978C26.248,23.936,33.705,18.678,37.756,15.949z" fill="#FFFFFF" opacity="0.5"/>
+<path d="M29.244,43.623v0.755c0,0,0.805-8.31,9.834-16.508c0,0-0.195-0.157-0.488-0.296 C30.025,35.62,29.244,43.623,29.244,43.623z" fill="#FFFFFF" opacity="0.5"/>
+<path d="M40.387,13.458c0,0,9.664,0.898,9.988,8.3c0.328-8.099-9.988-9.055-9.988-9.055l-4.635-0.864 c0,0-0.111,0.304,0.061,0.768L40.387,13.458z" fill="#FFFFFF" opacity="0.5"/>
<path d="M45.93,37.527c-0.115,2.25,0.777,4.435,3.746,6.851v-0.755C47.041,41.477,46.041,39.514,45.93,37.527z" fill="#FFFFFF"/>
-<path d="M37.756,15.194c-0.225-0.118-0.414-0.236-0.594-0.355 c-4.467,3.032-12.057,8.479-12.447,10.735c-0.025,0.153-0.004,0.343,0.051,0.56C25.564,23.66,33.521,18.045,37.756,15.194z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M37.756,15.194c-0.225-0.118-0.414-0.236-0.594-0.355 c-4.467,3.032-12.057,8.479-12.447,10.735c-0.025,0.153-0.004,0.343,0.051,0.56C25.564,23.66,33.521,18.045,37.756,15.194z" fill="#FFFFFF" opacity="0.5"/>
<linearGradient gradientTransform="matrix(1.0123 0 0 1 -4.0079 0)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="33.5625" x2="53.7416" y1="42.9795" y2="41.7184">
-<stop offset="0" style="stop-color:#8B8E8F"/>
-<stop offset="0.6545" style="stop-color:#DEDEDE"/>
-<stop offset="1" style="stop-color:#A0A9AB"/>
+ <stop offset="0" style="stop-color:#8B8E8F"/>
+ <stop offset="0.6545" style="stop-color:#DEDEDE"/>
+ <stop offset="1" style="stop-color:#A0A9AB"/>
</linearGradient>
<path d="M29.244,43.601h20.432c-2.48-2.009-3.729-3.006-9.957-3.006 C31.945,40.595,29.244,43.601,29.244,43.601z" fill="url(#SVGID_16_)"/>
<rect fill="none" height="60" width="60"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_generic_audio.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_generic_audio.svg Fri May 14 16:09:54 2010 +0300
@@ -1,128 +1,126 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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">
-<stop offset="0" style="stop-color:#B4BDBF"/>
-<stop offset="0.2667" style="stop-color:#E5EBED"/>
-<stop offset="0.703" style="stop-color:#8D9699"/>
-<stop offset="1" style="stop-color:#B7BDBF"/>
+ <stop offset="0" style="stop-color:#B4BDBF"/>
+ <stop offset="0.2667" style="stop-color:#E5EBED"/>
+ <stop offset="0.703" style="stop-color:#8D9699"/>
+ <stop offset="1" style="stop-color:#B7BDBF"/>
</linearGradient>
<path d="M29.529,6.518H6.109c-0.795,0-1.445,0.643-1.445,1.431v42.626h26.309V7.948 C30.973,7.16,30.324,6.518,29.529,6.518z" fill="url(#SVGID_1_)"/>
-<path d="M29.529,6.518c0.795,0,1.443,0.643,1.443,1.431v42.626H4.664V7.948 c0-0.788,0.65-1.431,1.445-1.431L29.529,6.518 M29.529,7.651H6.109c-0.168,0-0.313,0.136-0.313,0.297v41.489h24.042V7.948 C29.839,7.787,29.696,7.651,29.529,7.651L29.529,7.651z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M29.529,6.518c0.795,0,1.443,0.643,1.443,1.431v42.626H4.664V7.948 c0-0.788,0.65-1.431,1.445-1.431L29.529,6.518 M29.529,7.651H6.109c-0.168,0-0.313,0.136-0.313,0.297v41.489h24.042V7.948 C29.839,7.787,29.696,7.651,29.529,7.651L29.529,7.651z" fill="#FFFFFF" opacity="0.5"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -276 -305)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="278.3945" x2="309.0776" y1="-352.5684" y2="-352.5684">
-<stop offset="0" style="stop-color:#3C94DE"/>
-<stop offset="0.2545" style="stop-color:#96E9FA"/>
-<stop offset="0.7091" style="stop-color:#005BCC"/>
-<stop offset="1" style="stop-color:#0087D9"/>
+ <stop offset="0" style="stop-color:#3C94DE"/>
+ <stop offset="0.2545" style="stop-color:#96E9FA"/>
+ <stop offset="0.7091" style="stop-color:#005BCC"/>
+ <stop offset="1" style="stop-color:#0087D9"/>
</linearGradient>
<rect fill="url(#SVGID_2_)" height="6.012" width="30.848" x="2.395" y="44.563"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1.129" stroke-opacity="0.4" width="30.848" x="2.395" y="44.563"/>
-<rect fill-opacity="0.15" height="1.129" stroke-opacity="0.15" width="26.309" x="4.664" y="43.436"/>
+<rect enable-background="new " fill="#FFFFFF" height="1.129" opacity="0.4" width="30.848" x="2.395" y="44.563"/>
+<rect enable-background="new " height="1.129" opacity="0.15" width="26.309" x="4.664" y="43.436"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -276 -305)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="293.8184" x2="293.8184" y1="-341.9766" y2="-320.7682">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#A8A8A8"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#A8A8A8"/>
</linearGradient>
<path d="M17.819,36.977c-5.853,0-10.62-4.765-10.62-10.618c0-5.854,4.768-10.618,10.62-10.618 c5.854,0,10.618,4.764,10.618,10.618C28.438,32.212,23.674,36.977,17.819,36.977L17.819,36.977z" fill="url(#SVGID_3_)"/>
<radialGradient cx="903.1143" cy="-142.9111" gradientTransform="matrix(0.6122 0 0 -0.6122 -535.0661 -61.1312)" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="16.3333">
-<stop offset="0" style="stop-color:#636363"/>
-<stop offset="0.3333" style="stop-color:#808080"/>
-<stop offset="1" style="stop-color:#1C1C1C"/>
+ <stop offset="0" style="stop-color:#636363"/>
+ <stop offset="0.3333" style="stop-color:#808080"/>
+ <stop offset="1" style="stop-color:#1C1C1C"/>
</radialGradient>
<circle cx="17.821" cy="26.358" fill="url(#SVGID_4_)" r="9.999"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -276 -305)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="293.8193" x2="293.8193" y1="-338.9326" y2="-323.6798">
-<stop offset="0" style="stop-color:#808080"/>
-<stop offset="1" style="stop-color:#313131"/>
+ <stop offset="0" style="stop-color:#808080"/>
+ <stop offset="1" style="stop-color:#313131"/>
</linearGradient>
<circle cx="17.819" cy="26.358" fill="url(#SVGID_5_)" r="7.788"/>
<radialGradient cx="903.0488" cy="-143.4668" gradientTransform="matrix(0.6122 0 0 -0.6122 -535.0661 -61.1312)" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="12.2251">
-<stop offset="0" style="stop-color:#B4B4B4"/>
-<stop offset="1" style="stop-color:#696969"/>
+ <stop offset="0" style="stop-color:#B4B4B4"/>
+ <stop offset="1" style="stop-color:#696969"/>
</radialGradient>
-<path d="M24.088,30.964l-2.57-2.281h-6.926l-2.948,2.406 c1.424,1.854,3.657,3.056,6.176,3.056C20.396,34.145,22.671,32.889,24.088,30.964z" fill="url(#SVGID_6_)" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M22.866,27.604c0,2.788-2.26,5.048-5.047,5.048 c-2.787,0-5.044-2.26-5.044-5.048c0-2.785,2.257-5.046,5.044-5.046C20.606,22.558,22.866,24.819,22.866,27.604z" fill-opacity="0.15" stroke-opacity="0.15"/>
+<path d="M24.088,30.964l-2.57-2.281h-6.926l-2.948,2.406 c1.424,1.854,3.657,3.056,6.176,3.056C20.396,34.145,22.671,32.889,24.088,30.964z" enable-background="new " fill="url(#SVGID_6_)" opacity="0.5"/>
+<path d="M22.866,27.604c0,2.788-2.26,5.048-5.047,5.048 c-2.787,0-5.044-2.26-5.044-5.048c0-2.785,2.257-5.046,5.044-5.046C20.606,22.558,22.866,24.819,22.866,27.604z" enable-background="new " opacity="0.15"/>
<radialGradient cx="903.1455" cy="-140.748" gradientTransform="matrix(0.6122 0 0 -0.6122 -535.0661 -61.1312)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="9.2803">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="1" style="stop-color:#000000"/>
</radialGradient>
<circle cx="17.821" cy="26.358" fill="url(#SVGID_7_)" r="5.045"/>
-<circle cx="17.822" cy="26.358" fill="none" fill-opacity="0.15" r="4.385" stroke="#EBEBEB" stroke-opacity="0.15"/>
-<path d="M30.973,50.574h2.27v-4.883v-1.129h-2.27v-1.129V12.705h-8.271 c-1.479,0-2.683,1.198-2.683,2.669v35.2H30.973z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<circle cx="17.822" cy="26.358" enable-background="new " fill="none" opacity="0.15" r="4.385" stroke="#EBEBEB"/>
+<path d="M30.973,50.574h2.27v-4.883v-1.129h-2.27v-1.129V12.705h-8.271 c-1.479,0-2.683,1.198-2.683,2.669v35.2H30.973z" enable-background="new " opacity="0.35"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -276 -305)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="297.2568" x2="323.5664" y1="-340.9707" y2="-340.9707">
-<stop offset="0" style="stop-color:#B4BDBF"/>
-<stop offset="0.2667" style="stop-color:#E5EBED"/>
-<stop offset="0.703" style="stop-color:#8D9699"/>
-<stop offset="1" style="stop-color:#B7BDBF"/>
+ <stop offset="0" style="stop-color:#B4BDBF"/>
+ <stop offset="0.2667" style="stop-color:#E5EBED"/>
+ <stop offset="0.703" style="stop-color:#8D9699"/>
+ <stop offset="1" style="stop-color:#B7BDBF"/>
</linearGradient>
<path d="M46.122,13.942h-23.42c-0.796,0-1.445,0.644-1.445,1.432v42.625h26.31V15.374 C47.564,14.586,46.918,13.942,46.122,13.942z" fill="url(#SVGID_8_)"/>
-<path d="M46.122,13.942c0.796,0,1.442,0.644,1.442,1.432v42.625H21.257V15.374 c0-0.788,0.649-1.432,1.445-1.432H46.122 M46.122,15.076h-23.42c-0.169,0-0.312,0.137-0.312,0.298v41.489h24.042V15.374 C46.432,15.213,46.289,15.076,46.122,15.076L46.122,15.076z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M46.122,13.942c0.796,0,1.442,0.644,1.442,1.432v42.625H21.257V15.374 c0-0.788,0.649-1.432,1.445-1.432H46.122 M46.122,15.076h-23.42c-0.169,0-0.312,0.137-0.312,0.298v41.489h24.042V15.374 C46.432,15.213,46.289,15.076,46.122,15.076L46.122,15.076z" fill="#FFFFFF" opacity="0.5"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -276 -305)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="294.9863" x2="325.6694" y1="-359.9941" y2="-359.9941">
-<stop offset="0" style="stop-color:#3C94DE"/>
-<stop offset="0.2545" style="stop-color:#96E9FA"/>
-<stop offset="0.7091" style="stop-color:#005BCC"/>
-<stop offset="1" style="stop-color:#0087D9"/>
+ <stop offset="0" style="stop-color:#3C94DE"/>
+ <stop offset="0.2545" style="stop-color:#96E9FA"/>
+ <stop offset="0.7091" style="stop-color:#005BCC"/>
+ <stop offset="1" style="stop-color:#0087D9"/>
</linearGradient>
<rect fill="url(#SVGID_9_)" height="6.01" width="30.849" x="18.986" y="51.989"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1.129" stroke-opacity="0.4" width="30.849" x="18.986" y="51.989"/>
-<rect fill-opacity="0.15" height="1.13" stroke-opacity="0.15" width="26.31" x="21.257" y="50.859"/>
+<rect enable-background="new " fill="#FFFFFF" height="1.129" opacity="0.4" width="30.849" x="18.986" y="51.989"/>
+<rect enable-background="new " height="1.13" opacity="0.15" width="26.31" x="21.257" y="50.859"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -276 -305)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="310.4102" x2="310.4102" y1="-349.4004" y2="-328.192">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#A8A8A8"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#A8A8A8"/>
</linearGradient>
<path d="M34.412,44.4c-5.854,0-10.62-4.764-10.62-10.616c0-5.854,4.767-10.619,10.62-10.619 c5.854,0,10.617,4.765,10.617,10.619C45.029,39.639,40.268,44.4,34.412,44.4L34.412,44.4z" fill="url(#SVGID_10_)"/>
<radialGradient cx="930.2168" cy="-155.041" gradientTransform="matrix(0.6122 0 0 -0.6122 -535.0661 -61.1312)" gradientUnits="userSpaceOnUse" id="SVGID_11_" r="16.333">
-<stop offset="0" style="stop-color:#636363"/>
-<stop offset="0.3333" style="stop-color:#808080"/>
-<stop offset="1" style="stop-color:#1C1C1C"/>
+ <stop offset="0" style="stop-color:#636363"/>
+ <stop offset="0.3333" style="stop-color:#808080"/>
+ <stop offset="1" style="stop-color:#1C1C1C"/>
</radialGradient>
<circle cx="34.413" cy="33.784" fill="url(#SVGID_11_)" r="9.999"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -276 -305)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="310.4121" x2="310.4121" y1="-346.3584" y2="-331.1061">
-<stop offset="0" style="stop-color:#808080"/>
-<stop offset="1" style="stop-color:#313131"/>
+ <stop offset="0" style="stop-color:#808080"/>
+ <stop offset="1" style="stop-color:#313131"/>
</linearGradient>
<circle cx="34.412" cy="33.784" fill="url(#SVGID_12_)" r="7.788"/>
<radialGradient cx="930.1533" cy="-155.5962" gradientTransform="matrix(0.6122 0 0 -0.6122 -535.0661 -61.1312)" gradientUnits="userSpaceOnUse" id="SVGID_13_" r="12.2251">
-<stop offset="0" style="stop-color:#B4B4B4"/>
-<stop offset="1" style="stop-color:#696969"/>
+ <stop offset="0" style="stop-color:#B4B4B4"/>
+ <stop offset="1" style="stop-color:#696969"/>
</radialGradient>
-<path d="M40.682,38.389l-2.57-2.279h-6.926l-2.949,2.406 c1.425,1.854,3.658,3.055,6.176,3.055C36.988,41.57,39.264,40.314,40.682,38.389z" fill="url(#SVGID_13_)" fill-opacity="0.5" stroke-opacity="0.5"/>
-<circle cx="34.413" cy="35.03" fill-opacity="0.15" r="5.046" stroke-opacity="0.15"/>
+<path d="M40.682,38.389l-2.57-2.279h-6.926l-2.949,2.406 c1.425,1.854,3.658,3.055,6.176,3.055C36.988,41.57,39.264,40.314,40.682,38.389z" enable-background="new " fill="url(#SVGID_13_)" opacity="0.5"/>
+<circle cx="34.413" cy="35.03" enable-background="new " opacity="0.15" r="5.046"/>
<radialGradient cx="930.249" cy="-152.8774" gradientTransform="matrix(0.6122 0 0 -0.6122 -535.0661 -61.1312)" gradientUnits="userSpaceOnUse" id="SVGID_14_" r="9.28">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="1" style="stop-color:#000000"/>
</radialGradient>
<circle cx="34.413" cy="33.784" fill="url(#SVGID_14_)" r="5.046"/>
-<circle cx="34.414" cy="33.784" fill="none" fill-opacity="0.15" r="4.385" stroke="#EBEBEB" stroke-opacity="0.15"/>
+<circle cx="34.414" cy="33.784" enable-background="new " fill="none" opacity="0.15" r="4.385" stroke="#EBEBEB"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -276 -305)" gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="329.0576" x2="329.0576" y1="-307.5635" y2="-334.9076">
-<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"/>
+ <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="M52.841,1.999L48.51,4.772c2.588,3.613,3.951,7.799,3.951,12.575c0,4.217-1.031,8.032-3.092,11.386 l4.419,2.49c0.126-0.201,3.817-5.979,3.817-13.875C57.605,11.46,56.031,6.457,52.841,1.999z" fill="url(#SVGID_15_)"/>
-<path d="M47.822,15.064c0-0.788-0.647-1.431-1.443-1.431h-4.771 c0.306,1.081,0.44,2.276,0.44,3.714c0,2.583-0.452,4.328-1.608,6.229l-0.612,1.002l6.471,3.647l0.573-0.933 c0.206-0.339,0.563-0.971,0.952-1.842L47.822,15.064L47.822,15.064z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M47.822,15.064c0-0.788-0.647-1.431-1.443-1.431h-4.771 c0.306,1.081,0.44,2.276,0.44,3.714c0,2.583-0.452,4.328-1.608,6.229l-0.612,1.002l6.471,3.647l0.573-0.933 c0.206-0.339,0.563-0.971,0.952-1.842L47.822,15.064L47.822,15.064z" enable-background="new " opacity="0.35"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -276 -305)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="320.6797" x2="320.6797" y1="-312.7827" y2="-330.3271">
-<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"/>
+ <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="M45.258,6.974l-4.3,2.793c1.66,2.317,2.226,4.52,2.226,7.581c0,2.683-0.473,4.681-1.775,6.819 l4.494,2.533C47.691,23.772,50.796,15.748,45.258,6.974z" fill="url(#SVGID_16_)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -276 -305)" gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="329.0576" x2="329.0576" y1="-306.832" y2="-336.1659">
-<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"/>
+ <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="M52.674,2.851c2.896,4.244,4.305,8.992,4.305,14.497c0,6.409-2.488,11.396-3.414,13.028 l-3.328-1.875c1.892-3.304,2.853-7.053,2.853-11.153c0-4.587-1.243-8.755-3.694-12.399L52.674,2.851 M52.841,1.999L48.51,4.772 c2.588,3.613,3.951,7.799,3.951,12.575c0,4.217-1.031,8.032-3.092,11.386l4.419,2.49c0.126-0.201,3.817-5.979,3.817-13.875 C57.605,11.46,56.031,6.457,52.841,1.999L52.841,1.999z" fill="url(#SVGID_17_)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -276 -305)" gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="320.6797" x2="320.6797" y1="-312.3647" y2="-331.4919">
-<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"/>
+ <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="M45.061,7.849c4.98,8.402,1.881,15.669,0.608,18.001l-3.401-1.917 c1.09-1.979,1.543-3.935,1.543-6.585c0-3.063-0.578-5.261-1.975-7.405L45.061,7.849 M45.258,6.974l-4.3,2.793 c1.66,2.317,2.226,4.52,2.226,7.581c0,2.683-0.473,4.681-1.775,6.819l4.494,2.533C47.691,23.772,50.796,15.748,45.258,6.974 L45.258,6.974z" fill="url(#SVGID_18_)"/>
<rect fill="none" height="60" width="60"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_generic_bluetooth.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_generic_bluetooth.svg Fri May 14 16:09:54 2010 +0300
@@ -1,31 +1,31 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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">
-<stop offset="0" style="stop-color:#B4BDBF"/>
-<stop offset="0.2667" style="stop-color:#E5EBED"/>
-<stop offset="0.703" style="stop-color:#8D9699"/>
-<stop offset="1" style="stop-color:#B7BDBF"/>
+ <stop offset="0" style="stop-color:#B4BDBF"/>
+ <stop offset="0.2667" style="stop-color:#E5EBED"/>
+ <stop offset="0.703" style="stop-color:#8D9699"/>
+ <stop offset="1" style="stop-color:#B7BDBF"/>
</linearGradient>
<path d="M51.18,3H8.822C7.846,3,7.051,3.788,7.051,4.754V57h45.896V4.754C52.947,3.788,52.152,3,51.18,3z" fill="url(#SVGID_1_)"/>
-<path d="M51.18,3c0.973,0,1.769,0.788,1.769,1.754V57H7.051V4.754C7.051,3.788,7.846,3,8.822,3H51.18 M51.18,4.389H8.822c-0.207,0-0.382,0.168-0.382,0.365v50.854h43.119V4.754C51.559,4.557,51.385,4.389,51.18,4.389L51.18,4.389z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M51.18,3c0.973,0,1.769,0.788,1.769,1.754V57H7.051V4.754C7.051,3.788,7.846,3,8.822,3H51.18 M51.18,4.389H8.822c-0.207,0-0.382,0.168-0.382,0.365v50.854h43.119V4.754C51.559,4.557,51.385,4.389,51.18,4.389L51.18,4.389z" fill="#FFFFFF" opacity="0.5"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -276 -305)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="280.2695" x2="331.4557" y1="-358.3159" y2="-358.3159">
-<stop offset="0" style="stop-color:#3C94DE"/>
-<stop offset="0.2545" style="stop-color:#96E9FA"/>
-<stop offset="0.7091" style="stop-color:#005BCC"/>
-<stop offset="1" style="stop-color:#0087D9"/>
+ <stop offset="0" style="stop-color:#3C94DE"/>
+ <stop offset="0.2545" style="stop-color:#96E9FA"/>
+ <stop offset="0.7091" style="stop-color:#005BCC"/>
+ <stop offset="1" style="stop-color:#0087D9"/>
</linearGradient>
<rect fill="url(#SVGID_2_)" height="7.368" width="51.46" x="4.27" y="49.632"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1.384" stroke-opacity="0.4" width="51.46" x="4.27" y="49.632"/>
-<rect fill-opacity="0.15" height="1.384" stroke-opacity="0.15" width="45.896" x="7.051" y="48.248"/>
-<path d="M38.482,21.464l-9.881-10.119v13.33l-5.431-5.558l-1.983,2.022 l6.826,7.002l-6.826,6.998l1.979,2.021l5.436-5.556v13.33l9.882-10.113l-6.526-6.679L38.482,21.464z M34.537,21.484l-3.156,3.227 l-0.004-6.457L34.537,21.484z M34.537,34.801l-3.16,3.223l0.004-6.453L34.537,34.801z" fill="#FFFFFF" fill-opacity="0.75" stroke-opacity="0.75"/>
+<rect enable-background="new " fill="#FFFFFF" height="1.384" opacity="0.4" width="51.46" x="4.27" y="49.632"/>
+<rect enable-background="new " height="1.384" opacity="0.15" width="45.896" x="7.051" y="48.248"/>
+<path d="M38.482,21.464l-9.881-10.119v13.33l-5.431-5.558l-1.983,2.022 l6.826,7.002l-6.826,6.998l1.979,2.021l5.436-5.556v13.33l9.882-10.113l-6.526-6.679L38.482,21.464z M34.537,21.484l-3.156,3.227 l-0.004-6.457L34.537,21.484z M34.537,34.801l-3.16,3.223l0.004-6.453L34.537,34.801z" enable-background="new " fill="#FFFFFF" opacity="0.75"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -276 -305)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="305.8359" x2="305.8359" y1="-348.332" y2="-316.7938">
-<stop offset="0" style="stop-color:#2183E0"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#2183E0"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</linearGradient>
<path d="M38.482,19.863l-9.88-10.119v13.331l-5.431-5.559l-1.983,2.024l6.826,7l-6.826,6.998l1.979,2.021 l5.436-5.555v13.328l9.881-10.111l-6.525-6.681L38.482,19.863z M34.537,19.885l-3.156,3.226l-0.004-6.456L34.537,19.885z M34.537,33.201l-3.16,3.222l0.004-6.454L34.537,33.201z" fill="url(#SVGID_3_)"/>
<rect fill="none" height="59.999" width="60"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_group_feeds.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_group_feeds.svg Fri May 14 16:09:54 2010 +0300
@@ -1,225 +1,220 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<stop offset="0" style="stop-color:#FFA98E"/>
-<stop offset="0.2" style="stop-color:#FFA98E"/>
-<stop offset="0.9628" style="stop-color:#D45D36"/>
-<stop offset="1" style="stop-color:#D45D36"/>
+ <stop offset="0.2" style="stop-color:#FFA98E"/>
+ <stop offset="0.9628" style="stop-color:#D45D36"/>
</radialGradient>
<path d="M48.205,37.917c-1.123-0.489-1.088-2.883-0.625-3.606c0.08-0.126,0.152-0.253,0.23-0.381h-9.4 c0.076,0.128,0.148,0.255,0.23,0.381c0.465,0.724,0.5,3.117-0.623,3.606c-1.125,0.487,5.227,4.738,5.227,4.738 S49.328,38.404,48.205,37.917z" fill="url(#SVGID_1_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="43.1104" x2="43.1104" y1="37.4727" y2="47.3145">
-<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"/>
+ <stop offset="0" style="stop-color:#3BC8EB"/>
+ <stop offset="0.3879" style="stop-color:#2D9BD2"/>
+ <stop offset="0.8909" style="stop-color:#1347BA"/>
</linearGradient>
<path d="M54.961,40.41c-1.182-0.614-7.041-2.667-7.15-2.795l-4.477,3.722l-4.811-3.864 c-0.133,0.198-5.924,2.227-7.264,2.938c-1.535,0.815-4.039,2.687-4.039,6.904H59C59,43.097,56.145,41.025,54.961,40.41z" fill="url(#SVGID_2_)"/>
-<polygon fill="#020202" fill-opacity="0.3" points="37.43,37.952 43.334,42.655 48.879,38.047 47.811,37.615 43.334,41.337 38.523,37.473 " stroke-opacity="0.3"/>
+<polygon fill="#020202" opacity="0.3" points="37.43,37.952 43.334,42.655 48.879,38.047 47.811,37.615 43.334,41.337 38.523,37.473 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="28.0684" x2="37.707" y1="42.7466" y2="42.7466">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+ <stop offset="0" style="stop-color:#3BC8EB"/>
+ <stop offset="1" style="stop-color:#2D9BD2"/>
</linearGradient>
<path d="M37.707,38.696c0,0-8.424,2.199-8.424,8.1c0,0-1.205,0.002-1.215,0 C28.068,43.167,30.902,40.347,37.707,38.696z" fill="url(#SVGID_3_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="48.4043" x2="58.041" y1="42.6099" y2="42.6099">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+ <stop offset="0" style="stop-color:#3BC8EB"/>
+ <stop offset="1" style="stop-color:#2D9BD2"/>
</linearGradient>
<path d="M48.404,38.56c0,0,8.424,2.199,8.424,8.101c0,0,1.203,0,1.213,0 C58.041,43.029,55.209,40.211,48.404,38.56z" fill="url(#SVGID_4_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="43.1553" x2="43.1553" y1="43.0781" y2="37.6438">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+ <stop offset="0" style="stop-color:#3BC8EB"/>
+ <stop offset="1" style="stop-color:#2D9BD2"/>
</linearGradient>
<polygon fill="url(#SVGID_5_)" points="43.334,42.655 37.428,37.952 37.086,38.1 43.334,43.078 49.225,38.182 48.881,38.042 "/>
<radialGradient cx="-69.8633" cy="-28.6533" gradientTransform="matrix(0.9351 0 0 0.9319 109.2457 47.9072)" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="17.154">
-<stop offset="0" style="stop-color:#FFE2D9"/>
-<stop offset="0.5091" style="stop-color:#FFC6B3"/>
-<stop offset="0.7636" style="stop-color:#FFA98E"/>
-<stop offset="1" style="stop-color:#E88160"/>
+ <stop offset="0" style="stop-color:#FFE2D9"/>
+ <stop offset="0.5091" style="stop-color:#FFC6B3"/>
+ <stop offset="0.7636" style="stop-color:#FFA98E"/>
+ <stop offset="1" style="stop-color:#E88160"/>
</radialGradient>
<path d="M50.906,26.909c-0.039-0.017-0.084-0.02-0.125-0.033v-0.002c-0.008-0.002-0.014-0.002-0.025-0.005 c-0.061-0.017-0.123-0.029-0.186-0.034c-7.85-1.364-11.451-5.712-11.723-4.563c-0.217,0.918-2.416,2.9-3.568,3.886 c0.008,0.047,0.016,0.086,0.023,0.129c0,0,0.043,0.203,0.129,0.548c-0.092,0.01-0.182,0.029-0.268,0.066 c-0.732,0.308-0.963,1.511-0.514,2.687c0.447,1.174,1.406,1.876,2.141,1.566c0.047-0.019,0.084-0.051,0.123-0.078 c0.428,0.957,0.951,1.985,1.594,3.013c1.074,1.279,2.717,2.775,4.531,2.775c2.197,0,3.541-1.204,4.467-2.413 c0.023-0.053,0.047-0.101,0.074-0.141c0.684-1.071,1.24-2.146,1.689-3.144c0.717,0.248,1.637-0.419,2.094-1.547 C51.838,28.452,51.633,27.236,50.906,26.909z" fill="url(#SVGID_6_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="40.2764" x2="47.0569" y1="37.6001" y2="30.8725">
-<stop offset="0" style="stop-color:#FFC6B3"/>
-<stop offset="1" style="stop-color:#FFA98E"/>
+ <stop offset="0" style="stop-color:#FFC6B3"/>
+ <stop offset="1" style="stop-color:#FFA98E"/>
</linearGradient>
<path d="M42.719,36.249c-1.34,0-2.686-0.624-3.68-1.562c1.051,1.103,2.463,2.177,4,2.177 c2.197,0,3.541-1.204,4.467-2.413c0.023-0.053,0.047-0.101,0.074-0.141c0.684-1.071,1.24-2.146,1.689-3.144 C46.77,35.533,44.914,36.249,42.719,36.249z" fill="url(#SVGID_7_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="42.9766" x2="42.9766" y1="16.1133" y2="26.0988">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.3758" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+ <stop offset="0" style="stop-color:#8A5D3B"/>
+ <stop offset="0.3758" style="stop-color:#632F00"/>
+ <stop offset="1" style="stop-color:#361700"/>
</linearGradient>
<path d="M42.818,15.967c-2.721,0-4.029,1.238-5.039,2.53c-1.645,0.254-4.246,1.762-2.408,8.359 c1.152-0.988,3.26-3.666,3.477-4.584c0.273-1.16,3.936,3.278,11.934,4.602c0.094-0.368,0.137-0.587,0.137-0.587 C52.172,20.654,49.439,16.188,42.818,15.967z" fill="url(#SVGID_8_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="46.3916" x2="37.3443" y1="25.6675" y2="20.2965">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.3636" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+ <stop offset="0" style="stop-color:#8A5D3B"/>
+ <stop offset="0.3636" style="stop-color:#632F00"/>
+ <stop offset="1" style="stop-color:#361700"/>
</linearGradient>
<path d="M38.855,21.734c0,0,3.916,5.142,11.869,5.133C50.725,26.867,46.98,26.279,38.855,21.734z" fill="url(#SVGID_9_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="36.5283" x2="36.6077" y1="19.2515" y2="24.9963">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.3758" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+ <stop offset="0" style="stop-color:#8A5D3B"/>
+ <stop offset="0.3758" style="stop-color:#632F00"/>
+ <stop offset="1" style="stop-color:#361700"/>
</linearGradient>
<path d="M37.916,18.881c0,0-3.834,0.23-2.412,6.725C35.504,25.605,35.037,21.157,37.916,18.881z" fill="url(#SVGID_10_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="44.2432" x2="43.9615" y1="16.9707" y2="19.5749">
-<stop offset="0" style="stop-color:#A87C4F"/>
-<stop offset="1" style="stop-color:#632F00"/>
+ <stop offset="0" style="stop-color:#A87C4F"/>
+ <stop offset="1" style="stop-color:#632F00"/>
</linearGradient>
<path d="M44.678,19.781c-1.785-0.255-4.803-1.836-5.986-1.272c0,0,3.873-4.417,10.705,0.612 C49.396,19.121,47.77,20.221,44.678,19.781z" fill="url(#SVGID_11_)"/>
<radialGradient cx="-98.5264" cy="-5.0225" gradientTransform="matrix(0.9351 0 0 0.9319 109.2457 47.9072)" gradientUnits="userSpaceOnUse" id="SVGID_12_" r="12.778">
-<stop offset="0" style="stop-color:#FFA98E"/>
-<stop offset="0.2" style="stop-color:#FFA98E"/>
-<stop offset="0.9628" style="stop-color:#D45D36"/>
-<stop offset="1" style="stop-color:#D45D36"/>
+ <stop offset="0.2" style="stop-color:#FFA98E"/>
+ <stop offset="0.9628" style="stop-color:#D45D36"/>
</radialGradient>
<path d="M21.984,37.917c-1.125-0.489-1.088-2.883-0.625-3.606c0.08-0.126,0.154-0.253,0.234-0.381h-9.402 c0.076,0.128,0.15,0.255,0.23,0.381c0.465,0.724,0.498,3.117-0.625,3.606c-1.125,0.487,5.227,4.738,5.227,4.738 S23.109,38.404,21.984,37.917z" fill="url(#SVGID_12_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="16.8906" x2="16.8906" y1="37.4727" y2="47.3145">
-<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"/>
+ <stop offset="0" style="stop-color:#3BC8EB"/>
+ <stop offset="0.3879" style="stop-color:#2D9BD2"/>
+ <stop offset="0.8909" style="stop-color:#1347BA"/>
</linearGradient>
<path d="M28.742,40.41c-1.182-0.614-7.041-2.667-7.15-2.795l-4.477,3.722l-4.811-3.864 c-0.133,0.198-5.926,2.227-7.266,2.938C3.506,41.226,1,43.097,1,47.314h31.781C32.781,43.097,29.924,41.025,28.742,40.41z" fill="url(#SVGID_13_)"/>
-<polygon fill="#020202" fill-opacity="0.3" points="11.209,37.952 17.115,42.655 22.66,38.047 21.592,37.615 17.115,41.337 12.305,37.473 " stroke-opacity="0.3"/>
+<polygon fill="#020202" opacity="0.3" points="11.209,37.952 17.115,42.655 22.66,38.047 21.592,37.615 17.115,41.337 12.305,37.473 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="1.8496" x2="11.4883" y1="42.7466" y2="42.7466">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+ <stop offset="0" style="stop-color:#3BC8EB"/>
+ <stop offset="1" style="stop-color:#2D9BD2"/>
</linearGradient>
<path d="M11.488,38.696c0,0-8.426,2.199-8.426,8.1c0,0-1.203,0.002-1.213,0 C1.85,43.167,4.682,40.347,11.488,38.696z" fill="url(#SVGID_14_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="22.1836" x2="31.8223" y1="42.6099" y2="42.6099">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+ <stop offset="0" style="stop-color:#3BC8EB"/>
+ <stop offset="1" style="stop-color:#2D9BD2"/>
</linearGradient>
<path d="M22.184,38.56c0,0,8.424,2.199,8.424,8.101c0,0,1.205,0,1.215,0 C31.822,43.029,28.99,40.211,22.184,38.56z" fill="url(#SVGID_15_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="16.9346" x2="16.9346" y1="43.0781" y2="37.6438">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+ <stop offset="0" style="stop-color:#3BC8EB"/>
+ <stop offset="1" style="stop-color:#2D9BD2"/>
</linearGradient>
<polygon fill="url(#SVGID_16_)" points="17.115,42.655 11.209,37.952 10.865,38.1 17.115,43.078 23.004,38.182 22.662,38.042 "/>
<radialGradient cx="-97.9023" cy="-28.6533" gradientTransform="matrix(0.9351 0 0 0.9319 109.2457 47.9072)" gradientUnits="userSpaceOnUse" id="SVGID_17_" r="17.154">
-<stop offset="0" style="stop-color:#FFE2D9"/>
-<stop offset="0.5091" style="stop-color:#FFC6B3"/>
-<stop offset="0.7636" style="stop-color:#FFA98E"/>
-<stop offset="1" style="stop-color:#E88160"/>
+ <stop offset="0" style="stop-color:#FFE2D9"/>
+ <stop offset="0.5091" style="stop-color:#FFC6B3"/>
+ <stop offset="0.7636" style="stop-color:#FFA98E"/>
+ <stop offset="1" style="stop-color:#E88160"/>
</radialGradient>
<path d="M24.686,26.909c-0.039-0.017-0.084-0.02-0.123-0.033v-0.002c-0.012-0.002-0.016-0.002-0.025-0.005 c-0.061-0.017-0.123-0.029-0.188-0.034c-7.848-1.364-11.451-5.712-11.721-4.563c-0.217,0.918-2.416,2.9-3.57,3.886 c0.01,0.047,0.016,0.086,0.025,0.129c0,0,0.041,0.203,0.127,0.548c-0.09,0.01-0.18,0.029-0.268,0.066 c-0.73,0.308-0.963,1.511-0.512,2.687c0.447,1.174,1.406,1.876,2.141,1.566c0.045-0.019,0.084-0.051,0.123-0.078 c0.428,0.957,0.951,1.985,1.59,3.013c1.076,1.279,2.719,2.775,4.535,2.775c2.197,0,3.541-1.204,4.467-2.413 c0.023-0.053,0.045-0.101,0.072-0.141c0.684-1.071,1.242-2.146,1.689-3.144c0.719,0.248,1.637-0.419,2.096-1.547 C25.617,28.452,25.414,27.236,24.686,26.909z" fill="url(#SVGID_17_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="14.0576" x2="20.8372" y1="37.5996" y2="30.873">
-<stop offset="0" style="stop-color:#FFC6B3"/>
-<stop offset="1" style="stop-color:#FFA98E"/>
+ <stop offset="0" style="stop-color:#FFC6B3"/>
+ <stop offset="1" style="stop-color:#FFA98E"/>
</linearGradient>
<path d="M16.5,36.249c-1.34,0-2.688-0.624-3.68-1.562c1.051,1.103,2.463,2.177,4,2.177 c2.197,0,3.541-1.204,4.467-2.413c0.023-0.053,0.045-0.101,0.072-0.141c0.684-1.071,1.242-2.146,1.689-3.144 C20.551,35.533,18.695,36.249,16.5,36.249z" fill="url(#SVGID_18_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="16.7578" x2="16.7578" y1="16.1133" y2="26.0988">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.3758" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+ <stop offset="0" style="stop-color:#8A5D3B"/>
+ <stop offset="0.3758" style="stop-color:#632F00"/>
+ <stop offset="1" style="stop-color:#361700"/>
</linearGradient>
<path d="M16.6,15.967c-2.721,0-4.031,1.238-5.039,2.53c-1.645,0.254-4.25,1.762-2.408,8.359 c1.15-0.988,3.26-3.666,3.477-4.584c0.273-1.16,3.936,3.278,11.934,4.602c0.092-0.368,0.137-0.587,0.137-0.587 C25.955,20.654,23.221,16.188,16.6,15.967z" fill="url(#SVGID_19_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="20.1719" x2="11.1239" y1="25.6675" y2="20.2961">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.3636" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+ <stop offset="0" style="stop-color:#8A5D3B"/>
+ <stop offset="0.3636" style="stop-color:#632F00"/>
+ <stop offset="1" style="stop-color:#361700"/>
</linearGradient>
<path d="M12.637,21.734c0,0,3.914,5.142,11.869,5.133C24.506,26.867,20.762,26.279,12.637,21.734z" fill="url(#SVGID_20_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="10.3096" x2="10.389" y1="19.2515" y2="24.9963">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.3758" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+ <stop offset="0" style="stop-color:#8A5D3B"/>
+ <stop offset="0.3758" style="stop-color:#632F00"/>
+ <stop offset="1" style="stop-color:#361700"/>
</linearGradient>
<path d="M11.697,18.881c0,0-3.834,0.23-2.412,6.725C9.285,25.605,8.818,21.157,11.697,18.881z" fill="url(#SVGID_21_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="18.0244" x2="17.7427" y1="16.9707" y2="19.5754">
-<stop offset="0" style="stop-color:#A87C4F"/>
-<stop offset="1" style="stop-color:#632F00"/>
+ <stop offset="0" style="stop-color:#A87C4F"/>
+ <stop offset="1" style="stop-color:#632F00"/>
</linearGradient>
<path d="M18.457,19.781c-1.783-0.255-4.803-1.836-5.984-1.272c0,0,3.873-4.417,10.705,0.612 C23.178,19.121,21.549,20.221,18.457,19.781z" fill="url(#SVGID_22_)"/>
-<path d="M47.916,41.694c-1.092-0.569-4.482-1.827-7.205-2.838l-1.533-0.569l-0.273-0.11l-0.359-0.139 l-0.686-0.275l-0.424,0.186c0,0-0.006,0.002-0.008,0.004h-0.002c-1.777,0.695-5.18,1.935-6.166,2.458 c-0.385,0.206-0.832,0.477-1.283,0.835c-0.475-0.392-0.914-0.667-1.234-0.835c-0.85-0.439-4.098-1.619-5.91-2.299l-0.17-0.069 l-0.004,0.005l-0.752-0.304l-0.684,0.299c-0.668,0.263-1.492,0.576-2.373,0.911l-0.08,0.031c-2.607,0.99-5.561,2.113-6.693,2.715 c-2.535,1.346-4.359,3.248-5.438,5.615h20.582h5.561h20.494C51.592,43.797,48.686,42.094,47.916,41.694z" fill="#231F20" fill-opacity="0.15" stroke-opacity="0.15"/>
-<path d="M17.193,22.325c-1.205,1.026-1.531,3.083-0.748,5.124c0.732,1.925,2.256,3.218,3.783,3.218 h0.002c0.23,0.475,0.467,0.945,0.713,1.408h-0.07l0.584,0.965c0,0,0.15,0.248,0.33,0.545c0.486-0.827,0.914-1.646,1.262-2.418 c0.719,0.248,1.637-0.419,2.096-1.547c0.473-1.168,0.27-2.384-0.459-2.711c-0.039-0.017-0.084-0.02-0.123-0.033v-0.002 c-0.012-0.002-0.016-0.002-0.025-0.005c-0.061-0.017-0.123-0.029-0.188-0.034c-0.014-0.002-0.027-0.006-0.041-0.008 c-0.029-0.006-0.07-0.015-0.105-0.023c0.121,0.023,0.232,0.049,0.359,0.07c0.092-0.368,0.137-0.587,0.137-0.587 c1.256-5.633-1.479-10.1-8.1-10.32c-0.012,0-0.021,0.003-0.033,0.003C16.395,17.765,16.594,19.881,17.193,22.325z" fill="#231F20" fill-opacity="0.15" stroke-opacity="0.15"/>
-<path d="M37.779,18.497c-1.645,0.254-4.246,1.76-2.41,8.354c-0.068,0.01-0.139,0.023-0.205,0.051 c-0.732,0.308-0.963,1.511-0.514,2.687c0.447,1.174,1.406,1.876,2.141,1.566c0.047-0.019,0.084-0.051,0.123-0.078 c0.359,0.799,0.787,1.648,1.289,2.504c0.564-0.949,1.1-1.934,1.586-2.947c1.395-0.166,2.754-1.375,3.457-3.109 c0.801-1.979,0.545-4.035-0.584-5.104c0.504-2.285,0.584-4.463,0.252-6.444c-0.033-0.002-0.063-0.006-0.096-0.009 C40.098,15.967,38.789,17.205,37.779,18.497z M35.381,26.849c0.014-0.014,0.029-0.027,0.043-0.041 c0.002,0.01,0.004,0.018,0.008,0.027C35.414,26.837,35.396,26.845,35.381,26.849z M39.174,22.101L39.174,22.101 c-0.02-0.004-0.047-0.015-0.066-0.018C39.127,22.086,39.152,22.097,39.174,22.101z" fill="#231F20" fill-opacity="0.15" stroke-opacity="0.15"/>
-<path d="M47.621,42.258c-1.053-0.549-4.424-1.8-7.133-2.807l-1.549-0.574l-0.264-0.108l-0.369-0.142 l-1.045-0.418c-0.033-0.047-0.057-0.107-0.088-0.16c-1.826,0.708-4.971,1.86-5.914,2.361c-0.385,0.206-0.832,0.477-1.283,0.835 c-0.475-0.392-0.914-0.667-1.234-0.835c-0.85-0.439-4.098-1.619-5.91-2.299l-0.092-0.037l-1.285,0.56 c-0.689,0.271-1.549,0.597-2.461,0.943c-2.59,0.986-5.525,2.101-6.619,2.681c-2.309,1.226-4,2.936-5.035,5.057h19.881h5.561h19.785 C50.957,44.163,48.33,42.626,47.621,42.258z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M17.037,27.223c0.641,1.68,1.924,2.807,3.191,2.807c0.131,0,0.264-0.012,0.391-0.037 c0.432,0.934,0.9,1.844,1.398,2.719H22l0.146,0.241c0.334-0.609,0.645-1.212,0.902-1.785c0.719,0.248,1.637-0.419,2.096-1.547 c0.473-1.168,0.27-2.384-0.459-2.711c-0.039-0.017-0.084-0.02-0.123-0.033v-0.002c-0.012-0.002-0.016-0.002-0.025-0.005 c-0.061-0.017-0.123-0.029-0.188-0.034c-0.014-0.002-0.027-0.006-0.041-0.008c-0.029-0.006-0.07-0.015-0.105-0.023 c0.121,0.023,0.232,0.049,0.359,0.07c0.092-0.368,0.137-0.587,0.137-0.587c1.215-5.457-1.322-9.807-7.5-10.273 c-0.182,1.82,0.049,4.01,0.717,6.578C16.682,23.301,16.289,25.27,17.037,27.223z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M37.779,18.497c-1.645,0.254-4.246,1.76-2.41,8.354c-0.068,0.01-0.139,0.023-0.205,0.051 c-0.732,0.308-0.963,1.511-0.514,2.687c0.447,1.174,1.406,1.876,2.141,1.566c0.047-0.019,0.084-0.051,0.123-0.078 c0.268,0.6,0.576,1.224,0.924,1.861c0.551-0.946,1.072-1.918,1.541-2.922c0.025,0.002,0.055,0.002,0.082,0.002 c1.25,0,2.533-1.101,3.195-2.734c0.773-1.902,0.453-3.844-0.701-4.617c0.053-0.229,0.078-0.355,0.078-0.355 c0.502-2.247,0.574-4.381,0.238-6.312C39.926,16.158,38.717,17.299,37.779,18.497z M35.381,26.849 c0.014-0.014,0.029-0.027,0.043-0.041c0.002,0.01,0.004,0.018,0.008,0.027C35.414,26.837,35.396,26.845,35.381,26.849z M39.174,22.101L39.174,22.101c-0.02-0.004-0.047-0.015-0.066-0.018C39.127,22.086,39.152,22.097,39.174,22.101z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M47.916,41.694c-1.092-0.569-4.482-1.827-7.205-2.838l-1.533-0.569l-0.273-0.11l-0.359-0.139 l-0.686-0.275l-0.424,0.186c0,0-0.006,0.002-0.008,0.004h-0.002c-1.777,0.695-5.18,1.935-6.166,2.458 c-0.385,0.206-0.832,0.477-1.283,0.835c-0.475-0.392-0.914-0.667-1.234-0.835c-0.85-0.439-4.098-1.619-5.91-2.299l-0.17-0.069 l-0.004,0.005l-0.752-0.304l-0.684,0.299c-0.668,0.263-1.492,0.576-2.373,0.911l-0.08,0.031c-2.607,0.99-5.561,2.113-6.693,2.715 c-2.535,1.346-4.359,3.248-5.438,5.615h20.582h5.561h20.494C51.592,43.797,48.686,42.094,47.916,41.694z" fill="#231F20" opacity="0.15"/>
+<path d="M17.193,22.325c-1.205,1.026-1.531,3.083-0.748,5.124c0.732,1.925,2.256,3.218,3.783,3.218 h0.002c0.23,0.475,0.467,0.945,0.713,1.408h-0.07l0.584,0.965c0,0,0.15,0.248,0.33,0.545c0.486-0.827,0.914-1.646,1.262-2.418 c0.719,0.248,1.637-0.419,2.096-1.547c0.473-1.168,0.27-2.384-0.459-2.711c-0.039-0.017-0.084-0.02-0.123-0.033v-0.002 c-0.012-0.002-0.016-0.002-0.025-0.005c-0.061-0.017-0.123-0.029-0.188-0.034c-0.014-0.002-0.027-0.006-0.041-0.008 c-0.029-0.006-0.07-0.015-0.105-0.023c0.121,0.023,0.232,0.049,0.359,0.07c0.092-0.368,0.137-0.587,0.137-0.587 c1.256-5.633-1.479-10.1-8.1-10.32c-0.012,0-0.021,0.003-0.033,0.003C16.395,17.765,16.594,19.881,17.193,22.325z" fill="#231F20" opacity="0.15"/>
+<path d="M37.779,18.497c-1.645,0.254-4.246,1.76-2.41,8.354c-0.068,0.01-0.139,0.023-0.205,0.051 c-0.732,0.308-0.963,1.511-0.514,2.687c0.447,1.174,1.406,1.876,2.141,1.566c0.047-0.019,0.084-0.051,0.123-0.078 c0.359,0.799,0.787,1.648,1.289,2.504c0.564-0.949,1.1-1.934,1.586-2.947c1.395-0.166,2.754-1.375,3.457-3.109 c0.801-1.979,0.545-4.035-0.584-5.104c0.504-2.285,0.584-4.463,0.252-6.444c-0.033-0.002-0.063-0.006-0.096-0.009 C40.098,15.967,38.789,17.205,37.779,18.497z M35.381,26.849c0.014-0.014,0.029-0.027,0.043-0.041 c0.002,0.01,0.004,0.018,0.008,0.027C35.414,26.837,35.396,26.845,35.381,26.849z M39.174,22.101L39.174,22.101 c-0.02-0.004-0.047-0.015-0.066-0.018C39.127,22.086,39.152,22.097,39.174,22.101z" fill="#231F20" opacity="0.15"/>
+<path d="M47.621,42.258c-1.053-0.549-4.424-1.8-7.133-2.807l-1.549-0.574l-0.264-0.108l-0.369-0.142 l-1.045-0.418c-0.033-0.047-0.057-0.107-0.088-0.16c-1.826,0.708-4.971,1.86-5.914,2.361c-0.385,0.206-0.832,0.477-1.283,0.835 c-0.475-0.392-0.914-0.667-1.234-0.835c-0.85-0.439-4.098-1.619-5.91-2.299l-0.092-0.037l-1.285,0.56 c-0.689,0.271-1.549,0.597-2.461,0.943c-2.59,0.986-5.525,2.101-6.619,2.681c-2.309,1.226-4,2.936-5.035,5.057h19.881h5.561h19.785 C50.957,44.163,48.33,42.626,47.621,42.258z" fill="#231F20" opacity="0.3"/>
+<path d="M17.037,27.223c0.641,1.68,1.924,2.807,3.191,2.807c0.131,0,0.264-0.012,0.391-0.037 c0.432,0.934,0.9,1.844,1.398,2.719H22l0.146,0.241c0.334-0.609,0.645-1.212,0.902-1.785c0.719,0.248,1.637-0.419,2.096-1.547 c0.473-1.168,0.27-2.384-0.459-2.711c-0.039-0.017-0.084-0.02-0.123-0.033v-0.002c-0.012-0.002-0.016-0.002-0.025-0.005 c-0.061-0.017-0.123-0.029-0.188-0.034c-0.014-0.002-0.027-0.006-0.041-0.008c-0.029-0.006-0.07-0.015-0.105-0.023 c0.121,0.023,0.232,0.049,0.359,0.07c0.092-0.368,0.137-0.587,0.137-0.587c1.215-5.457-1.322-9.807-7.5-10.273 c-0.182,1.82,0.049,4.01,0.717,6.578C16.682,23.301,16.289,25.27,17.037,27.223z" fill="#231F20" opacity="0.3"/>
+<path d="M37.779,18.497c-1.645,0.254-4.246,1.76-2.41,8.354c-0.068,0.01-0.139,0.023-0.205,0.051 c-0.732,0.308-0.963,1.511-0.514,2.687c0.447,1.174,1.406,1.876,2.141,1.566c0.047-0.019,0.084-0.051,0.123-0.078 c0.268,0.6,0.576,1.224,0.924,1.861c0.551-0.946,1.072-1.918,1.541-2.922c0.025,0.002,0.055,0.002,0.082,0.002 c1.25,0,2.533-1.101,3.195-2.734c0.773-1.902,0.453-3.844-0.701-4.617c0.053-0.229,0.078-0.355,0.078-0.355 c0.502-2.247,0.574-4.381,0.238-6.312C39.926,16.158,38.717,17.299,37.779,18.497z M35.381,26.849 c0.014-0.014,0.029-0.027,0.043-0.041c0.002,0.01,0.004,0.018,0.008,0.027C35.414,26.837,35.396,26.845,35.381,26.849z M39.174,22.101L39.174,22.101c-0.02-0.004-0.047-0.015-0.066-0.018C39.127,22.086,39.152,22.097,39.174,22.101z" fill="#231F20" opacity="0.3"/>
<radialGradient cx="-84.3965" cy="-1.04" gradientTransform="matrix(0.9351 0 0 0.9319 109.2457 47.9072)" gradientUnits="userSpaceOnUse" id="SVGID_23_" r="18.6813">
-<stop offset="0" style="stop-color:#FFA98E"/>
-<stop offset="0.2" style="stop-color:#FFA98E"/>
-<stop offset="0.9628" style="stop-color:#D45D36"/>
-<stop offset="1" style="stop-color:#D45D36"/>
+ <stop offset="0.2" style="stop-color:#FFA98E"/>
+ <stop offset="0.9628" style="stop-color:#D45D36"/>
</radialGradient>
<path d="M37.447,39.174c-1.643-0.715-1.59-4.214-0.912-5.273c0.117-0.186,0.225-0.37,0.338-0.554H23.129 c0.113,0.184,0.219,0.368,0.338,0.554c0.678,1.06,0.73,4.559-0.914,5.273c-1.645,0.713,7.641,6.929,7.641,6.929 S39.092,39.887,37.447,39.174z" fill="url(#SVGID_23_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_24_" x1="30.001" x2="30.001" y1="38.5244" y2="52.9141">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="1" style="stop-color:#BA1212"/>
+ <stop offset="0" style="stop-color:#FF7236"/>
+ <stop offset="1" style="stop-color:#BA1212"/>
</linearGradient>
<path d="M47.33,42.822c-1.729-0.9-10.297-3.901-10.459-4.089l-6.545,5.439l-7.031-5.648 c-0.193,0.289-8.662,3.257-10.621,4.298c-2.242,1.189-5.906,3.925-5.906,10.092h46.467C53.234,46.747,49.057,43.719,47.33,42.822z" fill="url(#SVGID_24_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="30.0654" x2="30.0654" y1="37.5811" y2="45.9985">
-<stop offset="0" style="stop-color:#BC1C24"/>
-<stop offset="1" style="stop-color:#6B1C24"/>
+ <stop offset="0" style="stop-color:#BC1C24"/>
+ <stop offset="1" style="stop-color:#6B1C24"/>
</linearGradient>
<polygon fill="url(#SVGID_25_)" points="21.695,39.225 30.326,46.103 38.436,39.365 36.871,38.733 30.326,44.173 23.295,38.524 "/>
<path d="M22.1,40.313c0,0-12.316,3.215-12.316,11.844c0,0-1.76,0.002-1.775,0C8.008,46.851,12.15,42.725,22.1,40.313 z" fill="#FF7B56"/>
<path d="M37.74,40.113c0,0,12.316,3.218,12.316,11.844c0,0,1.762,0,1.775,0C51.832,46.65,47.689,42.525,37.74,40.113 z" fill="#FF7B56"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_26_" x1="30.0645" x2="30.0645" y1="46.7217" y2="38.7736">
-<stop offset="0" style="stop-color:#FFA98E"/>
-<stop offset="0.9628" style="stop-color:#D45D36"/>
-<stop offset="1" style="stop-color:#D45D36"/>
+ <stop offset="0" style="stop-color:#FFA98E"/>
+ <stop offset="0.9628" style="stop-color:#D45D36"/>
</linearGradient>
<polygon fill="url(#SVGID_26_)" points="30.326,46.103 21.691,39.225 21.191,39.445 30.326,46.722 38.938,39.561 38.438,39.358 "/>
<radialGradient cx="-83.4844" cy="-35.5879" gradientTransform="matrix(0.9351 0 0 0.9319 109.2457 47.9072)" gradientUnits="userSpaceOnUse" id="SVGID_27_" r="25.0781">
-<stop offset="0" style="stop-color:#FFE2D9"/>
-<stop offset="0.5091" style="stop-color:#FFC6B3"/>
-<stop offset="0.7636" style="stop-color:#FFA98E"/>
-<stop offset="1" style="stop-color:#E88160"/>
+ <stop offset="0" style="stop-color:#FFE2D9"/>
+ <stop offset="0.5091" style="stop-color:#FFC6B3"/>
+ <stop offset="0.7636" style="stop-color:#FFA98E"/>
+ <stop offset="1" style="stop-color:#E88160"/>
</radialGradient>
<path d="M41.398,23.083c-0.059-0.027-0.125-0.031-0.184-0.051V23.03c-0.012-0.002-0.023-0.004-0.035-0.006 c-0.092-0.023-0.182-0.045-0.275-0.051c-11.475-1.996-16.738-8.354-17.135-6.67c-0.316,1.34-3.535,4.236-5.219,5.682 c0.014,0.064,0.021,0.121,0.035,0.188c0,0,0.063,0.296,0.188,0.801c-0.135,0.014-0.264,0.041-0.393,0.094 c-1.07,0.454-1.406,2.21-0.75,3.928c0.658,1.716,2.059,2.744,3.131,2.294c0.066-0.029,0.121-0.078,0.182-0.115 c0.625,1.4,1.389,2.901,2.326,4.406c1.568,1.865,3.973,4.055,6.627,4.055c3.213,0,5.18-1.758,6.529-3.53 c0.033-0.074,0.068-0.144,0.109-0.204c1.002-1.564,1.813-3.135,2.471-4.594c1.047,0.361,2.395-0.612,3.063-2.263 C42.76,25.336,42.461,23.561,41.398,23.083z" fill="url(#SVGID_27_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_28_" x1="25.8574" x2="35.7696" y1="38.709" y2="28.8743">
-<stop offset="0" style="stop-color:#FFC6B3"/>
-<stop offset="1" style="stop-color:#FFA98E"/>
+ <stop offset="0" style="stop-color:#FFC6B3"/>
+ <stop offset="1" style="stop-color:#FFA98E"/>
</linearGradient>
<path d="M29.426,36.734c-1.955,0-3.926-0.91-5.377-2.283c1.535,1.612,3.6,3.184,5.848,3.184 c3.213,0,5.18-1.758,6.529-3.53c0.033-0.074,0.068-0.144,0.109-0.204c1.002-1.564,1.813-3.135,2.471-4.594 C35.352,35.689,32.639,36.734,29.426,36.734z" fill="url(#SVGID_28_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_29_" x1="29.8047" x2="29.8047" y1="7.3003" y2="21.8973">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.3758" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+ <stop offset="0" style="stop-color:#8A5D3B"/>
+ <stop offset="0.3758" style="stop-color:#632F00"/>
+ <stop offset="1" style="stop-color:#361700"/>
</linearGradient>
<path d="M29.574,7.086c-3.977,0-5.891,1.809-7.369,3.699c-2.4,0.37-6.209,2.57-3.52,12.218 c1.684-1.444,4.768-5.359,5.084-6.699c0.398-1.697,5.75,4.792,17.445,6.727c0.137-0.541,0.197-0.857,0.197-0.857 C43.25,13.937,39.256,7.407,29.574,7.086z" fill="url(#SVGID_29_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_30_" x1="34.7979" x2="21.5721" y1="21.2656" y2="13.414">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.3636" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+ <stop offset="0" style="stop-color:#8A5D3B"/>
+ <stop offset="0.3636" style="stop-color:#632F00"/>
+ <stop offset="1" style="stop-color:#361700"/>
</linearGradient>
<path d="M23.783,15.516c0,0,5.723,7.517,17.35,7.504C41.133,23.02,35.656,22.159,23.783,15.516z" fill="url(#SVGID_30_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_31_" x1="20.3789" x2="20.495" y1="11.8853" y2="20.2845">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.3758" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+ <stop offset="0" style="stop-color:#8A5D3B"/>
+ <stop offset="0.3758" style="stop-color:#632F00"/>
+ <stop offset="1" style="stop-color:#361700"/>
</linearGradient>
<path d="M22.406,11.344c0,0-5.604,0.334-3.525,9.831C18.881,21.175,18.195,14.67,22.406,11.344z" fill="url(#SVGID_31_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_32_" x1="31.6582" x2="31.2464" y1="8.5503" y2="12.3578">
-<stop offset="0" style="stop-color:#A87C4F"/>
-<stop offset="1" style="stop-color:#632F00"/>
+ <stop offset="0" style="stop-color:#A87C4F"/>
+ <stop offset="1" style="stop-color:#632F00"/>
</linearGradient>
<path d="M32.291,12.66c-2.609-0.375-7.02-2.686-8.75-1.859c0,0,5.662-6.459,15.65,0.895 C39.191,11.695,36.813,13.303,32.291,12.66z" fill="url(#SVGID_32_)"/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
<rect fill="none" height="30" width="30"/>
-<path d="M4.452,29.001c-1.903,0-3.451-1.549-3.451-3.453V4.453c0-1.903,1.548-3.452,3.451-3.452h21.095 c1.905,0,3.454,1.548,3.454,3.452v21.095c0,1.904-1.549,3.453-3.454,3.453H4.452z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M4.452,29.001c-1.903,0-3.451-1.549-3.451-3.453V4.453c0-1.903,1.548-3.452,3.451-3.452h21.095 c1.905,0,3.454,1.548,3.454,3.452v21.095c0,1.904-1.549,3.453-3.454,3.453H4.452z" opacity="0.35"/>
<path d="M27.932,25.493c0,1.346-1.092,2.438-2.44,2.438H4.508c-1.347,0-2.438-1.093-2.438-2.438V4.509 c0-1.348,1.091-2.44,2.438-2.44h20.983c1.348,0,2.44,1.093,2.44,2.44V25.493z" fill="#F7B388"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3347.6641)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-2190.8022" x2="-2167.4888" y1="3344.4668" y2="3321.1533">
-<stop offset="0" style="stop-color:#DF4F20"/>
-<stop offset="0.5" style="stop-color:#F48228"/>
-<stop offset="1" style="stop-color:#CF3A21"/>
+ <stop offset="0" style="stop-color:#DF4F20"/>
+ <stop offset="0.5" style="stop-color:#F48228"/>
+ <stop offset="1" style="stop-color:#CF3A21"/>
</linearGradient>
<path d="M4.508,27.188c-0.935,0-1.697-0.761-1.697-1.695V4.509c0-0.937,0.763-1.696,1.697-1.696h20.983 c0.937,0,1.697,0.762,1.697,1.696v20.984c0,0.935-0.76,1.695-1.697,1.695H4.508z" fill="url(#SVGID_1__)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3347.6641)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-2178.999" x2="-2178.999" y1="3345.792" y2="3319.6384">
-<stop offset="0" style="stop-color:#C5422B"/>
-<stop offset="0.5" style="stop-color:#F48228"/>
-<stop offset="1" style="stop-color:#AD1B00"/>
+ <stop offset="0" style="stop-color:#C5422B"/>
+ <stop offset="0.5" style="stop-color:#F48228"/>
+ <stop offset="1" style="stop-color:#AD1B00"/>
</linearGradient>
<path d="M25.547,2.413c1.125,0,2.041,0.916,2.041,2.04v21.095c0,1.124-0.917,2.04-2.041,2.04H4.452 c-1.124,0-2.038-0.916-2.038-2.04V4.453c0-1.124,0.915-2.04,2.038-2.04H25.547 M25.547,2.001H4.452 c-1.353,0-2.451,1.098-2.451,2.452v21.095c0,1.354,1.098,2.453,2.451,2.453h21.095c1.354,0,2.454-1.1,2.454-2.453V4.453 C28.001,3.099,26.901,2.001,25.547,2.001L25.547,2.001z" fill="url(#SVGID_2__)"/>
<circle cx="8.615" cy="21.385" fill="#FFFFFF" r="2.508"/>
<path d="M20.547,23.614h3.345c0-9.651-7.854-17.506-17.505-17.506v3.344C14.196,9.453,20.547,15.805,20.547,23.614z" fill="#FFFFFF"/>
<path d="M14.466,23.614h3.343c0-6.299-5.124-11.424-11.422-11.424v3.345C10.842,15.535,14.466,19.158,14.466,23.614z " fill="#FFFFFF"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_help.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_help.svg Fri May 14 16:09:54 2010 +0300
@@ -1,28 +1,30 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2.2666" y2="58.2666">
-<stop offset="0" style="stop-color:#E5FFB2"/>
-<stop offset="0.3879" style="stop-color:#6AAB18"/>
-<stop offset="0.6788" style="stop-color:#247307"/>
-<stop offset="1" style="stop-color:#C2FF4A"/>
+ <stop offset="0" style="stop-color:#E5FFB2"/>
+ <stop offset="0.3879" style="stop-color:#6AAB18"/>
+ <stop offset="0.6788" style="stop-color:#247307"/>
+ <stop offset="1" style="stop-color:#C2FF4A"/>
</linearGradient>
<circle cx="30" cy="30" fill="url(#SVGID_1_)" r="28"/>
<radialGradient cx="30.2666" cy="5.2007" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="51.4665">
-<stop offset="0" style="stop-color:#AFED23"/>
-<stop offset="0.8121" style="stop-color:#358C0C"/>
-<stop offset="1" style="stop-color:#67AD1A"/>
+ <stop offset="0" style="stop-color:#AFED23"/>
+ <stop offset="0.8121" style="stop-color:#358C0C"/>
+ <stop offset="1" style="stop-color:#67AD1A"/>
</radialGradient>
<path d="M30,57.2C15.002,57.2,2.801,44.999,2.801,30S15.002,2.8,30,2.8S57.199,15.001,57.199,30 S44.998,57.2,30,57.2L30,57.2z" fill="url(#SVGID_2_)"/>
-<path d="M21.201,19.861v-4.594c2.779-0.641,5.418-0.961,7.916-0.961c3.689,0,6.516,0.714,8.484,2.146 c1.971,1.428,2.955,3.525,2.955,6.292c0,1.609-0.381,2.972-1.137,4.089c-0.76,1.117-5.988,6.37-6.504,7.089s-0.773,1.57-0.773,2.555 v0.984h-7.336v-1.313c0-1.594,0.348-2.94,1.043-4.042c0.695-1.102,1.91-2.465,3.645-4.09c1.359-1.266,3.047-4.203,3.047-4.828 c0-2.827-1.703-4.24-5.109-4.24C25.51,18.947,23.436,19.251,21.201,19.861z M28.439,50c-1.236,0-2.297-0.438-3.188-1.313 c-0.889-0.875-1.334-1.945-1.334-3.211c0-1.25,0.441-2.321,1.322-3.21c0.883-0.891,1.949-1.336,3.199-1.336s2.32,0.445,3.211,1.336 c0.891,0.89,1.336,1.96,1.336,3.21c0,1.266-0.445,2.335-1.336,3.211C30.76,49.563,29.689,50,28.439,50z" fill-opacity="0.35" stroke-opacity="0.35"/>
-<path d="M21.201,18.754v-4.593c2.779-0.64,5.418-0.96,7.916-0.96c3.689,0,6.516,0.714,8.484,2.145 c1.971,1.428,2.955,3.525,2.955,6.292c0,1.609-0.381,2.972-1.137,4.089c-0.76,1.117-5.988,6.371-6.504,7.089 c-0.516,0.719-0.773,1.57-0.773,2.554v0.985h-7.336v-1.313c0-1.594,0.348-2.941,1.043-4.042s1.91-2.465,3.645-4.09 c1.359-1.266,3.047-4.204,3.047-4.828c0-2.827-1.703-4.241-5.109-4.241C25.51,17.841,23.436,18.145,21.201,18.754z M28.439,48.894 c-1.236,0-2.297-0.438-3.188-1.313c-0.889-0.875-1.334-1.945-1.334-3.211c0-1.25,0.441-2.32,1.322-3.21 c0.883-0.891,1.949-1.336,3.199-1.336s2.32,0.445,3.211,1.336s1.336,1.96,1.336,3.21c0,1.266-0.445,2.336-1.336,3.211 C30.76,48.456,29.689,48.894,28.439,48.894z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M21.201,19.861v-4.594c2.779-0.641,5.418-0.961,7.916-0.961c3.689,0,6.516,0.714,8.484,2.146 c1.971,1.428,2.955,3.525,2.955,6.292c0,1.609-0.381,2.972-1.137,4.089c-0.76,1.117-5.988,6.37-6.504,7.089s-0.773,1.57-0.773,2.555 v0.984h-7.336v-1.313c0-1.594,0.348-2.94,1.043-4.042c0.695-1.102,1.91-2.465,3.645-4.09c1.359-1.266,3.047-4.203,3.047-4.828 c0-2.827-1.703-4.24-5.109-4.24C25.51,18.947,23.436,19.251,21.201,19.861z M28.439,50c-1.236,0-2.297-0.438-3.188-1.313 c-0.889-0.875-1.334-1.945-1.334-3.211c0-1.25,0.441-2.321,1.322-3.21c0.883-0.891,1.949-1.336,3.199-1.336s2.32,0.445,3.211,1.336 c0.891,0.89,1.336,1.96,1.336,3.21c0,1.266-0.445,2.335-1.336,3.211C30.76,49.563,29.689,50,28.439,50z" opacity="0.35"/>
+<path d="M21.201,18.754v-4.593c2.779-0.64,5.418-0.96,7.916-0.96c3.689,0,6.516,0.714,8.484,2.145 c1.971,1.428,2.955,3.525,2.955,6.292c0,1.609-0.381,2.972-1.137,4.089c-0.76,1.117-5.988,6.371-6.504,7.089 c-0.516,0.719-0.773,1.57-0.773,2.554v0.985h-7.336v-1.313c0-1.594,0.348-2.941,1.043-4.042s1.91-2.465,3.645-4.09 c1.359-1.266,3.047-4.204,3.047-4.828c0-2.827-1.703-4.241-5.109-4.241C25.51,17.841,23.436,18.145,21.201,18.754z M28.439,48.894 c-1.236,0-2.297-0.438-3.188-1.313c-0.889-0.875-1.334-1.945-1.334-3.211c0-1.25,0.441-2.32,1.322-3.21 c0.883-0.891,1.949-1.336,3.199-1.336s2.32,0.445,3.211,1.336s1.336,1.96,1.336,3.21c0,1.266-0.445,2.336-1.336,3.211 C30.76,48.456,29.689,48.894,28.439,48.894z" opacity="0.35"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30.8789" x2="30.8789" y1="11.7944" y2="47.7757">
-<stop offset="0" style="stop-color:#F6FDFF"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+ <stop offset="0" style="stop-color:#F6FDFF"/>
+ <stop offset="1" style="stop-color:#ADB3B5"/>
</linearGradient>
<path d="M21.201,17.461v-4.593c2.779-0.641,5.418-0.961,7.916-0.961c3.689,0,6.516,0.714,8.484,2.145 c1.971,1.428,2.955,3.525,2.955,6.292c0,1.61-0.381,2.972-1.137,4.089c-0.76,1.117-5.988,6.371-6.504,7.089 s-0.773,1.571-0.773,2.554v0.985h-7.336v-1.313c0-1.594,0.348-2.941,1.043-4.042c0.695-1.101,1.91-2.465,3.645-4.09 c1.359-1.265,3.047-4.203,3.047-4.828c0-2.826-1.703-4.241-5.109-4.241C25.51,16.546,23.436,16.852,21.201,17.461z M28.439,47.6 c-1.236,0-2.297-0.438-3.188-1.312c-0.889-0.875-1.334-1.945-1.334-3.211c0-1.25,0.441-2.32,1.322-3.21 c0.883-0.891,1.949-1.336,3.199-1.336s2.32,0.445,3.211,1.336s1.336,1.96,1.336,3.21c0,1.266-0.445,2.336-1.336,3.211 C30.76,47.162,29.689,47.6,28.439,47.6z" fill="url(#SVGID_3_)"/>
<rect fill="none" height="60" width="60"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_hold_call.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_hold_call.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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"/>
@@ -38,4 +38,4 @@
<path d="M53.646,32.675C51.37,33.519,39.55,35.204,30,35.205 c-9.551,0-21.371-1.688-23.645-2.53c-0.433-0.161-0.804-0.342-1.144-0.532c0.231,0.341,0.472,0.687,0.731,1.025 c0.068,0.026,0.127,0.056,0.197,0.083C8.451,34.105,20.387,35.818,30,35.818c9.614,0,21.55-1.711,23.86-2.566 c0.069-0.027,0.129-0.059,0.196-0.085c0.261-0.339,0.5-0.685,0.733-1.023C54.447,32.333,54.077,32.514,53.646,32.675z" fill="url(#SVGID_6_)" fill-opacity="0.5" stroke-opacity="0.5"/>
<rect fill="none" height="60" width="60"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_homezone.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,61 @@
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
+<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"/>
+ <stop offset="1" style="stop-color:#969899"/>
+</linearGradient>
+<polygon fill="url(#SVGID_1_)" points="52.176,57 7.829,57 7.829,33.938 30,11.426 52.176,33.938 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30.0024" x2="30.0024" y1="56.21" y2="32.4016">
+ <stop offset="0" style="stop-color:#D9DADA"/>
+ <stop offset="1" style="stop-color:#989999"/>
+</linearGradient>
+<polygon fill="url(#SVGID_2_)" points="8.538,56.291 8.538,32.809 30,11.018 51.467,32.809 51.467,56.291 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30.0024" x2="30.0024" y1="55.9912" y2="24.6791">
+ <stop offset="0" style="stop-color:#F8F9F9"/>
+ <stop offset="1" style="stop-color:#D6D8D9"/>
+</linearGradient>
+<polygon fill="url(#SVGID_3_)" points="9.958,56.291 9.958,31.262 30,10.911 50.047,31.262 50.047,56.291 "/>
+<rect fill-opacity="0.15" height="24.126" width="17.031" x="21.487" y="32.874"/>
+<rect fill-opacity="0.5" height="23.416" width="15.61" x="22.197" y="33.584"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="30.0024" x2="30.0024" y1="56.9395" y2="34.2324">
+ <stop offset="0" style="stop-color:#D07100"/>
+ <stop offset="1" style="stop-color:#632100"/>
+</linearGradient>
+<rect fill="url(#SVGID_4_)" height="22.707" width="14.191" x="22.906" y="34.293"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30.002" x2="30.002" y1="34.3389" y2="56.9575">
+ <stop offset="0" style="stop-color:#D07100"/>
+ <stop offset="1" style="stop-color:#A23600"/>
+</linearGradient>
+<rect fill="url(#SVGID_5_)" height="21.288" width="12.773" x="23.616" y="35.003"/>
+<polygon fill-opacity="0.15" points="30,11.426 7.829,33.938 7.829,37.05 30,14.264 52.176,37.05 52.176,33.938 "/>
+<polygon fill-opacity="0.35" points="30,11.426 7.829,33.938 7.829,35.631 30,12.845 52.176,35.631 52.176,33.938 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="29.9995" x2="29.9995" y1="0.772" y2="35.3261">
+ <stop offset="0" style="stop-color:#DE4E29"/>
+ <stop offset="1" style="stop-color:#992006"/>
+</linearGradient>
+<path d="M30,11.426l22.176,22.785l4.434-4.555c0,0-23.922-24.521-25.035-25.733 c-1.115-1.209-1.833-1.274-3.209,0.069C26.999,5.338,3.391,29.656,3.391,29.656l4.438,4.555L30,11.426z" fill="url(#SVGID_6_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="29.9985" x2="29.9985" y1="1.605" y2="34.2477">
+ <stop offset="0" style="stop-color:#DE8029"/>
+ <stop offset="0.2606" style="stop-color:#DE4E29"/>
+ <stop offset="1" style="stop-color:#D82E09"/>
+</linearGradient>
+<path d="M4.38,29.656c3.367-3.468,23.247-23.94,24.483-25.158c0.535-0.522,0.941-0.788,1.205-0.788 c0.235,0,0.548,0.221,0.985,0.694c1.031,1.125,21.078,21.677,24.564,25.253l-3.441,3.537L30,10.409L7.828,33.194L4.38,29.656z" fill="url(#SVGID_7_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="29.9985" x2="29.9985" y1="3.5249" y2="29.1588">
+ <stop offset="0" style="stop-color:#F7D481"/>
+ <stop offset="1" style="stop-color:#F5340A"/>
+</linearGradient>
+<path d="M28.863,5.917c0.535-0.522,0.941-0.788,1.205-0.788c0.235,0,0.548,0.221,0.985,0.694 c0.977,1.066,19.014,19.562,23.875,24.544l0.689-0.71C52.131,26.082,32.084,5.529,31.053,4.404c-0.437-0.474-0.75-0.694-0.985-0.694 c-0.264,0-0.67,0.266-1.205,0.788C27.626,5.716,7.747,26.188,4.38,29.656l0.69,0.708C9.841,25.451,27.693,7.069,28.863,5.917z" fill="url(#SVGID_8_)"/>
+<path d="M33.904,48.131c-1.369,0-2.482-1.115-2.482-2.484s1.113-2.483,2.482-2.483s2.484,1.114,2.484,2.483 S35.273,48.131,33.904,48.131L33.904,48.131z" fill-opacity="0.1"/>
+<circle cx="33.904" cy="45.646" fill-opacity="0.15" r="1.773"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="33.9043" x2="33.9043" y1="44.5342" y2="46.6904">
+ <stop offset="0" style="stop-color:#ED8100"/>
+ <stop offset="1" style="stop-color:#B04400"/>
+</linearGradient>
+<path d="M33.904,46.711c-0.586,0-1.064-0.478-1.064-1.064c0-0.586,0.479-1.064,1.064-1.064 c0.588,0,1.064,0.479,1.064,1.064C34.969,46.233,34.492,46.711,33.904,46.711L33.904,46.711z" fill="url(#SVGID_9_)"/>
+<rect fill="none" height="60" width="60"/>
+</g>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_im.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_im.svg Fri May 14 16:09:54 2010 +0300
@@ -1,48 +1,49 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="60" width="60"/>
<rect fill="none" height="60" width="60"/>
<radialGradient cx="332.6348" cy="1113.6206" gradientTransform="matrix(1 0 0 1 -304 -1104)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="40.177">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#94FFFF"/>
+ <stop offset="0.5" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</radialGradient>
<path d="M12.382,51.741c-0.268,0-0.437-0.438-0.437-1.114v-9.345l-0.157-0.102 c-6-4.087-9.439-10.062-9.439-16.389c0-11.811,11.883-21.418,26.486-21.418s26.486,9.608,26.486,21.418 c0,11.811-11.883,21.418-26.486,21.418c-3.297,0-6.522-0.489-9.588-1.454l-0.215-0.069l-5.752,6.45 C12.941,51.514,12.606,51.741,12.382,51.741L12.382,51.741z" fill="url(#SVGID_1_)"/>
<rect fill="#FFFFFF" height="1.234" width="27.511" x="15.059" y="15.13"/>
-<rect fill-opacity="0.1" height="0.616" stroke-opacity="0.1" width="27.511" x="15.059" y="16.985"/>
-<rect fill-opacity="0.2" height="0.616" stroke-opacity="0.2" width="27.511" x="15.059" y="16.363"/>
+<rect enable-background="new " height="0.616" opacity="0.1" width="27.511" x="15.059" y="16.985"/>
+<rect enable-background="new " height="0.616" opacity="0.2" width="27.511" x="15.059" y="16.363"/>
<rect fill="#FFFFFF" height="1.234" width="27.511" x="15.059" y="23.099"/>
-<rect fill-opacity="0.1" height="0.616" stroke-opacity="0.1" width="27.511" x="15.059" y="24.955"/>
-<rect fill-opacity="0.2" height="0.616" stroke-opacity="0.2" width="27.511" x="15.059" y="24.332"/>
+<rect enable-background="new " height="0.616" opacity="0.1" width="27.511" x="15.059" y="24.955"/>
+<rect enable-background="new " height="0.616" opacity="0.2" width="27.511" x="15.059" y="24.332"/>
<rect fill="#FFFFFF" height="1.234" width="27.511" x="15.059" y="31.067"/>
-<rect fill-opacity="0.1" height="0.616" stroke-opacity="0.1" width="27.511" x="15.059" y="32.924"/>
-<rect fill-opacity="0.2" height="0.616" stroke-opacity="0.2" width="27.511" x="15.059" y="32.301"/>
+<rect enable-background="new " height="0.616" opacity="0.1" width="27.511" x="15.059" y="32.924"/>
+<rect enable-background="new " height="0.616" opacity="0.2" width="27.511" x="15.059" y="32.301"/>
<linearGradient gradientTransform="matrix(1 0 0 1 -304 -1104)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="332.6865" x2="332.6865" y1="1106.7769" y2="1152.0294">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#113F85"/>
+ <stop offset="0" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#113F85"/>
</linearGradient>
<path d="M28.687,3.023C13.948,3.023,2,12.714,2,24.671c0,6.659,3.712,12.613,9.544,16.584v9.107 c0,1.6,0.873,1.932,1.936,0.738l5.571-6.245c2.99,0.94,6.237,1.462,9.638,1.462c14.736,0,26.685-9.692,26.685-21.647 C55.372,12.714,43.423,3.023,28.687,3.023z M28.687,45.18c-3.195,0-6.322-0.474-9.297-1.41l-0.7-0.22l-6.007,6.735v-9.63 l-0.499-0.34c-5.747-3.913-9.046-9.612-9.046-15.644c0-11.309,11.463-20.509,25.549-20.509c14.088,0,25.547,9.2,25.547,20.509 C54.233,35.979,42.774,45.18,28.687,45.18z" fill="url(#SVGID_2_)"/>
-<path d="M54.942,28.519c-3.528-3.098-8.502-5.042-14.019-5.042 c-10.671,0-19.353,7.235-19.353,16.13c0,2.199,0.535,4.292,1.494,6.206c1.814,0.314,3.688,0.5,5.621,0.5 C41.804,46.318,52.704,38.638,54.942,28.519z" fill-opacity="0.15" stroke-opacity="0.15"/>
-<path d="M54.624,29.76c-3.344-3.145-8.237-5.143-13.7-5.143 c-10.044,0-18.214,6.724-18.214,14.991c0,2.3,0.65,4.473,1.78,6.422c1.37,0.177,2.765,0.289,4.196,0.289 C41.262,46.318,51.801,39.258,54.624,29.76z" fill-opacity="0.15" stroke-opacity="0.15"/>
+<path d="M54.942,28.519c-3.528-3.098-8.502-5.042-14.019-5.042 c-10.671,0-19.353,7.235-19.353,16.13c0,2.199,0.535,4.292,1.494,6.206c1.814,0.314,3.688,0.5,5.621,0.5 C41.804,46.318,52.704,38.638,54.942,28.519z" enable-background="new " opacity="0.15"/>
+<path d="M54.624,29.76c-3.344-3.145-8.237-5.143-13.7-5.143 c-10.044,0-18.214,6.724-18.214,14.991c0,2.3,0.65,4.473,1.78,6.422c1.37,0.177,2.765,0.289,4.196,0.289 C41.262,46.318,51.801,39.258,54.624,29.76z" enable-background="new " opacity="0.15"/>
<linearGradient gradientTransform="matrix(1 0 0 1 -304 -1104)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="344.9238" x2="344.9238" y1="1129.416" y2="1160.7534">
-<stop offset="0" style="stop-color:#FEE16E"/>
-<stop offset="1" style="stop-color:#BD6500"/>
+ <stop offset="0" style="stop-color:#FEE16E"/>
+ <stop offset="1" style="stop-color:#BD6500"/>
</linearGradient>
<path d="M23.848,39.607c0,7.649,7.646,13.85,17.076,13.85c2.177,0,4.253-0.333,6.168-0.935l3.563,3.996 c0.686,0.764,1.239,0.553,1.239-0.473v-5.828C55.626,47.679,58,43.868,58,39.607c0-7.651-7.644-13.85-17.076-13.85 C31.494,25.755,23.848,31.956,23.848,39.607z" fill="url(#SVGID_3_)"/>
<radialGradient cx="345.2559" cy="1131.3125" gradientTransform="matrix(1 0 0 1 -304 -1104)" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="25.7806">
-<stop offset="0" style="stop-color:#FEE16E"/>
-<stop offset="0.0667" style="stop-color:#FEE16E"/>
-<stop offset="0.697" style="stop-color:#F09000"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+ <stop offset="0.0667" style="stop-color:#FEE16E"/>
+ <stop offset="0.697" style="stop-color:#F09000"/>
+ <stop offset="1" style="stop-color:#FFC501"/>
</radialGradient>
<path d="M47.452,51.216l-0.701,0.22c-1.863,0.587-3.824,0.882-5.827,0.882 c-8.787,0-15.938-5.703-15.938-12.711c0-7.01,7.15-12.715,15.938-12.715c8.79,0,15.938,5.705,15.938,12.715 c0,3.719-2.044,7.24-5.608,9.67l-0.498,0.338v5.305L47.452,51.216z" fill="url(#SVGID_4_)"/>
<rect fill="#FFFFFF" height="1.138" width="18.451" x="31.698" y="42.878"/>
-<rect fill-opacity="0.1" height="0.412" stroke-opacity="0.1" width="18.451" x="31.698" y="44.031"/>
+<rect enable-background="new " height="0.412" opacity="0.1" width="18.451" x="31.698" y="44.031"/>
<rect fill="#FFFFFF" height="1.138" width="18.451" x="31.698" y="38.325"/>
-<rect fill-opacity="0.1" height="0.413" stroke-opacity="0.1" width="18.451" x="31.698" y="39.478"/>
+<rect enable-background="new " height="0.413" opacity="0.1" width="18.451" x="31.698" y="39.478"/>
<rect fill="#FFFFFF" height="1.138" width="18.451" x="31.698" y="33.771"/>
-<rect fill-opacity="0.1" height="0.413" stroke-opacity="0.1" width="18.451" x="31.698" y="34.924"/>
+<rect enable-background="new " height="0.413" opacity="0.1" width="18.451" x="31.698" y="34.924"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_imageprint.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_imageprint.svg Fri May 14 16:09:54 2010 +0300
@@ -1,151 +1,150 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<stop offset="0" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#585B5C"/>
+ <stop offset="0" style="stop-color:#ADB3B5"/>
+ <stop offset="1" style="stop-color:#585B5C"/>
</linearGradient>
<path d="M49.198,26.8c0,0.885-0.717,1.6-1.601,1.6H12.398c-0.883,0-1.6-0.715-1.6-1.6V7.601 c0-0.883,0.717-1.6,1.6-1.6h35.199c0.884,0,1.601,0.717,1.601,1.6V26.8z" fill="url(#SVGID_1_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="29.999" x2="29.999" y1="17.6411" y2="46.4399">
-<stop offset="0" style="stop-color:#DDE3E6"/>
-<stop offset="0.6909" style="stop-color:#C0CCD1"/>
-<stop offset="1" style="stop-color:#9BA1A3"/>
+ <stop offset="0" style="stop-color:#DDE3E6"/>
+ <stop offset="0.6909" style="stop-color:#C0CCD1"/>
+ <stop offset="1" style="stop-color:#9BA1A3"/>
</linearGradient>
<path d="M57.998,43.6c0,1.769-1.432,3.2-3.201,3.2H5.199C3.434,46.8,2,45.368,2,43.6V21.2 c0-1.766,1.434-3.199,3.199-3.199h49.598c1.77,0,3.201,1.434,3.201,3.199V43.6z" fill="url(#SVGID_2_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="18.9814" y2="45.166">
-<stop offset="0" style="stop-color:#BDC3C4"/>
-<stop offset="0.3515" style="stop-color:#DDE3E6"/>
-<stop offset="0.6545" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+ <stop offset="0" style="stop-color:#BDC3C4"/>
+ <stop offset="0.3515" style="stop-color:#DDE3E6"/>
+ <stop offset="0.6545" style="stop-color:#949DA1"/>
+ <stop offset="0.9636" style="stop-color:#ADB3B5"/>
+ <stop offset="1" style="stop-color:#595C5E"/>
</linearGradient>
<path d="M54.8,45.493H5.199c-1.043,0-1.893-0.849-1.893-1.893V21.2c0-1.043,0.85-1.892,1.893-1.892H54.8 c1.044,0,1.893,0.849,1.893,1.892v22.4C56.692,44.645,55.844,45.493,54.8,45.493L54.8,45.493z" fill="url(#SVGID_3_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="29.998" x2="29.998" y1="37.9102" y2="45.1094">
-<stop offset="0" style="stop-color:#131414"/>
-<stop offset="0.2424" style="stop-color:#252629"/>
-<stop offset="1" style="stop-color:#444747"/>
+ <stop offset="0" style="stop-color:#131414"/>
+ <stop offset="0.2424" style="stop-color:#252629"/>
+ <stop offset="1" style="stop-color:#444747"/>
</linearGradient>
<rect fill="url(#SVGID_4_)" height="7.199" width="38.399" x="10.799" y="38"/>
-<rect fill="#FFFFFF" fill-opacity="0.2" height="1.307" stroke-opacity="0.2" width="38.399" x="10.799" y="36.693"/>
+<rect fill="#FFFFFF" height="1.307" opacity="0.2" width="38.399" x="10.799" y="36.693"/>
<rect fill="#6D6E70" height="0.799" width="36.797" x="11.6" y="54.8"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="29.998" x2="29.998" y1="42.6509" y2="54.6499">
-<stop offset="0" style="stop-color:#585B5C"/>
-<stop offset="0.7879" style="stop-color:#949DA1"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+ <stop offset="0" style="stop-color:#585B5C"/>
+ <stop offset="0.7879" style="stop-color:#949DA1"/>
+ <stop offset="1" style="stop-color:#ADB3B5"/>
</linearGradient>
<polygon fill="url(#SVGID_5_)" points="49.198,42.801 48.396,42.801 11.6,42.801 10.799,42.801 10.799,43.6 11.6,43.6 11.6,54.8 48.396,54.8 48.396,43.6 49.198,43.6 "/>
-<rect fill="#020202" fill-opacity="0.15" height="12" stroke-opacity="0.15" width="35.199" x="12.398" y="6.001"/>
+<rect fill="#020202" height="12" opacity="0.15" width="35.199" x="12.398" y="6.001"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="30" x2="30" y1="2.002" y2="18.7534">
-<stop offset="0" style="stop-color:#D9D9D9"/>
-<stop offset="0.5382" style="stop-color:#B3B3B3"/>
-<stop offset="1" style="stop-color:#B3B3B3"/>
+ <stop offset="0" style="stop-color:#D9D9D9"/>
+ <stop offset="0.5382" style="stop-color:#B3B3B3"/>
</linearGradient>
<rect fill="url(#SVGID_6_)" height="15.999" width="33.599" x="13.2" y="2.002"/>
-<path d="M21.665,2.002c0,0,14.519,2.2,19.918,9.599 c0,0,4.081-5.6,5.216-2.555C46.226,6.105,41.045,1.897,21.665,2.002z" fill="#050505" fill-opacity="0.05" fill-rule="evenodd" stroke-opacity="0.05"/>
-<path d="M21.665,2.002c0,0,14.519,0.6,19.918,8.001 c0,0,4.081-4.801,5.216-0.957C46.226,6.105,41.045,1.897,21.665,2.002z" fill="#050505" fill-opacity="0.1" fill-rule="evenodd" stroke-opacity="0.1"/>
+<path clip-rule="evenodd" d="M21.665,2.002c0,0,14.519,2.2,19.918,9.599 c0,0,4.081-5.6,5.216-2.555C46.226,6.105,41.045,1.897,21.665,2.002z" fill="#050505" fill-rule="evenodd" opacity="0.05"/>
+<path clip-rule="evenodd" d="M21.665,2.002c0,0,14.519,0.6,19.918,8.001 c0,0,4.081-4.801,5.216-0.957C46.226,6.105,41.045,1.897,21.665,2.002z" fill="#050505" fill-rule="evenodd" opacity="0.1"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="34.9932" x2="33.4854" y1="2.6978" y2="8.2986">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.0061" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#D9D9D9"/>
+ <stop offset="0.0061" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#D9D9D9"/>
</linearGradient>
-<path d="M21.665,2.002c0,0,14.519,0.13,19.918,7.528 c0,0,3.866-4.768,5.216-0.484C46.226,6.105,41.045,1.897,21.665,2.002z" fill="url(#SVGID_7_)" fill-rule="evenodd"/>
-<rect fill="#020202" fill-opacity="0.2" height="12.798" stroke-opacity="0.2" width="35.199" x="12.398" y="42.801"/>
+<path clip-rule="evenodd" d="M21.665,2.002c0,0,14.519,0.13,19.918,7.528 c0,0,3.866-4.768,5.216-0.484C46.226,6.105,41.045,1.897,21.665,2.002z" fill="url(#SVGID_7_)" fill-rule="evenodd"/>
+<rect fill="#020202" height="12.798" opacity="0.2" width="35.199" x="12.398" y="42.801"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="30" x2="30" y1="40.3994" y2="58.4715">
-<stop offset="0" style="stop-color:#F5F5F5"/>
-<stop offset="0.8606" style="stop-color:#8F8F8F"/>
-<stop offset="1" style="stop-color:#A6A6A6"/>
+ <stop offset="0" style="stop-color:#F5F5F5"/>
+ <stop offset="0.8606" style="stop-color:#8F8F8F"/>
+ <stop offset="1" style="stop-color:#A6A6A6"/>
</linearGradient>
<rect fill="url(#SVGID_8_)" height="17.601" width="33.599" x="13.2" y="40.399"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="30" x2="30" y1="39.6006" y2="57.6697">
-<stop offset="0" style="stop-color:#F5F5F5"/>
-<stop offset="0.7818" style="stop-color:#CCCCCC"/>
-<stop offset="1" style="stop-color:#D1D1D1"/>
+ <stop offset="0" style="stop-color:#F5F5F5"/>
+ <stop offset="0.7818" style="stop-color:#CCCCCC"/>
+ <stop offset="1" style="stop-color:#D1D1D1"/>
</linearGradient>
<polygon fill="url(#SVGID_9_)" points="46.799,57.198 38.332,57.198 34.611,57.112 20.8,55.063 14.338,51.975 13.642,51.294 13.2,50.225 13.2,39.601 46.799,39.601 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="38.749" x2="22.3049" y1="37.021" y2="56.1539">
-<stop offset="0" style="stop-color:#C2F3FF"/>
-<stop offset="0.3758" style="stop-color:#2D9BD2"/>
-<stop offset="0.6909" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#1347BA"/>
+ <stop offset="0" style="stop-color:#C2F3FF"/>
+ <stop offset="0.3758" style="stop-color:#2D9BD2"/>
+ <stop offset="0.6909" style="stop-color:#1347BA"/>
</linearGradient>
<polygon fill="url(#SVGID_10_)" points="45.199,54.8 22.799,54.8 14.801,52.398 14.801,39.601 45.199,39.601 "/>
<linearGradient gradientTransform="matrix(0.8734 -0.108 0.1257 0.9176 55.8475 218.6808)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="-7.1758" x2="-5.4868" y1="-190.3931" y2="-184.663">
-<stop offset="0" style="stop-color:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
+ <stop offset="0" style="stop-color:#A7FF00"/>
+ <stop offset="1" style="stop-color:#138F00"/>
</linearGradient>
<path d="M32.764,41.259c0,0-10.45,3.05-11.486,13.332C21.277,54.591,32.56,51.987,32.764,41.259z" fill="url(#SVGID_11_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="24.5244" x2="17.7473" y1="44.6128" y2="48.3141">
-<stop offset="0" style="stop-color:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
+ <stop offset="0" style="stop-color:#A7FF00"/>
+ <stop offset="1" style="stop-color:#138F00"/>
</linearGradient>
<path d="M18.223,39.601c0,0,6.994,6.28,6.553,15.199h-1.977l-7.998-3.039v-12.16H18.223z" fill="url(#SVGID_12_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="13.4502" x2="18.0304" y1="47.0591" y2="46.2696">
-<stop offset="0" style="stop-color:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
+ <stop offset="0" style="stop-color:#A7FF00"/>
+ <stop offset="1" style="stop-color:#138F00"/>
</linearGradient>
<path d="M14.801,39.601v12.798c0,0,4.039,1.376,4.026,0.881c-0.196-7.036-2.468-11.459-4.024-13.679H14.801z " fill="url(#SVGID_13_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="29.6777" x2="37.6251" y1="46.6196" y2="52.8009">
-<stop offset="0" style="stop-color:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
+ <stop offset="0" style="stop-color:#A7FF00"/>
+ <stop offset="1" style="stop-color:#138F00"/>
</linearGradient>
<path d="M22.893,54.8c0,0,2.605-8.37,20.937-10.631c0,0-1.723,7.344-9.751,10.631H22.893z" fill="url(#SVGID_14_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="38.2305" x2="26.6075" y1="43.4058" y2="56.9659">
-<stop offset="0" style="stop-color:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
+ <stop offset="0" style="stop-color:#A7FF00"/>
+ <stop offset="1" style="stop-color:#138F00"/>
</linearGradient>
<path d="M43.801,44.278c0.018-0.069,0.028-0.109,0.028-0.109C25.092,46.172,22.893,54.8,22.893,54.8h0.479 C23.372,54.8,24.978,46.563,43.801,44.278z" fill="url(#SVGID_15_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="39.4199" x2="34.4577" y1="53.3096" y2="48.4554">
-<stop offset="0" style="stop-color:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
+ <stop offset="0" style="stop-color:#A7FF00"/>
+ <stop offset="1" style="stop-color:#138F00"/>
</linearGradient>
<path d="M27.33,54.8c0,0,6.406-2.688,16.471-10.521c-0.225,2.718-2.982,8.391-9.723,10.521H27.33z" fill="url(#SVGID_16_)"/>
-<rect fill="#FFFFFF" fill-opacity="0.3" height="0.801" stroke-opacity="0.3" width="21.6" x="23.6" y="53.999"/>
-<path d="M38.332,57.198c0,0-14.518-1.398-19.918-8.799 c0,0-3.866,6.038-5.214,1.756C13.774,53.095,18.955,57.304,38.332,57.198z" fill="#050505" fill-opacity="0.1" fill-rule="evenodd" stroke-opacity="0.1"/>
-<path d="M38.332,57.198c0,0-14.508-0.513-19.908-7.91 c0,0-3.876,5.149-5.224,0.867C13.774,53.095,18.955,57.304,38.332,57.198z" fill="#050505" fill-opacity="0.2" fill-rule="evenodd" stroke-opacity="0.2"/>
+<rect fill="#FFFFFF" height="0.801" opacity="0.3" width="21.6" x="23.6" y="53.999"/>
+<path clip-rule="evenodd" d="M38.332,57.198c0,0-14.518-1.398-19.918-8.799 c0,0-3.866,6.038-5.214,1.756C13.774,53.095,18.955,57.304,38.332,57.198z" fill="#050505" fill-rule="evenodd" opacity="0.1"/>
+<path clip-rule="evenodd" d="M38.332,57.198c0,0-14.508-0.513-19.908-7.91 c0,0-3.876,5.149-5.224,0.867C13.774,53.095,18.955,57.304,38.332,57.198z" fill="#050505" fill-rule="evenodd" opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="25.8027" x2="24.4534" y1="53.5825" y2="57.1418">
-<stop offset="0" style="stop-color:#FEFEFE"/>
-<stop offset="0.8182" style="stop-color:#E3E3E3"/>
-<stop offset="1" style="stop-color:#DEDEDE"/>
+ <stop offset="0" style="stop-color:#FEFEFE"/>
+ <stop offset="0.8182" style="stop-color:#E3E3E3"/>
+ <stop offset="1" style="stop-color:#DEDEDE"/>
</linearGradient>
-<path d="M38.332,57.198c0,0-14.518-0.13-19.918-7.527 c0,0-3.866,4.767-5.214,0.484C13.774,53.095,18.955,57.304,38.332,57.198z" fill="url(#SVGID_17_)" fill-rule="evenodd"/>
-<rect fill="#020202" fill-opacity="0.1" height="0.802" stroke-opacity="0.1" width="33.599" x="13.2" y="41.999"/>
-<rect fill="#020202" fill-opacity="0.2" height="0.799" stroke-opacity="0.2" width="33.599" x="13.2" y="41.2"/>
-<rect fill="#020202" fill-opacity="0.3" height="0.801" stroke-opacity="0.3" width="33.599" x="13.2" y="40.399"/>
-<rect fill="#020202" fill-opacity="0.5" height="0.799" stroke-opacity="0.5" width="33.599" x="13.2" y="39.601"/>
-<rect fill="#020202" fill-opacity="0.3" height="0.799" stroke-opacity="0.3" width="38.399" x="10.799" y="17.202"/>
-<rect fill="#020202" fill-opacity="0.1" height="0.802" stroke-opacity="0.1" width="38.399" x="10.799" y="16.4"/>
-<path d="M8.4,18.001V21.2c0,2.205,1.793,3.999,3.998,3.999h35.199c2.205,0,4-1.794,4-3.999v-3.199H8.4 z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path clip-rule="evenodd" d="M38.332,57.198c0,0-14.518-0.13-19.918-7.527 c0,0-3.866,4.767-5.214,0.484C13.774,53.095,18.955,57.304,38.332,57.198z" fill="url(#SVGID_17_)" fill-rule="evenodd"/>
+<rect fill="#020202" height="0.802" opacity="0.1" width="33.599" x="13.2" y="41.999"/>
+<rect fill="#020202" height="0.799" opacity="0.2" width="33.599" x="13.2" y="41.2"/>
+<rect fill="#020202" height="0.801" opacity="0.3" width="33.599" x="13.2" y="40.399"/>
+<rect fill="#020202" height="0.799" opacity="0.5" width="33.599" x="13.2" y="39.601"/>
+<rect fill="#020202" height="0.799" opacity="0.3" width="38.399" x="10.799" y="17.202"/>
+<rect fill="#020202" height="0.802" opacity="0.1" width="38.399" x="10.799" y="16.4"/>
+<path d="M8.4,18.001V21.2c0,2.205,1.793,3.999,3.998,3.999h35.199c2.205,0,4-1.794,4-3.999v-3.199H8.4 z" fill="#FFFFFF" opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="29.999" x2="29.999" y1="17.9209" y2="24.3213">
-<stop offset="0" style="stop-color:#A0A7A8"/>
-<stop offset="0.7576" style="stop-color:#252629"/>
-<stop offset="1" style="stop-color:#1F2021"/>
+ <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="M9.199,18.001V21.2c0,1.769,1.434,3.201,3.199,3.201h35.199c1.767,0,3.201-1.433,3.201-3.201v-3.199 H9.199z" fill="url(#SVGID_18_)"/>
-<rect fill="#FFFFFF" fill-opacity="0.2" height="1.307" stroke-opacity="0.2" width="41.6" x="9.199" y="18.001"/>
+<rect fill="#FFFFFF" height="1.307" opacity="0.2" width="41.6" x="9.199" y="18.001"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="53.1973" x2="53.1973" y1="41.2002" y2="44.4434">
-<stop offset="0" style="stop-color:#576266"/>
-<stop offset="1" style="stop-color:#E3E3E3"/>
+ <stop offset="0" style="stop-color:#576266"/>
+ <stop offset="1" style="stop-color:#E3E3E3"/>
</linearGradient>
<path d="M54.797,43.597c0,0.441-0.359,0.799-0.799,0.799h-1.6c-0.441,0-0.801-0.357-0.801-0.799v-1.598 c0-0.441,0.359-0.799,0.801-0.799h1.6c0.439,0,0.799,0.357,0.799,0.799V43.597z" fill="url(#SVGID_19_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="53.1982" x2="53.1982" y1="41.9692" y2="43.616">
-<stop offset="0" style="stop-color:#FFC142"/>
-<stop offset="0.7455" style="stop-color:#CF4E18"/>
-<stop offset="1" style="stop-color:#B52100"/>
+ <stop offset="0" style="stop-color:#FFC142"/>
+ <stop offset="0.7455" style="stop-color:#CF4E18"/>
+ <stop offset="1" style="stop-color:#B52100"/>
</linearGradient>
<rect fill="url(#SVGID_20_)" height="1.598" width="1.6" x="52.398" y="41.999"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="53.1973" x2="53.1973" y1="36.4004" y2="39.6486">
-<stop offset="0" style="stop-color:#576266"/>
-<stop offset="1" style="stop-color:#C4C4C4"/>
+ <stop offset="0" style="stop-color:#576266"/>
+ <stop offset="1" style="stop-color:#C4C4C4"/>
</linearGradient>
<path d="M54.797,38.799c0,0.444-0.357,0.802-0.801,0.802h-1.598c-0.441,0-0.801-0.357-0.801-0.802v-1.6 c0-0.441,0.359-0.799,0.801-0.799h1.598c0.443,0,0.801,0.357,0.801,0.799V38.799z" fill="url(#SVGID_21_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="53.1973" x2="53.1973" y1="37.1694" y2="38.8182">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+ <stop offset="0" style="stop-color:#C6FF45"/>
+ <stop offset="0.7273" style="stop-color:#66A00E"/>
+ <stop offset="1" style="stop-color:#387300"/>
</linearGradient>
<rect fill="url(#SVGID_22_)" height="1.6" width="1.598" x="52.398" y="37.199"/>
<rect fill="none" height="60" width="60"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_info.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_info.svg Fri May 14 16:09:54 2010 +0300
@@ -1,35 +1,37 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="60" width="60"/>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2.2666" y2="58.2666">
-<stop offset="0" style="stop-color:#E5FFB2"/>
-<stop offset="0.3879" style="stop-color:#6AAB18"/>
-<stop offset="0.6788" style="stop-color:#247307"/>
-<stop offset="1" style="stop-color:#C2FF4A"/>
+ <stop offset="0" style="stop-color:#E5FFB2"/>
+ <stop offset="0.3879" style="stop-color:#6AAB18"/>
+ <stop offset="0.6788" style="stop-color:#247307"/>
+ <stop offset="1" style="stop-color:#C2FF4A"/>
</linearGradient>
<circle cx="30" cy="30" fill="url(#SVGID_1_)" r="28"/>
<radialGradient cx="30.2666" cy="5.2007" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="51.4669">
-<stop offset="0" style="stop-color:#AFED23"/>
-<stop offset="0.8121" style="stop-color:#358C0C"/>
-<stop offset="1" style="stop-color:#67AD1A"/>
+ <stop offset="0" style="stop-color:#AFED23"/>
+ <stop offset="0.8121" style="stop-color:#358C0C"/>
+ <stop offset="1" style="stop-color:#67AD1A"/>
</radialGradient>
<path d="M30,57.2C15.002,57.2,2.801,44.999,2.801,30S15.002,2.8,30,2.8c14.999,0,27.2,12.201,27.2,27.2 S44.999,57.2,30,57.2L30,57.2z" fill="url(#SVGID_2_)"/>
-<polygon fill-opacity="0.1" points="23.799,27.181 26.471,27.181 26.471,50.313 34.252,50.313 34.252,22.751 23.799,22.751 " stroke-opacity="0.1"/>
-<path d="M30.39,19.892c1.281,0,2.31-0.316,3.083-0.949c0.773-0.632,1.159-1.504,1.159-2.612 c0-1.08-0.399-1.942-1.196-2.591s-1.813-0.973-3.046-0.973c-1.297,0-2.323,0.319-3.081,0.96c-0.76,0.642-1.138,1.509-1.138,2.604 c0,1.108,0.388,1.98,1.161,2.612C28.105,19.575,29.124,19.892,30.39,19.892z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<polygon fill-opacity="0.2" points="23.799,26.38 26.471,26.38 26.471,49.513 34.252,49.513 34.252,21.95 23.799,21.95 " stroke-opacity="0.2"/>
-<path d="M30.39,19.091c1.281,0,2.31-0.316,3.083-0.949s1.159-1.503,1.159-2.613c0-1.077-0.399-1.94-1.196-2.589 s-1.813-0.974-3.046-0.974c-1.297,0-2.323,0.321-3.081,0.962c-0.76,0.641-1.138,1.507-1.138,2.601c0,1.11,0.388,1.98,1.161,2.613 S29.124,19.091,30.39,19.091z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<polygon opacity="0.1" points="23.799,27.181 26.471,27.181 26.471,50.313 34.252,50.313 34.252,22.751 23.799,22.751 "/>
+<path d="M30.39,19.892c1.281,0,2.31-0.316,3.083-0.949c0.773-0.632,1.159-1.504,1.159-2.612 c0-1.08-0.399-1.942-1.196-2.591s-1.813-0.973-3.046-0.973c-1.297,0-2.323,0.319-3.081,0.96c-0.76,0.642-1.138,1.509-1.138,2.604 c0,1.108,0.388,1.98,1.161,2.612C28.105,19.575,29.124,19.892,30.39,19.892z" opacity="0.1"/>
+<polygon opacity="0.2" points="23.799,26.38 26.471,26.38 26.471,49.513 34.252,49.513 34.252,21.95 23.799,21.95 "/>
+<path d="M30.39,19.091c1.281,0,2.31-0.316,3.083-0.949s1.159-1.503,1.159-2.613c0-1.077-0.399-1.94-1.196-2.589 s-1.813-0.974-3.046-0.974c-1.297,0-2.323,0.321-3.081,0.962c-0.76,0.641-1.138,1.507-1.138,2.601c0,1.11,0.388,1.98,1.161,2.613 S29.124,19.091,30.39,19.091z" opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="29.0254" x2="29.0254" y1="11.5566" y2="49.1577">
-<stop offset="0" style="stop-color:#F6FDFF"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+ <stop offset="0" style="stop-color:#F6FDFF"/>
+ <stop offset="1" style="stop-color:#ADB3B5"/>
</linearGradient>
<polygon fill="url(#SVGID_3_)" points="23.799,25.581 26.471,25.581 26.471,48.713 34.252,48.713 34.252,21.15 23.799,21.15 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="30.373" x2="30.373" y1="11.5576" y2="49.1534">
-<stop offset="0" style="stop-color:#F6FDFF"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+ <stop offset="0" style="stop-color:#F6FDFF"/>
+ <stop offset="1" style="stop-color:#ADB3B5"/>
</linearGradient>
<path d="M30.361,18.291c1.281,0,2.309-0.315,3.083-0.948c0.773-0.633,1.159-1.504,1.159-2.613 c0-1.079-0.398-1.941-1.195-2.59s-1.813-0.973-3.047-0.973c-1.297,0-2.323,0.32-3.082,0.961s-1.137,1.507-1.137,2.602 c0,1.109,0.388,1.98,1.161,2.613C28.076,17.976,29.096,18.291,30.361,18.291z" fill="url(#SVGID_4_)"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_input_device.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_input_device.svg Fri May 14 16:09:54 2010 +0300
@@ -1,86 +1,92 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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">
-<stop offset="0" style="stop-color:#ECF4F8"/>
-<stop offset="0.7308" style="stop-color:#818687"/>
-<stop offset="1" style="stop-color:#CEDBE0"/>
+ <stop offset="0" style="stop-color:#ECF4F8"/>
+ <stop offset="0.7308" style="stop-color:#818687"/>
+ <stop offset="1" style="stop-color:#CEDBE0"/>
</linearGradient>
-<path d="M6.505,55.064C6.505,56.68,7.809,58,9.401,58h41.197 c1.594,0,2.896-1.32,2.896-2.936V14.48c0-1.615-1.303-2.937-2.896-2.937H9.401c-1.592,0-2.896,1.321-2.896,2.937V55.064z" fill="url(#SVGID_1_)" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M6.505,55.064C6.505,56.68,7.809,58,9.401,58h41.197 c1.594,0,2.896-1.32,2.896-2.936V14.48c0-1.615-1.303-2.937-2.896-2.937H9.401c-1.592,0-2.896,1.321-2.896,2.937V55.064z" enable-background="new " fill="url(#SVGID_1_)" opacity="0.6"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 8.3999 35.04)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="21.6001" x2="21.6001" y1="22.0293" y2="-21.623">
-<stop offset="0" style="stop-color:#E5EBED"/>
-<stop offset="0.6727" style="stop-color:#A1A9AC"/>
-<stop offset="1" style="stop-color:#C6CDCF"/>
+ <stop offset="0" style="stop-color:#E5EBED"/>
+ <stop offset="0.6727" style="stop-color:#A1A9AC"/>
+ <stop offset="1" style="stop-color:#C6CDCF"/>
</linearGradient>
<path d="M50.598,56.531H9.401c-0.789,0-1.427-0.66-1.427-1.477V14.48c0-0.809,0.638-1.469,1.427-1.469h41.197 c0.785,0,1.428,0.66,1.428,1.469v40.575C52.025,55.871,51.383,56.531,50.598,56.531L50.598,56.531z" fill="url(#SVGID_2_)"/>
<g>
-<path d="M24,47.958c-6.556,0-11.892-5.335-11.892-11.896 c0-6.556,5.335-11.889,11.892-11.889c6.557,0,11.891,5.333,11.891,11.889C35.891,42.623,30.557,47.958,24,47.958L24,47.958z" fill-opacity="0.5" stroke-opacity="0.5"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 8.3999 35.04)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="3.5708" x2="26.8214" y1="-0.2554" y2="-0.2554">
-<stop offset="0" style="stop-color:#262626"/>
-<stop offset="0.3879" style="stop-color:#CCCCCC"/>
-<stop offset="0.7091" style="stop-color:#262626"/>
-<stop offset="1" style="stop-color:#757575"/>
-</linearGradient>
-<path d="M35.453,35.295c0,6.323-5.125,11.454-11.454,11.454c-6.323,0-11.453-5.131-11.453-11.454 c0-6.332,5.13-11.453,11.453-11.453C30.328,23.842,35.453,28.963,35.453,35.295z" fill="url(#SVGID_3_)"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 8.3999 35.04)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="15.6006" x2="15.6006" y1="9.3652" y2="-9.4998">
-<stop offset="0" style="stop-color:#999999"/>
-<stop offset="1" style="stop-color:#000000"/>
-</linearGradient>
-<path d="M24,45.249c-6.04,0-10.953-4.913-10.953-10.954c0-6.04,4.914-10.953,10.953-10.953 s10.954,4.913,10.954,10.953C34.953,40.336,30.039,45.249,24,45.249L24,45.249z" fill="url(#SVGID_4_)"/>
-<path d="M13.188,16.536c0,4.259,2.52,8.104,6.36,9.848v6.69 c0,2.451,1.996,4.451,4.451,4.451c2.456,0,4.452-2,4.452-4.451v-6.69c3.84-1.744,6.359-5.589,6.359-9.848 c0-1.805-0.455-3.5-1.24-4.992H14.428C13.643,13.036,13.188,14.731,13.188,16.536z" fill-opacity="0.25" stroke-opacity="0.25"/>
-<path d="M20.329,18.189v16.886c0,2.028,1.644,3.672,3.671,3.672 c2.027,0,3.67-1.644,3.67-3.672V18.189H20.329z" fill-opacity="0.5" stroke-opacity="0.5"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 8.3999 35.04)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="11.9292" x2="19.27" y1="7.5596" y2="7.5596">
-<stop offset="0" style="stop-color:#6E6E6E"/>
-<stop offset="0.3455" style="stop-color:#E0E0E0"/>
-<stop offset="0.7515" style="stop-color:#838383"/>
-<stop offset="1" style="stop-color:#C9C9C9"/>
-</linearGradient>
-<path d="M20.329,17.206v16.877c0,2.028,1.644,3.672,3.671,3.672c2.027,0,3.67-1.644,3.67-3.672V17.206 H20.329z" fill="url(#SVGID_5_)"/>
-<path d="M20.329,22.951c1.151,0.404,2.382,0.635,3.671,0.635 c1.29,0,2.52-0.23,3.67-0.635v-9.646h-7.341V22.951z" fill-opacity="0.5" stroke-opacity="0.5"/>
-<radialGradient cx="15.5718" cy="32.6318" gradientTransform="matrix(1 0 0 -1 8.3999 35.04)" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="19.0015">
-<stop offset="0" style="stop-color:#C0E76F"/>
-<stop offset="0.1333" style="stop-color:#C0E76F"/>
-<stop offset="0.4848" style="stop-color:#79BE19"/>
-<stop offset="0.7091" style="stop-color:#428C0F"/>
-<stop offset="0.8545" style="stop-color:#5CA617"/>
-<stop offset="1" style="stop-color:#96CF3D"/>
-</radialGradient>
-<path d="M34.059,12.059c0,5.56-4.502,10.057-10.059,10.057c-5.556,0-10.058-4.497-10.058-10.057 C13.941,6.505,18.443,2,24,2C29.557,2,34.059,6.505,34.059,12.059z" fill="url(#SVGID_6_)"/>
+ <path d="M24,47.958c-6.556,0-11.892-5.335-11.892-11.896 c0-6.556,5.335-11.889,11.892-11.889c6.557,0,11.891,5.333,11.891,11.889C35.891,42.623,30.557,47.958,24,47.958L24,47.958z" enable-background="new " opacity="0.5"/>
+
+ <linearGradient gradientTransform="matrix(1 0 0 -1 8.3999 35.04)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="3.5708" x2="26.8214" y1="-0.2554" y2="-0.2554">
+ <stop offset="0" style="stop-color:#262626"/>
+ <stop offset="0.3879" style="stop-color:#CCCCCC"/>
+ <stop offset="0.7091" style="stop-color:#262626"/>
+ <stop offset="1" style="stop-color:#757575"/>
+ </linearGradient>
+ <path d="M35.453,35.295c0,6.323-5.125,11.454-11.454,11.454c-6.323,0-11.453-5.131-11.453-11.454 c0-6.332,5.13-11.453,11.453-11.453C30.328,23.842,35.453,28.963,35.453,35.295z" fill="url(#SVGID_3_)"/>
+
+ <linearGradient gradientTransform="matrix(1 0 0 -1 8.3999 35.04)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="15.6006" x2="15.6006" y1="9.3652" y2="-9.4998">
+ <stop offset="0" style="stop-color:#999999"/>
+ <stop offset="1" style="stop-color:#000000"/>
+ </linearGradient>
+ <path d="M24,45.249c-6.04,0-10.953-4.913-10.953-10.954c0-6.04,4.914-10.953,10.953-10.953 s10.954,4.913,10.954,10.953C34.953,40.336,30.039,45.249,24,45.249L24,45.249z" fill="url(#SVGID_4_)"/>
+ <path d="M13.188,16.536c0,4.259,2.52,8.104,6.36,9.848v6.69 c0,2.451,1.996,4.451,4.451,4.451c2.456,0,4.452-2,4.452-4.451v-6.69c3.84-1.744,6.359-5.589,6.359-9.848 c0-1.805-0.455-3.5-1.24-4.992H14.428C13.643,13.036,13.188,14.731,13.188,16.536z" enable-background="new " opacity="0.25"/>
+ <path d="M20.329,18.189v16.886c0,2.028,1.644,3.672,3.671,3.672 c2.027,0,3.67-1.644,3.67-3.672V18.189H20.329z" enable-background="new " opacity="0.5"/>
+
+ <linearGradient gradientTransform="matrix(1 0 0 -1 8.3999 35.04)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="11.9292" x2="19.27" y1="7.5596" y2="7.5596">
+ <stop offset="0" style="stop-color:#6E6E6E"/>
+ <stop offset="0.3455" style="stop-color:#E0E0E0"/>
+ <stop offset="0.7515" style="stop-color:#838383"/>
+ <stop offset="1" style="stop-color:#C9C9C9"/>
+ </linearGradient>
+ <path d="M20.329,17.206v16.877c0,2.028,1.644,3.672,3.671,3.672c2.027,0,3.67-1.644,3.67-3.672V17.206 H20.329z" fill="url(#SVGID_5_)"/>
+ <path d="M20.329,22.951c1.151,0.404,2.382,0.635,3.671,0.635 c1.29,0,2.52-0.23,3.67-0.635v-9.646h-7.341V22.951z" enable-background="new " opacity="0.5"/>
+
+ <radialGradient cx="15.5718" cy="32.6318" gradientTransform="matrix(1 0 0 -1 8.3999 35.04)" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="19.0015">
+ <stop offset="0.1333" style="stop-color:#C0E76F"/>
+ <stop offset="0.4848" style="stop-color:#79BE19"/>
+ <stop offset="0.7091" style="stop-color:#428C0F"/>
+ <stop offset="0.8545" style="stop-color:#5CA617"/>
+ <stop offset="1" style="stop-color:#96CF3D"/>
+ </radialGradient>
+ <path d="M34.059,12.059c0,5.56-4.502,10.057-10.059,10.057c-5.556,0-10.058-4.497-10.058-10.057 C13.941,6.505,18.443,2,24,2C29.557,2,34.059,6.505,34.059,12.059z" fill="url(#SVGID_6_)"/>
</g>
<g>
-<path d="M44.482,31.73c-3.273,0-5.938-2.663-5.938-5.939 c0-3.271,2.664-5.934,5.938-5.934s5.936,2.663,5.936,5.934C50.418,29.068,47.756,31.73,44.482,31.73L44.482,31.73z" fill-opacity="0.5" stroke-opacity="0.5"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 8.3999 35.04)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="30.0771" x2="41.6829" y1="9.6299" y2="9.6299">
-<stop offset="0" style="stop-color:#262626"/>
-<stop offset="0.3879" style="stop-color:#CCCCCC"/>
-<stop offset="0.7091" style="stop-color:#262626"/>
-<stop offset="1" style="stop-color:#757575"/>
-</linearGradient>
-<path d="M50.199,25.41c0,3.157-2.558,5.717-5.717,5.717c-3.156,0-5.718-2.56-5.718-5.717 c0-3.161,2.562-5.717,5.718-5.717C47.642,19.693,50.199,22.249,50.199,25.41z" fill="url(#SVGID_7_)"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 8.3999 35.04)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="36.082" x2="36.082" y1="14.4321" y2="5.0154">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="0.7939" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#E8522A"/>
-</linearGradient>
-<path d="M44.482,30.377c-3.016,0-5.469-2.451-5.469-5.467c0-3.017,2.453-5.469,5.469-5.469 c3.014,0,5.469,2.452,5.469,5.469C49.951,27.926,47.498,30.377,44.482,30.377L44.482,30.377z" fill="url(#SVGID_8_)"/>
+ <path d="M44.482,31.73c-3.273,0-5.938-2.663-5.938-5.939 c0-3.271,2.664-5.934,5.938-5.934s5.936,2.663,5.936,5.934C50.418,29.068,47.756,31.73,44.482,31.73L44.482,31.73z" enable-background="new " opacity="0.5"/>
+
+ <linearGradient gradientTransform="matrix(1 0 0 -1 8.3999 35.04)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="30.0771" x2="41.6829" y1="9.6299" y2="9.6299">
+ <stop offset="0" style="stop-color:#262626"/>
+ <stop offset="0.3879" style="stop-color:#CCCCCC"/>
+ <stop offset="0.7091" style="stop-color:#262626"/>
+ <stop offset="1" style="stop-color:#757575"/>
+ </linearGradient>
+ <path d="M50.199,25.41c0,3.157-2.558,5.717-5.717,5.717c-3.156,0-5.718-2.56-5.718-5.717 c0-3.161,2.562-5.717,5.718-5.717C47.642,19.693,50.199,22.249,50.199,25.41z" fill="url(#SVGID_7_)"/>
+
+ <linearGradient gradientTransform="matrix(1 0 0 -1 8.3999 35.04)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="36.082" x2="36.082" y1="14.4321" y2="5.0154">
+ <stop offset="0" style="stop-color:#FF7236"/>
+ <stop offset="0.7939" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#E8522A"/>
+ </linearGradient>
+ <path d="M44.482,30.377c-3.016,0-5.469-2.451-5.469-5.467c0-3.017,2.453-5.469,5.469-5.469 c3.014,0,5.469,2.452,5.469,5.469C49.951,27.926,47.498,30.377,44.482,30.377L44.482,30.377z" fill="url(#SVGID_8_)"/>
</g>
<g>
-<path d="M44.48,50.206c-3.271,0-5.937-2.661-5.937-5.938 c0-3.271,2.664-5.933,5.937-5.933s5.938,2.662,5.938,5.933C50.418,47.545,47.754,50.206,44.48,50.206L44.48,50.206z" fill-opacity="0.5" stroke-opacity="0.5"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 8.3999 35.04)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="30.0771" x2="41.6834" y1="-8.8452" y2="-8.8452">
-<stop offset="0" style="stop-color:#262626"/>
-<stop offset="0.3879" style="stop-color:#CCCCCC"/>
-<stop offset="0.7091" style="stop-color:#262626"/>
-<stop offset="1" style="stop-color:#757575"/>
-</linearGradient>
-<circle cx="44.48" cy="43.885" fill="url(#SVGID_9_)" r="5.718"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 8.3999 35.04)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="36.0811" x2="36.0811" y1="-4.0439" y2="-13.4606">
-<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="M44.48,48.854c-3.015,0-5.467-2.453-5.467-5.47c0-3.015,2.452-5.466,5.467-5.466 c3.016,0,5.469,2.451,5.469,5.466C49.949,46.4,47.496,48.854,44.48,48.854L44.48,48.854z" fill="url(#SVGID_10_)"/>
+ <path d="M44.48,50.206c-3.271,0-5.937-2.661-5.937-5.938 c0-3.271,2.664-5.933,5.937-5.933s5.938,2.662,5.938,5.933C50.418,47.545,47.754,50.206,44.48,50.206L44.48,50.206z" enable-background="new " opacity="0.5"/>
+
+ <linearGradient gradientTransform="matrix(1 0 0 -1 8.3999 35.04)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="30.0771" x2="41.6834" y1="-8.8452" y2="-8.8452">
+ <stop offset="0" style="stop-color:#262626"/>
+ <stop offset="0.3879" style="stop-color:#CCCCCC"/>
+ <stop offset="0.7091" style="stop-color:#262626"/>
+ <stop offset="1" style="stop-color:#757575"/>
+ </linearGradient>
+ <circle cx="44.48" cy="43.885" fill="url(#SVGID_9_)" r="5.718"/>
+
+ <linearGradient gradientTransform="matrix(1 0 0 -1 8.3999 35.04)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="36.0811" x2="36.0811" y1="-4.0439" y2="-13.4606">
+ <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="M44.48,48.854c-3.015,0-5.467-2.453-5.467-5.47c0-3.015,2.452-5.466,5.467-5.466 c3.016,0,5.469,2.451,5.469,5.466C49.949,46.4,47.496,48.854,44.48,48.854L44.48,48.854z" fill="url(#SVGID_10_)"/>
</g>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_internet_radio.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_internet_radio.svg Fri May 14 16:09:54 2010 +0300
@@ -1,339 +1,340 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="11.647" y2="52.3348">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="0.7939" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#E8522A"/>
+ <stop offset="0" style="stop-color:#FF7236"/>
+ <stop offset="0.7939" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#E8522A"/>
</linearGradient>
<path d="M58,50.776c0,0.858-0.697,1.556-1.557,1.556H3.555C2.694,52.332,2,51.635,2,50.776V13.443 c0-0.859,0.694-1.556,1.555-1.556h52.889c0.859,0,1.557,0.696,1.557,1.556V50.776z" fill="url(#SVGID_1_)"/>
-<path d="M56.443,11.888H3.555C2.694,11.888,2,12.584,2,13.443v12.056l56-6.158v-5.897 C58,12.584,57.303,11.888,56.443,11.888z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M56.443,11.888H3.555C2.694,11.888,2,12.584,2,13.443v12.056l56-6.158v-5.897 C58,12.584,57.303,11.888,56.443,11.888z" fill="#FFFFFF" opacity="0.1"/>
<path d="M56.443,12.666c0.428,0,0.777,0.349,0.777,0.777v37.333c0,0.428-0.35,0.778-0.777,0.778H3.555 c-0.43,0-0.778-0.351-0.778-0.778V13.443c0-0.429,0.349-0.777,0.778-0.777H56.443 M56.443,11.888H3.555 C2.694,11.888,2,12.584,2,13.443v37.333c0,0.858,0.694,1.556,1.555,1.556h52.889c0.859,0,1.557-0.697,1.557-1.556V13.443 C58,12.584,57.303,11.888,56.443,11.888L56.443,11.888z" fill="#D83506"/>
<path d="M56.443,51.555H3.555C2.694,51.555,2,50.857,2,49.999v0.777c0,0.858,0.694,1.556,1.555,1.556h52.889 c0.859,0,1.557-0.697,1.557-1.556v-0.777C58,50.857,57.303,51.555,56.443,51.555z" fill="#600909"/>
-<path d="M56.443,11.888H3.555C2.694,11.888,2,12.584,2,13.443v0.778c0-0.86,0.694-1.556,1.555-1.556 h52.889c0.859,0,1.557,0.695,1.557,1.556v-0.778C58,12.584,57.303,11.888,56.443,11.888z" fill="#FFFFFF" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M56.443,11.888H3.555C2.694,11.888,2,12.584,2,13.443v0.778c0-0.86,0.694-1.556,1.555-1.556 h52.889c0.859,0,1.557,0.695,1.557,1.556v-0.778C58,12.584,57.303,11.888,56.443,11.888z" fill="#FFFFFF" opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="45.9424" x2="45.9424" y1="32.6411" y2="20.912">
-<stop offset="0" style="stop-color:#444243"/>
-<stop offset="1" style="stop-color:#231F20"/>
+ <stop offset="0" style="stop-color:#444243"/>
+ <stop offset="1" style="stop-color:#231F20"/>
</linearGradient>
<circle cx="45.942" cy="26.611" fill="url(#SVGID_2_)" r="6.946"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="45.9424" x2="45.9424" y1="33.9702" y2="28.6358">
-<stop offset="0" style="stop-color:#D9D9D9"/>
-<stop offset="1" style="stop-color:#413F3F"/>
+ <stop offset="0" style="stop-color:#D9D9D9"/>
+ <stop offset="1" style="stop-color:#413F3F"/>
</linearGradient>
<path d="M45.943,33.558c-3.754,0-6.803-2.979-6.935-6.698c-0.003,0.084-0.013,0.163-0.013,0.248 c0,3.836,3.109,6.946,6.947,6.946c3.836,0,6.945-3.11,6.945-6.946c0-0.085-0.01-0.164-0.01-0.248 C52.744,30.578,49.695,33.558,45.943,33.558z" fill="url(#SVGID_3_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="45.9443" x2="45.9443" y1="35.3247" y2="17.436">
-<stop offset="0" style="stop-color:#FF4D00"/>
-<stop offset="1" style="stop-color:#9D1010"/>
+ <stop offset="0" style="stop-color:#FF4D00"/>
+ <stop offset="1" style="stop-color:#9D1010"/>
</linearGradient>
<path d="M45.943,35.609c-4.933,0-8.944-4.013-8.944-8.943c0-4.933,4.012-8.945,8.944-8.945 s8.945,4.013,8.945,8.945C54.889,31.597,50.876,35.609,45.943,35.609L45.943,35.609z M45.943,18.888 c-4.29,0-7.778,3.488-7.778,7.778c0,4.287,3.488,7.776,7.778,7.776c4.287,0,7.779-3.489,7.779-7.776 C53.723,22.376,50.23,18.888,45.943,18.888L45.943,18.888z" fill="url(#SVGID_4_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="45.9434" x2="45.9434" y1="20.5371" y2="32.7461">
-<stop offset="0" style="stop-color:#CBCBCB"/>
-<stop offset="1" style="stop-color:#4F4F4F"/>
+ <stop offset="0" style="stop-color:#CBCBCB"/>
+ <stop offset="1" style="stop-color:#4F4F4F"/>
</linearGradient>
<circle cx="45.943" cy="26.642" fill="url(#SVGID_5_)" r="6.104"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="45.9434" x2="45.9434" y1="20.9736" y2="32.3105">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.2848" style="stop-color:#FFFFFF"/>
-<stop offset="0.7212" style="stop-color:#7B7B7B"/>
-<stop offset="1" style="stop-color:#A7A7A7"/>
+ <stop offset="0.2848" style="stop-color:#FFFFFF"/>
+ <stop offset="0.7212" style="stop-color:#7B7B7B"/>
+ <stop offset="1" style="stop-color:#A7A7A7"/>
</linearGradient>
<circle cx="45.943" cy="26.642" fill="url(#SVGID_6_)" r="5.67"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="45.9434" x2="45.9434" y1="21.4746" y2="31.9404">
-<stop offset="0" style="stop-color:#D9D9D9"/>
-<stop offset="0.8242" style="stop-color:#636363"/>
-<stop offset="1" style="stop-color:#636363"/>
+ <stop offset="0" style="stop-color:#D9D9D9"/>
+ <stop offset="0.8242" style="stop-color:#636363"/>
</linearGradient>
<path d="M50.705,24.468c0.303,0.662,0.471,1.396,0.471,2.174c0,2.889-2.342,5.233-5.232,5.233 c-2.888,0-5.232-2.345-5.232-5.233s2.345-5.232,5.232-5.232C48.058,21.409,49.879,22.663,50.705,24.468z" fill="url(#SVGID_7_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="45.9434" x2="45.9434" y1="25.4961" y2="22.9348">
-<stop offset="0" style="stop-color:#636363"/>
-<stop offset="1" style="stop-color:#323232"/>
+ <stop offset="0" style="stop-color:#636363"/>
+ <stop offset="1" style="stop-color:#323232"/>
</linearGradient>
<polygon fill="url(#SVGID_8_)" points="44.636,25.397 45.943,22.782 47.251,25.397 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="20.2773" x2="20.2773" y1="30.6846" y2="20.667">
-<stop offset="0" style="stop-color:#636363"/>
-<stop offset="0.6667" style="stop-color:#515151"/>
-<stop offset="1" style="stop-color:#323232"/>
+ <stop offset="0" style="stop-color:#636363"/>
+ <stop offset="0.6667" style="stop-color:#515151"/>
+ <stop offset="1" style="stop-color:#323232"/>
</linearGradient>
<rect fill="url(#SVGID_9_)" height="10.889" width="28" x="6.277" y="20.055"/>
<rect fill="#D9D9D9" height="0.777" width="28" x="6.277" y="30.943"/>
<polygon fill="#A6A8AB" points="31.945,25.499 31.945,27.832 29.609,27.832 29.609,26.276 28.832,26.276 28.832,27.832 26.498,27.832 26.498,26.276 25.723,26.276 25.723,27.832 23.387,27.832 23.387,26.276 22.61,26.276 22.61,27.832 20.277,27.832 20.277,25.499 19.499,25.499 19.499,27.832 17.166,27.832 17.166,26.276 16.388,26.276 16.388,27.832 14.056,27.832 14.056,26.276 13.276,26.276 13.276,27.832 10.944,27.832 10.944,26.276 10.165,26.276 10.165,27.832 8.609,27.832 8.609,25.499 7.833,25.499 7.833,28.609 8.609,28.609 10.165,28.609 10.944,28.609 13.276,28.609 14.056,28.609 16.388,28.609 17.166,28.609 19.499,28.609 20.277,28.609 22.61,28.609 23.387,28.609 25.723,28.609 26.498,28.609 28.832,28.609 29.609,28.609 31.945,28.609 32.721,28.609 32.721,27.832 32.721,25.499 "/>
<rect fill="#E00000" height="10.889" width="1.556" x="20.301" y="20.055"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="9.127" x2="9.127" y1="40.2437" y2="43.355">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+ <stop offset="0" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#FF7236"/>
</linearGradient>
<circle cx="9.127" cy="41.832" fill="url(#SVGID_10_)" r="1.556"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="9.126" x2="9.126" y1="40.7729" y2="42.8472">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#383838"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#383838"/>
</linearGradient>
<circle cx="9.126" cy="41.832" fill="url(#SVGID_11_)" r="1.039"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="13.7295" x2="13.7295" y1="40.2437" y2="43.355">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+ <stop offset="0" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#FF7236"/>
</linearGradient>
<path d="M15.285,41.832c0,0.858-0.693,1.556-1.556,1.556c-0.857,0-1.555-0.697-1.555-1.556 c0-0.861,0.697-1.556,1.555-1.556C14.592,40.276,15.285,40.971,15.285,41.832z" fill="url(#SVGID_12_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="13.7295" x2="13.7295" y1="40.7729" y2="42.8472">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#383838"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#383838"/>
</linearGradient>
<circle cx="13.73" cy="41.832" fill="url(#SVGID_13_)" r="1.038"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="18.3955" x2="18.3955" y1="40.2437" y2="43.355">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+ <stop offset="0" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#FF7236"/>
</linearGradient>
<circle cx="18.396" cy="41.832" fill="url(#SVGID_14_)" r="1.555"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="18.3955" x2="18.3955" y1="40.7729" y2="42.8472">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#383838"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#383838"/>
</linearGradient>
<circle cx="18.396" cy="41.832" fill="url(#SVGID_15_)" r="1.038"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="23.0615" x2="23.0615" y1="40.2437" y2="43.355">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+ <stop offset="0" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#FF7236"/>
</linearGradient>
<circle cx="23.062" cy="41.832" fill="url(#SVGID_16_)" r="1.556"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="23.0635" x2="23.0635" y1="40.7729" y2="42.8472">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#383838"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#383838"/>
</linearGradient>
<circle cx="23.063" cy="41.832" fill="url(#SVGID_17_)" r="1.038"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="27.7295" x2="27.7295" y1="40.2437" y2="43.355">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+ <stop offset="0" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#FF7236"/>
</linearGradient>
<circle cx="27.729" cy="41.832" fill="url(#SVGID_18_)" r="1.556"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="27.7295" x2="27.7295" y1="40.7729" y2="42.8472">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#383838"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#383838"/>
</linearGradient>
<circle cx="27.729" cy="41.832" fill="url(#SVGID_19_)" r="1.037"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="32.3965" x2="32.3965" y1="40.2437" y2="43.355">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+ <stop offset="0" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#FF7236"/>
</linearGradient>
<circle cx="32.396" cy="41.832" fill="url(#SVGID_20_)" r="1.556"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="32.3965" x2="32.3965" y1="40.7729" y2="42.8472">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#383838"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#383838"/>
</linearGradient>
<circle cx="32.396" cy="41.832" fill="url(#SVGID_21_)" r="1.037"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="9.127" x2="9.127" y1="44.9106" y2="48.022">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+ <stop offset="0" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#FF7236"/>
</linearGradient>
<circle cx="9.127" cy="46.499" fill="url(#SVGID_22_)" r="1.556"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_23_" x1="9.126" x2="9.126" y1="45.4399" y2="47.5142">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#383838"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#383838"/>
</linearGradient>
<circle cx="9.126" cy="46.499" fill="url(#SVGID_23_)" r="1.039"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_24_" x1="13.7295" x2="13.7295" y1="44.9106" y2="48.022">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+ <stop offset="0" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#FF7236"/>
</linearGradient>
<path d="M15.285,46.499c0,0.858-0.693,1.556-1.556,1.556c-0.857,0-1.555-0.697-1.555-1.556 c0-0.861,0.697-1.556,1.555-1.556C14.592,44.943,15.285,45.638,15.285,46.499z" fill="url(#SVGID_24_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="13.7295" x2="13.7295" y1="45.4399" y2="47.5142">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#383838"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#383838"/>
</linearGradient>
<circle cx="13.73" cy="46.499" fill="url(#SVGID_25_)" r="1.038"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_26_" x1="18.3955" x2="18.3955" y1="44.9106" y2="48.022">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+ <stop offset="0" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#FF7236"/>
</linearGradient>
<circle cx="18.396" cy="46.499" fill="url(#SVGID_26_)" r="1.555"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_27_" x1="18.3955" x2="18.3955" y1="45.4399" y2="47.5142">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#383838"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#383838"/>
</linearGradient>
<circle cx="18.396" cy="46.499" fill="url(#SVGID_27_)" r="1.038"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_28_" x1="23.0615" x2="23.0615" y1="44.9106" y2="48.022">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+ <stop offset="0" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#FF7236"/>
</linearGradient>
<circle cx="23.062" cy="46.499" fill="url(#SVGID_28_)" r="1.556"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_29_" x1="23.0635" x2="23.0635" y1="45.4399" y2="47.5142">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#383838"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#383838"/>
</linearGradient>
<circle cx="23.063" cy="46.499" fill="url(#SVGID_29_)" r="1.038"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_30_" x1="27.7295" x2="27.7295" y1="44.9106" y2="48.022">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+ <stop offset="0" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#FF7236"/>
</linearGradient>
<circle cx="27.729" cy="46.499" fill="url(#SVGID_30_)" r="1.556"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_31_" x1="27.7295" x2="27.7295" y1="45.4399" y2="47.5142">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#383838"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#383838"/>
</linearGradient>
<circle cx="27.729" cy="46.499" fill="url(#SVGID_31_)" r="1.037"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_32_" x1="32.3965" x2="32.3965" y1="44.9106" y2="48.022">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+ <stop offset="0" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#FF7236"/>
</linearGradient>
<circle cx="32.396" cy="46.499" fill="url(#SVGID_32_)" r="1.556"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_33_" x1="32.3965" x2="32.3965" y1="45.4399" y2="47.5142">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#383838"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#383838"/>
</linearGradient>
<circle cx="32.396" cy="46.499" fill="url(#SVGID_33_)" r="1.037"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_34_" x1="36.999" x2="36.999" y1="40.2437" y2="43.355">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+ <stop offset="0" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#FF7236"/>
</linearGradient>
<circle cx="36.999" cy="41.832" fill="url(#SVGID_34_)" r="1.556"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_35_" x1="36.999" x2="36.999" y1="40.7729" y2="42.8472">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#383838"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#383838"/>
</linearGradient>
<circle cx="36.999" cy="41.832" fill="url(#SVGID_35_)" r="1.037"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_36_" x1="41.666" x2="41.666" y1="40.2437" y2="43.355">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+ <stop offset="0" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#FF7236"/>
</linearGradient>
<circle cx="41.666" cy="41.832" fill="url(#SVGID_36_)" r="1.556"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_37_" x1="41.666" x2="41.666" y1="40.7729" y2="42.8472">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#383838"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#383838"/>
</linearGradient>
<circle cx="41.666" cy="41.832" fill="url(#SVGID_37_)" r="1.037"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_38_" x1="46.333" x2="46.333" y1="40.2437" y2="43.355">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+ <stop offset="0" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#FF7236"/>
</linearGradient>
<circle cx="46.333" cy="41.832" fill="url(#SVGID_38_)" r="1.556"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_39_" x1="46.333" x2="46.333" y1="40.7729" y2="42.8472">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#383838"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#383838"/>
</linearGradient>
<circle cx="46.333" cy="41.832" fill="url(#SVGID_39_)" r="1.037"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_40_" x1="50.999" x2="50.999" y1="40.2437" y2="43.355">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+ <stop offset="0" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#FF7236"/>
</linearGradient>
<path d="M52.553,41.832c0,0.858-0.691,1.556-1.553,1.556c-0.858,0-1.556-0.697-1.556-1.556 c0-0.861,0.697-1.556,1.556-1.556C51.861,40.276,52.553,40.971,52.553,41.832z" fill="url(#SVGID_40_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_41_" x1="50.999" x2="50.999" y1="40.7729" y2="42.8472">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#383838"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#383838"/>
</linearGradient>
<path d="M52.037,41.832c0,0.573-0.467,1.037-1.037,1.037c-0.573,0-1.039-0.464-1.039-1.037 s0.466-1.037,1.039-1.037C51.57,40.795,52.037,41.259,52.037,41.832z" fill="url(#SVGID_41_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_42_" x1="36.999" x2="36.999" y1="44.9106" y2="48.022">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+ <stop offset="0" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#FF7236"/>
</linearGradient>
<circle cx="36.999" cy="46.499" fill="url(#SVGID_42_)" r="1.556"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_43_" x1="36.999" x2="36.999" y1="45.4399" y2="47.5142">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#383838"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#383838"/>
</linearGradient>
<circle cx="36.999" cy="46.499" fill="url(#SVGID_43_)" r="1.037"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_44_" x1="41.666" x2="41.666" y1="44.9106" y2="48.022">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+ <stop offset="0" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#FF7236"/>
</linearGradient>
<circle cx="41.666" cy="46.499" fill="url(#SVGID_44_)" r="1.556"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_45_" x1="41.666" x2="41.666" y1="45.4399" y2="47.5142">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#383838"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#383838"/>
</linearGradient>
<circle cx="41.666" cy="46.499" fill="url(#SVGID_45_)" r="1.037"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_46_" x1="46.333" x2="46.333" y1="44.9106" y2="48.022">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+ <stop offset="0" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#FF7236"/>
</linearGradient>
<circle cx="46.333" cy="46.499" fill="url(#SVGID_46_)" r="1.556"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_47_" x1="46.333" x2="46.333" y1="45.4399" y2="47.5142">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#383838"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#383838"/>
</linearGradient>
<circle cx="46.333" cy="46.499" fill="url(#SVGID_47_)" r="1.037"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_48_" x1="50.999" x2="50.999" y1="44.9106" y2="48.022">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+ <stop offset="0" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#FF7236"/>
</linearGradient>
<path d="M52.553,46.499c0,0.858-0.691,1.556-1.553,1.556c-0.858,0-1.556-0.697-1.556-1.556 c0-0.861,0.697-1.556,1.556-1.556C51.861,44.943,52.553,45.638,52.553,46.499z" fill="url(#SVGID_48_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_49_" x1="50.999" x2="50.999" y1="45.4399" y2="47.5142">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#383838"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#383838"/>
</linearGradient>
<path d="M52.037,46.499c0,0.573-0.467,1.037-1.037,1.037c-0.573,0-1.039-0.464-1.039-1.037 s0.466-1.037,1.039-1.037C51.57,45.462,52.037,45.926,52.037,46.499z" fill="url(#SVGID_49_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_50_" x1="49.833" x2="49.833" y1="11.5854" y2="6.285">
-<stop offset="0" style="stop-color:#CBCBCB"/>
-<stop offset="0.1576" style="stop-color:#808080"/>
-<stop offset="0.6545" style="stop-color:#E5E5E5"/>
-<stop offset="1" style="stop-color:#4F4F4F"/>
+ <stop offset="0" style="stop-color:#CBCBCB"/>
+ <stop offset="0.1576" style="stop-color:#808080"/>
+ <stop offset="0.6545" style="stop-color:#E5E5E5"/>
+ <stop offset="1" style="stop-color:#4F4F4F"/>
</linearGradient>
<rect fill="url(#SVGID_50_)" height="5.443" width="6.999" x="46.333" y="6.444"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_51_" x1="37.3877" x2="37.3877" y1="10.1592" y2="7.1295">
-<stop offset="0" style="stop-color:#CBCBCB"/>
-<stop offset="0.1576" style="stop-color:#808080"/>
-<stop offset="0.6545" style="stop-color:#E5E5E5"/>
-<stop offset="1" style="stop-color:#4F4F4F"/>
+ <stop offset="0" style="stop-color:#CBCBCB"/>
+ <stop offset="0.1576" style="stop-color:#808080"/>
+ <stop offset="0.6545" style="stop-color:#E5E5E5"/>
+ <stop offset="1" style="stop-color:#4F4F4F"/>
</linearGradient>
<rect fill="url(#SVGID_51_)" height="3.111" width="17.89" x="28.443" y="7.221"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_52_" x1="19.1104" x2="19.1104" y1="9.4683" y2="7.9534">
-<stop offset="0" style="stop-color:#CBCBCB"/>
-<stop offset="0.1576" style="stop-color:#808080"/>
-<stop offset="0.6545" style="stop-color:#E5E5E5"/>
-<stop offset="1" style="stop-color:#4F4F4F"/>
+ <stop offset="0" style="stop-color:#CBCBCB"/>
+ <stop offset="0.1576" style="stop-color:#808080"/>
+ <stop offset="0.6545" style="stop-color:#E5E5E5"/>
+ <stop offset="1" style="stop-color:#4F4F4F"/>
</linearGradient>
<rect fill="url(#SVGID_52_)" height="1.556" width="18.666" x="9.777" y="7.999"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_53_" x1="8.6104" x2="8.6104" y1="10.1592" y2="7.1295">
-<stop offset="0" style="stop-color:#CBCBCB"/>
-<stop offset="0.1576" style="stop-color:#808080"/>
-<stop offset="0.6545" style="stop-color:#E5E5E5"/>
-<stop offset="1" style="stop-color:#4F4F4F"/>
+ <stop offset="0" style="stop-color:#CBCBCB"/>
+ <stop offset="0.1576" style="stop-color:#808080"/>
+ <stop offset="0.6545" style="stop-color:#E5E5E5"/>
+ <stop offset="1" style="stop-color:#4F4F4F"/>
</linearGradient>
<rect fill="url(#SVGID_53_)" height="3.111" width="2.334" x="7.443" y="7.221"/>
-<path d="M49.832,11.498c-1.285,0-2.333-1.047-2.333-2.332c0-1.288,1.048-2.334,2.333-2.334s2.334,1.046,2.334,2.334 C52.166,10.451,51.117,11.498,49.832,11.498L49.832,11.498z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<circle cx="49.833" cy="9.166" fill-opacity="0.2" r="1.944" stroke-opacity="0.2"/>
+<path d="M49.832,11.498c-1.285,0-2.333-1.047-2.333-2.332c0-1.288,1.048-2.334,2.333-2.334s2.334,1.046,2.334,2.334 C52.166,10.451,51.117,11.498,49.832,11.498L49.832,11.498z" opacity="0.2"/>
+<circle cx="49.833" cy="9.166" opacity="0.2" r="1.944"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_54_" x1="49.8311" x2="49.8311" y1="8.0317" y2="10.2999">
-<stop offset="0" style="stop-color:#E5E5E5"/>
-<stop offset="0.7576" style="stop-color:#A7A7A7"/>
-<stop offset="1" style="stop-color:#CBCBCB"/>
+ <stop offset="0" style="stop-color:#E5E5E5"/>
+ <stop offset="0.7576" style="stop-color:#A7A7A7"/>
+ <stop offset="1" style="stop-color:#CBCBCB"/>
</linearGradient>
<circle cx="49.831" cy="9.166" fill="url(#SVGID_54_)" r="1.556"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_55_" x1="49.8311" x2="49.8311" y1="7.6592" y2="10.6737">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.2848" style="stop-color:#FFFFFF"/>
-<stop offset="0.7212" style="stop-color:#7B7B7B"/>
-<stop offset="1" style="stop-color:#A7A7A7"/>
+ <stop offset="0.2848" style="stop-color:#FFFFFF"/>
+ <stop offset="0.7212" style="stop-color:#7B7B7B"/>
+ <stop offset="1" style="stop-color:#A7A7A7"/>
</linearGradient>
<path d="M49.832,7.999C50.475,7.999,51,8.521,51,9.166c0,0.643-0.525,1.166-1.168,1.166 s-1.166-0.523-1.166-1.166C48.666,8.521,49.189,7.999,49.832,7.999 M49.832,7.61c-0.859,0-1.557,0.694-1.557,1.556 c0,0.858,0.697,1.556,1.557,1.556c0.857,0,1.555-0.697,1.555-1.556C51.387,8.305,50.689,7.61,49.832,7.61L49.832,7.61z" fill="url(#SVGID_55_)"/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
-<path d="M15,29.5C7.004,29.5,0.5,22.996,0.5,15C0.5,7.004,7.004,0.5,15,0.5 c7.995,0,14.5,6.505,14.5,14.5S22.995,29.5,15,29.5L15,29.5z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M15,29.5C7.004,29.5,0.5,22.996,0.5,15C0.5,7.004,7.004,0.5,15,0.5 c7.995,0,14.5,6.505,14.5,14.5S22.995,29.5,15,29.5L15,29.5z" enable-background="new " opacity="0.35"/>
<radialGradient cx="435.2295" cy="910.6348" gradientTransform="matrix(0.618 0 0 0.618 -253.9715 -552.4329)" gradientUnits="userSpaceOnUse" id="SVGID_1__" r="28.704">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#94FFFF"/>
+ <stop offset="0.5" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</radialGradient>
<circle cx="15" cy="15" fill="url(#SVGID_1__)" r="13.464"/>
-<path d="M27.983,14.263c-0.299-5.259-3.704-9.788-8.679-11.54l-0.605,0.1L15.18,2.15 l-4.386,2.615l-0.165,1.102H8.083l1.006,1.71L6.365,9.8l-0.635,2.744l2.25,3.987l2.297-0.469l0.839,0.723l0.655,0.064l0.433,1.691 l-0.571,1.484l2.084,5.332h2.126l2.107-1.701v-0.695l0.557-0.863l0.459-0.236c-0.116,0.18-0.3,0.586-0.3,0.586 c-0.02,0.139,0.299,2.855,1.234,2.643c0.711-0.16,3.248-4.873,3.296-5.322c0.096-0.887-0.387-1.252-0.683-1.391l-0.329-0.156 l-1.515,1.52c-0.162,0.012-0.309,0.039-0.44,0.078v-1.26l1.645-1.605l0.837-2.698l1.275-1.038l-0.28-0.508l0.962-0.926l-0.538-0.979 l0.41,0.049l2.396,5.362l0.49-0.39c-0.015-0.262-0.043-0.521-0.073-0.779L27.983,14.263z M15.161,8.231l-0.2-0.535h1.202 l0.586,1.316h-0.871V8.23L15.161,8.231L15.161,8.231z M19.129,10.882l0.961,1.402l0.064,0.168l-0.984-0.595l-0.234-0.848 L19.129,10.882z M20.573,13.331l0.29,0.29l-0.375,0.084l-0.085-0.104L20.573,13.331z M13.06,3.903l0.611,0.946l-0.694,0.212 l-0.271-0.154L13.06,3.903z" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M27.983,14.263c-0.299-5.259-3.704-9.788-8.679-11.54l-0.605,0.1L15.18,2.15 l-4.386,2.615l-0.165,1.102H8.083l1.006,1.71L6.365,9.8l-0.635,2.744l2.25,3.987l2.297-0.469l0.839,0.723l0.655,0.064l0.433,1.691 l-0.571,1.484l2.084,5.332h2.126l2.107-1.701v-0.695l0.557-0.863l0.459-0.236c-0.116,0.18-0.3,0.586-0.3,0.586 c-0.02,0.139,0.299,2.855,1.234,2.643c0.711-0.16,3.248-4.873,3.296-5.322c0.096-0.887-0.387-1.252-0.683-1.391l-0.329-0.156 l-1.515,1.52c-0.162,0.012-0.309,0.039-0.44,0.078v-1.26l1.645-1.605l0.837-2.698l1.275-1.038l-0.28-0.508l0.962-0.926l-0.538-0.979 l0.41,0.049l2.396,5.362l0.49-0.39c-0.015-0.262-0.043-0.521-0.073-0.779L27.983,14.263z M15.161,8.231l-0.2-0.535h1.202 l0.586,1.316h-0.871V8.23L15.161,8.231L15.161,8.231z M19.129,10.882l0.961,1.402l0.064,0.168l-0.984-0.595l-0.234-0.848 L19.129,10.882z M20.573,13.331l0.29,0.29l-0.375,0.084l-0.085-0.104L20.573,13.331z M13.06,3.903l0.611,0.946l-0.694,0.212 l-0.271-0.154L13.06,3.903z" enable-background="new " opacity="0.3"/>
<linearGradient gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="333.1904" x2="333.1904" y1="416.6045" y2="431.9054">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#C8E4EB"/>
+ <stop offset="0" style="stop-color:#31A7F8"/>
+ <stop offset="0.497" style="stop-color:#1E74DC"/>
+ <stop offset="1" style="stop-color:#C8E4EB"/>
</linearGradient>
-<path d="M15,1.536C7.564,1.536,1.536,7.565,1.536,15 c0,7.439,6.029,13.464,13.464,13.464c7.438,0,13.465-6.027,13.465-13.464C28.465,7.565,22.438,1.536,15,1.536z M15,27.428 C8.146,27.428,2.571,21.854,2.571,15C2.571,8.147,8.146,2.571,15,2.571S27.428,8.147,27.428,15 C27.428,21.854,21.854,27.428,15,27.428z" fill="url(#SVGID_2__)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M15,1.536C7.564,1.536,1.536,7.565,1.536,15 c0,7.439,6.029,13.464,13.464,13.464c7.438,0,13.465-6.027,13.465-13.464C28.465,7.565,22.438,1.536,15,1.536z M15,27.428 C8.146,27.428,2.571,21.854,2.571,15C2.571,8.147,8.146,2.571,15,2.571S27.428,8.147,27.428,15 C27.428,21.854,21.854,27.428,15,27.428z" enable-background="new " fill="url(#SVGID_2__)" opacity="0.3"/>
<radialGradient cx="333.6309" cy="418.627" gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_3__" r="9.0429">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+ <stop offset="0" style="stop-color:#94FF26"/>
+ <stop offset="0.3152" style="stop-color:#94FF26"/>
+ <stop offset="0.7273" style="stop-color:#1FC211"/>
+ <stop offset="1" style="stop-color:#0BA133"/>
</radialGradient>
<path d="M22.296,18.848l-1.401,1.402c0,0-0.848,0-0.887,0.336c-0.02,0.145-0.065,0.771-0.208,1.094 c-0.282,0.195-0.619,0.842-0.619,0.842s-0.175,1.25,0.761,1.037C20.871,23.35,23.734,19.523,22.296,18.848z" fill="url(#SVGID_3__)"/>
<radialGradient cx="333.6299" cy="418.6211" gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_4__" r="10.4663">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+ <stop offset="0" style="stop-color:#94FF26"/>
+ <stop offset="0.3152" style="stop-color:#94FF26"/>
+ <stop offset="0.7273" style="stop-color:#1FC211"/>
+ <stop offset="1" style="stop-color:#0BA133"/>
</radialGradient>
<path d="M19.132,3.213c-0.23,0.087-0.387,0.146-0.387,0.146l-3.463-0.663L13.583,3.76l0.894,1.383 l-1.563,0.48l-0.842-0.48l0.296-0.84l-1.098,0.76l-0.196,1.324H8.988L9.759,7.7l-2.932,2.39l-0.552,2.387l1.088,2.107L8.018,15 l2.297-0.469l0.839,0.721l0.763,0.074l0.83,3.246l-0.552,1.436l1.22,2.697l0.343,1.119h2.126l1.202-0.65l0.905-1.053V20.85 l1.724-0.881v-1.885l0.681-1.297l1.521-1.366l0.363-1.585l-1.988,0.443l-0.522-0.637l0.371-0.594l-1.411-0.854l-0.601-2.164 l1.042-0.68l0.96,1.402l0.359,0.922l0.722,0.721l0.842,0.44l0.936-0.151l1.039-1l-0.731-1.334l-0.921,0.24l-0.833-0.991l0.791-0.552 l2.482,0.301v0.883l2.161,4.452l0.491-0.393C27.176,9.158,23.783,4.849,19.132,3.213z M18.004,9.23l-1.134,0.3h-1.511V8.749h-1.443 L12.774,9.05l-1.741-0.482l-0.482-0.901l2.404-0.541h2.406L15,6.164h1.202l0.67,1.503l1.134,0.398V9.23H18.004z M20.589,7.247 l-2.044-0.361V6.165l1.022-0.24l0.3-0.36l0.722,0.6V7.247L20.589,7.247z" fill="url(#SVGID_4__)"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_java.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_java.svg Fri May 14 16:09:54 2010 +0300
@@ -1,79 +1,75 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="60" width="60"/>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="27.8457" x2="27.8457" y1="3.1968" y2="48.3756">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.4606" style="stop-color:#BDC2C4"/>
-<stop offset="0.7333" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+ <stop offset="0.0667" style="stop-color:#D1D7D9"/>
+ <stop offset="0.4606" style="stop-color:#BDC2C4"/>
+ <stop offset="0.7333" style="stop-color:#949DA1"/>
+ <stop offset="0.9636" style="stop-color:#ADB3B5"/>
+ <stop offset="1" style="stop-color:#595C5E"/>
</linearGradient>
<path d="M51.063,18.041H31.026v-2.398c2.141-1.259,4.404-2.609,4.404-5.144c0-3.896-4.045-7.063-7.939-7.063 s-7.937,3.168-7.937,7.063c0,2.535,2.265,3.892,4.414,5.146v2.396h-5.7c-1.445,0-2.628,1.183-2.628,2.625v13.049h-1.452 c-1.211-2.092-2.594-4.378-5.186-4.378C5.136,29.337,2,33.348,2,37.217c0,3.868,3.136,7.879,7.003,7.879 c2.592,0,3.975-2.285,5.186-4.377h1.452v3.885c0,1.445,1.183,2.627,2.628,2.627h6.205v-3.62c-1.89-1.103-3.883-2.296-3.883-4.526 c0-3.426,3.557-6.213,6.981-6.213s6.983,2.787,6.983,6.213c0,2.229-1.991,3.418-3.873,4.524v3.622h20.381 c1.447,0,2.629-1.182,2.629-2.627V20.666C53.692,19.224,52.511,18.041,51.063,18.041z" fill="url(#SVGID_1_)"/>
-<path d="M18.269,18.758h5.7v-0.717h-5.7c-1.445,0-2.628,1.183-2.628,2.625v0.718 C15.641,19.941,16.823,18.758,18.269,18.758z" fill="#FFFFFF" fill-opacity="0.75" stroke-opacity="0.75"/>
-<path d="M27.491,4.152c3.781,0,7.693,2.99,7.918,6.729c0.012-0.124,0.021-0.252,0.021-0.383 c0-3.896-4.045-7.063-7.939-7.063s-7.937,3.168-7.937,7.063c0,0.131,0.01,0.258,0.021,0.383C19.8,7.143,23.71,4.152,27.491,4.152z" fill="#FFFFFF" fill-opacity="0.75" stroke-opacity="0.75"/>
-<path d="M30.683,43.608v0.718c1.882-1.107,3.873-2.295,3.873-4.523c0-0.113-0.014-0.225-0.021-0.336 C34.32,41.452,32.454,42.566,30.683,43.608z" fill="#FFFFFF" fill-opacity="0.75" stroke-opacity="0.75"/>
-<path d="M9.003,30.055c2.592,0,3.975,2.285,5.186,4.378h1.452v-0.718h-1.452 c-1.211-2.092-2.594-4.378-5.186-4.378C5.136,29.337,2,33.348,2,37.217c0,0.119,0.013,0.238,0.019,0.358 C2.203,33.822,5.256,30.055,9.003,30.055z" fill="#FFFFFF" fill-opacity="0.75" stroke-opacity="0.75"/>
-<path d="M51.063,18.041H31.026v0.717h20.037c1.447,0,2.629,1.184,2.629,2.626v-0.718 C53.692,19.224,52.511,18.041,51.063,18.041z" fill="#FFFFFF" fill-opacity="0.75" stroke-opacity="0.75"/>
-<path d="M20.612,39.467c-0.008,0.111-0.021,0.223-0.021,0.336c0,2.229,1.993,3.422,3.883,4.525V43.61 C22.696,42.572,20.827,41.453,20.612,39.467z" fill="#FFFFFF" fill-opacity="0.75" stroke-opacity="0.75"/>
-<path d="M53.692,32.871H40.51l-0.113,0.01l-0.056,0.008c-1.32,0.211-2.018,1.203-2.18,1.639 l-1.121,2.34c-0.059,0.079-0.109,0.162-0.154,0.241c-0.066,0.112-0.119,0.222-0.129,0.247c-0.045,0.096-0.088,0.196-0.146,0.367 c-0.1,0.307-0.148,0.6-0.148,0.893v8.615h15.32c0.754,0,1.43-0.325,1.91-0.836V32.871z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M53.692,33.589H40.51l-0.056,0.009c-0.988,0.158-1.514,0.889-1.646,1.24l-1.151,2.401 c-0.056,0.073-0.105,0.149-0.152,0.231c-0.045,0.078-0.083,0.153-0.103,0.201c-0.036,0.074-0.067,0.15-0.109,0.273 c-0.076,0.233-0.113,0.452-0.113,0.67v8.615h14.603c0.754,0,1.43-0.325,1.91-0.836V33.589z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M18.269,18.758h5.7v-0.717h-5.7c-1.445,0-2.628,1.183-2.628,2.625v0.718 C15.641,19.941,16.823,18.758,18.269,18.758z" fill="#FFFFFF" opacity="0.75"/>
+<path d="M27.491,4.152c3.781,0,7.693,2.99,7.918,6.729c0.012-0.124,0.021-0.252,0.021-0.383 c0-3.896-4.045-7.063-7.939-7.063s-7.937,3.168-7.937,7.063c0,0.131,0.01,0.258,0.021,0.383C19.8,7.143,23.71,4.152,27.491,4.152z" fill="#FFFFFF" opacity="0.75"/>
+<path d="M30.683,43.608v0.718c1.882-1.107,3.873-2.295,3.873-4.523c0-0.113-0.014-0.225-0.021-0.336 C34.32,41.452,32.454,42.566,30.683,43.608z" fill="#FFFFFF" opacity="0.75"/>
+<path d="M9.003,30.055c2.592,0,3.975,2.285,5.186,4.378h1.452v-0.718h-1.452 c-1.211-2.092-2.594-4.378-5.186-4.378C5.136,29.337,2,33.348,2,37.217c0,0.119,0.013,0.238,0.019,0.358 C2.203,33.822,5.256,30.055,9.003,30.055z" fill="#FFFFFF" opacity="0.75"/>
+<path d="M51.063,18.041H31.026v0.717h20.037c1.447,0,2.629,1.184,2.629,2.626v-0.718 C53.692,19.224,52.511,18.041,51.063,18.041z" fill="#FFFFFF" opacity="0.75"/>
+<path d="M20.612,39.467c-0.008,0.111-0.021,0.223-0.021,0.336c0,2.229,1.993,3.422,3.883,4.525V43.61 C22.696,42.572,20.827,41.453,20.612,39.467z" fill="#FFFFFF" opacity="0.75"/>
+<path d="M53.692,32.871H40.51l-0.113,0.01l-0.056,0.008c-1.32,0.211-2.018,1.203-2.18,1.639 l-1.121,2.34c-0.059,0.079-0.109,0.162-0.154,0.241c-0.066,0.112-0.119,0.222-0.129,0.247c-0.045,0.096-0.088,0.196-0.146,0.367 c-0.1,0.307-0.148,0.6-0.148,0.893v8.615h15.32c0.754,0,1.43-0.325,1.91-0.836V32.871z" fill="#020202" opacity="0.1"/>
+<path d="M53.692,33.589H40.51l-0.056,0.009c-0.988,0.158-1.514,0.889-1.646,1.24l-1.151,2.401 c-0.056,0.073-0.105,0.149-0.152,0.231c-0.045,0.078-0.083,0.153-0.103,0.201c-0.036,0.074-0.067,0.15-0.109,0.273 c-0.076,0.233-0.113,0.452-0.113,0.67v8.615h14.603c0.754,0,1.43-0.325,1.91-0.836V33.589z" fill="#020202" opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="47.9434" x2="47.9434" y1="34.2832" y2="38.7279">
-<stop offset="0" style="stop-color:#3DAEFF"/>
-<stop offset="1" style="stop-color:#1A79D1"/>
+ <stop offset="0" style="stop-color:#3DAEFF"/>
+ <stop offset="1" style="stop-color:#1A79D1"/>
</linearGradient>
<path d="M57.618,37.627l-1.189-2.479c0,0-0.269-0.707-1.109-0.842H40.567 c-0.842,0.135-1.111,0.842-1.111,0.842l-1.188,2.479c-0.288,0.326-0.356,0.74-0.37,0.988h20.092 C57.975,38.367,57.907,37.953,57.618,37.627z" fill="url(#SVGID_2_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="47.9492" x2="47.9492" y1="37" y2="57.4615">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.6909" style="stop-color:#1347BA"/>
-<stop offset="1" style="stop-color:#2D9BD2"/>
+ <stop offset="0" style="stop-color:#3BC8EB"/>
+ <stop offset="0.6909" style="stop-color:#1347BA"/>
+ <stop offset="1" style="stop-color:#2D9BD2"/>
</linearGradient>
<path d="M58,55.128c0,0.793-0.644,1.436-1.436,1.436H39.333c-0.793,0-1.436-0.643-1.436-1.436V38.615 c0-0.793,0.643-1.436,1.436-1.436h17.231c0.792,0,1.436,0.643,1.436,1.436V55.128z" fill="url(#SVGID_3_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="47.9492" x2="47.9492" y1="37.1016" y2="51.9137">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.1818" style="stop-color:#2B93C7"/>
-<stop offset="0.8606" style="stop-color:#0F348A"/>
-<stop offset="1" style="stop-color:#0F348A"/>
+ <stop offset="0" style="stop-color:#3BC8EB"/>
+ <stop offset="0.1818" style="stop-color:#2B93C7"/>
+ <stop offset="0.8606" style="stop-color:#0F348A"/>
</linearGradient>
<path d="M40.769,51.538h14.359c0.793,0,1.437-0.644,1.437-1.437V37.18H39.333v12.922 C39.333,50.895,39.976,51.538,40.769,51.538z" fill="url(#SVGID_4_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="47.9482" x2="47.9482" y1="50.2227" y2="56.8327">
-<stop offset="0" style="stop-color:#113EA3"/>
-<stop offset="0.4121" style="stop-color:#113EA3"/>
-<stop offset="1" style="stop-color:#2174BF"/>
+ <stop offset="0.4121" style="stop-color:#113EA3"/>
+ <stop offset="1" style="stop-color:#2174BF"/>
</linearGradient>
<path d="M55.87,51.326c-0.17,0.103-0.36,0.168-0.565,0.194c-0.047,0.011-0.103,0.018-0.177,0.018H40.769 c-0.074,0-0.129-0.007-0.176-0.018c-0.205-0.026-0.396-0.092-0.564-0.194l-1.93,4.525c0.25,0.424,0.707,0.712,1.234,0.712h17.231 c0.528,0,0.984-0.288,1.233-0.712L55.87,51.326z" fill="url(#SVGID_5_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="47.9482" x2="47.9482" y1="50.3188" y2="56.3521">
-<stop offset="0" style="stop-color:#0F1C94"/>
-<stop offset="0.4121" style="stop-color:#0F1C94"/>
-<stop offset="1" style="stop-color:#2B93C7"/>
+ <stop offset="0.4121" style="stop-color:#0F1C94"/>
+ <stop offset="1" style="stop-color:#2B93C7"/>
</linearGradient>
-<path d="M40.028,52.044c0.169,0.103,0.359,0.169,0.564,0.194 c0.047,0.011,0.102,0.018,0.176,0.018h14.359c0.074,0,0.13-0.007,0.177-0.018c0.205-0.025,0.396-0.092,0.565-0.194l1.73,4.063 c0.074-0.078,0.143-0.162,0.197-0.255l-1.928-4.525c-0.17,0.103-0.36,0.168-0.565,0.194c-0.047,0.011-0.103,0.018-0.177,0.018 H40.769c-0.074,0-0.129-0.007-0.176-0.018c-0.205-0.026-0.396-0.092-0.564-0.194l-1.93,4.525c0.056,0.093,0.125,0.177,0.198,0.255 L40.028,52.044z" fill="url(#SVGID_6_)" fill-opacity="0.8" stroke-opacity="0.8"/>
+<path d="M40.028,52.044c0.169,0.103,0.359,0.169,0.564,0.194 c0.047,0.011,0.102,0.018,0.176,0.018h14.359c0.074,0,0.13-0.007,0.177-0.018c0.205-0.025,0.396-0.092,0.565-0.194l1.73,4.063 c0.074-0.078,0.143-0.162,0.197-0.255l-1.928-4.525c-0.17,0.103-0.36,0.168-0.565,0.194c-0.047,0.011-0.103,0.018-0.177,0.018 H40.769c-0.074,0-0.129-0.007-0.176-0.018c-0.205-0.026-0.396-0.092-0.564-0.194l-1.93,4.525c0.056,0.093,0.125,0.177,0.198,0.255 L40.028,52.044z" fill="url(#SVGID_6_)" opacity="0.8"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="47.9492" x2="47.9492" y1="37.1016" y2="51.9137">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="0.1818" style="stop-color:#2786B5"/>
-<stop offset="0.5394" style="stop-color:#1F4BA3"/>
-<stop offset="0.8606" style="stop-color:#0D1F78"/>
-<stop offset="1" style="stop-color:#0D1F78"/>
+ <stop offset="0" style="stop-color:#3BC8EB"/>
+ <stop offset="0.1818" style="stop-color:#2786B5"/>
+ <stop offset="0.5394" style="stop-color:#1F4BA3"/>
+ <stop offset="0.8606" style="stop-color:#0D1F78"/>
</linearGradient>
<path d="M39.333,37.18v12.922c0,0.793,0.643,1.437,1.436,1.437h14.359c0.793,0,1.437-0.644,1.437-1.437V37.18 H39.333z M55.847,50.102c0,0.396-0.323,0.719-0.719,0.719H40.769c-0.395,0-0.717-0.322-0.717-0.719V37.896h15.795V50.102z" fill="url(#SVGID_7_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="47.9492" x2="47.9492" y1="34.291" y2="37.2549">
-<stop offset="0" style="stop-color:#57ADFF"/>
-<stop offset="0.9879" style="stop-color:#0048B5"/>
-<stop offset="1" style="stop-color:#0048B5"/>
+ <stop offset="0" style="stop-color:#57ADFF"/>
+ <stop offset="0.9879" style="stop-color:#0048B5"/>
</linearGradient>
<path d="M56.564,35.743c0-0.793-0.644-1.437-1.437-1.437H40.769c-0.793,0-1.436,0.644-1.436,1.437v1.437 h17.231V35.743z" fill="url(#SVGID_8_)"/>
<path d="M39.333,37.18h17.231c0.465,0,0.875,0.225,1.138,0.568c-0.029-0.041-0.05-0.082-0.084-0.121l-1.189-2.479 c0,0-0.269-0.707-1.109-0.842H40.567c-0.842,0.135-1.111,0.842-1.111,0.842l-1.188,2.479c-0.101,0.115-0.167,0.238-0.222,0.362 C38.28,37.512,38.765,37.18,39.333,37.18z" fill="#A1E2FF"/>
<path d="M57.786,37.869c0.006,0.011,0.012,0.022,0.018,0.033C57.798,37.891,57.792,37.881,57.786,37.869z" fill="#A1E2FF"/>
<path d="M37.985,38.139c-0.004,0.01-0.006,0.02-0.01,0.029C37.979,38.158,37.981,38.148,37.985,38.139z" fill="#A1E2FF"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="47.9492" x2="47.9492" y1="37.0742" y2="57.0705">
-<stop offset="0" style="stop-color:#B1E5F2"/>
-<stop offset="0.4545" style="stop-color:#6CA6EB"/>
-<stop offset="0.6909" style="stop-color:#2B8BCF"/>
-<stop offset="1" style="stop-color:#33AFED"/>
+ <stop offset="0" style="stop-color:#B1E5F2"/>
+ <stop offset="0.4545" style="stop-color:#6CA6EB"/>
+ <stop offset="0.6909" style="stop-color:#2B8BCF"/>
+ <stop offset="1" style="stop-color:#33AFED"/>
</linearGradient>
<path d="M56.564,37.18H39.333c-0.793,0-1.436,0.643-1.436,1.436v16.513c0,0.793,0.643,1.436,1.436,1.436 h17.231c0.792,0,1.436-0.643,1.436-1.436V38.615C58,37.822,57.356,37.18,56.564,37.18z M57.282,55.128 c0,0.396-0.322,0.718-0.718,0.718H39.333c-0.395,0-0.718-0.322-0.718-0.718V38.615c0-0.396,0.323-0.719,0.718-0.719h17.231 c0.396,0,0.718,0.322,0.718,0.719V55.128z" fill="url(#SVGID_9_)"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_just_audio.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_just_audio.svg Fri May 14 16:09:54 2010 +0300
@@ -1,77 +1,83 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<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"/>
+ <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="M56.506,7.6H3.493C2.666,7.6,2,8.27,2,9.094v41.813C2,51.732,2.666,52.4,3.493,52.4h53.013 C57.33,52.4,58,51.732,58,50.906V9.094C58,8.27,57.33,7.6,56.506,7.6z M8.719,49.413c0,0.412-0.336,0.748-0.745,0.748H4.986 c-0.412,0-0.748-0.336-0.748-0.748V47.92c0-0.41,0.336-0.746,0.748-0.746h2.987c0.409,0,0.745,0.336,0.745,0.746V49.413z M8.719,12.08c0,0.41-0.336,0.746-0.745,0.746H4.986c-0.412,0-0.748-0.336-0.748-0.746v-1.493c0-0.409,0.336-0.748,0.748-0.748 h2.987c0.409,0,0.745,0.339,0.745,0.748V12.08z M15.438,49.413c0,0.412-0.335,0.748-0.745,0.748h-2.987 c-0.412,0-0.747-0.336-0.747-0.748V47.92c0-0.41,0.335-0.746,0.747-0.746h2.987c0.41,0,0.745,0.336,0.745,0.746V49.413z M15.438,12.08c0,0.41-0.335,0.746-0.745,0.746h-2.987c-0.412,0-0.747-0.336-0.747-0.746v-1.493c0-0.409,0.335-0.748,0.747-0.748 h2.987c0.41,0,0.745,0.339,0.745,0.748V12.08z M22.159,49.413c0,0.412-0.337,0.748-0.747,0.748h-2.986 c-0.41,0-0.746-0.336-0.746-0.748V47.92c0-0.41,0.335-0.746,0.746-0.746h2.986c0.41,0,0.747,0.336,0.747,0.746V49.413z M22.159,12.08c0,0.41-0.337,0.746-0.747,0.746h-2.986c-0.41,0-0.746-0.336-0.746-0.746v-1.493c0-0.409,0.335-0.748,0.746-0.748 h2.986c0.41,0,0.747,0.339,0.747,0.748V12.08z M28.88,49.413c0,0.412-0.337,0.748-0.747,0.748h-2.986 c-0.411,0-0.746-0.336-0.746-0.748V47.92c0-0.41,0.335-0.746,0.746-0.746h2.986c0.41,0,0.747,0.336,0.747,0.746V49.413z M28.88,12.08c0,0.41-0.337,0.746-0.747,0.746h-2.986c-0.411,0-0.746-0.336-0.746-0.746v-1.493c0-0.409,0.335-0.748,0.746-0.748 h2.986c0.41,0,0.747,0.339,0.747,0.748V12.08z M35.6,49.413c0,0.412-0.338,0.748-0.747,0.748h-2.985 c-0.412,0-0.748-0.336-0.748-0.748V47.92c0-0.41,0.336-0.746,0.748-0.746h2.985c0.409,0,0.747,0.336,0.747,0.746V49.413z M35.6,12.08c0,0.41-0.338,0.746-0.747,0.746h-2.985c-0.412,0-0.748-0.336-0.748-0.746v-1.493c0-0.409,0.336-0.748,0.748-0.748 h2.985c0.409,0,0.747,0.339,0.747,0.748V12.08z M42.318,49.413c0,0.412-0.335,0.748-0.745,0.748h-2.987 c-0.412,0-0.746-0.336-0.746-0.748V47.92c0-0.41,0.334-0.746,0.746-0.746h2.987c0.41,0,0.745,0.336,0.745,0.746V49.413z M42.318,12.08c0,0.41-0.335,0.746-0.745,0.746h-2.987c-0.412,0-0.746-0.336-0.746-0.746v-1.493c0-0.409,0.334-0.748,0.746-0.748 h2.987c0.41,0,0.745,0.339,0.745,0.748V12.08z M49.039,49.413c0,0.412-0.336,0.748-0.746,0.748h-2.987 c-0.41,0-0.745-0.336-0.745-0.748V47.92c0-0.41,0.335-0.746,0.745-0.746h2.987c0.41,0,0.746,0.336,0.746,0.746V49.413z M49.039,12.08c0,0.41-0.336,0.746-0.746,0.746h-2.987c-0.41,0-0.745-0.336-0.745-0.746v-1.493c0-0.409,0.335-0.748,0.745-0.748 h2.987c0.41,0,0.746,0.339,0.746,0.748V12.08z M55.761,49.413c0,0.412-0.339,0.748-0.748,0.748h-2.987 c-0.41,0-0.745-0.336-0.745-0.748V47.92c0-0.41,0.335-0.746,0.745-0.746h2.987c0.409,0,0.748,0.336,0.748,0.746V49.413z M55.761,12.08c0,0.41-0.339,0.746-0.748,0.746h-2.987c-0.41,0-0.745-0.336-0.745-0.746v-1.493c0-0.409,0.335-0.748,0.745-0.748 h2.987c0.409,0,0.748,0.339,0.748,0.748V12.08z" fill="url(#SVGID_1_)"/>
-<path d="M56.506,7.6H3.493C2.666,7.6,2,8.27,2,9.094v0.745 c0-0.824,0.666-1.493,1.493-1.493h53.013C57.33,8.346,58,9.015,58,9.839V9.094C58,8.27,57.33,7.6,56.506,7.6z" fill="#FFFFFF" fill-opacity="0.55" stroke-opacity="0.55"/>
-<path d="M3.493,52.4h53.013C57.33,52.4,58,51.732,58,50.906v-0.745 c0,0.824-0.67,1.493-1.494,1.493H3.493C2.666,51.654,2,50.985,2,50.161v0.745C2,51.732,2.666,52.4,3.493,52.4z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M56.506,7.6H3.493C2.666,7.6,2,8.27,2,9.094v0.745 c0-0.824,0.666-1.493,1.493-1.493h53.013C57.33,8.346,58,9.015,58,9.839V9.094C58,8.27,57.33,7.6,56.506,7.6z" enable-background="new " fill="#FFFFFF" opacity="0.55"/>
+<path d="M3.493,52.4h53.013C57.33,52.4,58,51.732,58,50.906v-0.745 c0,0.824-0.67,1.493-1.494,1.493H3.493C2.666,51.654,2,50.985,2,50.161v0.745C2,51.732,2.666,52.4,3.493,52.4z" enable-background="new " fill="#FFFFFF" opacity="0.1"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2164" x2="-2164" y1="3641.7637" y2="3611.8926">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="0.5" style="stop-color:#666666"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="0.5" style="stop-color:#666666"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
<rect fill="url(#SVGID_2_)" height="29.871" width="56" x="2" y="15.064"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2164.0005" x2="-2164.0005" y1="3612.0117" y2="3641.8828">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</linearGradient>
<path d="M55.761,43.441c0,0.821-0.673,1.494-1.493,1.494H5.732c-0.82,0-1.494-0.673-1.494-1.494V16.559 c0-0.819,0.674-1.494,1.494-1.494h48.535c0.82,0,1.493,0.675,1.493,1.494V43.441z" fill="url(#SVGID_3_)"/>
-<path d="M54.268,43.441H5.732c-0.82,0-1.494,0.074-1.494-0.748l0,0 c0,0.822,0.674,1.493,1.494,1.493h48.535c0.82,0,1.493-0.671,1.493-1.493l0,0C55.761,43.516,55.088,43.441,54.268,43.441z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M54.268,43.441H5.732c-0.82,0-1.494,0.074-1.494-0.748l0,0 c0,0.822,0.674,1.493,1.494,1.493h48.535c0.82,0,1.493-0.671,1.493-1.493l0,0C55.761,43.516,55.088,43.441,54.268,43.441z" enable-background="new " fill="#FFFFFF" opacity="0.5"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-2164.0005" x2="-2164.0005" y1="3641.8828" y2="3611.8926">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#404040"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#404040"/>
</linearGradient>
<path d="M54.268,15.813c0.41,0,0.745,0.336,0.745,0.745v26.883c0,0.412-0.335,0.745-0.745,0.745H5.732 c-0.411,0-0.746-0.333-0.746-0.745V16.559c0-0.409,0.335-0.745,0.746-0.745H54.268 M54.268,15.064H5.732 c-0.82,0-1.494,0.675-1.494,1.494v26.883c0,0.821,0.674,1.494,1.494,1.494h48.535c0.82,0,1.493-0.673,1.493-1.494V16.559 C55.761,15.739,55.088,15.064,54.268,15.064L54.268,15.064z" fill="url(#SVGID_4_)"/>
-<path d="M54.268,24.025v-5.974c0-0.824-0.67-1.493-1.494-1.493H7.226 c-0.824,0-1.493,0.669-1.493,1.493v9.709L54.268,24.025z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M54.268,24.025v-5.974c0-0.824-0.67-1.493-1.494-1.493H7.226 c-0.824,0-1.493,0.669-1.493,1.493v9.709L54.268,24.025z" enable-background="new " fill="#FFFFFF" opacity="0.2"/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<polygon fill="none" points="24.728,0 23.608,0.487 0,0.487 0,30.487 30,30.487 30,0.487 24.928,0.487 "/>
-<path d="M7.991,30.324c-3.295,0-5.976-1.69-6.668-4.205c-0.366-1.331-0.159-2.734,0.6-4.06 c1.063-1.86,3.062-3.301,5.478-3.952c0.873-0.235,1.762-0.355,2.639-0.355c0.927,0,1.816,0.133,2.635,0.389V5.247L24.728,0 l1.526,3.717l0.018-0.007l0.389,0.963l0.609,1.563l-10.565,4.318c0.008,2.6,0.003,5.635-0.001,8.204 c-0.003,2.014-0.006,3.74-0.002,4.745c0.016,2.839-2.473,5.497-6.049,6.463C9.771,30.203,8.875,30.324,7.991,30.324L7.991,30.324z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M7.991,30.324c-3.295,0-5.976-1.69-6.668-4.205c-0.366-1.331-0.159-2.734,0.6-4.06 c1.063-1.86,3.062-3.301,5.478-3.952c0.873-0.235,1.762-0.355,2.639-0.355c0.927,0,1.816,0.133,2.635,0.389V5.247L24.728,0 l1.526,3.717l0.018-0.007l0.389,0.963l0.609,1.563l-10.565,4.318c0.008,2.6,0.003,5.635-0.001,8.204 c-0.003,2.014-0.006,3.74-0.002,4.745c0.016,2.839-2.473,5.497-6.049,6.463C9.771,30.203,8.875,30.324,7.991,30.324L7.991,30.324z" opacity="0.35"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 2908.0361)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-2179.9351" x2="-2179.9351" y1="2902.811" y2="2880.1646">
-<stop offset="0" style="stop-color:#8CFF24"/>
-<stop offset="1" style="stop-color:#15570B"/>
+ <stop offset="0" style="stop-color:#8CFF24"/>
+ <stop offset="1" style="stop-color:#15570B"/>
</linearGradient>
<path d="M25.98,5.682l-1.79-4.357L13.902,5.902l0.016,13.899c-1.574-1.029-3.896-1.366-6.257-0.729 c-3.722,1.003-6.127,4.041-5.374,6.78c0.756,2.742,4.383,4.15,8.104,3.146c3.146-0.849,5.324-3.094,5.311-5.493 c-0.01-2.399,0.02-8.913,0-13.625L25.98,5.682z" fill="url(#SVGID_1__)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 0.5 614.8193 -1693.241)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-1201.8184" x2="-1201.8184" y1="3393.1226" y2="3404.4397">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</linearGradient>
<polygon fill="url(#SVGID_2__)" points="13.918,17.409 13.907,5.902 13.902,5.902 13.916,17.408 "/>
<linearGradient gradientTransform="matrix(0.5 0 0 0.5 614.8193 -1693.241)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="-1187.957" x2="-1187.957" y1="3393.1177" y2="3404.4392">
-<stop offset="0" style="stop-color:#9EFF47"/>
-<stop offset="1" style="stop-color:#11470A"/>
+ <stop offset="0" style="stop-color:#9EFF47"/>
+ <stop offset="1" style="stop-color:#11470A"/>
</linearGradient>
<path d="M15.701,9.169c0.005,0.759,0.006-0.117,0.008,0.711L25.98,5.682l-0.252-0.646L15.701,9.169z" fill="url(#SVGID_3__)"/>
<linearGradient gradientTransform="matrix(0.5 -0.0026 0.0026 0.5 604.1579 -1699.019)" gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="-1188.0039" x2="-1188.0039" y1="3402.1909" y2="3430.4734">
-<stop offset="0" style="stop-color:#B3FF6E"/>
-<stop offset="1" style="stop-color:#11470A"/>
+ <stop offset="0" style="stop-color:#B3FF6E"/>
+ <stop offset="1" style="stop-color:#11470A"/>
</linearGradient>
<polygon fill="url(#SVGID_4__)" points="14.072,20.2 14.072,6.3 24.389,1.807 24.19,1.324 13.674,5.902 13.674,19.803 "/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 2908.0361)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-2185.0737" x2="-2185.0737" y1="2887.9233" y2="2879.6807">
-<stop offset="0" style="stop-color:#B2F56E"/>
-<stop offset="0.4667" style="stop-color:#40AD00"/>
-<stop offset="1" style="stop-color:#074D00"/>
+ <stop offset="0" style="stop-color:#B2F56E"/>
+ <stop offset="0.4667" style="stop-color:#40AD00"/>
+ <stop offset="1" style="stop-color:#074D00"/>
</linearGradient>
<path d="M7.96,28.527c-2.474,0.012-4.447-1.129-4.909-2.839c-0.28-1.039,0.018-2.187,0.84-3.229 c0.9-1.141,2.291-2.007,3.923-2.436c0.688-0.184,1.385-0.277,2.075-0.281c2.474-0.013,4.445,1.129,4.91,2.84 c0.615,2.267-1.522,4.807-4.764,5.664C9.347,28.43,8.647,28.522,7.96,28.527L7.96,28.527z" fill="url(#SVGID_5_)"/>
<rect fill="none" height="30" width="30" y="0.487"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
-<rect fill-opacity="0.35" height="33.866" stroke-opacity="0.35" transform="matrix(-0.6985 0.7156 -0.7156 -0.6985 35.9922 14.2223)" width="3.706" x="13.147" y="-2.239"/>
+<rect height="33.866" opacity="0.35" transform="matrix(-0.6985 0.7156 -0.7156 -0.6985 35.9922 14.2223)" width="3.706" x="13.147" y="-2.239"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -257 670.6689)" gradientUnits="userSpaceOnUse" id="SVGID_1___" x1="260" x2="284" y1="655.9761" y2="655.9761">
-<stop offset="0" style="stop-color:#FF4D00"/>
-<stop offset="0.8424" style="stop-color:#CC1414"/>
-<stop offset="1" style="stop-color:#FF4D00"/>
+ <stop offset="0" style="stop-color:#FF4D00"/>
+ <stop offset="0.8424" style="stop-color:#CC1414"/>
+ <stop offset="1" style="stop-color:#FF4D00"/>
</linearGradient>
<polygon fill="url(#SVGID_1___)" points="25.809,26.431 3,4.177 4.191,2.956 27,25.21 "/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_key_screen.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_key_screen.svg Fri May 14 16:09:54 2010 +0300
@@ -1,153 +1,215 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2.001" y2="57.8555">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+ <stop offset="0.0667" style="stop-color:#D1D7D9"/>
+ <stop offset="0.2606" style="stop-color:#BDC2C4"/>
+ <stop offset="0.6606" style="stop-color:#949DA1"/>
+ <stop offset="0.9636" style="stop-color:#ADB3B5"/>
+ <stop offset="1" style="stop-color:#595C5E"/>
</linearGradient>
<path d="M48.027,54.932c0,1.693-1.375,3.069-3.068,3.069h-29.92c-1.693,0-3.066-1.376-3.066-3.069V5.07 c0-1.696,1.373-3.069,3.066-3.069h29.92c1.693,0,3.068,1.373,3.068,3.069V54.932z" fill="url(#SVGID_1_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="2.001" y2="56.899">
-<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"/>
+ <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="M44.959,2.001h-29.92c-1.693,0-3.066,1.373-3.066,3.069v49.861c0,0.82,0.324,1.56,0.848,2.11 c-0.047-0.187-0.08-0.377-0.08-0.575v-1.535V6.602V5.07c0-1.271,1.031-2.304,2.299-2.304h29.92c1.268,0,2.301,1.033,2.301,2.304 v1.531v48.33v1.535c0,0.198-0.033,0.389-0.08,0.575c0.521-0.551,0.848-1.29,0.848-2.11V5.07C48.027,3.374,46.652,2.001,44.959,2.001 z" fill="url(#SVGID_2_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="5.8916" y2="43.4283">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+ <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="37.589" stroke-opacity="0.6" width="31.453" x="14.273" y="5.836"/>
+<rect fill="url(#SVGID_3_)" height="37.589" opacity="0.6" width="31.453" x="14.273" y="5.836"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="29.999" x2="29.999" y1="6.6548" y2="42.6624">
-<stop offset="0" style="stop-color:#6E6E6E"/>
-<stop offset="1" style="stop-color:#333333"/>
+ <stop offset="0" style="stop-color:#6E6E6E"/>
+ <stop offset="1" style="stop-color:#333333"/>
</linearGradient>
<rect fill="url(#SVGID_4_)" height="36.058" width="29.92" x="15.039" y="6.602"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30" x2="30" y1="7.4214" y2="41.894">
-<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"/>
+ <stop offset="0" style="stop-color:#3BC8EB"/>
+ <stop offset="0.3879" style="stop-color:#2D9BD2"/>
+ <stop offset="0.8909" style="stop-color:#1347BA"/>
</linearGradient>
<rect fill="url(#SVGID_5_)" height="34.521" width="28.383" x="15.809" y="7.37"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="30" x2="30" y1="7.9712" y2="21.69">
-<stop offset="0" style="stop-color:#85EFFF"/>
-<stop offset="1" style="stop-color:#3BA1D9"/>
+ <stop offset="0" style="stop-color:#85EFFF"/>
+ <stop offset="1" style="stop-color:#3BA1D9"/>
</linearGradient>
<polygon fill="url(#SVGID_6_)" points="44.191,19.644 15.809,22.712 15.809,8.137 44.191,8.137 "/>
<rect fill="#9FE4FF" height="0.767" width="28.383" x="15.809" y="7.37"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="30.2236" x2="30.2236" y1="5.8726" y2="2.8032">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#D1D7D9"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#D1D7D9"/>
</linearGradient>
<path d="M26.832,5.836c-0.861,0-1.535-0.563-1.535-1.279v-0.51c0-0.718,0.674-1.28,1.535-1.28h6.785 c0.859,0,1.533,0.563,1.533,1.28v0.51c0,0.716-0.674,1.279-1.533,1.279H26.832z" fill="url(#SVGID_7_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="30.2236" x2="30.2236" y1="3.2158" y2="5.1992">
-<stop offset="0" style="stop-color:#6C7375"/>
-<stop offset="1" style="stop-color:#BDC2C4"/>
+ <stop offset="0" style="stop-color:#6C7375"/>
+ <stop offset="1" style="stop-color:#BDC2C4"/>
</linearGradient>
<path d="M34.383,4.557c0,0.283-0.342,0.514-0.766,0.514h-6.785c-0.424,0-0.768-0.23-0.768-0.514v-0.51 c0-0.283,0.344-0.512,0.768-0.512h6.785c0.424,0,0.766,0.229,0.766,0.512V4.557z" fill="url(#SVGID_8_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="29.8818" x2="29.8818" y1="44.2236" y2="55.628">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#FFFFFF"/>
+ <stop offset="0" style="stop-color:#B6BBBD"/>
+ <stop offset="1" style="stop-color:#FFFFFF"/>
</linearGradient>
-<path d="M27.109,55.7c-1.645,0-2.98-1.323-2.98-2.951v-5.606c0-1.627,1.336-2.951,2.98-2.951 h5.545c1.645,0,2.98,1.324,2.98,2.951v5.606c0,1.628-1.336,2.951-2.98,2.951H27.109z" fill="url(#SVGID_9_)" fill-opacity="0.6" stroke-opacity="0.6"/>
-<path d="M27.105,54.932c-1.219,0-2.211-0.979-2.211-2.183v-5.606c0-1.204,0.992-2.183,2.211-2.183 h5.553c1.219,0,2.209,0.979,2.209,2.183v5.606c0,1.204-0.99,2.183-2.209,2.183H27.105z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M27.109,55.7c-1.645,0-2.98-1.323-2.98-2.951v-5.606c0-1.627,1.336-2.951,2.98-2.951 h5.545c1.645,0,2.98,1.324,2.98,2.951v5.606c0,1.628-1.336,2.951-2.98,2.951H27.109z" fill="url(#SVGID_9_)" opacity="0.6"/>
+<path d="M27.105,54.932c-1.219,0-2.211-0.979-2.211-2.183v-5.606c0-1.204,0.992-2.183,2.211-2.183 h5.553c1.219,0,2.209,0.979,2.209,2.183v5.606c0,1.204-0.99,2.183-2.209,2.183H27.105z" fill="#020202" opacity="0.5"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="29.8818" x2="29.8818" y1="45.6865" y2="54.1806">
-<stop offset="0" style="stop-color:#A6A8AB"/>
-<stop offset="0.703" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#808184"/>
+ <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="M34.102,52.749c0,0.783-0.645,1.417-1.438,1.417h-5.566c-0.793,0-1.436-0.634-1.436-1.417v-5.606 c0-0.783,0.643-1.417,1.436-1.417h5.566c0.793,0,1.438,0.634,1.438,1.417V52.749z" fill="url(#SVGID_10_)"/>
-<path d="M28.73,52.632c-0.846,0-1.533-0.688-1.533-1.534v-2.303c0-0.847,0.688-1.534,1.533-1.534 h2.303c0.846,0,1.533,0.688,1.533,1.534v2.303c0,0.847-0.688,1.534-1.533,1.534H28.73z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M28.73,52.632c-0.846,0-1.533-0.688-1.533-1.534v-2.303c0-0.847,0.688-1.534,1.533-1.534 h2.303c0.846,0,1.533,0.688,1.533,1.534v2.303c0,0.847-0.688,1.534-1.533,1.534H28.73z" fill="#020202" opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="29.8809" x2="29.8809" y1="48.0103" y2="51.8696">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+ <stop offset="0.0667" style="stop-color:#D1D7D9"/>
+ <stop offset="0.2606" style="stop-color:#BDC2C4"/>
+ <stop offset="0.6606" style="stop-color:#949DA1"/>
+ <stop offset="0.9636" style="stop-color:#ADB3B5"/>
+ <stop offset="1" style="stop-color:#595C5E"/>
</linearGradient>
<path d="M28.73,51.863c-0.422,0-0.768-0.345-0.768-0.766v-2.303c0-0.422,0.346-0.767,0.768-0.767h2.303 c0.42,0,0.766,0.345,0.766,0.767v2.303c0,0.421-0.346,0.766-0.766,0.766H28.73z" fill="url(#SVGID_11_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="17.667" x2="17.667" y1="44.917" y2="54.1816">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+ <stop offset="0" style="stop-color:#B6BBBD"/>
+ <stop offset="1" style="stop-color:#F0FBFF"/>
</linearGradient>
-<path d="M17.223,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307 c0-1.624,1.324-2.948,2.949-2.948h0.887c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H17.223z" fill="url(#SVGID_12_)" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M17.223,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307 c0-1.624,1.324-2.948,2.949-2.948h0.887c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H17.223z" fill="url(#SVGID_12_)" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="17.665" x2="17.665" y1="45.6899" y2="53.4106">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+ <stop offset="0" style="stop-color:#231F20"/>
+ <stop offset="1" style="stop-color:#6D6E70"/>
</linearGradient>
-<path d="M17.223,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307 c0-1.201,0.98-2.183,2.184-2.183h0.887c1.205,0,2.182,0.981,2.182,2.183v3.307c0,1.204-0.977,2.183-2.182,2.183H17.223z" fill="url(#SVGID_13_)" fill-opacity="0.7" stroke-opacity="0.7"/>
+<path d="M17.223,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307 c0-1.201,0.98-2.183,2.184-2.183h0.887c1.205,0,2.182,0.981,2.182,2.183v3.307c0,1.204-0.977,2.183-2.182,2.183H17.223z" fill="url(#SVGID_13_)" opacity="0.7"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="17.667" x2="17.667" y1="46.4658" y2="52.6426">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+ <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="M19.525,51.215c0,0.783-0.635,1.417-1.416,1.417h-0.887c-0.779,0-1.414-0.634-1.414-1.417v-3.307 c0-0.78,0.635-1.414,1.414-1.414h0.887c0.781,0,1.416,0.634,1.416,1.414V51.215z" fill="url(#SVGID_14_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="41.6719" x2="41.6719" y1="44.917" y2="54.1816">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+ <stop offset="0" style="stop-color:#B6BBBD"/>
+ <stop offset="1" style="stop-color:#F0FBFF"/>
</linearGradient>
-<path d="M41.229,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307 c0-1.624,1.324-2.948,2.949-2.948h0.885c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H41.229z" fill="url(#SVGID_15_)" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M41.229,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307 c0-1.624,1.324-2.948,2.949-2.948h0.885c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H41.229z" fill="url(#SVGID_15_)" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="41.6709" x2="41.6709" y1="45.6899" y2="53.4106">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+ <stop offset="0" style="stop-color:#231F20"/>
+ <stop offset="1" style="stop-color:#6D6E70"/>
</linearGradient>
-<path d="M41.229,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307 c0-1.201,0.98-2.183,2.184-2.183h0.885c1.205,0,2.184,0.981,2.184,2.183v3.307c0,1.204-0.979,2.183-2.184,2.183H41.229z" fill="url(#SVGID_16_)" fill-opacity="0.7" stroke-opacity="0.7"/>
+<path d="M41.229,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307 c0-1.201,0.98-2.183,2.184-2.183h0.885c1.205,0,2.184,0.981,2.184,2.183v3.307c0,1.204-0.979,2.183-2.184,2.183H41.229z" fill="url(#SVGID_16_)" opacity="0.7"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="41.6719" x2="41.6719" y1="46.4658" y2="52.6426">
-<stop offset="0" style="stop-color:#FFC142"/>
-<stop offset="0.7455" style="stop-color:#CF4E18"/>
-<stop offset="1" style="stop-color:#B52100"/>
+ <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="M43.531,51.215c0,0.783-0.637,1.417-1.418,1.417h-0.885c-0.781,0-1.416-0.634-1.416-1.417v-3.307 c0-0.78,0.635-1.414,1.416-1.414h0.885c0.781,0,1.418,0.634,1.418,1.414V51.215z" fill="url(#SVGID_17_)"/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
-<path d="M0,30v-30h30v30h-30zm23.6-3.75l-8.732-8.732-8.736,8.73h17.46zm2.65-2.65v-17.47l-8.732,8.732,8.73,8.73zm-22.5-0.27l8.465-8.465-8.47-8.459v16.93zm11.12-11.11l8.46-8.47h-16.93l8.468,8.47z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="15" x2="15" y1="0.9941" y2="29.19">
-<stop offset="0" stop-color="#E6E6E6"/>
-<stop offset="0.6182" stop-color="#A8A8A8"/>
-<stop offset="1" stop-color="#CCCCCC"/>
-</linearGradient>
-<path d="M0.938,0.938v28.12h28.12v-28.12h-28.12zm12.6,13.93l-10.73,10.73v-21.46l10.73,10.73zm-9.401-12.06h21.46l-10.72,10.73-10.73-10.73zm10.73,13.38l11,11h-22l11-11zm1.32-1.32l11-11v21.99l-11-10.99z" fill="url(#SVGID_1__)"/>
-<polygon fill-opacity="0.6" points="8.547,25.31,7.61,17.81,5.625,17.81,5.625,12.2,24.38,12.2,24.38,17.81,22.39,17.81,21.45,25.31" stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="15" x2="15" y1="12.1" y2="23.99">
-<stop offset="0" stop-color="#A0F800"/>
-<stop offset="1" stop-color="#319E00"/>
-</linearGradient>
-<polygon fill="url(#SVGID_2__)" points="6.563,13.14,6.563,16.88,8.438,16.88,9.375,24.38,20.62,24.38,21.56,16.88,23.44,16.88,23.44,13.14"/>
-<path d="M13.12,14.06v-2.886c-0.348,0.048-0.692,0.073-1.03,0.073-0.804,0-1.568-0.139-2.272-0.414-3.952-1.536-3.863-4.501-3.858-4.626l0.019-0.408,0.312-0.265c0.103-0.088,1.06-0.855,2.881-0.855,0.958,0,1.99,0.212,3.066,0.632,1.3,0.506,2.174,1.126,2.762,1.716,0.588-0.589,1.462-1.209,2.762-1.716,1.076-0.42,2.108-0.632,3.066-0.632,1.82,0,2.777,0.767,2.881,0.855l0.313,0.265,0.019,0.408c0.005,0.125,0.094,3.091-3.862,4.632-0.704,0.275-1.469,0.414-2.272,0.414-0.338,0-0.683-0.025-1.03-0.073v2.886h-3.755z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<path d="M10.16,9.963c1.436,0.559,2.896,0.346,3.899,0.057v3.105h1.875v-3.1c1.003,0.289,2.464,0.502,3.899-0.057,3.375-1.316,3.267-3.717,3.267-3.717s-1.627-1.379-5.002-0.064c-1.87,0.725-2.72,1.667-3.11,2.369-0.392-0.702-1.242-1.644-3.102-2.369-3.377-1.316-5.004,0.064-5.004,0.064s-0.108,2.401,3.264,3.717z" fill="url(#SVGID_3__)"/>
<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="15" x2="15" y1="4.922" y2="12.87">
-<stop offset="0" stop-color="#A0F800"/>
-<stop offset="1" stop-color="#319E00"/>
-</linearGradient>
</defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="15" x2="15" y1="12.55" y2="17.37">
-<stop offset="0" stop-color="#D07100"/>
-<stop offset="1" stop-color="#A23600"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="7.6196" x2="7.6196" y1="1" y2="28.8433">
+ <stop offset="0" style="stop-color:#96E9FA"/>
+ <stop offset="1" style="stop-color:#0087D9"/>
+</linearGradient>
+<rect fill="url(#SVGID_1__)" height="6" width="6" x="4.62" y="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="14.9536" x2="14.9536" y1="1" y2="28.8433">
+ <stop offset="0" style="stop-color:#96E9FA"/>
+ <stop offset="1" style="stop-color:#0087D9"/>
+</linearGradient>
+<rect fill="url(#SVGID_2__)" height="6" width="6" x="11.954" y="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="22.3809" x2="22.3809" y1="1" y2="28.8433">
+ <stop offset="0" style="stop-color:#96E9FA"/>
+ <stop offset="1" style="stop-color:#0087D9"/>
+</linearGradient>
+<rect fill="url(#SVGID_3__)" height="6" width="6" x="19.381" y="1"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="7.6196" x2="7.6196" y1="1.0005" y2="28.8461">
+ <stop offset="0" style="stop-color:#96E9FA"/>
+ <stop offset="1" style="stop-color:#0087D9"/>
+</linearGradient>
+<rect fill="url(#SVGID_4__)" height="6" width="6" x="4.62" y="8.239"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="14.9536" x2="14.9536" y1="1.0005" y2="28.8461">
+ <stop offset="0" style="stop-color:#96E9FA"/>
+ <stop offset="1" style="stop-color:#0087D9"/>
</linearGradient>
-<rect fill="url(#SVGID_4__)" height="3.738" width="16.88" x="6.563" y="13.14"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="15" x2="15" y1="16.84" y2="24.56">
-<stop offset="0" stop-color="#D07100"/>
-<stop offset="1" stop-color="#A23600"/>
+<rect fill="url(#SVGID_5__)" height="6" width="6" x="11.954" y="8.239"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6__" x1="22.3809" x2="22.3809" y1="1.0005" y2="28.8461">
+ <stop offset="0" style="stop-color:#96E9FA"/>
+ <stop offset="1" style="stop-color:#0087D9"/>
+</linearGradient>
+<rect fill="url(#SVGID_6__)" height="6" width="6" x="19.381" y="8.239"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7__" x1="7.6196" x2="7.6196" y1="1.0024" y2="28.8444">
+ <stop offset="0" style="stop-color:#96E9FA"/>
+ <stop offset="1" style="stop-color:#0087D9"/>
+</linearGradient>
+<rect fill="url(#SVGID_7__)" height="5.999" width="6" x="4.62" y="15.572"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8__" x1="14.9536" x2="14.9536" y1="1.0024" y2="28.8444">
+ <stop offset="0" style="stop-color:#96E9FA"/>
+ <stop offset="1" style="stop-color:#0087D9"/>
+</linearGradient>
+<rect fill="url(#SVGID_8__)" height="5.999" width="6" x="11.954" y="15.572"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9__" x1="14.9536" x2="14.9536" y1="1.0049" y2="28.845">
+ <stop offset="0" style="stop-color:#96E9FA"/>
+ <stop offset="1" style="stop-color:#0087D9"/>
+</linearGradient>
+<rect fill="url(#SVGID_9__)" height="6" width="6" x="11.954" y="23"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10__" x1="22.3809" x2="22.3809" y1="1.0024" y2="28.8444">
+ <stop offset="0" style="stop-color:#96E9FA"/>
+ <stop offset="1" style="stop-color:#0087D9"/>
</linearGradient>
-<polygon fill="url(#SVGID_5__)" points="20.62,24.38,9.375,24.38,8.438,16.88,21.56,16.88"/>
-<path d="M23.1,6.246s-1.627-1.379-5.002-0.064c-1.86,0.725-2.71,1.667-3.1,2.369-0.392-0.702-1.242-1.644-3.102-2.369-3.377-1.316-5.004,0.064-5.004,0.064s-0.109,2.401,3.267,3.717c1.436,0.559,2.896,0.346,3.899,0.057v3.105h1.875v-3.1c1.003,0.289,2.464,0.502,3.899-0.057,3.37-1.316,3.26-3.717,3.26-3.717z" fill="url(#SVGID_3__)"/>
-<g fill-opacity="0.2" stroke-opacity="0.2">
-<path d="M14.06,9.082c-1.003,0.289-2.464,0.502-3.899-0.057-2.1-0.82-2.85-2.062-3.118-2.881-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.057v-0.938z"/>
-<path d="M22.96,6.144c-0.268,0.819-1.018,2.061-3.121,2.881-1.436,0.559-2.896,0.346-3.899,0.057v0.938c1.003,0.289,2.464,0.502,3.899-0.057,3.375-1.316,3.267-3.717,3.267-3.717s-0.06-0.042-0.15-0.102z"/>
-<rect height="0.938" width="1.875" x="14.06" y="12.19"/>
+<rect fill="url(#SVGID_10__)" height="5.999" width="6" x="19.381" y="15.572"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11__" x1="7.6196" x2="7.6196" y1="1" y2="6.9042">
+ <stop offset="0" style="stop-color:#73E3FF"/>
+ <stop offset="1" style="stop-color:#1347BA"/>
+</linearGradient>
+<path d="M9.915,1.705v4.591h-4.59V1.705H9.915 M10.619,1h-6v6h6V1L10.619,1z" fill="url(#SVGID_11__)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12__" x1="14.9536" x2="14.9536" y1="1" y2="6.9042">
+ <stop offset="0" style="stop-color:#73E3FF"/>
+ <stop offset="1" style="stop-color:#1347BA"/>
+</linearGradient>
+<path d="M17.249,1.705v4.591h-4.59V1.705H17.249 M17.954,1h-6v6h6V1L17.954,1z" fill="url(#SVGID_12__)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13__" x1="22.3809" x2="22.3809" y1="1" y2="6.9042">
+ <stop offset="0" style="stop-color:#73E3FF"/>
+ <stop offset="1" style="stop-color:#1347BA"/>
+</linearGradient>
+<path d="M24.676,1.705v4.591h-4.59V1.705H24.676 M25.381,1h-6v6h6V1L25.381,1z" fill="url(#SVGID_13__)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14__" x1="7.6196" x2="7.6196" y1="8.312" y2="14.2147">
+ <stop offset="0" style="stop-color:#73E3FF"/>
+ <stop offset="1" style="stop-color:#1347BA"/>
+</linearGradient>
+<path d="M9.915,8.943v4.591h-4.59V8.943H9.915 M10.619,8.239h-6v6h6V8.239L10.619,8.239z" fill="url(#SVGID_14__)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15__" x1="14.9536" x2="14.9536" y1="8.312" y2="14.2147">
+ <stop offset="0" style="stop-color:#73E3FF"/>
+ <stop offset="1" style="stop-color:#1347BA"/>
+</linearGradient>
+<path d="M17.249,8.943v4.591h-4.59V8.943H17.249 M17.954,8.239h-6v6h6V8.239L17.954,8.239z" fill="url(#SVGID_15__)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16__" x1="22.3809" x2="22.3809" y1="8.312" y2="14.2147">
+ <stop offset="0" style="stop-color:#73E3FF"/>
+ <stop offset="1" style="stop-color:#1347BA"/>
+</linearGradient>
+<path d="M24.676,8.943v4.591h-4.59V8.943H24.676 M25.381,8.239h-6v6h6V8.239L25.381,8.239z" fill="url(#SVGID_16__)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17__" x1="7.6196" x2="7.6196" y1="15.7993" y2="21.6132">
+ <stop offset="0" style="stop-color:#73E3FF"/>
+ <stop offset="1" style="stop-color:#1347BA"/>
+</linearGradient>
+<path d="M9.915,16.275v4.592h-4.59v-4.592H9.915 M10.619,15.572h-6v5.999h6V15.572L10.619,15.572z" fill="url(#SVGID_17__)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="14.9536" x2="14.9536" y1="15.7993" y2="21.6132">
+ <stop offset="0" style="stop-color:#73E3FF"/>
+ <stop offset="1" style="stop-color:#1347BA"/>
+</linearGradient>
+<path d="M17.249,16.275v4.592h-4.59v-4.592H17.249 M17.954,15.572h-6v5.999h6V15.572L17.954,15.572z" fill="url(#SVGID_18_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="14.9536" x2="14.9536" y1="23.0225" y2="28.8353">
+ <stop offset="0" style="stop-color:#73E3FF"/>
+ <stop offset="1" style="stop-color:#1347BA"/>
+</linearGradient>
+<path d="M17.249,23.705v4.59h-4.59v-4.59H17.249 M17.954,23h-6v6h6V23L17.954,23z" fill="url(#SVGID_19_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="22.3809" x2="22.3809" y1="15.7993" y2="21.6132">
+ <stop offset="0" style="stop-color:#73E3FF"/>
+ <stop offset="1" style="stop-color:#1347BA"/>
+</linearGradient>
+<path d="M24.676,16.275v4.592h-4.59v-4.592H24.676 M25.381,15.572h-6v5.999h6V15.572L25.381,15.572z" fill="url(#SVGID_20_)"/>
+<rect fill="none" height="30" width="30"/>
</g>
-<rect fill="#FFFFFF" fill-opacity="0.3" height="0.926" stroke-opacity="0.3" width="16.88" x="6.563" y="13.14"/>
-<polygon fill-opacity="0.2" points="21.44,17.81,21.56,16.88,8.438,16.88,8.555,17.81" stroke-opacity="0.2"/>
-</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_keyboard.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_keyboard.svg Fri May 14 16:09:54 2010 +0300
@@ -1,381 +1,358 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="14.5566" y2="45.5373">
-<stop offset="0" style="stop-color:#CED5D8"/>
-<stop offset="0.7308" style="stop-color:#818687"/>
-<stop offset="1" style="stop-color:#CEDBE0"/>
+ <stop offset="0" style="stop-color:#CED5D8"/>
+ <stop offset="0.7308" style="stop-color:#818687"/>
+ <stop offset="1" style="stop-color:#CEDBE0"/>
</linearGradient>
-<path d="M1,43.384c0,1.133,0.912,2.06,2.03,2.06h53.937c1.117,0,2.033-0.927,2.033-2.06V16.616 c0-1.133-0.916-2.06-2.033-2.06H3.03c-1.118,0-2.03,0.927-2.03,2.06V43.384z" fill="url(#SVGID_1_)" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M1,43.384c0,1.133,0.912,2.06,2.03,2.06h53.937c1.117,0,2.033-0.927,2.033-2.06V16.616 c0-1.133-0.916-2.06-2.033-2.06H3.03c-1.118,0-2.03,0.927-2.03,2.06V43.384z" fill="url(#SVGID_1_)" opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="29.999" x2="29.999" y1="15.5859" y2="44.5027">
-<stop offset="0" style="stop-color:#BCC3C5"/>
-<stop offset="0.8121" style="stop-color:#7A8285"/>
-<stop offset="1" style="stop-color:#B7BDBF"/>
+ <stop offset="0" style="stop-color:#BCC3C5"/>
+ <stop offset="0.8121" style="stop-color:#7A8285"/>
+ <stop offset="1" style="stop-color:#B7BDBF"/>
</linearGradient>
<path d="M56.967,44.415H3.03c-0.554,0-1.002-0.462-1.002-1.031V16.616c0-0.566,0.448-1.03,1.002-1.03h53.937 c0.553,0,1.003,0.464,1.003,1.03v26.768C57.97,43.953,57.52,44.415,56.967,44.415L56.967,44.415z" fill="url(#SVGID_2_)"/>
-<path d="M21.949,36.123c0,0.568-0.459,1.029-1.028,1.029h-3.089c-0.567,0-1.029-0.461-1.029-1.029v-3.088 c0-0.57,0.462-1.031,1.029-1.031h3.089c0.569,0,1.028,0.461,1.028,1.031V36.123z" fill-opacity="0.25" stroke-opacity="0.25"/>
+<path d="M21.949,36.123c0,0.568-0.459,1.029-1.028,1.029h-3.089c-0.567,0-1.029-0.461-1.029-1.029v-3.088 c0-0.57,0.462-1.031,1.029-1.031h3.089c0.569,0,1.028,0.461,1.028,1.031V36.123z" opacity="0.25"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="19.376" x2="19.376" y1="31.4229" y2="36.6183">
-<stop offset="0" style="stop-color:#ECF4F8"/>
-<stop offset="0.7939" style="stop-color:#A0A6A7"/>
-<stop offset="1" style="stop-color:#CEDBE0"/>
+ <stop offset="0" style="stop-color:#ECF4F8"/>
+ <stop offset="0.7939" style="stop-color:#A0A6A7"/>
+ <stop offset="1" style="stop-color:#CEDBE0"/>
</linearGradient>
<path d="M21.949,35.565c0,0.568-0.459,1.028-1.028,1.028h-3.089c-0.567,0-1.029-0.46-1.029-1.028v-3.089 c0-0.567,0.462-1.03,1.029-1.03h3.089c0.569,0,1.028,0.463,1.028,1.03V35.565z" fill="url(#SVGID_3_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="21.5" x2="17.3381" y1="34.0205" y2="34.0205">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.8364" style="stop-color:#C5CFD2"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+ <stop offset="0" style="stop-color:#E4EBED"/>
+ <stop offset="0.8364" style="stop-color:#C5CFD2"/>
+ <stop offset="0.9758" style="stop-color:#D2D9DB"/>
</linearGradient>
<path d="M17.832,36.08c-0.284,0-0.516-0.231-0.516-0.515v-3.089c0-0.284,0.231-0.516,0.516-0.516h3.089 c0.283,0,0.515,0.231,0.515,0.516v3.089c0,0.283-0.231,0.515-0.515,0.515H17.832z" fill="url(#SVGID_4_)"/>
-<path d="M28.128,36.123c0,0.568-0.462,1.029-1.029,1.029h-3.09c-0.568,0-1.028-0.461-1.028-1.029v-3.088 c0-0.57,0.46-1.031,1.028-1.031h3.09c0.567,0,1.029,0.461,1.029,1.031V36.123z" fill-opacity="0.25" stroke-opacity="0.25"/>
+<path d="M28.128,36.123c0,0.568-0.462,1.029-1.029,1.029h-3.09c-0.568,0-1.028-0.461-1.028-1.029v-3.088 c0-0.57,0.46-1.031,1.028-1.031h3.09c0.567,0,1.029,0.461,1.029,1.031V36.123z" opacity="0.25"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="25.5547" x2="25.5547" y1="31.4229" y2="36.6183">
-<stop offset="0" style="stop-color:#ECF4F8"/>
-<stop offset="0.7939" style="stop-color:#A0A6A7"/>
-<stop offset="1" style="stop-color:#CEDBE0"/>
+ <stop offset="0" style="stop-color:#ECF4F8"/>
+ <stop offset="0.7939" style="stop-color:#A0A6A7"/>
+ <stop offset="1" style="stop-color:#CEDBE0"/>
</linearGradient>
<path d="M28.128,35.565c0,0.568-0.462,1.028-1.029,1.028h-3.09c-0.568,0-1.028-0.46-1.028-1.028v-3.089 c0-0.567,0.46-1.03,1.028-1.03h3.09c0.567,0,1.029,0.463,1.029,1.03V35.565z" fill="url(#SVGID_5_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="27.6777" x2="23.5168" y1="34.0205" y2="34.0205">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.8364" style="stop-color:#C5CFD2"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+ <stop offset="0" style="stop-color:#E4EBED"/>
+ <stop offset="0.8364" style="stop-color:#C5CFD2"/>
+ <stop offset="0.9758" style="stop-color:#D2D9DB"/>
</linearGradient>
<path d="M24.009,36.08c-0.283,0-0.514-0.231-0.514-0.515v-3.089c0-0.284,0.23-0.516,0.514-0.516h3.09 c0.284,0,0.515,0.231,0.515,0.516v3.089c0,0.283-0.23,0.515-0.515,0.515H24.009z" fill="url(#SVGID_6_)"/>
-<path d="M34.305,36.123c0,0.568-0.461,1.029-1.029,1.029h-3.088c-0.568,0-1.031-0.461-1.031-1.029v-3.088 c0-0.57,0.463-1.031,1.031-1.031h3.088c0.568,0,1.029,0.461,1.029,1.031V36.123z" fill-opacity="0.25" stroke-opacity="0.25"/>
+<path d="M34.305,36.123c0,0.568-0.461,1.029-1.029,1.029h-3.088c-0.568,0-1.031-0.461-1.031-1.029v-3.088 c0-0.57,0.463-1.031,1.031-1.031h3.088c0.568,0,1.029,0.461,1.029,1.031V36.123z" opacity="0.25"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="31.7305" x2="31.7305" y1="31.4229" y2="36.6183">
-<stop offset="0" style="stop-color:#ECF4F8"/>
-<stop offset="0.7939" style="stop-color:#A0A6A7"/>
-<stop offset="1" style="stop-color:#CEDBE0"/>
+ <stop offset="0" style="stop-color:#ECF4F8"/>
+ <stop offset="0.7939" style="stop-color:#A0A6A7"/>
+ <stop offset="1" style="stop-color:#CEDBE0"/>
</linearGradient>
<path d="M34.305,35.565c0,0.568-0.461,1.028-1.029,1.028h-3.088c-0.568,0-1.031-0.46-1.031-1.028v-3.089 c0-0.567,0.463-1.03,1.031-1.03h3.088c0.568,0,1.029,0.463,1.029,1.03V35.565z" fill="url(#SVGID_7_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="33.8545" x2="29.6936" y1="34.0205" y2="34.0205">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.8364" style="stop-color:#C5CFD2"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+ <stop offset="0" style="stop-color:#E4EBED"/>
+ <stop offset="0.8364" style="stop-color:#C5CFD2"/>
+ <stop offset="0.9758" style="stop-color:#D2D9DB"/>
</linearGradient>
<path d="M30.188,36.08c-0.284,0-0.516-0.231-0.516-0.515v-3.089c0-0.284,0.231-0.516,0.516-0.516h3.088 c0.285,0,0.515,0.231,0.515,0.516v3.089c0,0.283-0.229,0.515-0.515,0.515H30.188z" fill="url(#SVGID_8_)"/>
-<path d="M40.482,36.123c0,0.568-0.46,1.029-1.028,1.029h-3.089c-0.57,0-1.03-0.461-1.03-1.029v-3.088 c0-0.57,0.46-1.031,1.03-1.031h3.089c0.568,0,1.028,0.461,1.028,1.031V36.123z" fill-opacity="0.25" stroke-opacity="0.25"/>
+<path d="M40.482,36.123c0,0.568-0.46,1.029-1.028,1.029h-3.089c-0.57,0-1.03-0.461-1.03-1.029v-3.088 c0-0.57,0.46-1.031,1.03-1.031h3.089c0.568,0,1.028,0.461,1.028,1.031V36.123z" opacity="0.25"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="37.9082" x2="37.9082" y1="31.4229" y2="36.6183">
-<stop offset="0" style="stop-color:#ECF4F8"/>
-<stop offset="0.7939" style="stop-color:#A0A6A7"/>
-<stop offset="1" style="stop-color:#CEDBE0"/>
+ <stop offset="0" style="stop-color:#ECF4F8"/>
+ <stop offset="0.7939" style="stop-color:#A0A6A7"/>
+ <stop offset="1" style="stop-color:#CEDBE0"/>
</linearGradient>
<path d="M40.482,35.565c0,0.568-0.46,1.028-1.028,1.028h-3.089c-0.57,0-1.03-0.46-1.03-1.028v-3.089 c0-0.567,0.46-1.03,1.03-1.03h3.089c0.568,0,1.028,0.463,1.028,1.03V35.565z" fill="url(#SVGID_9_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="40.0332" x2="35.8713" y1="34.0205" y2="34.0205">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.8364" style="stop-color:#C5CFD2"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+ <stop offset="0" style="stop-color:#E4EBED"/>
+ <stop offset="0.8364" style="stop-color:#C5CFD2"/>
+ <stop offset="0.9758" style="stop-color:#D2D9DB"/>
</linearGradient>
<path d="M36.365,36.08c-0.285,0-0.516-0.231-0.516-0.515v-3.089c0-0.284,0.23-0.516,0.516-0.516h3.089 c0.283,0,0.515,0.231,0.515,0.516v3.089c0,0.283-0.231,0.515-0.515,0.515H36.365z" fill="url(#SVGID_10_)"/>
-<path d="M15.559,36.123c0,0.568-0.46,1.029-1.029,1.029H5.393c-0.57,0-1.031-0.461-1.031-1.029v-3.088 c0-0.57,0.461-1.031,1.031-1.031h9.137c0.569,0,1.029,0.461,1.029,1.031V36.123z" fill-opacity="0.25" stroke-opacity="0.25"/>
+<path d="M15.559,36.123c0,0.568-0.46,1.029-1.029,1.029H5.393c-0.57,0-1.031-0.461-1.031-1.029v-3.088 c0-0.57,0.461-1.031,1.031-1.031h9.137c0.569,0,1.029,0.461,1.029,1.031V36.123z" opacity="0.25"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="9.96" x2="9.96" y1="31.4229" y2="36.6183">
-<stop offset="0" style="stop-color:#ECF4F8"/>
-<stop offset="0.7939" style="stop-color:#A0A6A7"/>
-<stop offset="1" style="stop-color:#CEDBE0"/>
+ <stop offset="0" style="stop-color:#ECF4F8"/>
+ <stop offset="0.7939" style="stop-color:#A0A6A7"/>
+ <stop offset="1" style="stop-color:#CEDBE0"/>
</linearGradient>
<path d="M15.559,35.565c0,0.568-0.46,1.028-1.029,1.028H5.393c-0.57,0-1.031-0.46-1.031-1.028v-3.089 c0-0.567,0.461-1.03,1.031-1.03h9.137c0.569,0,1.029,0.463,1.029,1.03V35.565z" fill="url(#SVGID_11_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="15.2031" x2="4.9306" y1="34.0205" y2="34.0205">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.8364" style="stop-color:#C5CFD2"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+ <stop offset="0" style="stop-color:#E4EBED"/>
+ <stop offset="0.8364" style="stop-color:#C5CFD2"/>
+ <stop offset="0.9758" style="stop-color:#D2D9DB"/>
</linearGradient>
<path d="M5.393,36.08c-0.285,0-0.516-0.231-0.516-0.515v-3.089c0-0.284,0.23-0.516,0.516-0.516h9.137 c0.283,0,0.515,0.231,0.515,0.516v3.089c0,0.283-0.231,0.515-0.515,0.515H5.393z" fill="url(#SVGID_12_)"/>
-<path d="M21.949,24.089c0,0.57-0.459,1.03-1.028,1.03h-6.569c-0.567,0-1.029-0.46-1.029-1.03V21 c0-0.567,0.462-1.028,1.029-1.028h6.569c0.569,0,1.028,0.461,1.028,1.028V24.089z" fill-opacity="0.25" stroke-opacity="0.25"/>
+<path d="M21.949,24.089c0,0.57-0.459,1.03-1.028,1.03h-6.569c-0.567,0-1.029-0.46-1.029-1.03V21 c0-0.567,0.462-1.028,1.029-1.028h6.569c0.569,0,1.028,0.461,1.028,1.028V24.089z" opacity="0.25"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="17.6357" x2="17.6357" y1="19.3906" y2="24.5861">
-<stop offset="0" style="stop-color:#ECF4F8"/>
-<stop offset="0.7939" style="stop-color:#A0A6A7"/>
-<stop offset="1" style="stop-color:#CEDBE0"/>
+ <stop offset="0" style="stop-color:#ECF4F8"/>
+ <stop offset="0.7939" style="stop-color:#A0A6A7"/>
+ <stop offset="1" style="stop-color:#CEDBE0"/>
</linearGradient>
<path d="M21.949,23.532c0,0.568-0.459,1.029-1.028,1.029h-6.569c-0.567,0-1.029-0.461-1.029-1.029v-3.089 c0-0.569,0.462-1.029,1.029-1.029h6.569c0.569,0,1.028,0.46,1.028,1.029V23.532z" fill="url(#SVGID_13_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="21.5547" x2="13.8762" y1="21.9878" y2="21.9878">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.8364" style="stop-color:#C5CFD2"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+ <stop offset="0" style="stop-color:#E4EBED"/>
+ <stop offset="0.8364" style="stop-color:#C5CFD2"/>
+ <stop offset="0.9758" style="stop-color:#D2D9DB"/>
</linearGradient>
<path d="M14.352,24.047c-0.284,0-0.516-0.23-0.516-0.515v-3.089c0-0.284,0.231-0.515,0.516-0.515h6.569 c0.283,0,0.515,0.23,0.515,0.515v3.089c0,0.284-0.231,0.515-0.515,0.515H14.352z" fill="url(#SVGID_14_)"/>
-<path d="M28.128,24.089c0,0.57-0.462,1.03-1.029,1.03h-3.09c-0.568,0-1.028-0.46-1.028-1.03V21 c0-0.567,0.46-1.028,1.028-1.028h3.09c0.567,0,1.029,0.461,1.029,1.028V24.089z" fill-opacity="0.25" stroke-opacity="0.25"/>
+<path d="M28.128,24.089c0,0.57-0.462,1.03-1.029,1.03h-3.09c-0.568,0-1.028-0.46-1.028-1.03V21 c0-0.567,0.46-1.028,1.028-1.028h3.09c0.567,0,1.029,0.461,1.029,1.028V24.089z" opacity="0.25"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="25.5547" x2="25.5547" y1="19.3906" y2="24.5861">
-<stop offset="0" style="stop-color:#ECF4F8"/>
-<stop offset="0.7939" style="stop-color:#A0A6A7"/>
-<stop offset="1" style="stop-color:#CEDBE0"/>
+ <stop offset="0" style="stop-color:#ECF4F8"/>
+ <stop offset="0.7939" style="stop-color:#A0A6A7"/>
+ <stop offset="1" style="stop-color:#CEDBE0"/>
</linearGradient>
<path d="M28.128,23.532c0,0.568-0.462,1.029-1.029,1.029h-3.09c-0.568,0-1.028-0.461-1.028-1.029v-3.089 c0-0.569,0.46-1.029,1.028-1.029h3.09c0.567,0,1.029,0.46,1.029,1.029V23.532z" fill="url(#SVGID_15_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="27.6777" x2="23.5168" y1="21.9878" y2="21.9878">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.8364" style="stop-color:#C5CFD2"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+ <stop offset="0" style="stop-color:#E4EBED"/>
+ <stop offset="0.8364" style="stop-color:#C5CFD2"/>
+ <stop offset="0.9758" style="stop-color:#D2D9DB"/>
</linearGradient>
<path d="M24.009,24.047c-0.283,0-0.514-0.23-0.514-0.515v-3.089c0-0.284,0.23-0.515,0.514-0.515h3.09 c0.284,0,0.515,0.23,0.515,0.515v3.089c0,0.284-0.23,0.515-0.515,0.515H24.009z" fill="url(#SVGID_16_)"/>
-<path d="M34.305,24.089c0,0.57-0.461,1.03-1.029,1.03h-3.088c-0.568,0-1.031-0.46-1.031-1.03V21 c0-0.567,0.463-1.028,1.031-1.028h3.088c0.568,0,1.029,0.461,1.029,1.028V24.089z" fill-opacity="0.25" stroke-opacity="0.25"/>
+<path d="M34.305,24.089c0,0.57-0.461,1.03-1.029,1.03h-3.088c-0.568,0-1.031-0.46-1.031-1.03V21 c0-0.567,0.463-1.028,1.031-1.028h3.088c0.568,0,1.029,0.461,1.029,1.028V24.089z" opacity="0.25"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="31.7305" x2="31.7305" y1="19.3906" y2="24.5861">
-<stop offset="0" style="stop-color:#ECF4F8"/>
-<stop offset="0.7939" style="stop-color:#A0A6A7"/>
-<stop offset="1" style="stop-color:#CEDBE0"/>
+ <stop offset="0" style="stop-color:#ECF4F8"/>
+ <stop offset="0.7939" style="stop-color:#A0A6A7"/>
+ <stop offset="1" style="stop-color:#CEDBE0"/>
</linearGradient>
<path d="M34.305,23.532c0,0.568-0.461,1.029-1.029,1.029h-3.088c-0.568,0-1.031-0.461-1.031-1.029v-3.089 c0-0.569,0.463-1.029,1.031-1.029h3.088c0.568,0,1.029,0.46,1.029,1.029V23.532z" fill="url(#SVGID_17_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="33.8545" x2="29.6936" y1="21.9878" y2="21.9878">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.8364" style="stop-color:#C5CFD2"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+ <stop offset="0" style="stop-color:#E4EBED"/>
+ <stop offset="0.8364" style="stop-color:#C5CFD2"/>
+ <stop offset="0.9758" style="stop-color:#D2D9DB"/>
</linearGradient>
<path d="M30.188,24.047c-0.284,0-0.516-0.23-0.516-0.515v-3.089c0-0.284,0.231-0.515,0.516-0.515h3.088 c0.285,0,0.515,0.23,0.515,0.515v3.089c0,0.284-0.229,0.515-0.515,0.515H30.188z" fill="url(#SVGID_18_)"/>
-<path d="M40.482,24.089c0,0.57-0.46,1.03-1.028,1.03h-3.089c-0.57,0-1.03-0.46-1.03-1.03V21 c0-0.567,0.46-1.028,1.03-1.028h3.089c0.568,0,1.028,0.461,1.028,1.028V24.089z" fill-opacity="0.25" stroke-opacity="0.25"/>
+<path d="M40.482,24.089c0,0.57-0.46,1.03-1.028,1.03h-3.089c-0.57,0-1.03-0.46-1.03-1.03V21 c0-0.567,0.46-1.028,1.03-1.028h3.089c0.568,0,1.028,0.461,1.028,1.028V24.089z" opacity="0.25"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="37.9082" x2="37.9082" y1="19.3906" y2="24.5861">
-<stop offset="0" style="stop-color:#ECF4F8"/>
-<stop offset="0.7939" style="stop-color:#A0A6A7"/>
-<stop offset="1" style="stop-color:#CEDBE0"/>
+ <stop offset="0" style="stop-color:#ECF4F8"/>
+ <stop offset="0.7939" style="stop-color:#A0A6A7"/>
+ <stop offset="1" style="stop-color:#CEDBE0"/>
</linearGradient>
<path d="M40.482,23.532c0,0.568-0.46,1.029-1.028,1.029h-3.089c-0.57,0-1.03-0.461-1.03-1.029v-3.089 c0-0.569,0.46-1.029,1.03-1.029h3.089c0.568,0,1.028,0.46,1.028,1.029V23.532z" fill="url(#SVGID_19_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="40.0332" x2="35.8713" y1="21.9878" y2="21.9878">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.8364" style="stop-color:#C5CFD2"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+ <stop offset="0" style="stop-color:#E4EBED"/>
+ <stop offset="0.8364" style="stop-color:#C5CFD2"/>
+ <stop offset="0.9758" style="stop-color:#D2D9DB"/>
</linearGradient>
<path d="M36.365,24.047c-0.285,0-0.516-0.23-0.516-0.515v-3.089c0-0.284,0.23-0.515,0.516-0.515h3.089 c0.283,0,0.515,0.23,0.515,0.515v3.089c0,0.284-0.231,0.515-0.515,0.515H36.365z" fill="url(#SVGID_20_)"/>
-<path d="M46.725,24.089c0,0.57-0.46,1.03-1.029,1.03h-3.088c-0.57,0-1.03-0.46-1.03-1.03V21 c0-0.567,0.46-1.028,1.03-1.028h3.088c0.569,0,1.029,0.461,1.029,1.028V24.089z" fill-opacity="0.25" stroke-opacity="0.25"/>
+<path d="M46.725,24.089c0,0.57-0.46,1.03-1.029,1.03h-3.088c-0.57,0-1.03-0.46-1.03-1.03V21 c0-0.567,0.46-1.028,1.03-1.028h3.088c0.569,0,1.029,0.461,1.029,1.028V24.089z" opacity="0.25"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="44.1504" x2="44.1504" y1="19.3906" y2="24.5861">
-<stop offset="0" style="stop-color:#ECF4F8"/>
-<stop offset="0.7939" style="stop-color:#A0A6A7"/>
-<stop offset="1" style="stop-color:#CEDBE0"/>
+ <stop offset="0" style="stop-color:#ECF4F8"/>
+ <stop offset="0.7939" style="stop-color:#A0A6A7"/>
+ <stop offset="1" style="stop-color:#CEDBE0"/>
</linearGradient>
<path d="M46.725,23.532c0,0.568-0.46,1.029-1.029,1.029h-3.088c-0.57,0-1.03-0.461-1.03-1.029v-3.089 c0-0.569,0.46-1.029,1.03-1.029h3.088c0.569,0,1.029,0.46,1.029,1.029V23.532z" fill="url(#SVGID_21_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="46.2744" x2="42.1125" y1="21.9878" y2="21.9878">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.8364" style="stop-color:#C5CFD2"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+ <stop offset="0" style="stop-color:#E4EBED"/>
+ <stop offset="0.8364" style="stop-color:#C5CFD2"/>
+ <stop offset="0.9758" style="stop-color:#D2D9DB"/>
</linearGradient>
<path d="M42.607,24.047c-0.285,0-0.517-0.23-0.517-0.515v-3.089c0-0.284,0.231-0.515,0.517-0.515h3.088 c0.283,0,0.515,0.23,0.515,0.515v3.089c0,0.284-0.231,0.515-0.515,0.515H42.607z" fill="url(#SVGID_22_)"/>
-<path d="M55.637,24.089c0,0.57-0.461,1.03-1.029,1.03h-5.823c-0.569,0-1.029-0.46-1.029-1.03V21 c0-0.567,0.46-1.028,1.029-1.028h5.823c0.568,0,1.029,0.461,1.029,1.028V24.089z" fill-opacity="0.25" stroke-opacity="0.25"/>
+<path d="M55.637,24.089c0,0.57-0.461,1.03-1.029,1.03h-5.823c-0.569,0-1.029-0.46-1.029-1.03V21 c0-0.567,0.46-1.028,1.029-1.028h5.823c0.568,0,1.029,0.461,1.029,1.028V24.089z" opacity="0.25"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_23_" x1="51.6953" x2="51.6953" y1="19.3906" y2="24.5861">
-<stop offset="0" style="stop-color:#ECF4F8"/>
-<stop offset="0.7939" style="stop-color:#A0A6A7"/>
-<stop offset="1" style="stop-color:#CEDBE0"/>
+ <stop offset="0" style="stop-color:#ECF4F8"/>
+ <stop offset="0.7939" style="stop-color:#A0A6A7"/>
+ <stop offset="1" style="stop-color:#CEDBE0"/>
</linearGradient>
<path d="M55.637,23.532c0,0.568-0.461,1.029-1.029,1.029h-5.823c-0.569,0-1.029-0.461-1.029-1.029v-3.089 c0-0.569,0.46-1.029,1.029-1.029h5.823c0.568,0,1.029,0.46,1.029,1.029V23.532z" fill="url(#SVGID_23_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_24_" x1="55.2305" x2="48.3058" y1="21.9878" y2="21.9878">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.8364" style="stop-color:#C5CFD2"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+ <stop offset="0" style="stop-color:#E4EBED"/>
+ <stop offset="0.8364" style="stop-color:#C5CFD2"/>
+ <stop offset="0.9758" style="stop-color:#D2D9DB"/>
</linearGradient>
<path d="M48.784,24.047c-0.285,0-0.515-0.23-0.515-0.515v-3.089c0-0.284,0.229-0.515,0.515-0.515h5.823 c0.284,0,0.516,0.23,0.516,0.515v3.089c0,0.284-0.231,0.515-0.516,0.515H48.784z" fill="url(#SVGID_24_)"/>
-<path d="M49.459,30.073c0,0.569-0.461,1.03-1.029,1.03h-5.824c-0.568,0-1.028-0.461-1.028-1.03v-3.088 c0-0.568,0.46-1.03,1.028-1.03h5.824c0.568,0,1.029,0.462,1.029,1.03V30.073z" fill-opacity="0.25" stroke-opacity="0.25"/>
+<path d="M49.459,30.073c0,0.569-0.461,1.03-1.029,1.03h-5.824c-0.568,0-1.028-0.461-1.028-1.03v-3.088 c0-0.568,0.46-1.03,1.028-1.03h5.824c0.568,0,1.029,0.462,1.029,1.03V30.073z" opacity="0.25"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="45.5176" x2="45.5176" y1="25.375" y2="30.5705">
-<stop offset="0" style="stop-color:#ECF4F8"/>
-<stop offset="0.7939" style="stop-color:#A0A6A7"/>
-<stop offset="1" style="stop-color:#CEDBE0"/>
+ <stop offset="0" style="stop-color:#ECF4F8"/>
+ <stop offset="0.7939" style="stop-color:#A0A6A7"/>
+ <stop offset="1" style="stop-color:#CEDBE0"/>
</linearGradient>
<path d="M49.459,29.517c0,0.568-0.461,1.029-1.029,1.029h-5.824c-0.568,0-1.028-0.461-1.028-1.029v-3.088 c0-0.569,0.46-1.03,1.028-1.03h5.824c0.568,0,1.029,0.461,1.029,1.03V29.517z" fill="url(#SVGID_25_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_26_" x1="49.0518" x2="42.1271" y1="27.9722" y2="27.9722">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.8364" style="stop-color:#C5CFD2"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+ <stop offset="0" style="stop-color:#E4EBED"/>
+ <stop offset="0.8364" style="stop-color:#C5CFD2"/>
+ <stop offset="0.9758" style="stop-color:#D2D9DB"/>
</linearGradient>
<path d="M42.605,30.03c-0.284,0-0.515-0.229-0.515-0.514v-3.088c0-0.285,0.23-0.515,0.515-0.515h5.824 c0.283,0,0.515,0.229,0.515,0.515v3.088c0,0.284-0.231,0.514-0.515,0.514H42.605z" fill="url(#SVGID_26_)"/>
-<path d="M12.078,24.089c0,0.57-0.46,1.03-1.028,1.03H5.393c-0.57,0-1.031-0.46-1.031-1.03V21 c0-0.567,0.461-1.028,1.031-1.028h5.657c0.568,0,1.028,0.461,1.028,1.028V24.089z" fill-opacity="0.25" stroke-opacity="0.25"/>
+<path d="M12.078,24.089c0,0.57-0.46,1.03-1.028,1.03H5.393c-0.57,0-1.031-0.46-1.031-1.03V21 c0-0.567,0.461-1.028,1.031-1.028h5.657c0.568,0,1.028,0.461,1.028,1.028V24.089z" opacity="0.25"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_27_" x1="8.2197" x2="8.2197" y1="19.3906" y2="24.5861">
-<stop offset="0" style="stop-color:#ECF4F8"/>
-<stop offset="0.7939" style="stop-color:#A0A6A7"/>
-<stop offset="1" style="stop-color:#CEDBE0"/>
+ <stop offset="0" style="stop-color:#ECF4F8"/>
+ <stop offset="0.7939" style="stop-color:#A0A6A7"/>
+ <stop offset="1" style="stop-color:#CEDBE0"/>
</linearGradient>
<path d="M12.078,23.532c0,0.568-0.46,1.029-1.028,1.029H5.393c-0.57,0-1.031-0.461-1.031-1.029v-3.089 c0-0.569,0.461-1.029,1.031-1.029h5.657c0.568,0,1.028,0.46,1.028,1.029V23.532z" fill="url(#SVGID_27_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_28_" x1="11.6689" x2="4.912" y1="21.9878" y2="21.9878">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.8364" style="stop-color:#C5CFD2"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+ <stop offset="0" style="stop-color:#E4EBED"/>
+ <stop offset="0.8364" style="stop-color:#C5CFD2"/>
+ <stop offset="0.9758" style="stop-color:#D2D9DB"/>
</linearGradient>
<path d="M5.393,24.047c-0.285,0-0.516-0.23-0.516-0.515v-3.089c0-0.284,0.23-0.515,0.516-0.515h5.657 c0.283,0,0.515,0.23,0.515,0.515v3.089c0,0.284-0.231,0.515-0.515,0.515H5.393z" fill="url(#SVGID_28_)"/>
-<path d="M9.51,30.073c0,0.569-0.461,1.03-1.029,1.03H5.393c-0.57,0-1.031-0.461-1.031-1.03v-3.088 c0-0.568,0.461-1.029,1.031-1.029H8.48c0.568,0,1.029,0.461,1.029,1.029V30.073z" fill-opacity="0.25" stroke-opacity="0.25"/>
+<path d="M9.51,30.073c0,0.569-0.461,1.03-1.029,1.03H5.393c-0.57,0-1.031-0.461-1.031-1.03v-3.088 c0-0.568,0.461-1.029,1.031-1.029H8.48c0.568,0,1.029,0.461,1.029,1.029V30.073z" opacity="0.25"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_29_" x1="6.9355" x2="6.9355" y1="25.375" y2="30.5705">
-<stop offset="0" style="stop-color:#ECF4F8"/>
-<stop offset="0.7939" style="stop-color:#A0A6A7"/>
-<stop offset="1" style="stop-color:#CEDBE0"/>
+ <stop offset="0" style="stop-color:#ECF4F8"/>
+ <stop offset="0.7939" style="stop-color:#A0A6A7"/>
+ <stop offset="1" style="stop-color:#CEDBE0"/>
</linearGradient>
<path d="M9.51,29.517c0,0.568-0.461,1.029-1.029,1.029H5.393c-0.57,0-1.031-0.461-1.031-1.029v-3.088 c0-0.569,0.461-1.03,1.031-1.03H8.48c0.568,0,1.029,0.461,1.029,1.03V29.517z" fill="url(#SVGID_29_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_30_" x1="9.0596" x2="4.8987" y1="27.9727" y2="27.9727">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.8364" style="stop-color:#C5CFD2"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+ <stop offset="0" style="stop-color:#E4EBED"/>
+ <stop offset="0.8364" style="stop-color:#C5CFD2"/>
+ <stop offset="0.9758" style="stop-color:#D2D9DB"/>
</linearGradient>
<path d="M5.393,30.032c-0.285,0-0.516-0.231-0.516-0.516v-3.088c0-0.286,0.23-0.516,0.516-0.516H8.48 c0.283,0,0.515,0.229,0.515,0.516v3.088c0,0.284-0.231,0.516-0.515,0.516H5.393z" fill="url(#SVGID_30_)"/>
-<path d="M15.688,30.073c0,0.569-0.461,1.03-1.031,1.03h-3.088c-0.568,0-1.028-0.461-1.028-1.03v-3.088 c0-0.568,0.46-1.029,1.028-1.029h3.088c0.57,0,1.031,0.461,1.031,1.029V30.073z" fill-opacity="0.25" stroke-opacity="0.25"/>
+<path d="M15.688,30.073c0,0.569-0.461,1.03-1.031,1.03h-3.088c-0.568,0-1.028-0.461-1.028-1.03v-3.088 c0-0.568,0.46-1.029,1.028-1.029h3.088c0.57,0,1.031,0.461,1.031,1.029V30.073z" opacity="0.25"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_31_" x1="13.1133" x2="13.1133" y1="25.375" y2="30.5705">
-<stop offset="0" style="stop-color:#ECF4F8"/>
-<stop offset="0.7939" style="stop-color:#A0A6A7"/>
-<stop offset="1" style="stop-color:#CEDBE0"/>
+ <stop offset="0" style="stop-color:#ECF4F8"/>
+ <stop offset="0.7939" style="stop-color:#A0A6A7"/>
+ <stop offset="1" style="stop-color:#CEDBE0"/>
</linearGradient>
<path d="M15.688,29.517c0,0.568-0.461,1.029-1.031,1.029h-3.088c-0.568,0-1.028-0.461-1.028-1.029v-3.088 c0-0.569,0.46-1.03,1.028-1.03h3.088c0.57,0,1.031,0.461,1.031,1.03V29.517z" fill="url(#SVGID_31_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_32_" x1="15.2363" x2="11.0764" y1="27.9727" y2="27.9727">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.8364" style="stop-color:#C5CFD2"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+ <stop offset="0" style="stop-color:#E4EBED"/>
+ <stop offset="0.8364" style="stop-color:#C5CFD2"/>
+ <stop offset="0.9758" style="stop-color:#D2D9DB"/>
</linearGradient>
<path d="M11.568,30.032c-0.283,0-0.514-0.231-0.514-0.516v-3.088c0-0.286,0.23-0.516,0.514-0.516h3.088 c0.286,0,0.516,0.229,0.516,0.516v3.088c0,0.284-0.229,0.516-0.516,0.516H11.568z" fill="url(#SVGID_32_)"/>
-<path d="M21.865,30.073c0,0.569-0.462,1.03-1.03,1.03h-3.088c-0.569,0-1.031-0.461-1.031-1.03v-3.088 c0-0.568,0.462-1.029,1.031-1.029h3.088c0.568,0,1.03,0.461,1.03,1.029V30.073z" fill-opacity="0.25" stroke-opacity="0.25"/>
+<path d="M21.865,30.073c0,0.569-0.462,1.03-1.03,1.03h-3.088c-0.569,0-1.031-0.461-1.031-1.03v-3.088 c0-0.568,0.462-1.029,1.031-1.029h3.088c0.568,0,1.03,0.461,1.03,1.029V30.073z" opacity="0.25"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_33_" x1="19.291" x2="19.291" y1="25.375" y2="30.5705">
-<stop offset="0" style="stop-color:#ECF4F8"/>
-<stop offset="0.7939" style="stop-color:#A0A6A7"/>
-<stop offset="1" style="stop-color:#CEDBE0"/>
+ <stop offset="0" style="stop-color:#ECF4F8"/>
+ <stop offset="0.7939" style="stop-color:#A0A6A7"/>
+ <stop offset="1" style="stop-color:#CEDBE0"/>
</linearGradient>
<path d="M21.865,29.517c0,0.568-0.462,1.029-1.03,1.029h-3.088c-0.569,0-1.031-0.461-1.031-1.029v-3.088 c0-0.569,0.462-1.03,1.031-1.03h3.088c0.568,0,1.03,0.461,1.03,1.03V29.517z" fill="url(#SVGID_33_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_34_" x1="21.4141" x2="17.2541" y1="27.9727" y2="27.9727">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.8364" style="stop-color:#C5CFD2"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+ <stop offset="0" style="stop-color:#E4EBED"/>
+ <stop offset="0.8364" style="stop-color:#C5CFD2"/>
+ <stop offset="0.9758" style="stop-color:#D2D9DB"/>
</linearGradient>
<path d="M17.747,30.032c-0.284,0-0.515-0.231-0.515-0.516v-3.088c0-0.286,0.23-0.516,0.515-0.516h3.088 c0.284,0,0.515,0.229,0.515,0.516v3.088c0,0.284-0.23,0.516-0.515,0.516H17.747z" fill="url(#SVGID_34_)"/>
-<path d="M28.042,30.073c0,0.569-0.46,1.03-1.028,1.03h-3.091c-0.567,0-1.028-0.461-1.028-1.03v-3.088 c0-0.568,0.461-1.029,1.028-1.029h3.091c0.568,0,1.028,0.461,1.028,1.029V30.073z" fill-opacity="0.25" stroke-opacity="0.25"/>
+<path d="M28.042,30.073c0,0.569-0.46,1.03-1.028,1.03h-3.091c-0.567,0-1.028-0.461-1.028-1.03v-3.088 c0-0.568,0.461-1.029,1.028-1.029h3.091c0.568,0,1.028,0.461,1.028,1.029V30.073z" opacity="0.25"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_35_" x1="25.4688" x2="25.4688" y1="25.375" y2="30.5705">
-<stop offset="0" style="stop-color:#ECF4F8"/>
-<stop offset="0.7939" style="stop-color:#A0A6A7"/>
-<stop offset="1" style="stop-color:#CEDBE0"/>
+ <stop offset="0" style="stop-color:#ECF4F8"/>
+ <stop offset="0.7939" style="stop-color:#A0A6A7"/>
+ <stop offset="1" style="stop-color:#CEDBE0"/>
</linearGradient>
<path d="M28.042,29.517c0,0.568-0.46,1.029-1.028,1.029h-3.091c-0.567,0-1.028-0.461-1.028-1.029v-3.088 c0-0.569,0.461-1.03,1.028-1.03h3.091c0.568,0,1.028,0.461,1.028,1.03V29.517z" fill="url(#SVGID_35_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_36_" x1="27.5918" x2="23.4309" y1="27.9727" y2="27.9727">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.8364" style="stop-color:#C5CFD2"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+ <stop offset="0" style="stop-color:#E4EBED"/>
+ <stop offset="0.8364" style="stop-color:#C5CFD2"/>
+ <stop offset="0.9758" style="stop-color:#D2D9DB"/>
</linearGradient>
<path d="M23.923,30.032c-0.283,0-0.514-0.231-0.514-0.516v-3.088c0-0.286,0.23-0.516,0.514-0.516h3.091 c0.283,0,0.514,0.229,0.514,0.516v3.088c0,0.284-0.23,0.516-0.514,0.516H23.923z" fill="url(#SVGID_36_)"/>
-<path d="M34.284,30.073c0,0.569-0.46,1.03-1.029,1.03h-3.09c-0.566,0-1.028-0.461-1.028-1.03v-3.088 c0-0.568,0.462-1.029,1.028-1.029h3.09c0.569,0,1.029,0.461,1.029,1.029V30.073z" fill-opacity="0.25" stroke-opacity="0.25"/>
+<path d="M34.284,30.073c0,0.569-0.46,1.03-1.029,1.03h-3.09c-0.566,0-1.028-0.461-1.028-1.03v-3.088 c0-0.568,0.462-1.029,1.028-1.029h3.09c0.569,0,1.029,0.461,1.029,1.029V30.073z" opacity="0.25"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_37_" x1="31.7109" x2="31.7109" y1="25.375" y2="30.5705">
-<stop offset="0" style="stop-color:#ECF4F8"/>
-<stop offset="0.7939" style="stop-color:#A0A6A7"/>
-<stop offset="1" style="stop-color:#CEDBE0"/>
+ <stop offset="0" style="stop-color:#ECF4F8"/>
+ <stop offset="0.7939" style="stop-color:#A0A6A7"/>
+ <stop offset="1" style="stop-color:#CEDBE0"/>
</linearGradient>
<path d="M34.284,29.517c0,0.568-0.46,1.029-1.029,1.029h-3.09c-0.566,0-1.028-0.461-1.028-1.029v-3.088 c0-0.569,0.462-1.03,1.028-1.03h3.09c0.569,0,1.029,0.461,1.029,1.03V29.517z" fill="url(#SVGID_37_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_38_" x1="33.834" x2="29.6721" y1="27.9727" y2="27.9727">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.8364" style="stop-color:#C5CFD2"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+ <stop offset="0" style="stop-color:#E4EBED"/>
+ <stop offset="0.8364" style="stop-color:#C5CFD2"/>
+ <stop offset="0.9758" style="stop-color:#D2D9DB"/>
</linearGradient>
<path d="M30.165,30.032c-0.283,0-0.515-0.231-0.515-0.516v-3.088c0-0.286,0.231-0.516,0.515-0.516h3.09 c0.283,0,0.515,0.229,0.515,0.516v3.088c0,0.284-0.231,0.516-0.515,0.516H30.165z" fill="url(#SVGID_38_)"/>
-<path d="M40.482,30.073c0,0.569-0.46,1.03-1.028,1.03h-3.089c-0.57,0-1.03-0.461-1.03-1.03v-3.088 c0-0.568,0.46-1.029,1.03-1.029h3.089c0.568,0,1.028,0.461,1.028,1.029V30.073z" fill-opacity="0.25" stroke-opacity="0.25"/>
+<path d="M40.482,30.073c0,0.569-0.46,1.03-1.028,1.03h-3.089c-0.57,0-1.03-0.461-1.03-1.03v-3.088 c0-0.568,0.46-1.029,1.03-1.029h3.089c0.568,0,1.028,0.461,1.028,1.029V30.073z" opacity="0.25"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_39_" x1="37.9082" x2="37.9082" y1="25.375" y2="30.5705">
-<stop offset="0" style="stop-color:#ECF4F8"/>
-<stop offset="0.7939" style="stop-color:#A0A6A7"/>
-<stop offset="1" style="stop-color:#CEDBE0"/>
+ <stop offset="0" style="stop-color:#ECF4F8"/>
+ <stop offset="0.7939" style="stop-color:#A0A6A7"/>
+ <stop offset="1" style="stop-color:#CEDBE0"/>
</linearGradient>
<path d="M40.482,29.517c0,0.568-0.46,1.029-1.028,1.029h-3.089c-0.57,0-1.03-0.461-1.03-1.029v-3.088 c0-0.569,0.46-1.03,1.03-1.03h3.089c0.568,0,1.028,0.461,1.028,1.03V29.517z" fill="url(#SVGID_39_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_40_" x1="40.0332" x2="35.8713" y1="27.9727" y2="27.9727">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.8364" style="stop-color:#C5CFD2"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+ <stop offset="0" style="stop-color:#E4EBED"/>
+ <stop offset="0.8364" style="stop-color:#C5CFD2"/>
+ <stop offset="0.9758" style="stop-color:#D2D9DB"/>
</linearGradient>
<path d="M36.365,30.032c-0.285,0-0.516-0.231-0.516-0.516v-3.088c0-0.286,0.23-0.516,0.516-0.516h3.089 c0.283,0,0.515,0.229,0.515,0.516v3.088c0,0.284-0.231,0.516-0.515,0.516H36.365z" fill="url(#SVGID_40_)"/>
-<path d="M55.637,36.123c0,0.568-0.461,1.029-1.029,1.029h-12c-0.57,0-1.03-0.461-1.03-1.029v-3.088 c0-0.569,0.46-1.03,1.03-1.03h12c0.568,0,1.029,0.461,1.029,1.03V36.123z" fill-opacity="0.25" stroke-opacity="0.25"/>
+<path d="M55.637,36.123c0,0.568-0.461,1.029-1.029,1.029h-12c-0.57,0-1.03-0.461-1.03-1.029v-3.088 c0-0.569,0.46-1.03,1.03-1.03h12c0.568,0,1.029,0.461,1.029,1.03V36.123z" opacity="0.25"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_41_" x1="48.6074" x2="48.6074" y1="25.4102" y2="36.5772">
-<stop offset="0" style="stop-color:#ECF4F8"/>
-<stop offset="0.7939" style="stop-color:#A0A6A7"/>
-<stop offset="1" style="stop-color:#CEDBE0"/>
+ <stop offset="0" style="stop-color:#ECF4F8"/>
+ <stop offset="0.7939" style="stop-color:#A0A6A7"/>
+ <stop offset="1" style="stop-color:#CEDBE0"/>
</linearGradient>
<path d="M54.608,25.398h-3.088c-0.571,0-1.03,0.461-1.03,1.03v5.02h-7.883c-0.57,0-1.03,0.461-1.03,1.029 v3.088c0,0.568,0.46,1.03,1.03,1.03h12c0.568,0,1.029-0.462,1.029-1.03v-9.137C55.637,25.859,55.178,25.398,54.608,25.398z" fill="url(#SVGID_41_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_42_" x1="48.6074" x2="48.6074" y1="25.8818" y2="36.0711">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.8364" style="stop-color:#C5CFD2"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+ <stop offset="0" style="stop-color:#E4EBED"/>
+ <stop offset="0.8364" style="stop-color:#C5CFD2"/>
+ <stop offset="0.9758" style="stop-color:#D2D9DB"/>
</linearGradient>
<path d="M54.608,25.913h-3.088c-0.285,0-0.517,0.229-0.517,0.516v5.533h-8.396 c-0.285,0-0.517,0.23-0.517,0.516v3.088c0,0.284,0.231,0.516,0.517,0.516h12c0.284,0,0.516-0.231,0.516-0.516v-9.137 C55.123,26.143,54.892,25.913,54.608,25.913z" fill="url(#SVGID_42_)"/>
-<path d="M21.949,42.235c0,0.568-0.459,1.03-1.028,1.03h-3.089c-0.567,0-1.029-0.462-1.029-1.03v-3.088 c0-0.568,0.462-1.031,1.029-1.031h3.089c0.569,0,1.028,0.463,1.028,1.031V42.235z" fill-opacity="0.25" stroke-opacity="0.25"/>
+<path d="M21.949,42.235c0,0.568-0.459,1.03-1.028,1.03h-3.089c-0.567,0-1.029-0.462-1.029-1.03v-3.088 c0-0.568,0.462-1.031,1.029-1.031h3.089c0.569,0,1.028,0.463,1.028,1.031V42.235z" opacity="0.25"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_43_" x1="19.376" x2="19.376" y1="37.5371" y2="42.7326">
-<stop offset="0" style="stop-color:#ECF4F8"/>
-<stop offset="0.7939" style="stop-color:#A0A6A7"/>
-<stop offset="1" style="stop-color:#CEDBE0"/>
+ <stop offset="0" style="stop-color:#ECF4F8"/>
+ <stop offset="0.7939" style="stop-color:#A0A6A7"/>
+ <stop offset="1" style="stop-color:#CEDBE0"/>
</linearGradient>
<path d="M21.949,41.679c0,0.568-0.459,1.029-1.028,1.029h-3.089c-0.567,0-1.029-0.461-1.029-1.029v-3.09 c0-0.567,0.462-1.028,1.029-1.028h3.089c0.569,0,1.028,0.461,1.028,1.028V41.679z" fill="url(#SVGID_43_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_44_" x1="21.5" x2="17.3381" y1="40.1343" y2="40.1343">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.8364" style="stop-color:#C5CFD2"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+ <stop offset="0" style="stop-color:#E4EBED"/>
+ <stop offset="0.8364" style="stop-color:#C5CFD2"/>
+ <stop offset="0.9758" style="stop-color:#D2D9DB"/>
</linearGradient>
<path d="M17.832,42.192c-0.284,0-0.516-0.229-0.516-0.514v-3.09c0-0.284,0.231-0.513,0.516-0.513h3.089 c0.283,0,0.515,0.229,0.515,0.513v3.09c0,0.284-0.231,0.514-0.515,0.514H17.832z" fill="url(#SVGID_44_)"/>
-<path d="M15.73,42.235c0,0.568-0.462,1.03-1.031,1.03h-3.088c-0.568,0-1.028-0.462-1.028-1.03v-3.088 c0-0.568,0.46-1.031,1.028-1.031h3.088c0.569,0,1.031,0.463,1.031,1.031V42.235z" fill-opacity="0.25" stroke-opacity="0.25"/>
+<path d="M15.73,42.235c0,0.568-0.462,1.03-1.031,1.03h-3.088c-0.568,0-1.028-0.462-1.028-1.03v-3.088 c0-0.568,0.46-1.031,1.028-1.031h3.088c0.569,0,1.031,0.463,1.031,1.031V42.235z" opacity="0.25"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_45_" x1="13.1563" x2="13.1563" y1="37.5371" y2="42.7326">
-<stop offset="0" style="stop-color:#ECF4F8"/>
-<stop offset="0.7939" style="stop-color:#A0A6A7"/>
-<stop offset="1" style="stop-color:#CEDBE0"/>
+ <stop offset="0" style="stop-color:#ECF4F8"/>
+ <stop offset="0.7939" style="stop-color:#A0A6A7"/>
+ <stop offset="1" style="stop-color:#CEDBE0"/>
</linearGradient>
<path d="M15.73,41.679c0,0.568-0.462,1.029-1.031,1.029h-3.088c-0.568,0-1.028-0.461-1.028-1.029v-3.09 c0-0.567,0.46-1.028,1.028-1.028h3.088c0.569,0,1.031,0.461,1.031,1.028V41.679z" fill="url(#SVGID_45_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_46_" x1="15.2793" x2="11.1194" y1="40.1343" y2="40.1343">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.8364" style="stop-color:#C5CFD2"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+ <stop offset="0" style="stop-color:#E4EBED"/>
+ <stop offset="0.8364" style="stop-color:#C5CFD2"/>
+ <stop offset="0.9758" style="stop-color:#D2D9DB"/>
</linearGradient>
<path d="M11.611,42.192c-0.283,0-0.514-0.229-0.514-0.514v-3.09c0-0.284,0.23-0.513,0.514-0.513h3.088 c0.286,0,0.516,0.229,0.516,0.513v3.09c0,0.284-0.229,0.514-0.516,0.514H11.611z" fill="url(#SVGID_46_)"/>
-<path d="M9.51,42.235c0,0.568-0.461,1.03-1.029,1.03H5.393c-0.57,0-1.031-0.462-1.031-1.03v-3.088 c0-0.568,0.461-1.031,1.031-1.031H8.48c0.568,0,1.029,0.463,1.029,1.031V42.235z" fill-opacity="0.25" stroke-opacity="0.25"/>
+<path d="M9.51,42.235c0,0.568-0.461,1.03-1.029,1.03H5.393c-0.57,0-1.031-0.462-1.031-1.03v-3.088 c0-0.568,0.461-1.031,1.031-1.031H8.48c0.568,0,1.029,0.463,1.029,1.031V42.235z" opacity="0.25"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_47_" x1="6.9355" x2="6.9355" y1="37.5371" y2="42.7326">
-<stop offset="0" style="stop-color:#ECF4F8"/>
-<stop offset="0.7939" style="stop-color:#A0A6A7"/>
-<stop offset="1" style="stop-color:#CEDBE0"/>
+ <stop offset="0" style="stop-color:#ECF4F8"/>
+ <stop offset="0.7939" style="stop-color:#A0A6A7"/>
+ <stop offset="1" style="stop-color:#CEDBE0"/>
</linearGradient>
<path d="M9.51,41.679c0,0.568-0.461,1.029-1.029,1.029H5.393c-0.57,0-1.031-0.461-1.031-1.029v-3.09 c0-0.567,0.461-1.028,1.031-1.028H8.48c0.568,0,1.029,0.461,1.029,1.028V41.679z" fill="url(#SVGID_47_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_48_" x1="9.0596" x2="4.8987" y1="40.1343" y2="40.1343">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.8364" style="stop-color:#C5CFD2"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+ <stop offset="0" style="stop-color:#E4EBED"/>
+ <stop offset="0.8364" style="stop-color:#C5CFD2"/>
+ <stop offset="0.9758" style="stop-color:#D2D9DB"/>
</linearGradient>
<path d="M5.393,42.192c-0.285,0-0.516-0.229-0.516-0.514v-3.09c0-0.284,0.23-0.513,0.516-0.513H8.48 c0.283,0,0.515,0.229,0.515,0.513v3.09c0,0.284-0.231,0.514-0.515,0.514H5.393z" fill="url(#SVGID_48_)"/>
-<path d="M49.557,42.235c0,0.568-0.463,1.03-1.03,1.03h-3.089c-0.568,0-1.028-0.462-1.028-1.03v-3.088 c0-0.568,0.46-1.031,1.028-1.031h3.089c0.567,0,1.03,0.463,1.03,1.031V42.235z" fill-opacity="0.25" stroke-opacity="0.25"/>
+<path d="M49.557,42.235c0,0.568-0.463,1.03-1.03,1.03h-3.089c-0.568,0-1.028-0.462-1.028-1.03v-3.088 c0-0.568,0.46-1.031,1.028-1.031h3.089c0.567,0,1.03,0.463,1.03,1.031V42.235z" opacity="0.25"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_49_" x1="46.9824" x2="46.9824" y1="37.5371" y2="42.7326">
-<stop offset="0" style="stop-color:#ECF4F8"/>
-<stop offset="0.7939" style="stop-color:#A0A6A7"/>
-<stop offset="1" style="stop-color:#CEDBE0"/>
+ <stop offset="0" style="stop-color:#ECF4F8"/>
+ <stop offset="0.7939" style="stop-color:#A0A6A7"/>
+ <stop offset="1" style="stop-color:#CEDBE0"/>
</linearGradient>
<path d="M49.557,41.679c0,0.568-0.463,1.029-1.03,1.029h-3.089c-0.568,0-1.028-0.461-1.028-1.029v-3.09 c0-0.567,0.46-1.028,1.028-1.028h3.089c0.567,0,1.03,0.461,1.03,1.028V41.679z" fill="url(#SVGID_49_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_50_" x1="49.1064" x2="44.9445" y1="40.1343" y2="40.1343">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.8364" style="stop-color:#C5CFD2"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+ <stop offset="0" style="stop-color:#E4EBED"/>
+ <stop offset="0.8364" style="stop-color:#C5CFD2"/>
+ <stop offset="0.9758" style="stop-color:#D2D9DB"/>
</linearGradient>
<path d="M45.438,42.192c-0.283,0-0.515-0.229-0.515-0.514v-3.09c0-0.284,0.231-0.513,0.515-0.513h3.089 c0.284,0,0.516,0.229,0.516,0.513v3.09c0,0.284-0.231,0.514-0.516,0.514H45.438z" fill="url(#SVGID_50_)"/>
-<path d="M55.637,42.235c0,0.568-0.461,1.03-1.029,1.03h-3.089c-0.569,0-1.028-0.462-1.028-1.03v-3.088 c0-0.568,0.459-1.031,1.028-1.031h3.089c0.568,0,1.029,0.463,1.029,1.031V42.235z" fill-opacity="0.25" stroke-opacity="0.25"/>
+<path d="M55.637,42.235c0,0.568-0.461,1.03-1.029,1.03h-3.089c-0.569,0-1.028-0.462-1.028-1.03v-3.088 c0-0.568,0.459-1.031,1.028-1.031h3.089c0.568,0,1.029,0.463,1.029,1.031V42.235z" opacity="0.25"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_51_" x1="53.0635" x2="53.0635" y1="37.5371" y2="42.7326">
-<stop offset="0" style="stop-color:#ECF4F8"/>
-<stop offset="0.7939" style="stop-color:#A0A6A7"/>
-<stop offset="1" style="stop-color:#CEDBE0"/>
+ <stop offset="0" style="stop-color:#ECF4F8"/>
+ <stop offset="0.7939" style="stop-color:#A0A6A7"/>
+ <stop offset="1" style="stop-color:#CEDBE0"/>
</linearGradient>
<path d="M55.637,41.679c0,0.568-0.461,1.029-1.029,1.029h-3.089c-0.569,0-1.028-0.461-1.028-1.029v-3.09 c0-0.567,0.459-1.028,1.028-1.028h3.089c0.568,0,1.029,0.461,1.029,1.028V41.679z" fill="url(#SVGID_51_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_52_" x1="55.1875" x2="51.0256" y1="40.1343" y2="40.1343">
-<stop offset="0" style="stop-color:#E4EBED"/>
-<stop offset="0.8364" style="stop-color:#C5CFD2"/>
-<stop offset="0.9758" style="stop-color:#D2D9DB"/>
-<stop offset="1" style="stop-color:#D2D9DB"/>
+ <stop offset="0" style="stop-color:#E4EBED"/>
+ <stop offset="0.8364" style="stop-color:#C5CFD2"/>
+ <stop offset="0.9758" style="stop-color:#D2D9DB"/>
</linearGradient>
<path d="M51.519,42.192c-0.283,0-0.515-0.229-0.515-0.514v-3.09c0-0.284,0.231-0.513,0.515-0.513h3.089 c0.284,0,0.516,0.229,0.516,0.513v3.09c0,0.284-0.231,0.514-0.516,0.514H51.519z" fill="url(#SVGID_52_)"/>
-<path d="M43.314,42.172c0,0.569-0.462,1.028-1.029,1.028H23.752c-0.567,0-1.029-0.459-1.029-1.028v-3.089 c0-0.568,0.462-1.029,1.029-1.029h18.533c0.567,0,1.029,0.461,1.029,1.029V42.172z" fill-opacity="0.25" stroke-opacity="0.25"/>
+<path d="M43.314,42.172c0,0.569-0.462,1.028-1.029,1.028H23.752c-0.567,0-1.029-0.459-1.029-1.028v-3.089 c0-0.568,0.462-1.029,1.029-1.029h18.533c0.567,0,1.029,0.461,1.029,1.029V42.172z" opacity="0.25"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_53_" x1="33.0186" x2="33.0186" y1="37.4727" y2="42.6681">
-<stop offset="0" style="stop-color:#8C8C8C"/>
-<stop offset="1" style="stop-color:#2E2E2E"/>
+ <stop offset="0" style="stop-color:#8C8C8C"/>
+ <stop offset="1" style="stop-color:#2E2E2E"/>
</linearGradient>
<path d="M43.314,41.613c0,0.57-0.462,1.03-1.029,1.03H23.752c-0.567,0-1.029-0.46-1.029-1.03v-3.089 c0-0.567,0.462-1.028,1.029-1.028h18.533c0.567,0,1.029,0.461,1.029,1.028V41.613z" fill="url(#SVGID_53_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_54_" x1="33.0186" x2="33.0186" y1="37.9102" y2="42.3335">
-<stop offset="0" style="stop-color:#686868"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#686868"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
<path d="M23.752,42.129c-0.284,0-0.516-0.231-0.516-0.516v-3.089c0-0.283,0.231-0.515,0.516-0.515h18.533 c0.284,0,0.516,0.231,0.516,0.515v3.089c0,0.284-0.231,0.516-0.516,0.516H23.752z" fill="url(#SVGID_54_)"/>
<rect fill="none" height="60" width="60"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_language.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_language.svg Fri May 14 16:09:54 2010 +0300
@@ -1,104 +1,87 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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">
-<stop offset="0" style="stop-color:#004E8C"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+<defs>
+</defs>
+<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"/>
+ <stop offset="0.3818" style="stop-color:#FFFFFF"/>
+ <stop offset="0.7091" style="stop-color:#686E70"/>
+ <stop offset="1" style="stop-color:#A6B0B3"/>
+</linearGradient>
+<rect fill="url(#SVGID_1_)" height="27.067" width="3.765" x="3.311" y="30.933"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="2.3691" x2="8.0166" y1="29.7603" y2="29.7603">
+ <stop offset="0" style="stop-color:#A8B1B3"/>
+ <stop offset="0.3818" style="stop-color:#FFFFFF"/>
+ <stop offset="0.7091" style="stop-color:#686E70"/>
+ <stop offset="1" style="stop-color:#A6B0B3"/>
</linearGradient>
-<path d="M57.998,30.001C57.998,45.464,45.461,58,30,58C14.535,58,1.998,45.464,1.998,30.001 C1.998,14.54,14.535,2,30,2C45.461,2,57.998,14.54,57.998,30.001z" fill="url(#SVGID_1_)"/>
-<radialGradient cx="26.9434" cy="12.7056" gradientTransform="matrix(0.9953 0 0 0.9952 2.7861 7.6702)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="33.8669">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
-</radialGradient>
-<circle cx="29.999" cy="30.001" fill="url(#SVGID_2_)" r="27.282"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="29.999" x2="29.999" y1="2.4785" y2="57.4196">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#88D6EB"/>
+<rect fill="url(#SVGID_2_)" height="2.346" width="5.647" x="2.369" y="28.587"/>
+<rect height="0.471" opacity="0.4" width="3.765" x="3.311" y="30.933"/>
+<rect height="0.471" opacity="0.1" width="3.765" x="3.311" y="57.529"/>
+<rect height="0.471" opacity="0.2" width="3.765" x="3.311" y="31.404"/>
+<rect height="0.471" opacity="0.1" width="3.765" x="3.311" y="31.875"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="7.0752" x2="28.6899" y1="41.8154" y2="41.8154">
+ <stop offset="0" style="stop-color:#1A5FCC"/>
+ <stop offset="0.1697" style="stop-color:#3492E9"/>
+ <stop offset="0.4" style="stop-color:#195BCB"/>
+ <stop offset="0.7455" style="stop-color:#389AED"/>
+ <stop offset="1" style="stop-color:#1E65D0"/>
</linearGradient>
-<path d="M30,2.718c-15.066,0-27.283,12.218-27.283,27.283c0,15.069,12.217,27.28,27.283,27.28 c15.07,0,27.281-12.211,27.281-27.28C57.281,14.937,45.07,2.718,30,2.718z M30,54.894c-14.166,0-25.691-11.524-25.691-25.688 C4.309,15.04,15.834,3.515,30,3.515S55.689,15.04,55.689,29.206C55.689,43.37,44.166,54.894,30,54.894z" fill="url(#SVGID_3_)" fill-opacity="0.3" stroke-opacity="0.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="3.1621" x2="7.498" y1="33.7139" y2="33.7139">
-<stop offset="0" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#000000"/>
+<path d="M7.075,31.404c0,0,7.318-0.909,9.905,1.303c4.323,3.695,8.959,3.246,11.709,2.859v16.748 c0,0-9.091,0.707-12.707-1.705c-2.198-1.465-8.908-0.969-8.908-0.969V31.404z" fill="url(#SVGID_3_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="23.3271" x2="44.9414" y1="15.1758" y2="15.1758">
+ <stop offset="0" style="stop-color:#398F0D"/>
+ <stop offset="0.1636" style="stop-color:#7BC84C"/>
+ <stop offset="0.4" style="stop-color:#388E0D"/>
+ <stop offset="0.7818" style="stop-color:#7AC943"/>
+ <stop offset="1" style="stop-color:#3E930E"/>
</linearGradient>
-<path d="M5.277,29.556C4.988,29.17,4.332,29.17,4.041,29.17c-0.57,0-0.873,0.406-0.879,0.804 v0.028v0.041c0,0.702,0.039,1.489,0.123,2.446c0.018,0.179,0.039,0.36,0.061,0.54l0.033,0.263c0.072,0.566,0.158,1.125,0.256,1.665 l0.043,0.237c0.043,0.213,0.084,0.424,0.129,0.633c0.117,0.53,0.26,1.08,0.434,1.687c0.025,0.087,0.049,0.175,0.07,0.26 c0.039,0.142,0.076,0.283,0.121,0.419l0.004,0.02l0.016,0.043c-0.002-0.011-0.01-0.03-0.012-0.048l1.564-0.106 c0.025-0.243,0.033-0.497,0.025-0.751C6.016,36.956,6,36.467,5.889,36.056l1.455-1.951l0.154-0.213v-0.264v-1.52v-0.331 l-0.232-0.232L5.277,29.556z" fill="url(#SVGID_4_)" fill-opacity="0.3" stroke-opacity="0.3"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="11.5254" x2="56.9043" y1="25.7695" y2="25.7695">
-<stop offset="0" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#000000"/>
+<path d="M23.327,4.764c0,0,7.318-0.906,9.903,1.304c4.324,3.694,8.959,3.246,11.711,2.858v16.75 c0,0-9.092,0.707-12.707-1.706c-2.197-1.467-8.907-0.968-8.907-0.968V4.764z" fill="url(#SVGID_4_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="19.5459" x2="23.3105" y1="18.2319" y2="18.2319">
+ <stop offset="0" style="stop-color:#A8B1B3"/>
+ <stop offset="0.3818" style="stop-color:#FFFFFF"/>
+ <stop offset="0.7091" style="stop-color:#686E70"/>
+ <stop offset="1" style="stop-color:#A6B0B3"/>
+</linearGradient>
+<rect fill="url(#SVGID_5_)" height="27.774" width="3.765" x="19.546" y="4.345"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="18.6045" x2="24.252" y1="3.1724" y2="3.1724">
+ <stop offset="0" style="stop-color:#A8B1B3"/>
+ <stop offset="0.3818" style="stop-color:#FFFFFF"/>
+ <stop offset="0.7091" style="stop-color:#686E70"/>
+ <stop offset="1" style="stop-color:#A6B0B3"/>
</linearGradient>
-<path d="M56.896,24.654c-0.02-0.103-0.039-0.176-0.057-0.25 c-0.016-0.055-0.027-0.109-0.037-0.162c-0.141-0.646-0.313-1.314-0.514-1.994l-0.023-0.074c-0.041-0.153-0.086-0.306-0.135-0.457 c-0.248-0.767-0.514-1.5-0.797-2.177c-0.035-0.085-0.074-0.163-0.109-0.245l-0.059-0.131c-0.268-0.619-0.568-1.238-0.883-1.833 l-0.041-0.077c-0.061-0.117-0.119-0.236-0.184-0.353c-0.385-0.695-0.789-1.358-1.199-1.974c-0.043-0.065-0.092-0.134-0.141-0.202 c-0.031-0.041-0.059-0.081-0.086-0.121c-0.395-0.571-0.807-1.126-1.236-1.656l-0.084-0.106c-0.059-0.071-0.115-0.146-0.176-0.218 c-0.498-0.596-1.023-1.174-1.566-1.72c-0.072-0.074-0.152-0.15-0.23-0.226l-0.064-0.062c-0.49-0.481-1.01-0.956-1.547-1.402 l-0.104-0.091c-0.055-0.048-0.107-0.096-0.164-0.139c-0.582-0.48-1.215-0.952-1.875-1.405c-0.08-0.055-0.164-0.109-0.248-0.162 l-0.1-0.066c-0.594-0.393-1.213-0.77-1.834-1.114l-0.098-0.055c-0.051-0.029-0.102-0.059-0.152-0.088 c-0.693-0.371-1.414-0.72-2.146-1.035L40.82,4.985l-0.199-0.083c-0.193-0.079-0.387-0.147-0.578-0.215 c-0.102-0.035-0.199-0.069-0.299-0.104l-0.371-0.138l-0.33,0.212c-0.223,0.14-1.098,0.64-1.613,0.934 c-0.574-0.077-1.961-0.251-3.359-0.386c0.432-0.042,1.025-0.09,1.869-0.146l0.117-1.573L35.994,3.47 c-0.051-0.014-0.102-0.025-0.152-0.037L35.723,3.41l-0.098-0.02c-0.857-0.172-1.662-0.297-2.461-0.38L33.16,3.009l-0.109-0.01 c-0.914-0.093-1.844-0.139-2.762-0.139c-0.809,0-1.648,0.042-2.564,0.13c-0.145,0.013-0.281,0.029-0.422,0.043 c-0.906,0.101-1.697,0.221-2.447,0.373L24.83,3.411l-0.018,0.003c-0.789,0.163-1.582,0.367-2.428,0.624 c-0.074,0.022-0.15,0.048-0.227,0.071l-0.17,0.056c-0.713,0.23-1.412,0.485-2.084,0.762c-0.057,0.023-0.094,0.037-0.131,0.051 l-0.102,0.041c-0.738,0.314-1.475,0.668-2.205,1.06c-0.078,0.041-0.156,0.087-0.232,0.13l-0.094,0.055 c-0.205,0.113-0.412,0.242-0.617,0.37L16.258,6.8l-1.461,0.893l1.623,0.542c0.242,0.082,0.504,0.123,0.773,0.123 c0.875,0,1.721-0.43,2.402-0.776c0.273-0.138,0.678-0.344,0.848-0.376c0.199,0.06,0.396,0.089,0.596,0.089 c0.746,0,1.354-0.401,1.893-0.754l0.145-0.094c0.174-0.057,0.473-0.167,1.07-0.391c0.607-0.229,1.717-0.645,2.01-0.715 c0.578-0.006,1.264-0.088,1.752-0.392c0.459,0.075,1.273,0.204,2.115,0.314C29.961,5.301,29.9,5.341,29.85,5.391 c-0.273,0.251-1.742,0.696-2.195,0.755c-0.848,0.106-1.186,0.532-1.322,0.871c-0.176,0.439-0.068,0.878,0.104,1.235 c-0.32,0.212-0.713,0.448-1.049,0.625c0-0.007,0.002-0.015,0.004-0.024c0.121-0.675,0.209-1.163-0.119-1.556 c-0.166-0.2-0.414-0.314-0.676-0.314c-0.387,0-0.688,0.239-0.93,0.473c-0.68,0.656-1.09,1.476-1.246,1.783l-0.027,0.059 l-0.025,0.044c-0.293,0.563-0.414,0.962-0.25,2.207c-0.074,0.051-0.287,0.132-0.582,0.132c-0.041,0-0.076-0.002-0.105-0.005 c-0.191-0.205-0.453-0.322-0.752-0.322l0,0c-0.684,0-1.619,0.771-2.773,2.292l-0.371,0.49l0.377,0.484l0.354,0.449 c-5.51,4.257-5.551,4.5-5.609,4.855c-0.01,0.032-0.057,0.18-0.123,0.383c-0.822,2.552-1.275,4.46-0.834,5.482 c1.025,2.368,2.182,4.579,3.68,4.701c0.133,0.011,0.277,0.017,0.434,0.017c1.373,0,3.6-0.416,4.668-0.635 c0.197,0.371,0.436,0.804,0.568,1.04l0.238,0.421l0.484-0.016c0,0,0.26-0.008,0.584-0.008c0.375,0,0.625,0.011,0.787,0.022 c0.584,1.708,1.699,5.643,1.492,6.459l-0.004,0.004c-1.885,2.821,0.4,6.499,1.494,8.269c0.088,0.14,0.168,0.266,0.232,0.374 c0.424,1.204,0.934,2.002,2.02,2.002c0.078,0,0.16-0.005,0.244-0.009c0.063-0.004,0.125-0.007,0.191-0.007 c0.121,0,0.207,0.014,0.293,0.045l0.1,0.036l0.105,0.01c0.205,0.017,0.4,0.045,0.592,0.071c0.334,0.047,0.68,0.095,1.031,0.095 c0.941,0,1.689-0.357,2.336-1.119c0.021-0.004,0.045-0.005,0.068-0.008c0.678-0.095,0.932-0.433,1.018-0.737 c0.051-0.05,0.117-0.112,0.172-0.164c0.268-0.244,0.584-0.537,0.803-0.88c0.1-0.059,0.213-0.125,0.338-0.2 c0.219-0.134,0.465-0.283,0.658-0.382c0.172-0.052,0.322-0.153,0.436-0.293c0.273-0.335,0.217-0.717,0.172-1.023 c-0.047-0.318-0.092-0.642,0.078-0.99c0.965-0.465,2.68-1.608,2.957-1.796v0.022c-0.02,0.153-0.064,0.563-0.133,0.822 c-0.363,0.366-0.67,0.919-0.766,1.105l-0.063,0.121l-0.02,0.137c-0.023,0.18-0.123,1.11,0.4,1.712 c0.264,0.301,0.641,0.468,1.063,0.468c0.131,0,0.271-0.017,0.416-0.05c1.342-0.304,3.723-3.531,3.916-5.312 c0.096-0.859-0.24-1.534-0.918-1.852l-0.506-0.24l-0.398,0.396l-1.469,1.471c-0.498,0.046-0.887,0.193-1.148,0.425 c0.016-0.627-0.047-1.27-0.113-1.896c-0.201-1.891-0.24-3.097,0.92-3.915l0.059-0.043l0.051-0.051 c0.418-0.426,0.883-0.799,1.373-1.193c1.15-0.924,2.34-1.878,3.047-3.604l0.031-0.074c0.227-0.59,0.568-1.478,0.104-2.158 c-0.115-0.167-0.359-0.426-0.814-0.518c0.604-0.242,1.066-0.435,1.111-0.452l0.141-0.059l0.109-0.104l2.48-2.381l0.363-0.35 l-0.16-0.479c-0.021-0.062-0.158-0.438-0.537-0.977c0.725,0.099,1.344,0.272,1.549,0.427c0.074,0.163,0.221,0.519,0.379,0.892 c2.732,6.435,3.115,6.766,3.824,6.777c0.027,0,0.049,0.002,0.066,0.005c0.057,0.002,0.109,0.006,0.156,0.006 c0.404,0,0.635-0.207,0.736-0.331c0.297-0.357,0.215-0.795,0.184-0.959l-0.012-0.056c-0.033-0.384-0.012-2.113,0.045-3.536 c0.004,0.004,0.006,0.008,0.008,0.013l1.463-0.58L56.896,24.654z M35.391,16.784c-0.113,0.005-0.238,0.012-0.367,0.017 c-0.422,0.018-0.902,0.04-1.377,0.04c-1.25,0-1.533-0.155-1.564-0.171c-0.146-0.107-0.297-0.188-0.457-0.246 c0.285-0.063,0.607-0.279,0.939-0.924c0.33,0.636,0.773,1.198,1.457,1.198c0.184,0,0.363-0.045,0.531-0.131 C34.783,16.568,35.162,16.7,35.391,16.784z M34.9,13.303c-0.094,0-0.172-0.005-0.23-0.009c0.064-0.167,0.141-0.264,0.201-0.319 c0.08,0.122,0.186,0.229,0.305,0.32C35.078,13.301,34.986,13.303,34.9,13.303z M29.932,14.974c0.428,0.837,0.744,1.198,0.994,1.355 c-0.619,0.049-1.086,0.443-1.469,0.817c-0.271-0.09-0.74-0.374-0.879-0.572c-0.084-0.117-0.18-0.217-0.287-0.304 C28.969,16.077,29.564,15.447,29.932,14.974z M27.57,14.355l-0.889-0.043l-2.975-0.146c0.361-0.299,0.707-0.579,0.91-0.745 c0.055-0.02,0.27-0.078,0.793-0.078c0.314,0,0.617,0.021,0.809,0.037L27.57,14.355z" fill="url(#SVGID_5_)" fill-opacity="0.3" stroke-opacity="0.3"/>
-<radialGradient cx="27.8105" cy="3.104" gradientTransform="matrix(0.9953 0 0 0.9952 2.7861 7.6702)" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="30.9363">
-<stop offset="0" style="stop-color:#7AF200"/>
-<stop offset="0.3152" style="stop-color:#7AF200"/>
-<stop offset="0.7273" style="stop-color:#1CAD0F"/>
-<stop offset="1" style="stop-color:#007A3A"/>
-</radialGradient>
-<path d="M3.957,29.985c0,0,0,0,0,0.002c0,0.01,0.002,0.014,0.002,0.021c0,0.813,0.051,1.615,0.119,2.41 c0.023,0.259,0.063,0.52,0.092,0.781c0.07,0.544,0.15,1.082,0.248,1.615c0.055,0.283,0.107,0.567,0.166,0.845 c0.123,0.553,0.266,1.097,0.422,1.632c0.063,0.222,0.113,0.447,0.184,0.663C5.197,37.978,5.207,38,5.213,38.023 c0.021-0.212,0.027-0.427,0.021-0.648c-0.053-1.568-0.303-1.367-0.303-1.367l1.771-2.381v-1.52L4.625,30.03 C4.625,30.03,3.959,29.926,3.957,29.985z" fill="url(#SVGID_6_)"/>
-<radialGradient cx="27.8096" cy="3.1069" gradientTransform="matrix(0.9953 0 0 0.9952 2.7861 7.6702)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="30.9388">
-<stop offset="0" style="stop-color:#7AF200"/>
-<stop offset="0.3152" style="stop-color:#7AF200"/>
-<stop offset="0.7273" style="stop-color:#1CAD0F"/>
-<stop offset="1" style="stop-color:#007A3A"/>
-</radialGradient>
-<path d="M20.631,6.433c0.766,0.252,1.395-0.26,2.109-0.717c0.252-0.051,3.055-1.17,3.357-1.17 c0.301,0,1.32-0.04,1.572-0.444c0,0,4.387,0.763,5.049,0.508c0.359-0.141,1.869-0.26,3.17-0.346 c-0.074-0.016-0.141-0.037-0.213-0.052c-0.07-0.014-0.141-0.026-0.211-0.04c-0.814-0.163-1.637-0.295-2.475-0.378 c-0.006,0-0.012,0-0.02-0.004c-0.881-0.088-1.775-0.135-2.682-0.135c-0.84,0-1.67,0.05-2.492,0.127 c-0.143,0.015-0.287,0.031-0.434,0.046c-0.793,0.086-1.578,0.203-2.35,0.357C25,4.191,24.986,4.192,24.973,4.193 c-0.801,0.166-1.584,0.371-2.355,0.606c-0.133,0.039-0.26,0.085-0.393,0.125c-0.684,0.221-1.357,0.466-2.02,0.737 c-0.076,0.034-0.156,0.063-0.234,0.095c-0.727,0.31-1.438,0.654-2.129,1.024c-0.104,0.056-0.203,0.116-0.307,0.175 c-0.299,0.165-0.576,0.349-0.861,0.525C18.098,7.957,19.877,6.178,20.631,6.433z" fill="url(#SVGID_7_)"/>
-<radialGradient cx="27.8066" cy="3.105" gradientTransform="matrix(0.9953 0 0 0.9952 2.7861 7.6702)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="30.9346">
-<stop offset="0" style="stop-color:#B2F56E"/>
-<stop offset="0.3152" style="stop-color:#B2F56E"/>
-<stop offset="0.7273" style="stop-color:#5CBF1B"/>
-<stop offset="1" style="stop-color:#227A00"/>
-</radialGradient>
-<path d="M56.111,24.787c-0.027-0.133-0.064-0.258-0.09-0.388c-0.141-0.65-0.307-1.292-0.494-1.924 c-0.051-0.171-0.102-0.346-0.154-0.515c-0.23-0.718-0.484-1.426-0.773-2.113c-0.051-0.121-0.109-0.24-0.16-0.358 c-0.266-0.606-0.553-1.201-0.861-1.782c-0.07-0.139-0.143-0.282-0.217-0.417c-0.365-0.657-0.75-1.297-1.166-1.919 c-0.068-0.107-0.15-0.21-0.223-0.316c-0.379-0.553-0.777-1.086-1.195-1.605c-0.086-0.103-0.166-0.209-0.254-0.313 c-0.482-0.578-0.986-1.135-1.518-1.669c-0.09-0.092-0.188-0.183-0.281-0.272c-0.482-0.475-0.984-0.933-1.506-1.369 c-0.09-0.073-0.17-0.151-0.26-0.223c-0.584-0.478-1.195-0.933-1.822-1.362c-0.109-0.075-0.223-0.148-0.334-0.219 c-0.578-0.384-1.174-0.747-1.785-1.085c-0.084-0.045-0.16-0.094-0.244-0.141c-0.68-0.363-1.371-0.696-2.082-1.003 c-0.125-0.053-0.256-0.103-0.379-0.155c-0.277-0.115-0.563-0.206-0.844-0.309c-0.334,0.213-1.881,1.088-1.881,1.088 s-6.717-0.917-7.174-0.462c-0.459,0.462-2.248,0.929-2.656,0.981c-0.406,0.053-1.25,0.27-0.238,1.518 c-0.152,0.155-3.039,2.165-3.039,1.25c0-0.916,0.645-2.552-0.26-1.676c-0.652,0.631-1.039,1.483-1.127,1.643 c-0.211,0.409-0.342,0.604-0.188,1.773c0.154,1.171-1.869,1.164-2.004,0.862c-0.363-0.813-2.363,1.821-2.363,1.821l0.844,1.082 c0,0-5.893,4.539-5.941,4.844c-0.053,0.307-1.523,4.247-1.016,5.418c0.512,1.174,1.797,4.127,3.016,4.226 c1.598,0.131,5.469-0.73,5.469-0.73c0.104,0.257,0.834,1.556,0.834,1.556s1.896-0.063,2.004,0.143 c0.035,0.069,2.287,6.693,1.543,7.571c-1.773,2.656,1.014,6.548,1.789,7.864c0.775,2.262,1.277,1.25,2.297,1.62 c1.258,0.108,2.318,0.573,3.385-0.8c0.309-0.255,0.836-0.054,0.836-0.408c0-0.198,0.912-0.781,1.146-1.33 c0.248-0.114,0.881-0.542,1.313-0.748c0.391-0.025-0.371-1.071,0.402-2.177c0.836-0.33,3.088-1.849,3.088-1.849 c0.104-2.227-1.094-4.979,1.141-6.559c1.445-1.47,3.336-2.306,4.256-4.544c0.252-0.661,0.818-2.014-0.813-1.609 c-1.531,0.386-3.238,0.474-2.432-0.201c-0.092-0.828-1.111-1.218-2.023-2.026c-0.473-1.117-1.215-3.108-1.215-3.108l-1.621-2.463 l0.203-0.508l1.926,2.836l1.926,2.328c0.707,2.33,1.314,2.535,1.314,2.535c1.068-0.377,3.596-1.419,3.596-1.419l2.484-2.381 c0,0-0.256-0.761-1.264-1.722l-0.764-0.455c-0.166,0.467-1.049,0.642-1.049,0.642l-2.145-2.564l0.801-0.162l0.613,1.171l1.473,0.509 c0,0,0.408-0.298,1.166,0.484c0.619-0.051,3.029,0.117,3.594,0.832c0.109,0.142,2.986,7.325,3.555,7.336 c0.248,0.001,0.43,0.099,0.348-0.335c-0.102-0.205,0-4.717,0.154-5.683c0.385-0.821,0.445-0.002,1.357,1.553 C56.121,24.862,56.119,24.824,56.111,24.787z M30.797,7.378c0.201-0.6,1.367-0.804,1.367-0.804s-0.334,0.618-0.258,0.937 c0.08,0.322-0.533,0.524-0.6,1.282c-0.066,0.755-1.459,0.313-1.574,0.047C29.617,8.577,30.592,7.977,30.797,7.378z M35.793,17.571 c-0.865,0-3.455,0.257-4.17-0.253c-0.711-0.508-1.266,0.052-1.781,0.562c-0.334,0.331-1.559-0.339-1.916-0.848 c-0.355-0.509-1.553-0.472-1.553-0.472l0.271-1.452l-3.445-0.167l-1.957,0.574l-1.844,0.052l1.031-0.491l1.287-0.304 c0,0,1.867-1.536,2.43-1.993c0.475-0.388,2.365-0.169,2.365-0.169l2.074,1.497c0,0-0.459,1.174-0.662,1.426 c0.76-0.05,1.658-1.436,1.658-1.436c-1.621-1.488-1.555-1.992-1.555-1.992l2.133,1.498l0.021,0.013c0,0,0.865,2.035,1.225,2.035 c0.352,0,0.809-1.401,0.809-1.401l0.609-0.153c0.27,0.642,0.773,2.094,1.381,1.754c0.35-0.193,0.928-0.017,1.588,0.236 c0.664,0.255,1.115-0.137,1.654,0.337C37.381,18.519,36.15,17.674,35.793,17.571z M37.148,14.068c-0.891-0.339-3.9,0.766-3.229-1.04 c0.359-0.975,1.281-1.179,1.598-0.531c0.082,0.267,1.084,0.679,1.076,0.117c-0.006-0.562,1.01-0.86,1.154-0.441 C37.207,12.563,39.863,14.589,37.148,14.068z M42.816,15.78c-0.492-0.397,0.223-0.738-0.506-1.359 c-1.041-0.895-1.855-1.278-0.436-2.002c1.754-0.221,0.283,0.559,0.576,1.027c0.156,0.247,1.039,1.08,1.73,2.103 C44.756,16.397,43.307,16.175,42.816,15.78z" fill="url(#SVGID_8_)"/>
-<radialGradient cx="27.8125" cy="3.1055" gradientTransform="matrix(0.9953 0 0 0.9952 2.7861 7.6702)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="30.9328">
-<stop offset="0" style="stop-color:#7AF200"/>
-<stop offset="0.3152" style="stop-color:#7AF200"/>
-<stop offset="0.7273" style="stop-color:#1CAD0F"/>
-<stop offset="1" style="stop-color:#007A3A"/>
-</radialGradient>
-<path d="M43.523,38.979l-1.689,1.688c0,0-1.016,0-1.064,0.406c-0.023,0.174-0.082,0.927-0.252,1.315 c-0.338,0.235-0.742,1.012-0.742,1.012s-0.211,1.504,0.912,1.249C41.809,44.395,45.256,39.795,43.523,38.979z" fill="url(#SVGID_9_)"/>
+<rect fill="url(#SVGID_6_)" height="2.345" width="5.647" x="18.604" y="2"/>
+<rect height="0.471" opacity="0.4" width="3.765" x="19.546" y="4.345"/>
+<rect height="0.471" opacity="0.1" width="3.765" x="19.546" y="31.648"/>
+<rect height="0.471" opacity="0.2" width="3.765" x="19.546" y="4.815"/>
+<rect height="0.471" opacity="0.1" width="3.765" x="19.546" y="5.286"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="36.0156" x2="57.6309" y1="41.8154" y2="41.8154">
+ <stop offset="0" style="stop-color:#CC1414"/>
+ <stop offset="0.1758" style="stop-color:#F74403"/>
+ <stop offset="0.4182" style="stop-color:#CC1414"/>
+ <stop offset="0.7394" style="stop-color:#FF4D00"/>
+ <stop offset="1" style="stop-color:#CC1414"/>
+</linearGradient>
+<path d="M36.016,31.404c0,0,7.32-0.909,9.904,1.303c4.324,3.695,8.959,3.246,11.711,2.859v16.748 c0,0-9.092,0.707-12.707-1.705c-2.197-1.465-8.908-0.969-8.908-0.969V31.404z" fill="url(#SVGID_7_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="32.252" x2="36.0156" y1="44.4668" y2="44.4668">
+ <stop offset="0" style="stop-color:#A8B1B3"/>
+ <stop offset="0.3818" style="stop-color:#FFFFFF"/>
+ <stop offset="0.7091" style="stop-color:#686E70"/>
+ <stop offset="1" style="stop-color:#A6B0B3"/>
+</linearGradient>
+<rect fill="url(#SVGID_8_)" height="27.067" width="3.764" x="32.252" y="30.933"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="31.3105" x2="36.957" y1="29.7603" y2="29.7603">
+ <stop offset="0" style="stop-color:#A8B1B3"/>
+ <stop offset="0.3818" style="stop-color:#FFFFFF"/>
+ <stop offset="0.7091" style="stop-color:#686E70"/>
+ <stop offset="1" style="stop-color:#A6B0B3"/>
+</linearGradient>
+<rect fill="url(#SVGID_9_)" height="2.346" width="5.646" x="31.311" y="28.587"/>
+<rect height="0.471" opacity="0.4" width="3.764" x="32.252" y="30.933"/>
+<rect height="0.471" opacity="0.2" width="3.764" x="32.252" y="31.404"/>
+<rect height="0.471" opacity="0.1" width="3.764" x="32.252" y="31.875"/>
+<rect height="0.469" opacity="0.1" width="3.764" x="32.252" y="57.531"/>
<rect fill="none" height="60" width="60"/>
</g>
-<g transform="matrix(1 0 0 1 30 30)">
-<path d="M0,30v-30h30v30h-30zm23.6-3.75l-8.732-8.732-8.736,8.73h17.46zm2.65-2.65v-17.47l-8.732,8.732,8.73,8.73zm-22.5-0.27l8.465-8.465-8.47-8.459v16.93zm11.12-11.11l8.46-8.47h-16.93l8.468,8.47z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="15" x2="15" y1="0.9941" y2="29.19">
-<stop offset="0" stop-color="#E6E6E6"/>
-<stop offset="0.6182" stop-color="#A8A8A8"/>
-<stop offset="1" stop-color="#CCCCCC"/>
-</linearGradient>
-<path d="M0.938,0.938v28.12h28.12v-28.12h-28.12zm12.6,13.93l-10.73,10.73v-21.46l10.73,10.73zm-9.401-12.06h21.46l-10.72,10.73-10.73-10.73zm10.73,13.38l11,11h-22l11-11zm1.32-1.32l11-11v21.99l-11-10.99z" fill="url(#SVGID_1__)"/>
-<polygon fill-opacity="0.6" points="8.547,25.31,7.61,17.81,5.625,17.81,5.625,12.2,24.38,12.2,24.38,17.81,22.39,17.81,21.45,25.31" stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="15" x2="15" y1="12.1" y2="23.99">
-<stop offset="0" stop-color="#A0F800"/>
-<stop offset="1" stop-color="#319E00"/>
-</linearGradient>
-<polygon fill="url(#SVGID_2__)" points="6.563,13.14,6.563,16.88,8.438,16.88,9.375,24.38,20.62,24.38,21.56,16.88,23.44,16.88,23.44,13.14"/>
-<path d="M13.12,14.06v-2.886c-0.348,0.048-0.692,0.073-1.03,0.073-0.804,0-1.568-0.139-2.272-0.414-3.952-1.536-3.863-4.501-3.858-4.626l0.019-0.408,0.312-0.265c0.103-0.088,1.06-0.855,2.881-0.855,0.958,0,1.99,0.212,3.066,0.632,1.3,0.506,2.174,1.126,2.762,1.716,0.588-0.589,1.462-1.209,2.762-1.716,1.076-0.42,2.108-0.632,3.066-0.632,1.82,0,2.777,0.767,2.881,0.855l0.313,0.265,0.019,0.408c0.005,0.125,0.094,3.091-3.862,4.632-0.704,0.275-1.469,0.414-2.272,0.414-0.338,0-0.683-0.025-1.03-0.073v2.886h-3.755z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<path d="M10.16,9.963c1.436,0.559,2.896,0.346,3.899,0.057v3.105h1.875v-3.1c1.003,0.289,2.464,0.502,3.899-0.057,3.375-1.316,3.267-3.717,3.267-3.717s-1.627-1.379-5.002-0.064c-1.87,0.725-2.72,1.667-3.11,2.369-0.392-0.702-1.242-1.644-3.102-2.369-3.377-1.316-5.004,0.064-5.004,0.064s-0.108,2.401,3.264,3.717z" fill="url(#SVGID_3__)"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="15" x2="15" y1="4.922" y2="12.87">
-<stop offset="0" stop-color="#A0F800"/>
-<stop offset="1" stop-color="#319E00"/>
-</linearGradient>
-</defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="15" x2="15" y1="12.55" y2="17.37">
-<stop offset="0" stop-color="#D07100"/>
-<stop offset="1" stop-color="#A23600"/>
-</linearGradient>
-<rect fill="url(#SVGID_4__)" height="3.738" width="16.88" x="6.563" y="13.14"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="15" x2="15" y1="16.84" y2="24.56">
-<stop offset="0" stop-color="#D07100"/>
-<stop offset="1" stop-color="#A23600"/>
-</linearGradient>
-<polygon fill="url(#SVGID_5__)" points="20.62,24.38,9.375,24.38,8.438,16.88,21.56,16.88"/>
-<path d="M23.1,6.246s-1.627-1.379-5.002-0.064c-1.86,0.725-2.71,1.667-3.1,2.369-0.392-0.702-1.242-1.644-3.102-2.369-3.377-1.316-5.004,0.064-5.004,0.064s-0.109,2.401,3.267,3.717c1.436,0.559,2.896,0.346,3.899,0.057v3.105h1.875v-3.1c1.003,0.289,2.464,0.502,3.899-0.057,3.37-1.316,3.26-3.717,3.26-3.717z" fill="url(#SVGID_3__)"/>
-<g fill-opacity="0.2" stroke-opacity="0.2">
-<path d="M14.06,9.082c-1.003,0.289-2.464,0.502-3.899-0.057-2.1-0.82-2.85-2.062-3.118-2.881-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.057v-0.938z"/>
-<path d="M22.96,6.144c-0.268,0.819-1.018,2.061-3.121,2.881-1.436,0.559-2.896,0.346-3.899,0.057v0.938c1.003,0.289,2.464,0.502,3.899-0.057,3.375-1.316,3.267-3.717,3.267-3.717s-0.06-0.042-0.15-0.102z"/>
-<rect height="0.938" width="1.875" x="14.06" y="12.19"/>
-</g>
-<rect fill="#FFFFFF" fill-opacity="0.3" height="0.926" stroke-opacity="0.3" width="16.88" x="6.563" y="13.14"/>
-<polygon fill-opacity="0.2" points="21.44,17.81,21.56,16.88,8.438,16.88,8.555,17.81" stroke-opacity="0.2"/>
-</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_location_new.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_location_new.svg Fri May 14 16:09:54 2010 +0300
@@ -1,78 +1,87 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<stop offset="0" style="stop-color:#4FB7EB"/>
-<stop offset="1" style="stop-color:#1755B3"/>
+ <stop offset="0" style="stop-color:#4FB7EB"/>
+ <stop offset="1" style="stop-color:#1755B3"/>
</linearGradient>
<polygon fill="url(#SVGID_1_)" points="49.361,9.213 57.039,10.264 57.039,53.138 43.52,54.988 30.002,52.297 22.284,53.751 "/>
<linearGradient gradientTransform="matrix(1 0 0 1 -200.5 -1768.5)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="237.2617" x2="237.2617" y1="1791.29" y2="1823.7784">
-<stop offset="0" style="stop-color:#8EFFF5"/>
-<stop offset="1" style="stop-color:#1D9DD8"/>
+ <stop offset="0" style="stop-color:#8EFFF5"/>
+ <stop offset="1" style="stop-color:#1D9DD8"/>
</linearGradient>
<polygon fill="url(#SVGID_2_)" points="43.52,21.685 43.52,54.988 30.002,52.297 30.002,41.25 "/>
-<polygon fill-opacity="0.25" points="50.26,9.347 43.52,23.584 30.002,43.172 23.378,53.564 20.226,54.149 47.881,9.016 " stroke-opacity="0.25"/>
+<polygon enable-background="new " opacity="0.25" points="50.26,9.347 43.52,23.584 30.002,43.172 23.378,53.564 20.226,54.149 47.881,9.016 "/>
<linearGradient gradientTransform="matrix(1 0 0 1 -200.5 -1768.5)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="224.7246" x2="224.7246" y1="1777.3057" y2="1823.4724">
-<stop offset="0" style="stop-color:#FEEFA7"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+ <stop offset="0" style="stop-color:#FEEFA7"/>
+ <stop offset="1" style="stop-color:#FFC501"/>
</linearGradient>
<polygon fill="url(#SVGID_3_)" points="45.482,11.152 43.414,22.27 30.002,41.725 22.334,53.759 15.733,54.988 2.966,52.584 2.966,9.338 15.358,8.413 30.002,10.446 43.52,8.413 "/>
<linearGradient gradientTransform="matrix(1 0 0 1 -200.5 -1768.5)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="223.3672" x2="223.3672" y1="1821.5967" y2="1778.4828">
-<stop offset="0" style="stop-color:#E69400"/>
-<stop offset="1" style="stop-color:#F9DE4F"/>
+ <stop offset="0" style="stop-color:#E69400"/>
+ <stop offset="1" style="stop-color:#F9DE4F"/>
</linearGradient>
<polygon fill="url(#SVGID_4_)" points="30.002,10.446 30.002,41.725 22.334,53.759 15.733,54.988 15.733,8.466 "/>
<linearGradient gradientTransform="matrix(1 0 0 1 -200.5 -1768.5)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="246.9512" x2="246.9512" y1="1790.3203" y2="1777.6716">
-<stop offset="0" style="stop-color:#E69400"/>
-<stop offset="1" style="stop-color:#F9DE4F"/>
+ <stop offset="0" style="stop-color:#E69400"/>
+ <stop offset="1" style="stop-color:#F9DE4F"/>
</linearGradient>
<polygon fill="url(#SVGID_5_)" points="43.52,8.413 43.52,22.115 49.383,9.217 "/>
-<path d="M16.483,54.842l11.49-17.231l-4.842-2.408l-7.341,10.153 l-7.165,8.278l-2.291-0.423l9.408-11.076l5.523-7.851l-5.782-2.847L2.966,28.87v-1.32l12.995,2.686l6.069,2.979l6.841-9.601 l-13.34-6.657L2.966,14.749v-2.042l12.971,2.171l13.968,6.972l4.002-6.801l-3.909-1.375l-5.803-4.013l2.769,0.382l3.052,2.232 l4.547,1.656l2.688-4.564L39.88,8.99l-3.501,5.915l4.996,2.688l2.188-3.465l2.255-5.396l1.271,0.173l-3.554,7.663 c0,0-8.687,13.462-13.519,20.691L18.318,54.506L16.483,54.842z M28.84,36.606l-4.9-2.489l6.734-9.471l4.502,2.188L28.84,36.606z M31.749,22.77l4.711,2.353l4.219-6.434l-4.955-2.665L31.749,22.77L31.749,22.77z" fill="#FFFFFF" fill-opacity="0.25" stroke-opacity="0.25"/>
+<path d="M16.483,54.842l11.49-17.231l-4.842-2.408l-7.341,10.153 l-7.165,8.278l-2.291-0.423l9.408-11.076l5.523-7.851l-5.782-2.847L2.966,28.87v-1.32l12.995,2.686l6.069,2.979l6.841-9.601 l-13.34-6.657L2.966,14.749v-2.042l12.971,2.171l13.968,6.972l4.002-6.801l-3.909-1.375l-5.803-4.013l2.769,0.382l3.052,2.232 l4.547,1.656l2.688-4.564L39.88,8.99l-3.501,5.915l4.996,2.688l2.188-3.465l2.255-5.396l1.271,0.173l-3.554,7.663 c0,0-8.687,13.462-13.519,20.691L18.318,54.506L16.483,54.842z M28.84,36.606l-4.9-2.489l6.734-9.471l4.502,2.188L28.84,36.606z M31.749,22.77l4.711,2.353l4.219-6.434l-4.955-2.665L31.749,22.77L31.749,22.77z" enable-background="new " fill="#FFFFFF" opacity="0.25"/>
<linearGradient gradientTransform="matrix(1 0 0 1 -200.5 -1768.5)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="225.3965" x2="225.3965" y1="1823.0439" y2="1789.2549">
-<stop offset="0" style="stop-color:#FCE28D"/>
-<stop offset="0.81" style="stop-color:#FEF7DF"/>
-<stop offset="1" style="stop-color:#FEF7DF"/>
+ <stop offset="0" style="stop-color:#FCE28D"/>
+ <stop offset="0.81" style="stop-color:#FEF7DF"/>
</linearGradient>
<path d="M46.023,8.754l-2.476,5.931c0,0-1.334,2.112-2.077,3.276l-5.482-2.949l3.524-5.947l-1.787,0.241 l-3.056,4.998l-4.625-1.697l-3.417-2.63l-2.114-0.292l5.51,3.755l4.268,1.503l-4.276,7.272l-14.135-7.055L2.966,12.979v1.483 l12.621,2.208l13.674,6.826l-0.164,0.277l-6.977,9.795l-6.365-3.099L2.961,27.85l0.005,0.742l12.754,2.651l5.965,2.939l-5.926,8.307 l-9.111,10.79l1.693,0.316l7.417-8.591l7.281-10.156l5.416,2.667L16.876,54.777l1.051-0.198l12.09-18.127l13.55-20.397l3.266-7.185 L46.023,8.754z M30.012,34.986l-1.265,1.946l-5.27-2.696l6.605-9.38l0.519-0.685l5.139,2.564L30.012,34.986z M36.559,25.482 l-5.202-2.598l4.261-7.232l5.453,2.936L36.559,25.482z" fill="url(#SVGID_6_)"/>
<polygon fill="#FFFFFF" points="38.253,47.876 43.529,36.76 48.269,47.876 43.529,45.003 "/>
-<polygon fill-opacity="0.4" points="48.269,47.876 43.529,36.76 43.529,45.003 " stroke-opacity="0.4"/>
-<ellipse cx="22.188" cy="28.443" fill="#333333" fill-opacity="0.2" rx="6.056" ry="2.335" stroke-opacity="0.2"/>
-<path d="M24.975,28.442c0,0.592-1.25,1.073-2.786,1.073 c-1.536,0-2.787-0.482-2.787-1.073c0-0.596,1.25-1.076,2.787-1.076C23.724,27.367,24.975,27.847,24.975,28.442z" fill="#333333" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M30.108,6.172c-1.354,0.957-3.687,2.304-4.689,2.304c-0.001,0-0.001,0-0.003,0 c-0.229-0.027-0.567-0.25-0.927-0.485c-0.718-0.468-1.704-1.113-3.139-1.124c-1.059,0-2.665,1.035-3.74,1.829l-0.667-1.729 L11.995,8.87l1.134,2.934l0.667-0.256l5.98,15.49l2.866,2.022l0.742-3.411l-1.496-3.874l0.268-0.689 c0.55-1.418,1.795-3.936,2.793-4.645c0.263-0.185,0.994-0.554,1.581-0.849c0.595-0.301,1.11-0.558,1.413-0.751 c2.499-1.603,3.411-7.21,3.505-7.845l0.296-1.983L30.108,6.172z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<polygon enable-background="new " opacity="0.4" points="48.269,47.876 43.529,36.76 43.529,45.003 "/>
+<ellipse cx="22.188" cy="28.443" enable-background="new " fill="#333333" opacity="0.2" rx="6.056" ry="2.335"/>
+<path d="M24.975,28.442c0,0.592-1.25,1.073-2.786,1.073 c-1.536,0-2.787-0.482-2.787-1.073c0-0.596,1.25-1.076,2.787-1.076C23.724,27.367,24.975,27.847,24.975,28.442z" enable-background="new " fill="#333333" opacity="0.4"/>
+<path d="M30.108,6.172c-1.354,0.957-3.687,2.304-4.689,2.304c-0.001,0-0.001,0-0.003,0 c-0.229-0.027-0.567-0.25-0.927-0.485c-0.718-0.468-1.704-1.113-3.139-1.124c-1.059,0-2.665,1.035-3.74,1.829l-0.667-1.729 L11.995,8.87l1.134,2.934l0.667-0.256l5.98,15.49l2.866,2.022l0.742-3.411l-1.496-3.874l0.268-0.689 c0.55-1.418,1.795-3.936,2.793-4.645c0.263-0.185,0.994-0.554,1.581-0.849c0.595-0.301,1.11-0.558,1.413-0.751 c2.499-1.603,3.411-7.21,3.505-7.845l0.296-1.983L30.108,6.172z" enable-background="new " opacity="0.6"/>
<linearGradient gradientTransform="matrix(0.9331 -0.3596 -0.3596 -0.9331 -489.4615 -2117.6033)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="-293.0366" x2="-295.1697" y1="-2176.2671" y2="-2176.2671">
-<stop offset="0" style="stop-color:#8C8E8F"/>
-<stop offset="0.65" style="stop-color:#D9D9D9"/>
-<stop offset="1" style="stop-color:#AEB2B3"/>
+ <stop offset="0" style="stop-color:#8C8E8F"/>
+ <stop offset="0.65" style="stop-color:#D9D9D9"/>
+ <stop offset="1" style="stop-color:#AEB2B3"/>
</linearGradient>
<polygon fill="url(#SVGID_7_)" points="14.286,10.442 16.297,9.666 22.493,25.715 22.077,27.618 20.482,26.49 "/>
<linearGradient gradientTransform="matrix(0.9331 -0.3596 -0.3596 -0.9331 -489.4615 -2117.6033)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="-292.3564" x2="-295.8871" y1="-2166.1377" y2="-2166.1377">
-<stop offset="0" style="stop-color:#4F4F4F"/>
-<stop offset="0.59" style="stop-color:#BFBFBF"/>
-<stop offset="1" style="stop-color:#6B6B6B"/>
+ <stop offset="0" style="stop-color:#4F4F4F"/>
+ <stop offset="0.59" style="stop-color:#BFBFBF"/>
+ <stop offset="1" style="stop-color:#6B6B6B"/>
</linearGradient>
<polygon fill="url(#SVGID_8_)" points="13.103,9.361 16.452,8.072 16.968,9.411 13.619,10.699 "/>
-<rect fill-opacity="0.2" height="0.717" stroke-opacity="0.2" transform="matrix(-0.9328 0.3603 -0.3603 -0.9328 33.5485 14.5261)" width="2.155" x="14.343" y="10.032"/>
+<rect enable-background="new " height="0.717" opacity="0.2" transform="matrix(-0.9328 0.3603 -0.3603 -0.9328 33.5485 14.5261)" width="2.155" x="14.343" y="10.032"/>
<path d="M17.225,10.08c0,0,2.878-2.366,4.131-2.354c1.958,0.013,2.896,1.477,3.959,1.601 c1.55,0.183,5.289-2.455,5.289-2.455s-0.877,5.81-3.122,7.253c-0.59,0.375-2.456,1.218-3.026,1.624 c-1.583,1.123-3.099,5.035-3.099,5.035L17.225,10.08z" fill="#33A02C"/>
-<path d="M21.652,8.488c1.958,0.018,2.897,1.48,3.958,1.605 c1.2,0.139,3.708-1.408,4.78-2.114c0.14-0.665,0.209-1.11,0.209-1.11s-3.739,2.638-5.29,2.455c-1.059-0.124-1.999-1.588-3.957-1.602 c-1.252-0.009-4.13,2.355-4.13,2.355l0.297,0.768C17.521,10.848,20.398,8.48,21.652,8.488z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M21.652,8.488c1.958,0.018,2.897,1.48,3.958,1.605 c1.2,0.139,3.708-1.408,4.78-2.114c0.14-0.665,0.209-1.11,0.209-1.11s-3.739,2.638-5.29,2.455c-1.059-0.124-1.999-1.588-3.957-1.602 c-1.252-0.009-4.13,2.355-4.13,2.355l0.297,0.768C17.521,10.848,20.398,8.48,21.652,8.488z" enable-background="new " fill="#FFFFFF" opacity="0.4"/>
</g>
<g transform="matrix(1 0 0 1 30 0)">
<rect fill="none" height="15" width="15" x="15"/>
-<rect fill-opacity="0.6" height="4.412" stroke-opacity="0.6" style="enable-background:new;" transform="matrix(-0.2587 0.9659 -0.9659 -0.2587 29.2728 -12.3701)" width="7.941" x="15.41" y="2.841"/>
+<rect height="4.412" opacity="0.6" style="enable-background:new;" transform="matrix(-0.2587 0.9659 -0.9659 -0.2587 29.2728 -12.3701)" width="7.941" x="15.41" y="2.841"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 90.98 116.5195)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-70.19" x2="-73.15" y1="114.9" y2="107.7">
+
<stop offset="0" stop-color="#DE8029"/>
+
<stop offset="0.26" stop-color="#DE4E29"/>
+
<stop offset="1" stop-color="#D82E09"/>
+
</linearGradient>
<polygon fill="url(#SVGID_1__)" points="20.17,8.913,16.76,8,18.59,1.181,22,2.094"/>
-<rect fill-opacity="0.6" height="4.411" stroke-opacity="0.6" style="enable-background:new;" transform="matrix(-0.7072 0.7071 -0.7071 -0.7072 48.0833 -1.2961)" width="9.707" x="19.46" y="7.104"/>
+<rect height="4.411" opacity="0.6" style="enable-background:new;" transform="matrix(-0.7072 0.7071 -0.7071 -0.7072 48.0833 -1.2961)" width="9.707" x="19.46" y="7.104"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 90.98 116.5195)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-63.01" x2="-70.68" y1="110.1" y2="104.1">
+
<stop offset="0" stop-color="#DE8029"/>
+
<stop offset="0.26" stop-color="#DE4E29"/>
+
<stop offset="1" stop-color="#D82E09"/>
+
</linearGradient>
<polygon fill="url(#SVGID_2__)" points="22.44,13.68,19.94,11.18,26.18,4.942,28.68,7.438"/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_maps.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_maps.svg Fri May 14 16:09:54 2010 +0300
@@ -1,60 +1,61 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<stop offset="0" style="stop-color:#4FB7EB"/>
-<stop offset="1" style="stop-color:#1755B3"/>
+ <stop offset="0" style="stop-color:#4FB7EB"/>
+ <stop offset="1" style="stop-color:#1755B3"/>
</linearGradient>
<polygon fill="url(#SVGID_1_)" points="49.361,9.213 57.039,10.264 57.039,53.138 43.52,54.988 30.002,52.297 22.284,53.751 "/>
<linearGradient gradientTransform="matrix(1 0 0 1 -200.5 -1768.5)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="237.2617" x2="237.2617" y1="1791.29" y2="1823.7784">
-<stop offset="0" style="stop-color:#8EFFF5"/>
-<stop offset="1" style="stop-color:#1D9DD8"/>
+ <stop offset="0" style="stop-color:#8EFFF5"/>
+ <stop offset="1" style="stop-color:#1D9DD8"/>
</linearGradient>
<polygon fill="url(#SVGID_2_)" points="43.52,21.685 43.52,54.988 30.002,52.297 30.002,41.25 "/>
-<polygon fill-opacity="0.25" points="50.26,9.347 43.52,23.584 30.002,43.172 23.378,53.564 20.226,54.149 47.881,9.016 " stroke-opacity="0.25"/>
+<polygon enable-background="new " opacity="0.25" points="50.26,9.347 43.52,23.584 30.002,43.172 23.378,53.564 20.226,54.149 47.881,9.016 "/>
<linearGradient gradientTransform="matrix(1 0 0 1 -200.5 -1768.5)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="224.7246" x2="224.7246" y1="1777.3057" y2="1823.4724">
-<stop offset="0" style="stop-color:#FEEFA7"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+ <stop offset="0" style="stop-color:#FEEFA7"/>
+ <stop offset="1" style="stop-color:#FFC501"/>
</linearGradient>
<polygon fill="url(#SVGID_3_)" points="45.482,11.152 43.414,22.27 30.002,41.725 22.334,53.759 15.733,54.988 2.966,52.584 2.966,9.338 15.358,8.413 30.002,10.446 43.52,8.413 "/>
<linearGradient gradientTransform="matrix(1 0 0 1 -200.5 -1768.5)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="223.3672" x2="223.3672" y1="1821.5967" y2="1778.4828">
-<stop offset="0" style="stop-color:#E69400"/>
-<stop offset="1" style="stop-color:#F9DE4F"/>
+ <stop offset="0" style="stop-color:#E69400"/>
+ <stop offset="1" style="stop-color:#F9DE4F"/>
</linearGradient>
<polygon fill="url(#SVGID_4_)" points="30.002,10.446 30.002,41.725 22.334,53.759 15.733,54.988 15.733,8.466 "/>
<linearGradient gradientTransform="matrix(1 0 0 1 -200.5 -1768.5)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="246.9512" x2="246.9512" y1="1790.3203" y2="1777.6716">
-<stop offset="0" style="stop-color:#E69400"/>
-<stop offset="1" style="stop-color:#F9DE4F"/>
+ <stop offset="0" style="stop-color:#E69400"/>
+ <stop offset="1" style="stop-color:#F9DE4F"/>
</linearGradient>
<polygon fill="url(#SVGID_5_)" points="43.52,8.413 43.52,22.115 49.383,9.217 "/>
-<path d="M16.483,54.842l11.49-17.231l-4.842-2.408l-7.341,10.153 l-7.165,8.278l-2.291-0.423l9.408-11.076l5.523-7.851l-5.782-2.847L2.966,28.87v-1.32l12.995,2.686l6.069,2.979l6.841-9.601 l-13.34-6.657L2.966,14.749v-2.042l12.971,2.171l13.968,6.972l4.002-6.801l-3.909-1.375l-5.803-4.013l2.769,0.382l3.052,2.232 l4.547,1.656l2.688-4.564L39.88,8.99l-3.501,5.915l4.996,2.688l2.188-3.465l2.255-5.396l1.271,0.173l-3.554,7.663 c0,0-8.687,13.462-13.519,20.691L18.318,54.506L16.483,54.842z M28.84,36.606l-4.9-2.489l6.734-9.471l4.502,2.188L28.84,36.606z M31.749,22.77l4.711,2.353l4.219-6.434l-4.955-2.665L31.749,22.77L31.749,22.77z" fill="#FFFFFF" fill-opacity="0.25" stroke-opacity="0.25"/>
+<path d="M16.483,54.842l11.49-17.231l-4.842-2.408l-7.341,10.153 l-7.165,8.278l-2.291-0.423l9.408-11.076l5.523-7.851l-5.782-2.847L2.966,28.87v-1.32l12.995,2.686l6.069,2.979l6.841-9.601 l-13.34-6.657L2.966,14.749v-2.042l12.971,2.171l13.968,6.972l4.002-6.801l-3.909-1.375l-5.803-4.013l2.769,0.382l3.052,2.232 l4.547,1.656l2.688-4.564L39.88,8.99l-3.501,5.915l4.996,2.688l2.188-3.465l2.255-5.396l1.271,0.173l-3.554,7.663 c0,0-8.687,13.462-13.519,20.691L18.318,54.506L16.483,54.842z M28.84,36.606l-4.9-2.489l6.734-9.471l4.502,2.188L28.84,36.606z M31.749,22.77l4.711,2.353l4.219-6.434l-4.955-2.665L31.749,22.77L31.749,22.77z" enable-background="new " fill="#FFFFFF" opacity="0.25"/>
<linearGradient gradientTransform="matrix(1 0 0 1 -200.5 -1768.5)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="225.3965" x2="225.3965" y1="1823.0439" y2="1789.2549">
-<stop offset="0" style="stop-color:#FCE28D"/>
-<stop offset="0.81" style="stop-color:#FEF7DF"/>
-<stop offset="1" style="stop-color:#FEF7DF"/>
+ <stop offset="0" style="stop-color:#FCE28D"/>
+ <stop offset="0.81" style="stop-color:#FEF7DF"/>
</linearGradient>
<path d="M46.023,8.754l-2.476,5.931c0,0-1.334,2.112-2.077,3.276l-5.482-2.949l3.524-5.947l-1.787,0.241 l-3.056,4.998l-4.625-1.697l-3.417-2.63l-2.114-0.292l5.51,3.755l4.268,1.503l-4.276,7.272l-14.135-7.055L2.966,12.979v1.483 l12.621,2.208l13.674,6.826l-0.164,0.277l-6.977,9.795l-6.365-3.099L2.961,27.85l0.005,0.742l12.754,2.651l5.965,2.939l-5.926,8.307 l-9.111,10.79l1.693,0.316l7.417-8.591l7.281-10.156l5.416,2.667L16.876,54.777l1.051-0.198l12.09-18.127l13.55-20.397l3.266-7.185 L46.023,8.754z M30.012,34.986l-1.265,1.946l-5.27-2.696l6.605-9.38l0.519-0.685l5.139,2.564L30.012,34.986z M36.559,25.482 l-5.202-2.598l4.261-7.232l5.453,2.936L36.559,25.482z" fill="url(#SVGID_6_)"/>
<polygon fill="#FFFFFF" points="38.253,47.876 43.529,36.76 48.269,47.876 43.529,45.003 "/>
-<polygon fill-opacity="0.4" points="48.269,47.876 43.529,36.76 43.529,45.003 " stroke-opacity="0.4"/>
-<ellipse cx="22.188" cy="28.443" fill="#333333" fill-opacity="0.2" rx="6.056" ry="2.335" stroke-opacity="0.2"/>
-<path d="M24.975,28.442c0,0.592-1.25,1.073-2.786,1.073 c-1.536,0-2.787-0.482-2.787-1.073c0-0.596,1.25-1.076,2.787-1.076C23.724,27.367,24.975,27.847,24.975,28.442z" fill="#333333" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M30.108,6.172c-1.354,0.957-3.687,2.304-4.689,2.304c-0.001,0-0.001,0-0.003,0 c-0.229-0.027-0.567-0.25-0.927-0.485c-0.718-0.468-1.704-1.113-3.139-1.124c-1.059,0-2.665,1.035-3.74,1.829l-0.667-1.729 L11.995,8.87l1.134,2.934l0.667-0.256l5.98,15.49l2.866,2.022l0.742-3.411l-1.496-3.874l0.268-0.689 c0.55-1.418,1.795-3.936,2.793-4.645c0.263-0.185,0.994-0.554,1.581-0.849c0.595-0.301,1.11-0.558,1.413-0.751 c2.499-1.603,3.411-7.21,3.505-7.845l0.296-1.983L30.108,6.172z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<polygon enable-background="new " opacity="0.4" points="48.269,47.876 43.529,36.76 43.529,45.003 "/>
+<ellipse cx="22.188" cy="28.443" enable-background="new " fill="#333333" opacity="0.2" rx="6.056" ry="2.335"/>
+<path d="M24.975,28.442c0,0.592-1.25,1.073-2.786,1.073 c-1.536,0-2.787-0.482-2.787-1.073c0-0.596,1.25-1.076,2.787-1.076C23.724,27.367,24.975,27.847,24.975,28.442z" enable-background="new " fill="#333333" opacity="0.4"/>
+<path d="M30.108,6.172c-1.354,0.957-3.687,2.304-4.689,2.304c-0.001,0-0.001,0-0.003,0 c-0.229-0.027-0.567-0.25-0.927-0.485c-0.718-0.468-1.704-1.113-3.139-1.124c-1.059,0-2.665,1.035-3.74,1.829l-0.667-1.729 L11.995,8.87l1.134,2.934l0.667-0.256l5.98,15.49l2.866,2.022l0.742-3.411l-1.496-3.874l0.268-0.689 c0.55-1.418,1.795-3.936,2.793-4.645c0.263-0.185,0.994-0.554,1.581-0.849c0.595-0.301,1.11-0.558,1.413-0.751 c2.499-1.603,3.411-7.21,3.505-7.845l0.296-1.983L30.108,6.172z" enable-background="new " opacity="0.6"/>
<linearGradient gradientTransform="matrix(0.9331 -0.3596 -0.3596 -0.9331 -489.4615 -2117.6033)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="-293.0366" x2="-295.1697" y1="-2176.2671" y2="-2176.2671">
-<stop offset="0" style="stop-color:#8C8E8F"/>
-<stop offset="0.65" style="stop-color:#D9D9D9"/>
-<stop offset="1" style="stop-color:#AEB2B3"/>
+ <stop offset="0" style="stop-color:#8C8E8F"/>
+ <stop offset="0.65" style="stop-color:#D9D9D9"/>
+ <stop offset="1" style="stop-color:#AEB2B3"/>
</linearGradient>
<polygon fill="url(#SVGID_7_)" points="14.286,10.442 16.297,9.666 22.493,25.715 22.077,27.618 20.482,26.49 "/>
<linearGradient gradientTransform="matrix(0.9331 -0.3596 -0.3596 -0.9331 -489.4615 -2117.6033)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="-292.3564" x2="-295.8871" y1="-2166.1377" y2="-2166.1377">
-<stop offset="0" style="stop-color:#4F4F4F"/>
-<stop offset="0.59" style="stop-color:#BFBFBF"/>
-<stop offset="1" style="stop-color:#6B6B6B"/>
+ <stop offset="0" style="stop-color:#4F4F4F"/>
+ <stop offset="0.59" style="stop-color:#BFBFBF"/>
+ <stop offset="1" style="stop-color:#6B6B6B"/>
</linearGradient>
<polygon fill="url(#SVGID_8_)" points="13.103,9.361 16.452,8.072 16.968,9.411 13.619,10.699 "/>
-<rect fill-opacity="0.2" height="0.717" stroke-opacity="0.2" transform="matrix(-0.9328 0.3603 -0.3603 -0.9328 33.5485 14.5261)" width="2.155" x="14.343" y="10.032"/>
+<rect enable-background="new " height="0.717" opacity="0.2" transform="matrix(-0.9328 0.3603 -0.3603 -0.9328 33.5485 14.5261)" width="2.155" x="14.343" y="10.032"/>
<path d="M17.225,10.08c0,0,2.878-2.366,4.131-2.354c1.958,0.013,2.896,1.477,3.959,1.601 c1.55,0.183,5.289-2.455,5.289-2.455s-0.877,5.81-3.122,7.253c-0.59,0.375-2.456,1.218-3.026,1.624 c-1.583,1.123-3.099,5.035-3.099,5.035L17.225,10.08z" fill="#33A02C"/>
-<path d="M21.652,8.488c1.958,0.018,2.897,1.48,3.958,1.605 c1.2,0.139,3.708-1.408,4.78-2.114c0.14-0.665,0.209-1.11,0.209-1.11s-3.739,2.638-5.29,2.455c-1.059-0.124-1.999-1.588-3.957-1.602 c-1.252-0.009-4.13,2.355-4.13,2.355l0.297,0.768C17.521,10.848,20.398,8.48,21.652,8.488z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M21.652,8.488c1.958,0.018,2.897,1.48,3.958,1.605 c1.2,0.139,3.708-1.408,4.78-2.114c0.14-0.665,0.209-1.11,0.209-1.11s-3.739,2.638-5.29,2.455c-1.059-0.124-1.999-1.588-3.957-1.602 c-1.252-0.009-4.13,2.355-4.13,2.355l0.297,0.768C17.521,10.848,20.398,8.48,21.652,8.488z" enable-background="new " fill="#FFFFFF" opacity="0.4"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mass_storage.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mass_storage.svg Fri May 14 16:09:54 2010 +0300
@@ -1,131 +1,130 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="1.8516" y2="57.6129">
-<stop offset="0" style="stop-color:#6B6B6B"/>
-<stop offset="1" style="stop-color:#141414"/>
+ <stop offset="0" style="stop-color:#6B6B6B"/>
+ <stop offset="1" style="stop-color:#141414"/>
</linearGradient>
<path d="M51.818,56.545c0,0.805-0.65,1.455-1.455,1.455H9.638c-0.804,0-1.456-0.65-1.456-1.455V3.455 C8.182,2.652,8.834,2,9.638,2h40.726c0.805,0,1.455,0.652,1.455,1.455V56.545z" fill="url(#SVGID_1_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="2.583" y2="56.8955">
-<stop offset="0" style="stop-color:#C7C7C7"/>
-<stop offset="0.7394" style="stop-color:#2B2B2B"/>
-<stop offset="1" style="stop-color:#737373"/>
+ <stop offset="0" style="stop-color:#C7C7C7"/>
+ <stop offset="0.7394" style="stop-color:#2B2B2B"/>
+ <stop offset="1" style="stop-color:#737373"/>
</linearGradient>
<path d="M9.638,57.272c-0.401,0-0.729-0.326-0.729-0.728V3.455c0-0.401,0.327-0.728,0.729-0.728h40.726 c0.401,0,0.728,0.326,0.728,0.728v53.09c0,0.401-0.326,0.728-0.728,0.728H9.638z" fill="url(#SVGID_2_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="3.3145" y2="56.178">
-<stop offset="0" style="stop-color:#8F8F8F"/>
-<stop offset="0.6303" style="stop-color:#393939"/>
-<stop offset="1" style="stop-color:#757575"/>
+ <stop offset="0" style="stop-color:#8F8F8F"/>
+ <stop offset="0.6303" style="stop-color:#393939"/>
+ <stop offset="1" style="stop-color:#757575"/>
</linearGradient>
<rect fill="url(#SVGID_3_)" height="53.09" width="40.727" x="9.637" y="3.455"/>
-<path d="M45.023,12.962l2.573-2.569c0.853-0.854,0.853-2.235,0-3.088l-1.03-1.027c-0.854-0.852-2.232-0.852-3.086,0 l-2.571,2.57L45.023,12.962z" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M30,44.908c-10.828,0-19.638-8.805-19.638-19.636c0-10.825,8.81-19.638,19.638-19.638 s19.639,8.813,19.639,19.638C49.639,36.104,40.828,44.908,30,44.908L30,44.908z" fill-opacity="0.15" stroke-opacity="0.15"/>
-<path d="M30,44.181c-10.828,0-19.638-8.805-19.638-19.636c0-10.825,8.81-19.637,19.638-19.637 s19.639,8.812,19.639,19.637C49.639,35.376,40.828,44.181,30,44.181L30,44.181z" fill-opacity="0.15" stroke-opacity="0.15"/>
-<path d="M30,43.453c-10.828,0-19.638-8.805-19.638-19.635c0-10.826,8.81-19.638,19.638-19.638 s19.639,8.812,19.639,19.638C49.639,34.648,40.828,43.453,30,43.453L30,43.453z" fill-opacity="0.15" stroke-opacity="0.15"/>
+<path d="M45.023,12.962l2.573-2.569c0.853-0.854,0.853-2.235,0-3.088l-1.03-1.027c-0.854-0.852-2.232-0.852-3.086,0 l-2.571,2.57L45.023,12.962z" opacity="0.3"/>
+<path d="M30,44.908c-10.828,0-19.638-8.805-19.638-19.636c0-10.825,8.81-19.638,19.638-19.638 s19.639,8.813,19.639,19.638C49.639,36.104,40.828,44.908,30,44.908L30,44.908z" opacity="0.15"/>
+<path d="M30,44.181c-10.828,0-19.638-8.805-19.638-19.636c0-10.825,8.81-19.637,19.638-19.637 s19.639,8.812,19.639,19.637C49.639,35.376,40.828,44.181,30,44.181L30,44.181z" opacity="0.15"/>
+<path d="M30,43.453c-10.828,0-19.638-8.805-19.638-19.635c0-10.826,8.81-19.638,19.638-19.638 s19.639,8.812,19.639,19.638C49.639,34.648,40.828,43.453,30,43.453L30,43.453z" opacity="0.15"/>
<path d="M30,42.727c-10.426,0-18.908-8.48-18.908-18.908c0-10.426,8.482-18.91,18.908-18.91 s18.908,8.484,18.908,18.91C48.908,34.246,40.426,42.727,30,42.727L30,42.727z" fill="#BDBDBD"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="29.999" x2="29.999" y1="6.3638" y2="42.0003">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#D4D4D4"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#D4D4D4"/>
</linearGradient>
<circle cx="29.999" cy="23.818" fill="url(#SVGID_4_)" r="18.181"/>
<path d="M30,30.461c-3.662,0-6.644-2.979-6.644-6.643c0-3.662,2.981-6.643,6.644-6.643 c3.663,0,6.645,2.98,6.645,6.643C36.645,27.482,33.663,30.461,30,30.461L30,30.461z" fill="#FFFFFF"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30" x2="30" y1="18.5815" y2="29.2736">
-<stop offset="0" style="stop-color:#A7A7A7"/>
-<stop offset="1" style="stop-color:#575757"/>
+ <stop offset="0" style="stop-color:#A7A7A7"/>
+ <stop offset="1" style="stop-color:#575757"/>
</linearGradient>
<circle cx="30" cy="23.818" fill="url(#SVGID_5_)" r="5.455"/>
-<path d="M30,27.818c-1.403,0-2.545-1.141-2.545-2.546c0-1.403,1.142-2.544,2.545-2.544s2.545,1.141,2.545,2.544 C32.545,26.678,31.403,27.818,30,27.818L30,27.818z" fill-opacity="0.15" stroke-opacity="0.15"/>
-<path d="M30,27.091c-1.403,0-2.545-1.141-2.545-2.546c0-1.403,1.142-2.544,2.545-2.544s2.545,1.141,2.545,2.544 C32.545,25.95,31.403,27.091,30,27.091L30,27.091z" fill-opacity="0.15" stroke-opacity="0.15"/>
+<path d="M30,27.818c-1.403,0-2.545-1.141-2.545-2.546c0-1.403,1.142-2.544,2.545-2.544s2.545,1.141,2.545,2.544 C32.545,26.678,31.403,27.818,30,27.818L30,27.818z" opacity="0.15"/>
+<path d="M30,27.091c-1.403,0-2.545-1.141-2.545-2.546c0-1.403,1.142-2.544,2.545-2.544s2.545,1.141,2.545,2.544 C32.545,25.95,31.403,27.091,30,27.091L30,27.091z" opacity="0.15"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="30" x2="30" y1="21.2734" y2="25.8797">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="1" style="stop-color:#9C9C9C"/>
+ <stop offset="0" style="stop-color:#F2F2F2"/>
+ <stop offset="1" style="stop-color:#9C9C9C"/>
</linearGradient>
<path d="M30,26.363c-1.403,0-2.545-1.141-2.545-2.545s1.142-2.545,2.545-2.545s2.545,1.141,2.545,2.545 S31.403,26.363,30,26.363L30,26.363z" fill="url(#SVGID_6_)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 0 1816.916)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="30" x2="30" y1="1776.7061" y2="1793.0983">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#BFBFBF"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#BFBFBF"/>
</linearGradient>
<path d="M30,30.727c3.81,0,6.91-3.1,6.91-6.908h9.818c0,9.225-7.504,16.727-16.729,16.727 s-16.729-7.502-16.729-16.727h9.819C23.091,27.627,26.191,30.727,30,30.727z" fill="url(#SVGID_7_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="45.2734" x2="46.7285" y1="7.8184" y2="7.8184">
-<stop offset="0" style="stop-color:#F0F0F0"/>
-<stop offset="1" style="stop-color:#D4D4D4"/>
+ <stop offset="0" style="stop-color:#F0F0F0"/>
+ <stop offset="1" style="stop-color:#D4D4D4"/>
</linearGradient>
<path d="M46.729,7.816c0,0.406-0.325,0.73-0.729,0.73c-0.4,0-0.726-0.324-0.726-0.73 c0-0.402,0.325-0.727,0.726-0.727C46.403,7.09,46.729,7.414,46.729,7.816z" fill="url(#SVGID_8_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="48.1797" x2="50.3633" y1="54.728" y2="54.728">
-<stop offset="0" style="stop-color:#F0F0F0"/>
-<stop offset="1" style="stop-color:#D4D4D4"/>
+ <stop offset="0" style="stop-color:#F0F0F0"/>
+ <stop offset="1" style="stop-color:#D4D4D4"/>
</linearGradient>
<path d="M50.363,54.727c0,0.604-0.489,1.093-1.09,1.093c-0.603,0-1.094-0.489-1.094-1.093 c0-0.6,0.491-1.09,1.094-1.09C49.874,53.637,50.363,54.127,50.363,54.727z" fill="url(#SVGID_9_)"/>
-<path d="M25.234,48.957c-1.146,0-3.191-0.967-3.472-1.135c-0.158-0.096-3.782-2.328-2.635-4.234l0.034-0.057 l0.076-0.105l7.997-9.101c0.427-0.602,1.117-0.959,1.856-0.959c0.411,0,0.813,0.112,1.167,0.323 c1.021,0.617,1.392,1.911,0.858,2.969l-4.311,11.394l-0.035,0.058C26.436,48.668,25.888,48.957,25.234,48.957L25.234,48.957z" fill-opacity="0.15" stroke-opacity="0.15"/>
-<path d="M23.779,48.229c-1.146,0-3.19-0.966-3.471-1.134c-0.158-0.097-3.782-2.328-2.635-4.235l0.033-0.057 l0.077-0.104l7.996-9.102c0.428-0.602,1.117-0.959,1.857-0.959c0.41,0,0.813,0.112,1.166,0.324c1.022,0.616,1.393,1.91,0.859,2.969 l-4.311,11.393l-0.035,0.058C24.981,47.94,24.433,48.229,23.779,48.229L23.779,48.229z" fill-opacity="0.15" stroke-opacity="0.15"/>
+<path d="M25.234,48.957c-1.146,0-3.191-0.967-3.472-1.135c-0.158-0.096-3.782-2.328-2.635-4.234l0.034-0.057 l0.076-0.105l7.997-9.101c0.427-0.602,1.117-0.959,1.856-0.959c0.411,0,0.813,0.112,1.167,0.323 c1.021,0.617,1.392,1.911,0.858,2.969l-4.311,11.394l-0.035,0.058C26.436,48.668,25.888,48.957,25.234,48.957L25.234,48.957z" opacity="0.15"/>
+<path d="M23.779,48.229c-1.146,0-3.19-0.966-3.471-1.134c-0.158-0.097-3.782-2.328-2.635-4.235l0.033-0.057 l0.077-0.104l7.996-9.102c0.428-0.602,1.117-0.959,1.857-0.959c0.41,0,0.813,0.112,1.166,0.324c1.022,0.616,1.393,1.91,0.859,2.969 l-4.311,11.393l-0.035,0.058C24.981,47.94,24.433,48.229,23.779,48.229L23.779,48.229z" opacity="0.15"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="18.1836" x2="29.1768" y1="39.707" y2="39.707">
-<stop offset="0" style="stop-color:#8E8E8E"/>
-<stop offset="0.0364" style="stop-color:#8E8E8E"/>
-<stop offset="1" style="stop-color:#444444"/>
+ <stop offset="0.0364" style="stop-color:#8E8E8E"/>
+ <stop offset="1" style="stop-color:#444444"/>
</linearGradient>
<path d="M23.779,46.775c-0.917,0-2.807-0.857-3.097-1.031c-0.036-0.021-3.123-2.012-2.386-3.236l0.033-0.057 l8.024-9.132c0.285-0.421,0.771-0.681,1.283-0.681c0.278,0,0.553,0.076,0.792,0.22c0.705,0.426,0.95,1.331,0.567,2.049l-4.302,11.37 l-0.034,0.057C24.562,46.499,24.315,46.775,23.779,46.775L23.779,46.775z" fill="url(#SVGID_10_)"/>
<linearGradient gradientTransform="matrix(0.5666 0.3407 -0.3408 0.5666 193.5584 513.624)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="-588.8296" x2="-588.8296" y1="-492.9287" y2="-472.7992">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#CCCCCC"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#CCCCCC"/>
</linearGradient>
<path d="M24.038,45.959c-0.233,0.387-2.597-0.607-2.981-0.838l0,0c-0.384-0.234-2.37-1.852-2.137-2.238 l8.016-9.123c0.234-0.385,0.736-0.508,1.12-0.277l0,0c0.385,0.232,0.509,0.732,0.28,1.117L24.038,45.959z" fill="url(#SVGID_11_)"/>
<linearGradient gradientTransform="matrix(0.5666 0.3407 -0.3408 0.5666 193.5584 513.624)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="-588.8315" x2="-588.8315" y1="-477.6504" y2="-473.626">
-<stop offset="0" style="stop-color:#444444"/>
-<stop offset="0.5455" style="stop-color:#8E8E8E"/>
-<stop offset="1" style="stop-color:#444444"/>
+ <stop offset="0" style="stop-color:#444444"/>
+ <stop offset="0.5455" style="stop-color:#8E8E8E"/>
+ <stop offset="1" style="stop-color:#444444"/>
</linearGradient>
<path d="M23.201,44.189c-0.384,0.643-1.219,0.852-1.863,0.463c-0.642-0.387-0.849-1.221-0.463-1.863 c0.389-0.641,1.221-0.848,1.863-0.463C23.381,42.715,23.588,43.547,23.201,44.189z" fill="url(#SVGID_12_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="9.6377" x2="11.8174" y1="54.728" y2="54.728">
-<stop offset="0" style="stop-color:#F0F0F0"/>
-<stop offset="1" style="stop-color:#D4D4D4"/>
+ <stop offset="0" style="stop-color:#F0F0F0"/>
+ <stop offset="1" style="stop-color:#D4D4D4"/>
</linearGradient>
<path d="M11.817,54.727c0,0.604-0.487,1.093-1.091,1.093c-0.599,0-1.089-0.489-1.089-1.093 c0-0.6,0.49-1.09,1.089-1.09C11.33,53.637,11.817,54.127,11.817,54.727z" fill="url(#SVGID_13_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="20.9092" x2="20.9092" y1="43.8174" y2="55.5303">
-<stop offset="0" style="stop-color:#8E8E8E"/>
-<stop offset="1" style="stop-color:#444444"/>
+ <stop offset="0" style="stop-color:#8E8E8E"/>
+ <stop offset="1" style="stop-color:#444444"/>
</linearGradient>
<path d="M14.002,55.527c-1.205,0-2.185-0.98-2.185-2.186V41.965c0-0.195,0.075-0.379,0.215-0.516 l2.387-2.387c0.142-0.141,0.328-0.213,0.514-0.213c0.184,0,0.362,0.064,0.501,0.201c3.761,3.598,8.684,5.67,13.863,5.84 C29.689,44.902,30,45.229,30,45.617v7.725c0,1.205-0.979,2.186-2.18,2.186H14.002z" fill="url(#SVGID_14_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="20.9092" x2="20.9092" y1="43.4331" y2="54.5986">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="1" style="stop-color:#9C9C9C"/>
+ <stop offset="0" style="stop-color:#F2F2F2"/>
+ <stop offset="1" style="stop-color:#9C9C9C"/>
</linearGradient>
<path d="M12.547,41.965v11.377c0,0.803,0.65,1.457,1.455,1.457H27.82c0.802,0,1.45-0.654,1.45-1.457V50 v-3.461v-0.922c-5.55-0.184-10.578-2.447-14.338-6.039L12.547,41.965z" fill="url(#SVGID_15_)"/>
-<path d="M14.933,39.578l-2.386,2.387v0.969l2.386-2.389c3.76,3.592,8.788,5.861,14.338,6.043v-0.049 v-0.922C23.721,45.434,18.692,43.17,14.933,39.578z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M14.933,39.578l-2.386,2.387v0.969l2.386-2.389c3.76,3.592,8.788,5.861,14.338,6.043v-0.049 v-0.922C23.721,45.434,18.692,43.17,14.933,39.578z" fill="#FFFFFF" opacity="0.5"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="26.7285" x2="26.7285" y1="48.6167" y2="52.1807">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#BFBFBF"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#BFBFBF"/>
</linearGradient>
<path d="M26.729,52.181c-1.003,0-1.819-0.815-1.819-1.817c0-1.003,0.816-1.819,1.819-1.819 s1.819,0.816,1.819,1.819C28.548,51.365,27.731,52.181,26.729,52.181L26.729,52.181z" fill="url(#SVGID_16_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="26.7275" x2="26.7275" y1="49.3149" y2="51.453">
-<stop offset="0" style="stop-color:#8E8E8E"/>
-<stop offset="0.0364" style="stop-color:#8E8E8E"/>
-<stop offset="1" style="stop-color:#444444"/>
+ <stop offset="0.0364" style="stop-color:#8E8E8E"/>
+ <stop offset="1" style="stop-color:#444444"/>
</linearGradient>
<path d="M27.82,50.363c0,0.605-0.492,1.09-1.092,1.09c-0.604,0-1.093-0.484-1.093-1.09 c0-0.602,0.489-1.092,1.093-1.092C27.328,49.271,27.82,49.762,27.82,50.363z" fill="url(#SVGID_17_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="15.0928" x2="15.0928" y1="42.0718" y2="45.6377">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#BFBFBF"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#BFBFBF"/>
</linearGradient>
<path d="M15.092,45.638c-1.002,0-1.816-0.817-1.816-1.821c0-1.002,0.814-1.817,1.816-1.817 c1.003,0,1.817,0.815,1.817,1.817C16.909,44.82,16.095,45.638,15.092,45.638L15.092,45.638z" fill="url(#SVGID_18_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="15.0918" x2="15.0918" y1="42.77" y2="44.91">
-<stop offset="0" style="stop-color:#8E8E8E"/>
-<stop offset="0.0364" style="stop-color:#8E8E8E"/>
-<stop offset="1" style="stop-color:#444444"/>
+ <stop offset="0.0364" style="stop-color:#8E8E8E"/>
+ <stop offset="1" style="stop-color:#444444"/>
</linearGradient>
<path d="M16.182,43.816c0,0.605-0.487,1.094-1.09,1.094c-0.604,0-1.09-0.488-1.09-1.094 c0-0.598,0.486-1.09,1.09-1.09C15.694,42.727,16.182,43.219,16.182,43.816z" fill="url(#SVGID_19_)"/>
-<path d="M33.564,56.036c-1.056,0-1.914-0.859-1.914-1.915v-4.75c0-1.057,0.858-1.917,1.914-1.917h14.254 c1.056,0,1.915,0.86,1.915,1.917v3.749l-0.642,0.077c-0.781,0.093-1.37,0.75-1.37,1.529c0,0.119,0.02,0.251,0.058,0.394l0.247,0.916 H33.564z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M33.564,56.036c-1.056,0-1.914-0.859-1.914-1.915v-4.75c0-1.057,0.858-1.917,1.914-1.917h14.254 c1.056,0,1.915,0.86,1.915,1.917v3.749l-0.642,0.077c-0.781,0.093-1.37,0.75-1.37,1.529c0,0.119,0.02,0.251,0.058,0.394l0.247,0.916 H33.564z" opacity="0.35"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="40.6914" x2="40.6914" y1="48.2568" y2="55.137">
-<stop offset="0" style="stop-color:#FAFFC7"/>
-<stop offset="1" style="stop-color:#EE971E"/>
+ <stop offset="0" style="stop-color:#FAFFC7"/>
+ <stop offset="1" style="stop-color:#EE971E"/>
</linearGradient>
<path d="M49.006,52.475v-3.104c0-0.658-0.529-1.189-1.188-1.189H33.564c-0.658,0-1.188,0.531-1.188,1.189 v4.75c0,0.656,0.529,1.188,1.188,1.188h13.513c-0.05-0.185-0.083-0.381-0.083-0.582C46.994,53.564,47.874,52.609,49.006,52.475z" fill="url(#SVGID_20_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="40.6914" x2="40.6914" y1="48.9683" y2="54.4456">
-<stop offset="0" style="stop-color:#F9E169"/>
-<stop offset="1" style="stop-color:#ED8C0D"/>
+ <stop offset="0" style="stop-color:#F9E169"/>
+ <stop offset="1" style="stop-color:#ED8C0D"/>
</linearGradient>
<path d="M33.564,54.582c-0.254,0-0.46-0.207-0.46-0.461v-4.75c0-0.256,0.206-0.463,0.46-0.463h14.254 c0.254,0,0.46,0.207,0.46,0.463V51.9c-1.137,0.398-1.948,1.45-2.008,2.682H33.564z" fill="url(#SVGID_21_)"/>
<rect fill="none" height="60" width="60"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_media_transfer.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_media_transfer.svg Fri May 14 16:09:54 2010 +0300
@@ -1,71 +1,94 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<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"/>
+ <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="M56.506,7.6H3.493C2.666,7.6,2,8.27,2,9.094v41.813C2,51.732,2.666,52.4,3.493,52.4h53.013 C57.33,52.4,58,51.732,58,50.906V9.094C58,8.27,57.33,7.6,56.506,7.6z M8.719,49.413c0,0.412-0.336,0.748-0.745,0.748H4.986 c-0.412,0-0.748-0.336-0.748-0.748V47.92c0-0.41,0.336-0.746,0.748-0.746h2.987c0.409,0,0.745,0.336,0.745,0.746V49.413z M8.719,12.08c0,0.41-0.336,0.746-0.745,0.746H4.986c-0.412,0-0.748-0.336-0.748-0.746v-1.493c0-0.409,0.336-0.748,0.748-0.748 h2.987c0.409,0,0.745,0.339,0.745,0.748V12.08z M15.438,49.413c0,0.412-0.335,0.748-0.745,0.748h-2.987 c-0.412,0-0.747-0.336-0.747-0.748V47.92c0-0.41,0.335-0.746,0.747-0.746h2.987c0.41,0,0.745,0.336,0.745,0.746V49.413z M15.438,12.08c0,0.41-0.335,0.746-0.745,0.746h-2.987c-0.412,0-0.747-0.336-0.747-0.746v-1.493c0-0.409,0.335-0.748,0.747-0.748 h2.987c0.41,0,0.745,0.339,0.745,0.748V12.08z M22.159,49.413c0,0.412-0.337,0.748-0.747,0.748h-2.986 c-0.41,0-0.746-0.336-0.746-0.748V47.92c0-0.41,0.335-0.746,0.746-0.746h2.986c0.41,0,0.747,0.336,0.747,0.746V49.413z M22.159,12.08c0,0.41-0.337,0.746-0.747,0.746h-2.986c-0.41,0-0.746-0.336-0.746-0.746v-1.493c0-0.409,0.335-0.748,0.746-0.748 h2.986c0.41,0,0.747,0.339,0.747,0.748V12.08z M28.88,49.413c0,0.412-0.337,0.748-0.747,0.748h-2.986 c-0.411,0-0.746-0.336-0.746-0.748V47.92c0-0.41,0.335-0.746,0.746-0.746h2.986c0.41,0,0.747,0.336,0.747,0.746V49.413z M28.88,12.08c0,0.41-0.337,0.746-0.747,0.746h-2.986c-0.411,0-0.746-0.336-0.746-0.746v-1.493c0-0.409,0.335-0.748,0.746-0.748 h2.986c0.41,0,0.747,0.339,0.747,0.748V12.08z M35.6,49.413c0,0.412-0.338,0.748-0.747,0.748h-2.985 c-0.412,0-0.748-0.336-0.748-0.748V47.92c0-0.41,0.336-0.746,0.748-0.746h2.985c0.409,0,0.747,0.336,0.747,0.746V49.413z M35.6,12.08c0,0.41-0.338,0.746-0.747,0.746h-2.985c-0.412,0-0.748-0.336-0.748-0.746v-1.493c0-0.409,0.336-0.748,0.748-0.748 h2.985c0.409,0,0.747,0.339,0.747,0.748V12.08z M42.318,49.413c0,0.412-0.335,0.748-0.745,0.748h-2.987 c-0.412,0-0.746-0.336-0.746-0.748V47.92c0-0.41,0.334-0.746,0.746-0.746h2.987c0.41,0,0.745,0.336,0.745,0.746V49.413z M42.318,12.08c0,0.41-0.335,0.746-0.745,0.746h-2.987c-0.412,0-0.746-0.336-0.746-0.746v-1.493c0-0.409,0.334-0.748,0.746-0.748 h2.987c0.41,0,0.745,0.339,0.745,0.748V12.08z M49.039,49.413c0,0.412-0.336,0.748-0.746,0.748h-2.987 c-0.41,0-0.745-0.336-0.745-0.748V47.92c0-0.41,0.335-0.746,0.745-0.746h2.987c0.41,0,0.746,0.336,0.746,0.746V49.413z M49.039,12.08c0,0.41-0.336,0.746-0.746,0.746h-2.987c-0.41,0-0.745-0.336-0.745-0.746v-1.493c0-0.409,0.335-0.748,0.745-0.748 h2.987c0.41,0,0.746,0.339,0.746,0.748V12.08z M55.761,49.413c0,0.412-0.339,0.748-0.748,0.748h-2.987 c-0.41,0-0.745-0.336-0.745-0.748V47.92c0-0.41,0.335-0.746,0.745-0.746h2.987c0.409,0,0.748,0.336,0.748,0.746V49.413z M55.761,12.08c0,0.41-0.339,0.746-0.748,0.746h-2.987c-0.41,0-0.745-0.336-0.745-0.746v-1.493c0-0.409,0.335-0.748,0.745-0.748 h2.987c0.409,0,0.748,0.339,0.748,0.748V12.08z" fill="url(#SVGID_1_)"/>
-<path d="M56.506,7.6H3.493C2.666,7.6,2,8.27,2,9.094v0.745 c0-0.824,0.666-1.493,1.493-1.493h53.013C57.33,8.346,58,9.015,58,9.839V9.094C58,8.27,57.33,7.6,56.506,7.6z" fill="#FFFFFF" fill-opacity="0.55" stroke-opacity="0.55"/>
-<path d="M3.493,52.4h53.013C57.33,52.4,58,51.732,58,50.906v-0.745 c0,0.824-0.67,1.493-1.494,1.493H3.493C2.666,51.654,2,50.985,2,50.161v0.745C2,51.732,2.666,52.4,3.493,52.4z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M56.506,7.6H3.493C2.666,7.6,2,8.27,2,9.094v0.745 c0-0.824,0.666-1.493,1.493-1.493h53.013C57.33,8.346,58,9.015,58,9.839V9.094C58,8.27,57.33,7.6,56.506,7.6z" enable-background="new " fill="#FFFFFF" opacity="0.55"/>
+<path d="M3.493,52.4h53.013C57.33,52.4,58,51.732,58,50.906v-0.745 c0,0.824-0.67,1.493-1.494,1.493H3.493C2.666,51.654,2,50.985,2,50.161v0.745C2,51.732,2.666,52.4,3.493,52.4z" enable-background="new " fill="#FFFFFF" opacity="0.1"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2164" x2="-2164" y1="3641.7637" y2="3611.8926">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="0.5" style="stop-color:#666666"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="0.5" style="stop-color:#666666"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
<rect fill="url(#SVGID_2_)" height="29.871" width="56" x="2" y="15.064"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2164.0005" x2="-2164.0005" y1="3612.0117" y2="3641.8828">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</linearGradient>
<path d="M55.761,43.441c0,0.821-0.673,1.494-1.493,1.494H5.732c-0.82,0-1.494-0.673-1.494-1.494V16.559 c0-0.819,0.674-1.494,1.494-1.494h48.535c0.82,0,1.493,0.675,1.493,1.494V43.441z" fill="url(#SVGID_3_)"/>
-<path d="M54.268,43.441H5.732c-0.82,0-1.494,0.074-1.494-0.748l0,0 c0,0.822,0.674,1.493,1.494,1.493h48.535c0.82,0,1.493-0.671,1.493-1.493l0,0C55.761,43.516,55.088,43.441,54.268,43.441z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M54.268,43.441H5.732c-0.82,0-1.494,0.074-1.494-0.748l0,0 c0,0.822,0.674,1.493,1.494,1.493h48.535c0.82,0,1.493-0.671,1.493-1.493l0,0C55.761,43.516,55.088,43.441,54.268,43.441z" enable-background="new " fill="#FFFFFF" opacity="0.5"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-2164.0005" x2="-2164.0005" y1="3641.8828" y2="3611.8926">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#404040"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#404040"/>
</linearGradient>
<path d="M54.268,15.813c0.41,0,0.745,0.336,0.745,0.745v26.883c0,0.412-0.335,0.745-0.745,0.745H5.732 c-0.411,0-0.746-0.333-0.746-0.745V16.559c0-0.409,0.335-0.745,0.746-0.745H54.268 M54.268,15.064H5.732 c-0.82,0-1.494,0.675-1.494,1.494v26.883c0,0.821,0.674,1.494,1.494,1.494h48.535c0.82,0,1.493-0.673,1.493-1.494V16.559 C55.761,15.739,55.088,15.064,54.268,15.064L54.268,15.064z" fill="url(#SVGID_4_)"/>
-<path d="M54.268,24.025v-5.974c0-0.824-0.67-1.493-1.494-1.493H7.226 c-0.824,0-1.493,0.669-1.493,1.493v9.709L54.268,24.025z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M54.268,24.025v-5.974c0-0.824-0.67-1.493-1.494-1.493H7.226 c-0.824,0-1.493,0.669-1.493,1.493v9.709L54.268,24.025z" enable-background="new " fill="#FFFFFF" opacity="0.2"/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="17.44" x2="17.44" y1="11.62" y2="23.26">
+
<stop offset="0" stop-color="#C6FF45"/>
+
<stop offset="0.7273" stop-color="#66A00E"/>
+
<stop offset="1" stop-color="#387300"/>
+
</linearGradient>
<path d="M9,21l8.392-4.184v2.635l0.379-0.072c3.278-0.629,5.699-2.189,6.479-4.178,0.428-1.096,0.368-2.309-0.166-3.576,0.945,1.015,1.97,2.541,1.76,4.252-0.307,2.496-3.08,4.732-8.244,6.648l-0.21,0.07v2.58l-8.39-4.18z" fill="url(#SVGID_1__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="15.02" x2="15.02" y1="25.71" y2="21.02">
+
<stop offset="0" stop-color="#C6FF45"/>
+
<stop offset="1" stop-color="#66A00E"/>
+
</linearGradient>
<path d="M8.396,21.05l9.315,4.646v-2.875c1.562-0.58,2.855-1.173,3.926-1.771h-13.24z" fill="url(#SVGID_2__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="12.56" x2="12.56" y1="18.16" y2="4.52">
+
<stop offset="0" stop-color="#45E8FF"/>
+
<stop offset="0.5" stop-color="#30A4D5"/>
+
<stop offset="1" stop-color="#1347BA"/>
+
</linearGradient>
<path d="M5.916,17.78c-0.945-1.015-1.97-2.541-1.76-4.251,0.307-2.496,3.08-4.734,8.243-6.65l0.208-0.076v-2.581l8.391,4.185-8.391,4.183v-2.635l-0.379,0.072c-3.278,0.629-5.7,2.191-6.478,4.178-0.431,1.09-0.371,2.31,0.164,3.57z" fill="url(#SVGID_3__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="14.98" x2="14.98" y1="4.235" y2="7.602">
+
<stop offset="0" stop-color="#45E8FF"/>
+
<stop offset="1" stop-color="#30A4D5"/>
+
</linearGradient>
<path d="M21.6,8.352l-9.315-4.645v2.875c-1.561,0.579-2.855,1.172-3.925,1.77h13.25z" fill="url(#SVGID_4__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="12.76" x2="12.76" y1="4.036" y2="13.82">
+
<stop offset="0" stop-color="#93E1FF"/>
+
<stop offset="0.0061" stop-color="#93E1FF"/>
+
<stop offset="1" stop-color="#1185BF"/>
+
</linearGradient>
<path d="M12.61,4.223l8.391,4.185-8.391,4.183v-2.633l-0.379,0.072c-3.278,0.629-5.699,2.191-6.478,4.178-0.429,1.098-0.369,2.313,0.167,3.581-0.946-1.013-1.971-2.538-1.762-4.253,0.305-2.497,3.079-4.735,8.243-6.652l0.208-0.076v-2.589m-0.32-0.516v2.875c-15.41,5.718-5.108,12.75-5.108,12.75-3.553-4.822,0.214-8.051,5.106-8.988v2.766l9.427-4.7-9.43-4.703z" fill="url(#SVGID_5_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="17.24" x2="17.24" y1="14.93" y2="25.69">
+
<stop offset="0" stop-color="#C5FE45"/>
+
<stop offset="1" stop-color="#4B8B00"/>
+
</linearGradient>
<path d="M22.82,10.07c3.553,4.821-0.214,8.05-5.106,8.987v-2.765l-9.426,4.7,9.426,4.701v-2.875c15.41-5.72,5.11-12.75,5.11-12.75zm-5.22,12.45l-0.21,0.08v2.58l-8.39-4.18,8.392-4.184v2.635l0.379-0.072c3.278-0.629,5.7-2.189,6.479-4.178,0.428-1.096,0.368-2.309-0.166-3.576,0.945,1.015,1.971,2.541,1.76,4.252-0.3,2.49-3.08,4.72-8.24,6.64z" fill="url(#SVGID_6_)"/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_meeting.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_meeting.svg Fri May 14 16:09:54 2010 +0300
@@ -1,85 +1,84 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
-<stop offset="1" style="stop-color:#8D5837"/>
+ <stop offset="0" style="stop-color:#E8B888"/>
+ <stop offset="1" style="stop-color:#8D5837"/>
</linearGradient>
<path d="M1,30.709l6.997-17.846l7.236,3.014c0,0,7.392-2.457,9.202-2.545c0.512-0.024,0.941,0.068,1.294,0.16 c1.076,0.275,9.452,5.293,13.415,9.238c3.965,3.946,6.643,10.371,6.842,11.024c0.279,0.906,0.271,4.289-3.42,4.344 c0.434,1.955-1.031,4.778-3.91,4.67c0.598,2.063-1.629,5.321-4.563,4.453c0.297,0.914-0.426,2.207-1.1,2.644 c-1.131,0.732-1.598,0.732-2.596,0.399c-2.929-0.978-9.198-3.904-12.384-6.222c-3.494-2.54-6.045-4.525-7.53-7.096 c-0.768-1.33-2.823-3.258-3.765-3.909C5.59,32.255,1,30.709,1,30.709z" fill="url(#SVGID_1_)"/>
<radialGradient cx="1006.4844" cy="-265.7949" gradientTransform="matrix(0.7982 0 0 0.7982 -783.5864 230.4873)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="42.1015">
-<stop offset="0" style="stop-color:#F8E0C8"/>
-<stop offset="0.0909" style="stop-color:#F8E0C8"/>
-<stop offset="0.4182" style="stop-color:#F0C8A0"/>
-<stop offset="0.6364" style="stop-color:#E8B888"/>
-<stop offset="1" style="stop-color:#BE7749"/>
+ <stop offset="0.0909" style="stop-color:#F8E0C8"/>
+ <stop offset="0.4182" style="stop-color:#F0C8A0"/>
+ <stop offset="0.6364" style="stop-color:#E8B888"/>
+ <stop offset="1" style="stop-color:#BE7749"/>
</radialGradient>
<path d="M31.424,49.681c-0.18,0-0.402-0.051-0.771-0.173c-2.771-0.926-9.038-3.834-12.168-6.11 c-3.385-2.461-5.89-4.393-7.309-6.849c-0.882-1.528-3.074-3.525-4.002-4.168c-0.926-0.641-3.716-1.66-5.128-2.154l6.397-16.313 l6.759,2.815l0.283-0.094c2.027-0.674,7.594-2.438,8.988-2.505l0.13-0.003c0.344,0,0.647,0.065,0.926,0.138 c0.985,0.272,9.18,5.176,13.053,9.031c3.814,3.798,6.428,9.995,6.643,10.693c0.102,0.331,0.188,1.507-0.434,2.36 c-0.447,0.615-1.201,0.936-2.236,0.951l-0.98,0.015l0.213,0.956c0.186,0.834-0.084,1.857-0.688,2.609 c-0.4,0.499-1.121,1.093-2.283,1.093l-1.234-0.045l0.307,1.062c0.197,0.677-0.045,1.604-0.615,2.363 c-0.58,0.771-1.385,1.214-2.211,1.214c-0.242,0-0.492-0.037-0.74-0.111l-1.453-0.43l0.467,1.44c0.158,0.49-0.32,1.434-0.775,1.729 C31.938,49.598,31.656,49.681,31.424,49.681L31.424,49.681z" fill="url(#SVGID_2_)"/>
-<path d="M6.375,31.583c-0.744-0.516-2.684-1.271-4.152-1.807l-0.177,0.45 c1.412,0.494,4.202,1.514,5.128,2.154c0.389,0.27,1.001,0.782,1.645,1.393C7.916,32.822,6.925,31.964,6.375,31.583z" fill="#FFFFFF" fill-opacity="0.75" stroke-opacity="0.75"/>
-<path d="M45.225,33.989c-0.215-0.698-2.828-6.896-6.643-10.693c-0.127-0.125-0.27-0.255-0.404-0.383 c3.598,3.817,6.041,9.604,6.248,10.278c0.102,0.331,0.189,1.507-0.432,2.36c-0.449,0.615-1.201,0.935-2.238,0.95l-0.98,0.016 l0.213,0.956c0.186,0.833-0.084,1.857-0.688,2.609c-0.4,0.498-1.119,1.093-2.283,1.093l-1.232-0.045l0.307,1.062 c0.195,0.677-0.047,1.604-0.617,2.362c-0.578,0.771-1.385,1.215-2.211,1.215c-0.242,0-0.492-0.037-0.74-0.111l-1.451-0.43 l0.465,1.44c0.158,0.489-0.32,1.434-0.775,1.728c-0.623,0.403-0.904,0.486-1.137,0.486c-0.18,0-0.403-0.051-0.771-0.174 c-2.771-0.925-9.037-3.833-12.167-6.109c-1.894-1.377-3.5-2.588-4.806-3.818c1.422,1.515,3.304,2.944,5.604,4.616 c3.13,2.276,9.396,5.185,12.168,6.11c0.369,0.122,0.592,0.173,0.771,0.173c0.232,0,0.514-0.083,1.137-0.485 c0.455-0.295,0.934-1.238,0.775-1.729l-0.467-1.44l1.453,0.43c0.248,0.074,0.498,0.111,0.74,0.111c0.826,0,1.631-0.442,2.211-1.214 c0.57-0.759,0.813-1.687,0.615-2.363l-0.307-1.062l1.234,0.045c1.162,0,1.883-0.594,2.283-1.093 c0.604-0.752,0.873-1.775,0.688-2.609l-0.213-0.956l0.98-0.015c1.035-0.016,1.789-0.336,2.236-0.951 C45.412,35.496,45.326,34.32,45.225,33.989z" fill="#FFFFFF" fill-opacity="0.75" stroke-opacity="0.75"/>
-<path d="M45.986,33.755c-0.199-0.653-2.877-7.078-6.842-11.024c-3.963-3.945-12.339-8.963-13.415-9.238 c-0.353-0.092-0.782-0.185-1.294-0.16c-0.219,0.01-0.521,0.057-0.878,0.128c-0.379,0.268-0.681,0.506-0.853,0.688l-0.221,0.234 c-0.548,0.579-0.943,0.997-1.234,1.684c-0.734,1.733-0.737,3.109-0.741,4.565c-0.002,1.01-0.005,2.053-0.25,3.343l-0.074,0.386 c-0.488,2.497-0.874,5.024,0.204,6.103c0.537,0.537,1.349,0.833,2.285,0.833c0.669,0,1.31-0.153,1.801-0.43 c0.87-0.488,2.979-1.837,3.788-3.815c0.616-1.509,0.699-2.717,0.766-3.688c0.049-0.721,0.089-1.291,0.335-1.741 c0.157-0.287,0.257-0.345,0.827-0.646c0.156-0.083,0.333-0.176,0.538-0.29c0.57-0.318,1.422-0.882,1.67-1.048 c0.113-0.044,0.162-0.049,0.178-0.049c0.102,0,0.457,0.214,0.77,0.403c0.057,0.034,0.158,0.088,0.305,0.161 c0.906,0.461,3.668,1.861,6.061,4.917c4.135,5.275,4.887,7.494,5.248,8.56c0.135,0.394,0.148,0.75,0.162,1.298 c0.018,0.685-0.426,1.299-0.762,1.701l-0.34,0.438l0.215,0.459c0.021,0.047,0.068,0.114,0.127,0.183 C46.244,36.786,46.209,34.479,45.986,33.755z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M6.375,31.583c-0.744-0.516-2.684-1.271-4.152-1.807l-0.177,0.45 c1.412,0.494,4.202,1.514,5.128,2.154c0.389,0.27,1.001,0.782,1.645,1.393C7.916,32.822,6.925,31.964,6.375,31.583z" fill="#FFFFFF" opacity="0.75"/>
+<path d="M45.225,33.989c-0.215-0.698-2.828-6.896-6.643-10.693c-0.127-0.125-0.27-0.255-0.404-0.383 c3.598,3.817,6.041,9.604,6.248,10.278c0.102,0.331,0.189,1.507-0.432,2.36c-0.449,0.615-1.201,0.935-2.238,0.95l-0.98,0.016 l0.213,0.956c0.186,0.833-0.084,1.857-0.688,2.609c-0.4,0.498-1.119,1.093-2.283,1.093l-1.232-0.045l0.307,1.062 c0.195,0.677-0.047,1.604-0.617,2.362c-0.578,0.771-1.385,1.215-2.211,1.215c-0.242,0-0.492-0.037-0.74-0.111l-1.451-0.43 l0.465,1.44c0.158,0.489-0.32,1.434-0.775,1.728c-0.623,0.403-0.904,0.486-1.137,0.486c-0.18,0-0.403-0.051-0.771-0.174 c-2.771-0.925-9.037-3.833-12.167-6.109c-1.894-1.377-3.5-2.588-4.806-3.818c1.422,1.515,3.304,2.944,5.604,4.616 c3.13,2.276,9.396,5.185,12.168,6.11c0.369,0.122,0.592,0.173,0.771,0.173c0.232,0,0.514-0.083,1.137-0.485 c0.455-0.295,0.934-1.238,0.775-1.729l-0.467-1.44l1.453,0.43c0.248,0.074,0.498,0.111,0.74,0.111c0.826,0,1.631-0.442,2.211-1.214 c0.57-0.759,0.813-1.687,0.615-2.363l-0.307-1.062l1.234,0.045c1.162,0,1.883-0.594,2.283-1.093 c0.604-0.752,0.873-1.775,0.688-2.609l-0.213-0.956l0.98-0.015c1.035-0.016,1.789-0.336,2.236-0.951 C45.412,35.496,45.326,34.32,45.225,33.989z" fill="#FFFFFF" opacity="0.75"/>
+<path d="M45.986,33.755c-0.199-0.653-2.877-7.078-6.842-11.024c-3.963-3.945-12.339-8.963-13.415-9.238 c-0.353-0.092-0.782-0.185-1.294-0.16c-0.219,0.01-0.521,0.057-0.878,0.128c-0.379,0.268-0.681,0.506-0.853,0.688l-0.221,0.234 c-0.548,0.579-0.943,0.997-1.234,1.684c-0.734,1.733-0.737,3.109-0.741,4.565c-0.002,1.01-0.005,2.053-0.25,3.343l-0.074,0.386 c-0.488,2.497-0.874,5.024,0.204,6.103c0.537,0.537,1.349,0.833,2.285,0.833c0.669,0,1.31-0.153,1.801-0.43 c0.87-0.488,2.979-1.837,3.788-3.815c0.616-1.509,0.699-2.717,0.766-3.688c0.049-0.721,0.089-1.291,0.335-1.741 c0.157-0.287,0.257-0.345,0.827-0.646c0.156-0.083,0.333-0.176,0.538-0.29c0.57-0.318,1.422-0.882,1.67-1.048 c0.113-0.044,0.162-0.049,0.178-0.049c0.102,0,0.457,0.214,0.77,0.403c0.057,0.034,0.158,0.088,0.305,0.161 c0.906,0.461,3.668,1.861,6.061,4.917c4.135,5.275,4.887,7.494,5.248,8.56c0.135,0.394,0.148,0.75,0.162,1.298 c0.018,0.685-0.426,1.299-0.762,1.701l-0.34,0.438l0.215,0.459c0.021,0.047,0.068,0.114,0.127,0.183 C46.244,36.786,46.209,34.479,45.986,33.755z" opacity="0.35"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="29.8706" x2="45.9676" y1="11.2334" y2="36.3762">
-<stop offset="0" style="stop-color:#E8B888"/>
-<stop offset="1" style="stop-color:#8D5837"/>
+ <stop offset="0" style="stop-color:#E8B888"/>
+ <stop offset="1" style="stop-color:#8D5837"/>
</linearGradient>
<path d="M59,27.916l-8.115-16.495l-7.504,3.165c0,0-7.693-4.752-9.484-5.024 c-0.508-0.076-0.945-0.026-1.305,0.028c-1.098,0.164-8.218,3.945-9.304,5.104c-0.66,0.704-1.037,1.056-1.303,1.685 c-1.16,2.737-0.326,4.507-0.942,7.746c-0.278,1.47-1.034,4.831-0.09,5.774c0.76,0.761,2.31,0.734,3.131,0.271 c0.579-0.325,2.698-1.605,3.439-3.421c1.05-2.57,0.419-4.194,1.141-5.512c0.347-0.632,0.697-0.704,1.675-1.249 c0.64-0.356,1.683-1.059,1.683-1.059c0.643-0.272,0.869-0.146,1.738,0.38c0.389,0.235,3.746,1.652,6.58,5.268 c4.199,5.357,4.996,7.675,5.375,8.797c0.178,0.521,0.191,0.993,0.205,1.534c0.023,0.988-0.584,1.796-0.947,2.23 c-0.098,0.119,0.234,0.078,0.336,0.064c1.34-0.19,3.068-2.092,3.395-2.58c0.324-0.488,2.117-2.229,2.66-2.715 C52.395,30.984,59,27.916,59,27.916z" fill="url(#SVGID_3_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="39.6035" x2="39.6035" y1="11.3853" y2="33.4196">
-<stop offset="0" style="stop-color:#F8E0C8"/>
-<stop offset="0.1455" style="stop-color:#F8E0C8"/>
-<stop offset="0.3576" style="stop-color:#F0C8A0"/>
-<stop offset="0.5697" style="stop-color:#E8B888"/>
-<stop offset="1" style="stop-color:#BE7749"/>
+ <stop offset="0.1455" style="stop-color:#F8E0C8"/>
+ <stop offset="0.3576" style="stop-color:#F0C8A0"/>
+ <stop offset="0.5697" style="stop-color:#E8B888"/>
+ <stop offset="1" style="stop-color:#BE7749"/>
</linearGradient>
<path d="M46.656,35.595c0.043-0.224,0.066-0.46,0.061-0.706c-0.014-0.554-0.027-1.127-0.244-1.77 c-0.391-1.15-1.201-3.545-5.504-9.034c-2.613-3.333-5.611-4.854-6.598-5.354c-0.094-0.048-0.16-0.082-0.199-0.104 c-0.631-0.382-1.049-0.634-1.596-0.634c-0.268,0-0.535,0.063-0.865,0.202l-0.07,0.029l-0.064,0.043 c-0.01,0.007-1.024,0.688-1.627,1.025c-0.191,0.106-0.358,0.194-0.505,0.272c-0.632,0.334-1.089,0.574-1.48,1.289 c-0.416,0.76-0.47,1.557-0.528,2.401c-0.062,0.901-0.132,1.922-0.65,3.192c-0.506,1.235-1.929,2.373-3.091,3.026 c-0.248,0.14-0.638,0.226-1.021,0.226c-0.495,0-0.928-0.137-1.156-0.365c-0.377-0.376-0.298-1.946,0.233-4.668l0.076-0.394 c0.273-1.436,0.275-2.604,0.278-3.637c0.003-1.347,0.006-2.51,0.614-3.947c0.179-0.421,0.428-0.684,0.924-1.209l0.227-0.24 c0.938-1.001,7.839-4.691,8.843-4.859c0.197-0.03,0.414-0.059,0.652-0.059c0.129,0,0.268,0.009,0.412,0.03 c1.186,0.18,6.264,3.109,9.184,4.914l0.35,0.217l7.191-3.033l7.422,15.089c-1.912,0.902-6.18,2.959-7.094,3.775 c-0.432,0.387-2.379,2.246-2.791,2.867C47.857,34.452,47.287,35.074,46.656,35.595L46.656,35.595z" fill="url(#SVGID_4_)"/>
-<path d="M26.854,43.412c0.38-0.857,0.549-2.018-1.039-3.516c-1.023-0.965-1.958-1.436-2.854-1.436 c-0.119,0-0.234,0.009-0.344,0.024c0.087-0.882-0.194-1.889-1.489-2.972c-0.917-0.768-1.969-1.189-2.962-1.189 c-0.208,0-0.411,0.019-0.606,0.056c-0.023-1.094-0.664-2.025-1.983-3.006c-0.747-0.556-1.516-0.837-2.283-0.837 c-0.83,0-1.648,0.329-2.433,0.979l-0.127,0.104c-0.866,0.717-2.014,1.67-2.574,2.625c0.89,0.835,1.853,1.881,2.325,2.701 c1.485,2.57,4.036,4.556,7.53,7.096c2.586,1.881,7.201,4.162,10.414,5.478c1.007-1.348,1.659-3.19,0.548-4.461 C28.188,44.157,27.498,43.62,26.854,43.412z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M26.854,43.412c0.38-0.857,0.549-2.018-1.039-3.516c-1.023-0.965-1.958-1.436-2.854-1.436 c-0.119,0-0.234,0.009-0.344,0.024c0.087-0.882-0.194-1.889-1.489-2.972c-0.917-0.768-1.969-1.189-2.962-1.189 c-0.208,0-0.411,0.019-0.606,0.056c-0.023-1.094-0.664-2.025-1.983-3.006c-0.747-0.556-1.516-0.837-2.283-0.837 c-0.83,0-1.648,0.329-2.433,0.979l-0.127,0.104c-0.866,0.717-2.014,1.67-2.574,2.625c0.89,0.835,1.853,1.881,2.325,2.701 c1.485,2.57,4.036,4.556,7.53,7.096c2.586,1.881,7.201,4.162,10.414,5.478c1.007-1.348,1.659-3.19,0.548-4.461 C28.188,44.157,27.498,43.62,26.854,43.412z" opacity="0.35"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="10.3682" x2="27.0654" y1="32.7324" y2="49.4296">
-<stop offset="0" style="stop-color:#E8B888"/>
-<stop offset="1" style="stop-color:#8D5837"/>
+ <stop offset="0" style="stop-color:#E8B888"/>
+ <stop offset="1" style="stop-color:#8D5837"/>
</linearGradient>
<path d="M8.715,34.899c0.399-0.931,1.771-2.036,2.655-2.769c1.198-0.993,2.428-1.084,3.73-0.116 c1.846,1.372,2.013,2.401,1.197,4.066c1.015-1.415,2.894-1.147,4.318,0.045c1.843,1.542,1.169,2.698,0.684,3.902 c0.734-0.506,1.74-1.65,3.968,0.449c2.019,1.905,0.559,2.737,0.199,3.994c0.559-0.559,1.358-0.659,2.909,1.113 c0.96,1.098-0.105,2.851-0.661,3.565c-0.476,0.612-1.67,1.419-2.908,0.85c-2.462-1.132-6.817-3.681-11.059-7.068 C7.627,38.04,8.159,36.197,8.715,34.899z" fill="url(#SVGID_5_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="21.4702" x2="16.5483" y1="37.8623" y2="44.0481">
-<stop offset="0" style="stop-color:#F8E0C8"/>
-<stop offset="0.1091" style="stop-color:#F8E0C8"/>
-<stop offset="0.3212" style="stop-color:#F0C8A0"/>
-<stop offset="0.5273" style="stop-color:#E8B888"/>
-<stop offset="1" style="stop-color:#BE7749"/>
+ <stop offset="0.1091" style="stop-color:#F8E0C8"/>
+ <stop offset="0.3212" style="stop-color:#F0C8A0"/>
+ <stop offset="0.5273" style="stop-color:#E8B888"/>
+ <stop offset="1" style="stop-color:#BE7749"/>
</linearGradient>
<path d="M25.68,49.396c-0.186,0-0.362-0.039-0.539-0.12c-2.361-1.087-6.632-3.563-10.895-6.967 c-5.838-4.666-5.187-6.186-4.798-7.095c0.305-0.71,1.556-1.744,2.303-2.362l0.128-0.107c0.497-0.41,0.959-0.61,1.414-0.61 c0.423,0,1.226,0.357,1.683,0.729c1.072,0.873,1.247,1.347,1.297,1.796c0.05,0.448-0.299,1.596-0.398,2.045 c0.474-0.324,1.78-0.784,2.292-0.784c0.61,0,1.316,0.299,1.938,0.818c1.259,1.054,1.182,1.163,1.057,2.161 c0,0-0.448,1.321-0.573,1.796c1.197-0.1,1.646-0.873,2.373-0.638c0.434,0.14,1.064,0.346,1.759,1.001 c1.071,1.011,1.071,1.202,0.807,2.056c-0.225,0.724-0.848,2.096-0.848,2.096s1.247-0.449,1.546-0.424 c0.309,0.025,0.55,0.181,1.551,1.324c0.54,0.618-0.216,1.938-0.69,2.551C26.855,48.957,26.291,49.396,25.68,49.396L25.68,49.396z" fill="url(#SVGID_6_)"/>
-<path d="M26.274,45.385c0.324,0.149,0.5,0.38,1.501,1.523c0.055,0.063,0.087,0.137,0.116,0.211 c0.104-0.389,0.104-0.758-0.116-1.009c-1.001-1.144-1.242-1.299-1.551-1.324c-0.188-0.016-0.747,0.154-1.139,0.284 C25.526,45.234,26.002,45.259,26.274,45.385z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M22.961,40.855c0.434,0.141,1.064,0.347,1.759,1.001c0.498,0.47,0.759,0.762,0.874,1.026 c0.185-0.663,0.092-0.914-0.874-1.824c-0.694-0.655-1.325-0.861-1.759-1.001c-0.671-0.218-1.113,0.419-2.117,0.597 C21.686,40.596,22.234,40.62,22.961,40.855z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M9.448,36.012c0.305-0.71,1.556-1.744,2.303-2.362l0.128-0.106 c0.497-0.411,0.959-0.611,1.414-0.611c0.423,0,1.226,0.357,1.683,0.729c0.881,0.717,1.153,1.163,1.251,1.549 c0.038-0.22,0.061-0.418,0.046-0.551c-0.05-0.449-0.225-0.923-1.297-1.796c-0.457-0.372-1.26-0.729-1.683-0.729 c-0.455,0-0.917,0.2-1.414,0.61l-0.128,0.107c-0.747,0.618-1.998,1.652-2.303,2.362c-0.143,0.334-0.317,0.751-0.197,1.375 C9.298,36.366,9.378,36.178,9.448,36.012z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M18.166,36.719c0.61,0,1.316,0.298,1.938,0.817c0.704,0.589,0.983,0.885,1.077,1.204 c0.107-0.846,0.107-1.011-1.077-2.002c-0.622-0.52-1.328-0.818-1.938-0.818c-0.442,0-1.479,0.345-2.059,0.647 C16.771,36.555,17.654,36.719,18.166,36.719z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M26.274,45.385c0.324,0.149,0.5,0.38,1.501,1.523c0.055,0.063,0.087,0.137,0.116,0.211 c0.104-0.389,0.104-0.758-0.116-1.009c-1.001-1.144-1.242-1.299-1.551-1.324c-0.188-0.016-0.747,0.154-1.139,0.284 C25.526,45.234,26.002,45.259,26.274,45.385z" fill="#FFFFFF" opacity="0.5"/>
+<path d="M22.961,40.855c0.434,0.141,1.064,0.347,1.759,1.001c0.498,0.47,0.759,0.762,0.874,1.026 c0.185-0.663,0.092-0.914-0.874-1.824c-0.694-0.655-1.325-0.861-1.759-1.001c-0.671-0.218-1.113,0.419-2.117,0.597 C21.686,40.596,22.234,40.62,22.961,40.855z" fill="#FFFFFF" opacity="0.5"/>
+<path d="M9.448,36.012c0.305-0.71,1.556-1.744,2.303-2.362l0.128-0.106 c0.497-0.411,0.959-0.611,1.414-0.611c0.423,0,1.226,0.357,1.683,0.729c0.881,0.717,1.153,1.163,1.251,1.549 c0.038-0.22,0.061-0.418,0.046-0.551c-0.05-0.449-0.225-0.923-1.297-1.796c-0.457-0.372-1.26-0.729-1.683-0.729 c-0.455,0-0.917,0.2-1.414,0.61l-0.128,0.107c-0.747,0.618-1.998,1.652-2.303,2.362c-0.143,0.334-0.317,0.751-0.197,1.375 C9.298,36.366,9.378,36.178,9.448,36.012z" fill="#FFFFFF" opacity="0.5"/>
+<path d="M18.166,36.719c0.61,0,1.316,0.298,1.938,0.817c0.704,0.589,0.983,0.885,1.077,1.204 c0.107-0.846,0.107-1.011-1.077-2.002c-0.622-0.52-1.328-0.818-1.938-0.818c-0.442,0-1.479,0.345-2.059,0.647 C16.771,36.555,17.654,36.719,18.166,36.719z" fill="#FFFFFF" opacity="0.5"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="13.9106" x2="16.3579" y1="38.6328" y2="36.1855">
-<stop offset="0" style="stop-color:#C78456"/>
-<stop offset="1" style="stop-color:#CE9C70"/>
+ <stop offset="0" style="stop-color:#C78456"/>
+ <stop offset="1" style="stop-color:#CE9C70"/>
</linearGradient>
<path d="M16.04,36.188c0,0-1.247,1.945-2.146,2.594c0,0,1.796-1.396,2.495-2.494L16.04,36.188z" fill="url(#SVGID_7_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="18.6655" x2="21.0459" y1="42.6221" y2="40.2417">
-<stop offset="0" style="stop-color:#C78456"/>
-<stop offset="1" style="stop-color:#B6845C"/>
+ <stop offset="0" style="stop-color:#C78456"/>
+ <stop offset="1" style="stop-color:#B6845C"/>
</linearGradient>
<path d="M20.729,40.246c0,0-1.247,1.945-2.146,2.594c0,0,1.796-1.396,2.494-2.494L20.729,40.246z" fill="url(#SVGID_8_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="22.8228" x2="25.2036" y1="47.1455" y2="44.7647">
-<stop offset="0" style="stop-color:#C78456"/>
-<stop offset="1" style="stop-color:#A8744F"/>
+ <stop offset="0" style="stop-color:#C78456"/>
+ <stop offset="1" style="stop-color:#A8744F"/>
</linearGradient>
<path d="M24.853,44.802c0,0-1.247,1.946-2.145,2.595c0,0,1.796-1.397,2.494-2.494L24.853,44.802z" fill="url(#SVGID_9_)"/>
-<path d="M22.899,17.684c0,0,0.799-2.322,2.378-2.139c1.578,0.184-0.22,2.297-0.767,2.945 C23.965,19.139,22.056,19.74,22.899,17.684z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M22.899,17.684c0,0,0.799-2.322,2.378-2.139c1.578,0.184-0.22,2.297-0.767,2.945 C23.965,19.139,22.056,19.74,22.899,17.684z" fill="#FFFFFF" opacity="0.5"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="31.6387" x2="31.6387" y1="42.3877" y2="46.5357">
-<stop offset="0" style="stop-color:#C78456"/>
-<stop offset="1" style="stop-color:#8F5B39"/>
+ <stop offset="0" style="stop-color:#C78456"/>
+ <stop offset="1" style="stop-color:#8F5B39"/>
</linearGradient>
<path d="M33.209,46.856l0.367-0.499c0,0-3.244-3.044-3.876-4.008L33.209,46.856z" fill="url(#SVGID_10_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="39.9697" x2="39.9697" y1="33.8926" y2="37.6532">
-<stop offset="0" style="stop-color:#C78456"/>
-<stop offset="1" style="stop-color:#A8744F"/>
+ <stop offset="0" style="stop-color:#C78456"/>
+ <stop offset="1" style="stop-color:#A8744F"/>
</linearGradient>
<path d="M41.689,37.943l0.367-0.499c0,0-2.91-2.401-4.174-3.587L41.689,37.943z" fill="url(#SVGID_11_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="36.0439" x2="36.0439" y1="38.4482" y2="42.2097">
-<stop offset="0" style="stop-color:#C78456"/>
-<stop offset="1" style="stop-color:#9B6744"/>
+ <stop offset="0" style="stop-color:#C78456"/>
+ <stop offset="1" style="stop-color:#9B6744"/>
</linearGradient>
<path d="M37.766,42.5l0.365-0.499c0,0-2.908-2.402-4.174-3.588L37.766,42.5z" fill="url(#SVGID_12_)"/>
<rect fill="none" height="60" width="60"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_message.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_message.svg Fri May 14 16:09:54 2010 +0300
@@ -1,42 +1,44 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="9.8965" y2="49.8018">
-<stop offset="0" style="stop-color:#FEEFA7"/>
-<stop offset="0.5091" style="stop-color:#FFC501"/>
-<stop offset="1" style="stop-color:#F6A800"/>
+ <stop offset="0" style="stop-color:#FEEFA7"/>
+ <stop offset="0.5091" style="stop-color:#FFC501"/>
+ <stop offset="1" style="stop-color:#F6A800"/>
</linearGradient>
<polygon fill="url(#SVGID_1_)" points="58,50.4 2,50.4 2,9.6 30.463,10.4 58,9.6 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="9.7017" y2="50.6398">
-<stop offset="0" style="stop-color:#F7AC00"/>
-<stop offset="0.3394" style="stop-color:#FFF8DB"/>
-<stop offset="1" style="stop-color:#FFE066"/>
+ <stop offset="0" style="stop-color:#F7AC00"/>
+ <stop offset="0.3394" style="stop-color:#FFF8DB"/>
+ <stop offset="1" style="stop-color:#FFE066"/>
</linearGradient>
<path d="M57.385,10.22v39.56H2.613V10.22H57.385 M58,9.6L29.802,9.936L2,9.6v40.8h56V9.6L58,9.6z" fill="url(#SVGID_2_)"/>
-<polygon fill="#FBAB13" fill-opacity="0.3" points="2,49.71 58,49.71 58,48.916 29.998,24.328 2,48.916 " stroke-opacity="0.3"/>
-<polygon fill="#F18800" fill-opacity="0.3" points="2,50.4 58,50.4 58,49.603 29.998,25.019 2,49.603 " stroke-opacity="0.3"/>
+<polygon fill="#FBAB13" opacity="0.3" points="2,49.71 58,49.71 58,48.916 29.998,24.328 2,48.916 "/>
+<polygon fill="#F18800" opacity="0.3" points="2,50.4 58,50.4 58,49.603 29.998,25.019 2,49.603 "/>
<linearGradient gradientTransform="matrix(-1 0 0 -1 -1801.0049 1240.3164)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1831.0049" x2="-1831.0049" y1="1214.7607" y2="1190.0703">
-<stop offset="0" style="stop-color:#F98A00"/>
-<stop offset="0.7273" style="stop-color:#FCBC3C"/>
-<stop offset="1" style="stop-color:#FFE36A"/>
+ <stop offset="0" style="stop-color:#F98A00"/>
+ <stop offset="0.7273" style="stop-color:#FCBC3C"/>
+ <stop offset="1" style="stop-color:#FFE36A"/>
</linearGradient>
<polygon fill="url(#SVGID_3_)" points="58,50.38 29.998,25.689 2,50.38 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="30" x2="30" y1="25.4995" y2="51.0736">
-<stop offset="0" style="stop-color:#FFF1B5"/>
-<stop offset="1" style="stop-color:#FFE066"/>
+ <stop offset="0" style="stop-color:#FFF1B5"/>
+ <stop offset="1" style="stop-color:#FFE066"/>
</linearGradient>
<polygon fill="url(#SVGID_4_)" points="58,50.38 29.998,25.689 2,50.38 29.998,26.563 "/>
-<polygon fill="#F18800" fill-opacity="0.3" points="30.057,10.4 2,9.6 29.998,38.617 58,9.6 " stroke-opacity="0.3"/>
-<polygon fill="#C26D00" fill-opacity="0.4" points="30.006,10.4 2,9.6 29.998,37.091 58,9.6 " stroke-opacity="0.4"/>
-<polygon fill="#AB6100" fill-opacity="0.4" points="29.904,10.297 2,9.6 29.998,35.802 58,9.6 " stroke-opacity="0.4"/>
+<polygon fill="#F18800" opacity="0.3" points="30.057,10.4 2,9.6 29.998,38.617 58,9.6 "/>
+<polygon fill="#C26D00" opacity="0.4" points="30.006,10.4 2,9.6 29.998,37.091 58,9.6 "/>
+<polygon fill="#AB6100" opacity="0.4" points="29.904,10.297 2,9.6 29.998,35.802 58,9.6 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30" x2="30" y1="32.9619" y2="8.0088">
-<stop offset="0" style="stop-color:#FFDA33"/>
-<stop offset="0.25" style="stop-color:#FFE692"/>
-<stop offset="1" style="stop-color:#FFFBF8"/>
+ <stop offset="0" style="stop-color:#FFDA33"/>
+ <stop offset="0.25" style="stop-color:#FFE692"/>
+ <stop offset="1" style="stop-color:#FFFBF8"/>
</linearGradient>
<polygon fill="url(#SVGID_5_)" points="2,9.6 29.998,34.29 58,9.6 "/>
<rect fill="none" height="60" width="60"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_message_group.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_message_group.svg Fri May 14 16:09:54 2010 +0300
@@ -1,40 +1,42 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="9.8965" y2="49.8018">
-<stop offset="0" style="stop-color:#FEEFA7"/>
-<stop offset="0.5091" style="stop-color:#FFC501"/>
-<stop offset="1" style="stop-color:#F6A800"/>
+ <stop offset="0" style="stop-color:#FEEFA7"/>
+ <stop offset="0.5091" style="stop-color:#FFC501"/>
+ <stop offset="1" style="stop-color:#F6A800"/>
</linearGradient>
<polygon fill="url(#SVGID_1_)" points="58,50.4 2,50.4 2,9.6 30.463,10.4 58,9.6 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="9.7017" y2="50.6398">
-<stop offset="0" style="stop-color:#F7AC00"/>
-<stop offset="0.3394" style="stop-color:#FFF8DB"/>
-<stop offset="1" style="stop-color:#FFE066"/>
+ <stop offset="0" style="stop-color:#F7AC00"/>
+ <stop offset="0.3394" style="stop-color:#FFF8DB"/>
+ <stop offset="1" style="stop-color:#FFE066"/>
</linearGradient>
<path d="M57.385,10.22v39.56H2.613V10.22H57.385 M58,9.6L29.802,9.936L2,9.6v40.8h56V9.6L58,9.6z" fill="url(#SVGID_2_)"/>
-<polygon fill="#FBAB13" fill-opacity="0.3" points="2,49.71 58,49.71 58,48.916 29.998,24.328 2,48.916 " stroke-opacity="0.3"/>
-<polygon fill="#F18800" fill-opacity="0.3" points="2,50.4 58,50.4 58,49.603 29.998,25.019 2,49.603 " stroke-opacity="0.3"/>
+<polygon fill="#FBAB13" opacity="0.3" points="2,49.71 58,49.71 58,48.916 29.998,24.328 2,48.916 "/>
+<polygon fill="#F18800" opacity="0.3" points="2,50.4 58,50.4 58,49.603 29.998,25.019 2,49.603 "/>
<linearGradient gradientTransform="matrix(-1 0 0 -1 -1801.0049 1240.3164)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1831.0049" x2="-1831.0049" y1="1214.7607" y2="1190.0703">
-<stop offset="0" style="stop-color:#F98A00"/>
-<stop offset="0.7273" style="stop-color:#FCBC3C"/>
-<stop offset="1" style="stop-color:#FFE36A"/>
+ <stop offset="0" style="stop-color:#F98A00"/>
+ <stop offset="0.7273" style="stop-color:#FCBC3C"/>
+ <stop offset="1" style="stop-color:#FFE36A"/>
</linearGradient>
<polygon fill="url(#SVGID_3_)" points="58,50.38 29.998,25.689 2,50.38 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="30" x2="30" y1="25.4995" y2="51.0736">
-<stop offset="0" style="stop-color:#FFF1B5"/>
-<stop offset="1" style="stop-color:#FFE066"/>
+ <stop offset="0" style="stop-color:#FFF1B5"/>
+ <stop offset="1" style="stop-color:#FFE066"/>
</linearGradient>
<polygon fill="url(#SVGID_4_)" points="58,50.38 29.998,25.689 2,50.38 29.998,26.563 "/>
-<polygon fill="#F18800" fill-opacity="0.3" points="30.057,10.4 2,9.6 29.998,38.617 58,9.6 " stroke-opacity="0.3"/>
-<polygon fill="#C26D00" fill-opacity="0.4" points="30.006,10.4 2,9.6 29.998,37.091 58,9.6 " stroke-opacity="0.4"/>
-<polygon fill="#AB6100" fill-opacity="0.4" points="29.904,10.297 2,9.6 29.998,35.802 58,9.6 " stroke-opacity="0.4"/>
+<polygon fill="#F18800" opacity="0.3" points="30.057,10.4 2,9.6 29.998,38.617 58,9.6 "/>
+<polygon fill="#C26D00" opacity="0.4" points="30.006,10.4 2,9.6 29.998,37.091 58,9.6 "/>
+<polygon fill="#AB6100" opacity="0.4" points="29.904,10.297 2,9.6 29.998,35.802 58,9.6 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30" x2="30" y1="32.9619" y2="8.0088">
-<stop offset="0" style="stop-color:#FFDA33"/>
-<stop offset="0.25" style="stop-color:#FFE692"/>
-<stop offset="1" style="stop-color:#FFFBF8"/>
+ <stop offset="0" style="stop-color:#FFDA33"/>
+ <stop offset="0.25" style="stop-color:#FFE692"/>
+ <stop offset="1" style="stop-color:#FFFBF8"/>
</linearGradient>
<polygon fill="url(#SVGID_5_)" points="2,9.6 29.998,34.29 58,9.6 "/>
<rect fill="none" height="60" width="60"/>
@@ -42,181 +44,291 @@
<g transform="matrix(1 0 0 1 30 30)">
<rect fill="none" height="30" width="30"/>
<radialGradient cx="669.4" cy="-594.3" gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_1__" r="11.1">
+
<stop offset="0" stop-color="#FFA98E"/>
+
<stop offset="0.2" stop-color="#FFA98E"/>
+
<stop offset="0.96" stop-color="#D45D36"/>
+
<stop offset="1" stop-color="#D45D36"/>
+
</radialGradient>
<path d="M23.46,18.68c-0.521-0.226-0.506-1.339-0.291-1.675,0.038-0.059,0.072-0.117,0.107-0.176h-4.365c0.035,0.059,0.069,0.116,0.107,0.176,0.215,0.336,0.23,1.448-0.291,1.675-0.522,0.228,2.428,2.202,2.428,2.202s2.81-1.98,2.29-2.2z" fill="url(#SVGID_1__)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="669.2" x2="669.2" y1="-588.9" y2="-598.1">
+
<stop offset="0" stop-color="#3BC8EB"/>
+
<stop offset="0.39" stop-color="#2D9BD2"/>
+
<stop offset="0.89" stop-color="#1347BA"/>
+
<stop offset="1" stop-color="#1347BA"/>
+
</linearGradient>
<path d="M26.59,19.84c-0.549-0.286-3.27-1.238-3.322-1.299l-2.078,1.729-2.233-1.795c-0.063,0.092-2.752,1.035-3.374,1.365-0.713,0.377-1.877,1.246-1.877,3.207h14.76c0-1.97-1.33-2.93-1.88-3.21z" fill="url(#SVGID_2__)"/>
-<polygon fill="#020202" fill-opacity="0.3" points="18.45,18.69,21.19,20.88,23.77,18.74,23.27,18.54,21.19,20.27,18.96,18.47" stroke-opacity="0.3" style="enable-background:new;"/>
+<polygon fill="#020202" opacity="0.3" points="18.45,18.69,21.19,20.88,23.77,18.74,23.27,18.54,21.19,20.27,18.96,18.47" style="enable-background:new;"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="669.2" x2="669.2" y1="-594.1" y2="-589.1">
+
<stop offset="0" stop-color="#3BC8EB"/>
+
<stop offset="1" stop-color="#2D9BD2"/>
+
</linearGradient>
<polygon fill="url(#SVGID_3__)" points="21.19,20.88,18.45,18.69,18.29,18.76,21.19,21.07,23.93,18.8,23.77,18.74"/>
<radialGradient cx="669.9" cy="-573.8" gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_4__" r="14.9">
+
<stop offset="0" stop-color="#FFE2D9"/>
+
<stop offset="0.51" stop-color="#FFC6B3"/>
+
<stop offset="0.76" stop-color="#FFA98E"/>
+
<stop offset="1" stop-color="#E88160"/>
+
</radialGradient>
<path d="M24.71,13.56c-0.019-0.008-0.04-0.009-0.06-0.015v-0.001c-0.004-0.001-0.006-0.002-0.006-0.002-0.033-0.008-0.063-0.014-0.094-0.016-3.644-0.635-5.317-2.654-5.442-2.119-0.101,0.425-1.122,1.346-1.657,1.805,0.004,0.021,0.008,0.039,0.012,0.06,0,0,0.02,0.094,0.06,0.254-0.042,0.005-0.084,0.014-0.124,0.03-0.341,0.145-0.447,0.702-0.238,1.248,0.209,0.545,0.652,0.871,0.994,0.728,0.021-0.009,0.039-0.023,0.058-0.036,0.198,0.445,0.44,0.922,0.739,1.4,0.498,0.594,1.262,1.287,2.105,1.287,1.02,0,1.645-0.559,2.072-1.121,0.012-0.023,0.022-0.047,0.034-0.064,0.317-0.497,0.575-0.996,0.785-1.46,0.333,0.115,0.761-0.194,0.974-0.719,0.23-0.53,0.14-1.09-0.2-1.25z" fill="url(#SVGID_4__)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="666.5" x2="672.8" y1="-589.1" y2="-582.8">
+
<stop offset="0" stop-color="#FFC6B3"/>
+
<stop offset="1" stop-color="#FFA98E"/>
+
</linearGradient>
<path d="M20.91,17.9c-0.621,0-1.246-0.289-1.707-0.727,0.486,0.514,1.143,1.012,1.857,1.012,1.02,0,1.645-0.559,2.072-1.121,0.011-0.023,0.021-0.047,0.034-0.064,0.317-0.497,0.575-0.996,0.785-1.46-1.15,2.03-2.01,2.36-3.03,2.36z" fill="url(#SVGID_5__)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="669.1" x2="669.1" y1="-569.1" y2="-578.4">
+
<stop offset="0" stop-color="#8A5D3B"/>
+
<stop offset="0.38" stop-color="#632F00"/>
+
<stop offset="1" stop-color="#361700"/>
+
</linearGradient>
<path d="M20.95,8.483c-1.265,0-1.872,0.574-2.341,1.175-0.764,0.117-1.974,0.817-1.119,3.882,0.535-0.459,1.514-1.703,1.614-2.128,0.128-0.54,1.828,1.521,5.542,2.137,0.045-0.172,0.063-0.272,0.063-0.272,0.6-2.62-0.67-4.694-3.75-4.797z" fill="url(#SVGID_6_)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="672.2" x2="663.8" y1="-578" y2="-573">
+
<stop offset="0" stop-color="#8A5D3B"/>
+
<stop offset="0.36" stop-color="#632F00"/>
+
<stop offset="1" stop-color="#361700"/>
+
</linearGradient>
<path d="M19.11,11.16s1.818,2.389,5.512,2.384c0,0-1.73-0.27-5.51-2.38z" fill="url(#SVGID_7_)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="663.1" x2="663.1" y1="-572" y2="-577.3">
+
<stop offset="0" stop-color="#8A5D3B"/>
+
<stop offset="0.38" stop-color="#632F00"/>
+
<stop offset="1" stop-color="#361700"/>
+
</linearGradient>
<path d="M18.68,9.836s-1.78,0.106-1.12,3.123c0,0-0.22-2.07,1.12-3.124z" fill="url(#SVGID_8_)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="670.2" x2="670" y1="-569.9" y2="-572.3">
+
<stop offset="0" stop-color="#A87C4F"/>
+
<stop offset="1" stop-color="#632F00"/>
+
</linearGradient>
<path d="M21.82,10.25c-0.828-0.118-2.23-0.853-2.779-0.59,0,0,1.799-2.053,4.971,0.284,0,0.004-0.76,0.516-2.19,0.306z" fill="url(#SVGID_9_)"/>
<radialGradient cx="645" cy="-594.3" gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="11.1">
+
<stop offset="0" stop-color="#FFA98E"/>
+
<stop offset="0.2" stop-color="#FFA98E"/>
+
<stop offset="0.96" stop-color="#D45D36"/>
+
<stop offset="1" stop-color="#D45D36"/>
+
</radialGradient>
<path d="M11.28,18.68c-0.521-0.226-0.505-1.339-0.29-1.675,0.037-0.059,0.072-0.117,0.108-0.176h-4.371c0.035,0.059,0.069,0.116,0.107,0.176,0.215,0.336,0.23,1.448-0.29,1.675-0.523,0.228,2.427,2.202,2.427,2.202s2.827-1.98,2.307-2.2z" fill="url(#SVGID_10_)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="644.8" x2="644.8" y1="-588.9" y2="-598.1">
+
<stop offset="0" stop-color="#3BC8EB"/>
+
<stop offset="0.39" stop-color="#2D9BD2"/>
+
<stop offset="0.89" stop-color="#1347BA"/>
+
<stop offset="1" stop-color="#1347BA"/>
+
</linearGradient>
<path d="M14.42,19.84c-0.549-0.286-3.271-1.238-3.322-1.299l-2.079,1.729-2.233-1.795c-0.063,0.092-2.752,1.035-3.375,1.365-0.712,0.377-1.876,1.246-1.876,3.207h14.76c-0.01-1.97-1.34-2.93-1.88-3.21z" fill="url(#SVGID_11_)"/>
-<polygon fill="#020202" fill-opacity="0.3" points="6.272,18.69,9.015,20.88,11.59,18.74,11.09,18.54,9.015,20.27,6.781,18.47" stroke-opacity="0.3" style="enable-background:new;"/>
+<polygon fill="#020202" opacity="0.3" points="6.272,18.69,9.015,20.88,11.59,18.74,11.09,18.54,9.015,20.27,6.781,18.47" style="enable-background:new;"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="644.9" x2="644.9" y1="-594.1" y2="-589.1">
+
<stop offset="0" stop-color="#3BC8EB"/>
+
<stop offset="1" stop-color="#2D9BD2"/>
+
</linearGradient>
<polygon fill="url(#SVGID_12_)" points="9.015,20.88,6.271,18.69,6.113,18.76,9.015,21.07,11.75,18.8,11.59,18.74"/>
<radialGradient cx="645.6" cy="-573.8" gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_13_" r="14.9">
+
<stop offset="0" stop-color="#FFE2D9"/>
+
<stop offset="0.51" stop-color="#FFC6B3"/>
+
<stop offset="0.76" stop-color="#FFA98E"/>
+
<stop offset="1" stop-color="#E88160"/>
+
</radialGradient>
<path d="M12.53,13.56c-0.019-0.008-0.04-0.009-0.059-0.015v-0.001c-0.004-0.001-0.007-0.002-0.012-0.002-0.028-0.008-0.057-0.014-0.087-0.016-3.645-0.635-5.317-2.654-5.443-2.119-0.102,0.425-1.123,1.346-1.658,1.805,0.004,0.021,0.008,0.039,0.012,0.06,0,0,0.02,0.094,0.06,0.254-0.043,0.005-0.085,0.014-0.124,0.03-0.341,0.145-0.447,0.702-0.239,1.248,0.209,0.545,0.653,0.871,0.995,0.728,0.021-0.009,0.039-0.023,0.058-0.036,0.198,0.445,0.44,0.922,0.738,1.4,0.499,0.594,1.263,1.287,2.106,1.287,1.02,0,1.645-0.559,2.073-1.121,0.011-0.023,0.022-0.047,0.034-0.064,0.318-0.497,0.576-0.996,0.785-1.46,0.334,0.115,0.761-0.194,0.973-0.719,0.23-0.53,0.14-1.09-0.2-1.25z" fill="url(#SVGID_13_)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="642.2" x2="648.5" y1="-589.1" y2="-582.8">
+
<stop offset="0" stop-color="#FFC6B3"/>
+
<stop offset="1" stop-color="#FFA98E"/>
+
</linearGradient>
<path d="M8.729,17.9c-0.621,0-1.247-0.289-1.708-0.727,0.487,0.514,1.144,1.012,1.858,1.012,1.02,0,1.645-0.559,2.073-1.121,0.011-0.023,0.022-0.047,0.034-0.064,0.318-0.497,0.576-0.996,0.785-1.46-1.15,2.03-2.011,2.36-3.031,2.36z" fill="url(#SVGID_14_)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="644.7" x2="644.7" y1="-569.1" y2="-578.4">
+
<stop offset="0" stop-color="#8A5D3B"/>
+
<stop offset="0.38" stop-color="#632F00"/>
+
<stop offset="1" stop-color="#361700"/>
+
</linearGradient>
<path d="M8.776,8.483c-1.265,0-1.872,0.574-2.342,1.175-0.763,0.117-1.973,0.817-1.118,3.882,0.535-0.459,1.514-1.703,1.615-2.128,0.127-0.54,1.828,1.521,5.542,2.137,0.043-0.172,0.063-0.272,0.063-0.272,0.59-2.62-0.68-4.694-3.754-4.797z" fill="url(#SVGID_15_)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="647.9" x2="639.5" y1="-578" y2="-573">
+
<stop offset="0" stop-color="#8A5D3B"/>
+
<stop offset="0.36" stop-color="#632F00"/>
+
<stop offset="1" stop-color="#361700"/>
+
</linearGradient>
<path d="M6.936,11.16s1.818,2.389,5.513,2.384c0,0-1.74-0.27-5.514-2.38z" fill="url(#SVGID_16_)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="638.7" x2="638.8" y1="-572.3" y2="-577.7">
+
<stop offset="0" stop-color="#8A5D3B"/>
+
<stop offset="0.38" stop-color="#632F00"/>
+
<stop offset="1" stop-color="#361700"/>
+
</linearGradient>
<path d="M6.498,9.836s-1.779,0.106-1.119,3.123c0,0-0.218-2.07,1.119-3.124z" fill="url(#SVGID_17_)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="645.9" x2="645.6" y1="-569.9" y2="-572.3">
+
<stop offset="0" stop-color="#A87C4F"/>
+
<stop offset="1" stop-color="#632F00"/>
+
</linearGradient>
<path d="M9.639,10.25c-0.828-0.118-2.23-0.853-2.78-0.59,0,0,1.8-2.053,4.973,0.284,0,0.004-0.76,0.516-2.191,0.306z" fill="url(#SVGID_18_)"/>
-<path d="M23.32,20.43c-0.506-0.264-2.081-0.849-3.348-1.317l-0.711-0.265-0.128-0.053-0.166-0.063-0.317-0.128-0.196,0.086c-0.001,0.002-0.003,0.002-0.004,0.003h-0.001c-0.826,0.323-2.406,0.897-2.865,1.143-0.178,0.095-0.385,0.222-0.596,0.388-0.221-0.183-0.426-0.311-0.573-0.388-0.395-0.205-1.904-0.753-2.746-1.067l-0.078-0.031-0.002,0.001-0.349-0.142-0.317,0.139c-0.311,0.122-0.693,0.268-1.103,0.424l-0.038,0.014c-1.21,0.461-2.582,0.982-3.107,1.262-1.177,0.625-2.025,1.51-2.525,2.609h21.66c-0.77-1.62-2.12-2.41-2.48-2.6z" fill="#231F20" fill-opacity="0.15" stroke-opacity="0.15" style="enable-background:new;"/>
-<path d="M9.052,11.44c-0.561,0.477-0.712,1.432-0.349,2.38,0.342,0.894,1.048,1.494,1.758,1.494h0.002c0.106,0.221,0.217,0.439,0.331,0.654h-0.033l0.271,0.448s0.071,0.115,0.154,0.253c0.226-0.383,0.424-0.765,0.586-1.123,0.334,0.115,0.761-0.194,0.973-0.719,0.22-0.542,0.125-1.106-0.212-1.259-0.019-0.008-0.04-0.009-0.059-0.015v-0.001c-0.004-0.001-0.007-0.002-0.012-0.002-0.028-0.008-0.057-0.014-0.087-0.016-0.007-0.002-0.012-0.003-0.019-0.005-0.015-0.003-0.032-0.007-0.05-0.011,0.057,0.011,0.109,0.023,0.167,0.033,0.043-0.172,0.063-0.272,0.063-0.272,0.583-2.617-0.686-4.69-3.761-4.793-0.006,0-0.01,0.001-0.017,0.001-0.072,0.839,0.021,1.822,0.3,2.962z" fill="#231F20" fill-opacity="0.15" stroke-opacity="0.15" style="enable-background:new;"/>
-<path d="M18.61,9.658c-0.764,0.117-1.973,0.817-1.119,3.879-0.033,0.006-0.064,0.011-0.096,0.023-0.342,0.145-0.447,0.702-0.238,1.248,0.209,0.545,0.652,0.871,0.994,0.728,0.021-0.009,0.039-0.023,0.058-0.036,0.165,0.371,0.364,0.766,0.599,1.163,0.263-0.441,0.512-0.897,0.736-1.369,0.646-0.077,1.279-0.639,1.605-1.444,0.371-0.919,0.253-1.873-0.272-2.37,0.235-1.062,0.272-2.073,0.117-2.993-0.015-0.001-0.028-0.003-0.043-0.003-1.26-0.001-1.87,0.574-2.34,1.174zm-1.11,3.882c0.007-0.006,0.015-0.013,0.021-0.019,0,0.005,0.002,0.008,0.002,0.013,0,0-0.01,0.01-0.02,0.01zm1.76-2.21c-0.009-0.002-0.021-0.007-0.029-0.008,0.01,0,0.02,0.01,0.03,0.01z" fill="#231F20" fill-opacity="0.15" stroke-opacity="0.15" style="enable-background:new;"/>
-<path d="M23.19,20.69c-0.49-0.256-2.057-0.836-3.314-1.305l-0.719-0.266-0.123-0.051-0.172-0.065-0.484-0.194c-0.016-0.021-0.027-0.051-0.041-0.073-0.85,0.327-2.31,0.862-2.746,1.097-0.179,0.094-0.386,0.221-0.597,0.387-0.221-0.182-0.426-0.311-0.573-0.387-0.395-0.205-1.904-0.754-2.746-1.068l-0.042-0.018-0.596,0.261c-0.32,0.125-0.719,0.276-1.144,0.438-1.202,0.457-2.565,0.975-3.074,1.244-1.071,0.568-1.857,1.363-2.338,2.35h21.01c-0.76-1.46-1.98-2.18-2.3-2.35z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3" style="enable-background:new;"/>
-<path d="M8.979,13.71c0.298,0.78,0.894,1.304,1.481,1.304,0.062,0,0.122-0.005,0.181-0.017,0.202,0.433,0.419,0.854,0.651,1.261h-0.009l0.068,0.113c0.155-0.283,0.3-0.563,0.419-0.829,0.334,0.115,0.761-0.194,0.973-0.719,0.22-0.542,0.125-1.106-0.212-1.259-0.019-0.008-0.04-0.009-0.059-0.015v-0.001c-0.004-0.001-0.007-0.002-0.012-0.002-0.028-0.008-0.057-0.014-0.087-0.016-0.007-0.002-0.012-0.003-0.019-0.005-0.015-0.003-0.032-0.007-0.05-0.011,0.057,0.011,0.109,0.023,0.167,0.033,0.043-0.172,0.063-0.272,0.063-0.272,0.564-2.535-0.613-4.556-3.483-4.772-0.08,0.847,0.026,1.864,0.336,3.057-0.57,0.33-0.751,1.24-0.404,2.15z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3" style="enable-background:new;"/>
-<path d="M18.61,9.658c-0.764,0.117-1.973,0.817-1.119,3.879-0.033,0.006-0.064,0.011-0.096,0.023-0.342,0.145-0.447,0.702-0.238,1.248,0.209,0.545,0.652,0.871,0.994,0.728,0.021-0.009,0.039-0.023,0.058-0.036,0.124,0.278,0.269,0.569,0.429,0.864,0.256-0.439,0.497-0.891,0.715-1.357,0.014,0.001,0.025,0.001,0.039,0.001,0.58,0,1.177-0.511,1.483-1.27,0.358-0.884,0.21-1.785-0.325-2.144,0.025-0.106,0.036-0.166,0.036-0.166,0.233-1.043,0.267-2.035,0.11-2.931-1.08,0.083-1.64,0.612-2.08,1.169zm-1.11,3.882c0.007-0.006,0.015-0.013,0.021-0.019,0,0.005,0.002,0.008,0.002,0.013,0,0-0.01,0.01-0.02,0.01zm1.76-2.21c-0.009-0.002-0.021-0.007-0.029-0.008,0.01,0,0.02,0.01,0.03,0.01z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3" style="enable-background:new;"/>
+<path d="M23.32,20.43c-0.506-0.264-2.081-0.849-3.348-1.317l-0.711-0.265-0.128-0.053-0.166-0.063-0.317-0.128-0.196,0.086c-0.001,0.002-0.003,0.002-0.004,0.003h-0.001c-0.826,0.323-2.406,0.897-2.865,1.143-0.178,0.095-0.385,0.222-0.596,0.388-0.221-0.183-0.426-0.311-0.573-0.388-0.395-0.205-1.904-0.753-2.746-1.067l-0.078-0.031-0.002,0.001-0.349-0.142-0.317,0.139c-0.311,0.122-0.693,0.268-1.103,0.424l-0.038,0.014c-1.21,0.461-2.582,0.982-3.107,1.262-1.177,0.625-2.025,1.51-2.525,2.609h21.66c-0.77-1.62-2.12-2.41-2.48-2.6z" fill="#231F20" opacity="0.15" style="enable-background:new;"/>
+<path d="M9.052,11.44c-0.561,0.477-0.712,1.432-0.349,2.38,0.342,0.894,1.048,1.494,1.758,1.494h0.002c0.106,0.221,0.217,0.439,0.331,0.654h-0.033l0.271,0.448s0.071,0.115,0.154,0.253c0.226-0.383,0.424-0.765,0.586-1.123,0.334,0.115,0.761-0.194,0.973-0.719,0.22-0.542,0.125-1.106-0.212-1.259-0.019-0.008-0.04-0.009-0.059-0.015v-0.001c-0.004-0.001-0.007-0.002-0.012-0.002-0.028-0.008-0.057-0.014-0.087-0.016-0.007-0.002-0.012-0.003-0.019-0.005-0.015-0.003-0.032-0.007-0.05-0.011,0.057,0.011,0.109,0.023,0.167,0.033,0.043-0.172,0.063-0.272,0.063-0.272,0.583-2.617-0.686-4.69-3.761-4.793-0.006,0-0.01,0.001-0.017,0.001-0.072,0.839,0.021,1.822,0.3,2.962z" fill="#231F20" opacity="0.15" style="enable-background:new;"/>
+<path d="M18.61,9.658c-0.764,0.117-1.973,0.817-1.119,3.879-0.033,0.006-0.064,0.011-0.096,0.023-0.342,0.145-0.447,0.702-0.238,1.248,0.209,0.545,0.652,0.871,0.994,0.728,0.021-0.009,0.039-0.023,0.058-0.036,0.165,0.371,0.364,0.766,0.599,1.163,0.263-0.441,0.512-0.897,0.736-1.369,0.646-0.077,1.279-0.639,1.605-1.444,0.371-0.919,0.253-1.873-0.272-2.37,0.235-1.062,0.272-2.073,0.117-2.993-0.015-0.001-0.028-0.003-0.043-0.003-1.26-0.001-1.87,0.574-2.34,1.174zm-1.11,3.882c0.007-0.006,0.015-0.013,0.021-0.019,0,0.005,0.002,0.008,0.002,0.013,0,0-0.01,0.01-0.02,0.01zm1.76-2.21c-0.009-0.002-0.021-0.007-0.029-0.008,0.01,0,0.02,0.01,0.03,0.01z" fill="#231F20" opacity="0.15" style="enable-background:new;"/>
+<path d="M23.19,20.69c-0.49-0.256-2.057-0.836-3.314-1.305l-0.719-0.266-0.123-0.051-0.172-0.065-0.484-0.194c-0.016-0.021-0.027-0.051-0.041-0.073-0.85,0.327-2.31,0.862-2.746,1.097-0.179,0.094-0.386,0.221-0.597,0.387-0.221-0.182-0.426-0.311-0.573-0.387-0.395-0.205-1.904-0.754-2.746-1.068l-0.042-0.018-0.596,0.261c-0.32,0.125-0.719,0.276-1.144,0.438-1.202,0.457-2.565,0.975-3.074,1.244-1.071,0.568-1.857,1.363-2.338,2.35h21.01c-0.76-1.46-1.98-2.18-2.3-2.35z" fill="#231F20" opacity="0.3" style="enable-background:new;"/>
+<path d="M8.979,13.71c0.298,0.78,0.894,1.304,1.481,1.304,0.062,0,0.122-0.005,0.181-0.017,0.202,0.433,0.419,0.854,0.651,1.261h-0.009l0.068,0.113c0.155-0.283,0.3-0.563,0.419-0.829,0.334,0.115,0.761-0.194,0.973-0.719,0.22-0.542,0.125-1.106-0.212-1.259-0.019-0.008-0.04-0.009-0.059-0.015v-0.001c-0.004-0.001-0.007-0.002-0.012-0.002-0.028-0.008-0.057-0.014-0.087-0.016-0.007-0.002-0.012-0.003-0.019-0.005-0.015-0.003-0.032-0.007-0.05-0.011,0.057,0.011,0.109,0.023,0.167,0.033,0.043-0.172,0.063-0.272,0.063-0.272,0.564-2.535-0.613-4.556-3.483-4.772-0.08,0.847,0.026,1.864,0.336,3.057-0.57,0.33-0.751,1.24-0.404,2.15z" fill="#231F20" opacity="0.3" style="enable-background:new;"/>
+<path d="M18.61,9.658c-0.764,0.117-1.973,0.817-1.119,3.879-0.033,0.006-0.064,0.011-0.096,0.023-0.342,0.145-0.447,0.702-0.238,1.248,0.209,0.545,0.652,0.871,0.994,0.728,0.021-0.009,0.039-0.023,0.058-0.036,0.124,0.278,0.269,0.569,0.429,0.864,0.256-0.439,0.497-0.891,0.715-1.357,0.014,0.001,0.025,0.001,0.039,0.001,0.58,0,1.177-0.511,1.483-1.27,0.358-0.884,0.21-1.785-0.325-2.144,0.025-0.106,0.036-0.166,0.036-0.166,0.233-1.043,0.267-2.035,0.11-2.931-1.08,0.083-1.64,0.612-2.08,1.169zm-1.11,3.882c0.007-0.006,0.015-0.013,0.021-0.019,0,0.005,0.002,0.008,0.002,0.013,0,0-0.01,0.01-0.02,0.01zm1.76-2.21c-0.009-0.002-0.021-0.007-0.029-0.008,0.01,0,0.02,0.01,0.03,0.01z" fill="#231F20" opacity="0.3" style="enable-background:new;"/>
<radialGradient cx="657.3" cy="-597.7" gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_19_" r="16.23">
+
<stop offset="0" stop-color="#FFA98E"/>
+
<stop offset="0.2" stop-color="#FFA98E"/>
+
<stop offset="0.96" stop-color="#D45D36"/>
+
<stop offset="1" stop-color="#D45D36"/>
+
</radialGradient>
<path d="M18.46,19.26c-0.764-0.332-0.738-1.957-0.424-2.448,0.055-0.086,0.104-0.172,0.156-0.258h-6.385c0.053,0.086,0.103,0.172,0.157,0.258,0.315,0.491,0.34,2.116-0.424,2.448-0.764,0.331,3.549,3.219,3.549,3.219s4.11-2.89,3.35-3.22z" fill="url(#SVGID_19_)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="657" x2="657" y1="-589.9" y2="-603.3">
+
<stop offset="0" stop-color="#FF7236"/>
+
<stop offset="1" stop-color="#BA1212"/>
+
</linearGradient>
<path d="M23.05,20.96c-0.803-0.418-4.781-1.811-4.857-1.896l-3.04,2.524-3.266-2.623c-0.09,0.134-4.023,1.512-4.934,1.995-1.042,0.553-2.743,1.822-2.743,4.688h21.59c0-2.87-1.94-4.28-2.74-4.69z" fill="url(#SVGID_20_)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="657.1" x2="657.1" y1="-589" y2="-596.9">
+
<stop offset="0" stop-color="#BC1C24"/>
+
<stop offset="1" stop-color="#6B1C24"/>
+
</linearGradient>
<polygon fill="url(#SVGID_21_)" points="11.14,19.28,15.15,22.48,18.92,19.35,18.19,19.06,15.15,21.58,11.89,18.96"/>
<path d="M11.33,19.79s-5.72,1.493-5.72,5.502h-0.823c0-2.46,1.922-4.38,6.543-5.5z" fill="#FF7B56"/>
<path d="M18.6,19.7s5.72,1.494,5.72,5.502h0.824c0-2.47-1.92-4.38-6.54-5.5z" fill="#FF7B56"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="657.1" x2="657.1" y1="-597.5" y2="-590.2">
+
<stop offset="0" stop-color="#FFA98E"/>
+
<stop offset="0.96" stop-color="#D45D36"/>
+
<stop offset="1" stop-color="#D45D36"/>
+
</linearGradient>
<polygon fill="url(#SVGID_22_)" points="15.15,22.48,11.14,19.28,10.91,19.39,15.15,22.77,19.15,19.44,18.92,19.35"/>
<radialGradient cx="658.1" cy="-567.8" gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_23_" r="21.78">
+
<stop offset="0" stop-color="#FFE2D9"/>
+
<stop offset="0.51" stop-color="#FFC6B3"/>
+
<stop offset="0.76" stop-color="#FFA98E"/>
+
<stop offset="1" stop-color="#E88160"/>
+
</radialGradient>
<path d="M20.29,11.79c-0.026-0.013-0.058-0.015-0.086-0.022v-0.002c-0.005-0.001-0.01-0.002-0.017-0.003-0.041-0.011-0.084-0.021-0.127-0.022-5.331-0.928-7.775-3.88-7.959-3.099-0.147,0.622-1.641,1.968-2.424,2.639,0.007,0.03,0.01,0.057,0.018,0.087,0,0,0.027,0.138,0.086,0.372-0.062,0.007-0.123,0.02-0.182,0.045-0.498,0.21-0.654,1.026-0.349,1.823,0.305,0.798,0.956,1.274,1.454,1.065,0.03-0.014,0.057-0.035,0.085-0.054,0.289,0.65,0.645,1.348,1.079,2.047,0.729,0.866,1.846,1.883,3.079,1.883,1.49,0,2.404-0.815,3.031-1.64,0.017-0.033,0.031-0.066,0.053-0.095,0.465-0.728,0.842-1.455,1.145-2.134,0.488,0.168,1.113-0.284,1.424-1.051,0.35-0.81,0.21-1.63-0.29-1.85z" fill="url(#SVGID_23_)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_24_" x1="653.2" x2="662.4" y1="-590.1" y2="-580.9">
+
<stop offset="0" stop-color="#FFC6B3"/>
+
<stop offset="1" stop-color="#FFA98E"/>
+
</linearGradient>
<path d="M14.73,18.13c-0.908,0-1.822-0.423-2.496-1.06,0.713,0.748,1.672,1.478,2.716,1.478,1.491,0,2.403-0.815,3.032-1.64,0.016-0.033,0.031-0.066,0.051-0.095,0.465-0.728,0.842-1.455,1.146-2.134-1.7,2.95-2.96,3.44-4.45,3.44z" fill="url(#SVGID_24_)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="656.8" x2="656.8" y1="-560.9" y2="-574.5">
+
<stop offset="0" stop-color="#8A5D3B"/>
+
<stop offset="0.38" stop-color="#632F00"/>
+
<stop offset="1" stop-color="#361700"/>
+
</linearGradient>
<path d="M14.8,4.357c-1.847,0-2.736,0.84-3.423,1.718-1.12,0.172-2.884,1.195-1.636,5.675,0.783-0.67,2.214-2.489,2.361-3.111,0.186-0.788,2.672,2.226,8.103,3.124,0.063-0.251,0.093-0.398,0.093-0.398,0.86-3.821-0.99-6.853-5.49-7.003z" fill="url(#SVGID_25_)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_26_" x1="661.5" x2="649.2" y1="-573.9" y2="-566.6">
+
<stop offset="0" stop-color="#8A5D3B"/>
+
<stop offset="0.36" stop-color="#632F00"/>
+
<stop offset="1" stop-color="#361700"/>
+
</linearGradient>
<path d="M12.11,8.272s2.658,3.492,8.059,3.485c0,0-2.54-0.4-8.06-3.488z" fill="url(#SVGID_26_)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_27_" x1="648.1" x2="648.2" y1="-565.2" y2="-573">
+
<stop offset="0" stop-color="#8A5D3B"/>
+
<stop offset="0.38" stop-color="#632F00"/>
+
<stop offset="1" stop-color="#361700"/>
+
</linearGradient>
<path d="M11.47,6.335s-2.603,0.155-1.637,4.566c0.003,0-0.315-3.019,1.637-4.565z" fill="url(#SVGID_27_)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_28_" x1="658.5" x2="658.2" y1="-562.1" y2="-565.6">
+
<stop offset="0" stop-color="#A87C4F"/>
+
<stop offset="1" stop-color="#632F00"/>
+
</linearGradient>
<path d="M16.06,6.946c-1.212-0.173-3.263-1.247-4.065-0.863,0,0,2.63-3,7.271,0.415,0,0-1.11,0.747-3.21,0.448z" fill="url(#SVGID_28_)"/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_message_home.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_message_home.svg Fri May 14 16:09:54 2010 +0300
@@ -1,83 +1,87 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="9.8965" y2="49.8018">
-<stop offset="0" style="stop-color:#FEEFA7"/>
-<stop offset="0.5091" style="stop-color:#FFC501"/>
-<stop offset="1" style="stop-color:#F6A800"/>
+ <stop offset="0" style="stop-color:#FEEFA7"/>
+ <stop offset="0.5091" style="stop-color:#FFC501"/>
+ <stop offset="1" style="stop-color:#F6A800"/>
</linearGradient>
<polygon fill="url(#SVGID_1_)" points="58,50.4 2,50.4 2,9.6 30.463,10.4 58,9.6 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="9.7017" y2="50.6398">
-<stop offset="0" style="stop-color:#F7AC00"/>
-<stop offset="0.3394" style="stop-color:#FFF8DB"/>
-<stop offset="1" style="stop-color:#FFE066"/>
+ <stop offset="0" style="stop-color:#F7AC00"/>
+ <stop offset="0.3394" style="stop-color:#FFF8DB"/>
+ <stop offset="1" style="stop-color:#FFE066"/>
</linearGradient>
<path d="M57.385,10.22v39.56H2.613V10.22H57.385 M58,9.6L29.802,9.936L2,9.6v40.8h56V9.6L58,9.6z" fill="url(#SVGID_2_)"/>
-<polygon fill="#FBAB13" fill-opacity="0.3" points="2,49.71 58,49.71 58,48.916 29.998,24.328 2,48.916 " stroke-opacity="0.3"/>
-<polygon fill="#F18800" fill-opacity="0.3" points="2,50.4 58,50.4 58,49.603 29.998,25.019 2,49.603 " stroke-opacity="0.3"/>
+<polygon fill="#FBAB13" opacity="0.3" points="2,49.71 58,49.71 58,48.916 29.998,24.328 2,48.916 "/>
+<polygon fill="#F18800" opacity="0.3" points="2,50.4 58,50.4 58,49.603 29.998,25.019 2,49.603 "/>
<linearGradient gradientTransform="matrix(-1 0 0 -1 -1801.0049 1240.3164)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1831.0049" x2="-1831.0049" y1="1214.7607" y2="1190.0703">
-<stop offset="0" style="stop-color:#F98A00"/>
-<stop offset="0.7273" style="stop-color:#FCBC3C"/>
-<stop offset="1" style="stop-color:#FFE36A"/>
+ <stop offset="0" style="stop-color:#F98A00"/>
+ <stop offset="0.7273" style="stop-color:#FCBC3C"/>
+ <stop offset="1" style="stop-color:#FFE36A"/>
</linearGradient>
<polygon fill="url(#SVGID_3_)" points="58,50.38 29.998,25.689 2,50.38 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="30" x2="30" y1="25.4995" y2="51.0736">
-<stop offset="0" style="stop-color:#FFF1B5"/>
-<stop offset="1" style="stop-color:#FFE066"/>
+ <stop offset="0" style="stop-color:#FFF1B5"/>
+ <stop offset="1" style="stop-color:#FFE066"/>
</linearGradient>
<polygon fill="url(#SVGID_4_)" points="58,50.38 29.998,25.689 2,50.38 29.998,26.563 "/>
-<polygon fill="#F18800" fill-opacity="0.3" points="30.057,10.4 2,9.6 29.998,38.617 58,9.6 " stroke-opacity="0.3"/>
-<polygon fill="#C26D00" fill-opacity="0.4" points="30.006,10.4 2,9.6 29.998,37.091 58,9.6 " stroke-opacity="0.4"/>
-<polygon fill="#AB6100" fill-opacity="0.4" points="29.904,10.297 2,9.6 29.998,35.802 58,9.6 " stroke-opacity="0.4"/>
+<polygon fill="#F18800" opacity="0.3" points="30.057,10.4 2,9.6 29.998,38.617 58,9.6 "/>
+<polygon fill="#C26D00" opacity="0.4" points="30.006,10.4 2,9.6 29.998,37.091 58,9.6 "/>
+<polygon fill="#AB6100" opacity="0.4" points="29.904,10.297 2,9.6 29.998,35.802 58,9.6 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30" x2="30" y1="32.9619" y2="8.0088">
-<stop offset="0" style="stop-color:#FFDA33"/>
-<stop offset="0.25" style="stop-color:#FFE692"/>
-<stop offset="1" style="stop-color:#FFFBF8"/>
+ <stop offset="0" style="stop-color:#FFDA33"/>
+ <stop offset="0.25" style="stop-color:#FFE692"/>
+ <stop offset="1" style="stop-color:#FFFBF8"/>
</linearGradient>
<polygon fill="url(#SVGID_5_)" points="2,9.6 29.998,34.29 58,9.6 "/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<polygon fill="none" points="30.414,14.408 30.414,0 0.414,0 0.414,14.41 0,14.824 0.414,15.237 0.414,30 30.414,30 30.414,15.236 30.828,14.821 "/>
-<path d="M2.749,29.823V17.57L0,14.824l0.706-0.707C1.213,13.608,13.143,1.649,13.861,0.962 c0.387-0.368,0.914-0.786,1.589-0.786c0.687,0,1.172,0.42,1.518,0.785c0.457,0.484,8.802,8.816,13.151,13.154l0.708,0.706 l-2.747,2.749v12.253H2.749z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M2.749,29.823V17.57L0,14.824l0.706-0.707C1.213,13.608,13.143,1.649,13.861,0.962 c0.387-0.368,0.914-0.786,1.589-0.786c0.687,0,1.172,0.42,1.518,0.785c0.457,0.484,8.802,8.816,13.151,13.154l0.708,0.706 l-2.747,2.749v12.253H2.749z" opacity="0.35"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="15.415" x2="15.415" y1="28.6694" y2="12.5688">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.6606" style="stop-color:#E0E1E2"/>
-<stop offset="1" style="stop-color:#B9BCBD"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="0.6606" style="stop-color:#E0E1E2"/>
+ <stop offset="1" style="stop-color:#B9BCBD"/>
</linearGradient>
<polygon fill="url(#SVGID_1__)" points="27.081,28.823 3.749,28.823 3.749,14.473 15.414,5.489 27.081,14.473 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="15.415" x2="15.415" y1="17.313" y2="28.6013">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.6606" style="stop-color:#E0E1E2"/>
-<stop offset="1" style="stop-color:#B9BCBD"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="0.6606" style="stop-color:#E0E1E2"/>
+ <stop offset="1" style="stop-color:#B9BCBD"/>
</linearGradient>
<path d="M15.414,6.668l10.736,8.264V27.89H4.682V14.932L15.414,6.668 M15.414,5.489L3.749,14.473v14.351 h23.333V14.473L15.414,5.489L15.414,5.489z" fill="url(#SVGID_2__)"/>
-<polygon fill-opacity="0.2" points="27.081,18.033 27.081,14.473 15.414,5.489 3.749,14.473 3.749,18.322 15.414,8.99 " stroke-opacity="0.2"/>
+<polygon opacity="0.2" points="27.081,18.033 27.081,14.473 15.414,5.489 3.749,14.473 3.749,18.322 15.414,8.99 "/>
<polygon fill="#727272" points="27.081,18.033 27.081,14.473 15.414,5.489 3.749,14.473 3.749,18.322 15.414,6.655 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="15.416" x2="15.416" y1="17.9946" y2="29.1519">
-<stop offset="0" style="stop-color:#D07100"/>
-<stop offset="1" style="stop-color:#A23600"/>
+ <stop offset="0" style="stop-color:#D07100"/>
+ <stop offset="1" style="stop-color:#A23600"/>
</linearGradient>
<rect fill="url(#SVGID_3__)" height="10.501" width="7.001" x="11.916" y="18.322"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="15.416" x2="15.416" y1="28.7466" y2="18.3602">
-<stop offset="0" style="stop-color:#D07100"/>
-<stop offset="1" style="stop-color:#A23600"/>
+ <stop offset="0" style="stop-color:#D07100"/>
+ <stop offset="1" style="stop-color:#A23600"/>
</linearGradient>
<path d="M17.98,19.257v8.633h-5.133v-8.633H17.98 M18.917,18.322h-7.001v10.501h7.001V18.322L18.917,18.322z" fill="url(#SVGID_4__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="15.4136" x2="15.4136" y1="0.0352" y2="17.7271">
-<stop offset="0" style="stop-color:#DE8029"/>
-<stop offset="0.2606" style="stop-color:#DE4E29"/>
-<stop offset="1" style="stop-color:#D82E09"/>
+ <stop offset="0" style="stop-color:#DE8029"/>
+ <stop offset="0.2606" style="stop-color:#DE4E29"/>
+ <stop offset="1" style="stop-color:#D82E09"/>
</linearGradient>
<path d="M15.414,5.489l11.667,11.667l2.333-2.333c0,0-12.586-12.554-13.171-13.175 c-0.587-0.62-0.965-0.652-1.689,0.035c-0.719,0.688-13.14,13.14-13.14,13.14l2.335,2.333L15.414,5.489z" fill="url(#SVGID_5__)"/>
<radialGradient cx="15.2969" cy="1.7559" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="18.6679">
-<stop offset="0" style="stop-color:#F7D481"/>
-<stop offset="1" style="stop-color:#F5340A"/>
+ <stop offset="0" style="stop-color:#F7D481"/>
+ <stop offset="1" style="stop-color:#F5340A"/>
</radialGradient>
<path d="M14.553,2.616c0.724-0.688,1.102-0.653,1.689-0.034c0.516,0.549,10.433,10.442,12.705,12.709 l0.467-0.468c0,0-12.586-12.554-13.171-13.175c-0.587-0.62-0.965-0.652-1.689,0.035c-0.719,0.688-13.14,13.14-13.14,13.14 l0.467,0.465C4.134,13.029,13.917,3.225,14.553,2.616z" fill="url(#SVGID_6_)"/>
-<rect fill-opacity="0.2" height="1.168" stroke-opacity="0.2" width="7.001" x="11.916" y="18.322"/>
+<rect height="1.168" opacity="0.2" width="7.001" x="11.916" y="18.322"/>
<rect fill="none" height="30" width="30" x="0.414"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_message_work.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_message_work.svg Fri May 14 16:09:54 2010 +0300
@@ -1,40 +1,42 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="9.8965" y2="49.8018">
-<stop offset="0" style="stop-color:#FEEFA7"/>
-<stop offset="0.5091" style="stop-color:#FFC501"/>
-<stop offset="1" style="stop-color:#F6A800"/>
+ <stop offset="0" style="stop-color:#FEEFA7"/>
+ <stop offset="0.5091" style="stop-color:#FFC501"/>
+ <stop offset="1" style="stop-color:#F6A800"/>
</linearGradient>
<polygon fill="url(#SVGID_1_)" points="58,50.4 2,50.4 2,9.6 30.463,10.4 58,9.6 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="9.7017" y2="50.6398">
-<stop offset="0" style="stop-color:#F7AC00"/>
-<stop offset="0.3394" style="stop-color:#FFF8DB"/>
-<stop offset="1" style="stop-color:#FFE066"/>
+ <stop offset="0" style="stop-color:#F7AC00"/>
+ <stop offset="0.3394" style="stop-color:#FFF8DB"/>
+ <stop offset="1" style="stop-color:#FFE066"/>
</linearGradient>
<path d="M57.385,10.22v39.56H2.613V10.22H57.385 M58,9.6L29.802,9.936L2,9.6v40.8h56V9.6L58,9.6z" fill="url(#SVGID_2_)"/>
-<polygon fill="#FBAB13" fill-opacity="0.3" points="2,49.71 58,49.71 58,48.916 29.998,24.328 2,48.916 " stroke-opacity="0.3"/>
-<polygon fill="#F18800" fill-opacity="0.3" points="2,50.4 58,50.4 58,49.603 29.998,25.019 2,49.603 " stroke-opacity="0.3"/>
+<polygon fill="#FBAB13" opacity="0.3" points="2,49.71 58,49.71 58,48.916 29.998,24.328 2,48.916 "/>
+<polygon fill="#F18800" opacity="0.3" points="2,50.4 58,50.4 58,49.603 29.998,25.019 2,49.603 "/>
<linearGradient gradientTransform="matrix(-1 0 0 -1 -1801.0049 1240.3164)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1831.0049" x2="-1831.0049" y1="1214.7607" y2="1190.0703">
-<stop offset="0" style="stop-color:#F98A00"/>
-<stop offset="0.7273" style="stop-color:#FCBC3C"/>
-<stop offset="1" style="stop-color:#FFE36A"/>
+ <stop offset="0" style="stop-color:#F98A00"/>
+ <stop offset="0.7273" style="stop-color:#FCBC3C"/>
+ <stop offset="1" style="stop-color:#FFE36A"/>
</linearGradient>
<polygon fill="url(#SVGID_3_)" points="58,50.38 29.998,25.689 2,50.38 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="30" x2="30" y1="25.4995" y2="51.0736">
-<stop offset="0" style="stop-color:#FFF1B5"/>
-<stop offset="1" style="stop-color:#FFE066"/>
+ <stop offset="0" style="stop-color:#FFF1B5"/>
+ <stop offset="1" style="stop-color:#FFE066"/>
</linearGradient>
<polygon fill="url(#SVGID_4_)" points="58,50.38 29.998,25.689 2,50.38 29.998,26.563 "/>
-<polygon fill="#F18800" fill-opacity="0.3" points="30.057,10.4 2,9.6 29.998,38.617 58,9.6 " stroke-opacity="0.3"/>
-<polygon fill="#C26D00" fill-opacity="0.4" points="30.006,10.4 2,9.6 29.998,37.091 58,9.6 " stroke-opacity="0.4"/>
-<polygon fill="#AB6100" fill-opacity="0.4" points="29.904,10.297 2,9.6 29.998,35.802 58,9.6 " stroke-opacity="0.4"/>
+<polygon fill="#F18800" opacity="0.3" points="30.057,10.4 2,9.6 29.998,38.617 58,9.6 "/>
+<polygon fill="#C26D00" opacity="0.4" points="30.006,10.4 2,9.6 29.998,37.091 58,9.6 "/>
+<polygon fill="#AB6100" opacity="0.4" points="29.904,10.297 2,9.6 29.998,35.802 58,9.6 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30" x2="30" y1="32.9619" y2="8.0088">
-<stop offset="0" style="stop-color:#FFDA33"/>
-<stop offset="0.25" style="stop-color:#FFE692"/>
-<stop offset="1" style="stop-color:#FFFBF8"/>
+ <stop offset="0" style="stop-color:#FFDA33"/>
+ <stop offset="0.25" style="stop-color:#FFE692"/>
+ <stop offset="1" style="stop-color:#FFFBF8"/>
</linearGradient>
<polygon fill="url(#SVGID_5_)" points="2,9.6 29.998,34.29 58,9.6 "/>
<rect fill="none" height="60" width="60"/>
@@ -43,105 +45,165 @@
<rect fill="none" height="30" width="30"/>
<rect fill="none" height="30" width="30"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="654.6" x2="654.6" y1="-558.3" y2="-601.7">
+
<stop offset="0" stop-color="#DFE1E6"/>
+
<stop offset="1" stop-color="#BDBEC3"/>
+
</linearGradient>
<rect fill="url(#SVGID_1__)" height="21.5" width="17.33" x="5.158" y="3.499"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="654.6" x2="654.6" y1="-558.9" y2="-602.2">
+
<stop offset="0" stop-color="#E7E9EF"/>
+
<stop offset="1" stop-color="#C8C9CE"/>
+
</linearGradient>
<path d="M21.99,3.999v20.5h-16.33v-20.5h16.33m0.5-0.501h-17.33v21.5h17.33v-21.5z" fill="url(#SVGID_2__)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="642.6" x2="642.6" y1="-567.9" y2="-562.2">
+
<stop offset="0" stop-color="#75BCFF"/>
+
<stop offset="1" stop-color="#0070A1"/>
+
</linearGradient>
<rect fill="url(#SVGID_3__)" height="3" width="3" x="6.324" y="5.146"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="650.6" x2="650.6" y1="-567.9" y2="-562.2">
+
<stop offset="0" stop-color="#75BCFF"/>
+
<stop offset="1" stop-color="#0070A1"/>
+
</linearGradient>
<rect fill="url(#SVGID_4__)" height="3" width="3" x="10.32" y="5.146"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="666.6" x2="666.6" y1="-567.9" y2="-562.2">
+
<stop offset="0" stop-color="#75BCFF"/>
+
<stop offset="1" stop-color="#0070A1"/>
+
</linearGradient>
<rect fill="url(#SVGID_5__)" height="3" width="3" x="18.32" y="5.146"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="658.6" x2="658.6" y1="-567.9" y2="-562.2">
+
<stop offset="0" stop-color="#75BCFF"/>
+
<stop offset="1" stop-color="#0070A1"/>
+
</linearGradient>
<rect fill="url(#SVGID_6_)" height="3" width="3" x="14.32" y="5.146"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="642.6" x2="642.6" y1="-576.5" y2="-570.8">
+
<stop offset="0" stop-color="#75BCFF"/>
+
<stop offset="1" stop-color="#0070A1"/>
+
</linearGradient>
<rect fill="url(#SVGID_7_)" height="3" width="3" x="6.324" y="9.458"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="650.6" x2="650.6" y1="-576.5" y2="-570.8">
+
<stop offset="0" stop-color="#75BCFF"/>
+
<stop offset="1" stop-color="#0070A1"/>
+
</linearGradient>
<rect fill="url(#SVGID_8_)" height="3" width="3" x="10.32" y="9.458"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="666.6" x2="666.6" y1="-576.5" y2="-570.8">
+
<stop offset="0" stop-color="#75BCFF"/>
+
<stop offset="1" stop-color="#0070A1"/>
+
</linearGradient>
<rect fill="url(#SVGID_9_)" height="3" width="3" x="18.32" y="9.458"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="658.6" x2="658.6" y1="-576.5" y2="-570.8">
+
<stop offset="0" stop-color="#75BCFF"/>
+
<stop offset="1" stop-color="#0070A1"/>
+
</linearGradient>
<rect fill="url(#SVGID_10_)" height="3" width="3" x="14.32" y="9.458"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="642.6" x2="642.6" y1="-594.5" y2="-588.8">
+
<stop offset="0" stop-color="#75BCFF"/>
+
<stop offset="1" stop-color="#0070A1"/>
+
</linearGradient>
<rect fill="url(#SVGID_11_)" height="3" width="3" x="6.324" y="18.46"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="650.6" x2="650.6" y1="-594.5" y2="-588.8">
+
<stop offset="0" stop-color="#75BCFF"/>
+
<stop offset="1" stop-color="#0070A1"/>
+
</linearGradient>
<rect fill="url(#SVGID_12_)" height="3" width="3" x="10.32" y="18.46"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="666.6" x2="666.6" y1="-594.5" y2="-588.8">
+
<stop offset="0" stop-color="#75BCFF"/>
+
<stop offset="1" stop-color="#0070A1"/>
+
</linearGradient>
<rect fill="url(#SVGID_13_)" height="3" width="3" x="18.32" y="18.46"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="658.6" x2="658.6" y1="-594.5" y2="-588.8">
+
<stop offset="0" stop-color="#75BCFF"/>
+
<stop offset="1" stop-color="#0070A1"/>
+
</linearGradient>
<rect fill="url(#SVGID_14_)" height="3" width="3" x="14.32" y="18.46"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="642.6" x2="642.6" y1="-585.5" y2="-579.8">
+
<stop offset="0" stop-color="#75BCFF"/>
+
<stop offset="1" stop-color="#0070A1"/>
+
</linearGradient>
<rect fill="url(#SVGID_15_)" height="3" width="3" x="6.324" y="13.96"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="650.6" x2="650.6" y1="-585.5" y2="-579.8">
+
<stop offset="0" stop-color="#75BCFF"/>
+
<stop offset="1" stop-color="#0070A1"/>
+
</linearGradient>
<rect fill="url(#SVGID_16_)" height="3" width="3" x="10.32" y="13.96"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="666.6" x2="666.6" y1="-585.5" y2="-579.8">
+
<stop offset="0" stop-color="#75BCFF"/>
+
<stop offset="1" stop-color="#0070A1"/>
+
</linearGradient>
<rect fill="url(#SVGID_17_)" height="3" width="3" x="18.32" y="13.96"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="658.6" x2="658.6" y1="-585.5" y2="-579.8">
+
<stop offset="0" stop-color="#75BCFF"/>
+
<stop offset="1" stop-color="#0070A1"/>
+
</linearGradient>
<rect fill="url(#SVGID_18_)" height="3" width="3" x="14.32" y="13.96"/>
-<polygon fill-opacity="0.3" points="22.49,25,22.49,14.85,12.51,11.92,12.51,25" stroke-opacity="0.3" style="enable-background:new;"/>
+<polygon opacity="0.3" points="22.49,25,22.49,14.85,12.51,11.92,12.51,25" style="enable-background:new;"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="665.4" x2="665.4" y1="-582.2" y2="-604.8">
+
<stop offset="0" stop-color="#CCCCCC"/>
+
<stop offset="1" stop-color="#949494"/>
+
</linearGradient>
<polygon fill="url(#SVGID_19_)" points="24.84,16.25,13.51,12.92,13.51,26.5,24.84,26.5"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="665.4" x2="665.4" y1="-582" y2="-605.1">
+
<stop offset="0" stop-color="#DBDDE2"/>
+
<stop offset="1" stop-color="#B5B6BA"/>
+
</linearGradient>
<path d="M14.01,13.58l10.33,3.039v9.38h-10.33v-12.42m-0.5-0.665v13.58h11.33v-10.25l-11.33-3.33z" fill="url(#SVGID_20_)"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_missed_video_call_unseen.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_missed_video_call_unseen.svg Fri May 14 16:09:54 2010 +0300
@@ -1,174 +1,234 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<stop offset="0" style="stop-color:#3AC5EA"/>
-<stop offset="0.297" style="stop-color:#3AC5EA"/>
-<stop offset="0.6667" style="stop-color:#1754C9"/>
-<stop offset="0.7939" style="stop-color:#33ADE1"/>
-<stop offset="1" style="stop-color:#33ADE1"/>
+ <stop offset="0.297" style="stop-color:#3AC5EA"/>
+ <stop offset="0.6667" style="stop-color:#1754C9"/>
+ <stop offset="0.7939" style="stop-color:#33ADE1"/>
</radialGradient>
<path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333c-0.617-0.665-2.567-3.083-2.968-3.735 c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956c6.191-6.192,9.085-7.646,9.956-8.107 c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967c0.534,0.492,0.872,0.588,1.299,0.274 c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778c-2.476-2.889-8.594-5.015-10.751-5.399 c-1.923-0.345-3.876-0.872-6.567,0.235c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352 c-1.108,2.691-0.581,4.645-0.236,6.567c0.386,2.158,2.51,8.275,5.399,10.752c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2070.7568" x2="-2070.3252" y1="-2266.8511" y2="-2263.2749">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+ <stop offset="0" style="stop-color:#2685D2"/>
+ <stop offset="1" style="stop-color:#081D45"/>
</linearGradient>
<path d="M35.172,17.108c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967 c0.534,0.492,0.872,0.588,1.299,0.274c0.048-0.035,0.062-0.046,0.064-0.046c0.253-0.184,1.032-0.738,2.12-1.514 c-0.251-0.204-3.468-2.809-4.8-2.956C36.857,15.598,35.172,17.108,35.172,17.108z" fill="url(#SVGID_2_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -2128.2356 5114.0977)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2070.7607" x2="-2070.3289" y1="5104.5752" y2="5108.1523">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+ <stop offset="0" style="stop-color:#2685D2"/>
+ <stop offset="1" style="stop-color:#081D45"/>
</linearGradient>
<path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.713c0.376,0.666,2.351,3.069,2.967,3.738 c0.493,0.531,0.587,0.869,0.274,1.298c-0.035,0.047-0.046,0.062-0.046,0.062c-0.183,0.253-0.738,1.032-1.515,2.119 c-0.204-0.252-2.807-3.467-2.956-4.799C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="47.9224" x2="3.9991" y1="3.9307" y2="47.854">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+ <stop offset="0" style="stop-color:#ABEEFF"/>
+ <stop offset="1" style="stop-color:#539FDE"/>
</linearGradient>
-<path d="M2.979,47.467c-0.344-1.925-0.873-3.878,0.235-6.567 c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.341,4.269,40.9,3.215c2.691-1.108,4.644-0.581,6.567-0.236 c1.981,0.354,7.296,2.178,10.069,4.711c-2.552-2.815-8.496-4.879-10.617-5.258c-1.923-0.345-3.876-0.872-6.567,0.235 c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567 c0.378,2.122,2.441,8.065,5.258,10.617C5.156,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M2.979,47.467c-0.344-1.925-0.873-3.878,0.235-6.567 c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.341,4.269,40.9,3.215c2.691-1.108,4.644-0.581,6.567-0.236 c1.981,0.354,7.296,2.178,10.069,4.711c-2.552-2.815-8.496-4.879-10.617-5.258c-1.923-0.345-3.876-0.872-6.567,0.235 c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567 c0.378,2.122,2.441,8.065,5.258,10.617C5.156,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="54.3535" x2="3.9474" y1="3.2017" y2="53.6078">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+ <stop offset="0" style="stop-color:#ABEEFF"/>
+ <stop offset="1" style="stop-color:#539FDE"/>
</linearGradient>
-<path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333 c-0.617-0.665-2.567-3.083-2.968-3.735c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956 c6.191-6.192,9.085-7.646,9.956-8.107c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967 c0.534,0.492,0.872,0.588,1.299,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778 c-0.292-0.339-0.634-0.665-1.013-0.982c0.49,0.657,0.198,1.134-0.607,1.666C54.65,9.447,41.576,18.739,40.825,19.29 c-0.431,0.314-0.767,0.219-1.3-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.948-0.436-1.71-0.034 c-0.871,0.46-3.764,1.914-9.956,8.106c-6.193,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.319,1.135,0.035,1.711 c0.4,0.651,2.351,3.069,2.967,3.736c0.493,0.533,0.559,0.896,0.259,1.332c-0.517,0.755-9.828,13.794-10.76,15.195 c-0.533,0.803-1.008,1.098-1.665,0.606c0.314,0.378,0.644,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_5_)" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333 c-0.617-0.665-2.567-3.083-2.968-3.735c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956 c6.191-6.192,9.085-7.646,9.956-8.107c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967 c0.534,0.492,0.872,0.588,1.299,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778 c-0.292-0.339-0.634-0.665-1.013-0.982c0.49,0.657,0.198,1.134-0.607,1.666C54.65,9.447,41.576,18.739,40.825,19.29 c-0.431,0.314-0.767,0.219-1.3-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.948-0.436-1.71-0.034 c-0.871,0.46-3.764,1.914-9.956,8.106c-6.193,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.319,1.135,0.035,1.711 c0.4,0.651,2.351,3.069,2.967,3.736c0.493,0.533,0.559,0.896,0.259,1.332c-0.517,0.755-9.828,13.794-10.76,15.195 c-0.533,0.803-1.008,1.098-1.665,0.606c0.314,0.378,0.644,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_5_)" opacity="0.6"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -141.776 3075.0667)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-2041.9355" x2="-2041.9355" y1="-2305.2153" y2="-2243.2966">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="0.5091" style="stop-color:#081D45"/>
-<stop offset="1" style="stop-color:#2275BD"/>
+ <stop offset="0" style="stop-color:#2685D2"/>
+ <stop offset="0.5091" style="stop-color:#081D45"/>
+ <stop offset="1" style="stop-color:#2275BD"/>
</linearGradient>
<path d="M2.899,45.012c1.275-2.777,10.299-14.804,18.804-23.31c8.505-8.506,20.532-17.529,23.308-18.803 c0.527-0.241,1.02-0.411,1.493-0.545c-0.511-0.096-1.03-0.19-1.565-0.26c-0.086,0.036-0.163,0.063-0.25,0.102 c-2.818,1.293-14.971,10.397-23.533,18.959C12.595,29.717,3.489,41.869,2.195,44.688c-0.038,0.087-0.063,0.166-0.101,0.25 c0.07,0.535,0.166,1.055,0.259,1.565C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_6_)"/>
<rect fill="none" height="60" width="60"/>
</g>
<g>
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
<rect fill="none" height="30" width="30"/>
-<path d="M20.74,16.008L21.732,17L30,8.733l-4.488-4.486l-4.131,4.132l1.613-6.023l-6.129-1.643l-2.32,8.654 l-4.027-4.185L0,16.008h5.752v3.212c0,6.398,4.527,10.067,12.42,10.067h0.943v-8.079h-0.943c-0.998,0-2.881-0.416-2.881-1.988 v-3.212H20.74z M18.381,11.377l-0.969,0.969l-1.594-1.655L18.381,11.377z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M20.74,16.008L21.732,17L30,8.733l-4.488-4.486l-4.131,4.132l1.613-6.023l-6.129-1.643l-2.32,8.654 l-4.027-4.185L0,16.008h5.752v3.212c0,6.398,4.527,10.067,12.42,10.067h0.943v-8.079h-0.943c-0.998,0-2.881-0.416-2.881-1.988 v-3.212H20.74z M18.381,11.377l-0.969,0.969l-1.594-1.655L18.381,11.377z" opacity="0.35"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3121.6689)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-2183.5244" x2="-2183.5244" y1="3114.3159" y2="3092.6184">
-<stop offset="0" style="stop-color:#FF7042"/>
-<stop offset="1" style="stop-color:#991B23"/>
+ <stop offset="0" style="stop-color:#FF7042"/>
+ <stop offset="1" style="stop-color:#991B23"/>
</linearGradient>
<path d="M14.346,19.22v-4.157h4.369l-8.201-8.521l-8.277,8.521h4.461v4.157c0,7.027,5.848,9.122,11.475,9.122 v-6.188C16.438,22.154,14.346,21.298,14.346,19.22z" fill="url(#SVGID_1__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="10.4756" x2="10.4756" y1="6.6836" y2="23.1265">
-<stop offset="0" style="stop-color:#FA9D53"/>
-<stop offset="1" style="stop-color:#991B23"/>
+ <stop offset="0" style="stop-color:#FA9D53"/>
+ <stop offset="1" style="stop-color:#991B23"/>
</linearGradient>
<polygon fill="url(#SVGID_2__)" points="10.514,7.505 17.787,15.063 18.715,15.063 10.514,6.542 2.236,15.063 3.172,15.063 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="16.2588" x2="16.2588" y1="6.6821" y2="23.1266">
-<stop offset="0" style="stop-color:#FA9D53"/>
-<stop offset="1" style="stop-color:#991B23"/>
+ <stop offset="0" style="stop-color:#FA9D53"/>
+ <stop offset="1" style="stop-color:#991B23"/>
</linearGradient>
<path d="M14.346,19.22v0.964c0,2.077,2.092,2.934,3.826,2.934v-0.963 C16.438,22.154,14.346,21.298,14.346,19.22z" fill="url(#SVGID_3__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="19.6777" x2="17.6734" y1="2.3481" y2="10.087">
-<stop offset="0" style="stop-color:#FFA959"/>
-<stop offset="0.703" style="stop-color:#CA3522"/>
-<stop offset="1" style="stop-color:#F08849"/>
+ <stop offset="0" style="stop-color:#FFA959"/>
+ <stop offset="0.703" style="stop-color:#CA3522"/>
+ <stop offset="1" style="stop-color:#F08849"/>
</linearGradient>
<polygon fill="url(#SVGID_4__)" points="15.459,9.616 17.533,1.871 21.836,3.024 19.762,10.768 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="19.5371" x2="17.755" y1="2.8726" y2="9.7783">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="0.7939" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#E8522A"/>
+ <stop offset="0" style="stop-color:#FF7236"/>
+ <stop offset="0.7939" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#E8522A"/>
</linearGradient>
<polygon fill="url(#SVGID_5__)" points="19.445,10.223 16.004,9.3 17.85,2.416 21.291,3.338 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6__" x1="27.0137" x2="20.1654" y1="7.1484" y2="14.1638">
-<stop offset="0" style="stop-color:#FFA959"/>
-<stop offset="0.703" style="stop-color:#CA3522"/>
-<stop offset="1" style="stop-color:#F08849"/>
+ <stop offset="0" style="stop-color:#FFA959"/>
+ <stop offset="0.703" style="stop-color:#CA3522"/>
+ <stop offset="1" style="stop-color:#F08849"/>
</linearGradient>
<polygon fill="url(#SVGID_6__)" points="18.582,12.513 25.512,5.584 28.662,8.733 21.732,15.663 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="26.7764" x2="20.5396" y1="7.4414" y2="13.7339">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="0.7939" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#E8522A"/>
+ <stop offset="0" style="stop-color:#FF7236"/>
+ <stop offset="0.7939" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#E8522A"/>
</linearGradient>
<polygon fill="url(#SVGID_7_)" points="21.732,15.034 19.213,12.513 25.512,6.213 28.031,8.733 "/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1___" x1="12.38" x2="17.62" y1="23.65" y2="23.65">
+
<stop offset="0" stop-color="#878A8C"/>
+
<stop offset="0.2606" stop-color="#BDC2C4"/>
+
<stop offset="0.6606" stop-color="#5B6163"/>
+
<stop offset="1" stop-color="#959A9C"/>
+
</linearGradient>
<rect fill="url(#SVGID_1___)" height="7.853" width="5.105" x="12.45" y="19.72"/>
<path d="M12.45,24.66c0.82,0.199,1.673,0.315,2.553,0.315,0.881,0,1.732-0.116,2.553-0.315v-4.294h-5.105v4.285z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
<path d="M12.45,24.02c0.82,0.199,1.673,0.315,2.553,0.315,0.881,0,1.732-0.116,2.553-0.315v-4.294h-5.105v4.288z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2___" x1="15" x2="15" y1="1.975" y2="23.67">
+
<stop offset="0" stop-color="#F2F2F2"/>
+
<stop offset="0.3212" stop-color="#E6E6E6"/>
+
<stop offset="1" stop-color="#666666"/>
+
</linearGradient>
<path d="M15,23.7c-5.98,0-10.85-4.867-10.85-10.85s4.87-10.85,10.85-10.85c5.982,0,10.85,4.866,10.85,10.85s-4.87,10.85-10.85,10.85z" fill="url(#SVGID_2___)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3___" x1="15" x2="15" y1="2.614" y2="23.03">
+
<stop offset="0" stop-color="#D1D7D9"/>
+
<stop offset="0.0667" stop-color="#D1D7D9"/>
+
<stop offset="0.2606" stop-color="#BDC2C4"/>
+
<stop offset="0.6606" stop-color="#7C8487"/>
+
<stop offset="1" stop-color="#ADB3B5"/>
+
</linearGradient>
<circle cx="15" cy="12.85" fill="url(#SVGID_3___)" r="10.21"/>
<path d="M15,21.99c-5.315,0-9.657-4.23-9.843-9.5-0.004,0.116-0.009,0.231-0.009,0.349,0,5.431,4.419,9.851,9.852,9.851s9.852-4.42,9.852-9.851c0-0.117-0.005-0.232-0.009-0.349-0.18,5.27-4.52,9.5-9.84,9.5z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
<path d="M23.3,12.41c0,4.704-3.715,9.346-8.299,9.345-4.58-0.003-8.292-4.646-8.291-9.35,0.002-4.706,3.718-8.517,8.298-8.517,4.57,0.001,8.29,3.814,8.29,8.517z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
<path d="M15,21.07c-2.387-0.002-4.63-0.932-6.315-2.619-1.688-1.688-2.615-3.932-2.614-6.318,0-4.923,4.009-8.929,8.935-8.929,2.387,0,4.632,0.931,6.317,2.618,1.688,1.688,2.616,3.933,2.615,6.318-0.002,4.924-4.01,8.93-8.934,8.93h-0.014z" fill="#231F20" fill-opacity="0.2" stroke-opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4___" x1="15" x2="15" y1="3.721" y2="20.35">
+
<stop offset="0" stop-color="#CFCFCF"/>
+
<stop offset="0.1091" stop-color="#CFCFCF"/>
+
<stop offset="0.6848" stop-color="#121212"/>
+
<stop offset="1" stop-color="#A6A6A6"/>
+
</linearGradient>
<path d="M15,20.43c-2.216-0.002-4.298-0.864-5.864-2.432-1.567-1.566-2.428-3.65-2.427-5.866,0-4.573,3.723-8.293,8.296-8.293,2.218,0.001,4.3,0.864,5.866,2.432s2.43,3.651,2.428,5.867c-0.001,4.573-3.723,8.292-8.295,8.292h-0.004z" fill="url(#SVGID_4___)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5___" x1="15" x2="15" y1="4.368" y2="19.72">
+
<stop offset="0" stop-color="#F2F2F2"/>
+
<stop offset="1" stop-color="#606769"/>
+
</linearGradient>
<circle cx="15" cy="12.13" fill="url(#SVGID_5___)" r="7.657"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6___" x1="15" x2="15" y1="5.772" y2="18.45">
+
<stop offset="0" stop-color="#1A1A1A"/>
+
<stop offset="0.503" stop-color="#343434"/>
+
<stop offset="0.7515" stop-color="#9E9E9E"/>
+
<stop offset="1" stop-color="#CFCFCF"/>
+
</linearGradient>
<path d="M15,18.51c-1.706-0.001-3.309-0.666-4.514-1.871-1.204-1.206-1.867-2.808-1.867-4.512,0-3.517,2.862-6.378,6.382-6.378,1.706,0,3.308,0.664,4.513,1.871,1.205,1.205,1.868,2.808,1.867,4.513,0,3.51-2.86,6.37-6.38,6.37z" fill="url(#SVGID_6___)"/>
<radialGradient cx="25.77" cy="10.27" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_7__" r="6.499">
+
<stop offset="0" stop-color="#000000"/>
+
<stop offset="0.5917" stop-color="#000000"/>
+
<stop offset="0.627" stop-color="#050505"/>
+
<stop offset="0.7652" stop-color="#121212"/>
+
<stop offset="0.8876" stop-color="#171717"/>
+
<stop offset="1" stop-color="#171717"/>
+
</radialGradient>
<path d="M20.74,12.14c0,3.172-2.574,5.74-5.744,5.74-3.175-0.001-5.743-2.573-5.741-5.745,0-3.171,2.573-5.742,5.745-5.74,3.17-0.009,5.74,2.562,5.74,5.74z" fill="url(#SVGID_7__)"/>
<radialGradient cx="21.65" cy="5.066" gradientTransform="matrix(1.0143 0 0 1.0141 -9.5579 3.1299)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="10.35">
+
<stop offset="0" stop-color="#242424"/>
+
<stop offset="0.4303" stop-color="#242424"/>
+
<stop offset="0.7818" stop-color="#000000"/>
+
<stop offset="1" stop-color="#000000"/>
+
</radialGradient>
<circle cx="15" cy="12.13" fill="url(#SVGID_8_)" r="4.712"/>
<radialGradient cx="23.96" cy="3.55" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="11.36">
+
<stop offset="0" stop-color="#A700F5"/>
+
<stop offset="0.3091" stop-color="#A700F5"/>
+
<stop offset="0.4364" stop-color="#5E008A"/>
+
<stop offset="0.8061" stop-color="#0E1402"/>
+
<stop offset="1" stop-color="#0E1402"/>
+
</radialGradient>
<path d="M19.21,12.13c0,2.326-1.886,4.21-4.212,4.21-2.326-0.002-4.213-1.888-4.213-4.212,0.004-2.327,1.89-4.21,4.213-4.21,2.33,0.003,4.21,1.888,4.21,4.21z" fill="url(#SVGID_9_)"/>
<radialGradient cx="25.17" cy="13.25" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="4.611">
+
<stop offset="0" stop-color="#48630C"/>
+
<stop offset="0.7879" stop-color="#000000"/>
+
<stop offset="1" stop-color="#000000"/>
+
</radialGradient>
<path d="M19.21,12.13c0,2.326-1.886,4.21-4.212,4.21-2.326-0.002-4.213-1.888-4.213-4.212,0,0,1.444,2.569,4.213,2.569,2.77,0,4.21-2.57,4.21-2.57z" fill="url(#SVGID_10_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="14.98" x2="14.98" y1="7.065" y2="12.09">
+
<stop offset="0" stop-color="#F8FBFF"/>
+
<stop offset="1" stop-color="#808080"/>
+
</linearGradient>
<path d="M14.98,12.07c1.828,0,3.549-0.277,5.067-0.765-0.431-2.41-2.532-4.239-5.067-4.239-2.532,0-4.632,1.83-5.065,4.239,1.515,0.49,3.235,0.77,5.065,0.77z" fill="url(#SVGID_11_)" fill-opacity="0.35" stroke-opacity="0.35"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="5.762" x2="24.29" y1="26.72" y2="26.72">
+
<stop offset="0" stop-color="#878A8C"/>
+
<stop offset="0.2606" stop-color="#BDC2C4"/>
+
<stop offset="0.6606" stop-color="#5B6163"/>
+
<stop offset="1" stop-color="#959A9C"/>
+
</linearGradient>
<path d="M24.24,28c0.025-0.635,0.04-0.508,0.04-0.639v-0.035c0-1.037-0.852-1.879-1.901-1.879h-14.72c-1.05,0-1.9,0.842-1.9,1.879v0.035c0,0.131,0.014,0.004,0.04,0.639h18.44z" fill="url(#SVGID_12_)"/>
<path d="M5.879,26.7h18.29c-0.084-0.234-0.212-0.444-0.377-0.626h-17.53c-0.164,0.19-0.293,0.4-0.377,0.63z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
@@ -176,4 +236,4 @@
<path d="M6.255,26.07h17.54c-0.348-0.383-0.846-0.627-1.407-0.627h-14.72c-0.56,0.01-1.059,0.25-1.407,0.63z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_missed_voice_call.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_missed_voice_call.svg Fri May 14 16:09:54 2010 +0300
@@ -1,62 +1,64 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<stop offset="0" style="stop-color:#3AC5EA"/>
-<stop offset="0.297" style="stop-color:#3AC5EA"/>
-<stop offset="0.6667" style="stop-color:#1754C9"/>
-<stop offset="0.7939" style="stop-color:#33ADE1"/>
-<stop offset="1" style="stop-color:#33ADE1"/>
+ <stop offset="0.297" style="stop-color:#3AC5EA"/>
+ <stop offset="0.6667" style="stop-color:#1754C9"/>
+ <stop offset="0.7939" style="stop-color:#33ADE1"/>
</radialGradient>
<path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333c-0.617-0.665-2.567-3.083-2.968-3.735 c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956c6.191-6.192,9.085-7.646,9.956-8.107 c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967c0.534,0.492,0.872,0.588,1.299,0.274 c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778c-2.476-2.889-8.594-5.015-10.751-5.399 c-1.923-0.345-3.876-0.872-6.567,0.235c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352 c-1.108,2.691-0.581,4.645-0.236,6.567c0.386,2.158,2.51,8.275,5.399,10.752c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2070.7568" x2="-2070.3252" y1="-2266.8511" y2="-2263.2749">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+ <stop offset="0" style="stop-color:#2685D2"/>
+ <stop offset="1" style="stop-color:#081D45"/>
</linearGradient>
<path d="M35.172,17.108c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967 c0.534,0.492,0.872,0.588,1.299,0.274c0.048-0.035,0.062-0.046,0.064-0.046c0.253-0.184,1.032-0.738,2.12-1.514 c-0.251-0.204-3.468-2.809-4.8-2.956C36.857,15.598,35.172,17.108,35.172,17.108z" fill="url(#SVGID_2_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -2128.2356 5114.0977)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2070.7607" x2="-2070.3289" y1="5104.5752" y2="5108.1523">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+ <stop offset="0" style="stop-color:#2685D2"/>
+ <stop offset="1" style="stop-color:#081D45"/>
</linearGradient>
<path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.713c0.376,0.666,2.351,3.069,2.967,3.738 c0.493,0.531,0.587,0.869,0.274,1.298c-0.035,0.047-0.046,0.062-0.046,0.062c-0.183,0.253-0.738,1.032-1.515,2.119 c-0.204-0.252-2.807-3.467-2.956-4.799C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="47.9224" x2="3.9991" y1="3.9307" y2="47.854">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+ <stop offset="0" style="stop-color:#ABEEFF"/>
+ <stop offset="1" style="stop-color:#539FDE"/>
</linearGradient>
-<path d="M2.979,47.467c-0.344-1.925-0.873-3.878,0.235-6.567 c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.341,4.269,40.9,3.215c2.691-1.108,4.644-0.581,6.567-0.236 c1.981,0.354,7.296,2.178,10.069,4.711c-2.552-2.815-8.496-4.879-10.617-5.258c-1.923-0.345-3.876-0.872-6.567,0.235 c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567 c0.378,2.122,2.441,8.065,5.258,10.617C5.156,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M2.979,47.467c-0.344-1.925-0.873-3.878,0.235-6.567 c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.341,4.269,40.9,3.215c2.691-1.108,4.644-0.581,6.567-0.236 c1.981,0.354,7.296,2.178,10.069,4.711c-2.552-2.815-8.496-4.879-10.617-5.258c-1.923-0.345-3.876-0.872-6.567,0.235 c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567 c0.378,2.122,2.441,8.065,5.258,10.617C5.156,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="54.3535" x2="3.9474" y1="3.2017" y2="53.6078">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+ <stop offset="0" style="stop-color:#ABEEFF"/>
+ <stop offset="1" style="stop-color:#539FDE"/>
</linearGradient>
-<path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333 c-0.617-0.665-2.567-3.083-2.968-3.735c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956 c6.191-6.192,9.085-7.646,9.956-8.107c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967 c0.534,0.492,0.872,0.588,1.299,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778 c-0.292-0.339-0.634-0.665-1.013-0.982c0.49,0.657,0.198,1.134-0.607,1.666C54.65,9.447,41.576,18.739,40.825,19.29 c-0.431,0.314-0.767,0.219-1.3-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.948-0.436-1.71-0.034 c-0.871,0.46-3.764,1.914-9.956,8.106c-6.193,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.319,1.135,0.035,1.711 c0.4,0.651,2.351,3.069,2.967,3.736c0.493,0.533,0.559,0.896,0.259,1.332c-0.517,0.755-9.828,13.794-10.76,15.195 c-0.533,0.803-1.008,1.098-1.665,0.606c0.314,0.378,0.644,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_5_)" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333 c-0.617-0.665-2.567-3.083-2.968-3.735c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956 c6.191-6.192,9.085-7.646,9.956-8.107c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967 c0.534,0.492,0.872,0.588,1.299,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778 c-0.292-0.339-0.634-0.665-1.013-0.982c0.49,0.657,0.198,1.134-0.607,1.666C54.65,9.447,41.576,18.739,40.825,19.29 c-0.431,0.314-0.767,0.219-1.3-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.948-0.436-1.71-0.034 c-0.871,0.46-3.764,1.914-9.956,8.106c-6.193,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.319,1.135,0.035,1.711 c0.4,0.651,2.351,3.069,2.967,3.736c0.493,0.533,0.559,0.896,0.259,1.332c-0.517,0.755-9.828,13.794-10.76,15.195 c-0.533,0.803-1.008,1.098-1.665,0.606c0.314,0.378,0.644,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_5_)" opacity="0.6"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -141.776 3075.0667)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-2041.9355" x2="-2041.9355" y1="-2305.2153" y2="-2243.2966">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="0.5091" style="stop-color:#081D45"/>
-<stop offset="1" style="stop-color:#2275BD"/>
+ <stop offset="0" style="stop-color:#2685D2"/>
+ <stop offset="0.5091" style="stop-color:#081D45"/>
+ <stop offset="1" style="stop-color:#2275BD"/>
</linearGradient>
<path d="M2.899,45.012c1.275-2.777,10.299-14.804,18.804-23.31c8.505-8.506,20.532-17.529,23.308-18.803 c0.527-0.241,1.02-0.411,1.493-0.545c-0.511-0.096-1.03-0.19-1.565-0.26c-0.086,0.036-0.163,0.063-0.25,0.102 c-2.818,1.293-14.971,10.397-23.533,18.959C12.595,29.717,3.489,41.869,2.195,44.688c-0.038,0.087-0.063,0.166-0.101,0.25 c0.07,0.535,0.166,1.055,0.259,1.565C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_6_)"/>
<rect fill="none" height="60" width="60"/>
</g>
<g>
+<defs>
+</defs>
<polygon fill="none" points="15.053,0 14.626,0.439 0,0.439 0,30.439 30,30.439 30,0.439 15.476,0.439 "/>
-<path d="M24.884,30.438c-10.001,0-15.735-4.635-15.735-12.715v-4.339H2.053L15.053,0l12.88,13.385h-6.962v4.339 c0,2.189,2.56,2.768,3.913,2.768h1v9.947H24.884z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M24.884,30.438c-10.001,0-15.735-4.635-15.735-12.715v-4.339H2.053L15.053,0l12.88,13.385h-6.962v4.339 c0,2.189,2.56,2.768,3.913,2.768h1v9.947H24.884z" opacity="0.35"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3014.6338)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-2179" x2="-2179" y1="3012.1528" y2="2984.2842">
-<stop offset="0" style="stop-color:#FF7042"/>
-<stop offset="1" style="stop-color:#991B23"/>
+ <stop offset="0" style="stop-color:#FF7042"/>
+ <stop offset="1" style="stop-color:#991B23"/>
</linearGradient>
<path d="M19.971,17.724v-5.339h5.611L15.049,1.438L4.418,12.385h5.73v5.339 c0,9.024,7.509,11.715,14.735,11.715v-7.947C22.658,21.491,19.971,20.392,19.971,17.724z" fill="url(#SVGID_1__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="15" x2="15" y1="1.7129" y2="22.5894">
-<stop offset="0" style="stop-color:#FFB259"/>
-<stop offset="1" style="stop-color:#991B23"/>
+ <stop offset="0" style="stop-color:#FFB259"/>
+ <stop offset="1" style="stop-color:#991B23"/>
</linearGradient>
<polygon fill="url(#SVGID_2__)" points="15.049,2.438 24.62,12.385 25.582,12.385 15.049,1.438 4.418,12.385 5.389,12.385 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="22.4268" x2="22.4268" y1="1.7129" y2="22.5894">
-<stop offset="0" style="stop-color:#FF7042"/>
-<stop offset="1" style="stop-color:#991B23"/>
+ <stop offset="0" style="stop-color:#FF7042"/>
+ <stop offset="1" style="stop-color:#991B23"/>
</linearGradient>
<path d="M19.971,17.724v1c0,2.668,2.688,3.768,4.913,3.768v-1C22.658,21.491,19.971,20.392,19.971,17.724z" fill="url(#SVGID_3__)"/>
<rect fill="none" height="30" width="30" y="0.439"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_missed_voice_call_unseen.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_missed_voice_call_unseen.svg Fri May 14 16:09:54 2010 +0300
@@ -1,86 +1,88 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<stop offset="0" style="stop-color:#3AC5EA"/>
-<stop offset="0.297" style="stop-color:#3AC5EA"/>
-<stop offset="0.6667" style="stop-color:#1754C9"/>
-<stop offset="0.7939" style="stop-color:#33ADE1"/>
-<stop offset="1" style="stop-color:#33ADE1"/>
+ <stop offset="0.297" style="stop-color:#3AC5EA"/>
+ <stop offset="0.6667" style="stop-color:#1754C9"/>
+ <stop offset="0.7939" style="stop-color:#33ADE1"/>
</radialGradient>
<path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333c-0.617-0.665-2.567-3.083-2.968-3.735 c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956c6.191-6.192,9.085-7.646,9.956-8.107 c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967c0.534,0.492,0.872,0.588,1.299,0.274 c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778c-2.476-2.889-8.594-5.015-10.751-5.399 c-1.923-0.345-3.876-0.872-6.567,0.235c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352 c-1.108,2.691-0.581,4.645-0.236,6.567c0.386,2.158,2.51,8.275,5.399,10.752c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2070.7568" x2="-2070.3252" y1="-2266.8511" y2="-2263.2749">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+ <stop offset="0" style="stop-color:#2685D2"/>
+ <stop offset="1" style="stop-color:#081D45"/>
</linearGradient>
<path d="M35.172,17.108c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967 c0.534,0.492,0.872,0.588,1.299,0.274c0.048-0.035,0.062-0.046,0.064-0.046c0.253-0.184,1.032-0.738,2.12-1.514 c-0.251-0.204-3.468-2.809-4.8-2.956C36.857,15.598,35.172,17.108,35.172,17.108z" fill="url(#SVGID_2_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -2128.2356 5114.0977)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2070.7607" x2="-2070.3289" y1="5104.5752" y2="5108.1523">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+ <stop offset="0" style="stop-color:#2685D2"/>
+ <stop offset="1" style="stop-color:#081D45"/>
</linearGradient>
<path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.713c0.376,0.666,2.351,3.069,2.967,3.738 c0.493,0.531,0.587,0.869,0.274,1.298c-0.035,0.047-0.046,0.062-0.046,0.062c-0.183,0.253-0.738,1.032-1.515,2.119 c-0.204-0.252-2.807-3.467-2.956-4.799C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="47.9224" x2="3.9991" y1="3.9307" y2="47.854">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+ <stop offset="0" style="stop-color:#ABEEFF"/>
+ <stop offset="1" style="stop-color:#539FDE"/>
</linearGradient>
-<path d="M2.979,47.467c-0.344-1.925-0.873-3.878,0.235-6.567 c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.341,4.269,40.9,3.215c2.691-1.108,4.644-0.581,6.567-0.236 c1.981,0.354,7.296,2.178,10.069,4.711c-2.552-2.815-8.496-4.879-10.617-5.258c-1.923-0.345-3.876-0.872-6.567,0.235 c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567 c0.378,2.122,2.441,8.065,5.258,10.617C5.156,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M2.979,47.467c-0.344-1.925-0.873-3.878,0.235-6.567 c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.341,4.269,40.9,3.215c2.691-1.108,4.644-0.581,6.567-0.236 c1.981,0.354,7.296,2.178,10.069,4.711c-2.552-2.815-8.496-4.879-10.617-5.258c-1.923-0.345-3.876-0.872-6.567,0.235 c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567 c0.378,2.122,2.441,8.065,5.258,10.617C5.156,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="54.3535" x2="3.9474" y1="3.2017" y2="53.6078">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+ <stop offset="0" style="stop-color:#ABEEFF"/>
+ <stop offset="1" style="stop-color:#539FDE"/>
</linearGradient>
-<path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333 c-0.617-0.665-2.567-3.083-2.968-3.735c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956 c6.191-6.192,9.085-7.646,9.956-8.107c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967 c0.534,0.492,0.872,0.588,1.299,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778 c-0.292-0.339-0.634-0.665-1.013-0.982c0.49,0.657,0.198,1.134-0.607,1.666C54.65,9.447,41.576,18.739,40.825,19.29 c-0.431,0.314-0.767,0.219-1.3-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.948-0.436-1.71-0.034 c-0.871,0.46-3.764,1.914-9.956,8.106c-6.193,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.319,1.135,0.035,1.711 c0.4,0.651,2.351,3.069,2.967,3.736c0.493,0.533,0.559,0.896,0.259,1.332c-0.517,0.755-9.828,13.794-10.76,15.195 c-0.533,0.803-1.008,1.098-1.665,0.606c0.314,0.378,0.644,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_5_)" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333 c-0.617-0.665-2.567-3.083-2.968-3.735c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956 c6.191-6.192,9.085-7.646,9.956-8.107c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967 c0.534,0.492,0.872,0.588,1.299,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778 c-0.292-0.339-0.634-0.665-1.013-0.982c0.49,0.657,0.198,1.134-0.607,1.666C54.65,9.447,41.576,18.739,40.825,19.29 c-0.431,0.314-0.767,0.219-1.3-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.948-0.436-1.71-0.034 c-0.871,0.46-3.764,1.914-9.956,8.106c-6.193,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.319,1.135,0.035,1.711 c0.4,0.651,2.351,3.069,2.967,3.736c0.493,0.533,0.559,0.896,0.259,1.332c-0.517,0.755-9.828,13.794-10.76,15.195 c-0.533,0.803-1.008,1.098-1.665,0.606c0.314,0.378,0.644,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_5_)" opacity="0.6"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -141.776 3075.0667)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-2041.9355" x2="-2041.9355" y1="-2305.2153" y2="-2243.2966">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="0.5091" style="stop-color:#081D45"/>
-<stop offset="1" style="stop-color:#2275BD"/>
+ <stop offset="0" style="stop-color:#2685D2"/>
+ <stop offset="0.5091" style="stop-color:#081D45"/>
+ <stop offset="1" style="stop-color:#2275BD"/>
</linearGradient>
<path d="M2.899,45.012c1.275-2.777,10.299-14.804,18.804-23.31c8.505-8.506,20.532-17.529,23.308-18.803 c0.527-0.241,1.02-0.411,1.493-0.545c-0.511-0.096-1.03-0.19-1.565-0.26c-0.086,0.036-0.163,0.063-0.25,0.102 c-2.818,1.293-14.971,10.397-23.533,18.959C12.595,29.717,3.489,41.869,2.195,44.688c-0.038,0.087-0.063,0.166-0.101,0.25 c0.07,0.535,0.166,1.055,0.259,1.565C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_6_)"/>
<rect fill="none" height="60" width="60"/>
</g>
<g>
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
<rect fill="none" height="30" width="30"/>
-<path d="M20.74,16.008L21.732,17L30,8.733l-4.488-4.486l-4.131,4.132l1.613-6.023l-6.129-1.643l-2.32,8.654 l-4.027-4.185L0,16.008h5.752v3.212c0,6.398,4.527,10.067,12.42,10.067h0.943v-8.079h-0.943c-0.998,0-2.881-0.416-2.881-1.988 v-3.212H20.74z M18.381,11.377l-0.969,0.969l-1.594-1.655L18.381,11.377z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M20.74,16.008L21.732,17L30,8.733l-4.488-4.486l-4.131,4.132l1.613-6.023l-6.129-1.643l-2.32,8.654 l-4.027-4.185L0,16.008h5.752v3.212c0,6.398,4.527,10.067,12.42,10.067h0.943v-8.079h-0.943c-0.998,0-2.881-0.416-2.881-1.988 v-3.212H20.74z M18.381,11.377l-0.969,0.969l-1.594-1.655L18.381,11.377z" opacity="0.35"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3121.6689)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-2183.5244" x2="-2183.5244" y1="3114.3159" y2="3092.6184">
-<stop offset="0" style="stop-color:#FF7042"/>
-<stop offset="1" style="stop-color:#991B23"/>
+ <stop offset="0" style="stop-color:#FF7042"/>
+ <stop offset="1" style="stop-color:#991B23"/>
</linearGradient>
<path d="M14.346,19.22v-4.157h4.369l-8.201-8.521l-8.277,8.521h4.461v4.157c0,7.027,5.848,9.122,11.475,9.122 v-6.188C16.438,22.154,14.346,21.298,14.346,19.22z" fill="url(#SVGID_1__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="10.4756" x2="10.4756" y1="6.6836" y2="23.1265">
-<stop offset="0" style="stop-color:#FA9D53"/>
-<stop offset="1" style="stop-color:#991B23"/>
+ <stop offset="0" style="stop-color:#FA9D53"/>
+ <stop offset="1" style="stop-color:#991B23"/>
</linearGradient>
<polygon fill="url(#SVGID_2__)" points="10.514,7.505 17.787,15.063 18.715,15.063 10.514,6.542 2.236,15.063 3.172,15.063 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="16.2588" x2="16.2588" y1="6.6821" y2="23.1266">
-<stop offset="0" style="stop-color:#FA9D53"/>
-<stop offset="1" style="stop-color:#991B23"/>
+ <stop offset="0" style="stop-color:#FA9D53"/>
+ <stop offset="1" style="stop-color:#991B23"/>
</linearGradient>
<path d="M14.346,19.22v0.964c0,2.077,2.092,2.934,3.826,2.934v-0.963 C16.438,22.154,14.346,21.298,14.346,19.22z" fill="url(#SVGID_3__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="19.6777" x2="17.6734" y1="2.3481" y2="10.087">
-<stop offset="0" style="stop-color:#FFA959"/>
-<stop offset="0.703" style="stop-color:#CA3522"/>
-<stop offset="1" style="stop-color:#F08849"/>
+ <stop offset="0" style="stop-color:#FFA959"/>
+ <stop offset="0.703" style="stop-color:#CA3522"/>
+ <stop offset="1" style="stop-color:#F08849"/>
</linearGradient>
<polygon fill="url(#SVGID_4__)" points="15.459,9.616 17.533,1.871 21.836,3.024 19.762,10.768 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="19.5371" x2="17.755" y1="2.8726" y2="9.7783">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="0.7939" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#E8522A"/>
+ <stop offset="0" style="stop-color:#FF7236"/>
+ <stop offset="0.7939" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#E8522A"/>
</linearGradient>
<polygon fill="url(#SVGID_5__)" points="19.445,10.223 16.004,9.3 17.85,2.416 21.291,3.338 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6__" x1="27.0137" x2="20.1654" y1="7.1484" y2="14.1638">
-<stop offset="0" style="stop-color:#FFA959"/>
-<stop offset="0.703" style="stop-color:#CA3522"/>
-<stop offset="1" style="stop-color:#F08849"/>
+ <stop offset="0" style="stop-color:#FFA959"/>
+ <stop offset="0.703" style="stop-color:#CA3522"/>
+ <stop offset="1" style="stop-color:#F08849"/>
</linearGradient>
<polygon fill="url(#SVGID_6__)" points="18.582,12.513 25.512,5.584 28.662,8.733 21.732,15.663 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="26.7764" x2="20.5396" y1="7.4414" y2="13.7339">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="0.7939" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#E8522A"/>
+ <stop offset="0" style="stop-color:#FF7236"/>
+ <stop offset="0.7939" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#E8522A"/>
</linearGradient>
<polygon fill="url(#SVGID_7_)" points="21.732,15.034 19.213,12.513 25.512,6.213 28.031,8.733 "/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_missed_voip_call_unseen.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_missed_voip_call_unseen.svg Fri May 14 16:09:54 2010 +0300
@@ -1,117 +1,121 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<stop offset="0" style="stop-color:#3AC5EA"/>
-<stop offset="0.297" style="stop-color:#3AC5EA"/>
-<stop offset="0.6667" style="stop-color:#1754C9"/>
-<stop offset="0.7939" style="stop-color:#33ADE1"/>
-<stop offset="1" style="stop-color:#33ADE1"/>
+ <stop offset="0.297" style="stop-color:#3AC5EA"/>
+ <stop offset="0.6667" style="stop-color:#1754C9"/>
+ <stop offset="0.7939" style="stop-color:#33ADE1"/>
</radialGradient>
<path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333c-0.617-0.665-2.567-3.083-2.968-3.735 c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956c6.191-6.192,9.085-7.646,9.956-8.107 c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967c0.534,0.492,0.872,0.588,1.299,0.274 c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778c-2.476-2.889-8.594-5.015-10.751-5.399 c-1.923-0.345-3.876-0.872-6.567,0.235c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352 c-1.108,2.691-0.581,4.645-0.236,6.567c0.386,2.158,2.51,8.275,5.399,10.752c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2070.7568" x2="-2070.3252" y1="-2266.8511" y2="-2263.2749">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+ <stop offset="0" style="stop-color:#2685D2"/>
+ <stop offset="1" style="stop-color:#081D45"/>
</linearGradient>
<path d="M35.172,17.108c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967 c0.534,0.492,0.872,0.588,1.299,0.274c0.048-0.035,0.062-0.046,0.064-0.046c0.253-0.184,1.032-0.738,2.12-1.514 c-0.251-0.204-3.468-2.809-4.8-2.956C36.857,15.598,35.172,17.108,35.172,17.108z" fill="url(#SVGID_2_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -2128.2356 5114.0977)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2070.7607" x2="-2070.3289" y1="5104.5752" y2="5108.1523">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+ <stop offset="0" style="stop-color:#2685D2"/>
+ <stop offset="1" style="stop-color:#081D45"/>
</linearGradient>
<path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.713c0.376,0.666,2.351,3.069,2.967,3.738 c0.493,0.531,0.587,0.869,0.274,1.298c-0.035,0.047-0.046,0.062-0.046,0.062c-0.183,0.253-0.738,1.032-1.515,2.119 c-0.204-0.252-2.807-3.467-2.956-4.799C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="47.9224" x2="3.9991" y1="3.9307" y2="47.854">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+ <stop offset="0" style="stop-color:#ABEEFF"/>
+ <stop offset="1" style="stop-color:#539FDE"/>
</linearGradient>
-<path d="M2.979,47.467c-0.344-1.925-0.873-3.878,0.235-6.567 c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.341,4.269,40.9,3.215c2.691-1.108,4.644-0.581,6.567-0.236 c1.981,0.354,7.296,2.178,10.069,4.711c-2.552-2.815-8.496-4.879-10.617-5.258c-1.923-0.345-3.876-0.872-6.567,0.235 c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567 c0.378,2.122,2.441,8.065,5.258,10.617C5.156,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M2.979,47.467c-0.344-1.925-0.873-3.878,0.235-6.567 c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.341,4.269,40.9,3.215c2.691-1.108,4.644-0.581,6.567-0.236 c1.981,0.354,7.296,2.178,10.069,4.711c-2.552-2.815-8.496-4.879-10.617-5.258c-1.923-0.345-3.876-0.872-6.567,0.235 c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567 c0.378,2.122,2.441,8.065,5.258,10.617C5.156,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="54.3535" x2="3.9474" y1="3.2017" y2="53.6078">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+ <stop offset="0" style="stop-color:#ABEEFF"/>
+ <stop offset="1" style="stop-color:#539FDE"/>
</linearGradient>
-<path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333 c-0.617-0.665-2.567-3.083-2.968-3.735c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956 c6.191-6.192,9.085-7.646,9.956-8.107c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967 c0.534,0.492,0.872,0.588,1.299,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778 c-0.292-0.339-0.634-0.665-1.013-0.982c0.49,0.657,0.198,1.134-0.607,1.666C54.65,9.447,41.576,18.739,40.825,19.29 c-0.431,0.314-0.767,0.219-1.3-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.948-0.436-1.71-0.034 c-0.871,0.46-3.764,1.914-9.956,8.106c-6.193,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.319,1.135,0.035,1.711 c0.4,0.651,2.351,3.069,2.967,3.736c0.493,0.533,0.559,0.896,0.259,1.332c-0.517,0.755-9.828,13.794-10.76,15.195 c-0.533,0.803-1.008,1.098-1.665,0.606c0.314,0.378,0.644,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_5_)" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333 c-0.617-0.665-2.567-3.083-2.968-3.735c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956 c6.191-6.192,9.085-7.646,9.956-8.107c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967 c0.534,0.492,0.872,0.588,1.299,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778 c-0.292-0.339-0.634-0.665-1.013-0.982c0.49,0.657,0.198,1.134-0.607,1.666C54.65,9.447,41.576,18.739,40.825,19.29 c-0.431,0.314-0.767,0.219-1.3-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.948-0.436-1.71-0.034 c-0.871,0.46-3.764,1.914-9.956,8.106c-6.193,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.319,1.135,0.035,1.711 c0.4,0.651,2.351,3.069,2.967,3.736c0.493,0.533,0.559,0.896,0.259,1.332c-0.517,0.755-9.828,13.794-10.76,15.195 c-0.533,0.803-1.008,1.098-1.665,0.606c0.314,0.378,0.644,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_5_)" opacity="0.6"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -141.776 3075.0667)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-2041.9355" x2="-2041.9355" y1="-2305.2153" y2="-2243.2966">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="0.5091" style="stop-color:#081D45"/>
-<stop offset="1" style="stop-color:#2275BD"/>
+ <stop offset="0" style="stop-color:#2685D2"/>
+ <stop offset="0.5091" style="stop-color:#081D45"/>
+ <stop offset="1" style="stop-color:#2275BD"/>
</linearGradient>
<path d="M2.899,45.012c1.275-2.777,10.299-14.804,18.804-23.31c8.505-8.506,20.532-17.529,23.308-18.803 c0.527-0.241,1.02-0.411,1.493-0.545c-0.511-0.096-1.03-0.19-1.565-0.26c-0.086,0.036-0.163,0.063-0.25,0.102 c-2.818,1.293-14.971,10.397-23.533,18.959C12.595,29.717,3.489,41.869,2.195,44.688c-0.038,0.087-0.063,0.166-0.101,0.25 c0.07,0.535,0.166,1.055,0.259,1.565C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_6_)"/>
<rect fill="none" height="60" width="60"/>
</g>
<g>
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
<rect fill="none" height="30" width="30"/>
-<path d="M20.74,16.008L21.732,17L30,8.733l-4.488-4.486l-4.131,4.132l1.613-6.023l-6.129-1.643l-2.32,8.654 l-4.027-4.185L0,16.008h5.752v3.212c0,6.398,4.527,10.067,12.42,10.067h0.943v-8.079h-0.943c-0.998,0-2.881-0.416-2.881-1.988 v-3.212H20.74z M18.381,11.377l-0.969,0.969l-1.594-1.655L18.381,11.377z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M20.74,16.008L21.732,17L30,8.733l-4.488-4.486l-4.131,4.132l1.613-6.023l-6.129-1.643l-2.32,8.654 l-4.027-4.185L0,16.008h5.752v3.212c0,6.398,4.527,10.067,12.42,10.067h0.943v-8.079h-0.943c-0.998,0-2.881-0.416-2.881-1.988 v-3.212H20.74z M18.381,11.377l-0.969,0.969l-1.594-1.655L18.381,11.377z" opacity="0.35"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3121.6689)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-2183.5244" x2="-2183.5244" y1="3114.3159" y2="3092.6184">
-<stop offset="0" style="stop-color:#FF7042"/>
-<stop offset="1" style="stop-color:#991B23"/>
+ <stop offset="0" style="stop-color:#FF7042"/>
+ <stop offset="1" style="stop-color:#991B23"/>
</linearGradient>
<path d="M14.346,19.22v-4.157h4.369l-8.201-8.521l-8.277,8.521h4.461v4.157c0,7.027,5.848,9.122,11.475,9.122 v-6.188C16.438,22.154,14.346,21.298,14.346,19.22z" fill="url(#SVGID_1__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="10.4756" x2="10.4756" y1="6.6836" y2="23.1265">
-<stop offset="0" style="stop-color:#FA9D53"/>
-<stop offset="1" style="stop-color:#991B23"/>
+ <stop offset="0" style="stop-color:#FA9D53"/>
+ <stop offset="1" style="stop-color:#991B23"/>
</linearGradient>
<polygon fill="url(#SVGID_2__)" points="10.514,7.505 17.787,15.063 18.715,15.063 10.514,6.542 2.236,15.063 3.172,15.063 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="16.2588" x2="16.2588" y1="6.6821" y2="23.1266">
-<stop offset="0" style="stop-color:#FA9D53"/>
-<stop offset="1" style="stop-color:#991B23"/>
+ <stop offset="0" style="stop-color:#FA9D53"/>
+ <stop offset="1" style="stop-color:#991B23"/>
</linearGradient>
<path d="M14.346,19.22v0.964c0,2.077,2.092,2.934,3.826,2.934v-0.963 C16.438,22.154,14.346,21.298,14.346,19.22z" fill="url(#SVGID_3__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="19.6777" x2="17.6734" y1="2.3481" y2="10.087">
-<stop offset="0" style="stop-color:#FFA959"/>
-<stop offset="0.703" style="stop-color:#CA3522"/>
-<stop offset="1" style="stop-color:#F08849"/>
+ <stop offset="0" style="stop-color:#FFA959"/>
+ <stop offset="0.703" style="stop-color:#CA3522"/>
+ <stop offset="1" style="stop-color:#F08849"/>
</linearGradient>
<polygon fill="url(#SVGID_4__)" points="15.459,9.616 17.533,1.871 21.836,3.024 19.762,10.768 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="19.5371" x2="17.755" y1="2.8726" y2="9.7783">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="0.7939" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#E8522A"/>
+ <stop offset="0" style="stop-color:#FF7236"/>
+ <stop offset="0.7939" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#E8522A"/>
</linearGradient>
<polygon fill="url(#SVGID_5__)" points="19.445,10.223 16.004,9.3 17.85,2.416 21.291,3.338 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6__" x1="27.0137" x2="20.1654" y1="7.1484" y2="14.1638">
-<stop offset="0" style="stop-color:#FFA959"/>
-<stop offset="0.703" style="stop-color:#CA3522"/>
-<stop offset="1" style="stop-color:#F08849"/>
+ <stop offset="0" style="stop-color:#FFA959"/>
+ <stop offset="0.703" style="stop-color:#CA3522"/>
+ <stop offset="1" style="stop-color:#F08849"/>
</linearGradient>
<polygon fill="url(#SVGID_6__)" points="18.582,12.513 25.512,5.584 28.662,8.733 21.732,15.663 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="26.7764" x2="20.5396" y1="7.4414" y2="13.7339">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="0.7939" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#E8522A"/>
+ <stop offset="0" style="stop-color:#FF7236"/>
+ <stop offset="0.7939" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#E8522A"/>
</linearGradient>
<polygon fill="url(#SVGID_7_)" points="21.732,15.034 19.213,12.513 25.512,6.213 28.031,8.733 "/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
-<path d="M15,29.5C7.004,29.5,0.5,22.996,0.5,15C0.5,7.004,7.004,0.5,15,0.5 c7.995,0,14.5,6.505,14.5,14.5S22.995,29.5,15,29.5L15,29.5z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M15,29.5C7.004,29.5,0.5,22.996,0.5,15C0.5,7.004,7.004,0.5,15,0.5 c7.995,0,14.5,6.505,14.5,14.5S22.995,29.5,15,29.5L15,29.5z" enable-background="new " opacity="0.35"/>
<radialGradient cx="435.2295" cy="910.6348" gradientTransform="matrix(0.618 0 0 0.618 -253.9715 -552.4329)" gradientUnits="userSpaceOnUse" id="SVGID_1___" r="28.704">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#94FFFF"/>
+ <stop offset="0.5" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</radialGradient>
<circle cx="15" cy="15" fill="url(#SVGID_1___)" r="13.464"/>
-<path d="M27.983,14.263c-0.299-5.259-3.704-9.788-8.679-11.54l-0.605,0.1L15.18,2.15 l-4.386,2.615l-0.165,1.102H8.083l1.006,1.71L6.365,9.8l-0.635,2.744l2.25,3.987l2.297-0.469l0.839,0.723l0.655,0.064l0.433,1.691 l-0.571,1.484l2.084,5.332h2.126l2.107-1.701v-0.695l0.557-0.863l0.459-0.236c-0.116,0.18-0.3,0.586-0.3,0.586 c-0.02,0.139,0.299,2.855,1.234,2.643c0.711-0.16,3.248-4.873,3.296-5.322c0.096-0.887-0.387-1.252-0.683-1.391l-0.329-0.156 l-1.515,1.52c-0.162,0.012-0.309,0.039-0.44,0.078v-1.26l1.645-1.605l0.837-2.698l1.275-1.038l-0.28-0.508l0.962-0.926l-0.538-0.979 l0.41,0.049l2.396,5.362l0.49-0.39c-0.015-0.262-0.043-0.521-0.073-0.779L27.983,14.263z M15.161,8.231l-0.2-0.535h1.202 l0.586,1.316h-0.871V8.23L15.161,8.231L15.161,8.231z M19.129,10.882l0.961,1.402l0.064,0.168l-0.984-0.595l-0.234-0.848 L19.129,10.882z M20.573,13.331l0.29,0.29l-0.375,0.084l-0.085-0.104L20.573,13.331z M13.06,3.903l0.611,0.946l-0.694,0.212 l-0.271-0.154L13.06,3.903z" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M27.983,14.263c-0.299-5.259-3.704-9.788-8.679-11.54l-0.605,0.1L15.18,2.15 l-4.386,2.615l-0.165,1.102H8.083l1.006,1.71L6.365,9.8l-0.635,2.744l2.25,3.987l2.297-0.469l0.839,0.723l0.655,0.064l0.433,1.691 l-0.571,1.484l2.084,5.332h2.126l2.107-1.701v-0.695l0.557-0.863l0.459-0.236c-0.116,0.18-0.3,0.586-0.3,0.586 c-0.02,0.139,0.299,2.855,1.234,2.643c0.711-0.16,3.248-4.873,3.296-5.322c0.096-0.887-0.387-1.252-0.683-1.391l-0.329-0.156 l-1.515,1.52c-0.162,0.012-0.309,0.039-0.44,0.078v-1.26l1.645-1.605l0.837-2.698l1.275-1.038l-0.28-0.508l0.962-0.926l-0.538-0.979 l0.41,0.049l2.396,5.362l0.49-0.39c-0.015-0.262-0.043-0.521-0.073-0.779L27.983,14.263z M15.161,8.231l-0.2-0.535h1.202 l0.586,1.316h-0.871V8.23L15.161,8.231L15.161,8.231z M19.129,10.882l0.961,1.402l0.064,0.168l-0.984-0.595l-0.234-0.848 L19.129,10.882z M20.573,13.331l0.29,0.29l-0.375,0.084l-0.085-0.104L20.573,13.331z M13.06,3.903l0.611,0.946l-0.694,0.212 l-0.271-0.154L13.06,3.903z" enable-background="new " opacity="0.3"/>
<linearGradient gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_2___" x1="333.1904" x2="333.1904" y1="416.6045" y2="431.9054">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#C8E4EB"/>
+ <stop offset="0" style="stop-color:#31A7F8"/>
+ <stop offset="0.497" style="stop-color:#1E74DC"/>
+ <stop offset="1" style="stop-color:#C8E4EB"/>
</linearGradient>
-<path d="M15,1.536C7.564,1.536,1.536,7.565,1.536,15 c0,7.439,6.029,13.464,13.464,13.464c7.438,0,13.465-6.027,13.465-13.464C28.465,7.565,22.438,1.536,15,1.536z M15,27.428 C8.146,27.428,2.571,21.854,2.571,15C2.571,8.147,8.146,2.571,15,2.571S27.428,8.147,27.428,15 C27.428,21.854,21.854,27.428,15,27.428z" fill="url(#SVGID_2___)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M15,1.536C7.564,1.536,1.536,7.565,1.536,15 c0,7.439,6.029,13.464,13.464,13.464c7.438,0,13.465-6.027,13.465-13.464C28.465,7.565,22.438,1.536,15,1.536z M15,27.428 C8.146,27.428,2.571,21.854,2.571,15C2.571,8.147,8.146,2.571,15,2.571S27.428,8.147,27.428,15 C27.428,21.854,21.854,27.428,15,27.428z" enable-background="new " fill="url(#SVGID_2___)" opacity="0.3"/>
<radialGradient cx="333.6309" cy="418.627" gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_3___" r="9.0429">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+ <stop offset="0" style="stop-color:#94FF26"/>
+ <stop offset="0.3152" style="stop-color:#94FF26"/>
+ <stop offset="0.7273" style="stop-color:#1FC211"/>
+ <stop offset="1" style="stop-color:#0BA133"/>
</radialGradient>
<path d="M22.296,18.848l-1.401,1.402c0,0-0.848,0-0.887,0.336c-0.02,0.145-0.065,0.771-0.208,1.094 c-0.282,0.195-0.619,0.842-0.619,0.842s-0.175,1.25,0.761,1.037C20.871,23.35,23.734,19.523,22.296,18.848z" fill="url(#SVGID_3___)"/>
<radialGradient cx="333.6299" cy="418.6211" gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_4___" r="10.4663">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+ <stop offset="0" style="stop-color:#94FF26"/>
+ <stop offset="0.3152" style="stop-color:#94FF26"/>
+ <stop offset="0.7273" style="stop-color:#1FC211"/>
+ <stop offset="1" style="stop-color:#0BA133"/>
</radialGradient>
<path d="M19.132,3.213c-0.23,0.087-0.387,0.146-0.387,0.146l-3.463-0.663L13.583,3.76l0.894,1.383 l-1.563,0.48l-0.842-0.48l0.296-0.84l-1.098,0.76l-0.196,1.324H8.988L9.759,7.7l-2.932,2.39l-0.552,2.387l1.088,2.107L8.018,15 l2.297-0.469l0.839,0.721l0.763,0.074l0.83,3.246l-0.552,1.436l1.22,2.697l0.343,1.119h2.126l1.202-0.65l0.905-1.053V20.85 l1.724-0.881v-1.885l0.681-1.297l1.521-1.366l0.363-1.585l-1.988,0.443l-0.522-0.637l0.371-0.594l-1.411-0.854l-0.601-2.164 l1.042-0.68l0.96,1.402l0.359,0.922l0.722,0.721l0.842,0.44l0.936-0.151l1.039-1l-0.731-1.334l-0.921,0.24l-0.833-0.991l0.791-0.552 l2.482,0.301v0.883l2.161,4.452l0.491-0.393C27.176,9.158,23.783,4.849,19.132,3.213z M18.004,9.23l-1.134,0.3h-1.511V8.749h-1.443 L12.774,9.05l-1.741-0.482l-0.482-0.901l2.404-0.541h2.406L15,6.164h1.202l0.67,1.503l1.134,0.398V9.23H18.004z M20.589,7.247 l-2.044-0.361V6.165l1.022-0.24l0.3-0.36l0.722,0.6V7.247L20.589,7.247z" fill="url(#SVGID_4___)"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mmc.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mmc.svg Fri May 14 16:09:54 2010 +0300
@@ -1,82 +1,161 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.54" x2="29.54" y1="8.111" y2="49.9">
+
<stop offset="0" stop-color="#666666"/>
+
<stop offset="1" stop-color="#000000"/>
+
</linearGradient>
+
<path d="M22.91,9.039c0.511-0.425,1.472-0.771,2.136-0.771h20.48c0.664,0,1.207,0.542,1.207,1.206v39.21c0,0.663-0.543,1.206-1.207,1.206h-31.98c-0.663,0-1.207-0.543-1.207-1.206v-29.69c0-0.663,0.418-1.553,0.929-1.977l9.63-7.991z" fill="url(#SVGID_1_)"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="29.54" x2="29.54" y1="7.959" y2="50.51">
+
<stop offset="0" stop-color="#999999"/>
+
<stop offset="1" stop-color="#333333"/>
+
</linearGradient>
+
<path d="M45.77,8.571c0.338,0,0.611,0.274,0.611,0.612v39.8c0,0.338-0.273,0.612-0.611,0.612h-32.45c-0.338,0-0.612-0.274-0.612-0.612v-30.13c0-0.49,0.344-1.222,0.721-1.535l9.78-8.105c0.412-0.342,1.242-0.642,1.777-0.642h20.79m0.004-0.614h-20.79c-0.674,0-1.648,0.352-2.167,0.781l-9.78,8.107c-0.519,0.43-0.943,1.332-0.943,2.006v30.13c0,0.673,0.551,1.225,1.225,1.225h32.45c0.673,0,1.225-0.552,1.225-1.225v-39.82c-0.01-0.674-0.56-1.225-1.23-1.225z" fill="url(#SVGID_2_)"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="29.54" x2="29.54" y1="9.65" y2="48.37">
+
<stop offset="0" stop-color="#A0A3A6"/>
+
<stop offset="0.2606" stop-color="#7B7E80"/>
+
<stop offset="0.8182" stop-color="#474B4D"/>
+
<stop offset="1" stop-color="#707577"/>
+
</linearGradient>
+
<path d="M15.15,48.37c-0.673,0-1.224-0.551-1.224-1.225v-27.35c0-0.673,0.423-1.577,0.94-2.009l8.629-7.198c0.517-0.432,1.491-0.784,2.165-0.784h18.26c0.673,0,1.224,0.552,1.224,1.225v36.12c0,0.674-0.551,1.225-1.224,1.225h-28.77z" fill="url(#SVGID_3_)"/>
+
<path d="M43.93,47.76h-28.78c-0.673,0-1.224-0.552-1.224-1.224v0.611c0,0.674,0.551,1.225,1.224,1.225h28.78c0.673,0,1.224-0.551,1.224-1.225v-0.611c0,0.65-0.55,1.21-1.22,1.21z" fill="#808080"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="29.54" x2="29.54" y1="39.8" y2="45.46">
+
<stop offset="0" stop-color="#242626"/>
+
<stop offset="1" stop-color="#585C5E"/>
+
</linearGradient>
+
<rect fill="url(#SVGID_4_)" height="5.511" width="27.55" x="15.76" y="39.8"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="42.09" x2="42.09" y1="19.59" y2="11.02">
+
<stop offset="0" stop-color="#666666"/>
+
<stop offset="1" stop-color="#282828"/>
+
</linearGradient>
+
<rect fill="url(#SVGID_5_)" height="8.571" width="3.674" x="40.26" y="11.02"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="42.09" x2="42.09" y1="11.49" y2="19.86">
+
<stop offset="0" stop-color="#FFF173"/>
+
<stop offset="0.33" stop-color="#F1BC35"/>
+
<stop offset="0.66" stop-color="#E5B029"/>
+
<stop offset="1" stop-color="#FFA102"/>
+
</linearGradient>
+
<rect fill="url(#SVGID_6_)" height="7.959" width="2.449" x="40.87" y="11.63"/>
+
<rect fill="#CBCBCB" height="0.612" width="3.674" x="40.26" y="18.98"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="36.58" x2="36.58" y1="19.59" y2="11.02">
+
<stop offset="0" stop-color="#666666"/>
+
<stop offset="1" stop-color="#282828"/>
-</linearGradient>
-<rect fill="url(#SVGID_7_)" height="8.571" width="3.673" x="34.74" y="11.02"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="36.58" x2="36.58" y1="11.49" y2="19.86">
-<stop offset="0" stop-color="#FFF173"/>
-<stop offset="0.33" stop-color="#F1BC35"/>
-<stop offset="0.66" stop-color="#E5B029"/>
-<stop offset="1" stop-color="#FFA102"/>
+
</linearGradient>
-<rect fill="url(#SVGID_8_)" height="7.959" width="2.449" x="35.36" y="11.63"/>
-<rect fill="#CBCBCB" height="0.612" width="3.673" x="34.74" y="18.98"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="31.07" x2="31.07" y1="19.59" y2="11.02">
-<stop offset="0" stop-color="#666666"/>
-<stop offset="1" stop-color="#282828"/>
-</linearGradient>
-<rect fill="url(#SVGID_9_)" height="8.571" width="3.673" x="29.24" y="11.02"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="31.07" x2="31.07" y1="11.49" y2="19.86">
+
+<rect fill="url(#SVGID_7_)" height="8.571" width="3.673" x="34.74" y="11.02"/>
+
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="36.58" x2="36.58" y1="11.49" y2="19.86">
+
<stop offset="0" stop-color="#FFF173"/>
+
<stop offset="0.33" stop-color="#F1BC35"/>
+
<stop offset="0.66" stop-color="#E5B029"/>
+
<stop offset="1" stop-color="#FFA102"/>
+
</linearGradient>
-<rect fill="url(#SVGID_10_)" height="7.959" width="2.449" x="29.85" y="11.63"/>
-<rect fill="#CBCBCB" height="0.612" width="3.673" x="29.24" y="18.98"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="25.56" x2="25.56" y1="19.59" y2="11.02">
+
+<rect fill="url(#SVGID_8_)" height="7.959" width="2.449" x="35.36" y="11.63"/>
+
+<rect fill="#CBCBCB" height="0.612" width="3.673" x="34.74" y="18.98"/>
+
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="31.07" x2="31.07" y1="19.59" y2="11.02">
+
<stop offset="0" stop-color="#666666"/>
+
<stop offset="1" stop-color="#282828"/>
+
</linearGradient>
-<rect fill="url(#SVGID_11_)" height="8.571" width="3.673" x="23.72" y="11.02"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="25.56" x2="25.56" y1="11.49" y2="19.86">
+
+<rect fill="url(#SVGID_9_)" height="8.571" width="3.673" x="29.24" y="11.02"/>
+
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="31.07" x2="31.07" y1="11.49" y2="19.86">
+
<stop offset="0" stop-color="#FFF173"/>
+
<stop offset="0.33" stop-color="#F1BC35"/>
+
<stop offset="0.66" stop-color="#E5B029"/>
+
<stop offset="1" stop-color="#FFA102"/>
+
</linearGradient>
+
+<rect fill="url(#SVGID_10_)" height="7.959" width="2.449" x="29.85" y="11.63"/>
+
+<rect fill="#CBCBCB" height="0.612" width="3.673" x="29.24" y="18.98"/>
+
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="25.56" x2="25.56" y1="19.59" y2="11.02">
+
+<stop offset="0" stop-color="#666666"/>
+
+<stop offset="1" stop-color="#282828"/>
+
+</linearGradient>
+
+<rect fill="url(#SVGID_11_)" height="8.571" width="3.673" x="23.72" y="11.02"/>
+
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="25.56" x2="25.56" y1="11.49" y2="19.86">
+
+<stop offset="0" stop-color="#FFF173"/>
+
+<stop offset="0.33" stop-color="#F1BC35"/>
+
+<stop offset="0.66" stop-color="#E5B029"/>
+
+<stop offset="1" stop-color="#FFA102"/>
+
+</linearGradient>
+
<rect fill="url(#SVGID_12_)" height="7.959" width="2.449" x="24.34" y="11.63"/>
+
<rect fill="#CBCBCB" height="0.612" width="3.673" x="23.72" y="18.98"/>
+
<rect fill="#8C8C8C" height="0.613" width="27.55" x="15.76" y="44.69"/>
+
<path d="M45.77,7.959h-20.79c-0.674,0-1.648,0.352-2.167,0.781l-9.78,8.107c-0.4,0.332-0.743,0.947-0.878,1.52,0,0,1.004-0.828,1.269-1.049l9.78-8.105c0.412-0.342,1.242-0.642,1.777-0.642h20.78c0.611,0,1.225,0.612,1.225,0.612-0.01-0.675-0.56-1.226-1.23-1.226z" fill="#CCCCCC"/>
+
<rect fill="none" height="60" width="60"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mmc_removed.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mmc_removed.svg Fri May 14 16:09:54 2010 +0300
@@ -1,79 +1,81 @@
-<?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 fill-opacity="0.5" stroke-opacity="0.5">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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 opacity="0.5">
+<defs>
+</defs>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.5405" x2="29.5405" y1="8.1108" y2="49.8955">
-<stop offset="0" style="stop-color:#666666"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#666666"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
<path d="M22.913,9.039c0.511-0.425,1.472-0.771,2.136-0.771h20.479c0.664,0,1.207,0.542,1.207,1.206v39.214 c0,0.663-0.543,1.206-1.207,1.206H13.554c-0.663,0-1.207-0.543-1.207-1.206V19.003c0-0.663,0.418-1.553,0.929-1.977L22.913,9.039z" fill="url(#SVGID_1_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="29.5405" x2="29.5405" y1="7.959" y2="50.5109">
-<stop offset="0" style="stop-color:#999999"/>
-<stop offset="1" style="stop-color:#333333"/>
+ <stop offset="0" style="stop-color:#999999"/>
+ <stop offset="1" style="stop-color:#333333"/>
</linearGradient>
<path d="M45.766,8.571c0.338,0,0.611,0.274,0.611,0.612v39.796c0,0.338-0.273,0.612-0.611,0.612H13.316 c-0.338,0-0.612-0.274-0.612-0.612V18.854c0-0.49,0.344-1.222,0.721-1.535l9.78-8.105c0.412-0.342,1.242-0.642,1.777-0.642H45.766 M45.766,7.959H24.982c-0.674,0-1.648,0.352-2.167,0.781l-9.78,8.107c-0.519,0.43-0.943,1.332-0.943,2.006v30.126 c0,0.673,0.551,1.225,1.225,1.225h32.449c0.673,0,1.225-0.552,1.225-1.225V9.184C46.99,8.51,46.438,7.959,45.766,7.959L45.766,7.959 z" fill="url(#SVGID_2_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="29.5405" x2="29.5405" y1="9.6499" y2="48.3682">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.2606" style="stop-color:#7B7E80"/>
-<stop offset="0.8182" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+ <stop offset="0" style="stop-color:#A0A3A6"/>
+ <stop offset="0.2606" style="stop-color:#7B7E80"/>
+ <stop offset="0.8182" style="stop-color:#474B4D"/>
+ <stop offset="1" style="stop-color:#707577"/>
</linearGradient>
<path d="M15.153,48.367c-0.673,0-1.224-0.551-1.224-1.225V19.787c0-0.673,0.423-1.577,0.94-2.009l8.629-7.198 c0.517-0.432,1.491-0.784,2.165-0.784h18.265c0.673,0,1.224,0.552,1.224,1.225v36.122c0,0.674-0.551,1.225-1.224,1.225H15.153z" fill="url(#SVGID_3_)"/>
<path d="M43.929,47.755H15.153c-0.673,0-1.224-0.552-1.224-1.224v0.611c0,0.674,0.551,1.225,1.224,1.225h28.776 c0.673,0,1.224-0.551,1.224-1.225v-0.611C45.152,47.203,44.602,47.755,43.929,47.755z" fill="#808080"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="29.5405" x2="29.5405" y1="39.7959" y2="45.4597">
-<stop offset="0" style="stop-color:#242626"/>
-<stop offset="1" style="stop-color:#585C5E"/>
+ <stop offset="0" style="stop-color:#242626"/>
+ <stop offset="1" style="stop-color:#585C5E"/>
</linearGradient>
<rect fill="url(#SVGID_4_)" height="5.511" width="27.551" x="15.765" y="39.796"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="42.0918" x2="42.0918" y1="19.5918" y2="11.0205">
-<stop offset="0" style="stop-color:#666666"/>
-<stop offset="1" style="stop-color:#282828"/>
+ <stop offset="0" style="stop-color:#666666"/>
+ <stop offset="1" style="stop-color:#282828"/>
</linearGradient>
<rect fill="url(#SVGID_5_)" height="8.571" width="3.674" x="40.255" y="11.021"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="42.0918" x2="42.0918" y1="11.4927" y2="19.8569">
-<stop offset="0" style="stop-color:#FFF173"/>
-<stop offset="0.33" style="stop-color:#F1BC35"/>
-<stop offset="0.66" style="stop-color:#E5B029"/>
-<stop offset="1" style="stop-color:#FFA102"/>
+ <stop offset="0" style="stop-color:#FFF173"/>
+ <stop offset="0.33" style="stop-color:#F1BC35"/>
+ <stop offset="0.66" style="stop-color:#E5B029"/>
+ <stop offset="1" style="stop-color:#FFA102"/>
</linearGradient>
<rect fill="url(#SVGID_6_)" height="7.959" width="2.449" x="40.867" y="11.633"/>
<rect fill="#CBCBCB" height="0.612" width="3.674" x="40.255" y="18.979"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="36.582" x2="36.582" y1="19.5918" y2="11.0205">
-<stop offset="0" style="stop-color:#666666"/>
-<stop offset="1" style="stop-color:#282828"/>
+ <stop offset="0" style="stop-color:#666666"/>
+ <stop offset="1" style="stop-color:#282828"/>
</linearGradient>
<rect fill="url(#SVGID_7_)" height="8.571" width="3.673" x="34.745" y="11.021"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="36.582" x2="36.582" y1="11.4927" y2="19.8569">
-<stop offset="0" style="stop-color:#FFF173"/>
-<stop offset="0.33" style="stop-color:#F1BC35"/>
-<stop offset="0.66" style="stop-color:#E5B029"/>
-<stop offset="1" style="stop-color:#FFA102"/>
+ <stop offset="0" style="stop-color:#FFF173"/>
+ <stop offset="0.33" style="stop-color:#F1BC35"/>
+ <stop offset="0.66" style="stop-color:#E5B029"/>
+ <stop offset="1" style="stop-color:#FFA102"/>
</linearGradient>
<rect fill="url(#SVGID_8_)" height="7.959" width="2.449" x="35.357" y="11.633"/>
<rect fill="#CBCBCB" height="0.612" width="3.673" x="34.745" y="18.979"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="31.0713" x2="31.0713" y1="19.5918" y2="11.0205">
-<stop offset="0" style="stop-color:#666666"/>
-<stop offset="1" style="stop-color:#282828"/>
+ <stop offset="0" style="stop-color:#666666"/>
+ <stop offset="1" style="stop-color:#282828"/>
</linearGradient>
<rect fill="url(#SVGID_9_)" height="8.571" width="3.673" x="29.235" y="11.021"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="31.0723" x2="31.0723" y1="11.4927" y2="19.8569">
-<stop offset="0" style="stop-color:#FFF173"/>
-<stop offset="0.33" style="stop-color:#F1BC35"/>
-<stop offset="0.66" style="stop-color:#E5B029"/>
-<stop offset="1" style="stop-color:#FFA102"/>
+ <stop offset="0" style="stop-color:#FFF173"/>
+ <stop offset="0.33" style="stop-color:#F1BC35"/>
+ <stop offset="0.66" style="stop-color:#E5B029"/>
+ <stop offset="1" style="stop-color:#FFA102"/>
</linearGradient>
<rect fill="url(#SVGID_10_)" height="7.959" width="2.449" x="29.847" y="11.633"/>
<rect fill="#CBCBCB" height="0.612" width="3.673" x="29.235" y="18.979"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="25.561" x2="25.561" y1="19.5918" y2="11.0205">
-<stop offset="0" style="stop-color:#666666"/>
-<stop offset="1" style="stop-color:#282828"/>
+ <stop offset="0" style="stop-color:#666666"/>
+ <stop offset="1" style="stop-color:#282828"/>
</linearGradient>
<rect fill="url(#SVGID_11_)" height="8.571" width="3.673" x="23.725" y="11.021"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="25.561" x2="25.561" y1="11.4927" y2="19.8569">
-<stop offset="0" style="stop-color:#FFF173"/>
-<stop offset="0.33" style="stop-color:#F1BC35"/>
-<stop offset="0.66" style="stop-color:#E5B029"/>
-<stop offset="1" style="stop-color:#FFA102"/>
+ <stop offset="0" style="stop-color:#FFF173"/>
+ <stop offset="0.33" style="stop-color:#F1BC35"/>
+ <stop offset="0.66" style="stop-color:#E5B029"/>
+ <stop offset="1" style="stop-color:#FFA102"/>
</linearGradient>
<rect fill="url(#SVGID_12_)" height="7.959" width="2.449" x="24.337" y="11.633"/>
<rect fill="#CBCBCB" height="0.612" width="3.673" x="23.725" y="18.979"/>
@@ -81,4 +83,4 @@
<path d="M45.766,7.959H24.982c-0.674,0-1.648,0.352-2.167,0.781l-9.78,8.107c-0.4,0.332-0.743,0.947-0.878,1.52 c0,0,1.004-0.828,1.269-1.049l9.78-8.105c0.412-0.342,1.242-0.642,1.777-0.642h20.784c0.611,0,1.225,0.612,1.225,0.612 C46.99,8.51,46.438,7.959,45.766,7.959z" fill="#CCCCCC"/>
<rect fill="none" height="60" width="60"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mobile.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mobile.svg Fri May 14 16:09:54 2010 +0300
@@ -1,112 +1,110 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2.001" y2="57.8555">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+ <stop offset="0.0667" style="stop-color:#D1D7D9"/>
+ <stop offset="0.2606" style="stop-color:#BDC2C4"/>
+ <stop offset="0.6606" style="stop-color:#949DA1"/>
+ <stop offset="0.9636" style="stop-color:#ADB3B5"/>
+ <stop offset="1" style="stop-color:#595C5E"/>
</linearGradient>
<path d="M48.027,54.932c0,1.693-1.375,3.069-3.068,3.069h-29.92c-1.693,0-3.066-1.376-3.066-3.069V5.07 c0-1.696,1.373-3.069,3.066-3.069h29.92c1.693,0,3.068,1.373,3.068,3.069V54.932z" fill="url(#SVGID_1_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="2.001" y2="56.899">
-<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"/>
+ <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="M44.959,2.001h-29.92c-1.693,0-3.066,1.373-3.066,3.069v49.861c0,0.82,0.324,1.56,0.848,2.11 c-0.047-0.187-0.08-0.377-0.08-0.575v-1.535V6.602V5.07c0-1.271,1.031-2.304,2.299-2.304h29.92c1.268,0,2.301,1.033,2.301,2.304 v1.531v48.33v1.535c0,0.198-0.033,0.389-0.08,0.575c0.521-0.551,0.848-1.29,0.848-2.11V5.07C48.027,3.374,46.652,2.001,44.959,2.001 z" fill="url(#SVGID_2_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="5.8916" y2="43.4283">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+ <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="37.589" stroke-opacity="0.6" width="31.453" x="14.273" y="5.836"/>
+<rect fill="url(#SVGID_3_)" height="37.589" opacity="0.6" width="31.453" x="14.273" y="5.836"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="29.999" x2="29.999" y1="6.6548" y2="42.6624">
-<stop offset="0" style="stop-color:#6E6E6E"/>
-<stop offset="1" style="stop-color:#333333"/>
+ <stop offset="0" style="stop-color:#6E6E6E"/>
+ <stop offset="1" style="stop-color:#333333"/>
</linearGradient>
<rect fill="url(#SVGID_4_)" height="36.058" width="29.92" x="15.039" y="6.602"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30" x2="30" y1="7.4214" y2="41.894">
-<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"/>
+ <stop offset="0" style="stop-color:#3BC8EB"/>
+ <stop offset="0.3879" style="stop-color:#2D9BD2"/>
+ <stop offset="0.8909" style="stop-color:#1347BA"/>
</linearGradient>
<rect fill="url(#SVGID_5_)" height="34.521" width="28.383" x="15.809" y="7.37"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="30" x2="30" y1="7.9712" y2="21.69">
-<stop offset="0" style="stop-color:#85EFFF"/>
-<stop offset="1" style="stop-color:#3BA1D9"/>
+ <stop offset="0" style="stop-color:#85EFFF"/>
+ <stop offset="1" style="stop-color:#3BA1D9"/>
</linearGradient>
<polygon fill="url(#SVGID_6_)" points="44.191,19.644 15.809,22.712 15.809,8.137 44.191,8.137 "/>
<rect fill="#9FE4FF" height="0.767" width="28.383" x="15.809" y="7.37"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="30.2236" x2="30.2236" y1="5.8726" y2="2.8032">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#D1D7D9"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#D1D7D9"/>
</linearGradient>
<path d="M26.832,5.836c-0.861,0-1.535-0.563-1.535-1.279v-0.51c0-0.718,0.674-1.28,1.535-1.28h6.785 c0.859,0,1.533,0.563,1.533,1.28v0.51c0,0.716-0.674,1.279-1.533,1.279H26.832z" fill="url(#SVGID_7_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="30.2236" x2="30.2236" y1="3.2158" y2="5.1992">
-<stop offset="0" style="stop-color:#6C7375"/>
-<stop offset="1" style="stop-color:#BDC2C4"/>
+ <stop offset="0" style="stop-color:#6C7375"/>
+ <stop offset="1" style="stop-color:#BDC2C4"/>
</linearGradient>
<path d="M34.383,4.557c0,0.283-0.342,0.514-0.766,0.514h-6.785c-0.424,0-0.768-0.23-0.768-0.514v-0.51 c0-0.283,0.344-0.512,0.768-0.512h6.785c0.424,0,0.766,0.229,0.766,0.512V4.557z" fill="url(#SVGID_8_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="29.8818" x2="29.8818" y1="44.2236" y2="55.628">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#FFFFFF"/>
+ <stop offset="0" style="stop-color:#B6BBBD"/>
+ <stop offset="1" style="stop-color:#FFFFFF"/>
</linearGradient>
-<path d="M27.109,55.7c-1.645,0-2.98-1.323-2.98-2.951v-5.606c0-1.627,1.336-2.951,2.98-2.951 h5.545c1.645,0,2.98,1.324,2.98,2.951v5.606c0,1.628-1.336,2.951-2.98,2.951H27.109z" fill="url(#SVGID_9_)" fill-opacity="0.6" stroke-opacity="0.6"/>
-<path d="M27.105,54.932c-1.219,0-2.211-0.979-2.211-2.183v-5.606c0-1.204,0.992-2.183,2.211-2.183 h5.553c1.219,0,2.209,0.979,2.209,2.183v5.606c0,1.204-0.99,2.183-2.209,2.183H27.105z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M27.109,55.7c-1.645,0-2.98-1.323-2.98-2.951v-5.606c0-1.627,1.336-2.951,2.98-2.951 h5.545c1.645,0,2.98,1.324,2.98,2.951v5.606c0,1.628-1.336,2.951-2.98,2.951H27.109z" fill="url(#SVGID_9_)" opacity="0.6"/>
+<path d="M27.105,54.932c-1.219,0-2.211-0.979-2.211-2.183v-5.606c0-1.204,0.992-2.183,2.211-2.183 h5.553c1.219,0,2.209,0.979,2.209,2.183v5.606c0,1.204-0.99,2.183-2.209,2.183H27.105z" fill="#020202" opacity="0.5"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="29.8818" x2="29.8818" y1="45.6865" y2="54.1806">
-<stop offset="0" style="stop-color:#A6A8AB"/>
-<stop offset="0.703" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#808184"/>
+ <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="M34.102,52.749c0,0.783-0.645,1.417-1.438,1.417h-5.566c-0.793,0-1.436-0.634-1.436-1.417v-5.606 c0-0.783,0.643-1.417,1.436-1.417h5.566c0.793,0,1.438,0.634,1.438,1.417V52.749z" fill="url(#SVGID_10_)"/>
-<path d="M28.73,52.632c-0.846,0-1.533-0.688-1.533-1.534v-2.303c0-0.847,0.688-1.534,1.533-1.534 h2.303c0.846,0,1.533,0.688,1.533,1.534v2.303c0,0.847-0.688,1.534-1.533,1.534H28.73z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M28.73,52.632c-0.846,0-1.533-0.688-1.533-1.534v-2.303c0-0.847,0.688-1.534,1.533-1.534 h2.303c0.846,0,1.533,0.688,1.533,1.534v2.303c0,0.847-0.688,1.534-1.533,1.534H28.73z" fill="#020202" opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="29.8809" x2="29.8809" y1="48.0103" y2="51.8696">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+ <stop offset="0.0667" style="stop-color:#D1D7D9"/>
+ <stop offset="0.2606" style="stop-color:#BDC2C4"/>
+ <stop offset="0.6606" style="stop-color:#949DA1"/>
+ <stop offset="0.9636" style="stop-color:#ADB3B5"/>
+ <stop offset="1" style="stop-color:#595C5E"/>
</linearGradient>
<path d="M28.73,51.863c-0.422,0-0.768-0.345-0.768-0.766v-2.303c0-0.422,0.346-0.767,0.768-0.767h2.303 c0.42,0,0.766,0.345,0.766,0.767v2.303c0,0.421-0.346,0.766-0.766,0.766H28.73z" fill="url(#SVGID_11_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="17.667" x2="17.667" y1="44.917" y2="54.1816">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+ <stop offset="0" style="stop-color:#B6BBBD"/>
+ <stop offset="1" style="stop-color:#F0FBFF"/>
</linearGradient>
-<path d="M17.223,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307 c0-1.624,1.324-2.948,2.949-2.948h0.887c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H17.223z" fill="url(#SVGID_12_)" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M17.223,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307 c0-1.624,1.324-2.948,2.949-2.948h0.887c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H17.223z" fill="url(#SVGID_12_)" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="17.665" x2="17.665" y1="45.6899" y2="53.4106">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+ <stop offset="0" style="stop-color:#231F20"/>
+ <stop offset="1" style="stop-color:#6D6E70"/>
</linearGradient>
-<path d="M17.223,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307 c0-1.201,0.98-2.183,2.184-2.183h0.887c1.205,0,2.182,0.981,2.182,2.183v3.307c0,1.204-0.977,2.183-2.182,2.183H17.223z" fill="url(#SVGID_13_)" fill-opacity="0.7" stroke-opacity="0.7"/>
+<path d="M17.223,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307 c0-1.201,0.98-2.183,2.184-2.183h0.887c1.205,0,2.182,0.981,2.182,2.183v3.307c0,1.204-0.977,2.183-2.182,2.183H17.223z" fill="url(#SVGID_13_)" opacity="0.7"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="17.667" x2="17.667" y1="46.4658" y2="52.6426">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+ <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="M19.525,51.215c0,0.783-0.635,1.417-1.416,1.417h-0.887c-0.779,0-1.414-0.634-1.414-1.417v-3.307 c0-0.78,0.635-1.414,1.414-1.414h0.887c0.781,0,1.416,0.634,1.416,1.414V51.215z" fill="url(#SVGID_14_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="41.6719" x2="41.6719" y1="44.917" y2="54.1816">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+ <stop offset="0" style="stop-color:#B6BBBD"/>
+ <stop offset="1" style="stop-color:#F0FBFF"/>
</linearGradient>
-<path d="M41.229,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307 c0-1.624,1.324-2.948,2.949-2.948h0.885c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H41.229z" fill="url(#SVGID_15_)" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M41.229,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307 c0-1.624,1.324-2.948,2.949-2.948h0.885c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H41.229z" fill="url(#SVGID_15_)" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="41.6709" x2="41.6709" y1="45.6899" y2="53.4106">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+ <stop offset="0" style="stop-color:#231F20"/>
+ <stop offset="1" style="stop-color:#6D6E70"/>
</linearGradient>
-<path d="M41.229,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307 c0-1.201,0.98-2.183,2.184-2.183h0.885c1.205,0,2.184,0.981,2.184,2.183v3.307c0,1.204-0.979,2.183-2.184,2.183H41.229z" fill="url(#SVGID_16_)" fill-opacity="0.7" stroke-opacity="0.7"/>
+<path d="M41.229,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307 c0-1.201,0.98-2.183,2.184-2.183h0.885c1.205,0,2.184,0.981,2.184,2.183v3.307c0,1.204-0.979,2.183-2.184,2.183H41.229z" fill="url(#SVGID_16_)" opacity="0.7"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="41.6719" x2="41.6719" y1="46.4658" y2="52.6426">
-<stop offset="0" style="stop-color:#FFC142"/>
-<stop offset="0.7455" style="stop-color:#CF4E18"/>
-<stop offset="1" style="stop-color:#B52100"/>
+ <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="M43.531,51.215c0,0.783-0.637,1.417-1.418,1.417h-0.885c-0.781,0-1.416-0.634-1.416-1.417v-3.307 c0-0.78,0.635-1.414,1.416-1.414h0.885c0.781,0,1.418,0.634,1.418,1.414V51.215z" fill="url(#SVGID_17_)"/>
<rect fill="none" height="60" width="60"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mobile_tv.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mobile_tv.svg Fri May 14 16:09:54 2010 +0300
@@ -1,39 +1,40 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="53.1709" y2="49.6078">
-<stop offset="0" style="stop-color:#404040"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#404040"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
<path d="M44.73,51.777c0,0.86-0.676,1.556-1.509,1.556H16.777c-0.832,0-1.508-0.695-1.508-1.556l0,0 c0-0.858-0.048-2.332-0.048-2.332h29.556C44.777,49.445,44.73,50.919,44.73,51.777L44.73,51.777z" fill="url(#SVGID_1_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="6.4082" y2="50.2251">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="0.1212" style="stop-color:#F2F2F2"/>
-<stop offset="0.5515" style="stop-color:#ADB2B5"/>
-<stop offset="1" style="stop-color:#E6E9E8"/>
+ <stop offset="0.1212" style="stop-color:#F2F2F2"/>
+ <stop offset="0.5515" style="stop-color:#ADB2B5"/>
+ <stop offset="1" style="stop-color:#E6E9E8"/>
</linearGradient>
<path d="M58,48.666c0,0.86-0.697,1.556-1.557,1.556H3.557C2.695,50.222,2,49.526,2,48.666V8.223 c0-0.858,0.695-1.556,1.557-1.556h52.887C57.303,6.667,58,7.364,58,8.223V48.666z" fill="url(#SVGID_2_)"/>
-<path d="M56.443,49.445H3.557C2.695,49.445,2,48.748,2,47.889v0.777c0,0.86,0.695,1.556,1.557,1.556 h52.887c0.859,0,1.557-0.695,1.557-1.556v-0.777C58,48.748,57.303,49.445,56.443,49.445z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M56.443,49.445H3.557C2.695,49.445,2,48.748,2,47.889v0.777c0,0.86,0.695,1.556,1.557,1.556 h52.887c0.859,0,1.557-0.695,1.557-1.556v-0.777C58,48.748,57.303,49.445,56.443,49.445z" fill="#231F20" opacity="0.3"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="41.4072" y2="10.4689">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</linearGradient>
<rect fill="url(#SVGID_3_)" height="31.888" width="49.777" x="5.111" y="9.778"/>
<rect fill="#FFFFFF" height="0.778" width="49.777" x="5.111" y="40.888"/>
-<polygon fill="#FFFFFF" fill-opacity="0.2" points="5.901,26.112 54.11,19.753 54.11,10.555 5.889,10.555 " stroke-opacity="0.2"/>
+<polygon fill="#FFFFFF" opacity="0.2" points="5.901,26.112 54.11,19.753 54.11,10.555 5.889,10.555 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="30" x2="30" y1="48.5547" y2="42.6262">
-<stop offset="0" style="stop-color:#57CDEA"/>
-<stop offset="1" style="stop-color:#196BDE"/>
+ <stop offset="0" style="stop-color:#57CDEA"/>
+ <stop offset="1" style="stop-color:#196BDE"/>
</linearGradient>
<path d="M30,43.611c1.074,0,1.943,0.871,1.943,1.943c0,1.071-0.869,1.945-1.943,1.945 c-1.071,0-1.944-0.874-1.944-1.945C28.056,44.482,28.929,43.611,30,43.611 M30,42.443c-1.719,0-3.111,1.395-3.111,3.111 c0,1.719,1.393,3.111,3.111,3.111s3.111-1.393,3.111-3.111C33.111,43.838,31.719,42.443,30,42.443L30,42.443z" fill="url(#SVGID_4_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30" x2="30" y1="7.5732" y2="48.7959">
-<stop offset="0" style="stop-color:#E6E9E8"/>
-<stop offset="1" style="stop-color:#ADB2B5"/>
+ <stop offset="0" style="stop-color:#E6E9E8"/>
+ <stop offset="1" style="stop-color:#ADB2B5"/>
</linearGradient>
<path d="M55.666,7.443H4.333c-0.858,0-1.556,0.697-1.556,1.556V47.11c0,0.86,0.697,1.556,1.556,1.556h22.736 c-0.827-0.779-1.347-1.884-1.347-3.111c0-1.226,0.52-2.33,1.347-3.111H4.333V8.999h51.333v33.444H32.93 c0.828,0.781,1.348,1.886,1.348,3.111c0,1.228-0.52,2.332-1.348,3.111h22.736c0.859,0,1.556-0.695,1.556-1.556V8.999 C57.222,8.141,56.525,7.443,55.666,7.443z" fill="url(#SVGID_5_)"/>
-<path d="M43.223,52.554H16.779c-0.701,0-1.287-0.496-1.456-1.166c-0.03,0.126-0.054,0.256-0.054,0.39 c0,0.86,0.676,1.556,1.51,1.556h26.443c0.832,0,1.508-0.695,1.508-1.556c0-0.134-0.021-0.264-0.054-0.39 C44.51,52.058,43.926,52.554,43.223,52.554z" fill="#FFFFFF" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M43.223,52.554H16.779c-0.701,0-1.287-0.496-1.456-1.166c-0.03,0.126-0.054,0.256-0.054,0.39 c0,0.86,0.676,1.556,1.51,1.556h26.443c0.832,0,1.508-0.695,1.508-1.556c0-0.134-0.021-0.264-0.054-0.39 C44.51,52.058,43.926,52.554,43.223,52.554z" fill="#FFFFFF" opacity="0.35"/>
<rect fill="none" height="60" width="60"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mono.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mono.svg Fri May 14 16:09:54 2010 +0300
@@ -1,52 +1,54 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="1.5215" y2="58.4791">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#D9D9D9"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#D9D9D9"/>
</linearGradient>
<circle cx="30" cy="30.001" fill="url(#SVGID_1_)" r="28"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="29.999" x2="29.999" y1="2.4795" y2="56.5974">
-<stop offset="0" style="stop-color:#F5F5F5"/>
-<stop offset="0.7818" style="stop-color:#CCCCCC"/>
-<stop offset="1" style="stop-color:#D1D1D1"/>
+ <stop offset="0" style="stop-color:#F5F5F5"/>
+ <stop offset="0.7818" style="stop-color:#CCCCCC"/>
+ <stop offset="1" style="stop-color:#D1D1D1"/>
</linearGradient>
<circle cx="29.999" cy="30.001" fill="url(#SVGID_2_)" r="26.804"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="29.999" x2="29.999" y1="51.8564" y2="7.5413">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#A8A8A8"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#A8A8A8"/>
</linearGradient>
<circle cx="29.999" cy="30.001" fill="url(#SVGID_3_)" r="22.257"/>
<radialGradient cx="29.998" cy="30.001" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="21.0991">
-<stop offset="0" style="stop-color:#636363"/>
-<stop offset="0.3333" style="stop-color:#808080"/>
-<stop offset="1" style="stop-color:#1C1C1C"/>
+ <stop offset="0" style="stop-color:#636363"/>
+ <stop offset="0.3333" style="stop-color:#808080"/>
+ <stop offset="1" style="stop-color:#1C1C1C"/>
</radialGradient>
<circle cx="29.998" cy="30.001" fill="url(#SVGID_4_)" r="21.1"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="29.9971" x2="29.9971" y1="44.8384" y2="13.4077">
-<stop offset="0" style="stop-color:#808080"/>
-<stop offset="1" style="stop-color:#1C1C1C"/>
+ <stop offset="0" style="stop-color:#808080"/>
+ <stop offset="1" style="stop-color:#1C1C1C"/>
</linearGradient>
<circle cx="29.998" cy="30.001" fill="url(#SVGID_5_)" r="16.432"/>
<radialGradient cx="29.918" cy="30.7183" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="15.7949">
-<stop offset="0" style="stop-color:#B4B4B4"/>
-<stop offset="1" style="stop-color:#696969"/>
+ <stop offset="0" style="stop-color:#B4B4B4"/>
+ <stop offset="1" style="stop-color:#696969"/>
</radialGradient>
-<path d="M43.227,39.72l-5.428-4.813H23.188l-6.221,5.079c3.004,3.913,7.715,6.448,13.03,6.448 C35.433,46.434,40.237,43.785,43.227,39.72z" fill="url(#SVGID_6_)" fill-opacity="0.5" stroke-opacity="0.5"/>
-<circle cx="29.999" cy="32.633" fill-opacity="0.15" r="10.649" stroke-opacity="0.15"/>
+<path d="M43.227,39.72l-5.428-4.813H23.188l-6.221,5.079c3.004,3.913,7.715,6.448,13.03,6.448 C35.433,46.434,40.237,43.785,43.227,39.72z" fill="url(#SVGID_6_)" opacity="0.5"/>
+<circle cx="29.999" cy="32.633" opacity="0.15" r="10.649"/>
<radialGradient cx="30.0391" cy="27.208" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="11.9907">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="1" style="stop-color:#000000"/>
</radialGradient>
<circle cx="29.999" cy="30.001" fill="url(#SVGID_7_)" r="10.649"/>
-<circle cx="30" cy="30.001" fill="none" fill-opacity="0.15" r="9.254" stroke="#EBEBEB" stroke-opacity="0.15"/>
+<circle cx="30" cy="30.001" fill="none" opacity="0.15" r="9.254" stroke="#EBEBEB"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="29.999" x2="29.999" y1="19.5313" y2="40.4805">
-<stop offset="0" style="stop-color:#DEDEDE"/>
-<stop offset="1" style="stop-color:#A8A8A8"/>
+ <stop offset="0" style="stop-color:#DEDEDE"/>
+ <stop offset="1" style="stop-color:#A8A8A8"/>
</linearGradient>
-<path d="M29.997,19.352c-5.88,0-10.647,4.768-10.647,10.649 c0,5.88,4.768,10.648,10.647,10.648c5.882,0,10.651-4.769,10.651-10.648C40.648,24.119,35.879,19.352,29.997,19.352z M29.997,38.377 c-4.626,0-8.374-3.75-8.374-8.376c0-4.628,3.748-8.378,8.374-8.378c4.627,0,8.378,3.75,8.378,8.378 C38.375,34.627,34.624,38.377,29.997,38.377z" fill="url(#SVGID_8_)" fill-opacity="0.15" stroke-opacity="0.15"/>
+<path d="M29.997,19.352c-5.88,0-10.647,4.768-10.647,10.649 c0,5.88,4.768,10.648,10.647,10.648c5.882,0,10.651-4.769,10.651-10.648C40.648,24.119,35.879,19.352,29.997,19.352z M29.997,38.377 c-4.626,0-8.374-3.75-8.374-8.376c0-4.628,3.748-8.378,8.374-8.378c4.627,0,8.378,3.75,8.378,8.378 C38.375,34.627,34.624,38.377,29.997,38.377z" fill="url(#SVGID_8_)" opacity="0.15"/>
<rect fill="none" height="60" width="60"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mouse.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mouse.svg Fri May 14 16:09:54 2010 +0300
@@ -1,98 +1,96 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<radialGradient cx="30.1362" cy="20.3848" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="35.3912">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.303" style="stop-color:#FFFFFF"/>
-<stop offset="0.6667" style="stop-color:#BDC2C5"/>
-<stop offset="1" style="stop-color:#EAEBEC"/>
+ <stop offset="0.303" style="stop-color:#FFFFFF"/>
+ <stop offset="0.6667" style="stop-color:#BDC2C5"/>
+ <stop offset="1" style="stop-color:#EAEBEC"/>
</radialGradient>
<path d="M30,57.201c-10.93,0-20.163-8.713-20.163-19.025V13.439c0-9.115,6.905-9.869,14.599-9.869 c0.865,0,1.755,0.008,2.665,0.018c0.946,0.01,1.915,0.02,2.899,0.02s1.952-0.01,2.898-0.02c0.91-0.01,1.802-0.018,2.666-0.018 c7.693,0,14.598,0.754,14.598,9.869v24.736C50.162,48.488,40.93,57.201,30,57.201L30,57.201z" fill="url(#SVGID_1_)"/>
<radialGradient cx="17.4287" cy="-2.4482" gradientTransform="matrix(0.9655 0 0 0.9655 13.3019 23.1178)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="35.1983">
-<stop offset="0" style="stop-color:#CBD2D5"/>
-<stop offset="0.303" style="stop-color:#CBD2D5"/>
-<stop offset="0.703" style="stop-color:#8C9599"/>
-<stop offset="0.8909" style="stop-color:#B3BCBF"/>
-<stop offset="1" style="stop-color:#DBE2E6"/>
+ <stop offset="0.303" style="stop-color:#CBD2D5"/>
+ <stop offset="0.703" style="stop-color:#8C9599"/>
+ <stop offset="0.8909" style="stop-color:#B3BCBF"/>
+ <stop offset="1" style="stop-color:#DBE2E6"/>
</radialGradient>
<path d="M49.17,38.176c0,9.961-8.847,18.033-19.17,18.033c-10.32,0-19.17-8.072-19.17-18.033V13.439 C10.83,3.48,19.481,4.6,30,4.6s19.17-1.119,19.17,8.84V38.176z" fill="url(#SVGID_2_)"/>
<radialGradient cx="17.4282" cy="-12.0474" gradientTransform="matrix(0.9655 0 0 0.9655 13.3019 23.1178)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="26.0563">
-<stop offset="0" style="stop-color:#CBD2D5"/>
-<stop offset="0.3273" style="stop-color:#CBD2D5"/>
-<stop offset="0.8" style="stop-color:#949DA1"/>
-<stop offset="0.9333" style="stop-color:#B9C1C4"/>
-<stop offset="1" style="stop-color:#CBD2D5"/>
+ <stop offset="0.3273" style="stop-color:#CBD2D5"/>
+ <stop offset="0.8" style="stop-color:#949DA1"/>
+ <stop offset="0.9333" style="stop-color:#B9C1C4"/>
+ <stop offset="1" style="stop-color:#CBD2D5"/>
</radialGradient>
<path d="M49.17,22.729v-9.289c0-9.918-8.58-8.85-19.039-8.84v18.129H49.17z" fill="url(#SVGID_3_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="45.9238" x2="34.694" y1="7.1699" y2="18.7923">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#B9BFC1"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#B9BFC1"/>
</linearGradient>
-<path d="M30.719,22.139V5.186c0.744-0.002,1.477-0.01,2.197-0.018 c0.9-0.008,1.781-0.018,2.64-0.018c7.626,0,13.026,0.594,13.026,8.289v8.699H30.719z" fill="url(#SVGID_4_)" fill-opacity="0.15" stroke-opacity="0.15"/>
+<path d="M30.719,22.139V5.186c0.744-0.002,1.477-0.01,2.197-0.018 c0.9-0.008,1.781-0.018,2.64-0.018c7.626,0,13.026,0.594,13.026,8.289v8.699H30.719z" fill="url(#SVGID_4_)" opacity="0.15"/>
<radialGradient cx="17.4297" cy="-12.0474" gradientTransform="matrix(0.9655 0 0 0.9655 13.3019 23.1178)" gradientUnits="userSpaceOnUse" id="SVGID_5_" r="26.0574">
-<stop offset="0" style="stop-color:#CBD2D5"/>
-<stop offset="0.3273" style="stop-color:#CBD2D5"/>
-<stop offset="0.8" style="stop-color:#949DA1"/>
-<stop offset="0.9333" style="stop-color:#B9C1C4"/>
-<stop offset="1" style="stop-color:#CBD2D5"/>
+ <stop offset="0.3273" style="stop-color:#CBD2D5"/>
+ <stop offset="0.8" style="stop-color:#949DA1"/>
+ <stop offset="0.9333" style="stop-color:#B9C1C4"/>
+ <stop offset="1" style="stop-color:#CBD2D5"/>
</radialGradient>
<path d="M10.92,22.729v-9.289c0-9.918,8.579-8.85,19.039-8.84v18.129H10.92z" fill="url(#SVGID_5_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="14.0469" x2="28.9546" y1="7.2695" y2="22.1773">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#B9BFC1"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#B9BFC1"/>
</linearGradient>
-<path d="M11.509,22.139v-8.699c0-7.695,5.398-8.289,13.026-8.289 c0.857,0,1.736,0.01,2.639,0.018c0.719,0.008,1.453,0.016,2.196,0.018v16.953H11.509z" fill="url(#SVGID_6_)" fill-opacity="0.15" stroke-opacity="0.15"/>
+<path d="M11.509,22.139v-8.699c0-7.695,5.398-8.289,13.026-8.289 c0.857,0,1.736,0.01,2.639,0.018c0.719,0.008,1.453,0.016,2.196,0.018v16.953H11.509z" fill="url(#SVGID_6_)" opacity="0.15"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="29.5425" x2="29.5425" y1="4.5718" y2="22.785">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#D6D9DB"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#D6D9DB"/>
</linearGradient>
<path d="M30.131,4.594c-0.389,0.002-0.781,0.004-1.177,0.004v18.1h1.177V4.594z" fill="url(#SVGID_7_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="10.9199" x2="49.1699" y1="22.1396" y2="22.1396">
-<stop offset="0" style="stop-color:#737475"/>
-<stop offset="0.5" style="stop-color:#4D4D4D"/>
-<stop offset="1" style="stop-color:#737475"/>
+ <stop offset="0" style="stop-color:#737475"/>
+ <stop offset="0.5" style="stop-color:#4D4D4D"/>
+ <stop offset="1" style="stop-color:#737475"/>
</linearGradient>
<rect fill="url(#SVGID_8_)" height="1.178" width="38.25" x="10.92" y="21.551"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="30.7192" x2="30.7192" y1="4.5718" y2="22.8164">
-<stop offset="0" style="stop-color:#737475"/>
-<stop offset="0.9697" style="stop-color:#4E4E4E"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+ <stop offset="0" style="stop-color:#737475"/>
+ <stop offset="0.9697" style="stop-color:#4E4E4E"/>
+ <stop offset="1" style="stop-color:#4D4D4D"/>
</linearGradient>
<path d="M31.309,4.594c-0.39,0.002-0.782,0.004-1.178,0.006v18.129h1.178V4.594z" fill="url(#SVGID_9_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="10.9199" x2="49.1699" y1="23.3164" y2="23.3164">
-<stop offset="0" style="stop-color:#C4C9CB"/>
-<stop offset="0.5" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#C4C9CB"/>
+ <stop offset="0" style="stop-color:#C4C9CB"/>
+ <stop offset="0.5" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#C4C9CB"/>
</linearGradient>
<rect fill="url(#SVGID_10_)" height="1.176" width="38.25" x="10.92" y="22.729"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="30.0015" x2="30.0015" y1="19.0859" y2="4.4878">
-<stop offset="0" style="stop-color:#A2ABAE"/>
-<stop offset="1" style="stop-color:#454244"/>
+ <stop offset="0" style="stop-color:#A2ABAE"/>
+ <stop offset="1" style="stop-color:#454244"/>
</linearGradient>
<path d="M34.609,14.773V4.564c-1.479,0.01-7.738,0.01-9.217,0v10.209c0,2.545,2.063,4.607,4.607,4.607 S34.609,17.318,34.609,14.773z" fill="url(#SVGID_11_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="30.0005" x2="30.0005" y1="4.4292" y2="18.0821">
-<stop offset="0" style="stop-color:#767578"/>
-<stop offset="1" style="stop-color:#231F20"/>
+ <stop offset="0" style="stop-color:#767578"/>
+ <stop offset="1" style="stop-color:#231F20"/>
</linearGradient>
<path d="M30,18.205c-2.216,0-4.019-1.805-4.019-4.021V4.57c0.36,0.002,7.677,0.002,8.039,0v9.613 C34.021,16.4,32.218,18.205,30,18.205L30,18.205z" fill="url(#SVGID_12_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="29.9995" x2="29.9995" y1="4.3652" y2="16.8027">
-<stop offset="0" style="stop-color:#5B5655"/>
-<stop offset="0.3212" style="stop-color:#B5B5B5"/>
-<stop offset="0.6303" style="stop-color:#5A5859"/>
-<stop offset="0.8242" style="stop-color:#898889"/>
-<stop offset="1" style="stop-color:#343232"/>
+ <stop offset="0" style="stop-color:#5B5655"/>
+ <stop offset="0.3212" style="stop-color:#B5B5B5"/>
+ <stop offset="0.6303" style="stop-color:#5A5859"/>
+ <stop offset="0.8242" style="stop-color:#898889"/>
+ <stop offset="1" style="stop-color:#343232"/>
</linearGradient>
<path d="M30,16.853c-1.784,0-3.235-1.451-3.235-3.235V7.715c0-1.783,1.451-3.237,3.235-3.237 s3.235,1.454,3.235,3.237v5.902C33.235,15.401,31.784,16.853,30,16.853L30,16.853z" fill="url(#SVGID_13_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="29.9995" x2="29.9995" y1="4.9658" y2="16.2196">
-<stop offset="0" style="stop-color:#3D3A39"/>
-<stop offset="0.3212" style="stop-color:#939393"/>
-<stop offset="0.4788" style="stop-color:#898889"/>
-<stop offset="0.6848" style="stop-color:#2C2A2A"/>
-<stop offset="0.8788" style="stop-color:#5A5859"/>
-<stop offset="1" style="stop-color:#343232"/>
+ <stop offset="0" style="stop-color:#3D3A39"/>
+ <stop offset="0.3212" style="stop-color:#939393"/>
+ <stop offset="0.4788" style="stop-color:#898889"/>
+ <stop offset="0.6848" style="stop-color:#2C2A2A"/>
+ <stop offset="0.8788" style="stop-color:#5A5859"/>
+ <stop offset="1" style="stop-color:#343232"/>
</linearGradient>
<path d="M30,16.265c-1.46,0-2.648-1.188-2.648-2.647V7.715c0-1.46,1.188-2.647,2.648-2.647 s2.648,1.188,2.648,2.647v5.902C32.648,15.076,31.46,16.265,30,16.265L30,16.265z" fill="url(#SVGID_14_)"/>
<rect fill="none" height="60" width="60"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music.svg Fri May 14 16:09:54 2010 +0300
@@ -1,50 +1,52 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
-<stop offset="1" style="stop-color:#007338"/>
+ <stop offset="0" style="stop-color:#ADF54E"/>
+ <stop offset="1" style="stop-color:#007338"/>
</linearGradient>
<rect fill="url(#SVGID_1_)" height="47.899" width="47.898" x="2" y="6.05"/>
-<path d="M49.898,11.426c-3.863-2.852-8.631-4.563-13.814-4.563c-6.181,0.031-11.98,2.467-16.328,6.858 c-4.348,4.395-6.725,10.215-6.694,16.395c0.067,12.696,10.445,23.02,23.133,23.02h0.123c4.961-0.023,9.662-1.621,13.58-4.518V11.426 z M36.197,32.863c-1.764,0-3.318-1.416-3.592-3.249c0.191-1.826,1.738-3.249,3.576-3.256l0.016-1.342v1.342 c1.857,0,3.381,1.372,3.598,3.217C39.543,31.42,37.994,32.855,36.197,32.863z" fill="#231F20" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M49.898,11.426c-3.863-2.852-8.631-4.563-13.814-4.563c-6.181,0.031-11.98,2.467-16.328,6.858 c-4.348,4.395-6.725,10.215-6.694,16.395c0.067,12.696,10.445,23.02,23.133,23.02h0.123c4.961-0.023,9.662-1.621,13.58-4.518V11.426 z M36.197,32.863c-1.764,0-3.318-1.416-3.592-3.249c0.191-1.826,1.738-3.249,3.576-3.256l0.016-1.342v1.342 c1.857,0,3.381,1.372,3.598,3.217C39.543,31.42,37.994,32.855,36.197,32.863z" fill="#231F20" opacity="0.2"/>
<linearGradient gradientTransform="matrix(1 -0.0051 -0.0051 -1 -262.5146 -282.5771)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="297.1133" x2="297.1133" y1="-292.6729" y2="-336.2676">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.6606" style="stop-color:#8D9799"/>
-<stop offset="1" style="stop-color:#B9C0C2"/>
+ <stop offset="0" style="stop-color:#D1D7D9"/>
+ <stop offset="0.6606" style="stop-color:#8D9799"/>
+ <stop offset="1" style="stop-color:#B9C0C2"/>
</linearGradient>
<path d="M36.09,8.372c-12.037,0.062-21.749,9.867-21.687,21.907c0.062,12.04,9.87,21.749,21.908,21.688 C48.35,51.904,58.061,42.096,58,30.056C57.938,18.019,48.129,8.311,36.09,8.372z" fill="url(#SVGID_2_)"/>
<linearGradient gradientTransform="matrix(-1 0.0051 0.0051 1 516.8711 1754.7261)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="450.7412" x2="492.9824" y1="-1716.1777" y2="-1716.1777">
-<stop offset="0" style="stop-color:#A0A7A9"/>
-<stop offset="0.5" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#A0A7A9"/>
+ <stop offset="0" style="stop-color:#A0A7A9"/>
+ <stop offset="0.5" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#A0A7A9"/>
</linearGradient>
-<path d="M36.307,50.838C24.793,50.895,15.39,41.73,15.089,30.275 c-0.003,0.15-0.009,0.301-0.007,0.455c0.059,11.663,9.562,21.073,21.228,21.012c11.666-0.059,21.076-9.563,21.014-21.229 c0-0.152-0.008-0.303-0.014-0.451C57.129,41.516,47.818,50.779,36.307,50.838z" fill="url(#SVGID_3_)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M36.307,50.838C24.793,50.895,15.39,41.73,15.089,30.275 c-0.003,0.15-0.009,0.301-0.007,0.455c0.059,11.663,9.562,21.073,21.228,21.012c11.666-0.059,21.076-9.563,21.014-21.229 c0-0.152-0.008-0.303-0.014-0.451C57.129,41.516,47.818,50.779,36.307,50.838z" enable-background="new " fill="url(#SVGID_3_)" opacity="0.3"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="36.2002" x2="36.2002" y1="9.3618" y2="51.1027">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</linearGradient>
<path d="M36.092,8.991C24.396,9.052,14.966,18.58,15.026,30.275c0.061,11.696,9.588,21.125,21.283,21.067 c11.697-0.059,21.125-9.586,21.066-21.282C57.316,18.363,47.785,8.934,36.092,8.991z M36.246,39.152 c-4.961,0.023-9.002-3.975-9.029-8.938l0,0c-0.026-4.964,3.977-9.003,8.938-9.031c4.963-0.024,9.004,3.977,9.029,8.939h0.002 C45.211,35.084,41.209,39.125,36.246,39.152z" fill="url(#SVGID_4_)"/>
-<path d="M16.076,34.326c-2.194-10.6,4.263-21.14,14.704-23.995c1.703-0.464,3.46-0.704,5.222-0.715 c8.754-0.044,16.834,5.668,19.646,13.892l0.215,0.626l-10.566,2.889l-0.209-0.512c-1.465-3.585-5.061-5.98-8.945-5.959 c-0.834,0.004-1.666,0.117-2.477,0.338c-4.679,1.28-7.677,5.86-6.972,10.653l0.081,0.545l-10.567,2.889L16.076,34.326z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<polygon fill="#231F20" fill-opacity="0.2" points="46.303,47.168 47.645,48.328 47.645,14.173 49.898,12.222 49.898,9.72 46.303,12.833 " stroke-opacity="0.2"/>
-<polygon fill="#231F20" fill-opacity="0.2" points="45.604,47.168 46.943,48.328 46.943,13.474 49.898,10.821 49.898,9.02 45.604,12.833 " stroke-opacity="0.2"/>
+<path d="M16.076,34.326c-2.194-10.6,4.263-21.14,14.704-23.995c1.703-0.464,3.46-0.704,5.222-0.715 c8.754-0.044,16.834,5.668,19.646,13.892l0.215,0.626l-10.566,2.889l-0.209-0.512c-1.465-3.585-5.061-5.98-8.945-5.959 c-0.834,0.004-1.666,0.117-2.477,0.338c-4.679,1.28-7.677,5.86-6.972,10.653l0.081,0.545l-10.567,2.889L16.076,34.326z" fill="#FFFFFF" opacity="0.2"/>
+<polygon fill="#231F20" opacity="0.2" points="46.303,47.168 47.645,48.328 47.645,14.173 49.898,12.222 49.898,9.72 46.303,12.833 "/>
+<polygon fill="#231F20" opacity="0.2" points="45.604,47.168 46.943,48.328 46.943,13.474 49.898,10.821 49.898,9.02 45.604,12.833 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="25.9487" x2="25.9487" y1="5.6982" y2="53.7662">
-<stop offset="0" style="stop-color:#D6FF7A"/>
-<stop offset="1" style="stop-color:#235C08"/>
+ <stop offset="0" style="stop-color:#D6FF7A"/>
+ <stop offset="1" style="stop-color:#235C08"/>
</linearGradient>
<polygon fill="url(#SVGID_5_)" points="46.303,47.168 46.303,12.833 49.898,9.72 49.898,6.05 2,6.05 2,53.949 49.898,53.949 49.898,50.281 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="25.9497" x2="25.9497" y1="6.4077" y2="53.0723">
-<stop offset="0" style="stop-color:#AFED23"/>
-<stop offset="0.75" style="stop-color:#358C0C"/>
-<stop offset="1" style="stop-color:#56A215"/>
+ <stop offset="0" style="stop-color:#AFED23"/>
+ <stop offset="0.75" style="stop-color:#358C0C"/>
+ <stop offset="1" style="stop-color:#56A215"/>
</linearGradient>
<polygon fill="url(#SVGID_6_)" points="2.7,53.25 2.7,6.749 49.199,6.749 49.199,9.399 45.604,12.515 45.604,47.486 49.199,50.6 49.199,53.25 "/>
-<path d="M38.686,18.954l-2.051-4.99l-11.784,5.244l0.018,15.921c-1.804-1.18-4.464-1.564-7.167-0.836 c-4.263,1.15-7.018,4.631-6.156,7.768c0.866,3.143,5.021,4.754,9.283,3.605c3.603-0.973,6.097-3.545,6.083-6.293 c-0.012-2.748,0.022-10.209,0-15.607L38.686,18.954z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M38.686,18.954l-2.051-4.99l-11.784,5.244l0.018,15.921c-1.804-1.18-4.464-1.564-7.167-0.836 c-4.263,1.15-7.018,4.631-6.156,7.768c0.866,3.143,5.021,4.754,9.283,3.605c3.603-0.973,6.097-3.545,6.083-6.293 c-0.012-2.748,0.022-10.209,0-15.607L38.686,18.954z" opacity="0.2"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 2165)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="-2168.2642" x2="-2168.2642" y1="2145.8682" y2="2119.928">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#D2D5D6"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#D2D5D6"/>
</linearGradient>
<path d="M39.385,19.654l-2.051-4.991l-11.783,5.245l0.017,15.92c-1.804-1.18-4.464-1.564-7.167-0.834 c-4.263,1.15-7.018,4.629-6.155,7.766c0.866,3.143,5.021,4.754,9.283,3.605c3.602-0.973,6.097-3.543,6.083-6.293 c-0.012-2.748,0.022-10.208,0-15.606L39.385,19.654z" fill="url(#SVGID_7_)"/>
<rect fill="none" height="60" width="60"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music_album.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music_album.svg Fri May 14 16:09:54 2010 +0300
@@ -1,68 +1,72 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.6909" style="stop-color:#808A8C"/>
-<stop offset="1" style="stop-color:#A4ACAE"/>
+ <stop offset="0" style="stop-color:#D1D7D9"/>
+ <stop offset="0.6909" style="stop-color:#808A8C"/>
+ <stop offset="1" style="stop-color:#A4ACAE"/>
</linearGradient>
<path d="M29.857,2.002C14.394,2.082,1.922,14.679,2.001,30.143S14.68,58.079,30.145,57.999 C45.605,57.921,58.079,45.321,58,29.858C57.92,14.396,45.322,1.924,29.857,2.002z M30.035,37.199 c-3.977,0.021-7.215-3.187-7.235-7.162c-0.018-3.977,3.185-7.218,7.163-7.237c3.977-0.021,7.217,3.188,7.236,7.163 C37.221,33.938,34.014,37.179,30.035,37.199z" fill="url(#SVGID_1_)"/>
<linearGradient gradientTransform="matrix(1 -0.0051 0.0051 1 335.906 -1118.9601)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-311.7583" x2="-311.7583" y1="1135.5718" y2="1159.377">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#CFCFCF"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#CFCFCF"/>
</linearGradient>
<path d="M29.939,18.001C23.312,18.034,17.967,23.435,18,30.063c0.035,6.625,5.433,11.972,12.061,11.936 c6.627-0.032,11.972-5.432,11.938-12.061C41.966,23.31,36.566,17.966,29.939,18.001z M30.032,36.399 c-3.534,0.018-6.413-2.833-6.433-6.367c-0.016-3.533,2.833-6.414,6.367-6.432c3.533-0.017,6.415,2.833,6.434,6.367 C36.418,33.503,33.566,36.381,30.032,36.399z" fill="url(#SVGID_2_)"/>
<linearGradient gradientTransform="matrix(-1 0.0051 -0.0051 -1 -1180.5496 3117.9622)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1253.3975" x2="-1199.1357" y1="3067.8501" y2="3067.8501">
-<stop offset="0" style="stop-color:#A0A7A9"/>
-<stop offset="0.5" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#A0A7A9"/>
+ <stop offset="0" style="stop-color:#A0A7A9"/>
+ <stop offset="0.5" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#A0A7A9"/>
</linearGradient>
-<path d="M30.135,56.55C15.348,56.626,3.267,44.851,2.884,30.139 c-0.003,0.191-0.013,0.386-0.011,0.583c0.076,14.98,12.283,27.067,27.267,26.994c14.987-0.079,27.074-12.285,26.995-27.27 c-0.001-0.195-0.013-0.389-0.018-0.582C56.883,44.577,44.925,56.476,30.135,56.55z" fill="url(#SVGID_3_)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M30.135,56.55C15.348,56.626,3.267,44.851,2.884,30.139 c-0.003,0.191-0.013,0.386-0.011,0.583c0.076,14.98,12.283,27.067,27.267,26.994c14.987-0.079,27.074-12.285,26.995-27.27 c-0.001-0.195-0.013-0.389-0.018-0.582C56.883,44.577,44.925,56.476,30.135,56.55z" enable-background="new " fill="url(#SVGID_3_)" opacity="0.3"/>
<linearGradient gradientTransform="matrix(1 -0.0051 0.0051 1 335.906 -1118.9601)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-318.1577" x2="-305.3569" y1="1150.27" y2="1150.27">
-<stop offset="0" style="stop-color:#848C8E"/>
-<stop offset="0.5" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#848C8E"/>
+ <stop offset="0" style="stop-color:#848C8E"/>
+ <stop offset="0.5" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#848C8E"/>
</linearGradient>
<path d="M30.032,36.399c3.534-0.019,6.386-2.896,6.368-6.432c-0.002-0.204-0.014-0.403-0.035-0.6 c-0.285,3.254-3.006,6.014-6.338,6.03c-3.333,0.019-6.082-2.715-6.399-5.967c-0.017,0.199-0.029,0.399-0.028,0.601 C23.619,33.566,26.498,36.417,30.032,36.399z" fill="url(#SVGID_4_)"/>
<linearGradient gradientTransform="matrix(1 0 0 1 347 -1116.5)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-317.0005" x2="-317.0005" y1="1119.7017" y2="1173.7001">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</linearGradient>
<path d="M29.861,2.802C14.838,2.878,2.723,15.118,2.8,30.139c0.079,15.021,12.318,27.134,27.34,27.06 c15.022-0.076,27.136-12.314,27.06-27.335C57.122,14.838,44.881,2.725,29.861,2.802z M30.059,41.539 c-6.373,0.032-11.564-5.106-11.596-11.479h-0.004c-0.033-6.375,5.109-11.565,11.481-11.598c6.375-0.033,11.565,5.105,11.597,11.479 h0.002C41.572,36.315,36.43,41.507,30.059,41.539z" fill="url(#SVGID_5_)"/>
-<path d="M4.15,35.341C1.33,21.725,9.627,8.188,23.037,4.521 c2.186-0.598,4.444-0.907,6.708-0.918c11.248-0.056,21.622,7.281,25.237,17.844l0.275,0.806l-13.574,3.709l-0.267-0.655 c-1.885-4.605-6.5-7.685-11.491-7.657c-1.072,0.005-2.142,0.151-3.18,0.435c-6.014,1.646-9.861,7.526-8.959,13.682l0.103,0.702 L4.32,36.177L4.15,35.341z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M4.15,35.341C1.33,21.725,9.627,8.188,23.037,4.521 c2.186-0.598,4.444-0.907,6.708-0.918c11.248-0.056,21.622,7.281,25.237,17.844l0.275,0.806l-13.574,3.709l-0.267-0.655 c-1.885-4.605-6.5-7.685-11.491-7.657c-1.072,0.005-2.142,0.151-3.18,0.435c-6.014,1.646-9.861,7.526-8.959,13.682l0.103,0.702 L4.32,36.177L4.15,35.341z" enable-background="new " fill="#FFFFFF" opacity="0.2"/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<polygon fill="none" points="24.728,0 23.608,0.487 0,0.487 0,30.487 30,30.487 30,0.487 24.928,0.487 "/>
-<path d="M7.991,30.324c-3.295,0-5.976-1.69-6.668-4.205c-0.366-1.331-0.159-2.734,0.6-4.06 c1.063-1.86,3.062-3.301,5.478-3.952c0.873-0.235,1.762-0.355,2.639-0.355c0.927,0,1.816,0.133,2.635,0.389V5.247L24.728,0 l1.526,3.717l0.018-0.007l0.389,0.963l0.609,1.563l-10.565,4.318c0.008,2.6,0.003,5.635-0.001,8.204 c-0.003,2.014-0.006,3.74-0.002,4.745c0.016,2.839-2.473,5.497-6.049,6.463C9.771,30.203,8.875,30.324,7.991,30.324L7.991,30.324z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M7.991,30.324c-3.295,0-5.976-1.69-6.668-4.205c-0.366-1.331-0.159-2.734,0.6-4.06 c1.063-1.86,3.062-3.301,5.478-3.952c0.873-0.235,1.762-0.355,2.639-0.355c0.927,0,1.816,0.133,2.635,0.389V5.247L24.728,0 l1.526,3.717l0.018-0.007l0.389,0.963l0.609,1.563l-10.565,4.318c0.008,2.6,0.003,5.635-0.001,8.204 c-0.003,2.014-0.006,3.74-0.002,4.745c0.016,2.839-2.473,5.497-6.049,6.463C9.771,30.203,8.875,30.324,7.991,30.324L7.991,30.324z" opacity="0.35"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 2908.0361)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-2179.9351" x2="-2179.9351" y1="2902.811" y2="2880.1646">
-<stop offset="0" style="stop-color:#8CFF24"/>
-<stop offset="1" style="stop-color:#15570B"/>
+ <stop offset="0" style="stop-color:#8CFF24"/>
+ <stop offset="1" style="stop-color:#15570B"/>
</linearGradient>
<path d="M25.98,5.682l-1.79-4.357L13.902,5.902l0.016,13.899c-1.574-1.029-3.896-1.366-6.257-0.729 c-3.722,1.003-6.127,4.041-5.374,6.78c0.756,2.742,4.383,4.15,8.104,3.146c3.146-0.849,5.324-3.094,5.311-5.493 c-0.01-2.399,0.02-8.913,0-13.625L25.98,5.682z" fill="url(#SVGID_1__)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 0.5 614.8193 -1693.241)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-1201.8184" x2="-1201.8184" y1="3393.1226" y2="3404.4397">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</linearGradient>
<polygon fill="url(#SVGID_2__)" points="13.918,17.409 13.907,5.902 13.902,5.902 13.916,17.408 "/>
<linearGradient gradientTransform="matrix(0.5 0 0 0.5 614.8193 -1693.241)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="-1187.957" x2="-1187.957" y1="3393.1177" y2="3404.4392">
-<stop offset="0" style="stop-color:#9EFF47"/>
-<stop offset="1" style="stop-color:#11470A"/>
+ <stop offset="0" style="stop-color:#9EFF47"/>
+ <stop offset="1" style="stop-color:#11470A"/>
</linearGradient>
<path d="M15.701,9.169c0.005,0.759,0.006-0.117,0.008,0.711L25.98,5.682l-0.252-0.646L15.701,9.169z" fill="url(#SVGID_3__)"/>
<linearGradient gradientTransform="matrix(0.5 -0.0026 0.0026 0.5 604.1579 -1699.019)" gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="-1188.0039" x2="-1188.0039" y1="3402.1909" y2="3430.4734">
-<stop offset="0" style="stop-color:#B3FF6E"/>
-<stop offset="1" style="stop-color:#11470A"/>
+ <stop offset="0" style="stop-color:#B3FF6E"/>
+ <stop offset="1" style="stop-color:#11470A"/>
</linearGradient>
<polygon fill="url(#SVGID_4__)" points="14.072,20.2 14.072,6.3 24.389,1.807 24.19,1.324 13.674,5.902 13.674,19.803 "/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 2908.0361)" gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="-2185.0737" x2="-2185.0737" y1="2887.9233" y2="2879.6807">
-<stop offset="0" style="stop-color:#B2F56E"/>
-<stop offset="0.4667" style="stop-color:#40AD00"/>
-<stop offset="1" style="stop-color:#074D00"/>
+ <stop offset="0" style="stop-color:#B2F56E"/>
+ <stop offset="0.4667" style="stop-color:#40AD00"/>
+ <stop offset="1" style="stop-color:#074D00"/>
</linearGradient>
<path d="M7.96,28.527c-2.474,0.012-4.447-1.129-4.909-2.839c-0.28-1.039,0.018-2.187,0.84-3.229 c0.9-1.141,2.291-2.007,3.923-2.436c0.688-0.184,1.385-0.277,2.075-0.281c2.474-0.013,4.445,1.129,4.91,2.84 c0.615,2.267-1.522,4.807-4.764,5.664C9.347,28.43,8.647,28.522,7.96,28.527L7.96,28.527z" fill="url(#SVGID_5__)"/>
<rect fill="none" height="30" width="30" y="0.487"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music_empty.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music_empty.svg Fri May 14 16:09:54 2010 +0300
@@ -1,113 +1,108 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="0" y2="62.1923">
-<stop offset="0" style="stop-color:#942D2C"/>
-<stop offset="1" style="stop-color:#3C1212"/>
+ <stop offset="0" style="stop-color:#942D2C"/>
+ <stop offset="1" style="stop-color:#3C1212"/>
</linearGradient>
<rect fill="url(#SVGID_1_)" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="4.5098" y2="55.5135">
-<stop offset="0" style="stop-color:#A5A7AA"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#A5A7AA"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
-<path d="M29.999,55.926c-14.294,0-25.925-11.631-25.925-25.925 c0-14.296,11.631-25.928,25.925-25.928c14.296,0,25.927,11.632,25.927,25.928C55.926,44.295,44.295,55.926,29.999,55.926 L29.999,55.926z" fill="url(#SVGID_2_)" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M29.999,55.926c-14.294,0-25.925-11.631-25.925-25.925 c0-14.296,11.631-25.928,25.925-25.928c14.296,0,25.927,11.632,25.927,25.928C55.926,44.295,44.295,55.926,29.999,55.926 L29.999,55.926z" fill="url(#SVGID_2_)" opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30.0005" x2="30.0005" y1="5.1992" y2="54.8236">
-<stop offset="0" style="stop-color:#707173"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#707173"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
-<path d="M29.999,55.225c-13.908,0-25.224-11.315-25.224-25.224 c0-13.909,11.315-25.227,25.224-25.227c13.91,0,25.227,11.317,25.227,25.227C55.226,43.909,43.909,55.225,29.999,55.225 L29.999,55.225z" fill="url(#SVGID_3_)" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M29.999,55.225c-13.908,0-25.224-11.315-25.224-25.224 c0-13.909,11.315-25.227,25.224-25.227c13.91,0,25.227,11.317,25.227,25.227C55.226,43.909,43.909,55.225,29.999,55.225 L29.999,55.225z" fill="url(#SVGID_3_)" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="30.0005" x2="30.0005" y1="4.3555" y2="54.244">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#D8D8D7"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#D8D8D7"/>
</linearGradient>
<circle cx="30" cy="29.3" fill="url(#SVGID_4_)" r="24.525"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="29.9995" x2="29.9995" y1="5.1943" y2="52.5953">
-<stop offset="0" style="stop-color:#F4F5F5"/>
-<stop offset="0.7818" style="stop-color:#CCCBCB"/>
-<stop offset="1" style="stop-color:#D0D0D1"/>
+ <stop offset="0" style="stop-color:#F4F5F5"/>
+ <stop offset="0.7818" style="stop-color:#CCCBCB"/>
+ <stop offset="1" style="stop-color:#D0D0D1"/>
</linearGradient>
<circle cx="30" cy="29.3" fill="url(#SVGID_5_)" r="23.477"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="29.9995" x2="29.9995" y1="48.4443" y2="9.628">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#A8A7A7"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#A8A7A7"/>
</linearGradient>
<circle cx="30" cy="29.3" fill="url(#SVGID_6_)" r="19.495"/>
<radialGradient cx="36.7554" cy="71.5244" gradientTransform="matrix(0.9587 0 0 0.9587 -5.2375 -39.2709)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="19.2764">
-<stop offset="0" style="stop-color:#636363"/>
-<stop offset="0.3333" style="stop-color:#808080"/>
-<stop offset="1" style="stop-color:#1B1C1C"/>
+ <stop offset="0" style="stop-color:#636363"/>
+ <stop offset="0.3333" style="stop-color:#808080"/>
+ <stop offset="1" style="stop-color:#1B1C1C"/>
</radialGradient>
<circle cx="30" cy="29.3" fill="url(#SVGID_7_)" r="18.48"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="29.9995" x2="29.9995" y1="42.2959" y2="14.7661">
-<stop offset="0" style="stop-color:#808080"/>
-<stop offset="1" style="stop-color:#1B1C1C"/>
+ <stop offset="0" style="stop-color:#808080"/>
+ <stop offset="1" style="stop-color:#1B1C1C"/>
</linearGradient>
<circle cx="30" cy="29.3" fill="url(#SVGID_8_)" r="14.393"/>
<radialGradient cx="36.6816" cy="72.1777" gradientTransform="matrix(0.9587 0 0 0.9587 -5.2375 -39.2709)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="14.4318">
-<stop offset="0" style="stop-color:#B3B3B4"/>
-<stop offset="1" style="stop-color:#696969"/>
+ <stop offset="0" style="stop-color:#B3B3B4"/>
+ <stop offset="1" style="stop-color:#696969"/>
</radialGradient>
-<path d="M41.586,37.812l-4.756-4.216H24.035l-5.45,4.448c2.632,3.429,6.759,5.649,11.414,5.649 C34.758,43.693,38.967,41.372,41.586,37.812z" fill="url(#SVGID_9_)" fill-opacity="0.5" stroke-opacity="0.5"/>
-<circle cx="30" cy="31.604" fill-opacity="0.15" r="9.327" stroke-opacity="0.15"/>
+<path d="M41.586,37.812l-4.756-4.216H24.035l-5.45,4.448c2.632,3.429,6.759,5.649,11.414,5.649 C34.758,43.693,38.967,41.372,41.586,37.812z" fill="url(#SVGID_9_)" opacity="0.5"/>
+<circle cx="30" cy="31.604" opacity="0.15" r="9.327"/>
<radialGradient cx="36.792" cy="68.9736" gradientTransform="matrix(0.9587 0 0 0.9587 -5.2375 -39.2709)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="10.9541">
-<stop offset="0" style="stop-color:#4D4E4E"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#4D4E4E"/>
+ <stop offset="1" style="stop-color:#000000"/>
</radialGradient>
<circle cx="30" cy="29.3" fill="url(#SVGID_10_)" r="9.327"/>
-<circle cx="30" cy="29.3" fill="none" fill-opacity="0.15" r="8.106" stroke="#EBEBEB" stroke-opacity="0.15"/>
+<circle cx="30" cy="29.3" fill="none" opacity="0.15" r="8.106" stroke="#EBEBEB"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="30" x2="30" y1="20.1299" y2="38.4788">
-<stop offset="0" style="stop-color:#DEDEDD"/>
-<stop offset="1" style="stop-color:#A8A7A7"/>
+ <stop offset="0" style="stop-color:#DEDEDD"/>
+ <stop offset="1" style="stop-color:#A8A7A7"/>
</linearGradient>
-<path d="M29.999,19.973c-5.151,0-9.326,4.176-9.326,9.327s4.175,9.327,9.326,9.327 c5.15,0,9.328-4.176,9.328-9.327S35.149,19.973,29.999,19.973z M29.999,36.636c-4.052,0-7.335-3.284-7.335-7.336 c0-4.053,3.283-7.337,7.335-7.337s7.339,3.284,7.339,7.337C37.338,33.352,34.051,36.636,29.999,36.636z" fill="url(#SVGID_11_)" fill-opacity="0.15" stroke-opacity="0.15"/>
-<path d="M50.342,18.256c-11.463,0-20.624,6.636-24.617,8.388c-3.667,1.609-6.428,3.301-14.676,3.301 C2.8,29.944,0,26.088,0,26.088v2.616v1.69v4.475v0.902v3.607v3.049v4.244v0.342v1.838v4.188c0,0,10.143-18.252,19.182-22.08 c7.153-3.028,10.977-2.932,18.569-0.451C45.344,32.989,60,55.234,60,55.234v-9.348v-0.644v-0.376v-4.318v-4.553v-4.68v-1.063v-0.497 v-6.088v-3.901C60,19.768,58.35,18.186,50.342,18.256z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M29.999,19.973c-5.151,0-9.326,4.176-9.326,9.327s4.175,9.327,9.326,9.327 c5.15,0,9.328-4.176,9.328-9.327S35.149,19.973,29.999,19.973z M29.999,36.636c-4.052,0-7.335-3.284-7.335-7.336 c0-4.053,3.283-7.337,7.335-7.337s7.339,3.284,7.339,7.337C37.338,33.352,34.051,36.636,29.999,36.636z" fill="url(#SVGID_11_)" opacity="0.15"/>
+<path d="M50.342,18.256c-11.463,0-20.624,6.636-24.617,8.388c-3.667,1.609-6.428,3.301-14.676,3.301 C2.8,29.944,0,26.088,0,26.088v2.616v1.69v4.475v0.902v3.607v3.049v4.244v0.342v1.838v4.188c0,0,10.143-18.252,19.182-22.08 c7.153-3.028,10.977-2.932,18.569-0.451C45.344,32.989,60,55.234,60,55.234v-9.348v-0.644v-0.376v-4.318v-4.553v-4.68v-1.063v-0.497 v-6.088v-3.901C60,19.768,58.35,18.186,50.342,18.256z" opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="2.6997" x2="56.2554" y1="35.752" y2="35.752">
-<stop offset="0" style="stop-color:#C82128"/>
-<stop offset="0.2" style="stop-color:#C82128"/>
-<stop offset="1" style="stop-color:#801517"/>
+ <stop offset="0.2" style="stop-color:#C82128"/>
+ <stop offset="1" style="stop-color:#801517"/>
</linearGradient>
<path d="M0,27.707v20.148c0,0,11.618-14.605,15.436-16.507s9.159-3.792,9.159-3.792s6.39-1.127,11.126-0.15 C40.457,28.384,60,43.871,60,43.871V28.76c0,0-7.363-5.111-13.228-5.111S30.27,25.04,27.076,25.903 c-3.194,0.862-2.255,0.285-10.149,3.383S0,27.707,0,27.707z" fill="url(#SVGID_12_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="4.0327" x2="64.4873" y1="24.0771" y2="24.0771">
-<stop offset="0" style="stop-color:#EF4E59"/>
-<stop offset="0.0848" style="stop-color:#EF4E59"/>
-<stop offset="1" style="stop-color:#CD2027"/>
+ <stop offset="0.0848" style="stop-color:#EF4E59"/>
+ <stop offset="1" style="stop-color:#CD2027"/>
</linearGradient>
<path d="M0,25.091c0,0,2.8,3.855,11.049,3.855c8.248,0,11.009-1.69,14.676-3.3 c3.993-1.752,13.154-8.388,24.617-8.388C58.35,17.188,60,18.77,60,18.77v3.902c0,0-5.202-2.476-9.635-2.476 c-11.072,0-20.996,4.109-24.212,5.843c-3.284,1.77-12.304,4.858-16.176,4.858c-4.036,0-9.978-1.5-9.978-1.5V25.091z" fill="url(#SVGID_13_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="2.6997" x2="56.2554" y1="39.9023" y2="39.9023">
-<stop offset="0" style="stop-color:#C82128"/>
-<stop offset="0.2" style="stop-color:#C82128"/>
-<stop offset="1" style="stop-color:#801517"/>
+ <stop offset="0.2" style="stop-color:#C82128"/>
+ <stop offset="1" style="stop-color:#801517"/>
</linearGradient>
<path d="M0,50.711c0,0,10.143-16.921,19.182-20.748c7.153-3.029,10.977-2.933,18.569-0.451 C45.344,31.992,60,52.908,60,52.908v-8.662c0,0-8.652-9.266-13.979-12.78c-5.95-3.925-14.173-4.938-19.245-4.46 c-3.7,0.349-11.979,3.563-17.667,8.82C4.345,40.229,0,45.675,0,45.675V50.711z" fill="url(#SVGID_14_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="4.0327" x2="64.4873" y1="36.2725" y2="36.2725">
-<stop offset="0" style="stop-color:#EF4E59"/>
-<stop offset="0.0848" style="stop-color:#EF4E59"/>
-<stop offset="1" style="stop-color:#CD2027"/>
+ <stop offset="0.0848" style="stop-color:#EF4E59"/>
+ <stop offset="1" style="stop-color:#CD2027"/>
</linearGradient>
<path d="M0,46.017c0,0,10.175-12.62,19.182-16.521c6.297-2.728,10.858-3.021,18.569-1.347 C44.894,29.699,60,44.889,60,44.889v-5.338c0,0-8.594-6.087-13.979-9.514c-5.601-3.563-14.173-3.803-19.245-3.326 c-3.7,0.349-12.708,4.342-17.667,7.988C3.883,38.54,0,41.431,0,41.431V46.017z" fill="url(#SVGID_15_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="2.6997" x2="56.2554" y1="27.4854" y2="27.4854">
-<stop offset="0" style="stop-color:#C82128"/>
-<stop offset="0.2" style="stop-color:#C82128"/>
-<stop offset="0.3968" style="stop-color:#801517"/>
-<stop offset="1" style="stop-color:#801517"/>
+ <stop offset="0.2" style="stop-color:#C82128"/>
+ <stop offset="0.3968" style="stop-color:#801517"/>
</linearGradient>
<path d="M26.153,26.039c-3.284,1.77-12.304,4.858-16.176,4.858c-4.036,0-9.978-1.5-9.978-1.5v5.376 c0,0,2.909-0.733,8.338-1.645c4.005-0.672,14.265-5.91,18.889-7.038c4.623-1.127,17.041-1.691,23.625,0.384 C57.504,28.571,60,30.319,60,30.319v-7.647c0,0-5.202-2.476-9.635-2.476C39.293,20.196,29.369,24.306,26.153,26.039z" fill="url(#SVGID_16_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="4.0327" x2="64.4873" y1="31.3799" y2="31.3799">
-<stop offset="0" style="stop-color:#EF4E59"/>
-<stop offset="0.0848" style="stop-color:#EF4E59"/>
-<stop offset="1" style="stop-color:#CD2027"/>
+ <stop offset="0.0848" style="stop-color:#EF4E59"/>
+ <stop offset="1" style="stop-color:#CD2027"/>
</linearGradient>
<path d="M50.852,25.195c-6.664-1.803-19.002-0.231-23.625,0.896c-4.624,1.128-15.61,6.444-18.889,7.038 C2.922,34.109,0,33.871,0,33.871v4.512c0,0,13.228-7.357,24.221-11.104c3.269-1.113,6.47-1.525,9.133-1.525 c5.98,0,8.374,0.453,13.908,2.104C54.816,30.113,60,34.999,60,34.999v-5.742C59.371,28.858,57.523,26.999,50.852,25.195z" fill="url(#SVGID_17_)"/>
-<path d="M42.354,41.455c0,0.924-0.567,1.772-1.367,2.389c-0.78,0.615-1.807,0.984-2.71,0.984 c-0.574,0-1.108-0.184-1.478-0.492c-0.39-0.308-0.616-0.76-0.616-1.293c0-0.842,0.574-1.684,1.355-2.299 c0.779-0.637,1.765-1.047,2.586-1.047c0.719,0,1.305,0.078,1.675,0.426V24.313h0.555c0.042,0.739,0.151,1.776,1.034,2.576 c1.006,0.883,1.93,1.766,2.566,2.565c0.841,1.048,1.437,2.36,1.437,3.694c0,0.678-0.103,1.376-0.288,2.033 c0.35,0.697,0.534,1.437,0.534,2.278c0,1.437-0.416,2.622-1.011,3.606h-0.334c0.432-0.656,0.934-2.211,0.893-3.196 c-0.041-1.088-0.123-1.724-0.82-2.587c-0.801-0.984-2.861-2.016-4.011-2.815V41.455z M46.857,33.354 c-0.041-1.088-0.574-1.929-1.272-2.792c-0.8-0.984-2.081-1.82-3.23-2.478c0.042,1.478,0.993,2.991,1.876,3.792 c1.006,0.883,1.498,1.354,2.094,2.094c0.185,0.225,0.325,0.49,0.469,0.717C46.834,34.256,46.878,33.703,46.857,33.354z" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M10.249,25.854c0.273-0.042,0.547-0.063,0.82-0.063c2.673-0.021,4.546,2.377,4.524,5.092 c0,2.252-1.347,3.914-3.346,4.882l0.842,4.272c0.063,0.357,0.063,0.673,0.063,0.967c0,2.146-1.348,3.536-3.578,3.768 c-1.746,0.189-3.745-1.01-3.935-2.904c-0.126-1.263,0.736-2.566,1.957-2.715c1.115-0.126,2.125,0.863,2.167,2.021 c0.063,1.62-1.536,2.146-2.146,1.999c0.063,0.716,1.305,0.989,1.895,0.926c1.957-0.23,2.883-1.43,2.946-3.135 c0-0.463-0.043-1.011-0.169-1.537l-0.716-3.366c-0.673,0.189-1.325,0.273-1.957,0.273c-3.619,0-6.565-3.073-6.859-7.05 c-0.316-4.103,2.987-7.154,5.534-9.764c-0.379-1.557-0.61-3.072-0.61-4.671c0-1.915,0.884-5.829,2.883-6.566 c0.863-0.336,2.462,3.894,2.42,6.229c-0.042,2.946-1.389,5.766-3.451,7.807L10.249,25.854z M10.06,28.357 c-1.179,0.358-2.188,1.578-2.167,2.883c0,1.115,0.736,1.831,1.662,2.273c0.104,0.041,0.147,0.126,0.147,0.209 c0,0.127-0.147,0.232-0.295,0.211c-1.6-0.547-2.735-2.104-2.715-3.871c0-1.726,1.368-3.473,2.904-4.04l-0.632-3.178 c-2.23,1.979-4.692,4.335-4.713,7.597c0,3.281,2.777,5.303,5.786,5.176c0.484-0.021,0.947-0.105,1.41-0.252L10.06,28.357z M12.122,12.744c-0.021-0.674-0.421-1.347-1.158-1.347c-1.768,0.357-2.398,3.388-2.44,4.902c0,0.884,0.147,1.789,0.357,2.652 C10.564,17.5,12.206,15.122,12.122,12.744z M12.122,35.154c1.263-0.674,2.125-2.041,2.063-3.556 c-0.147-1.937-1.579-3.346-3.452-3.325L12.122,35.154z" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M25.243,17.415h0.327V27.66c-0.024,1.054-1.352,1.964-2.356,1.964c-0.303,0-0.609-0.039-0.852-0.196 c-0.387-0.255-0.471-0.665-0.458-1.113c0.036-1.077,1.315-1.927,2.356-1.963c0.303-0.013,0.606,0.019,0.982,0.261V17.415z" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M33.052,16.219h0.327v10.244c-0.023,1.054-1.352,1.965-2.357,1.965c-0.302,0-0.608-0.039-0.851-0.197 c-0.388-0.254-0.471-0.664-0.458-1.112c0.036-1.078,1.314-1.928,2.357-1.964c0.302-0.012,0.605,0.02,0.981,0.262V16.219z" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M40.191,13.56h0.328v10.245c-0.025,1.054-1.352,1.964-2.357,1.964c-0.303,0-0.609-0.039-0.851-0.196 c-0.388-0.255-0.471-0.665-0.458-1.113c0.035-1.078,1.314-1.928,2.355-1.964c0.303-0.012,0.607,0.02,0.982,0.262V13.56z" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M46.692,9.718h0.327v10.245c-0.024,1.054-1.352,1.964-2.357,1.964c-0.303,0-0.608-0.039-0.85-0.196 c-0.389-0.254-0.471-0.665-0.459-1.112c0.036-1.078,1.314-1.928,2.356-1.964c0.303-0.013,0.606,0.02,0.982,0.262V9.718z" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M52.896,9.718h0.328v10.245c-0.024,1.054-1.352,1.964-2.357,1.964c-0.303,0-0.609-0.039-0.851-0.196 c-0.388-0.254-0.471-0.665-0.458-1.112c0.036-1.078,1.314-1.928,2.356-1.964c0.303-0.013,0.606,0.02,0.981,0.262V9.718z" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M57.045,16.525h0.327V26.77c-0.024,1.054-1.351,1.965-2.356,1.965c-0.303,0-0.609-0.039-0.852-0.197 c-0.387-0.254-0.471-0.664-0.458-1.112c0.036-1.078,1.315-1.928,2.356-1.964c0.303-0.012,0.607,0.02,0.982,0.262V16.525z" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M52.126,52.258c1.521-1.018,2.489-1.58,3.339-3.062c0.365-0.642,0.632-1.562,0.632-2.232 c0-0.544-0.029-0.948-0.237-1.344c-0.236-0.454-0.74-0.81-1.393-0.751c-0.434,0.04-0.958,0.198-1.176,0.436 c-0.118,0.128-0.227,0.306-0.296,0.454c-0.06,0.128,0,0.325,0.237,0.336c0.089,0,0.286-0.079,0.395-0.089 c0.514-0.059,0.939,0.355,0.939,0.8c0,0.435-0.386,0.889-0.998,0.889c-0.633,0-1.166-0.435-1.186-1.057 c-0.02-0.661,0.415-1.333,1.027-1.669c0.326-0.207,1.037-0.395,1.383-0.395c0.633,0,1.195,0.107,1.787,0.602 c0.594,0.494,0.791,0.898,0.88,1.729c0.128,1.176-0.85,2.717-1.798,3.496c-0.889,0.732-2.252,1.473-3.477,2.065L52.126,52.258z M58.418,45.334c0.326,0,0.533,0.267,0.533,0.533c0,0.277-0.207,0.543-0.533,0.543c-0.346,0-0.543-0.266-0.543-0.543 C57.875,45.601,58.072,45.334,58.418,45.334z M58.418,47.497c0.326,0,0.533,0.267,0.533,0.534c0,0.275-0.207,0.543-0.533,0.543 c-0.346,0-0.543-0.268-0.543-0.543C57.875,47.764,58.072,47.497,58.418,47.497z" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M42.354,41.455c0,0.924-0.567,1.772-1.367,2.389c-0.78,0.615-1.807,0.984-2.71,0.984 c-0.574,0-1.108-0.184-1.478-0.492c-0.39-0.308-0.616-0.76-0.616-1.293c0-0.842,0.574-1.684,1.355-2.299 c0.779-0.637,1.765-1.047,2.586-1.047c0.719,0,1.305,0.078,1.675,0.426V24.313h0.555c0.042,0.739,0.151,1.776,1.034,2.576 c1.006,0.883,1.93,1.766,2.566,2.565c0.841,1.048,1.437,2.36,1.437,3.694c0,0.678-0.103,1.376-0.288,2.033 c0.35,0.697,0.534,1.437,0.534,2.278c0,1.437-0.416,2.622-1.011,3.606h-0.334c0.432-0.656,0.934-2.211,0.893-3.196 c-0.041-1.088-0.123-1.724-0.82-2.587c-0.801-0.984-2.861-2.016-4.011-2.815V41.455z M46.857,33.354 c-0.041-1.088-0.574-1.929-1.272-2.792c-0.8-0.984-2.081-1.82-3.23-2.478c0.042,1.478,0.993,2.991,1.876,3.792 c1.006,0.883,1.498,1.354,2.094,2.094c0.185,0.225,0.325,0.49,0.469,0.717C46.834,34.256,46.878,33.703,46.857,33.354z" opacity="0.3"/>
+<path d="M10.249,25.854c0.273-0.042,0.547-0.063,0.82-0.063c2.673-0.021,4.546,2.377,4.524,5.092 c0,2.252-1.347,3.914-3.346,4.882l0.842,4.272c0.063,0.357,0.063,0.673,0.063,0.967c0,2.146-1.348,3.536-3.578,3.768 c-1.746,0.189-3.745-1.01-3.935-2.904c-0.126-1.263,0.736-2.566,1.957-2.715c1.115-0.126,2.125,0.863,2.167,2.021 c0.063,1.62-1.536,2.146-2.146,1.999c0.063,0.716,1.305,0.989,1.895,0.926c1.957-0.23,2.883-1.43,2.946-3.135 c0-0.463-0.043-1.011-0.169-1.537l-0.716-3.366c-0.673,0.189-1.325,0.273-1.957,0.273c-3.619,0-6.565-3.073-6.859-7.05 c-0.316-4.103,2.987-7.154,5.534-9.764c-0.379-1.557-0.61-3.072-0.61-4.671c0-1.915,0.884-5.829,2.883-6.566 c0.863-0.336,2.462,3.894,2.42,6.229c-0.042,2.946-1.389,5.766-3.451,7.807L10.249,25.854z M10.06,28.357 c-1.179,0.358-2.188,1.578-2.167,2.883c0,1.115,0.736,1.831,1.662,2.273c0.104,0.041,0.147,0.126,0.147,0.209 c0,0.127-0.147,0.232-0.295,0.211c-1.6-0.547-2.735-2.104-2.715-3.871c0-1.726,1.368-3.473,2.904-4.04l-0.632-3.178 c-2.23,1.979-4.692,4.335-4.713,7.597c0,3.281,2.777,5.303,5.786,5.176c0.484-0.021,0.947-0.105,1.41-0.252L10.06,28.357z M12.122,12.744c-0.021-0.674-0.421-1.347-1.158-1.347c-1.768,0.357-2.398,3.388-2.44,4.902c0,0.884,0.147,1.789,0.357,2.652 C10.564,17.5,12.206,15.122,12.122,12.744z M12.122,35.154c1.263-0.674,2.125-2.041,2.063-3.556 c-0.147-1.937-1.579-3.346-3.452-3.325L12.122,35.154z" opacity="0.3"/>
+<path d="M25.243,17.415h0.327V27.66c-0.024,1.054-1.352,1.964-2.356,1.964c-0.303,0-0.609-0.039-0.852-0.196 c-0.387-0.255-0.471-0.665-0.458-1.113c0.036-1.077,1.315-1.927,2.356-1.963c0.303-0.013,0.606,0.019,0.982,0.261V17.415z" opacity="0.3"/>
+<path d="M33.052,16.219h0.327v10.244c-0.023,1.054-1.352,1.965-2.357,1.965c-0.302,0-0.608-0.039-0.851-0.197 c-0.388-0.254-0.471-0.664-0.458-1.112c0.036-1.078,1.314-1.928,2.357-1.964c0.302-0.012,0.605,0.02,0.981,0.262V16.219z" opacity="0.3"/>
+<path d="M40.191,13.56h0.328v10.245c-0.025,1.054-1.352,1.964-2.357,1.964c-0.303,0-0.609-0.039-0.851-0.196 c-0.388-0.255-0.471-0.665-0.458-1.113c0.035-1.078,1.314-1.928,2.355-1.964c0.303-0.012,0.607,0.02,0.982,0.262V13.56z" opacity="0.3"/>
+<path d="M46.692,9.718h0.327v10.245c-0.024,1.054-1.352,1.964-2.357,1.964c-0.303,0-0.608-0.039-0.85-0.196 c-0.389-0.254-0.471-0.665-0.459-1.112c0.036-1.078,1.314-1.928,2.356-1.964c0.303-0.013,0.606,0.02,0.982,0.262V9.718z" opacity="0.3"/>
+<path d="M52.896,9.718h0.328v10.245c-0.024,1.054-1.352,1.964-2.357,1.964c-0.303,0-0.609-0.039-0.851-0.196 c-0.388-0.254-0.471-0.665-0.458-1.112c0.036-1.078,1.314-1.928,2.356-1.964c0.303-0.013,0.606,0.02,0.981,0.262V9.718z" opacity="0.3"/>
+<path d="M57.045,16.525h0.327V26.77c-0.024,1.054-1.351,1.965-2.356,1.965c-0.303,0-0.609-0.039-0.852-0.197 c-0.387-0.254-0.471-0.664-0.458-1.112c0.036-1.078,1.315-1.928,2.356-1.964c0.303-0.012,0.607,0.02,0.982,0.262V16.525z" opacity="0.3"/>
+<path d="M52.126,52.258c1.521-1.018,2.489-1.58,3.339-3.062c0.365-0.642,0.632-1.562,0.632-2.232 c0-0.544-0.029-0.948-0.237-1.344c-0.236-0.454-0.74-0.81-1.393-0.751c-0.434,0.04-0.958,0.198-1.176,0.436 c-0.118,0.128-0.227,0.306-0.296,0.454c-0.06,0.128,0,0.325,0.237,0.336c0.089,0,0.286-0.079,0.395-0.089 c0.514-0.059,0.939,0.355,0.939,0.8c0,0.435-0.386,0.889-0.998,0.889c-0.633,0-1.166-0.435-1.186-1.057 c-0.02-0.661,0.415-1.333,1.027-1.669c0.326-0.207,1.037-0.395,1.383-0.395c0.633,0,1.195,0.107,1.787,0.602 c0.594,0.494,0.791,0.898,0.88,1.729c0.128,1.176-0.85,2.717-1.798,3.496c-0.889,0.732-2.252,1.473-3.477,2.065L52.126,52.258z M58.418,45.334c0.326,0,0.533,0.267,0.533,0.533c0,0.277-0.207,0.543-0.533,0.543c-0.346,0-0.543-0.266-0.543-0.543 C57.875,45.601,58.072,45.334,58.418,45.334z M58.418,47.497c0.326,0,0.533,0.267,0.533,0.534c0,0.275-0.207,0.543-0.533,0.543 c-0.346,0-0.543-0.268-0.543-0.543C57.875,47.764,58.072,47.497,58.418,47.497z" opacity="0.3"/>
<path d="M42.021,40.791c0,0.923-0.566,1.771-1.367,2.389c-0.779,0.615-1.807,0.984-2.709,0.984 c-0.575,0-1.108-0.185-1.479-0.493c-0.39-0.308-0.615-0.759-0.615-1.293c0-0.841,0.574-1.683,1.354-2.299 c0.78-0.637,1.765-1.047,2.587-1.047c0.719,0,1.305,0.077,1.674,0.427V23.648h0.555c0.042,0.738,0.152,1.775,1.035,2.576 c1.006,0.882,1.93,1.765,2.565,2.565c0.842,1.047,1.437,2.36,1.437,3.694c0,0.678-0.102,1.375-0.287,2.031 c0.35,0.698,0.533,1.438,0.533,2.279c0,1.438-0.416,2.621-1.011,3.607h-0.333c0.432-0.657,0.934-2.211,0.893-3.197 c-0.041-1.088-0.123-1.724-0.82-2.586c-0.801-0.985-2.861-2.016-4.012-2.816V40.791z M46.525,32.689 c-0.041-1.088-0.574-1.93-1.272-2.791c-0.801-0.985-2.081-1.821-3.231-2.479c0.042,1.479,0.994,2.991,1.877,3.791 c1.006,0.883,1.498,1.355,2.094,2.094c0.184,0.227,0.324,0.491,0.469,0.717C46.502,33.591,46.546,33.039,46.525,32.689z" fill="#FFFFFF"/>
<path d="M9.916,25.189c0.274-0.042,0.548-0.063,0.821-0.063c2.673-0.021,4.546,2.378,4.524,5.093 c0,2.251-1.347,3.913-3.346,4.881l0.842,4.271c0.063,0.358,0.063,0.674,0.063,0.969c0,2.146-1.347,3.535-3.577,3.768 c-1.747,0.189-3.746-1.011-3.936-2.904c-0.126-1.264,0.736-2.567,1.957-2.715c1.115-0.127,2.126,0.863,2.168,2.02 c0.063,1.621-1.536,2.146-2.146,2c0.063,0.715,1.305,0.988,1.894,0.926c1.957-0.232,2.883-1.432,2.946-3.137 c0-0.463-0.042-1.01-0.168-1.535l-0.716-3.367c-0.673,0.189-1.326,0.273-1.957,0.273c-3.62,0-6.565-3.072-6.86-7.049 c-0.315-4.104,2.988-7.154,5.534-9.764c-0.378-1.558-0.609-3.073-0.609-4.672c0-1.915,0.884-5.829,2.883-6.565 c0.862-0.337,2.462,3.893,2.42,6.229c-0.043,2.946-1.389,5.766-3.451,7.808L9.916,25.189z M9.728,27.693 c-1.179,0.357-2.188,1.578-2.168,2.883c0,1.115,0.736,1.83,1.662,2.271c0.105,0.043,0.147,0.127,0.147,0.211 c0,0.127-0.147,0.232-0.295,0.211c-1.599-0.547-2.735-2.105-2.714-3.872c0-1.726,1.367-3.472,2.904-4.04L8.633,22.18 c-2.23,1.979-4.692,4.335-4.714,7.597c0,3.282,2.778,5.303,5.787,5.177c0.484-0.021,0.947-0.105,1.41-0.253L9.728,27.693z M11.789,12.079c-0.021-0.674-0.421-1.347-1.157-1.347c-1.768,0.357-2.398,3.388-2.44,4.903c0,0.884,0.146,1.788,0.357,2.651 C10.232,16.835,11.874,14.457,11.789,12.079z M11.789,34.49c1.263-0.674,2.126-2.042,2.063-3.557 c-0.147-1.936-1.578-3.346-3.451-3.325L11.789,34.49z" fill="#FFFFFF"/>
<path d="M24.911,16.751h0.327v10.244c-0.024,1.054-1.352,1.964-2.357,1.964c-0.303,0-0.608-0.039-0.851-0.196 c-0.388-0.254-0.471-0.665-0.458-1.112c0.036-1.078,1.314-1.928,2.356-1.964c0.303-0.012,0.606,0.02,0.982,0.262V16.751z" fill="#FFFFFF"/>
@@ -118,4 +113,4 @@
<path d="M56.713,15.86h0.327v10.245c-0.024,1.054-1.352,1.964-2.356,1.964c-0.303,0-0.609-0.039-0.852-0.196 c-0.387-0.255-0.471-0.665-0.458-1.113c0.036-1.077,1.315-1.927,2.356-1.963c0.303-0.013,0.606,0.019,0.982,0.261V15.86z" fill="#FFFFFF"/>
<path d="M51.793,51.594c1.521-1.018,2.49-1.581,3.339-3.063c0.366-0.643,0.632-1.561,0.632-2.232 c0-0.543-0.029-0.948-0.236-1.344c-0.236-0.453-0.74-0.81-1.393-0.75c-0.435,0.039-0.959,0.197-1.176,0.435 c-0.119,0.128-0.227,0.306-0.297,0.454c-0.059,0.129,0,0.326,0.238,0.336c0.088,0,0.285-0.079,0.395-0.089 c0.514-0.06,0.938,0.355,0.938,0.8c0,0.436-0.386,0.889-0.998,0.889c-0.632,0-1.165-0.434-1.185-1.057 c-0.02-0.662,0.414-1.333,1.027-1.67c0.326-0.207,1.037-0.395,1.383-0.395c0.632,0,1.195,0.109,1.787,0.604 c0.593,0.493,0.791,0.898,0.879,1.728c0.129,1.176-0.85,2.717-1.797,3.497c-0.889,0.73-2.252,1.472-3.477,2.064L51.793,51.594z M58.086,44.669c0.326,0,0.533,0.267,0.533,0.534c0,0.275-0.207,0.543-0.533,0.543c-0.346,0-0.543-0.268-0.543-0.543 C57.543,44.936,57.74,44.669,58.086,44.669z M58.086,46.832c0.326,0,0.533,0.268,0.533,0.533c0,0.277-0.207,0.544-0.533,0.544 c-0.346,0-0.543-0.267-0.543-0.544C57.543,47.1,57.74,46.832,58.086,46.832z" fill="#FFFFFF"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music_player.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music_player.svg Fri May 14 16:09:54 2010 +0300
@@ -1,89 +1,95 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.6909" style="stop-color:#808A8C"/>
-<stop offset="1" style="stop-color:#A4ACAE"/>
+ <stop offset="0" style="stop-color:#D1D7D9"/>
+ <stop offset="0.6909" style="stop-color:#808A8C"/>
+ <stop offset="1" style="stop-color:#A4ACAE"/>
</linearGradient>
<path d="M29.857,2.002C14.394,2.082,1.922,14.679,2.001,30.143S14.68,58.079,30.145,57.999 C45.605,57.921,58.079,45.321,58,29.858C57.92,14.396,45.322,1.924,29.857,2.002z M30.035,37.199 c-3.977,0.021-7.215-3.187-7.235-7.162c-0.018-3.977,3.185-7.218,7.163-7.237c3.977-0.021,7.217,3.188,7.236,7.163 C37.221,33.938,34.014,37.179,30.035,37.199z" fill="url(#SVGID_1_)"/>
<linearGradient gradientTransform="matrix(1 -0.0051 0.0051 1 335.906 -1118.9601)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-311.7583" x2="-311.7583" y1="1135.5718" y2="1159.377">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#CFCFCF"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#CFCFCF"/>
</linearGradient>
<path d="M29.939,18.001C23.312,18.034,17.967,23.435,18,30.063c0.035,6.625,5.433,11.972,12.061,11.936 c6.627-0.032,11.972-5.432,11.938-12.061C41.966,23.31,36.566,17.966,29.939,18.001z M30.032,36.399 c-3.534,0.018-6.413-2.833-6.433-6.367c-0.016-3.533,2.833-6.414,6.367-6.432c3.533-0.017,6.415,2.833,6.434,6.367 C36.418,33.503,33.566,36.381,30.032,36.399z" fill="url(#SVGID_2_)"/>
<linearGradient gradientTransform="matrix(-1 0.0051 -0.0051 -1 -1180.5496 3117.9622)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1253.3975" x2="-1199.1357" y1="3067.8501" y2="3067.8501">
-<stop offset="0" style="stop-color:#A0A7A9"/>
-<stop offset="0.5" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#A0A7A9"/>
+ <stop offset="0" style="stop-color:#A0A7A9"/>
+ <stop offset="0.5" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#A0A7A9"/>
</linearGradient>
-<path d="M30.135,56.55C15.348,56.626,3.267,44.851,2.884,30.139 c-0.003,0.191-0.013,0.386-0.011,0.583c0.076,14.98,12.283,27.067,27.267,26.994c14.987-0.079,27.074-12.285,26.995-27.27 c-0.001-0.195-0.013-0.389-0.018-0.582C56.883,44.577,44.925,56.476,30.135,56.55z" fill="url(#SVGID_3_)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M30.135,56.55C15.348,56.626,3.267,44.851,2.884,30.139 c-0.003,0.191-0.013,0.386-0.011,0.583c0.076,14.98,12.283,27.067,27.267,26.994c14.987-0.079,27.074-12.285,26.995-27.27 c-0.001-0.195-0.013-0.389-0.018-0.582C56.883,44.577,44.925,56.476,30.135,56.55z" enable-background="new " fill="url(#SVGID_3_)" opacity="0.3"/>
<linearGradient gradientTransform="matrix(1 -0.0051 0.0051 1 335.906 -1118.9601)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-318.1577" x2="-305.3569" y1="1150.27" y2="1150.27">
-<stop offset="0" style="stop-color:#848C8E"/>
-<stop offset="0.5" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#848C8E"/>
+ <stop offset="0" style="stop-color:#848C8E"/>
+ <stop offset="0.5" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#848C8E"/>
</linearGradient>
<path d="M30.032,36.399c3.534-0.019,6.386-2.896,6.368-6.432c-0.002-0.204-0.014-0.403-0.035-0.6 c-0.285,3.254-3.006,6.014-6.338,6.03c-3.333,0.019-6.082-2.715-6.399-5.967c-0.017,0.199-0.029,0.399-0.028,0.601 C23.619,33.566,26.498,36.417,30.032,36.399z" fill="url(#SVGID_4_)"/>
<linearGradient gradientTransform="matrix(1 0 0 1 347 -1116.5)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-317.0005" x2="-317.0005" y1="1119.7017" y2="1173.7001">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</linearGradient>
<path d="M29.861,2.802C14.838,2.878,2.723,15.118,2.8,30.139c0.079,15.021,12.318,27.134,27.34,27.06 c15.022-0.076,27.136-12.314,27.06-27.335C57.122,14.838,44.881,2.725,29.861,2.802z M30.059,41.539 c-6.373,0.032-11.564-5.106-11.596-11.479h-0.004c-0.033-6.375,5.109-11.565,11.481-11.598c6.375-0.033,11.565,5.105,11.597,11.479 h0.002C41.572,36.315,36.43,41.507,30.059,41.539z" fill="url(#SVGID_5_)"/>
-<path d="M4.15,35.341C1.33,21.725,9.627,8.188,23.037,4.521 c2.186-0.598,4.444-0.907,6.708-0.918c11.248-0.056,21.622,7.281,25.237,17.844l0.275,0.806l-13.574,3.709l-0.267-0.655 c-1.885-4.605-6.5-7.685-11.491-7.657c-1.072,0.005-2.142,0.151-3.18,0.435c-6.014,1.646-9.861,7.526-8.959,13.682l0.103,0.702 L4.32,36.177L4.15,35.341z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M4.15,35.341C1.33,21.725,9.627,8.188,23.037,4.521 c2.186-0.598,4.444-0.907,6.708-0.918c11.248-0.056,21.622,7.281,25.237,17.844l0.275,0.806l-13.574,3.709l-0.267-0.655 c-1.885-4.605-6.5-7.685-11.491-7.657c-1.072,0.005-2.142,0.151-3.18,0.435c-6.014,1.646-9.861,7.526-8.959,13.682l0.103,0.702 L4.32,36.177L4.15,35.341z" enable-background="new " fill="#FFFFFF" opacity="0.2"/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
<rect fill="none" height="30" width="30"/>
-<path d="M15,29.999C6.729,29.999,0,23.271,0,15S6.729,0.001,15,0.001c8.271,0,15,6.729,15,14.999 S23.271,29.999,15,29.999L15,29.999z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M15,29.999C6.729,29.999,0,23.271,0,15S6.729,0.001,15,0.001c8.271,0,15,6.729,15,14.999 S23.271,29.999,15,29.999L15,29.999z" opacity="0.35"/>
<linearGradient gradientTransform="matrix(0.5 0 0 0.5 579.9604 -1693.241)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-1129.9209" x2="-1129.9209" y1="3388.3521" y2="3444.3481">
-<stop offset="0" style="stop-color:#D5F5B5"/>
-<stop offset="1" style="stop-color:#40AD00"/>
+ <stop offset="0" style="stop-color:#D5F5B5"/>
+ <stop offset="1" style="stop-color:#40AD00"/>
</linearGradient>
<path d="M15,28.999C7.279,28.999,1,22.72,1,15C1,7.281,7.279,1.001,15,1.001c7.718,0,14,6.28,14,13.999 C29,22.72,22.718,28.999,15,28.999L15,28.999z" fill="url(#SVGID_1__)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 2908.0361)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-2179.0005" x2="-2179.0005" y1="2906.6362" y2="2878.8359">
-<stop offset="0" style="stop-color:#8CFF24"/>
-<stop offset="1" style="stop-color:#15570B"/>
+ <stop offset="0" style="stop-color:#8CFF24"/>
+ <stop offset="1" style="stop-color:#15570B"/>
</linearGradient>
<path d="M28.599,15c0,7.512-6.09,13.6-13.599,13.6C7.486,28.6,1.4,22.512,1.4,15C1.4,7.491,7.486,1.4,15,1.4 C22.509,1.4,28.599,7.491,28.599,15z" fill="url(#SVGID_2__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="16.5117" x2="16.5117" y1="21.3633" y2="7.2163">
-<stop offset="0" style="stop-color:#82DA3B"/>
-<stop offset="1" style="stop-color:#11470A"/>
+ <stop offset="0" style="stop-color:#82DA3B"/>
+ <stop offset="1" style="stop-color:#11470A"/>
</linearGradient>
<polygon fill="url(#SVGID_3__)" points="10.353,7.134 22.671,14.21 10.353,21.429 "/>
<polygon fill="#FFFFFF" points="11.11,8.444 22.008,14.734 11.11,21.026 "/>
</g>
<g>
+<defs>
+</defs>
<polygon fill="none" points="24.728,0 23.608,0.487 0,0.487 0,30.487 30,30.487 30,0.487 24.928,0.487 "/>
-<path d="M7.991,30.324c-3.295,0-5.976-1.69-6.668-4.205c-0.366-1.331-0.159-2.734,0.6-4.06 c1.063-1.86,3.062-3.301,5.478-3.952c0.873-0.235,1.762-0.355,2.639-0.355c0.927,0,1.816,0.133,2.635,0.389V5.247L24.728,0 l1.526,3.717l0.018-0.007l0.389,0.963l0.609,1.563l-10.565,4.318c0.008,2.6,0.003,5.635-0.001,8.204 c-0.003,2.014-0.006,3.74-0.002,4.745c0.016,2.839-2.473,5.497-6.049,6.463C9.771,30.203,8.875,30.324,7.991,30.324L7.991,30.324z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M7.991,30.324c-3.295,0-5.976-1.69-6.668-4.205c-0.366-1.331-0.159-2.734,0.6-4.06 c1.063-1.86,3.062-3.301,5.478-3.952c0.873-0.235,1.762-0.355,2.639-0.355c0.927,0,1.816,0.133,2.635,0.389V5.247L24.728,0 l1.526,3.717l0.018-0.007l0.389,0.963l0.609,1.563l-10.565,4.318c0.008,2.6,0.003,5.635-0.001,8.204 c-0.003,2.014-0.006,3.74-0.002,4.745c0.016,2.839-2.473,5.497-6.049,6.463C9.771,30.203,8.875,30.324,7.991,30.324L7.991,30.324z" opacity="0.35"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 2908.0361)" gradientUnits="userSpaceOnUse" id="SVGID_1___" x1="-2179.9351" x2="-2179.9351" y1="2902.811" y2="2880.1646">
-<stop offset="0" style="stop-color:#8CFF24"/>
-<stop offset="1" style="stop-color:#15570B"/>
+ <stop offset="0" style="stop-color:#8CFF24"/>
+ <stop offset="1" style="stop-color:#15570B"/>
</linearGradient>
<path d="M25.98,5.682l-1.79-4.357L13.902,5.902l0.016,13.899c-1.574-1.029-3.896-1.366-6.257-0.729 c-3.722,1.003-6.127,4.041-5.374,6.78c0.756,2.742,4.383,4.15,8.104,3.146c3.146-0.849,5.324-3.094,5.311-5.493 c-0.01-2.399,0.02-8.913,0-13.625L25.98,5.682z" fill="url(#SVGID_1___)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 0.5 614.8193 -1693.241)" gradientUnits="userSpaceOnUse" id="SVGID_2___" x1="-1201.8184" x2="-1201.8184" y1="3393.1226" y2="3404.4397">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</linearGradient>
<polygon fill="url(#SVGID_2___)" points="13.918,17.409 13.907,5.902 13.902,5.902 13.916,17.408 "/>
<linearGradient gradientTransform="matrix(0.5 0 0 0.5 614.8193 -1693.241)" gradientUnits="userSpaceOnUse" id="SVGID_3___" x1="-1187.957" x2="-1187.957" y1="3393.1177" y2="3404.4392">
-<stop offset="0" style="stop-color:#9EFF47"/>
-<stop offset="1" style="stop-color:#11470A"/>
+ <stop offset="0" style="stop-color:#9EFF47"/>
+ <stop offset="1" style="stop-color:#11470A"/>
</linearGradient>
<path d="M15.701,9.169c0.005,0.759,0.006-0.117,0.008,0.711L25.98,5.682l-0.252-0.646L15.701,9.169z" fill="url(#SVGID_3___)"/>
<linearGradient gradientTransform="matrix(0.5 -0.0026 0.0026 0.5 604.1579 -1699.019)" gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="-1188.0039" x2="-1188.0039" y1="3402.1909" y2="3430.4734">
-<stop offset="0" style="stop-color:#B3FF6E"/>
-<stop offset="1" style="stop-color:#11470A"/>
+ <stop offset="0" style="stop-color:#B3FF6E"/>
+ <stop offset="1" style="stop-color:#11470A"/>
</linearGradient>
<polygon fill="url(#SVGID_4__)" points="14.072,20.2 14.072,6.3 24.389,1.807 24.19,1.324 13.674,5.902 13.674,19.803 "/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 2908.0361)" gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="-2185.0737" x2="-2185.0737" y1="2887.9233" y2="2879.6807">
-<stop offset="0" style="stop-color:#B2F56E"/>
-<stop offset="0.4667" style="stop-color:#40AD00"/>
-<stop offset="1" style="stop-color:#074D00"/>
+ <stop offset="0" style="stop-color:#B2F56E"/>
+ <stop offset="0.4667" style="stop-color:#40AD00"/>
+ <stop offset="1" style="stop-color:#074D00"/>
</linearGradient>
<path d="M7.96,28.527c-2.474,0.012-4.447-1.129-4.909-2.839c-0.28-1.039,0.018-2.187,0.84-3.229 c0.9-1.141,2.291-2.007,3.923-2.436c0.688-0.184,1.385-0.277,2.075-0.281c2.474-0.013,4.445,1.129,4.91,2.84 c0.615,2.267-1.522,4.807-4.764,5.664C9.347,28.43,8.647,28.522,7.96,28.527L7.96,28.527z" fill="url(#SVGID_5__)"/>
<rect fill="none" height="30" width="30" y="0.487"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music_shop.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_music_shop.svg Fri May 14 16:09:54 2010 +0300
@@ -1,130 +1,132 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<stop offset="0" style="stop-color:#BFBFBF"/>
-<stop offset="0.7818" style="stop-color:#404040"/>
-<stop offset="1" style="stop-color:#666666"/>
+ <stop offset="0" style="stop-color:#BFBFBF"/>
+ <stop offset="0.7818" style="stop-color:#404040"/>
+ <stop offset="1" style="stop-color:#666666"/>
</linearGradient>
<path d="M4.221,11.382c-1.826,0-3.313-1.486-3.313-3.312c0-1.824,1.486-3.311,3.313-3.311 c1.824,0,3.311,1.486,3.311,3.311C7.531,9.896,6.045,11.382,4.221,11.382L4.221,11.382z" fill="url(#SVGID_1_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="4.2207" x2="4.2207" y1="5.5142" y2="10.6549">
-<stop offset="0" style="stop-color:#7A7A7A"/>
-<stop offset="0.7818" style="stop-color:#212121"/>
-<stop offset="1" style="stop-color:#3A3A3A"/>
+ <stop offset="0" style="stop-color:#7A7A7A"/>
+ <stop offset="0.7818" style="stop-color:#212121"/>
+ <stop offset="1" style="stop-color:#3A3A3A"/>
</linearGradient>
<circle cx="4.221" cy="8.071" fill="url(#SVGID_2_)" r="2.521"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="13.501" x2="56.4315" y1="47.3521" y2="47.3521">
-<stop offset="0" style="stop-color:#878A8C"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#757D80"/>
-<stop offset="1" style="stop-color:#959A9C"/>
+ <stop offset="0" style="stop-color:#878A8C"/>
+ <stop offset="0.2606" style="stop-color:#BDC2C4"/>
+ <stop offset="0.6606" style="stop-color:#757D80"/>
+ <stop offset="1" style="stop-color:#959A9C"/>
</linearGradient>
<path d="M55.23,45.774h-37.9l-4.018,1.579l0,0c0,0.298,0.074,0.595,0.242,0.854 c0.291,0.45,0.789,0.722,1.326,0.722h40.35c0.869,0,1.576-0.706,1.576-1.576C56.807,46.481,56.1,45.774,55.23,45.774z" fill="url(#SVGID_3_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="15.3105" x2="19.0975" y1="41.4453" y2="43.2125">
-<stop offset="0" style="stop-color:#878A8C"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#757D80"/>
-<stop offset="1" style="stop-color:#959A9C"/>
+ <stop offset="0" style="stop-color:#878A8C"/>
+ <stop offset="0.2606" style="stop-color:#BDC2C4"/>
+ <stop offset="0.6606" style="stop-color:#757D80"/>
+ <stop offset="1" style="stop-color:#959A9C"/>
</linearGradient>
<path d="M13.313,47.354l4.018-1.579l3.189-7.016c0.359-0.792,0.012-1.729-0.783-2.088 c-0.795-0.361-1.73-0.01-2.088,0.784l-4.203,9.247C13.348,46.908,13.313,47.13,13.313,47.354L13.313,47.354z" fill="url(#SVGID_4_)"/>
-<path d="M19.371,36.56c-0.695-0.131-1.418,0.219-1.723,0.894l-1.156,2.541c0.662,1.489,1.262,2.443,1.791,2.813 c0.1,0.073,0.205,0.126,0.307,0.191l1.805-3.968C20.123,38.458,19.764,37.605,19.371,36.56z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M18.551,36.624c-0.387,0.137-0.721,0.425-0.902,0.83l-0.713,1.565c0.582,1.418,1.25,2.756,1.816,3.156 c0.055,0.039,0.115,0.065,0.168,0.104l1.057-2.325C19.652,39.363,19.115,38.151,18.551,36.624z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M13.555,48.207c0.291,0.45,0.789,0.722,1.326,0.722h40.35c0.869,0,1.576-0.706,1.576-1.576H13.313 C13.313,47.651,13.387,47.948,13.555,48.207z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M18.494,48.929h10.578c-0.4-1.333-1.291-2.452-2.459-3.155h-5.66C19.785,46.478,18.891,47.596,18.494,48.929z " fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M19.371,36.56c-0.695-0.131-1.418,0.219-1.723,0.894l-1.156,2.541c0.662,1.489,1.262,2.443,1.791,2.813 c0.1,0.073,0.205,0.126,0.307,0.191l1.805-3.968C20.123,38.458,19.764,37.605,19.371,36.56z" opacity="0.1"/>
+<path d="M18.551,36.624c-0.387,0.137-0.721,0.425-0.902,0.83l-0.713,1.565c0.582,1.418,1.25,2.756,1.816,3.156 c0.055,0.039,0.115,0.065,0.168,0.104l1.057-2.325C19.652,39.363,19.115,38.151,18.551,36.624z" opacity="0.2"/>
+<path d="M13.555,48.207c0.291,0.45,0.789,0.722,1.326,0.722h40.35c0.869,0,1.576-0.706,1.576-1.576H13.313 C13.313,47.651,13.387,47.948,13.555,48.207z" opacity="0.2"/>
+<path d="M18.494,48.929h10.578c-0.4-1.333-1.291-2.452-2.459-3.155h-5.66C19.785,46.478,18.891,47.596,18.494,48.929z " opacity="0.2"/>
<radialGradient cx="23.3809" cy="44.9189" gradientUnits="userSpaceOnUse" id="SVGID_5_" r="10.6545">
-<stop offset="0" style="stop-color:#7A7A7A"/>
-<stop offset="0.7818" style="stop-color:#212121"/>
-<stop offset="1" style="stop-color:#353535"/>
+ <stop offset="0" style="stop-color:#7A7A7A"/>
+ <stop offset="0.7818" style="stop-color:#212121"/>
+ <stop offset="1" style="stop-color:#353535"/>
</radialGradient>
<path d="M23.785,55.24c-2.613,0-4.734-2.124-4.734-4.733c0-2.609,2.121-4.732,4.734-4.732 c2.607,0,4.73,2.123,4.73,4.732C28.516,53.116,26.393,55.24,23.785,55.24L23.785,55.24z" fill="url(#SVGID_5_)"/>
<radialGradient cx="23.4492" cy="45.8501" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="8.8793">
-<stop offset="0" style="stop-color:#7A7A7A"/>
-<stop offset="0.7818" style="stop-color:#212121"/>
-<stop offset="1" style="stop-color:#353535"/>
+ <stop offset="0" style="stop-color:#7A7A7A"/>
+ <stop offset="0.7818" style="stop-color:#212121"/>
+ <stop offset="1" style="stop-color:#353535"/>
</radialGradient>
<path d="M27.729,50.506c0,2.179-1.766,3.945-3.943,3.945c-2.182,0-3.945-1.766-3.945-3.945 c0-2.178,1.764-3.943,3.945-3.943C25.963,46.563,27.729,48.328,27.729,50.506z" fill="url(#SVGID_6_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="6.3311" x2="6.3311" y1="6.4199" y2="10.0271">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.4606" style="stop-color:#BDC2C4"/>
-<stop offset="0.7333" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+ <stop offset="0.0667" style="stop-color:#D1D7D9"/>
+ <stop offset="0.4606" style="stop-color:#BDC2C4"/>
+ <stop offset="0.7333" style="stop-color:#949DA1"/>
+ <stop offset="0.9636" style="stop-color:#ADB3B5"/>
+ <stop offset="1" style="stop-color:#595C5E"/>
</linearGradient>
<path d="M8.424,6.39H5.061c-0.928,0-1.682,0.753-1.682,1.681s0.754,1.681,1.682,1.681h2.061l2.162-2.994 C9.049,6.547,8.768,6.39,8.424,6.39z" fill="url(#SVGID_7_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="23.7832" x2="23.7832" y1="48.2568" y2="52.9256">
-<stop offset="0" style="stop-color:#E6E9E8"/>
-<stop offset="1" style="stop-color:#ADB2B5"/>
+ <stop offset="0" style="stop-color:#E6E9E8"/>
+ <stop offset="1" style="stop-color:#ADB2B5"/>
</linearGradient>
<path d="M23.785,52.873c-1.307,0-2.367-1.063-2.367-2.367c0-1.305,1.061-2.366,2.367-2.366 c1.303,0,2.363,1.061,2.363,2.366C26.148,51.811,25.088,52.873,23.785,52.873L23.785,52.873z" fill="url(#SVGID_8_)"/>
-<path d="M41.369,48.929h10.576c-0.4-1.333-1.289-2.452-2.459-3.155h-5.66C42.658,46.478,41.766,47.596,41.369,48.929z " fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M41.369,48.929h10.576c-0.4-1.333-1.289-2.452-2.459-3.155h-5.66C42.658,46.478,41.766,47.596,41.369,48.929z " opacity="0.1"/>
<radialGradient cx="46.5889" cy="44.9189" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="10.8384">
-<stop offset="0" style="stop-color:#7A7A7A"/>
-<stop offset="0.7818" style="stop-color:#212121"/>
-<stop offset="1" style="stop-color:#353535"/>
+ <stop offset="0" style="stop-color:#7A7A7A"/>
+ <stop offset="0.7818" style="stop-color:#212121"/>
+ <stop offset="1" style="stop-color:#353535"/>
</radialGradient>
<path d="M46.656,55.24c-2.611,0-4.732-2.124-4.732-4.733c0-2.609,2.121-4.732,4.732-4.732 c2.609,0,4.732,2.123,4.732,4.732C51.389,53.116,49.266,55.24,46.656,55.24L46.656,55.24z" fill="url(#SVGID_9_)"/>
<radialGradient cx="46.6006" cy="45.8501" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="9.0328">
-<stop offset="0" style="stop-color:#7A7A7A"/>
-<stop offset="0.7818" style="stop-color:#212121"/>
-<stop offset="1" style="stop-color:#353535"/>
+ <stop offset="0" style="stop-color:#7A7A7A"/>
+ <stop offset="0.7818" style="stop-color:#212121"/>
+ <stop offset="1" style="stop-color:#353535"/>
</radialGradient>
<circle cx="46.657" cy="50.506" fill="url(#SVGID_10_)" r="3.944"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="46.6563" x2="46.6563" y1="48.1914" y2="52.8588">
-<stop offset="0" style="stop-color:#E6E9E8"/>
-<stop offset="1" style="stop-color:#ADB2B5"/>
+ <stop offset="0" style="stop-color:#E6E9E8"/>
+ <stop offset="1" style="stop-color:#ADB2B5"/>
</linearGradient>
<path d="M46.656,52.873c-1.305,0-2.365-1.063-2.365-2.367c0-1.305,1.061-2.366,2.365-2.366 s2.365,1.061,2.365,2.366C49.021,51.811,47.961,52.873,46.656,52.873L46.656,52.873z" fill="url(#SVGID_11_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="30.1436" x2="30.1436" y1="10.1616" y2="42.5465">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.4606" style="stop-color:#BDC2C4"/>
-<stop offset="0.7333" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+ <stop offset="0.0667" style="stop-color:#D1D7D9"/>
+ <stop offset="0.4606" style="stop-color:#BDC2C4"/>
+ <stop offset="0.7333" style="stop-color:#949DA1"/>
+ <stop offset="0.9636" style="stop-color:#ADB3B5"/>
+ <stop offset="1" style="stop-color:#595C5E"/>
</linearGradient>
<path d="M12.004,13.339L10.1,8.109c0-0.012-0.514-1.72-1.676-1.72H5.061c-0.928,0-1.682,0.753-1.682,1.681 s0.754,1.681,1.682,1.681h2.061l9.359,25.72c0,0,1.762,5.382,2.742,6.068c0.84,0.622,1.873,0.995,3,0.995h28.58 c2.785,0,5.043-2.258,5.043-5.043l1.063-21.015L12.004,13.339z M22.832,38.593c-0.563,0.179-1.16-0.135-1.338-0.693L15.67,19.448 c-0.178-0.56,0.133-1.157,0.693-1.335c0.561-0.177,1.158,0.133,1.336,0.694l5.826,18.453C23.701,37.818,23.393,38.417,22.832,38.593 z M28.547,38.774c-0.563,0.178-1.158-0.133-1.338-0.694l-5.826-18.451c-0.176-0.561,0.137-1.157,0.695-1.334 c0.563-0.176,1.16,0.131,1.336,0.694l5.828,18.452C29.416,38,29.105,38.597,28.547,38.774z M34.361,38.959 c-0.563,0.178-1.158-0.133-1.338-0.694l-5.826-18.451c-0.176-0.56,0.137-1.158,0.697-1.336s1.158,0.133,1.332,0.695l5.83,18.451 C35.23,38.184,34.92,38.781,34.361,38.959z M39.584,39.125c-0.563,0.178-1.16-0.133-1.338-0.695l-5.824-18.451 c-0.176-0.56,0.131-1.157,0.695-1.335c0.561-0.178,1.158,0.133,1.334,0.693l5.824,18.453C40.453,38.352,40.146,38.95,39.584,39.125z M45.299,39.308c-0.563,0.177-1.158-0.135-1.336-0.695l-5.826-18.452c-0.176-0.56,0.135-1.157,0.695-1.334 c0.561-0.177,1.158,0.133,1.336,0.694l5.826,18.453C46.17,38.533,45.857,39.13,45.299,39.308z M50.918,39.493 c-0.563,0.178-1.16-0.136-1.338-0.695l-5.824-18.451c-0.178-0.56,0.131-1.157,0.691-1.335c0.563-0.177,1.158,0.133,1.338,0.694 l5.826,18.453C51.785,38.716,51.475,39.314,50.918,39.493z M52.553,28.654c-0.561,0.177-1.16-0.134-1.336-0.695l-2.336-7.35 c-0.178-0.56,0.133-1.158,0.695-1.335c0.561-0.177,1.158,0.135,1.334,0.694l2.336,7.351C53.424,27.879,53.111,28.476,52.553,28.654z " fill="url(#SVGID_12_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="30.1436" x2="30.1436" y1="10.1616" y2="42.5465">
-<stop offset="0" style="stop-color:#ECF3F5"/>
-<stop offset="0.4606" style="stop-color:#D3D9DB"/>
-<stop offset="0.7333" style="stop-color:#ABB5BA"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+ <stop offset="0" style="stop-color:#ECF3F5"/>
+ <stop offset="0.4606" style="stop-color:#D3D9DB"/>
+ <stop offset="0.7333" style="stop-color:#ABB5BA"/>
+ <stop offset="0.9636" style="stop-color:#ADB3B5"/>
+ <stop offset="1" style="stop-color:#595C5E"/>
</linearGradient>
<path d="M12.004,13.339L10.1,8.109c0-0.012-0.514-1.72-1.676-1.72H5.061c-0.928,0-1.682,0.753-1.682,1.681 s0.754,1.681,1.682,1.681h2.061l9.359,25.72c0,0,1.762,5.382,2.742,6.068c0.84,0.622,1.873,0.995,3,0.995h28.58 c2.785,0,5.043-2.258,5.043-5.043l0.023-0.497c0.008-0.107,0.01-0.208,0.018-0.291l0.043-0.884l0.268-5.254v-0.002l0.025-0.516 l0.686-13.571L12.004,13.339z M55.057,37.452c0,2.386-1.91,4.295-4.254,4.295h-28.58c-0.914,0-1.789-0.291-2.529-0.839 c-0.492-0.394-1.668-3.25-2.461-5.68L7.672,8.963H5.061c-0.492,0-0.893-0.401-0.893-0.893s0.4-0.892,0.893-0.892h3.363 c0.393,0,0.756,0.696,0.885,1.044v0.015l2.129,5.854l44.645,3.118L55.057,37.452z" fill="url(#SVGID_13_)"/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<polygon fill="none" points="24.728,0 23.608,0.487 0,0.487 0,30.487 30,30.487 30,0.487 24.928,0.487 "/>
-<path d="M7.991,30.324c-3.295,0-5.976-1.69-6.668-4.205c-0.366-1.331-0.159-2.734,0.6-4.06 c1.063-1.86,3.062-3.301,5.478-3.952c0.873-0.235,1.762-0.355,2.639-0.355c0.927,0,1.816,0.133,2.635,0.389V5.247L24.728,0 l1.526,3.717l0.018-0.007l0.389,0.963l0.609,1.563l-10.565,4.318c0.008,2.6,0.003,5.635-0.001,8.204 c-0.003,2.014-0.006,3.74-0.002,4.745c0.016,2.839-2.473,5.497-6.049,6.463C9.771,30.203,8.875,30.324,7.991,30.324L7.991,30.324z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M7.991,30.324c-3.295,0-5.976-1.69-6.668-4.205c-0.366-1.331-0.159-2.734,0.6-4.06 c1.063-1.86,3.062-3.301,5.478-3.952c0.873-0.235,1.762-0.355,2.639-0.355c0.927,0,1.816,0.133,2.635,0.389V5.247L24.728,0 l1.526,3.717l0.018-0.007l0.389,0.963l0.609,1.563l-10.565,4.318c0.008,2.6,0.003,5.635-0.001,8.204 c-0.003,2.014-0.006,3.74-0.002,4.745c0.016,2.839-2.473,5.497-6.049,6.463C9.771,30.203,8.875,30.324,7.991,30.324L7.991,30.324z" opacity="0.35"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 2908.0361)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-2179.9351" x2="-2179.9351" y1="2902.811" y2="2880.1646">
-<stop offset="0" style="stop-color:#8CFF24"/>
-<stop offset="1" style="stop-color:#15570B"/>
+ <stop offset="0" style="stop-color:#8CFF24"/>
+ <stop offset="1" style="stop-color:#15570B"/>
</linearGradient>
<path d="M25.98,5.682l-1.79-4.357L13.902,5.902l0.016,13.899c-1.574-1.029-3.896-1.366-6.257-0.729 c-3.722,1.003-6.127,4.041-5.374,6.78c0.756,2.742,4.383,4.15,8.104,3.146c3.146-0.849,5.324-3.094,5.311-5.493 c-0.01-2.399,0.02-8.913,0-13.625L25.98,5.682z" fill="url(#SVGID_1__)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 0.5 614.8193 -1693.241)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-1201.8184" x2="-1201.8184" y1="3393.1226" y2="3404.4397">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</linearGradient>
<polygon fill="url(#SVGID_2__)" points="13.918,17.409 13.907,5.902 13.902,5.902 13.916,17.408 "/>
<linearGradient gradientTransform="matrix(0.5 0 0 0.5 614.8193 -1693.241)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="-1187.957" x2="-1187.957" y1="3393.1177" y2="3404.4392">
-<stop offset="0" style="stop-color:#9EFF47"/>
-<stop offset="1" style="stop-color:#11470A"/>
+ <stop offset="0" style="stop-color:#9EFF47"/>
+ <stop offset="1" style="stop-color:#11470A"/>
</linearGradient>
<path d="M15.701,9.169c0.005,0.759,0.006-0.117,0.008,0.711L25.98,5.682l-0.252-0.646L15.701,9.169z" fill="url(#SVGID_3__)"/>
<linearGradient gradientTransform="matrix(0.5 -0.0026 0.0026 0.5 604.1579 -1699.019)" gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="-1188.0039" x2="-1188.0039" y1="3402.1909" y2="3430.4734">
-<stop offset="0" style="stop-color:#B3FF6E"/>
-<stop offset="1" style="stop-color:#11470A"/>
+ <stop offset="0" style="stop-color:#B3FF6E"/>
+ <stop offset="1" style="stop-color:#11470A"/>
</linearGradient>
<polygon fill="url(#SVGID_4__)" points="14.072,20.2 14.072,6.3 24.389,1.807 24.19,1.324 13.674,5.902 13.674,19.803 "/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 2908.0361)" gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="-2185.0737" x2="-2185.0737" y1="2887.9233" y2="2879.6807">
-<stop offset="0" style="stop-color:#B2F56E"/>
-<stop offset="0.4667" style="stop-color:#40AD00"/>
-<stop offset="1" style="stop-color:#074D00"/>
+ <stop offset="0" style="stop-color:#B2F56E"/>
+ <stop offset="0.4667" style="stop-color:#40AD00"/>
+ <stop offset="1" style="stop-color:#074D00"/>
</linearGradient>
<path d="M7.96,28.527c-2.474,0.012-4.447-1.129-4.909-2.839c-0.28-1.039,0.018-2.187,0.84-3.229 c0.9-1.141,2.291-2.007,3.923-2.436c0.688-0.184,1.385-0.277,2.075-0.281c2.474-0.013,4.445,1.129,4.91,2.84 c0.615,2.267-1.522,4.807-4.764,5.664C9.347,28.43,8.647,28.522,7.96,28.527L7.96,28.527z" fill="url(#SVGID_5__)"/>
<rect fill="none" height="30" width="30" y="0.487"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mycard.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_mycard.svg Fri May 14 16:09:54 2010 +0300
@@ -1,42 +1,44 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="8.8086" y2="50.5088">
-<stop offset="0" style="stop-color:#E3E3E3"/>
-<stop offset="1" style="stop-color:#9B9B9B"/>
+ <stop offset="0" style="stop-color:#E3E3E3"/>
+ <stop offset="1" style="stop-color:#9B9B9B"/>
</linearGradient>
<path d="M4.871,50.82C3.289,50.82,2,49.533,2,47.948V12.052C2,10.467,3.289,9.18,4.871,9.18h50.258 c1.584,0,2.871,1.287,2.871,2.872v35.896c0,1.585-1.287,2.872-2.871,2.872H4.871z" fill="url(#SVGID_1_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30.001" x2="30.001" y1="9.5391" y2="49.8016">
-<stop offset="0" style="stop-color:#F5F5F5"/>
-<stop offset="0.7818" style="stop-color:#CCCCCC"/>
-<stop offset="1" style="stop-color:#D1D1D1"/>
+ <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="M57.283,47.948c0,1.189-0.965,2.154-2.154,2.154H4.871c-1.188,0-2.152-0.965-2.152-2.154V12.052 c0-1.189,0.965-2.154,2.152-2.154h50.258c1.189,0,2.154,0.965,2.154,2.154V47.948z" fill="url(#SVGID_2_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="10.54" y2="49.3096">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#DEDEDE"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#DEDEDE"/>
</linearGradient>
<path d="M55.129,11.334c0.396,0,0.719,0.321,0.719,0.718v35.896c0,0.396-0.322,0.718-0.719,0.718H4.871 c-0.395,0-0.717-0.321-0.717-0.718V12.052c0-0.396,0.322-0.718,0.717-0.718H55.129 M55.129,10.615H4.871 c-0.791,0-1.436,0.644-1.436,1.437v35.896c0,0.792,0.645,1.437,1.436,1.437h50.258c0.791,0,1.436-0.645,1.436-1.437V12.052 C56.564,11.259,55.92,10.615,55.129,10.615L55.129,10.615z" fill="url(#SVGID_3_)"/>
-<rect fill="#020202" fill-opacity="0.1" height="23.692" stroke-opacity="0.1" width="21.539" x="7.744" y="19.04"/>
+<rect fill="#020202" height="23.692" opacity="0.1" width="21.539" x="7.744" y="19.04"/>
<rect fill="#FFFFFF" height="23.691" width="21.539" x="7.744" y="17.604"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="18.5137" x2="18.5137" y1="40.6636" y2="18.4058">
-<stop offset="0" style="stop-color:#3FA8F4"/>
-<stop offset="1" style="stop-color:#8DC8E1"/>
+ <stop offset="0" style="stop-color:#3FA8F4"/>
+ <stop offset="1" style="stop-color:#8DC8E1"/>
</linearGradient>
<rect fill="url(#SVGID_4_)" height="22.258" width="20.102" x="8.463" y="18.321"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="9.8984" x2="25.6941" y1="29.7617" y2="29.7617">
-<stop offset="0" style="stop-color:#146BAF"/>
-<stop offset="1" style="stop-color:#013B77"/>
+ <stop offset="0" style="stop-color:#146BAF"/>
+ <stop offset="1" style="stop-color:#013B77"/>
</linearGradient>
<path d="M24.939,34.517c-0.469-0.243-2.283-0.901-3.256-1.267l-0.041-0.016h-0.002 c-0.01-0.004-0.018-0.007-0.027-0.011l-0.549-0.222c-0.389-0.44-0.346-1.455-0.129-1.794c0.045-0.067,0.084-0.136,0.127-0.205 h-0.008c0.314-0.512,0.582-1.021,0.797-1.498c0.389,0.135,0.889-0.228,1.137-0.839c0.258-0.635,0.146-1.292-0.25-1.47 c-0.021-0.01-0.045-0.011-0.066-0.018c0-0.002,0-0.002,0-0.002c0.051-0.199,0.072-0.318,0.072-0.318 c0.682-3.054-0.801-5.475-4.391-5.595c-1.473,0-2.182,0.672-2.73,1.373c-0.893,0.138-2.303,0.952-1.307,4.526 c-0.037,0.007-0.076,0.013-0.111,0.027c-0.4,0.169-0.523,0.82-0.279,1.458c0.244,0.636,0.764,1.019,1.162,0.85 c0.023-0.011,0.045-0.028,0.066-0.042c0.219,0.491,0.49,1.018,0.813,1.547h-0.002c0.014,0.025,0.029,0.05,0.045,0.073 c0.002,0.005,0.004,0.01,0.008,0.013v0.003c0.025,0.038,0.049,0.077,0.072,0.116c0.207,0.324,0.252,1.255-0.08,1.723l-0.572,0.249 c-0.961,0.376-2.814,1.052-3.35,1.337c-0.832,0.442-2.189,1.455-2.189,3.743h17.23C27.129,35.972,25.578,34.85,24.939,34.517z M22.619,27.168c-0.021-0.006-0.041-0.012-0.063-0.013c-0.029-0.005-0.055-0.012-0.084-0.017c-0.006-0.002-0.006-0.002-0.012-0.003 C22.514,27.146,22.566,27.156,22.619,27.168z M14.322,27.162c0.006-0.006,0.018-0.016,0.023-0.022 c0.002,0.006,0.002,0.01,0.006,0.016C14.34,27.156,14.332,27.161,14.322,27.162z" fill="url(#SVGID_5_)"/>
-<rect fill="#020202" fill-opacity="0.2" height="0.718" stroke-opacity="0.2" width="18.668" x="33.59" y="21.912"/>
-<rect fill="#020202" fill-opacity="0.5" height="1.256" stroke-opacity="0.5" width="18.668" x="33.59" y="22.63"/>
-<rect fill="#020202" fill-opacity="0.2" height="0.718" stroke-opacity="0.2" width="18.668" x="33.59" y="28.374"/>
-<rect fill="#020202" fill-opacity="0.5" height="1.256" stroke-opacity="0.5" width="18.668" x="33.59" y="29.092"/>
-<rect fill="#020202" fill-opacity="0.2" height="0.718" stroke-opacity="0.2" width="18.668" x="33.59" y="34.835"/>
-<rect fill="#020202" fill-opacity="0.5" height="1.257" stroke-opacity="0.5" width="18.668" x="33.59" y="35.553"/>
+<rect fill="#020202" height="0.718" opacity="0.2" width="18.668" x="33.59" y="21.912"/>
+<rect fill="#020202" height="1.256" opacity="0.5" width="18.668" x="33.59" y="22.63"/>
+<rect fill="#020202" height="0.718" opacity="0.2" width="18.668" x="33.59" y="28.374"/>
+<rect fill="#020202" height="1.256" opacity="0.5" width="18.668" x="33.59" y="29.092"/>
+<rect fill="#020202" height="0.718" opacity="0.2" width="18.668" x="33.59" y="34.835"/>
+<rect fill="#020202" height="1.257" opacity="0.5" width="18.668" x="33.59" y="35.553"/>
<rect fill="none" height="60" width="60"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_network.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_network.svg Fri May 14 16:09:54 2010 +0300
@@ -1,27 +1,48 @@
-<?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">
-<rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30.05" x2="30.05" y1="8.571" y2="30.74">
-<stop offset="0" stop-color="#CCCCCC"/>
-<stop offset="1" stop-color="#919191"/>
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
+<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"/>
+ <stop offset="0.0788" style="stop-color:#A8B1B3"/>
+ <stop offset="0.3152" style="stop-color:#FFFFFF"/>
+ <stop offset="0.7333" style="stop-color:#989C9E"/>
+ <stop offset="1" style="stop-color:#C6CBCC"/>
+</linearGradient>
+<path d="M26.472,10.75v42.014c0,0.766,0.626,1.387,1.399,1.387h4.201c0.773,0,1.4-0.621,1.4-1.387V10.75 H26.472z" fill="url(#SVGID_1_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="29.9995" x2="29.9995" y1="5.6274" y2="33.0842">
+ <stop offset="0" style="stop-color:#A6A8AB"/>
+ <stop offset="1" style="stop-color:#231F20"/>
</linearGradient>
-<path d="M48.37,8.571h-36.74v0.043l-3.131,3.131,19.04,19.04,2.507-2.507,2.507,2.507,19.05-19.04-3.174-3.174m-30.64,6.124h24.51l-12.25,12.26-12.26-12.26z" fill="url(#SVGID_1_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30.05" x2="30.05" y1="9.394" y2="29.55">
-<stop offset="0" stop-color="#DBDBDB"/>
-<stop offset="0.3152" stop-color="#DBDBDB"/>
-<stop offset="0.6848" stop-color="#B3B3B3"/>
-<stop offset="1" stop-color="#B8B8B8"/>
+<path d="M57.893,7.582c-0.316-1.029-1.268-1.732-2.346-1.732H30.322h-0.35H4.453 c-1.078,0-2.029,0.703-2.345,1.732c-0.316,1.029,0.078,2.145,0.971,2.747l23.394,22.586v-9.161L12.455,10.75h17.518h0.35h17.223 L33.473,23.975v9.074l23.449-22.72C57.814,9.727,58.207,8.611,57.893,7.582z" fill="url(#SVGID_2_)"/>
+<path d="M2.108,8.384C2.423,7.354,3.375,6.55,4.453,6.55h25.52h0.35h25.225 c1.078,0,2.029,0.804,2.346,1.834c0.033,0.106,0.053,0.214,0.07,0.322c0.063-0.368,0.043-0.751-0.07-1.124 c-0.316-1.029-1.268-1.732-2.346-1.732H30.322h-0.35H4.453c-1.078,0-2.029,0.703-2.345,1.732C1.993,7.955,1.975,8.338,2.037,8.706 C2.054,8.598,2.075,8.49,2.108,8.384z" fill="#FFFFFF" opacity="0.6"/>
+<polygon fill="#FFFFFF" opacity="0.6" points="34.184,24.717 48.693,10.742 47.58,10.742 34.184,23.428 "/>
+<polygon fill="#FFFFFF" opacity="0.6" points="11.317,10.753 25.783,24.498 25.783,23.216 12.451,10.753 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="29.9995" x2="29.9995" y1="6.481" y2="32.1174">
+ <stop offset="0" style="stop-color:#EBECF0"/>
+ <stop offset="0.5" style="stop-color:#BBBCBF"/>
+ <stop offset="0.5" style="stop-color:#A4A5A8"/>
+ <stop offset="1" style="stop-color:#C8CACC"/>
+</linearGradient>
+<path d="M34.172,24.738L49.715,10.05H10.251l15.521,14.472v7.094L3.479,9.755 C2.829,9.315,2.55,8.527,2.777,7.787s0.9-1.237,1.676-1.237h51.094c0.775,0,1.449,0.497,1.676,1.237s-0.053,1.528-0.693,1.962 L34.172,31.855V24.738z" fill="url(#SVGID_3_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="45.7363" x2="45.7363" y1="7.9927" y2="30.6518">
+ <stop offset="0" style="stop-color:#68696B"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
-<polygon fill="url(#SVGID_2_)" points="9.555,11.61,11.77,9.394,48.34,9.394,50.56,11.61,32.61,29.55,30.82,27.76,44.99,13.59,15.12,13.59,29.29,27.76,27.5,29.55"/>
-<polygon fill="#FFFFFF" fill-opacity="0.5" points="45.01,13.57,30.82,27.76,31.32,28.27,46.02,13.57" stroke-opacity="0.5"/>
-<polygon fill="#FFFFFF" fill-opacity="0.8" points="11.77,10.41,48.34,10.41,50.05,12.11,50.56,11.61,48.34,9.394,11.77,9.394,9.555,11.61,10.06,12.11" stroke-opacity="0.8"/>
-<polygon fill="#FFFFFF" fill-opacity="0.5" points="14.14,13.62,28.79,28.27,29.29,27.76,15.15,13.62" stroke-opacity="0.5"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="26.94" x2="33.06" y1="32.21" y2="32.21">
-<stop offset="0" stop-color="#B8B8B8"/>
-<stop offset="0.3697" stop-color="#E6E6E6"/>
-<stop offset="0.7212" stop-color="#919191"/>
-<stop offset="1" stop-color="#E6E6E6"/>
+<path d="M57.148,7.602c-0.129,0.295-0.336,0.557-0.619,0.748L34.172,30.455v1.4L56.529,9.749 c0.641-0.434,0.92-1.222,0.693-1.962C57.203,7.723,57.176,7.662,57.148,7.602z" fill="url(#SVGID_4_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="14.2354" x2="14.2354" y1="7.9922" y2="30.666">
+ <stop offset="0" style="stop-color:#68696B"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
-<path d="M33.06,50.2c0,0.677-0.547,1.225-1.224,1.225h-3.674c-0.676,0-1.224-0.548-1.224-1.225v-35.98c0-0.676,0.548-1.225,1.224-1.225h3.674c0.677,0,1.224,0.548,1.224,1.225v35.98z" fill="url(#SVGID_3_)"/>
-</svg>
+<path d="M2.851,7.6C2.825,7.662,2.797,7.723,2.777,7.787C2.55,8.527,2.829,9.315,3.479,9.755l22.293,21.86 v-1.4L3.479,8.354C3.191,8.16,2.982,7.896,2.851,7.6z" fill="url(#SVGID_5_)"/>
+<path d="M2.777,8.487c0.227-0.74,0.9-1.237,1.676-1.237h51.094c0.775,0,1.449,0.497,1.676,1.237 c0.018,0.058,0.027,0.116,0.037,0.174c0.061-0.283,0.053-0.582-0.037-0.874c-0.227-0.74-0.9-1.237-1.676-1.237H4.453 c-0.775,0-1.449,0.497-1.676,1.237c-0.09,0.291-0.098,0.59-0.038,0.873C2.75,8.603,2.759,8.545,2.777,8.487z" fill="#FFFFFF"/>
+<path d="M32.072,53.45h-4.201c-0.772,0-1.399-0.621-1.399-1.387v0.7c0,0.766,0.626,1.387,1.399,1.387h4.201 c0.773,0,1.4-0.621,1.4-1.387v-0.7C33.473,52.829,32.846,53.45,32.072,53.45z" opacity="0.4"/>
+<path d="M32.072,52.736h-4.201c-0.772,0-1.399-0.621-1.399-1.387v0.7c0,0.766,0.626,1.387,1.399,1.387h4.201 c0.773,0,1.4-0.621,1.4-1.387v-0.7C33.473,52.115,32.846,52.736,32.072,52.736z" opacity="0.2"/>
+<rect height="0.7" opacity="0.3" width="7" x="26.472" y="10.75"/>
+<rect height="0.7" opacity="0.2" width="7" x="26.472" y="11.45"/>
+<rect height="2.8" opacity="0.1" width="7" x="26.472" y="10.75"/>
+<rect fill="none" height="60" width="60"/>
+</g>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_network_off.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_network_off.svg Fri May 14 16:09:54 2010 +0300
@@ -1,40 +1,61 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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.05" x2="30.05" y1="8.571" y2="30.74">
-<stop offset="0" stop-color="#CCCCCC"/>
-<stop offset="1" stop-color="#919191"/>
+<defs>
+</defs>
+<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"/>
+ <stop offset="0.0788" style="stop-color:#A8B1B3"/>
+ <stop offset="0.3152" style="stop-color:#FFFFFF"/>
+ <stop offset="0.7333" style="stop-color:#989C9E"/>
+ <stop offset="1" style="stop-color:#C6CBCC"/>
+</linearGradient>
+<path d="M26.472,10.75v42.014c0,0.766,0.626,1.387,1.399,1.387h4.201c0.773,0,1.4-0.621,1.4-1.387V10.75 H26.472z" fill="url(#SVGID_1_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="29.9995" x2="29.9995" y1="5.6274" y2="33.0842">
+ <stop offset="0" style="stop-color:#A6A8AB"/>
+ <stop offset="1" style="stop-color:#231F20"/>
</linearGradient>
-<path d="M48.37,8.571h-36.74v0.043l-3.131,3.131,19.04,19.04,2.507-2.507,2.507,2.507,19.05-19.04-3.174-3.174m-30.64,6.124h24.51l-12.25,12.26-12.26-12.26z" fill="url(#SVGID_1_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30.05" x2="30.05" y1="9.394" y2="29.55">
-<stop offset="0" stop-color="#DBDBDB"/>
-<stop offset="0.3152" stop-color="#DBDBDB"/>
-<stop offset="0.6848" stop-color="#B3B3B3"/>
-<stop offset="1" stop-color="#B8B8B8"/>
+<path d="M57.893,7.582c-0.316-1.029-1.268-1.732-2.346-1.732H30.322h-0.35H4.453 c-1.078,0-2.029,0.703-2.345,1.732c-0.316,1.029,0.078,2.145,0.971,2.747l23.394,22.586v-9.161L12.455,10.75h17.518h0.35h17.223 L33.473,23.975v9.074l23.449-22.72C57.814,9.727,58.207,8.611,57.893,7.582z" fill="url(#SVGID_2_)"/>
+<path d="M2.108,8.384C2.423,7.354,3.375,6.55,4.453,6.55h25.52h0.35h25.225 c1.078,0,2.029,0.804,2.346,1.834c0.033,0.106,0.053,0.214,0.07,0.322c0.063-0.368,0.043-0.751-0.07-1.124 c-0.316-1.029-1.268-1.732-2.346-1.732H30.322h-0.35H4.453c-1.078,0-2.029,0.703-2.345,1.732C1.993,7.955,1.975,8.338,2.037,8.706 C2.054,8.598,2.075,8.49,2.108,8.384z" fill="#FFFFFF" opacity="0.6"/>
+<polygon fill="#FFFFFF" opacity="0.6" points="34.184,24.717 48.693,10.742 47.58,10.742 34.184,23.428 "/>
+<polygon fill="#FFFFFF" opacity="0.6" points="11.317,10.753 25.783,24.498 25.783,23.216 12.451,10.753 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="29.9995" x2="29.9995" y1="6.481" y2="32.1174">
+ <stop offset="0" style="stop-color:#EBECF0"/>
+ <stop offset="0.5" style="stop-color:#BBBCBF"/>
+ <stop offset="0.5" style="stop-color:#A4A5A8"/>
+ <stop offset="1" style="stop-color:#C8CACC"/>
</linearGradient>
-<polygon fill="url(#SVGID_2_)" points="9.555,11.61,11.77,9.394,48.34,9.394,50.56,11.61,32.61,29.55,30.82,27.76,44.99,13.59,15.12,13.59,29.29,27.76,27.5,29.55"/>
-<polygon fill="#FFFFFF" fill-opacity="0.5" points="45.01,13.57,30.82,27.76,31.32,28.27,46.02,13.57" stroke-opacity="0.5"/>
-<polygon fill="#FFFFFF" fill-opacity="0.8" points="11.77,10.41,48.34,10.41,50.05,12.11,50.56,11.61,48.34,9.394,11.77,9.394,9.555,11.61,10.06,12.11" stroke-opacity="0.8"/>
-<polygon fill="#FFFFFF" fill-opacity="0.5" points="14.14,13.62,28.79,28.27,29.29,27.76,15.15,13.62" stroke-opacity="0.5"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="26.94" x2="33.06" y1="32.21" y2="32.21">
-<stop offset="0" stop-color="#B8B8B8"/>
-<stop offset="0.3697" stop-color="#E6E6E6"/>
-<stop offset="0.7212" stop-color="#919191"/>
-<stop offset="1" stop-color="#E6E6E6"/>
+<path d="M34.172,24.738L49.715,10.05H10.251l15.521,14.472v7.094L3.479,9.755 C2.829,9.315,2.55,8.527,2.777,7.787s0.9-1.237,1.676-1.237h51.094c0.775,0,1.449,0.497,1.676,1.237s-0.053,1.528-0.693,1.962 L34.172,31.855V24.738z" fill="url(#SVGID_3_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="45.7363" x2="45.7363" y1="7.9927" y2="30.6518">
+ <stop offset="0" style="stop-color:#68696B"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
-<path d="M33.06,50.2c0,0.677-0.547,1.225-1.224,1.225h-3.674c-0.676,0-1.224-0.548-1.224-1.225v-35.98c0-0.676,0.548-1.225,1.224-1.225h3.674c0.677,0,1.224,0.548,1.224,1.225v35.98z" fill="url(#SVGID_3_)"/>
+<path d="M57.148,7.602c-0.129,0.295-0.336,0.557-0.619,0.748L34.172,30.455v1.4L56.529,9.749 c0.641-0.434,0.92-1.222,0.693-1.962C57.203,7.723,57.176,7.662,57.148,7.602z" fill="url(#SVGID_4_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="14.2354" x2="14.2354" y1="7.9922" y2="30.666">
+ <stop offset="0" style="stop-color:#68696B"/>
+ <stop offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<path d="M2.851,7.6C2.825,7.662,2.797,7.723,2.777,7.787C2.55,8.527,2.829,9.315,3.479,9.755l22.293,21.86 v-1.4L3.479,8.354C3.191,8.16,2.982,7.896,2.851,7.6z" fill="url(#SVGID_5_)"/>
+<path d="M2.777,8.487c0.227-0.74,0.9-1.237,1.676-1.237h51.094c0.775,0,1.449,0.497,1.676,1.237 c0.018,0.058,0.027,0.116,0.037,0.174c0.061-0.283,0.053-0.582-0.037-0.874c-0.227-0.74-0.9-1.237-1.676-1.237H4.453 c-0.775,0-1.449,0.497-1.676,1.237c-0.09,0.291-0.098,0.59-0.038,0.873C2.75,8.603,2.759,8.545,2.777,8.487z" fill="#FFFFFF"/>
+<path d="M32.072,53.45h-4.201c-0.772,0-1.399-0.621-1.399-1.387v0.7c0,0.766,0.626,1.387,1.399,1.387h4.201 c0.773,0,1.4-0.621,1.4-1.387v-0.7C33.473,52.829,32.846,53.45,32.072,53.45z" opacity="0.4"/>
+<path d="M32.072,52.736h-4.201c-0.772,0-1.399-0.621-1.399-1.387v0.7c0,0.766,0.626,1.387,1.399,1.387h4.201 c0.773,0,1.4-0.621,1.4-1.387v-0.7C33.473,52.115,32.846,52.736,32.072,52.736z" opacity="0.2"/>
+<rect height="0.7" opacity="0.3" width="7" x="26.472" y="10.75"/>
+<rect height="0.7" opacity="0.2" width="7" x="26.472" y="11.45"/>
+<rect height="2.8" opacity="0.1" width="7" x="26.472" y="10.75"/>
+<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(2 0 0 2 0 0)">
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
-<rect fill-opacity="0.35" height="33.866" stroke-opacity="0.35" transform="matrix(-0.6985 0.7156 -0.7156 -0.6985 35.9922 14.2223)" width="3.706" x="13.147" y="-2.239"/>
+<rect height="33.866" opacity="0.35" transform="matrix(-0.6985 0.7156 -0.7156 -0.6985 35.9922 14.2223)" width="3.706" x="13.147" y="-2.239"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -257 670.6689)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="260" x2="284" y1="655.9761" y2="655.9761">
-<stop offset="0" style="stop-color:#FF4D00"/>
-<stop offset="0.8424" style="stop-color:#CC1414"/>
-<stop offset="1" style="stop-color:#FF4D00"/>
+ <stop offset="0" style="stop-color:#FF4D00"/>
+ <stop offset="0.8424" style="stop-color:#CC1414"/>
+ <stop offset="1" style="stop-color:#FF4D00"/>
</linearGradient>
<polygon fill="url(#SVGID_1__)" points="25.809,26.431 3,4.177 4.191,2.956 27,25.21 "/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_network_settings.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,72 @@
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
+<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"/>
+ <stop offset="0.0788" style="stop-color:#A8B1B3"/>
+ <stop offset="0.3152" style="stop-color:#FFFFFF"/>
+ <stop offset="0.7333" style="stop-color:#989C9E"/>
+ <stop offset="1" style="stop-color:#C6CBCC"/>
+</linearGradient>
+<path d="M26.472,10.75v42.014c0,0.766,0.626,1.387,1.399,1.387h4.201c0.773,0,1.4-0.621,1.4-1.387V10.75 H26.472z" fill="url(#SVGID_1_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="29.9995" x2="29.9995" y1="5.6274" y2="33.0842">
+ <stop offset="0" style="stop-color:#A6A8AB"/>
+ <stop offset="1" style="stop-color:#231F20"/>
+</linearGradient>
+<path d="M57.893,7.582c-0.316-1.029-1.268-1.732-2.346-1.732H30.322h-0.35H4.453 c-1.078,0-2.029,0.703-2.345,1.732c-0.316,1.029,0.078,2.145,0.971,2.747l23.394,22.586v-9.161L12.455,10.75h17.518h0.35h17.223 L33.473,23.975v9.074l23.449-22.72C57.814,9.727,58.207,8.611,57.893,7.582z" fill="url(#SVGID_2_)"/>
+<path d="M2.108,8.384C2.423,7.354,3.375,6.55,4.453,6.55h25.52h0.35h25.225 c1.078,0,2.029,0.804,2.346,1.834c0.033,0.106,0.053,0.214,0.07,0.322c0.063-0.368,0.043-0.751-0.07-1.124 c-0.316-1.029-1.268-1.732-2.346-1.732H30.322h-0.35H4.453c-1.078,0-2.029,0.703-2.345,1.732C1.993,7.955,1.975,8.338,2.037,8.706 C2.054,8.598,2.075,8.49,2.108,8.384z" fill="#FFFFFF" opacity="0.6"/>
+<polygon fill="#FFFFFF" opacity="0.6" points="34.184,24.717 48.693,10.742 47.58,10.742 34.184,23.428 "/>
+<polygon fill="#FFFFFF" opacity="0.6" points="11.317,10.753 25.783,24.498 25.783,23.216 12.451,10.753 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="29.9995" x2="29.9995" y1="6.481" y2="32.1174">
+ <stop offset="0" style="stop-color:#EBECF0"/>
+ <stop offset="0.5" style="stop-color:#BBBCBF"/>
+ <stop offset="0.5" style="stop-color:#A4A5A8"/>
+ <stop offset="1" style="stop-color:#C8CACC"/>
+</linearGradient>
+<path d="M34.172,24.738L49.715,10.05H10.251l15.521,14.472v7.094L3.479,9.755 C2.829,9.315,2.55,8.527,2.777,7.787s0.9-1.237,1.676-1.237h51.094c0.775,0,1.449,0.497,1.676,1.237s-0.053,1.528-0.693,1.962 L34.172,31.855V24.738z" fill="url(#SVGID_3_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="45.7363" x2="45.7363" y1="7.9927" y2="30.6518">
+ <stop offset="0" style="stop-color:#68696B"/>
+ <stop offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<path d="M57.148,7.602c-0.129,0.295-0.336,0.557-0.619,0.748L34.172,30.455v1.4L56.529,9.749 c0.641-0.434,0.92-1.222,0.693-1.962C57.203,7.723,57.176,7.662,57.148,7.602z" fill="url(#SVGID_4_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="14.2354" x2="14.2354" y1="7.9922" y2="30.666">
+ <stop offset="0" style="stop-color:#68696B"/>
+ <stop offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<path d="M2.851,7.6C2.825,7.662,2.797,7.723,2.777,7.787C2.55,8.527,2.829,9.315,3.479,9.755l22.293,21.86 v-1.4L3.479,8.354C3.191,8.16,2.982,7.896,2.851,7.6z" fill="url(#SVGID_5_)"/>
+<path d="M2.777,8.487c0.227-0.74,0.9-1.237,1.676-1.237h51.094c0.775,0,1.449,0.497,1.676,1.237 c0.018,0.058,0.027,0.116,0.037,0.174c0.061-0.283,0.053-0.582-0.037-0.874c-0.227-0.74-0.9-1.237-1.676-1.237H4.453 c-0.775,0-1.449,0.497-1.676,1.237c-0.09,0.291-0.098,0.59-0.038,0.873C2.75,8.603,2.759,8.545,2.777,8.487z" fill="#FFFFFF"/>
+<path d="M32.072,53.45h-4.201c-0.772,0-1.399-0.621-1.399-1.387v0.7c0,0.766,0.626,1.387,1.399,1.387h4.201 c0.773,0,1.4-0.621,1.4-1.387v-0.7C33.473,52.829,32.846,53.45,32.072,53.45z" opacity="0.4"/>
+<path d="M32.072,52.736h-4.201c-0.772,0-1.399-0.621-1.399-1.387v0.7c0,0.766,0.626,1.387,1.399,1.387h4.201 c0.773,0,1.4-0.621,1.4-1.387v-0.7C33.473,52.115,32.846,52.736,32.072,52.736z" opacity="0.2"/>
+<rect height="0.7" opacity="0.3" width="7" x="26.472" y="10.75"/>
+<rect height="0.7" opacity="0.2" width="7" x="26.472" y="11.45"/>
+<rect height="2.8" opacity="0.1" width="7" x="26.472" y="10.75"/>
+<rect fill="none" height="60" width="60"/>
+</g>
+<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
+<path d="M15,29.505c-0.657,0-1.337-0.048-2.019-0.144l-0.594-0.082l-0.435-1.304c-0.171-0.517-0.3-1.313-0.3-1.854 v-0.687c-0.006-0.031-0.063-0.11-0.102-0.131l-1.339-0.548l-0.099-0.032c-0.06,0-0.112,0.021-0.127,0.031l-0.479,0.479 c-0.383,0.383-1.038,0.855-1.522,1.098l-1.232,0.612l-0.477-0.36c-1.081-0.815-2.042-1.775-2.856-2.854L3.057,23.25l0.616-1.23 c0.246-0.489,0.718-1.144,1.099-1.523l0.484-0.485c0.018-0.026,0.033-0.119,0.021-0.157L4.72,18.511 c-0.041-0.095-0.118-0.151-0.159-0.158l-0.676,0.001c-0.545,0-1.343-0.13-1.855-0.302l-1.303-0.434l-0.083-0.594 C0.548,16.346,0.5,15.666,0.5,15.005s0.048-1.34,0.144-2.02l0.083-0.594l1.305-0.434c0.507-0.171,1.306-0.301,1.853-0.301h0.687 c0.031-0.006,0.108-0.062,0.127-0.099l0.553-1.344c0.04-0.098,0.025-0.19,0-0.224L4.772,9.511C4.387,9.125,3.915,8.47,3.674,7.987 L3.059,6.758L3.42,6.279c0.814-1.079,1.774-2.04,2.855-2.855l0.479-0.362l1.231,0.617c0.486,0.244,1.14,0.715,1.522,1.097 l0.487,0.485c0.008,0.005,0.06,0.025,0.119,0.025l0.034-0.017l0.064-0.014l1.285-0.531c0.094-0.04,0.15-0.118,0.156-0.16l0-0.676 c0-0.543,0.129-1.34,0.301-1.854l0.435-1.304l0.594-0.083c0.676-0.095,1.356-0.143,2.02-0.143c0.662,0,1.342,0.048,2.02,0.143 l0.595,0.083l0.434,1.305c0.17,0.515,0.301,1.312,0.301,1.853v0.687c0.006,0.031,0.063,0.11,0.1,0.129l1.341,0.551l0.098,0.031 c0.061,0,0.113-0.02,0.129-0.031l0.478-0.478c0.385-0.385,1.038-0.856,1.521-1.098l1.233-0.613l0.476,0.36 c1.08,0.813,2.041,1.773,2.856,2.855l0.362,0.479L26.27,8.106c-0.253,0.506-0.391,0.758-1.04,1.407L24.744,10 c-0.017,0.026-0.032,0.119-0.021,0.158l0.557,1.344c0.04,0.093,0.117,0.15,0.158,0.156l0.678,0c0.544,0,1.343,0.13,1.854,0.302 l1.303,0.433l0.083,0.594c0.095,0.677,0.144,1.356,0.144,2.021c0,0.666-0.049,1.345-0.144,2.021l-0.085,0.593l-1.303,0.434 c-0.508,0.172-1.305,0.302-1.853,0.302h-0.688c-0.032,0.006-0.109,0.063-0.131,0.102l-0.547,1.339 c-0.04,0.097-0.026,0.191-0.002,0.226l0.479,0.479c0.383,0.381,0.857,1.038,1.099,1.525l0.613,1.226l-0.36,0.479 c-0.815,1.08-1.774,2.041-2.854,2.855l-0.479,0.361l-1.231-0.615c-0.485-0.244-1.14-0.716-1.521-1.097l-0.487-0.486 c-0.006-0.004-0.059-0.023-0.119-0.023l-0.031,0.017l-0.066,0.015l-1.284,0.529c-0.094,0.04-0.15,0.118-0.156,0.159v0.677 c0,0.54-0.129,1.337-0.301,1.853l-0.434,1.306l-0.595,0.082C16.335,29.457,15.656,29.505,15,29.505L15,29.505z M15,11.208 c-2.094,0-3.798,1.704-3.798,3.798c0,2.094,1.704,3.798,3.798,3.798s3.797-1.704,3.797-3.798C18.797,12.912,17.094,11.208,15,11.208 L15,11.208z" opacity="0.35"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -360.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="282.4795" x2="282.4795" y1="-361.4912" y2="-388.438">
+ <stop offset="0.1" style="stop-color:#FFFFFF"/>
+ <stop offset="0.74" style="stop-color:#929497"/>
+ <stop offset="1" style="stop-color:#C8C8C8"/>
+</linearGradient>
+<path d="M26.116,12.624H25.43c-0.437,0-0.906-0.339-1.042-0.754l-0.531-1.285 c-0.196-0.389-0.105-0.96,0.204-1.269l0.485-0.486c0.615-0.615,0.659-0.759,0.916-1.271l0.349-0.695 c-0.761-1.008-1.659-1.906-2.668-2.666l-0.694,0.346c-0.389,0.195-0.961,0.608-1.271,0.917l-0.485,0.486 c-0.31,0.309-0.882,0.401-1.271,0.203L18.138,5.62c-0.417-0.137-0.755-0.608-0.755-1.044V3.889c0-0.437-0.113-1.134-0.251-1.548 l-0.246-0.735C16.269,1.519,15.641,1.472,15,1.472c-0.641,0-1.27,0.047-1.886,0.133L12.869,2.34 c-0.138,0.415-0.251,1.111-0.251,1.548v0.687c0,0.436-0.339,0.906-0.754,1.042l-1.285,0.53C10.19,6.346,9.62,6.254,9.311,5.946 L8.824,5.46C8.515,5.151,7.942,4.739,7.553,4.543L6.858,4.195C5.851,4.956,4.953,5.854,4.192,6.862l0.347,0.694 c0.195,0.391,0.608,0.963,0.917,1.272l0.486,0.486c0.309,0.309,0.4,0.88,0.202,1.269l-0.531,1.286 c-0.136,0.415-0.605,0.754-1.042,0.754H3.884c-0.438,0-1.134,0.112-1.548,0.252l-0.736,0.245c-0.086,0.617-0.134,1.245-0.134,1.886 c0,0.64,0.047,1.269,0.134,1.885l0.736,0.246c0.414,0.139,1.11,0.251,1.548,0.251h0.687c0.438,0,0.906,0.34,1.042,0.755l0.53,1.284 c0.198,0.389,0.106,0.961-0.203,1.269l-0.486,0.486c-0.309,0.308-0.721,0.882-0.917,1.271L4.19,23.146 c0.761,1.008,1.659,1.905,2.667,2.665l0.694-0.345c0.391-0.196,0.963-0.608,1.271-0.917l0.486-0.485 c0.309-0.309,0.881-0.401,1.27-0.203l1.284,0.529c0.416,0.138,0.755,0.608,0.755,1.044v0.687c0,0.438,0.113,1.133,0.251,1.549 l0.245,0.734c0.617,0.086,1.245,0.134,1.886,0.134c0.64,0,1.267-0.048,1.886-0.134l0.244-0.734c0.138-0.416,0.251-1.111,0.251-1.549 v-0.687c0-0.438,0.34-0.906,0.755-1.043l1.284-0.53c0.391-0.197,0.959-0.105,1.269,0.203l0.485,0.485 c0.31,0.309,0.882,0.721,1.272,0.917l0.695,0.347c1.008-0.76,1.904-1.657,2.665-2.666l-0.347-0.693 c-0.194-0.391-0.608-0.964-0.918-1.271l-0.483-0.486c-0.31-0.309-0.4-0.88-0.204-1.27l0.529-1.284 c0.14-0.416,0.607-0.755,1.044-0.755h0.688c0.435,0,1.132-0.111,1.547-0.251l0.736-0.246c0.087-0.615,0.134-1.245,0.134-1.885 c0-0.641-0.047-1.269-0.134-1.886l-0.736-0.245C27.249,12.736,26.553,12.624,26.116,12.624z M15,19.771 c-2.632,0-4.765-2.133-4.765-4.765c0-2.631,2.132-4.765,4.765-4.765c2.63,0,4.764,2.134,4.764,4.765 C19.764,17.638,17.63,19.771,15,19.771z" fill="url(#SVGID_1__)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -360.0195)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="277.6816" x2="287.2746" y1="-377.2241" y2="-377.2241">
+ <stop offset="0" style="stop-color:#7A7A7A"/>
+ <stop offset="0.5" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#7A7A7A"/>
+</linearGradient>
+<path d="M15,19.771c2.63,0,4.764-2.133,4.764-4.765c0-0.125-0.01-0.246-0.018-0.367 c-0.188,2.459-2.239,4.398-4.746,4.398c-2.508,0-4.558-1.939-4.746-4.398c-0.01,0.122-0.019,0.243-0.019,0.367 C10.235,17.638,12.367,19.771,15,19.771z" fill="url(#SVGID_2__)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -360.0195)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="282.4805" x2="282.4805" y1="-383.0635" y2="-366.7921">
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="0.52" style="stop-color:#C8C8C8"/>
+ <stop offset="1" style="stop-color:#929497"/>
+</linearGradient>
+<path d="M15,6.52c-4.687,0-8.487,3.8-8.487,8.487s3.8,8.486,8.487,8.486s8.487-3.799,8.487-8.486 S19.687,6.52,15,6.52z M15,21.563c-3.621,0-6.559-2.935-6.559-6.557c0-3.622,2.937-6.558,6.559-6.558 c3.62,0,6.557,2.936,6.557,6.558C21.557,18.629,18.619,21.563,15,21.563z" fill="url(#SVGID_3__)"/>
+<rect fill="none" height="30" width="30"/>
+</g>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_new_message.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_new_message.svg Fri May 14 16:09:54 2010 +0300
@@ -1,71 +1,75 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="9.8965" y2="49.8018">
-<stop offset="0" style="stop-color:#FEEFA7"/>
-<stop offset="0.5091" style="stop-color:#FFC501"/>
-<stop offset="1" style="stop-color:#F6A800"/>
+ <stop offset="0" style="stop-color:#FEEFA7"/>
+ <stop offset="0.5091" style="stop-color:#FFC501"/>
+ <stop offset="1" style="stop-color:#F6A800"/>
</linearGradient>
<polygon fill="url(#SVGID_1_)" points="58,50.4 2,50.4 2,9.6 30.463,10.4 58,9.6 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="9.7017" y2="50.6398">
-<stop offset="0" style="stop-color:#F7AC00"/>
-<stop offset="0.3394" style="stop-color:#FFF8DB"/>
-<stop offset="1" style="stop-color:#FFE066"/>
+ <stop offset="0" style="stop-color:#F7AC00"/>
+ <stop offset="0.3394" style="stop-color:#FFF8DB"/>
+ <stop offset="1" style="stop-color:#FFE066"/>
</linearGradient>
<path d="M57.385,10.22v39.56H2.613V10.22H57.385 M58,9.6L29.802,9.936L2,9.6v40.8h56V9.6L58,9.6z" fill="url(#SVGID_2_)"/>
-<polygon fill="#FBAB13" fill-opacity="0.3" points="2,49.71 58,49.71 58,48.916 29.998,24.328 2,48.916 " stroke-opacity="0.3"/>
-<polygon fill="#F18800" fill-opacity="0.3" points="2,50.4 58,50.4 58,49.603 29.998,25.019 2,49.603 " stroke-opacity="0.3"/>
+<polygon fill="#FBAB13" opacity="0.3" points="2,49.71 58,49.71 58,48.916 29.998,24.328 2,48.916 "/>
+<polygon fill="#F18800" opacity="0.3" points="2,50.4 58,50.4 58,49.603 29.998,25.019 2,49.603 "/>
<linearGradient gradientTransform="matrix(-1 0 0 -1 -1801.0049 1240.3164)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1831.0049" x2="-1831.0049" y1="1214.7607" y2="1190.0703">
-<stop offset="0" style="stop-color:#F98A00"/>
-<stop offset="0.7273" style="stop-color:#FCBC3C"/>
-<stop offset="1" style="stop-color:#FFE36A"/>
+ <stop offset="0" style="stop-color:#F98A00"/>
+ <stop offset="0.7273" style="stop-color:#FCBC3C"/>
+ <stop offset="1" style="stop-color:#FFE36A"/>
</linearGradient>
<polygon fill="url(#SVGID_3_)" points="58,50.38 29.998,25.689 2,50.38 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="30" x2="30" y1="25.4995" y2="51.0736">
-<stop offset="0" style="stop-color:#FFF1B5"/>
-<stop offset="1" style="stop-color:#FFE066"/>
+ <stop offset="0" style="stop-color:#FFF1B5"/>
+ <stop offset="1" style="stop-color:#FFE066"/>
</linearGradient>
<polygon fill="url(#SVGID_4_)" points="58,50.38 29.998,25.689 2,50.38 29.998,26.563 "/>
-<polygon fill="#F18800" fill-opacity="0.3" points="30.057,10.4 2,9.6 29.998,38.617 58,9.6 " stroke-opacity="0.3"/>
-<polygon fill="#C26D00" fill-opacity="0.4" points="30.006,10.4 2,9.6 29.998,37.091 58,9.6 " stroke-opacity="0.4"/>
-<polygon fill="#AB6100" fill-opacity="0.4" points="29.904,10.297 2,9.6 29.998,35.802 58,9.6 " stroke-opacity="0.4"/>
+<polygon fill="#F18800" opacity="0.3" points="30.057,10.4 2,9.6 29.998,38.617 58,9.6 "/>
+<polygon fill="#C26D00" opacity="0.4" points="30.006,10.4 2,9.6 29.998,37.091 58,9.6 "/>
+<polygon fill="#AB6100" opacity="0.4" points="29.904,10.297 2,9.6 29.998,35.802 58,9.6 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30" x2="30" y1="32.9619" y2="8.0088">
-<stop offset="0" style="stop-color:#FFDA33"/>
-<stop offset="0.25" style="stop-color:#FFE692"/>
-<stop offset="1" style="stop-color:#FFFBF8"/>
+ <stop offset="0" style="stop-color:#FFDA33"/>
+ <stop offset="0.25" style="stop-color:#FFE692"/>
+ <stop offset="1" style="stop-color:#FFFBF8"/>
</linearGradient>
<polygon fill="url(#SVGID_5_)" points="2,9.6 29.998,34.29 58,9.6 "/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 0)">
+<defs>
+</defs>
<polygon fill="none" points="5.104,0 5.044,0.225 0,0.225 0,30.225 13.919,30.225 14.333,30.639 14.747,30.225 30,30.225 30,0.225 5.942,0.225 "/>
-<polygon fill-opacity="0.35" points="22.007,7.349 11.844,17.512 15.771,2.858 5.104,0 0.374,17.655 9.308,20.049 6.525,22.831 14.333,30.639 29.814,15.156 " stroke-opacity="0.35"/>
+<polygon opacity="0.35" points="22.007,7.349 11.844,17.512 15.771,2.858 5.104,0 0.374,17.655 9.308,20.049 6.525,22.831 14.333,30.639 29.814,15.156 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="10.1621" x2="6.0926" y1="2.1929" y2="17.9056">
-<stop offset="0" style="stop-color:#FFA959"/>
-<stop offset="0.703" style="stop-color:#CA3522"/>
-<stop offset="1" style="stop-color:#F08849"/>
+ <stop offset="0" style="stop-color:#FFA959"/>
+ <stop offset="0.703" style="stop-color:#CA3522"/>
+ <stop offset="1" style="stop-color:#F08849"/>
</linearGradient>
<polygon fill="url(#SVGID_1__)" points="1.599,16.948 5.812,1.225 14.546,3.565 10.333,19.288 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="9.877" x2="6.2598" y1="3.2612" y2="17.2775">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="0.7939" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#E8522A"/>
+ <stop offset="0" style="stop-color:#FF7236"/>
+ <stop offset="0.7939" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#E8522A"/>
</linearGradient>
<polygon fill="url(#SVGID_2__)" points="9.693,18.181 2.706,16.309 6.45,2.333 13.438,4.204 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="25.0566" x2="11.1526" y1="11.9385" y2="26.1817">
-<stop offset="0" style="stop-color:#FFA959"/>
-<stop offset="0.703" style="stop-color:#CA3522"/>
-<stop offset="1" style="stop-color:#F08849"/>
+ <stop offset="0" style="stop-color:#FFA959"/>
+ <stop offset="0.703" style="stop-color:#CA3522"/>
+ <stop offset="1" style="stop-color:#F08849"/>
</linearGradient>
<polygon fill="url(#SVGID_3__)" points="7.939,22.831 22.007,8.763 28.4,15.156 14.333,29.225 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="24.5723" x2="11.9119" y1="12.5332" y2="25.3066">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="0.7939" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#E8522A"/>
+ <stop offset="0" style="stop-color:#FF7236"/>
+ <stop offset="0.7939" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#E8522A"/>
</linearGradient>
<polygon fill="url(#SVGID_4__)" points="14.333,27.946 9.218,22.831 22.007,10.042 27.122,15.156 "/>
<rect fill="none" height="30" width="30" y="0.225"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_new_voice_message.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_new_voice_message.svg Fri May 14 16:09:54 2010 +0300
@@ -1,58 +1,74 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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"/>
+
<stop offset="1" stop-color="#A8A8A8"/>
+
</linearGradient>
<path d="M17.36,1s6.154,1.286,10.78,5.642c-13.61,0.95-24.36,12.29-24.36,26.14,0,14.48,11.74,26.22,26.22,26.22s26.22-11.93,26.22-26.22c0-14.28-13.11-31.78-38.86-31.78z" fill="url(#SVGID_1_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="36.79" x2="36.79" y1="5.052" y2="31.46">
+
<stop offset="0" stop-color="#FFFFFF"/>
+
<stop offset="1" stop-color="#CDD3D5"/>
+
</linearGradient>
<path d="M56.15,32.73l0.066,0.055c0-14.28-13.11-31.78-38.86-31.78,0,0,36.7,2.018,38.79,31.73z" fill="url(#SVGID_2_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="9.028" y2="57.83">
+
<stop offset="0" stop-color="#F5F5F5"/>
+
<stop offset="0.05" stop-color="#F5F5F5"/>
+
<stop offset="0.7818" stop-color="#CCCCCC"/>
+
<stop offset="1" stop-color="#D1D1D1"/>
+
</linearGradient>
<path d="M54.52,33.18c0,13.54-10.98,24.52-24.52,24.52s-24.52-10.98-24.52-24.52c-0.003-13.54,10.98-24.52,24.52-24.52s24.52,10.98,24.52,24.52z" fill="url(#SVGID_3_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="30" x2="30" y1="24.82" y2="40.68">
+
<stop offset="0" stop-color="#FF7236"/>
+
<stop offset="1" stop-color="#D11414"/>
+
</linearGradient>
<path d="M40.38,24.82c-4.26,0-7.725,3.465-7.725,7.72,0,1.766,0.602,3.385,1.598,4.686h-8.513c0.998-1.301,1.598-2.92,1.598-4.686,0-4.255-3.465-7.72-7.724-7.72-4.26,0-7.726,3.465-7.726,7.72,0,4.262,3.466,7.727,7.726,7.727h20.77c4.26,0,7.723-3.465,7.723-7.727-0.01-4.25-3.48-7.72-7.74-7.72zm-25.45,7.72c0-2.58,2.101-4.681,4.685-4.681,2.583,0,4.685,2.102,4.685,4.681,0,2.584-2.102,4.686-4.685,4.686-2.59,0-4.69-2.1-4.69-4.69zm25.45,4.69c-2.584,0-4.686-2.102-4.686-4.686,0-2.58,2.102-4.681,4.686-4.681,2.583,0,4.684,2.102,4.684,4.681,0.01,2.59-2.09,4.69-4.68,4.69z" fill="url(#SVGID_4_)"/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 0)">
+<defs>
+</defs>
<polygon fill="none" points="5.104,0 5.044,0.225 0,0.225 0,30.225 13.919,30.225 14.333,30.639 14.747,30.225 30,30.225 30,0.225 5.942,0.225 "/>
-<polygon fill-opacity="0.35" points="22.007,7.349 11.844,17.512 15.771,2.858 5.104,0 0.374,17.655 9.308,20.049 6.525,22.831 14.333,30.639 29.814,15.156 " stroke-opacity="0.35"/>
+<polygon opacity="0.35" points="22.007,7.349 11.844,17.512 15.771,2.858 5.104,0 0.374,17.655 9.308,20.049 6.525,22.831 14.333,30.639 29.814,15.156 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="10.1621" x2="6.0926" y1="2.1929" y2="17.9056">
-<stop offset="0" style="stop-color:#FFA959"/>
-<stop offset="0.703" style="stop-color:#CA3522"/>
-<stop offset="1" style="stop-color:#F08849"/>
+ <stop offset="0" style="stop-color:#FFA959"/>
+ <stop offset="0.703" style="stop-color:#CA3522"/>
+ <stop offset="1" style="stop-color:#F08849"/>
</linearGradient>
<polygon fill="url(#SVGID_1__)" points="1.599,16.948 5.812,1.225 14.546,3.565 10.333,19.288 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="9.877" x2="6.2598" y1="3.2612" y2="17.2775">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="0.7939" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#E8522A"/>
+ <stop offset="0" style="stop-color:#FF7236"/>
+ <stop offset="0.7939" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#E8522A"/>
</linearGradient>
<polygon fill="url(#SVGID_2__)" points="9.693,18.181 2.706,16.309 6.45,2.333 13.438,4.204 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="25.0566" x2="11.1526" y1="11.9385" y2="26.1817">
-<stop offset="0" style="stop-color:#FFA959"/>
-<stop offset="0.703" style="stop-color:#CA3522"/>
-<stop offset="1" style="stop-color:#F08849"/>
+ <stop offset="0" style="stop-color:#FFA959"/>
+ <stop offset="0.703" style="stop-color:#CA3522"/>
+ <stop offset="1" style="stop-color:#F08849"/>
</linearGradient>
<polygon fill="url(#SVGID_3__)" points="7.939,22.831 22.007,8.763 28.4,15.156 14.333,29.225 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="24.5723" x2="11.9119" y1="12.5332" y2="25.3066">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="0.7939" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#E8522A"/>
+ <stop offset="0" style="stop-color:#FF7236"/>
+ <stop offset="0.7939" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#E8522A"/>
</linearGradient>
<polygon fill="url(#SVGID_4__)" points="14.333,27.946 9.218,22.831 22.007,10.042 27.122,15.156 "/>
<rect fill="none" height="30" width="30" y="0.225"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_non_default.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_non_default.svg Fri May 14 16:09:54 2010 +0300
@@ -1,159 +1,161 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
-<stop offset="0.3818" style="stop-color:#FFFFFF"/>
-<stop offset="0.7091" style="stop-color:#686E70"/>
-<stop offset="1" style="stop-color:#A6B0B3"/>
+ <stop offset="0" style="stop-color:#A8B1B3"/>
+ <stop offset="0.3818" style="stop-color:#FFFFFF"/>
+ <stop offset="0.7091" style="stop-color:#686E70"/>
+ <stop offset="1" style="stop-color:#A6B0B3"/>
</linearGradient>
<path d="M52.041,56.938c0,0.339-0.274,0.612-0.612,0.612H7.347c-0.338,0-0.612-0.273-0.612-0.612v-3.673 c0-0.339,0.274-0.612,0.612-0.612h44.082c0.338,0,0.612,0.273,0.612,0.612V56.938z" fill="url(#SVGID_1_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="10.4082" x2="49.5918" y1="22.6533" y2="22.6533">
-<stop offset="0" style="stop-color:#B4BDBF"/>
-<stop offset="0.2667" style="stop-color:#E5EBED"/>
-<stop offset="0.703" style="stop-color:#8D9699"/>
-<stop offset="1" style="stop-color:#B7BDBF"/>
+ <stop offset="0" style="stop-color:#B4BDBF"/>
+ <stop offset="0.2667" style="stop-color:#E5EBED"/>
+ <stop offset="0.703" style="stop-color:#8D9699"/>
+ <stop offset="1" style="stop-color:#B7BDBF"/>
</linearGradient>
<path d="M48.113,2.449H11.889c-0.815,0-1.48,0.668-1.48,1.485v38.923h39.184V3.935 C49.592,3.117,48.926,2.449,48.113,2.449z" fill="url(#SVGID_2_)"/>
<path d="M48.113,2.449c0.813,0,1.479,0.668,1.479,1.485v38.923H10.408V3.935c0-0.817,0.666-1.485,1.48-1.485H48.113 M48.113,3.626H11.889c-0.173,0-0.318,0.142-0.318,0.309v37.747H48.43V3.935C48.43,3.768,48.285,3.626,48.113,3.626L48.113,3.626z" fill="#FFFFFF"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="15.5947" y2="6.3742">
-<stop offset="0" style="stop-color:#808080"/>
-<stop offset="1" style="stop-color:#303030"/>
+ <stop offset="0" style="stop-color:#808080"/>
+ <stop offset="1" style="stop-color:#303030"/>
</linearGradient>
<rect fill="url(#SVGID_3_)" height="9.412" width="32.59" x="13.705" y="6.183"/>
-<rect fill="#FFFFFF" fill-opacity="0.25" height="1.177" stroke-opacity="0.25" width="32.59" x="13.705" y="15.595"/>
+<rect fill="#FFFFFF" height="1.177" opacity="0.25" width="32.59" x="13.705" y="15.595"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="30.0015" x2="30.0015" y1="7.4082" y2="14.3725">
-<stop offset="0" style="stop-color:#8B8B8B"/>
-<stop offset="1" style="stop-color:#454545"/>
+ <stop offset="0" style="stop-color:#8B8B8B"/>
+ <stop offset="1" style="stop-color:#454545"/>
</linearGradient>
<rect fill="url(#SVGID_4_)" height="7.058" width="30.263" x="14.87" y="7.359"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30.0005" x2="30.0005" y1="8.2974" y2="13.2402">
-<stop offset="0" style="stop-color:#525252"/>
-<stop offset="1" style="stop-color:#1C1C1C"/>
+ <stop offset="0" style="stop-color:#525252"/>
+ <stop offset="1" style="stop-color:#1C1C1C"/>
</linearGradient>
<rect fill="url(#SVGID_5_)" height="4.706" width="27.939" x="16.031" y="8.534"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="20.0767" x2="20.0767" y1="9.5928" y2="12.0647">
-<stop offset="0" style="stop-color:#17BFFF"/>
-<stop offset="1" style="stop-color:#0D5186"/>
+ <stop offset="0" style="stop-color:#17BFFF"/>
+ <stop offset="1" style="stop-color:#0D5186"/>
</linearGradient>
<rect fill="url(#SVGID_6_)" height="2.354" width="5.848" x="17.153" y="9.711"/>
-<rect fill="#FFFFFF" fill-opacity="0.25" height="1.176" stroke-opacity="0.25" width="5.848" x="17.153" y="9.711"/>
+<rect fill="#FFFFFF" height="1.176" opacity="0.25" width="5.848" x="17.153" y="9.711"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="30" x2="30" y1="28.0029" y2="18.7824">
-<stop offset="0" style="stop-color:#808080"/>
-<stop offset="1" style="stop-color:#303030"/>
+ <stop offset="0" style="stop-color:#808080"/>
+ <stop offset="1" style="stop-color:#303030"/>
</linearGradient>
<rect fill="url(#SVGID_7_)" height="9.412" width="32.59" x="13.705" y="18.591"/>
-<rect fill="#FFFFFF" fill-opacity="0.25" height="1.176" stroke-opacity="0.25" width="32.59" x="13.705" y="28.003"/>
+<rect fill="#FFFFFF" height="1.176" opacity="0.25" width="32.59" x="13.705" y="28.003"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="30.0015" x2="30.0015" y1="19.8154" y2="26.7816">
-<stop offset="0" style="stop-color:#8B8B8B"/>
-<stop offset="1" style="stop-color:#454545"/>
+ <stop offset="0" style="stop-color:#8B8B8B"/>
+ <stop offset="1" style="stop-color:#454545"/>
</linearGradient>
<rect fill="url(#SVGID_8_)" height="7.06" width="30.263" x="14.87" y="19.767"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="30.0005" x2="30.0005" y1="20.7056" y2="25.6484">
-<stop offset="0" style="stop-color:#525252"/>
-<stop offset="1" style="stop-color:#1C1C1C"/>
+ <stop offset="0" style="stop-color:#525252"/>
+ <stop offset="1" style="stop-color:#1C1C1C"/>
</linearGradient>
<rect fill="url(#SVGID_9_)" height="4.706" width="27.939" x="16.031" y="20.942"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="26.957" x2="31.9189" y1="50.5098" y2="50.5098">
-<stop offset="0" style="stop-color:#1A1A1A"/>
-<stop offset="0.3212" style="stop-color:#C7C7C7"/>
-<stop offset="0.6848" style="stop-color:#4D4D4D"/>
-<stop offset="0.8545" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#7A7A7A"/>
+ <stop offset="0" style="stop-color:#1A1A1A"/>
+ <stop offset="0.3212" style="stop-color:#C7C7C7"/>
+ <stop offset="0.6848" style="stop-color:#4D4D4D"/>
+ <stop offset="0.8545" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#7A7A7A"/>
</linearGradient>
<path d="M26.939,48.367v3.674c0,0.338,0.274,0.612,0.612,0.612h3.674c0.338,0,0.612-0.274,0.612-0.612 v-3.674H26.939z" fill="url(#SVGID_10_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="26.9565" x2="31.918" y1="48.6738" y2="48.6738">
-<stop offset="0" style="stop-color:#1A1A1A"/>
-<stop offset="0.3212" style="stop-color:#C7C7C7"/>
-<stop offset="0.6848" style="stop-color:#4D4D4D"/>
-<stop offset="0.8545" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#7A7A7A"/>
+ <stop offset="0" style="stop-color:#1A1A1A"/>
+ <stop offset="0.3212" style="stop-color:#C7C7C7"/>
+ <stop offset="0.6848" style="stop-color:#4D4D4D"/>
+ <stop offset="0.8545" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#7A7A7A"/>
</linearGradient>
<rect fill="url(#SVGID_11_)" height="0.612" width="4.897" x="26.938" y="48.367"/>
<g>
-<rect fill="none" height="60" width="60"/>
+ <rect fill="none" height="60" width="60"/>
</g>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="30.0005" x2="30.0005" y1="48.9316" y2="42.9805">
-<stop offset="0" style="stop-color:#808080"/>
-<stop offset="1" style="stop-color:#303030"/>
+ <stop offset="0" style="stop-color:#808080"/>
+ <stop offset="1" style="stop-color:#303030"/>
</linearGradient>
<rect fill="url(#SVGID_12_)" height="6.122" width="37.996" x="11.002" y="42.857"/>
-<rect fill-opacity="0.5" height="0.612" stroke-opacity="0.5" width="37.996" x="11.002" y="42.857"/>
-<rect fill-opacity="0.2" height="0.612" stroke-opacity="0.2" width="37.996" x="11.002" y="43.47"/>
+<rect height="0.612" opacity="0.5" width="37.996" x="11.002" y="42.857"/>
+<rect height="0.612" opacity="0.2" width="37.996" x="11.002" y="43.47"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="12.8589" x2="12.8589" y1="48.9404" y2="44.1797">
-<stop offset="0" style="stop-color:#999999"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+ <stop offset="0" style="stop-color:#999999"/>
+ <stop offset="1" style="stop-color:#4D4D4D"/>
</linearGradient>
<rect fill="url(#SVGID_13_)" height="4.897" width="2.476" x="11.621" y="44.082"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="17.8115" x2="17.8115" y1="48.9404" y2="44.1797">
-<stop offset="0" style="stop-color:#999999"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+ <stop offset="0" style="stop-color:#999999"/>
+ <stop offset="1" style="stop-color:#4D4D4D"/>
</linearGradient>
<rect fill="url(#SVGID_14_)" height="4.897" width="2.476" x="16.574" y="44.082"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="22.7642" x2="22.7642" y1="48.9404" y2="44.1797">
-<stop offset="0" style="stop-color:#999999"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+ <stop offset="0" style="stop-color:#999999"/>
+ <stop offset="1" style="stop-color:#4D4D4D"/>
</linearGradient>
<rect fill="url(#SVGID_15_)" height="4.897" width="2.476" x="21.526" y="44.082"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="27.7158" x2="27.7158" y1="48.9404" y2="44.1797">
-<stop offset="0" style="stop-color:#999999"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+ <stop offset="0" style="stop-color:#999999"/>
+ <stop offset="1" style="stop-color:#4D4D4D"/>
</linearGradient>
<rect fill="url(#SVGID_16_)" height="4.897" width="2.476" x="26.478" y="44.082"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="32.668" x2="32.668" y1="48.9404" y2="44.1797">
-<stop offset="0" style="stop-color:#999999"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+ <stop offset="0" style="stop-color:#999999"/>
+ <stop offset="1" style="stop-color:#4D4D4D"/>
</linearGradient>
<rect fill="url(#SVGID_17_)" height="4.897" width="2.477" x="31.43" y="44.082"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="37.6211" x2="37.6211" y1="48.9404" y2="44.1797">
-<stop offset="0" style="stop-color:#999999"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+ <stop offset="0" style="stop-color:#999999"/>
+ <stop offset="1" style="stop-color:#4D4D4D"/>
</linearGradient>
<rect fill="url(#SVGID_18_)" height="4.897" width="2.477" x="36.383" y="44.082"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="42.5723" x2="42.5723" y1="48.9404" y2="44.1797">
-<stop offset="0" style="stop-color:#999999"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+ <stop offset="0" style="stop-color:#999999"/>
+ <stop offset="1" style="stop-color:#4D4D4D"/>
</linearGradient>
<rect fill="url(#SVGID_19_)" height="4.897" width="2.477" x="41.334" y="44.082"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="47.5254" x2="47.5254" y1="48.9404" y2="44.1797">
-<stop offset="0" style="stop-color:#999999"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+ <stop offset="0" style="stop-color:#999999"/>
+ <stop offset="1" style="stop-color:#4D4D4D"/>
</linearGradient>
<rect fill="url(#SVGID_20_)" height="4.897" width="2.477" x="46.287" y="44.082"/>
-<rect fill-opacity="0.5" height="0.612" stroke-opacity="0.5" width="37.996" x="11.002" y="48.367"/>
-<rect fill="#CCCCCC" fill-opacity="0.5" height="0.612" stroke-opacity="0.5" width="37.996" x="11.002" y="47.755"/>
-<rect fill-opacity="0.3" height="0.612" stroke-opacity="0.3" width="4.897" x="26.938" y="48.979"/>
-<rect fill-opacity="0.1" height="0.612" stroke-opacity="0.1" width="4.897" x="26.938" y="49.592"/>
-<rect fill-opacity="0.3" height="4.897" stroke-opacity="0.3" width="0.612" x="18.979" y="52.653"/>
-<rect fill-opacity="0.3" height="4.897" stroke-opacity="0.3" width="0.612" x="39.184" y="52.653"/>
-<rect fill-opacity="0.1" height="4.897" stroke-opacity="0.1" width="0.612" x="18.367" y="52.653"/>
-<rect fill-opacity="0.1" height="4.897" stroke-opacity="0.1" width="0.612" x="39.796" y="52.653"/>
+<rect height="0.612" opacity="0.5" width="37.996" x="11.002" y="48.367"/>
+<rect fill="#CCCCCC" height="0.612" opacity="0.5" width="37.996" x="11.002" y="47.755"/>
+<rect height="0.612" opacity="0.3" width="4.897" x="26.938" y="48.979"/>
+<rect height="0.612" opacity="0.1" width="4.897" x="26.938" y="49.592"/>
+<rect height="4.897" opacity="0.3" width="0.612" x="18.979" y="52.653"/>
+<rect height="4.897" opacity="0.3" width="0.612" x="39.184" y="52.653"/>
+<rect height="4.897" opacity="0.1" width="0.612" x="18.367" y="52.653"/>
+<rect height="4.897" opacity="0.1" width="0.612" x="39.796" y="52.653"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="29.3872" x2="29.3872" y1="52.1279" y2="57.9301">
-<stop offset="0" style="stop-color:#1A1A1A"/>
-<stop offset="0.3212" style="stop-color:#C7C7C7"/>
-<stop offset="0.6848" style="stop-color:#4D4D4D"/>
-<stop offset="0.8545" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#7A7A7A"/>
+ <stop offset="0" style="stop-color:#1A1A1A"/>
+ <stop offset="0.3212" style="stop-color:#C7C7C7"/>
+ <stop offset="0.6848" style="stop-color:#4D4D4D"/>
+ <stop offset="0.8545" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#7A7A7A"/>
</linearGradient>
<rect fill="url(#SVGID_21_)" height="6.122" width="18.367" x="20.204" y="52.041"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="19.8979" x2="19.8979" y1="52.1279" y2="57.9301">
-<stop offset="0" style="stop-color:#1A1A1A"/>
-<stop offset="0.3212" style="stop-color:#C7C7C7"/>
-<stop offset="0.6848" style="stop-color:#4D4D4D"/>
-<stop offset="0.8545" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#7A7A7A"/>
+ <stop offset="0" style="stop-color:#1A1A1A"/>
+ <stop offset="0.3212" style="stop-color:#C7C7C7"/>
+ <stop offset="0.6848" style="stop-color:#4D4D4D"/>
+ <stop offset="0.8545" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#7A7A7A"/>
</linearGradient>
<path d="M19.592,52.653v4.897c0,0.339,0.274,0.612,0.612,0.612v-6.122 C19.866,52.041,19.592,52.314,19.592,52.653z" fill="url(#SVGID_22_)"/>
-<path d="M19.592,52.653v4.897c0,0.339,0.274,0.612,0.612,0.612v-6.122C19.866,52.041,19.592,52.314,19.592,52.653z" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M19.592,52.653v4.897c0,0.339,0.274,0.612,0.612,0.612v-6.122C19.866,52.041,19.592,52.314,19.592,52.653z" opacity="0.3"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_23_" x1="38.877" x2="38.877" y1="52.1279" y2="57.9301">
-<stop offset="0" style="stop-color:#1A1A1A"/>
-<stop offset="0.3212" style="stop-color:#C7C7C7"/>
-<stop offset="0.6848" style="stop-color:#4D4D4D"/>
-<stop offset="0.8545" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#7A7A7A"/>
+ <stop offset="0" style="stop-color:#1A1A1A"/>
+ <stop offset="0.3212" style="stop-color:#C7C7C7"/>
+ <stop offset="0.6848" style="stop-color:#4D4D4D"/>
+ <stop offset="0.8545" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#7A7A7A"/>
</linearGradient>
<path d="M38.571,52.041v6.122c0.339,0,0.612-0.273,0.612-0.612v-4.897 C39.184,52.314,38.91,52.041,38.571,52.041z" fill="url(#SVGID_23_)"/>
-<path d="M38.571,52.041v6.122c0.339,0,0.612-0.273,0.612-0.612v-4.897C39.184,52.314,38.91,52.041,38.571,52.041z" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M38.571,52.041v6.122c0.339,0,0.612-0.273,0.612-0.612v-4.897C39.184,52.314,38.91,52.041,38.571,52.041z" opacity="0.3"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_notes.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_notes.svg Fri May 14 16:09:54 2010 +0300
@@ -1,34 +1,35 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<stop offset="0" style="stop-color:#A36F00"/>
-<stop offset="0.8303" style="stop-color:#A36F00"/>
-<stop offset="1" style="stop-color:#DE9F01"/>
+ <stop offset="0.8303" style="stop-color:#A36F00"/>
+ <stop offset="1" style="stop-color:#DE9F01"/>
</linearGradient>
<rect fill="url(#SVGID_1_)" height="53" width="51.29" x="4.354" y="3.5"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="3.0728" y2="54.3618">
-<stop offset="0" style="stop-color:#FEE47A"/>
-<stop offset="0.3758" style="stop-color:#FFC501"/>
-<stop offset="0.7818" style="stop-color:#F6A800"/>
-<stop offset="1" style="stop-color:#FCBC01"/>
+ <stop offset="0" style="stop-color:#FEE47A"/>
+ <stop offset="0.3758" style="stop-color:#FFC501"/>
+ <stop offset="0.7818" style="stop-color:#F6A800"/>
+ <stop offset="1" style="stop-color:#FCBC01"/>
</linearGradient>
<path d="M55.645,54.789h-26.5c0,0-13.249-0.381-20.088-3.348c-4.56-1.977-4.702-4.18-4.702-4.18V3.5h51.29 V54.789z" fill="url(#SVGID_2_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="3.0728" y2="54.3618">
-<stop offset="0" style="stop-color:#FEF6D8"/>
-<stop offset="0.3758" style="stop-color:#FFDF75"/>
-<stop offset="0.7818" style="stop-color:#FFBA23"/>
-<stop offset="1" style="stop-color:#FCD823"/>
+ <stop offset="0" style="stop-color:#FEF6D8"/>
+ <stop offset="0.3758" style="stop-color:#FFDF75"/>
+ <stop offset="0.7818" style="stop-color:#FFBA23"/>
+ <stop offset="1" style="stop-color:#FCD823"/>
</linearGradient>
<path d="M4.354,3.5v43.762c0,0,0.048,0.672,0.854,1.609V4.354h49.58v49.582H19.324 c5.195,0.721,9.82,0.854,9.82,0.854h26.5V3.5H4.354z" fill="url(#SVGID_3_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="17.8213" x2="16.3792" y1="50.9248" y2="54.7289">
-<stop offset="0" style="stop-color:#FEEDA5"/>
-<stop offset="0.8182" style="stop-color:#FFC501"/>
-<stop offset="1" style="stop-color:#F6A800"/>
+ <stop offset="0" style="stop-color:#FEEDA5"/>
+ <stop offset="0.8182" style="stop-color:#FFC501"/>
+ <stop offset="1" style="stop-color:#F6A800"/>
</linearGradient>
-<path d="M31.211,54.789c0,0-15.514-0.139-21.283-8.045 c0,0-4.133,5.094-5.573,0.518C4.967,50.404,10.504,54.902,31.211,54.789z" fill="url(#SVGID_4_)" fill-rule="evenodd"/>
+<path clip-rule="evenodd" d="M31.211,54.789c0,0-15.514-0.139-21.283-8.045 c0,0-4.133,5.094-5.573,0.518C4.967,50.404,10.504,54.902,31.211,54.789z" fill="url(#SVGID_4_)" fill-rule="evenodd"/>
<rect fill="#FEEDA3" height="0.855" width="42.742" x="8.633" y="39.549"/>
<rect fill="#875703" height="1.709" width="42.742" x="8.633" y="37.84"/>
<rect fill="#FEEDA3" height="0.854" width="42.742" x="8.633" y="31.855"/>
@@ -40,61 +41,63 @@
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
-<path d="M29.387,4.245c-0.311-0.683-0.854-1.43-1.527-2.103 c-1.146-1.146-2.387-1.829-3.32-1.829c-0.574,0-0.936,0.242-1.137,0.444L10.791,13.367l0.555,0.554l-8.305,8.304l0.439,0.439 c-0.057,0.029-0.113,0.055-0.168,0.077c-0.318,0.129-0.545,0.145-0.537,0.145l0,0L2.012,22.9l-1.699,6.786l6.047-1.51l0.715-0.198 l0.041-0.734c0.002-0.002,0.016-0.23,0.146-0.559c0.021-0.051,0.045-0.104,0.076-0.165l0.439,0.439l8.305-8.305l0.553,0.553 L29.244,6.602C29.555,6.29,29.988,5.569,29.387,4.245z" fill-opacity="0.35" fill-rule="evenodd" stroke-opacity="0.35"/>
+<path clip-rule="evenodd" d="M29.387,4.245c-0.311-0.683-0.854-1.43-1.527-2.103 c-1.146-1.146-2.387-1.829-3.32-1.829c-0.574,0-0.936,0.242-1.137,0.444L10.791,13.367l0.555,0.554l-8.305,8.304l0.439,0.439 c-0.057,0.029-0.113,0.055-0.168,0.077c-0.318,0.129-0.545,0.145-0.537,0.145l0,0L2.012,22.9l-1.699,6.786l6.047-1.51l0.715-0.198 l0.041-0.734c0.002-0.002,0.016-0.23,0.146-0.559c0.021-0.051,0.045-0.104,0.076-0.165l0.439,0.439l8.305-8.305l0.553,0.553 L29.244,6.602C29.555,6.29,29.988,5.569,29.387,4.245z" fill-rule="evenodd" opacity="0.35"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 626.7343 353.4672)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-675.0313" x2="-668.7666" y1="184.2666" y2="184.2666">
-<stop offset="0" style="stop-color:#878A8C"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#5B6163"/>
-<stop offset="1" style="stop-color:#959A9C"/>
-</linearGradient>
-<path d="M27.152,2.85c-1.223-1.223-2.586-1.844-3.043-1.385 L13.313,12.26l4.43,4.429L28.537,5.895C28.996,5.436,28.377,4.072,27.152,2.85z" fill="url(#SVGID_1__)" fill-rule="evenodd"/>
-<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 626.7343 353.4672)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-674.248" x2="-669.5498" y1="199.5332" y2="199.5332">
-<stop offset="0" style="stop-color:#666666"/>
-<stop offset="0.3455" style="stop-color:#969696"/>
-<stop offset="0.7818" style="stop-color:#3B3B3B"/>
-<stop offset="1" style="stop-color:#2B2B2B"/>
+ <stop offset="0" style="stop-color:#878A8C"/>
+ <stop offset="0.2606" style="stop-color:#BDC2C4"/>
+ <stop offset="0.6606" style="stop-color:#5B6163"/>
+ <stop offset="1" style="stop-color:#959A9C"/>
</linearGradient>
-<polygon fill="url(#SVGID_2__)" fill-rule="evenodd" points="8.33,24.992 5.008,21.672 12.76,13.921 16.082,17.242 "/>
-<linearGradient gradientTransform="matrix(0.7071 0.7071 0.0471 -0.0471 -85.8835 1066.085)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="-674.2476" x2="-669.5498" y1="12046.2031" y2="12046.2031">
-<stop offset="0" style="stop-color:#B2B2B2"/>
-<stop offset="0.3818" style="stop-color:#FFFFFF"/>
-<stop offset="0.8" style="stop-color:#4D4D4D"/>
-<stop offset="1" style="stop-color:#B2B2B2"/>
+<path clip-rule="evenodd" d="M27.152,2.85c-1.223-1.223-2.586-1.844-3.043-1.385 L13.313,12.26l4.43,4.429L28.537,5.895C28.996,5.436,28.377,4.072,27.152,2.85z" fill="url(#SVGID_1__)" fill-rule="evenodd"/>
+<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 626.7343 353.4672)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-674.248" x2="-669.5498" y1="199.5332" y2="199.5332">
+ <stop offset="0" style="stop-color:#666666"/>
+ <stop offset="0.3455" style="stop-color:#969696"/>
+ <stop offset="0.7818" style="stop-color:#3B3B3B"/>
+ <stop offset="1" style="stop-color:#2B2B2B"/>
</linearGradient>
-<polygon fill="url(#SVGID_3__)" fill-rule="evenodd" points="8.33,24.992 5.008,21.672 4.455,22.225 7.777,25.546 "/>
-<rect fill="#020202" fill-opacity="0.2" fill-rule="evenodd" height="0.782" stroke-opacity="0.2" transform="matrix(0.7071 0.7071 -0.7071 0.7071 15.5849 -4.8019)" width="4.696" x="11.241" y="16.02"/>
-<rect fill="#020202" fill-opacity="0.5" fill-rule="evenodd" height="0.784" stroke-opacity="0.5" transform="matrix(0.7072 0.707 -0.707 0.7072 15.353 -5.3564)" width="4.698" x="11.795" y="15.467"/>
+<polygon clip-rule="evenodd" fill="url(#SVGID_2__)" fill-rule="evenodd" points="8.33,24.992 5.008,21.672 12.76,13.921 16.082,17.242 "/>
+<linearGradient gradientTransform="matrix(0.7071 0.7071 0.0471 -0.0471 -85.8835 1066.085)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="-674.2476" x2="-669.5498" y1="12046.2031" y2="12046.2031">
+ <stop offset="0" style="stop-color:#B2B2B2"/>
+ <stop offset="0.3818" style="stop-color:#FFFFFF"/>
+ <stop offset="0.8" style="stop-color:#4D4D4D"/>
+ <stop offset="1" style="stop-color:#B2B2B2"/>
+</linearGradient>
+<polygon clip-rule="evenodd" fill="url(#SVGID_3__)" fill-rule="evenodd" points="8.33,24.992 5.008,21.672 4.455,22.225 7.777,25.546 "/>
+<rect clip-rule="evenodd" fill="#020202" fill-rule="evenodd" height="0.782" opacity="0.2" transform="matrix(0.7071 0.7071 -0.7071 0.7071 15.5849 -4.8019)" width="4.696" x="11.241" y="16.02"/>
+<rect clip-rule="evenodd" fill="#020202" fill-rule="evenodd" height="0.784" opacity="0.5" transform="matrix(0.7072 0.707 -0.707 0.7072 15.353 -5.3564)" width="4.698" x="11.795" y="15.467"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 626.7343 353.4672)" gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="-674.2476" x2="-669.5503" y1="208.9268" y2="208.9268">
-<stop offset="0" style="stop-color:#878A8C"/>
-<stop offset="0.2606" style="stop-color:#E7EDF0"/>
-<stop offset="0.7455" style="stop-color:#5B6163"/>
-<stop offset="1" style="stop-color:#959A9C"/>
+ <stop offset="0" style="stop-color:#878A8C"/>
+ <stop offset="0.2606" style="stop-color:#E7EDF0"/>
+ <stop offset="0.7455" style="stop-color:#5B6163"/>
+ <stop offset="1" style="stop-color:#959A9C"/>
</linearGradient>
<path d="M7.225,24.992l-1.107-1.106l-1.109-1.107c-1.105,1.107-2.213,1.107-2.213,1.107l-1.107,4.427 l4.43-1.106C6.117,27.206,6.117,26.1,7.225,24.992z" fill="url(#SVGID_4__)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 626.7343 353.4672)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-675.0298" x2="-668.7666" y1="176.8291" y2="176.8291">
-<stop offset="0" style="stop-color:#666666"/>
-<stop offset="0.3455" style="stop-color:#969696"/>
-<stop offset="0.7818" style="stop-color:#3B3B3B"/>
-<stop offset="1" style="stop-color:#2B2B2B"/>
+ <stop offset="0" style="stop-color:#666666"/>
+ <stop offset="0.3455" style="stop-color:#969696"/>
+ <stop offset="0.7818" style="stop-color:#3B3B3B"/>
+ <stop offset="1" style="stop-color:#2B2B2B"/>
</linearGradient>
-<path d="M27.152,2.85c-1.223-1.223-2.586-1.844-3.043-1.385 l-0.277,0.277l4.428,4.43l0.277-0.277C28.996,5.436,28.377,4.072,27.152,2.85z" fill="url(#SVGID_5_)" fill-rule="evenodd"/>
+<path clip-rule="evenodd" d="M27.152,2.85c-1.223-1.223-2.586-1.844-3.043-1.385 l-0.277,0.277l4.428,4.43l0.277-0.277C28.996,5.436,28.377,4.072,27.152,2.85z" fill="url(#SVGID_5_)" fill-rule="evenodd"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 626.7343 353.4672)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-675.0313" x2="-668.7676" y1="193.2695" y2="193.2695">
-<stop offset="0" style="stop-color:#B2B2B2"/>
-<stop offset="0.3818" style="stop-color:#FFFFFF"/>
-<stop offset="0.8" style="stop-color:#4D4D4D"/>
-<stop offset="1" style="stop-color:#B2B2B2"/>
+ <stop offset="0" style="stop-color:#B2B2B2"/>
+ <stop offset="0.3818" style="stop-color:#FFFFFF"/>
+ <stop offset="0.8" style="stop-color:#4D4D4D"/>
+ <stop offset="1" style="stop-color:#B2B2B2"/>
</linearGradient>
-<polygon fill="url(#SVGID_6_)" fill-rule="evenodd" points="16.635,17.795 12.205,13.367 13.313,12.26 17.742,16.688 "/>
-<path d="M3.686,23.668l2.648,2.648 c0.086-0.219,0.215-0.461,0.391-0.718l-2.322-2.322C4.145,23.452,3.904,23.58,3.686,23.668z" fill="#020202" fill-opacity="0.1" fill-rule="evenodd" stroke-opacity="0.1"/>
-<path d="M6.725,25.599c0.137-0.197,0.293-0.4,0.5-0.606 l-1.107-1.106l-1.109-1.107c-0.205,0.205-0.406,0.362-0.605,0.498L6.725,25.599z" fill="#020202" fill-opacity="0.3" fill-rule="evenodd" stroke-opacity="0.3"/>
+<polygon clip-rule="evenodd" fill="url(#SVGID_6_)" fill-rule="evenodd" points="16.635,17.795 12.205,13.367 13.313,12.26 17.742,16.688 "/>
+<path clip-rule="evenodd" d="M3.686,23.668l2.648,2.648 c0.086-0.219,0.215-0.461,0.391-0.718l-2.322-2.322C4.145,23.452,3.904,23.58,3.686,23.668z" fill="#020202" fill-rule="evenodd" opacity="0.1"/>
+<path clip-rule="evenodd" d="M6.725,25.599c0.137-0.197,0.293-0.4,0.5-0.606 l-1.107-1.106l-1.109-1.107c-0.205,0.205-0.406,0.362-0.605,0.498L6.725,25.599z" fill="#020202" fill-rule="evenodd" opacity="0.3"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 626.7343 353.4672)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="-672.6821" x2="-671.1157" y1="207.7534" y2="207.7534">
-<stop offset="0" style="stop-color:#666666"/>
-<stop offset="0.3455" style="stop-color:#969696"/>
-<stop offset="0.7818" style="stop-color:#3B3B3B"/>
-<stop offset="1" style="stop-color:#2B2B2B"/>
+ <stop offset="0" style="stop-color:#666666"/>
+ <stop offset="0.3455" style="stop-color:#969696"/>
+ <stop offset="0.7818" style="stop-color:#3B3B3B"/>
+ <stop offset="1" style="stop-color:#2B2B2B"/>
</linearGradient>
-<path d="M5.287,25.822c-0.152,0.152-0.525,0.029-0.832-0.276 c-0.305-0.307-0.428-0.679-0.275-0.831s0.525-0.029,0.828,0.277C5.316,25.298,5.439,25.67,5.287,25.822z" fill="url(#SVGID_7_)" fill-rule="evenodd"/>
-<rect fill="none" fill-rule="evenodd" height="30" width="30"/>
+<path clip-rule="evenodd" d="M5.287,25.822c-0.152,0.152-0.525,0.029-0.832-0.276 c-0.305-0.307-0.428-0.679-0.275-0.831s0.525-0.029,0.828,0.277C5.316,25.298,5.439,25.67,5.287,25.822z" fill="url(#SVGID_7_)" fill-rule="evenodd"/>
+<rect clip-rule="evenodd" fill="none" fill-rule="evenodd" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ok.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ok.svg Fri May 14 16:09:54 2010 +0300
@@ -1,20 +1,22 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="5.1221" y2="44.929">
-<stop offset="0" style="stop-color:#E3FFA3"/>
-<stop offset="0.7758" style="stop-color:#73B542"/>
-<stop offset="1" style="stop-color:#AFDD76"/>
+ <stop offset="0" style="stop-color:#E3FFA3"/>
+ <stop offset="0.7758" style="stop-color:#73B542"/>
+ <stop offset="1" style="stop-color:#AFDD76"/>
</linearGradient>
<polygon fill="url(#SVGID_1_)" points="58,15.935 50.143,8.078 21.992,36.227 9.854,24.092 2,31.948 21.971,51.922 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="6.7451" y2="43.9537">
-<stop offset="0" style="stop-color:#AFED23"/>
-<stop offset="0.8121" style="stop-color:#358C0C"/>
-<stop offset="1" style="stop-color:#67AD1A"/>
+ <stop offset="0" style="stop-color:#AFED23"/>
+ <stop offset="0.8121" style="stop-color:#358C0C"/>
+ <stop offset="1" style="stop-color:#67AD1A"/>
</linearGradient>
<polygon fill="url(#SVGID_2_)" points="3.432,31.948 9.854,25.522 21.992,37.658 50.143,9.508 56.568,15.935 21.971,50.491 "/>
<rect fill="none" height="60" width="60"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_online.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_online.svg Fri May 14 16:09:54 2010 +0300
@@ -1,78 +1,76 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<stop offset="0" style="stop-color:#004E8C"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#004E8C"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</linearGradient>
<path d="M57.998,30.001C57.998,45.464,45.461,58,30,58C14.535,58,1.998,45.464,1.998,30.001 C1.998,14.54,14.535,2,30,2C45.461,2,57.998,14.54,57.998,30.001z" fill="url(#SVGID_1_)"/>
<radialGradient cx="26.9434" cy="12.7056" gradientTransform="matrix(0.9953 0 0 0.9952 2.7861 7.6702)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="33.8669">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#94FFFF"/>
+ <stop offset="0.5" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</radialGradient>
<circle cx="29.999" cy="30.001" fill="url(#SVGID_2_)" r="27.282"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="29.999" x2="29.999" y1="2.4785" y2="57.4196">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#88D6EB"/>
+ <stop offset="0" style="stop-color:#31A7F8"/>
+ <stop offset="0.497" style="stop-color:#1E74DC"/>
+ <stop offset="1" style="stop-color:#88D6EB"/>
</linearGradient>
-<path d="M30,2.718c-15.066,0-27.283,12.218-27.283,27.283c0,15.069,12.217,27.28,27.283,27.28 c15.07,0,27.281-12.211,27.281-27.28C57.281,14.937,45.07,2.718,30,2.718z M30,54.894c-14.166,0-25.691-11.524-25.691-25.688 C4.309,15.04,15.834,3.515,30,3.515S55.689,15.04,55.689,29.206C55.689,43.37,44.166,54.894,30,54.894z" fill="url(#SVGID_3_)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M30,2.718c-15.066,0-27.283,12.218-27.283,27.283c0,15.069,12.217,27.28,27.283,27.28 c15.07,0,27.281-12.211,27.281-27.28C57.281,14.937,45.07,2.718,30,2.718z M30,54.894c-14.166,0-25.691-11.524-25.691-25.688 C4.309,15.04,15.834,3.515,30,3.515S55.689,15.04,55.689,29.206C55.689,43.37,44.166,54.894,30,54.894z" fill="url(#SVGID_3_)" opacity="0.3"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="3.1621" x2="7.498" y1="33.7139" y2="33.7139">
-<stop offset="0" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#58595B"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
-<path d="M5.277,29.556C4.988,29.17,4.332,29.17,4.041,29.17c-0.57,0-0.873,0.406-0.879,0.804 v0.028v0.041c0,0.702,0.039,1.489,0.123,2.446c0.018,0.179,0.039,0.36,0.061,0.54l0.033,0.263c0.072,0.566,0.158,1.125,0.256,1.665 l0.043,0.237c0.043,0.213,0.084,0.424,0.129,0.633c0.117,0.53,0.26,1.08,0.434,1.687c0.025,0.087,0.049,0.175,0.07,0.26 c0.039,0.142,0.076,0.283,0.121,0.419l0.004,0.02l0.016,0.043c-0.002-0.011-0.01-0.03-0.012-0.048l1.564-0.106 c0.025-0.243,0.033-0.497,0.025-0.751C6.016,36.956,6,36.467,5.889,36.056l1.455-1.951l0.154-0.213v-0.264v-1.52v-0.331 l-0.232-0.232L5.277,29.556z" fill="url(#SVGID_4_)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M5.277,29.556C4.988,29.17,4.332,29.17,4.041,29.17c-0.57,0-0.873,0.406-0.879,0.804 v0.028v0.041c0,0.702,0.039,1.489,0.123,2.446c0.018,0.179,0.039,0.36,0.061,0.54l0.033,0.263c0.072,0.566,0.158,1.125,0.256,1.665 l0.043,0.237c0.043,0.213,0.084,0.424,0.129,0.633c0.117,0.53,0.26,1.08,0.434,1.687c0.025,0.087,0.049,0.175,0.07,0.26 c0.039,0.142,0.076,0.283,0.121,0.419l0.004,0.02l0.016,0.043c-0.002-0.011-0.01-0.03-0.012-0.048l1.564-0.106 c0.025-0.243,0.033-0.497,0.025-0.751C6.016,36.956,6,36.467,5.889,36.056l1.455-1.951l0.154-0.213v-0.264v-1.52v-0.331 l-0.232-0.232L5.277,29.556z" fill="url(#SVGID_4_)" opacity="0.3"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="11.5254" x2="56.9043" y1="25.7695" y2="25.7695">
-<stop offset="0" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#58595B"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
-<path d="M56.896,24.654c-0.02-0.103-0.039-0.176-0.057-0.25 c-0.016-0.055-0.027-0.109-0.037-0.162c-0.141-0.646-0.313-1.314-0.514-1.994l-0.023-0.074c-0.041-0.153-0.086-0.306-0.135-0.457 c-0.248-0.767-0.514-1.5-0.797-2.177c-0.035-0.085-0.074-0.163-0.109-0.245l-0.059-0.131c-0.268-0.619-0.568-1.238-0.883-1.833 l-0.041-0.077c-0.061-0.117-0.119-0.236-0.184-0.353c-0.385-0.695-0.789-1.358-1.199-1.974c-0.043-0.065-0.092-0.134-0.141-0.202 c-0.031-0.041-0.059-0.081-0.086-0.121c-0.395-0.571-0.807-1.126-1.236-1.656l-0.084-0.106c-0.059-0.071-0.115-0.146-0.176-0.218 c-0.498-0.596-1.023-1.174-1.566-1.72c-0.072-0.074-0.152-0.15-0.23-0.226l-0.064-0.062c-0.49-0.481-1.01-0.956-1.547-1.402 l-0.104-0.091c-0.055-0.048-0.107-0.096-0.164-0.139c-0.582-0.48-1.215-0.952-1.875-1.405c-0.08-0.055-0.164-0.109-0.248-0.162 l-0.1-0.066c-0.594-0.393-1.213-0.77-1.834-1.114l-0.098-0.055c-0.051-0.029-0.102-0.059-0.152-0.088 c-0.693-0.371-1.414-0.72-2.146-1.035L40.82,4.985l-0.199-0.083c-0.193-0.079-0.387-0.147-0.578-0.215 c-0.102-0.035-0.199-0.069-0.299-0.104l-0.371-0.138l-0.33,0.212c-0.223,0.14-1.098,0.64-1.613,0.934 c-0.574-0.077-1.961-0.251-3.359-0.386c0.432-0.042,1.025-0.09,1.869-0.146l0.117-1.573L35.994,3.47 c-0.051-0.014-0.102-0.025-0.152-0.037L35.723,3.41l-0.098-0.02c-0.857-0.172-1.662-0.297-2.461-0.38L33.16,3.009l-0.109-0.01 c-0.914-0.093-1.844-0.139-2.762-0.139c-0.809,0-1.648,0.042-2.564,0.13c-0.145,0.013-0.281,0.029-0.422,0.043 c-0.906,0.101-1.697,0.221-2.447,0.373L24.83,3.411l-0.018,0.003c-0.789,0.163-1.582,0.367-2.428,0.624 c-0.074,0.022-0.15,0.048-0.227,0.071l-0.17,0.056c-0.713,0.23-1.412,0.485-2.084,0.762c-0.057,0.023-0.094,0.037-0.131,0.051 l-0.102,0.041c-0.738,0.314-1.475,0.668-2.205,1.06c-0.078,0.041-0.156,0.087-0.232,0.13l-0.094,0.055 c-0.205,0.113-0.412,0.242-0.617,0.37L16.258,6.8l-1.461,0.893l1.623,0.542c0.242,0.082,0.504,0.123,0.773,0.123 c0.875,0,1.721-0.43,2.402-0.776c0.273-0.138,0.678-0.344,0.848-0.376c0.199,0.06,0.396,0.089,0.596,0.089 c0.746,0,1.354-0.401,1.893-0.754l0.145-0.094c0.174-0.057,0.473-0.167,1.07-0.391c0.607-0.229,1.717-0.645,2.01-0.715 c0.578-0.006,1.264-0.088,1.752-0.392c0.459,0.075,1.273,0.204,2.115,0.314C29.961,5.301,29.9,5.341,29.85,5.391 c-0.273,0.251-1.742,0.696-2.195,0.755c-0.848,0.106-1.186,0.532-1.322,0.871c-0.176,0.439-0.068,0.878,0.104,1.235 c-0.32,0.212-0.713,0.448-1.049,0.625c0-0.007,0.002-0.015,0.004-0.024c0.121-0.675,0.209-1.163-0.119-1.556 c-0.166-0.2-0.414-0.314-0.676-0.314c-0.387,0-0.688,0.239-0.93,0.473c-0.68,0.656-1.09,1.476-1.246,1.783l-0.027,0.059 l-0.025,0.044c-0.293,0.563-0.414,0.962-0.25,2.207c-0.074,0.051-0.287,0.132-0.582,0.132c-0.041,0-0.076-0.002-0.105-0.005 c-0.191-0.205-0.453-0.322-0.752-0.322l0,0c-0.684,0-1.619,0.771-2.773,2.292l-0.371,0.49l0.377,0.484l0.354,0.449 c-5.51,4.257-5.551,4.5-5.609,4.855c-0.01,0.032-0.057,0.18-0.123,0.383c-0.822,2.552-1.275,4.46-0.834,5.482 c1.025,2.368,2.182,4.579,3.68,4.701c0.133,0.011,0.277,0.017,0.434,0.017c1.373,0,3.6-0.416,4.668-0.635 c0.197,0.371,0.436,0.804,0.568,1.04l0.238,0.421l0.484-0.016c0,0,0.26-0.008,0.584-0.008c0.375,0,0.625,0.011,0.787,0.022 c0.584,1.708,1.699,5.643,1.492,6.459l-0.004,0.004c-1.885,2.821,0.4,6.499,1.494,8.269c0.088,0.14,0.168,0.266,0.232,0.374 c0.424,1.204,0.934,2.002,2.02,2.002c0.078,0,0.16-0.005,0.244-0.009c0.063-0.004,0.125-0.007,0.191-0.007 c0.121,0,0.207,0.014,0.293,0.045l0.1,0.036l0.105,0.01c0.205,0.017,0.4,0.045,0.592,0.071c0.334,0.047,0.68,0.095,1.031,0.095 c0.941,0,1.689-0.357,2.336-1.119c0.021-0.004,0.045-0.005,0.068-0.008c0.678-0.095,0.932-0.433,1.018-0.737 c0.051-0.05,0.117-0.112,0.172-0.164c0.268-0.244,0.584-0.537,0.803-0.88c0.1-0.059,0.213-0.125,0.338-0.2 c0.219-0.134,0.465-0.283,0.658-0.382c0.172-0.052,0.322-0.153,0.436-0.293c0.273-0.335,0.217-0.717,0.172-1.023 c-0.047-0.318-0.092-0.642,0.078-0.99c0.965-0.465,2.68-1.608,2.957-1.796v0.022c-0.02,0.153-0.064,0.563-0.133,0.822 c-0.363,0.366-0.67,0.919-0.766,1.105l-0.063,0.121l-0.02,0.137c-0.023,0.18-0.123,1.11,0.4,1.712 c0.264,0.301,0.641,0.468,1.063,0.468c0.131,0,0.271-0.017,0.416-0.05c1.342-0.304,3.723-3.531,3.916-5.312 c0.096-0.859-0.24-1.534-0.918-1.852l-0.506-0.24l-0.398,0.396l-1.469,1.471c-0.498,0.046-0.887,0.193-1.148,0.425 c0.016-0.627-0.047-1.27-0.113-1.896c-0.201-1.891-0.24-3.097,0.92-3.915l0.059-0.043l0.051-0.051 c0.418-0.426,0.883-0.799,1.373-1.193c1.15-0.924,2.34-1.878,3.047-3.604l0.031-0.074c0.227-0.59,0.568-1.478,0.104-2.158 c-0.115-0.167-0.359-0.426-0.814-0.518c0.604-0.242,1.066-0.435,1.111-0.452l0.141-0.059l0.109-0.104l2.48-2.381l0.363-0.35 l-0.16-0.479c-0.021-0.062-0.158-0.438-0.537-0.977c0.725,0.099,1.344,0.272,1.549,0.427c0.074,0.163,0.221,0.519,0.379,0.892 c2.732,6.435,3.115,6.766,3.824,6.777c0.027,0,0.049,0.002,0.066,0.005c0.057,0.002,0.109,0.006,0.156,0.006 c0.404,0,0.635-0.207,0.736-0.331c0.297-0.357,0.215-0.795,0.184-0.959l-0.012-0.056c-0.033-0.384-0.012-2.113,0.045-3.536 c0.004,0.004,0.006,0.008,0.008,0.013l1.463-0.58L56.896,24.654z M35.391,16.784c-0.113,0.005-0.238,0.012-0.367,0.017 c-0.422,0.018-0.902,0.04-1.377,0.04c-1.25,0-1.533-0.155-1.564-0.171c-0.146-0.107-0.297-0.188-0.457-0.246 c0.285-0.063,0.607-0.279,0.939-0.924c0.33,0.636,0.773,1.198,1.457,1.198c0.184,0,0.363-0.045,0.531-0.131 C34.783,16.568,35.162,16.7,35.391,16.784z M34.9,13.303c-0.094,0-0.172-0.005-0.23-0.009c0.064-0.167,0.141-0.264,0.201-0.319 c0.08,0.122,0.186,0.229,0.305,0.32C35.078,13.301,34.986,13.303,34.9,13.303z M29.932,14.974c0.428,0.837,0.744,1.198,0.994,1.355 c-0.619,0.049-1.086,0.443-1.469,0.817c-0.271-0.09-0.74-0.374-0.879-0.572c-0.084-0.117-0.18-0.217-0.287-0.304 C28.969,16.077,29.564,15.447,29.932,14.974z M27.57,14.355l-0.889-0.043l-2.975-0.146c0.361-0.299,0.707-0.579,0.91-0.745 c0.055-0.02,0.27-0.078,0.793-0.078c0.314,0,0.617,0.021,0.809,0.037L27.57,14.355z" fill="url(#SVGID_5_)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M56.896,24.654c-0.02-0.103-0.039-0.176-0.057-0.25 c-0.016-0.055-0.027-0.109-0.037-0.162c-0.141-0.646-0.313-1.314-0.514-1.994l-0.023-0.074c-0.041-0.153-0.086-0.306-0.135-0.457 c-0.248-0.767-0.514-1.5-0.797-2.177c-0.035-0.085-0.074-0.163-0.109-0.245l-0.059-0.131c-0.268-0.619-0.568-1.238-0.883-1.833 l-0.041-0.077c-0.061-0.117-0.119-0.236-0.184-0.353c-0.385-0.695-0.789-1.358-1.199-1.974c-0.043-0.065-0.092-0.134-0.141-0.202 c-0.031-0.041-0.059-0.081-0.086-0.121c-0.395-0.571-0.807-1.126-1.236-1.656l-0.084-0.106c-0.059-0.071-0.115-0.146-0.176-0.218 c-0.498-0.596-1.023-1.174-1.566-1.72c-0.072-0.074-0.152-0.15-0.23-0.226l-0.064-0.062c-0.49-0.481-1.01-0.956-1.547-1.402 l-0.104-0.091c-0.055-0.048-0.107-0.096-0.164-0.139c-0.582-0.48-1.215-0.952-1.875-1.405c-0.08-0.055-0.164-0.109-0.248-0.162 l-0.1-0.066c-0.594-0.393-1.213-0.77-1.834-1.114l-0.098-0.055c-0.051-0.029-0.102-0.059-0.152-0.088 c-0.693-0.371-1.414-0.72-2.146-1.035L40.82,4.985l-0.199-0.083c-0.193-0.079-0.387-0.147-0.578-0.215 c-0.102-0.035-0.199-0.069-0.299-0.104l-0.371-0.138l-0.33,0.212c-0.223,0.14-1.098,0.64-1.613,0.934 c-0.574-0.077-1.961-0.251-3.359-0.386c0.432-0.042,1.025-0.09,1.869-0.146l0.117-1.573L35.994,3.47 c-0.051-0.014-0.102-0.025-0.152-0.037L35.723,3.41l-0.098-0.02c-0.857-0.172-1.662-0.297-2.461-0.38L33.16,3.009l-0.109-0.01 c-0.914-0.093-1.844-0.139-2.762-0.139c-0.809,0-1.648,0.042-2.564,0.13c-0.145,0.013-0.281,0.029-0.422,0.043 c-0.906,0.101-1.697,0.221-2.447,0.373L24.83,3.411l-0.018,0.003c-0.789,0.163-1.582,0.367-2.428,0.624 c-0.074,0.022-0.15,0.048-0.227,0.071l-0.17,0.056c-0.713,0.23-1.412,0.485-2.084,0.762c-0.057,0.023-0.094,0.037-0.131,0.051 l-0.102,0.041c-0.738,0.314-1.475,0.668-2.205,1.06c-0.078,0.041-0.156,0.087-0.232,0.13l-0.094,0.055 c-0.205,0.113-0.412,0.242-0.617,0.37L16.258,6.8l-1.461,0.893l1.623,0.542c0.242,0.082,0.504,0.123,0.773,0.123 c0.875,0,1.721-0.43,2.402-0.776c0.273-0.138,0.678-0.344,0.848-0.376c0.199,0.06,0.396,0.089,0.596,0.089 c0.746,0,1.354-0.401,1.893-0.754l0.145-0.094c0.174-0.057,0.473-0.167,1.07-0.391c0.607-0.229,1.717-0.645,2.01-0.715 c0.578-0.006,1.264-0.088,1.752-0.392c0.459,0.075,1.273,0.204,2.115,0.314C29.961,5.301,29.9,5.341,29.85,5.391 c-0.273,0.251-1.742,0.696-2.195,0.755c-0.848,0.106-1.186,0.532-1.322,0.871c-0.176,0.439-0.068,0.878,0.104,1.235 c-0.32,0.212-0.713,0.448-1.049,0.625c0-0.007,0.002-0.015,0.004-0.024c0.121-0.675,0.209-1.163-0.119-1.556 c-0.166-0.2-0.414-0.314-0.676-0.314c-0.387,0-0.688,0.239-0.93,0.473c-0.68,0.656-1.09,1.476-1.246,1.783l-0.027,0.059 l-0.025,0.044c-0.293,0.563-0.414,0.962-0.25,2.207c-0.074,0.051-0.287,0.132-0.582,0.132c-0.041,0-0.076-0.002-0.105-0.005 c-0.191-0.205-0.453-0.322-0.752-0.322l0,0c-0.684,0-1.619,0.771-2.773,2.292l-0.371,0.49l0.377,0.484l0.354,0.449 c-5.51,4.257-5.551,4.5-5.609,4.855c-0.01,0.032-0.057,0.18-0.123,0.383c-0.822,2.552-1.275,4.46-0.834,5.482 c1.025,2.368,2.182,4.579,3.68,4.701c0.133,0.011,0.277,0.017,0.434,0.017c1.373,0,3.6-0.416,4.668-0.635 c0.197,0.371,0.436,0.804,0.568,1.04l0.238,0.421l0.484-0.016c0,0,0.26-0.008,0.584-0.008c0.375,0,0.625,0.011,0.787,0.022 c0.584,1.708,1.699,5.643,1.492,6.459l-0.004,0.004c-1.885,2.821,0.4,6.499,1.494,8.269c0.088,0.14,0.168,0.266,0.232,0.374 c0.424,1.204,0.934,2.002,2.02,2.002c0.078,0,0.16-0.005,0.244-0.009c0.063-0.004,0.125-0.007,0.191-0.007 c0.121,0,0.207,0.014,0.293,0.045l0.1,0.036l0.105,0.01c0.205,0.017,0.4,0.045,0.592,0.071c0.334,0.047,0.68,0.095,1.031,0.095 c0.941,0,1.689-0.357,2.336-1.119c0.021-0.004,0.045-0.005,0.068-0.008c0.678-0.095,0.932-0.433,1.018-0.737 c0.051-0.05,0.117-0.112,0.172-0.164c0.268-0.244,0.584-0.537,0.803-0.88c0.1-0.059,0.213-0.125,0.338-0.2 c0.219-0.134,0.465-0.283,0.658-0.382c0.172-0.052,0.322-0.153,0.436-0.293c0.273-0.335,0.217-0.717,0.172-1.023 c-0.047-0.318-0.092-0.642,0.078-0.99c0.965-0.465,2.68-1.608,2.957-1.796v0.022c-0.02,0.153-0.064,0.563-0.133,0.822 c-0.363,0.366-0.67,0.919-0.766,1.105l-0.063,0.121l-0.02,0.137c-0.023,0.18-0.123,1.11,0.4,1.712 c0.264,0.301,0.641,0.468,1.063,0.468c0.131,0,0.271-0.017,0.416-0.05c1.342-0.304,3.723-3.531,3.916-5.312 c0.096-0.859-0.24-1.534-0.918-1.852l-0.506-0.24l-0.398,0.396l-1.469,1.471c-0.498,0.046-0.887,0.193-1.148,0.425 c0.016-0.627-0.047-1.27-0.113-1.896c-0.201-1.891-0.24-3.097,0.92-3.915l0.059-0.043l0.051-0.051 c0.418-0.426,0.883-0.799,1.373-1.193c1.15-0.924,2.34-1.878,3.047-3.604l0.031-0.074c0.227-0.59,0.568-1.478,0.104-2.158 c-0.115-0.167-0.359-0.426-0.814-0.518c0.604-0.242,1.066-0.435,1.111-0.452l0.141-0.059l0.109-0.104l2.48-2.381l0.363-0.35 l-0.16-0.479c-0.021-0.062-0.158-0.438-0.537-0.977c0.725,0.099,1.344,0.272,1.549,0.427c0.074,0.163,0.221,0.519,0.379,0.892 c2.732,6.435,3.115,6.766,3.824,6.777c0.027,0,0.049,0.002,0.066,0.005c0.057,0.002,0.109,0.006,0.156,0.006 c0.404,0,0.635-0.207,0.736-0.331c0.297-0.357,0.215-0.795,0.184-0.959l-0.012-0.056c-0.033-0.384-0.012-2.113,0.045-3.536 c0.004,0.004,0.006,0.008,0.008,0.013l1.463-0.58L56.896,24.654z M35.391,16.784c-0.113,0.005-0.238,0.012-0.367,0.017 c-0.422,0.018-0.902,0.04-1.377,0.04c-1.25,0-1.533-0.155-1.564-0.171c-0.146-0.107-0.297-0.188-0.457-0.246 c0.285-0.063,0.607-0.279,0.939-0.924c0.33,0.636,0.773,1.198,1.457,1.198c0.184,0,0.363-0.045,0.531-0.131 C34.783,16.568,35.162,16.7,35.391,16.784z M34.9,13.303c-0.094,0-0.172-0.005-0.23-0.009c0.064-0.167,0.141-0.264,0.201-0.319 c0.08,0.122,0.186,0.229,0.305,0.32C35.078,13.301,34.986,13.303,34.9,13.303z M29.932,14.974c0.428,0.837,0.744,1.198,0.994,1.355 c-0.619,0.049-1.086,0.443-1.469,0.817c-0.271-0.09-0.74-0.374-0.879-0.572c-0.084-0.117-0.18-0.217-0.287-0.304 C28.969,16.077,29.564,15.447,29.932,14.974z M27.57,14.355l-0.889-0.043l-2.975-0.146c0.361-0.299,0.707-0.579,0.91-0.745 c0.055-0.02,0.27-0.078,0.793-0.078c0.314,0,0.617,0.021,0.809,0.037L27.57,14.355z" fill="url(#SVGID_5_)" opacity="0.3"/>
<radialGradient cx="27.8105" cy="3.104" gradientTransform="matrix(0.9953 0 0 0.9952 2.7861 7.6702)" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="30.9363">
-<stop offset="0" style="stop-color:#7AF200"/>
-<stop offset="0.3152" style="stop-color:#7AF200"/>
-<stop offset="0.7273" style="stop-color:#1CAD0F"/>
-<stop offset="1" style="stop-color:#007A3A"/>
+ <stop offset="0.3152" style="stop-color:#7AF200"/>
+ <stop offset="0.7273" style="stop-color:#1CAD0F"/>
+ <stop offset="1" style="stop-color:#007A3A"/>
</radialGradient>
<path d="M3.957,29.985c0,0,0,0,0,0.002c0,0.01,0.002,0.014,0.002,0.021c0,0.813,0.051,1.615,0.119,2.41 c0.023,0.259,0.063,0.52,0.092,0.781c0.07,0.544,0.15,1.082,0.248,1.615c0.055,0.283,0.107,0.567,0.166,0.845 c0.123,0.553,0.266,1.097,0.422,1.632c0.063,0.222,0.113,0.447,0.184,0.663C5.197,37.978,5.207,38,5.213,38.023 c0.021-0.212,0.027-0.427,0.021-0.648c-0.053-1.568-0.303-1.367-0.303-1.367l1.771-2.381v-1.52L4.625,30.03 C4.625,30.03,3.959,29.926,3.957,29.985z" fill="url(#SVGID_6_)"/>
<radialGradient cx="27.8096" cy="3.1069" gradientTransform="matrix(0.9953 0 0 0.9952 2.7861 7.6702)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="30.9388">
-<stop offset="0" style="stop-color:#7AF200"/>
-<stop offset="0.3152" style="stop-color:#7AF200"/>
-<stop offset="0.7273" style="stop-color:#1CAD0F"/>
-<stop offset="1" style="stop-color:#007A3A"/>
+ <stop offset="0.3152" style="stop-color:#7AF200"/>
+ <stop offset="0.7273" style="stop-color:#1CAD0F"/>
+ <stop offset="1" style="stop-color:#007A3A"/>
</radialGradient>
<path d="M20.631,6.433c0.766,0.252,1.395-0.26,2.109-0.717c0.252-0.051,3.055-1.17,3.357-1.17 c0.301,0,1.32-0.04,1.572-0.444c0,0,4.387,0.763,5.049,0.508c0.359-0.141,1.869-0.26,3.17-0.346 c-0.074-0.016-0.141-0.037-0.213-0.052c-0.07-0.014-0.141-0.026-0.211-0.04c-0.814-0.163-1.637-0.295-2.475-0.378 c-0.006,0-0.012,0-0.02-0.004c-0.881-0.088-1.775-0.135-2.682-0.135c-0.84,0-1.67,0.05-2.492,0.127 c-0.143,0.015-0.287,0.031-0.434,0.046c-0.793,0.086-1.578,0.203-2.35,0.357C25,4.191,24.986,4.192,24.973,4.193 c-0.801,0.166-1.584,0.371-2.355,0.606c-0.133,0.039-0.26,0.085-0.393,0.125c-0.684,0.221-1.357,0.466-2.02,0.737 c-0.076,0.034-0.156,0.063-0.234,0.095c-0.727,0.31-1.438,0.654-2.129,1.024c-0.104,0.056-0.203,0.116-0.307,0.175 c-0.299,0.165-0.576,0.349-0.861,0.525C18.098,7.957,19.877,6.178,20.631,6.433z" fill="url(#SVGID_7_)"/>
<radialGradient cx="27.8066" cy="3.105" gradientTransform="matrix(0.9953 0 0 0.9952 2.7861 7.6702)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="30.9346">
-<stop offset="0" style="stop-color:#B2F56E"/>
-<stop offset="0.3152" style="stop-color:#B2F56E"/>
-<stop offset="0.7273" style="stop-color:#5CBF1B"/>
-<stop offset="1" style="stop-color:#227A00"/>
+ <stop offset="0.3152" style="stop-color:#B2F56E"/>
+ <stop offset="0.7273" style="stop-color:#5CBF1B"/>
+ <stop offset="1" style="stop-color:#227A00"/>
</radialGradient>
<path d="M56.111,24.787c-0.027-0.133-0.064-0.258-0.09-0.388c-0.141-0.65-0.307-1.292-0.494-1.924 c-0.051-0.171-0.102-0.346-0.154-0.515c-0.23-0.718-0.484-1.426-0.773-2.113c-0.051-0.121-0.109-0.24-0.16-0.358 c-0.266-0.606-0.553-1.201-0.861-1.782c-0.07-0.139-0.143-0.282-0.217-0.417c-0.365-0.657-0.75-1.297-1.166-1.919 c-0.068-0.107-0.15-0.21-0.223-0.316c-0.379-0.553-0.777-1.086-1.195-1.605c-0.086-0.103-0.166-0.209-0.254-0.313 c-0.482-0.578-0.986-1.135-1.518-1.669c-0.09-0.092-0.188-0.183-0.281-0.272c-0.482-0.475-0.984-0.933-1.506-1.369 c-0.09-0.073-0.17-0.151-0.26-0.223c-0.584-0.478-1.195-0.933-1.822-1.362c-0.109-0.075-0.223-0.148-0.334-0.219 c-0.578-0.384-1.174-0.747-1.785-1.085c-0.084-0.045-0.16-0.094-0.244-0.141c-0.68-0.363-1.371-0.696-2.082-1.003 c-0.125-0.053-0.256-0.103-0.379-0.155c-0.277-0.115-0.563-0.206-0.844-0.309c-0.334,0.213-1.881,1.088-1.881,1.088 s-6.717-0.917-7.174-0.462c-0.459,0.462-2.248,0.929-2.656,0.981c-0.406,0.053-1.25,0.27-0.238,1.518 c-0.152,0.155-3.039,2.165-3.039,1.25c0-0.916,0.645-2.552-0.26-1.676c-0.652,0.631-1.039,1.483-1.127,1.643 c-0.211,0.409-0.342,0.604-0.188,1.773c0.154,1.171-1.869,1.164-2.004,0.862c-0.363-0.813-2.363,1.821-2.363,1.821l0.844,1.082 c0,0-5.893,4.539-5.941,4.844c-0.053,0.307-1.523,4.247-1.016,5.418c0.512,1.174,1.797,4.127,3.016,4.226 c1.598,0.131,5.469-0.73,5.469-0.73c0.104,0.257,0.834,1.556,0.834,1.556s1.896-0.063,2.004,0.143 c0.035,0.069,2.287,6.693,1.543,7.571c-1.773,2.656,1.014,6.548,1.789,7.864c0.775,2.262,1.277,1.25,2.297,1.62 c1.258,0.108,2.318,0.573,3.385-0.8c0.309-0.255,0.836-0.054,0.836-0.408c0-0.198,0.912-0.781,1.146-1.33 c0.248-0.114,0.881-0.542,1.313-0.748c0.391-0.025-0.371-1.071,0.402-2.177c0.836-0.33,3.088-1.849,3.088-1.849 c0.104-2.227-1.094-4.979,1.141-6.559c1.445-1.47,3.336-2.306,4.256-4.544c0.252-0.661,0.818-2.014-0.813-1.609 c-1.531,0.386-3.238,0.474-2.432-0.201c-0.092-0.828-1.111-1.218-2.023-2.026c-0.473-1.117-1.215-3.108-1.215-3.108l-1.621-2.463 l0.203-0.508l1.926,2.836l1.926,2.328c0.707,2.33,1.314,2.535,1.314,2.535c1.068-0.377,3.596-1.419,3.596-1.419l2.484-2.381 c0,0-0.256-0.761-1.264-1.722l-0.764-0.455c-0.166,0.467-1.049,0.642-1.049,0.642l-2.145-2.564l0.801-0.162l0.613,1.171l1.473,0.509 c0,0,0.408-0.298,1.166,0.484c0.619-0.051,3.029,0.117,3.594,0.832c0.109,0.142,2.986,7.325,3.555,7.336 c0.248,0.001,0.43,0.099,0.348-0.335c-0.102-0.205,0-4.717,0.154-5.683c0.385-0.821,0.445-0.002,1.357,1.553 C56.121,24.862,56.119,24.824,56.111,24.787z M30.797,7.378c0.201-0.6,1.367-0.804,1.367-0.804s-0.334,0.618-0.258,0.937 c0.08,0.322-0.533,0.524-0.6,1.282c-0.066,0.755-1.459,0.313-1.574,0.047C29.617,8.577,30.592,7.977,30.797,7.378z M35.793,17.571 c-0.865,0-3.455,0.257-4.17-0.253c-0.711-0.508-1.266,0.052-1.781,0.562c-0.334,0.331-1.559-0.339-1.916-0.848 c-0.355-0.509-1.553-0.472-1.553-0.472l0.271-1.452l-3.445-0.167l-1.957,0.574l-1.844,0.052l1.031-0.491l1.287-0.304 c0,0,1.867-1.536,2.43-1.993c0.475-0.388,2.365-0.169,2.365-0.169l2.074,1.497c0,0-0.459,1.174-0.662,1.426 c0.76-0.05,1.658-1.436,1.658-1.436c-1.621-1.488-1.555-1.992-1.555-1.992l2.133,1.498l0.021,0.013c0,0,0.865,2.035,1.225,2.035 c0.352,0,0.809-1.401,0.809-1.401l0.609-0.153c0.27,0.642,0.773,2.094,1.381,1.754c0.35-0.193,0.928-0.017,1.588,0.236 c0.664,0.255,1.115-0.137,1.654,0.337C37.381,18.519,36.15,17.674,35.793,17.571z M37.148,14.068c-0.891-0.339-3.9,0.766-3.229-1.04 c0.359-0.975,1.281-1.179,1.598-0.531c0.082,0.267,1.084,0.679,1.076,0.117c-0.006-0.562,1.01-0.86,1.154-0.441 C37.207,12.563,39.863,14.589,37.148,14.068z M42.816,15.78c-0.492-0.397,0.223-0.738-0.506-1.359 c-1.041-0.895-1.855-1.278-0.436-2.002c1.754-0.221,0.283,0.559,0.576,1.027c0.156,0.247,1.039,1.08,1.73,2.103 C44.756,16.397,43.307,16.175,42.816,15.78z" fill="url(#SVGID_8_)"/>
<radialGradient cx="27.8125" cy="3.1055" gradientTransform="matrix(0.9953 0 0 0.9952 2.7861 7.6702)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="30.9328">
-<stop offset="0" style="stop-color:#7AF200"/>
-<stop offset="0.3152" style="stop-color:#7AF200"/>
-<stop offset="0.7273" style="stop-color:#1CAD0F"/>
-<stop offset="1" style="stop-color:#007A3A"/>
+ <stop offset="0.3152" style="stop-color:#7AF200"/>
+ <stop offset="0.7273" style="stop-color:#1CAD0F"/>
+ <stop offset="1" style="stop-color:#007A3A"/>
</radialGradient>
<path d="M43.523,38.979l-1.689,1.688c0,0-1.016,0-1.064,0.406c-0.023,0.174-0.082,0.927-0.252,1.315 c-0.338,0.235-0.742,1.012-0.742,1.012s-0.211,1.504,0.912,1.249C41.809,44.395,45.256,39.795,43.523,38.979z" fill="url(#SVGID_9_)"/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
-<path d="M15,30C6.729,30,0,23.271,0,15.001C0,6.729,6.729,0,15,0c8.271,0,15,6.729,15,15.001 C30,23.271,23.271,30,15,30L15,30z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M15,30C6.729,30,0,23.271,0,15.001C0,6.729,6.729,0,15,0c8.271,0,15,6.729,15,15.001 C30,23.271,23.271,30,15,30L15,30z" opacity="0.35"/>
<radialGradient cx="15.2446" cy="7.1245" gradientTransform="matrix(1 0 0 1 0 0.2666)" gradientUnits="userSpaceOnUse" id="SVGID_1__" r="27.4219">
-<stop offset="0" style="stop-color:#C5FF4D"/>
-<stop offset="0.1273" style="stop-color:#C5FF4D"/>
-<stop offset="0.5576" style="stop-color:#428C0F"/>
-<stop offset="0.9758" style="stop-color:#C5FF4D"/>
-<stop offset="1" style="stop-color:#C5FF4D"/>
+ <stop offset="0.1273" style="stop-color:#C5FF4D"/>
+ <stop offset="0.5576" style="stop-color:#428C0F"/>
+ <stop offset="0.9758" style="stop-color:#C5FF4D"/>
</radialGradient>
<circle cx="15" cy="15.001" fill="url(#SVGID_1__)" r="14"/>
-<path d="M14.945,13.573c-4.122,0-8.019-0.584-11.498-1.616c0.27-5.423,5.34-9.751,11.57-9.751 c6.215,0,11.274,4.304,11.569,9.707C23.071,12.973,19.125,13.573,14.945,13.573z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M15.017,2.936c5.939,0,10.813,3.934,11.491,9c0.025-0.007,0.053-0.015,0.078-0.022 c-0.295-5.403-5.354-9.707-11.569-9.707c-6.23,0-11.301,4.328-11.57,9.751c0.024,0.006,0.05,0.013,0.075,0.02 C4.178,6.893,9.062,2.936,15.017,2.936z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M14.945,13.573c-4.122,0-8.019-0.584-11.498-1.616c0.27-5.423,5.34-9.751,11.57-9.751 c6.215,0,11.274,4.304,11.569,9.707C23.071,12.973,19.125,13.573,14.945,13.573z" fill="#FFFFFF" opacity="0.2"/>
+<path d="M15.017,2.936c5.939,0,10.813,3.934,11.491,9c0.025-0.007,0.053-0.015,0.078-0.022 c-0.295-5.403-5.354-9.707-11.569-9.707c-6.23,0-11.301,4.328-11.57,9.751c0.024,0.006,0.05,0.013,0.075,0.02 C4.178,6.893,9.062,2.936,15.017,2.936z" fill="#FFFFFF" opacity="0.2"/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ovi_suite.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ovi_suite.svg Fri May 14 16:09:54 2010 +0300
@@ -1,38 +1,7 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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">
-<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="M56.506,7.6H3.493C2.666,7.6,2,8.27,2,9.094v41.813C2,51.732,2.666,52.4,3.493,52.4h53.013 C57.33,52.4,58,51.732,58,50.906V9.094C58,8.27,57.33,7.6,56.506,7.6z M8.719,49.413c0,0.412-0.336,0.748-0.745,0.748H4.986 c-0.412,0-0.748-0.336-0.748-0.748V47.92c0-0.41,0.336-0.746,0.748-0.746h2.987c0.409,0,0.745,0.336,0.745,0.746V49.413z M8.719,12.08c0,0.41-0.336,0.746-0.745,0.746H4.986c-0.412,0-0.748-0.336-0.748-0.746v-1.493c0-0.409,0.336-0.748,0.748-0.748 h2.987c0.409,0,0.745,0.339,0.745,0.748V12.08z M15.438,49.413c0,0.412-0.335,0.748-0.745,0.748h-2.987 c-0.412,0-0.747-0.336-0.747-0.748V47.92c0-0.41,0.335-0.746,0.747-0.746h2.987c0.41,0,0.745,0.336,0.745,0.746V49.413z M15.438,12.08c0,0.41-0.335,0.746-0.745,0.746h-2.987c-0.412,0-0.747-0.336-0.747-0.746v-1.493c0-0.409,0.335-0.748,0.747-0.748 h2.987c0.41,0,0.745,0.339,0.745,0.748V12.08z M22.159,49.413c0,0.412-0.337,0.748-0.747,0.748h-2.986 c-0.41,0-0.746-0.336-0.746-0.748V47.92c0-0.41,0.335-0.746,0.746-0.746h2.986c0.41,0,0.747,0.336,0.747,0.746V49.413z M22.159,12.08c0,0.41-0.337,0.746-0.747,0.746h-2.986c-0.41,0-0.746-0.336-0.746-0.746v-1.493c0-0.409,0.335-0.748,0.746-0.748 h2.986c0.41,0,0.747,0.339,0.747,0.748V12.08z M28.88,49.413c0,0.412-0.337,0.748-0.747,0.748h-2.986 c-0.411,0-0.746-0.336-0.746-0.748V47.92c0-0.41,0.335-0.746,0.746-0.746h2.986c0.41,0,0.747,0.336,0.747,0.746V49.413z M28.88,12.08c0,0.41-0.337,0.746-0.747,0.746h-2.986c-0.411,0-0.746-0.336-0.746-0.746v-1.493c0-0.409,0.335-0.748,0.746-0.748 h2.986c0.41,0,0.747,0.339,0.747,0.748V12.08z M35.6,49.413c0,0.412-0.338,0.748-0.747,0.748h-2.985 c-0.412,0-0.748-0.336-0.748-0.748V47.92c0-0.41,0.336-0.746,0.748-0.746h2.985c0.409,0,0.747,0.336,0.747,0.746V49.413z M35.6,12.08c0,0.41-0.338,0.746-0.747,0.746h-2.985c-0.412,0-0.748-0.336-0.748-0.746v-1.493c0-0.409,0.336-0.748,0.748-0.748 h2.985c0.409,0,0.747,0.339,0.747,0.748V12.08z M42.318,49.413c0,0.412-0.335,0.748-0.745,0.748h-2.987 c-0.412,0-0.746-0.336-0.746-0.748V47.92c0-0.41,0.334-0.746,0.746-0.746h2.987c0.41,0,0.745,0.336,0.745,0.746V49.413z M42.318,12.08c0,0.41-0.335,0.746-0.745,0.746h-2.987c-0.412,0-0.746-0.336-0.746-0.746v-1.493c0-0.409,0.334-0.748,0.746-0.748 h2.987c0.41,0,0.745,0.339,0.745,0.748V12.08z M49.039,49.413c0,0.412-0.336,0.748-0.746,0.748h-2.987 c-0.41,0-0.745-0.336-0.745-0.748V47.92c0-0.41,0.335-0.746,0.745-0.746h2.987c0.41,0,0.746,0.336,0.746,0.746V49.413z M49.039,12.08c0,0.41-0.336,0.746-0.746,0.746h-2.987c-0.41,0-0.745-0.336-0.745-0.746v-1.493c0-0.409,0.335-0.748,0.745-0.748 h2.987c0.41,0,0.746,0.339,0.746,0.748V12.08z M55.761,49.413c0,0.412-0.339,0.748-0.748,0.748h-2.987 c-0.41,0-0.745-0.336-0.745-0.748V47.92c0-0.41,0.335-0.746,0.745-0.746h2.987c0.409,0,0.748,0.336,0.748,0.746V49.413z M55.761,12.08c0,0.41-0.339,0.746-0.748,0.746h-2.987c-0.41,0-0.745-0.336-0.745-0.746v-1.493c0-0.409,0.335-0.748,0.745-0.748 h2.987c0.409,0,0.748,0.339,0.748,0.748V12.08z" fill="url(#SVGID_1_)"/>
-<path d="M56.506,7.6H3.493C2.666,7.6,2,8.27,2,9.094v0.745 c0-0.824,0.666-1.493,1.493-1.493h53.013C57.33,8.346,58,9.015,58,9.839V9.094C58,8.27,57.33,7.6,56.506,7.6z" fill="#FFFFFF" fill-opacity="0.55" stroke-opacity="0.55"/>
-<path d="M3.493,52.4h53.013C57.33,52.4,58,51.732,58,50.906v-0.745 c0,0.824-0.67,1.493-1.494,1.493H3.493C2.666,51.654,2,50.985,2,50.161v0.745C2,51.732,2.666,52.4,3.493,52.4z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2164" x2="-2164" y1="3641.7637" y2="3611.8926">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="0.5" style="stop-color:#666666"/>
-<stop offset="1" style="stop-color:#000000"/>
-</linearGradient>
-<rect fill="url(#SVGID_2_)" height="29.871" width="56" x="2" y="15.064"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2164.0005" x2="-2164.0005" y1="3612.0117" y2="3641.8828">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
-</linearGradient>
-<path d="M55.761,43.441c0,0.821-0.673,1.494-1.493,1.494H5.732c-0.82,0-1.494-0.673-1.494-1.494V16.559 c0-0.819,0.674-1.494,1.494-1.494h48.535c0.82,0,1.493,0.675,1.493,1.494V43.441z" fill="url(#SVGID_3_)"/>
-<path d="M54.268,43.441H5.732c-0.82,0-1.494,0.074-1.494-0.748l0,0 c0,0.822,0.674,1.493,1.494,1.493h48.535c0.82,0,1.493-0.671,1.493-1.493l0,0C55.761,43.516,55.088,43.441,54.268,43.441z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-2164.0005" x2="-2164.0005" y1="3641.8828" y2="3611.8926">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#404040"/>
-</linearGradient>
-<path d="M54.268,15.813c0.41,0,0.745,0.336,0.745,0.745v26.883c0,0.412-0.335,0.745-0.745,0.745H5.732 c-0.411,0-0.746-0.333-0.746-0.745V16.559c0-0.409,0.335-0.745,0.746-0.745H54.268 M54.268,15.064H5.732 c-0.82,0-1.494,0.675-1.494,1.494v26.883c0,0.821,0.674,1.494,1.494,1.494h48.535c0.82,0,1.493-0.673,1.493-1.494V16.559 C55.761,15.739,55.088,15.064,54.268,15.064L54.268,15.064z" fill="url(#SVGID_4_)"/>
-<path d="M54.268,24.025v-5.974c0-0.824-0.67-1.493-1.494-1.493H7.226 c-0.824,0-1.493,0.669-1.493,1.493v9.709L54.268,24.025z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<rect fill="none" height="60" width="60"/>
-</g>
-<g transform="matrix(0.5 0 0 0.5 0 0)">
<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"/>
<path d="M33.17,41.91c2.304,0,3.116-1.152,3.665-2.83l4.954-16.36h-4.624l-3.548,14.15-3.339-14.15h-5.479l4.704,16.36c0.51,1.68,1.37,2.83,3.67,2.83z" fill="#FFFFFF"/>
@@ -40,35 +9,4 @@
<path d="M44.65,41.39c0.39,0.279,0.999,0.523,1.859,0.523,0.905,0,1.492-0.244,1.879-0.523,0.746-0.523,0.746-1.41,0.746-1.893v-16.77h-5.167-0.355c-0.502,0-0.92,0.01-1.209,0.41-0.134,0.184-0.327,0.51-0.327,1.107,0,0.621,0.203,0.924,0.327,1.109,0.289,0.398,0.707,0.4,1.209,0.4,0.162,0,0.302-0.002,0.302-0.002v13.75c-0.01,0.47-0.01,1.36,0.73,1.88z" fill="#FFFFFF"/>
<rect fill="none" height="60" width="60"/>
</g>
-<g transform="matrix(1 0 0 1 30 30)">
-<polygon fill="none" points="24.728,0 23.608,0.487 0,0.487 0,30.487 30,30.487 30,0.487 24.928,0.487 "/>
-<path d="M7.991,30.324c-3.295,0-5.976-1.69-6.668-4.205c-0.366-1.331-0.159-2.734,0.6-4.06 c1.063-1.86,3.062-3.301,5.478-3.952c0.873-0.235,1.762-0.355,2.639-0.355c0.927,0,1.816,0.133,2.635,0.389V5.247L24.728,0 l1.526,3.717l0.018-0.007l0.389,0.963l0.609,1.563l-10.565,4.318c0.008,2.6,0.003,5.635-0.001,8.204 c-0.003,2.014-0.006,3.74-0.002,4.745c0.016,2.839-2.473,5.497-6.049,6.463C9.771,30.203,8.875,30.324,7.991,30.324L7.991,30.324z" fill-opacity="0.35" stroke-opacity="0.35"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 2194 2908.0361)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-2179.9351" x2="-2179.9351" y1="2902.811" y2="2880.1646">
-<stop offset="0" style="stop-color:#8CFF24"/>
-<stop offset="1" style="stop-color:#15570B"/>
-</linearGradient>
-<path d="M25.98,5.682l-1.79-4.357L13.902,5.902l0.016,13.899c-1.574-1.029-3.896-1.366-6.257-0.729 c-3.722,1.003-6.127,4.041-5.374,6.78c0.756,2.742,4.383,4.15,8.104,3.146c3.146-0.849,5.324-3.094,5.311-5.493 c-0.01-2.399,0.02-8.913,0-13.625L25.98,5.682z" fill="url(#SVGID_1__)"/>
-<linearGradient gradientTransform="matrix(0.5 0 0 0.5 614.8193 -1693.241)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-1201.8184" x2="-1201.8184" y1="3393.1226" y2="3404.4397">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
-</linearGradient>
-<polygon fill="url(#SVGID_2__)" points="13.918,17.409 13.907,5.902 13.902,5.902 13.916,17.408 "/>
-<linearGradient gradientTransform="matrix(0.5 0 0 0.5 614.8193 -1693.241)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="-1187.957" x2="-1187.957" y1="3393.1177" y2="3404.4392">
-<stop offset="0" style="stop-color:#9EFF47"/>
-<stop offset="1" style="stop-color:#11470A"/>
-</linearGradient>
-<path d="M15.701,9.169c0.005,0.759,0.006-0.117,0.008,0.711L25.98,5.682l-0.252-0.646L15.701,9.169z" fill="url(#SVGID_3__)"/>
-<linearGradient gradientTransform="matrix(0.5 -0.0026 0.0026 0.5 604.1579 -1699.019)" gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="-1188.0039" x2="-1188.0039" y1="3402.1909" y2="3430.4734">
-<stop offset="0" style="stop-color:#B3FF6E"/>
-<stop offset="1" style="stop-color:#11470A"/>
-</linearGradient>
-<polygon fill="url(#SVGID_4__)" points="14.072,20.2 14.072,6.3 24.389,1.807 24.19,1.324 13.674,5.902 13.674,19.803 "/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 2194 2908.0361)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-2185.0737" x2="-2185.0737" y1="2887.9233" y2="2879.6807">
-<stop offset="0" style="stop-color:#B2F56E"/>
-<stop offset="0.4667" style="stop-color:#40AD00"/>
-<stop offset="1" style="stop-color:#074D00"/>
-</linearGradient>
-<path d="M7.96,28.527c-2.474,0.012-4.447-1.129-4.909-2.839c-0.28-1.039,0.018-2.187,0.84-3.229 c0.9-1.141,2.291-2.007,3.923-2.436c0.688-0.184,1.385-0.277,2.075-0.281c2.474-0.013,4.445,1.129,4.91,2.84 c0.615,2.267-1.522,4.807-4.764,5.664C9.347,28.43,8.647,28.522,7.96,28.527L7.96,28.527z" fill="url(#SVGID_5_)"/>
-<rect fill="none" height="30" width="30" y="0.487"/>
-</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ovistore.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ovistore.svg Fri May 14 16:09:54 2010 +0300
@@ -1,47 +1,49 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.9971" x2="29.9971" y1="11.1475" y2="59">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</linearGradient>
<polygon fill="url(#SVGID_1_)" points="49.745,33.13 50.37,11.55 9.624,11.55 10.797,33.03 3.996,59 55.998,59 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="29.9971" x2="29.9971" y1="64.0889" y2="49.3909">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</linearGradient>
<polygon fill="url(#SVGID_2_)" points="3.996,59 10.967,54.038 49.429,54.038 55.998,59 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="9.3125" x2="9.3125" y1="11.248" y2="59.7255">
-<stop offset="0" style="stop-color:#5ED2FF"/>
-<stop offset="1" style="stop-color:#277ADF"/>
+ <stop offset="0" style="stop-color:#5ED2FF"/>
+ <stop offset="1" style="stop-color:#277ADF"/>
</linearGradient>
<polygon fill="url(#SVGID_3_)" points="9.624,11.55 14.628,16.712 12.73,49.303 3.996,59 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="50.6777" x2="50.6777" y1="12.5122" y2="59.2981">
-<stop offset="0" style="stop-color:#5ED2FF"/>
-<stop offset="1" style="stop-color:#277ADF"/>
+ <stop offset="0" style="stop-color:#5ED2FF"/>
+ <stop offset="1" style="stop-color:#277ADF"/>
</linearGradient>
<polygon fill="url(#SVGID_4_)" points="50.37,11.55 45.357,16.712 47.254,49.303 55.998,59 "/>
-<polygon fill="#FFFFFF" fill-opacity="0.15" points="50.934,23.129 49.654,12.354 10.34,12.354 8.508,27.796 " stroke-opacity="0.15"/>
+<polygon fill="#FFFFFF" opacity="0.15" points="50.934,23.129 49.654,12.354 10.34,12.354 8.508,27.796 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="29.9971" x2="29.9971" y1="12.0908" y2="58.4598">
-<stop offset="0" style="stop-color:#8AD4FF"/>
-<stop offset="0.7697" style="stop-color:#2078FF"/>
-<stop offset="1" style="stop-color:#369EFF"/>
+ <stop offset="0" style="stop-color:#8AD4FF"/>
+ <stop offset="0.7697" style="stop-color:#2078FF"/>
+ <stop offset="1" style="stop-color:#369EFF"/>
</linearGradient>
<path d="M48.939,13.157l5.248,44.234H5.808l5.247-44.234H48.939 M49.654,12.354H10.34L4.902,58.195h50.189 L49.654,12.354L49.654,12.354z" fill="url(#SVGID_5_)"/>
-<polygon fill="#FFFFFF" fill-opacity="0.15" points="4.902,58.195 55.092,58.195 53.709,46.528 5.659,51.811 " stroke-opacity="0.15"/>
-<path d="M42.791,46.192c-0.918,0-1.534-0.296-1.89-0.545c-0.911-0.646-0.911-1.666-0.911-2.101v-9.719 c-0.273-0.046-0.563-0.15-0.813-0.383l-3.05,10.015c-0.444,1.356-1.214,2.733-3.579,2.733c-2.435,0-3.191-1.46-3.578-2.733 l-1.232-4.256c-0.434,4.462-3.059,6.989-7.354,6.989c-4.768,0-7.393-3-7.393-8.448c0-4.933,2.852-7.997,7.441-7.997 c2.109,0,3.829,0.606,5.08,1.773l-0.457-1.572h5.904l1.957,8.226l2.067-8.226h5.257l-0.005,0.011 c0.118-0.008,0.228-0.008,0.325-0.008c0.122,0,0.25-0.003,0.25-0.003h1.143c-1.311-0.291-2.142-1.252-2.142-2.572 c0-1.594,1.212-2.665,3.015-2.665c1.773,0,3.013,1.096,3.013,2.665c0,1.32-0.831,2.282-2.142,2.572h1.902v13.597 c0,0.436,0,1.455-0.904,2.099C44.176,46.008,43.535,46.192,42.791,46.192L42.791,46.192z M20.385,33.666 c-1.146,0-1.613,1.161-1.613,4.005c0,3.184,0.496,4.604,1.613,4.604c1.195,0,1.639-1.247,1.639-4.604 C22.023,35.843,21.738,33.666,20.385,33.666L20.385,33.666z" fill-opacity="0.05" stroke-opacity="0.05"/>
-<path d="M42.791,45.791c-0.812,0-1.352-0.255-1.66-0.472c-0.74-0.525-0.74-1.368-0.74-1.773V33.46 c-0.365-0.008-0.781-0.063-1.078-0.466c-0.086-0.113-0.189-0.277-0.258-0.523l-3.307,10.872c-0.42,1.276-1.096,2.448-3.199,2.448 c-2.158,0-2.828-1.236-3.193-2.448l-2.051-7.079c0.064,0.5,0.096,1.027,0.096,1.582c0,5.049-2.557,7.946-7.016,7.946 c-4.574,0-6.992-2.783-6.992-8.046c0-4.685,2.699-7.597,7.041-7.597c2.898,0,4.986,1.202,6.086,3.404l-0.927-3.201h5.053l2.259,9.51 l2.395-9.51H39.7l-0.054,0.172c0.295-0.169,0.631-0.169,0.916-0.169c0.125,0,0.263-0.002,0.263-0.002h4.374v13.196 c0,0.405,0,1.248-0.734,1.771C44.014,45.632,43.453,45.791,42.791,45.791L42.791,45.791z M20.385,33.265 c-1.771,0-2.015,2.117-2.015,4.406c0,2.475,0.239,5.006,2.015,5.006c1.698,0,2.039-1.916,2.039-5.006 C22.424,34.747,21.738,33.265,20.385,33.265L20.385,33.265z M42.828,29.641c-1.588,0-2.615-0.889-2.615-2.264 c0-1.375,1.027-2.263,2.615-2.263c1.538,0,2.613,0.931,2.613,2.263C45.441,28.752,44.414,29.641,42.828,29.641L42.828,29.641z" fill-opacity="0.1" stroke-opacity="0.1"/>
+<polygon fill="#FFFFFF" opacity="0.15" points="4.902,58.195 55.092,58.195 53.709,46.528 5.659,51.811 "/>
+<path d="M42.791,46.192c-0.918,0-1.534-0.296-1.89-0.545c-0.911-0.646-0.911-1.666-0.911-2.101v-9.719 c-0.273-0.046-0.563-0.15-0.813-0.383l-3.05,10.015c-0.444,1.356-1.214,2.733-3.579,2.733c-2.435,0-3.191-1.46-3.578-2.733 l-1.232-4.256c-0.434,4.462-3.059,6.989-7.354,6.989c-4.768,0-7.393-3-7.393-8.448c0-4.933,2.852-7.997,7.441-7.997 c2.109,0,3.829,0.606,5.08,1.773l-0.457-1.572h5.904l1.957,8.226l2.067-8.226h5.257l-0.005,0.011 c0.118-0.008,0.228-0.008,0.325-0.008c0.122,0,0.25-0.003,0.25-0.003h1.143c-1.311-0.291-2.142-1.252-2.142-2.572 c0-1.594,1.212-2.665,3.015-2.665c1.773,0,3.013,1.096,3.013,2.665c0,1.32-0.831,2.282-2.142,2.572h1.902v13.597 c0,0.436,0,1.455-0.904,2.099C44.176,46.008,43.535,46.192,42.791,46.192L42.791,46.192z M20.385,33.666 c-1.146,0-1.613,1.161-1.613,4.005c0,3.184,0.496,4.604,1.613,4.604c1.195,0,1.639-1.247,1.639-4.604 C22.023,35.843,21.738,33.666,20.385,33.666L20.385,33.666z" opacity="0.05"/>
+<path d="M42.791,45.791c-0.812,0-1.352-0.255-1.66-0.472c-0.74-0.525-0.74-1.368-0.74-1.773V33.46 c-0.365-0.008-0.781-0.063-1.078-0.466c-0.086-0.113-0.189-0.277-0.258-0.523l-3.307,10.872c-0.42,1.276-1.096,2.448-3.199,2.448 c-2.158,0-2.828-1.236-3.193-2.448l-2.051-7.079c0.064,0.5,0.096,1.027,0.096,1.582c0,5.049-2.557,7.946-7.016,7.946 c-4.574,0-6.992-2.783-6.992-8.046c0-4.685,2.699-7.597,7.041-7.597c2.898,0,4.986,1.202,6.086,3.404l-0.927-3.201h5.053l2.259,9.51 l2.395-9.51H39.7l-0.054,0.172c0.295-0.169,0.631-0.169,0.916-0.169c0.125,0,0.263-0.002,0.263-0.002h4.374v13.196 c0,0.405,0,1.248-0.734,1.771C44.014,45.632,43.453,45.791,42.791,45.791L42.791,45.791z M20.385,33.265 c-1.771,0-2.015,2.117-2.015,4.406c0,2.475,0.239,5.006,2.015,5.006c1.698,0,2.039-1.916,2.039-5.006 C22.424,34.747,21.738,33.265,20.385,33.265L20.385,33.265z M42.828,29.641c-1.588,0-2.615-0.889-2.615-2.264 c0-1.375,1.027-2.263,2.615-2.263c1.538,0,2.613,0.931,2.613,2.263C45.441,28.752,44.414,29.641,42.828,29.641L42.828,29.641z" opacity="0.1"/>
<path d="M20.385,44.989c-4.905,0-6.592-3.367-6.592-7.645c0-4.229,2.289-7.196,6.641-7.196 c4.505,0,6.566,2.994,6.566,7.295C27,41.947,24.911,44.989,20.385,44.989z M20.385,32.464c-2.238,0-2.416,2.716-2.416,4.805 c0,2.135,0.104,5.408,2.416,5.408s2.439-2.918,2.439-5.408C22.824,35.329,22.523,32.464,20.385,32.464z M26.126,30.35h4.202 l2.567,10.796l2.716-10.796h3.548l-3.797,12.476c-0.421,1.285-1.046,2.163-2.813,2.163c-1.764,0-2.42-0.878-2.81-2.163L26.126,30.35 z M42.828,28.838c-1.285,0-2.213-0.656-2.213-1.864c0-1.206,0.904-1.861,2.213-1.861c1.232,0,2.21,0.68,2.21,1.861 C45.038,28.182,44.109,28.838,42.828,28.838z M40.791,43.146c0,0.364,0,1.041,0.57,1.443c0.299,0.209,0.767,0.4,1.43,0.4 c0.689,0,1.139-0.189,1.439-0.4c0.57-0.402,0.57-1.079,0.57-1.443V30.35h-3.969c0,0-0.14,0.002-0.27,0.002 c-0.389,0-0.705,0.01-0.928,0.311c-0.106,0.14-0.25,0.394-0.25,0.844c0,0.475,0.144,0.708,0.25,0.848 c0.223,0.3,0.539,0.304,0.928,0.304c0.13,0,0.229,0,0.229,0V43.146z" fill="#FFFFFF"/>
-<path d="M13.822,21.03c4.524,0,6.193-4.23,7.807-8.321c0.154-0.39,0.308-0.776,0.462-1.159h-2.562 c-0.044,0.109-0.088,0.22-0.131,0.327c-1.678,4.25-2.889,6.831-5.576,6.831c-0.659,0-1.195,0.521-1.195,1.162 S13.163,21.03,13.822,21.03z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M38.071,12.709c1.612,4.091,3.282,8.321,7.806,8.321c0.66,0,1.195-0.52,1.195-1.161s-0.535-1.162-1.195-1.162 c-2.686,0-3.898-2.581-5.574-6.831c-0.043-0.107-0.088-0.218-0.133-0.327h-2.561C37.764,11.933,37.918,12.319,38.071,12.709z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M13.822,21.03c4.524,0,6.193-4.23,7.807-8.321c0.154-0.39,0.308-0.776,0.462-1.159h-2.562 c-0.044,0.109-0.088,0.22-0.131,0.327c-1.678,4.25-2.889,6.831-5.576,6.831c-0.659,0-1.195,0.521-1.195,1.162 S13.163,21.03,13.822,21.03z" opacity="0.2"/>
+<path d="M38.071,12.709c1.612,4.091,3.282,8.321,7.806,8.321c0.66,0,1.195-0.52,1.195-1.161s-0.535-1.162-1.195-1.162 c-2.686,0-3.898-2.581-5.574-6.831c-0.043-0.107-0.088-0.218-0.133-0.327h-2.561C37.764,11.933,37.918,12.319,38.071,12.709z" opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="13.1113" x2="46.5898" y1="10.6279" y2="10.6279">
-<stop offset="0" style="stop-color:#F4F4F4"/>
-<stop offset="0.5" style="stop-color:#E1E2E3"/>
-<stop offset="1" style="stop-color:#F4F4F4"/>
+ <stop offset="0" style="stop-color:#F4F4F4"/>
+ <stop offset="0.5" style="stop-color:#E1E2E3"/>
+ <stop offset="1" style="stop-color:#F4F4F4"/>
</linearGradient>
<path d="M45.428,17.934c-2.612,0-3.791-2.581-5.419-6.831C38.283,6.604,35.686,1,29.848,1 s-8.432,5.604-10.158,10.103c-1.627,4.25-2.805,6.831-5.418,6.831c-0.641,0-1.16,0.521-1.16,1.162s0.52,1.161,1.16,1.161 c4.398,0,6.021-4.231,7.588-8.322c1.698-4.429,3.303-8.611,7.99-8.613c4.689,0.002,6.293,4.184,7.99,8.613 c1.568,4.091,3.189,8.322,7.588,8.322c0.641,0,1.162-0.52,1.162-1.161S46.068,17.934,45.428,17.934z" fill="url(#SVGID_6_)"/>
<rect fill="none" height="60" width="60"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_personalization.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_personalization.svg Fri May 14 16:09:54 2010 +0300
@@ -1,117 +1,185 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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">
+
<stop offset="0" stop-color="#FEEFA7"/>
+
<stop offset="0.51" stop-color="#FFC501"/>
+
<stop offset="0.78" stop-color="#F6A800"/>
+
<stop offset="1" stop-color="#FCBA01"/>
+
</radialGradient>
<path d="M38.9,47.59c-2.769,0-5.188-1.035-7.191-3.076-6.77-6.896-6.979-23.27-6.975-25.47,7.495-1.505,11.22-1.801,15.09-1.801,3.624,0,6.74,0.421,13.23,1.797-0.08,2.82-1.08,28.55-14.16,28.55z" fill="url(#SVGID_1)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="47.09" x2="47.09" y1="18.28" y2="47.26">
+
<stop offset="0" stop-color="#FEF8DD"/>
+
<stop offset="1" stop-color="#FFC501"/>
+
</linearGradient>
<path d="M49.31,18.16s0.613,5.736-0.727,8.807l0.689,2.203s0,2.285-1.544,3.735c0,0-0.859,10.66-6.812,14.74,0,0,7.912-0.771,10.89-16.29,0,0,1.596-8.988,1.453-12.57l-3.95-0.62z" fill="url(#SVGID_2)" fill-opacity="0.5" stroke-opacity="0.5"/>
<radialGradient cx="41.63" cy="21.03" gradientUnits="userSpaceOnUse" id="SVGID_3" r="25.72">
+
<stop offset="0" stop-color="#FEF7D5"/>
+
<stop offset="0.59" stop-color="#FFF491"/>
+
<stop offset="1" stop-color="#FCBA01"/>
+
</radialGradient>
<path d="M39.82,16.93c-3.795,0-7.498,0.261-15.39,1.856,0,0-0.541,29.1,14.47,29.1,14.23,0,14.46-29.1,14.46-29.1-6.93-1.48-9.95-1.86-13.54-1.86zm-0.92,30.35c-2.684,0-5.029-1.004-6.974-2.984-6.476-6.597-6.871-22.05-6.886-25,7.305-1.457,10.97-1.746,14.78-1.746,3.553,0,6.619,0.409,12.92,1.737-0.12,3.8-1.37,27.99-13.84,27.99z" fill="url(#SVGID_3)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="39.13" x2="39.13" y1="34.06" y2="38.92">
+
<stop offset="0" stop-color="#FFAA04"/>
+
<stop offset="1" stop-color="#8F5102"/>
+
</linearGradient>
<path d="M41.43,35.78s-3.164,1.717-4.564,0.686c0,0,2.5,3.56,4.56-0.69z" fill="url(#SVGID_4)"/>
<radialGradient cx="45.76" cy="29.42" gradientUnits="userSpaceOnUse" id="SVGID_5" r="3.74">
+
<stop offset="0" stop-color="#FFE591"/>
+
<stop offset="1" stop-color="#FFC704"/>
+
</radialGradient>
<path d="M49.7,30.15h-7.921s1.433-1.333,3.96-1.492c2.52-0.16,3.78,0.31,3.96,1.49z" fill="url(#SVGID_5)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6" x1="45.74" x2="45.74" y1="29.94" y2="25.72">
+
<stop offset="0" stop-color="#FFC501"/>
+
<stop offset="1" stop-color="#FEF8DD"/>
+
</linearGradient>
<path d="M45.74,29.06c1.613,0,3.045,0.429,3.961,1.091,0.038-0.155,0.073-0.314,0.062-0.475-0.174-2.32-1.8-3.545-4.022-3.545-2.221,0-4.109,1.836-4.021,3.545,0.008,0.162,0.025,0.319,0.063,0.474,0.91-0.66,2.34-1.09,3.96-1.09z" fill="url(#SVGID_6)" fill-opacity="0.8" stroke-opacity="0.8"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7" x1="45.74" x2="45.74" y1="29.98" y2="26.55">
+
<stop offset="0" stop-color="#4D1F00"/>
+
<stop offset="1" stop-color="#BA6A02"/>
+
</linearGradient>
<path d="M45.74,29.06c1.613,0,3.045,0.429,3.961,1.091,0.038-0.155,0.062-0.313,0.062-0.475,0-1.544-1.8-2.795-4.022-2.795-2.221,0-4.021,1.251-4.021,2.795,0,0.162,0.025,0.319,0.063,0.474,0.91-0.66,2.34-1.09,3.96-1.09z" fill="url(#SVGID_7)"/>
<path d="M39.09,45.72c-3.938,0-5.338-5.51-5.338-5.51h10.68c0,0.01-1.4,5.51-5.34,5.51z" fill="#AB6100" fill-opacity="0.2" stroke-opacity="0.2"/>
<path d="M39.09,45.05c-3.938,0-5.338-4.837-5.338-4.837h10.68c0,0.01-1.4,4.84-5.34,4.84z" fill="#AB6100" fill-opacity="0.3" stroke-opacity="0.3"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8" x1="39.09" x2="39.09" y1="44.48" y2="39.88">
+
<stop offset="0" stop-color="#FFF3CC"/>
+
<stop offset="0.58" stop-color="#FFB805"/>
+
<stop offset="1" stop-color="#572000"/>
+
</linearGradient>
<path d="M39.09,44.13c-3.938,0-5.338-4.224-5.338-4.224h10.68c0-0.01-1.4,4.22-5.34,4.22z" fill="url(#SVGID_8)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9" x1="39.09" x2="39.09" y1="38.22" y2="44.61">
+
<stop offset="0" stop-color="#4D1F00"/>
+
<stop offset="1" stop-color="#BA6A02"/>
+
</linearGradient>
<path d="M34.15,40.32h9.895s-1.005,3.01-4.946,3.01c-3.94,0-4.94-3.01-4.94-3.01z" fill="url(#SVGID_9)"/>
<path d="M40.21,16.94c-0.129-0.001-0.258-0.003-0.389-0.003-3.795,0-7.498,0.261-15.39,1.856,0,0-0.333,17.96,6.803,25.66,0.137-0.13,0.279-0.248,0.413-0.386,6.7-6.82,8.23-20.35,8.57-27.13z" fill-opacity="0.1" stroke-opacity="0.1"/>
<path d="M24.43,18.79s-0.319,17.27,6.397,25.2c0.126-0.121,0.258-0.229,0.382-0.355,6.545-6.67,8.052-19.99,8.389-26.7-3.72,0.01-7.43,0.29-15.17,1.85z" fill-opacity="0.1" stroke-opacity="0.1"/>
<path d="M24.43,18.79s-0.307,16.6,6.011,24.73c0.11-0.104,0.223-0.198,0.331-0.308,6.402-6.522,7.883-19.63,8.215-26.27-3.52,0.04-7.23,0.37-14.55,1.85z" fill-opacity="0.2" stroke-opacity="0.2"/>
<radialGradient cx="22.8" cy="12.79" gradientUnits="userSpaceOnUse" id="SVGID_10" r="34.28">
+
<stop offset="0" stop-color="#E9F0F2"/>
+
<stop offset="0.04" stop-color="#E9F0F2"/>
+
<stop offset="0.58" stop-color="#BDC2C4"/>
+
<stop offset="0.83" stop-color="#949DA1"/>
+
<stop offset="0.99" stop-color="#98A1A4"/>
+
<stop offset="1" stop-color="#98A1A4"/>
+
</radialGradient>
<path d="M21.8,46.12c-2.904,0-5.439-1.102-7.534-3.273-7.552-7.834-7.376-27.3-7.325-29.68l0.192-0.041c7.558-1.608,9.588-2.041,13.61-2.041,4.453,0,8.745,0.343,17.42,2.083,0.008,2.384-0.197,21.4-8.043,29.4-2.33,2.35-5.12,3.55-8.33,3.55z" fill="url(#SVGID_10)"/>
<radialGradient cx="22.8" cy="12.51" gradientUnits="userSpaceOnUse" id="SVGID_11" r="34.9">
+
<stop offset="0" stop-color="#F6FDFF"/>
+
<stop offset="0.58" stop-color="#DBE1E3"/>
+
<stop offset="0.83" stop-color="#ABB6BA"/>
+
<stop offset="0.99" stop-color="#AAB4B8"/>
+
<stop offset="1" stop-color="#AAB4B8"/>
+
</radialGradient>
<path d="M38.47,12.92c-9.088-1.835-13.35-2.139-17.72-2.139-4.127,0-6.116,0.439-14.1,2.139,0,0-1.221,33.51,15.16,33.51,17.28,0,16.66-33.51,16.66-33.51zm-8.57,29.43c-2.256,2.298-4.979,3.463-8.095,3.463-2.818,0-5.278-1.069-7.313-3.18-7.259-7.527-7.295-26.01-7.244-29.22,7.495-1.595,9.519-2.024,13.5-2.024,4.392,0,8.628,0.335,17.11,2.028-0.01,3.21-0.42,21.26-7.96,28.93z" fill="url(#SVGID_11)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12" x1="31.5" x2="31.5" y1="11.73" y2="48.06">
+
<stop offset="0" stop-color="#F0F5F7"/>
+
<stop offset="1" stop-color="#A6AEB3"/>
+
</linearGradient>
<path d="M34.28,12.67l-0.998,8.469,1.688,3.757s0.281,1.327-1.755,4.562c0,0-0.277,12.19-8.179,15.75,0,0,8.539-0.847,11.75-17.88,0,0,1.322-9.31,1.168-14.05l-3.68-0.61z" fill="url(#SVGID_12)" fill-opacity="0.5" stroke-opacity="0.5"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13" x1="13.22" x2="13.22" y1="12.67" y2="45.35">
+
<stop offset="0" stop-color="#F0F5F7"/>
+
<stop offset="1" stop-color="#A6AEB3"/>
+
</linearGradient>
<path d="M11.02,12.67l0.459,8.469-1.034,4.051s-0.141,1.26,1.102,4.268c0,0,0.338,12.56,7.939,15.95,0,0-8.465-0.29-11.51-18.07,0,0-1.15-9.425-0.995-14.09l4.035-0.58z" fill="url(#SVGID_13)" fill-opacity="0.5" stroke-opacity="0.5"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14" x1="27.38" x2="27.38" y1="34.15" y2="18.18">
+
<stop offset="0" stop-color="#8D9498"/>
+
<stop offset="1" stop-color="#CEDBE0"/>
+
</linearGradient>
<path d="M22.94,22.55c-0.418,2.382,1.774,12.47-0.818,12.38,0,0,1.64,0.23,2.895-1.333,0,0-0.992-3.404-0.908-6.658-0.113-5.152,1.692-6.734,8.52-7.091,0,0-9.04-0.97-9.69,2.7z" fill="url(#SVGID_14)"/>
<radialGradient cx="14.93" cy="24.67" gradientUnits="userSpaceOnUse" id="SVGID_15" r="4.2">
+
<stop offset="0" stop-color="#F7F7F7"/>
+
<stop offset="1" stop-color="#ABABAB"/>
+
</radialGradient>
<path d="M10.51,25.5h8.901s-1.609-1.498-4.451-1.676c-2.84-0.17-4.25,0.35-4.45,1.68z" fill="url(#SVGID_15)"/>
<radialGradient cx="30.76" cy="24.67" gradientUnits="userSpaceOnUse" id="SVGID_16" r="4.2">
+
<stop offset="0" stop-color="#D4D4D4"/>
+
<stop offset="1" stop-color="#9AA7AB"/>
+
</radialGradient>
<path d="M35.18,25.5h-8.9s1.609-1.498,4.451-1.676c2.84-0.17,4.25,0.35,4.45,1.68z" fill="url(#SVGID_16)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17" x1="30.73" x2="30.73" y1="21.08" y2="23.38">
+
<stop offset="0" stop-color="#F0F0F0"/>
+
<stop offset="1" stop-color="#CFCFCF"/>
+
</linearGradient>
<path d="M30.73,23.66c1.814,0,3.422,0.482,4.451,1.227,0.043-0.173,0.07-0.352,0.07-0.533,0-1.736-2.025-3.143-4.521-3.143s-4.52,1.407-4.52,3.143c0,0.182,0.027,0.36,0.07,0.533,1.03-0.74,2.64-1.23,4.45-1.23z" fill="url(#SVGID_17)" fill-opacity="0.8" stroke-opacity="0.8"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18" x1="30.73" x2="30.73" y1="25.31" y2="21.45">
+
<stop offset="0" stop-color="#333333"/>
+
<stop offset="1" stop-color="#CBCBCB"/>
+
</linearGradient>
<path d="M30.73,24.28c1.814,0,3.422,0.482,4.451,1.227,0.043-0.173,0.07-0.352,0.07-0.533,0-1.736-2.025-3.143-4.521-3.143s-4.52,1.407-4.52,3.143c0,0.182,0.027,0.36,0.07,0.533,1.03-0.75,2.64-1.23,4.45-1.23z" fill="url(#SVGID_18)"/>
<radialGradient cx="14.99" cy="24.67" gradientUnits="userSpaceOnUse" id="SVGID_19" r="4.2">
+
<stop offset="0" stop-color="#D4D4D4"/>
+
<stop offset="1" stop-color="#9AA7AB"/>
+
</radialGradient>
<path d="M19.41,25.5h-8.9s1.61-1.498,4.451-1.676c2.84-0.17,4.25,0.35,4.45,1.68z" fill="url(#SVGID_19)"/>
<path d="M14.96,23.66c1.814,0,3.422,0.482,4.451,1.227,0.043-0.173,0.07-0.352,0.07-0.533,0-1.736-2.024-3.143-4.521-3.143s-4.52,1.407-4.52,3.143c0,0.182,0.027,0.36,0.069,0.533,1.03-0.74,2.64-1.23,4.45-1.23z" fill="url(#SVGID_17)" fill-opacity="0.8" stroke-opacity="0.8"/>
@@ -119,46 +187,54 @@
<path d="M22.74,42.66c-4.516,0-6.122-6.186-6.122-6.186h12.24c0,0.01-1.61,6.19-6.12,6.19z" fill-opacity="0.05" stroke-opacity="0.05"/>
<path d="M22.74,42.05c-4.516,0-6.122-5.572-6.122-5.572h12.24s-1.61,5.57-6.12,5.57z" fill-opacity="0.1" stroke-opacity="0.1"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22" x1="22.74" x2="22.74" y1="36.44" y2="41.45">
+
<stop offset="0" stop-color="#262D33"/>
+
<stop offset="1" stop-color="#FFFFFF"/>
+
</linearGradient>
<path d="M22.74,41.32c-4.516,0-6.122-4.844-6.122-4.844h12.24s-1.61,4.84-6.12,4.84z" fill="url(#SVGID_22)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_23" x1="22.74" x2="22.74" y1="34.55" y2="41.87">
+
<stop offset="0" stop-color="#1A1A1A"/>
+
<stop offset="1" stop-color="#B2B2B2"/>
+
</linearGradient>
<path d="M17.06,36.96h11.35s-1.151,3.451-5.674,3.451-5.68-3.45-5.68-3.45z" fill="url(#SVGID_23)"/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<polygon fill="none" points="24.728,0 23.608,0.487 0,0.487 0,30.487 30,30.487 30,0.487 24.928,0.487 "/>
-<path d="M7.991,30.324c-3.295,0-5.976-1.69-6.668-4.205c-0.366-1.331-0.159-2.734,0.6-4.06 c1.063-1.86,3.062-3.301,5.478-3.952c0.873-0.235,1.762-0.355,2.639-0.355c0.927,0,1.816,0.133,2.635,0.389V5.247L24.728,0 l1.526,3.717l0.018-0.007l0.389,0.963l0.609,1.563l-10.565,4.318c0.008,2.6,0.003,5.635-0.001,8.204 c-0.003,2.014-0.006,3.74-0.002,4.745c0.016,2.839-2.473,5.497-6.049,6.463C9.771,30.203,8.875,30.324,7.991,30.324L7.991,30.324z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M7.991,30.324c-3.295,0-5.976-1.69-6.668-4.205c-0.366-1.331-0.159-2.734,0.6-4.06 c1.063-1.86,3.062-3.301,5.478-3.952c0.873-0.235,1.762-0.355,2.639-0.355c0.927,0,1.816,0.133,2.635,0.389V5.247L24.728,0 l1.526,3.717l0.018-0.007l0.389,0.963l0.609,1.563l-10.565,4.318c0.008,2.6,0.003,5.635-0.001,8.204 c-0.003,2.014-0.006,3.74-0.002,4.745c0.016,2.839-2.473,5.497-6.049,6.463C9.771,30.203,8.875,30.324,7.991,30.324L7.991,30.324z" opacity="0.35"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 2908.0361)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2179.9351" x2="-2179.9351" y1="2902.811" y2="2880.1646">
-<stop offset="0" style="stop-color:#8CFF24"/>
-<stop offset="1" style="stop-color:#15570B"/>
+ <stop offset="0" style="stop-color:#8CFF24"/>
+ <stop offset="1" style="stop-color:#15570B"/>
</linearGradient>
<path d="M25.98,5.682l-1.79-4.357L13.902,5.902l0.016,13.899c-1.574-1.029-3.896-1.366-6.257-0.729 c-3.722,1.003-6.127,4.041-5.374,6.78c0.756,2.742,4.383,4.15,8.104,3.146c3.146-0.849,5.324-3.094,5.311-5.493 c-0.01-2.399,0.02-8.913,0-13.625L25.98,5.682z" fill="url(#SVGID_1_)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 0.5 614.8193 -1693.241)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-1201.8184" x2="-1201.8184" y1="3393.1226" y2="3404.4397">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</linearGradient>
<polygon fill="url(#SVGID_2_)" points="13.918,17.409 13.907,5.902 13.902,5.902 13.916,17.408 "/>
<linearGradient gradientTransform="matrix(0.5 0 0 0.5 614.8193 -1693.241)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1187.957" x2="-1187.957" y1="3393.1177" y2="3404.4392">
-<stop offset="0" style="stop-color:#9EFF47"/>
-<stop offset="1" style="stop-color:#11470A"/>
+ <stop offset="0" style="stop-color:#9EFF47"/>
+ <stop offset="1" style="stop-color:#11470A"/>
</linearGradient>
<path d="M15.701,9.169c0.005,0.759,0.006-0.117,0.008,0.711L25.98,5.682l-0.252-0.646L15.701,9.169z" fill="url(#SVGID_3_)"/>
<linearGradient gradientTransform="matrix(0.5 -0.0026 0.0026 0.5 604.1579 -1699.019)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-1188.0039" x2="-1188.0039" y1="3402.1909" y2="3430.4734">
-<stop offset="0" style="stop-color:#B3FF6E"/>
-<stop offset="1" style="stop-color:#11470A"/>
+ <stop offset="0" style="stop-color:#B3FF6E"/>
+ <stop offset="1" style="stop-color:#11470A"/>
</linearGradient>
<polygon fill="url(#SVGID_4_)" points="14.072,20.2 14.072,6.3 24.389,1.807 24.19,1.324 13.674,5.902 13.674,19.803 "/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 2908.0361)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-2185.0737" x2="-2185.0737" y1="2887.9233" y2="2879.6807">
-<stop offset="0" style="stop-color:#B2F56E"/>
-<stop offset="0.4667" style="stop-color:#40AD00"/>
-<stop offset="1" style="stop-color:#074D00"/>
+ <stop offset="0" style="stop-color:#B2F56E"/>
+ <stop offset="0.4667" style="stop-color:#40AD00"/>
+ <stop offset="1" style="stop-color:#074D00"/>
</linearGradient>
<path d="M7.96,28.527c-2.474,0.012-4.447-1.129-4.909-2.839c-0.28-1.039,0.018-2.187,0.84-3.229 c0.9-1.141,2.291-2.007,3.923-2.436c0.688-0.184,1.385-0.277,2.075-0.281c2.474-0.013,4.445,1.129,4.91,2.84 c0.615,2.267-1.522,4.807-4.764,5.664C9.347,28.43,8.647,28.522,7.96,28.527L7.96,28.527z" fill="url(#SVGID_5_)"/>
<rect fill="none" height="30" width="30" y="0.487"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_phone_as_modem.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_phone_as_modem.svg Fri May 14 16:09:54 2010 +0300
@@ -1,279 +1,253 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2.001" y2="57.8555">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+ <stop offset="0.0667" style="stop-color:#D1D7D9"/>
+ <stop offset="0.2606" style="stop-color:#BDC2C4"/>
+ <stop offset="0.6606" style="stop-color:#949DA1"/>
+ <stop offset="0.9636" style="stop-color:#ADB3B5"/>
+ <stop offset="1" style="stop-color:#595C5E"/>
</linearGradient>
<path d="M48.027,54.932c0,1.693-1.375,3.069-3.068,3.069h-29.92c-1.693,0-3.066-1.376-3.066-3.069V5.07 c0-1.696,1.373-3.069,3.066-3.069h29.92c1.693,0,3.068,1.373,3.068,3.069V54.932z" fill="url(#SVGID_1_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="2.001" y2="56.899">
-<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"/>
+ <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="M44.959,2.001h-29.92c-1.693,0-3.066,1.373-3.066,3.069v49.861c0,0.82,0.324,1.56,0.848,2.11 c-0.047-0.187-0.08-0.377-0.08-0.575v-1.535V6.602V5.07c0-1.271,1.031-2.304,2.299-2.304h29.92c1.268,0,2.301,1.033,2.301,2.304 v1.531v48.33v1.535c0,0.198-0.033,0.389-0.08,0.575c0.521-0.551,0.848-1.29,0.848-2.11V5.07C48.027,3.374,46.652,2.001,44.959,2.001 z" fill="url(#SVGID_2_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="5.8916" y2="43.4283">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+ <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="37.589" stroke-opacity="0.6" width="31.453" x="14.273" y="5.836"/>
+<rect fill="url(#SVGID_3_)" height="37.589" opacity="0.6" width="31.453" x="14.273" y="5.836"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="29.999" x2="29.999" y1="6.6548" y2="42.6624">
-<stop offset="0" style="stop-color:#6E6E6E"/>
-<stop offset="1" style="stop-color:#333333"/>
+ <stop offset="0" style="stop-color:#6E6E6E"/>
+ <stop offset="1" style="stop-color:#333333"/>
</linearGradient>
<rect fill="url(#SVGID_4_)" height="36.058" width="29.92" x="15.039" y="6.602"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30" x2="30" y1="7.4214" y2="41.894">
-<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"/>
+ <stop offset="0" style="stop-color:#3BC8EB"/>
+ <stop offset="0.3879" style="stop-color:#2D9BD2"/>
+ <stop offset="0.8909" style="stop-color:#1347BA"/>
</linearGradient>
<rect fill="url(#SVGID_5_)" height="34.521" width="28.383" x="15.809" y="7.37"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="30" x2="30" y1="7.9712" y2="21.69">
-<stop offset="0" style="stop-color:#85EFFF"/>
-<stop offset="1" style="stop-color:#3BA1D9"/>
+ <stop offset="0" style="stop-color:#85EFFF"/>
+ <stop offset="1" style="stop-color:#3BA1D9"/>
</linearGradient>
<polygon fill="url(#SVGID_6_)" points="44.191,19.644 15.809,22.712 15.809,8.137 44.191,8.137 "/>
<rect fill="#9FE4FF" height="0.767" width="28.383" x="15.809" y="7.37"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="30.2236" x2="30.2236" y1="5.8726" y2="2.8032">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#D1D7D9"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#D1D7D9"/>
</linearGradient>
<path d="M26.832,5.836c-0.861,0-1.535-0.563-1.535-1.279v-0.51c0-0.718,0.674-1.28,1.535-1.28h6.785 c0.859,0,1.533,0.563,1.533,1.28v0.51c0,0.716-0.674,1.279-1.533,1.279H26.832z" fill="url(#SVGID_7_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="30.2236" x2="30.2236" y1="3.2158" y2="5.1992">
-<stop offset="0" style="stop-color:#6C7375"/>
-<stop offset="1" style="stop-color:#BDC2C4"/>
+ <stop offset="0" style="stop-color:#6C7375"/>
+ <stop offset="1" style="stop-color:#BDC2C4"/>
</linearGradient>
<path d="M34.383,4.557c0,0.283-0.342,0.514-0.766,0.514h-6.785c-0.424,0-0.768-0.23-0.768-0.514v-0.51 c0-0.283,0.344-0.512,0.768-0.512h6.785c0.424,0,0.766,0.229,0.766,0.512V4.557z" fill="url(#SVGID_8_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="29.8818" x2="29.8818" y1="44.2236" y2="55.628">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#FFFFFF"/>
+ <stop offset="0" style="stop-color:#B6BBBD"/>
+ <stop offset="1" style="stop-color:#FFFFFF"/>
</linearGradient>
-<path d="M27.109,55.7c-1.645,0-2.98-1.323-2.98-2.951v-5.606c0-1.627,1.336-2.951,2.98-2.951 h5.545c1.645,0,2.98,1.324,2.98,2.951v5.606c0,1.628-1.336,2.951-2.98,2.951H27.109z" fill="url(#SVGID_9_)" fill-opacity="0.6" stroke-opacity="0.6"/>
-<path d="M27.105,54.932c-1.219,0-2.211-0.979-2.211-2.183v-5.606c0-1.204,0.992-2.183,2.211-2.183 h5.553c1.219,0,2.209,0.979,2.209,2.183v5.606c0,1.204-0.99,2.183-2.209,2.183H27.105z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M27.109,55.7c-1.645,0-2.98-1.323-2.98-2.951v-5.606c0-1.627,1.336-2.951,2.98-2.951 h5.545c1.645,0,2.98,1.324,2.98,2.951v5.606c0,1.628-1.336,2.951-2.98,2.951H27.109z" fill="url(#SVGID_9_)" opacity="0.6"/>
+<path d="M27.105,54.932c-1.219,0-2.211-0.979-2.211-2.183v-5.606c0-1.204,0.992-2.183,2.211-2.183 h5.553c1.219,0,2.209,0.979,2.209,2.183v5.606c0,1.204-0.99,2.183-2.209,2.183H27.105z" fill="#020202" opacity="0.5"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="29.8818" x2="29.8818" y1="45.6865" y2="54.1806">
-<stop offset="0" style="stop-color:#A6A8AB"/>
-<stop offset="0.703" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#808184"/>
+ <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="M34.102,52.749c0,0.783-0.645,1.417-1.438,1.417h-5.566c-0.793,0-1.436-0.634-1.436-1.417v-5.606 c0-0.783,0.643-1.417,1.436-1.417h5.566c0.793,0,1.438,0.634,1.438,1.417V52.749z" fill="url(#SVGID_10_)"/>
-<path d="M28.73,52.632c-0.846,0-1.533-0.688-1.533-1.534v-2.303c0-0.847,0.688-1.534,1.533-1.534 h2.303c0.846,0,1.533,0.688,1.533,1.534v2.303c0,0.847-0.688,1.534-1.533,1.534H28.73z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M28.73,52.632c-0.846,0-1.533-0.688-1.533-1.534v-2.303c0-0.847,0.688-1.534,1.533-1.534 h2.303c0.846,0,1.533,0.688,1.533,1.534v2.303c0,0.847-0.688,1.534-1.533,1.534H28.73z" fill="#020202" opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="29.8809" x2="29.8809" y1="48.0103" y2="51.8696">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+ <stop offset="0.0667" style="stop-color:#D1D7D9"/>
+ <stop offset="0.2606" style="stop-color:#BDC2C4"/>
+ <stop offset="0.6606" style="stop-color:#949DA1"/>
+ <stop offset="0.9636" style="stop-color:#ADB3B5"/>
+ <stop offset="1" style="stop-color:#595C5E"/>
</linearGradient>
<path d="M28.73,51.863c-0.422,0-0.768-0.345-0.768-0.766v-2.303c0-0.422,0.346-0.767,0.768-0.767h2.303 c0.42,0,0.766,0.345,0.766,0.767v2.303c0,0.421-0.346,0.766-0.766,0.766H28.73z" fill="url(#SVGID_11_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="17.667" x2="17.667" y1="44.917" y2="54.1816">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+ <stop offset="0" style="stop-color:#B6BBBD"/>
+ <stop offset="1" style="stop-color:#F0FBFF"/>
</linearGradient>
-<path d="M17.223,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307 c0-1.624,1.324-2.948,2.949-2.948h0.887c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H17.223z" fill="url(#SVGID_12_)" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M17.223,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307 c0-1.624,1.324-2.948,2.949-2.948h0.887c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H17.223z" fill="url(#SVGID_12_)" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="17.665" x2="17.665" y1="45.6899" y2="53.4106">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+ <stop offset="0" style="stop-color:#231F20"/>
+ <stop offset="1" style="stop-color:#6D6E70"/>
</linearGradient>
-<path d="M17.223,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307 c0-1.201,0.98-2.183,2.184-2.183h0.887c1.205,0,2.182,0.981,2.182,2.183v3.307c0,1.204-0.977,2.183-2.182,2.183H17.223z" fill="url(#SVGID_13_)" fill-opacity="0.7" stroke-opacity="0.7"/>
+<path d="M17.223,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307 c0-1.201,0.98-2.183,2.184-2.183h0.887c1.205,0,2.182,0.981,2.182,2.183v3.307c0,1.204-0.977,2.183-2.182,2.183H17.223z" fill="url(#SVGID_13_)" opacity="0.7"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="17.667" x2="17.667" y1="46.4658" y2="52.6426">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+ <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="M19.525,51.215c0,0.783-0.635,1.417-1.416,1.417h-0.887c-0.779,0-1.414-0.634-1.414-1.417v-3.307 c0-0.78,0.635-1.414,1.414-1.414h0.887c0.781,0,1.416,0.634,1.416,1.414V51.215z" fill="url(#SVGID_14_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="41.6719" x2="41.6719" y1="44.917" y2="54.1816">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+ <stop offset="0" style="stop-color:#B6BBBD"/>
+ <stop offset="1" style="stop-color:#F0FBFF"/>
</linearGradient>
-<path d="M41.229,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307 c0-1.624,1.324-2.948,2.949-2.948h0.885c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H41.229z" fill="url(#SVGID_15_)" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M41.229,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307 c0-1.624,1.324-2.948,2.949-2.948h0.885c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H41.229z" fill="url(#SVGID_15_)" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="41.6709" x2="41.6709" y1="45.6899" y2="53.4106">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+ <stop offset="0" style="stop-color:#231F20"/>
+ <stop offset="1" style="stop-color:#6D6E70"/>
</linearGradient>
-<path d="M41.229,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307 c0-1.201,0.98-2.183,2.184-2.183h0.885c1.205,0,2.184,0.981,2.184,2.183v3.307c0,1.204-0.979,2.183-2.184,2.183H41.229z" fill="url(#SVGID_16_)" fill-opacity="0.7" stroke-opacity="0.7"/>
+<path d="M41.229,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307 c0-1.201,0.98-2.183,2.184-2.183h0.885c1.205,0,2.184,0.981,2.184,2.183v3.307c0,1.204-0.979,2.183-2.184,2.183H41.229z" fill="url(#SVGID_16_)" opacity="0.7"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="41.6719" x2="41.6719" y1="46.4658" y2="52.6426">
-<stop offset="0" style="stop-color:#FFC142"/>
-<stop offset="0.7455" style="stop-color:#CF4E18"/>
-<stop offset="1" style="stop-color:#B52100"/>
+ <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="M43.531,51.215c0,0.783-0.637,1.417-1.418,1.417h-0.885c-0.781,0-1.416-0.634-1.416-1.417v-3.307 c0-0.78,0.635-1.414,1.416-1.414h0.885c0.781,0,1.418,0.634,1.418,1.414V51.215z" fill="url(#SVGID_17_)"/>
<rect fill="none" height="60" width="60"/>
</g>
-<g transform="matrix(0.5 0 0 0.5 30 30)">
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="29.9995" x2="29.9995" y1="45.9541" y2="55.212">
-<stop offset="0" style="stop-color:#334247"/>
-<stop offset="1" style="stop-color:#446066"/>
+<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -276 -335)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="291.0005" x2="291.0005" y1="-358.7285" y2="-363.4325">
+ <stop offset="0" style="stop-color:#334247"/>
+ <stop offset="1" style="stop-color:#446066"/>
</linearGradient>
-<path d="M57.551,54.49c0,0.338-0.273,0.611-0.612,0.611H3.062c-0.339,0-0.612-0.273-0.612-0.611v-7.96 c0-0.338,0.273-0.612,0.612-0.612h53.877c0.339,0,0.612,0.274,0.612,0.612V54.49z" fill="url(#SVGID_1__)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="29.9995" x2="29.9995" y1="46.5615" y2="54.5859">
-<stop offset="0" style="stop-color:#334247"/>
-<stop offset="1" style="stop-color:#638B94"/>
-</linearGradient>
-<path d="M3.062,46.53v7.96h53.877v-7.96H3.062z M56.326,53.266H3.674v-6.123h52.652V53.266z" fill="url(#SVGID_2__)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="30.0005" x2="30.0005" y1="55.0654" y2="45.8075">
-<stop offset="0" style="stop-color:#334247"/>
-<stop offset="1" style="stop-color:#446066"/>
+<path d="M29,28.065c0,0.173-0.139,0.311-0.311,0.311H1.312C1.14,28.376,1,28.238,1,28.065v-4.045 C1,23.85,1.14,23.71,1.312,23.71H28.69c0.172,0,0.311,0.14,0.311,0.311V28.065z" fill="url(#SVGID_1__)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -276 -335)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="291.0005" x2="291.0005" y1="-359.0366" y2="-363.114">
+ <stop offset="0" style="stop-color:#334247"/>
+ <stop offset="1" style="stop-color:#638B94"/>
</linearGradient>
-<path d="M56.938,45.918H3.062c-0.339,0-0.612,0.274-0.612,0.612v7.96c0,0.338,0.273,0.611,0.612,0.611h53.877 c0.339,0,0.612-0.273,0.612-0.611v-7.96C57.551,46.192,57.277,45.918,56.938,45.918z M56.938,54.49H3.062v-7.96h53.877V54.49z" fill="url(#SVGID_3__)"/>
-<g>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="36.9395" x2="43.3462" y1="26.0205" y2="26.0205">
-<stop offset="0" style="stop-color:#DBDBDB"/>
-<stop offset="0.097" style="stop-color:#DBDBDB"/>
-<stop offset="0.6848" style="stop-color:#B0B0B0"/>
-<stop offset="1" style="stop-color:#DEDEDE"/>
+<path d="M1.312,24.021v4.045H28.69v-4.045H1.312z M28.377,27.444H1.623v-3.111h26.755V27.444z" fill="url(#SVGID_2__)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -276 -335)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="291.0005" x2="291.0005" y1="-363.3579" y2="-358.6539">
+ <stop offset="0" style="stop-color:#334247"/>
+ <stop offset="1" style="stop-color:#446066"/>
</linearGradient>
-<path d="M43.47,33.674c0,0.338-0.274,0.612-0.612,0.612h-5.511c-0.338,0-0.612-0.274-0.612-0.612 l0.612-15.307c0-0.338,0.274-0.612,0.612-0.612h4.286c0.338,0,0.612,0.274,0.612,0.612L43.47,33.674z" fill="url(#SVGID_4__)"/>
-<rect fill-opacity="0.3" height="0.612" stroke-opacity="0.3" width="6.735" x="36.734" y="31.837"/>
-<rect fill-opacity="0.1" height="1.837" stroke-opacity="0.1" width="6.735" x="36.734" y="30.612"/>
-<rect fill-opacity="0.1" height="0.612" stroke-opacity="0.1" width="6.735" x="36.734" y="31.225"/>
-<path d="M42.245,17.755h-4.286c-0.338,0-0.612,0.274-0.612,0.612v0.612 c0-0.338,0.274-0.612,0.612-0.612h4.286c0.338,0,0.612,0.274,0.612,0.612v-0.612C42.857,18.029,42.583,17.755,42.245,17.755z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="37.5869" x2="42.6832" y1="12.5508" y2="12.5508">
-<stop offset="0" style="stop-color:#DBDBDB"/>
-<stop offset="0.097" style="stop-color:#DBDBDB"/>
-<stop offset="0.6848" style="stop-color:#919191"/>
-<stop offset="1" style="stop-color:#B8B8B8"/>
+<path d="M28.688,23.71H1.312C1.14,23.71,1,23.85,1,24.021v4.045c0,0.173,0.139,0.311,0.311,0.311H28.69 c0.172,0,0.311-0.138,0.311-0.311v-4.045C29,23.85,28.862,23.71,28.688,23.71z M28.688,28.065H1.312v-4.045H28.69v4.045H28.688z" fill="url(#SVGID_3__)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -276 -335)" gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="294.5269" x2="297.7813" y1="-348.5991" y2="-348.5991">
+ <stop offset="0.097" style="stop-color:#DBDBDB"/>
+ <stop offset="0.6848" style="stop-color:#B0B0B0"/>
+ <stop offset="1" style="stop-color:#DEDEDE"/>
+</linearGradient>
+<path d="M21.844,17.488c0,0.171-0.139,0.311-0.311,0.311h-2.8c-0.173,0-0.312-0.14-0.312-0.311l0.312-7.778 c0-0.172,0.14-0.311,0.31-0.311h2.18c0.17,0,0.311,0.139,0.311,0.311L21.844,17.488z" fill="url(#SVGID_4__)"/>
+<rect enable-background="new " height="0.312" opacity="0.3" width="3.422" x="18.422" y="16.555"/>
+<rect enable-background="new " height="0.934" opacity="0.1" width="3.422" x="18.422" y="15.933"/>
+<rect enable-background="new " height="0.312" opacity="0.1" width="3.422" x="18.422" y="16.243"/>
+<path d="M21.223,9.399h-2.18c-0.17,0-0.31,0.139-0.31,0.311v0.311 c0-0.171,0.14-0.311,0.31-0.311h2.18c0.17,0,0.311,0.14,0.311,0.311V9.71C21.534,9.538,21.393,9.399,21.223,9.399z" enable-background="new " fill="#FFFFFF" opacity="0.5"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -276 -335)" gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="294.856" x2="297.4459" y1="-341.7549" y2="-341.7549">
+ <stop offset="0.097" style="stop-color:#DBDBDB"/>
+ <stop offset="0.6848" style="stop-color:#919191"/>
+ <stop offset="1" style="stop-color:#B8B8B8"/>
</linearGradient>
-<path d="M42.245,17.755l-0.612-9.796c0-0.338-0.274-0.612-0.612-0.612h-1.837 c-0.338,0-0.612,0.274-0.612,0.612l-0.612,9.796H42.245z" fill="url(#SVGID_5__)"/>
-<path d="M41.021,7.347h-1.837c-0.338,0-0.612,0.274-0.612,0.612v0.612 c0-0.338,0.274-0.612,0.612-0.612h1.837c0.338,0,0.612,0.274,0.612,0.612V7.959C41.633,7.621,41.358,7.347,41.021,7.347z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
-<rect fill-opacity="0.3" height="0.612" stroke-opacity="0.3" width="4.286" x="37.959" y="17.143"/>
-<rect fill-opacity="0.1" height="0.612" stroke-opacity="0.1" width="4.286" x="37.959" y="16.53"/>
-<rect fill-opacity="0.1" height="1.837" stroke-opacity="0.1" width="4.286" x="37.959" y="15.918"/>
-</g>
-<rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6__" x1="29.9995" x2="29.9995" y1="32.5068" y2="47.3191">
-<stop offset="0" style="stop-color:#E0E2E6"/>
-<stop offset="1" style="stop-color:#555557"/>
+<path d="M21.223,9.399l-0.313-4.979c0-0.172-0.139-0.311-0.311-0.311h-0.934 c-0.172,0-0.311,0.139-0.311,0.311l-0.311,4.979H21.223z" fill="url(#SVGID_5__)"/>
+<path d="M20.6,4.11h-0.934c-0.172,0-0.311,0.139-0.311,0.311v0.311 c0-0.172,0.139-0.311,0.311-0.311H20.6c0.172,0,0.311,0.139,0.311,0.311V4.421C20.911,4.249,20.772,4.11,20.6,4.11z" enable-background="new " fill="#FFFFFF" opacity="0.5"/>
+<rect enable-background="new " height="0.313" opacity="0.3" width="2.18" x="19.043" y="9.087"/>
+<rect enable-background="new " height="0.312" opacity="0.1" width="2.18" x="19.043" y="8.775"/>
+<rect enable-background="new " height="0.934" opacity="0.1" width="2.18" x="19.043" y="8.466"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -276 -335)" gradientUnits="userSpaceOnUse" id="SVGID_6__" x1="291.0005" x2="291.0005" y1="-351.8955" y2="-359.4225">
+ <stop offset="0" style="stop-color:#E0E2E6"/>
+ <stop offset="1" style="stop-color:#555557"/>
</linearGradient>
-<path d="M57.551,34.83c0-1.313-1.068-2.381-2.385-2.381H4.834c-1.316,0-2.385,1.067-2.385,2.381v12.313 h55.102V34.83z" fill="url(#SVGID_6__)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7__" x1="29.9995" x2="29.9995" y1="33.4209" y2="47.3077">
-<stop offset="0" style="stop-color:#EBEBEB"/>
-<stop offset="1" style="stop-color:#919191"/>
-</linearGradient>
-<path d="M57.064,34.592c0-0.676-0.548-1.225-1.226-1.225H4.161c-0.678,0-1.226,0.549-1.226,1.225v12.551 h54.129V34.592z" fill="url(#SVGID_7__)"/>
-<path d="M2.506,34.286c0.137-0.527,1.084-0.919,1.655-0.919h51.678c0.571,0,1.508,0.392,1.646,0.919 l0,0c-0.248-1.051-1.19-1.837-2.318-1.837H4.834C3.706,32.449,2.755,33.235,2.506,34.286L2.506,34.286z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
-<g>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8__" x1="13.1636" x2="13.1636" y1="43.2168" y2="35.7019">
-<stop offset="0" style="stop-color:#9F9F9F"/>
-<stop offset="1" style="stop-color:#7D7D80"/>
+<path d="M29,18.076c0-0.667-0.543-1.21-1.213-1.21H2.212C1.543,16.866,1,17.408,1,18.076v6.257h28V18.076z" fill="url(#SVGID_6__)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -276 -335)" gradientUnits="userSpaceOnUse" id="SVGID_7__" x1="290.9995" x2="290.9995" y1="-352.3604" y2="-359.4167">
+ <stop offset="0" style="stop-color:#D5D5D5"/>
+ <stop offset="1" style="stop-color:#919191"/>
</linearGradient>
-<rect fill="url(#SVGID_8__)" height="8.2" width="3.28" x="11.523" y="35.39"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9__" x1="13.1631" x2="13.1631" y1="43.043" y2="35.9365">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
-</linearGradient>
-<rect fill="url(#SVGID_9__)" height="7.106" width="2.188" x="12.069" y="35.937"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10__" x1="7.1499" x2="7.1499" y1="43.2168" y2="35.7019">
-<stop offset="0" style="stop-color:#9F9F9F"/>
-<stop offset="1" style="stop-color:#7D7D80"/>
+<path d="M28.752,17.954c0-0.343-0.278-0.621-0.623-0.621H1.87c-0.345,0-0.623,0.278-0.623,0.621v6.379h27.505 V17.954z" fill="url(#SVGID_7__)"/>
+<path d="M1.029,17.799c0.07-0.268,0.551-0.466,0.841-0.466h26.259 c0.291,0,0.768,0.198,0.837,0.466l0,0c-0.126-0.534-0.604-0.933-1.177-0.933H2.212C1.639,16.866,1.155,17.265,1.029,17.799 L1.029,17.799z" enable-background="new " fill="#FFFFFF" opacity="0.5"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -276 -335)" gradientUnits="userSpaceOnUse" id="SVGID_8__" x1="282.4448" x2="282.4448" y1="-357.3369" y2="-353.5188">
+ <stop offset="0" style="stop-color:#9F9F9F"/>
+ <stop offset="1" style="stop-color:#7D7D80"/>
</linearGradient>
-<rect fill="url(#SVGID_10__)" height="8.2" width="3.28" x="5.51" y="35.39"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11__" x1="7.1499" x2="7.1499" y1="43.043" y2="35.9365">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+<rect fill="url(#SVGID_8__)" height="4.166" width="1.666" x="5.611" y="18.36"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -276 -335)" gradientUnits="userSpaceOnUse" id="SVGID_9__" x1="282.4438" x2="282.4438" y1="-357.249" y2="-353.6387">
+ <stop offset="0" style="stop-color:#C6FF45"/>
+ <stop offset="0.7273" style="stop-color:#66A00E"/>
+ <stop offset="1" style="stop-color:#387300"/>
</linearGradient>
-<rect fill="url(#SVGID_11__)" height="7.106" width="2.187" x="6.057" y="35.937"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12__" x1="19.1763" x2="19.1763" y1="43.2168" y2="35.7019">
-<stop offset="0" style="stop-color:#9F9F9F"/>
-<stop offset="1" style="stop-color:#7D7D80"/>
+<rect fill="url(#SVGID_9__)" height="3.61" width="1.112" x="5.888" y="18.639"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -276 -335)" gradientUnits="userSpaceOnUse" id="SVGID_10__" x1="279.3892" x2="279.3892" y1="-357.3369" y2="-353.5188">
+ <stop offset="0" style="stop-color:#9F9F9F"/>
+ <stop offset="1" style="stop-color:#7D7D80"/>
</linearGradient>
-<rect fill="url(#SVGID_12__)" height="8.2" width="3.28" x="17.536" y="35.39"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13__" x1="19.1763" x2="19.1763" y1="43.043" y2="35.9365">
-<stop offset="0" style="stop-color:#334247"/>
-<stop offset="1" style="stop-color:#446066"/>
+<rect fill="url(#SVGID_10__)" height="4.166" width="1.667" x="2.555" y="18.36"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -276 -335)" gradientUnits="userSpaceOnUse" id="SVGID_11__" x1="279.3892" x2="279.3892" y1="-357.249" y2="-353.6387">
+ <stop offset="0" style="stop-color:#C6FF45"/>
+ <stop offset="0.7273" style="stop-color:#66A00E"/>
+ <stop offset="1" style="stop-color:#387300"/>
</linearGradient>
-<rect fill="url(#SVGID_13__)" height="7.106" width="2.187" x="18.083" y="35.937"/>
-<rect fill="#FFFFFF" fill-opacity="0.5" height="0.547" stroke-opacity="0.5" width="2.188" x="12.069" y="35.937"/>
-<rect fill="#FFFFFF" fill-opacity="0.5" height="0.547" stroke-opacity="0.5" width="2.187" x="6.057" y="35.937"/>
-</g>
-<rect fill-opacity="0.3" height="0.612" stroke-opacity="0.3" width="55.102" x="2.449" y="47.143"/>
-<rect fill-opacity="0.1" height="0.612" stroke-opacity="0.1" width="55.102" x="2.449" y="47.755"/>
-<rect fill="#FFFFFF" fill-opacity="0.2" height="0.611" stroke-opacity="0.2" width="55.102" x="2.449" y="46.531"/>
-<rect fill-opacity="0.1" height="0.611" stroke-opacity="0.1" width="55.102" x="2.449" y="45.918"/>
-<g>
-<linearGradient gradientTransform="matrix(-0.7071 -0.7071 -0.7071 0.7071 774.9818 369.3789)" gradientUnits="userSpaceOnUse" id="SVGID_14__" x1="788.3408" x2="775.1464" y1="269.3369" y2="282.3496">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+<rect fill="url(#SVGID_11__)" height="3.61" width="1.112" x="2.833" y="18.639"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -276 -335)" gradientUnits="userSpaceOnUse" id="SVGID_12__" x1="285.5005" x2="285.5005" y1="-357.3369" y2="-353.5188">
+ <stop offset="0" style="stop-color:#9F9F9F"/>
+ <stop offset="1" style="stop-color:#7D7D80"/>
+</linearGradient>
+<rect fill="url(#SVGID_12__)" height="4.166" width="1.667" x="8.666" y="18.36"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -276 -335)" gradientUnits="userSpaceOnUse" id="SVGID_13__" x1="285.5005" x2="285.5005" y1="-357.249" y2="-353.6387">
+ <stop offset="0" style="stop-color:#334247"/>
+ <stop offset="1" style="stop-color:#446066"/>
</linearGradient>
-<path d="M27.674,2.457l2.729,2.727c-3.561,3.56-3.559,9.354,0,12.913l-2.728,2.728 C22.611,15.76,22.611,7.521,27.674,2.457z" fill="url(#SVGID_14__)"/>
-<linearGradient gradientTransform="matrix(-0.7071 -0.7071 -0.7071 0.7071 774.9818 369.3789)" gradientUnits="userSpaceOnUse" id="SVGID_15__" x1="783.4971" x2="770.3032" y1="264.4326" y2="277.4448">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+<rect fill="url(#SVGID_13__)" height="3.61" width="1.111" x="8.944" y="18.639"/>
+<rect enable-background="new " fill="#FFFFFF" height="0.278" opacity="0.5" width="1.112" x="5.888" y="18.639"/>
+<rect enable-background="new " fill="#FFFFFF" height="0.278" opacity="0.5" width="1.112" x="2.833" y="18.639"/>
+<rect enable-background="new " height="0.311" opacity="0.3" width="28" x="1" y="24.333"/>
+<rect enable-background="new " height="0.311" opacity="0.1" width="28" x="1" y="24.644"/>
+<rect enable-background="new " fill="#FFFFFF" height="0.312" opacity="0.2" width="28" x="1" y="24.021"/>
+<rect enable-background="new " height="0.311" opacity="0.1" width="28" x="1" y="23.71"/>
+<linearGradient gradientTransform="matrix(-0.7071 -0.7071 0.7071 -0.7071 442.0565 10.7984)" gradientUnits="userSpaceOnUse" id="SVGID_14__" x1="309.5308" x2="302.8252" y1="-296.5103" y2="-303.1235">
+ <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="M13.818,1.625l1.387,1.386c-1.81,1.809-1.809,4.753,0,6.563l-1.386,1.387 C11.245,8.386,11.245,4.198,13.818,1.625z" fill="url(#SVGID_14__)"/>
+<linearGradient gradientTransform="matrix(-0.7071 -0.7071 0.7071 -0.7071 442.0565 10.7984)" gradientUnits="userSpaceOnUse" id="SVGID_15__" x1="307.0698" x2="300.3655" y1="-294.0181" y2="-300.6301">
+ <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="M16.963,3.382l1.387,1.385c-0.841,0.842-0.841,2.209,0,3.049l-1.387,1.387 C15.359,7.599,15.359,4.987,16.963,3.382z" fill="url(#SVGID_15__)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -276 -335)" gradientUnits="userSpaceOnUse" id="SVGID_16__" x1="289.5513" x2="289.5513" y1="-345.8452" y2="-334.9367">
+ <stop offset="0" style="stop-color:#AAE535"/>
+ <stop offset="1" style="stop-color:#5D9C0A"/>
</linearGradient>
-<path d="M33.865,5.913l2.728,2.728c-1.655,1.654-1.655,4.345,0,5.998l-2.728,2.728 C30.707,14.21,30.707,9.072,33.865,5.913z" fill="url(#SVGID_15__)"/>
-<g>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16__" x1="27.1475" x2="27.1475" y1="20.6016" y2="-0.8683">
-<stop offset="0" style="stop-color:#AAE535"/>
-<stop offset="1" style="stop-color:#5D9C0A"/>
+<path d="M13.819,10.529c-1.231-1.232-1.867-2.835-1.919-4.452c-0.057,1.76,0.58,3.54,1.919,4.881 l1.386-1.386c-0.072-0.073-0.137-0.15-0.203-0.226L13.819,10.529z" fill="url(#SVGID_16__)"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -276 -335)" gradientUnits="userSpaceOnUse" id="SVGID_17__" x1="293.0571" x2="293.0571" y1="-344.208" y2="-338.9822">
+ <stop offset="0" style="stop-color:#AAE535"/>
+ <stop offset="1" style="stop-color:#5D9C0A"/>
+</linearGradient>
+<path d="M16.963,8.772c-0.748-0.749-1.141-1.714-1.193-2.695C15.713,7.2,16.106,8.345,16.963,9.2 l1.387-1.387c-0.074-0.072-0.133-0.154-0.193-0.235L16.963,8.772z" fill="url(#SVGID_17__)"/>
+<path d="M13.818,2.055l1.184,1.181c0.066-0.074,0.131-0.152,0.203-0.225l-1.387-1.386 c-1.341,1.342-1.975,3.12-1.918,4.881C11.952,4.888,12.586,3.287,13.818,2.055z" fill="#FFFFFF" opacity="0.5"/>
+<path d="M16.963,3.812l1.193,1.192c0.061-0.08,0.119-0.162,0.193-0.237l-1.387-1.385 c-0.857,0.856-1.25,2.002-1.193,3.124C15.823,5.524,16.217,4.56,16.963,3.812z" fill="#FFFFFF" opacity="0.5"/>
+<linearGradient gradientTransform="matrix(0.7071 -0.7071 -0.7071 -0.7071 201.7121 10.7984)" gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="-117.2642" x2="-123.9698" y1="130.2861" y2="123.6729">
+ <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="M26.377,1.625l-1.387,1.386c1.809,1.809,1.809,4.753,0,6.563l1.385,1.387 C28.95,8.386,28.95,4.198,26.377,1.625z" fill="url(#SVGID_18_)"/>
+<linearGradient gradientTransform="matrix(0.7071 -0.7071 -0.7071 -0.7071 201.7121 10.7984)" gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="-119.7256" x2="-126.43" y1="132.7783" y2="126.1663">
+ <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="M27.676,19.979c-2.424-2.425-3.675-5.579-3.777-8.762c-0.112,3.465,1.139,6.966,3.777,9.606 l2.728-2.728c-0.143-0.144-0.27-0.294-0.4-0.444L27.676,19.979z" fill="url(#SVGID_16__)"/>
-</g>
-<g>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17__" x1="34.0488" x2="34.0488" y1="17.3809" y2="7.0927">
-<stop offset="0" style="stop-color:#AAE535"/>
-<stop offset="1" style="stop-color:#5D9C0A"/>
+<path d="M23.231,3.382l-1.387,1.385c0.842,0.842,0.842,2.209,0,3.049l1.387,1.387 C24.836,7.599,24.836,4.987,23.231,3.382z" fill="url(#SVGID_19_)"/>
+<linearGradient gradientTransform="matrix(-1 0 0 -1 919.7686 -335)" gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="893.1245" x2="893.1245" y1="-345.8447" y2="-334.9362">
+ <stop offset="0" style="stop-color:#AAE535"/>
+ <stop offset="1" style="stop-color:#5D9C0A"/>
+</linearGradient>
+<path d="M26.375,10.529c1.232-1.232,1.867-2.835,1.92-4.452c0.057,1.76-0.578,3.54-1.92,4.881l-1.387-1.386 c0.072-0.073,0.137-0.15,0.204-0.226L26.375,10.529z" fill="url(#SVGID_20_)"/>
+<linearGradient gradientTransform="matrix(-1 0 0 -1 919.7686 -335)" gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="896.6313" x2="896.6313" y1="-344.2075" y2="-338.9817">
+ <stop offset="0" style="stop-color:#AAE535"/>
+ <stop offset="1" style="stop-color:#5D9C0A"/>
</linearGradient>
-<path d="M33.865,16.521c-1.472-1.472-2.248-3.372-2.349-5.304c-0.114,2.212,0.662,4.463,2.349,6.148 l2.728-2.728c-0.146-0.144-0.261-0.306-0.38-0.465L33.865,16.521z" fill="url(#SVGID_17__)"/>
-</g>
-<g fill-opacity="0.6" stroke-opacity="0.6">
-<path d="M27.674,3.302l2.329,2.325c0.131-0.149,0.258-0.301,0.4-0.443l-2.729-2.727 c-2.639,2.64-3.888,6.141-3.775,9.605C24.001,8.879,25.251,5.726,27.674,3.302z" fill="#FFFFFF"/>
-</g>
-<g fill-opacity="0.6" stroke-opacity="0.6">
-<path d="M33.865,6.759l2.348,2.347c0.119-0.159,0.234-0.32,0.38-0.465l-2.728-2.728 c-1.687,1.687-2.463,3.938-2.349,6.149C31.617,10.131,32.394,8.23,33.865,6.759z" fill="#FFFFFF"/>
-</g>
+<path d="M23.231,8.772c0.746-0.749,1.143-1.714,1.193-2.695C24.482,7.2,24.086,8.345,23.231,9.2 l-1.387-1.387c0.074-0.072,0.133-0.154,0.191-0.235L23.231,8.772z" fill="url(#SVGID_21_)"/>
+<path d="M26.377,2.055l-1.185,1.181c-0.067-0.074-0.132-0.152-0.202-0.225l1.387-1.386 c1.34,1.342,1.975,3.12,1.918,4.881C28.243,4.888,27.608,3.287,26.377,2.055z" fill="#FFFFFF" opacity="0.5"/>
+<path d="M23.231,3.812l-1.195,1.192c-0.059-0.08-0.117-0.162-0.191-0.237l1.387-1.385 c0.855,0.856,1.251,2.002,1.193,3.124C24.374,5.524,23.977,4.56,23.231,3.812z" fill="#FFFFFF" opacity="0.5"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -276 -335)" gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="302.5112" x2="302.5112" y1="-360.3394" y2="-362.1274">
+ <stop offset="0" style="stop-color:#334247"/>
+ <stop offset="1" style="stop-color:#446066"/>
+</linearGradient>
+<path d="M25.579,27.132c-0.35,0-0.623-0.233-0.623-0.533v-0.711c0-0.299,0.273-0.533,0.623-0.533h1.867 c0.348,0,0.621,0.234,0.621,0.533v0.711c0,0.3-0.273,0.533-0.621,0.533H25.579z" fill="url(#SVGID_22_)"/>
+<path d="M27.755,26.599c0,0.123-0.138,0.223-0.31,0.223h-1.867 c-0.172,0-0.311-0.1-0.311-0.223v-0.711c0-0.121,0.139-0.222,0.311-0.222h1.867c0.172,0,0.31,0.099,0.31,0.222V26.599z" enable-background="new " fill="#3FA9F5" opacity="0.5"/>
+<rect fill="none" height="30" width="30"/>
</g>
-<g>
-<linearGradient gradientTransform="matrix(0.7071 -0.7071 0.7071 0.7071 449.7858 369.3789)" gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="-21.0962" x2="-34.2907" y1="-540.0996" y2="-527.0869">
-<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="M52.389,2.457l-2.729,2.727c3.56,3.56,3.559,9.354,0,12.913l2.727,2.728 C57.45,15.76,57.45,7.521,52.389,2.457z" fill="url(#SVGID_18_)"/>
-<linearGradient gradientTransform="matrix(0.7071 -0.7071 0.7071 0.7071 449.7858 369.3789)" gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="-25.9399" x2="-39.1338" y1="-545.0034" y2="-531.9913">
-<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="M46.197,5.913L43.47,8.641c1.654,1.654,1.654,4.345,0,5.998l2.728,2.728 C49.355,14.21,49.355,9.072,46.197,5.913z" fill="url(#SVGID_19_)"/>
-<g>
-<linearGradient gradientTransform="matrix(-1 0 0 1 1224.7676 0)" gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="1171.8535" x2="1171.8535" y1="20.6016" y2="-0.8683">
-<stop offset="0" style="stop-color:#AAE535"/>
-<stop offset="1" style="stop-color:#5D9C0A"/>
-</linearGradient>
-<path d="M52.386,19.979c2.425-2.425,3.675-5.579,3.777-8.762c0.112,3.465-1.138,6.966-3.777,9.606 l-2.727-2.728c0.142-0.144,0.269-0.294,0.399-0.444L52.386,19.979z" fill="url(#SVGID_20_)"/>
-</g>
-<g>
-<linearGradient gradientTransform="matrix(-1 0 0 1 1224.7676 0)" gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="1178.7539" x2="1178.7539" y1="17.3809" y2="7.0927">
-<stop offset="0" style="stop-color:#AAE535"/>
-<stop offset="1" style="stop-color:#5D9C0A"/>
-</linearGradient>
-<path d="M46.197,16.521c1.471-1.472,2.248-3.372,2.349-5.304c0.114,2.212-0.663,4.463-2.349,6.148 l-2.728-2.728c0.145-0.144,0.261-0.306,0.379-0.465L46.197,16.521z" fill="url(#SVGID_21_)"/>
-</g>
-<g fill-opacity="0.6" stroke-opacity="0.6">
-<path d="M52.389,3.302l-2.33,2.325c-0.131-0.149-0.258-0.301-0.399-0.443l2.729-2.727 c2.638,2.64,3.887,6.141,3.774,9.605C56.061,8.879,54.811,5.726,52.389,3.302z" fill="#FFFFFF"/>
-</g>
-<g fill-opacity="0.6" stroke-opacity="0.6">
-<path d="M46.197,6.759l-2.349,2.347c-0.118-0.159-0.234-0.32-0.379-0.465l2.728-2.728 c1.686,1.687,2.463,3.938,2.349,6.149C48.445,10.131,47.668,8.23,46.197,6.759z" fill="#FFFFFF"/>
-</g>
-</g>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="52.6523" x2="52.6523" y1="49.124" y2="52.6441">
-<stop offset="0" style="stop-color:#334247"/>
-<stop offset="1" style="stop-color:#446066"/>
-</linearGradient>
-<path d="M50.816,52.653c-0.687,0-1.225-0.461-1.225-1.05v-1.399c0-0.589,0.538-1.05,1.225-1.05h3.674 c0.686,0,1.224,0.461,1.224,1.05v1.399c0,0.589-0.538,1.05-1.224,1.05H50.816z" fill="url(#SVGID_22_)"/>
-<path d="M55.102,51.604c0,0.241-0.273,0.438-0.611,0.438h-3.674c-0.339,0-0.612-0.196-0.612-0.438 v-1.399c0-0.241,0.273-0.438,0.612-0.438h3.674c0.338,0,0.611,0.196,0.611,0.438V51.604z" fill="#3FA9F5" fill-opacity="0.5" stroke-opacity="0.5"/>
-</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_phonebook.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_phonebook.svg Fri May 14 16:09:54 2010 +0300
@@ -1,66 +1,65 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="60" width="60"/>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30.8115" x2="30.8115" y1="3.3521" y2="56.9221">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#CCCCCC"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#CCCCCC"/>
</linearGradient>
<path d="M54.349,56.377c0,0.085-0.727,0.813-1.622,0.813H8.898c-0.896,0-1.624-0.728-1.624-1.623V4.434 c0-0.896,0.728-1.623,1.624-1.623h43.828c0.896,0,1.622,0.728,1.622,2.437V56.377z" fill="url(#SVGID_1_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="51.5088" x2="55.7697" y1="16.9629" y2="16.9629">
-<stop offset="0" style="stop-color:#808080"/>
-<stop offset="0.897" style="stop-color:#F0F0F0"/>
-<stop offset="0.9091" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#FFFFFF"/>
+ <stop offset="0" style="stop-color:#808080"/>
+ <stop offset="0.897" style="stop-color:#F0F0F0"/>
+ <stop offset="0.9091" style="stop-color:#FFFFFF"/>
</linearGradient>
<path d="M55.259,22.511c0.438-0.225,0.713-0.678,0.713-1.17v-9.238c0-0.492-0.275-0.945-0.713-1.169 l-3.399-1.187v14.432L55.259,22.511z" fill="url(#SVGID_2_)"/>
-<polygon fill="#231F20" fill-opacity="0.35" points="51.769,21.19 55.08,22.481 52.512,23.733 51.769,23.71 " stroke-opacity="0.35"/>
+<polygon fill="#231F20" opacity="0.35" points="51.769,21.19 55.08,22.481 52.512,23.733 51.769,23.71 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="55.6133" x2="51.1445" y1="30.522" y2="30.522">
-<stop offset="0" style="stop-color:#AFE865"/>
-<stop offset="0.0485" style="stop-color:#AFE865"/>
-<stop offset="0.0606" style="stop-color:#68B339"/>
-<stop offset="1" style="stop-color:#136101"/>
+ <stop offset="0.0485" style="stop-color:#AFE865"/>
+ <stop offset="0.0606" style="stop-color:#68B339"/>
+ <stop offset="1" style="stop-color:#136101"/>
</linearGradient>
<path d="M55.093,36.307c0.438-0.224,0.715-0.678,0.715-1.169v-9.239c0-0.49-0.277-0.943-0.715-1.167 l-3.754-1.427v14.435L55.093,36.307z" fill="url(#SVGID_3_)"/>
-<polygon fill="#231F20" fill-opacity="0.35" points="50.641,35.196 54.729,36.608 51.83,37.739 50.629,37.705 " stroke-opacity="0.35"/>
+<polygon fill="#231F20" opacity="0.35" points="50.641,35.196 54.729,36.608 51.83,37.739 50.629,37.705 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="55.5654" x2="50.8946" y1="44.645" y2="44.645">
-<stop offset="0" style="stop-color:#B8D6E9"/>
-<stop offset="0.0667" style="stop-color:#5CB2E9"/>
-<stop offset="1" style="stop-color:#005BCC"/>
+ <stop offset="0" style="stop-color:#B8D6E9"/>
+ <stop offset="0.0667" style="stop-color:#5CB2E9"/>
+ <stop offset="1" style="stop-color:#005BCC"/>
</linearGradient>
<path d="M55.193,50.915c0.438-0.224,0.715-0.677,0.715-1.169V39.538c0-0.492-0.277-0.944-0.715-1.169 l-4.172-1.427v15.405L55.193,50.915z" fill="url(#SVGID_4_)"/>
-<rect fill="#404041" fill-opacity="0.2" height="54.379" stroke-opacity="0.2" width="18.668" x="34.059" y="2.811"/>
-<rect fill="#404041" fill-opacity="0.2" height="54.379" stroke-opacity="0.2" width="18.668" x="33.246" y="2.811"/>
+<rect fill="#404041" height="54.379" opacity="0.2" width="18.668" x="34.059" y="2.811"/>
+<rect fill="#404041" height="54.379" opacity="0.2" width="18.668" x="33.246" y="2.811"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="27.5664" x2="27.5664" y1="1.9009" y2="57.1847">
-<stop offset="0" style="stop-color:#B2F56E"/>
-<stop offset="0.5333" style="stop-color:#439020"/>
-<stop offset="1" style="stop-color:#0D4D07"/>
+ <stop offset="0" style="stop-color:#B2F56E"/>
+ <stop offset="0.5333" style="stop-color:#439020"/>
+ <stop offset="1" style="stop-color:#0D4D07"/>
</linearGradient>
<path d="M51.104,56.377c0,0.898-0.729,1.623-1.624,1.623H5.652c-0.896,0-1.623-0.725-1.623-1.623V3.623 C4.029,2.728,4.756,2,5.652,2h43.827c0.896,0,1.624,0.728,1.624,1.623V56.377z" fill="url(#SVGID_5_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="30.4072" x2="30.4072" y1="1.73" y2="72.4742">
-<stop offset="0" style="stop-color:#CDEDBD"/>
-<stop offset="0.9879" style="stop-color:#139900"/>
-<stop offset="1" style="stop-color:#139900"/>
+ <stop offset="0" style="stop-color:#CDEDBD"/>
+ <stop offset="0.9879" style="stop-color:#139900"/>
</linearGradient>
<path d="M49.479,2.811c0.448,0,0.811,0.365,0.811,0.813v52.754c0,0.449-0.362,0.813-0.811,0.813H10.521V2.811 H49.479 M49.479,2H9.711v56h39.769c0.896,0,1.624-0.725,1.624-1.623V3.623C51.104,2.728,50.375,2,49.479,2L49.479,2z" fill="url(#SVGID_6_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="6.8701" x2="6.8701" y1="1.73" y2="58.813">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="1" style="stop-color:#A0A0A0"/>
+ <stop offset="0" style="stop-color:#F2F2F2"/>
+ <stop offset="1" style="stop-color:#A0A0A0"/>
</linearGradient>
<path d="M5.652,2C4.756,2,4.029,2.728,4.029,3.623v52.754C4.029,57.275,4.756,58,5.652,58h4.059V2H5.652z" fill="url(#SVGID_7_)"/>
<rect fill="#737373" height="56" width="0.813" x="8.898" y="2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="8.4932" x2="8.4932" y1="1.73" y2="58.813">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#E6E6E6"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#E6E6E6"/>
</linearGradient>
<rect fill="url(#SVGID_8_)" height="56" width="0.811" x="8.088" y="2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="30.8125" x2="30.8125" y1="21.3486" y2="47.4313">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#CFCFCF"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#CFCFCF"/>
</linearGradient>
<path d="M39.314,37.199c-1.072-0.559-2.147-0.521-4.064-1.728c-3.053-1.921,0.533-4.525,1.326-6.673 c0.652,0.225,1.488-0.381,1.904-1.406c0.431-1.063,0.244-2.166-0.416-2.463c-0.037-0.016-0.078-0.02-0.114-0.031l0,0 c0.083-0.337,0.122-0.533,0.122-0.533c1.142-5.12-1.34-9.179-7.358-9.381c-2.473,0-3.661,1.126-4.58,2.301 c-1.491,0.23-3.853,1.596-2.196,7.566c-0.059,0.021-0.115,0.041-0.181,0.07c-0.667,0.28-0.875,1.374-0.469,2.441 c0.409,1.066,1.282,1.705,1.947,1.424c0.042-0.017,0.076-0.047,0.114-0.071c0.729,2.23,4.109,5.207,1.46,6.626 c-0.192,0.104-3.283,1.211-4.5,1.857c-1.396,0.74-3.671,2.441-3.671,6.275h24.348C42.986,39.641,40.389,37.76,39.314,37.199z" fill="url(#SVGID_9_)"/>
-<rect fill="#DEFEAC" fill-opacity="0.5" height="0.813" stroke-opacity="0.5" width="24.348" x="18.639" y="43.475"/>
+<rect fill="#DEFEAC" height="0.813" opacity="0.5" width="24.348" x="18.639" y="43.475"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_photos.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_photos.svg Fri May 14 16:09:54 2010 +0300
@@ -1,114 +1,111 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.2485" style="stop-color:#F1F2F2"/>
-<stop offset="0.6121" style="stop-color:#D4DADE"/>
-<stop offset="0.9152" style="stop-color:#E3E8E8"/>
-<stop offset="0.9818" style="stop-color:#FCFFFE"/>
-<stop offset="1" style="stop-color:#FCFFFE"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="0.2485" style="stop-color:#F1F2F2"/>
+ <stop offset="0.6121" style="stop-color:#D4DADE"/>
+ <stop offset="0.9152" style="stop-color:#E3E8E8"/>
+ <stop offset="0.9818" style="stop-color:#FCFFFE"/>
</linearGradient>
<polygon fill="url(#SVGID_1_)" points="54.098,47.98 4.005,50.45 1.999,9.095 52.092,6.622 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="28.0479" x2="28.0478" y1="8.2808" y2="49.2366">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="0.2485" style="stop-color:#EBECEC"/>
-<stop offset="0.6121" style="stop-color:#ADB2B5"/>
-<stop offset="0.9152" style="stop-color:#CCD1D1"/>
-<stop offset="0.9818" style="stop-color:#E6E9E8"/>
-<stop offset="1" style="stop-color:#E6E9E8"/>
+ <stop offset="0" style="stop-color:#F2F2F2"/>
+ <stop offset="0.2485" style="stop-color:#EBECEC"/>
+ <stop offset="0.6121" style="stop-color:#ADB2B5"/>
+ <stop offset="0.9152" style="stop-color:#CCD1D1"/>
+ <stop offset="0.9818" style="stop-color:#E6E9E8"/>
</linearGradient>
<path d="M51.492,7.289l1.943,40.087l-48.83,2.405L2.661,9.698L51.492,7.289" fill="url(#SVGID_2_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="5.3555" x2="50.48" y1="26.7739" y2="24.7415">
-<stop offset="0" style="stop-color:#92D4E3"/>
-<stop offset="1" style="stop-color:#2671D1"/>
+ <stop offset="0" style="stop-color:#92D4E3"/>
+ <stop offset="1" style="stop-color:#2671D1"/>
</linearGradient>
<polygon fill="url(#SVGID_3_)" points="51.11,39.233 6.322,41.44 4.908,12.275 49.697,10.066 "/>
-<polygon fill="#231F20" fill-opacity="0.3" points="53.861,50.161 52.514,14.279 7.008,14.279 7.008,50.161 " stroke-opacity="0.3"/>
+<polygon fill="#231F20" opacity="0.3" points="53.861,50.161 52.514,14.279 7.008,14.279 7.008,50.161 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="32.9248" x2="32.9248" y1="14.937" y2="53.5091">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="0.297" style="stop-color:#DBDCDD"/>
-<stop offset="0.6121" style="stop-color:#ADB2B5"/>
-<stop offset="0.9152" style="stop-color:#CCD1D1"/>
-<stop offset="0.9818" style="stop-color:#E6E9E8"/>
-<stop offset="1" style="stop-color:#E6E9E8"/>
+ <stop offset="0" style="stop-color:#F2F2F2"/>
+ <stop offset="0.297" style="stop-color:#DBDCDD"/>
+ <stop offset="0.6121" style="stop-color:#ADB2B5"/>
+ <stop offset="0.9152" style="stop-color:#CCD1D1"/>
+ <stop offset="0.9818" style="stop-color:#E6E9E8"/>
</linearGradient>
<rect fill="url(#SVGID_4_)" height="38.25" width="50.149" x="7.85" y="15.128"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="32.9248" x2="32.9248" y1="15.1279" y2="53.5738">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.2485" style="stop-color:#F1F2F2"/>
-<stop offset="0.6121" style="stop-color:#D4DADE"/>
-<stop offset="0.9152" style="stop-color:#E3E8E8"/>
-<stop offset="0.9818" style="stop-color:#FCFFFE"/>
-<stop offset="1" style="stop-color:#FCFFFE"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="0.2485" style="stop-color:#F1F2F2"/>
+ <stop offset="0.6121" style="stop-color:#D4DADE"/>
+ <stop offset="0.9152" style="stop-color:#E3E8E8"/>
+ <stop offset="0.9818" style="stop-color:#FCFFFE"/>
</linearGradient>
<path d="M57.37,15.767v36.973H8.479V15.767H57.37 M57.999,15.128H7.85v38.25h50.149V15.128L57.999,15.128z" fill="url(#SVGID_5_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="33.0215" x2="33.0215" y1="18.2749" y2="50.5403">
-<stop offset="0" style="stop-color:#B3B3B3"/>
-<stop offset="1" style="stop-color:#666666"/>
+ <stop offset="0" style="stop-color:#B3B3B3"/>
+ <stop offset="1" style="stop-color:#666666"/>
</linearGradient>
<rect fill="url(#SVGID_6_)" height="31.317" width="44.844" x="10.6" y="18.45"/>
<radialGradient cx="54.0225" cy="18.9033" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="52.4862">
-<stop offset="0" style="stop-color:#8BC53F"/>
-<stop offset="0.503" style="stop-color:#33773B"/>
-<stop offset="1" style="stop-color:#004F3C"/>
+ <stop offset="0" style="stop-color:#8BC53F"/>
+ <stop offset="0.503" style="stop-color:#33773B"/>
+ <stop offset="1" style="stop-color:#004F3C"/>
</radialGradient>
<rect fill="url(#SVGID_7_)" height="30.029" width="43.32" x="11.344" y="19.173"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="18.3887" x2="65.1917" y1="23.498" y2="49.7402">
-<stop offset="0" style="stop-color:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
+ <stop offset="0" style="stop-color:#A7FF00"/>
+ <stop offset="1" style="stop-color:#138F00"/>
</linearGradient>
<path d="M54.664,39.146c-0.629-0.43-1.334-0.841-2.129-1.204c-4.343-1.972-17.958-4.564-27.088-7.607 c-9.131-3.045-5.986-6.29-5.986-6.29c-0.202-0.711-0.709-1.421-1.521-0.204c-2.154,3.23,2.193,5.898,7,7.608 c5.986,2.132,19.838,4.423,25.262,8.016c1.836,1.216,3.296,2.394,4.463,3.482V39.146z" fill="url(#SVGID_8_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="25.0088" x2="27.8499" y1="32.647" y2="39.5468">
-<stop offset="0" style="stop-color:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
+ <stop offset="0" style="stop-color:#A7FF00"/>
+ <stop offset="1" style="stop-color:#138F00"/>
</linearGradient>
<path d="M21.49,39.972c1.014,0.813,4.647,1.473,8.219-1.927c2.129-2.029,2.129-5.073,2.129-5.073 s-3.854-1.116-7.405,1.319C20.882,36.726,20.477,39.159,21.49,39.972z" fill="url(#SVGID_9_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="15.8662" x2="16.0691" y1="27.7065" y2="31.6628">
-<stop offset="0" style="stop-color:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
+ <stop offset="0" style="stop-color:#A7FF00"/>
+ <stop offset="1" style="stop-color:#138F00"/>
</linearGradient>
<path d="M12.544,30.37c0.415,0.624,2.298,1.62,4.854,0.377c1.524-0.744,2.057-2.417,2.057-2.417 s-1.925-1.286-4.302-0.567C12.775,28.479,12.129,29.746,12.544,30.37z" fill="url(#SVGID_10_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="25.8027" x2="26.7159" y1="25.4258" y2="29.8901">
-<stop offset="0" style="stop-color:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
+ <stop offset="0" style="stop-color:#A7FF00"/>
+ <stop offset="1" style="stop-color:#138F00"/>
</linearGradient>
<path d="M29.506,25.059c-0.711-0.71-2.659-1.55-5.275,0.61c-1.563,1.288-1.581,3.556-1.581,3.556 s2.595,0.298,4.675-0.817C29.73,27.116,30.14,25.693,29.506,25.059z" fill="url(#SVGID_11_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="40.0938" x2="42.1227" y1="28.4878" y2="39.1729">
-<stop offset="0" style="stop-color:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
+ <stop offset="0" style="stop-color:#A7FF00"/>
+ <stop offset="1" style="stop-color:#138F00"/>
</linearGradient>
<path d="M43.962,28.813c-0.614-0.793-2.64-1.47-4.871,0.71c-1.446,1.414-1.935,4.57-1.935,4.57 s2.595,0.3,4.674-0.816C44.236,31.985,44.824,29.929,43.962,28.813z" fill="url(#SVGID_12_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="43.7607" x2="43.2202" y1="36.4453" y2="47.2661">
-<stop offset="0" style="stop-color:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
+ <stop offset="0" style="stop-color:#A7FF00"/>
+ <stop offset="1" style="stop-color:#138F00"/>
</linearGradient>
<path d="M37.245,46.001c1.288,0.863,6.896,2.138,11.433-1.479c2.711-2.159,1.725-5.969,1.725-5.969 s-5.83-2.202-10.347,0.391C35.539,41.532,35.954,45.136,37.245,46.001z" fill="url(#SVGID_13_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="52.2568" x2="56.5859" y1="29.7988" y2="42.3786">
-<stop offset="0" style="stop-color:#A7FF00"/>
-<stop offset="1" style="stop-color:#138F00"/>
+ <stop offset="0" style="stop-color:#A7FF00"/>
+ <stop offset="1" style="stop-color:#138F00"/>
</linearGradient>
<path d="M54.664,29.374c-1.041,1.038-1.97,2.361-2.577,4.026c-1.184,3.254,1.644,5.99,1.644,5.99 s0.359-0.069,0.934-0.233V29.374z" fill="url(#SVGID_14_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="47.4512" x2="44.533" y1="29.749" y2="35.4486">
-<stop offset="0" style="stop-color:#45E8FF"/>
-<stop offset="0.1333" style="stop-color:#45E8FF"/>
-<stop offset="0.5333" style="stop-color:#30A4D5"/>
-<stop offset="1" style="stop-color:#1347BA"/>
+ <stop offset="0.1333" style="stop-color:#45E8FF"/>
+ <stop offset="0.5333" style="stop-color:#30A4D5"/>
+ <stop offset="1" style="stop-color:#1347BA"/>
</linearGradient>
<path d="M44.197,35.911c0,0,1.608-8.439,3.197-5.71C48.369,31.871,45.559,35.674,44.197,35.911z" fill="url(#SVGID_15_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="40.9365" x2="43.3032" y1="29.688" y2="36.0635">
-<stop offset="0" style="stop-color:#45E8FF"/>
-<stop offset="0.5152" style="stop-color:#30A4D5"/>
-<stop offset="1" style="stop-color:#1347BA"/>
+ <stop offset="0" style="stop-color:#45E8FF"/>
+ <stop offset="0.5152" style="stop-color:#30A4D5"/>
+ <stop offset="1" style="stop-color:#1347BA"/>
</linearGradient>
<path d="M44.324,35.956c0,0-0.502-10.259-3.893-6.101C38.119,32.696,41.59,34.696,44.324,35.956z" fill="url(#SVGID_16_)"/>
-<polygon fill="#FFFFFF" fill-opacity="0.3" points="57.999,25.07 57.999,15.128 7.85,15.128 7.85,31.056 " stroke-opacity="0.3"/>
-<rect fill="#FFFFFF" fill-opacity="0.05" height="1.396" stroke-opacity="0.05" width="44.844" x="10.6" y="48.371"/>
-<rect fill="#FFFFFF" fill-opacity="0.05" height="2.204" stroke-opacity="0.05" width="44.844" x="10.6" y="47.563"/>
-<rect fill="#FFFFFF" fill-opacity="0.05" height="3.012" stroke-opacity="0.05" width="44.844" x="10.6" y="46.756"/>
-<rect fill="#FFFFFF" fill-opacity="0.05" height="3.82" stroke-opacity="0.05" width="44.844" x="10.6" y="45.947"/>
+<polygon fill="#FFFFFF" opacity="0.3" points="57.999,25.07 57.999,15.128 7.85,15.128 7.85,31.056 "/>
+<rect fill="#FFFFFF" height="1.396" opacity="0.05" width="44.844" x="10.6" y="48.371"/>
+<rect fill="#FFFFFF" height="2.204" opacity="0.05" width="44.844" x="10.6" y="47.563"/>
+<rect fill="#FFFFFF" height="3.012" opacity="0.05" width="44.844" x="10.6" y="46.756"/>
+<rect fill="#FFFFFF" height="3.82" opacity="0.05" width="44.844" x="10.6" y="45.947"/>
<rect fill="none" height="60" width="59.999"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_pin_code.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_pin_code.svg Fri May 14 16:09:54 2010 +0300
@@ -1,39 +1,40 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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="18.4185" y2="40.575">
-<stop offset="0" style="stop-color:#A8B1B3"/>
-<stop offset="0.3879" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#A2A6A8"/>
+<defs>
+</defs>
+<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"/>
+ <stop offset="0.3879" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#A2A6A8"/>
</linearGradient>
-<rect fill="url(#SVGID_1_)" height="22.247" width="56" x="2" y="18.306"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="20.687" y2="39.4278">
-<stop offset="0" style="stop-color:#A9AAAD"/>
-<stop offset="1" style="stop-color:#000000"/>
+<rect fill="url(#SVGID_1_)" height="20.795" width="56" x="2" y="19.068"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30.0005" x2="30.0005" y1="22.8101" y2="37.2885">
+ <stop offset="0" style="stop-color:#A9AAAD"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
-<rect fill="url(#SVGID_2_)" height="18.817" width="46.884" x="6.558" y="20.592"/>
-<rect fill="#231F20" fill-opacity="0.2" height="18.817" stroke-opacity="0.2" width="1.143" x="52.285" y="20.592"/>
-<rect fill="#231F20" fill-opacity="0.2" height="18.817" stroke-opacity="0.2" width="1.143" x="6.717" y="20.592"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="18.4243" y2="41.7178">
-<stop offset="0" style="stop-color:#D2D3D3"/>
-<stop offset="1" style="stop-color:#7B7E80"/>
+<rect fill="url(#SVGID_2_)" height="14.537" width="47.479" x="6.262" y="22.736"/>
+<rect fill="#231F20" height="14.562" opacity="0.2" width="1.068" x="52.658" y="22.657"/>
+<rect fill="#231F20" height="14.562" opacity="0.2" width="1.068" x="6.41" y="22.657"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="29.9995" x2="29.9995" y1="19.1792" y2="40.952">
+ <stop offset="0" style="stop-color:#D2D3D3"/>
+ <stop offset="1" style="stop-color:#7B7E80"/>
</linearGradient>
-<path d="M2,18.306v23.389h56V18.306H2z M56.856,40.553H3.143V19.448h53.714V40.553z" fill="url(#SVGID_3_)"/>
-<polygon points="37.213,27.633 36.295,27.103 34.896,29.523 33.5,27.103 32.58,27.633 33.979,30.055 31.184,30.055 31.184,31.116 33.979,31.116 32.58,33.536 33.498,34.066 34.896,31.646 36.295,34.066 37.214,33.536 35.816,31.116 38.611,31.116 38.611,30.055 35.814,30.055 "/>
-<polygon points="26.602,27.633 25.684,27.103 24.285,29.523 22.889,27.103 21.969,27.633 23.367,30.055 20.57,30.055 20.57,31.116 23.367,31.116 21.969,33.536 22.887,34.066 24.285,31.646 25.684,34.066 26.603,33.536 25.204,31.116 27.999,31.116 27.999,30.055 25.203,30.055 "/>
-<polygon points="15.989,27.633 15.072,27.103 13.674,29.523 12.277,27.103 11.357,27.633 12.756,30.055 9.959,30.055 9.959,31.116 12.756,31.116 11.357,33.536 12.276,34.066 13.674,31.646 15.072,34.066 15.99,33.536 14.593,31.116 17.388,31.116 17.388,30.055 14.592,30.055 "/>
-<rect height="1.303" width="6.512" x="42.371" y="32.94"/>
-<polygon fill-opacity="0.2" points="31.691,33.056 32.851,31.048 30.531,31.048 30.531,28.684 32.851,28.684 31.691,26.674 33.738,25.495 34.896,27.502 36.057,25.494 38.102,26.675 36.943,28.684 39.262,28.684 39.262,31.048 36.943,31.048 38.104,33.057 36.056,34.235 34.896,32.228 33.738,34.235 " stroke-opacity="0.2"/>
-<polygon fill="#FFFFFF" points="38.611,29.335 35.814,29.335 37.213,26.913 36.295,26.384 34.896,28.805 33.5,26.384 32.58,26.913 33.979,29.335 31.184,29.335 31.184,30.396 33.979,30.396 32.58,32.817 33.498,33.348 34.896,30.927 36.295,33.348 37.214,32.817 35.816,30.396 38.611,30.396 "/>
-<polygon fill-opacity="0.2" points="21.08,33.056 22.238,31.048 19.92,31.048 19.92,28.684 22.239,28.684 21.08,26.675 23.127,25.495 24.285,27.502 25.445,25.495 27.49,26.675 26.331,28.684 28.65,28.684 28.65,31.048 26.332,31.048 27.492,33.057 25.445,34.235 24.285,32.228 23.125,34.236 " stroke-opacity="0.2"/>
-<polygon fill="#FFFFFF" points="27.999,29.335 25.203,29.335 26.602,26.913 25.684,26.384 24.285,28.805 22.889,26.384 21.969,26.913 23.367,29.335 20.57,29.335 20.57,30.396 23.367,30.396 21.969,32.817 22.887,33.348 24.285,30.927 25.684,33.348 26.603,32.817 25.204,30.396 27.999,30.396 "/>
-<polygon fill-opacity="0.2" points="10.469,33.056 11.627,31.048 9.309,31.048 9.309,28.684 11.627,28.684 10.469,26.675 12.516,25.495 13.674,27.502 14.834,25.494 16.879,26.675 15.72,28.684 18.039,28.684 18.039,31.048 15.721,31.048 16.881,33.056 14.834,34.235 13.674,32.228 12.515,34.235 " stroke-opacity="0.2"/>
-<polygon fill="#FFFFFF" points="17.388,29.335 14.592,29.335 15.989,26.913 15.072,26.384 13.674,28.805 12.277,26.384 11.357,26.913 12.756,29.335 9.959,29.335 9.959,30.396 12.756,30.396 11.357,32.817 12.276,33.348 13.674,30.927 15.072,33.348 15.99,32.817 14.593,30.396 17.388,30.396 "/>
-<rect fill-opacity="0.2" height="2.604" stroke-opacity="0.2" width="7.813" x="41.721" y="31.569"/>
-<rect fill="#E6E6E6" height="1.303" width="6.512" x="42.371" y="32.22"/>
-<rect fill-opacity="0.3" height="0.651" stroke-opacity="0.3" width="46.884" x="6.558" y="20.592"/>
+<path d="M2,19.068V40.93h56V19.068H2z M56.932,39.863H3.068V20.135h53.863V39.863z" fill="url(#SVGID_3_)"/>
+<polygon points="36.742,27.786 35.885,27.292 34.578,29.555 33.271,27.292 32.412,27.786 33.721,30.051 31.107,30.051 31.107,31.043 33.721,31.043 32.412,33.305 33.271,33.799 34.578,31.537 35.885,33.799 36.744,33.305 35.438,31.043 38.051,31.043 38.051,30.051 35.436,30.051 "/>
+<polygon points="26.824,27.786 25.965,27.292 24.659,29.555 23.353,27.292 22.494,27.786 23.801,30.051 21.187,30.051 21.187,31.043 23.801,31.043 22.494,33.305 23.352,33.799 24.659,31.537 25.965,33.799 26.825,33.305 25.518,31.043 28.131,31.043 28.131,30.051 25.518,30.051 "/>
+<polygon points="16.904,27.786 16.047,27.292 14.739,29.555 13.434,27.292 12.574,27.786 13.881,30.051 11.268,30.051 11.268,31.043 13.881,31.043 12.574,33.305 13.434,33.799 14.739,31.537 16.047,33.799 16.905,33.305 15.599,31.043 18.211,31.043 18.211,30.051 15.598,30.051 "/>
+<rect height="1.217" width="6.086" x="41.566" y="32.748"/>
+<polygon opacity="0.2" points="31.582,32.855 32.666,30.979 30.499,30.979 30.499,28.768 32.666,28.768 31.582,26.891 33.496,25.787 34.578,27.665 35.662,25.787 37.574,26.891 36.49,28.768 38.658,28.768 38.658,30.979 36.492,30.979 37.576,32.855 35.662,33.959 34.578,32.082 33.494,33.959 "/>
+<polygon fill="#FFFFFF" points="38.051,29.377 35.436,29.377 36.742,27.114 35.885,26.62 34.578,28.881 33.271,26.62 32.412,27.114 33.721,29.377 31.107,29.377 31.107,30.37 33.721,30.37 32.412,32.633 33.271,33.127 34.578,30.866 35.885,33.127 36.744,32.633 35.438,30.37 38.051,30.37 "/>
+<polygon opacity="0.2" points="21.662,32.855 22.746,30.979 20.578,30.979 20.578,28.768 22.746,28.768 21.662,26.891 23.576,25.787 24.659,27.665 25.742,25.787 27.655,26.891 26.571,28.768 28.739,28.768 28.739,30.979 26.572,30.979 27.656,32.855 25.742,33.959 24.659,32.082 23.574,33.959 "/>
+<polygon fill="#FFFFFF" points="28.131,29.377 25.518,29.377 26.824,27.114 25.965,26.62 24.659,28.881 23.353,26.62 22.494,27.114 23.801,29.377 21.187,29.377 21.187,30.37 23.801,30.37 22.494,32.633 23.352,33.127 24.659,30.866 25.965,33.127 26.825,32.633 25.518,30.37 28.131,30.37 "/>
+<polygon opacity="0.2" points="11.742,32.855 12.826,30.979 10.659,30.979 10.659,28.768 12.826,28.768 11.742,26.891 13.656,25.787 14.74,27.665 15.823,25.787 17.736,26.891 16.652,28.768 18.82,28.768 18.82,30.979 16.652,30.979 17.737,32.855 15.823,33.959 14.739,32.082 13.656,33.959 "/>
+<polygon fill="#FFFFFF" points="18.211,29.377 15.598,29.377 16.904,27.114 16.047,26.62 14.739,28.881 13.434,26.62 12.574,27.114 13.881,29.377 11.268,29.377 11.268,30.37 13.881,30.37 12.574,32.633 13.434,33.127 14.739,30.866 16.047,33.127 16.905,32.633 15.599,30.37 18.211,30.37 "/>
+<rect height="2.436" opacity="0.2" width="7.305" x="40.957" y="31.465"/>
+<rect fill="#E6E6E6" height="1.217" width="6.086" x="41.566" y="32.074"/>
+<rect height="0.607" opacity="0.3" width="47.479" x="6.262" y="22.736"/>
<rect fill="none" height="60" width="60"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_play.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_play.svg Fri May 14 16:09:54 2010 +0300
@@ -1,24 +1,26 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="60" width="60"/>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientTransform="matrix(0.5 0 0 0.5 590.3462 -1619.0369)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-1120.6924" x2="-1120.6924" y1="3241.8101" y2="3353.8101">
-<stop offset="0" style="stop-color:#D5F5B5"/>
-<stop offset="1" style="stop-color:#40AD00"/>
+ <stop offset="0" style="stop-color:#D5F5B5"/>
+ <stop offset="1" style="stop-color:#40AD00"/>
</linearGradient>
<path d="M30,58C14.561,58,2,45.44,2,30C2,14.562,14.561,2,30,2c15.436,0,28,12.562,28,28 C58,45.44,45.436,58,30,58L30,58z" fill="url(#SVGID_1_)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3204.8525)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2164.001" x2="-2164.001" y1="3202.0542" y2="3146.4495">
-<stop offset="0" style="stop-color:#8CFF24"/>
-<stop offset="1" style="stop-color:#15570B"/>
+ <stop offset="0" style="stop-color:#8CFF24"/>
+ <stop offset="1" style="stop-color:#15570B"/>
</linearGradient>
<path d="M57.197,30c0,15.024-12.18,27.201-27.197,27.201C14.975,57.201,2.801,45.024,2.801,30 C2.801,14.981,14.975,2.799,30,2.799C45.018,2.799,57.197,14.981,57.197,30z" fill="url(#SVGID_2_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="33.0234" x2="33.0234" y1="42.7275" y2="14.4317">
-<stop offset="0" style="stop-color:#82DA3B"/>
-<stop offset="1" style="stop-color:#11470A"/>
+ <stop offset="0" style="stop-color:#82DA3B"/>
+ <stop offset="1" style="stop-color:#11470A"/>
</linearGradient>
<polygon fill="url(#SVGID_3_)" points="20.705,14.267 45.342,28.42 20.705,42.858 "/>
<polygon fill="#FFFFFF" points="22.221,16.888 44.016,29.469 22.221,42.054 "/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_playlist.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_playlist.svg Fri May 14 16:09:54 2010 +0300
@@ -1,32 +1,32 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<stop offset="0" style="stop-color:#E6E9E8"/>
-<stop offset="0.7455" style="stop-color:#ADB2B5"/>
-<stop offset="1" style="stop-color:#ADB2B5"/>
+ <stop offset="0" style="stop-color:#E6E9E8"/>
+ <stop offset="0.7455" style="stop-color:#ADB2B5"/>
</linearGradient>
<rect fill="url(#SVGID_1_)" height="53" width="51.291" x="4.354" y="3.5"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="29.999" x2="29.999" y1="3.0728" y2="54.3628">
-<stop offset="0" style="stop-color:#F5F5F5"/>
-<stop offset="1" style="stop-color:#CCCCCC"/>
+ <stop offset="0" style="stop-color:#F5F5F5"/>
+ <stop offset="1" style="stop-color:#CCCCCC"/>
</linearGradient>
<path d="M55.645,54.79h-26.5c0,0-13.249-0.381-20.089-3.347c-4.56-1.975-4.702-4.181-4.702-4.181V3.5h51.291 V54.79z" fill="url(#SVGID_2_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="29.999" x2="29.999" y1="3.0728" y2="54.3628">
-<stop offset="0" style="stop-color:#E5EBED"/>
-<stop offset="0.703" style="stop-color:#8D9699"/>
-<stop offset="1" style="stop-color:#B7BDBF"/>
+ <stop offset="0" style="stop-color:#E5EBED"/>
+ <stop offset="0.703" style="stop-color:#8D9699"/>
+ <stop offset="1" style="stop-color:#B7BDBF"/>
</linearGradient>
<path d="M4.354,3.5v43.763c0,0,0.048,0.672,0.855,1.611V4.356h49.58v49.582H19.324 c5.195,0.719,9.82,0.852,9.82,0.852h26.5V3.5H4.354z" fill="url(#SVGID_3_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="18.7158" x2="16.7993" y1="47.938" y2="54.272">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.1939" style="stop-color:#E6E9E8"/>
-<stop offset="0.9333" style="stop-color:#84878A"/>
-<stop offset="1" style="stop-color:#84878A"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="0.1939" style="stop-color:#E6E9E8"/>
+ <stop offset="0.9333" style="stop-color:#84878A"/>
</linearGradient>
-<path d="M31.211,54.79c0,0-12.406,0.569-17.906-8.515 c0,0-7.511,5.564-8.951,0.987C4.967,50.406,10.504,54.903,31.211,54.79z" fill="url(#SVGID_4_)" fill-rule="evenodd"/>
+<path clip-rule="evenodd" d="M31.211,54.79c0,0-12.406,0.569-17.906-8.515 c0,0-7.511,5.564-8.951,0.987C4.967,50.406,10.504,54.903,31.211,54.79z" fill="url(#SVGID_4_)" fill-rule="evenodd"/>
<rect fill="#F5F5F5" height="0.855" width="42.741" x="8.628" y="39.55"/>
<rect fill="#666666" height="1.71" width="42.741" x="8.628" y="37.84"/>
<rect fill="#F5F5F5" height="0.854" width="42.741" x="8.628" y="31.856"/>
@@ -38,34 +38,36 @@
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<polygon fill="none" points="24.728,0 23.608,0.487 0,0.487 0,30.487 30,30.487 30,0.487 24.928,0.487 "/>
-<path d="M7.991,30.324c-3.295,0-5.976-1.69-6.668-4.205c-0.366-1.331-0.159-2.734,0.6-4.06 c1.063-1.86,3.062-3.301,5.478-3.952c0.873-0.235,1.762-0.355,2.639-0.355c0.927,0,1.816,0.133,2.635,0.389V5.247L24.728,0 l1.526,3.717l0.018-0.007l0.389,0.963l0.609,1.563l-10.565,4.318c0.008,2.6,0.003,5.635-0.001,8.204 c-0.003,2.014-0.006,3.74-0.002,4.745c0.016,2.839-2.473,5.497-6.049,6.463C9.771,30.203,8.875,30.324,7.991,30.324L7.991,30.324z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M7.991,30.324c-3.295,0-5.976-1.69-6.668-4.205c-0.366-1.331-0.159-2.734,0.6-4.06 c1.063-1.86,3.062-3.301,5.478-3.952c0.873-0.235,1.762-0.355,2.639-0.355c0.927,0,1.816,0.133,2.635,0.389V5.247L24.728,0 l1.526,3.717l0.018-0.007l0.389,0.963l0.609,1.563l-10.565,4.318c0.008,2.6,0.003,5.635-0.001,8.204 c-0.003,2.014-0.006,3.74-0.002,4.745c0.016,2.839-2.473,5.497-6.049,6.463C9.771,30.203,8.875,30.324,7.991,30.324L7.991,30.324z" opacity="0.35"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 2908.0361)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-2179.9351" x2="-2179.9351" y1="2902.811" y2="2880.1646">
-<stop offset="0" style="stop-color:#8CFF24"/>
-<stop offset="1" style="stop-color:#15570B"/>
+ <stop offset="0" style="stop-color:#8CFF24"/>
+ <stop offset="1" style="stop-color:#15570B"/>
</linearGradient>
<path d="M25.98,5.682l-1.79-4.357L13.902,5.902l0.016,13.899c-1.574-1.029-3.896-1.366-6.257-0.729 c-3.722,1.003-6.127,4.041-5.374,6.78c0.756,2.742,4.383,4.15,8.104,3.146c3.146-0.849,5.324-3.094,5.311-5.493 c-0.01-2.399,0.02-8.913,0-13.625L25.98,5.682z" fill="url(#SVGID_1__)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 0.5 614.8193 -1693.241)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-1201.8184" x2="-1201.8184" y1="3393.1226" y2="3404.4397">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</linearGradient>
<polygon fill="url(#SVGID_2__)" points="13.918,17.409 13.907,5.902 13.902,5.902 13.916,17.408 "/>
<linearGradient gradientTransform="matrix(0.5 0 0 0.5 614.8193 -1693.241)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="-1187.957" x2="-1187.957" y1="3393.1177" y2="3404.4392">
-<stop offset="0" style="stop-color:#9EFF47"/>
-<stop offset="1" style="stop-color:#11470A"/>
+ <stop offset="0" style="stop-color:#9EFF47"/>
+ <stop offset="1" style="stop-color:#11470A"/>
</linearGradient>
<path d="M15.701,9.169c0.005,0.759,0.006-0.117,0.008,0.711L25.98,5.682l-0.252-0.646L15.701,9.169z" fill="url(#SVGID_3__)"/>
<linearGradient gradientTransform="matrix(0.5 -0.0026 0.0026 0.5 604.1579 -1699.019)" gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="-1188.0039" x2="-1188.0039" y1="3402.1909" y2="3430.4734">
-<stop offset="0" style="stop-color:#B3FF6E"/>
-<stop offset="1" style="stop-color:#11470A"/>
+ <stop offset="0" style="stop-color:#B3FF6E"/>
+ <stop offset="1" style="stop-color:#11470A"/>
</linearGradient>
<polygon fill="url(#SVGID_4__)" points="14.072,20.2 14.072,6.3 24.389,1.807 24.19,1.324 13.674,5.902 13.674,19.803 "/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 2908.0361)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-2185.0737" x2="-2185.0737" y1="2887.9233" y2="2879.6807">
-<stop offset="0" style="stop-color:#B2F56E"/>
-<stop offset="0.4667" style="stop-color:#40AD00"/>
-<stop offset="1" style="stop-color:#074D00"/>
+ <stop offset="0" style="stop-color:#B2F56E"/>
+ <stop offset="0.4667" style="stop-color:#40AD00"/>
+ <stop offset="1" style="stop-color:#074D00"/>
</linearGradient>
<path d="M7.96,28.527c-2.474,0.012-4.447-1.129-4.909-2.839c-0.28-1.039,0.018-2.187,0.84-3.229 c0.9-1.141,2.291-2.007,3.923-2.436c0.688-0.184,1.385-0.277,2.075-0.281c2.474-0.013,4.445,1.129,4.91,2.84 c0.615,2.267-1.522,4.807-4.764,5.664C9.347,28.43,8.647,28.522,7.96,28.527L7.96,28.527z" fill="url(#SVGID_5_)"/>
<rect fill="none" height="30" width="30" y="0.487"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_positioning.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,68 @@
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
+<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"/>
+ <stop offset="1" style="stop-color:#1755B3"/>
+</linearGradient>
+<polygon fill="url(#SVGID_1_)" points="49.362,7.722 57.042,8.771 57.042,51.648 43.521,53.498 30,50.807 22.283,52.262 "/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -331.0195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="304.2402" x2="304.2402" y1="-352.3188" y2="-384.8111">
+ <stop offset="0" style="stop-color:#8EFFF5"/>
+ <stop offset="1" style="stop-color:#1D9DD8"/>
+</linearGradient>
+<polygon fill="url(#SVGID_2_)" points="43.521,20.192 43.521,53.498 30,50.807 30,39.762 "/>
+<polygon enable-background="new " opacity="0.25" points="50.26,7.855 43.521,22.093 30,41.684 23.377,52.074 20.223,52.66 47.878,7.523 "/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -331.0195)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="291.7021" x2="291.7021" y1="-338.3325" y2="-384.5055">
+ <stop offset="0" style="stop-color:#FEEFA7"/>
+ <stop offset="1" style="stop-color:#FFC501"/>
+</linearGradient>
+<polygon fill="url(#SVGID_3_)" points="45.482,9.658 43.416,20.78 30,40.236 22.332,52.27 15.73,53.498 2.962,51.096 2.962,7.848 15.355,6.921 30,8.953 43.521,6.921 "/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -331.0195)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="290.3457" x2="290.3457" y1="-382.6211" y2="-339.5177">
+ <stop offset="0" style="stop-color:#E69400"/>
+ <stop offset="1" style="stop-color:#F9DE4F"/>
+</linearGradient>
+<polygon fill="url(#SVGID_4_)" points="30,8.953 30,40.236 22.332,52.27 15.73,53.498 15.73,6.975 "/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -331.0195)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="313.9336" x2="313.9336" y1="-351.3516" y2="-338.7017">
+ <stop offset="0" style="stop-color:#E69400"/>
+ <stop offset="1" style="stop-color:#F9DE4F"/>
+</linearGradient>
+<polygon fill="url(#SVGID_5_)" points="43.521,6.921 43.521,20.625 49.384,7.724 "/>
+<path d="M16.481,53.352l11.489-17.232l-4.841-2.406l-7.339,10.152 l-7.168,8.281l-2.29-0.424l9.407-11.078l5.523-7.85l-5.784-2.85L2.962,27.38v-1.32l12.994,2.686l6.07,2.979l6.841-9.601 l-13.339-6.657L2.962,13.258v-2.043l12.972,2.171l13.968,6.974l4.003-6.803l-3.908-1.373l-5.807-4.013l2.769,0.383l3.052,2.231 l4.549,1.657l2.689-4.566L39.882,7.5l-3.506,5.913l4.999,2.689l2.188-3.465l2.257-5.396l1.268,0.173l-3.548,7.662 c0,0-8.686,13.464-13.521,20.694L18.318,53.018L16.481,53.352z M28.837,35.115l-4.9-2.488l6.735-9.472l4.503,2.186L28.837,35.115z M31.748,21.279l4.714,2.353l4.213-6.433l-4.958-2.667L31.748,21.279L31.748,21.279z" enable-background="new " fill="#FFFFFF" opacity="0.25"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -331.0195)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="292.3779" x2="292.3779" y1="-384.0728" y2="-350.2898">
+ <stop offset="0" style="stop-color:#FCE28D"/>
+ <stop offset="0.8121" style="stop-color:#FEF7DF"/>
+</linearGradient>
+<path d="M46.025,7.262l-2.477,5.932c0,0-1.337,2.112-2.076,3.277l-5.486-2.949l3.527-5.948l-1.79,0.241 l-3.054,4.999l-4.627-1.698l-3.417-2.63l-2.113-0.292l5.51,3.755l4.268,1.503l-4.279,7.275l-14.134-7.056L2.962,11.49v1.483 l12.62,2.208l13.677,6.826l-0.164,0.276l-6.977,9.794l-6.366-3.1L2.959,26.357L2.962,27.1l12.753,2.652l5.966,2.938L15.758,41 L6.646,51.789l1.694,0.316l7.417-8.592l7.282-10.158l5.416,2.668L16.874,53.285l1.054-0.197l12.089-18.129l13.552-20.4l3.267-7.185 L46.025,7.262z M30.009,33.498l-1.264,1.945l-5.27-2.695l6.604-9.387l0.519-0.686l5.138,2.565L30.009,33.498z M36.559,23.992 l-5.202-2.597l4.253-7.233l5.463,2.937L36.559,23.992z" fill="url(#SVGID_6_)"/>
+<polygon fill="#FFFFFF" points="38.255,46.385 43.528,35.268 48.269,46.385 43.528,43.514 "/>
+<polygon enable-background="new " opacity="0.4" points="48.269,46.385 43.528,35.268 43.528,43.514 "/>
+<path d="M20.926,5.4c-1.043,0-1.892,0.833-1.892,1.857c0,1.022,0.849,1.855,1.892,1.855 c1.042,0,1.891-0.833,1.891-1.855C22.818,6.232,21.968,5.4,20.926,5.4z" fill="none"/>
+<rect fill="none" height="60" width="60.001"/>
+<path d="M21.041,33.514l5.39-9.33l9.33-5.389l-9.33-5.388l-2.635-5.315l-5.098-0.706 l-3.045,6.021l-9.33,5.388l9.331,5.389L21.041,33.514z M23.442,13.688h2.705v2.706h-2.705V13.688z M23.442,21.197h2.705V23.9h-2.705 V21.197z M15.936,13.688h2.705v2.706h-2.705V13.688z M15.936,21.197h2.705V23.9h-2.705V21.197z" enable-background="new " opacity="0.25"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -331.0195)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="288.5215" x2="288.5215" y1="-336.2764" y2="-362.4492">
+ <stop offset="0.1879" style="stop-color:#DAFF8C"/>
+ <stop offset="1" style="stop-color:#77C949"/>
+</linearGradient>
+<polygon fill="url(#SVGID_7_)" points="34.261,18.043 26.898,13.793 26.898,16.394 22.691,16.394 22.691,12.186 25.292,12.186 21.041,4.826 16.791,12.186 19.392,12.186 19.392,16.394 15.184,16.394 15.184,13.793 7.823,18.043 15.184,22.294 15.184,19.694 19.392,19.694 19.392,23.9 16.791,23.9 21.041,31.262 25.292,23.9 22.691,23.9 22.691,19.694 26.898,19.694 26.898,22.294 "/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -331.0195)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="288.5215" x2="288.5215" y1="-337.4956" y2="-361.0748">
+ <stop offset="0" style="stop-color:#AEE737"/>
+ <stop offset="0.7273" style="stop-color:#66A00E"/>
+ <stop offset="1" style="stop-color:#387300"/>
+</linearGradient>
+<polygon fill="url(#SVGID_8_)" points="18.092,24.651 20.142,24.651 20.142,18.943 14.434,18.943 14.434,20.992 9.326,18.043 14.434,15.095 14.434,17.145 20.142,17.145 20.142,11.435 18.092,11.435 21.041,6.328 23.991,11.435 21.941,11.435 21.941,17.145 27.65,17.145 27.65,15.095 32.757,18.043 27.65,20.992 27.65,18.943 21.941,18.943 21.941,24.651 23.991,24.651 21.041,29.758 "/>
+<path d="M21.041,22.492c-2.039,0-3.697-1.659-3.697-3.698s1.659-3.698,3.697-3.698 c2.039,0,3.698,1.659,3.698,3.698S23.08,22.492,21.041,22.492L21.041,22.492z" enable-background="new " opacity="0.25"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -331.0195)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="288.5215" x2="288.5215" y1="-346.1563" y2="-352.2564">
+ <stop offset="0.1879" style="stop-color:#DAFF8C"/>
+ <stop offset="1" style="stop-color:#77C949"/>
+</linearGradient>
+<circle cx="21.041" cy="18.129" fill="url(#SVGID_9_)" r="3.031"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -331.0195)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="288.5215" x2="288.5215" y1="-346.814" y2="-351.5732">
+ <stop offset="0" style="stop-color:#AEE737"/>
+ <stop offset="0.7273" style="stop-color:#66A00E"/>
+ <stop offset="1" style="stop-color:#387300"/>
+</linearGradient>
+<path d="M21.041,20.493c-1.304,0-2.364-1.061-2.364-2.365c0-1.304,1.06-2.366,2.364-2.366 c1.305,0,2.365,1.06,2.365,2.366C23.406,19.432,22.346,20.493,21.041,20.493L21.041,20.493z" fill="url(#SVGID_10_)"/>
+</g>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_positioning_info.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_positioning_info.svg Fri May 14 16:09:54 2010 +0300
@@ -1,94 +1,95 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
-<stop offset="1" style="stop-color:#1755B3"/>
+ <stop offset="0" style="stop-color:#4FB7EB"/>
+ <stop offset="1" style="stop-color:#1755B3"/>
</linearGradient>
<polygon fill="url(#SVGID_1_)" points="49.362,7.722 57.042,8.771 57.042,51.648 43.521,53.498 30,50.807 22.283,52.262 "/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -331.0195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="304.2402" x2="304.2402" y1="-352.3188" y2="-384.8111">
-<stop offset="0" style="stop-color:#8EFFF5"/>
-<stop offset="1" style="stop-color:#1D9DD8"/>
+ <stop offset="0" style="stop-color:#8EFFF5"/>
+ <stop offset="1" style="stop-color:#1D9DD8"/>
</linearGradient>
<polygon fill="url(#SVGID_2_)" points="43.521,20.192 43.521,53.498 30,50.807 30,39.762 "/>
-<polygon fill-opacity="0.25" points="50.26,7.855 43.521,22.093 30,41.684 23.377,52.074 20.223,52.66 47.878,7.523 " stroke-opacity="0.25"/>
+<polygon enable-background="new " opacity="0.25" points="50.26,7.855 43.521,22.093 30,41.684 23.377,52.074 20.223,52.66 47.878,7.523 "/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -331.0195)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="291.7021" x2="291.7021" y1="-338.3325" y2="-384.5055">
-<stop offset="0" style="stop-color:#FEEFA7"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+ <stop offset="0" style="stop-color:#FEEFA7"/>
+ <stop offset="1" style="stop-color:#FFC501"/>
</linearGradient>
<polygon fill="url(#SVGID_3_)" points="45.482,9.658 43.416,20.78 30,40.236 22.332,52.27 15.73,53.498 2.962,51.096 2.962,7.848 15.355,6.921 30,8.953 43.521,6.921 "/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -331.0195)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="290.3457" x2="290.3457" y1="-382.6211" y2="-339.5177">
-<stop offset="0" style="stop-color:#E69400"/>
-<stop offset="1" style="stop-color:#F9DE4F"/>
+ <stop offset="0" style="stop-color:#E69400"/>
+ <stop offset="1" style="stop-color:#F9DE4F"/>
</linearGradient>
<polygon fill="url(#SVGID_4_)" points="30,8.953 30,40.236 22.332,52.27 15.73,53.498 15.73,6.975 "/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -331.0195)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="313.9336" x2="313.9336" y1="-351.3516" y2="-338.7017">
-<stop offset="0" style="stop-color:#E69400"/>
-<stop offset="1" style="stop-color:#F9DE4F"/>
+ <stop offset="0" style="stop-color:#E69400"/>
+ <stop offset="1" style="stop-color:#F9DE4F"/>
</linearGradient>
<polygon fill="url(#SVGID_5_)" points="43.521,6.921 43.521,20.625 49.384,7.724 "/>
-<path d="M16.481,53.352l11.489-17.232l-4.841-2.406l-7.339,10.152 l-7.168,8.281l-2.29-0.424l9.407-11.078l5.523-7.85l-5.784-2.85L2.962,27.38v-1.32l12.994,2.686l6.07,2.979l6.841-9.601 l-13.339-6.657L2.962,13.258v-2.043l12.972,2.171l13.968,6.974l4.003-6.803l-3.908-1.373l-5.807-4.013l2.769,0.383l3.052,2.231 l4.549,1.657l2.689-4.566L39.882,7.5l-3.506,5.913l4.999,2.689l2.188-3.465l2.257-5.396l1.268,0.173l-3.548,7.662 c0,0-8.686,13.464-13.521,20.694L18.318,53.018L16.481,53.352z M28.837,35.115l-4.9-2.488l6.735-9.472l4.503,2.186L28.837,35.115z M31.748,21.279l4.714,2.353l4.213-6.433l-4.958-2.667L31.748,21.279L31.748,21.279z" fill="#FFFFFF" fill-opacity="0.25" stroke-opacity="0.25"/>
+<path d="M16.481,53.352l11.489-17.232l-4.841-2.406l-7.339,10.152 l-7.168,8.281l-2.29-0.424l9.407-11.078l5.523-7.85l-5.784-2.85L2.962,27.38v-1.32l12.994,2.686l6.07,2.979l6.841-9.601 l-13.339-6.657L2.962,13.258v-2.043l12.972,2.171l13.968,6.974l4.003-6.803l-3.908-1.373l-5.807-4.013l2.769,0.383l3.052,2.231 l4.549,1.657l2.689-4.566L39.882,7.5l-3.506,5.913l4.999,2.689l2.188-3.465l2.257-5.396l1.268,0.173l-3.548,7.662 c0,0-8.686,13.464-13.521,20.694L18.318,53.018L16.481,53.352z M28.837,35.115l-4.9-2.488l6.735-9.472l4.503,2.186L28.837,35.115z M31.748,21.279l4.714,2.353l4.213-6.433l-4.958-2.667L31.748,21.279L31.748,21.279z" enable-background="new " fill="#FFFFFF" opacity="0.25"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -331.0195)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="292.3779" x2="292.3779" y1="-384.0728" y2="-350.2898">
-<stop offset="0" style="stop-color:#FCE28D"/>
-<stop offset="0.8121" style="stop-color:#FEF7DF"/>
-<stop offset="1" style="stop-color:#FEF7DF"/>
+ <stop offset="0" style="stop-color:#FCE28D"/>
+ <stop offset="0.8121" style="stop-color:#FEF7DF"/>
</linearGradient>
<path d="M46.025,7.262l-2.477,5.932c0,0-1.337,2.112-2.076,3.277l-5.486-2.949l3.527-5.948l-1.79,0.241 l-3.054,4.999l-4.627-1.698l-3.417-2.63l-2.113-0.292l5.51,3.755l4.268,1.503l-4.279,7.275l-14.134-7.056L2.962,11.49v1.483 l12.62,2.208l13.677,6.826l-0.164,0.276l-6.977,9.794l-6.366-3.1L2.959,26.357L2.962,27.1l12.753,2.652l5.966,2.938L15.758,41 L6.646,51.789l1.694,0.316l7.417-8.592l7.282-10.158l5.416,2.668L16.874,53.285l1.054-0.197l12.089-18.129l13.552-20.4l3.267-7.185 L46.025,7.262z M30.009,33.498l-1.264,1.945l-5.27-2.695l6.604-9.387l0.519-0.686l5.138,2.565L30.009,33.498z M36.559,23.992 l-5.202-2.597l4.253-7.233l5.463,2.937L36.559,23.992z" fill="url(#SVGID_6_)"/>
<polygon fill="#FFFFFF" points="38.255,46.385 43.528,35.268 48.269,46.385 43.528,43.514 "/>
-<polygon fill-opacity="0.4" points="48.269,46.385 43.528,35.268 43.528,43.514 " stroke-opacity="0.4"/>
+<polygon enable-background="new " opacity="0.4" points="48.269,46.385 43.528,35.268 43.528,43.514 "/>
<path d="M20.926,5.4c-1.043,0-1.892,0.833-1.892,1.857c0,1.022,0.849,1.855,1.892,1.855 c1.042,0,1.891-0.833,1.891-1.855C22.818,6.232,21.968,5.4,20.926,5.4z" fill="none"/>
<rect fill="none" height="60" width="60.001"/>
-<path d="M21.041,33.514l5.39-9.33l9.33-5.389l-9.33-5.388l-2.635-5.315l-5.098-0.706 l-3.045,6.021l-9.33,5.388l9.331,5.389L21.041,33.514z M23.442,13.688h2.705v2.706h-2.705V13.688z M23.442,21.197h2.705V23.9h-2.705 V21.197z M15.936,13.688h2.705v2.706h-2.705V13.688z M15.936,21.197h2.705V23.9h-2.705V21.197z" fill-opacity="0.25" stroke-opacity="0.25"/>
+<path d="M21.041,33.514l5.39-9.33l9.33-5.389l-9.33-5.388l-2.635-5.315l-5.098-0.706 l-3.045,6.021l-9.33,5.388l9.331,5.389L21.041,33.514z M23.442,13.688h2.705v2.706h-2.705V13.688z M23.442,21.197h2.705V23.9h-2.705 V21.197z M15.936,13.688h2.705v2.706h-2.705V13.688z M15.936,21.197h2.705V23.9h-2.705V21.197z" enable-background="new " opacity="0.25"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -331.0195)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="288.5215" x2="288.5215" y1="-336.2764" y2="-362.4492">
-<stop offset="0" style="stop-color:#DAFF8C"/>
-<stop offset="0.1879" style="stop-color:#DAFF8C"/>
-<stop offset="1" style="stop-color:#77C949"/>
+ <stop offset="0.1879" style="stop-color:#DAFF8C"/>
+ <stop offset="1" style="stop-color:#77C949"/>
</linearGradient>
<polygon fill="url(#SVGID_7_)" points="34.261,18.043 26.898,13.793 26.898,16.394 22.691,16.394 22.691,12.186 25.292,12.186 21.041,4.826 16.791,12.186 19.392,12.186 19.392,16.394 15.184,16.394 15.184,13.793 7.823,18.043 15.184,22.294 15.184,19.694 19.392,19.694 19.392,23.9 16.791,23.9 21.041,31.262 25.292,23.9 22.691,23.9 22.691,19.694 26.898,19.694 26.898,22.294 "/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -331.0195)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="288.5215" x2="288.5215" y1="-337.4956" y2="-361.0748">
-<stop offset="0" style="stop-color:#AEE737"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+ <stop offset="0" style="stop-color:#AEE737"/>
+ <stop offset="0.7273" style="stop-color:#66A00E"/>
+ <stop offset="1" style="stop-color:#387300"/>
</linearGradient>
<polygon fill="url(#SVGID_8_)" points="18.092,24.651 20.142,24.651 20.142,18.943 14.434,18.943 14.434,20.992 9.326,18.043 14.434,15.095 14.434,17.145 20.142,17.145 20.142,11.435 18.092,11.435 21.041,6.328 23.991,11.435 21.941,11.435 21.941,17.145 27.65,17.145 27.65,15.095 32.757,18.043 27.65,20.992 27.65,18.943 21.941,18.943 21.941,24.651 23.991,24.651 21.041,29.758 "/>
-<path d="M21.041,22.492c-2.039,0-3.697-1.659-3.697-3.698s1.659-3.698,3.697-3.698 c2.039,0,3.698,1.659,3.698,3.698S23.08,22.492,21.041,22.492L21.041,22.492z" fill-opacity="0.25" stroke-opacity="0.25"/>
+<path d="M21.041,22.492c-2.039,0-3.697-1.659-3.697-3.698s1.659-3.698,3.697-3.698 c2.039,0,3.698,1.659,3.698,3.698S23.08,22.492,21.041,22.492L21.041,22.492z" enable-background="new " opacity="0.25"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -331.0195)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="288.5215" x2="288.5215" y1="-346.1563" y2="-352.2564">
-<stop offset="0" style="stop-color:#DAFF8C"/>
-<stop offset="0.1879" style="stop-color:#DAFF8C"/>
-<stop offset="1" style="stop-color:#77C949"/>
+ <stop offset="0.1879" style="stop-color:#DAFF8C"/>
+ <stop offset="1" style="stop-color:#77C949"/>
</linearGradient>
<circle cx="21.041" cy="18.129" fill="url(#SVGID_9_)" r="3.031"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -331.0195)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="288.5215" x2="288.5215" y1="-346.814" y2="-351.5732">
-<stop offset="0" style="stop-color:#AEE737"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+ <stop offset="0" style="stop-color:#AEE737"/>
+ <stop offset="0.7273" style="stop-color:#66A00E"/>
+ <stop offset="1" style="stop-color:#387300"/>
</linearGradient>
<path d="M21.041,20.493c-1.304,0-2.364-1.061-2.364-2.365c0-1.304,1.06-2.366,2.364-2.366 c1.305,0,2.365,1.06,2.365,2.366C23.406,19.432,22.346,20.493,21.041,20.493L21.041,20.493z" fill="url(#SVGID_10_)"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
<rect fill="none" height="30" width="30"/>
-<path d="M15,30C6.729,30,0,23.271,0,15C0,6.729,6.729,0,15,0s15,6.729,15,15C30,23.271,23.271,30,15,30L15,30z" fill-opacity="0.35" stroke-opacity="0.35"/>
-<path d="M15.159,10.697c0.525,0,0.947-0.13,1.264-0.39 c0.316-0.259,0.474-0.615,0.474-1.07c0-0.44-0.164-0.795-0.49-1.061c-0.326-0.264-0.741-0.398-1.248-0.398 c-0.531,0-0.951,0.132-1.261,0.395c-0.311,0.262-0.465,0.617-0.465,1.064c0,0.455,0.159,0.812,0.474,1.07 C14.224,10.567,14.641,10.697,15.159,10.697z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M15.159,10.369c0.525,0,0.947-0.129,1.264-0.389 c0.316-0.26,0.474-0.615,0.474-1.07c0-0.441-0.164-0.795-0.49-1.061c-0.326-0.266-0.741-0.398-1.248-0.398 c-0.531,0-0.951,0.13-1.261,0.394c-0.311,0.263-0.465,0.616-0.465,1.064c0,0.455,0.159,0.812,0.474,1.07 C14.224,10.24,14.641,10.369,15.159,10.369z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M15,30C6.729,30,0,23.271,0,15C0,6.729,6.729,0,15,0s15,6.729,15,15C30,23.271,23.271,30,15,30L15,30z" opacity="0.35"/>
+<path d="M15.159,10.697c0.525,0,0.947-0.13,1.264-0.39 c0.316-0.259,0.474-0.615,0.474-1.07c0-0.44-0.164-0.795-0.49-1.061c-0.326-0.264-0.741-0.398-1.248-0.398 c-0.531,0-0.951,0.132-1.261,0.395c-0.311,0.262-0.465,0.617-0.465,1.064c0,0.455,0.159,0.812,0.474,1.07 C14.224,10.567,14.641,10.697,15.159,10.697z" enable-background="new " opacity="0.1"/>
+<path d="M15.159,10.369c0.525,0,0.947-0.129,1.264-0.389 c0.316-0.26,0.474-0.615,0.474-1.07c0-0.441-0.164-0.795-0.49-1.061c-0.326-0.266-0.741-0.398-1.248-0.398 c-0.531,0-0.951,0.13-1.261,0.394c-0.311,0.263-0.465,0.616-0.465,1.064c0,0.455,0.159,0.812,0.474,1.07 C14.224,10.24,14.641,10.369,15.159,10.369z" enable-background="new " opacity="0.2"/>
<radialGradient cx="-2178.8628" cy="3345.4287" gradientTransform="matrix(1 0 0 -1 2194 3347.6641)" gradientUnits="userSpaceOnUse" id="SVGID_1__" r="26.49">
-<stop offset="0" style="stop-color:#AFED23"/>
-<stop offset="0.8121" style="stop-color:#358C0C"/>
-<stop offset="1" style="stop-color:#67AD1A"/>
+ <stop offset="0" style="stop-color:#AFED23"/>
+ <stop offset="0.8121" style="stop-color:#358C0C"/>
+ <stop offset="1" style="stop-color:#67AD1A"/>
</radialGradient>
<path d="M15,29C7.28,29,1,22.72,1,15S7.28,1,15,1c7.721,0,14,6.28,14,14S22.72,29,15,29L15,29z" fill="url(#SVGID_1__)"/>
-<polygon fill-opacity="0.1" points="12.46,13.847 13.555,13.847 13.555,23.318 16.741,23.318 16.741,12.032 12.46,12.032 " stroke-opacity="0.1"/>
-<polygon fill-opacity="0.2" points="12.46,13.519 13.555,13.519 13.555,22.99 16.741,22.99 16.741,11.704 12.46,11.704 " stroke-opacity="0.2"/>
+<polygon enable-background="new " opacity="0.1" points="12.46,13.847 13.555,13.847 13.555,23.318 16.741,23.318 16.741,12.032 12.46,12.032 "/>
+<polygon enable-background="new " opacity="0.2" points="12.46,13.519 13.555,13.519 13.555,22.99 16.741,22.99 16.741,11.704 12.46,11.704 "/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3347.6641)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-2179.3994" x2="-2179.3994" y1="3340.2148" y2="3324.8184">
-<stop offset="0" style="stop-color:#F6FDFF"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+ <stop offset="0" style="stop-color:#F6FDFF"/>
+ <stop offset="1" style="stop-color:#ADB3B5"/>
</linearGradient>
<polygon fill="url(#SVGID_2__)" points="12.46,13.191 13.555,13.191 13.555,22.663 16.741,22.663 16.741,11.377 12.46,11.377 "/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3347.6641)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="-2178.8477" x2="-2178.8477" y1="3340.2158" y2="3324.8235">
-<stop offset="0" style="stop-color:#F6FDFF"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+ <stop offset="0" style="stop-color:#F6FDFF"/>
+ <stop offset="1" style="stop-color:#ADB3B5"/>
</linearGradient>
<path d="M15.148,10.205c0.524,0,0.945-0.129,1.262-0.389c0.316-0.259,0.475-0.615,0.475-1.07 c0-0.441-0.163-0.795-0.489-1.061c-0.327-0.264-0.743-0.397-1.248-0.397c-0.531,0-0.952,0.131-1.262,0.394 c-0.312,0.262-0.466,0.617-0.466,1.064c0,0.455,0.159,0.812,0.477,1.07C14.212,10.076,14.63,10.205,15.148,10.205z" fill="url(#SVGID_3__)"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_power_management.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,119 @@
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
+<g>
+ <rect fill="none" height="60" width="60"/>
+</g>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="11.4556" x2="48.9027" y1="32.1465" y2="32.1465">
+ <stop offset="0" style="stop-color:#AFB6BA"/>
+ <stop offset="0.2667" style="stop-color:#DDE3E6"/>
+ <stop offset="0.6545" style="stop-color:#949DA1"/>
+ <stop offset="0.8788" style="stop-color:#D9DFE1"/>
+ <stop offset="1" style="stop-color:#ADB3B5"/>
+</linearGradient>
+<path d="M48.544,55.771c0,0.678-0.55,1.228-1.228,1.228H12.684c-0.678,0-1.228-0.55-1.228-1.228V8.522 c0-0.678,0.55-1.228,1.228-1.228h34.633c0.678,0,1.228,0.55,1.228,1.228V55.771z" fill="url(#SVGID_1_)"/>
+<rect fill-opacity="0.4" height="36.816" width="29.726" x="15.137" y="12.204"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="11.4556" x2="48.5444" y1="55.7715" y2="55.7715">
+ <stop offset="0" style="stop-color:#808080"/>
+ <stop offset="0.5" style="stop-color:#231F20"/>
+ <stop offset="1" style="stop-color:#808080"/>
+</linearGradient>
+<path d="M47.317,55.771H12.684c-0.678,0-1.228-0.55-1.228-1.228v0.614v0.613 c0,0.678,0.55,1.228,1.228,1.228h34.633c0.678,0,1.228-0.55,1.228-1.228v-0.613v-0.614C48.544,55.222,47.995,55.771,47.317,55.771z" fill="url(#SVGID_2_)" fill-opacity="0.4"/>
+<path d="M47.317,7.295H12.684c-0.678,0-1.228,0.55-1.228,1.228v0.613 c0-0.678,0.55-1.227,1.228-1.227h34.633c0.678,0,1.228,0.549,1.228,1.227V8.522C48.544,7.845,47.995,7.295,47.317,7.295z" fill="#FFFFFF" fill-opacity="0.3"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="22.2319" x2="37.769" y1="5.147" y2="5.147">
+ <stop offset="0" style="stop-color:#A8B1B3"/>
+ <stop offset="0.303" style="stop-color:#FFFFFF"/>
+ <stop offset="0.7212" style="stop-color:#909496"/>
+ <stop offset="1" style="stop-color:#D1D6D7"/>
+</linearGradient>
+<path d="M37.769,7.295V4.839c0-1.016-0.792-1.84-1.768-1.84H23.999c-0.976,0-1.767,0.824-1.767,1.84v2.456 H37.769z" fill="url(#SVGID_3_)"/>
+<path d="M36.001,2.999H23.999c-0.976,0-1.767,0.824-1.767,1.84v0.615 c0-1.018,0.791-1.842,1.767-1.842h12.003c0.976,0,1.768,0.824,1.768,1.842V4.839C37.769,3.823,36.977,2.999,36.001,2.999z" fill="#FFFFFF" fill-opacity="0.4"/>
+<rect fill-opacity="0.4" height="0.613" width="15.537" x="22.232" y="6.682"/>
+<rect fill-opacity="0.2" height="0.614" width="15.537" x="22.232" y="6.067"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="15.6558" x2="44.6947" y1="38.2822" y2="38.2822">
+ <stop offset="0" style="stop-color:#5AA913"/>
+ <stop offset="0.3212" style="stop-color:#A8F222"/>
+ <stop offset="0.7697" style="stop-color:#58A813"/>
+ <stop offset="1" style="stop-color:#8FD31D"/>
+</linearGradient>
+<rect fill="url(#SVGID_4_)" height="21.477" width="29.726" x="15.137" y="27.544"/>
+<rect fill="#FFFFFF" fill-opacity="0.4" height="0.612" width="29.726" x="15.137" y="27.544"/>
+<rect fill-opacity="0.4" height="0.614" width="29.726" x="15.137" y="48.408"/>
+<rect fill-opacity="0.2" height="0.613" width="29.726" x="15.137" y="47.794"/>
+<rect fill="#FFFFFF" fill-opacity="0.3" height="0.613" width="29.726" x="15.137" y="49.022"/>
+<rect fill-opacity="0.3" height="0.613" width="29.726" x="15.137" y="11.591"/>
+<path d="M15.137,12.204v36.816h29.726V12.204H15.137z M44.249,48.407H15.751V12.818h28.497V48.407z" fill-opacity="0.1"/>
+<rect fill-opacity="0.3" height="1.227" width="29.726" x="15.137" y="12.204"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="11.4556" x2="48.5444" y1="53.0107" y2="53.0107">
+ <stop offset="0" style="stop-color:#A6A8AB"/>
+ <stop offset="0.5" style="stop-color:#231F20"/>
+ <stop offset="1" style="stop-color:#A6A8AB"/>
+</linearGradient>
+<rect fill="url(#SVGID_5_)" fill-opacity="0.3" height="0.613" width="37.089" x="11.456" y="52.704"/>
+<rect fill="#FFFFFF" fill-opacity="0.3" height="0.613" width="37.089" x="11.456" y="53.317"/>
+<rect fill="#FFFFFF" fill-opacity="0.1" height="21.477" width="2.455" x="41.793" y="27.544"/>
+<rect fill="#FFFFFF" fill-opacity="0.2" height="34.363" width="12.542" x="20.047" y="13.431"/>
+</g>
+<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
+<g>
+ <rect fill="none" height="30" width="30"/>
+</g>
+<path d="M4.702,29.605v-4.874h5.554c0.938,0,1.606-0.196,1.932-0.566c0.384-0.438,0.411-1.195,0.39-1.449 l-0.017-0.254l-0.001-2.041H7.667c-0.845,0-1.532-0.681-1.532-1.518L5.41,10.721c-0.641-0.182-1.112-0.768-1.112-1.46V6.812 c0-0.837,0.687-1.519,1.531-1.519h2.755V1.855c0-0.806,0.611-1.46,1.363-1.46h0.922c0.752,0,1.363,0.654,1.363,1.46v3.438h5.229 V1.855c0-0.806,0.611-1.46,1.363-1.46h0.922c0.752,0,1.363,0.654,1.363,1.46v3.438h3.061c0.846,0,1.531,0.682,1.531,1.519v2.449 c0,0.692-0.471,1.279-1.112,1.46l-0.726,8.235c0.002,0.784-0.686,1.465-1.529,1.465h-4.897v0.612h-0.011v1.298 c0.061,0.65,0.131,3.098-1.582,5.051c-1.295,1.475-3.176,2.224-5.588,2.224H4.702z" fill-opacity="0.35"/>
+<path d="M16.827,22.331v-2.51h-3.667v2.602l0.015,0.235c0.001,0.012,0.105,1.172-0.536,1.902 c-0.449,0.512-1.251,0.771-2.383,0.771H5.302v3.674h4.954c2.232,0,3.961-0.679,5.137-2.019 C16.954,25.208,16.881,22.957,16.827,22.331z" fill="#333333"/>
+<path d="M16.217,22.385l-0.004-0.027v-2.536h-2.441v2.583l0.014,0.216l-0.002-0.012 c0.019,0.209,0.09,1.473-0.685,2.356c-0.571,0.65-1.527,0.979-2.843,0.979H5.302v2.449h4.954c2.049,0,3.622-0.609,4.676-1.811 C16.327,24.993,16.268,22.968,16.217,22.385z" fill="#4D4D4D"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="6.4722" x2="16.7294" y1="29.0205" y2="21.2034">
+ <stop offset="0" style="stop-color:#A9AAAD"/>
+ <stop offset="1" style="stop-color:#4D4D4D"/>
+</linearGradient>
+<path d="M15.604,22.412l-0.002-0.027v-2.563h-1.219v2.563l0.014,0.196c0.025,0.334,0.072,1.751-0.838,2.788 c-0.693,0.787-1.803,1.187-3.303,1.187H5.302v1.225h4.954c1.864,0,3.284-0.539,4.216-1.602 C15.708,24.771,15.653,22.96,15.604,22.412z" fill="url(#SVGID_1__)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="9.1841" x2="11.6328" y1="4.3623" y2="4.3623">
+ <stop offset="0" style="stop-color:#A8B1B3"/>
+ <stop offset="0.3818" style="stop-color:#FFFFFF"/>
+ <stop offset="0.7091" style="stop-color:#686E70"/>
+ <stop offset="1" style="stop-color:#A6B0B3"/>
+</linearGradient>
+<path d="M11.633,6.87c0,0.475-0.342,0.859-0.764,0.859H9.947c-0.422,0-0.763-0.385-0.763-0.859V1.855 c0-0.476,0.341-0.86,0.763-0.86h0.922c0.422,0,0.764,0.385,0.764,0.86V6.87z" fill="url(#SVGID_2__)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="18.061" x2="20.5103" y1="4.3623" y2="4.3623">
+ <stop offset="0" style="stop-color:#A8B1B3"/>
+ <stop offset="0.3818" style="stop-color:#FFFFFF"/>
+ <stop offset="0.7091" style="stop-color:#686E70"/>
+ <stop offset="1" style="stop-color:#A6B0B3"/>
+</linearGradient>
+<path d="M20.51,6.87c0,0.475-0.342,0.859-0.764,0.859h-0.922c-0.422,0-0.764-0.385-0.764-0.859V1.855 c0-0.476,0.342-0.86,0.764-0.86h0.922c0.422,0,0.764,0.385,0.764,0.86V6.87z" fill="url(#SVGID_3__)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="15" x2="15" y1="7.6772" y2="19.8455">
+ <stop offset="0" style="stop-color:#A9AAAD"/>
+ <stop offset="1" style="stop-color:#333333"/>
+</linearGradient>
+<path d="M23.266,18.903c0,0.507-0.418,0.918-0.932,0.918H7.667c-0.515,0-0.932-0.411-0.932-0.918L5.816,8.495 c0-0.508,0.417-0.919,0.931-0.919h16.505c0.514,0,0.932,0.411,0.932,0.919L23.266,18.903z" fill="url(#SVGID_4__)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="5.5771" x2="24.3763" y1="13.6392" y2="13.6392">
+ <stop offset="0" style="stop-color:#333333"/>
+ <stop offset="0.3" style="stop-color:#A9AAAD"/>
+ <stop offset="0.7" style="stop-color:#A9AAAD"/>
+ <stop offset="1" style="stop-color:#333333"/>
+</linearGradient>
+<path d="M7.667,19.089c-0.176,0-0.32-0.137-0.32-0.306v-0.027L6.429,8.476c0.01-0.16,0.149-0.286,0.318-0.286 h16.505c0.168,0,0.308,0.126,0.318,0.286l-0.918,10.28v0.027c0,0.169-0.143,0.306-0.318,0.306H7.667z" fill="url(#SVGID_5__)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="4.8979" x2="25.0414" y1="8.0356" y2="8.0356">
+ <stop offset="0" style="stop-color:#A8B1B3"/>
+ <stop offset="0.3818" style="stop-color:#FFFFFF"/>
+ <stop offset="0.7091" style="stop-color:#686E70"/>
+ <stop offset="1" style="stop-color:#A6B0B3"/>
+</linearGradient>
+<path d="M25.102,9.261c0,0.507-0.416,0.918-0.932,0.918H5.829c-0.514,0-0.931-0.411-0.931-0.918V6.812 c0-0.508,0.417-0.919,0.931-0.919H24.17c0.516,0,0.932,0.411,0.932,0.919V9.261z" fill="url(#SVGID_6_)"/>
+<path d="M24.17,5.893H5.829c-0.514,0-0.931,0.411-0.931,0.919v0.306 c0-0.507,0.417-0.918,0.931-0.918H24.17c0.516,0,0.932,0.411,0.932,0.918V6.812C25.102,6.304,24.686,5.893,24.17,5.893z" fill="#FFFFFF" fill-opacity="0.3"/>
+<path d="M24.17,10.179H5.829c-0.514,0-0.931-0.411-0.931-0.918V8.954c0,0.507,0.417,0.918,0.931,0.918H24.17 c0.516,0,0.932-0.411,0.932-0.918v0.307C25.102,9.768,24.686,10.179,24.17,10.179z" fill-opacity="0.2"/>
+<polygon fill-opacity="0.1" points="6.046,11.097 23.954,11.097 23.981,10.791 6.019,10.791 "/>
+<polygon fill-opacity="0.3" points="6.019,10.791 23.981,10.791 24.008,10.485 5.992,10.485 "/>
+<polygon fill-opacity="0.5" points="5.992,10.485 24.008,10.485 24.036,10.179 5.965,10.179 "/>
+<rect fill-opacity="0.4" height="0.306" width="2.449" x="9.184" y="5.587"/>
+<rect fill-opacity="0.4" height="0.306" width="2.449" x="18.061" y="5.587"/>
+<rect fill-opacity="0.2" height="0.307" width="2.449" x="9.184" y="5.28"/>
+<rect fill-opacity="0.2" height="0.307" width="2.449" x="18.061" y="5.28"/>
+<rect fill-opacity="0.3" height="0.306" width="3.673" x="13.163" y="19.821"/>
+<rect fill-opacity="0.2" height="0.307" width="3.673" x="13.163" y="20.127"/>
+</g>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_presentation_player.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_presentation_player.svg Fri May 14 16:09:54 2010 +0300
@@ -1,127 +1,135 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="51.4814" y2="10.7829">
-<stop offset="0" style="stop-color:#EBEBEB"/>
-<stop offset="1" style="stop-color:#CCCCCC"/>
+ <stop offset="0" style="stop-color:#EBEBEB"/>
+ <stop offset="1" style="stop-color:#CCCCCC"/>
</linearGradient>
<rect fill="url(#SVGID_1_)" height="41.251" width="51.16" x="4.42" y="10.346"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="50.5747" y2="11.4563">
-<stop offset="0" style="stop-color:#B3B3B3"/>
-<stop offset="1" style="stop-color:#808080"/>
+ <stop offset="0" style="stop-color:#B3B3B3"/>
+ <stop offset="1" style="stop-color:#808080"/>
</linearGradient>
<rect fill="url(#SVGID_2_)" height="38.485" width="46.32" x="6.84" y="11.729"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="11.2798" y2="49.8705">
-<stop offset="0" style="stop-color:#F5F5F5"/>
-<stop offset="1" style="stop-color:#CCCCCC"/>
+ <stop offset="0" style="stop-color:#F5F5F5"/>
+ <stop offset="1" style="stop-color:#CCCCCC"/>
</linearGradient>
<rect fill="url(#SVGID_3_)" height="37.103" width="44.938" x="7.531" y="12.42"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="30" x2="30" y1="48.4854" y2="13.2231">
-<stop offset="0" style="stop-color:#F5F5F5"/>
-<stop offset="1" style="stop-color:#CCCCCC"/>
+ <stop offset="0" style="stop-color:#F5F5F5"/>
+ <stop offset="1" style="stop-color:#CCCCCC"/>
</linearGradient>
<rect fill="url(#SVGID_4_)" height="35.72" width="43.555" x="8.223" y="13.111"/>
-<rect fill-opacity="0.1" height="3.111" stroke-opacity="0.1" width="51.16" x="4.42" y="10.346"/>
-<rect fill-opacity="0.2" height="1.729" stroke-opacity="0.2" width="51.16" x="4.42" y="10.346"/>
+<rect height="3.111" opacity="0.1" width="51.16" x="4.42" y="10.346"/>
+<rect height="1.729" opacity="0.2" width="51.16" x="4.42" y="10.346"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30" x2="30" y1="5.7334" y2="10.6915">
-<stop offset="0" style="stop-color:#B4BDBF"/>
-<stop offset="0.2667" style="stop-color:#E5EBED"/>
-<stop offset="0.703" style="stop-color:#8D9699"/>
-<stop offset="1" style="stop-color:#B7BDBF"/>
+ <stop offset="0" style="stop-color:#B4BDBF"/>
+ <stop offset="0.2667" style="stop-color:#E5EBED"/>
+ <stop offset="0.703" style="stop-color:#8D9699"/>
+ <stop offset="1" style="stop-color:#B7BDBF"/>
</linearGradient>
<rect fill="url(#SVGID_5_)" height="4.873" width="56" x="2" y="5.818"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="56.9375" x2="56.9375" y1="5.7334" y2="10.6915">
-<stop offset="0" style="stop-color:#292929"/>
-<stop offset="0.3455" style="stop-color:#8C8C8C"/>
-<stop offset="0.7" style="stop-color:#171717"/>
-<stop offset="1" style="stop-color:#646464"/>
+ <stop offset="0" style="stop-color:#292929"/>
+ <stop offset="0.3455" style="stop-color:#8C8C8C"/>
+ <stop offset="0.7" style="stop-color:#171717"/>
+ <stop offset="1" style="stop-color:#646464"/>
</linearGradient>
<rect fill="url(#SVGID_6_)" height="4.873" width="2.125" x="55.875" y="5.818"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="3.0615" x2="3.0615" y1="5.7334" y2="10.6915">
-<stop offset="0" style="stop-color:#292929"/>
-<stop offset="0.3455" style="stop-color:#8C8C8C"/>
-<stop offset="0.7" style="stop-color:#171717"/>
-<stop offset="1" style="stop-color:#646464"/>
+ <stop offset="0" style="stop-color:#292929"/>
+ <stop offset="0.3455" style="stop-color:#8C8C8C"/>
+ <stop offset="0.7" style="stop-color:#171717"/>
+ <stop offset="1" style="stop-color:#646464"/>
</linearGradient>
<rect fill="url(#SVGID_7_)" height="4.873" width="2.123" x="2" y="5.818"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="29.999" x2="29.999" y1="54.1147" y2="51.2821">
-<stop offset="0" style="stop-color:#B4BDBF"/>
-<stop offset="0.2667" style="stop-color:#E5EBED"/>
-<stop offset="0.703" style="stop-color:#8D9699"/>
-<stop offset="1" style="stop-color:#B7BDBF"/>
+ <stop offset="0" style="stop-color:#B4BDBF"/>
+ <stop offset="0.2667" style="stop-color:#E5EBED"/>
+ <stop offset="0.703" style="stop-color:#8D9699"/>
+ <stop offset="1" style="stop-color:#B7BDBF"/>
</linearGradient>
<rect fill="url(#SVGID_8_)" height="2.683" width="54.584" x="2.707" y="51.498"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="56.583" x2="56.583" y1="54.1147" y2="51.2821">
-<stop offset="0" style="stop-color:#292929"/>
-<stop offset="0.3455" style="stop-color:#8C8C8C"/>
-<stop offset="0.7" style="stop-color:#171717"/>
-<stop offset="1" style="stop-color:#646464"/>
+ <stop offset="0" style="stop-color:#292929"/>
+ <stop offset="0.3455" style="stop-color:#8C8C8C"/>
+ <stop offset="0.7" style="stop-color:#171717"/>
+ <stop offset="1" style="stop-color:#646464"/>
</linearGradient>
<rect fill="url(#SVGID_9_)" height="2.683" width="1.416" x="55.875" y="51.498"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="3.415" x2="3.415" y1="54.1147" y2="51.2821">
-<stop offset="0" style="stop-color:#292929"/>
-<stop offset="0.3455" style="stop-color:#8C8C8C"/>
-<stop offset="0.7" style="stop-color:#171717"/>
-<stop offset="1" style="stop-color:#646464"/>
+ <stop offset="0" style="stop-color:#292929"/>
+ <stop offset="0.3455" style="stop-color:#8C8C8C"/>
+ <stop offset="0.7" style="stop-color:#171717"/>
+ <stop offset="1" style="stop-color:#646464"/>
</linearGradient>
<rect fill="url(#SVGID_10_)" height="2.683" width="1.416" x="2.707" y="51.498"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="45.4971" x2="45.4971" y1="15.5684" y2="44.6055">
+ <stop offset="0" style="stop-color:#8CC944"/>
+ <stop offset="1" style="stop-color:#358C0C"/>
+</linearGradient>
<rect fill="url(#SVGID_11_)" height="29.037" width="6.221" x="42.387" y="16.105"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="35.127" x2="35.127" y1="23.854" y2="45.9286">
+ <stop offset="0" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
+</linearGradient>
<rect fill="url(#SVGID_12_)" height="21.432" width="6.223" x="32.016" y="23.711"/>
-<rect fill-opacity="0.25" height="24.889" stroke-opacity="0.25" width="6.223" x="22.336" y="20.945"/>
+<rect height="24.889" opacity="0.25" width="6.223" x="22.336" y="20.945"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="24.7559" x2="24.7559" y1="20.1851" y2="44.97">
-<stop offset="0" style="stop-color:#8CC944"/>
-<stop offset="1" style="stop-color:#358C0C"/>
+ <stop offset="0" style="stop-color:#8CC944"/>
+ <stop offset="1" style="stop-color:#358C0C"/>
</linearGradient>
<rect fill="url(#SVGID_13_)" height="24.889" width="6.223" x="21.645" y="20.254"/>
-<rect fill-opacity="0.25" height="7.604" stroke-opacity="0.25" width="6.221" x="11.967" y="38.229"/>
+<rect height="7.604" opacity="0.25" width="6.221" x="11.967" y="38.229"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="14.3857" x2="14.3857" y1="37.5381" y2="45.3728">
-<stop offset="0" style="stop-color:#DD7E28"/>
-<stop offset="1" style="stop-color:#D8300A"/>
+ <stop offset="0" style="stop-color:#DD7E28"/>
+ <stop offset="1" style="stop-color:#D8300A"/>
</linearGradient>
<rect fill="url(#SVGID_14_)" height="7.604" width="6.221" x="11.275" y="37.538"/>
-<rect fill-opacity="0.25" height="29.037" stroke-opacity="0.25" width="6.221" x="43.078" y="16.797"/>
-<rect fill="url(#SVGID_11_)" height="29.037" width="6.221" x="42.387" y="16.105"/>
-<rect fill-opacity="0.25" height="21.432" stroke-opacity="0.25" width="6.223" x="32.707" y="24.402"/>
-<rect fill="url(#SVGID_12_)" height="21.432" width="6.223" x="32.016" y="23.711"/>
-<rect fill="#FFFFFF" fill-opacity="0.5" height="1.153" stroke-opacity="0.5" width="6.221" x="42.387" y="16.105"/>
-<rect fill="#FFFFFF" fill-opacity="0.5" height="1.153" stroke-opacity="0.5" width="6.223" x="32.016" y="23.711"/>
-<rect fill="#FFFFFF" fill-opacity="0.5" height="1.153" stroke-opacity="0.5" width="6.223" x="21.645" y="20.254"/>
-<rect fill="#FFFFFF" fill-opacity="0.5" height="1.153" stroke-opacity="0.5" width="6.221" x="11.275" y="37.538"/>
+<rect height="29.037" opacity="0.25" width="6.221" x="43.078" y="16.797"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="45.4971" x2="45.4971" y1="15.5684" y2="44.6055">
+ <stop offset="0" style="stop-color:#8CC944"/>
+ <stop offset="1" style="stop-color:#358C0C"/>
+</linearGradient>
+<rect fill="url(#SVGID_15_)" height="29.037" width="6.221" x="42.387" y="16.105"/>
+<rect height="21.432" opacity="0.25" width="6.223" x="32.707" y="24.402"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="35.127" x2="35.127" y1="23.854" y2="45.9286">
+ <stop offset="0" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
+</linearGradient>
+<rect fill="url(#SVGID_16_)" height="21.432" width="6.223" x="32.016" y="23.711"/>
+<rect fill="#FFFFFF" height="1.153" opacity="0.5" width="6.221" x="42.387" y="16.105"/>
+<rect fill="#FFFFFF" height="1.153" opacity="0.5" width="6.223" x="32.016" y="23.711"/>
+<rect fill="#FFFFFF" height="1.153" opacity="0.5" width="6.223" x="21.645" y="20.254"/>
+<rect fill="#FFFFFF" height="1.153" opacity="0.5" width="6.221" x="11.275" y="37.538"/>
<rect fill="none" height="60" width="60"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="45.4971" x2="45.4971" y1="15.5684" y2="44.6055">
-<stop offset="0" style="stop-color:#8CC944"/>
-<stop offset="1" style="stop-color:#358C0C"/>
-</linearGradient>
-</defs>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="35.127" x2="35.127" y1="23.854" y2="45.9286">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
-</linearGradient>
-</defs>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
<rect fill="none" height="30" width="30"/>
-<path d="M15,29.999C6.729,29.999,0,23.271,0,15S6.729,0.001,15,0.001c8.271,0,15,6.729,15,14.999 S23.271,29.999,15,29.999L15,29.999z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M15,29.999C6.729,29.999,0,23.271,0,15S6.729,0.001,15,0.001c8.271,0,15,6.729,15,14.999 S23.271,29.999,15,29.999L15,29.999z" opacity="0.35"/>
<linearGradient gradientTransform="matrix(0.5 0 0 0.5 579.9604 -1693.241)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-1129.9209" x2="-1129.9209" y1="3388.3521" y2="3444.3481">
-<stop offset="0" style="stop-color:#D5F5B5"/>
-<stop offset="1" style="stop-color:#40AD00"/>
+ <stop offset="0" style="stop-color:#D5F5B5"/>
+ <stop offset="1" style="stop-color:#40AD00"/>
</linearGradient>
<path d="M15,28.999C7.279,28.999,1,22.72,1,15C1,7.281,7.279,1.001,15,1.001c7.718,0,14,6.28,14,13.999 C29,22.72,22.718,28.999,15,28.999L15,28.999z" fill="url(#SVGID_1__)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 2908.0361)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-2179.0005" x2="-2179.0005" y1="2906.6362" y2="2878.8359">
-<stop offset="0" style="stop-color:#8CFF24"/>
-<stop offset="1" style="stop-color:#15570B"/>
+ <stop offset="0" style="stop-color:#8CFF24"/>
+ <stop offset="1" style="stop-color:#15570B"/>
</linearGradient>
<path d="M28.599,15c0,7.512-6.09,13.6-13.599,13.6C7.486,28.6,1.4,22.512,1.4,15C1.4,7.491,7.486,1.4,15,1.4 C22.509,1.4,28.599,7.491,28.599,15z" fill="url(#SVGID_2__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="16.5117" x2="16.5117" y1="21.3633" y2="7.2163">
-<stop offset="0" style="stop-color:#82DA3B"/>
-<stop offset="1" style="stop-color:#11470A"/>
+ <stop offset="0" style="stop-color:#82DA3B"/>
+ <stop offset="1" style="stop-color:#11470A"/>
</linearGradient>
<polygon fill="url(#SVGID_3__)" points="10.353,7.134 22.671,14.21 10.353,21.429 "/>
<polygon fill="#FFFFFF" points="11.11,8.444 22.008,14.734 11.11,21.026 "/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_profiles.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_profiles.svg Fri May 14 16:09:54 2010 +0300
@@ -1,99 +1,103 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<stop offset="0" style="stop-color:#73E3FF"/>
-<stop offset="1" style="stop-color:#1347BA"/>
+ <stop offset="0" style="stop-color:#73E3FF"/>
+ <stop offset="1" style="stop-color:#1347BA"/>
</linearGradient>
<path d="M7.014,26.609h21.855V4.753C16.799,4.753,7.014,14.538,7.014,26.609z" fill="url(#SVGID_1_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="17.9678" x2="17.9678" y1="6.0098" y2="52.2334">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</linearGradient>
<path d="M7.82,25.855C8.563,15.003,17.264,6.301,28.115,5.559v20.296H7.82z" fill="url(#SVGID_2_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="16.4346" x2="16.4346" y1="31.7661" y2="55.483">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="1" style="stop-color:#ADB2B5"/>
+ <stop offset="0" style="stop-color:#F2F2F2"/>
+ <stop offset="1" style="stop-color:#ADB2B5"/>
</linearGradient>
<path d="M27.408,55.246c-12.492,0-22.654-10.163-22.654-22.654v-0.708h23.361v23.362H27.408z" fill="url(#SVGID_3_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="16.4404" x2="16.4404" y1="32.5273" y2="54.7021">
-<stop offset="0" style="stop-color:#DBDFE0"/>
-<stop offset="1" style="stop-color:#7D8588"/>
+ <stop offset="0" style="stop-color:#DBDFE0"/>
+ <stop offset="1" style="stop-color:#7D8588"/>
</linearGradient>
<path d="M27.361,54.48C15.492,54.09,5.91,44.507,5.52,32.638h21.842V54.48z" fill="url(#SVGID_4_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="44.3184" x2="44.3184" y1="5.0361" y2="34.0517">
-<stop offset="0" style="stop-color:#73E3FF"/>
-<stop offset="1" style="stop-color:#1347BA"/>
+ <stop offset="0" style="stop-color:#73E3FF"/>
+ <stop offset="1" style="stop-color:#1347BA"/>
</linearGradient>
<path d="M33.391,4.753v21.855h21.855C55.246,14.538,45.461,4.753,33.391,4.753z" fill="url(#SVGID_5_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="44.293" x2="44.293" y1="6.0098" y2="52.2334">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</linearGradient>
<path d="M34.145,25.855V5.559c10.852,0.743,19.555,9.445,20.297,20.296H34.145z" fill="url(#SVGID_6_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="44.3184" x2="44.3184" y1="31.248" y2="52.7565">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="1" style="stop-color:#1347BA"/>
+ <stop offset="0" style="stop-color:#3BC8EB"/>
+ <stop offset="1" style="stop-color:#1347BA"/>
</linearGradient>
<path d="M33.391,52.985c12.07,0,21.855-9.784,21.855-21.854H33.391V52.985z" fill="url(#SVGID_7_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="44.293" x2="44.293" y1="6.0107" y2="52.2332">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</linearGradient>
<path d="M34.145,31.884h20.297c-0.742,10.852-9.445,19.553-20.297,20.296V31.884z" fill="url(#SVGID_8_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="17.9414" x2="17.9414" y1="4.5654" y2="41.5914">
-<stop offset="0" style="stop-color:#2277CC"/>
-<stop offset="1" style="stop-color:#092259"/>
+ <stop offset="0" style="stop-color:#2277CC"/>
+ <stop offset="1" style="stop-color:#092259"/>
</linearGradient>
<path d="M28.869,4.766v21.843H7.027C7.416,14.739,17,5.156,28.869,4.766 M29.623,4 C16.721,4,6.26,14.459,6.26,27.362h23.363V4L29.623,4z" fill="url(#SVGID_9_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="16.4346" x2="16.4346" y1="31.0054" y2="55.875">
-<stop offset="0" style="stop-color:#DBE1E3"/>
-<stop offset="1" style="stop-color:#505657"/>
+ <stop offset="0" style="stop-color:#DBE1E3"/>
+ <stop offset="1" style="stop-color:#505657"/>
</linearGradient>
<path d="M28.115,31.884v23.362c-12.881,0-23.361-10.48-23.361-23.362H28.115 M28.869,31.13H4v0.754 C4,45.181,14.818,56,28.115,56h0.754V31.13L28.869,31.13z" fill="url(#SVGID_10_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="44.3184" x2="44.3184" y1="4.5654" y2="41.5914">
-<stop offset="0" style="stop-color:#2277CC"/>
-<stop offset="1" style="stop-color:#092259"/>
+ <stop offset="0" style="stop-color:#2277CC"/>
+ <stop offset="1" style="stop-color:#092259"/>
</linearGradient>
<path d="M33.391,4.766c11.869,0.39,21.453,9.973,21.844,21.843H33.391V4.766 M32.637,4v23.362H56 C56,14.459,45.541,4,32.637,4L32.637,4z" fill="url(#SVGID_11_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="44.3184" x2="44.3184" y1="30.1255" y2="53.881">
-<stop offset="0" style="stop-color:#2277CC"/>
-<stop offset="1" style="stop-color:#092259"/>
+ <stop offset="0" style="stop-color:#2277CC"/>
+ <stop offset="1" style="stop-color:#092259"/>
</linearGradient>
<path d="M55.234,31.13C54.844,43,45.26,52.583,33.391,52.973V31.13H55.234 M56,30.376H32.637v23.362 C45.541,53.739,56,43.279,56,30.376L56,30.376z" fill="url(#SVGID_12_)"/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<polygon fill="none" points="24.728,0 23.608,0.487 0,0.487 0,30.487 30,30.487 30,0.487 24.928,0.487 "/>
-<path d="M7.991,30.324c-3.295,0-5.976-1.69-6.668-4.205c-0.366-1.331-0.159-2.734,0.6-4.06 c1.063-1.86,3.062-3.301,5.478-3.952c0.873-0.235,1.762-0.355,2.639-0.355c0.927,0,1.816,0.133,2.635,0.389V5.247L24.728,0 l1.526,3.717l0.018-0.007l0.389,0.963l0.609,1.563l-10.565,4.318c0.008,2.6,0.003,5.635-0.001,8.204 c-0.003,2.014-0.006,3.74-0.002,4.745c0.016,2.839-2.473,5.497-6.049,6.463C9.771,30.203,8.875,30.324,7.991,30.324L7.991,30.324z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M7.991,30.324c-3.295,0-5.976-1.69-6.668-4.205c-0.366-1.331-0.159-2.734,0.6-4.06 c1.063-1.86,3.062-3.301,5.478-3.952c0.873-0.235,1.762-0.355,2.639-0.355c0.927,0,1.816,0.133,2.635,0.389V5.247L24.728,0 l1.526,3.717l0.018-0.007l0.389,0.963l0.609,1.563l-10.565,4.318c0.008,2.6,0.003,5.635-0.001,8.204 c-0.003,2.014-0.006,3.74-0.002,4.745c0.016,2.839-2.473,5.497-6.049,6.463C9.771,30.203,8.875,30.324,7.991,30.324L7.991,30.324z" opacity="0.35"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 2908.0361)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-2179.9351" x2="-2179.9351" y1="2902.811" y2="2880.1646">
-<stop offset="0" style="stop-color:#8CFF24"/>
-<stop offset="1" style="stop-color:#15570B"/>
+ <stop offset="0" style="stop-color:#8CFF24"/>
+ <stop offset="1" style="stop-color:#15570B"/>
</linearGradient>
<path d="M25.98,5.682l-1.79-4.357L13.902,5.902l0.016,13.899c-1.574-1.029-3.896-1.366-6.257-0.729 c-3.722,1.003-6.127,4.041-5.374,6.78c0.756,2.742,4.383,4.15,8.104,3.146c3.146-0.849,5.324-3.094,5.311-5.493 c-0.01-2.399,0.02-8.913,0-13.625L25.98,5.682z" fill="url(#SVGID_1__)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 0.5 614.8193 -1693.241)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-1201.8184" x2="-1201.8184" y1="3393.1226" y2="3404.4397">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</linearGradient>
<polygon fill="url(#SVGID_2__)" points="13.918,17.409 13.907,5.902 13.902,5.902 13.916,17.408 "/>
<linearGradient gradientTransform="matrix(0.5 0 0 0.5 614.8193 -1693.241)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="-1187.957" x2="-1187.957" y1="3393.1177" y2="3404.4392">
-<stop offset="0" style="stop-color:#9EFF47"/>
-<stop offset="1" style="stop-color:#11470A"/>
+ <stop offset="0" style="stop-color:#9EFF47"/>
+ <stop offset="1" style="stop-color:#11470A"/>
</linearGradient>
<path d="M15.701,9.169c0.005,0.759,0.006-0.117,0.008,0.711L25.98,5.682l-0.252-0.646L15.701,9.169z" fill="url(#SVGID_3__)"/>
<linearGradient gradientTransform="matrix(0.5 -0.0026 0.0026 0.5 604.1579 -1699.019)" gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="-1188.0039" x2="-1188.0039" y1="3402.1909" y2="3430.4734">
-<stop offset="0" style="stop-color:#B3FF6E"/>
-<stop offset="1" style="stop-color:#11470A"/>
+ <stop offset="0" style="stop-color:#B3FF6E"/>
+ <stop offset="1" style="stop-color:#11470A"/>
</linearGradient>
<polygon fill="url(#SVGID_4__)" points="14.072,20.2 14.072,6.3 24.389,1.807 24.19,1.324 13.674,5.902 13.674,19.803 "/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 2908.0361)" gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="-2185.0737" x2="-2185.0737" y1="2887.9233" y2="2879.6807">
-<stop offset="0" style="stop-color:#B2F56E"/>
-<stop offset="0.4667" style="stop-color:#40AD00"/>
-<stop offset="1" style="stop-color:#074D00"/>
+ <stop offset="0" style="stop-color:#B2F56E"/>
+ <stop offset="0.4667" style="stop-color:#40AD00"/>
+ <stop offset="1" style="stop-color:#074D00"/>
</linearGradient>
<path d="M7.96,28.527c-2.474,0.012-4.447-1.129-4.909-2.839c-0.28-1.039,0.018-2.187,0.84-3.229 c0.9-1.141,2.291-2.007,3.923-2.436c0.688-0.184,1.385-0.277,2.075-0.281c2.474-0.013,4.445,1.129,4.91,2.84 c0.615,2.267-1.522,4.807-4.764,5.664C9.347,28.43,8.647,28.522,7.96,28.527L7.96,28.527z" fill="url(#SVGID_5__)"/>
<rect fill="none" height="30" width="30" y="0.487"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_query.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_query.svg Fri May 14 16:09:54 2010 +0300
@@ -1,31 +1,32 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.7636" style="stop-color:#144DA3"/>
-<stop offset="1" style="stop-color:#36B5FF"/>
+ <stop offset="0" style="stop-color:#94FFFF"/>
+ <stop offset="0.7636" style="stop-color:#144DA3"/>
+ <stop offset="1" style="stop-color:#36B5FF"/>
</linearGradient>
<path d="M14.814,10.715V3.508C19.178,2.505,23.314,2,27.238,2c5.785,0,10.221,1.121,13.311,3.364 s4.635,5.532,4.635,9.873c0,2.526-0.596,4.665-1.783,6.417c-1.191,1.752-9.396,9.994-10.205,11.121 c-0.809,1.128-1.213,2.465-1.213,4.01v1.544h-11.51v-2.06c0-2.502,0.547-4.612,1.639-6.342c1.09-1.729,2.994-3.868,5.715-6.419 c2.133-1.985,4.781-6.593,4.781-7.573c0-4.436-2.674-6.655-8.018-6.655C21.576,9.28,18.322,9.759,14.814,10.715z" fill="url(#SVGID_1_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="29.999" x2="29.999" y1="2.5591" y2="37.7967">
-<stop offset="0" style="stop-color:#6BCBF2"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#6BCBF2"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</linearGradient>
<path d="M21.223,37.579v-1.31c0-2.343,0.512-4.342,1.521-5.941c1.051-1.666,2.934-3.776,5.596-6.272 c2.016-1.876,5.018-6.732,5.018-8.12c0-3.378-1.521-7.405-8.768-7.405c-2.695,0-5.629,0.383-8.717,1.137l-0.309,0.075V4.107 l0.197-0.043c4.018-0.872,7.879-1.314,11.477-1.314c5.596,0,9.928,1.084,12.869,3.222c2.912,2.112,4.326,5.144,4.326,9.266 c0,2.359-0.557,4.376-1.654,5.996c-0.646,0.95-3.703,4.159-6.158,6.737c-2.273,2.389-3.68,3.872-4.035,4.367 c-0.898,1.254-1.354,2.75-1.354,4.447v0.794H21.223z" fill="url(#SVGID_2_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="26.6924" x2="26.6924" y1="43.6758" y2="58.1758">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.7636" style="stop-color:#144DA3"/>
-<stop offset="1" style="stop-color:#36B5FF"/>
+ <stop offset="0" style="stop-color:#94FFFF"/>
+ <stop offset="0.7636" style="stop-color:#144DA3"/>
+ <stop offset="1" style="stop-color:#36B5FF"/>
</linearGradient>
<path d="M26.672,58c-1.938,0-3.602-0.686-5-2.059c-1.396-1.373-2.094-3.052-2.094-5.037 c0-1.962,0.693-3.641,2.076-5.038c1.385-1.397,3.059-2.095,5.018-2.095c1.961,0,3.641,0.697,5.037,2.095 c1.398,1.397,2.098,3.076,2.098,5.038c0,1.985-0.699,3.664-2.098,5.037C30.313,57.314,28.633,58,26.672,58z" fill="url(#SVGID_3_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="26.6924" x2="26.6924" y1="44.436" y2="57.4074">
-<stop offset="0" style="stop-color:#63C1EF"/>
-<stop offset="0.1152" style="stop-color:#63C1EF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0.1152" style="stop-color:#63C1EF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</linearGradient>
<path d="M26.672,57.25c-1.748,0-3.211-0.604-4.475-1.844c-1.258-1.237-1.869-2.71-1.869-4.502 c0-1.771,0.607-3.245,1.859-4.511c1.248-1.26,2.715-1.872,4.484-1.872c1.771,0,3.246,0.613,4.508,1.875 c1.264,1.263,1.877,2.737,1.877,4.508c0,1.792-0.613,3.265-1.873,4.503C29.92,56.647,28.445,57.25,26.672,57.25L26.672,57.25z" fill="url(#SVGID_4_)"/>
<rect fill="none" height="60" width="60"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_radio.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_radio.svg Fri May 14 16:09:54 2010 +0300
@@ -1,308 +1,307 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="11.647" y2="52.3348">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="0.7939" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#E8522A"/>
+ <stop offset="0" style="stop-color:#FF7236"/>
+ <stop offset="0.7939" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#E8522A"/>
</linearGradient>
<path d="M58,50.776c0,0.858-0.697,1.556-1.557,1.556H3.555C2.694,52.332,2,51.635,2,50.776V13.443 c0-0.859,0.694-1.556,1.555-1.556h52.889c0.859,0,1.557,0.696,1.557,1.556V50.776z" fill="url(#SVGID_1_)"/>
-<path d="M56.443,11.888H3.555C2.694,11.888,2,12.584,2,13.443v12.056l56-6.158v-5.897 C58,12.584,57.303,11.888,56.443,11.888z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M56.443,11.888H3.555C2.694,11.888,2,12.584,2,13.443v12.056l56-6.158v-5.897 C58,12.584,57.303,11.888,56.443,11.888z" fill="#FFFFFF" opacity="0.1"/>
<path d="M56.443,12.666c0.428,0,0.777,0.349,0.777,0.777v37.333c0,0.428-0.35,0.778-0.777,0.778H3.555 c-0.43,0-0.778-0.351-0.778-0.778V13.443c0-0.429,0.349-0.777,0.778-0.777H56.443 M56.443,11.888H3.555 C2.694,11.888,2,12.584,2,13.443v37.333c0,0.858,0.694,1.556,1.555,1.556h52.889c0.859,0,1.557-0.697,1.557-1.556V13.443 C58,12.584,57.303,11.888,56.443,11.888L56.443,11.888z" fill="#D83506"/>
<path d="M56.443,51.555H3.555C2.694,51.555,2,50.857,2,49.999v0.777c0,0.858,0.694,1.556,1.555,1.556h52.889 c0.859,0,1.557-0.697,1.557-1.556v-0.777C58,50.857,57.303,51.555,56.443,51.555z" fill="#600909"/>
-<path d="M56.443,11.888H3.555C2.694,11.888,2,12.584,2,13.443v0.778c0-0.86,0.694-1.556,1.555-1.556 h52.889c0.859,0,1.557,0.695,1.557,1.556v-0.778C58,12.584,57.303,11.888,56.443,11.888z" fill="#FFFFFF" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M56.443,11.888H3.555C2.694,11.888,2,12.584,2,13.443v0.778c0-0.86,0.694-1.556,1.555-1.556 h52.889c0.859,0,1.557,0.695,1.557,1.556v-0.778C58,12.584,57.303,11.888,56.443,11.888z" fill="#FFFFFF" opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="45.9424" x2="45.9424" y1="32.6411" y2="20.912">
-<stop offset="0" style="stop-color:#444243"/>
-<stop offset="1" style="stop-color:#231F20"/>
+ <stop offset="0" style="stop-color:#444243"/>
+ <stop offset="1" style="stop-color:#231F20"/>
</linearGradient>
<circle cx="45.942" cy="26.611" fill="url(#SVGID_2_)" r="6.946"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="45.9424" x2="45.9424" y1="33.9702" y2="28.6358">
-<stop offset="0" style="stop-color:#D9D9D9"/>
-<stop offset="1" style="stop-color:#413F3F"/>
+ <stop offset="0" style="stop-color:#D9D9D9"/>
+ <stop offset="1" style="stop-color:#413F3F"/>
</linearGradient>
<path d="M45.943,33.558c-3.754,0-6.803-2.979-6.935-6.698c-0.003,0.084-0.013,0.163-0.013,0.248 c0,3.836,3.109,6.946,6.947,6.946c3.836,0,6.945-3.11,6.945-6.946c0-0.085-0.01-0.164-0.01-0.248 C52.744,30.578,49.695,33.558,45.943,33.558z" fill="url(#SVGID_3_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="45.9443" x2="45.9443" y1="35.3247" y2="17.436">
-<stop offset="0" style="stop-color:#FF4D00"/>
-<stop offset="1" style="stop-color:#9D1010"/>
+ <stop offset="0" style="stop-color:#FF4D00"/>
+ <stop offset="1" style="stop-color:#9D1010"/>
</linearGradient>
<path d="M45.943,35.609c-4.933,0-8.944-4.013-8.944-8.943c0-4.933,4.012-8.945,8.944-8.945 s8.945,4.013,8.945,8.945C54.889,31.597,50.876,35.609,45.943,35.609L45.943,35.609z M45.943,18.888 c-4.29,0-7.778,3.488-7.778,7.778c0,4.287,3.488,7.776,7.778,7.776c4.287,0,7.779-3.489,7.779-7.776 C53.723,22.376,50.23,18.888,45.943,18.888L45.943,18.888z" fill="url(#SVGID_4_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="45.9434" x2="45.9434" y1="20.5371" y2="32.7461">
-<stop offset="0" style="stop-color:#CBCBCB"/>
-<stop offset="1" style="stop-color:#4F4F4F"/>
+ <stop offset="0" style="stop-color:#CBCBCB"/>
+ <stop offset="1" style="stop-color:#4F4F4F"/>
</linearGradient>
<circle cx="45.943" cy="26.642" fill="url(#SVGID_5_)" r="6.104"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="45.9434" x2="45.9434" y1="20.9736" y2="32.3105">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.2848" style="stop-color:#FFFFFF"/>
-<stop offset="0.7212" style="stop-color:#7B7B7B"/>
-<stop offset="1" style="stop-color:#A7A7A7"/>
+ <stop offset="0.2848" style="stop-color:#FFFFFF"/>
+ <stop offset="0.7212" style="stop-color:#7B7B7B"/>
+ <stop offset="1" style="stop-color:#A7A7A7"/>
</linearGradient>
<circle cx="45.943" cy="26.642" fill="url(#SVGID_6_)" r="5.67"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="45.9434" x2="45.9434" y1="21.4746" y2="31.9404">
-<stop offset="0" style="stop-color:#D9D9D9"/>
-<stop offset="0.8242" style="stop-color:#636363"/>
-<stop offset="1" style="stop-color:#636363"/>
+ <stop offset="0" style="stop-color:#D9D9D9"/>
+ <stop offset="0.8242" style="stop-color:#636363"/>
</linearGradient>
<path d="M50.705,24.468c0.303,0.662,0.471,1.396,0.471,2.174c0,2.889-2.342,5.233-5.232,5.233 c-2.888,0-5.232-2.345-5.232-5.233s2.345-5.232,5.232-5.232C48.058,21.409,49.879,22.663,50.705,24.468z" fill="url(#SVGID_7_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="45.9434" x2="45.9434" y1="25.4961" y2="22.9348">
-<stop offset="0" style="stop-color:#636363"/>
-<stop offset="1" style="stop-color:#323232"/>
+ <stop offset="0" style="stop-color:#636363"/>
+ <stop offset="1" style="stop-color:#323232"/>
</linearGradient>
<polygon fill="url(#SVGID_8_)" points="44.636,25.397 45.943,22.782 47.251,25.397 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="20.2773" x2="20.2773" y1="30.6846" y2="20.667">
-<stop offset="0" style="stop-color:#636363"/>
-<stop offset="0.6667" style="stop-color:#515151"/>
-<stop offset="1" style="stop-color:#323232"/>
+ <stop offset="0" style="stop-color:#636363"/>
+ <stop offset="0.6667" style="stop-color:#515151"/>
+ <stop offset="1" style="stop-color:#323232"/>
</linearGradient>
<rect fill="url(#SVGID_9_)" height="10.889" width="28" x="6.277" y="20.055"/>
<rect fill="#D9D9D9" height="0.777" width="28" x="6.277" y="30.943"/>
<polygon fill="#A6A8AB" points="31.945,25.499 31.945,27.832 29.609,27.832 29.609,26.276 28.832,26.276 28.832,27.832 26.498,27.832 26.498,26.276 25.723,26.276 25.723,27.832 23.387,27.832 23.387,26.276 22.61,26.276 22.61,27.832 20.277,27.832 20.277,25.499 19.499,25.499 19.499,27.832 17.166,27.832 17.166,26.276 16.388,26.276 16.388,27.832 14.056,27.832 14.056,26.276 13.276,26.276 13.276,27.832 10.944,27.832 10.944,26.276 10.165,26.276 10.165,27.832 8.609,27.832 8.609,25.499 7.833,25.499 7.833,28.609 8.609,28.609 10.165,28.609 10.944,28.609 13.276,28.609 14.056,28.609 16.388,28.609 17.166,28.609 19.499,28.609 20.277,28.609 22.61,28.609 23.387,28.609 25.723,28.609 26.498,28.609 28.832,28.609 29.609,28.609 31.945,28.609 32.721,28.609 32.721,27.832 32.721,25.499 "/>
<rect fill="#E00000" height="10.889" width="1.556" x="20.301" y="20.055"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="9.127" x2="9.127" y1="40.2437" y2="43.355">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+ <stop offset="0" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#FF7236"/>
</linearGradient>
<circle cx="9.127" cy="41.832" fill="url(#SVGID_10_)" r="1.556"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="9.126" x2="9.126" y1="40.7729" y2="42.8472">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#383838"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#383838"/>
</linearGradient>
<circle cx="9.126" cy="41.832" fill="url(#SVGID_11_)" r="1.039"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="13.7295" x2="13.7295" y1="40.2437" y2="43.355">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+ <stop offset="0" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#FF7236"/>
</linearGradient>
<path d="M15.285,41.832c0,0.858-0.693,1.556-1.556,1.556c-0.857,0-1.555-0.697-1.555-1.556 c0-0.861,0.697-1.556,1.555-1.556C14.592,40.276,15.285,40.971,15.285,41.832z" fill="url(#SVGID_12_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="13.7295" x2="13.7295" y1="40.7729" y2="42.8472">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#383838"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#383838"/>
</linearGradient>
<circle cx="13.73" cy="41.832" fill="url(#SVGID_13_)" r="1.038"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="18.3955" x2="18.3955" y1="40.2437" y2="43.355">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+ <stop offset="0" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#FF7236"/>
</linearGradient>
<circle cx="18.396" cy="41.832" fill="url(#SVGID_14_)" r="1.555"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="18.3955" x2="18.3955" y1="40.7729" y2="42.8472">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#383838"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#383838"/>
</linearGradient>
<circle cx="18.396" cy="41.832" fill="url(#SVGID_15_)" r="1.038"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="23.0615" x2="23.0615" y1="40.2437" y2="43.355">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+ <stop offset="0" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#FF7236"/>
</linearGradient>
<circle cx="23.062" cy="41.832" fill="url(#SVGID_16_)" r="1.556"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="23.0635" x2="23.0635" y1="40.7729" y2="42.8472">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#383838"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#383838"/>
</linearGradient>
<circle cx="23.063" cy="41.832" fill="url(#SVGID_17_)" r="1.038"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="27.7295" x2="27.7295" y1="40.2437" y2="43.355">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+ <stop offset="0" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#FF7236"/>
</linearGradient>
<circle cx="27.729" cy="41.832" fill="url(#SVGID_18_)" r="1.556"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="27.7295" x2="27.7295" y1="40.7729" y2="42.8472">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#383838"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#383838"/>
</linearGradient>
<circle cx="27.729" cy="41.832" fill="url(#SVGID_19_)" r="1.037"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="32.3965" x2="32.3965" y1="40.2437" y2="43.355">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+ <stop offset="0" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#FF7236"/>
</linearGradient>
<circle cx="32.396" cy="41.832" fill="url(#SVGID_20_)" r="1.556"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="32.3965" x2="32.3965" y1="40.7729" y2="42.8472">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#383838"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#383838"/>
</linearGradient>
<circle cx="32.396" cy="41.832" fill="url(#SVGID_21_)" r="1.037"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="9.127" x2="9.127" y1="44.9106" y2="48.022">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+ <stop offset="0" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#FF7236"/>
</linearGradient>
<circle cx="9.127" cy="46.499" fill="url(#SVGID_22_)" r="1.556"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_23_" x1="9.126" x2="9.126" y1="45.4399" y2="47.5142">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#383838"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#383838"/>
</linearGradient>
<circle cx="9.126" cy="46.499" fill="url(#SVGID_23_)" r="1.039"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_24_" x1="13.7295" x2="13.7295" y1="44.9106" y2="48.022">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+ <stop offset="0" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#FF7236"/>
</linearGradient>
<path d="M15.285,46.499c0,0.858-0.693,1.556-1.556,1.556c-0.857,0-1.555-0.697-1.555-1.556 c0-0.861,0.697-1.556,1.555-1.556C14.592,44.943,15.285,45.638,15.285,46.499z" fill="url(#SVGID_24_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="13.7295" x2="13.7295" y1="45.4399" y2="47.5142">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#383838"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#383838"/>
</linearGradient>
<circle cx="13.73" cy="46.499" fill="url(#SVGID_25_)" r="1.038"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_26_" x1="18.3955" x2="18.3955" y1="44.9106" y2="48.022">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+ <stop offset="0" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#FF7236"/>
</linearGradient>
<circle cx="18.396" cy="46.499" fill="url(#SVGID_26_)" r="1.555"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_27_" x1="18.3955" x2="18.3955" y1="45.4399" y2="47.5142">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#383838"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#383838"/>
</linearGradient>
<circle cx="18.396" cy="46.499" fill="url(#SVGID_27_)" r="1.038"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_28_" x1="23.0615" x2="23.0615" y1="44.9106" y2="48.022">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+ <stop offset="0" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#FF7236"/>
</linearGradient>
<circle cx="23.062" cy="46.499" fill="url(#SVGID_28_)" r="1.556"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_29_" x1="23.0635" x2="23.0635" y1="45.4399" y2="47.5142">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#383838"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#383838"/>
</linearGradient>
<circle cx="23.063" cy="46.499" fill="url(#SVGID_29_)" r="1.038"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_30_" x1="27.7295" x2="27.7295" y1="44.9106" y2="48.022">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+ <stop offset="0" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#FF7236"/>
</linearGradient>
<circle cx="27.729" cy="46.499" fill="url(#SVGID_30_)" r="1.556"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_31_" x1="27.7295" x2="27.7295" y1="45.4399" y2="47.5142">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#383838"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#383838"/>
</linearGradient>
<circle cx="27.729" cy="46.499" fill="url(#SVGID_31_)" r="1.037"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_32_" x1="32.3965" x2="32.3965" y1="44.9106" y2="48.022">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+ <stop offset="0" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#FF7236"/>
</linearGradient>
<circle cx="32.396" cy="46.499" fill="url(#SVGID_32_)" r="1.556"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_33_" x1="32.3965" x2="32.3965" y1="45.4399" y2="47.5142">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#383838"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#383838"/>
</linearGradient>
<circle cx="32.396" cy="46.499" fill="url(#SVGID_33_)" r="1.037"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_34_" x1="36.999" x2="36.999" y1="40.2437" y2="43.355">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+ <stop offset="0" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#FF7236"/>
</linearGradient>
<circle cx="36.999" cy="41.832" fill="url(#SVGID_34_)" r="1.556"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_35_" x1="36.999" x2="36.999" y1="40.7729" y2="42.8472">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#383838"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#383838"/>
</linearGradient>
<circle cx="36.999" cy="41.832" fill="url(#SVGID_35_)" r="1.037"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_36_" x1="41.666" x2="41.666" y1="40.2437" y2="43.355">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+ <stop offset="0" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#FF7236"/>
</linearGradient>
<circle cx="41.666" cy="41.832" fill="url(#SVGID_36_)" r="1.556"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_37_" x1="41.666" x2="41.666" y1="40.7729" y2="42.8472">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#383838"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#383838"/>
</linearGradient>
<circle cx="41.666" cy="41.832" fill="url(#SVGID_37_)" r="1.037"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_38_" x1="46.333" x2="46.333" y1="40.2437" y2="43.355">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+ <stop offset="0" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#FF7236"/>
</linearGradient>
<circle cx="46.333" cy="41.832" fill="url(#SVGID_38_)" r="1.556"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_39_" x1="46.333" x2="46.333" y1="40.7729" y2="42.8472">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#383838"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#383838"/>
</linearGradient>
<circle cx="46.333" cy="41.832" fill="url(#SVGID_39_)" r="1.037"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_40_" x1="50.999" x2="50.999" y1="40.2437" y2="43.355">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+ <stop offset="0" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#FF7236"/>
</linearGradient>
<path d="M52.553,41.832c0,0.858-0.691,1.556-1.553,1.556c-0.858,0-1.556-0.697-1.556-1.556 c0-0.861,0.697-1.556,1.556-1.556C51.861,40.276,52.553,40.971,52.553,41.832z" fill="url(#SVGID_40_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_41_" x1="50.999" x2="50.999" y1="40.7729" y2="42.8472">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#383838"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#383838"/>
</linearGradient>
<path d="M52.037,41.832c0,0.573-0.467,1.037-1.037,1.037c-0.573,0-1.039-0.464-1.039-1.037 s0.466-1.037,1.039-1.037C51.57,40.795,52.037,41.259,52.037,41.832z" fill="url(#SVGID_41_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_42_" x1="36.999" x2="36.999" y1="44.9106" y2="48.022">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+ <stop offset="0" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#FF7236"/>
</linearGradient>
<circle cx="36.999" cy="46.499" fill="url(#SVGID_42_)" r="1.556"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_43_" x1="36.999" x2="36.999" y1="45.4399" y2="47.5142">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#383838"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#383838"/>
</linearGradient>
<circle cx="36.999" cy="46.499" fill="url(#SVGID_43_)" r="1.037"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_44_" x1="41.666" x2="41.666" y1="44.9106" y2="48.022">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+ <stop offset="0" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#FF7236"/>
</linearGradient>
<circle cx="41.666" cy="46.499" fill="url(#SVGID_44_)" r="1.556"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_45_" x1="41.666" x2="41.666" y1="45.4399" y2="47.5142">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#383838"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#383838"/>
</linearGradient>
<circle cx="41.666" cy="46.499" fill="url(#SVGID_45_)" r="1.037"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_46_" x1="46.333" x2="46.333" y1="44.9106" y2="48.022">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+ <stop offset="0" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#FF7236"/>
</linearGradient>
<circle cx="46.333" cy="46.499" fill="url(#SVGID_46_)" r="1.556"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_47_" x1="46.333" x2="46.333" y1="45.4399" y2="47.5142">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#383838"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#383838"/>
</linearGradient>
<circle cx="46.333" cy="46.499" fill="url(#SVGID_47_)" r="1.037"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_48_" x1="50.999" x2="50.999" y1="44.9106" y2="48.022">
-<stop offset="0" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+ <stop offset="0" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#FF7236"/>
</linearGradient>
<path d="M52.553,46.499c0,0.858-0.691,1.556-1.553,1.556c-0.858,0-1.556-0.697-1.556-1.556 c0-0.861,0.697-1.556,1.556-1.556C51.861,44.943,52.553,45.638,52.553,46.499z" fill="url(#SVGID_48_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_49_" x1="50.999" x2="50.999" y1="45.4399" y2="47.5142">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#383838"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#383838"/>
</linearGradient>
<path d="M52.037,46.499c0,0.573-0.467,1.037-1.037,1.037c-0.573,0-1.039-0.464-1.039-1.037 s0.466-1.037,1.039-1.037C51.57,45.462,52.037,45.926,52.037,46.499z" fill="url(#SVGID_49_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_50_" x1="49.833" x2="49.833" y1="11.5854" y2="6.285">
-<stop offset="0" style="stop-color:#CBCBCB"/>
-<stop offset="0.1576" style="stop-color:#808080"/>
-<stop offset="0.6545" style="stop-color:#E5E5E5"/>
-<stop offset="1" style="stop-color:#4F4F4F"/>
+ <stop offset="0" style="stop-color:#CBCBCB"/>
+ <stop offset="0.1576" style="stop-color:#808080"/>
+ <stop offset="0.6545" style="stop-color:#E5E5E5"/>
+ <stop offset="1" style="stop-color:#4F4F4F"/>
</linearGradient>
<rect fill="url(#SVGID_50_)" height="5.443" width="6.999" x="46.333" y="6.444"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_51_" x1="37.3877" x2="37.3877" y1="10.1592" y2="7.1295">
-<stop offset="0" style="stop-color:#CBCBCB"/>
-<stop offset="0.1576" style="stop-color:#808080"/>
-<stop offset="0.6545" style="stop-color:#E5E5E5"/>
-<stop offset="1" style="stop-color:#4F4F4F"/>
+ <stop offset="0" style="stop-color:#CBCBCB"/>
+ <stop offset="0.1576" style="stop-color:#808080"/>
+ <stop offset="0.6545" style="stop-color:#E5E5E5"/>
+ <stop offset="1" style="stop-color:#4F4F4F"/>
</linearGradient>
<rect fill="url(#SVGID_51_)" height="3.111" width="17.89" x="28.443" y="7.221"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_52_" x1="19.1104" x2="19.1104" y1="9.4683" y2="7.9534">
-<stop offset="0" style="stop-color:#CBCBCB"/>
-<stop offset="0.1576" style="stop-color:#808080"/>
-<stop offset="0.6545" style="stop-color:#E5E5E5"/>
-<stop offset="1" style="stop-color:#4F4F4F"/>
+ <stop offset="0" style="stop-color:#CBCBCB"/>
+ <stop offset="0.1576" style="stop-color:#808080"/>
+ <stop offset="0.6545" style="stop-color:#E5E5E5"/>
+ <stop offset="1" style="stop-color:#4F4F4F"/>
</linearGradient>
<rect fill="url(#SVGID_52_)" height="1.556" width="18.666" x="9.777" y="7.999"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_53_" x1="8.6104" x2="8.6104" y1="10.1592" y2="7.1295">
-<stop offset="0" style="stop-color:#CBCBCB"/>
-<stop offset="0.1576" style="stop-color:#808080"/>
-<stop offset="0.6545" style="stop-color:#E5E5E5"/>
-<stop offset="1" style="stop-color:#4F4F4F"/>
+ <stop offset="0" style="stop-color:#CBCBCB"/>
+ <stop offset="0.1576" style="stop-color:#808080"/>
+ <stop offset="0.6545" style="stop-color:#E5E5E5"/>
+ <stop offset="1" style="stop-color:#4F4F4F"/>
</linearGradient>
<rect fill="url(#SVGID_53_)" height="3.111" width="2.334" x="7.443" y="7.221"/>
-<path d="M49.832,11.498c-1.285,0-2.333-1.047-2.333-2.332c0-1.288,1.048-2.334,2.333-2.334s2.334,1.046,2.334,2.334 C52.166,10.451,51.117,11.498,49.832,11.498L49.832,11.498z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<circle cx="49.833" cy="9.166" fill-opacity="0.2" r="1.944" stroke-opacity="0.2"/>
+<path d="M49.832,11.498c-1.285,0-2.333-1.047-2.333-2.332c0-1.288,1.048-2.334,2.333-2.334s2.334,1.046,2.334,2.334 C52.166,10.451,51.117,11.498,49.832,11.498L49.832,11.498z" opacity="0.2"/>
+<circle cx="49.833" cy="9.166" opacity="0.2" r="1.944"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_54_" x1="49.8311" x2="49.8311" y1="8.0317" y2="10.2999">
-<stop offset="0" style="stop-color:#E5E5E5"/>
-<stop offset="0.7576" style="stop-color:#A7A7A7"/>
-<stop offset="1" style="stop-color:#CBCBCB"/>
+ <stop offset="0" style="stop-color:#E5E5E5"/>
+ <stop offset="0.7576" style="stop-color:#A7A7A7"/>
+ <stop offset="1" style="stop-color:#CBCBCB"/>
</linearGradient>
<circle cx="49.831" cy="9.166" fill="url(#SVGID_54_)" r="1.556"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_55_" x1="49.8311" x2="49.8311" y1="7.6592" y2="10.6737">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.2848" style="stop-color:#FFFFFF"/>
-<stop offset="0.7212" style="stop-color:#7B7B7B"/>
-<stop offset="1" style="stop-color:#A7A7A7"/>
+ <stop offset="0.2848" style="stop-color:#FFFFFF"/>
+ <stop offset="0.7212" style="stop-color:#7B7B7B"/>
+ <stop offset="1" style="stop-color:#A7A7A7"/>
</linearGradient>
<path d="M49.832,7.999C50.475,7.999,51,8.521,51,9.166c0,0.643-0.525,1.166-1.168,1.166 s-1.166-0.523-1.166-1.166C48.666,8.521,49.189,7.999,49.832,7.999 M49.832,7.61c-0.859,0-1.557,0.694-1.557,1.556 c0,0.858,0.697,1.556,1.557,1.556c0.857,0,1.555-0.697,1.555-1.556C51.387,8.305,50.689,7.61,49.832,7.61L49.832,7.61z" fill="url(#SVGID_55_)"/>
<rect fill="none" height="60" width="60"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_realplayer.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_realplayer.svg Fri May 14 16:09:54 2010 +0300
@@ -1,19 +1,21 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientTransform="matrix(1 0 0 1 2188 -2893)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-2158.0015" x2="-2158.0015" y1="2911.3418" y2="2988.4666">
-<stop offset="0" style="stop-color:#3686FF"/>
-<stop offset="1" style="stop-color:#051F7D"/>
+ <stop offset="0" style="stop-color:#3686FF"/>
+ <stop offset="1" style="stop-color:#051F7D"/>
</linearGradient>
<path d="M29.989,9.401c-12.723,0-27.991,5.928-27.991,15.61c0,11.406,21.403,16.235,27.033,16.047 c1.939-0.063,0.797,1.191,0.338,1.966c-1.484,2.496-3.174,5.655-3.559,6.277c-0.367,0.592-0.082,1.634,0.76,1.188 c0,0,21.877-12.897,26.304-16.107c5.597-4.42,5.114-9.44,5.114-9.44C57.988,15.388,42.713,9.401,29.989,9.401z" fill="url(#SVGID_1_)"/>
<path d="M33.668,40.274c-1.676,0.981-2.034,0.396-1.618-0.241c0.214-0.32,0.832-1.389,1.536-2.744 c0.399-0.764-0.004-0.859-0.254-0.866c-13.586,0-24.254-5.016-24.254-11.035c0-6.994,11.57-11.017,20.814-11.07v0.002 c9.253,0,21.043,4.012,21.004,11.021c-0.031,4.989-7.414,9.531-7.414,9.531C43.431,34.902,33.668,40.274,33.668,40.274" fill="#FFFFFF"/>
<linearGradient gradientTransform="matrix(1 0 0 1 2188 -2893)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2156.4209" x2="-2156.4209" y1="2893.4824" y2="2946.6184">
-<stop offset="0" style="stop-color:#3686FF"/>
-<stop offset="1" style="stop-color:#051F7D"/>
+ <stop offset="0" style="stop-color:#3686FF"/>
+ <stop offset="1" style="stop-color:#051F7D"/>
</linearGradient>
<path d="M40.174,18.697c-0.61-0.152-1.26-0.206-2.379-0.206c-3.188,0.093-5.209,2.449-5.209,2.449l0.58-2.12 h-6.534l-3.647,13.545h6.742l1.529-5.656c0.782-2.851,2.217-3.786,5.074-3.786c0.49,0,1,0.034,1.5,0.111L40.174,18.697z" fill="url(#SVGID_2_)"/>
<rect fill="none" height="60" width="60"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_received_voice_call.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_received_voice_call.svg Fri May 14 16:09:54 2010 +0300
@@ -1,51 +1,53 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<stop offset="0" style="stop-color:#3AC5EA"/>
-<stop offset="0.297" style="stop-color:#3AC5EA"/>
-<stop offset="0.6667" style="stop-color:#1754C9"/>
-<stop offset="0.7939" style="stop-color:#33ADE1"/>
-<stop offset="1" style="stop-color:#33ADE1"/>
+ <stop offset="0.297" style="stop-color:#3AC5EA"/>
+ <stop offset="0.6667" style="stop-color:#1754C9"/>
+ <stop offset="0.7939" style="stop-color:#33ADE1"/>
</radialGradient>
<path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333c-0.617-0.665-2.567-3.083-2.968-3.735 c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956c6.191-6.192,9.085-7.646,9.956-8.107 c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967c0.534,0.492,0.872,0.588,1.299,0.274 c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778c-2.476-2.889-8.594-5.015-10.751-5.399 c-1.923-0.345-3.876-0.872-6.567,0.235c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352 c-1.108,2.691-0.581,4.645-0.236,6.567c0.386,2.158,2.51,8.275,5.399,10.752c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2070.7568" x2="-2070.3252" y1="-2266.8511" y2="-2263.2749">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+ <stop offset="0" style="stop-color:#2685D2"/>
+ <stop offset="1" style="stop-color:#081D45"/>
</linearGradient>
<path d="M35.172,17.108c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967 c0.534,0.492,0.872,0.588,1.299,0.274c0.048-0.035,0.062-0.046,0.064-0.046c0.253-0.184,1.032-0.738,2.12-1.514 c-0.251-0.204-3.468-2.809-4.8-2.956C36.857,15.598,35.172,17.108,35.172,17.108z" fill="url(#SVGID_2_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -2128.2356 5114.0977)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2070.7607" x2="-2070.3289" y1="5104.5752" y2="5108.1523">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+ <stop offset="0" style="stop-color:#2685D2"/>
+ <stop offset="1" style="stop-color:#081D45"/>
</linearGradient>
<path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.713c0.376,0.666,2.351,3.069,2.967,3.738 c0.493,0.531,0.587,0.869,0.274,1.298c-0.035,0.047-0.046,0.062-0.046,0.062c-0.183,0.253-0.738,1.032-1.515,2.119 c-0.204-0.252-2.807-3.467-2.956-4.799C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="47.9224" x2="3.9991" y1="3.9307" y2="47.854">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+ <stop offset="0" style="stop-color:#ABEEFF"/>
+ <stop offset="1" style="stop-color:#539FDE"/>
</linearGradient>
-<path d="M2.979,47.467c-0.344-1.925-0.873-3.878,0.235-6.567 c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.341,4.269,40.9,3.215c2.691-1.108,4.644-0.581,6.567-0.236 c1.981,0.354,7.296,2.178,10.069,4.711c-2.552-2.815-8.496-4.879-10.617-5.258c-1.923-0.345-3.876-0.872-6.567,0.235 c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567 c0.378,2.122,2.441,8.065,5.258,10.617C5.156,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M2.979,47.467c-0.344-1.925-0.873-3.878,0.235-6.567 c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.341,4.269,40.9,3.215c2.691-1.108,4.644-0.581,6.567-0.236 c1.981,0.354,7.296,2.178,10.069,4.711c-2.552-2.815-8.496-4.879-10.617-5.258c-1.923-0.345-3.876-0.872-6.567,0.235 c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567 c0.378,2.122,2.441,8.065,5.258,10.617C5.156,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="54.3535" x2="3.9474" y1="3.2017" y2="53.6078">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+ <stop offset="0" style="stop-color:#ABEEFF"/>
+ <stop offset="1" style="stop-color:#539FDE"/>
</linearGradient>
-<path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333 c-0.617-0.665-2.567-3.083-2.968-3.735c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956 c6.191-6.192,9.085-7.646,9.956-8.107c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967 c0.534,0.492,0.872,0.588,1.299,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778 c-0.292-0.339-0.634-0.665-1.013-0.982c0.49,0.657,0.198,1.134-0.607,1.666C54.65,9.447,41.576,18.739,40.825,19.29 c-0.431,0.314-0.767,0.219-1.3-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.948-0.436-1.71-0.034 c-0.871,0.46-3.764,1.914-9.956,8.106c-6.193,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.319,1.135,0.035,1.711 c0.4,0.651,2.351,3.069,2.967,3.736c0.493,0.533,0.559,0.896,0.259,1.332c-0.517,0.755-9.828,13.794-10.76,15.195 c-0.533,0.803-1.008,1.098-1.665,0.606c0.314,0.378,0.644,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_5_)" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333 c-0.617-0.665-2.567-3.083-2.968-3.735c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956 c6.191-6.192,9.085-7.646,9.956-8.107c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967 c0.534,0.492,0.872,0.588,1.299,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778 c-0.292-0.339-0.634-0.665-1.013-0.982c0.49,0.657,0.198,1.134-0.607,1.666C54.65,9.447,41.576,18.739,40.825,19.29 c-0.431,0.314-0.767,0.219-1.3-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.948-0.436-1.71-0.034 c-0.871,0.46-3.764,1.914-9.956,8.106c-6.193,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.319,1.135,0.035,1.711 c0.4,0.651,2.351,3.069,2.967,3.736c0.493,0.533,0.559,0.896,0.259,1.332c-0.517,0.755-9.828,13.794-10.76,15.195 c-0.533,0.803-1.008,1.098-1.665,0.606c0.314,0.378,0.644,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_5_)" opacity="0.6"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -141.776 3075.0667)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-2041.9355" x2="-2041.9355" y1="-2305.2153" y2="-2243.2966">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="0.5091" style="stop-color:#081D45"/>
-<stop offset="1" style="stop-color:#2275BD"/>
+ <stop offset="0" style="stop-color:#2685D2"/>
+ <stop offset="0.5091" style="stop-color:#081D45"/>
+ <stop offset="1" style="stop-color:#2275BD"/>
</linearGradient>
<path d="M2.899,45.012c1.275-2.777,10.299-14.804,18.804-23.31c8.505-8.506,20.532-17.529,23.308-18.803 c0.527-0.241,1.02-0.411,1.493-0.545c-0.511-0.096-1.03-0.19-1.565-0.26c-0.086,0.036-0.163,0.063-0.25,0.102 c-2.818,1.293-14.971,10.397-23.533,18.959C12.595,29.717,3.489,41.869,2.195,44.688c-0.038,0.087-0.063,0.166-0.101,0.25 c0.07,0.535,0.166,1.055,0.259,1.565C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_6_)"/>
<rect fill="none" height="60" width="60"/>
</g>
<g>
+<defs>
+</defs>
<polygon fill="none" points="30.096,0 0.096,0 0.096,14.833 0,14.833 0.096,14.933 0.096,30 14.601,30 15.021,30.438 15.447,30 30.096,30 30.096,14.963 30.215,14.841 30.096,14.841 "/>
-<polygon fill-opacity="0.35" points="0,14.833 3.596,14.828 3.625,14.859 8.375,14.859 8.375,0 21.73,0.001 21.73,14.843 30.215,14.841 15.021,30.438 " stroke-opacity="0.35"/>
+<polygon opacity="0.35" points="0,14.833 3.596,14.828 3.625,14.859 8.375,14.859 8.375,0 21.73,0.001 21.73,14.843 30.215,14.841 15.021,30.438 "/>
<linearGradient gradientTransform="matrix(1 1.000000e-004 1.000000e-004 -1 2191.3389 2985.8491)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-2176.5142" x2="-2176.5142" y1="2984.646" y2="2957.3247">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+ <stop offset="0" style="stop-color:#C6FF45"/>
+ <stop offset="0.7273" style="stop-color:#66A00E"/>
+ <stop offset="1" style="stop-color:#387300"/>
</linearGradient>
<polygon fill="url(#SVGID_1__)" points="2.846,15.859 15.025,28.575 27.398,15.845 20.732,15.843 20.727,1.292 9.375,1.291 9.375,15.859 "/>
<line fill="none" x1="20.727" x2="9.375" y1="1.297" y2="1.296"/>
@@ -53,10 +55,10 @@
<polygon fill="#E7FFB9" points="20.555,15.867 27.527,15.867 27,16.458 20.555,16.458 "/>
<polygon fill="#E7FFB9" points="2.459,15.859 9.365,15.859 9.365,16.451 3.08,16.451 "/>
<linearGradient gradientTransform="matrix(1 1.000000e-004 1.000000e-004 -1 2191.3389 2985.8491)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-2165.6621" x2="-2187.9482" y1="2963.2173" y2="2963.2173">
-<stop offset="0" style="stop-color:#AAE535"/>
-<stop offset="1" style="stop-color:#5D9C0A"/>
+ <stop offset="0" style="stop-color:#AAE535"/>
+ <stop offset="1" style="stop-color:#5D9C0A"/>
</linearGradient>
<polygon fill="url(#SVGID_2__)" points="27.016,15.844 15.025,28.15 3.172,15.829 2.348,15.83 15.025,29 27.842,15.844 "/>
<rect fill="none" height="30" width="30" x="0.096"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_reset.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_reset.svg Fri May 14 16:09:54 2010 +0300
@@ -1,105 +1,207 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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_)"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ring_tone.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_ring_tone.svg Fri May 14 16:09:54 2010 +0300
@@ -1,143 +1,143 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2.001" y2="57.8555">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+ <stop offset="0.0667" style="stop-color:#D1D7D9"/>
+ <stop offset="0.2606" style="stop-color:#BDC2C4"/>
+ <stop offset="0.6606" style="stop-color:#949DA1"/>
+ <stop offset="0.9636" style="stop-color:#ADB3B5"/>
+ <stop offset="1" style="stop-color:#595C5E"/>
</linearGradient>
<path d="M48.027,54.932c0,1.693-1.375,3.069-3.068,3.069h-29.92c-1.693,0-3.066-1.376-3.066-3.069V5.07 c0-1.696,1.373-3.069,3.066-3.069h29.92c1.693,0,3.068,1.373,3.068,3.069V54.932z" fill="url(#SVGID_1_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="2.001" y2="56.899">
-<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"/>
+ <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="M44.959,2.001h-29.92c-1.693,0-3.066,1.373-3.066,3.069v49.861c0,0.82,0.324,1.56,0.848,2.11 c-0.047-0.187-0.08-0.377-0.08-0.575v-1.535V6.602V5.07c0-1.271,1.031-2.304,2.299-2.304h29.92c1.268,0,2.301,1.033,2.301,2.304 v1.531v48.33v1.535c0,0.198-0.033,0.389-0.08,0.575c0.521-0.551,0.848-1.29,0.848-2.11V5.07C48.027,3.374,46.652,2.001,44.959,2.001 z" fill="url(#SVGID_2_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="5.8916" y2="43.4283">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+ <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="37.589" stroke-opacity="0.6" width="31.453" x="14.273" y="5.836"/>
+<rect fill="url(#SVGID_3_)" height="37.589" opacity="0.6" width="31.453" x="14.273" y="5.836"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="29.999" x2="29.999" y1="6.6548" y2="42.6624">
-<stop offset="0" style="stop-color:#6E6E6E"/>
-<stop offset="1" style="stop-color:#333333"/>
+ <stop offset="0" style="stop-color:#6E6E6E"/>
+ <stop offset="1" style="stop-color:#333333"/>
</linearGradient>
<rect fill="url(#SVGID_4_)" height="36.058" width="29.92" x="15.039" y="6.602"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30" x2="30" y1="7.4214" y2="41.894">
-<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"/>
+ <stop offset="0" style="stop-color:#3BC8EB"/>
+ <stop offset="0.3879" style="stop-color:#2D9BD2"/>
+ <stop offset="0.8909" style="stop-color:#1347BA"/>
</linearGradient>
<rect fill="url(#SVGID_5_)" height="34.521" width="28.383" x="15.809" y="7.37"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="30" x2="30" y1="7.9712" y2="21.69">
-<stop offset="0" style="stop-color:#85EFFF"/>
-<stop offset="1" style="stop-color:#3BA1D9"/>
+ <stop offset="0" style="stop-color:#85EFFF"/>
+ <stop offset="1" style="stop-color:#3BA1D9"/>
</linearGradient>
<polygon fill="url(#SVGID_6_)" points="44.191,19.644 15.809,22.712 15.809,8.137 44.191,8.137 "/>
<rect fill="#9FE4FF" height="0.767" width="28.383" x="15.809" y="7.37"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="30.2236" x2="30.2236" y1="5.8726" y2="2.8032">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#D1D7D9"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#D1D7D9"/>
</linearGradient>
<path d="M26.832,5.836c-0.861,0-1.535-0.563-1.535-1.279v-0.51c0-0.718,0.674-1.28,1.535-1.28h6.785 c0.859,0,1.533,0.563,1.533,1.28v0.51c0,0.716-0.674,1.279-1.533,1.279H26.832z" fill="url(#SVGID_7_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="30.2236" x2="30.2236" y1="3.2158" y2="5.1992">
-<stop offset="0" style="stop-color:#6C7375"/>
-<stop offset="1" style="stop-color:#BDC2C4"/>
+ <stop offset="0" style="stop-color:#6C7375"/>
+ <stop offset="1" style="stop-color:#BDC2C4"/>
</linearGradient>
<path d="M34.383,4.557c0,0.283-0.342,0.514-0.766,0.514h-6.785c-0.424,0-0.768-0.23-0.768-0.514v-0.51 c0-0.283,0.344-0.512,0.768-0.512h6.785c0.424,0,0.766,0.229,0.766,0.512V4.557z" fill="url(#SVGID_8_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="29.8818" x2="29.8818" y1="44.2236" y2="55.628">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#FFFFFF"/>
+ <stop offset="0" style="stop-color:#B6BBBD"/>
+ <stop offset="1" style="stop-color:#FFFFFF"/>
</linearGradient>
-<path d="M27.109,55.7c-1.645,0-2.98-1.323-2.98-2.951v-5.606c0-1.627,1.336-2.951,2.98-2.951 h5.545c1.645,0,2.98,1.324,2.98,2.951v5.606c0,1.628-1.336,2.951-2.98,2.951H27.109z" fill="url(#SVGID_9_)" fill-opacity="0.6" stroke-opacity="0.6"/>
-<path d="M27.105,54.932c-1.219,0-2.211-0.979-2.211-2.183v-5.606c0-1.204,0.992-2.183,2.211-2.183 h5.553c1.219,0,2.209,0.979,2.209,2.183v5.606c0,1.204-0.99,2.183-2.209,2.183H27.105z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M27.109,55.7c-1.645,0-2.98-1.323-2.98-2.951v-5.606c0-1.627,1.336-2.951,2.98-2.951 h5.545c1.645,0,2.98,1.324,2.98,2.951v5.606c0,1.628-1.336,2.951-2.98,2.951H27.109z" fill="url(#SVGID_9_)" opacity="0.6"/>
+<path d="M27.105,54.932c-1.219,0-2.211-0.979-2.211-2.183v-5.606c0-1.204,0.992-2.183,2.211-2.183 h5.553c1.219,0,2.209,0.979,2.209,2.183v5.606c0,1.204-0.99,2.183-2.209,2.183H27.105z" fill="#020202" opacity="0.5"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="29.8818" x2="29.8818" y1="45.6865" y2="54.1806">
-<stop offset="0" style="stop-color:#A6A8AB"/>
-<stop offset="0.703" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#808184"/>
+ <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="M34.102,52.749c0,0.783-0.645,1.417-1.438,1.417h-5.566c-0.793,0-1.436-0.634-1.436-1.417v-5.606 c0-0.783,0.643-1.417,1.436-1.417h5.566c0.793,0,1.438,0.634,1.438,1.417V52.749z" fill="url(#SVGID_10_)"/>
-<path d="M28.73,52.632c-0.846,0-1.533-0.688-1.533-1.534v-2.303c0-0.847,0.688-1.534,1.533-1.534 h2.303c0.846,0,1.533,0.688,1.533,1.534v2.303c0,0.847-0.688,1.534-1.533,1.534H28.73z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M28.73,52.632c-0.846,0-1.533-0.688-1.533-1.534v-2.303c0-0.847,0.688-1.534,1.533-1.534 h2.303c0.846,0,1.533,0.688,1.533,1.534v2.303c0,0.847-0.688,1.534-1.533,1.534H28.73z" fill="#020202" opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="29.8809" x2="29.8809" y1="48.0103" y2="51.8696">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+ <stop offset="0.0667" style="stop-color:#D1D7D9"/>
+ <stop offset="0.2606" style="stop-color:#BDC2C4"/>
+ <stop offset="0.6606" style="stop-color:#949DA1"/>
+ <stop offset="0.9636" style="stop-color:#ADB3B5"/>
+ <stop offset="1" style="stop-color:#595C5E"/>
</linearGradient>
<path d="M28.73,51.863c-0.422,0-0.768-0.345-0.768-0.766v-2.303c0-0.422,0.346-0.767,0.768-0.767h2.303 c0.42,0,0.766,0.345,0.766,0.767v2.303c0,0.421-0.346,0.766-0.766,0.766H28.73z" fill="url(#SVGID_11_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="17.667" x2="17.667" y1="44.917" y2="54.1816">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+ <stop offset="0" style="stop-color:#B6BBBD"/>
+ <stop offset="1" style="stop-color:#F0FBFF"/>
</linearGradient>
-<path d="M17.223,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307 c0-1.624,1.324-2.948,2.949-2.948h0.887c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H17.223z" fill="url(#SVGID_12_)" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M17.223,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307 c0-1.624,1.324-2.948,2.949-2.948h0.887c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H17.223z" fill="url(#SVGID_12_)" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="17.665" x2="17.665" y1="45.6899" y2="53.4106">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+ <stop offset="0" style="stop-color:#231F20"/>
+ <stop offset="1" style="stop-color:#6D6E70"/>
</linearGradient>
-<path d="M17.223,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307 c0-1.201,0.98-2.183,2.184-2.183h0.887c1.205,0,2.182,0.981,2.182,2.183v3.307c0,1.204-0.977,2.183-2.182,2.183H17.223z" fill="url(#SVGID_13_)" fill-opacity="0.7" stroke-opacity="0.7"/>
+<path d="M17.223,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307 c0-1.201,0.98-2.183,2.184-2.183h0.887c1.205,0,2.182,0.981,2.182,2.183v3.307c0,1.204-0.977,2.183-2.182,2.183H17.223z" fill="url(#SVGID_13_)" opacity="0.7"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="17.667" x2="17.667" y1="46.4658" y2="52.6426">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+ <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="M19.525,51.215c0,0.783-0.635,1.417-1.416,1.417h-0.887c-0.779,0-1.414-0.634-1.414-1.417v-3.307 c0-0.78,0.635-1.414,1.414-1.414h0.887c0.781,0,1.416,0.634,1.416,1.414V51.215z" fill="url(#SVGID_14_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="41.6719" x2="41.6719" y1="44.917" y2="54.1816">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+ <stop offset="0" style="stop-color:#B6BBBD"/>
+ <stop offset="1" style="stop-color:#F0FBFF"/>
</linearGradient>
-<path d="M41.229,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307 c0-1.624,1.324-2.948,2.949-2.948h0.885c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H41.229z" fill="url(#SVGID_15_)" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M41.229,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307 c0-1.624,1.324-2.948,2.949-2.948h0.885c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H41.229z" fill="url(#SVGID_15_)" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="41.6709" x2="41.6709" y1="45.6899" y2="53.4106">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+ <stop offset="0" style="stop-color:#231F20"/>
+ <stop offset="1" style="stop-color:#6D6E70"/>
</linearGradient>
-<path d="M41.229,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307 c0-1.201,0.98-2.183,2.184-2.183h0.885c1.205,0,2.184,0.981,2.184,2.183v3.307c0,1.204-0.979,2.183-2.184,2.183H41.229z" fill="url(#SVGID_16_)" fill-opacity="0.7" stroke-opacity="0.7"/>
+<path d="M41.229,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307 c0-1.201,0.98-2.183,2.184-2.183h0.885c1.205,0,2.184,0.981,2.184,2.183v3.307c0,1.204-0.979,2.183-2.184,2.183H41.229z" fill="url(#SVGID_16_)" opacity="0.7"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="41.6719" x2="41.6719" y1="46.4658" y2="52.6426">
-<stop offset="0" style="stop-color:#FFC142"/>
-<stop offset="0.7455" style="stop-color:#CF4E18"/>
-<stop offset="1" style="stop-color:#B52100"/>
+ <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="M43.531,51.215c0,0.783-0.637,1.417-1.418,1.417h-0.885c-0.781,0-1.416-0.634-1.416-1.417v-3.307 c0-0.78,0.635-1.414,1.416-1.414h0.885c0.781,0,1.418,0.634,1.418,1.414V51.215z" fill="url(#SVGID_17_)"/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<polygon fill="none" points="24.728,0 23.608,0.487 0,0.487 0,30.487 30,30.487 30,0.487 24.928,0.487 "/>
-<path d="M7.991,30.324c-3.295,0-5.976-1.69-6.668-4.205c-0.366-1.331-0.159-2.734,0.6-4.06 c1.063-1.86,3.062-3.301,5.478-3.952c0.873-0.235,1.762-0.355,2.639-0.355c0.927,0,1.816,0.133,2.635,0.389V5.247L24.728,0 l1.526,3.717l0.018-0.007l0.389,0.963l0.609,1.563l-10.565,4.318c0.008,2.6,0.003,5.635-0.001,8.204 c-0.003,2.014-0.006,3.74-0.002,4.745c0.016,2.839-2.473,5.497-6.049,6.463C9.771,30.203,8.875,30.324,7.991,30.324L7.991,30.324z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M7.991,30.324c-3.295,0-5.976-1.69-6.668-4.205c-0.366-1.331-0.159-2.734,0.6-4.06 c1.063-1.86,3.062-3.301,5.478-3.952c0.873-0.235,1.762-0.355,2.639-0.355c0.927,0,1.816,0.133,2.635,0.389V5.247L24.728,0 l1.526,3.717l0.018-0.007l0.389,0.963l0.609,1.563l-10.565,4.318c0.008,2.6,0.003,5.635-0.001,8.204 c-0.003,2.014-0.006,3.74-0.002,4.745c0.016,2.839-2.473,5.497-6.049,6.463C9.771,30.203,8.875,30.324,7.991,30.324L7.991,30.324z" opacity="0.35"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 2908.0361)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-2179.9351" x2="-2179.9351" y1="2902.811" y2="2880.1646">
-<stop offset="0" style="stop-color:#8CFF24"/>
-<stop offset="1" style="stop-color:#15570B"/>
+ <stop offset="0" style="stop-color:#8CFF24"/>
+ <stop offset="1" style="stop-color:#15570B"/>
</linearGradient>
<path d="M25.98,5.682l-1.79-4.357L13.902,5.902l0.016,13.899c-1.574-1.029-3.896-1.366-6.257-0.729 c-3.722,1.003-6.127,4.041-5.374,6.78c0.756,2.742,4.383,4.15,8.104,3.146c3.146-0.849,5.324-3.094,5.311-5.493 c-0.01-2.399,0.02-8.913,0-13.625L25.98,5.682z" fill="url(#SVGID_1__)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 0.5 614.8193 -1693.241)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-1201.8184" x2="-1201.8184" y1="3393.1226" y2="3404.4397">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</linearGradient>
<polygon fill="url(#SVGID_2__)" points="13.918,17.409 13.907,5.902 13.902,5.902 13.916,17.408 "/>
<linearGradient gradientTransform="matrix(0.5 0 0 0.5 614.8193 -1693.241)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="-1187.957" x2="-1187.957" y1="3393.1177" y2="3404.4392">
-<stop offset="0" style="stop-color:#9EFF47"/>
-<stop offset="1" style="stop-color:#11470A"/>
+ <stop offset="0" style="stop-color:#9EFF47"/>
+ <stop offset="1" style="stop-color:#11470A"/>
</linearGradient>
<path d="M15.701,9.169c0.005,0.759,0.006-0.117,0.008,0.711L25.98,5.682l-0.252-0.646L15.701,9.169z" fill="url(#SVGID_3__)"/>
<linearGradient gradientTransform="matrix(0.5 -0.0026 0.0026 0.5 604.1579 -1699.019)" gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="-1188.0039" x2="-1188.0039" y1="3402.1909" y2="3430.4734">
-<stop offset="0" style="stop-color:#B3FF6E"/>
-<stop offset="1" style="stop-color:#11470A"/>
+ <stop offset="0" style="stop-color:#B3FF6E"/>
+ <stop offset="1" style="stop-color:#11470A"/>
</linearGradient>
<polygon fill="url(#SVGID_4__)" points="14.072,20.2 14.072,6.3 24.389,1.807 24.19,1.324 13.674,5.902 13.674,19.803 "/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 2908.0361)" gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="-2185.0737" x2="-2185.0737" y1="2887.9233" y2="2879.6807">
-<stop offset="0" style="stop-color:#B2F56E"/>
-<stop offset="0.4667" style="stop-color:#40AD00"/>
-<stop offset="1" style="stop-color:#074D00"/>
+ <stop offset="0" style="stop-color:#B2F56E"/>
+ <stop offset="0.4667" style="stop-color:#40AD00"/>
+ <stop offset="1" style="stop-color:#074D00"/>
</linearGradient>
<path d="M7.96,28.527c-2.474,0.012-4.447-1.129-4.909-2.839c-0.28-1.039,0.018-2.187,0.84-3.229 c0.9-1.141,2.291-2.007,3.923-2.436c0.688-0.184,1.385-0.277,2.075-0.281c2.474-0.013,4.445,1.129,4.91,2.84 c0.615,2.267-1.522,4.807-4.764,5.664C9.347,28.43,8.647,28.522,7.96,28.527L7.96,28.527z" fill="url(#SVGID_5__)"/>
<rect fill="none" height="30" width="30" y="0.487"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sat.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sat.svg Fri May 14 16:09:54 2010 +0300
@@ -1,112 +1,116 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.8182" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#7B7E80"/>
+ <stop offset="0" style="stop-color:#A0A3A6"/>
+ <stop offset="0.8182" style="stop-color:#474B4D"/>
+ <stop offset="1" style="stop-color:#7B7E80"/>
</linearGradient>
<path d="M8.957,57.999c-1.365,0-2.473-1.108-2.473-2.473V4.472c0-1.364,1.107-2.473,2.473-2.473h30.801 c1.115,0,2.607,0.619,3.396,1.406l8.951,8.95c0.789,0.79,1.408,2.281,1.408,3.396v39.774c0,1.364-1.111,2.473-2.473,2.473H8.957z" fill="url(#SVGID_1_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="29.999" x2="29.999" y1="3.2646" y2="56.7327">
-<stop offset="0" style="stop-color:#F5F5F5"/>
-<stop offset="0.7818" style="stop-color:#CCCCCC"/>
-<stop offset="1" style="stop-color:#D1D1D1"/>
+ <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="M51.041,56.674H8.957c-0.633,0-1.146-0.513-1.146-1.147V4.469c0-0.629,0.514-1.145,1.146-1.145 h30.801c0.766,0,1.912,0.477,2.459,1.021l8.953,8.948c0.543,0.546,1.018,1.693,1.018,2.459v39.774 C52.188,56.161,51.676,56.674,51.041,56.674L51.041,56.674z" fill="url(#SVGID_2_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="4.6533" y2="55.3477">
-<stop offset="0" style="stop-color:#E6E9E8"/>
-<stop offset="1" style="stop-color:#ADB2B5"/>
+ <stop offset="0" style="stop-color:#E6E9E8"/>
+ <stop offset="1" style="stop-color:#ADB2B5"/>
</linearGradient>
<path d="M50.863,55.348H9.137V4.653h30.621c0.412,0,1.227,0.336,1.521,0.629l8.957,8.95 c0.289,0.293,0.627,1.105,0.627,1.52V55.348L50.863,55.348z" fill="url(#SVGID_3_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="27.3711" x2="27.3711" y1="51.1084" y2="24.5269">
-<stop offset="0" style="stop-color:#666666"/>
-<stop offset="1" style="stop-color:#282828"/>
+ <stop offset="0" style="stop-color:#666666"/>
+ <stop offset="1" style="stop-color:#282828"/>
</linearGradient>
<rect fill="url(#SVGID_4_)" height="26.784" width="31.227" x="11.758" y="24.426"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1.326" stroke-opacity="0.4" width="31.227" x="11.758" y="51.21"/>
+<rect fill="#FFFFFF" height="1.326" opacity="0.4" width="31.227" x="11.758" y="51.21"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="16.2236" x2="16.2236" y1="25.7173" y2="49.2631">
-<stop offset="0" style="stop-color:#FFF173"/>
-<stop offset="0.33" style="stop-color:#F1BC35"/>
-<stop offset="0.66" style="stop-color:#E5B029"/>
-<stop offset="1" style="stop-color:#FFA102"/>
+ <stop offset="0" style="stop-color:#FFF173"/>
+ <stop offset="0.33" style="stop-color:#F1BC35"/>
+ <stop offset="0.66" style="stop-color:#E5B029"/>
+ <stop offset="1" style="stop-color:#FFA102"/>
</linearGradient>
<rect fill="url(#SVGID_5_)" height="7.305" width="5.682" x="13.383" y="42.197"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="30.1895" x2="30.1895" y1="25.9839" y2="48.9336">
-<stop offset="0" style="stop-color:#FFF173"/>
-<stop offset="0.33" style="stop-color:#F1BC35"/>
-<stop offset="0.66" style="stop-color:#E5B029"/>
-<stop offset="1" style="stop-color:#FFA102"/>
+ <stop offset="0" style="stop-color:#FFF173"/>
+ <stop offset="0.33" style="stop-color:#F1BC35"/>
+ <stop offset="0.66" style="stop-color:#E5B029"/>
+ <stop offset="1" style="stop-color:#FFA102"/>
</linearGradient>
<rect fill="url(#SVGID_6_)" height="7.304" width="5.254" x="27.563" y="25.967"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="23.3125" x2="23.3125" y1="25.9839" y2="48.9336">
-<stop offset="0" style="stop-color:#FFF173"/>
-<stop offset="0.33" style="stop-color:#F1BC35"/>
-<stop offset="0.66" style="stop-color:#E5B029"/>
-<stop offset="1" style="stop-color:#FFA102"/>
+ <stop offset="0" style="stop-color:#FFF173"/>
+ <stop offset="0.33" style="stop-color:#F1BC35"/>
+ <stop offset="0.66" style="stop-color:#E5B029"/>
+ <stop offset="1" style="stop-color:#FFA102"/>
</linearGradient>
<rect fill="url(#SVGID_7_)" height="7.304" width="5.254" x="20.686" y="25.967"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="37.8779" x2="37.8779" y1="25.9839" y2="48.9336">
-<stop offset="0" style="stop-color:#FFF173"/>
-<stop offset="0.33" style="stop-color:#F1BC35"/>
-<stop offset="0.66" style="stop-color:#E5B029"/>
-<stop offset="1" style="stop-color:#FFA102"/>
+ <stop offset="0" style="stop-color:#FFF173"/>
+ <stop offset="0.33" style="stop-color:#F1BC35"/>
+ <stop offset="0.66" style="stop-color:#E5B029"/>
+ <stop offset="1" style="stop-color:#FFA102"/>
</linearGradient>
<rect fill="url(#SVGID_8_)" height="7.304" width="6.877" x="34.439" y="25.967"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="30.1895" x2="30.1895" y1="25.7173" y2="49.2631">
-<stop offset="0" style="stop-color:#FFF173"/>
-<stop offset="0.33" style="stop-color:#F1BC35"/>
-<stop offset="0.66" style="stop-color:#E5B029"/>
-<stop offset="1" style="stop-color:#FFA102"/>
+ <stop offset="0" style="stop-color:#FFF173"/>
+ <stop offset="0.33" style="stop-color:#F1BC35"/>
+ <stop offset="0.66" style="stop-color:#E5B029"/>
+ <stop offset="1" style="stop-color:#FFA102"/>
</linearGradient>
<rect fill="url(#SVGID_9_)" height="7.305" width="5.254" x="27.563" y="42.197"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="23.3125" x2="23.3125" y1="25.7173" y2="49.2631">
-<stop offset="0" style="stop-color:#FFF173"/>
-<stop offset="0.33" style="stop-color:#F1BC35"/>
-<stop offset="0.66" style="stop-color:#E5B029"/>
-<stop offset="1" style="stop-color:#FFA102"/>
+ <stop offset="0" style="stop-color:#FFF173"/>
+ <stop offset="0.33" style="stop-color:#F1BC35"/>
+ <stop offset="0.66" style="stop-color:#E5B029"/>
+ <stop offset="1" style="stop-color:#FFA102"/>
</linearGradient>
<rect fill="url(#SVGID_10_)" height="7.305" width="5.254" x="20.686" y="42.197"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="27.3496" x2="27.3496" y1="25.9839" y2="48.8929">
-<stop offset="0" style="stop-color:#FFF173"/>
-<stop offset="0.33" style="stop-color:#F1BC35"/>
-<stop offset="0.66" style="stop-color:#E5B029"/>
-<stop offset="1" style="stop-color:#FFA102"/>
+ <stop offset="0" style="stop-color:#FFF173"/>
+ <stop offset="0.33" style="stop-color:#F1BC35"/>
+ <stop offset="0.66" style="stop-color:#E5B029"/>
+ <stop offset="1" style="stop-color:#FFA102"/>
</linearGradient>
<polygon fill="url(#SVGID_11_)" points="18.975,34.894 18.975,25.967 13.383,25.967 13.383,40.574 41.316,40.574 41.316,34.894 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="37.8779" x2="37.8779" y1="25.7173" y2="49.2631">
-<stop offset="0" style="stop-color:#FFF173"/>
-<stop offset="0.33" style="stop-color:#F1BC35"/>
-<stop offset="0.66" style="stop-color:#E5B029"/>
-<stop offset="1" style="stop-color:#FFA102"/>
+ <stop offset="0" style="stop-color:#FFF173"/>
+ <stop offset="0.33" style="stop-color:#F1BC35"/>
+ <stop offset="0.66" style="stop-color:#E5B029"/>
+ <stop offset="1" style="stop-color:#FFA102"/>
</linearGradient>
<rect fill="url(#SVGID_12_)" height="7.305" width="6.877" x="34.439" y="42.197"/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
<rect fill="none" height="30" width="30"/>
-<path d="M15,30C6.729,30,0,23.271,0,15C0,6.729,6.729,0,15,0s15,6.729,15,15C30,23.271,23.271,30,15,30L15,30z" fill-opacity="0.35" stroke-opacity="0.35"/>
-<path d="M15.159,10.697c0.525,0,0.947-0.13,1.264-0.39 c0.316-0.259,0.474-0.615,0.474-1.07c0-0.44-0.164-0.795-0.49-1.061c-0.326-0.264-0.741-0.398-1.248-0.398 c-0.531,0-0.951,0.132-1.261,0.395c-0.311,0.262-0.465,0.617-0.465,1.064c0,0.455,0.159,0.812,0.474,1.07 C14.224,10.567,14.641,10.697,15.159,10.697z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M15.159,10.369c0.525,0,0.947-0.129,1.264-0.389 c0.316-0.26,0.474-0.615,0.474-1.07c0-0.441-0.164-0.795-0.49-1.061c-0.326-0.266-0.741-0.398-1.248-0.398 c-0.531,0-0.951,0.13-1.261,0.394c-0.311,0.263-0.465,0.616-0.465,1.064c0,0.455,0.159,0.812,0.474,1.07 C14.224,10.24,14.641,10.369,15.159,10.369z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M15,30C6.729,30,0,23.271,0,15C0,6.729,6.729,0,15,0s15,6.729,15,15C30,23.271,23.271,30,15,30L15,30z" opacity="0.35"/>
+<path d="M15.159,10.697c0.525,0,0.947-0.13,1.264-0.39 c0.316-0.259,0.474-0.615,0.474-1.07c0-0.44-0.164-0.795-0.49-1.061c-0.326-0.264-0.741-0.398-1.248-0.398 c-0.531,0-0.951,0.132-1.261,0.395c-0.311,0.262-0.465,0.617-0.465,1.064c0,0.455,0.159,0.812,0.474,1.07 C14.224,10.567,14.641,10.697,15.159,10.697z" enable-background="new " opacity="0.1"/>
+<path d="M15.159,10.369c0.525,0,0.947-0.129,1.264-0.389 c0.316-0.26,0.474-0.615,0.474-1.07c0-0.441-0.164-0.795-0.49-1.061c-0.326-0.266-0.741-0.398-1.248-0.398 c-0.531,0-0.951,0.13-1.261,0.394c-0.311,0.263-0.465,0.616-0.465,1.064c0,0.455,0.159,0.812,0.474,1.07 C14.224,10.24,14.641,10.369,15.159,10.369z" enable-background="new " opacity="0.2"/>
<radialGradient cx="-2178.8628" cy="3345.4287" gradientTransform="matrix(1 0 0 -1 2194 3347.6641)" gradientUnits="userSpaceOnUse" id="SVGID_1__" r="26.49">
-<stop offset="0" style="stop-color:#AFED23"/>
-<stop offset="0.8121" style="stop-color:#358C0C"/>
-<stop offset="1" style="stop-color:#67AD1A"/>
+ <stop offset="0" style="stop-color:#AFED23"/>
+ <stop offset="0.8121" style="stop-color:#358C0C"/>
+ <stop offset="1" style="stop-color:#67AD1A"/>
</radialGradient>
<path d="M15,29C7.28,29,1,22.72,1,15S7.28,1,15,1c7.721,0,14,6.28,14,14S22.72,29,15,29L15,29z" fill="url(#SVGID_1__)"/>
-<polygon fill-opacity="0.1" points="12.46,13.847 13.555,13.847 13.555,23.318 16.741,23.318 16.741,12.032 12.46,12.032 " stroke-opacity="0.1"/>
-<polygon fill-opacity="0.2" points="12.46,13.519 13.555,13.519 13.555,22.99 16.741,22.99 16.741,11.704 12.46,11.704 " stroke-opacity="0.2"/>
+<polygon enable-background="new " opacity="0.1" points="12.46,13.847 13.555,13.847 13.555,23.318 16.741,23.318 16.741,12.032 12.46,12.032 "/>
+<polygon enable-background="new " opacity="0.2" points="12.46,13.519 13.555,13.519 13.555,22.99 16.741,22.99 16.741,11.704 12.46,11.704 "/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3347.6641)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-2179.3994" x2="-2179.3994" y1="3340.2148" y2="3324.8184">
-<stop offset="0" style="stop-color:#F6FDFF"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+ <stop offset="0" style="stop-color:#F6FDFF"/>
+ <stop offset="1" style="stop-color:#ADB3B5"/>
</linearGradient>
<polygon fill="url(#SVGID_2__)" points="12.46,13.191 13.555,13.191 13.555,22.663 16.741,22.663 16.741,11.377 12.46,11.377 "/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3347.6641)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="-2178.8477" x2="-2178.8477" y1="3340.2158" y2="3324.8235">
-<stop offset="0" style="stop-color:#F6FDFF"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+ <stop offset="0" style="stop-color:#F6FDFF"/>
+ <stop offset="1" style="stop-color:#ADB3B5"/>
</linearGradient>
<path d="M15.148,10.205c0.524,0,0.945-0.129,1.262-0.389c0.316-0.259,0.475-0.615,0.475-1.07 c0-0.441-0.163-0.795-0.489-1.061c-0.327-0.264-0.743-0.397-1.248-0.397c-0.531,0-0.952,0.131-1.262,0.394 c-0.312,0.262-0.466,0.617-0.466,1.064c0,0.455,0.159,0.812,0.477,1.07C14.212,10.076,14.63,10.205,15.148,10.205z" fill="url(#SVGID_3__)"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sat_text.svg Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,118 +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="29.999" x2="29.999" y1="1.999" y2="57.9139">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.8182" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#7B7E80"/>
-</linearGradient>
-<path d="M8.957,57.999c-1.365,0-2.473-1.108-2.473-2.473V4.472c0-1.364,1.107-2.473,2.473-2.473h30.801 c1.115,0,2.607,0.619,3.396,1.406l8.951,8.95c0.789,0.79,1.408,2.281,1.408,3.396v39.774c0,1.364-1.111,2.473-2.473,2.473H8.957z" fill="url(#SVGID_1_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="29.999" x2="29.999" y1="3.2646" y2="56.7327">
-<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="M51.041,56.674H8.957c-0.633,0-1.146-0.513-1.146-1.147V4.469c0-0.629,0.514-1.145,1.146-1.145 h30.801c0.766,0,1.912,0.477,2.459,1.021l8.953,8.948c0.543,0.546,1.018,1.693,1.018,2.459v39.774 C52.188,56.161,51.676,56.674,51.041,56.674L51.041,56.674z" fill="url(#SVGID_2_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="4.6533" y2="55.3477">
-<stop offset="0" style="stop-color:#E6E9E8"/>
-<stop offset="1" style="stop-color:#ADB2B5"/>
-</linearGradient>
-<path d="M50.863,55.348H9.137V4.653h30.621c0.412,0,1.227,0.336,1.521,0.629l8.957,8.95 c0.289,0.293,0.627,1.105,0.627,1.52V55.348L50.863,55.348z" fill="url(#SVGID_3_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="27.3711" x2="27.3711" y1="51.1084" y2="24.5269">
-<stop offset="0" style="stop-color:#666666"/>
-<stop offset="1" style="stop-color:#282828"/>
-</linearGradient>
-<rect fill="url(#SVGID_4_)" height="26.784" width="31.227" x="11.758" y="24.426"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1.326" stroke-opacity="0.4" width="31.227" x="11.758" y="51.21"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="16.2236" x2="16.2236" y1="25.7173" y2="49.2631">
-<stop offset="0" style="stop-color:#FFF173"/>
-<stop offset="0.33" style="stop-color:#F1BC35"/>
-<stop offset="0.66" style="stop-color:#E5B029"/>
-<stop offset="1" style="stop-color:#FFA102"/>
-</linearGradient>
-<rect fill="url(#SVGID_5_)" height="7.305" width="5.682" x="13.383" y="42.197"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="30.1895" x2="30.1895" y1="25.9839" y2="48.9336">
-<stop offset="0" style="stop-color:#FFF173"/>
-<stop offset="0.33" style="stop-color:#F1BC35"/>
-<stop offset="0.66" style="stop-color:#E5B029"/>
-<stop offset="1" style="stop-color:#FFA102"/>
-</linearGradient>
-<rect fill="url(#SVGID_6_)" height="7.304" width="5.254" x="27.563" y="25.967"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="23.3125" x2="23.3125" y1="25.9839" y2="48.9336">
-<stop offset="0" style="stop-color:#FFF173"/>
-<stop offset="0.33" style="stop-color:#F1BC35"/>
-<stop offset="0.66" style="stop-color:#E5B029"/>
-<stop offset="1" style="stop-color:#FFA102"/>
-</linearGradient>
-<rect fill="url(#SVGID_7_)" height="7.304" width="5.254" x="20.686" y="25.967"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="37.8779" x2="37.8779" y1="25.9839" y2="48.9336">
-<stop offset="0" style="stop-color:#FFF173"/>
-<stop offset="0.33" style="stop-color:#F1BC35"/>
-<stop offset="0.66" style="stop-color:#E5B029"/>
-<stop offset="1" style="stop-color:#FFA102"/>
-</linearGradient>
-<rect fill="url(#SVGID_8_)" height="7.304" width="6.877" x="34.439" y="25.967"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="30.1895" x2="30.1895" y1="25.7173" y2="49.2631">
-<stop offset="0" style="stop-color:#FFF173"/>
-<stop offset="0.33" style="stop-color:#F1BC35"/>
-<stop offset="0.66" style="stop-color:#E5B029"/>
-<stop offset="1" style="stop-color:#FFA102"/>
-</linearGradient>
-<rect fill="url(#SVGID_9_)" height="7.305" width="5.254" x="27.563" y="42.197"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="23.3125" x2="23.3125" y1="25.7173" y2="49.2631">
-<stop offset="0" style="stop-color:#FFF173"/>
-<stop offset="0.33" style="stop-color:#F1BC35"/>
-<stop offset="0.66" style="stop-color:#E5B029"/>
-<stop offset="1" style="stop-color:#FFA102"/>
-</linearGradient>
-<rect fill="url(#SVGID_10_)" height="7.305" width="5.254" x="20.686" y="42.197"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="27.3496" x2="27.3496" y1="25.9839" y2="48.8929">
-<stop offset="0" style="stop-color:#FFF173"/>
-<stop offset="0.33" style="stop-color:#F1BC35"/>
-<stop offset="0.66" style="stop-color:#E5B029"/>
-<stop offset="1" style="stop-color:#FFA102"/>
-</linearGradient>
-<polygon fill="url(#SVGID_11_)" points="18.975,34.894 18.975,25.967 13.383,25.967 13.383,40.574 41.316,40.574 41.316,34.894 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="37.8779" x2="37.8779" y1="25.7173" y2="49.2631">
-<stop offset="0" style="stop-color:#FFF173"/>
-<stop offset="0.33" style="stop-color:#F1BC35"/>
-<stop offset="0.66" style="stop-color:#E5B029"/>
-<stop offset="1" style="stop-color:#FFA102"/>
-</linearGradient>
-<rect fill="url(#SVGID_12_)" height="7.305" width="6.877" x="34.439" y="42.197"/>
-<rect fill="none" height="60" width="60"/>
-</g>
-<g transform="matrix(0.5 0 0 0.5 30 30)">
-<rect fill="none" height="60" width="60"/>
-<rect fill="none" height="60" width="60"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="30" x2="30" y1="2.2666" y2="58.2666">
-<stop offset="0" style="stop-color:#E5FFB2"/>
-<stop offset="0.3879" style="stop-color:#6AAB18"/>
-<stop offset="0.6788" style="stop-color:#247307"/>
-<stop offset="1" style="stop-color:#C2FF4A"/>
-</linearGradient>
-<circle cx="30" cy="30" fill="url(#SVGID_1__)" r="28"/>
-<radialGradient cx="30.2666" cy="5.2007" gradientUnits="userSpaceOnUse" id="SVGID_2__" r="51.4669">
-<stop offset="0" style="stop-color:#AFED23"/>
-<stop offset="0.8121" style="stop-color:#358C0C"/>
-<stop offset="1" style="stop-color:#67AD1A"/>
-</radialGradient>
-<path d="M30,57.2C15.002,57.2,2.801,44.999,2.801,30S15.002,2.8,30,2.8c14.999,0,27.2,12.201,27.2,27.2 S44.999,57.2,30,57.2L30,57.2z" fill="url(#SVGID_2__)"/>
-<polygon fill-opacity="0.1" points="23.799,27.181 26.471,27.181 26.471,50.313 34.252,50.313 34.252,22.751 23.799,22.751 " stroke-opacity="0.1"/>
-<path d="M30.39,19.892c1.281,0,2.31-0.316,3.083-0.949c0.773-0.632,1.159-1.504,1.159-2.612 c0-1.08-0.399-1.942-1.196-2.591s-1.813-0.973-3.046-0.973c-1.297,0-2.323,0.319-3.081,0.96c-0.76,0.642-1.138,1.509-1.138,2.604 c0,1.108,0.388,1.98,1.161,2.612C28.105,19.575,29.124,19.892,30.39,19.892z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<polygon fill-opacity="0.2" points="23.799,26.38 26.471,26.38 26.471,49.513 34.252,49.513 34.252,21.95 23.799,21.95 " stroke-opacity="0.2"/>
-<path d="M30.39,19.091c1.281,0,2.31-0.316,3.083-0.949s1.159-1.503,1.159-2.613c0-1.077-0.399-1.94-1.196-2.589 s-1.813-0.974-3.046-0.974c-1.297,0-2.323,0.321-3.081,0.962c-0.76,0.641-1.138,1.507-1.138,2.601c0,1.11,0.388,1.98,1.161,2.613 S29.124,19.091,30.39,19.091z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="29.0254" x2="29.0254" y1="11.5566" y2="49.1577">
-<stop offset="0" style="stop-color:#F6FDFF"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
-</linearGradient>
-<polygon fill="url(#SVGID_3__)" points="23.799,25.581 26.471,25.581 26.471,48.713 34.252,48.713 34.252,21.15 23.799,21.15 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="30.373" x2="30.373" y1="11.5576" y2="49.1534">
-<stop offset="0" style="stop-color:#F6FDFF"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
-</linearGradient>
-<path d="M30.361,18.291c1.281,0,2.309-0.315,3.083-0.948c0.773-0.633,1.159-1.504,1.159-2.613 c0-1.079-0.398-1.941-1.195-2.59s-1.813-0.973-3.047-0.973c-1.297,0-2.323,0.32-3.082,0.961s-1.137,1.507-1.137,2.602 c0,1.109,0.388,1.98,1.161,2.613C28.076,17.976,29.096,18.291,30.361,18.291z" fill="url(#SVGID_4__)"/>
-</g>
-</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_search.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_search.svg Fri May 14 16:09:54 2010 +0300
@@ -1,60 +1,60 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<stop offset="0" style="stop-color:#292929"/>
-<stop offset="0.3455" style="stop-color:#8C8C8C"/>
-<stop offset="0.7" style="stop-color:#171717"/>
-<stop offset="1" style="stop-color:#646464"/>
+ <stop offset="0" style="stop-color:#292929"/>
+ <stop offset="0.3455" style="stop-color:#8C8C8C"/>
+ <stop offset="0.7" style="stop-color:#171717"/>
+ <stop offset="1" style="stop-color:#646464"/>
</linearGradient>
<polygon fill="url(#SVGID_1_)" points="17.729,47.067 12.72,42.057 20.639,34.138 25.649,39.148 "/>
<linearGradient gradientTransform="matrix(-1 0 0 1 4302.3848 0)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="4287.2246" x2="4294.4331" y1="52.2168" y2="45.0081">
-<stop offset="0" style="stop-color:#B3B3B3"/>
-<stop offset="0.3758" style="stop-color:#969696"/>
-<stop offset="0.7515" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#D5D5D5"/>
+ <stop offset="0" style="stop-color:#B3B3B3"/>
+ <stop offset="0.3758" style="stop-color:#969696"/>
+ <stop offset="0.7515" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#D5D5D5"/>
</linearGradient>
<path d="M2.565,50.126c-0.754,0.753-0.754,1.987,0,2.74l4.568,4.568c0.752,0.754,1.986,0.754,2.74,0 l10.505-10.505c0.753-0.754,0.753-1.986,0-2.74L15.81,39.62c-0.752-0.753-1.984-0.752-2.738,0L2.565,50.126z" fill="url(#SVGID_2_)"/>
<linearGradient gradientTransform="matrix(-0.7071 -0.7071 -0.5071 0.5071 5299.6968 1575.5687)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="4824.3057" x2="4813.9697" y1="3708.6299" y2="3708.6299">
-<stop offset="0" style="stop-color:#E0E4E6"/>
-<stop offset="0.3333" style="stop-color:#B0B6B8"/>
-<stop offset="0.3333" style="stop-color:#9FA6A8"/>
-<stop offset="0.6848" style="stop-color:#6A7173"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
+ <stop offset="0" style="stop-color:#E0E4E6"/>
+ <stop offset="0.3333" style="stop-color:#B0B6B8"/>
+ <stop offset="0.3333" style="stop-color:#9FA6A8"/>
+ <stop offset="0.6848" style="stop-color:#6A7173"/>
+ <stop offset="1" style="stop-color:#ADB3B5"/>
</linearGradient>
<polygon fill="url(#SVGID_3_)" points="10.976,56.332 3.668,49.023 11.857,40.833 19.165,48.143 "/>
-<path d="M36.649,25.261c-7.902,0-15.16-1.912-20.893-5.105C17.397,10.043,26.169,2.321,36.743,2.321 c10.541,0,19.287,7.673,20.97,17.737C51.954,23.309,44.632,25.261,36.649,25.261z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M36.649,25.261c-7.902,0-15.16-1.912-20.893-5.105C17.397,10.043,26.169,2.321,36.743,2.321 c10.541,0,19.287,7.673,20.97,17.737C51.954,23.309,44.632,25.261,36.649,25.261z" fill="#FFFFFF" opacity="0.2"/>
<linearGradient gradientTransform="matrix(-0.9773 0 0 0.9773 4277.1611 57.5776)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="4338.9121" x2="4338.9121" y1="-19.5293" y2="-50.7046">
-<stop offset="0" style="stop-color:#B2F56E"/>
-<stop offset="0.4667" style="stop-color:#40AD00"/>
-<stop offset="1" style="stop-color:#074D00"/>
+ <stop offset="0" style="stop-color:#B2F56E"/>
+ <stop offset="0.4667" style="stop-color:#40AD00"/>
+ <stop offset="1" style="stop-color:#074D00"/>
</linearGradient>
-<circle cx="36.742" cy="23.257" fill="url(#SVGID_4_)" fill-opacity="0.7" r="15.233" stroke-opacity="0.7"/>
+<circle cx="36.742" cy="23.257" fill="url(#SVGID_4_)" opacity="0.7" r="15.233"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="36.7432" x2="36.7432" y1="44.6318" y2="1.9579">
-<stop offset="0" style="stop-color:#BEC7CC"/>
-<stop offset="0.1939" style="stop-color:#9AA4A6"/>
-<stop offset="0.697" style="stop-color:#D4D9DB"/>
-<stop offset="0.897" style="stop-color:#ECF3F5"/>
-<stop offset="1" style="stop-color:#ECF3F5"/>
+ <stop offset="0" style="stop-color:#BEC7CC"/>
+ <stop offset="0.1939" style="stop-color:#9AA4A6"/>
+ <stop offset="0.697" style="stop-color:#D4D9DB"/>
+ <stop offset="0.897" style="stop-color:#ECF3F5"/>
</linearGradient>
<path d="M36.743,2c-11.738,0-21.258,9.518-21.258,21.257s9.52,21.257,21.258,21.257 s21.258-9.518,21.258-21.257S48.481,2,36.743,2z M36.743,39.287c-8.413,0-16.07-7.617-16.07-16.03C20.673,14.844,28.33,7,36.743,7 c8.414,0,16.216,7.844,16.216,16.257C52.959,31.67,45.157,39.287,36.743,39.287z" fill="url(#SVGID_5_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="36.7422" x2="36.7422" y1="2.2324" y2="42.8653">
-<stop offset="0" style="stop-color:#E5EBED"/>
-<stop offset="0.5818" style="stop-color:#C4CCCE"/>
-<stop offset="0.8545" style="stop-color:#8D9699"/>
-<stop offset="0.9758" style="stop-color:#CAD2D4"/>
-<stop offset="1" style="stop-color:#CAD2D4"/>
+ <stop offset="0" style="stop-color:#E5EBED"/>
+ <stop offset="0.5818" style="stop-color:#C4CCCE"/>
+ <stop offset="0.8545" style="stop-color:#8D9699"/>
+ <stop offset="0.9758" style="stop-color:#CAD2D4"/>
</linearGradient>
<path d="M36.743,3.063c-11.151,0-20.195,9.042-20.195,20.193c0,11.151,9.044,20.194,20.195,20.194 c11.152,0,20.193-9.043,20.193-20.194C56.937,12.105,47.896,3.063,36.743,3.063z M36.743,39.287c-8.413,0-16.07-7.617-16.07-16.03 C20.673,14.844,28.33,7,36.743,7c8.414,0,16.216,7.844,16.216,16.257C52.959,31.67,45.157,39.287,36.743,39.287z" fill="url(#SVGID_6_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="36.7422" x2="36.7422" y1="39.6108" y2="7.5044">
-<stop offset="0" style="stop-color:#E5EBED"/>
-<stop offset="1" style="stop-color:#515759"/>
+ <stop offset="0" style="stop-color:#E5EBED"/>
+ <stop offset="1" style="stop-color:#515759"/>
</linearGradient>
<path d="M36.743,6.96c-9.002,0-16.298,7.297-16.298,16.297s7.296,16.297,16.298,16.297 c9,0,16.296-7.297,16.296-16.297S45.743,6.96,36.743,6.96z M36.743,38.491c-8.413,0-15.234-6.821-15.234-15.234 c0-8.413,6.821-15.233,15.234-15.233c8.414,0,15.232,6.821,15.232,15.233C51.976,31.67,45.157,38.491,36.743,38.491z" fill="url(#SVGID_7_)"/>
-<path d="M36.653,24.873c-5.037,0-9.799-0.81-14.051-2.244c0.332-7.532,6.525-13.543,14.141-13.543 c7.594,0,13.775,5.979,14.135,13.484C46.583,24.04,41.76,24.873,36.653,24.873z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M36.642,10.138c7.035,0,12.868,5.031,14.165,11.688c-0.722-7.15-6.722-12.74-14.063-12.74 c-6.607,0-12.139,4.527-13.705,10.646C25.038,14.141,30.366,10.138,36.642,10.138z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M36.653,24.873c-5.037,0-9.799-0.81-14.051-2.244c0.332-7.532,6.525-13.543,14.141-13.543 c7.594,0,13.775,5.979,14.135,13.484C46.583,24.04,41.76,24.873,36.653,24.873z" fill="#FFFFFF" opacity="0.2"/>
+<path d="M36.642,10.138c7.035,0,12.868,5.031,14.165,11.688c-0.722-7.15-6.722-12.74-14.063-12.74 c-6.607,0-12.139,4.527-13.705,10.646C25.038,14.141,30.366,10.138,36.642,10.138z" fill="#FFFFFF" opacity="0.4"/>
<rect fill="none" height="60" width="60"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_security.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_security.svg Fri May 14 16:09:54 2010 +0300
@@ -1,44 +1,46 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
-<stop offset="0.5333" style="stop-color:#CCCCCC"/>
-<stop offset="1" style="stop-color:#8F8F8F"/>
+ <stop offset="0" style="stop-color:#8C8C8C"/>
+ <stop offset="0.5333" style="stop-color:#CCCCCC"/>
+ <stop offset="1" style="stop-color:#8F8F8F"/>
</linearGradient>
<path d="M30.236,2.865c-9.661,0-17.502,7.771-17.638,17.402v6.473h5.966v-6.473 C18.7,13.94,23.877,8.835,30.236,8.835c6.357,0,11.535,5.105,11.672,11.433v8.679h5.967v-8.679 C47.738,10.636,39.9,2.865,30.236,2.865z" fill="url(#SVGID_1_)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 39.9805)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-88.5723" x2="-55.9912" y1="23.5225" y2="23.5225">
-<stop offset="0" style="stop-color:#CCCCCC"/>
-<stop offset="0.5152" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#CCCCCC"/>
+ <stop offset="0" style="stop-color:#CCCCCC"/>
+ <stop offset="0.5152" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#CCCCCC"/>
</linearGradient>
<path d="M43.012,27.843v-7.575c-0.148-6.926-5.878-12.536-12.775-12.536c-6.896,0-12.625,5.61-12.774,12.515 v8.7h-3.76v-8.679c0.127-8.98,7.544-16.299,16.534-16.299c8.992,0,16.408,7.318,16.535,16.315v7.559H43.012z" fill="url(#SVGID_2_)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 39.9805)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-87.8945" x2="-56.6681" y1="23.5225" y2="23.5225">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.5" style="stop-color:#B3B3B3"/>
-<stop offset="1" style="stop-color:#FFFFFF"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="0.5" style="stop-color:#B3B3B3"/>
+ <stop offset="1" style="stop-color:#FFFFFF"/>
</linearGradient>
<path d="M14.389,28.259v-7.991c0.122-8.604,7.231-15.612,15.847-15.612c8.617,0,15.727,7.016,15.848,15.637 v6.862h-2.385v-6.888c-0.156-7.299-6.195-13.224-13.463-13.224c-7.267,0-13.306,5.915-13.462,13.188v8.027L14.389,28.259 L14.389,28.259z" fill="url(#SVGID_3_)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 39.9805)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-94.52" x2="-50.52" y1="-1.6851" y2="-1.6851">
-<stop offset="0" style="stop-color:#ED8C0D"/>
-<stop offset="0.24" style="stop-color:#FFE692"/>
-<stop offset="0.75" style="stop-color:#ED8C0D"/>
-<stop offset="0.8667" style="stop-color:#FFB81F"/>
-<stop offset="1" style="stop-color:#ED8C0D"/>
+ <stop offset="0" style="stop-color:#ED8C0D"/>
+ <stop offset="0.24" style="stop-color:#FFE692"/>
+ <stop offset="0.75" style="stop-color:#ED8C0D"/>
+ <stop offset="0.8667" style="stop-color:#FFB81F"/>
+ <stop offset="1" style="stop-color:#ED8C0D"/>
</linearGradient>
<path d="M52,55.76c0,0.76-0.615,1.375-1.375,1.375H9.375C8.616,57.135,8,56.518,8,55.76V27.571 c0-0.759,0.616-1.375,1.375-1.375h41.25c0.76,0,1.375,0.616,1.375,1.375V55.76z" fill="url(#SVGID_4_)"/>
-<path d="M50.625,26.196H9.375C8.616,26.196,8,26.812,8,27.571v1.375 c0-0.759,0.616-1.375,1.375-1.375h41.25c0.76,0,1.375,0.616,1.375,1.375v-1.375C52,26.812,51.385,26.196,50.625,26.196z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<rect fill="#EE8F11" fill-opacity="0.5" height="4.813" stroke-opacity="0.5" width="44" x="8" y="32.385"/>
-<rect fill-opacity="0.25" height="0.688" stroke-opacity="0.25" width="44" x="8" y="32.385"/>
-<path d="M50.625,57.135H9.375C8.616,57.135,8,56.518,8,55.76v-1.375 c0,0.758,0.616,1.375,1.375,1.375h41.25c0.76,0,1.375-0.617,1.375-1.375v1.375C52,56.518,51.385,57.135,50.625,57.135z" fill-opacity="0.25" stroke-opacity="0.25"/>
-<rect fill="#FEE38E" fill-opacity="0.4" height="0.688" stroke-opacity="0.4" width="44" x="8" y="37.196"/>
-<path d="M30,54.674c-1.378,0-2.5-1.121-2.5-2.5V48.5 c-1.538-0.885-2.5-2.517-2.5-4.326c0-2.756,2.243-5,5-5s5,2.244,5,5c0,1.811-0.962,3.441-2.5,4.326v3.674 C32.5,53.553,31.379,54.674,30,54.674L30,54.674z" fill="#FFE591" fill-opacity="0.25" stroke-opacity="0.25"/>
+<path d="M50.625,26.196H9.375C8.616,26.196,8,26.812,8,27.571v1.375 c0-0.759,0.616-1.375,1.375-1.375h41.25c0.76,0,1.375,0.616,1.375,1.375v-1.375C52,26.812,51.385,26.196,50.625,26.196z" enable-background="new " fill="#FFFFFF" opacity="0.4"/>
+<rect enable-background="new " fill="#EE8F11" height="4.813" opacity="0.5" width="44" x="8" y="32.385"/>
+<rect enable-background="new " height="0.688" opacity="0.25" width="44" x="8" y="32.385"/>
+<path d="M50.625,57.135H9.375C8.616,57.135,8,56.518,8,55.76v-1.375 c0,0.758,0.616,1.375,1.375,1.375h41.25c0.76,0,1.375-0.617,1.375-1.375v1.375C52,56.518,51.385,57.135,50.625,57.135z" enable-background="new " opacity="0.25"/>
+<rect enable-background="new " fill="#FEE38E" height="0.688" opacity="0.4" width="44" x="8" y="37.196"/>
+<path d="M30,54.674c-1.378,0-2.5-1.121-2.5-2.5V48.5 c-1.538-0.885-2.5-2.517-2.5-4.326c0-2.756,2.243-5,5-5s5,2.244,5,5c0,1.811-0.962,3.441-2.5,4.326v3.674 C32.5,53.553,31.379,54.674,30,54.674L30,54.674z" enable-background="new " fill="#FFE591" opacity="0.25"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 39.9805)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-72.52" x2="-72.52" y1="-13.209" y2="-0.4489">
-<stop offset="0" style="stop-color:#A67C52"/>
-<stop offset="1" style="stop-color:#603813"/>
+ <stop offset="0" style="stop-color:#A67C52"/>
+ <stop offset="1" style="stop-color:#603813"/>
</linearGradient>
<path d="M34,44.174c0-2.209-1.791-4-4-4s-4,1.791-4,4c0,1.678,1.035,3.109,2.5,3.703v4.297 c0,0.83,0.672,1.5,1.5,1.5s1.5-0.67,1.5-1.5v-4.297C32.965,47.283,34,45.852,34,44.174z" fill="url(#SVGID_5_)"/>
<rect fill="none" height="60" width="60"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_server_locked.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_server_locked.svg Fri May 14 16:09:54 2010 +0300
@@ -1,200 +1,202 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
-<stop offset="0.3818" style="stop-color:#FFFFFF"/>
-<stop offset="0.7091" style="stop-color:#686E70"/>
-<stop offset="1" style="stop-color:#A6B0B3"/>
+ <stop offset="0" style="stop-color:#A8B1B3"/>
+ <stop offset="0.3818" style="stop-color:#FFFFFF"/>
+ <stop offset="0.7091" style="stop-color:#686E70"/>
+ <stop offset="1" style="stop-color:#A6B0B3"/>
</linearGradient>
<path d="M52.041,56.938c0,0.339-0.274,0.612-0.612,0.612H7.347c-0.338,0-0.612-0.273-0.612-0.612v-3.673 c0-0.339,0.274-0.612,0.612-0.612h44.082c0.338,0,0.612,0.273,0.612,0.612V56.938z" fill="url(#SVGID_1_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="10.4082" x2="49.5918" y1="22.6533" y2="22.6533">
-<stop offset="0" style="stop-color:#B4BDBF"/>
-<stop offset="0.2667" style="stop-color:#E5EBED"/>
-<stop offset="0.703" style="stop-color:#8D9699"/>
-<stop offset="1" style="stop-color:#B7BDBF"/>
+ <stop offset="0" style="stop-color:#B4BDBF"/>
+ <stop offset="0.2667" style="stop-color:#E5EBED"/>
+ <stop offset="0.703" style="stop-color:#8D9699"/>
+ <stop offset="1" style="stop-color:#B7BDBF"/>
</linearGradient>
<path d="M48.113,2.449H11.889c-0.815,0-1.48,0.668-1.48,1.485v38.923h39.184V3.935 C49.592,3.117,48.926,2.449,48.113,2.449z" fill="url(#SVGID_2_)"/>
<path d="M48.113,2.449c0.813,0,1.479,0.668,1.479,1.485v38.923H10.408V3.935c0-0.817,0.666-1.485,1.48-1.485H48.113 M48.113,3.626H11.889c-0.173,0-0.318,0.142-0.318,0.309v37.747H48.43V3.935C48.43,3.768,48.285,3.626,48.113,3.626L48.113,3.626z" fill="#FFFFFF"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="15.5947" y2="6.3742">
-<stop offset="0" style="stop-color:#808080"/>
-<stop offset="1" style="stop-color:#303030"/>
+ <stop offset="0" style="stop-color:#808080"/>
+ <stop offset="1" style="stop-color:#303030"/>
</linearGradient>
<rect fill="url(#SVGID_3_)" height="9.412" width="32.59" x="13.705" y="6.183"/>
-<rect fill="#FFFFFF" fill-opacity="0.25" height="1.177" stroke-opacity="0.25" width="32.59" x="13.705" y="15.595"/>
+<rect fill="#FFFFFF" height="1.177" opacity="0.25" width="32.59" x="13.705" y="15.595"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="30.0015" x2="30.0015" y1="7.4082" y2="14.3725">
-<stop offset="0" style="stop-color:#8B8B8B"/>
-<stop offset="1" style="stop-color:#454545"/>
+ <stop offset="0" style="stop-color:#8B8B8B"/>
+ <stop offset="1" style="stop-color:#454545"/>
</linearGradient>
<rect fill="url(#SVGID_4_)" height="7.058" width="30.263" x="14.87" y="7.359"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30.0005" x2="30.0005" y1="8.2974" y2="13.2402">
-<stop offset="0" style="stop-color:#525252"/>
-<stop offset="1" style="stop-color:#1C1C1C"/>
+ <stop offset="0" style="stop-color:#525252"/>
+ <stop offset="1" style="stop-color:#1C1C1C"/>
</linearGradient>
<rect fill="url(#SVGID_5_)" height="4.706" width="27.939" x="16.031" y="8.534"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="20.0767" x2="20.0767" y1="9.5928" y2="12.0647">
-<stop offset="0" style="stop-color:#17BFFF"/>
-<stop offset="1" style="stop-color:#0D5186"/>
+ <stop offset="0" style="stop-color:#17BFFF"/>
+ <stop offset="1" style="stop-color:#0D5186"/>
</linearGradient>
<rect fill="url(#SVGID_6_)" height="2.354" width="5.848" x="17.153" y="9.711"/>
-<rect fill="#FFFFFF" fill-opacity="0.25" height="1.176" stroke-opacity="0.25" width="5.848" x="17.153" y="9.711"/>
+<rect fill="#FFFFFF" height="1.176" opacity="0.25" width="5.848" x="17.153" y="9.711"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="30" x2="30" y1="28.0029" y2="18.7824">
-<stop offset="0" style="stop-color:#808080"/>
-<stop offset="1" style="stop-color:#303030"/>
+ <stop offset="0" style="stop-color:#808080"/>
+ <stop offset="1" style="stop-color:#303030"/>
</linearGradient>
<rect fill="url(#SVGID_7_)" height="9.412" width="32.59" x="13.705" y="18.591"/>
-<rect fill="#FFFFFF" fill-opacity="0.25" height="1.176" stroke-opacity="0.25" width="32.59" x="13.705" y="28.003"/>
+<rect fill="#FFFFFF" height="1.176" opacity="0.25" width="32.59" x="13.705" y="28.003"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="30.0015" x2="30.0015" y1="19.8154" y2="26.7816">
-<stop offset="0" style="stop-color:#8B8B8B"/>
-<stop offset="1" style="stop-color:#454545"/>
+ <stop offset="0" style="stop-color:#8B8B8B"/>
+ <stop offset="1" style="stop-color:#454545"/>
</linearGradient>
<rect fill="url(#SVGID_8_)" height="7.06" width="30.263" x="14.87" y="19.767"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="30.0005" x2="30.0005" y1="20.7056" y2="25.6484">
-<stop offset="0" style="stop-color:#525252"/>
-<stop offset="1" style="stop-color:#1C1C1C"/>
+ <stop offset="0" style="stop-color:#525252"/>
+ <stop offset="1" style="stop-color:#1C1C1C"/>
</linearGradient>
<rect fill="url(#SVGID_9_)" height="4.706" width="27.939" x="16.031" y="20.942"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="26.957" x2="31.9189" y1="50.5098" y2="50.5098">
-<stop offset="0" style="stop-color:#1A1A1A"/>
-<stop offset="0.3212" style="stop-color:#C7C7C7"/>
-<stop offset="0.6848" style="stop-color:#4D4D4D"/>
-<stop offset="0.8545" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#7A7A7A"/>
+ <stop offset="0" style="stop-color:#1A1A1A"/>
+ <stop offset="0.3212" style="stop-color:#C7C7C7"/>
+ <stop offset="0.6848" style="stop-color:#4D4D4D"/>
+ <stop offset="0.8545" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#7A7A7A"/>
</linearGradient>
<path d="M26.939,48.367v3.674c0,0.338,0.274,0.612,0.612,0.612h3.674c0.338,0,0.612-0.274,0.612-0.612 v-3.674H26.939z" fill="url(#SVGID_10_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="26.9565" x2="31.918" y1="48.6738" y2="48.6738">
-<stop offset="0" style="stop-color:#1A1A1A"/>
-<stop offset="0.3212" style="stop-color:#C7C7C7"/>
-<stop offset="0.6848" style="stop-color:#4D4D4D"/>
-<stop offset="0.8545" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#7A7A7A"/>
+ <stop offset="0" style="stop-color:#1A1A1A"/>
+ <stop offset="0.3212" style="stop-color:#C7C7C7"/>
+ <stop offset="0.6848" style="stop-color:#4D4D4D"/>
+ <stop offset="0.8545" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#7A7A7A"/>
</linearGradient>
<rect fill="url(#SVGID_11_)" height="0.612" width="4.897" x="26.938" y="48.367"/>
<g>
-<rect fill="none" height="60" width="60"/>
+ <rect fill="none" height="60" width="60"/>
</g>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="30.0005" x2="30.0005" y1="48.9316" y2="42.9805">
-<stop offset="0" style="stop-color:#808080"/>
-<stop offset="1" style="stop-color:#303030"/>
+ <stop offset="0" style="stop-color:#808080"/>
+ <stop offset="1" style="stop-color:#303030"/>
</linearGradient>
<rect fill="url(#SVGID_12_)" height="6.122" width="37.996" x="11.002" y="42.857"/>
-<rect fill-opacity="0.5" height="0.612" stroke-opacity="0.5" width="37.996" x="11.002" y="42.857"/>
-<rect fill-opacity="0.2" height="0.612" stroke-opacity="0.2" width="37.996" x="11.002" y="43.47"/>
+<rect height="0.612" opacity="0.5" width="37.996" x="11.002" y="42.857"/>
+<rect height="0.612" opacity="0.2" width="37.996" x="11.002" y="43.47"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="12.8589" x2="12.8589" y1="48.9404" y2="44.1797">
-<stop offset="0" style="stop-color:#999999"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+ <stop offset="0" style="stop-color:#999999"/>
+ <stop offset="1" style="stop-color:#4D4D4D"/>
</linearGradient>
<rect fill="url(#SVGID_13_)" height="4.897" width="2.476" x="11.621" y="44.082"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="17.8115" x2="17.8115" y1="48.9404" y2="44.1797">
-<stop offset="0" style="stop-color:#999999"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+ <stop offset="0" style="stop-color:#999999"/>
+ <stop offset="1" style="stop-color:#4D4D4D"/>
</linearGradient>
<rect fill="url(#SVGID_14_)" height="4.897" width="2.476" x="16.574" y="44.082"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="22.7642" x2="22.7642" y1="48.9404" y2="44.1797">
-<stop offset="0" style="stop-color:#999999"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+ <stop offset="0" style="stop-color:#999999"/>
+ <stop offset="1" style="stop-color:#4D4D4D"/>
</linearGradient>
<rect fill="url(#SVGID_15_)" height="4.897" width="2.476" x="21.526" y="44.082"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="27.7158" x2="27.7158" y1="48.9404" y2="44.1797">
-<stop offset="0" style="stop-color:#999999"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+ <stop offset="0" style="stop-color:#999999"/>
+ <stop offset="1" style="stop-color:#4D4D4D"/>
</linearGradient>
<rect fill="url(#SVGID_16_)" height="4.897" width="2.476" x="26.478" y="44.082"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="32.668" x2="32.668" y1="48.9404" y2="44.1797">
-<stop offset="0" style="stop-color:#999999"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+ <stop offset="0" style="stop-color:#999999"/>
+ <stop offset="1" style="stop-color:#4D4D4D"/>
</linearGradient>
<rect fill="url(#SVGID_17_)" height="4.897" width="2.477" x="31.43" y="44.082"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="37.6211" x2="37.6211" y1="48.9404" y2="44.1797">
-<stop offset="0" style="stop-color:#999999"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+ <stop offset="0" style="stop-color:#999999"/>
+ <stop offset="1" style="stop-color:#4D4D4D"/>
</linearGradient>
<rect fill="url(#SVGID_18_)" height="4.897" width="2.477" x="36.383" y="44.082"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="42.5723" x2="42.5723" y1="48.9404" y2="44.1797">
-<stop offset="0" style="stop-color:#999999"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+ <stop offset="0" style="stop-color:#999999"/>
+ <stop offset="1" style="stop-color:#4D4D4D"/>
</linearGradient>
<rect fill="url(#SVGID_19_)" height="4.897" width="2.477" x="41.334" y="44.082"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="47.5254" x2="47.5254" y1="48.9404" y2="44.1797">
-<stop offset="0" style="stop-color:#999999"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+ <stop offset="0" style="stop-color:#999999"/>
+ <stop offset="1" style="stop-color:#4D4D4D"/>
</linearGradient>
<rect fill="url(#SVGID_20_)" height="4.897" width="2.477" x="46.287" y="44.082"/>
-<rect fill-opacity="0.5" height="0.612" stroke-opacity="0.5" width="37.996" x="11.002" y="48.367"/>
-<rect fill="#CCCCCC" fill-opacity="0.5" height="0.612" stroke-opacity="0.5" width="37.996" x="11.002" y="47.755"/>
-<rect fill-opacity="0.3" height="0.612" stroke-opacity="0.3" width="4.897" x="26.938" y="48.979"/>
-<rect fill-opacity="0.1" height="0.612" stroke-opacity="0.1" width="4.897" x="26.938" y="49.592"/>
-<rect fill-opacity="0.3" height="4.897" stroke-opacity="0.3" width="0.612" x="18.979" y="52.653"/>
-<rect fill-opacity="0.3" height="4.897" stroke-opacity="0.3" width="0.612" x="39.184" y="52.653"/>
-<rect fill-opacity="0.1" height="4.897" stroke-opacity="0.1" width="0.612" x="18.367" y="52.653"/>
-<rect fill-opacity="0.1" height="4.897" stroke-opacity="0.1" width="0.612" x="39.796" y="52.653"/>
+<rect height="0.612" opacity="0.5" width="37.996" x="11.002" y="48.367"/>
+<rect fill="#CCCCCC" height="0.612" opacity="0.5" width="37.996" x="11.002" y="47.755"/>
+<rect height="0.612" opacity="0.3" width="4.897" x="26.938" y="48.979"/>
+<rect height="0.612" opacity="0.1" width="4.897" x="26.938" y="49.592"/>
+<rect height="4.897" opacity="0.3" width="0.612" x="18.979" y="52.653"/>
+<rect height="4.897" opacity="0.3" width="0.612" x="39.184" y="52.653"/>
+<rect height="4.897" opacity="0.1" width="0.612" x="18.367" y="52.653"/>
+<rect height="4.897" opacity="0.1" width="0.612" x="39.796" y="52.653"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="29.3872" x2="29.3872" y1="52.1279" y2="57.9301">
-<stop offset="0" style="stop-color:#1A1A1A"/>
-<stop offset="0.3212" style="stop-color:#C7C7C7"/>
-<stop offset="0.6848" style="stop-color:#4D4D4D"/>
-<stop offset="0.8545" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#7A7A7A"/>
+ <stop offset="0" style="stop-color:#1A1A1A"/>
+ <stop offset="0.3212" style="stop-color:#C7C7C7"/>
+ <stop offset="0.6848" style="stop-color:#4D4D4D"/>
+ <stop offset="0.8545" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#7A7A7A"/>
</linearGradient>
<rect fill="url(#SVGID_21_)" height="6.122" width="18.367" x="20.204" y="52.041"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="19.8979" x2="19.8979" y1="52.1279" y2="57.9301">
-<stop offset="0" style="stop-color:#1A1A1A"/>
-<stop offset="0.3212" style="stop-color:#C7C7C7"/>
-<stop offset="0.6848" style="stop-color:#4D4D4D"/>
-<stop offset="0.8545" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#7A7A7A"/>
+ <stop offset="0" style="stop-color:#1A1A1A"/>
+ <stop offset="0.3212" style="stop-color:#C7C7C7"/>
+ <stop offset="0.6848" style="stop-color:#4D4D4D"/>
+ <stop offset="0.8545" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#7A7A7A"/>
</linearGradient>
<path d="M19.592,52.653v4.897c0,0.339,0.274,0.612,0.612,0.612v-6.122 C19.866,52.041,19.592,52.314,19.592,52.653z" fill="url(#SVGID_22_)"/>
-<path d="M19.592,52.653v4.897c0,0.339,0.274,0.612,0.612,0.612v-6.122C19.866,52.041,19.592,52.314,19.592,52.653z" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M19.592,52.653v4.897c0,0.339,0.274,0.612,0.612,0.612v-6.122C19.866,52.041,19.592,52.314,19.592,52.653z" opacity="0.3"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_23_" x1="38.877" x2="38.877" y1="52.1279" y2="57.9301">
-<stop offset="0" style="stop-color:#1A1A1A"/>
-<stop offset="0.3212" style="stop-color:#C7C7C7"/>
-<stop offset="0.6848" style="stop-color:#4D4D4D"/>
-<stop offset="0.8545" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#7A7A7A"/>
+ <stop offset="0" style="stop-color:#1A1A1A"/>
+ <stop offset="0.3212" style="stop-color:#C7C7C7"/>
+ <stop offset="0.6848" style="stop-color:#4D4D4D"/>
+ <stop offset="0.8545" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#7A7A7A"/>
</linearGradient>
<path d="M38.571,52.041v6.122c0.339,0,0.612-0.273,0.612-0.612v-4.897 C39.184,52.314,38.91,52.041,38.571,52.041z" fill="url(#SVGID_23_)"/>
-<path d="M38.571,52.041v6.122c0.339,0,0.612-0.273,0.612-0.612v-4.897C39.184,52.314,38.91,52.041,38.571,52.041z" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M38.571,52.041v6.122c0.339,0,0.612-0.273,0.612-0.612v-4.897C39.184,52.314,38.91,52.041,38.571,52.041z" opacity="0.3"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
<polygon fill="none" points="0,0 0,30 4.358,30 25.643,30 30,30 30,0 "/>
<g>
-<rect fill="none" height="30" width="30"/>
+ <rect fill="none" height="30" width="30"/>
</g>
-<path d="M4.358,30c-0.942,0-1.709-0.768-1.709-1.71V13.747 c0-0.943,0.767-1.711,1.709-1.711h0.663V9.979C5.099,4.471,9.63,0,15.122,0c5.491,0,10.022,4.471,10.101,9.966v2.07h0.42 c0.941,0,1.709,0.768,1.709,1.711V28.29c0,0.942-0.768,1.71-1.709,1.71H4.358z M20.145,12.036V9.979 c-0.058-2.692-2.312-4.9-5.021-4.9s-4.965,2.208-5.021,4.922v2.035H20.145z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M4.358,30c-0.942,0-1.709-0.768-1.709-1.71V13.747 c0-0.943,0.767-1.711,1.709-1.711h0.663V9.979C5.099,4.471,9.63,0,15.122,0c5.491,0,10.022,4.471,10.101,9.966v2.07h0.42 c0.941,0,1.709,0.768,1.709,1.711V28.29c0,0.942-0.768,1.71-1.709,1.71H4.358z M20.145,12.036V9.979 c-0.058-2.692-2.312-4.9-5.021-4.9s-4.965,2.208-5.021,4.922v2.035H20.145z" enable-background="new " opacity="0.35"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -361.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="273.6377" x2="291.5699" y1="-368.7476" y2="-368.7476">
-<stop offset="0" style="stop-color:#8C8C8C"/>
-<stop offset="0.5333" style="stop-color:#B3B3B3"/>
-<stop offset="1" style="stop-color:#808080"/>
+ <stop offset="0" style="stop-color:#8C8C8C"/>
+ <stop offset="0.5333" style="stop-color:#B3B3B3"/>
+ <stop offset="1" style="stop-color:#808080"/>
</linearGradient>
<path d="M15.122,1c-4.984,0-9.03,4.009-9.101,8.979v3.338H9.1V9.979c0.069-3.266,2.74-5.9,6.021-5.9 s5.951,2.635,6.021,5.9v4.477h3.078V9.979C24.152,5.009,20.107,1,15.122,1z" fill="url(#SVGID_1__)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -361.0195)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="274.1973" x2="291.0081" y1="-369.0322" y2="-369.0322">
-<stop offset="0" style="stop-color:#CCCCCC"/>
-<stop offset="0.5152" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#CCCCCC"/>
+ <stop offset="0" style="stop-color:#CCCCCC"/>
+ <stop offset="0.5152" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#CCCCCC"/>
</linearGradient>
<path d="M21.714,13.888V9.979c-0.077-3.574-3.032-6.469-6.592-6.469c-3.559,0-6.514,2.895-6.592,6.458v4.488 H6.591V9.979c0.065-4.636,3.893-8.41,8.531-8.41c4.64,0,8.465,3.774,8.53,8.418v3.9L21.714,13.888L21.714,13.888z" fill="url(#SVGID_2__)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -361.0195)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="274.5469" x2="290.6592" y1="-369.0322" y2="-369.0322">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.5" style="stop-color:#B3B3B3"/>
-<stop offset="1" style="stop-color:#FFFFFF"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="0.5" style="stop-color:#B3B3B3"/>
+ <stop offset="1" style="stop-color:#FFFFFF"/>
</linearGradient>
<path d="M6.945,14.102V9.979c0.063-4.44,3.731-8.055,8.177-8.055S23.234,5.542,23.3,9.99v3.541h-1.231V9.979 c-0.08-3.767-3.196-6.824-6.945-6.824c-3.75,0-6.865,3.053-6.946,6.805v4.142H6.945z" fill="url(#SVGID_3__)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -361.0195)" gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="271.1289" x2="293.832" y1="-382.0376" y2="-382.0376">
-<stop offset="0" style="stop-color:#ED8C0D"/>
-<stop offset="0.24" style="stop-color:#FFE692"/>
-<stop offset="0.75" style="stop-color:#ED8C0D"/>
-<stop offset="0.8667" style="stop-color:#FFB81F"/>
-<stop offset="1" style="stop-color:#ED8C0D"/>
+ <stop offset="0" style="stop-color:#ED8C0D"/>
+ <stop offset="0.24" style="stop-color:#FFE692"/>
+ <stop offset="0.75" style="stop-color:#ED8C0D"/>
+ <stop offset="0.8667" style="stop-color:#FFB81F"/>
+ <stop offset="1" style="stop-color:#ED8C0D"/>
</linearGradient>
<path d="M26.352,28.29c0,0.392-0.317,0.71-0.709,0.71H4.358c-0.392,0-0.709-0.318-0.709-0.71V13.747 c0-0.392,0.317-0.711,0.709-0.711h21.283c0.393,0,0.709,0.319,0.709,0.711V28.29H26.352z" fill="url(#SVGID_4__)"/>
-<path d="M25.643,13.036H4.358c-0.392,0-0.709,0.319-0.709,0.711v0.709 c0-0.392,0.317-0.709,0.709-0.709h21.283c0.393,0,0.709,0.317,0.709,0.709v-0.709C26.352,13.355,26.033,13.036,25.643,13.036z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M25.643,29H4.358c-0.392,0-0.709-0.318-0.709-0.71v-0.709 c0,0.392,0.317,0.709,0.709,0.709h21.283c0.393,0,0.709-0.317,0.709-0.709v0.709C26.352,28.682,26.033,29,25.643,29z" fill-opacity="0.25" stroke-opacity="0.25"/>
-<path d="M15,25.82c-0.689,0-1.25-0.562-1.25-1.25v-1.838 c-0.769-0.441-1.25-1.256-1.25-2.162c0-1.379,1.122-2.5,2.5-2.5c1.379,0,2.5,1.121,2.5,2.5c0,0.904-0.48,1.721-1.25,2.162v1.838 C16.25,25.26,15.689,25.82,15,25.82L15,25.82z" fill="#FFE591" fill-opacity="0.25" stroke-opacity="0.25"/>
+<path d="M25.643,13.036H4.358c-0.392,0-0.709,0.319-0.709,0.711v0.709 c0-0.392,0.317-0.709,0.709-0.709h21.283c0.393,0,0.709,0.317,0.709,0.709v-0.709C26.352,13.355,26.033,13.036,25.643,13.036z" enable-background="new " fill="#FFFFFF" opacity="0.4"/>
+<path d="M25.643,29H4.358c-0.392,0-0.709-0.318-0.709-0.71v-0.709 c0,0.392,0.317,0.709,0.709,0.709h21.283c0.393,0,0.709-0.317,0.709-0.709v0.709C26.352,28.682,26.033,29,25.643,29z" enable-background="new " opacity="0.25"/>
+<path d="M15,25.82c-0.689,0-1.25-0.562-1.25-1.25v-1.838 c-0.769-0.441-1.25-1.256-1.25-2.162c0-1.379,1.122-2.5,2.5-2.5c1.379,0,2.5,1.121,2.5,2.5c0,0.904-0.48,1.721-1.25,2.162v1.838 C16.25,25.26,15.689,25.82,15,25.82L15,25.82z" enable-background="new " fill="#FFE591" opacity="0.25"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -361.0195)" gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="282.4805" x2="282.4805" y1="-386.0986" y2="-379.7186">
-<stop offset="0" style="stop-color:#A67C52"/>
-<stop offset="1" style="stop-color:#603813"/>
+ <stop offset="0" style="stop-color:#A67C52"/>
+ <stop offset="1" style="stop-color:#603813"/>
</linearGradient>
<path d="M17,20.57c0-1.104-0.896-2-2-2c-1.104,0-2,0.896-2,2c0,0.839,0.518,1.555,1.25,1.852v2.148 c0,0.414,0.336,0.75,0.75,0.75s0.75-0.336,0.75-0.75v-2.148C16.482,22.125,17,21.409,17,20.57z" fill="url(#SVGID_5__)"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_settings.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_settings.svg Fri May 14 16:09:54 2010 +0300
@@ -1,146 +1,140 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="4.5" y2="55.3778">
-<stop offset="0" style="stop-color:#E8E8E8"/>
-<stop offset="0.3576" style="stop-color:#B2BDC2"/>
-<stop offset="0.7455" style="stop-color:#595C5E"/>
-<stop offset="1" style="stop-color:#A1ABB0"/>
+ <stop offset="0" style="stop-color:#E8E8E8"/>
+ <stop offset="0.3576" style="stop-color:#B2BDC2"/>
+ <stop offset="0.7455" style="stop-color:#595C5E"/>
+ <stop offset="1" style="stop-color:#A1ABB0"/>
</linearGradient>
<path d="M6.412,55.5c-1.055,0-1.912-0.857-1.912-1.911V6.411C4.5,5.357,5.357,4.5,6.412,4.5h47.176 c1.055,0,1.913,0.857,1.913,1.911v47.178c0,1.054-0.858,1.911-1.913,1.911H6.412z" fill="url(#SVGID_1_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30.001" x2="30.001" y1="5.7139" y2="54.1698">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.1455" style="stop-color:#D7DDDE"/>
-<stop offset="0.3212" style="stop-color:#FFFFFF"/>
-<stop offset="0.7333" style="stop-color:#8E9699"/>
-<stop offset="1" style="stop-color:#D5E2E6"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="0.1455" style="stop-color:#D7DDDE"/>
+ <stop offset="0.3212" style="stop-color:#FFFFFF"/>
+ <stop offset="0.7333" style="stop-color:#8E9699"/>
+ <stop offset="1" style="stop-color:#D5E2E6"/>
</linearGradient>
<path d="M6.412,54.286c-0.385,0-0.697-0.313-0.697-0.697V6.411c0-0.384,0.313-0.697,0.697-0.697h47.176 c0.387,0,0.699,0.313,0.699,0.697v47.178c0,0.385-0.313,0.697-0.699,0.697H6.412z" fill="url(#SVGID_2_)"/>
<path d="M53.588,5.106H6.412c-0.719,0-1.305,0.586-1.305,1.305v47.178 c0,0.719,0.586,1.305,1.305,1.305h47.176c0.72,0,1.307-0.586,1.307-1.305V6.411C54.895,5.692,54.308,5.106,53.588,5.106z M53.68,53.589c0,0.05-0.041,0.09-0.092,0.09H6.412c-0.049,0-0.09-0.04-0.09-0.09V6.411c0-0.049,0.041-0.09,0.09-0.09h47.176 c0.051,0,0.092,0.041,0.092,0.09V53.589z" fill="#FFFFFF" fill-opacity="0.5"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="13.6074" x2="13.6074" y1="11.021" y2="48.3899">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
<path d="M13,48.519c-1.339,0-2.428-1.09-2.428-2.429V13.304c0-1.34,1.089-2.43,2.428-2.43 h1.215c1.339,0,2.429,1.09,2.429,2.43V46.09c0,1.339-1.09,2.429-2.429,2.429H13z" fill="url(#SVGID_3_)" fill-opacity="0.3"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="15.9473" x2="11.1119" y1="29.6973" y2="29.6973">
-<stop offset="0" style="stop-color:#595C5E"/>
-<stop offset="0.3" style="stop-color:#ABB2B5"/>
-<stop offset="0.7" style="stop-color:#ABB2B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+ <stop offset="0" style="stop-color:#595C5E"/>
+ <stop offset="0.3" style="stop-color:#ABB2B5"/>
+ <stop offset="0.7" style="stop-color:#ABB2B5"/>
+ <stop offset="1" style="stop-color:#595C5E"/>
</linearGradient>
<path d="M16.036,46.09c0,1.006-0.815,1.822-1.821,1.822H13c-1.006,0-1.821-0.816-1.821-1.822V13.304 c0-1.008,0.815-1.821,1.821-1.821h1.215c1.006,0,1.821,0.813,1.821,1.821V46.09z" fill="url(#SVGID_4_)"/>
<path d="M14.215,11.482H13c-1.006,0-1.821,0.813-1.821,1.821V46.09c0,1.006,0.815,1.822,1.821,1.822h1.215 c1.006,0,1.821-0.816,1.821-1.822V13.304C16.036,12.296,15.221,11.482,14.215,11.482z M15.429,46.09 c0,0.669-0.544,1.214-1.214,1.214H13c-0.67,0-1.214-0.545-1.214-1.214V13.304c0-0.67,0.544-1.215,1.214-1.215h1.215 c0.67,0,1.214,0.545,1.214,1.215V46.09z" fill-opacity="0.1"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="11.7861" x2="15.4287" y1="36.0713" y2="36.0713">
-<stop offset="0" style="stop-color:#5AA913"/>
-<stop offset="0.497" style="stop-color:#A2ED21"/>
-<stop offset="1" style="stop-color:#58A813"/>
+ <stop offset="0" style="stop-color:#5AA913"/>
+ <stop offset="0.497" style="stop-color:#A2ED21"/>
+ <stop offset="1" style="stop-color:#58A813"/>
</linearGradient>
<path d="M13,47.304c-0.67,0-1.214-0.545-1.214-1.214V26.054c0-0.668,0.544-1.215,1.214-1.215h1.215 c0.67,0,1.214,0.547,1.214,1.215V46.09c0,0.669-0.544,1.214-1.214,1.214H13z" fill="url(#SVGID_5_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="13.6074" x2="13.6074" y1="19.6782" y2="28.6905">
-<stop offset="0" style="stop-color:#666666"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#666666"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
<path d="M10.572,28.483c-1.34,0-2.43-1.09-2.43-2.43v-4.25c0-1.34,1.09-2.428,2.43-2.428 h6.071c1.339,0,2.429,1.088,2.429,2.428v4.25c0,1.34-1.09,2.43-2.429,2.43H10.572z" fill="url(#SVGID_6_)" fill-opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="13.6074" x2="13.6074" y1="19.4058" y2="27.2627">
-<stop offset="0" style="stop-color:#A6A8AB"/>
-<stop offset="1" style="stop-color:#231F20"/>
+ <stop offset="0" style="stop-color:#A6A8AB"/>
+ <stop offset="1" style="stop-color:#231F20"/>
</linearGradient>
<path d="M10.572,27.268c-1.006,0-1.822-0.816-1.822-1.82v-4.252 c0-1.004,0.816-1.819,1.822-1.819h6.071c1.004,0,1.821,0.815,1.821,1.819v4.252c0,1.004-0.817,1.82-1.821,1.82H10.572z" fill="url(#SVGID_7_)" fill-opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="13.6074" x2="13.6074" y1="20.2031" y2="26.8131">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.1212" style="stop-color:#FFFFFF"/>
-<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"/>
+ <stop offset="0.1212" style="stop-color:#FFFFFF"/>
+ <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"/>
</linearGradient>
<path d="M17.857,25.447c0,0.671-0.543,1.214-1.214,1.214h-6.071c-0.672,0-1.215-0.543-1.215-1.214v-4.252 c0-0.669,0.543-1.214,1.215-1.214h6.071c0.671,0,1.214,0.545,1.214,1.214V25.447z" fill="url(#SVGID_8_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="13.6074" x2="13.6074" y1="20.7715" y2="26.1783">
-<stop offset="0" style="stop-color:#E5E9EB"/>
-<stop offset="0.1212" style="stop-color:#E5E9EB"/>
-<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="1" style="stop-color:#ADB3B5"/>
+ <stop offset="0.1212" style="stop-color:#E5E9EB"/>
+ <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="1" style="stop-color:#ADB3B5"/>
</linearGradient>
<path d="M10.572,26.054c-0.336,0-0.607-0.272-0.607-0.606v-4.252c0-0.335,0.271-0.605,0.607-0.605h6.071 c0.335,0,0.606,0.271,0.606,0.605v4.252c0,0.334-0.271,0.606-0.606,0.606H10.572z" fill="url(#SVGID_9_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="25.75" x2="25.75" y1="11.021" y2="48.3899">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
<path d="M25.143,48.519c-1.339,0-2.428-1.09-2.428-2.429V13.304 c0-1.34,1.089-2.43,2.428-2.43h1.215c1.339,0,2.429,1.09,2.429,2.43V46.09c0,1.339-1.09,2.429-2.429,2.429H25.143z" fill="url(#SVGID_10_)" fill-opacity="0.3"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="28.0898" x2="23.2554" y1="29.6973" y2="29.6973">
-<stop offset="0" style="stop-color:#595C5E"/>
-<stop offset="0.3" style="stop-color:#ABB2B5"/>
-<stop offset="0.7" style="stop-color:#ABB2B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+ <stop offset="0" style="stop-color:#595C5E"/>
+ <stop offset="0.3" style="stop-color:#ABB2B5"/>
+ <stop offset="0.7" style="stop-color:#ABB2B5"/>
+ <stop offset="1" style="stop-color:#595C5E"/>
</linearGradient>
<path d="M28.179,46.09c0,1.006-0.815,1.822-1.821,1.822h-1.215c-1.005,0-1.82-0.816-1.82-1.822V13.304 c0-1.008,0.815-1.821,1.82-1.821h1.215c1.006,0,1.821,0.813,1.821,1.821V46.09z" fill="url(#SVGID_11_)"/>
<path d="M26.357,11.482h-1.215c-1.005,0-1.82,0.813-1.82,1.821V46.09c0,1.006,0.815,1.822,1.82,1.822h1.215 c1.006,0,1.821-0.816,1.821-1.822V13.304C28.179,12.296,27.363,11.482,26.357,11.482z M27.571,46.09 c0,0.669-0.544,1.214-1.214,1.214h-1.215c-0.67,0-1.214-0.545-1.214-1.214V13.304c0-0.67,0.544-1.215,1.214-1.215h1.215 c0.67,0,1.214,0.545,1.214,1.215V46.09z" fill-opacity="0.1"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="23.9287" x2="27.5713" y1="37.5898" y2="37.5898">
-<stop offset="0" style="stop-color:#5AA913"/>
-<stop offset="0.497" style="stop-color:#A2ED21"/>
-<stop offset="1" style="stop-color:#58A813"/>
+ <stop offset="0" style="stop-color:#5AA913"/>
+ <stop offset="0.497" style="stop-color:#A2ED21"/>
+ <stop offset="1" style="stop-color:#58A813"/>
</linearGradient>
<path d="M25.143,47.304c-0.67,0-1.214-0.545-1.214-1.214v-17c0-0.67,0.544-1.214,1.214-1.214h1.215 c0.67,0,1.214,0.544,1.214,1.214v17c0,0.669-0.544,1.214-1.214,1.214H25.143z" fill="url(#SVGID_12_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="25.75" x2="25.75" y1="26.9634" y2="35.9757">
-<stop offset="0" style="stop-color:#666666"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#666666"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
<path d="M22.715,35.769c-1.339,0-2.429-1.09-2.429-2.43V29.09 c0-1.34,1.09-2.429,2.429-2.429h6.071c1.339,0,2.429,1.089,2.429,2.429v4.249c0,1.34-1.09,2.43-2.429,2.43H22.715z" fill="url(#SVGID_13_)" fill-opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="25.75" x2="25.75" y1="26.6909" y2="34.5488">
-<stop offset="0" style="stop-color:#A6A8AB"/>
-<stop offset="1" style="stop-color:#231F20"/>
+ <stop offset="0" style="stop-color:#A6A8AB"/>
+ <stop offset="1" style="stop-color:#231F20"/>
</linearGradient>
<path d="M22.715,34.554c-1.005,0-1.822-0.816-1.822-1.821v-4.249 c0-1.006,0.817-1.822,1.822-1.822h6.071c1.005,0,1.821,0.816,1.821,1.822v4.249c0,1.005-0.816,1.821-1.821,1.821H22.715z" fill="url(#SVGID_14_)" fill-opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="25.75" x2="25.75" y1="27.4893" y2="34.0982">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.1212" style="stop-color:#FFFFFF"/>
-<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"/>
+ <stop offset="0.1212" style="stop-color:#FFFFFF"/>
+ <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"/>
</linearGradient>
<path d="M30,32.732c0,0.671-0.543,1.214-1.214,1.214h-6.071c-0.671,0-1.215-0.543-1.215-1.214v-4.249 c0-0.672,0.544-1.216,1.215-1.216h6.071c0.671,0,1.214,0.544,1.214,1.216V32.732z" fill="url(#SVGID_15_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="25.75" x2="25.75" y1="28.0571" y2="33.463">
-<stop offset="0" style="stop-color:#E5E9EB"/>
-<stop offset="0.1212" style="stop-color:#E5E9EB"/>
-<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="1" style="stop-color:#ADB3B5"/>
+ <stop offset="0.1212" style="stop-color:#E5E9EB"/>
+ <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="1" style="stop-color:#ADB3B5"/>
</linearGradient>
<path d="M22.715,33.339c-0.335,0-0.607-0.271-0.607-0.606v-4.249c0-0.336,0.272-0.607,0.607-0.607h6.071 c0.335,0,0.607,0.271,0.607,0.607v4.249c0,0.335-0.272,0.606-0.607,0.606H22.715z" fill="url(#SVGID_16_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="42.1426" x2="42.1426" y1="14.0352" y2="45.034">
-<stop offset="0" style="stop-color:#999999"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#999999"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
<path d="M36.982,45.179c-1.034,0-1.877-0.842-1.877-1.876V16.091 c0-1.035,0.843-1.876,1.877-1.876h10.322c1.035,0,1.876,0.841,1.876,1.876v27.212c0,1.034-0.841,1.876-1.876,1.876H36.982z" fill="url(#SVGID_17_)" fill-opacity="0.1"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="42.1426" x2="42.1426" y1="14.5083" y2="44.5696">
-<stop offset="0" style="stop-color:#999999"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#999999"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
<path d="M36.982,44.71c-0.775,0-1.407-0.632-1.407-1.407V16.091 c0-0.775,0.632-1.408,1.407-1.408h10.322c0.775,0,1.406,0.633,1.406,1.408v27.212c0,0.775-0.631,1.407-1.406,1.407H36.982z" fill="url(#SVGID_18_)" fill-opacity="0.3"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="42.1436" x2="42.1436" y1="44.3218" y2="15.0707">
-<stop offset="0" style="stop-color:#5F6366"/>
-<stop offset="1" style="stop-color:#3E4142"/>
+ <stop offset="0" style="stop-color:#5F6366"/>
+ <stop offset="1" style="stop-color:#3E4142"/>
</linearGradient>
<path d="M48.242,43.303c0,0.519-0.419,0.938-0.938,0.938H36.982c-0.518,0-0.938-0.42-0.938-0.938V16.091 c0-0.518,0.42-0.938,0.938-0.938h10.322c0.519,0,0.938,0.42,0.938,0.938V43.303z" fill="url(#SVGID_19_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="42.1436" x2="42.1436" y1="16.8999" y2="43.2099">
-<stop offset="0" style="stop-color:#9CA4A6"/>
-<stop offset="0.1" style="stop-color:#F0F2F3"/>
-<stop offset="0.5" style="stop-color:#BBBEBF"/>
-<stop offset="0.9" style="stop-color:#F3F5F5"/>
-<stop offset="0.95" style="stop-color:#8E9699"/>
-<stop offset="1" style="stop-color:#686E70"/>
+ <stop offset="0" style="stop-color:#9CA4A6"/>
+ <stop offset="0.1" style="stop-color:#F0F2F3"/>
+ <stop offset="0.5" style="stop-color:#BBBEBF"/>
+ <stop offset="0.9" style="stop-color:#F3F5F5"/>
+ <stop offset="0.95" style="stop-color:#8E9699"/>
+ <stop offset="1" style="stop-color:#686E70"/>
</linearGradient>
<path d="M36.982,43.771c-0.258,0-0.469-0.21-0.469-0.468V17.03c0-0.26,0.211-0.471,0.469-0.471h10.322 c0.259,0,0.469,0.211,0.469,0.471v26.272c0,0.258-0.21,0.468-0.469,0.468H36.982z" fill="url(#SVGID_20_)"/>
<path d="M47.305,18.437H36.982c-0.258,0-0.469,0.211-0.469,0.469v0.471c0-0.26,0.211-0.471,0.469-0.471h10.322 c0.259,0,0.469,0.211,0.469,0.471v-0.471C47.773,18.647,47.563,18.437,47.305,18.437z" fill="#FFFFFF"/>
@@ -148,12 +142,12 @@
<path d="M36.982,41.427c-0.259,0-0.469-0.212-0.469-0.47V19.376c0-0.26,0.21-0.471,0.469-0.471 h10.322c0.259,0,0.469,0.211,0.469,0.471v21.581c0,0.258-0.21,0.47-0.469,0.47H36.982z" fill="#FFFFFF" fill-opacity="0.3"/>
<path d="M36.514,30.165v10.792c0,0.258,0.21,0.47,0.469,0.47h10.322 c0.259,0,0.469-0.212,0.469-0.47V30.165H36.514z" fill="#FFFFFF" fill-opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="42.1436" x2="42.1436" y1="22.582" y2="19.8827">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#808080"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#808080"/>
</linearGradient>
<path d="M38.859,22.66c-0.26,0-0.469-0.212-0.469-0.471v-1.876 c0-0.26,0.209-0.47,0.469-0.47h6.568c0.26,0,0.469,0.21,0.469,0.47v1.876c0,0.259-0.209,0.471-0.469,0.471H38.859z" fill="url(#SVGID_21_)" fill-opacity="0.4"/>
<rect fill="#FF1D25" height="1.876" width="6.568" x="38.859" y="20.313"/>
<polygon fill-opacity="0.3" points="44.959,20.313 39.328,20.313 38.859,20.313 38.859,20.782 38.859,22.189 39.328,22.189 39.328,20.782 44.959,20.782 44.959,22.189 45.428,22.189 45.428,20.782 45.428,20.313 "/>
<rect fill="none" height="60" width="60"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sim.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sim.svg Fri May 14 16:09:54 2010 +0300
@@ -1,87 +1,89 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<stop offset="0" style="stop-color:#A0A3A6"/>
-<stop offset="0.8182" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#7B7E80"/>
+ <stop offset="0" style="stop-color:#A0A3A6"/>
+ <stop offset="0.8182" style="stop-color:#474B4D"/>
+ <stop offset="1" style="stop-color:#7B7E80"/>
</linearGradient>
<path d="M8.957,57.999c-1.365,0-2.473-1.108-2.473-2.473V4.472c0-1.364,1.107-2.473,2.473-2.473h30.801 c1.115,0,2.607,0.619,3.396,1.406l8.951,8.95c0.789,0.79,1.408,2.281,1.408,3.396v39.774c0,1.364-1.111,2.473-2.473,2.473H8.957z" fill="url(#SVGID_1_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="29.999" x2="29.999" y1="3.2646" y2="56.7327">
-<stop offset="0" style="stop-color:#F5F5F5"/>
-<stop offset="0.7818" style="stop-color:#CCCCCC"/>
-<stop offset="1" style="stop-color:#D1D1D1"/>
+ <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="M51.041,56.674H8.957c-0.633,0-1.146-0.513-1.146-1.147V4.469c0-0.629,0.514-1.145,1.146-1.145 h30.801c0.766,0,1.912,0.477,2.459,1.021l8.953,8.948c0.543,0.546,1.018,1.693,1.018,2.459v39.774 C52.188,56.161,51.676,56.674,51.041,56.674L51.041,56.674z" fill="url(#SVGID_2_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="4.6533" y2="55.3477">
-<stop offset="0" style="stop-color:#E6E9E8"/>
-<stop offset="1" style="stop-color:#ADB2B5"/>
+ <stop offset="0" style="stop-color:#E6E9E8"/>
+ <stop offset="1" style="stop-color:#ADB2B5"/>
</linearGradient>
<path d="M50.863,55.348H9.137V4.653h30.621c0.412,0,1.227,0.336,1.521,0.629l8.957,8.95 c0.289,0.293,0.627,1.105,0.627,1.52V55.348L50.863,55.348z" fill="url(#SVGID_3_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="27.3711" x2="27.3711" y1="51.1084" y2="24.5269">
-<stop offset="0" style="stop-color:#666666"/>
-<stop offset="1" style="stop-color:#282828"/>
+ <stop offset="0" style="stop-color:#666666"/>
+ <stop offset="1" style="stop-color:#282828"/>
</linearGradient>
<rect fill="url(#SVGID_4_)" height="26.784" width="31.227" x="11.758" y="24.426"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1.326" stroke-opacity="0.4" width="31.227" x="11.758" y="51.21"/>
+<rect fill="#FFFFFF" height="1.326" opacity="0.4" width="31.227" x="11.758" y="51.21"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="16.2236" x2="16.2236" y1="25.7173" y2="49.2631">
-<stop offset="0" style="stop-color:#FFF173"/>
-<stop offset="0.33" style="stop-color:#F1BC35"/>
-<stop offset="0.66" style="stop-color:#E5B029"/>
-<stop offset="1" style="stop-color:#FFA102"/>
+ <stop offset="0" style="stop-color:#FFF173"/>
+ <stop offset="0.33" style="stop-color:#F1BC35"/>
+ <stop offset="0.66" style="stop-color:#E5B029"/>
+ <stop offset="1" style="stop-color:#FFA102"/>
</linearGradient>
<rect fill="url(#SVGID_5_)" height="7.305" width="5.682" x="13.383" y="42.197"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="30.1895" x2="30.1895" y1="25.9839" y2="48.9336">
-<stop offset="0" style="stop-color:#FFF173"/>
-<stop offset="0.33" style="stop-color:#F1BC35"/>
-<stop offset="0.66" style="stop-color:#E5B029"/>
-<stop offset="1" style="stop-color:#FFA102"/>
+ <stop offset="0" style="stop-color:#FFF173"/>
+ <stop offset="0.33" style="stop-color:#F1BC35"/>
+ <stop offset="0.66" style="stop-color:#E5B029"/>
+ <stop offset="1" style="stop-color:#FFA102"/>
</linearGradient>
<rect fill="url(#SVGID_6_)" height="7.304" width="5.254" x="27.563" y="25.967"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="23.3125" x2="23.3125" y1="25.9839" y2="48.9336">
-<stop offset="0" style="stop-color:#FFF173"/>
-<stop offset="0.33" style="stop-color:#F1BC35"/>
-<stop offset="0.66" style="stop-color:#E5B029"/>
-<stop offset="1" style="stop-color:#FFA102"/>
+ <stop offset="0" style="stop-color:#FFF173"/>
+ <stop offset="0.33" style="stop-color:#F1BC35"/>
+ <stop offset="0.66" style="stop-color:#E5B029"/>
+ <stop offset="1" style="stop-color:#FFA102"/>
</linearGradient>
<rect fill="url(#SVGID_7_)" height="7.304" width="5.254" x="20.686" y="25.967"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="37.8779" x2="37.8779" y1="25.9839" y2="48.9336">
-<stop offset="0" style="stop-color:#FFF173"/>
-<stop offset="0.33" style="stop-color:#F1BC35"/>
-<stop offset="0.66" style="stop-color:#E5B029"/>
-<stop offset="1" style="stop-color:#FFA102"/>
+ <stop offset="0" style="stop-color:#FFF173"/>
+ <stop offset="0.33" style="stop-color:#F1BC35"/>
+ <stop offset="0.66" style="stop-color:#E5B029"/>
+ <stop offset="1" style="stop-color:#FFA102"/>
</linearGradient>
<rect fill="url(#SVGID_8_)" height="7.304" width="6.877" x="34.439" y="25.967"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="30.1895" x2="30.1895" y1="25.7173" y2="49.2631">
-<stop offset="0" style="stop-color:#FFF173"/>
-<stop offset="0.33" style="stop-color:#F1BC35"/>
-<stop offset="0.66" style="stop-color:#E5B029"/>
-<stop offset="1" style="stop-color:#FFA102"/>
+ <stop offset="0" style="stop-color:#FFF173"/>
+ <stop offset="0.33" style="stop-color:#F1BC35"/>
+ <stop offset="0.66" style="stop-color:#E5B029"/>
+ <stop offset="1" style="stop-color:#FFA102"/>
</linearGradient>
<rect fill="url(#SVGID_9_)" height="7.305" width="5.254" x="27.563" y="42.197"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="23.3125" x2="23.3125" y1="25.7173" y2="49.2631">
-<stop offset="0" style="stop-color:#FFF173"/>
-<stop offset="0.33" style="stop-color:#F1BC35"/>
-<stop offset="0.66" style="stop-color:#E5B029"/>
-<stop offset="1" style="stop-color:#FFA102"/>
+ <stop offset="0" style="stop-color:#FFF173"/>
+ <stop offset="0.33" style="stop-color:#F1BC35"/>
+ <stop offset="0.66" style="stop-color:#E5B029"/>
+ <stop offset="1" style="stop-color:#FFA102"/>
</linearGradient>
<rect fill="url(#SVGID_10_)" height="7.305" width="5.254" x="20.686" y="42.197"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="27.3496" x2="27.3496" y1="25.9839" y2="48.8929">
-<stop offset="0" style="stop-color:#FFF173"/>
-<stop offset="0.33" style="stop-color:#F1BC35"/>
-<stop offset="0.66" style="stop-color:#E5B029"/>
-<stop offset="1" style="stop-color:#FFA102"/>
+ <stop offset="0" style="stop-color:#FFF173"/>
+ <stop offset="0.33" style="stop-color:#F1BC35"/>
+ <stop offset="0.66" style="stop-color:#E5B029"/>
+ <stop offset="1" style="stop-color:#FFA102"/>
</linearGradient>
<polygon fill="url(#SVGID_11_)" points="18.975,34.894 18.975,25.967 13.383,25.967 13.383,40.574 41.316,40.574 41.316,34.894 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="37.8779" x2="37.8779" y1="25.7173" y2="49.2631">
-<stop offset="0" style="stop-color:#FFF173"/>
-<stop offset="0.33" style="stop-color:#F1BC35"/>
-<stop offset="0.66" style="stop-color:#E5B029"/>
-<stop offset="1" style="stop-color:#FFA102"/>
+ <stop offset="0" style="stop-color:#FFF173"/>
+ <stop offset="0.33" style="stop-color:#F1BC35"/>
+ <stop offset="0.66" style="stop-color:#E5B029"/>
+ <stop offset="1" style="stop-color:#FFA102"/>
</linearGradient>
<rect fill="url(#SVGID_12_)" height="7.305" width="6.877" x="34.439" y="42.197"/>
<rect fill="none" height="60" width="60"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sisx.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sisx.svg Fri May 14 16:09:54 2010 +0300
@@ -1,15 +1,16 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.4606" style="stop-color:#BDC2C4"/>
-<stop offset="0.7333" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+ <stop offset="0.0667" style="stop-color:#D1D7D9"/>
+ <stop offset="0.4606" style="stop-color:#BDC2C4"/>
+ <stop offset="0.7333" style="stop-color:#949DA1"/>
+ <stop offset="0.9636" style="stop-color:#ADB3B5"/>
+ <stop offset="1" style="stop-color:#595C5E"/>
</linearGradient>
<path d="M51.065,18.041H31.027v-2.398c2.141-1.259,4.403-2.609,4.403-5.143c0-3.896-4.045-7.064-7.938-7.064 c-3.895,0-7.937,3.168-7.937,7.064c0,2.535,2.265,3.891,4.415,5.146v2.396h-5.701c-1.445,0-2.627,1.183-2.627,2.626v13.048h-1.453 c-1.211-2.092-2.594-4.378-5.185-4.378C5.136,29.337,2,33.348,2,37.217c0,3.868,3.136,7.879,7.003,7.879 c2.591,0,3.974-2.286,5.185-4.377h1.453v3.885c0,1.445,1.183,2.627,2.627,2.627h6.205v-3.62c-1.889-1.104-3.882-2.296-3.882-4.526 c0-3.426,3.556-6.213,6.981-6.213s6.983,2.787,6.983,6.213c0,2.229-1.99,3.417-3.873,4.525v3.621h20.383 c1.445,0,2.628-1.182,2.628-2.627V20.667C53.693,19.224,52.51,18.041,51.065,18.041z" fill="url(#SVGID_1_)"/>
<path d="M18.268,18.759h5.701v-0.718h-5.701c-1.445,0-2.627,1.183-2.627,2.626v0.718 C15.641,19.941,16.823,18.759,18.268,18.759z" fill="#FFFFFF"/>
@@ -18,47 +19,47 @@
<path d="M9.003,30.055c2.591,0,3.974,2.286,5.185,4.378h1.453v-0.718h-1.453c-1.211-2.092-2.594-4.378-5.185-4.378 C5.136,29.337,2,33.348,2,37.217c0,0.119,0.012,0.238,0.018,0.358C2.204,33.822,5.256,30.055,9.003,30.055z" fill="#FFFFFF"/>
<path d="M51.065,18.041H31.027v0.718h20.038c1.445,0,2.628,1.182,2.628,2.625v-0.718 C53.693,19.224,52.51,18.041,51.065,18.041z" fill="#FFFFFF"/>
<path d="M20.612,39.467c-0.007,0.111-0.021,0.223-0.021,0.336c0,2.229,1.993,3.422,3.882,4.525V43.61 C22.695,42.572,20.827,41.454,20.612,39.467z" fill="#FFFFFF"/>
-<path d="M53.693,32.871H40.51l-0.113,0.01L40.34,32.89c-1.32,0.21-2.018,1.202-2.179,1.638 l-1.121,2.339c-0.058,0.08-0.11,0.163-0.155,0.242c-0.064,0.112-0.118,0.222-0.127,0.247c-0.047,0.096-0.09,0.197-0.148,0.367 c-0.1,0.307-0.148,0.6-0.148,0.893v8.615h15.32c0.754,0,1.43-0.326,1.911-0.836V32.871z" fill="#020202" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M53.693,33.59H40.51l-0.057,0.009c-0.986,0.157-1.513,0.888-1.645,1.239l-1.151,2.401 c-0.056,0.073-0.106,0.149-0.153,0.231c-0.045,0.078-0.082,0.154-0.102,0.201c-0.037,0.073-0.067,0.15-0.109,0.273 c-0.076,0.233-0.114,0.452-0.114,0.67v8.615h14.603c0.754,0,1.43-0.326,1.911-0.836V33.59z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M53.693,32.871H40.51l-0.113,0.01L40.34,32.89c-1.32,0.21-2.018,1.202-2.179,1.638 l-1.121,2.339c-0.058,0.08-0.11,0.163-0.155,0.242c-0.064,0.112-0.118,0.222-0.127,0.247c-0.047,0.096-0.09,0.197-0.148,0.367 c-0.1,0.307-0.148,0.6-0.148,0.893v8.615h15.32c0.754,0,1.43-0.326,1.911-0.836V32.871z" fill="#020202" opacity="0.1"/>
+<path d="M53.693,33.59H40.51l-0.057,0.009c-0.986,0.157-1.513,0.888-1.645,1.239l-1.151,2.401 c-0.056,0.073-0.106,0.149-0.153,0.231c-0.045,0.078-0.082,0.154-0.102,0.201c-0.037,0.073-0.067,0.15-0.109,0.273 c-0.076,0.233-0.114,0.452-0.114,0.67v8.615h14.603c0.754,0,1.43-0.326,1.911-0.836V33.59z" fill="#020202" opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="47.9429" x2="47.9429" y1="34.2842" y2="38.7279">
-<stop offset="0" style="stop-color:#AFED23"/>
-<stop offset="1" style="stop-color:#7DC51A"/>
+ <stop offset="0" style="stop-color:#AFED23"/>
+ <stop offset="1" style="stop-color:#7DC51A"/>
</linearGradient>
<path d="M57.619,37.628l-1.189-2.479c0,0-0.269-0.707-1.11-0.841H40.568 c-0.843,0.134-1.111,0.841-1.111,0.841l-1.188,2.479c-0.289,0.325-0.356,0.74-0.371,0.987h20.092 C57.975,38.368,57.908,37.953,57.619,37.628z" fill="url(#SVGID_2_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="47.9487" x2="47.9487" y1="37.0742" y2="57.0715">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="1" style="stop-color:#D11414"/>
+ <stop offset="0" style="stop-color:#FF7236"/>
+ <stop offset="1" style="stop-color:#D11414"/>
</linearGradient>
<path d="M58,55.128c0,0.793-0.644,1.437-1.436,1.437H39.333c-0.791,0-1.436-0.644-1.436-1.437V38.615 c0-0.793,0.645-1.436,1.436-1.436h17.232c0.792,0,1.436,0.643,1.436,1.436V55.128z" fill="url(#SVGID_3_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="47.9487" x2="47.9487" y1="51.5391" y2="37.1797">
-<stop offset="0" style="stop-color:#961414"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+ <stop offset="0" style="stop-color:#961414"/>
+ <stop offset="1" style="stop-color:#FF7236"/>
</linearGradient>
<path d="M40.769,51.539h14.359c0.793,0,1.437-0.645,1.437-1.438V37.18H39.333v12.922 C39.333,50.895,39.976,51.539,40.769,51.539z" fill="url(#SVGID_4_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="47.9478" x2="47.9478" y1="50.2227" y2="56.8339">
-<stop offset="0" style="stop-color:#961414"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+ <stop offset="0" style="stop-color:#961414"/>
+ <stop offset="1" style="stop-color:#FF7236"/>
</linearGradient>
<path d="M55.87,51.326c-0.17,0.104-0.359,0.168-0.564,0.194c-0.047,0.011-0.103,0.019-0.177,0.019H40.769 c-0.074,0-0.13-0.008-0.177-0.019c-0.205-0.026-0.395-0.091-0.564-0.194l-1.929,4.525c0.25,0.424,0.706,0.713,1.233,0.713h17.232 c0.527,0,0.983-0.289,1.232-0.713L55.87,51.326z" fill="url(#SVGID_5_)"/>
-<path d="M55.305,52.238c0.205-0.025,0.395-0.092,0.564-0.193l1.731,4.062c0.073-0.078,0.142-0.161,0.196-0.255 l-1.928-4.525c-0.17,0.104-0.359,0.168-0.564,0.194c-0.047,0.011-0.103,0.019-0.177,0.019H40.769c-0.074,0-0.13-0.008-0.177-0.019 c-0.205-0.026-0.395-0.091-0.564-0.194l-1.929,4.525c0.056,0.094,0.124,0.177,0.198,0.255l1.73-4.062 c0.17,0.102,0.359,0.168,0.564,0.193c0.047,0.011,0.103,0.018,0.177,0.018" fill-opacity="0.15" stroke-opacity="0.15"/>
-<path d="M39.333,37.18v12.922c0,0.793,0.644,1.438,1.437,1.438h14.359c0.793,0,1.437-0.645,1.437-1.438V37.18H39.333z M55.846,50.102c0,0.396-0.322,0.719-0.718,0.719H40.769c-0.396,0-0.718-0.322-0.718-0.719V37.896h15.795V50.102z" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M55.305,52.238c0.205-0.025,0.395-0.092,0.564-0.193l1.731,4.062c0.073-0.078,0.142-0.161,0.196-0.255 l-1.928-4.525c-0.17,0.104-0.359,0.168-0.564,0.194c-0.047,0.011-0.103,0.019-0.177,0.019H40.769c-0.074,0-0.13-0.008-0.177-0.019 c-0.205-0.026-0.395-0.091-0.564-0.194l-1.929,4.525c0.056,0.094,0.124,0.177,0.198,0.255l1.73-4.062 c0.17,0.102,0.359,0.168,0.564,0.193c0.047,0.011,0.103,0.018,0.177,0.018" opacity="0.15"/>
+<path d="M39.333,37.18v12.922c0,0.793,0.644,1.438,1.437,1.438h14.359c0.793,0,1.437-0.645,1.437-1.438V37.18H39.333z M55.846,50.102c0,0.396-0.322,0.719-0.718,0.719H40.769c-0.396,0-0.718-0.322-0.718-0.719V37.896h15.795V50.102z" opacity="0.1"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="47.9487" x2="47.9487" y1="34.292" y2="37.2548">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="1" style="stop-color:#D11414"/>
+ <stop offset="0" style="stop-color:#FF7236"/>
+ <stop offset="1" style="stop-color:#D11414"/>
</linearGradient>
<path d="M56.565,35.742c0-0.793-0.644-1.435-1.437-1.435H40.769c-0.793,0-1.437,0.642-1.437,1.435v1.438 h17.232V35.742z" fill="url(#SVGID_6_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="47.8735" x2="47.8735" y1="37.4336" y2="34.3221">
-<stop offset="0" style="stop-color:#EC4B27"/>
-<stop offset="1" style="stop-color:#FF9A4D"/>
+ <stop offset="0" style="stop-color:#EC4B27"/>
+ <stop offset="1" style="stop-color:#FF9A4D"/>
</linearGradient>
-<path d="M39.333,37.18h17.232c0.465,0,0.874,0.225,1.137,0.568 c-0.027-0.041-0.049-0.082-0.083-0.12l-1.189-2.479c0,0-0.269-0.707-1.11-0.841H40.568c-0.843,0.134-1.111,0.841-1.111,0.841 l-1.188,2.479c-0.102,0.113-0.167,0.237-0.223,0.362C38.28,37.512,38.765,37.18,39.333,37.18z" fill="url(#SVGID_7_)" fill-opacity="0.65" stroke-opacity="0.65"/>
+<path d="M39.333,37.18h17.232c0.465,0,0.874,0.225,1.137,0.568 c-0.027-0.041-0.049-0.082-0.083-0.12l-1.189-2.479c0,0-0.269-0.707-1.11-0.841H40.568c-0.843,0.134-1.111,0.841-1.111,0.841 l-1.188,2.479c-0.102,0.113-0.167,0.237-0.223,0.362C38.28,37.512,38.765,37.18,39.333,37.18z" fill="url(#SVGID_7_)" opacity="0.65"/>
<path d="M57.787,37.869c0.007,0.012,0.011,0.021,0.017,0.033C57.797,37.891,57.792,37.881,57.787,37.869z" fill="#C7FF5A"/>
<path d="M37.985,38.139c-0.003,0.01-0.006,0.02-0.01,0.029C37.979,38.158,37.982,38.148,37.985,38.139z" fill="#C7FF5A"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="47.9487" x2="47.9487" y1="37.0742" y2="57.0715">
-<stop offset="0" style="stop-color:#FDDB2B"/>
-<stop offset="0.5455" style="stop-color:#FF9A4D"/>
-<stop offset="1" style="stop-color:#EC4B27"/>
+ <stop offset="0" style="stop-color:#FDDB2B"/>
+ <stop offset="0.5455" style="stop-color:#FF9A4D"/>
+ <stop offset="1" style="stop-color:#EC4B27"/>
</linearGradient>
<path d="M56.565,37.18H39.333c-0.791,0-1.436,0.643-1.436,1.436v16.513c0,0.793,0.645,1.437,1.436,1.437 h17.232c0.792,0,1.436-0.644,1.436-1.437V38.615C58,37.822,57.357,37.18,56.565,37.18z M57.282,55.128 c0,0.396-0.322,0.718-0.717,0.718H39.333c-0.395,0-0.717-0.322-0.717-0.718V38.615c0-0.396,0.322-0.719,0.717-0.719h17.232 c0.395,0,0.717,0.322,0.717,0.719V55.128z" fill="url(#SVGID_8_)"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_social_media.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_social_media.svg Fri May 14 16:09:54 2010 +0300
@@ -1,263 +1,523 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
+
<stop offset="1" stop-color="#1B66D8"/>
+
</linearGradient>
+
<circle cx="30" cy="28.98" fill="url(#SVGID_1)" r="21.43"/>
+
<radialGradient cx="29.68" cy="21.59" gradientUnits="userSpaceOnUse" id="SVGID_2" r="25.79">
+
<stop offset="0" stop-color="#94FFFF"/>
+
<stop offset="0.5" stop-color="#36B5FF"/>
+
<stop offset="1" stop-color="#1B66D8"/>
+
</radialGradient>
+
<path d="M50.88,28.98c0,11.53-9.346,20.88-20.88,20.88s-20.88-9.345-20.88-20.88c0-11.53,9.349-20.88,20.88-20.88s20.88,9.36,20.88,20.88z" fill="url(#SVGID_2)"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="30" x2="30" y1="7.92" y2="49.97">
+
<stop offset="0" stop-color="#31A7F8"/>
+
<stop offset="0.5" stop-color="#1E74DC"/>
+
<stop offset="1" stop-color="#88D6EB"/>
+
</linearGradient>
+
<path d="M30,8.107c-11.53,0-20.88,9.349-20.88,20.88s9.349,20.88,20.88,20.88,20.88-9.345,20.88-20.88c0-11.53-9.35-20.88-20.88-20.88zm0,39.92c-10.84,0-19.66-8.817-19.66-19.66s8.82-19.66,19.66-19.66,19.66,8.819,19.66,19.66c0,10.85-8.82,19.66-19.66,19.66z" fill="url(#SVGID_3)" fill-opacity="0.3" stroke-opacity="0.3"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="9.46" x2="12.78" y1="31.83" y2="31.83">
+
<stop offset="0" stop-color="#58595B"/>
+
<stop offset="1" stop-color="#000000"/>
+
</linearGradient>
+
<path d="M11.08,28.64c-0.222-0.295-0.725-0.295-0.946-0.295-0.437,0-0.669,0.311-0.673,0.616v0.021,0.031c0,0.537,0.03,1.14,0.094,1.871,0.013,0.139,0.03,0.276,0.047,0.414l0.024,0.201c0.055,0.434,0.121,0.861,0.195,1.274l0.035,0.183c0.032,0.162,0.063,0.323,0.097,0.483,0.089,0.405,0.198,0.827,0.332,1.29,0.019,0.066,0.037,0.135,0.054,0.199,0.029,0.109,0.058,0.217,0.091,0.322l0.005,0.014,0.012,0.033c-0.003-0.01-0.008-0.023-0.01-0.037l1.197-0.081c0.019-0.187,0.025-0.382,0.019-0.575-0.01-0.303-0.021-0.676-0.108-0.991l1.112-1.493,0.121-0.162v-1.595l-0.16-0.18-1.52-1.53z" fill="url(#SVGID_4)" fill-opacity="0.3" stroke-opacity="0.3"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="15.86" x2="50.59" y1="25.75" y2="25.75">
+
<stop offset="0" stop-color="#58595B"/>
+
<stop offset="1" stop-color="#000000"/>
+
</linearGradient>
+
<path d="M50.58,24.89c-0.015-0.079-0.029-0.135-0.043-0.191-0.012-0.042-0.021-0.084-0.029-0.125-0.105-0.495-0.236-1.006-0.391-1.525l-0.02-0.07c-0.033-0.117-0.067-0.234-0.105-0.349-0.188-0.587-0.393-1.148-0.607-1.666-0.028-0.065-0.057-0.125-0.085-0.188l-0.045-0.101c-0.206-0.473-0.435-0.947-0.677-1.402l-0.03-0.059c-0.046-0.089-0.092-0.181-0.141-0.269-0.295-0.532-0.603-1.04-0.918-1.511-0.032-0.049-0.069-0.102-0.106-0.154-0.023-0.031-0.045-0.062-0.066-0.092-0.301-0.437-0.617-0.862-0.946-1.268l-0.063-0.081c-0.045-0.055-0.089-0.112-0.135-0.167-0.381-0.456-0.783-0.898-1.199-1.316-0.055-0.057-0.114-0.115-0.176-0.172l-0.049-0.046c-0.375-0.369-0.774-0.731-1.183-1.074l-0.081-0.069c-0.041-0.037-0.082-0.073-0.125-0.106-0.446-0.367-0.93-0.728-1.435-1.075-0.063-0.042-0.126-0.083-0.19-0.124l-0.076-0.05c-0.455-0.301-0.93-0.589-1.404-0.853l-0.074-0.042c-0.039-0.022-0.078-0.045-0.118-0.068-0.528-0.283-1.081-0.55-1.643-0.792l-0.12-0.056-0.153-0.063c-0.148-0.062-0.297-0.114-0.444-0.166-0.076-0.026-0.152-0.053-0.228-0.08l-0.282-0.105-0.254,0.162c-0.171,0.108-0.841,0.491-1.236,0.715-0.438-0.059-1.499-0.192-2.569-0.295,0.33-0.032,0.786-0.069,1.429-0.111l0.091-1.204-0.048-0.012c-0.038-0.011-0.077-0.02-0.116-0.029l-0.091-0.018-0.075-0.014c-0.654-0.132-1.271-0.227-1.882-0.291l-0.004-0.001h-0.09c-0.698-0.07-1.409-0.106-2.113-0.106-0.62,0-1.262,0.032-1.963,0.101-0.109,0.01-0.214,0.021-0.321,0.032-0.693,0.078-1.299,0.169-1.873,0.286l-0.02,0.003-0.014,0.002c-0.603,0.125-1.211,0.281-1.856,0.477-0.058,0.018-0.115,0.037-0.173,0.055l-0.13,0.043c-0.547,0.175-1.083,0.37-1.596,0.582-0.042,0.018-0.071,0.029-0.099,0.039l-0.078,0.031c-0.564,0.241-1.128,0.512-1.688,0.812-0.061,0.031-0.119,0.066-0.177,0.1l-0.072,0.042c-0.157,0.087-0.316,0.186-0.472,0.283l-0.204,0.127-1.118,0.684,1.242,0.416c0.186,0.062,0.385,0.093,0.592,0.093,0.669,0,1.317-0.329,1.837-0.593,0.209-0.105,0.521-0.264,0.648-0.288,0.152,0.045,0.306,0.068,0.458,0.068,0.569,0,1.035-0.306,1.447-0.578l0.111-0.071c0.133-0.043,0.362-0.128,0.818-0.299,0.465-0.174,1.314-0.493,1.541-0.547,0.44-0.005,0.966-0.068,1.339-0.3,0.352,0.058,0.976,0.157,1.619,0.241-0.046,0.029-0.092,0.059-0.132,0.097-0.209,0.192-1.335,0.533-1.679,0.577-0.648,0.082-0.908,0.408-1.012,0.666-0.135,0.336-0.053,0.672,0.078,0.946-0.245,0.162-0.545,0.342-0.804,0.478,0.001-0.006,0.002-0.012,0.003-0.019,0.093-0.517,0.161-0.89-0.09-1.189-0.128-0.153-0.318-0.241-0.519-0.241-0.295,0-0.525,0.183-0.711,0.362-0.519,0.502-0.833,1.129-0.953,1.365l-0.022,0.044-0.018,0.035c-0.225,0.431-0.318,0.737-0.192,1.688-0.056,0.04-0.219,0.102-0.446,0.102-0.03,0-0.058-0.003-0.079-0.004-0.146-0.158-0.348-0.247-0.575-0.247-0.523,0-1.237,0.589-2.124,1.754l-0.284,0.374,0.29,0.37,0.269,0.344c-4.215,3.258-4.247,3.443-4.292,3.716-0.007,0.024-0.044,0.138-0.094,0.293-0.628,1.952-0.977,3.412-0.637,4.195,0.785,1.813,1.669,3.504,2.816,3.598,0.101,0.009,0.212,0.012,0.332,0.012,1.05,0,2.753-0.318,3.571-0.485,0.152,0.283,0.335,0.615,0.437,0.795l0.182,0.322,0.37-0.012c0.004,0,0.2-0.006,0.447-0.006,0.287,0,0.479,0.008,0.602,0.016,0.446,1.307,1.3,4.318,1.141,4.943l-0.002,0.002c-1.441,2.16,0.305,4.975,1.144,6.328,0.066,0.107,0.126,0.203,0.177,0.287,0.324,0.922,0.716,1.531,1.545,1.531,0.062,0,0.124-0.004,0.188-0.007,0.046-0.003,0.095-0.005,0.146-0.005,0.092,0,0.158,0.011,0.226,0.035l0.076,0.027,0.08,0.008c0.155,0.012,0.306,0.034,0.453,0.055,0.255,0.035,0.519,0.071,0.789,0.071,0.721,0,1.293-0.272,1.787-0.856,0.018-0.002,0.036-0.003,0.054-0.006,0.519-0.071,0.712-0.331,0.778-0.564,0.039-0.038,0.09-0.086,0.131-0.124,0.205-0.188,0.447-0.411,0.615-0.675,0.076-0.044,0.162-0.096,0.258-0.152,0.167-0.104,0.355-0.217,0.504-0.293,0.131-0.04,0.246-0.116,0.334-0.225,0.209-0.257,0.166-0.548,0.131-0.783-0.035-0.242-0.07-0.49,0.061-0.758,0.737-0.354,2.051-1.23,2.262-1.373l-0.001,0.017c-0.013,0.116-0.048,0.431-0.101,0.628-0.278,0.28-0.512,0.703-0.586,0.846l-0.048,0.094-0.015,0.104c-0.018,0.138-0.094,0.851,0.307,1.311,0.201,0.23,0.49,0.359,0.813,0.359,0.102,0,0.209-0.014,0.318-0.039,1.027-0.232,2.85-2.702,2.998-4.065,0.072-0.656-0.186-1.173-0.704-1.417l-0.387-0.183-0.304,0.302-1.125,1.126c-0.381,0.034-0.678,0.147-0.879,0.325,0.012-0.479-0.036-0.973-0.087-1.451-0.155-1.445-0.185-2.369,0.703-2.996l0.045-0.032,0.038-0.04c0.32-0.326,0.676-0.61,1.052-0.912,0.88-0.707,1.79-1.438,2.332-2.759l0.022-0.056c0.174-0.451,0.437-1.131,0.082-1.651-0.09-0.128-0.275-0.326-0.625-0.396,0.461-0.186,0.816-0.333,0.852-0.345l0.106-0.044,0.083-0.08,1.899-1.822,0.278-0.269-0.122-0.366c-0.017-0.047-0.12-0.335-0.411-0.748,0.554,0.075,1.029,0.208,1.185,0.326,0.057,0.125,0.171,0.397,0.292,0.683,2.088,4.924,2.383,5.177,2.926,5.186,0.021,0,0.037,0.002,0.051,0.003,0.043,0.003,0.083,0.005,0.119,0.005,0.309,0,0.486-0.158,0.564-0.252,0.227-0.273,0.163-0.608,0.139-0.734l-0.008-0.043c-0.025-0.294-0.009-1.618,0.034-2.706,0.003,0.002,0.004,0.006,0.007,0.01l1.119-0.445-0.04-0.09zm-16.46-6.02c-0.086,0.003-0.181,0.008-0.281,0.012-0.322,0.014-0.689,0.031-1.054,0.031-0.956,0-1.173-0.118-1.195-0.132-0.114-0.082-0.23-0.143-0.351-0.188,0.217-0.048,0.465-0.214,0.72-0.708,0.25,0.487,0.592,0.917,1.114,0.917,0.141,0,0.277-0.034,0.406-0.101,0.17,0.01,0.46,0.11,0.63,0.17zm-0.37-2.66c-0.072,0-0.131-0.003-0.176-0.007,0.049-0.128,0.108-0.202,0.154-0.244,0.061,0.093,0.141,0.175,0.232,0.245-0.07,0-0.14,0.01-0.2,0.01zm-3.8,1.27c0.327,0.641,0.569,0.917,0.762,1.037-0.475,0.039-0.833,0.34-1.126,0.625-0.206-0.068-0.565-0.286-0.672-0.438-0.063-0.089-0.138-0.166-0.22-0.232,0.52-0.14,0.97-0.62,1.26-0.99zm-1.81-0.47l-0.678-0.034-2.279-0.111c0.278-0.228,0.542-0.444,0.697-0.57,0.042-0.014,0.205-0.06,0.606-0.06,0.242,0,0.473,0.017,0.62,0.029l1.03,0.74z" fill="url(#SVGID_5)" fill-opacity="0.3" stroke-opacity="0.3"/>
+
<radialGradient cx="30.34" cy="14.28" gradientUnits="userSpaceOnUse" id="SVGID_6" r="23.56">
+
<stop offset="0" stop-color="#7AF200"/>
+
<stop offset="0.32" stop-color="#7AF200"/>
+
<stop offset="0.73" stop-color="#1CAD0F"/>
+
<stop offset="1" stop-color="#007A3A"/>
+
</radialGradient>
+
<path d="M10.07,28.97v0.018c0,0.622,0.039,1.237,0.093,1.843,0.017,0.199,0.046,0.398,0.069,0.599,0.053,0.417,0.116,0.829,0.19,1.237,0.042,0.217,0.082,0.434,0.127,0.646,0.093,0.422,0.203,0.838,0.321,1.248,0.05,0.17,0.089,0.343,0.14,0.508,0.007,0.018,0.014,0.034,0.018,0.053,0.017-0.162,0.021-0.327,0.017-0.497-0.04-1.199-0.233-1.045-0.233-1.045l1.357-1.823v-1.162l-1.589-1.59c-0.01,0-0.52-0.08-0.52-0.04z" fill="url(#SVGID_6)"/>
+
<path d="M22.83,10.95c0.587,0.192,1.066-0.2,1.613-0.548,0.193-0.04,2.338-0.896,2.57-0.896,0.231,0,1.01-0.03,1.204-0.34,0,0,3.357,0.583,3.862,0.389,0.277-0.108,1.434-0.2,2.426-0.265-0.057-0.012-0.107-0.029-0.162-0.041-0.055-0.011-0.106-0.019-0.162-0.03-0.623-0.125-1.252-0.226-1.894-0.29-0.005,0-0.01,0-0.015-0.002-0.674-0.068-1.359-0.104-2.053-0.104-0.643,0-1.277,0.039-1.906,0.098-0.11,0.011-0.22,0.023-0.331,0.035-0.608,0.066-1.21,0.155-1.8,0.273-0.01,0.004-0.021,0.005-0.031,0.006-0.613,0.126-1.213,0.283-1.802,0.464-0.102,0.03-0.199,0.064-0.301,0.096-0.523,0.168-1.038,0.356-1.544,0.564-0.06,0.026-0.12,0.047-0.18,0.071-0.556,0.238-1.099,0.501-1.629,0.784-0.08,0.043-0.157,0.089-0.235,0.134-0.227,0.125-0.44,0.267-0.66,0.401,1.07,0.38,2.43-0.99,3.01-0.79z" fill="url(#SVGID_6)"/>
+
<path d="M49.98,25c-0.021-0.102-0.049-0.197-0.07-0.296-0.105-0.499-0.233-0.99-0.377-1.473-0.039-0.13-0.076-0.265-0.117-0.395-0.176-0.548-0.372-1.09-0.592-1.617-0.039-0.093-0.084-0.184-0.123-0.275-0.203-0.464-0.422-0.918-0.658-1.363-0.055-0.106-0.109-0.215-0.166-0.319-0.279-0.502-0.574-0.993-0.892-1.468-0.054-0.083-0.115-0.162-0.171-0.242-0.291-0.422-0.596-0.831-0.916-1.228-0.063-0.079-0.126-0.161-0.193-0.241-0.368-0.443-0.756-0.868-1.16-1.277-0.07-0.071-0.143-0.141-0.215-0.208-0.371-0.364-0.756-0.714-1.153-1.047-0.067-0.056-0.132-0.116-0.198-0.171-0.448-0.366-0.915-0.714-1.395-1.042-0.084-0.058-0.17-0.113-0.256-0.167-0.442-0.294-0.898-0.572-1.365-0.83-0.064-0.035-0.124-0.073-0.188-0.108-0.52-0.278-1.049-0.533-1.594-0.768-0.097-0.041-0.195-0.079-0.29-0.12-0.212-0.087-0.432-0.156-0.646-0.235-0.255,0.163-1.438,0.832-1.438,0.832s-5.141-0.702-5.492-0.353c-0.351,0.353-1.721,0.71-2.033,0.751-0.31,0.039-0.956,0.206-0.181,1.161-0.116,0.118-2.325,1.657-2.325,0.957,0-0.701,0.494-1.953-0.2-1.282-0.498,0.482-0.796,1.135-0.86,1.257-0.163,0.313-0.263,0.462-0.145,1.357s-1.43,0.891-1.534,0.659c-0.277-0.622-1.809,1.394-1.809,1.394l0.647,0.828s-4.509,3.474-4.548,3.707c-0.039,0.234-1.164,3.25-0.775,4.146,0.389,0.898,1.375,3.158,2.307,3.233,1.221,0.1,4.185-0.559,4.185-0.559,0.08,0.196,0.637,1.189,0.637,1.189s1.453-0.047,1.534,0.11c0.027,0.053,1.75,5.121,1.182,5.793-1.357,2.032,0.775,5.011,1.369,6.018,0.595,1.731,0.977,0.957,1.758,1.239,0.961,0.084,1.773,0.439,2.589-0.611,0.237-0.195,0.641-0.041,0.641-0.313,0-0.152,0.697-0.598,0.877-1.018,0.189-0.089,0.675-0.415,1.004-0.572,0.299-0.02-0.283-0.82,0.309-1.666,0.639-0.252,2.364-1.415,2.364-1.415,0.077-1.704-0.839-3.812,0.873-5.02,1.104-1.125,2.552-1.765,3.253-3.478,0.195-0.505,0.629-1.542-0.619-1.231-1.172,0.295-2.479,0.362-1.861-0.154-0.07-0.634-0.85-0.931-1.549-1.551-0.361-0.854-0.93-2.378-0.93-2.378l-1.24-1.884,0.156-0.389,1.473,2.17,1.475,1.782c0.541,1.783,1.006,1.939,1.006,1.939,0.816-0.289,2.752-1.085,2.752-1.085l1.899-1.823s-0.195-0.581-0.967-1.316l-0.584-0.349c-0.126,0.357-0.802,0.492-0.802,0.492l-1.641-1.963,0.61-0.123,0.471,0.896,1.128,0.39s0.313-0.229,0.893,0.371c0.473-0.04,2.318,0.089,2.749,0.636,0.085,0.109,2.286,5.606,2.72,5.614,0.191,0.001,0.329,0.077,0.268-0.256-0.078-0.157,0-3.609,0.115-4.349,0.295-0.627,0.344-0.002,1.039,1.188-0.01-0.04-0.02-0.07-0.02-0.09zm-19.37-13.33c0.153-0.459,1.046-0.615,1.046-0.615s-0.256,0.472-0.196,0.716c0.06,0.246-0.407,0.401-0.46,0.982-0.051,0.577-1.117,0.239-1.205,0.036-0.09-0.21,0.65-0.67,0.81-1.13zm3.82,7.8c-0.661,0-2.644,0.196-3.189-0.193-0.547-0.389-0.97,0.039-1.363,0.429-0.258,0.253-1.193-0.259-1.467-0.649-0.272-0.39-1.188-0.361-1.188-0.361l0.208-1.11-2.637-0.128-1.499,0.439-1.411,0.041,0.79-0.376,0.984-0.232s1.431-1.175,1.858-1.525c0.364-0.296,1.81-0.129,1.81-0.129l1.589,1.146s-0.353,0.898-0.508,1.09c0.583-0.039,1.269-1.099,1.269-1.099-1.239-1.138-1.189-1.524-1.189-1.524l1.633,1.146,0.015,0.01s0.662,1.558,0.937,1.558c0.271,0,0.619-1.073,0.619-1.073l0.466-0.117c0.207,0.492,0.594,1.602,1.059,1.343,0.268-0.147,0.709-0.013,1.213,0.18,0.51,0.195,0.854-0.104,1.268,0.258-0.04,1.6-0.99,0.95-1.26,0.87zm1.04-2.68c-0.682-0.259-2.984,0.586-2.469-0.796,0.274-0.746,0.98-0.902,1.221-0.405,0.063,0.203,0.83,0.519,0.825,0.089-0.006-0.43,0.771-0.659,0.883-0.338-0.41,0.31,1.63,1.86-0.45,1.46zm4.34,1.31c-0.377-0.304,0.169-0.564-0.387-1.04-0.799-0.684-1.421-0.979-0.334-1.532,1.34-0.168,0.217,0.428,0.439,0.785,0.119,0.19,0.797,0.828,1.326,1.61,0.43,0.64-0.68,0.47-1.05,0.17z" fill="url(#SVGID_6)"/>
+
<path d="M40.35,35.86l-1.293,1.291-0.814,0.311c-0.018,0.133-0.063,0.709-0.192,1.008-0.259,0.18-0.569,0.775-0.569,0.775s-0.159,1.149,0.699,0.953c0.85-0.19,3.48-3.71,2.16-4.33z" fill="url(#SVGID_6)"/>
+
<rect fill="none" height="60" width="60"/>
+
<rect fill-opacity="0.4" height="25" stroke-opacity="0.4" transform="matrix(0.8133 -0.5819 0.5819 0.8133 -15.5607 18.7982)" width="3.674" x="19.67" y="21.14"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10" x1="22.2" x2="20.47" y1="32.54" y2="33.77">
+
<stop offset="0" stop-color="#999999"/>
+
<stop offset="0.27" stop-color="#FFFFFF"/>
+
<stop offset="0.67" stop-color="#999999"/>
+
<stop offset="0.82" stop-color="#666666"/>
+
<stop offset="1" stop-color="#B3B3B3"/>
+
</linearGradient>
+
<polygon fill="url(#SVGID_10)" points="27.43,43.41,13.6,24.08,15.59,22.65,29.42,41.98"/>
+
<rect fill-opacity="0.4" height="3.673" stroke-opacity="0.4" transform="matrix(0.5821 -0.8131 0.8131 0.5821 -11.1119 45.664)" width="25" x="26.37" y="31.81"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11" x1="38.02" x2="39.86" y1="32.42" y2="33.75">
+
<stop offset="0" stop-color="#999999"/>
+
<stop offset="0.27" stop-color="#FFFFFF"/>
+
<stop offset="0.67" stop-color="#999999"/>
+
<stop offset="0.82" stop-color="#666666"/>
+
<stop offset="1" stop-color="#B3B3B3"/>
+
</linearGradient>
+
<polygon fill="url(#SVGID_11)" points="32.94,43.41,46.78,24.08,44.79,22.65,30.95,41.98"/>
+
<rect fill-opacity="0.4" height="3.673" stroke-opacity="0.4" width="33.13" x="12.89" y="17.7"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12" x1="29.46" x2="29.46" y1="17.65" y2="20.41">
+
<stop offset="0" stop-color="#999999"/>
+
<stop offset="0.27" stop-color="#FFFFFF"/>
+
<stop offset="0.67" stop-color="#999999"/>
+
<stop offset="0.82" stop-color="#666666"/>
+
<stop offset="1" stop-color="#B3B3B3"/>
+
</linearGradient>
+
<polygon fill="url(#SVGID_12)" points="45.41,20.15,13.5,20.15,13.5,17.7,45.41,17.7"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13" x1="30.11" x2="30.11" y1="29.69" y2="50.46">
+
<stop offset="0" stop-color="#A6A8AB"/>
+
<stop offset="1" stop-color="#231F20"/>
+
</linearGradient>
+
<path d="M35.36,45.61l-0.757-0.28-0.134-0.055-0.16-0.062-0.428-0.172c-0.199-0.361-0.211-1.13-0.064-1.471l-0.262-0.146,0.283,0.101c0.043-0.067,0.084-0.136,0.126-0.208l0.043-0.069c0.319-0.522,0.617-1.071,0.885-1.634,0.669-0.076,1.322-0.654,1.659-1.489,0.387-0.95,0.262-1.936-0.283-2.444,0.493-2.213,0.152-4.221-0.959-5.652-1.123-1.449-2.96-2.258-5.325-2.335-2.061,0-3.124,0.913-3.877,1.834-0.559,0.129-1.289,0.453-1.808,1.257-0.7,1.084-0.787,2.715-0.259,4.851-0.583,0.487-0.74,1.474-0.365,2.456,0.353,0.922,1.079,1.539,1.808,1.539h0.013c0.114,0.242,0.234,0.479,0.357,0.711h-0.039l0.277,0.453s0.419,0.688,0.447,0.73c0.111,0.174,0.204,0.962-0.004,1.44l-0.567,0.249c-0.331,0.129-0.744,0.285-1.191,0.455-1.251,0.477-2.672,1.017-3.214,1.305-0.548,0.291-1.022,0.639-1.431,1.033,2.953,1.533,6.304,2.406,9.861,2.406,3.646,0,7.078-0.914,10.08-2.52-0.555-0.522-1.066-0.816-1.269-0.923-0.53-0.28-2.15-0.88-3.46-1.37z" fill="url(#SVGID_13)" fill-opacity="0.2" stroke-opacity="0.2"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14" x1="30.11" x2="30.11" y1="29.99" y2="50.46">
+
<stop offset="0" stop-color="#A9AAAD"/>
+
<stop offset="1" stop-color="#000000"/>
+
</linearGradient>
+
<path d="M35.26,45.89l-0.766-0.284-0.129-0.052-0.164-0.063-0.518-0.207c-0.324-0.445-0.318-1.407-0.137-1.838l0.012-0.021c0.01-0.023,0.019-0.043,0.031-0.063,0.041-0.066,0.084-0.134,0.121-0.201l0.045-0.069c0.344-0.563,0.662-1.157,0.947-1.769,0.016,0.001,0.029,0.001,0.045,0.001,0.599,0,1.213-0.526,1.531-1.312,0.37-0.914,0.217-1.848-0.339-2.216,0.026-0.114,0.039-0.177,0.039-0.177,0.474-2.127,0.153-4.049-0.903-5.41-1.066-1.377-2.824-2.144-5.089-2.219-1.961,0-2.952,0.856-3.712,1.805-0.537,0.104-1.234,0.394-1.722,1.15-0.675,1.044-0.731,2.663-0.171,4.814-0.597,0.337-0.785,1.283-0.425,2.224,0.309,0.804,0.923,1.347,1.529,1.347,0.064,0,0.13-0.007,0.191-0.02,0.213,0.455,0.441,0.9,0.684,1.326h-0.01l0.362,0.592s0.055,0.092,0.082,0.134c0.185,0.288,0.271,1.284-0.036,1.83l-0.676,0.296c-0.334,0.129-0.747,0.287-1.187,0.454-1.246,0.474-2.66,1.012-3.187,1.292-0.489,0.259-0.921,0.564-1.293,0.912,2.885,1.445,6.138,2.264,9.584,2.264,3.533,0,6.863-0.86,9.801-2.376-0.495-0.449-0.942-0.707-1.126-0.802-0.48-0.25-2.09-0.85-3.39-1.33z" fill="url(#SVGID_14)" fill-opacity="0.4" stroke-opacity="0.4"/>
+
<radialGradient cx="30.36" cy="49.25" gradientUnits="userSpaceOnUse" id="SVGID_15" r="8.41">
+
<stop offset="0" stop-color="#FFA98E"/>
+
<stop offset="0.2" stop-color="#FFA98E"/>
+
<stop offset="0.96" stop-color="#D45D36"/>
+
<stop offset="1" stop-color="#D45D36"/>
+
</radialGradient>
+
<path d="M33.78,45.44c-0.79-0.343-0.766-2.028-0.439-2.538,0.057-0.089,0.109-0.178,0.164-0.268h-6.62c0.054,0.09,0.106,0.179,0.163,0.268,0.327,0.51,0.352,2.195-0.439,2.538-0.792,0.345,3.68,3.339,3.68,3.339s4.29-2.99,3.5-3.34z" fill="url(#SVGID_15)"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16" x1="30.19" x2="30.19" y1="45.13" y2="52.06">
+
<stop offset="0" stop-color="#3BC8EB"/>
+
<stop offset="0.39" stop-color="#2D9BD2"/>
+
<stop offset="0.89" stop-color="#1347BA"/>
+
<stop offset="1" stop-color="#1347BA"/>
+
</linearGradient>
+
<path d="M38.54,47.2c-0.832-0.434-4.959-1.878-5.036-1.968l-3.151,2.619-3.386-2.721c-0.094,0.139-4.171,1.568-5.116,2.069-1.08,0.573-2.844,1.892-2.844,4.86h22.38c0-2.97-2.01-4.43-2.84-4.86z" fill="url(#SVGID_16)"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17" x1="30.22" x2="30.22" y1="44.68" y2="48.73">
+
<stop offset="0" stop-color="#FAFAFA"/>
+
<stop offset="0.78" stop-color="#CCCCCC"/>
+
<stop offset="1" stop-color="#D1D1D1"/>
+
</linearGradient>
+
<polygon fill="url(#SVGID_17)" points="26.19,45.47,30.35,48.78,34.25,45.54,33.5,45.23,30.35,47.85,26.96,45.13"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_18" x1="19.6" x2="26.39" y1="48.84" y2="48.84">
+
<stop offset="0" stop-color="#85EFFF"/>
+
<stop offset="1" stop-color="#3BA1D9"/>
+
</linearGradient>
+
<path d="M26.39,45.99s-5.931,1.549-5.931,5.703h-0.854c-0.01-2.55,1.99-4.54,6.78-5.7z" fill="url(#SVGID_18)"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_19" x1="33.92" x2="40.7" y1="48.75" y2="48.75">
+
<stop offset="0" stop-color="#85EFFF"/>
+
<stop offset="1" stop-color="#3BA1D9"/>
+
</linearGradient>
+
<path d="M33.92,45.9s5.932,1.549,5.932,5.704h0.854c0-2.56-1.99-4.54-6.78-5.7z" fill="url(#SVGID_19)"/>
+
<polygon fill="#020202" fill-opacity="0.3" points="30.35,48.78,26.19,45.47,25.95,45.57,30.35,49.08,34.5,45.63,34.25,45.53" stroke-opacity="0.3"/>
+
<radialGradient cx="30.12" cy="33.65" gradientUnits="userSpaceOnUse" id="SVGID_20" r="11.29">
+
<stop offset="0" stop-color="#FFE2D9"/>
+
<stop offset="0.51" stop-color="#FFC6B3"/>
+
<stop offset="0.76" stop-color="#FFA98E"/>
+
<stop offset="1" stop-color="#E88160"/>
+
</radialGradient>
+
<path d="M35.68,37.69c-0.028-0.014-0.062-0.016-0.089-0.024-0.006-0.002-0.011-0.004-0.016-0.004-0.045-0.013-0.088-0.021-0.133-0.025-5.527-0.961-8.062-4.021-8.253-3.211-0.152,0.645-1.702,2.039-2.513,2.736,0.006,0.031,0.01,0.059,0.017,0.09,0,0,0.03,0.143,0.089,0.385-0.063,0.008-0.126,0.021-0.188,0.047-0.517,0.217-0.679,1.063-0.362,1.891,0.316,0.827,0.991,1.322,1.508,1.104,0.032-0.014,0.059-0.036,0.089-0.056,0.3,0.676,0.668,1.397,1.119,2.123,0.755,0.898,1.914,1.951,3.192,1.951,1.547,0,2.493-0.846,3.144-1.698,0.016-0.036,0.033-0.069,0.053-0.099,0.482-0.753,0.873-1.51,1.188-2.213,0.505,0.175,1.153-0.294,1.476-1.089,0.33-0.81,0.18-1.67-0.33-1.9z" fill="url(#SVGID_20)"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_21" x1="28.2" x2="32.97" y1="45.22" y2="40.48">
+
<stop offset="0" stop-color="#FFC6B3"/>
+
<stop offset="1" stop-color="#FFA98E"/>
+
</linearGradient>
+
<path d="M29.92,44.27c-0.942,0-1.892-0.439-2.589-1.1,0.74,0.776,1.733,1.531,2.817,1.531,1.546,0,2.493-0.846,3.144-1.698,0.015-0.036,0.031-0.069,0.053-0.099,0.48-0.753,0.873-1.51,1.188-2.213-1.76,3.08-3.07,3.58-4.61,3.58z" fill="url(#SVGID_21)"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_22" x1="30.1" x2="30.1" y1="30.09" y2="37.12">
+
<stop offset="0" stop-color="#8A5D3B"/>
+
<stop offset="0.38" stop-color="#632F00"/>
+
<stop offset="1" stop-color="#361700"/>
+
</linearGradient>
+
<path d="M29.99,29.99c-1.917,0-2.837,0.872-3.549,1.782-1.158,0.178-2.991,1.238-1.696,5.884,0.812-0.695,2.295-2.581,2.447-3.226,0.192-0.819,2.771,2.307,8.402,3.238,0.064-0.26,0.095-0.413,0.095-0.413,0.89-3.96-1.03-7.1-5.69-7.26z" fill="url(#SVGID_22)"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_23" x1="32.5" x2="26.13" y1="36.82" y2="33.04">
+
<stop offset="0" stop-color="#8A5D3B"/>
+
<stop offset="0.36" stop-color="#632F00"/>
+
<stop offset="1" stop-color="#361700"/>
+
</linearGradient>
+
<path d="M27.2,34.05s2.756,3.62,8.355,3.614c-0.01,0-2.64-0.41-8.36-3.61z" fill="url(#SVGID_23)"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_24" x1="25.56" x2="25.61" y1="32.3" y2="36.35">
+
<stop offset="0" stop-color="#8A5D3B"/>
+
<stop offset="0.38" stop-color="#632F00"/>
+
<stop offset="1" stop-color="#361700"/>
+
</linearGradient>
+
<path d="M26.53,32.04s-2.699,0.161-1.697,4.734c0.01,0.01-0.32-3.13,1.7-4.73z" fill="url(#SVGID_24)"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_25" x1="30.99" x2="30.79" y1="30.7" y2="32.53">
+
<stop offset="0" stop-color="#A87C4F"/>
+
<stop offset="1" stop-color="#632F00"/>
+
</linearGradient>
+
<path d="M31.3,32.67c-1.257-0.179-3.381-1.292-4.215-0.895,0,0,2.726-3.11,7.539,0.432,0,0-1.15,0.77-3.32,0.46z" fill="url(#SVGID_25)"/>
+
<rect fill="none" height="30" width="30" x="15.19" y="26.32"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_26" x1="15.32" x2="15.32" y1="26.12" y2="11.07">
+
<stop offset="0" stop-color="#A6A8AB"/>
+
<stop offset="1" stop-color="#231F20"/>
+
</linearGradient>
+
<path d="M8.773,26.07h13.09v-0.487c0-2.907-2.152-4.174-2.584-4.4-0.426-0.222-1.75-0.714-2.816-1.11l-0.617-0.229-0.11-0.044-0.131-0.05-0.35-0.14c-0.162-0.295-0.171-0.922-0.052-1.201l-0.213-0.119,0.23,0.082c0.035-0.056,0.067-0.111,0.103-0.169l0.036-0.057c0.261-0.427,0.503-0.875,0.723-1.334,0.545-0.062,1.08-0.534,1.355-1.215,0.315-0.775,0.213-1.58-0.231-1.996,0.149-0.672,0.204-1.319,0.168-1.928-4.6,3.36-7.803,8.5-8.607,14.4z" fill="url(#SVGID_26)" fill-opacity="0.2" stroke-opacity="0.2"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_27" x1="15.21" x2="15.21" y1="11.48" y2="26.12">
+
<stop offset="0" stop-color="#A9AAAD"/>
+
<stop offset="1" stop-color="#000000"/>
+
</linearGradient>
+
<path d="M8.804,25.83h12.82v-0.243c0-2.767-2.043-3.971-2.453-4.184-0.413-0.214-1.73-0.704-2.788-1.097l-0.625-0.232-0.104-0.042-0.135-0.051-0.422-0.169c-0.264-0.363-0.259-1.148-0.111-1.5l0.01-0.018c0.007-0.019,0.016-0.036,0.025-0.05,0.034-0.055,0.068-0.109,0.099-0.165l0.036-0.057c0.281-0.459,0.542-0.944,0.773-1.443h0.038c0.488,0,0.99-0.43,1.25-1.071,0.302-0.746,0.177-1.508-0.277-1.809,0.021-0.092,0.033-0.144,0.033-0.144,0.132-0.592,0.182-1.162,0.166-1.704-4.41,3.3-7.494,8.27-8.336,13.97z" fill="url(#SVGID_27)" fill-opacity="0.4" stroke-opacity="0.4"/>
+
<radialGradient cx="12.38" cy="23.06" gradientUnits="userSpaceOnUse" id="SVGID_28" r="6.87">
+
<stop offset="0" stop-color="#FFA98E"/>
+
<stop offset="0.2" stop-color="#FFA98E"/>
+
<stop offset="0.96" stop-color="#D45D36"/>
+
<stop offset="1" stop-color="#D45D36"/>
+
</radialGradient>
+
<path d="M15.17,19.94c-0.646-0.281-0.625-1.656-0.359-2.073,0.047-0.072,0.089-0.145,0.134-0.218h-5.398c0.043,0.073,0.087,0.146,0.133,0.218,0.266,0.417,0.287,1.792-0.359,2.073s3.003,2.725,3.003,2.725,3.5-2.44,2.85-2.72z" fill="url(#SVGID_28)"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_29" x1="12.24" x2="12.24" y1="19.68" y2="25.34">
+
<stop offset="0" stop-color="#FF7236"/>
+
<stop offset="1" stop-color="#BA1212"/>
+
</linearGradient>
+
<path d="M19.06,21.37c-0.68-0.354-4.047-1.533-4.111-1.606l-2.573,2.138-2.764-2.221c-0.077,0.113-3.406,1.28-4.176,1.689-0.881,0.469-2.321,1.543-2.321,3.967h18.27c0-2.42-1.65-3.61-2.32-3.97z" fill="url(#SVGID_29)"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_30" x1="12.27" x2="12.27" y1="19.31" y2="22.62">
+
<stop offset="0" stop-color="#BC1C24"/>
+
<stop offset="1" stop-color="#6B1C24"/>
+
</linearGradient>
+
<polygon fill="url(#SVGID_30)" points="8.978,19.96,12.37,22.66,15.56,20.02,14.94,19.77,12.37,21.9,9.608,19.68"/>
+
<path d="M9.138,20.39s-4.842,1.264-4.842,4.655h-0.697c0-2.08,1.628-3.7,5.539-4.65z" fill="#FF7B56"/>
+
<path d="M15.29,20.31s4.842,1.265,4.842,4.657h0.697c0-2.09-1.63-3.71-5.54-4.66z" fill="#FF7B56"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_31" x1="12.27" x2="12.27" y1="22.91" y2="19.78">
+
<stop offset="0" stop-color="#FFA98E"/>
+
<stop offset="0.96" stop-color="#D45D36"/>
+
<stop offset="1" stop-color="#D45D36"/>
+
</linearGradient>
+
<polygon fill="url(#SVGID_31)" points="12.37,22.66,8.978,19.96,8.78,20.04,12.37,22.91,15.76,20.09,15.56,20.01"/>
+
<radialGradient cx="12.19" cy="10.32" gradientUnits="userSpaceOnUse" id="SVGID_32" r="9.22">
+
<stop offset="0" stop-color="#FFE2D9"/>
+
<stop offset="0.51" stop-color="#FFC6B3"/>
+
<stop offset="0.76" stop-color="#FFA98E"/>
+
<stop offset="1" stop-color="#E88160"/>
+
</radialGradient>
+
<path d="M16.72,13.61c-0.023-0.012-0.049-0.013-0.072-0.021-0.005-0.001-0.009-0.002-0.013-0.003-0.036-0.01-0.071-0.018-0.108-0.02-4.511-0.784-6.582-3.283-6.737-2.621-0.124,0.526-1.39,1.665-2.051,2.232,0.005,0.026,0.008,0.048,0.013,0.074,0,0,0.024,0.116,0.074,0.315-0.052,0.006-0.104,0.016-0.154,0.038-0.422,0.178-0.553,0.869-0.295,1.543,0.258,0.675,0.809,1.08,1.231,0.902,0.026-0.012,0.048-0.03,0.072-0.045,0.244,0.551,0.546,1.141,0.914,1.733,0.617,0.733,1.563,1.593,2.605,1.593,1.263,0,2.035-0.69,2.567-1.387,0.012-0.029,0.026-0.056,0.042-0.08,0.394-0.615,0.713-1.232,0.971-1.807,0.413,0.143,0.941-0.241,1.204-0.889,0.28-0.65,0.16-1.35-0.26-1.54z" fill="url(#SVGID_32)"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_33" x1="10.61" x2="14.51" y1="19.76" y2="15.89">
+
<stop offset="0" stop-color="#FFC6B3"/>
+
<stop offset="1" stop-color="#FFA98E"/>
-</linearGradient>
-<path d="M12.02,18.98c-0.769,0-1.543-0.358-2.114-0.898,0.604,0.634,1.416,1.251,2.299,1.251,1.263,0,2.035-0.69,2.567-1.387,0.012-0.029,0.026-0.057,0.042-0.081,0.394-0.615,0.713-1.232,0.971-1.806-1.43,2.52-2.5,2.93-3.76,2.93z" fill="url(#SVGID_33)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_34" x1="12.17" x2="12.17" y1="7.41" y2="13.15">
-<stop offset="0" stop-color="#8A5D3B"/>
-<stop offset="0.38" stop-color="#632F00"/>
-<stop offset="1" stop-color="#361700"/>
+
</linearGradient>
+
+<path d="M12.02,18.98c-0.769,0-1.543-0.358-2.114-0.898,0.604,0.634,1.416,1.251,2.299,1.251,1.263,0,2.035-0.69,2.567-1.387,0.012-0.029,0.026-0.057,0.042-0.081,0.394-0.615,0.713-1.232,0.971-1.806-1.43,2.52-2.5,2.93-3.76,2.93z" fill="url(#SVGID_33)"/>
+
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_34" x1="12.17" x2="12.17" y1="7.41" y2="13.15">
+
+<stop offset="0" stop-color="#8A5D3B"/>
+
+<stop offset="0.38" stop-color="#632F00"/>
+
+<stop offset="1" stop-color="#361700"/>
+
+</linearGradient>
+
<path d="M12.08,7.325c-1.564,0-2.316,0.71-2.897,1.455-0.944,0.145-2.44,1.011-1.383,4.803,0.663-0.568,1.874-2.107,1.998-2.633,0.158-0.669,2.262,1.883,6.859,2.644,0.053-0.213,0.078-0.338,0.078-0.338,0.71-3.23-0.86-5.798-4.66-5.925z" fill="url(#SVGID_34)"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_35" x1="14.13" x2="8.93" y1="12.9" y2="9.81">
+
<stop offset="0" stop-color="#8A5D3B"/>
+
<stop offset="0.36" stop-color="#632F00"/>
+
<stop offset="1" stop-color="#361700"/>
+
</linearGradient>
+
<path d="M9.799,10.64s2.25,2.954,6.821,2.949c0,0-2.15-0.34-6.821-2.95z" fill="url(#SVGID_35)"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_36" x1="8.46" x2="8.51" y1="9.21" y2="12.51">
+
<stop offset="0" stop-color="#8A5D3B"/>
+
<stop offset="0.38" stop-color="#632F00"/>
+
<stop offset="1" stop-color="#361700"/>
+
</linearGradient>
+
<path d="M9.258,8.999s-2.203,0.132-1.386,3.865c0,0-0.268-2.55,1.386-3.861z" fill="url(#SVGID_36)"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_37" x1="12.9" x2="12.73" y1="7.9" y2="9.4">
+
<stop offset="0" stop-color="#A87C4F"/>
+
<stop offset="1" stop-color="#632F00"/>
+
</linearGradient>
+
<path d="M13.14,9.516c-1.025-0.146-2.76-1.055-3.44-0.73,0,0,2.225-2.539,6.154,0.352,0.01,0-0.93,0.632-2.71,0.378z" fill="url(#SVGID_37)"/>
+
<rect fill="none" height="24.49" width="24.49" y="4.333"/>
+
<path d="M51.07,26.07h-13.09v-0.487c0-2.907,2.152-4.174,2.584-4.4,0.425-0.222,1.75-0.714,2.815-1.11l0.617-0.229,0.109-0.044,0.132-0.05,0.35-0.14c0.162-0.295,0.171-0.922,0.051-1.201l0.214-0.119-0.23,0.082c-0.034-0.056-0.067-0.111-0.103-0.169l-0.035-0.057c-0.262-0.427-0.504-0.875-0.724-1.334-0.545-0.062-1.079-0.534-1.354-1.215-0.315-0.775-0.213-1.58,0.23-1.996-0.148-0.672-0.203-1.319-0.167-1.928,4.59,3.36,7.8,8.5,8.6,14.4z" fill="url(#SVGID_26)" fill-opacity="0.2" stroke-opacity="0.2"/>
+
<path d="M51.04,25.83h-12.82v-0.243c0-2.767,2.042-3.971,2.453-4.184,0.413-0.214,1.729-0.704,2.788-1.097l0.625-0.232,0.104-0.042,0.136-0.051,0.421-0.169c0.266-0.363,0.26-1.148,0.112-1.5l-0.01-0.018c-0.007-0.019-0.016-0.036-0.025-0.05-0.034-0.055-0.067-0.109-0.099-0.165l-0.037-0.057c-0.28-0.459-0.541-0.944-0.773-1.443h-0.037c-0.488,0-0.99-0.43-1.25-1.071-0.302-0.746-0.176-1.508,0.277-1.809-0.021-0.092-0.033-0.144-0.033-0.144-0.132-0.592-0.182-1.162-0.166-1.704,4.39,3.3,7.48,8.27,8.32,13.97z" fill="url(#SVGID_27)" fill-opacity="0.4" stroke-opacity="0.4"/>
+
<radialGradient cx="47.89" cy="23.06" gradientUnits="userSpaceOnUse" id="SVGID_40" r="6.87">
+
<stop offset="0" stop-color="#FFA98E"/>
+
<stop offset="0.2" stop-color="#FFA98E"/>
+
<stop offset="0.96" stop-color="#D45D36"/>
+
<stop offset="1" stop-color="#D45D36"/>
+
</radialGradient>
+
<path d="M50.68,19.94c-0.646-0.281-0.624-1.656-0.358-2.073,0.046-0.072,0.089-0.145,0.133-0.218h-5.4c0.044,0.073,0.087,0.146,0.133,0.218,0.267,0.417,0.287,1.792-0.358,2.073-0.646,0.281,3.003,2.725,3.003,2.725s3.51-2.44,2.86-2.72z" fill="url(#SVGID_40)"/>
+
<path d="M54.56,21.37c-0.68-0.354-4.048-1.533-4.11-1.606l-2.574,2.138-2.764-2.221c-0.076,0.113-3.405,1.28-4.176,1.689-0.881,0.469-2.32,1.543-2.32,3.967h18.27c-0.01-2.42-1.65-3.61-2.33-3.97z" fill="url(#SVGID_29)"/>
+
<polygon fill="url(#SVGID_30)" points="44.48,19.96,47.88,22.66,51.07,20.02,50.45,19.77,47.88,21.9,45.12,19.68"/>
+
<path d="M44.65,20.39s-4.842,1.264-4.842,4.655h-0.697c0-2.08,1.62-3.7,5.54-4.65z" fill="#FF7B56"/>
+
<path d="M50.8,20.31s4.842,1.265,4.842,4.657h0.697c-0.01-2.09-1.64-3.71-5.54-4.66z" fill="#FF7B56"/>
+
<polygon fill="url(#SVGID_31)" points="47.88,22.66,44.48,19.96,44.29,20.04,47.88,22.91,51.27,20.09,51.07,20.01"/>
+
<radialGradient cx="47.7" cy="10.32" gradientUnits="userSpaceOnUse" id="SVGID_44" r="9.22">
+
<stop offset="0" stop-color="#FFE2D9"/>
+
<stop offset="0.51" stop-color="#FFC6B3"/>
+
<stop offset="0.76" stop-color="#FFA98E"/>
+
<stop offset="1" stop-color="#E88160"/>
+
</radialGradient>
+
<path d="M52.23,13.61c-0.022-0.012-0.049-0.013-0.071-0.021-0.005-0.001-0.01-0.002-0.014-0.003-0.035-0.01-0.07-0.018-0.108-0.02-4.511-0.784-6.581-3.283-6.736-2.621-0.124,0.526-1.39,1.665-2.052,2.232,0.006,0.026,0.009,0.048,0.014,0.074,0,0,0.023,0.116,0.073,0.315-0.052,0.006-0.104,0.016-0.153,0.038-0.422,0.178-0.554,0.869-0.295,1.543,0.258,0.675,0.809,1.08,1.23,0.902,0.025-0.012,0.048-0.03,0.072-0.045,0.244,0.551,0.546,1.141,0.914,1.733,0.617,0.733,1.563,1.593,2.605,1.593,1.263,0,2.035-0.69,2.566-1.387,0.012-0.029,0.026-0.056,0.042-0.08,0.394-0.615,0.712-1.232,0.971-1.807,0.413,0.143,0.94-0.241,1.204-0.889,0.29-0.65,0.17-1.35-0.25-1.54z" fill="url(#SVGID_44)"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_45" x1="46.12" x2="50.02" y1="19.76" y2="15.89">
+
<stop offset="0" stop-color="#FFC6B3"/>
+
<stop offset="1" stop-color="#FFA98E"/>
+
</linearGradient>
+
<path d="M47.52,18.98c-0.769,0-1.543-0.358-2.113-0.898,0.604,0.634,1.416,1.251,2.299,1.251,1.264,0,2.035-0.69,2.567-1.387,0.013-0.029,0.026-0.057,0.042-0.081,0.393-0.615,0.712-1.232,0.971-1.806-1.43,2.52-2.5,2.93-3.77,2.93z" fill="url(#SVGID_45)"/>
+
<path d="M47.58,7.325c-1.563,0-2.315,0.71-2.896,1.455-0.944,0.145-2.441,1.011-1.383,4.803,0.662-0.568,1.873-2.107,1.998-2.633,0.156-0.669,2.261,1.883,6.857,2.644,0.054-0.213,0.078-0.338,0.078-0.338,0.72-3.23-0.85-5.798-4.66-5.925z" fill="url(#SVGID_34)"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_47" x1="49.64" x2="44.44" y1="12.9" y2="9.81">
+
<stop offset="0" stop-color="#8A5D3B"/>
+
<stop offset="0.36" stop-color="#632F00"/>
+
<stop offset="1" stop-color="#361700"/>
+
</linearGradient>
+
<path d="M45.31,10.64s2.25,2.954,6.822,2.949c0,0-2.15-0.34-6.82-2.95z" fill="url(#SVGID_47)"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_48" x1="43.97" x2="44.01" y1="9.21" y2="12.51">
+
<stop offset="0" stop-color="#8A5D3B"/>
+
<stop offset="0.38" stop-color="#632F00"/>
+
<stop offset="1" stop-color="#361700"/>
+
</linearGradient>
+
<path d="M44.77,8.999s-2.203,0.132-1.386,3.865c0,0-0.27-2.55,1.39-3.861z" fill="url(#SVGID_48)"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_49" x1="48.4" x2="48.24" y1="7.9" y2="9.4">
+
<stop offset="0" stop-color="#A87C4F"/>
+
<stop offset="1" stop-color="#632F00"/>
+
</linearGradient>
+
<path d="M48.65,9.516c-1.025-0.146-2.761-1.055-3.439-0.73,0,0,2.225-2.539,6.153,0.352,0,0-0.93,0.632-2.71,0.378z" fill="url(#SVGID_49)"/>
+
<rect fill="none" height="24.49" width="24.49" x="35.51" y="4.333"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_speaker.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_speaker.svg Fri May 14 16:09:54 2010 +0300
@@ -1,97 +1,99 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.999" x2="29.999" y1="2" y2="57.9149">
-<stop offset="0" style="stop-color:#F0AB62"/>
-<stop offset="1" style="stop-color:#5C2B0F"/>
+ <stop offset="0" style="stop-color:#F0AB62"/>
+ <stop offset="1" style="stop-color:#5C2B0F"/>
</linearGradient>
<path d="M52.459,55.62c0,1.314-1.065,2.38-2.38,2.38H9.92c-1.314,0-2.38-1.065-2.38-2.38V4.38 C7.54,3.065,8.605,2,9.92,2h40.159c1.314,0,2.38,1.065,2.38,2.38V55.62z" fill="url(#SVGID_1_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="3.1904" y2="56.7281">
-<stop offset="0" style="stop-color:#F0CEAA"/>
-<stop offset="0.6364" style="stop-color:#AF733E"/>
-<stop offset="1" style="stop-color:#C18C5B"/>
+ <stop offset="0" style="stop-color:#F0CEAA"/>
+ <stop offset="0.6364" style="stop-color:#AF733E"/>
+ <stop offset="1" style="stop-color:#C18C5B"/>
</linearGradient>
<path d="M9.92,56.81c-0.656,0-1.189-0.533-1.189-1.189V4.38c0-0.656,0.533-1.189,1.189-1.189h40.159 c0.657,0,1.19,0.533,1.19,1.189v51.24c0,0.656-0.533,1.189-1.19,1.189H9.92z" fill="url(#SVGID_2_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="29.999" x2="29.999" y1="4.3799" y2="55.5422">
-<stop offset="0" style="stop-color:#D49757"/>
-<stop offset="0.7515" style="stop-color:#8A4117"/>
-<stop offset="1" style="stop-color:#B7763E"/>
+ <stop offset="0" style="stop-color:#D49757"/>
+ <stop offset="0.7515" style="stop-color:#8A4117"/>
+ <stop offset="1" style="stop-color:#B7763E"/>
</linearGradient>
<rect fill="url(#SVGID_3_)" height="51.24" width="40.159" x="9.92" y="4.38"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="29.999" x2="29.999" y1="41.4912" y2="7.5526">
-<stop offset="0" style="stop-color:#D49757"/>
-<stop offset="1" style="stop-color:#702200"/>
+ <stop offset="0" style="stop-color:#D49757"/>
+ <stop offset="1" style="stop-color:#702200"/>
</linearGradient>
<circle cx="30" cy="24.702" fill="url(#SVGID_4_)" r="17.02"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30" x2="30" y1="8.8267" y2="40.4868">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="0.4" style="stop-color:#D3D6D7"/>
-<stop offset="0.7939" style="stop-color:#959EA2"/>
-<stop offset="1" style="stop-color:#C9CDCF"/>
+ <stop offset="0" style="stop-color:#F2F2F2"/>
+ <stop offset="0.4" style="stop-color:#D3D6D7"/>
+ <stop offset="0.7939" style="stop-color:#959EA2"/>
+ <stop offset="1" style="stop-color:#C9CDCF"/>
</linearGradient>
<path d="M29.998,40.532c-8.728,0-15.828-7.101-15.828-15.83c0-8.729,7.101-15.83,15.828-15.83 c8.729,0,15.832,7.102,15.832,15.83C45.83,33.432,38.728,40.532,29.998,40.532L29.998,40.532z" fill="url(#SVGID_5_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="29.9971" x2="29.9971" y1="10.4238" y2="38.8273">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.297" style="stop-color:#E4E5E6"/>
-<stop offset="0.6424" style="stop-color:#949DA1"/>
-<stop offset="1" style="stop-color:#FFFFFF"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="0.297" style="stop-color:#E4E5E6"/>
+ <stop offset="0.6424" style="stop-color:#949DA1"/>
+ <stop offset="1" style="stop-color:#FFFFFF"/>
</linearGradient>
<path d="M29.998,38.983c-7.873,0-14.279-6.407-14.279-14.281s6.406-14.278,14.279-14.278 s14.278,6.404,14.278,14.278S37.871,38.983,29.998,38.983L29.998,38.983z" fill="url(#SVGID_6_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="29.998" x2="29.998" y1="34.6191" y2="14.6512">
-<stop offset="0" style="stop-color:#CBCBCB"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+ <stop offset="0" style="stop-color:#CBCBCB"/>
+ <stop offset="1" style="stop-color:#4D4D4D"/>
</linearGradient>
<circle cx="29.998" cy="24.702" fill="url(#SVGID_7_)" r="10.195"/>
-<path d="M38.205,30.732l-3.368-2.985h-9.063l-3.861,3.148c1.865,2.429,4.787,4.002,8.086,4.002 C33.369,34.897,36.35,33.255,38.205,30.732z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<circle cx="29.998" cy="26.336" fill-opacity="0.15" r="6.607" stroke-opacity="0.15"/>
+<path d="M38.205,30.732l-3.368-2.985h-9.063l-3.861,3.148c1.865,2.429,4.787,4.002,8.086,4.002 C33.369,34.897,36.35,33.255,38.205,30.732z" fill="#FFFFFF" opacity="0.3"/>
+<circle cx="29.998" cy="26.336" opacity="0.15" r="6.607"/>
<radialGradient cx="313.3594" cy="-573.2905" gradientTransform="matrix(0.5638 0 0 0.5638 -146.6494 346.192)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="13.1949">
-<stop offset="0" style="stop-color:#737373"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#737373"/>
+ <stop offset="1" style="stop-color:#000000"/>
</radialGradient>
<circle cx="29.998" cy="24.702" fill="url(#SVGID_8_)" r="6.607"/>
-<path d="M29.998,30.444c-3.166,0-5.742-2.575-5.742-5.742c0-3.165,2.576-5.741,5.742-5.741 s5.74,2.576,5.74,5.741C35.738,27.869,33.164,30.444,29.998,30.444L29.998,30.444z M29.998,20.059c-2.563,0-4.645,2.084-4.645,4.644 c0,2.562,2.082,4.644,4.645,4.644c2.561,0,4.643-2.082,4.643-4.644C34.641,22.143,32.559,20.059,29.998,20.059L29.998,20.059z" fill="#EBEBEB" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M29.998,30.444c-3.166,0-5.742-2.575-5.742-5.742c0-3.165,2.576-5.741,5.742-5.741 s5.74,2.576,5.74,5.741C35.738,27.869,33.164,30.444,29.998,30.444L29.998,30.444z M29.998,20.059c-2.563,0-4.645,2.084-4.645,4.644 c0,2.562,2.082,4.644,4.645,4.644c2.561,0,4.643-2.082,4.643-4.644C34.641,22.143,32.559,20.059,29.998,20.059L29.998,20.059z" fill="#EBEBEB" opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="45.7656" x2="45.7656" y1="54.8813" y2="50.5181">
-<stop offset="0" style="stop-color:#D49757"/>
-<stop offset="1" style="stop-color:#702200"/>
+ <stop offset="0" style="stop-color:#D49757"/>
+ <stop offset="1" style="stop-color:#702200"/>
</linearGradient>
<circle cx="45.766" cy="52.715" fill="url(#SVGID_9_)" r="2.38"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="45.7656" x2="45.7656" y1="53.7988" y2="51.6172">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
<path d="M45.766,53.905c-0.656,0-1.189-0.533-1.189-1.19c0-0.656,0.533-1.189,1.189-1.189 s1.189,0.533,1.189,1.189C46.955,53.372,46.422,53.905,45.766,53.905L45.766,53.905z" fill="url(#SVGID_10_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="13.7373" x2="13.7373" y1="54.8813" y2="50.5181">
-<stop offset="0" style="stop-color:#D49757"/>
-<stop offset="1" style="stop-color:#702200"/>
+ <stop offset="0" style="stop-color:#D49757"/>
+ <stop offset="1" style="stop-color:#702200"/>
</linearGradient>
<circle cx="13.737" cy="52.715" fill="url(#SVGID_11_)" r="2.38"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="13.7373" x2="13.7373" y1="53.7988" y2="51.6172">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
<path d="M13.737,53.905c-0.657,0-1.19-0.533-1.19-1.19c0-0.656,0.533-1.189,1.19-1.189 c0.656,0,1.189,0.533,1.189,1.189C14.927,53.372,14.394,53.905,13.737,53.905L13.737,53.905z" fill="url(#SVGID_12_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="45.7656" x2="45.7656" y1="9.9624" y2="5.5991">
-<stop offset="0" style="stop-color:#D49757"/>
-<stop offset="1" style="stop-color:#702200"/>
+ <stop offset="0" style="stop-color:#D49757"/>
+ <stop offset="1" style="stop-color:#702200"/>
</linearGradient>
<circle cx="45.766" cy="7.796" fill="url(#SVGID_13_)" r="2.38"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="45.7656" x2="45.7656" y1="8.8799" y2="6.6982">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
<path d="M45.766,8.986c-0.656,0-1.189-0.533-1.189-1.19c0-0.656,0.533-1.189,1.189-1.189 s1.189,0.533,1.189,1.189C46.955,8.453,46.422,8.986,45.766,8.986L45.766,8.986z" fill="url(#SVGID_14_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="13.7373" x2="13.7373" y1="9.9624" y2="5.5991">
-<stop offset="0" style="stop-color:#D49757"/>
-<stop offset="1" style="stop-color:#702200"/>
+ <stop offset="0" style="stop-color:#D49757"/>
+ <stop offset="1" style="stop-color:#702200"/>
</linearGradient>
<circle cx="13.737" cy="7.796" fill="url(#SVGID_15_)" r="2.38"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="13.7373" x2="13.7373" y1="8.8799" y2="6.6982">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
<path d="M13.737,8.986c-0.657,0-1.19-0.533-1.19-1.19c0-0.656,0.533-1.189,1.19-1.189 c0.656,0,1.189,0.533,1.189,1.189C14.927,8.453,14.394,8.986,13.737,8.986L13.737,8.986z" fill="url(#SVGID_16_)"/>
<rect fill="none" height="60" width="60"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_stereo.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_stereo.svg Fri May 14 16:09:54 2010 +0300
@@ -1,93 +1,95 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="0.5879" style="stop-color:#B4BABD"/>
-<stop offset="1" style="stop-color:#F2F2F2"/>
+ <stop offset="0" style="stop-color:#F2F2F2"/>
+ <stop offset="0.5879" style="stop-color:#B4BABD"/>
+ <stop offset="1" style="stop-color:#F2F2F2"/>
</linearGradient>
<path d="M50.762,34.911c-0.035-1.49-0.029-3.037-0.025-4.611c0.025-8.141,3.977-23.862-19.914-23.862 S9.998,17.496,9.883,31.411c-0.012,1.19-0.021,2.362-0.049,3.5l-4.436-0.1c0.027-1.118,0.035-2.269,0.047-3.438 C5.559,17.572,2.43,2,30.822,2c28.391,0,24.379,19.689,24.352,28.313c-0.004,1.536-0.008,3.044,0.023,4.498L50.762,34.911 L50.762,34.911z" fill="url(#SVGID_1_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30.3916" x2="30.3916" y1="3.1812" y2="33.2296">
-<stop offset="0" style="stop-color:#9DA5A8"/>
-<stop offset="0.3636" style="stop-color:#C9CDCE"/>
-<stop offset="0.7455" style="stop-color:#949DA1"/>
-<stop offset="1" style="stop-color:#D3D6D7"/>
+ <stop offset="0" style="stop-color:#9DA5A8"/>
+ <stop offset="0.3636" style="stop-color:#C9CDCE"/>
+ <stop offset="0.7455" style="stop-color:#949DA1"/>
+ <stop offset="1" style="stop-color:#D3D6D7"/>
</linearGradient>
<path d="M51.297,33.784c-0.012-1.138-0.01-2.303-0.006-3.483c0.004-0.937,0.055-1.977,0.109-3.084 c0.26-5.216,0.582-11.705-3.648-16.153c-3.271-3.438-8.967-5.181-16.93-5.181c-8.865,0-14.729,1.577-17.924,4.823 c-3.801,3.862-3.709,9.713-3.604,16.488c0.021,1.38,0.045,2.787,0.033,4.211l-0.035,2.939l-3.33-0.075l0.01-0.553 C5.986,32.95,5.992,32.168,6,31.379c0.01-1.362-0.008-2.726-0.027-4.077c-0.104-7.34-0.201-14.272,4.461-19.001 c3.813-3.866,10.482-5.746,20.389-5.746c8.961,0,15.471,2.06,19.35,6.124c5.16,5.402,4.803,13.116,4.543,18.748 c-0.049,1.051-0.094,2.022-0.096,2.884l-0.002,0.512c-0.002,0.98-0.004,1.949,0.008,2.898l0.008,0.549l-3.328,0.075L51.297,33.784z" fill="url(#SVGID_2_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="18.6035" x2="18.6035" y1="29.2012" y2="56.9375">
-<stop offset="0" style="stop-color:#7B7B7B"/>
-<stop offset="0.1455" style="stop-color:#565656"/>
-<stop offset="0.3091" style="stop-color:#8C8C8C"/>
-<stop offset="0.6848" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#646464"/>
+ <stop offset="0" style="stop-color:#7B7B7B"/>
+ <stop offset="0.1455" style="stop-color:#565656"/>
+ <stop offset="0.3091" style="stop-color:#8C8C8C"/>
+ <stop offset="0.6848" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#646464"/>
</linearGradient>
<path d="M22.07,53.608c0,1.831-1.496,3.329-3.328,3.329h-3.605V29.201h3.605c1.832,0,3.328,1.497,3.328,3.329 V53.608z" fill="url(#SVGID_3_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="7.4629" x2="7.4629" y1="33.2002" y2="52.9385">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="0.1455" style="stop-color:#959EA2"/>
-<stop offset="0.3697" style="stop-color:#F2F2F2"/>
-<stop offset="0.7576" style="stop-color:#949DA1"/>
-<stop offset="1" style="stop-color:#D3D6D7"/>
+ <stop offset="0" style="stop-color:#F2F2F2"/>
+ <stop offset="0.1455" style="stop-color:#959EA2"/>
+ <stop offset="0.3697" style="stop-color:#F2F2F2"/>
+ <stop offset="0.7576" style="stop-color:#949DA1"/>
+ <stop offset="1" style="stop-color:#D3D6D7"/>
</linearGradient>
<rect fill="url(#SVGID_4_)" height="19.738" width="6.473" x="4.227" y="33.2"/>
-<rect fill="#FFFFFF" fill-opacity="0.35" height="19.738" stroke-opacity="0.35" width="1.109" x="4.227" y="33.2"/>
-<rect fill-opacity="0.5" height="27.736" stroke-opacity="0.5" width="2.219" x="15.137" y="29.201"/>
+<rect fill="#FFFFFF" height="19.738" opacity="0.35" width="1.109" x="4.227" y="33.2"/>
+<rect height="27.736" opacity="0.5" width="2.219" x="15.137" y="29.201"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="14.0273" x2="14.0273" y1="28.1387" y2="58">
-<stop offset="0" style="stop-color:#7E7E7E"/>
-<stop offset="0.1394" style="stop-color:#000000"/>
-<stop offset="0.2727" style="stop-color:#555555"/>
-<stop offset="0.6909" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#707070"/>
+ <stop offset="0" style="stop-color:#7E7E7E"/>
+ <stop offset="0.1394" style="stop-color:#000000"/>
+ <stop offset="0.2727" style="stop-color:#555555"/>
+ <stop offset="0.6909" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#707070"/>
</linearGradient>
<polygon fill="url(#SVGID_5_)" points="12.918,28.139 11.809,42.446 12.918,58 16.246,58 16.246,28.139 "/>
-<rect fill="#FFFFFF" fill-opacity="0.15" height="29.861" stroke-opacity="0.15" width="1.109" x="15.137" y="28.139"/>
-<rect fill-opacity="0.5" height="19.738" stroke-opacity="0.5" width="1.387" x="9.313" y="33.2"/>
+<rect fill="#FFFFFF" height="29.861" opacity="0.15" width="1.109" x="15.137" y="28.139"/>
+<rect height="19.738" opacity="0.5" width="1.387" x="9.313" y="33.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="11.6699" x2="11.6699" y1="28.1387" y2="58">
-<stop offset="0" style="stop-color:#CAD0D4"/>
-<stop offset="0.1273" style="stop-color:#99A1A5"/>
-<stop offset="0.2848" style="stop-color:#F2F2F2"/>
-<stop offset="0.6485" style="stop-color:#949DA1"/>
-<stop offset="1" style="stop-color:#F2F2F2"/>
+ <stop offset="0" style="stop-color:#CAD0D4"/>
+ <stop offset="0.1273" style="stop-color:#99A1A5"/>
+ <stop offset="0.2848" style="stop-color:#F2F2F2"/>
+ <stop offset="0.6485" style="stop-color:#949DA1"/>
+ <stop offset="1" style="stop-color:#F2F2F2"/>
</linearGradient>
<polygon fill="url(#SVGID_6_)" points="10.422,30.357 10.422,55.781 12.918,58 12.918,28.139 "/>
<linearGradient gradientTransform="matrix(-1 0 0 1 -43.916 0)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="-85.3086" x2="-85.3086" y1="29.2012" y2="56.9375">
-<stop offset="0" style="stop-color:#7B7B7B"/>
-<stop offset="0.1455" style="stop-color:#565656"/>
-<stop offset="0.3091" style="stop-color:#8C8C8C"/>
-<stop offset="0.6848" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#646464"/>
+ <stop offset="0" style="stop-color:#7B7B7B"/>
+ <stop offset="0.1455" style="stop-color:#565656"/>
+ <stop offset="0.3091" style="stop-color:#8C8C8C"/>
+ <stop offset="0.6848" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#646464"/>
</linearGradient>
<path d="M37.926,53.608c0,1.831,1.498,3.329,3.328,3.329h3.605V29.201h-3.605 c-1.83,0-3.328,1.497-3.328,3.329V53.608z" fill="url(#SVGID_7_)"/>
<linearGradient gradientTransform="matrix(-1 0 0 1 -43.916 0)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="-96.4502" x2="-96.4502" y1="33.2002" y2="52.9385">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="0.1455" style="stop-color:#959EA2"/>
-<stop offset="0.3697" style="stop-color:#F2F2F2"/>
-<stop offset="0.7576" style="stop-color:#949DA1"/>
-<stop offset="1" style="stop-color:#D3D6D7"/>
+ <stop offset="0" style="stop-color:#F2F2F2"/>
+ <stop offset="0.1455" style="stop-color:#959EA2"/>
+ <stop offset="0.3697" style="stop-color:#F2F2F2"/>
+ <stop offset="0.7576" style="stop-color:#949DA1"/>
+ <stop offset="1" style="stop-color:#D3D6D7"/>
</linearGradient>
<rect fill="url(#SVGID_8_)" height="19.738" width="6.471" x="49.299" y="33.2"/>
-<rect fill="#FFFFFF" fill-opacity="0.35" height="19.738" stroke-opacity="0.35" width="1.109" x="54.66" y="33.2"/>
-<rect fill-opacity="0.5" height="27.736" stroke-opacity="0.5" width="2.217" x="42.643" y="29.201"/>
+<rect fill="#FFFFFF" height="19.738" opacity="0.35" width="1.109" x="54.66" y="33.2"/>
+<rect height="27.736" opacity="0.5" width="2.217" x="42.643" y="29.201"/>
<linearGradient gradientTransform="matrix(-1 0 0 1 -43.916 0)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="-89.8867" x2="-89.8867" y1="28.1387" y2="58">
-<stop offset="0" style="stop-color:#7E7E7E"/>
-<stop offset="0.1394" style="stop-color:#000000"/>
-<stop offset="0.2727" style="stop-color:#555555"/>
-<stop offset="0.6909" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#707070"/>
+ <stop offset="0" style="stop-color:#7E7E7E"/>
+ <stop offset="0.1394" style="stop-color:#000000"/>
+ <stop offset="0.2727" style="stop-color:#555555"/>
+ <stop offset="0.6909" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#707070"/>
</linearGradient>
<polygon fill="url(#SVGID_9_)" points="47.08,28.139 48.189,42.446 47.08,58 43.752,58 43.752,28.139 "/>
-<rect fill="#FFFFFF" fill-opacity="0.15" height="29.861" stroke-opacity="0.15" width="1.109" x="43.752" y="28.139"/>
-<rect fill-opacity="0.5" height="19.738" stroke-opacity="0.5" width="1.387" x="49.299" y="33.2"/>
+<rect fill="#FFFFFF" height="29.861" opacity="0.15" width="1.109" x="43.752" y="28.139"/>
+<rect height="19.738" opacity="0.5" width="1.387" x="49.299" y="33.2"/>
<linearGradient gradientTransform="matrix(-1 0 0 1 -43.916 0)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="-92.2441" x2="-92.2441" y1="28.1387" y2="58">
-<stop offset="0" style="stop-color:#CAD0D4"/>
-<stop offset="0.1273" style="stop-color:#99A1A5"/>
-<stop offset="0.2848" style="stop-color:#F2F2F2"/>
-<stop offset="0.6485" style="stop-color:#949DA1"/>
-<stop offset="1" style="stop-color:#F2F2F2"/>
+ <stop offset="0" style="stop-color:#CAD0D4"/>
+ <stop offset="0.1273" style="stop-color:#99A1A5"/>
+ <stop offset="0.2848" style="stop-color:#F2F2F2"/>
+ <stop offset="0.6485" style="stop-color:#949DA1"/>
+ <stop offset="1" style="stop-color:#F2F2F2"/>
</linearGradient>
<polygon fill="url(#SVGID_10_)" points="49.576,30.357 49.576,55.781 47.08,58 47.08,28.139 "/>
<rect fill="none" height="60" width="60"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_sync.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,61 @@
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
+<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"/>
+ <stop offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<path d="M13.69,40.243c-0.309-0.211-7.56-5.245-7.252-12.086 c0.198-4.412,3.463-8.415,9.705-11.898c1.036-0.577,2.176-1.153,3.391-1.711l0.326-0.148c0.21-0.095,0.425-0.189,0.64-0.283 c0.187-0.083,0.378-0.165,0.573-0.248l0.557-0.234c0.256-0.105,1.223-0.493,1.223-0.493c0.176-0.069,0.352-0.138,0.53-0.206V6.081 l22.723,11.33L23.382,28.74v-5.978c-5.189,1.273-8.968,3.829-10.175,6.915c-1.018,2.598-0.306,5.583,2.117,8.872l0.299,0.406 l-1.516,1.572L13.69,40.243z" enable-background="new " fill="url(#SVGID_1_)" opacity="0.2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="25.896" x2="25.896" y1="7.0449" y2="37.3736">
+ <stop offset="0" style="stop-color:#A9AAAD"/>
+ <stop offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<path d="M14.028,39.75c-0.298-0.204-7.287-5.049-6.994-11.566 c0.188-4.191,3.351-8.028,9.4-11.404c1.028-0.573,2.151-1.14,3.349-1.689l0.324-0.148c0.206-0.093,0.418-0.186,0.63-0.278 c0.188-0.082,0.376-0.164,0.568-0.245l0.555-0.234c0.25-0.104,1.213-0.489,1.213-0.489c0.297-0.117,0.599-0.233,0.905-0.349V7.045 l20.789,10.366L23.979,27.776v-5.764c-5.772,1.253-9.982,4.009-11.328,7.448c-1.097,2.802-0.358,5.979,2.193,9.443L14.028,39.75z" enable-background="new " fill="url(#SVGID_2_)" opacity="0.4"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="33.7334" x2="33.7334" y1="19.688" y2="51.9872">
+ <stop offset="0" style="stop-color:#A6A8AB"/>
+ <stop offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<path d="M13.896,42.589L36.616,31.26v5.978 c5.19-1.273,8.968-3.829,10.177-6.914c1.017-2.598,0.304-5.583-2.119-8.873l-0.299-0.405l1.517-1.573l0.417,0.284 c0.309,0.211,7.561,5.245,7.253,12.087c-0.198,4.412-3.464,8.415-9.706,11.898l-0.138,0.076c-1.002,0.555-2.102,1.106-3.271,1.641 l-0.303,0.14c-0.216,0.097-0.434,0.193-0.65,0.288l-0.559,0.241l-0.571,0.239c-0.253,0.105-0.508,0.209-0.767,0.312l-0.455,0.182 c-0.174,0.069-0.35,0.137-0.526,0.205v6.855L13.896,42.589z" enable-background="new " fill="url(#SVGID_3_)" opacity="0.2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="34.1035" x2="34.1035" y1="20.4546" y2="51.1212">
+ <stop offset="0" style="stop-color:#A9AAAD"/>
+ <stop offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<path d="M15.234,42.589L36.02,32.224v5.764 c5.773-1.253,9.982-4.009,11.328-7.447c1.098-2.802,0.359-5.979-2.192-9.444l0.815-0.847c0.299,0.204,7.287,5.049,6.994,11.567 c-0.188,4.191-3.351,8.028-9.4,11.404l-0.137,0.076c-0.989,0.547-2.074,1.092-3.229,1.62l-0.304,0.14 c-0.21,0.095-0.426,0.189-0.64,0.283l-0.557,0.24l-0.565,0.237c-0.247,0.103-0.501,0.205-0.756,0.307l-0.457,0.182 c-0.294,0.116-0.595,0.232-0.901,0.348v6.302L15.234,42.589z" enable-background="new " fill="url(#SVGID_4_)" opacity="0.4"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="34.873" x2="34.873" y1="23.2422" y2="46.511">
+ <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="M18.001,41.993l16.783-8.368v5.271l0.76-0.146c6.556-1.256,11.398-4.38,12.956-8.356 c0.856-2.191,0.736-4.618-0.332-7.152c1.892,2.029,3.939,5.081,3.521,8.503c-0.614,4.992-6.161,9.466-16.488,13.298l-0.416,0.156 v5.161L18.001,41.993z" fill="url(#SVGID_5_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="30.0327" x2="30.0327" y1="51.4287" y2="42.0396">
+ <stop offset="0" style="stop-color:#C6FF45"/>
+ <stop offset="1" style="stop-color:#66A00E"/>
+</linearGradient>
+<path d="M16.792,42.103l18.631,9.291v-5.75c3.122-1.16,5.709-2.345,7.851-3.541H16.792z" fill="url(#SVGID_6_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="25.127" x2="25.127" y1="36.3267" y2="9.0388">
+ <stop offset="0" style="stop-color:#45E8FF"/>
+ <stop offset="0.5" style="stop-color:#30A4D5"/>
+ <stop offset="1" style="stop-color:#1347BA"/>
+</linearGradient>
+<path d="M11.831,35.564c-1.891-2.029-3.939-5.082-3.519-8.502c0.613-4.993,6.16-9.467,16.486-13.299 l0.417-0.154V8.445l16.782,8.369l-16.782,8.367v-5.271l-0.759,0.145C17.9,21.313,13.057,24.437,11.5,28.412 C10.643,30.603,10.762,33.03,11.831,35.564L11.831,35.564z" fill="url(#SVGID_7_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="29.9663" x2="29.9663" y1="8.4697" y2="15.2044">
+ <stop offset="0" style="stop-color:#45E8FF"/>
+ <stop offset="1" style="stop-color:#30A4D5"/>
+</linearGradient>
+<path d="M43.207,16.703l-18.631-9.29v5.75c-3.122,1.159-5.709,2.345-7.85,3.54H43.207z" fill="url(#SVGID_8_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="25.5229" x2="25.5229" y1="8.0708" y2="27.6391">
+ <stop offset="0.0061" style="stop-color:#93E1FF"/>
+ <stop offset="1" style="stop-color:#1185BF"/>
+</linearGradient>
+<path d="M25.215,8.445l16.782,8.369l-16.782,8.367v-4.498v-0.773l-0.759,0.145 C17.9,21.313,13.058,24.437,11.5,28.412c-0.858,2.193-0.738,4.624,0.335,7.161c-1.892-2.025-3.943-5.077-3.523-8.507 c0.61-4.994,6.158-9.469,16.487-13.303l0.417-0.154v-0.445V8.445 M24.576,7.413v5.75C-6.247,24.602,14.364,38.659,14.364,38.659 c-7.105-9.643,0.429-16.1,10.212-17.976v5.531l18.854-9.4L24.576,7.413L24.576,7.413z" fill="url(#SVGID_9_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="34.4766" x2="34.4766" y1="29.8569" y2="51.3697">
+ <stop offset="0" style="stop-color:#C5FE45"/>
+ <stop offset="1" style="stop-color:#4B8B00"/>
+</linearGradient>
+<path d="M45.635,20.146c7.105,9.644-0.428,16.101-10.212,17.977v-5.531l-18.854,9.401l18.854,9.401v-5.75 C66.247,34.204,45.635,20.146,45.635,20.146z M35.2,45.043l-0.416,0.156v0.444v4.717l-16.783-8.368l16.783-8.368v4.498v0.773 l0.76-0.146c6.556-1.256,11.399-4.38,12.956-8.356c0.856-2.191,0.736-4.618-0.332-7.152c1.892,2.029,3.94,5.081,3.521,8.503 C51.074,36.737,45.527,41.211,35.2,45.043z" fill="url(#SVGID_10_)"/>
+<rect fill="none" height="60" width="60"/>
+</g>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tasks.svg Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +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"/>
-<rect fill="none" height="60" width="60"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -257 2114.0029)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="286.999" x2="286.999" y1="2109.4985" y2="2056.0034">
-<stop offset="0" style="stop-color:#D49757"/>
-<stop offset="1" style="stop-color:#702200"/>
-</linearGradient>
-<path d="M8.526,58c-1.246,0-2.261-1.013-2.261-2.26V6.765c0-1.248,1.015-2.261,2.261-2.261h42.947 c1.247,0,2.262,1.013,2.262,2.261V55.74c0,1.247-1.015,2.26-2.262,2.26H8.526z" fill="url(#SVGID_1_)"/>
-<path d="M51.473,4.504H8.526c-1.246,0-2.261,1.013-2.261,2.261v0.753 c0-1.248,1.015-2.261,2.261-2.261h42.947c1.247,0,2.262,1.013,2.262,2.261V6.765C53.735,5.518,52.72,4.504,51.473,4.504z" fill="#FFFFFF" fill-opacity="0.6" stroke-opacity="0.6"/>
-<path d="M51.473,57.246H8.526c-1.246,0-2.261-1.013-2.261-2.259v0.753 c0,1.247,1.015,2.26,2.261,2.26h42.947c1.247,0,2.262-1.013,2.262-2.26v-0.753C53.735,56.233,52.72,57.246,51.473,57.246z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -257 2114.0029)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="287" x2="287" y1="2105.8599" y2="2058.8542">
-<stop offset="0" style="stop-color:#707173"/>
-<stop offset="1" style="stop-color:#000000"/>
-</linearGradient>
-<rect fill="url(#SVGID_2_)" fill-opacity="0.3" height="46.716" stroke-opacity="0.3" width="41.441" x="9.279" y="8.271"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -257 2114.0029)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="287" x2="287" y1="2105.1021" y2="2059.6138">
-<stop offset="0" style="stop-color:#707173"/>
-<stop offset="1" style="stop-color:#000000"/>
-</linearGradient>
-<rect fill="url(#SVGID_3_)" fill-opacity="0.6" height="45.209" stroke-opacity="0.6" width="39.934" x="10.033" y="9.024"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -257 2114.0029)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="306.4023" x2="267.6852" y1="2082.7524" y2="2082.7524">
-<stop offset="0" style="stop-color:#737373"/>
-<stop offset="1" style="stop-color:#FFFFFF"/>
-</linearGradient>
-<rect fill="url(#SVGID_4_)" height="42.948" width="38.427" x="10.787" y="9.778"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -257 2114.0029)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="306.2607" x2="267.8748" y1="2083.5054" y2="2083.5054">
-<stop offset="0" style="stop-color:#8A8C8E"/>
-<stop offset="1" style="stop-color:#4A4A4A"/>
-</linearGradient>
-<rect fill="url(#SVGID_5_)" height="42.948" width="38.427" x="10.787" y="9.024"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -257 2114.0029)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="267.8789" x2="306.4008" y1="2083.8804" y2="2083.8804">
-<stop offset="0" style="stop-color:#737373"/>
-<stop offset="1" style="stop-color:#FFFFFF"/>
-</linearGradient>
-<rect fill="url(#SVGID_6_)" height="42.195" width="38.427" x="10.787" y="9.024"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -257 2114.0029)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="277.0107" x2="271.0243" y1="2074.269" y2="2068.2825">
-<stop offset="0" style="stop-color:#737373"/>
-<stop offset="1" style="stop-color:#FFFFFF"/>
-</linearGradient>
-<rect fill="url(#SVGID_7_)" height="41.441" width="38.427" x="10.787" y="9.024"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -257 2114.0029)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="286.999" x2="286.999" y1="2088.8618" y2="2072.0024">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.25" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#E1E1E1"/>
-</linearGradient>
-<path d="M10.787,36.149c0,0.83,0.478,1.987,1.064,2.573l9.925,9.925c0.586,0.585,1.743,1.064,2.573,1.064 h24.864V9.024H10.787V36.149z" fill="url(#SVGID_8_)"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -257 2114.0029)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="286.999" x2="286.999" y1="2104.7153" y2="2064.199">
-<stop offset="0" style="stop-color:#F0F0F2"/>
-<stop offset="1" style="stop-color:#B3B5B8"/>
-</linearGradient>
-<path d="M48.46,9.778v39.181H24.349c-0.626,0-1.599-0.401-2.04-0.845l-9.925-9.924 c-0.443-0.441-0.845-1.413-0.845-2.04V9.778H48.46 M49.213,9.024H10.787v27.125c0,0.83,0.478,1.987,1.064,2.573l9.925,9.925 c0.586,0.585,1.743,1.064,2.573,1.064h24.864V9.024L49.213,9.024z" fill="url(#SVGID_9_)"/>
-<polygon fill="#929497" points="25.856,23.028 46.199,23.028 46.199,21.521 25.856,21.521 "/>
-<polygon fill="#929497" points="25.856,31.929 46.199,31.929 46.199,30.422 25.856,30.422 "/>
-<polygon fill="#929497" points="16.815,40.549 46.199,40.549 46.199,39.796 46.199,39.042 16.815,39.042 "/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -257 2114.0029)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="279.4805" x2="273.8942" y1="2075.5806" y2="2069.9941">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<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="M12.177,39.046c-0.314-0.347-0.896-0.695-1.297-2.184c0,0,0.66,3.055,9.701,0.041 c0,12.809,3.768,12.809,3.768,12.809c-0.831,0-1.987-0.479-2.573-1.064L12.177,39.046z" fill="url(#SVGID_10_)"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -257 2114.0029)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="287.001" x2="287.001" y1="2106.5767" y2="2102.8931">
-<stop offset="0" style="stop-color:#707173"/>
-<stop offset="1" style="stop-color:#000000"/>
-</linearGradient>
-<path d="M43.265,7.045c-0.107-0.35-0.512-0.637-0.9-0.637 h-5.741c-0.388,0-0.779-0.292-0.866-0.645l-0.189-0.749H24.433l-0.191,0.749c-0.088,0.355-0.477,0.645-0.865,0.645h-5.741 c-0.388,0-0.793,0.287-0.9,0.637l-1.024,3.36c-0.108,0.35,0.123,0.637,0.512,0.637h27.554c0.388,0,0.619-0.288,0.513-0.637 L43.265,7.045z" fill="url(#SVGID_11_)" fill-opacity="0.15" stroke-opacity="0.15"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -257 2114.0029)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="287.001" x2="287.001" y1="2105.8237" y2="2102.1401">
-<stop offset="0" style="stop-color:#707173"/>
-<stop offset="1" style="stop-color:#000000"/>
-</linearGradient>
-<path d="M43.265,7.799c-0.107-0.35-0.512-0.637-0.9-0.637h-5.741 c-0.388,0-0.779-0.291-0.866-0.644l-0.189-0.749H24.433l-0.191,0.749c-0.088,0.354-0.477,0.644-0.865,0.644h-5.741 c-0.388,0-0.793,0.287-0.9,0.637l-1.024,3.36c-0.108,0.35,0.123,0.637,0.512,0.637h27.554c0.388,0,0.619-0.287,0.513-0.637 L43.265,7.799z" fill="url(#SVGID_12_)" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M44.822,12.549H15.178l-0.218,0.781 c-0.114,0.399,0.128,0.726,0.538,0.726h29.005c0.409,0,0.651-0.327,0.539-0.726L44.822,12.549z" fill="#6D6E70" fill-opacity="0.5" stroke-opacity="0.5"/>
-<linearGradient gradientTransform="matrix(1 0 0 -1 -257 2114.0029)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="286.999" x2="286.999" y1="2111.5005" y2="2101.1914">
-<stop offset="0" style="stop-color:#747577"/>
-<stop offset="1" style="stop-color:#D5D7D9"/>
-</linearGradient>
-<path d="M43.964,8.753c-0.113-0.399-0.541-0.725-0.949-0.725h-6.043c-0.409,0-0.819-0.331-0.913-0.734 l-2.131-4.56C33.835,2.33,33.423,2,33.013,2h-6.027c-0.409,0-0.82,0.33-0.911,0.734l-2.133,4.56 c-0.094,0.404-0.504,0.734-0.913,0.734h-6.043c-0.41,0-0.836,0.326-0.949,0.725l-1.078,3.824c-0.113,0.399,0.128,0.726,0.539,0.726 h29.006c0.409,0,0.651-0.327,0.539-0.726L43.964,8.753z" fill="url(#SVGID_13_)"/>
-<path d="M26.783,2.754h6.431c0.316,0,0.734,0.179,0.919,0.434c0,0-0.284-1.188-1.125-1.188h-6.022 c-0.835,0-1.118,1.188-1.118,1.188C26.053,2.934,26.467,2.754,26.783,2.754z" fill="#FFFFFF"/>
-<path d="M36.361,8.047c0.099,0.404,0.53,0.734,0.959,0.734h6.346c0.108,0,0.216,0.021,0.322,0.058l-0.024-0.086 c-0.113-0.399-0.541-0.725-0.949-0.725h-6.043c-0.266,0-0.521-0.147-0.702-0.354L36.361,8.047z" fill="#FFFFFF"/>
-<path d="M16.334,8.782h6.345c0.429,0,0.861-0.331,0.96-0.734l0.089-0.373c-0.179,0.207-0.435,0.354-0.702,0.354 h-6.043c-0.408,0-0.834,0.326-0.948,0.725l-0.024,0.086C16.117,8.802,16.227,8.782,16.334,8.782z" fill="#FFFFFF"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="18.9233" x2="18.9233" y1="17.7236" y2="25.0068">
-<stop offset="0" style="stop-color:#83C61D"/>
-<stop offset="1" style="stop-color:#358C0C"/>
-</linearGradient>
-<polygon fill="url(#SVGID_14_)" points="24.046,19.701 22.61,18.264 17.46,23.414 15.238,21.194 13.801,22.631 17.454,26.286 "/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="18.9233" x2="18.9233" y1="26.6226" y2="33.9071">
-<stop offset="0" style="stop-color:#83C61D"/>
-<stop offset="1" style="stop-color:#358C0C"/>
-</linearGradient>
-<polygon fill="url(#SVGID_15_)" points="24.046,28.602 22.61,27.164 17.46,32.314 15.238,30.095 13.801,31.532 17.454,35.187 "/>
-</g>
-</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_text.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_text.svg Fri May 14 16:09:54 2010 +0300
@@ -1,32 +1,32 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<stop offset="0" style="stop-color:#E6E9E8"/>
-<stop offset="0.7455" style="stop-color:#ADB2B5"/>
-<stop offset="1" style="stop-color:#ADB2B5"/>
+ <stop offset="0" style="stop-color:#E6E9E8"/>
+ <stop offset="0.7455" style="stop-color:#ADB2B5"/>
</linearGradient>
<rect fill="url(#SVGID_1_)" height="53" width="51.291" x="4.354" y="3.5"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="29.999" x2="29.999" y1="3.0728" y2="54.3628">
-<stop offset="0" style="stop-color:#F5F5F5"/>
-<stop offset="1" style="stop-color:#CCCCCC"/>
+ <stop offset="0" style="stop-color:#F5F5F5"/>
+ <stop offset="1" style="stop-color:#CCCCCC"/>
</linearGradient>
<path d="M55.645,54.79h-26.5c0,0-13.249-0.381-20.089-3.347c-4.56-1.975-4.702-4.181-4.702-4.181V3.5h51.291 V54.79z" fill="url(#SVGID_2_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="29.999" x2="29.999" y1="3.0728" y2="54.3628">
-<stop offset="0" style="stop-color:#E5EBED"/>
-<stop offset="0.703" style="stop-color:#8D9699"/>
-<stop offset="1" style="stop-color:#B7BDBF"/>
+ <stop offset="0" style="stop-color:#E5EBED"/>
+ <stop offset="0.703" style="stop-color:#8D9699"/>
+ <stop offset="1" style="stop-color:#B7BDBF"/>
</linearGradient>
<path d="M4.354,3.5v43.763c0,0,0.048,0.672,0.855,1.611V4.356h49.58v49.582H19.324 c5.195,0.719,9.82,0.852,9.82,0.852h26.5V3.5H4.354z" fill="url(#SVGID_3_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="18.7158" x2="16.7993" y1="47.938" y2="54.272">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.1939" style="stop-color:#E6E9E8"/>
-<stop offset="0.9333" style="stop-color:#84878A"/>
-<stop offset="1" style="stop-color:#84878A"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="0.1939" style="stop-color:#E6E9E8"/>
+ <stop offset="0.9333" style="stop-color:#84878A"/>
</linearGradient>
-<path d="M31.211,54.79c0,0-12.406,0.569-17.906-8.515 c0,0-7.511,5.564-8.951,0.987C4.967,50.406,10.504,54.903,31.211,54.79z" fill="url(#SVGID_4_)" fill-rule="evenodd"/>
+<path clip-rule="evenodd" d="M31.211,54.79c0,0-12.406,0.569-17.906-8.515 c0,0-7.511,5.564-8.951,0.987C4.967,50.406,10.504,54.903,31.211,54.79z" fill="url(#SVGID_4_)" fill-rule="evenodd"/>
<rect fill="#F5F5F5" height="0.855" width="42.741" x="8.628" y="39.55"/>
<rect fill="#666666" height="1.71" width="42.741" x="8.628" y="37.84"/>
<rect fill="#F5F5F5" height="0.854" width="42.741" x="8.628" y="31.856"/>
@@ -37,4 +37,4 @@
<rect fill="#666666" height="1.71" width="42.741" x="8.628" y="14.76"/>
<rect fill="none" height="60" width="60"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tip.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tip.svg Fri May 14 16:09:54 2010 +0300
@@ -1,40 +1,41 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<radialGradient cx="29.7026" cy="11.6152" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="38.4093">
-<stop offset="0" style="stop-color:#FFE36A"/>
-<stop offset="0.0727" style="stop-color:#FFE36A"/>
-<stop offset="0.5152" style="stop-color:#FCB432"/>
-<stop offset="0.703" style="stop-color:#F98A00"/>
-<stop offset="1" style="stop-color:#FCBC3C"/>
+ <stop offset="0.0727" style="stop-color:#FFE36A"/>
+ <stop offset="0.5152" style="stop-color:#FCB432"/>
+ <stop offset="0.703" style="stop-color:#F98A00"/>
+ <stop offset="1" style="stop-color:#FCBC3C"/>
</radialGradient>
<path d="M30,1C13.868,1,6.945,12.993,8.949,25.372c2.001,12.363,9.413,24.197,21.011,24.367v0.004 c0.015,0,0.026-0.002,0.041-0.002c0.016,0,0.027,0.002,0.041,0.002v-0.004c11.598-0.17,19.01-12.004,21.012-24.367 C53.057,12.993,46.133,1,30,1z" fill="url(#SVGID_1_)"/>
-<path d="M29.794,43.146c-2.909,0-9.646-0.137-14.811-2.203c3,4.275,6.97,7.426,11.806,8.443 c0.037,0.008,0.074,0.014,0.11,0.021c0.284,0.057,0.57,0.107,0.859,0.15c0.239,0.035,0.481,0.061,0.725,0.086 c0.113,0.012,0.226,0.027,0.34,0.037c0.386,0.031,0.776,0.051,1.171,0.057v0.002c0.044,0,0.085-0.004,0.128-0.006 c0.051,0,0.1-0.006,0.15-0.006c0.342-0.01,0.68-0.031,1.014-0.059c0.23-0.021,0.457-0.047,0.684-0.076 c0.094-0.012,0.186-0.023,0.279-0.035c5.588-0.83,10.082-4.459,13.328-9.445C40.303,42.723,32.951,43.146,29.794,43.146z" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M29.794,43.146c-2.909,0-9.646-0.137-14.811-2.203c3,4.275,6.97,7.426,11.806,8.443 c0.037,0.008,0.074,0.014,0.11,0.021c0.284,0.057,0.57,0.107,0.859,0.15c0.239,0.035,0.481,0.061,0.725,0.086 c0.113,0.012,0.226,0.027,0.34,0.037c0.386,0.031,0.776,0.051,1.171,0.057v0.002c0.044,0,0.085-0.004,0.128-0.006 c0.051,0,0.1-0.006,0.15-0.006c0.342-0.01,0.68-0.031,1.014-0.059c0.23-0.021,0.457-0.047,0.684-0.076 c0.094-0.012,0.186-0.023,0.279-0.035c5.588-0.83,10.082-4.459,13.328-9.445C40.303,42.723,32.951,43.146,29.794,43.146z" opacity="0.1"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="17.9624" x2="42.0391" y1="51.7617" y2="51.7617">
-<stop offset="0" style="stop-color:#A0A8AC"/>
-<stop offset="0.1212" style="stop-color:#BDC3C4"/>
-<stop offset="0.2848" style="stop-color:#E9EFF2"/>
-<stop offset="0.6727" style="stop-color:#949DA1"/>
-<stop offset="0.8182" style="stop-color:#D9DFE1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+ <stop offset="0" style="stop-color:#A0A8AC"/>
+ <stop offset="0.1212" style="stop-color:#BDC3C4"/>
+ <stop offset="0.2848" style="stop-color:#E9EFF2"/>
+ <stop offset="0.6727" style="stop-color:#949DA1"/>
+ <stop offset="0.8182" style="stop-color:#D9DFE1"/>
+ <stop offset="0.9636" style="stop-color:#ADB3B5"/>
+ <stop offset="1" style="stop-color:#595C5E"/>
</linearGradient>
<polygon fill="url(#SVGID_2_)" points="17.962,44.523 17.962,56.377 21.099,59 38.9,59 42.039,56.377 42.039,44.523 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="42.0391" x2="17.9629" y1="57.54" y2="57.54">
-<stop offset="0" style="stop-color:#E2E2E2"/>
-<stop offset="0.3" style="stop-color:#969696"/>
-<stop offset="0.6727" style="stop-color:#F2F2F2"/>
-<stop offset="1" style="stop-color:#B3B3B3"/>
+ <stop offset="0" style="stop-color:#E2E2E2"/>
+ <stop offset="0.3" style="stop-color:#969696"/>
+ <stop offset="0.6727" style="stop-color:#F2F2F2"/>
+ <stop offset="1" style="stop-color:#B3B3B3"/>
</linearGradient>
<polygon fill="url(#SVGID_3_)" points="17.962,56.377 21.099,59 38.9,59 42.039,56.377 42.039,56.08 17.962,56.08 "/>
<radialGradient cx="29.5933" cy="3.4521" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="18.3714">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#FAD384"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#FAD384"/>
</radialGradient>
-<path d="M48.678,14.315c-0.715-2.025-1.75-3.873-3.094-5.452 C42.072,4.738,36.684,2.557,30,2.557c-6.683,0-12.072,2.182-15.583,6.307c-1.344,1.58-2.38,3.427-3.094,5.451 C17.357,14.959,23.618,15.31,30,15.31C36.381,15.312,42.643,14.961,48.678,14.315z" fill="url(#SVGID_4_)" fill-opacity="0.75" stroke-opacity="0.75"/>
-<rect fill-opacity="0.25" height="2.207" stroke-opacity="0.25" width="24.077" x="17.962" y="46.975"/>
-<rect fill-opacity="0.25" height="2.205" stroke-opacity="0.25" width="24.077" x="17.962" y="51.939"/>
+<path d="M48.678,14.315c-0.715-2.025-1.75-3.873-3.094-5.452 C42.072,4.738,36.684,2.557,30,2.557c-6.683,0-12.072,2.182-15.583,6.307c-1.344,1.58-2.38,3.427-3.094,5.451 C17.357,14.959,23.618,15.31,30,15.31C36.381,15.312,42.643,14.961,48.678,14.315z" fill="url(#SVGID_4_)" opacity="0.75"/>
+<rect height="2.207" opacity="0.25" width="24.077" x="17.962" y="46.975"/>
+<rect height="2.205" opacity="0.25" width="24.077" x="17.962" y="51.939"/>
<rect fill="none" height="60" width="60"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_todo_alarm.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_todo_alarm.svg Fri May 14 16:09:54 2010 +0300
@@ -1,82 +1,83 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="60" width="60"/>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -257 1649.9688)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="286.999" x2="286.999" y1="1645.4639" y2="1591.9688">
-<stop offset="0" style="stop-color:#D49757"/>
-<stop offset="1" style="stop-color:#702200"/>
+ <stop offset="0" style="stop-color:#D49757"/>
+ <stop offset="1" style="stop-color:#702200"/>
</linearGradient>
<path d="M8.526,58c-1.246,0-2.261-1.013-2.261-2.259V6.766c0-1.248,1.015-2.261,2.261-2.261h42.947 c1.247,0,2.262,1.013,2.262,2.261v48.976c0,1.246-1.015,2.259-2.262,2.259H8.526z" fill="url(#SVGID_1_)"/>
-<path d="M51.473,4.505H8.526c-1.246,0-2.261,1.013-2.261,2.261V7.52 c0-1.248,1.015-2.262,2.261-2.262h42.947c1.247,0,2.262,1.014,2.262,2.262V6.766C53.735,5.518,52.72,4.505,51.473,4.505z" fill="#FFFFFF" fill-opacity="0.6" stroke-opacity="0.6"/>
-<path d="M51.473,57.246H8.526c-1.246,0-2.261-1.013-2.261-2.259v0.754 C6.265,56.987,7.28,58,8.526,58h42.947c1.247,0,2.262-1.013,2.262-2.259v-0.754C53.735,56.233,52.72,57.246,51.473,57.246z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M51.473,4.505H8.526c-1.246,0-2.261,1.013-2.261,2.261V7.52 c0-1.248,1.015-2.262,2.261-2.262h42.947c1.247,0,2.262,1.014,2.262,2.262V6.766C53.735,5.518,52.72,4.505,51.473,4.505z" enable-background="new " fill="#FFFFFF" opacity="0.6"/>
+<path d="M51.473,57.246H8.526c-1.246,0-2.261-1.013-2.261-2.259v0.754 C6.265,56.987,7.28,58,8.526,58h42.947c1.247,0,2.262-1.013,2.262-2.259v-0.754C53.735,56.233,52.72,57.246,51.473,57.246z" enable-background="new " fill="#FFFFFF" opacity="0.3"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -257 1649.9688)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="287" x2="287" y1="1641.8242" y2="1594.8197">
-<stop offset="0" style="stop-color:#707173"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#707173"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
-<rect fill="url(#SVGID_2_)" fill-opacity="0.3" height="46.716" stroke-opacity="0.3" width="41.441" x="9.279" y="8.271"/>
+<rect enable-background="new " fill="url(#SVGID_2_)" height="46.716" opacity="0.3" width="41.441" x="9.279" y="8.271"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -257 1649.9688)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="287" x2="287" y1="1641.0664" y2="1595.578">
-<stop offset="0" style="stop-color:#707173"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#707173"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
-<rect fill="url(#SVGID_3_)" fill-opacity="0.6" height="45.209" stroke-opacity="0.6" width="39.934" x="10.033" y="9.025"/>
+<rect enable-background="new " fill="url(#SVGID_3_)" height="45.209" opacity="0.6" width="39.934" x="10.033" y="9.025"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -257 1649.9688)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="306.4023" x2="267.6852" y1="1618.7178" y2="1618.7178">
-<stop offset="0" style="stop-color:#737373"/>
-<stop offset="1" style="stop-color:#FFFFFF"/>
+ <stop offset="0" style="stop-color:#737373"/>
+ <stop offset="1" style="stop-color:#FFFFFF"/>
</linearGradient>
<rect fill="url(#SVGID_4_)" height="42.948" width="38.427" x="10.787" y="9.778"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -257 1649.9688)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="306.2607" x2="267.8748" y1="1619.4707" y2="1619.4707">
-<stop offset="0" style="stop-color:#8A8C8E"/>
-<stop offset="1" style="stop-color:#4A4A4A"/>
+ <stop offset="0" style="stop-color:#8A8C8E"/>
+ <stop offset="1" style="stop-color:#4A4A4A"/>
</linearGradient>
<rect fill="url(#SVGID_5_)" height="42.947" width="38.427" x="10.787" y="9.025"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -257 1649.9688)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="267.8789" x2="306.4008" y1="1619.8457" y2="1619.8457">
-<stop offset="0" style="stop-color:#737373"/>
-<stop offset="1" style="stop-color:#FFFFFF"/>
+ <stop offset="0" style="stop-color:#737373"/>
+ <stop offset="1" style="stop-color:#FFFFFF"/>
</linearGradient>
<rect fill="url(#SVGID_6_)" height="42.194" width="38.427" x="10.787" y="9.025"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -257 1649.9688)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="277.0107" x2="271.0243" y1="1610.2334" y2="1604.2468">
-<stop offset="0" style="stop-color:#737373"/>
-<stop offset="1" style="stop-color:#FFFFFF"/>
+ <stop offset="0" style="stop-color:#737373"/>
+ <stop offset="1" style="stop-color:#FFFFFF"/>
</linearGradient>
<rect fill="url(#SVGID_7_)" height="41.441" width="38.427" x="10.787" y="9.025"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -257 1649.9688)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="286.999" x2="286.999" y1="1624.8262" y2="1607.9667">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.25" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#E1E1E1"/>
+ <stop offset="0.25" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#E1E1E1"/>
</linearGradient>
<path d="M10.787,36.15c0,0.829,0.478,1.986,1.064,2.572l9.925,9.926c0.586,0.585,1.743,1.064,2.573,1.064 h24.864V9.025H10.787V36.15z" fill="url(#SVGID_8_)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -257 1649.9688)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="286.999" x2="286.999" y1="1640.6797" y2="1600.1635">
-<stop offset="0" style="stop-color:#F0F0F2"/>
-<stop offset="1" style="stop-color:#B3B5B8"/>
+ <stop offset="0" style="stop-color:#F0F0F2"/>
+ <stop offset="1" style="stop-color:#B3B5B8"/>
</linearGradient>
<path d="M48.46,9.778v39.181H24.349c-0.626,0-1.599-0.401-2.04-0.846l-9.925-9.924 c-0.443-0.441-0.845-1.413-0.845-2.039V9.778H48.46 M49.213,9.025H10.787V36.15c0,0.829,0.478,1.986,1.064,2.572l9.925,9.926 c0.586,0.585,1.743,1.064,2.573,1.064h24.864V9.025L49.213,9.025z" fill="url(#SVGID_9_)"/>
<polygon fill="#929497" points="25.856,23.028 46.199,23.028 46.199,21.521 25.856,21.521 "/>
<polygon fill="#929497" points="25.856,31.93 46.199,31.93 46.199,30.422 25.856,30.422 "/>
<polygon fill="#929497" points="16.815,40.55 46.199,40.55 46.199,39.797 46.199,39.043 16.815,39.043 "/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -257 1649.9688)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="279.4805" x2="273.8942" y1="1611.5459" y2="1605.9596">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<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"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <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="M12.177,39.047c-0.314-0.348-0.896-0.695-1.297-2.184c0,0,0.66,3.054,9.701,0.04 c0,12.81,3.768,12.81,3.768,12.81c-0.831,0-1.987-0.479-2.573-1.064L12.177,39.047z" fill="url(#SVGID_10_)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -257 1649.9688)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="287.001" x2="287.001" y1="1642.542" y2="1638.8584">
-<stop offset="0" style="stop-color:#707173"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#707173"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
-<path d="M43.265,7.045c-0.107-0.35-0.512-0.637-0.9-0.637 h-5.741c-0.388,0-0.779-0.291-0.866-0.645l-0.189-0.748H24.433l-0.191,0.748c-0.088,0.355-0.477,0.645-0.865,0.645h-5.741 c-0.388,0-0.793,0.287-0.9,0.637l-1.024,3.361c-0.108,0.35,0.123,0.637,0.512,0.637h27.554c0.388,0,0.619-0.287,0.513-0.637 L43.265,7.045z" fill="url(#SVGID_11_)" fill-opacity="0.15" stroke-opacity="0.15"/>
+<path d="M43.265,7.045c-0.107-0.35-0.512-0.637-0.9-0.637 h-5.741c-0.388,0-0.779-0.291-0.866-0.645l-0.189-0.748H24.433l-0.191,0.748c-0.088,0.355-0.477,0.645-0.865,0.645h-5.741 c-0.388,0-0.793,0.287-0.9,0.637l-1.024,3.361c-0.108,0.35,0.123,0.637,0.512,0.637h27.554c0.388,0,0.619-0.287,0.513-0.637 L43.265,7.045z" enable-background="new " fill="url(#SVGID_11_)" opacity="0.15"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -257 1649.9688)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="287.001" x2="287.001" y1="1641.7881" y2="1638.1045">
-<stop offset="0" style="stop-color:#707173"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#707173"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
-<path d="M43.265,7.8c-0.107-0.351-0.512-0.638-0.9-0.638h-5.741 c-0.388,0-0.779-0.291-0.866-0.645L35.568,5.77H24.433l-0.191,0.748c-0.088,0.355-0.477,0.645-0.865,0.645h-5.741 c-0.388,0-0.793,0.287-0.9,0.638l-1.024,3.359c-0.108,0.351,0.123,0.638,0.512,0.638h27.554c0.388,0,0.619-0.287,0.513-0.638 L43.265,7.8z" fill="url(#SVGID_12_)" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M44.822,12.55H15.178l-0.218,0.781 c-0.114,0.399,0.128,0.727,0.538,0.727h29.005c0.409,0,0.651-0.327,0.539-0.727L44.822,12.55z" fill="#6D6E70" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M43.265,7.8c-0.107-0.351-0.512-0.638-0.9-0.638h-5.741 c-0.388,0-0.779-0.291-0.866-0.645L35.568,5.77H24.433l-0.191,0.748c-0.088,0.355-0.477,0.645-0.865,0.645h-5.741 c-0.388,0-0.793,0.287-0.9,0.638l-1.024,3.359c-0.108,0.351,0.123,0.638,0.512,0.638h27.554c0.388,0,0.619-0.287,0.513-0.638 L43.265,7.8z" enable-background="new " fill="url(#SVGID_12_)" opacity="0.2"/>
+<path d="M44.822,12.55H15.178l-0.218,0.781 c-0.114,0.399,0.128,0.727,0.538,0.727h29.005c0.409,0,0.651-0.327,0.539-0.727L44.822,12.55z" enable-background="new " fill="#6D6E70" opacity="0.5"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -257 1649.9688)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="286.999" x2="286.999" y1="1647.4658" y2="1637.1558">
-<stop offset="0" style="stop-color:#747577"/>
-<stop offset="1" style="stop-color:#D5D7D9"/>
+ <stop offset="0" style="stop-color:#747577"/>
+ <stop offset="1" style="stop-color:#D5D7D9"/>
</linearGradient>
<path d="M43.964,8.753c-0.113-0.398-0.541-0.724-0.949-0.724h-6.043c-0.409,0-0.819-0.331-0.913-0.735 l-2.131-4.56C33.835,2.33,33.423,2,33.013,2h-6.027c-0.409,0-0.82,0.33-0.911,0.734l-2.133,4.56 c-0.094,0.404-0.504,0.735-0.913,0.735h-6.043c-0.41,0-0.836,0.325-0.949,0.724l-1.078,3.825c-0.113,0.398,0.128,0.726,0.539,0.726 h29.006c0.409,0,0.651-0.327,0.539-0.726L43.964,8.753z" fill="url(#SVGID_13_)"/>
<path d="M26.783,2.755h6.431c0.316,0,0.734,0.179,0.919,0.435c0,0-0.284-1.189-1.125-1.189h-6.022 c-0.835,0-1.118,1.189-1.118,1.189C26.053,2.934,26.467,2.755,26.783,2.755z" fill="#FFFFFF"/>
@@ -86,63 +87,65 @@
<path d="M21.805,27.533v5.834h-5.833v-5.834H21.805 M23.055,26.283h-8.333v8.334h8.333V26.283L23.055,26.283z" fill="#929497"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<polygon fill="none" points="0.414,0 0.414,10.485 0,10.899 0.414,11.313 0.414,30 19.1,30 19.514,30.414 19.928,30 30.414,30 30.414,0 "/>
-<path d="M13.769,24.668c-0.003,0.001-0.44,0.125-0.44,0.125l-0.022-0.021L12.8,24.867l-0.025-0.025 c-0.205,0.02-0.411,0.03-0.618,0.03c-1.746,0-3.402-0.694-4.662-1.954c-1.416-1.414-2.113-3.354-1.924-5.279L5.55,17.618l0.09-0.501 L5.634,17.11l0.032-0.128c0.023-0.113,0.049-0.226,0.079-0.338L0,10.899l2.238-2.238c0.623-0.625,1.393-1.296,2.627-1.358 C4.924,7.3,4.988,7.298,5.054,7.298c0.11,0,0.226,0.005,0.346,0.015L5.58,7.334c0.188,0.025,0.352,0.054,0.521,0.092 c0,0,0.277,0.066,0.313,0.076l4.098-4.098C12.707,1.209,15.636,0,18.76,0c2.05,0,4.037,0.526,5.792,1.527 c0.53-0.355,1.14-0.541,1.763-0.541c0.834,0,1.616,0.323,2.203,0.91c1.08,1.08,1.205,2.759,0.375,3.979 c2.574,4.525,1.834,10.311-1.883,14.027l-4.096,4.096c0,0.002,0.068,0.29,0.068,0.29c0.044,0.201,0.072,0.357,0.092,0.505 c0.011,0.083,0.021,0.159,0.026,0.23c0.015,0.178,0.019,0.354,0.011,0.519c-0.062,1.237-0.732,2.009-1.357,2.634l-2.24,2.238 L13.769,24.668z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M13.769,24.668c-0.003,0.001-0.44,0.125-0.44,0.125l-0.022-0.021L12.8,24.867l-0.025-0.025 c-0.205,0.02-0.411,0.03-0.618,0.03c-1.746,0-3.402-0.694-4.662-1.954c-1.416-1.414-2.113-3.354-1.924-5.279L5.55,17.618l0.09-0.501 L5.634,17.11l0.032-0.128c0.023-0.113,0.049-0.226,0.079-0.338L0,10.899l2.238-2.238c0.623-0.625,1.393-1.296,2.627-1.358 C4.924,7.3,4.988,7.298,5.054,7.298c0.11,0,0.226,0.005,0.346,0.015L5.58,7.334c0.188,0.025,0.352,0.054,0.521,0.092 c0,0,0.277,0.066,0.313,0.076l4.098-4.098C12.707,1.209,15.636,0,18.76,0c2.05,0,4.037,0.526,5.792,1.527 c0.53-0.355,1.14-0.541,1.763-0.541c0.834,0,1.616,0.323,2.203,0.91c1.08,1.08,1.205,2.759,0.375,3.979 c2.574,4.525,1.834,10.311-1.883,14.027l-4.096,4.096c0,0.002,0.068,0.29,0.068,0.29c0.044,0.201,0.072,0.357,0.092,0.505 c0.011,0.083,0.021,0.159,0.026,0.23c0.015,0.178,0.019,0.354,0.011,0.519c-0.062,1.237-0.732,2.009-1.357,2.634l-2.24,2.238 L13.769,24.668z" opacity="0.35"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -924.0166 637.3657)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="218.7148" x2="229.6865" y1="-1096.7686" y2="-1096.7686">
-<stop offset="0" style="stop-color:#676B6D"/>
-<stop offset="0.297" style="stop-color:#A0A3A6"/>
-<stop offset="0.7091" style="stop-color:#474B4D"/>
-<stop offset="1" style="stop-color:#707577"/>
+ <stop offset="0" style="stop-color:#676B6D"/>
+ <stop offset="0.297" style="stop-color:#A0A3A6"/>
+ <stop offset="0.7091" style="stop-color:#474B4D"/>
+ <stop offset="1" style="stop-color:#707577"/>
</linearGradient>
<path d="M8,14.656L8,14.656c-2.029,2.029-1.943,5.411,0.201,7.555c2.143,2.143,5.527,2.232,7.557,0.203l0,0 L8,14.656z" fill="url(#SVGID_1__)"/>
<linearGradient gradientTransform="matrix(1 0 0 1 0 9.765625e-004)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="3.21" x2="21.4822" y1="8.9229" y2="27.1951">
-<stop offset="0" style="stop-color:#FFB533"/>
-<stop offset="0.2" style="stop-color:#FFE692"/>
-<stop offset="0.3879" style="stop-color:#FBD072"/>
-<stop offset="0.4182" style="stop-color:#F7BC54"/>
-<stop offset="0.6667" style="stop-color:#ED8C0D"/>
-<stop offset="0.8545" style="stop-color:#F9C967"/>
-<stop offset="1" style="stop-color:#FFB81F"/>
+ <stop offset="0" style="stop-color:#FFB533"/>
+ <stop offset="0.2" style="stop-color:#FFE692"/>
+ <stop offset="0.3879" style="stop-color:#FBD072"/>
+ <stop offset="0.4182" style="stop-color:#F7BC54"/>
+ <stop offset="0.6667" style="stop-color:#ED8C0D"/>
+ <stop offset="0.8545" style="stop-color:#F9C967"/>
+ <stop offset="1" style="stop-color:#FFB81F"/>
</linearGradient>
<path d="M21.777,23.721L6.693,8.637c-2.041-0.73-2.813-0.205-3.748,0.731l-1.531,1.531L19.514,29l1.533-1.531 C21.982,26.532,22.508,25.761,21.777,23.721z" fill="url(#SVGID_2__)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -924.0166 637.3657)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="221.9707" x2="226.2741" y1="-1120.2998" y2="-1120.2998">
-<stop offset="0" style="stop-color:#FFB533"/>
-<stop offset="0.1939" style="stop-color:#FFE692"/>
-<stop offset="0.703" style="stop-color:#ED8C0D"/>
-<stop offset="0.8848" style="stop-color:#F9C967"/>
-<stop offset="1" style="stop-color:#FFB81F"/>
+ <stop offset="0" style="stop-color:#FFB533"/>
+ <stop offset="0.1939" style="stop-color:#FFE692"/>
+ <stop offset="0.703" style="stop-color:#ED8C0D"/>
+ <stop offset="0.8848" style="stop-color:#F9C967"/>
+ <stop offset="1" style="stop-color:#FFB81F"/>
</linearGradient>
<path d="M27.057,6.375l0.754-0.755c0.83-0.829,0.83-2.188,0-3.017c-0.83-0.83-2.188-0.83-3.018,0 l-0.754,0.754L27.057,6.375z" fill="url(#SVGID_3__)"/>
-<path d="M27.057,6.375l0.754-0.755c0.045-0.045,0.08-0.098,0.119-0.146 c-0.385-0.581-0.832-1.134-1.344-1.645c-0.512-0.512-1.064-0.96-1.646-1.346c-0.047,0.041-0.1,0.074-0.146,0.12l-0.754,0.754 L27.057,6.375z" fill="#873900" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M26.869,3.546c-0.492-0.492-1.023-0.924-1.58-1.299c-0.178,0.095-0.346,0.207-0.494,0.355 l-0.473,0.473l3.018,3.017l0.471-0.472c0.148-0.148,0.262-0.318,0.357-0.495C27.791,4.568,27.359,4.038,26.869,3.546z" fill="#873900" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M27.057,6.375l0.754-0.755c0.045-0.045,0.08-0.098,0.119-0.146 c-0.385-0.581-0.832-1.134-1.344-1.645c-0.512-0.512-1.064-0.96-1.646-1.346c-0.047,0.041-0.1,0.074-0.146,0.12l-0.754,0.754 L27.057,6.375z" fill="#873900" opacity="0.2"/>
+<path d="M26.869,3.546c-0.492-0.492-1.023-0.924-1.58-1.299c-0.178,0.095-0.346,0.207-0.494,0.355 l-0.473,0.473l3.018,3.017l0.471-0.472c0.148-0.148,0.262-0.318,0.357-0.495C27.791,4.568,27.359,4.038,26.869,3.546z" fill="#873900" opacity="0.1"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="26.3223" x2="14.1095" y1="4.0923" y2="16.3051">
-<stop offset="0" style="stop-color:#FDE6B1"/>
-<stop offset="1" style="stop-color:#EF951A"/>
+ <stop offset="0" style="stop-color:#FDE6B1"/>
+ <stop offset="1" style="stop-color:#EF951A"/>
</linearGradient>
<path d="M21.777,23.721l4.525-4.525c4.148-4.147,4.148-10.936,0-15.084s-10.936-4.148-15.084,0L6.693,8.637 L21.777,23.721z" fill="url(#SVGID_4__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="13.1172" x2="27.4319" y1="2.9941" y2="17.3088">
-<stop offset="0" style="stop-color:#FFB533"/>
-<stop offset="0.2545" style="stop-color:#FFE692"/>
-<stop offset="0.503" style="stop-color:#F8C15B"/>
-<stop offset="0.5152" style="stop-color:#F6B84E"/>
-<stop offset="0.6667" style="stop-color:#ED8C0D"/>
-<stop offset="0.8545" style="stop-color:#F9C967"/>
-<stop offset="1" style="stop-color:#FFB81F"/>
+ <stop offset="0" style="stop-color:#FFB533"/>
+ <stop offset="0.2545" style="stop-color:#FFE692"/>
+ <stop offset="0.503" style="stop-color:#F8C15B"/>
+ <stop offset="0.5152" style="stop-color:#F6B84E"/>
+ <stop offset="0.6667" style="stop-color:#ED8C0D"/>
+ <stop offset="0.8545" style="stop-color:#F9C967"/>
+ <stop offset="1" style="stop-color:#FFB81F"/>
</linearGradient>
<path d="M7.258,8.637l4.244-4.242C13.432,2.464,16.01,1.4,18.76,1.4c2.752,0,5.33,1.063,7.26,2.994 c1.932,1.931,2.994,4.509,2.994,7.259c0,2.751-1.063,5.329-2.994,7.26l-4.242,4.242L7.258,8.637z" fill="url(#SVGID_5__)"/>
-<rect fill="#873900" fill-opacity="0.2" height="0.401" stroke-opacity="0.2" transform="matrix(0.7071 0.7071 -0.7071 0.7071 15.546 -5.4806)" width="21.332" x="3.723" y="15.825"/>
-<path d="M13.619,23.671c0.143-0.041,0.285-0.087,0.426-0.141l-7.162-7.161c-0.053,0.14-0.1,0.281-0.141,0.425 L13.619,23.671z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<rect fill="#873900" fill-opacity="0.1" height="0.4" stroke-opacity="0.1" transform="matrix(0.7071 0.7071 -0.7071 0.7071 15.429 -5.7637)" width="21.332" x="4.006" y="15.543"/>
-<path d="M13.133,23.786c0.156-0.029,0.309-0.063,0.461-0.106L6.734,16.82c-0.043,0.151-0.078,0.305-0.107,0.459 L13.133,23.786z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M4.85,8.302l17.262,17.263c0.037-0.485-0.059-1.074-0.334-1.844L6.693,8.637 C5.924,8.36,5.336,8.266,4.85,8.302z" fill="#FFF6C9" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M6.693,8.637c-0.195-0.07-0.379-0.128-0.553-0.176l15.813,15.813 c-0.047-0.173-0.105-0.357-0.176-0.553L6.693,8.637z" fill="#FFF6C9" fill-opacity="0.5" stroke-opacity="0.5"/>
-<rect fill="#753200" fill-opacity="0.2" height="0.401" stroke-opacity="0.2" transform="matrix(0.7071 0.7071 -0.7071 0.7071 17.1142 -1.697)" width="25.598" x="-2.194" y="19.608"/>
-<rect fill="#753200" fill-opacity="0.1" height="0.398" stroke-opacity="0.1" transform="matrix(0.7071 0.7071 -0.7071 0.7071 16.9952 -1.9808)" width="25.599" x="-1.911" y="19.326"/>
+<rect fill="#873900" height="0.401" opacity="0.2" transform="matrix(0.7071 0.7071 -0.7071 0.7071 15.546 -5.4806)" width="21.332" x="3.723" y="15.825"/>
+<path d="M13.619,23.671c0.143-0.041,0.285-0.087,0.426-0.141l-7.162-7.161c-0.053,0.14-0.1,0.281-0.141,0.425 L13.619,23.671z" opacity="0.2"/>
+<rect fill="#873900" height="0.4" opacity="0.1" transform="matrix(0.7071 0.7071 -0.7071 0.7071 15.429 -5.7637)" width="21.332" x="4.006" y="15.543"/>
+<path d="M13.133,23.786c0.156-0.029,0.309-0.063,0.461-0.106L6.734,16.82c-0.043,0.151-0.078,0.305-0.107,0.459 L13.133,23.786z" opacity="0.1"/>
+<path d="M4.85,8.302l17.262,17.263c0.037-0.485-0.059-1.074-0.334-1.844L6.693,8.637 C5.924,8.36,5.336,8.266,4.85,8.302z" fill="#FFF6C9" opacity="0.5"/>
+<path d="M6.693,8.637c-0.195-0.07-0.379-0.128-0.553-0.176l15.813,15.813 c-0.047-0.173-0.105-0.357-0.176-0.553L6.693,8.637z" fill="#FFF6C9" opacity="0.5"/>
+<rect fill="#753200" height="0.401" opacity="0.2" transform="matrix(0.7071 0.7071 -0.7071 0.7071 17.1142 -1.697)" width="25.598" x="-2.194" y="19.608"/>
+<rect fill="#753200" height="0.398" opacity="0.1" transform="matrix(0.7071 0.7071 -0.7071 0.7071 16.9952 -1.9808)" width="25.599" x="-1.911" y="19.326"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6__" x1="21.6523" x2="21.6523" y1="1.7822" y2="16.0367">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#F9C966"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#F9C966"/>
</linearGradient>
-<path d="M27.348,15.49c-2.314-1.359-4.715-3.255-6.941-5.482 c-2.229-2.228-4.123-4.628-5.482-6.942l-0.236-0.403l0.436-0.172c1.156-0.455,2.375-0.686,3.627-0.686 c2.615,0,5.162,1.047,6.986,2.873c2.775,2.774,3.635,6.941,2.188,10.614l-0.172,0.435L27.348,15.49z" fill="url(#SVGID_6__)" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M27.348,15.49c-2.314-1.359-4.715-3.255-6.941-5.482 c-2.229-2.228-4.123-4.628-5.482-6.942l-0.236-0.403l0.436-0.172c1.156-0.455,2.375-0.686,3.627-0.686 c2.615,0,5.162,1.047,6.986,2.873c2.775,2.774,3.635,6.941,2.188,10.614l-0.172,0.435L27.348,15.49z" fill="url(#SVGID_6__)" opacity="0.5"/>
<rect fill="none" height="30" width="30" x="0.414"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tone.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tone.svg Fri May 14 16:09:54 2010 +0300
@@ -1,32 +1,61 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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">
+
<stop offset="0" stop-color="#8CFF24"/>
+
<stop offset="1" stop-color="#15570B"/>
+
</linearGradient>
+
<path d="M48.63,13.08l-3.08-7.497-17.7,7.877,0.028,23.92c-2.712-1.771-6.708-2.354-10.77-1.254-6.405,1.725-10.54,6.951-9.247,11.66,1.3,4.718,7.543,7.142,13.94,5.415,5.412-1.461,9.159-5.324,9.138-9.451-0.018-4.129,0.033-15.34,0-23.44l17.69-7.23z" fill="url(#SVGID_1)"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="27.86" x2="27.86" y1="9.02" y2="18.75">
+
<stop offset="0" stop-color="#36B5FF"/>
+
<stop offset="1" stop-color="#1B66D8"/>
+
</linearGradient>
+
<polygon fill="url(#SVGID_2)" points="27.88,33.26,27.86,13.46,27.85,13.46,27.87,33.26"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="39.79" x2="39.79" y1="9.02" y2="18.75">
+
<stop offset="0" stop-color="#9EFF47"/>
+
<stop offset="1" stop-color="#11470A"/>
+
</linearGradient>
+
<path d="M30.94,19.08c0.007,1.306,0.01-0.201,0.012,1.223l17.67-7.225-0.436-1.108-17.24,7.11z" fill="url(#SVGID_3)"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="36.64" x2="36.76" y1="12.18" y2="36.51">
+
<stop offset="0" stop-color="#B3FF6E"/>
+
<stop offset="1" stop-color="#11470A"/>
+
</linearGradient>
+
<polygon fill="url(#SVGID_4)" points="28.14,38.06,28.14,14.14,45.89,6.413,45.55,5.582,27.45,13.46,27.45,37.38"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="19.29" x2="19.29" y1="37.91" y2="52.09">
+
<stop offset="0" stop-color="#B2F56E"/>
+
<stop offset="0.47" stop-color="#40AD00"/>
+
<stop offset="1" stop-color="#074D00"/>
+
</linearGradient>
+
<path d="M17.62,52.39c-4.258,0.021-7.653-1.941-8.447-4.885-0.484-1.785,0.028-3.761,1.444-5.555,1.55-1.964,3.944-3.454,6.747-4.191,1.187-0.317,2.386-0.477,3.573-0.484,4.258-0.021,7.651,1.943,8.45,4.885,1.058,3.9-2.618,8.272-8.196,9.748-1.18,0.31-2.38,0.47-3.57,0.48z" fill="url(#SVGID_5)"/>
+
<rect fill="none" height="60" width="60"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tone_off.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tone_off.svg Fri May 14 16:09:54 2010 +0300
@@ -1,45 +1,63 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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">
+
<stop offset="0" stop-color="#8CFF24"/>
+
<stop offset="1" stop-color="#15570B"/>
+
</linearGradient>
<path d="M48.63,13.08l-3.08-7.497-17.7,7.877,0.028,23.92c-2.712-1.771-6.708-2.354-10.77-1.254-6.405,1.725-10.54,6.951-9.247,11.66,1.3,4.718,7.543,7.142,13.94,5.415,5.412-1.461,9.159-5.324,9.138-9.451-0.018-4.129,0.033-15.34,0-23.44l17.69-7.23z" fill="url(#SVGID_1)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="27.86" x2="27.86" y1="9.02" y2="18.75">
+
<stop offset="0" stop-color="#36B5FF"/>
+
<stop offset="1" stop-color="#1B66D8"/>
+
</linearGradient>
<polygon fill="url(#SVGID_2)" points="27.88,33.26,27.86,13.46,27.85,13.46,27.87,33.26"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3" x1="39.79" x2="39.79" y1="9.02" y2="18.75">
+
<stop offset="0" stop-color="#9EFF47"/>
+
<stop offset="1" stop-color="#11470A"/>
+
</linearGradient>
<path d="M30.94,19.08c0.007,1.306,0.01-0.201,0.012,1.223l17.67-7.225-0.436-1.108-17.24,7.11z" fill="url(#SVGID_3)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4" x1="36.64" x2="36.76" y1="12.18" y2="36.51">
+
<stop offset="0" stop-color="#B3FF6E"/>
+
<stop offset="1" stop-color="#11470A"/>
+
</linearGradient>
<polygon fill="url(#SVGID_4)" points="28.14,38.06,28.14,14.14,45.89,6.413,45.55,5.582,27.45,13.46,27.45,37.38"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5" x1="19.29" x2="19.29" y1="37.91" y2="52.09">
+
<stop offset="0" stop-color="#B2F56E"/>
+
<stop offset="0.47" stop-color="#40AD00"/>
+
<stop offset="1" stop-color="#074D00"/>
+
</linearGradient>
<path d="M17.62,52.39c-4.258,0.021-7.653-1.941-8.447-4.885-0.484-1.785,0.028-3.761,1.444-5.555,1.55-1.964,3.944-3.454,6.747-4.191,1.187-0.317,2.386-0.477,3.573-0.484,4.258-0.021,7.651,1.943,8.45,4.885,1.058,3.9-2.618,8.272-8.196,9.748-1.18,0.31-2.38,0.47-3.57,0.48z" fill="url(#SVGID_5)"/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(2 0 0 2 0 0)">
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
-<rect fill-opacity="0.35" height="33.866" stroke-opacity="0.35" transform="matrix(-0.6985 0.7156 -0.7156 -0.6985 35.9922 14.2223)" width="3.706" x="13.147" y="-2.239"/>
+<rect height="33.866" opacity="0.35" transform="matrix(-0.6985 0.7156 -0.7156 -0.6985 35.9922 14.2223)" width="3.706" x="13.147" y="-2.239"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -257 670.6689)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="260" x2="284" y1="655.9761" y2="655.9761">
-<stop offset="0" style="stop-color:#FF4D00"/>
-<stop offset="0.8424" style="stop-color:#CC1414"/>
-<stop offset="1" style="stop-color:#FF4D00"/>
+ <stop offset="0" style="stop-color:#FF4D00"/>
+ <stop offset="0.8424" style="stop-color:#CC1414"/>
+ <stop offset="1" style="stop-color:#FF4D00"/>
</linearGradient>
<polygon fill="url(#SVGID_1_)" points="25.809,26.431 3,4.177 4.191,2.956 27,25.21 "/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tv_out.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_tv_out.svg Fri May 14 16:09:54 2010 +0300
@@ -1,184 +1,184 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="2.001" y2="57.8555">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+ <stop offset="0.0667" style="stop-color:#D1D7D9"/>
+ <stop offset="0.2606" style="stop-color:#BDC2C4"/>
+ <stop offset="0.6606" style="stop-color:#949DA1"/>
+ <stop offset="0.9636" style="stop-color:#ADB3B5"/>
+ <stop offset="1" style="stop-color:#595C5E"/>
</linearGradient>
<path d="M48.027,54.932c0,1.693-1.375,3.069-3.068,3.069h-29.92c-1.693,0-3.066-1.376-3.066-3.069V5.07 c0-1.696,1.373-3.069,3.066-3.069h29.92c1.693,0,3.068,1.373,3.068,3.069V54.932z" fill="url(#SVGID_1_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="2.001" y2="56.899">
-<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"/>
+ <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="M44.959,2.001h-29.92c-1.693,0-3.066,1.373-3.066,3.069v49.861c0,0.82,0.324,1.56,0.848,2.11 c-0.047-0.187-0.08-0.377-0.08-0.575v-1.535V6.602V5.07c0-1.271,1.031-2.304,2.299-2.304h29.92c1.268,0,2.301,1.033,2.301,2.304 v1.531v48.33v1.535c0,0.198-0.033,0.389-0.08,0.575c0.521-0.551,0.848-1.29,0.848-2.11V5.07C48.027,3.374,46.652,2.001,44.959,2.001 z" fill="url(#SVGID_2_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="5.8916" y2="43.4283">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+ <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="37.589" stroke-opacity="0.6" width="31.453" x="14.273" y="5.836"/>
+<rect fill="url(#SVGID_3_)" height="37.589" opacity="0.6" width="31.453" x="14.273" y="5.836"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="29.999" x2="29.999" y1="6.6548" y2="42.6624">
-<stop offset="0" style="stop-color:#6E6E6E"/>
-<stop offset="1" style="stop-color:#333333"/>
+ <stop offset="0" style="stop-color:#6E6E6E"/>
+ <stop offset="1" style="stop-color:#333333"/>
</linearGradient>
<rect fill="url(#SVGID_4_)" height="36.058" width="29.92" x="15.039" y="6.602"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="30" x2="30" y1="7.4214" y2="41.894">
-<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"/>
+ <stop offset="0" style="stop-color:#3BC8EB"/>
+ <stop offset="0.3879" style="stop-color:#2D9BD2"/>
+ <stop offset="0.8909" style="stop-color:#1347BA"/>
</linearGradient>
<rect fill="url(#SVGID_5_)" height="34.521" width="28.383" x="15.809" y="7.37"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="30" x2="30" y1="7.9712" y2="21.69">
-<stop offset="0" style="stop-color:#85EFFF"/>
-<stop offset="1" style="stop-color:#3BA1D9"/>
+ <stop offset="0" style="stop-color:#85EFFF"/>
+ <stop offset="1" style="stop-color:#3BA1D9"/>
</linearGradient>
<polygon fill="url(#SVGID_6_)" points="44.191,19.644 15.809,22.712 15.809,8.137 44.191,8.137 "/>
<rect fill="#9FE4FF" height="0.767" width="28.383" x="15.809" y="7.37"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="30.2236" x2="30.2236" y1="5.8726" y2="2.8032">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#D1D7D9"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#D1D7D9"/>
</linearGradient>
<path d="M26.832,5.836c-0.861,0-1.535-0.563-1.535-1.279v-0.51c0-0.718,0.674-1.28,1.535-1.28h6.785 c0.859,0,1.533,0.563,1.533,1.28v0.51c0,0.716-0.674,1.279-1.533,1.279H26.832z" fill="url(#SVGID_7_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="30.2236" x2="30.2236" y1="3.2158" y2="5.1992">
-<stop offset="0" style="stop-color:#6C7375"/>
-<stop offset="1" style="stop-color:#BDC2C4"/>
+ <stop offset="0" style="stop-color:#6C7375"/>
+ <stop offset="1" style="stop-color:#BDC2C4"/>
</linearGradient>
<path d="M34.383,4.557c0,0.283-0.342,0.514-0.766,0.514h-6.785c-0.424,0-0.768-0.23-0.768-0.514v-0.51 c0-0.283,0.344-0.512,0.768-0.512h6.785c0.424,0,0.766,0.229,0.766,0.512V4.557z" fill="url(#SVGID_8_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="29.8818" x2="29.8818" y1="44.2236" y2="55.628">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#FFFFFF"/>
+ <stop offset="0" style="stop-color:#B6BBBD"/>
+ <stop offset="1" style="stop-color:#FFFFFF"/>
</linearGradient>
-<path d="M27.109,55.7c-1.645,0-2.98-1.323-2.98-2.951v-5.606c0-1.627,1.336-2.951,2.98-2.951 h5.545c1.645,0,2.98,1.324,2.98,2.951v5.606c0,1.628-1.336,2.951-2.98,2.951H27.109z" fill="url(#SVGID_9_)" fill-opacity="0.6" stroke-opacity="0.6"/>
-<path d="M27.105,54.932c-1.219,0-2.211-0.979-2.211-2.183v-5.606c0-1.204,0.992-2.183,2.211-2.183 h5.553c1.219,0,2.209,0.979,2.209,2.183v5.606c0,1.204-0.99,2.183-2.209,2.183H27.105z" fill="#020202" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M27.109,55.7c-1.645,0-2.98-1.323-2.98-2.951v-5.606c0-1.627,1.336-2.951,2.98-2.951 h5.545c1.645,0,2.98,1.324,2.98,2.951v5.606c0,1.628-1.336,2.951-2.98,2.951H27.109z" fill="url(#SVGID_9_)" opacity="0.6"/>
+<path d="M27.105,54.932c-1.219,0-2.211-0.979-2.211-2.183v-5.606c0-1.204,0.992-2.183,2.211-2.183 h5.553c1.219,0,2.209,0.979,2.209,2.183v5.606c0,1.204-0.99,2.183-2.209,2.183H27.105z" fill="#020202" opacity="0.5"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="29.8818" x2="29.8818" y1="45.6865" y2="54.1806">
-<stop offset="0" style="stop-color:#A6A8AB"/>
-<stop offset="0.703" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#808184"/>
+ <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="M34.102,52.749c0,0.783-0.645,1.417-1.438,1.417h-5.566c-0.793,0-1.436-0.634-1.436-1.417v-5.606 c0-0.783,0.643-1.417,1.436-1.417h5.566c0.793,0,1.438,0.634,1.438,1.417V52.749z" fill="url(#SVGID_10_)"/>
-<path d="M28.73,52.632c-0.846,0-1.533-0.688-1.533-1.534v-2.303c0-0.847,0.688-1.534,1.533-1.534 h2.303c0.846,0,1.533,0.688,1.533,1.534v2.303c0,0.847-0.688,1.534-1.533,1.534H28.73z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M28.73,52.632c-0.846,0-1.533-0.688-1.533-1.534v-2.303c0-0.847,0.688-1.534,1.533-1.534 h2.303c0.846,0,1.533,0.688,1.533,1.534v2.303c0,0.847-0.688,1.534-1.533,1.534H28.73z" fill="#020202" opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="29.8809" x2="29.8809" y1="48.0103" y2="51.8696">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.0667" style="stop-color:#D1D7D9"/>
-<stop offset="0.2606" style="stop-color:#BDC2C4"/>
-<stop offset="0.6606" style="stop-color:#949DA1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+ <stop offset="0.0667" style="stop-color:#D1D7D9"/>
+ <stop offset="0.2606" style="stop-color:#BDC2C4"/>
+ <stop offset="0.6606" style="stop-color:#949DA1"/>
+ <stop offset="0.9636" style="stop-color:#ADB3B5"/>
+ <stop offset="1" style="stop-color:#595C5E"/>
</linearGradient>
<path d="M28.73,51.863c-0.422,0-0.768-0.345-0.768-0.766v-2.303c0-0.422,0.346-0.767,0.768-0.767h2.303 c0.42,0,0.766,0.345,0.766,0.767v2.303c0,0.421-0.346,0.766-0.766,0.766H28.73z" fill="url(#SVGID_11_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="17.667" x2="17.667" y1="44.917" y2="54.1816">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+ <stop offset="0" style="stop-color:#B6BBBD"/>
+ <stop offset="1" style="stop-color:#F0FBFF"/>
</linearGradient>
-<path d="M17.223,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307 c0-1.624,1.324-2.948,2.949-2.948h0.887c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H17.223z" fill="url(#SVGID_12_)" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M17.223,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307 c0-1.624,1.324-2.948,2.949-2.948h0.887c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H17.223z" fill="url(#SVGID_12_)" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="17.665" x2="17.665" y1="45.6899" y2="53.4106">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+ <stop offset="0" style="stop-color:#231F20"/>
+ <stop offset="1" style="stop-color:#6D6E70"/>
</linearGradient>
-<path d="M17.223,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307 c0-1.201,0.98-2.183,2.184-2.183h0.887c1.205,0,2.182,0.981,2.182,2.183v3.307c0,1.204-0.977,2.183-2.182,2.183H17.223z" fill="url(#SVGID_13_)" fill-opacity="0.7" stroke-opacity="0.7"/>
+<path d="M17.223,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307 c0-1.201,0.98-2.183,2.184-2.183h0.887c1.205,0,2.182,0.981,2.182,2.183v3.307c0,1.204-0.977,2.183-2.182,2.183H17.223z" fill="url(#SVGID_13_)" opacity="0.7"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="17.667" x2="17.667" y1="46.4658" y2="52.6426">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+ <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="M19.525,51.215c0,0.783-0.635,1.417-1.416,1.417h-0.887c-0.779,0-1.414-0.634-1.414-1.417v-3.307 c0-0.78,0.635-1.414,1.414-1.414h0.887c0.781,0,1.416,0.634,1.416,1.414V51.215z" fill="url(#SVGID_14_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="41.6719" x2="41.6719" y1="44.917" y2="54.1816">
-<stop offset="0" style="stop-color:#B6BBBD"/>
-<stop offset="1" style="stop-color:#F0FBFF"/>
+ <stop offset="0" style="stop-color:#B6BBBD"/>
+ <stop offset="1" style="stop-color:#F0FBFF"/>
</linearGradient>
-<path d="M41.229,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307 c0-1.624,1.324-2.948,2.949-2.948h0.885c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H41.229z" fill="url(#SVGID_15_)" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M41.229,54.166c-1.625,0-2.949-1.323-2.949-2.951v-3.307 c0-1.624,1.324-2.948,2.949-2.948h0.885c1.627,0,2.951,1.324,2.951,2.948v3.307c0,1.628-1.324,2.951-2.951,2.951H41.229z" fill="url(#SVGID_15_)" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="41.6709" x2="41.6709" y1="45.6899" y2="53.4106">
-<stop offset="0" style="stop-color:#231F20"/>
-<stop offset="1" style="stop-color:#6D6E70"/>
+ <stop offset="0" style="stop-color:#231F20"/>
+ <stop offset="1" style="stop-color:#6D6E70"/>
</linearGradient>
-<path d="M41.229,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307 c0-1.201,0.98-2.183,2.184-2.183h0.885c1.205,0,2.184,0.981,2.184,2.183v3.307c0,1.204-0.979,2.183-2.184,2.183H41.229z" fill="url(#SVGID_16_)" fill-opacity="0.7" stroke-opacity="0.7"/>
+<path d="M41.229,53.397c-1.203,0-2.184-0.979-2.184-2.183v-3.307 c0-1.201,0.98-2.183,2.184-2.183h0.885c1.205,0,2.184,0.981,2.184,2.183v3.307c0,1.204-0.979,2.183-2.184,2.183H41.229z" fill="url(#SVGID_16_)" opacity="0.7"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="41.6719" x2="41.6719" y1="46.4658" y2="52.6426">
-<stop offset="0" style="stop-color:#FFC142"/>
-<stop offset="0.7455" style="stop-color:#CF4E18"/>
-<stop offset="1" style="stop-color:#B52100"/>
+ <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="M43.531,51.215c0,0.783-0.637,1.417-1.418,1.417h-0.885c-0.781,0-1.416-0.634-1.416-1.417v-3.307 c0-0.78,0.635-1.414,1.416-1.414h0.885c0.781,0,1.418,0.634,1.418,1.414V51.215z" fill="url(#SVGID_17_)"/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(-1 0 0 1 60 30)">
+<defs>
+</defs>
<polygon fill="none" points="8.019,0 0,0 0,30 18.231,30 18.84,30.224 18.975,30 30,30 30,0 21.98,0 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="6.5635" x2="23.4365" y1="15.1118" y2="15.1118">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="0.2727" style="stop-color:#333333"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="0.2727" style="stop-color:#333333"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
-<path d="M18.064,29.938c-4.937-1.812-6.404-6.104-6.839-8.368h-0.037l-0.033-0.295h-0.363 c-0.829,0-1.512-0.64-1.581-1.452L8.62,17.166H8.15c-0.875,0-1.587-0.712-1.587-1.586V7.359c0-0.83,0.642-1.514,1.455-1.58V0H21.98 v5.779c0.814,0.066,1.456,0.75,1.456,1.58v8.221c0,0.874-0.712,1.586-1.588,1.586H21.38l-0.592,2.657 c-0.069,0.812-0.751,1.452-1.579,1.452c0.416,0.971,1.1,1.979,2.214,2.472l1.037,0.459l-3.62,6.018L18.064,29.938z" fill="url(#SVGID_1__)" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M18.064,29.938c-4.937-1.812-6.404-6.104-6.839-8.368h-0.037l-0.033-0.295h-0.363 c-0.829,0-1.512-0.64-1.581-1.452L8.62,17.166H8.15c-0.875,0-1.587-0.712-1.587-1.586V7.359c0-0.83,0.642-1.514,1.455-1.58V0H21.98 v5.779c0.814,0.066,1.456,0.75,1.456,1.58v8.221c0,0.874-0.712,1.586-1.588,1.586H21.38l-0.592,2.657 c-0.069,0.812-0.751,1.452-1.579,1.452c0.416,0.971,1.1,1.979,2.214,2.472l1.037,0.459l-3.62,6.018L18.064,29.938z" fill="url(#SVGID_1__)" opacity="0.35"/>
<radialGradient cx="22.252" cy="19.7871" gradientUnits="userSpaceOnUse" id="SVGID_2__" r="9.5452">
-<stop offset="0" style="stop-color:#101010"/>
-<stop offset="0.4727" style="stop-color:#858585"/>
-<stop offset="0.8" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+ <stop offset="0" style="stop-color:#101010"/>
+ <stop offset="0.4727" style="stop-color:#858585"/>
+ <stop offset="0.8" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#4D4D4D"/>
</radialGradient>
<path d="M18.409,29c-5.74-2.107-6.669-7.99-6.358-10.807l5.544,0.615c-0.033,0.371,0.419,4.525,3.424,5.854 L18.409,29L18.409,29z" fill="url(#SVGID_2__)"/>
-<path d="M17.595,18.809l-5.544-0.615c-0.08,0.725-0.077,1.654,0.069,2.67h5.867 C17.657,19.828,17.581,18.969,17.595,18.809z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M17.595,18.809l-5.544-0.615c-0.08,0.725-0.077,1.654,0.069,2.67h5.867 C17.657,19.828,17.581,18.969,17.595,18.809z" opacity="0.35"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="9.0186" x2="20.9805" y1="3.9355" y2="3.9355">
-<stop offset="0" style="stop-color:#B57201"/>
-<stop offset="0.05" style="stop-color:#FFF173"/>
-<stop offset="0.35" style="stop-color:#F1BC35"/>
-<stop offset="0.65" style="stop-color:#E5B029"/>
-<stop offset="0.95" style="stop-color:#FCE666"/>
-<stop offset="1" style="stop-color:#B57201"/>
+ <stop offset="0" style="stop-color:#B57201"/>
+ <stop offset="0.05" style="stop-color:#FFF173"/>
+ <stop offset="0.35" style="stop-color:#F1BC35"/>
+ <stop offset="0.65" style="stop-color:#E5B029"/>
+ <stop offset="0.95" style="stop-color:#FCE666"/>
+ <stop offset="1" style="stop-color:#B57201"/>
</linearGradient>
<rect fill="url(#SVGID_3__)" height="5.871" width="11.962" x="9.019" y="1"/>
-<path d="M17.595,18.809l-5.544-0.615c-0.072,0.654-0.075,1.477,0.03,2.377h5.818 C17.644,19.67,17.582,18.953,17.595,18.809z" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M17.595,18.809l-5.544-0.615c-0.072,0.654-0.075,1.477,0.03,2.377h5.818 C17.644,19.67,17.582,18.953,17.595,18.809z" opacity="0.5"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="9.0313" x2="20.9688" y1="17.0469" y2="17.0469">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#7A7A7A"/>
-<stop offset="0.8" style="stop-color:#1A1A1A"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.2" style="stop-color:#7A7A7A"/>
+ <stop offset="0.8" style="stop-color:#1A1A1A"/>
+ <stop offset="1" style="stop-color:#4D4D4D"/>
</linearGradient>
<path d="M19.794,19.688c0,0.324-0.263,0.588-0.586,0.588h-8.416c-0.324,0-0.587-0.264-0.587-0.588 l-1.174-5.281c0-0.326,0.263-0.588,0.587-0.588h10.764c0.324,0,0.587,0.262,0.587,0.588L19.794,19.688z" fill="url(#SVGID_4__)"/>
-<path d="M20.382,14.111H9.618c-0.266,0-0.486,0.178-0.56,0.418l0.495,2.225h10.893l0.494-2.225 C20.868,14.289,20.646,14.111,20.382,14.111z" fill-opacity="0.35" stroke-opacity="0.35"/>
-<path d="M9.618,17.047h10.764l0.514-2.316c-0.096-0.189-0.286-0.324-0.514-0.324H9.618 c-0.229,0-0.418,0.135-0.516,0.324L9.618,17.047z" fill-opacity="0.35" stroke-opacity="0.35"/>
-<path d="M20.382,13.818H9.618c-0.324,0-0.587,0.262-0.587,0.588l0.456,2.053h11.025l0.456-2.053 C20.969,14.08,20.706,13.818,20.382,13.818z" fill-opacity="0.5" stroke-opacity="0.5"/>
-<rect fill-opacity="0.35" height="0.393" stroke-opacity="0.35" width="11.962" x="9.019" y="6.479"/>
-<rect fill-opacity="0.15" height="0.391" stroke-opacity="0.15" width="11.962" x="9.019" y="6.088"/>
+<path d="M20.382,14.111H9.618c-0.266,0-0.486,0.178-0.56,0.418l0.495,2.225h10.893l0.494-2.225 C20.868,14.289,20.646,14.111,20.382,14.111z" opacity="0.35"/>
+<path d="M9.618,17.047h10.764l0.514-2.316c-0.096-0.189-0.286-0.324-0.514-0.324H9.618 c-0.229,0-0.418,0.135-0.516,0.324L9.618,17.047z" opacity="0.35"/>
+<path d="M20.382,13.818H9.618c-0.324,0-0.587,0.262-0.587,0.588l0.456,2.053h11.025l0.456-2.053 C20.969,14.08,20.706,13.818,20.382,13.818z" opacity="0.5"/>
+<rect height="0.393" opacity="0.35" width="11.962" x="9.019" y="6.479"/>
+<rect height="0.391" opacity="0.15" width="11.962" x="9.019" y="6.088"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="7.5635" x2="22.4365" y1="11.4697" y2="11.4697">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#595959"/>
-<stop offset="0.8" style="stop-color:#1A1A1A"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.2" style="stop-color:#595959"/>
+ <stop offset="0.8" style="stop-color:#1A1A1A"/>
+ <stop offset="1" style="stop-color:#4D4D4D"/>
</linearGradient>
<path d="M22.437,15.58c0,0.324-0.264,0.586-0.588,0.586H8.15c-0.324,0-0.587-0.262-0.587-0.586V7.359 c0-0.324,0.263-0.586,0.587-0.586h13.698c0.324,0,0.588,0.262,0.588,0.586V15.58z" fill="url(#SVGID_5__)"/>
-<path d="M21.849,15.873H8.15c-0.324,0-0.587-0.264-0.587-0.588v0.295c0,0.324,0.263,0.586,0.587,0.586h13.698 c0.324,0,0.588-0.262,0.588-0.586v-0.295C22.437,15.609,22.173,15.873,21.849,15.873z" fill-opacity="0.35" stroke-opacity="0.35"/>
-<path d="M21.849,15.58H8.15c-0.324,0-0.587-0.264-0.587-0.588v0.293c0,0.324,0.263,0.588,0.587,0.588h13.698 c0.324,0,0.588-0.264,0.588-0.588v-0.293C22.437,15.316,22.173,15.58,21.849,15.58z" fill-opacity="0.15" stroke-opacity="0.15"/>
-<path d="M21.849,6.773H8.15c-0.324,0-0.587,0.262-0.587,0.586v0.293c0-0.322,0.263-0.586,0.587-0.586 h13.698c0.324,0,0.588,0.264,0.588,0.586V7.359C22.437,7.035,22.173,6.773,21.849,6.773z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M21.849,7.066H8.15c-0.324,0-0.587,0.264-0.587,0.586v0.295c0-0.324,0.263-0.588,0.587-0.588 h13.698c0.324,0,0.588,0.264,0.588,0.588V7.652C22.437,7.33,22.173,7.066,21.849,7.066z" fill="#FFFFFF" fill-opacity="0.25" stroke-opacity="0.25"/>
+<path d="M21.849,15.873H8.15c-0.324,0-0.587-0.264-0.587-0.588v0.295c0,0.324,0.263,0.586,0.587,0.586h13.698 c0.324,0,0.588-0.262,0.588-0.586v-0.295C22.437,15.609,22.173,15.873,21.849,15.873z" opacity="0.35"/>
+<path d="M21.849,15.58H8.15c-0.324,0-0.587-0.264-0.587-0.588v0.293c0,0.324,0.263,0.588,0.587,0.588h13.698 c0.324,0,0.588-0.264,0.588-0.588v-0.293C22.437,15.316,22.173,15.58,21.849,15.58z" opacity="0.15"/>
+<path d="M21.849,6.773H8.15c-0.324,0-0.587,0.262-0.587,0.586v0.293c0-0.322,0.263-0.586,0.587-0.586 h13.698c0.324,0,0.588,0.264,0.588,0.586V7.359C22.437,7.035,22.173,6.773,21.849,6.773z" fill="#FFFFFF" opacity="0.5"/>
+<path d="M21.849,7.066H8.15c-0.324,0-0.587,0.264-0.587,0.586v0.295c0-0.324,0.263-0.588,0.587-0.588 h13.698c0.324,0,0.588,0.264,0.588,0.588V7.652C22.437,7.33,22.173,7.066,21.849,7.066z" fill="#FFFFFF" opacity="0.25"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6__" x1="7.5635" x2="22.4365" y1="8.4355" y2="8.4355">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="0.2727" style="stop-color:#333333"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="0.2727" style="stop-color:#333333"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
<rect fill="url(#SVGID_6__)" height="0.586" width="14.873" x="7.563" y="8.143"/>
-<rect fill="#FFFFFF" fill-opacity="0.25" height="0.295" stroke-opacity="0.25" width="14.873" x="7.563" y="8.729"/>
-<rect fill="#FFFFFF" fill-opacity="0.25" height="0.293" stroke-opacity="0.25" width="14.873" x="7.563" y="10.197"/>
-<rect fill="#FFFFFF" fill-opacity="0.25" height="0.295" stroke-opacity="0.25" width="14.873" x="7.563" y="11.664"/>
+<rect fill="#FFFFFF" height="0.295" opacity="0.25" width="14.873" x="7.563" y="8.729"/>
+<rect fill="#FFFFFF" height="0.293" opacity="0.25" width="14.873" x="7.563" y="10.197"/>
+<rect fill="#FFFFFF" height="0.295" opacity="0.25" width="14.873" x="7.563" y="11.664"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7__" x1="7.5635" x2="22.4365" y1="9.9033" y2="9.9033">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="0.2727" style="stop-color:#333333"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="0.2727" style="stop-color:#333333"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
<rect fill="url(#SVGID_7__)" height="0.588" width="14.873" x="7.563" y="9.609"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8__" x1="7.5635" x2="22.4365" y1="11.3711" y2="11.3711">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="0.2727" style="stop-color:#333333"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="0.2727" style="stop-color:#333333"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
<rect fill="url(#SVGID_8__)" height="0.586" width="14.873" x="7.563" y="11.078"/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_unknown.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,32 @@
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
+<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">
+ <stop offset="0" style="stop-color:#94FFFF"/>
+ <stop offset="0.7636" style="stop-color:#144DA3"/>
+ <stop offset="1" style="stop-color:#36B5FF"/>
+</linearGradient>
+<path d="M14.814,10.715V3.508C19.178,2.505,23.314,2,27.238,2c5.785,0,10.221,1.121,13.311,3.364 s4.635,5.532,4.635,9.873c0,2.526-0.596,4.665-1.783,6.417c-1.191,1.752-9.396,9.994-10.205,11.121 c-0.809,1.128-1.213,2.465-1.213,4.01v1.544h-11.51v-2.06c0-2.502,0.547-4.612,1.639-6.342c1.09-1.729,2.994-3.868,5.715-6.419 c2.133-1.985,4.781-6.593,4.781-7.573c0-4.436-2.674-6.655-8.018-6.655C21.576,9.28,18.322,9.759,14.814,10.715z" fill="url(#SVGID_1_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="29.999" x2="29.999" y1="2.5591" y2="37.7967">
+ <stop offset="0" style="stop-color:#6BCBF2"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
+</linearGradient>
+<path d="M21.223,37.579v-1.31c0-2.343,0.512-4.342,1.521-5.941c1.051-1.666,2.934-3.776,5.596-6.272 c2.016-1.876,5.018-6.732,5.018-8.12c0-3.378-1.521-7.405-8.768-7.405c-2.695,0-5.629,0.383-8.717,1.137l-0.309,0.075V4.107 l0.197-0.043c4.018-0.872,7.879-1.314,11.477-1.314c5.596,0,9.928,1.084,12.869,3.222c2.912,2.112,4.326,5.144,4.326,9.266 c0,2.359-0.557,4.376-1.654,5.996c-0.646,0.95-3.703,4.159-6.158,6.737c-2.273,2.389-3.68,3.872-4.035,4.367 c-0.898,1.254-1.354,2.75-1.354,4.447v0.794H21.223z" fill="url(#SVGID_2_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="26.6924" x2="26.6924" y1="43.6758" y2="58.1758">
+ <stop offset="0" style="stop-color:#94FFFF"/>
+ <stop offset="0.7636" style="stop-color:#144DA3"/>
+ <stop offset="1" style="stop-color:#36B5FF"/>
+</linearGradient>
+<path d="M26.672,58c-1.938,0-3.602-0.686-5-2.059c-1.396-1.373-2.094-3.052-2.094-5.037 c0-1.962,0.693-3.641,2.076-5.038c1.385-1.397,3.059-2.095,5.018-2.095c1.961,0,3.641,0.697,5.037,2.095 c1.398,1.397,2.098,3.076,2.098,5.038c0,1.985-0.699,3.664-2.098,5.037C30.313,57.314,28.633,58,26.672,58z" fill="url(#SVGID_3_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="26.6924" x2="26.6924" y1="44.436" y2="57.4074">
+ <stop offset="0.1152" style="stop-color:#63C1EF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
+</linearGradient>
+<path d="M26.672,57.25c-1.748,0-3.211-0.604-4.475-1.844c-1.258-1.237-1.869-2.71-1.869-4.502 c0-1.771,0.607-3.245,1.859-4.511c1.248-1.26,2.715-1.872,4.484-1.872c1.771,0,3.246,0.613,4.508,1.875 c1.264,1.263,1.877,2.737,1.877,4.508c0,1.792-0.613,3.265-1.873,4.503C29.92,56.647,28.445,57.25,26.672,57.25L26.672,57.25z" fill="url(#SVGID_4_)"/>
+<rect fill="none" height="60" width="60"/>
+</g>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_url_address.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_url_address.svg Fri May 14 16:09:54 2010 +0300
@@ -1,84 +1,81 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.999" x2="29.999" y1="2.0776" y2="57.6216">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.4667" style="stop-color:#E6E6E6"/>
-<stop offset="0.9576" style="stop-color:#C2C2C2"/>
-<stop offset="1" style="stop-color:#C2C2C2"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="0.4667" style="stop-color:#E6E6E6"/>
+ <stop offset="0.9576" style="stop-color:#C2C2C2"/>
</linearGradient>
<path d="M53.428,41.199c0,1.027-0.582,2.461-1.297,3.188L40.027,56.681C39.314,57.407,37.904,58,36.891,58 H6.57V2h46.857V41.199z" fill="url(#SVGID_1_)"/>
<linearGradient gradientTransform="matrix(-1 0 0 -1 5045.8477 1885.916)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="5015.8486" x2="5015.8486" y1="1883.5537" y2="1827.7893">
-<stop offset="0" style="stop-color:#F0F0F2"/>
-<stop offset="1" style="stop-color:#B3B5B8"/>
+ <stop offset="0" style="stop-color:#F0F0F2"/>
+ <stop offset="1" style="stop-color:#B3B5B8"/>
</linearGradient>
<path d="M7.49,2.932h45.02v38.268c0,0.775-0.49,1.979-1.031,2.527l-12.1,12.293 c-0.541,0.549-1.725,1.047-2.488,1.047H7.49V2.932 M6.57,2v56h30.32c1.014,0,2.424-0.593,3.137-1.319l12.104-12.294 c0.715-0.727,1.297-2.16,1.297-3.188V2H6.57L6.57,2z" fill="url(#SVGID_2_)"/>
<linearGradient gradientTransform="matrix(-1 0 0 -1 5045.8477 1885.916)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="5006.7441" x2="4999.812" y1="1841.873" y2="1834.9412">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<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"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <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="M51.736,44.787c0.379-0.43,1.09-0.859,1.576-2.705c0,0-0.803,3.783-11.83,0.052 C41.482,58,36.891,58,36.891,58c1.014,0,2.424-0.593,3.137-1.319L51.736,44.787z" fill="url(#SVGID_3_)"/>
-<ellipse cx="30" cy="28.558" fill-opacity="0.2" rx="15.107" ry="15.347" stroke-opacity="0.2"/>
+<ellipse cx="30" cy="28.558" opacity="0.2" rx="15.107" ry="15.347"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="30" x2="30" y1="42.5859" y2="12.1111">
-<stop offset="0" style="stop-color:#004E8C"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#004E8C"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</linearGradient>
<ellipse cx="30" cy="27.416" fill="url(#SVGID_4_)" rx="15.107" ry="15.346"/>
<radialGradient cx="-11.9336" cy="13.8384" gradientTransform="matrix(0.9797 0 0 0.9952 41.476 8.3351)" gradientUnits="userSpaceOnUse" id="SVGID_5_" r="18.5643">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#94FFFF"/>
+ <stop offset="0.5" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</radialGradient>
<ellipse cx="30" cy="27.416" fill="url(#SVGID_5_)" rx="14.721" ry="14.953"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="30" x2="30" y1="12.3306" y2="42.445">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#88D6EB"/>
+ <stop offset="0" style="stop-color:#31A7F8"/>
+ <stop offset="0.497" style="stop-color:#1E74DC"/>
+ <stop offset="1" style="stop-color:#88D6EB"/>
</linearGradient>
-<path d="M30,12.462c-8.129,0-14.721,6.696-14.721,14.954c0,8.26,6.592,14.953,14.721,14.953 c8.131,0,14.721-6.693,14.721-14.953C44.721,19.158,38.131,12.462,30,12.462z M30,41.061c-7.645,0-13.863-6.316-13.863-14.08 c0-7.766,6.219-14.081,13.863-14.081s13.861,6.315,13.861,14.081C43.861,34.744,37.645,41.061,30,41.061z" fill="url(#SVGID_6_)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M30,12.462c-8.129,0-14.721,6.696-14.721,14.954c0,8.26,6.592,14.953,14.721,14.953 c8.131,0,14.721-6.693,14.721-14.953C44.721,19.158,38.131,12.462,30,12.462z M30,41.061c-7.645,0-13.863-6.316-13.863-14.08 c0-7.766,6.219-14.081,13.863-14.081s13.861,6.315,13.861,14.081C43.861,34.744,37.645,41.061,30,41.061z" fill="url(#SVGID_6_)" opacity="0.3"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="15.5195" x2="17.8594" y1="29.4512" y2="29.4512">
-<stop offset="0" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#58595B"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
-<path d="M16.66,27.172c-0.156-0.211-0.51-0.211-0.666-0.211c-0.307,0-0.473,0.223-0.475,0.441 v0.016v0.021c0,0.385,0.021,0.816,0.066,1.34c0.01,0.098,0.02,0.198,0.033,0.297l0.018,0.144c0.039,0.312,0.086,0.617,0.139,0.913 l0.023,0.129c0.023,0.119,0.045,0.232,0.068,0.348c0.064,0.291,0.141,0.592,0.236,0.924c0.012,0.049,0.025,0.098,0.035,0.143 c0.021,0.078,0.039,0.156,0.064,0.231l0.004,0.011l0.008,0.023c0-0.006-0.006-0.018-0.006-0.026l0.844-0.058 c0.014-0.135,0.02-0.273,0.014-0.414c-0.006-0.216-0.016-0.482-0.076-0.709l0.785-1.069l0.084-0.116v-0.145v-0.833v-0.183 l-0.127-0.127L16.66,27.172z" fill="url(#SVGID_7_)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M16.66,27.172c-0.156-0.211-0.51-0.211-0.666-0.211c-0.307,0-0.473,0.223-0.475,0.441 v0.016v0.021c0,0.385,0.021,0.816,0.066,1.34c0.01,0.098,0.02,0.198,0.033,0.297l0.018,0.144c0.039,0.312,0.086,0.617,0.139,0.913 l0.023,0.129c0.023,0.119,0.045,0.232,0.068,0.348c0.064,0.291,0.141,0.592,0.236,0.924c0.012,0.049,0.025,0.098,0.035,0.143 c0.021,0.078,0.039,0.156,0.064,0.231l0.004,0.011l0.008,0.023c0-0.006-0.006-0.018-0.006-0.026l0.844-0.058 c0.014-0.135,0.02-0.273,0.014-0.414c-0.006-0.216-0.016-0.482-0.076-0.709l0.785-1.069l0.084-0.116v-0.145v-0.833v-0.183 l-0.127-0.127L16.66,27.172z" fill="url(#SVGID_7_)" opacity="0.3"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="20.0322" x2="44.5176" y1="25.0957" y2="25.0957">
-<stop offset="0" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#58595B"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
-<path d="M44.512,24.485c-0.01-0.056-0.021-0.099-0.031-0.138 c-0.008-0.029-0.014-0.061-0.021-0.088c-0.072-0.355-0.166-0.72-0.273-1.094l-0.014-0.04c-0.021-0.083-0.047-0.169-0.072-0.251 c-0.133-0.42-0.277-0.822-0.43-1.193c-0.02-0.045-0.041-0.09-0.061-0.134l-0.029-0.071c-0.148-0.34-0.309-0.679-0.477-1.004 l-0.023-0.042c-0.033-0.065-0.066-0.13-0.1-0.194c-0.211-0.381-0.424-0.746-0.648-1.082c-0.021-0.035-0.047-0.072-0.072-0.111 c-0.02-0.021-0.031-0.042-0.047-0.065c-0.213-0.313-0.438-0.618-0.668-0.907l-0.047-0.059c-0.031-0.039-0.061-0.08-0.094-0.12 c-0.268-0.325-0.551-0.644-0.844-0.942c-0.041-0.039-0.084-0.081-0.125-0.125L40.4,16.791c-0.264-0.264-0.545-0.521-0.834-0.768 l-0.057-0.051c-0.027-0.026-0.059-0.051-0.088-0.074c-0.314-0.264-0.656-0.522-1.014-0.771c-0.041-0.029-0.086-0.061-0.131-0.088 l-0.055-0.037c-0.32-0.215-0.656-0.422-0.99-0.611l-0.051-0.029c-0.029-0.017-0.059-0.031-0.084-0.049 c-0.375-0.202-0.764-0.395-1.158-0.566l-0.1-0.041L35.73,13.66c-0.105-0.045-0.209-0.081-0.313-0.119 c-0.055-0.02-0.107-0.037-0.158-0.057l-0.201-0.076l-0.182,0.116c-0.117,0.075-0.59,0.351-0.869,0.511 c-0.309-0.041-1.057-0.137-1.811-0.211c0.23-0.023,0.555-0.05,1.006-0.08l0.064-0.861l-0.033-0.01 c-0.027-0.006-0.055-0.013-0.082-0.02l-0.064-0.012l-0.053-0.012c-0.461-0.094-0.896-0.162-1.326-0.209h-0.004l-0.061-0.006 c-0.492-0.051-0.992-0.076-1.488-0.076c-0.438,0-0.891,0.024-1.385,0.072c-0.078,0.007-0.148,0.015-0.227,0.023 c-0.488,0.055-0.916,0.121-1.32,0.205l-0.016,0.002h-0.008c-0.426,0.092-0.854,0.203-1.311,0.344 c-0.039,0.014-0.08,0.026-0.121,0.039l-0.092,0.031c-0.387,0.125-0.766,0.266-1.125,0.416c-0.027,0.014-0.051,0.021-0.07,0.027 l-0.055,0.023c-0.398,0.172-0.797,0.367-1.191,0.582c-0.041,0.021-0.082,0.047-0.125,0.071l-0.051,0.028 c-0.109,0.064-0.221,0.135-0.33,0.203l-0.143,0.092l-0.791,0.49l0.875,0.297c0.131,0.045,0.271,0.066,0.42,0.066 c0.471,0,0.928-0.236,1.295-0.424c0.146-0.076,0.365-0.189,0.457-0.207c0.107,0.032,0.215,0.049,0.322,0.049 c0.4,0,0.729-0.221,1.02-0.415l0.076-0.05c0.098-0.031,0.258-0.092,0.578-0.213c0.33-0.127,0.928-0.354,1.088-0.393 c0.311-0.004,0.68-0.049,0.943-0.215c0.248,0.041,0.688,0.111,1.143,0.172c-0.033,0.021-0.066,0.041-0.096,0.07 c-0.146,0.137-0.939,0.381-1.184,0.414c-0.457,0.057-0.639,0.291-0.713,0.475c-0.094,0.242-0.039,0.484,0.057,0.68 c-0.174,0.114-0.385,0.244-0.566,0.342c0-0.004,0.002-0.009,0.002-0.014c0.064-0.371,0.113-0.639-0.064-0.852 c-0.09-0.111-0.225-0.172-0.365-0.172c-0.209,0-0.371,0.13-0.502,0.258c-0.365,0.359-0.588,0.809-0.672,0.977l-0.016,0.031 l-0.014,0.025c-0.156,0.311-0.223,0.527-0.135,1.211c-0.039,0.027-0.154,0.072-0.314,0.072c-0.02,0-0.039-0.002-0.055-0.002 c-0.104-0.114-0.246-0.18-0.406-0.18l0,0c-0.369,0-0.873,0.424-1.496,1.258l-0.199,0.268l0.203,0.266l0.188,0.246 c-2.973,2.334-2.994,2.467-3.023,2.66c-0.008,0.02-0.033,0.1-0.068,0.211c-0.443,1.398-0.688,2.445-0.449,3.004 c0.553,1.299,1.178,2.512,1.986,2.578c0.07,0.006,0.148,0.008,0.234,0.008c0.738,0,1.939-0.229,2.518-0.348 c0.105,0.204,0.236,0.441,0.307,0.57l0.129,0.23l0.26-0.008c0,0,0.141-0.006,0.316-0.006c0.203,0,0.338,0.008,0.424,0.014 c0.314,0.938,0.918,3.094,0.805,3.539l-0.002,0.002c-1.014,1.549,0.215,3.563,0.807,4.533c0.049,0.076,0.09,0.145,0.125,0.205 c0.229,0.66,0.506,1.098,1.09,1.098c0.043,0,0.09-0.004,0.131-0.005c0.033-0.003,0.07-0.005,0.104-0.005 c0.066,0,0.111,0.01,0.16,0.027l0.055,0.02l0.055,0.004c0.109,0.009,0.215,0.023,0.32,0.039c0.178,0.025,0.365,0.051,0.557,0.051 c0.508,0,0.908-0.195,1.258-0.613c0.014,0,0.025-0.002,0.037-0.004c0.367-0.051,0.504-0.238,0.549-0.404 c0.029-0.028,0.064-0.063,0.094-0.09c0.146-0.134,0.316-0.293,0.436-0.482c0.051-0.031,0.113-0.068,0.182-0.109 c0.117-0.073,0.25-0.154,0.354-0.209c0.092-0.028,0.174-0.084,0.234-0.161c0.148-0.183,0.119-0.394,0.094-0.562 c-0.025-0.173-0.051-0.35,0.043-0.541c0.52-0.256,1.445-0.882,1.594-0.984v0.012c-0.008,0.083-0.033,0.309-0.07,0.45 c-0.197,0.2-0.359,0.503-0.414,0.606l-0.031,0.066l-0.012,0.074c-0.012,0.098-0.066,0.607,0.215,0.938 c0.143,0.166,0.346,0.258,0.574,0.258c0.07,0,0.146-0.01,0.223-0.027c0.727-0.168,2.01-1.936,2.113-2.91 c0.053-0.473-0.129-0.842-0.494-1.018l-0.273-0.131l-0.217,0.217l-0.791,0.805c-0.268,0.025-0.479,0.107-0.619,0.234 c0.008-0.344-0.025-0.695-0.061-1.039c-0.109-1.037-0.129-1.695,0.496-2.146l0.031-0.023l0.029-0.027 c0.223-0.234,0.475-0.438,0.74-0.654c0.619-0.506,1.26-1.029,1.643-1.975l0.016-0.041c0.123-0.323,0.309-0.811,0.059-1.183 c-0.063-0.091-0.193-0.233-0.441-0.286c0.326-0.131,0.576-0.236,0.6-0.245l0.076-0.032l0.059-0.059l1.34-1.303l0.195-0.192 l-0.086-0.263c-0.012-0.034-0.086-0.24-0.291-0.535c0.391,0.053,0.729,0.148,0.834,0.234c0.043,0.088,0.121,0.283,0.209,0.488 c1.471,3.527,1.678,3.708,2.063,3.715c0.014,0,0.025,0.001,0.035,0.004c0.029,0,0.059,0.002,0.082,0.002 c0.221,0,0.344-0.114,0.398-0.182c0.16-0.195,0.117-0.436,0.1-0.525l-0.006-0.029c-0.018-0.213-0.006-1.162,0.023-1.94 c0.002,0.003,0.004,0.005,0.004,0.007l0.791-0.319L44.512,24.485z M32.908,20.172c-0.061,0.001-0.129,0.006-0.199,0.006 c-0.227,0.014-0.486,0.023-0.742,0.023c-0.672,0-0.826-0.083-0.842-0.094c-0.082-0.057-0.162-0.102-0.248-0.133 c0.154-0.035,0.328-0.156,0.508-0.508c0.176,0.348,0.416,0.656,0.785,0.656c0.1,0,0.195-0.023,0.287-0.07 C32.582,20.055,32.785,20.125,32.908,20.172z M32.645,18.264c-0.053,0-0.094-0.002-0.125-0.005c0.033-0.091,0.076-0.146,0.107-0.175 c0.043,0.066,0.104,0.125,0.166,0.175C32.74,18.262,32.691,18.264,32.645,18.264z M29.963,19.178 c0.23,0.461,0.402,0.658,0.539,0.745c-0.334,0.026-0.586,0.242-0.797,0.448c-0.145-0.053-0.396-0.206-0.473-0.314 c-0.043-0.064-0.096-0.119-0.156-0.168C29.443,19.783,29.766,19.438,29.963,19.178z M28.689,18.842l-0.48-0.025l-1.605-0.078 c0.197-0.164,0.385-0.318,0.492-0.409c0.031-0.013,0.145-0.044,0.428-0.044c0.17,0,0.332,0.013,0.438,0.021L28.689,18.842z" fill="url(#SVGID_8_)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M44.512,24.485c-0.01-0.056-0.021-0.099-0.031-0.138 c-0.008-0.029-0.014-0.061-0.021-0.088c-0.072-0.355-0.166-0.72-0.273-1.094l-0.014-0.04c-0.021-0.083-0.047-0.169-0.072-0.251 c-0.133-0.42-0.277-0.822-0.43-1.193c-0.02-0.045-0.041-0.09-0.061-0.134l-0.029-0.071c-0.148-0.34-0.309-0.679-0.477-1.004 l-0.023-0.042c-0.033-0.065-0.066-0.13-0.1-0.194c-0.211-0.381-0.424-0.746-0.648-1.082c-0.021-0.035-0.047-0.072-0.072-0.111 c-0.02-0.021-0.031-0.042-0.047-0.065c-0.213-0.313-0.438-0.618-0.668-0.907l-0.047-0.059c-0.031-0.039-0.061-0.08-0.094-0.12 c-0.268-0.325-0.551-0.644-0.844-0.942c-0.041-0.039-0.084-0.081-0.125-0.125L40.4,16.791c-0.264-0.264-0.545-0.521-0.834-0.768 l-0.057-0.051c-0.027-0.026-0.059-0.051-0.088-0.074c-0.314-0.264-0.656-0.522-1.014-0.771c-0.041-0.029-0.086-0.061-0.131-0.088 l-0.055-0.037c-0.32-0.215-0.656-0.422-0.99-0.611l-0.051-0.029c-0.029-0.017-0.059-0.031-0.084-0.049 c-0.375-0.202-0.764-0.395-1.158-0.566l-0.1-0.041L35.73,13.66c-0.105-0.045-0.209-0.081-0.313-0.119 c-0.055-0.02-0.107-0.037-0.158-0.057l-0.201-0.076l-0.182,0.116c-0.117,0.075-0.59,0.351-0.869,0.511 c-0.309-0.041-1.057-0.137-1.811-0.211c0.23-0.023,0.555-0.05,1.006-0.08l0.064-0.861l-0.033-0.01 c-0.027-0.006-0.055-0.013-0.082-0.02l-0.064-0.012l-0.053-0.012c-0.461-0.094-0.896-0.162-1.326-0.209h-0.004l-0.061-0.006 c-0.492-0.051-0.992-0.076-1.488-0.076c-0.438,0-0.891,0.024-1.385,0.072c-0.078,0.007-0.148,0.015-0.227,0.023 c-0.488,0.055-0.916,0.121-1.32,0.205l-0.016,0.002h-0.008c-0.426,0.092-0.854,0.203-1.311,0.344 c-0.039,0.014-0.08,0.026-0.121,0.039l-0.092,0.031c-0.387,0.125-0.766,0.266-1.125,0.416c-0.027,0.014-0.051,0.021-0.07,0.027 l-0.055,0.023c-0.398,0.172-0.797,0.367-1.191,0.582c-0.041,0.021-0.082,0.047-0.125,0.071l-0.051,0.028 c-0.109,0.064-0.221,0.135-0.33,0.203l-0.143,0.092l-0.791,0.49l0.875,0.297c0.131,0.045,0.271,0.066,0.42,0.066 c0.471,0,0.928-0.236,1.295-0.424c0.146-0.076,0.365-0.189,0.457-0.207c0.107,0.032,0.215,0.049,0.322,0.049 c0.4,0,0.729-0.221,1.02-0.415l0.076-0.05c0.098-0.031,0.258-0.092,0.578-0.213c0.33-0.127,0.928-0.354,1.088-0.393 c0.311-0.004,0.68-0.049,0.943-0.215c0.248,0.041,0.688,0.111,1.143,0.172c-0.033,0.021-0.066,0.041-0.096,0.07 c-0.146,0.137-0.939,0.381-1.184,0.414c-0.457,0.057-0.639,0.291-0.713,0.475c-0.094,0.242-0.039,0.484,0.057,0.68 c-0.174,0.114-0.385,0.244-0.566,0.342c0-0.004,0.002-0.009,0.002-0.014c0.064-0.371,0.113-0.639-0.064-0.852 c-0.09-0.111-0.225-0.172-0.365-0.172c-0.209,0-0.371,0.13-0.502,0.258c-0.365,0.359-0.588,0.809-0.672,0.977l-0.016,0.031 l-0.014,0.025c-0.156,0.311-0.223,0.527-0.135,1.211c-0.039,0.027-0.154,0.072-0.314,0.072c-0.02,0-0.039-0.002-0.055-0.002 c-0.104-0.114-0.246-0.18-0.406-0.18l0,0c-0.369,0-0.873,0.424-1.496,1.258l-0.199,0.268l0.203,0.266l0.188,0.246 c-2.973,2.334-2.994,2.467-3.023,2.66c-0.008,0.02-0.033,0.1-0.068,0.211c-0.443,1.398-0.688,2.445-0.449,3.004 c0.553,1.299,1.178,2.512,1.986,2.578c0.07,0.006,0.148,0.008,0.234,0.008c0.738,0,1.939-0.229,2.518-0.348 c0.105,0.204,0.236,0.441,0.307,0.57l0.129,0.23l0.26-0.008c0,0,0.141-0.006,0.316-0.006c0.203,0,0.338,0.008,0.424,0.014 c0.314,0.938,0.918,3.094,0.805,3.539l-0.002,0.002c-1.014,1.549,0.215,3.563,0.807,4.533c0.049,0.076,0.09,0.145,0.125,0.205 c0.229,0.66,0.506,1.098,1.09,1.098c0.043,0,0.09-0.004,0.131-0.005c0.033-0.003,0.07-0.005,0.104-0.005 c0.066,0,0.111,0.01,0.16,0.027l0.055,0.02l0.055,0.004c0.109,0.009,0.215,0.023,0.32,0.039c0.178,0.025,0.365,0.051,0.557,0.051 c0.508,0,0.908-0.195,1.258-0.613c0.014,0,0.025-0.002,0.037-0.004c0.367-0.051,0.504-0.238,0.549-0.404 c0.029-0.028,0.064-0.063,0.094-0.09c0.146-0.134,0.316-0.293,0.436-0.482c0.051-0.031,0.113-0.068,0.182-0.109 c0.117-0.073,0.25-0.154,0.354-0.209c0.092-0.028,0.174-0.084,0.234-0.161c0.148-0.183,0.119-0.394,0.094-0.562 c-0.025-0.173-0.051-0.35,0.043-0.541c0.52-0.256,1.445-0.882,1.594-0.984v0.012c-0.008,0.083-0.033,0.309-0.07,0.45 c-0.197,0.2-0.359,0.503-0.414,0.606l-0.031,0.066l-0.012,0.074c-0.012,0.098-0.066,0.607,0.215,0.938 c0.143,0.166,0.346,0.258,0.574,0.258c0.07,0,0.146-0.01,0.223-0.027c0.727-0.168,2.01-1.936,2.113-2.91 c0.053-0.473-0.129-0.842-0.494-1.018l-0.273-0.131l-0.217,0.217l-0.791,0.805c-0.268,0.025-0.479,0.107-0.619,0.234 c0.008-0.344-0.025-0.695-0.061-1.039c-0.109-1.037-0.129-1.695,0.496-2.146l0.031-0.023l0.029-0.027 c0.223-0.234,0.475-0.438,0.74-0.654c0.619-0.506,1.26-1.029,1.643-1.975l0.016-0.041c0.123-0.323,0.309-0.811,0.059-1.183 c-0.063-0.091-0.193-0.233-0.441-0.286c0.326-0.131,0.576-0.236,0.6-0.245l0.076-0.032l0.059-0.059l1.34-1.303l0.195-0.192 l-0.086-0.263c-0.012-0.034-0.086-0.24-0.291-0.535c0.391,0.053,0.729,0.148,0.834,0.234c0.043,0.088,0.121,0.283,0.209,0.488 c1.471,3.527,1.678,3.708,2.063,3.715c0.014,0,0.025,0.001,0.035,0.004c0.029,0,0.059,0.002,0.082,0.002 c0.221,0,0.344-0.114,0.398-0.182c0.16-0.195,0.117-0.436,0.1-0.525l-0.006-0.029c-0.018-0.213-0.006-1.162,0.023-1.94 c0.002,0.003,0.004,0.005,0.004,0.007l0.791-0.319L44.512,24.485z M32.908,20.172c-0.061,0.001-0.129,0.006-0.199,0.006 c-0.227,0.014-0.486,0.023-0.742,0.023c-0.672,0-0.826-0.083-0.842-0.094c-0.082-0.057-0.162-0.102-0.248-0.133 c0.154-0.035,0.328-0.156,0.508-0.508c0.176,0.348,0.416,0.656,0.785,0.656c0.1,0,0.195-0.023,0.287-0.07 C32.582,20.055,32.785,20.125,32.908,20.172z M32.645,18.264c-0.053,0-0.094-0.002-0.125-0.005c0.033-0.091,0.076-0.146,0.107-0.175 c0.043,0.066,0.104,0.125,0.166,0.175C32.74,18.262,32.691,18.264,32.645,18.264z M29.963,19.178 c0.23,0.461,0.402,0.658,0.539,0.745c-0.334,0.026-0.586,0.242-0.797,0.448c-0.145-0.053-0.396-0.206-0.473-0.314 c-0.043-0.064-0.096-0.119-0.156-0.168C29.443,19.783,29.766,19.438,29.963,19.178z M28.689,18.842l-0.48-0.025l-1.605-0.078 c0.197-0.164,0.385-0.318,0.492-0.409c0.031-0.013,0.145-0.044,0.428-0.044c0.17,0,0.332,0.013,0.438,0.021L28.689,18.842z" fill="url(#SVGID_8_)" opacity="0.3"/>
<radialGradient cx="-11.4893" cy="8.5776" gradientTransform="matrix(0.9797 0 0 0.9952 41.476 8.3351)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="16.9394">
-<stop offset="0" style="stop-color:#7AF200"/>
-<stop offset="0.3152" style="stop-color:#7AF200"/>
-<stop offset="0.7273" style="stop-color:#1CAD0F"/>
-<stop offset="1" style="stop-color:#007A3A"/>
+ <stop offset="0.3152" style="stop-color:#7AF200"/>
+ <stop offset="0.7273" style="stop-color:#1CAD0F"/>
+ <stop offset="1" style="stop-color:#007A3A"/>
</radialGradient>
<path d="M15.949,27.407c0,0,0,0,0,0.003c0,0.002,0,0.006,0,0.01c0,0.445,0.029,0.886,0.064,1.32 c0.014,0.144,0.033,0.285,0.049,0.43c0.037,0.297,0.084,0.594,0.135,0.886c0.031,0.153,0.059,0.31,0.09,0.464 c0.066,0.301,0.145,0.6,0.229,0.893c0.035,0.121,0.061,0.245,0.096,0.363c0.008,0.012,0.012,0.025,0.014,0.038 c0.012-0.116,0.016-0.234,0.012-0.354c-0.027-0.861-0.164-0.75-0.164-0.75l0.955-1.305v-0.833l-1.119-1.138 C16.309,27.434,15.949,27.376,15.949,27.407z" fill="url(#SVGID_9_)"/>
<radialGradient cx="-11.459" cy="8.5776" gradientTransform="matrix(0.9797 0 0 0.9952 41.476 8.3351)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="16.9575">
-<stop offset="0" style="stop-color:#7AF200"/>
-<stop offset="0.3152" style="stop-color:#7AF200"/>
-<stop offset="0.7273" style="stop-color:#1CAD0F"/>
-<stop offset="1" style="stop-color:#007A3A"/>
+ <stop offset="0.3152" style="stop-color:#7AF200"/>
+ <stop offset="0.7273" style="stop-color:#1CAD0F"/>
+ <stop offset="1" style="stop-color:#007A3A"/>
</radialGradient>
<path d="M24.947,14.498c0.412,0.139,0.75-0.143,1.135-0.395c0.137-0.027,1.648-0.641,1.813-0.641 s0.713-0.021,0.85-0.243c0,0,2.365,0.419,2.723,0.278c0.193-0.076,1.01-0.143,1.709-0.189c-0.037-0.008-0.076-0.02-0.113-0.029 c-0.039-0.008-0.074-0.013-0.113-0.021c-0.439-0.091-0.885-0.161-1.336-0.208c0,0-0.006,0-0.01-0.002 c-0.477-0.048-0.957-0.074-1.447-0.074c-0.453,0-0.902,0.027-1.346,0.07c-0.076,0.008-0.152,0.016-0.232,0.026 c-0.428,0.047-0.854,0.11-1.27,0.195c-0.008,0.003-0.016,0.003-0.021,0.005c-0.432,0.09-0.855,0.203-1.271,0.33 c-0.072,0.023-0.141,0.047-0.209,0.068c-0.371,0.123-0.734,0.258-1.092,0.406c-0.041,0.019-0.084,0.034-0.125,0.051 c-0.393,0.171-0.775,0.359-1.15,0.563c-0.055,0.03-0.109,0.064-0.164,0.096c-0.162,0.09-0.311,0.189-0.467,0.287 C23.58,15.334,24.537,14.357,24.947,14.498z" fill="url(#SVGID_10_)"/>
<radialGradient cx="-11.458" cy="8.5742" gradientTransform="matrix(0.9797 0 0 0.9952 41.476 8.3351)" gradientUnits="userSpaceOnUse" id="SVGID_11_" r="16.9562">
-<stop offset="0" style="stop-color:#B2F56E"/>
-<stop offset="0.3152" style="stop-color:#B2F56E"/>
-<stop offset="0.7273" style="stop-color:#5CBF1B"/>
-<stop offset="1" style="stop-color:#227A00"/>
+ <stop offset="0.3152" style="stop-color:#B2F56E"/>
+ <stop offset="0.7273" style="stop-color:#5CBF1B"/>
+ <stop offset="1" style="stop-color:#227A00"/>
</radialGradient>
<path d="M44.09,24.559c-0.016-0.073-0.037-0.143-0.053-0.214c-0.07-0.356-0.164-0.708-0.266-1.054 c-0.025-0.094-0.051-0.189-0.08-0.282c-0.125-0.394-0.264-0.781-0.416-1.159c-0.029-0.064-0.061-0.131-0.09-0.195 c-0.143-0.334-0.297-0.658-0.463-0.977c-0.037-0.078-0.078-0.156-0.117-0.23c-0.197-0.359-0.406-0.709-0.627-1.051 c-0.041-0.06-0.084-0.114-0.121-0.174c-0.205-0.303-0.42-0.596-0.648-0.881c-0.043-0.055-0.088-0.113-0.135-0.172 c-0.262-0.314-0.533-0.619-0.82-0.914c-0.047-0.051-0.098-0.099-0.15-0.148c-0.26-0.26-0.535-0.512-0.813-0.75 c-0.047-0.041-0.092-0.083-0.141-0.123c-0.316-0.262-0.645-0.512-0.982-0.746c-0.061-0.041-0.119-0.081-0.182-0.12 c-0.311-0.211-0.631-0.411-0.961-0.595c-0.047-0.025-0.088-0.053-0.133-0.077c-0.365-0.198-0.74-0.383-1.123-0.55 c-0.07-0.029-0.139-0.055-0.205-0.086c-0.15-0.063-0.303-0.111-0.455-0.17c-0.182,0.118-1.016,0.598-1.016,0.598 s-3.623-0.503-3.869-0.252c-0.25,0.252-1.213,0.508-1.434,0.537c-0.219,0.029-0.674,0.148-0.129,0.832 c-0.082,0.084-1.643,1.186-1.643,0.686c0-0.502,0.352-1.4-0.139-0.92c-0.35,0.346-0.563,0.813-0.605,0.902 c-0.115,0.223-0.186,0.328-0.104,0.97c0.084,0.642-1.006,0.64-1.08,0.474c-0.197-0.445-1.275,0.998-1.275,0.998l0.455,0.594 c0,0-3.18,2.486-3.205,2.654c-0.029,0.168-0.822,2.328-0.547,2.971c0.273,0.643,0.969,2.262,1.625,2.313 c0.861,0.072,2.951-0.398,2.951-0.398c0.055,0.143,0.451,0.854,0.451,0.854s1.021-0.035,1.08,0.078 c0.018,0.037,1.234,3.668,0.832,4.148c-0.957,1.457,0.547,3.59,0.965,4.313c0.42,1.238,0.688,0.684,1.24,0.889 c0.678,0.057,1.25,0.313,1.826-0.44c0.166-0.14,0.451-0.028,0.451-0.224c0-0.107,0.494-0.428,0.619-0.729 c0.133-0.063,0.475-0.296,0.707-0.409c0.211-0.014-0.201-0.586,0.217-1.192c0.451-0.181,1.666-1.013,1.666-1.013 c0.057-1.223-0.592-2.729,0.617-3.596c0.777-0.806,1.799-1.266,2.295-2.492c0.139-0.361,0.441-1.104-0.438-0.881 c-0.826,0.211-1.75,0.26-1.313-0.109c-0.051-0.456-0.6-0.668-1.092-1.111c-0.254-0.613-0.654-1.704-0.654-1.704l-0.875-1.349 l0.107-0.279l1.041,1.555l1.037,1.275c0.383,1.277,0.711,1.389,0.711,1.389c0.574-0.205,1.939-0.775,1.939-0.775l1.342-1.307 c0,0-0.139-0.418-0.684-0.943l-0.41-0.25c-0.09,0.258-0.566,0.352-0.566,0.352l-1.156-1.406l0.43-0.088l0.332,0.641l0.795,0.279 c0,0,0.219-0.163,0.629,0.267c0.334-0.028,1.635,0.065,1.938,0.456c0.061,0.078,1.611,4.016,1.918,4.021 c0.137,0.001,0.232,0.055,0.189-0.185c-0.055-0.109,0-2.584,0.08-3.115c0.209-0.447,0.242,0,0.734,0.854 C44.094,24.6,44.094,24.579,44.09,24.559z M30.432,15.017c0.105-0.329,0.738-0.44,0.738-0.44s-0.184,0.339-0.141,0.514 c0.041,0.177-0.289,0.286-0.324,0.701c-0.037,0.416-0.789,0.171-0.85,0.025C29.793,15.672,30.318,15.344,30.432,15.017z M33.125,20.603c-0.467,0-1.863,0.141-2.248-0.138c-0.385-0.279-0.686,0.028-0.961,0.309c-0.182,0.18-0.842-0.187-1.035-0.467 c-0.191-0.279-0.838-0.259-0.838-0.259l0.146-0.796l-1.859-0.09l-1.057,0.314l-0.992,0.027l0.557-0.269l0.693-0.167 c0,0,1.008-0.841,1.309-1.092c0.258-0.213,1.277-0.094,1.277-0.094l1.121,0.821c0,0-0.25,0.644-0.359,0.78 c0.412-0.027,0.896-0.785,0.896-0.785c-0.873-0.816-0.84-1.094-0.84-1.094l1.152,0.822l0.01,0.006c0,0,0.467,1.117,0.662,1.117 c0.189,0,0.436-0.769,0.436-0.769l0.326-0.083c0.146,0.352,0.42,1.146,0.748,0.961c0.189-0.105,0.5-0.011,0.855,0.129 c0.359,0.139,0.602-0.074,0.895,0.186C33.982,21.123,33.318,20.66,33.125,20.603z M33.855,18.684 c-0.479-0.188-2.102,0.418-1.74-0.57c0.193-0.535,0.691-0.646,0.863-0.292c0.043,0.147,0.586,0.374,0.582,0.065 s0.543-0.471,0.621-0.242C33.889,17.857,35.322,18.967,33.855,18.684z M36.918,19.621c-0.268-0.219,0.117-0.404-0.275-0.745 c-0.563-0.491-1.002-0.702-0.234-1.097c0.945-0.122,0.152,0.307,0.309,0.563c0.084,0.136,0.563,0.592,0.938,1.152 C37.963,19.959,37.182,19.84,36.918,19.621z" fill="url(#SVGID_11_)"/>
<radialGradient cx="-11.4609" cy="8.5801" gradientTransform="matrix(0.9797 0 0 0.9952 41.476 8.3351)" gradientUnits="userSpaceOnUse" id="SVGID_12_" r="16.9527">
-<stop offset="0" style="stop-color:#7AF200"/>
-<stop offset="0.3152" style="stop-color:#7AF200"/>
-<stop offset="0.7273" style="stop-color:#1CAD0F"/>
-<stop offset="1" style="stop-color:#007A3A"/>
+ <stop offset="0.3152" style="stop-color:#7AF200"/>
+ <stop offset="0.7273" style="stop-color:#1CAD0F"/>
+ <stop offset="1" style="stop-color:#007A3A"/>
</radialGradient>
<path d="M37.297,32.337l-0.91,0.925c0,0-0.549,0-0.576,0.224c-0.012,0.095-0.045,0.508-0.135,0.72 c-0.182,0.129-0.402,0.557-0.402,0.557s-0.113,0.822,0.492,0.682C36.373,35.306,38.232,32.785,37.297,32.337z" fill="url(#SVGID_12_)"/>
<rect fill="none" height="60" width="60"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_url_address_home.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_url_address_home.svg Fri May 14 16:09:54 2010 +0300
@@ -1,125 +1,124 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.999" x2="29.999" y1="2.0776" y2="57.6216">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.4667" style="stop-color:#E6E6E6"/>
-<stop offset="0.9576" style="stop-color:#C2C2C2"/>
-<stop offset="1" style="stop-color:#C2C2C2"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="0.4667" style="stop-color:#E6E6E6"/>
+ <stop offset="0.9576" style="stop-color:#C2C2C2"/>
</linearGradient>
<path d="M53.428,41.199c0,1.027-0.582,2.461-1.297,3.188L40.027,56.681C39.314,57.407,37.904,58,36.891,58 H6.57V2h46.857V41.199z" fill="url(#SVGID_1_)"/>
<linearGradient gradientTransform="matrix(-1 0 0 -1 5045.8477 1885.916)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="5015.8486" x2="5015.8486" y1="1883.5537" y2="1827.7893">
-<stop offset="0" style="stop-color:#F0F0F2"/>
-<stop offset="1" style="stop-color:#B3B5B8"/>
+ <stop offset="0" style="stop-color:#F0F0F2"/>
+ <stop offset="1" style="stop-color:#B3B5B8"/>
</linearGradient>
<path d="M7.49,2.932h45.02v38.268c0,0.775-0.49,1.979-1.031,2.527l-12.1,12.293 c-0.541,0.549-1.725,1.047-2.488,1.047H7.49V2.932 M6.57,2v56h30.32c1.014,0,2.424-0.593,3.137-1.319l12.104-12.294 c0.715-0.727,1.297-2.16,1.297-3.188V2H6.57L6.57,2z" fill="url(#SVGID_2_)"/>
<linearGradient gradientTransform="matrix(-1 0 0 -1 5045.8477 1885.916)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="5006.7441" x2="4999.812" y1="1841.873" y2="1834.9412">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<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"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <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="M51.736,44.787c0.379-0.43,1.09-0.859,1.576-2.705c0,0-0.803,3.783-11.83,0.052 C41.482,58,36.891,58,36.891,58c1.014,0,2.424-0.593,3.137-1.319L51.736,44.787z" fill="url(#SVGID_3_)"/>
-<ellipse cx="30" cy="28.558" fill-opacity="0.2" rx="15.107" ry="15.347" stroke-opacity="0.2"/>
+<ellipse cx="30" cy="28.558" opacity="0.2" rx="15.107" ry="15.347"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="30" x2="30" y1="42.5859" y2="12.1111">
-<stop offset="0" style="stop-color:#004E8C"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#004E8C"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</linearGradient>
<ellipse cx="30" cy="27.416" fill="url(#SVGID_4_)" rx="15.107" ry="15.346"/>
<radialGradient cx="-11.9336" cy="13.8384" gradientTransform="matrix(0.9797 0 0 0.9952 41.476 8.3351)" gradientUnits="userSpaceOnUse" id="SVGID_5_" r="18.5643">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#94FFFF"/>
+ <stop offset="0.5" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</radialGradient>
<ellipse cx="30" cy="27.416" fill="url(#SVGID_5_)" rx="14.721" ry="14.953"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="30" x2="30" y1="12.3306" y2="42.445">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#88D6EB"/>
+ <stop offset="0" style="stop-color:#31A7F8"/>
+ <stop offset="0.497" style="stop-color:#1E74DC"/>
+ <stop offset="1" style="stop-color:#88D6EB"/>
</linearGradient>
-<path d="M30,12.462c-8.129,0-14.721,6.696-14.721,14.954c0,8.26,6.592,14.953,14.721,14.953 c8.131,0,14.721-6.693,14.721-14.953C44.721,19.158,38.131,12.462,30,12.462z M30,41.061c-7.645,0-13.863-6.316-13.863-14.08 c0-7.766,6.219-14.081,13.863-14.081s13.861,6.315,13.861,14.081C43.861,34.744,37.645,41.061,30,41.061z" fill="url(#SVGID_6_)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M30,12.462c-8.129,0-14.721,6.696-14.721,14.954c0,8.26,6.592,14.953,14.721,14.953 c8.131,0,14.721-6.693,14.721-14.953C44.721,19.158,38.131,12.462,30,12.462z M30,41.061c-7.645,0-13.863-6.316-13.863-14.08 c0-7.766,6.219-14.081,13.863-14.081s13.861,6.315,13.861,14.081C43.861,34.744,37.645,41.061,30,41.061z" fill="url(#SVGID_6_)" opacity="0.3"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="15.5195" x2="17.8594" y1="29.4512" y2="29.4512">
-<stop offset="0" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#58595B"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
-<path d="M16.66,27.172c-0.156-0.211-0.51-0.211-0.666-0.211c-0.307,0-0.473,0.223-0.475,0.441 v0.016v0.021c0,0.385,0.021,0.816,0.066,1.34c0.01,0.098,0.02,0.198,0.033,0.297l0.018,0.144c0.039,0.312,0.086,0.617,0.139,0.913 l0.023,0.129c0.023,0.119,0.045,0.232,0.068,0.348c0.064,0.291,0.141,0.592,0.236,0.924c0.012,0.049,0.025,0.098,0.035,0.143 c0.021,0.078,0.039,0.156,0.064,0.231l0.004,0.011l0.008,0.023c0-0.006-0.006-0.018-0.006-0.026l0.844-0.058 c0.014-0.135,0.02-0.273,0.014-0.414c-0.006-0.216-0.016-0.482-0.076-0.709l0.785-1.069l0.084-0.116v-0.145v-0.833v-0.183 l-0.127-0.127L16.66,27.172z" fill="url(#SVGID_7_)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M16.66,27.172c-0.156-0.211-0.51-0.211-0.666-0.211c-0.307,0-0.473,0.223-0.475,0.441 v0.016v0.021c0,0.385,0.021,0.816,0.066,1.34c0.01,0.098,0.02,0.198,0.033,0.297l0.018,0.144c0.039,0.312,0.086,0.617,0.139,0.913 l0.023,0.129c0.023,0.119,0.045,0.232,0.068,0.348c0.064,0.291,0.141,0.592,0.236,0.924c0.012,0.049,0.025,0.098,0.035,0.143 c0.021,0.078,0.039,0.156,0.064,0.231l0.004,0.011l0.008,0.023c0-0.006-0.006-0.018-0.006-0.026l0.844-0.058 c0.014-0.135,0.02-0.273,0.014-0.414c-0.006-0.216-0.016-0.482-0.076-0.709l0.785-1.069l0.084-0.116v-0.145v-0.833v-0.183 l-0.127-0.127L16.66,27.172z" fill="url(#SVGID_7_)" opacity="0.3"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="20.0322" x2="44.5176" y1="25.0957" y2="25.0957">
-<stop offset="0" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#58595B"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
-<path d="M44.512,24.485c-0.01-0.056-0.021-0.099-0.031-0.138 c-0.008-0.029-0.014-0.061-0.021-0.088c-0.072-0.355-0.166-0.72-0.273-1.094l-0.014-0.04c-0.021-0.083-0.047-0.169-0.072-0.251 c-0.133-0.42-0.277-0.822-0.43-1.193c-0.02-0.045-0.041-0.09-0.061-0.134l-0.029-0.071c-0.148-0.34-0.309-0.679-0.477-1.004 l-0.023-0.042c-0.033-0.065-0.066-0.13-0.1-0.194c-0.211-0.381-0.424-0.746-0.648-1.082c-0.021-0.035-0.047-0.072-0.072-0.111 c-0.02-0.021-0.031-0.042-0.047-0.065c-0.213-0.313-0.438-0.618-0.668-0.907l-0.047-0.059c-0.031-0.039-0.061-0.08-0.094-0.12 c-0.268-0.325-0.551-0.644-0.844-0.942c-0.041-0.039-0.084-0.081-0.125-0.125L40.4,16.791c-0.264-0.264-0.545-0.521-0.834-0.768 l-0.057-0.051c-0.027-0.026-0.059-0.051-0.088-0.074c-0.314-0.264-0.656-0.522-1.014-0.771c-0.041-0.029-0.086-0.061-0.131-0.088 l-0.055-0.037c-0.32-0.215-0.656-0.422-0.99-0.611l-0.051-0.029c-0.029-0.017-0.059-0.031-0.084-0.049 c-0.375-0.202-0.764-0.395-1.158-0.566l-0.1-0.041L35.73,13.66c-0.105-0.045-0.209-0.081-0.313-0.119 c-0.055-0.02-0.107-0.037-0.158-0.057l-0.201-0.076l-0.182,0.116c-0.117,0.075-0.59,0.351-0.869,0.511 c-0.309-0.041-1.057-0.137-1.811-0.211c0.23-0.023,0.555-0.05,1.006-0.08l0.064-0.861l-0.033-0.01 c-0.027-0.006-0.055-0.013-0.082-0.02l-0.064-0.012l-0.053-0.012c-0.461-0.094-0.896-0.162-1.326-0.209h-0.004l-0.061-0.006 c-0.492-0.051-0.992-0.076-1.488-0.076c-0.438,0-0.891,0.024-1.385,0.072c-0.078,0.007-0.148,0.015-0.227,0.023 c-0.488,0.055-0.916,0.121-1.32,0.205l-0.016,0.002h-0.008c-0.426,0.092-0.854,0.203-1.311,0.344 c-0.039,0.014-0.08,0.026-0.121,0.039l-0.092,0.031c-0.387,0.125-0.766,0.266-1.125,0.416c-0.027,0.014-0.051,0.021-0.07,0.027 l-0.055,0.023c-0.398,0.172-0.797,0.367-1.191,0.582c-0.041,0.021-0.082,0.047-0.125,0.071l-0.051,0.028 c-0.109,0.064-0.221,0.135-0.33,0.203l-0.143,0.092l-0.791,0.49l0.875,0.297c0.131,0.045,0.271,0.066,0.42,0.066 c0.471,0,0.928-0.236,1.295-0.424c0.146-0.076,0.365-0.189,0.457-0.207c0.107,0.032,0.215,0.049,0.322,0.049 c0.4,0,0.729-0.221,1.02-0.415l0.076-0.05c0.098-0.031,0.258-0.092,0.578-0.213c0.33-0.127,0.928-0.354,1.088-0.393 c0.311-0.004,0.68-0.049,0.943-0.215c0.248,0.041,0.688,0.111,1.143,0.172c-0.033,0.021-0.066,0.041-0.096,0.07 c-0.146,0.137-0.939,0.381-1.184,0.414c-0.457,0.057-0.639,0.291-0.713,0.475c-0.094,0.242-0.039,0.484,0.057,0.68 c-0.174,0.114-0.385,0.244-0.566,0.342c0-0.004,0.002-0.009,0.002-0.014c0.064-0.371,0.113-0.639-0.064-0.852 c-0.09-0.111-0.225-0.172-0.365-0.172c-0.209,0-0.371,0.13-0.502,0.258c-0.365,0.359-0.588,0.809-0.672,0.977l-0.016,0.031 l-0.014,0.025c-0.156,0.311-0.223,0.527-0.135,1.211c-0.039,0.027-0.154,0.072-0.314,0.072c-0.02,0-0.039-0.002-0.055-0.002 c-0.104-0.114-0.246-0.18-0.406-0.18l0,0c-0.369,0-0.873,0.424-1.496,1.258l-0.199,0.268l0.203,0.266l0.188,0.246 c-2.973,2.334-2.994,2.467-3.023,2.66c-0.008,0.02-0.033,0.1-0.068,0.211c-0.443,1.398-0.688,2.445-0.449,3.004 c0.553,1.299,1.178,2.512,1.986,2.578c0.07,0.006,0.148,0.008,0.234,0.008c0.738,0,1.939-0.229,2.518-0.348 c0.105,0.204,0.236,0.441,0.307,0.57l0.129,0.23l0.26-0.008c0,0,0.141-0.006,0.316-0.006c0.203,0,0.338,0.008,0.424,0.014 c0.314,0.938,0.918,3.094,0.805,3.539l-0.002,0.002c-1.014,1.549,0.215,3.563,0.807,4.533c0.049,0.076,0.09,0.145,0.125,0.205 c0.229,0.66,0.506,1.098,1.09,1.098c0.043,0,0.09-0.004,0.131-0.005c0.033-0.003,0.07-0.005,0.104-0.005 c0.066,0,0.111,0.01,0.16,0.027l0.055,0.02l0.055,0.004c0.109,0.009,0.215,0.023,0.32,0.039c0.178,0.025,0.365,0.051,0.557,0.051 c0.508,0,0.908-0.195,1.258-0.613c0.014,0,0.025-0.002,0.037-0.004c0.367-0.051,0.504-0.238,0.549-0.404 c0.029-0.028,0.064-0.063,0.094-0.09c0.146-0.134,0.316-0.293,0.436-0.482c0.051-0.031,0.113-0.068,0.182-0.109 c0.117-0.073,0.25-0.154,0.354-0.209c0.092-0.028,0.174-0.084,0.234-0.161c0.148-0.183,0.119-0.394,0.094-0.562 c-0.025-0.173-0.051-0.35,0.043-0.541c0.52-0.256,1.445-0.882,1.594-0.984v0.012c-0.008,0.083-0.033,0.309-0.07,0.45 c-0.197,0.2-0.359,0.503-0.414,0.606l-0.031,0.066l-0.012,0.074c-0.012,0.098-0.066,0.607,0.215,0.938 c0.143,0.166,0.346,0.258,0.574,0.258c0.07,0,0.146-0.01,0.223-0.027c0.727-0.168,2.01-1.936,2.113-2.91 c0.053-0.473-0.129-0.842-0.494-1.018l-0.273-0.131l-0.217,0.217l-0.791,0.805c-0.268,0.025-0.479,0.107-0.619,0.234 c0.008-0.344-0.025-0.695-0.061-1.039c-0.109-1.037-0.129-1.695,0.496-2.146l0.031-0.023l0.029-0.027 c0.223-0.234,0.475-0.438,0.74-0.654c0.619-0.506,1.26-1.029,1.643-1.975l0.016-0.041c0.123-0.323,0.309-0.811,0.059-1.183 c-0.063-0.091-0.193-0.233-0.441-0.286c0.326-0.131,0.576-0.236,0.6-0.245l0.076-0.032l0.059-0.059l1.34-1.303l0.195-0.192 l-0.086-0.263c-0.012-0.034-0.086-0.24-0.291-0.535c0.391,0.053,0.729,0.148,0.834,0.234c0.043,0.088,0.121,0.283,0.209,0.488 c1.471,3.527,1.678,3.708,2.063,3.715c0.014,0,0.025,0.001,0.035,0.004c0.029,0,0.059,0.002,0.082,0.002 c0.221,0,0.344-0.114,0.398-0.182c0.16-0.195,0.117-0.436,0.1-0.525l-0.006-0.029c-0.018-0.213-0.006-1.162,0.023-1.94 c0.002,0.003,0.004,0.005,0.004,0.007l0.791-0.319L44.512,24.485z M32.908,20.172c-0.061,0.001-0.129,0.006-0.199,0.006 c-0.227,0.014-0.486,0.023-0.742,0.023c-0.672,0-0.826-0.083-0.842-0.094c-0.082-0.057-0.162-0.102-0.248-0.133 c0.154-0.035,0.328-0.156,0.508-0.508c0.176,0.348,0.416,0.656,0.785,0.656c0.1,0,0.195-0.023,0.287-0.07 C32.582,20.055,32.785,20.125,32.908,20.172z M32.645,18.264c-0.053,0-0.094-0.002-0.125-0.005c0.033-0.091,0.076-0.146,0.107-0.175 c0.043,0.066,0.104,0.125,0.166,0.175C32.74,18.262,32.691,18.264,32.645,18.264z M29.963,19.178 c0.23,0.461,0.402,0.658,0.539,0.745c-0.334,0.026-0.586,0.242-0.797,0.448c-0.145-0.053-0.396-0.206-0.473-0.314 c-0.043-0.064-0.096-0.119-0.156-0.168C29.443,19.783,29.766,19.438,29.963,19.178z M28.689,18.842l-0.48-0.025l-1.605-0.078 c0.197-0.164,0.385-0.318,0.492-0.409c0.031-0.013,0.145-0.044,0.428-0.044c0.17,0,0.332,0.013,0.438,0.021L28.689,18.842z" fill="url(#SVGID_8_)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M44.512,24.485c-0.01-0.056-0.021-0.099-0.031-0.138 c-0.008-0.029-0.014-0.061-0.021-0.088c-0.072-0.355-0.166-0.72-0.273-1.094l-0.014-0.04c-0.021-0.083-0.047-0.169-0.072-0.251 c-0.133-0.42-0.277-0.822-0.43-1.193c-0.02-0.045-0.041-0.09-0.061-0.134l-0.029-0.071c-0.148-0.34-0.309-0.679-0.477-1.004 l-0.023-0.042c-0.033-0.065-0.066-0.13-0.1-0.194c-0.211-0.381-0.424-0.746-0.648-1.082c-0.021-0.035-0.047-0.072-0.072-0.111 c-0.02-0.021-0.031-0.042-0.047-0.065c-0.213-0.313-0.438-0.618-0.668-0.907l-0.047-0.059c-0.031-0.039-0.061-0.08-0.094-0.12 c-0.268-0.325-0.551-0.644-0.844-0.942c-0.041-0.039-0.084-0.081-0.125-0.125L40.4,16.791c-0.264-0.264-0.545-0.521-0.834-0.768 l-0.057-0.051c-0.027-0.026-0.059-0.051-0.088-0.074c-0.314-0.264-0.656-0.522-1.014-0.771c-0.041-0.029-0.086-0.061-0.131-0.088 l-0.055-0.037c-0.32-0.215-0.656-0.422-0.99-0.611l-0.051-0.029c-0.029-0.017-0.059-0.031-0.084-0.049 c-0.375-0.202-0.764-0.395-1.158-0.566l-0.1-0.041L35.73,13.66c-0.105-0.045-0.209-0.081-0.313-0.119 c-0.055-0.02-0.107-0.037-0.158-0.057l-0.201-0.076l-0.182,0.116c-0.117,0.075-0.59,0.351-0.869,0.511 c-0.309-0.041-1.057-0.137-1.811-0.211c0.23-0.023,0.555-0.05,1.006-0.08l0.064-0.861l-0.033-0.01 c-0.027-0.006-0.055-0.013-0.082-0.02l-0.064-0.012l-0.053-0.012c-0.461-0.094-0.896-0.162-1.326-0.209h-0.004l-0.061-0.006 c-0.492-0.051-0.992-0.076-1.488-0.076c-0.438,0-0.891,0.024-1.385,0.072c-0.078,0.007-0.148,0.015-0.227,0.023 c-0.488,0.055-0.916,0.121-1.32,0.205l-0.016,0.002h-0.008c-0.426,0.092-0.854,0.203-1.311,0.344 c-0.039,0.014-0.08,0.026-0.121,0.039l-0.092,0.031c-0.387,0.125-0.766,0.266-1.125,0.416c-0.027,0.014-0.051,0.021-0.07,0.027 l-0.055,0.023c-0.398,0.172-0.797,0.367-1.191,0.582c-0.041,0.021-0.082,0.047-0.125,0.071l-0.051,0.028 c-0.109,0.064-0.221,0.135-0.33,0.203l-0.143,0.092l-0.791,0.49l0.875,0.297c0.131,0.045,0.271,0.066,0.42,0.066 c0.471,0,0.928-0.236,1.295-0.424c0.146-0.076,0.365-0.189,0.457-0.207c0.107,0.032,0.215,0.049,0.322,0.049 c0.4,0,0.729-0.221,1.02-0.415l0.076-0.05c0.098-0.031,0.258-0.092,0.578-0.213c0.33-0.127,0.928-0.354,1.088-0.393 c0.311-0.004,0.68-0.049,0.943-0.215c0.248,0.041,0.688,0.111,1.143,0.172c-0.033,0.021-0.066,0.041-0.096,0.07 c-0.146,0.137-0.939,0.381-1.184,0.414c-0.457,0.057-0.639,0.291-0.713,0.475c-0.094,0.242-0.039,0.484,0.057,0.68 c-0.174,0.114-0.385,0.244-0.566,0.342c0-0.004,0.002-0.009,0.002-0.014c0.064-0.371,0.113-0.639-0.064-0.852 c-0.09-0.111-0.225-0.172-0.365-0.172c-0.209,0-0.371,0.13-0.502,0.258c-0.365,0.359-0.588,0.809-0.672,0.977l-0.016,0.031 l-0.014,0.025c-0.156,0.311-0.223,0.527-0.135,1.211c-0.039,0.027-0.154,0.072-0.314,0.072c-0.02,0-0.039-0.002-0.055-0.002 c-0.104-0.114-0.246-0.18-0.406-0.18l0,0c-0.369,0-0.873,0.424-1.496,1.258l-0.199,0.268l0.203,0.266l0.188,0.246 c-2.973,2.334-2.994,2.467-3.023,2.66c-0.008,0.02-0.033,0.1-0.068,0.211c-0.443,1.398-0.688,2.445-0.449,3.004 c0.553,1.299,1.178,2.512,1.986,2.578c0.07,0.006,0.148,0.008,0.234,0.008c0.738,0,1.939-0.229,2.518-0.348 c0.105,0.204,0.236,0.441,0.307,0.57l0.129,0.23l0.26-0.008c0,0,0.141-0.006,0.316-0.006c0.203,0,0.338,0.008,0.424,0.014 c0.314,0.938,0.918,3.094,0.805,3.539l-0.002,0.002c-1.014,1.549,0.215,3.563,0.807,4.533c0.049,0.076,0.09,0.145,0.125,0.205 c0.229,0.66,0.506,1.098,1.09,1.098c0.043,0,0.09-0.004,0.131-0.005c0.033-0.003,0.07-0.005,0.104-0.005 c0.066,0,0.111,0.01,0.16,0.027l0.055,0.02l0.055,0.004c0.109,0.009,0.215,0.023,0.32,0.039c0.178,0.025,0.365,0.051,0.557,0.051 c0.508,0,0.908-0.195,1.258-0.613c0.014,0,0.025-0.002,0.037-0.004c0.367-0.051,0.504-0.238,0.549-0.404 c0.029-0.028,0.064-0.063,0.094-0.09c0.146-0.134,0.316-0.293,0.436-0.482c0.051-0.031,0.113-0.068,0.182-0.109 c0.117-0.073,0.25-0.154,0.354-0.209c0.092-0.028,0.174-0.084,0.234-0.161c0.148-0.183,0.119-0.394,0.094-0.562 c-0.025-0.173-0.051-0.35,0.043-0.541c0.52-0.256,1.445-0.882,1.594-0.984v0.012c-0.008,0.083-0.033,0.309-0.07,0.45 c-0.197,0.2-0.359,0.503-0.414,0.606l-0.031,0.066l-0.012,0.074c-0.012,0.098-0.066,0.607,0.215,0.938 c0.143,0.166,0.346,0.258,0.574,0.258c0.07,0,0.146-0.01,0.223-0.027c0.727-0.168,2.01-1.936,2.113-2.91 c0.053-0.473-0.129-0.842-0.494-1.018l-0.273-0.131l-0.217,0.217l-0.791,0.805c-0.268,0.025-0.479,0.107-0.619,0.234 c0.008-0.344-0.025-0.695-0.061-1.039c-0.109-1.037-0.129-1.695,0.496-2.146l0.031-0.023l0.029-0.027 c0.223-0.234,0.475-0.438,0.74-0.654c0.619-0.506,1.26-1.029,1.643-1.975l0.016-0.041c0.123-0.323,0.309-0.811,0.059-1.183 c-0.063-0.091-0.193-0.233-0.441-0.286c0.326-0.131,0.576-0.236,0.6-0.245l0.076-0.032l0.059-0.059l1.34-1.303l0.195-0.192 l-0.086-0.263c-0.012-0.034-0.086-0.24-0.291-0.535c0.391,0.053,0.729,0.148,0.834,0.234c0.043,0.088,0.121,0.283,0.209,0.488 c1.471,3.527,1.678,3.708,2.063,3.715c0.014,0,0.025,0.001,0.035,0.004c0.029,0,0.059,0.002,0.082,0.002 c0.221,0,0.344-0.114,0.398-0.182c0.16-0.195,0.117-0.436,0.1-0.525l-0.006-0.029c-0.018-0.213-0.006-1.162,0.023-1.94 c0.002,0.003,0.004,0.005,0.004,0.007l0.791-0.319L44.512,24.485z M32.908,20.172c-0.061,0.001-0.129,0.006-0.199,0.006 c-0.227,0.014-0.486,0.023-0.742,0.023c-0.672,0-0.826-0.083-0.842-0.094c-0.082-0.057-0.162-0.102-0.248-0.133 c0.154-0.035,0.328-0.156,0.508-0.508c0.176,0.348,0.416,0.656,0.785,0.656c0.1,0,0.195-0.023,0.287-0.07 C32.582,20.055,32.785,20.125,32.908,20.172z M32.645,18.264c-0.053,0-0.094-0.002-0.125-0.005c0.033-0.091,0.076-0.146,0.107-0.175 c0.043,0.066,0.104,0.125,0.166,0.175C32.74,18.262,32.691,18.264,32.645,18.264z M29.963,19.178 c0.23,0.461,0.402,0.658,0.539,0.745c-0.334,0.026-0.586,0.242-0.797,0.448c-0.145-0.053-0.396-0.206-0.473-0.314 c-0.043-0.064-0.096-0.119-0.156-0.168C29.443,19.783,29.766,19.438,29.963,19.178z M28.689,18.842l-0.48-0.025l-1.605-0.078 c0.197-0.164,0.385-0.318,0.492-0.409c0.031-0.013,0.145-0.044,0.428-0.044c0.17,0,0.332,0.013,0.438,0.021L28.689,18.842z" fill="url(#SVGID_8_)" opacity="0.3"/>
<radialGradient cx="-11.4893" cy="8.5776" gradientTransform="matrix(0.9797 0 0 0.9952 41.476 8.3351)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="16.9394">
-<stop offset="0" style="stop-color:#7AF200"/>
-<stop offset="0.3152" style="stop-color:#7AF200"/>
-<stop offset="0.7273" style="stop-color:#1CAD0F"/>
-<stop offset="1" style="stop-color:#007A3A"/>
+ <stop offset="0.3152" style="stop-color:#7AF200"/>
+ <stop offset="0.7273" style="stop-color:#1CAD0F"/>
+ <stop offset="1" style="stop-color:#007A3A"/>
</radialGradient>
<path d="M15.949,27.407c0,0,0,0,0,0.003c0,0.002,0,0.006,0,0.01c0,0.445,0.029,0.886,0.064,1.32 c0.014,0.144,0.033,0.285,0.049,0.43c0.037,0.297,0.084,0.594,0.135,0.886c0.031,0.153,0.059,0.31,0.09,0.464 c0.066,0.301,0.145,0.6,0.229,0.893c0.035,0.121,0.061,0.245,0.096,0.363c0.008,0.012,0.012,0.025,0.014,0.038 c0.012-0.116,0.016-0.234,0.012-0.354c-0.027-0.861-0.164-0.75-0.164-0.75l0.955-1.305v-0.833l-1.119-1.138 C16.309,27.434,15.949,27.376,15.949,27.407z" fill="url(#SVGID_9_)"/>
<radialGradient cx="-11.459" cy="8.5776" gradientTransform="matrix(0.9797 0 0 0.9952 41.476 8.3351)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="16.9575">
-<stop offset="0" style="stop-color:#7AF200"/>
-<stop offset="0.3152" style="stop-color:#7AF200"/>
-<stop offset="0.7273" style="stop-color:#1CAD0F"/>
-<stop offset="1" style="stop-color:#007A3A"/>
+ <stop offset="0.3152" style="stop-color:#7AF200"/>
+ <stop offset="0.7273" style="stop-color:#1CAD0F"/>
+ <stop offset="1" style="stop-color:#007A3A"/>
</radialGradient>
<path d="M24.947,14.498c0.412,0.139,0.75-0.143,1.135-0.395c0.137-0.027,1.648-0.641,1.813-0.641 s0.713-0.021,0.85-0.243c0,0,2.365,0.419,2.723,0.278c0.193-0.076,1.01-0.143,1.709-0.189c-0.037-0.008-0.076-0.02-0.113-0.029 c-0.039-0.008-0.074-0.013-0.113-0.021c-0.439-0.091-0.885-0.161-1.336-0.208c0,0-0.006,0-0.01-0.002 c-0.477-0.048-0.957-0.074-1.447-0.074c-0.453,0-0.902,0.027-1.346,0.07c-0.076,0.008-0.152,0.016-0.232,0.026 c-0.428,0.047-0.854,0.11-1.27,0.195c-0.008,0.003-0.016,0.003-0.021,0.005c-0.432,0.09-0.855,0.203-1.271,0.33 c-0.072,0.023-0.141,0.047-0.209,0.068c-0.371,0.123-0.734,0.258-1.092,0.406c-0.041,0.019-0.084,0.034-0.125,0.051 c-0.393,0.171-0.775,0.359-1.15,0.563c-0.055,0.03-0.109,0.064-0.164,0.096c-0.162,0.09-0.311,0.189-0.467,0.287 C23.58,15.334,24.537,14.357,24.947,14.498z" fill="url(#SVGID_10_)"/>
<radialGradient cx="-11.458" cy="8.5742" gradientTransform="matrix(0.9797 0 0 0.9952 41.476 8.3351)" gradientUnits="userSpaceOnUse" id="SVGID_11_" r="16.9562">
-<stop offset="0" style="stop-color:#B2F56E"/>
-<stop offset="0.3152" style="stop-color:#B2F56E"/>
-<stop offset="0.7273" style="stop-color:#5CBF1B"/>
-<stop offset="1" style="stop-color:#227A00"/>
+ <stop offset="0.3152" style="stop-color:#B2F56E"/>
+ <stop offset="0.7273" style="stop-color:#5CBF1B"/>
+ <stop offset="1" style="stop-color:#227A00"/>
</radialGradient>
<path d="M44.09,24.559c-0.016-0.073-0.037-0.143-0.053-0.214c-0.07-0.356-0.164-0.708-0.266-1.054 c-0.025-0.094-0.051-0.189-0.08-0.282c-0.125-0.394-0.264-0.781-0.416-1.159c-0.029-0.064-0.061-0.131-0.09-0.195 c-0.143-0.334-0.297-0.658-0.463-0.977c-0.037-0.078-0.078-0.156-0.117-0.23c-0.197-0.359-0.406-0.709-0.627-1.051 c-0.041-0.06-0.084-0.114-0.121-0.174c-0.205-0.303-0.42-0.596-0.648-0.881c-0.043-0.055-0.088-0.113-0.135-0.172 c-0.262-0.314-0.533-0.619-0.82-0.914c-0.047-0.051-0.098-0.099-0.15-0.148c-0.26-0.26-0.535-0.512-0.813-0.75 c-0.047-0.041-0.092-0.083-0.141-0.123c-0.316-0.262-0.645-0.512-0.982-0.746c-0.061-0.041-0.119-0.081-0.182-0.12 c-0.311-0.211-0.631-0.411-0.961-0.595c-0.047-0.025-0.088-0.053-0.133-0.077c-0.365-0.198-0.74-0.383-1.123-0.55 c-0.07-0.029-0.139-0.055-0.205-0.086c-0.15-0.063-0.303-0.111-0.455-0.17c-0.182,0.118-1.016,0.598-1.016,0.598 s-3.623-0.503-3.869-0.252c-0.25,0.252-1.213,0.508-1.434,0.537c-0.219,0.029-0.674,0.148-0.129,0.832 c-0.082,0.084-1.643,1.186-1.643,0.686c0-0.502,0.352-1.4-0.139-0.92c-0.35,0.346-0.563,0.813-0.605,0.902 c-0.115,0.223-0.186,0.328-0.104,0.97c0.084,0.642-1.006,0.64-1.08,0.474c-0.197-0.445-1.275,0.998-1.275,0.998l0.455,0.594 c0,0-3.18,2.486-3.205,2.654c-0.029,0.168-0.822,2.328-0.547,2.971c0.273,0.643,0.969,2.262,1.625,2.313 c0.861,0.072,2.951-0.398,2.951-0.398c0.055,0.143,0.451,0.854,0.451,0.854s1.021-0.035,1.08,0.078 c0.018,0.037,1.234,3.668,0.832,4.148c-0.957,1.457,0.547,3.59,0.965,4.313c0.42,1.238,0.688,0.684,1.24,0.889 c0.678,0.057,1.25,0.313,1.826-0.44c0.166-0.14,0.451-0.028,0.451-0.224c0-0.107,0.494-0.428,0.619-0.729 c0.133-0.063,0.475-0.296,0.707-0.409c0.211-0.014-0.201-0.586,0.217-1.192c0.451-0.181,1.666-1.013,1.666-1.013 c0.057-1.223-0.592-2.729,0.617-3.596c0.777-0.806,1.799-1.266,2.295-2.492c0.139-0.361,0.441-1.104-0.438-0.881 c-0.826,0.211-1.75,0.26-1.313-0.109c-0.051-0.456-0.6-0.668-1.092-1.111c-0.254-0.613-0.654-1.704-0.654-1.704l-0.875-1.349 l0.107-0.279l1.041,1.555l1.037,1.275c0.383,1.277,0.711,1.389,0.711,1.389c0.574-0.205,1.939-0.775,1.939-0.775l1.342-1.307 c0,0-0.139-0.418-0.684-0.943l-0.41-0.25c-0.09,0.258-0.566,0.352-0.566,0.352l-1.156-1.406l0.43-0.088l0.332,0.641l0.795,0.279 c0,0,0.219-0.163,0.629,0.267c0.334-0.028,1.635,0.065,1.938,0.456c0.061,0.078,1.611,4.016,1.918,4.021 c0.137,0.001,0.232,0.055,0.189-0.185c-0.055-0.109,0-2.584,0.08-3.115c0.209-0.447,0.242,0,0.734,0.854 C44.094,24.6,44.094,24.579,44.09,24.559z M30.432,15.017c0.105-0.329,0.738-0.44,0.738-0.44s-0.184,0.339-0.141,0.514 c0.041,0.177-0.289,0.286-0.324,0.701c-0.037,0.416-0.789,0.171-0.85,0.025C29.793,15.672,30.318,15.344,30.432,15.017z M33.125,20.603c-0.467,0-1.863,0.141-2.248-0.138c-0.385-0.279-0.686,0.028-0.961,0.309c-0.182,0.18-0.842-0.187-1.035-0.467 c-0.191-0.279-0.838-0.259-0.838-0.259l0.146-0.796l-1.859-0.09l-1.057,0.314l-0.992,0.027l0.557-0.269l0.693-0.167 c0,0,1.008-0.841,1.309-1.092c0.258-0.213,1.277-0.094,1.277-0.094l1.121,0.821c0,0-0.25,0.644-0.359,0.78 c0.412-0.027,0.896-0.785,0.896-0.785c-0.873-0.816-0.84-1.094-0.84-1.094l1.152,0.822l0.01,0.006c0,0,0.467,1.117,0.662,1.117 c0.189,0,0.436-0.769,0.436-0.769l0.326-0.083c0.146,0.352,0.42,1.146,0.748,0.961c0.189-0.105,0.5-0.011,0.855,0.129 c0.359,0.139,0.602-0.074,0.895,0.186C33.982,21.123,33.318,20.66,33.125,20.603z M33.855,18.684 c-0.479-0.188-2.102,0.418-1.74-0.57c0.193-0.535,0.691-0.646,0.863-0.292c0.043,0.147,0.586,0.374,0.582,0.065 s0.543-0.471,0.621-0.242C33.889,17.857,35.322,18.967,33.855,18.684z M36.918,19.621c-0.268-0.219,0.117-0.404-0.275-0.745 c-0.563-0.491-1.002-0.702-0.234-1.097c0.945-0.122,0.152,0.307,0.309,0.563c0.084,0.136,0.563,0.592,0.938,1.152 C37.963,19.959,37.182,19.84,36.918,19.621z" fill="url(#SVGID_11_)"/>
<radialGradient cx="-11.4609" cy="8.5801" gradientTransform="matrix(0.9797 0 0 0.9952 41.476 8.3351)" gradientUnits="userSpaceOnUse" id="SVGID_12_" r="16.9527">
-<stop offset="0" style="stop-color:#7AF200"/>
-<stop offset="0.3152" style="stop-color:#7AF200"/>
-<stop offset="0.7273" style="stop-color:#1CAD0F"/>
-<stop offset="1" style="stop-color:#007A3A"/>
+ <stop offset="0.3152" style="stop-color:#7AF200"/>
+ <stop offset="0.7273" style="stop-color:#1CAD0F"/>
+ <stop offset="1" style="stop-color:#007A3A"/>
</radialGradient>
<path d="M37.297,32.337l-0.91,0.925c0,0-0.549,0-0.576,0.224c-0.012,0.095-0.045,0.508-0.135,0.72 c-0.182,0.129-0.402,0.557-0.402,0.557s-0.113,0.822,0.492,0.682C36.373,35.306,38.232,32.785,37.297,32.337z" fill="url(#SVGID_12_)"/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<polygon fill="none" points="30.414,14.408 30.414,0 0.414,0 0.414,14.41 0,14.824 0.414,15.237 0.414,30 30.414,30 30.414,15.236 30.828,14.821 "/>
-<path d="M2.749,29.823V17.57L0,14.824l0.706-0.707C1.213,13.608,13.143,1.649,13.861,0.962 c0.387-0.368,0.914-0.786,1.589-0.786c0.687,0,1.172,0.42,1.518,0.785c0.457,0.484,8.802,8.816,13.151,13.154l0.708,0.706 l-2.747,2.749v12.253H2.749z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M2.749,29.823V17.57L0,14.824l0.706-0.707C1.213,13.608,13.143,1.649,13.861,0.962 c0.387-0.368,0.914-0.786,1.589-0.786c0.687,0,1.172,0.42,1.518,0.785c0.457,0.484,8.802,8.816,13.151,13.154l0.708,0.706 l-2.747,2.749v12.253H2.749z" opacity="0.35"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="15.415" x2="15.415" y1="28.6694" y2="12.5688">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.6606" style="stop-color:#E0E1E2"/>
-<stop offset="1" style="stop-color:#B9BCBD"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="0.6606" style="stop-color:#E0E1E2"/>
+ <stop offset="1" style="stop-color:#B9BCBD"/>
</linearGradient>
<polygon fill="url(#SVGID_1__)" points="27.081,28.823 3.749,28.823 3.749,14.473 15.414,5.489 27.081,14.473 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="15.415" x2="15.415" y1="17.313" y2="28.6013">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.6606" style="stop-color:#E0E1E2"/>
-<stop offset="1" style="stop-color:#B9BCBD"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="0.6606" style="stop-color:#E0E1E2"/>
+ <stop offset="1" style="stop-color:#B9BCBD"/>
</linearGradient>
<path d="M15.414,6.668l10.736,8.264V27.89H4.682V14.932L15.414,6.668 M15.414,5.489L3.749,14.473v14.351 h23.333V14.473L15.414,5.489L15.414,5.489z" fill="url(#SVGID_2__)"/>
-<polygon fill-opacity="0.2" points="27.081,18.033 27.081,14.473 15.414,5.489 3.749,14.473 3.749,18.322 15.414,8.99 " stroke-opacity="0.2"/>
+<polygon opacity="0.2" points="27.081,18.033 27.081,14.473 15.414,5.489 3.749,14.473 3.749,18.322 15.414,8.99 "/>
<polygon fill="#727272" points="27.081,18.033 27.081,14.473 15.414,5.489 3.749,14.473 3.749,18.322 15.414,6.655 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="15.416" x2="15.416" y1="17.9946" y2="29.1519">
-<stop offset="0" style="stop-color:#D07100"/>
-<stop offset="1" style="stop-color:#A23600"/>
+ <stop offset="0" style="stop-color:#D07100"/>
+ <stop offset="1" style="stop-color:#A23600"/>
</linearGradient>
<rect fill="url(#SVGID_3__)" height="10.501" width="7.001" x="11.916" y="18.322"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="15.416" x2="15.416" y1="28.7466" y2="18.3602">
-<stop offset="0" style="stop-color:#D07100"/>
-<stop offset="1" style="stop-color:#A23600"/>
+ <stop offset="0" style="stop-color:#D07100"/>
+ <stop offset="1" style="stop-color:#A23600"/>
</linearGradient>
<path d="M17.98,19.257v8.633h-5.133v-8.633H17.98 M18.917,18.322h-7.001v10.501h7.001V18.322L18.917,18.322z" fill="url(#SVGID_4__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="15.4136" x2="15.4136" y1="0.0352" y2="17.7271">
-<stop offset="0" style="stop-color:#DE8029"/>
-<stop offset="0.2606" style="stop-color:#DE4E29"/>
-<stop offset="1" style="stop-color:#D82E09"/>
+ <stop offset="0" style="stop-color:#DE8029"/>
+ <stop offset="0.2606" style="stop-color:#DE4E29"/>
+ <stop offset="1" style="stop-color:#D82E09"/>
</linearGradient>
<path d="M15.414,5.489l11.667,11.667l2.333-2.333c0,0-12.586-12.554-13.171-13.175 c-0.587-0.62-0.965-0.652-1.689,0.035c-0.719,0.688-13.14,13.14-13.14,13.14l2.335,2.333L15.414,5.489z" fill="url(#SVGID_5__)"/>
<radialGradient cx="15.2969" cy="1.7559" gradientUnits="userSpaceOnUse" id="SVGID_6__" r="18.6679">
-<stop offset="0" style="stop-color:#F7D481"/>
-<stop offset="1" style="stop-color:#F5340A"/>
+ <stop offset="0" style="stop-color:#F7D481"/>
+ <stop offset="1" style="stop-color:#F5340A"/>
</radialGradient>
<path d="M14.553,2.616c0.724-0.688,1.102-0.653,1.689-0.034c0.516,0.549,10.433,10.442,12.705,12.709 l0.467-0.468c0,0-12.586-12.554-13.171-13.175c-0.587-0.62-0.965-0.652-1.689,0.035c-0.719,0.688-13.14,13.14-13.14,13.14 l0.467,0.465C4.134,13.029,13.917,3.225,14.553,2.616z" fill="url(#SVGID_6__)"/>
-<rect fill-opacity="0.2" height="1.168" stroke-opacity="0.2" width="7.001" x="11.916" y="18.322"/>
+<rect height="1.168" opacity="0.2" width="7.001" x="11.916" y="18.322"/>
<rect fill="none" height="30" width="30" x="0.414"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_url_address_work.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_url_address_work.svg Fri May 14 16:09:54 2010 +0300
@@ -1,82 +1,79 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="29.999" x2="29.999" y1="2.0776" y2="57.6216">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.4667" style="stop-color:#E6E6E6"/>
-<stop offset="0.9576" style="stop-color:#C2C2C2"/>
-<stop offset="1" style="stop-color:#C2C2C2"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="0.4667" style="stop-color:#E6E6E6"/>
+ <stop offset="0.9576" style="stop-color:#C2C2C2"/>
</linearGradient>
<path d="M53.428,41.199c0,1.027-0.582,2.461-1.297,3.188L40.027,56.681C39.314,57.407,37.904,58,36.891,58 H6.57V2h46.857V41.199z" fill="url(#SVGID_1_)"/>
<linearGradient gradientTransform="matrix(-1 0 0 -1 5045.8477 1885.916)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="5015.8486" x2="5015.8486" y1="1883.5537" y2="1827.7893">
-<stop offset="0" style="stop-color:#F0F0F2"/>
-<stop offset="1" style="stop-color:#B3B5B8"/>
+ <stop offset="0" style="stop-color:#F0F0F2"/>
+ <stop offset="1" style="stop-color:#B3B5B8"/>
</linearGradient>
<path d="M7.49,2.932h45.02v38.268c0,0.775-0.49,1.979-1.031,2.527l-12.1,12.293 c-0.541,0.549-1.725,1.047-2.488,1.047H7.49V2.932 M6.57,2v56h30.32c1.014,0,2.424-0.593,3.137-1.319l12.104-12.294 c0.715-0.727,1.297-2.16,1.297-3.188V2H6.57L6.57,2z" fill="url(#SVGID_2_)"/>
<linearGradient gradientTransform="matrix(-1 0 0 -1 5045.8477 1885.916)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="5006.7441" x2="4999.812" y1="1841.873" y2="1834.9412">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<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"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <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="M51.736,44.787c0.379-0.43,1.09-0.859,1.576-2.705c0,0-0.803,3.783-11.83,0.052 C41.482,58,36.891,58,36.891,58c1.014,0,2.424-0.593,3.137-1.319L51.736,44.787z" fill="url(#SVGID_3_)"/>
-<ellipse cx="30" cy="28.558" fill-opacity="0.2" rx="15.107" ry="15.347" stroke-opacity="0.2"/>
+<ellipse cx="30" cy="28.558" opacity="0.2" rx="15.107" ry="15.347"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="30" x2="30" y1="42.5859" y2="12.1111">
-<stop offset="0" style="stop-color:#004E8C"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#004E8C"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</linearGradient>
<ellipse cx="30" cy="27.416" fill="url(#SVGID_4_)" rx="15.107" ry="15.346"/>
<radialGradient cx="-11.9336" cy="13.8384" gradientTransform="matrix(0.9797 0 0 0.9952 41.476 8.3351)" gradientUnits="userSpaceOnUse" id="SVGID_5_" r="18.5643">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#94FFFF"/>
+ <stop offset="0.5" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</radialGradient>
<ellipse cx="30" cy="27.416" fill="url(#SVGID_5_)" rx="14.721" ry="14.953"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="30" x2="30" y1="12.3306" y2="42.445">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#88D6EB"/>
+ <stop offset="0" style="stop-color:#31A7F8"/>
+ <stop offset="0.497" style="stop-color:#1E74DC"/>
+ <stop offset="1" style="stop-color:#88D6EB"/>
</linearGradient>
-<path d="M30,12.462c-8.129,0-14.721,6.696-14.721,14.954c0,8.26,6.592,14.953,14.721,14.953 c8.131,0,14.721-6.693,14.721-14.953C44.721,19.158,38.131,12.462,30,12.462z M30,41.061c-7.645,0-13.863-6.316-13.863-14.08 c0-7.766,6.219-14.081,13.863-14.081s13.861,6.315,13.861,14.081C43.861,34.744,37.645,41.061,30,41.061z" fill="url(#SVGID_6_)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M30,12.462c-8.129,0-14.721,6.696-14.721,14.954c0,8.26,6.592,14.953,14.721,14.953 c8.131,0,14.721-6.693,14.721-14.953C44.721,19.158,38.131,12.462,30,12.462z M30,41.061c-7.645,0-13.863-6.316-13.863-14.08 c0-7.766,6.219-14.081,13.863-14.081s13.861,6.315,13.861,14.081C43.861,34.744,37.645,41.061,30,41.061z" fill="url(#SVGID_6_)" opacity="0.3"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="15.5195" x2="17.8594" y1="29.4512" y2="29.4512">
-<stop offset="0" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#58595B"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
-<path d="M16.66,27.172c-0.156-0.211-0.51-0.211-0.666-0.211c-0.307,0-0.473,0.223-0.475,0.441 v0.016v0.021c0,0.385,0.021,0.816,0.066,1.34c0.01,0.098,0.02,0.198,0.033,0.297l0.018,0.144c0.039,0.312,0.086,0.617,0.139,0.913 l0.023,0.129c0.023,0.119,0.045,0.232,0.068,0.348c0.064,0.291,0.141,0.592,0.236,0.924c0.012,0.049,0.025,0.098,0.035,0.143 c0.021,0.078,0.039,0.156,0.064,0.231l0.004,0.011l0.008,0.023c0-0.006-0.006-0.018-0.006-0.026l0.844-0.058 c0.014-0.135,0.02-0.273,0.014-0.414c-0.006-0.216-0.016-0.482-0.076-0.709l0.785-1.069l0.084-0.116v-0.145v-0.833v-0.183 l-0.127-0.127L16.66,27.172z" fill="url(#SVGID_7_)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M16.66,27.172c-0.156-0.211-0.51-0.211-0.666-0.211c-0.307,0-0.473,0.223-0.475,0.441 v0.016v0.021c0,0.385,0.021,0.816,0.066,1.34c0.01,0.098,0.02,0.198,0.033,0.297l0.018,0.144c0.039,0.312,0.086,0.617,0.139,0.913 l0.023,0.129c0.023,0.119,0.045,0.232,0.068,0.348c0.064,0.291,0.141,0.592,0.236,0.924c0.012,0.049,0.025,0.098,0.035,0.143 c0.021,0.078,0.039,0.156,0.064,0.231l0.004,0.011l0.008,0.023c0-0.006-0.006-0.018-0.006-0.026l0.844-0.058 c0.014-0.135,0.02-0.273,0.014-0.414c-0.006-0.216-0.016-0.482-0.076-0.709l0.785-1.069l0.084-0.116v-0.145v-0.833v-0.183 l-0.127-0.127L16.66,27.172z" fill="url(#SVGID_7_)" opacity="0.3"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="20.0322" x2="44.5176" y1="25.0957" y2="25.0957">
-<stop offset="0" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#58595B"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
-<path d="M44.512,24.485c-0.01-0.056-0.021-0.099-0.031-0.138 c-0.008-0.029-0.014-0.061-0.021-0.088c-0.072-0.355-0.166-0.72-0.273-1.094l-0.014-0.04c-0.021-0.083-0.047-0.169-0.072-0.251 c-0.133-0.42-0.277-0.822-0.43-1.193c-0.02-0.045-0.041-0.09-0.061-0.134l-0.029-0.071c-0.148-0.34-0.309-0.679-0.477-1.004 l-0.023-0.042c-0.033-0.065-0.066-0.13-0.1-0.194c-0.211-0.381-0.424-0.746-0.648-1.082c-0.021-0.035-0.047-0.072-0.072-0.111 c-0.02-0.021-0.031-0.042-0.047-0.065c-0.213-0.313-0.438-0.618-0.668-0.907l-0.047-0.059c-0.031-0.039-0.061-0.08-0.094-0.12 c-0.268-0.325-0.551-0.644-0.844-0.942c-0.041-0.039-0.084-0.081-0.125-0.125L40.4,16.791c-0.264-0.264-0.545-0.521-0.834-0.768 l-0.057-0.051c-0.027-0.026-0.059-0.051-0.088-0.074c-0.314-0.264-0.656-0.522-1.014-0.771c-0.041-0.029-0.086-0.061-0.131-0.088 l-0.055-0.037c-0.32-0.215-0.656-0.422-0.99-0.611l-0.051-0.029c-0.029-0.017-0.059-0.031-0.084-0.049 c-0.375-0.202-0.764-0.395-1.158-0.566l-0.1-0.041L35.73,13.66c-0.105-0.045-0.209-0.081-0.313-0.119 c-0.055-0.02-0.107-0.037-0.158-0.057l-0.201-0.076l-0.182,0.116c-0.117,0.075-0.59,0.351-0.869,0.511 c-0.309-0.041-1.057-0.137-1.811-0.211c0.23-0.023,0.555-0.05,1.006-0.08l0.064-0.861l-0.033-0.01 c-0.027-0.006-0.055-0.013-0.082-0.02l-0.064-0.012l-0.053-0.012c-0.461-0.094-0.896-0.162-1.326-0.209h-0.004l-0.061-0.006 c-0.492-0.051-0.992-0.076-1.488-0.076c-0.438,0-0.891,0.024-1.385,0.072c-0.078,0.007-0.148,0.015-0.227,0.023 c-0.488,0.055-0.916,0.121-1.32,0.205l-0.016,0.002h-0.008c-0.426,0.092-0.854,0.203-1.311,0.344 c-0.039,0.014-0.08,0.026-0.121,0.039l-0.092,0.031c-0.387,0.125-0.766,0.266-1.125,0.416c-0.027,0.014-0.051,0.021-0.07,0.027 l-0.055,0.023c-0.398,0.172-0.797,0.367-1.191,0.582c-0.041,0.021-0.082,0.047-0.125,0.071l-0.051,0.028 c-0.109,0.064-0.221,0.135-0.33,0.203l-0.143,0.092l-0.791,0.49l0.875,0.297c0.131,0.045,0.271,0.066,0.42,0.066 c0.471,0,0.928-0.236,1.295-0.424c0.146-0.076,0.365-0.189,0.457-0.207c0.107,0.032,0.215,0.049,0.322,0.049 c0.4,0,0.729-0.221,1.02-0.415l0.076-0.05c0.098-0.031,0.258-0.092,0.578-0.213c0.33-0.127,0.928-0.354,1.088-0.393 c0.311-0.004,0.68-0.049,0.943-0.215c0.248,0.041,0.688,0.111,1.143,0.172c-0.033,0.021-0.066,0.041-0.096,0.07 c-0.146,0.137-0.939,0.381-1.184,0.414c-0.457,0.057-0.639,0.291-0.713,0.475c-0.094,0.242-0.039,0.484,0.057,0.68 c-0.174,0.114-0.385,0.244-0.566,0.342c0-0.004,0.002-0.009,0.002-0.014c0.064-0.371,0.113-0.639-0.064-0.852 c-0.09-0.111-0.225-0.172-0.365-0.172c-0.209,0-0.371,0.13-0.502,0.258c-0.365,0.359-0.588,0.809-0.672,0.977l-0.016,0.031 l-0.014,0.025c-0.156,0.311-0.223,0.527-0.135,1.211c-0.039,0.027-0.154,0.072-0.314,0.072c-0.02,0-0.039-0.002-0.055-0.002 c-0.104-0.114-0.246-0.18-0.406-0.18l0,0c-0.369,0-0.873,0.424-1.496,1.258l-0.199,0.268l0.203,0.266l0.188,0.246 c-2.973,2.334-2.994,2.467-3.023,2.66c-0.008,0.02-0.033,0.1-0.068,0.211c-0.443,1.398-0.688,2.445-0.449,3.004 c0.553,1.299,1.178,2.512,1.986,2.578c0.07,0.006,0.148,0.008,0.234,0.008c0.738,0,1.939-0.229,2.518-0.348 c0.105,0.204,0.236,0.441,0.307,0.57l0.129,0.23l0.26-0.008c0,0,0.141-0.006,0.316-0.006c0.203,0,0.338,0.008,0.424,0.014 c0.314,0.938,0.918,3.094,0.805,3.539l-0.002,0.002c-1.014,1.549,0.215,3.563,0.807,4.533c0.049,0.076,0.09,0.145,0.125,0.205 c0.229,0.66,0.506,1.098,1.09,1.098c0.043,0,0.09-0.004,0.131-0.005c0.033-0.003,0.07-0.005,0.104-0.005 c0.066,0,0.111,0.01,0.16,0.027l0.055,0.02l0.055,0.004c0.109,0.009,0.215,0.023,0.32,0.039c0.178,0.025,0.365,0.051,0.557,0.051 c0.508,0,0.908-0.195,1.258-0.613c0.014,0,0.025-0.002,0.037-0.004c0.367-0.051,0.504-0.238,0.549-0.404 c0.029-0.028,0.064-0.063,0.094-0.09c0.146-0.134,0.316-0.293,0.436-0.482c0.051-0.031,0.113-0.068,0.182-0.109 c0.117-0.073,0.25-0.154,0.354-0.209c0.092-0.028,0.174-0.084,0.234-0.161c0.148-0.183,0.119-0.394,0.094-0.562 c-0.025-0.173-0.051-0.35,0.043-0.541c0.52-0.256,1.445-0.882,1.594-0.984v0.012c-0.008,0.083-0.033,0.309-0.07,0.45 c-0.197,0.2-0.359,0.503-0.414,0.606l-0.031,0.066l-0.012,0.074c-0.012,0.098-0.066,0.607,0.215,0.938 c0.143,0.166,0.346,0.258,0.574,0.258c0.07,0,0.146-0.01,0.223-0.027c0.727-0.168,2.01-1.936,2.113-2.91 c0.053-0.473-0.129-0.842-0.494-1.018l-0.273-0.131l-0.217,0.217l-0.791,0.805c-0.268,0.025-0.479,0.107-0.619,0.234 c0.008-0.344-0.025-0.695-0.061-1.039c-0.109-1.037-0.129-1.695,0.496-2.146l0.031-0.023l0.029-0.027 c0.223-0.234,0.475-0.438,0.74-0.654c0.619-0.506,1.26-1.029,1.643-1.975l0.016-0.041c0.123-0.323,0.309-0.811,0.059-1.183 c-0.063-0.091-0.193-0.233-0.441-0.286c0.326-0.131,0.576-0.236,0.6-0.245l0.076-0.032l0.059-0.059l1.34-1.303l0.195-0.192 l-0.086-0.263c-0.012-0.034-0.086-0.24-0.291-0.535c0.391,0.053,0.729,0.148,0.834,0.234c0.043,0.088,0.121,0.283,0.209,0.488 c1.471,3.527,1.678,3.708,2.063,3.715c0.014,0,0.025,0.001,0.035,0.004c0.029,0,0.059,0.002,0.082,0.002 c0.221,0,0.344-0.114,0.398-0.182c0.16-0.195,0.117-0.436,0.1-0.525l-0.006-0.029c-0.018-0.213-0.006-1.162,0.023-1.94 c0.002,0.003,0.004,0.005,0.004,0.007l0.791-0.319L44.512,24.485z M32.908,20.172c-0.061,0.001-0.129,0.006-0.199,0.006 c-0.227,0.014-0.486,0.023-0.742,0.023c-0.672,0-0.826-0.083-0.842-0.094c-0.082-0.057-0.162-0.102-0.248-0.133 c0.154-0.035,0.328-0.156,0.508-0.508c0.176,0.348,0.416,0.656,0.785,0.656c0.1,0,0.195-0.023,0.287-0.07 C32.582,20.055,32.785,20.125,32.908,20.172z M32.645,18.264c-0.053,0-0.094-0.002-0.125-0.005c0.033-0.091,0.076-0.146,0.107-0.175 c0.043,0.066,0.104,0.125,0.166,0.175C32.74,18.262,32.691,18.264,32.645,18.264z M29.963,19.178 c0.23,0.461,0.402,0.658,0.539,0.745c-0.334,0.026-0.586,0.242-0.797,0.448c-0.145-0.053-0.396-0.206-0.473-0.314 c-0.043-0.064-0.096-0.119-0.156-0.168C29.443,19.783,29.766,19.438,29.963,19.178z M28.689,18.842l-0.48-0.025l-1.605-0.078 c0.197-0.164,0.385-0.318,0.492-0.409c0.031-0.013,0.145-0.044,0.428-0.044c0.17,0,0.332,0.013,0.438,0.021L28.689,18.842z" fill="url(#SVGID_8_)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M44.512,24.485c-0.01-0.056-0.021-0.099-0.031-0.138 c-0.008-0.029-0.014-0.061-0.021-0.088c-0.072-0.355-0.166-0.72-0.273-1.094l-0.014-0.04c-0.021-0.083-0.047-0.169-0.072-0.251 c-0.133-0.42-0.277-0.822-0.43-1.193c-0.02-0.045-0.041-0.09-0.061-0.134l-0.029-0.071c-0.148-0.34-0.309-0.679-0.477-1.004 l-0.023-0.042c-0.033-0.065-0.066-0.13-0.1-0.194c-0.211-0.381-0.424-0.746-0.648-1.082c-0.021-0.035-0.047-0.072-0.072-0.111 c-0.02-0.021-0.031-0.042-0.047-0.065c-0.213-0.313-0.438-0.618-0.668-0.907l-0.047-0.059c-0.031-0.039-0.061-0.08-0.094-0.12 c-0.268-0.325-0.551-0.644-0.844-0.942c-0.041-0.039-0.084-0.081-0.125-0.125L40.4,16.791c-0.264-0.264-0.545-0.521-0.834-0.768 l-0.057-0.051c-0.027-0.026-0.059-0.051-0.088-0.074c-0.314-0.264-0.656-0.522-1.014-0.771c-0.041-0.029-0.086-0.061-0.131-0.088 l-0.055-0.037c-0.32-0.215-0.656-0.422-0.99-0.611l-0.051-0.029c-0.029-0.017-0.059-0.031-0.084-0.049 c-0.375-0.202-0.764-0.395-1.158-0.566l-0.1-0.041L35.73,13.66c-0.105-0.045-0.209-0.081-0.313-0.119 c-0.055-0.02-0.107-0.037-0.158-0.057l-0.201-0.076l-0.182,0.116c-0.117,0.075-0.59,0.351-0.869,0.511 c-0.309-0.041-1.057-0.137-1.811-0.211c0.23-0.023,0.555-0.05,1.006-0.08l0.064-0.861l-0.033-0.01 c-0.027-0.006-0.055-0.013-0.082-0.02l-0.064-0.012l-0.053-0.012c-0.461-0.094-0.896-0.162-1.326-0.209h-0.004l-0.061-0.006 c-0.492-0.051-0.992-0.076-1.488-0.076c-0.438,0-0.891,0.024-1.385,0.072c-0.078,0.007-0.148,0.015-0.227,0.023 c-0.488,0.055-0.916,0.121-1.32,0.205l-0.016,0.002h-0.008c-0.426,0.092-0.854,0.203-1.311,0.344 c-0.039,0.014-0.08,0.026-0.121,0.039l-0.092,0.031c-0.387,0.125-0.766,0.266-1.125,0.416c-0.027,0.014-0.051,0.021-0.07,0.027 l-0.055,0.023c-0.398,0.172-0.797,0.367-1.191,0.582c-0.041,0.021-0.082,0.047-0.125,0.071l-0.051,0.028 c-0.109,0.064-0.221,0.135-0.33,0.203l-0.143,0.092l-0.791,0.49l0.875,0.297c0.131,0.045,0.271,0.066,0.42,0.066 c0.471,0,0.928-0.236,1.295-0.424c0.146-0.076,0.365-0.189,0.457-0.207c0.107,0.032,0.215,0.049,0.322,0.049 c0.4,0,0.729-0.221,1.02-0.415l0.076-0.05c0.098-0.031,0.258-0.092,0.578-0.213c0.33-0.127,0.928-0.354,1.088-0.393 c0.311-0.004,0.68-0.049,0.943-0.215c0.248,0.041,0.688,0.111,1.143,0.172c-0.033,0.021-0.066,0.041-0.096,0.07 c-0.146,0.137-0.939,0.381-1.184,0.414c-0.457,0.057-0.639,0.291-0.713,0.475c-0.094,0.242-0.039,0.484,0.057,0.68 c-0.174,0.114-0.385,0.244-0.566,0.342c0-0.004,0.002-0.009,0.002-0.014c0.064-0.371,0.113-0.639-0.064-0.852 c-0.09-0.111-0.225-0.172-0.365-0.172c-0.209,0-0.371,0.13-0.502,0.258c-0.365,0.359-0.588,0.809-0.672,0.977l-0.016,0.031 l-0.014,0.025c-0.156,0.311-0.223,0.527-0.135,1.211c-0.039,0.027-0.154,0.072-0.314,0.072c-0.02,0-0.039-0.002-0.055-0.002 c-0.104-0.114-0.246-0.18-0.406-0.18l0,0c-0.369,0-0.873,0.424-1.496,1.258l-0.199,0.268l0.203,0.266l0.188,0.246 c-2.973,2.334-2.994,2.467-3.023,2.66c-0.008,0.02-0.033,0.1-0.068,0.211c-0.443,1.398-0.688,2.445-0.449,3.004 c0.553,1.299,1.178,2.512,1.986,2.578c0.07,0.006,0.148,0.008,0.234,0.008c0.738,0,1.939-0.229,2.518-0.348 c0.105,0.204,0.236,0.441,0.307,0.57l0.129,0.23l0.26-0.008c0,0,0.141-0.006,0.316-0.006c0.203,0,0.338,0.008,0.424,0.014 c0.314,0.938,0.918,3.094,0.805,3.539l-0.002,0.002c-1.014,1.549,0.215,3.563,0.807,4.533c0.049,0.076,0.09,0.145,0.125,0.205 c0.229,0.66,0.506,1.098,1.09,1.098c0.043,0,0.09-0.004,0.131-0.005c0.033-0.003,0.07-0.005,0.104-0.005 c0.066,0,0.111,0.01,0.16,0.027l0.055,0.02l0.055,0.004c0.109,0.009,0.215,0.023,0.32,0.039c0.178,0.025,0.365,0.051,0.557,0.051 c0.508,0,0.908-0.195,1.258-0.613c0.014,0,0.025-0.002,0.037-0.004c0.367-0.051,0.504-0.238,0.549-0.404 c0.029-0.028,0.064-0.063,0.094-0.09c0.146-0.134,0.316-0.293,0.436-0.482c0.051-0.031,0.113-0.068,0.182-0.109 c0.117-0.073,0.25-0.154,0.354-0.209c0.092-0.028,0.174-0.084,0.234-0.161c0.148-0.183,0.119-0.394,0.094-0.562 c-0.025-0.173-0.051-0.35,0.043-0.541c0.52-0.256,1.445-0.882,1.594-0.984v0.012c-0.008,0.083-0.033,0.309-0.07,0.45 c-0.197,0.2-0.359,0.503-0.414,0.606l-0.031,0.066l-0.012,0.074c-0.012,0.098-0.066,0.607,0.215,0.938 c0.143,0.166,0.346,0.258,0.574,0.258c0.07,0,0.146-0.01,0.223-0.027c0.727-0.168,2.01-1.936,2.113-2.91 c0.053-0.473-0.129-0.842-0.494-1.018l-0.273-0.131l-0.217,0.217l-0.791,0.805c-0.268,0.025-0.479,0.107-0.619,0.234 c0.008-0.344-0.025-0.695-0.061-1.039c-0.109-1.037-0.129-1.695,0.496-2.146l0.031-0.023l0.029-0.027 c0.223-0.234,0.475-0.438,0.74-0.654c0.619-0.506,1.26-1.029,1.643-1.975l0.016-0.041c0.123-0.323,0.309-0.811,0.059-1.183 c-0.063-0.091-0.193-0.233-0.441-0.286c0.326-0.131,0.576-0.236,0.6-0.245l0.076-0.032l0.059-0.059l1.34-1.303l0.195-0.192 l-0.086-0.263c-0.012-0.034-0.086-0.24-0.291-0.535c0.391,0.053,0.729,0.148,0.834,0.234c0.043,0.088,0.121,0.283,0.209,0.488 c1.471,3.527,1.678,3.708,2.063,3.715c0.014,0,0.025,0.001,0.035,0.004c0.029,0,0.059,0.002,0.082,0.002 c0.221,0,0.344-0.114,0.398-0.182c0.16-0.195,0.117-0.436,0.1-0.525l-0.006-0.029c-0.018-0.213-0.006-1.162,0.023-1.94 c0.002,0.003,0.004,0.005,0.004,0.007l0.791-0.319L44.512,24.485z M32.908,20.172c-0.061,0.001-0.129,0.006-0.199,0.006 c-0.227,0.014-0.486,0.023-0.742,0.023c-0.672,0-0.826-0.083-0.842-0.094c-0.082-0.057-0.162-0.102-0.248-0.133 c0.154-0.035,0.328-0.156,0.508-0.508c0.176,0.348,0.416,0.656,0.785,0.656c0.1,0,0.195-0.023,0.287-0.07 C32.582,20.055,32.785,20.125,32.908,20.172z M32.645,18.264c-0.053,0-0.094-0.002-0.125-0.005c0.033-0.091,0.076-0.146,0.107-0.175 c0.043,0.066,0.104,0.125,0.166,0.175C32.74,18.262,32.691,18.264,32.645,18.264z M29.963,19.178 c0.23,0.461,0.402,0.658,0.539,0.745c-0.334,0.026-0.586,0.242-0.797,0.448c-0.145-0.053-0.396-0.206-0.473-0.314 c-0.043-0.064-0.096-0.119-0.156-0.168C29.443,19.783,29.766,19.438,29.963,19.178z M28.689,18.842l-0.48-0.025l-1.605-0.078 c0.197-0.164,0.385-0.318,0.492-0.409c0.031-0.013,0.145-0.044,0.428-0.044c0.17,0,0.332,0.013,0.438,0.021L28.689,18.842z" fill="url(#SVGID_8_)" opacity="0.3"/>
<radialGradient cx="-11.4893" cy="8.5776" gradientTransform="matrix(0.9797 0 0 0.9952 41.476 8.3351)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="16.9394">
-<stop offset="0" style="stop-color:#7AF200"/>
-<stop offset="0.3152" style="stop-color:#7AF200"/>
-<stop offset="0.7273" style="stop-color:#1CAD0F"/>
-<stop offset="1" style="stop-color:#007A3A"/>
+ <stop offset="0.3152" style="stop-color:#7AF200"/>
+ <stop offset="0.7273" style="stop-color:#1CAD0F"/>
+ <stop offset="1" style="stop-color:#007A3A"/>
</radialGradient>
<path d="M15.949,27.407c0,0,0,0,0,0.003c0,0.002,0,0.006,0,0.01c0,0.445,0.029,0.886,0.064,1.32 c0.014,0.144,0.033,0.285,0.049,0.43c0.037,0.297,0.084,0.594,0.135,0.886c0.031,0.153,0.059,0.31,0.09,0.464 c0.066,0.301,0.145,0.6,0.229,0.893c0.035,0.121,0.061,0.245,0.096,0.363c0.008,0.012,0.012,0.025,0.014,0.038 c0.012-0.116,0.016-0.234,0.012-0.354c-0.027-0.861-0.164-0.75-0.164-0.75l0.955-1.305v-0.833l-1.119-1.138 C16.309,27.434,15.949,27.376,15.949,27.407z" fill="url(#SVGID_9_)"/>
<radialGradient cx="-11.459" cy="8.5776" gradientTransform="matrix(0.9797 0 0 0.9952 41.476 8.3351)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="16.9575">
-<stop offset="0" style="stop-color:#7AF200"/>
-<stop offset="0.3152" style="stop-color:#7AF200"/>
-<stop offset="0.7273" style="stop-color:#1CAD0F"/>
-<stop offset="1" style="stop-color:#007A3A"/>
+ <stop offset="0.3152" style="stop-color:#7AF200"/>
+ <stop offset="0.7273" style="stop-color:#1CAD0F"/>
+ <stop offset="1" style="stop-color:#007A3A"/>
</radialGradient>
<path d="M24.947,14.498c0.412,0.139,0.75-0.143,1.135-0.395c0.137-0.027,1.648-0.641,1.813-0.641 s0.713-0.021,0.85-0.243c0,0,2.365,0.419,2.723,0.278c0.193-0.076,1.01-0.143,1.709-0.189c-0.037-0.008-0.076-0.02-0.113-0.029 c-0.039-0.008-0.074-0.013-0.113-0.021c-0.439-0.091-0.885-0.161-1.336-0.208c0,0-0.006,0-0.01-0.002 c-0.477-0.048-0.957-0.074-1.447-0.074c-0.453,0-0.902,0.027-1.346,0.07c-0.076,0.008-0.152,0.016-0.232,0.026 c-0.428,0.047-0.854,0.11-1.27,0.195c-0.008,0.003-0.016,0.003-0.021,0.005c-0.432,0.09-0.855,0.203-1.271,0.33 c-0.072,0.023-0.141,0.047-0.209,0.068c-0.371,0.123-0.734,0.258-1.092,0.406c-0.041,0.019-0.084,0.034-0.125,0.051 c-0.393,0.171-0.775,0.359-1.15,0.563c-0.055,0.03-0.109,0.064-0.164,0.096c-0.162,0.09-0.311,0.189-0.467,0.287 C23.58,15.334,24.537,14.357,24.947,14.498z" fill="url(#SVGID_10_)"/>
<radialGradient cx="-11.458" cy="8.5742" gradientTransform="matrix(0.9797 0 0 0.9952 41.476 8.3351)" gradientUnits="userSpaceOnUse" id="SVGID_11_" r="16.9562">
-<stop offset="0" style="stop-color:#B2F56E"/>
-<stop offset="0.3152" style="stop-color:#B2F56E"/>
-<stop offset="0.7273" style="stop-color:#5CBF1B"/>
-<stop offset="1" style="stop-color:#227A00"/>
+ <stop offset="0.3152" style="stop-color:#B2F56E"/>
+ <stop offset="0.7273" style="stop-color:#5CBF1B"/>
+ <stop offset="1" style="stop-color:#227A00"/>
</radialGradient>
<path d="M44.09,24.559c-0.016-0.073-0.037-0.143-0.053-0.214c-0.07-0.356-0.164-0.708-0.266-1.054 c-0.025-0.094-0.051-0.189-0.08-0.282c-0.125-0.394-0.264-0.781-0.416-1.159c-0.029-0.064-0.061-0.131-0.09-0.195 c-0.143-0.334-0.297-0.658-0.463-0.977c-0.037-0.078-0.078-0.156-0.117-0.23c-0.197-0.359-0.406-0.709-0.627-1.051 c-0.041-0.06-0.084-0.114-0.121-0.174c-0.205-0.303-0.42-0.596-0.648-0.881c-0.043-0.055-0.088-0.113-0.135-0.172 c-0.262-0.314-0.533-0.619-0.82-0.914c-0.047-0.051-0.098-0.099-0.15-0.148c-0.26-0.26-0.535-0.512-0.813-0.75 c-0.047-0.041-0.092-0.083-0.141-0.123c-0.316-0.262-0.645-0.512-0.982-0.746c-0.061-0.041-0.119-0.081-0.182-0.12 c-0.311-0.211-0.631-0.411-0.961-0.595c-0.047-0.025-0.088-0.053-0.133-0.077c-0.365-0.198-0.74-0.383-1.123-0.55 c-0.07-0.029-0.139-0.055-0.205-0.086c-0.15-0.063-0.303-0.111-0.455-0.17c-0.182,0.118-1.016,0.598-1.016,0.598 s-3.623-0.503-3.869-0.252c-0.25,0.252-1.213,0.508-1.434,0.537c-0.219,0.029-0.674,0.148-0.129,0.832 c-0.082,0.084-1.643,1.186-1.643,0.686c0-0.502,0.352-1.4-0.139-0.92c-0.35,0.346-0.563,0.813-0.605,0.902 c-0.115,0.223-0.186,0.328-0.104,0.97c0.084,0.642-1.006,0.64-1.08,0.474c-0.197-0.445-1.275,0.998-1.275,0.998l0.455,0.594 c0,0-3.18,2.486-3.205,2.654c-0.029,0.168-0.822,2.328-0.547,2.971c0.273,0.643,0.969,2.262,1.625,2.313 c0.861,0.072,2.951-0.398,2.951-0.398c0.055,0.143,0.451,0.854,0.451,0.854s1.021-0.035,1.08,0.078 c0.018,0.037,1.234,3.668,0.832,4.148c-0.957,1.457,0.547,3.59,0.965,4.313c0.42,1.238,0.688,0.684,1.24,0.889 c0.678,0.057,1.25,0.313,1.826-0.44c0.166-0.14,0.451-0.028,0.451-0.224c0-0.107,0.494-0.428,0.619-0.729 c0.133-0.063,0.475-0.296,0.707-0.409c0.211-0.014-0.201-0.586,0.217-1.192c0.451-0.181,1.666-1.013,1.666-1.013 c0.057-1.223-0.592-2.729,0.617-3.596c0.777-0.806,1.799-1.266,2.295-2.492c0.139-0.361,0.441-1.104-0.438-0.881 c-0.826,0.211-1.75,0.26-1.313-0.109c-0.051-0.456-0.6-0.668-1.092-1.111c-0.254-0.613-0.654-1.704-0.654-1.704l-0.875-1.349 l0.107-0.279l1.041,1.555l1.037,1.275c0.383,1.277,0.711,1.389,0.711,1.389c0.574-0.205,1.939-0.775,1.939-0.775l1.342-1.307 c0,0-0.139-0.418-0.684-0.943l-0.41-0.25c-0.09,0.258-0.566,0.352-0.566,0.352l-1.156-1.406l0.43-0.088l0.332,0.641l0.795,0.279 c0,0,0.219-0.163,0.629,0.267c0.334-0.028,1.635,0.065,1.938,0.456c0.061,0.078,1.611,4.016,1.918,4.021 c0.137,0.001,0.232,0.055,0.189-0.185c-0.055-0.109,0-2.584,0.08-3.115c0.209-0.447,0.242,0,0.734,0.854 C44.094,24.6,44.094,24.579,44.09,24.559z M30.432,15.017c0.105-0.329,0.738-0.44,0.738-0.44s-0.184,0.339-0.141,0.514 c0.041,0.177-0.289,0.286-0.324,0.701c-0.037,0.416-0.789,0.171-0.85,0.025C29.793,15.672,30.318,15.344,30.432,15.017z M33.125,20.603c-0.467,0-1.863,0.141-2.248-0.138c-0.385-0.279-0.686,0.028-0.961,0.309c-0.182,0.18-0.842-0.187-1.035-0.467 c-0.191-0.279-0.838-0.259-0.838-0.259l0.146-0.796l-1.859-0.09l-1.057,0.314l-0.992,0.027l0.557-0.269l0.693-0.167 c0,0,1.008-0.841,1.309-1.092c0.258-0.213,1.277-0.094,1.277-0.094l1.121,0.821c0,0-0.25,0.644-0.359,0.78 c0.412-0.027,0.896-0.785,0.896-0.785c-0.873-0.816-0.84-1.094-0.84-1.094l1.152,0.822l0.01,0.006c0,0,0.467,1.117,0.662,1.117 c0.189,0,0.436-0.769,0.436-0.769l0.326-0.083c0.146,0.352,0.42,1.146,0.748,0.961c0.189-0.105,0.5-0.011,0.855,0.129 c0.359,0.139,0.602-0.074,0.895,0.186C33.982,21.123,33.318,20.66,33.125,20.603z M33.855,18.684 c-0.479-0.188-2.102,0.418-1.74-0.57c0.193-0.535,0.691-0.646,0.863-0.292c0.043,0.147,0.586,0.374,0.582,0.065 s0.543-0.471,0.621-0.242C33.889,17.857,35.322,18.967,33.855,18.684z M36.918,19.621c-0.268-0.219,0.117-0.404-0.275-0.745 c-0.563-0.491-1.002-0.702-0.234-1.097c0.945-0.122,0.152,0.307,0.309,0.563c0.084,0.136,0.563,0.592,0.938,1.152 C37.963,19.959,37.182,19.84,36.918,19.621z" fill="url(#SVGID_11_)"/>
<radialGradient cx="-11.4609" cy="8.5801" gradientTransform="matrix(0.9797 0 0 0.9952 41.476 8.3351)" gradientUnits="userSpaceOnUse" id="SVGID_12_" r="16.9527">
-<stop offset="0" style="stop-color:#7AF200"/>
-<stop offset="0.3152" style="stop-color:#7AF200"/>
-<stop offset="0.7273" style="stop-color:#1CAD0F"/>
-<stop offset="1" style="stop-color:#007A3A"/>
+ <stop offset="0.3152" style="stop-color:#7AF200"/>
+ <stop offset="0.7273" style="stop-color:#1CAD0F"/>
+ <stop offset="1" style="stop-color:#007A3A"/>
</radialGradient>
<path d="M37.297,32.337l-0.91,0.925c0,0-0.549,0-0.576,0.224c-0.012,0.095-0.045,0.508-0.135,0.72 c-0.182,0.129-0.402,0.557-0.402,0.557s-0.113,0.822,0.492,0.682C36.373,35.306,38.232,32.785,37.297,32.337z" fill="url(#SVGID_12_)"/>
<rect fill="none" height="60" width="60"/>
@@ -85,105 +82,165 @@
<rect fill="none" height="30" width="30"/>
<rect fill="none" height="30" width="30"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="654.6" x2="654.6" y1="-558.3" y2="-601.7">
+
<stop offset="0" stop-color="#DFE1E6"/>
+
<stop offset="1" stop-color="#BDBEC3"/>
+
</linearGradient>
<rect fill="url(#SVGID_1__)" height="21.5" width="17.33" x="5.158" y="3.499"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="654.6" x2="654.6" y1="-558.9" y2="-602.2">
+
<stop offset="0" stop-color="#E7E9EF"/>
+
<stop offset="1" stop-color="#C8C9CE"/>
+
</linearGradient>
<path d="M21.99,3.999v20.5h-16.33v-20.5h16.33m0.5-0.501h-17.33v21.5h17.33v-21.5z" fill="url(#SVGID_2__)"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="642.6" x2="642.6" y1="-567.9" y2="-562.2">
+
<stop offset="0" stop-color="#75BCFF"/>
+
<stop offset="1" stop-color="#0070A1"/>
+
</linearGradient>
<rect fill="url(#SVGID_3__)" height="3" width="3" x="6.324" y="5.146"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="650.6" x2="650.6" y1="-567.9" y2="-562.2">
+
<stop offset="0" stop-color="#75BCFF"/>
+
<stop offset="1" stop-color="#0070A1"/>
+
</linearGradient>
<rect fill="url(#SVGID_4__)" height="3" width="3" x="10.32" y="5.146"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="666.6" x2="666.6" y1="-567.9" y2="-562.2">
+
<stop offset="0" stop-color="#75BCFF"/>
+
<stop offset="1" stop-color="#0070A1"/>
+
</linearGradient>
<rect fill="url(#SVGID_5__)" height="3" width="3" x="18.32" y="5.146"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_6__" x1="658.6" x2="658.6" y1="-567.9" y2="-562.2">
+
<stop offset="0" stop-color="#75BCFF"/>
+
<stop offset="1" stop-color="#0070A1"/>
+
</linearGradient>
<rect fill="url(#SVGID_6__)" height="3" width="3" x="14.32" y="5.146"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_7__" x1="642.6" x2="642.6" y1="-576.5" y2="-570.8">
+
<stop offset="0" stop-color="#75BCFF"/>
+
<stop offset="1" stop-color="#0070A1"/>
+
</linearGradient>
<rect fill="url(#SVGID_7__)" height="3" width="3" x="6.324" y="9.458"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_8__" x1="650.6" x2="650.6" y1="-576.5" y2="-570.8">
+
<stop offset="0" stop-color="#75BCFF"/>
+
<stop offset="1" stop-color="#0070A1"/>
+
</linearGradient>
<rect fill="url(#SVGID_8__)" height="3" width="3" x="10.32" y="9.458"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_9__" x1="666.6" x2="666.6" y1="-576.5" y2="-570.8">
+
<stop offset="0" stop-color="#75BCFF"/>
+
<stop offset="1" stop-color="#0070A1"/>
+
</linearGradient>
<rect fill="url(#SVGID_9__)" height="3" width="3" x="18.32" y="9.458"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_10__" x1="658.6" x2="658.6" y1="-576.5" y2="-570.8">
+
<stop offset="0" stop-color="#75BCFF"/>
+
<stop offset="1" stop-color="#0070A1"/>
+
</linearGradient>
<rect fill="url(#SVGID_10__)" height="3" width="3" x="14.32" y="9.458"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_11__" x1="642.6" x2="642.6" y1="-594.5" y2="-588.8">
+
<stop offset="0" stop-color="#75BCFF"/>
+
<stop offset="1" stop-color="#0070A1"/>
+
</linearGradient>
<rect fill="url(#SVGID_11__)" height="3" width="3" x="6.324" y="18.46"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_12__" x1="650.6" x2="650.6" y1="-594.5" y2="-588.8">
+
<stop offset="0" stop-color="#75BCFF"/>
+
<stop offset="1" stop-color="#0070A1"/>
+
</linearGradient>
<rect fill="url(#SVGID_12__)" height="3" width="3" x="10.32" y="18.46"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="666.6" x2="666.6" y1="-594.5" y2="-588.8">
+
<stop offset="0" stop-color="#75BCFF"/>
+
<stop offset="1" stop-color="#0070A1"/>
+
</linearGradient>
<rect fill="url(#SVGID_13_)" height="3" width="3" x="18.32" y="18.46"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="658.6" x2="658.6" y1="-594.5" y2="-588.8">
+
<stop offset="0" stop-color="#75BCFF"/>
+
<stop offset="1" stop-color="#0070A1"/>
+
</linearGradient>
<rect fill="url(#SVGID_14_)" height="3" width="3" x="14.32" y="18.46"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="642.6" x2="642.6" y1="-585.5" y2="-579.8">
+
<stop offset="0" stop-color="#75BCFF"/>
+
<stop offset="1" stop-color="#0070A1"/>
+
</linearGradient>
<rect fill="url(#SVGID_15_)" height="3" width="3" x="6.324" y="13.96"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="650.6" x2="650.6" y1="-585.5" y2="-579.8">
+
<stop offset="0" stop-color="#75BCFF"/>
+
<stop offset="1" stop-color="#0070A1"/>
+
</linearGradient>
<rect fill="url(#SVGID_16_)" height="3" width="3" x="10.32" y="13.96"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="666.6" x2="666.6" y1="-585.5" y2="-579.8">
+
<stop offset="0" stop-color="#75BCFF"/>
+
<stop offset="1" stop-color="#0070A1"/>
+
</linearGradient>
<rect fill="url(#SVGID_17_)" height="3" width="3" x="18.32" y="13.96"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="658.6" x2="658.6" y1="-585.5" y2="-579.8">
+
<stop offset="0" stop-color="#75BCFF"/>
+
<stop offset="1" stop-color="#0070A1"/>
+
</linearGradient>
<rect fill="url(#SVGID_18_)" height="3" width="3" x="14.32" y="13.96"/>
-<polygon fill-opacity="0.3" points="22.49,25,22.49,14.85,12.51,11.92,12.51,25" stroke-opacity="0.3" style="enable-background:new;"/>
+<polygon opacity="0.3" points="22.49,25,22.49,14.85,12.51,11.92,12.51,25" style="enable-background:new;"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="665.4" x2="665.4" y1="-582.2" y2="-604.8">
+
<stop offset="0" stop-color="#CCCCCC"/>
+
<stop offset="1" stop-color="#949494"/>
+
</linearGradient>
<polygon fill="url(#SVGID_19_)" points="24.84,16.25,13.51,12.92,13.51,26.5,24.84,26.5"/>
<linearGradient gradientTransform="matrix(0.5 0 0 -0.5 -313.5 -276)" gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="665.4" x2="665.4" y1="-582" y2="-605.1">
+
<stop offset="0" stop-color="#DBDDE2"/>
+
<stop offset="1" stop-color="#B5B6BA"/>
+
</linearGradient>
<path d="M14.01,13.58l10.33,3.039v9.38h-10.33v-12.42m-0.5-0.665v13.58h11.33v-10.25l-11.33-3.33z" fill="url(#SVGID_20_)"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_usb.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_usb.svg Fri May 14 16:09:54 2010 +0300
@@ -1,29 +1,31 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="60" width="60"/>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="4.2583" y2="55.2583">
-<stop offset="0" style="stop-color:#E8E8E8"/>
-<stop offset="0.3576" style="stop-color:#B2BDC2"/>
-<stop offset="0.7576" style="stop-color:#595C5E"/>
-<stop offset="1" style="stop-color:#A1ABB0"/>
+ <stop offset="0" style="stop-color:#E8E8E8"/>
+ <stop offset="0.3576" style="stop-color:#B2BDC2"/>
+ <stop offset="0.7576" style="stop-color:#595C5E"/>
+ <stop offset="1" style="stop-color:#A1ABB0"/>
</linearGradient>
<path d="M7.9,55.5c-1.875,0-3.4-1.525-3.4-3.4V7.9c0-1.876,1.525-3.4,3.4-3.4H52.1c1.874,0,3.4,1.524,3.4,3.4 V52.1c0,1.875-1.526,3.4-3.4,3.4H7.9z" fill="url(#SVGID_1_)"/>
<path d="M7.9,54.771c-1.473,0-2.672-1.198-2.672-2.672V7.9c0-1.474,1.199-2.672,2.672-2.672H52.1 c1.473,0,2.672,1.198,2.672,2.672V52.1c0,1.474-1.199,2.672-2.672,2.672H7.9z" fill="#FFFFFF" fill-opacity="0.5"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="6.2002" y2="53.7998">
-<stop offset="0" style="stop-color:#D7DDDE"/>
-<stop offset="0.3697" style="stop-color:#FFFFFF"/>
-<stop offset="0.8061" style="stop-color:#AFB5B7"/>
-<stop offset="1" style="stop-color:#E0E4E5"/>
+ <stop offset="0" style="stop-color:#D7DDDE"/>
+ <stop offset="0.3697" style="stop-color:#FFFFFF"/>
+ <stop offset="0.8061" style="stop-color:#AFB5B7"/>
+ <stop offset="1" style="stop-color:#E0E4E5"/>
</linearGradient>
<path d="M7.9,53.8c-0.938,0-1.7-0.764-1.7-1.7V7.9c0-0.938,0.763-1.7,1.7-1.7H52.1 c0.938,0,1.699,0.762,1.699,1.7V52.1c0,0.937-0.762,1.7-1.699,1.7H7.9z" fill="url(#SVGID_2_)"/>
<path d="M42.355,34.462v-2.344H28.438l5.785,8.718h2.457v-1.702h5.697v5.438H36.68v-1.194h-3.084l-8.278-11.259 H19.01c-0.463,1.753-1.877,3.036-3.543,3.036c-2.047,0-3.698-1.896-3.698-4.239c0-2.334,1.651-4.236,3.69-4.236 c1.644,0,3.025,1.217,3.519,2.892h2.839l7.508-10.796l4.557-0.072c0.463-1.075,1.432-1.816,2.535-1.816 c2.379,0,3.333,1.468,3.333,3.271c0,1.807-0.897,3.261-3.333,3.265c-1.232,0-2.279-0.919-2.678-2.183h-2.855L24.95,29.57h17.405 v-2.913l5.875,3.909L42.355,34.462z" fill="#FFFFFF"/>
<linearGradient gradientTransform="matrix(1 0 0 1 -275.8623 -411.166)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="305.8613" x2="305.8613" y1="427.3232" y2="455.0088">
-<stop offset="0" style="stop-color:#797C80"/>
-<stop offset="1" style="stop-color:#3F4243"/>
+ <stop offset="0" style="stop-color:#797C80"/>
+ <stop offset="1" style="stop-color:#3F4243"/>
</linearGradient>
<path d="M42.355,33.734v-2.343H28.438l5.785,8.715h2.457v-1.701h5.697v5.438H36.68v-1.193h-3.084 l-8.278-11.258H19.01c-0.463,1.752-1.877,3.034-3.543,3.034c-2.047,0-3.698-1.896-3.698-4.238c0-2.335,1.651-4.237,3.69-4.237 c1.644,0,3.025,1.217,3.519,2.892h2.839l7.508-10.796l4.557-0.072c0.463-1.075,1.432-1.816,2.535-1.816 c2.379,0,3.333,1.468,3.333,3.271c0,1.807-0.897,3.262-3.333,3.264c-1.232,0-2.279-0.918-2.678-2.183h-2.855l-5.933,8.333h17.405 v-2.913l5.875,3.91L42.355,33.734z" fill="url(#SVGID_3_)"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_usb_memory.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_usb_memory.svg Fri May 14 16:09:54 2010 +0300
@@ -1,63 +1,64 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="30" x2="30" y1="23.2222" y2="0.7603">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="0.1576" style="stop-color:#E6E6E6"/>
-<stop offset="1" style="stop-color:#B3B3B3"/>
+ <stop offset="0" style="stop-color:#F2F2F2"/>
+ <stop offset="0.1576" style="stop-color:#E6E6E6"/>
+ <stop offset="1" style="stop-color:#B3B3B3"/>
</linearGradient>
<rect fill="url(#SVGID_1_)" height="22.462" width="28.305" x="15.848" y="1"/>
<linearGradient gradientTransform="matrix(-1 0 0 -1 -3087.1172 11754.375)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-3117.1167" x2="-3117.1167" y1="11752.4258" y2="11731.4102">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="0.1576" style="stop-color:#E6E6E6"/>
-<stop offset="1" style="stop-color:#B3B3B3"/>
+ <stop offset="0" style="stop-color:#F2F2F2"/>
+ <stop offset="0.1576" style="stop-color:#E6E6E6"/>
+ <stop offset="1" style="stop-color:#B3B3B3"/>
</linearGradient>
<rect fill="url(#SVGID_2_)" height="21.016" width="26.859" x="16.57" y="1.724"/>
<linearGradient gradientTransform="matrix(-1 0 0 -1 -3087.1172 11754.375)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-3117.1177" x2="-3117.1177" y1="11731.7617" y2="11752.7773">
-<stop offset="0" style="stop-color:#E6E6E6"/>
-<stop offset="1" style="stop-color:#FFFFFF"/>
+ <stop offset="0" style="stop-color:#E6E6E6"/>
+ <stop offset="1" style="stop-color:#FFFFFF"/>
</linearGradient>
<path d="M17.227,22.083V2.378h25.547v19.705H17.227 M16.57,22.739H43.43V1.724H16.57V22.739L16.57,22.739z" fill="url(#SVGID_3_)"/>
-<rect fill="#231F20" fill-opacity="0.4" height="0.638" stroke-opacity="0.4" width="26.859" x="16.57" y="21.034"/>
-<rect fill="#231F20" fill-opacity="0.15" height="0.639" stroke-opacity="0.15" width="26.859" x="16.57" y="20.378"/>
+<rect fill="#231F20" height="0.638" opacity="0.4" width="26.859" x="16.57" y="21.034"/>
+<rect fill="#231F20" height="0.639" opacity="0.15" width="26.859" x="16.57" y="20.378"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="30" x2="30" y1="59" y2="22.2708">
-<stop offset="0" style="stop-color:#EBEBEB"/>
-<stop offset="0.7455" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#8B8B8B"/>
+ <stop offset="0" style="stop-color:#EBEBEB"/>
+ <stop offset="0.7455" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#8B8B8B"/>
</linearGradient>
<path d="M29.939,59c-15.299,0-19.092-11.501-19.092-13.139V23.695c0-1.121,0.912-2.034,2.035-2.034h34.232 c1.123,0,2.037,0.913,2.037,2.034v22.166C49.152,47.583,45.57,59,29.939,59L29.939,59z" fill="url(#SVGID_4_)"/>
<linearGradient gradientTransform="matrix(-1 0 0 -1 -3087.1172 11754.375)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-3117.1167" x2="-3117.1167" y1="11731.9902" y2="11696.6816">
-<stop offset="0" style="stop-color:#EBEBEB"/>
-<stop offset="0.7455" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#8B8B8B"/>
+ <stop offset="0" style="stop-color:#EBEBEB"/>
+ <stop offset="0.7455" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#8B8B8B"/>
</linearGradient>
<path d="M11.57,23.695c0-0.722,0.592-1.311,1.313-1.311h34.232c0.725,0,1.314,0.589,1.314,1.311v22.166 c0,2.077-4.049,12.417-18.49,12.417C15.5,58.278,11.57,47.61,11.57,45.861V23.695z" fill="url(#SVGID_5_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="30" x2="30" y1="23.4189" y2="57.8808">
-<stop offset="0" style="stop-color:#8E8E8E"/>
-<stop offset="1" style="stop-color:#0A0A0A"/>
+ <stop offset="0" style="stop-color:#8E8E8E"/>
+ <stop offset="1" style="stop-color:#0A0A0A"/>
</linearGradient>
<path d="M29.939,57.62c-13.973,0-17.713-10.361-17.713-11.759V23.695c0-0.362,0.293-0.655,0.656-0.655h34.232 c0.363,0,0.658,0.293,0.658,0.655v22.166C47.773,47.327,44.23,57.62,29.939,57.62L29.939,57.62z" fill="url(#SVGID_6_)"/>
-<path d="M30.943,40.104c6.248,0,12.32-0.324,18.143-0.928V24.351c0-0.721-0.592-1.311-1.313-1.311 H13.539c-0.723,0-1.313,0.59-1.313,1.311v14.767C18.223,39.759,24.49,40.104,30.943,40.104z" fill="#FFFFFF" fill-opacity="0.15" stroke-opacity="0.15"/>
+<path d="M30.943,40.104c6.248,0,12.32-0.324,18.143-0.928V24.351c0-0.721-0.592-1.311-1.313-1.311 H13.539c-0.723,0-1.313,0.59-1.313,1.311v14.767C18.223,39.759,24.49,40.104,30.943,40.104z" fill="#FFFFFF" opacity="0.15"/>
<rect fill="#FFFFFF" height="5.468" width="5.471" x="33.445" y="12.966"/>
<rect fill="#FFFFFF" height="5.468" width="5.471" x="21.084" y="12.966"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="36.1807" x2="36.1807" y1="17.499" y2="12.0196">
-<stop offset="0" style="stop-color:#8E8E8E"/>
-<stop offset="1" style="stop-color:#0A0A0A"/>
+ <stop offset="0" style="stop-color:#8E8E8E"/>
+ <stop offset="1" style="stop-color:#0A0A0A"/>
</linearGradient>
<rect fill="url(#SVGID_7_)" height="5.469" width="5.471" x="33.445" y="12.002"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="23.8193" x2="23.8193" y1="17.3184" y2="12.0085">
-<stop offset="0" style="stop-color:#8E8E8E"/>
-<stop offset="1" style="stop-color:#0A0A0A"/>
+ <stop offset="0" style="stop-color:#8E8E8E"/>
+ <stop offset="1" style="stop-color:#0A0A0A"/>
</linearGradient>
<rect fill="url(#SVGID_8_)" height="5.469" width="5.471" x="21.084" y="12.002"/>
<linearGradient gradientTransform="matrix(-1 0 0 -1 -3087.1172 11754.375)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="-3117.2319" x2="-3117.2319" y1="11726.4707" y2="11705.0322">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.297" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#D9D9D9"/>
+ <stop offset="0.297" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#D9D9D9"/>
</linearGradient>
<path d="M35.699,34.294c0-0.804-0.652-1.453-1.455-1.453s-1.455,0.649-1.455,1.453 c0,0.676,0.465,1.239,1.09,1.402c-0.195,1.042-1.01,4.4-3.27,4.526V31.67h1.686l-2.359-4.087l-2.359,4.087h1.686v11.897 c-1.912-0.455-2.654-3.352-2.863-4.404c0.6-0.179,1.041-0.729,1.041-1.387c0-0.801-0.65-1.456-1.453-1.456 c-0.805,0-1.455,0.655-1.455,1.456c0,0.639,0.414,1.176,0.988,1.371c0.178,1.027,1.029,4.852,3.742,5.295v1.745 c-0.646,0.267-1.105,0.902-1.105,1.644c0,0.982,0.797,1.777,1.779,1.777s1.777-0.795,1.777-1.777c0-0.741-0.457-1.377-1.104-1.644 v-5.102c3.137-0.122,4.016-4.567,4.156-5.439C35.311,35.438,35.699,34.913,35.699,34.294z" fill="url(#SVGID_9_)"/>
<rect fill="none" height="60" width="60"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,37 @@
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
+<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">
+ <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="M56.506,7.6H3.493C2.666,7.6,2,8.27,2,9.094v41.813C2,51.732,2.666,52.4,3.493,52.4h53.013 C57.33,52.4,58,51.732,58,50.906V9.094C58,8.27,57.33,7.6,56.506,7.6z M8.719,49.413c0,0.412-0.336,0.748-0.745,0.748H4.986 c-0.412,0-0.748-0.336-0.748-0.748V47.92c0-0.41,0.336-0.746,0.748-0.746h2.987c0.409,0,0.745,0.336,0.745,0.746V49.413z M8.719,12.08c0,0.41-0.336,0.746-0.745,0.746H4.986c-0.412,0-0.748-0.336-0.748-0.746v-1.493c0-0.409,0.336-0.748,0.748-0.748 h2.987c0.409,0,0.745,0.339,0.745,0.748V12.08z M15.438,49.413c0,0.412-0.335,0.748-0.745,0.748h-2.987 c-0.412,0-0.747-0.336-0.747-0.748V47.92c0-0.41,0.335-0.746,0.747-0.746h2.987c0.41,0,0.745,0.336,0.745,0.746V49.413z M15.438,12.08c0,0.41-0.335,0.746-0.745,0.746h-2.987c-0.412,0-0.747-0.336-0.747-0.746v-1.493c0-0.409,0.335-0.748,0.747-0.748 h2.987c0.41,0,0.745,0.339,0.745,0.748V12.08z M22.159,49.413c0,0.412-0.337,0.748-0.747,0.748h-2.986 c-0.41,0-0.746-0.336-0.746-0.748V47.92c0-0.41,0.335-0.746,0.746-0.746h2.986c0.41,0,0.747,0.336,0.747,0.746V49.413z M22.159,12.08c0,0.41-0.337,0.746-0.747,0.746h-2.986c-0.41,0-0.746-0.336-0.746-0.746v-1.493c0-0.409,0.335-0.748,0.746-0.748 h2.986c0.41,0,0.747,0.339,0.747,0.748V12.08z M28.88,49.413c0,0.412-0.337,0.748-0.747,0.748h-2.986 c-0.411,0-0.746-0.336-0.746-0.748V47.92c0-0.41,0.335-0.746,0.746-0.746h2.986c0.41,0,0.747,0.336,0.747,0.746V49.413z M28.88,12.08c0,0.41-0.337,0.746-0.747,0.746h-2.986c-0.411,0-0.746-0.336-0.746-0.746v-1.493c0-0.409,0.335-0.748,0.746-0.748 h2.986c0.41,0,0.747,0.339,0.747,0.748V12.08z M35.6,49.413c0,0.412-0.338,0.748-0.747,0.748h-2.985 c-0.412,0-0.748-0.336-0.748-0.748V47.92c0-0.41,0.336-0.746,0.748-0.746h2.985c0.409,0,0.747,0.336,0.747,0.746V49.413z M35.6,12.08c0,0.41-0.338,0.746-0.747,0.746h-2.985c-0.412,0-0.748-0.336-0.748-0.746v-1.493c0-0.409,0.336-0.748,0.748-0.748 h2.985c0.409,0,0.747,0.339,0.747,0.748V12.08z M42.318,49.413c0,0.412-0.335,0.748-0.745,0.748h-2.987 c-0.412,0-0.746-0.336-0.746-0.748V47.92c0-0.41,0.334-0.746,0.746-0.746h2.987c0.41,0,0.745,0.336,0.745,0.746V49.413z M42.318,12.08c0,0.41-0.335,0.746-0.745,0.746h-2.987c-0.412,0-0.746-0.336-0.746-0.746v-1.493c0-0.409,0.334-0.748,0.746-0.748 h2.987c0.41,0,0.745,0.339,0.745,0.748V12.08z M49.039,49.413c0,0.412-0.336,0.748-0.746,0.748h-2.987 c-0.41,0-0.745-0.336-0.745-0.748V47.92c0-0.41,0.335-0.746,0.745-0.746h2.987c0.41,0,0.746,0.336,0.746,0.746V49.413z M49.039,12.08c0,0.41-0.336,0.746-0.746,0.746h-2.987c-0.41,0-0.745-0.336-0.745-0.746v-1.493c0-0.409,0.335-0.748,0.745-0.748 h2.987c0.41,0,0.746,0.339,0.746,0.748V12.08z M55.761,49.413c0,0.412-0.339,0.748-0.748,0.748h-2.987 c-0.41,0-0.745-0.336-0.745-0.748V47.92c0-0.41,0.335-0.746,0.745-0.746h2.987c0.409,0,0.748,0.336,0.748,0.746V49.413z M55.761,12.08c0,0.41-0.339,0.746-0.748,0.746h-2.987c-0.41,0-0.745-0.336-0.745-0.746v-1.493c0-0.409,0.335-0.748,0.745-0.748 h2.987c0.409,0,0.748,0.339,0.748,0.748V12.08z" fill="url(#SVGID_1_)"/>
+<path d="M56.506,7.6H3.493C2.666,7.6,2,8.27,2,9.094v0.745 c0-0.824,0.666-1.493,1.493-1.493h53.013C57.33,8.346,58,9.015,58,9.839V9.094C58,8.27,57.33,7.6,56.506,7.6z" enable-background="new " fill="#FFFFFF" opacity="0.55"/>
+<path d="M3.493,52.4h53.013C57.33,52.4,58,51.732,58,50.906v-0.745 c0,0.824-0.67,1.493-1.494,1.493H3.493C2.666,51.654,2,50.985,2,50.161v0.745C2,51.732,2.666,52.4,3.493,52.4z" enable-background="new " fill="#FFFFFF" opacity="0.1"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2164" x2="-2164" y1="3641.7637" y2="3611.8926">
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="0.5" style="stop-color:#666666"/>
+ <stop offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<rect fill="url(#SVGID_2_)" height="29.871" width="56" x="2" y="15.064"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2164.0005" x2="-2164.0005" y1="3612.0117" y2="3641.8828">
+ <stop offset="0" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
+</linearGradient>
+<path d="M55.761,43.441c0,0.821-0.673,1.494-1.493,1.494H5.732c-0.82,0-1.494-0.673-1.494-1.494V16.559 c0-0.819,0.674-1.494,1.494-1.494h48.535c0.82,0,1.493,0.675,1.493,1.494V43.441z" fill="url(#SVGID_3_)"/>
+<path d="M54.268,43.441H5.732c-0.82,0-1.494,0.074-1.494-0.748l0,0 c0,0.822,0.674,1.493,1.494,1.493h48.535c0.82,0,1.493-0.671,1.493-1.493l0,0C55.761,43.516,55.088,43.441,54.268,43.441z" enable-background="new " fill="#FFFFFF" opacity="0.5"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-2164.0005" x2="-2164.0005" y1="3641.8828" y2="3611.8926">
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#404040"/>
+</linearGradient>
+<path d="M54.268,15.813c0.41,0,0.745,0.336,0.745,0.745v26.883c0,0.412-0.335,0.745-0.745,0.745H5.732 c-0.411,0-0.746-0.333-0.746-0.745V16.559c0-0.409,0.335-0.745,0.746-0.745H54.268 M54.268,15.064H5.732 c-0.82,0-1.494,0.675-1.494,1.494v26.883c0,0.821,0.674,1.494,1.494,1.494h48.535c0.82,0,1.493-0.673,1.493-1.494V16.559 C55.761,15.739,55.088,15.064,54.268,15.064L54.268,15.064z" fill="url(#SVGID_4_)"/>
+<path d="M54.268,24.025v-5.974c0-0.824-0.67-1.493-1.494-1.493H7.226 c-0.824,0-1.493,0.669-1.493,1.493v9.709L54.268,24.025z" enable-background="new " fill="#FFFFFF" opacity="0.2"/>
+<rect fill="none" height="60" width="60"/>
+</g>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_call.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_call.svg Fri May 14 16:09:54 2010 +0300
@@ -1,130 +1,188 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<stop offset="0" style="stop-color:#3AC5EA"/>
-<stop offset="0.297" style="stop-color:#3AC5EA"/>
-<stop offset="0.6667" style="stop-color:#1754C9"/>
-<stop offset="0.7939" style="stop-color:#33ADE1"/>
-<stop offset="1" style="stop-color:#33ADE1"/>
+ <stop offset="0.297" style="stop-color:#3AC5EA"/>
+ <stop offset="0.6667" style="stop-color:#1754C9"/>
+ <stop offset="0.7939" style="stop-color:#33ADE1"/>
</radialGradient>
<path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333c-0.617-0.665-2.567-3.083-2.968-3.735 c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956c6.191-6.192,9.085-7.646,9.956-8.107 c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967c0.534,0.492,0.872,0.588,1.299,0.274 c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778c-2.476-2.889-8.594-5.015-10.751-5.399 c-1.923-0.345-3.876-0.872-6.567,0.235c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352 c-1.108,2.691-0.581,4.645-0.236,6.567c0.386,2.158,2.51,8.275,5.399,10.752c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2070.7568" x2="-2070.3252" y1="-2266.8511" y2="-2263.2749">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+ <stop offset="0" style="stop-color:#2685D2"/>
+ <stop offset="1" style="stop-color:#081D45"/>
</linearGradient>
<path d="M35.172,17.108c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967 c0.534,0.492,0.872,0.588,1.299,0.274c0.048-0.035,0.062-0.046,0.064-0.046c0.253-0.184,1.032-0.738,2.12-1.514 c-0.251-0.204-3.468-2.809-4.8-2.956C36.857,15.598,35.172,17.108,35.172,17.108z" fill="url(#SVGID_2_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -2128.2356 5114.0977)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2070.7607" x2="-2070.3289" y1="5104.5752" y2="5108.1523">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+ <stop offset="0" style="stop-color:#2685D2"/>
+ <stop offset="1" style="stop-color:#081D45"/>
</linearGradient>
<path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.713c0.376,0.666,2.351,3.069,2.967,3.738 c0.493,0.531,0.587,0.869,0.274,1.298c-0.035,0.047-0.046,0.062-0.046,0.062c-0.183,0.253-0.738,1.032-1.515,2.119 c-0.204-0.252-2.807-3.467-2.956-4.799C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="47.9224" x2="3.9991" y1="3.9307" y2="47.854">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+ <stop offset="0" style="stop-color:#ABEEFF"/>
+ <stop offset="1" style="stop-color:#539FDE"/>
</linearGradient>
-<path d="M2.979,47.467c-0.344-1.925-0.873-3.878,0.235-6.567 c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.341,4.269,40.9,3.215c2.691-1.108,4.644-0.581,6.567-0.236 c1.981,0.354,7.296,2.178,10.069,4.711c-2.552-2.815-8.496-4.879-10.617-5.258c-1.923-0.345-3.876-0.872-6.567,0.235 c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567 c0.378,2.122,2.441,8.065,5.258,10.617C5.156,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M2.979,47.467c-0.344-1.925-0.873-3.878,0.235-6.567 c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.341,4.269,40.9,3.215c2.691-1.108,4.644-0.581,6.567-0.236 c1.981,0.354,7.296,2.178,10.069,4.711c-2.552-2.815-8.496-4.879-10.617-5.258c-1.923-0.345-3.876-0.872-6.567,0.235 c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567 c0.378,2.122,2.441,8.065,5.258,10.617C5.156,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="54.3535" x2="3.9474" y1="3.2017" y2="53.6078">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+ <stop offset="0" style="stop-color:#ABEEFF"/>
+ <stop offset="1" style="stop-color:#539FDE"/>
</linearGradient>
-<path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333 c-0.617-0.665-2.567-3.083-2.968-3.735c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956 c6.191-6.192,9.085-7.646,9.956-8.107c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967 c0.534,0.492,0.872,0.588,1.299,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778 c-0.292-0.339-0.634-0.665-1.013-0.982c0.49,0.657,0.198,1.134-0.607,1.666C54.65,9.447,41.576,18.739,40.825,19.29 c-0.431,0.314-0.767,0.219-1.3-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.948-0.436-1.71-0.034 c-0.871,0.46-3.764,1.914-9.956,8.106c-6.193,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.319,1.135,0.035,1.711 c0.4,0.651,2.351,3.069,2.967,3.736c0.493,0.533,0.559,0.896,0.259,1.332c-0.517,0.755-9.828,13.794-10.76,15.195 c-0.533,0.803-1.008,1.098-1.665,0.606c0.314,0.378,0.644,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_5_)" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333 c-0.617-0.665-2.567-3.083-2.968-3.735c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956 c6.191-6.192,9.085-7.646,9.956-8.107c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967 c0.534,0.492,0.872,0.588,1.299,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778 c-0.292-0.339-0.634-0.665-1.013-0.982c0.49,0.657,0.198,1.134-0.607,1.666C54.65,9.447,41.576,18.739,40.825,19.29 c-0.431,0.314-0.767,0.219-1.3-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.948-0.436-1.71-0.034 c-0.871,0.46-3.764,1.914-9.956,8.106c-6.193,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.319,1.135,0.035,1.711 c0.4,0.651,2.351,3.069,2.967,3.736c0.493,0.533,0.559,0.896,0.259,1.332c-0.517,0.755-9.828,13.794-10.76,15.195 c-0.533,0.803-1.008,1.098-1.665,0.606c0.314,0.378,0.644,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_5_)" opacity="0.6"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -141.776 3075.0667)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-2041.9355" x2="-2041.9355" y1="-2305.2153" y2="-2243.2966">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="0.5091" style="stop-color:#081D45"/>
-<stop offset="1" style="stop-color:#2275BD"/>
+ <stop offset="0" style="stop-color:#2685D2"/>
+ <stop offset="0.5091" style="stop-color:#081D45"/>
+ <stop offset="1" style="stop-color:#2275BD"/>
</linearGradient>
<path d="M2.899,45.012c1.275-2.777,10.299-14.804,18.804-23.31c8.505-8.506,20.532-17.529,23.308-18.803 c0.527-0.241,1.02-0.411,1.493-0.545c-0.511-0.096-1.03-0.19-1.565-0.26c-0.086,0.036-0.163,0.063-0.25,0.102 c-2.818,1.293-14.971,10.397-23.533,18.959C12.595,29.717,3.489,41.869,2.195,44.688c-0.038,0.087-0.063,0.166-0.101,0.25 c0.07,0.535,0.166,1.055,0.259,1.565C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_6_)"/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="12.38" x2="17.62" y1="23.65" y2="23.65">
+
<stop offset="0" stop-color="#878A8C"/>
+
<stop offset="0.2606" stop-color="#BDC2C4"/>
+
<stop offset="0.6606" stop-color="#5B6163"/>
+
<stop offset="1" stop-color="#959A9C"/>
+
</linearGradient>
<rect fill="url(#SVGID_1__)" height="7.853" width="5.105" x="12.45" y="19.72"/>
<path d="M12.45,24.66c0.82,0.199,1.673,0.315,2.553,0.315,0.881,0,1.732-0.116,2.553-0.315v-4.294h-5.105v4.285z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
<path d="M12.45,24.02c0.82,0.199,1.673,0.315,2.553,0.315,0.881,0,1.732-0.116,2.553-0.315v-4.294h-5.105v4.288z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="15" x2="15" y1="1.975" y2="23.67">
+
<stop offset="0" stop-color="#F2F2F2"/>
+
<stop offset="0.3212" stop-color="#E6E6E6"/>
+
<stop offset="1" stop-color="#666666"/>
+
</linearGradient>
<path d="M15,23.7c-5.98,0-10.85-4.867-10.85-10.85s4.87-10.85,10.85-10.85c5.982,0,10.85,4.866,10.85,10.85s-4.87,10.85-10.85,10.85z" fill="url(#SVGID_2__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="15" x2="15" y1="2.614" y2="23.03">
+
<stop offset="0" stop-color="#D1D7D9"/>
+
<stop offset="0.0667" stop-color="#D1D7D9"/>
+
<stop offset="0.2606" stop-color="#BDC2C4"/>
+
<stop offset="0.6606" stop-color="#7C8487"/>
+
<stop offset="1" stop-color="#ADB3B5"/>
+
</linearGradient>
<circle cx="15" cy="12.85" fill="url(#SVGID_3__)" r="10.21"/>
<path d="M15,21.99c-5.315,0-9.657-4.23-9.843-9.5-0.004,0.116-0.009,0.231-0.009,0.349,0,5.431,4.419,9.851,9.852,9.851s9.852-4.42,9.852-9.851c0-0.117-0.005-0.232-0.009-0.349-0.18,5.27-4.52,9.5-9.84,9.5z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
<path d="M23.3,12.41c0,4.704-3.715,9.346-8.299,9.345-4.58-0.003-8.292-4.646-8.291-9.35,0.002-4.706,3.718-8.517,8.298-8.517,4.57,0.001,8.29,3.814,8.29,8.517z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
<path d="M15,21.07c-2.387-0.002-4.63-0.932-6.315-2.619-1.688-1.688-2.615-3.932-2.614-6.318,0-4.923,4.009-8.929,8.935-8.929,2.387,0,4.632,0.931,6.317,2.618,1.688,1.688,2.616,3.933,2.615,6.318-0.002,4.924-4.01,8.93-8.934,8.93h-0.014z" fill="#231F20" fill-opacity="0.2" stroke-opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="15" x2="15" y1="3.721" y2="20.35">
+
<stop offset="0" stop-color="#CFCFCF"/>
+
<stop offset="0.1091" stop-color="#CFCFCF"/>
+
<stop offset="0.6848" stop-color="#121212"/>
+
<stop offset="1" stop-color="#A6A6A6"/>
+
</linearGradient>
<path d="M15,20.43c-2.216-0.002-4.298-0.864-5.864-2.432-1.567-1.566-2.428-3.65-2.427-5.866,0-4.573,3.723-8.293,8.296-8.293,2.218,0.001,4.3,0.864,5.866,2.432s2.43,3.651,2.428,5.867c-0.001,4.573-3.723,8.292-8.295,8.292h-0.004z" fill="url(#SVGID_4__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="15" x2="15" y1="4.368" y2="19.72">
+
<stop offset="0" stop-color="#F2F2F2"/>
+
<stop offset="1" stop-color="#606769"/>
+
</linearGradient>
<circle cx="15" cy="12.13" fill="url(#SVGID_5__)" r="7.657"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6__" x1="15" x2="15" y1="5.772" y2="18.45">
+
<stop offset="0" stop-color="#1A1A1A"/>
+
<stop offset="0.503" stop-color="#343434"/>
+
<stop offset="0.7515" stop-color="#9E9E9E"/>
+
<stop offset="1" stop-color="#CFCFCF"/>
+
</linearGradient>
<path d="M15,18.51c-1.706-0.001-3.309-0.666-4.514-1.871-1.204-1.206-1.867-2.808-1.867-4.512,0-3.517,2.862-6.378,6.382-6.378,1.706,0,3.308,0.664,4.513,1.871,1.205,1.205,1.868,2.808,1.867,4.513,0,3.51-2.86,6.37-6.38,6.37z" fill="url(#SVGID_6__)"/>
<radialGradient cx="25.77" cy="10.27" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="6.499">
+
<stop offset="0" stop-color="#000000"/>
+
<stop offset="0.5917" stop-color="#000000"/>
+
<stop offset="0.627" stop-color="#050505"/>
+
<stop offset="0.7652" stop-color="#121212"/>
+
<stop offset="0.8876" stop-color="#171717"/>
+
<stop offset="1" stop-color="#171717"/>
+
</radialGradient>
<path d="M20.74,12.14c0,3.172-2.574,5.74-5.744,5.74-3.175-0.001-5.743-2.573-5.741-5.745,0-3.171,2.573-5.742,5.745-5.74,3.17-0.009,5.74,2.562,5.74,5.74z" fill="url(#SVGID_7_)"/>
<radialGradient cx="21.65" cy="5.066" gradientTransform="matrix(1.0143 0 0 1.0141 -9.5579 3.1299)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="10.35">
+
<stop offset="0" stop-color="#242424"/>
+
<stop offset="0.4303" stop-color="#242424"/>
+
<stop offset="0.7818" stop-color="#000000"/>
+
<stop offset="1" stop-color="#000000"/>
+
</radialGradient>
<circle cx="15" cy="12.13" fill="url(#SVGID_8_)" r="4.712"/>
<radialGradient cx="23.96" cy="3.55" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="11.36">
+
<stop offset="0" stop-color="#A700F5"/>
+
<stop offset="0.3091" stop-color="#A700F5"/>
+
<stop offset="0.4364" stop-color="#5E008A"/>
+
<stop offset="0.8061" stop-color="#0E1402"/>
+
<stop offset="1" stop-color="#0E1402"/>
+
</radialGradient>
<path d="M19.21,12.13c0,2.326-1.886,4.21-4.212,4.21-2.326-0.002-4.213-1.888-4.213-4.212,0.004-2.327,1.89-4.21,4.213-4.21,2.33,0.003,4.21,1.888,4.21,4.21z" fill="url(#SVGID_9_)"/>
<radialGradient cx="25.17" cy="13.25" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="4.611">
+
<stop offset="0" stop-color="#48630C"/>
+
<stop offset="0.7879" stop-color="#000000"/>
+
<stop offset="1" stop-color="#000000"/>
+
</radialGradient>
<path d="M19.21,12.13c0,2.326-1.886,4.21-4.212,4.21-2.326-0.002-4.213-1.888-4.213-4.212,0,0,1.444,2.569,4.213,2.569,2.77,0,4.21-2.57,4.21-2.57z" fill="url(#SVGID_10_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="14.98" x2="14.98" y1="7.065" y2="12.09">
+
<stop offset="0" stop-color="#F8FBFF"/>
+
<stop offset="1" stop-color="#808080"/>
+
</linearGradient>
<path d="M14.98,12.07c1.828,0,3.549-0.277,5.067-0.765-0.431-2.41-2.532-4.239-5.067-4.239-2.532,0-4.632,1.83-5.065,4.239,1.515,0.49,3.235,0.77,5.065,0.77z" fill="url(#SVGID_11_)" fill-opacity="0.35" stroke-opacity="0.35"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="5.762" x2="24.29" y1="26.72" y2="26.72">
+
<stop offset="0" stop-color="#878A8C"/>
+
<stop offset="0.2606" stop-color="#BDC2C4"/>
+
<stop offset="0.6606" stop-color="#5B6163"/>
+
<stop offset="1" stop-color="#959A9C"/>
+
</linearGradient>
<path d="M24.24,28c0.025-0.635,0.04-0.508,0.04-0.639v-0.035c0-1.037-0.852-1.879-1.901-1.879h-14.72c-1.05,0-1.9,0.842-1.9,1.879v0.035c0,0.131,0.014,0.004,0.04,0.639h18.44z" fill="url(#SVGID_12_)"/>
<path d="M5.879,26.7h18.29c-0.084-0.234-0.212-0.444-0.377-0.626h-17.53c-0.164,0.19-0.293,0.4-0.377,0.63z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
@@ -132,4 +190,4 @@
<path d="M6.255,26.07h17.54c-0.348-0.383-0.846-0.627-1.407-0.627h-14.72c-0.56,0.01-1.059,0.25-1.407,0.63z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_call_active.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_call_active.svg Fri May 14 16:09:54 2010 +0300
@@ -1,121 +1,179 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
-<stop offset="0.297" style="stop-color:#A7E722"/>
-<stop offset="0.6667" style="stop-color:#428C0F"/>
-<stop offset="0.7939" style="stop-color:#5CA617"/>
-<stop offset="1" style="stop-color:#5CA617"/>
+ <stop offset="0.297" style="stop-color:#A7E722"/>
+ <stop offset="0.6667" style="stop-color:#428C0F"/>
+ <stop offset="0.7939" style="stop-color:#5CA617"/>
</radialGradient>
<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737 c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108 c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274 c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-2.477-2.889-8.594-5.015-10.752-5.399 c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571C11.203,27.277,3.722,37.795,2.668,40.352 c-1.108,2.691-0.581,4.645-0.236,6.567c0.387,2.158,2.511,8.275,5.4,10.752c0.718,0.616,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-1639.3428" x2="-1638.9111" y1="-2494.9824" y2="-2491.4067">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+ <stop offset="0" style="stop-color:#559D13"/>
+ <stop offset="1" style="stop-color:#284F09"/>
</linearGradient>
<path d="M35.172,17.107c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967 c0.535,0.492,0.873,0.588,1.301,0.274c0.047-0.034,0.063-0.046,0.064-0.046c0.252-0.184,1.031-0.739,2.119-1.514 c-0.252-0.205-3.469-2.809-4.801-2.956C36.855,15.598,35.172,17.107,35.172,17.107z" fill="url(#SVGID_2_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -1696.8304 4072.5859)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1639.3467" x2="-1638.9149" y1="4063.0557" y2="4066.6318">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+ <stop offset="0" style="stop-color:#559D13"/>
+ <stop offset="1" style="stop-color:#284F09"/>
</linearGradient>
<path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.714c0.376,0.665,2.351,3.067,2.967,3.737 c0.492,0.53,0.587,0.869,0.274,1.297c-0.035,0.049-0.046,0.063-0.046,0.063c-0.183,0.253-0.738,1.032-1.515,2.12 c-0.203-0.252-2.807-3.469-2.956-4.8C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
-<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112 C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711 c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571 C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617 C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B5DC77" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737 c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108 c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274 c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982 c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273 c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107 c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736 c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606 c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B5DC77" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112 C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711 c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571 C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617 C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B5DC77" opacity="0.5"/>
+<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737 c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108 c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274 c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982 c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273 c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107 c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736 c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606 c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B5DC77" opacity="0.6"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -608.1406 2931.3247)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-1610.522" x2="-1610.522" y1="-2533.3467" y2="-2471.428">
-<stop offset="0" style="stop-color:#447F0F"/>
-<stop offset="0.5" style="stop-color:#284F09"/>
-<stop offset="1" style="stop-color:#40790E"/>
+ <stop offset="0" style="stop-color:#447F0F"/>
+ <stop offset="0.5" style="stop-color:#284F09"/>
+ <stop offset="1" style="stop-color:#40790E"/>
</linearGradient>
-<path d="M2.899,45.012c1.275-2.776,10.299-14.805,18.804-23.31 c8.505-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26 c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.534,18.958c-8.562,8.562-17.667,20.715-18.96,23.535 c-0.038,0.086-0.063,0.165-0.101,0.25c0.071,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_4_)" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M2.899,45.012c1.275-2.776,10.299-14.805,18.804-23.31 c8.505-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26 c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.534,18.958c-8.562,8.562-17.667,20.715-18.96,23.535 c-0.038,0.086-0.063,0.165-0.101,0.25c0.071,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_4_)" opacity="0.5"/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="12.38" x2="17.62" y1="23.65" y2="23.65">
+
<stop offset="0" stop-color="#878A8C"/>
+
<stop offset="0.2606" stop-color="#BDC2C4"/>
+
<stop offset="0.6606" stop-color="#5B6163"/>
+
<stop offset="1" stop-color="#959A9C"/>
+
</linearGradient>
<rect fill="url(#SVGID_1__)" height="7.853" width="5.105" x="12.45" y="19.72"/>
<path d="M12.45,24.66c0.82,0.199,1.673,0.315,2.553,0.315,0.881,0,1.732-0.116,2.553-0.315v-4.294h-5.105v4.285z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
<path d="M12.45,24.02c0.82,0.199,1.673,0.315,2.553,0.315,0.881,0,1.732-0.116,2.553-0.315v-4.294h-5.105v4.288z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="15" x2="15" y1="1.975" y2="23.67">
+
<stop offset="0" stop-color="#F2F2F2"/>
+
<stop offset="0.3212" stop-color="#E6E6E6"/>
+
<stop offset="1" stop-color="#666666"/>
+
</linearGradient>
<path d="M15,23.7c-5.98,0-10.85-4.867-10.85-10.85s4.87-10.85,10.85-10.85c5.982,0,10.85,4.866,10.85,10.85s-4.87,10.85-10.85,10.85z" fill="url(#SVGID_2__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="15" x2="15" y1="2.614" y2="23.03">
+
<stop offset="0" stop-color="#D1D7D9"/>
+
<stop offset="0.0667" stop-color="#D1D7D9"/>
+
<stop offset="0.2606" stop-color="#BDC2C4"/>
+
<stop offset="0.6606" stop-color="#7C8487"/>
+
<stop offset="1" stop-color="#ADB3B5"/>
+
</linearGradient>
<circle cx="15" cy="12.85" fill="url(#SVGID_3__)" r="10.21"/>
<path d="M15,21.99c-5.315,0-9.657-4.23-9.843-9.5-0.004,0.116-0.009,0.231-0.009,0.349,0,5.431,4.419,9.851,9.852,9.851s9.852-4.42,9.852-9.851c0-0.117-0.005-0.232-0.009-0.349-0.18,5.27-4.52,9.5-9.84,9.5z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
<path d="M23.3,12.41c0,4.704-3.715,9.346-8.299,9.345-4.58-0.003-8.292-4.646-8.291-9.35,0.002-4.706,3.718-8.517,8.298-8.517,4.57,0.001,8.29,3.814,8.29,8.517z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
<path d="M15,21.07c-2.387-0.002-4.63-0.932-6.315-2.619-1.688-1.688-2.615-3.932-2.614-6.318,0-4.923,4.009-8.929,8.935-8.929,2.387,0,4.632,0.931,6.317,2.618,1.688,1.688,2.616,3.933,2.615,6.318-0.002,4.924-4.01,8.93-8.934,8.93h-0.014z" fill="#231F20" fill-opacity="0.2" stroke-opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="15" x2="15" y1="3.721" y2="20.35">
+
<stop offset="0" stop-color="#CFCFCF"/>
+
<stop offset="0.1091" stop-color="#CFCFCF"/>
+
<stop offset="0.6848" stop-color="#121212"/>
+
<stop offset="1" stop-color="#A6A6A6"/>
+
</linearGradient>
<path d="M15,20.43c-2.216-0.002-4.298-0.864-5.864-2.432-1.567-1.566-2.428-3.65-2.427-5.866,0-4.573,3.723-8.293,8.296-8.293,2.218,0.001,4.3,0.864,5.866,2.432s2.43,3.651,2.428,5.867c-0.001,4.573-3.723,8.292-8.295,8.292h-0.004z" fill="url(#SVGID_4__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="15" x2="15" y1="4.368" y2="19.72">
+
<stop offset="0" stop-color="#F2F2F2"/>
+
<stop offset="1" stop-color="#606769"/>
+
</linearGradient>
<circle cx="15" cy="12.13" fill="url(#SVGID_5_)" r="7.657"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="15" x2="15" y1="5.772" y2="18.45">
+
<stop offset="0" stop-color="#1A1A1A"/>
+
<stop offset="0.503" stop-color="#343434"/>
+
<stop offset="0.7515" stop-color="#9E9E9E"/>
+
<stop offset="1" stop-color="#CFCFCF"/>
+
</linearGradient>
<path d="M15,18.51c-1.706-0.001-3.309-0.666-4.514-1.871-1.204-1.206-1.867-2.808-1.867-4.512,0-3.517,2.862-6.378,6.382-6.378,1.706,0,3.308,0.664,4.513,1.871,1.205,1.205,1.868,2.808,1.867,4.513,0,3.51-2.86,6.37-6.38,6.37z" fill="url(#SVGID_6_)"/>
<radialGradient cx="25.77" cy="10.27" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="6.499">
+
<stop offset="0" stop-color="#000000"/>
+
<stop offset="0.5917" stop-color="#000000"/>
+
<stop offset="0.627" stop-color="#050505"/>
+
<stop offset="0.7652" stop-color="#121212"/>
+
<stop offset="0.8876" stop-color="#171717"/>
+
<stop offset="1" stop-color="#171717"/>
+
</radialGradient>
<path d="M20.74,12.14c0,3.172-2.574,5.74-5.744,5.74-3.175-0.001-5.743-2.573-5.741-5.745,0-3.171,2.573-5.742,5.745-5.74,3.17-0.009,5.74,2.562,5.74,5.74z" fill="url(#SVGID_7_)"/>
<radialGradient cx="21.65" cy="5.066" gradientTransform="matrix(1.0143 0 0 1.0141 -9.5579 3.1299)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="10.35">
+
<stop offset="0" stop-color="#242424"/>
+
<stop offset="0.4303" stop-color="#242424"/>
+
<stop offset="0.7818" stop-color="#000000"/>
+
<stop offset="1" stop-color="#000000"/>
+
</radialGradient>
<circle cx="15" cy="12.13" fill="url(#SVGID_8_)" r="4.712"/>
<radialGradient cx="23.96" cy="3.55" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="11.36">
+
<stop offset="0" stop-color="#A700F5"/>
+
<stop offset="0.3091" stop-color="#A700F5"/>
+
<stop offset="0.4364" stop-color="#5E008A"/>
+
<stop offset="0.8061" stop-color="#0E1402"/>
+
<stop offset="1" stop-color="#0E1402"/>
+
</radialGradient>
<path d="M19.21,12.13c0,2.326-1.886,4.21-4.212,4.21-2.326-0.002-4.213-1.888-4.213-4.212,0.004-2.327,1.89-4.21,4.213-4.21,2.33,0.003,4.21,1.888,4.21,4.21z" fill="url(#SVGID_9_)"/>
<radialGradient cx="25.17" cy="13.25" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="4.611">
+
<stop offset="0" stop-color="#48630C"/>
+
<stop offset="0.7879" stop-color="#000000"/>
+
<stop offset="1" stop-color="#000000"/>
+
</radialGradient>
<path d="M19.21,12.13c0,2.326-1.886,4.21-4.212,4.21-2.326-0.002-4.213-1.888-4.213-4.212,0,0,1.444,2.569,4.213,2.569,2.77,0,4.21-2.57,4.21-2.57z" fill="url(#SVGID_10_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="14.98" x2="14.98" y1="7.065" y2="12.09">
+
<stop offset="0" stop-color="#F8FBFF"/>
+
<stop offset="1" stop-color="#808080"/>
+
</linearGradient>
<path d="M14.98,12.07c1.828,0,3.549-0.277,5.067-0.765-0.431-2.41-2.532-4.239-5.067-4.239-2.532,0-4.632,1.83-5.065,4.239,1.515,0.49,3.235,0.77,5.065,0.77z" fill="url(#SVGID_11_)" fill-opacity="0.35" stroke-opacity="0.35"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="5.762" x2="24.29" y1="26.72" y2="26.72">
+
<stop offset="0" stop-color="#878A8C"/>
+
<stop offset="0.2606" stop-color="#BDC2C4"/>
+
<stop offset="0.6606" stop-color="#5B6163"/>
+
<stop offset="1" stop-color="#959A9C"/>
+
</linearGradient>
<path d="M24.24,28c0.025-0.635,0.04-0.508,0.04-0.639v-0.035c0-1.037-0.852-1.879-1.901-1.879h-14.72c-1.05,0-1.9,0.842-1.9,1.879v0.035c0,0.131,0.014,0.004,0.04,0.639h18.44z" fill="url(#SVGID_12_)"/>
<path d="M5.879,26.7h18.29c-0.084-0.234-0.212-0.444-0.377-0.626h-17.53c-0.164,0.19-0.293,0.4-0.377,0.63z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
@@ -123,4 +181,4 @@
<path d="M6.255,26.07h17.54c-0.348-0.383-0.846-0.627-1.407-0.627h-14.72c-0.56,0.01-1.059,0.25-1.407,0.63z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_call_end.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_call_end.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
@@ -42,90 +42,148 @@
</g>
<g transform="matrix(1 0 0 1 30 30)">
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="12.38" x2="17.62" y1="23.65" y2="23.65">
+
<stop offset="0" stop-color="#878A8C"/>
+
<stop offset="0.2606" stop-color="#BDC2C4"/>
+
<stop offset="0.6606" stop-color="#5B6163"/>
+
<stop offset="1" stop-color="#959A9C"/>
+
</linearGradient>
<rect fill="url(#SVGID_1__)" height="7.853" width="5.105" x="12.45" y="19.72"/>
<path d="M12.45,24.66c0.82,0.199,1.673,0.315,2.553,0.315,0.881,0,1.732-0.116,2.553-0.315v-4.294h-5.105v4.285z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
<path d="M12.45,24.02c0.82,0.199,1.673,0.315,2.553,0.315,0.881,0,1.732-0.116,2.553-0.315v-4.294h-5.105v4.288z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="15" x2="15" y1="1.975" y2="23.67">
+
<stop offset="0" stop-color="#F2F2F2"/>
+
<stop offset="0.3212" stop-color="#E6E6E6"/>
+
<stop offset="1" stop-color="#666666"/>
+
</linearGradient>
<path d="M15,23.7c-5.98,0-10.85-4.867-10.85-10.85s4.87-10.85,10.85-10.85c5.982,0,10.85,4.866,10.85,10.85s-4.87,10.85-10.85,10.85z" fill="url(#SVGID_2__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="15" x2="15" y1="2.614" y2="23.03">
+
<stop offset="0" stop-color="#D1D7D9"/>
+
<stop offset="0.0667" stop-color="#D1D7D9"/>
+
<stop offset="0.2606" stop-color="#BDC2C4"/>
+
<stop offset="0.6606" stop-color="#7C8487"/>
+
<stop offset="1" stop-color="#ADB3B5"/>
+
</linearGradient>
<circle cx="15" cy="12.85" fill="url(#SVGID_3__)" r="10.21"/>
<path d="M15,21.99c-5.315,0-9.657-4.23-9.843-9.5-0.004,0.116-0.009,0.231-0.009,0.349,0,5.431,4.419,9.851,9.852,9.851s9.852-4.42,9.852-9.851c0-0.117-0.005-0.232-0.009-0.349-0.18,5.27-4.52,9.5-9.84,9.5z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
<path d="M23.3,12.41c0,4.704-3.715,9.346-8.299,9.345-4.58-0.003-8.292-4.646-8.291-9.35,0.002-4.706,3.718-8.517,8.298-8.517,4.57,0.001,8.29,3.814,8.29,8.517z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
<path d="M15,21.07c-2.387-0.002-4.63-0.932-6.315-2.619-1.688-1.688-2.615-3.932-2.614-6.318,0-4.923,4.009-8.929,8.935-8.929,2.387,0,4.632,0.931,6.317,2.618,1.688,1.688,2.616,3.933,2.615,6.318-0.002,4.924-4.01,8.93-8.934,8.93h-0.014z" fill="#231F20" fill-opacity="0.2" stroke-opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="15" x2="15" y1="3.721" y2="20.35">
+
<stop offset="0" stop-color="#CFCFCF"/>
+
<stop offset="0.1091" stop-color="#CFCFCF"/>
+
<stop offset="0.6848" stop-color="#121212"/>
+
<stop offset="1" stop-color="#A6A6A6"/>
+
</linearGradient>
<path d="M15,20.43c-2.216-0.002-4.298-0.864-5.864-2.432-1.567-1.566-2.428-3.65-2.427-5.866,0-4.573,3.723-8.293,8.296-8.293,2.218,0.001,4.3,0.864,5.866,2.432s2.43,3.651,2.428,5.867c-0.001,4.573-3.723,8.292-8.295,8.292h-0.004z" fill="url(#SVGID_4__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="15" x2="15" y1="4.368" y2="19.72">
+
<stop offset="0" stop-color="#F2F2F2"/>
+
<stop offset="1" stop-color="#606769"/>
+
</linearGradient>
<circle cx="15" cy="12.13" fill="url(#SVGID_5__)" r="7.657"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6__" x1="15" x2="15" y1="5.772" y2="18.45">
+
<stop offset="0" stop-color="#1A1A1A"/>
+
<stop offset="0.503" stop-color="#343434"/>
+
<stop offset="0.7515" stop-color="#9E9E9E"/>
+
<stop offset="1" stop-color="#CFCFCF"/>
+
</linearGradient>
<path d="M15,18.51c-1.706-0.001-3.309-0.666-4.514-1.871-1.204-1.206-1.867-2.808-1.867-4.512,0-3.517,2.862-6.378,6.382-6.378,1.706,0,3.308,0.664,4.513,1.871,1.205,1.205,1.868,2.808,1.867,4.513,0,3.51-2.86,6.37-6.38,6.37z" fill="url(#SVGID_6__)"/>
<radialGradient cx="25.77" cy="10.27" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="6.499">
+
<stop offset="0" stop-color="#000000"/>
+
<stop offset="0.5917" stop-color="#000000"/>
+
<stop offset="0.627" stop-color="#050505"/>
+
<stop offset="0.7652" stop-color="#121212"/>
+
<stop offset="0.8876" stop-color="#171717"/>
+
<stop offset="1" stop-color="#171717"/>
+
</radialGradient>
<path d="M20.74,12.14c0,3.172-2.574,5.74-5.744,5.74-3.175-0.001-5.743-2.573-5.741-5.745,0-3.171,2.573-5.742,5.745-5.74,3.17-0.009,5.74,2.562,5.74,5.74z" fill="url(#SVGID_7_)"/>
<radialGradient cx="21.65" cy="5.066" gradientTransform="matrix(1.0143 0 0 1.0141 -9.5579 3.1299)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="10.35">
+
<stop offset="0" stop-color="#242424"/>
+
<stop offset="0.4303" stop-color="#242424"/>
+
<stop offset="0.7818" stop-color="#000000"/>
+
<stop offset="1" stop-color="#000000"/>
+
</radialGradient>
<circle cx="15" cy="12.13" fill="url(#SVGID_8_)" r="4.712"/>
<radialGradient cx="23.96" cy="3.55" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="11.36">
+
<stop offset="0" stop-color="#A700F5"/>
+
<stop offset="0.3091" stop-color="#A700F5"/>
+
<stop offset="0.4364" stop-color="#5E008A"/>
+
<stop offset="0.8061" stop-color="#0E1402"/>
+
<stop offset="1" stop-color="#0E1402"/>
+
</radialGradient>
<path d="M19.21,12.13c0,2.326-1.886,4.21-4.212,4.21-2.326-0.002-4.213-1.888-4.213-4.212,0.004-2.327,1.89-4.21,4.213-4.21,2.33,0.003,4.21,1.888,4.21,4.21z" fill="url(#SVGID_9_)"/>
<radialGradient cx="25.17" cy="13.25" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="4.611">
+
<stop offset="0" stop-color="#48630C"/>
+
<stop offset="0.7879" stop-color="#000000"/>
+
<stop offset="1" stop-color="#000000"/>
+
</radialGradient>
<path d="M19.21,12.13c0,2.326-1.886,4.21-4.212,4.21-2.326-0.002-4.213-1.888-4.213-4.212,0,0,1.444,2.569,4.213,2.569,2.77,0,4.21-2.57,4.21-2.57z" fill="url(#SVGID_10_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="14.98" x2="14.98" y1="7.065" y2="12.09">
+
<stop offset="0" stop-color="#F8FBFF"/>
+
<stop offset="1" stop-color="#808080"/>
+
</linearGradient>
<path d="M14.98,12.07c1.828,0,3.549-0.277,5.067-0.765-0.431-2.41-2.532-4.239-5.067-4.239-2.532,0-4.632,1.83-5.065,4.239,1.515,0.49,3.235,0.77,5.065,0.77z" fill="url(#SVGID_11_)" fill-opacity="0.35" stroke-opacity="0.35"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="5.762" x2="24.29" y1="26.72" y2="26.72">
+
<stop offset="0" stop-color="#878A8C"/>
+
<stop offset="0.2606" stop-color="#BDC2C4"/>
+
<stop offset="0.6606" stop-color="#5B6163"/>
+
<stop offset="1" stop-color="#959A9C"/>
+
</linearGradient>
<path d="M24.24,28c0.025-0.635,0.04-0.508,0.04-0.639v-0.035c0-1.037-0.852-1.879-1.901-1.879h-14.72c-1.05,0-1.9,0.842-1.9,1.879v0.035c0,0.131,0.014,0.004,0.04,0.639h18.44z" fill="url(#SVGID_12_)"/>
<path d="M5.879,26.7h18.29c-0.084-0.234-0.212-0.444-0.377-0.626h-17.53c-0.164,0.19-0.293,0.4-0.377,0.63z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
@@ -133,4 +191,4 @@
<path d="M6.255,26.07h17.54c-0.348-0.383-0.846-0.627-1.407-0.627h-14.72c-0.56,0.01-1.059,0.25-1.407,0.63z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_call_waiting.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_call_waiting.svg Fri May 14 16:09:54 2010 +0300
@@ -1,129 +1,187 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
-<stop offset="0.297" style="stop-color:#FFC144"/>
-<stop offset="0.6667" style="stop-color:#EF6902"/>
-<stop offset="0.7939" style="stop-color:#FEB037"/>
-<stop offset="1" style="stop-color:#FEB037"/>
+ <stop offset="0.297" style="stop-color:#FFC144"/>
+ <stop offset="0.6667" style="stop-color:#EF6902"/>
+ <stop offset="0.7939" style="stop-color:#FEB037"/>
</radialGradient>
<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.259-1.333c-0.616-0.665-2.566-3.083-2.968-3.735 c-0.353-0.575-0.411-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956c6.191-6.192,9.084-7.646,9.955-8.107 c0.76-0.4,1.037-0.345,1.711,0.035c0.666,0.377,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274 c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.523-1.778c-2.477-2.889-8.594-5.015-10.75-5.399 c-1.924-0.345-3.877-0.872-6.568,0.235c-2.559,1.054-13.074,8.536-21.11,16.572C11.203,27.277,3.723,37.795,2.668,40.352 c-1.107,2.691-0.58,4.645-0.236,6.567c0.387,2.158,2.511,8.275,5.4,10.752c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.853,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-1639.3418" x2="-1638.9102" y1="-2494.9819" y2="-2491.4063">
-<stop offset="0" style="stop-color:#E17B15"/>
-<stop offset="1" style="stop-color:#B05004"/>
+ <stop offset="0" style="stop-color:#E17B15"/>
+ <stop offset="1" style="stop-color:#B05004"/>
</linearGradient>
<path d="M35.172,17.108c0.76-0.4,1.037-0.345,1.711,0.035c0.666,0.377,3.068,2.352,3.734,2.967 c0.535,0.492,0.873,0.588,1.301,0.274c0.047-0.035,0.063-0.046,0.064-0.046c0.252-0.184,1.031-0.738,2.119-1.514 c-0.252-0.204-3.469-2.809-4.801-2.956C36.857,15.598,35.172,17.108,35.172,17.108z" fill="url(#SVGID_2_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -1696.8304 4072.5859)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1639.3462" x2="-1638.9143" y1="4063.0557" y2="4066.6326">
-<stop offset="0" style="stop-color:#E17B15"/>
-<stop offset="1" style="stop-color:#B05004"/>
+ <stop offset="0" style="stop-color:#E17B15"/>
+ <stop offset="1" style="stop-color:#B05004"/>
</linearGradient>
<path d="M17.093,35.188c-0.401,0.763-0.347,1.039,0.034,1.713c0.376,0.666,2.352,3.069,2.967,3.738 c0.493,0.531,0.587,0.869,0.274,1.297c-0.034,0.048-0.046,0.063-0.046,0.063c-0.183,0.253-0.738,1.032-1.515,2.119 c-0.203-0.252-2.807-3.467-2.956-4.799C15.579,36.875,17.093,35.188,17.093,35.188z" fill="url(#SVGID_3_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="48.4072" x2="4.0833" y1="3.4473" y2="47.7712">
-<stop offset="0" style="stop-color:#FFD06E"/>
-<stop offset="1" style="stop-color:#FAB56E"/>
+ <stop offset="0" style="stop-color:#FFD06E"/>
+ <stop offset="1" style="stop-color:#FAB56E"/>
</linearGradient>
-<path d="M2.979,47.467c-0.345-1.925-0.873-3.878,0.235-6.567 c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.34,4.269,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236 c1.98,0.354,7.297,2.178,10.07,4.711c-2.553-2.815-8.496-4.879-10.617-5.258c-1.924-0.345-3.877-0.872-6.568,0.235 c-2.559,1.054-13.074,8.536-21.11,16.572C11.203,27.277,3.723,37.795,2.668,40.352c-1.107,2.691-0.58,4.645-0.236,6.567 c0.379,2.122,2.441,8.065,5.259,10.617C5.155,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M2.979,47.467c-0.345-1.925-0.873-3.878,0.235-6.567 c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.34,4.269,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236 c1.98,0.354,7.297,2.178,10.07,4.711c-2.553-2.815-8.496-4.879-10.617-5.258c-1.924-0.345-3.877-0.872-6.568,0.235 c-2.559,1.054-13.074,8.536-21.11,16.572C11.203,27.277,3.723,37.795,2.668,40.352c-1.107,2.691-0.58,4.645-0.236,6.567 c0.379,2.122,2.441,8.065,5.259,10.617C5.155,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" opacity="0.5"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="53.9023" x2="3.4732" y1="3.6543" y2="54.0835">
-<stop offset="0" style="stop-color:#FFD06E"/>
-<stop offset="1" style="stop-color:#FAB56E"/>
+ <stop offset="0" style="stop-color:#FFD06E"/>
+ <stop offset="1" style="stop-color:#FAB56E"/>
</linearGradient>
-<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.259-1.333 c-0.616-0.665-2.566-3.083-2.968-3.735c-0.353-0.575-0.411-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956 c6.191-6.192,9.084-7.646,9.955-8.107c0.76-0.4,1.037-0.345,1.711,0.035c0.666,0.377,3.068,2.352,3.734,2.967 c0.535,0.492,0.873,0.588,1.301,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.523-1.778 c-0.291-0.339-0.635-0.665-1.012-0.982c0.488,0.657,0.197,1.134-0.607,1.666c-1.4,0.933-14.475,10.225-15.227,10.775 c-0.43,0.314-0.768,0.219-1.299-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.949-0.436-1.711-0.034 c-0.869,0.46-3.763,1.914-9.954,8.106c-6.193,6.192-7.636,9.092-8.108,9.956c-0.378,0.69-0.319,1.135,0.036,1.711 c0.4,0.651,2.351,3.069,2.967,3.736c0.492,0.533,0.559,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195 c-0.534,0.803-1.009,1.098-1.665,0.606c0.314,0.378,0.643,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.853,42.705,20.37,41.951z" fill="url(#SVGID_5_)" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.259-1.333 c-0.616-0.665-2.566-3.083-2.968-3.735c-0.353-0.575-0.411-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956 c6.191-6.192,9.084-7.646,9.955-8.107c0.76-0.4,1.037-0.345,1.711,0.035c0.666,0.377,3.068,2.352,3.734,2.967 c0.535,0.492,0.873,0.588,1.301,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.523-1.778 c-0.291-0.339-0.635-0.665-1.012-0.982c0.488,0.657,0.197,1.134-0.607,1.666c-1.4,0.933-14.475,10.225-15.227,10.775 c-0.43,0.314-0.768,0.219-1.299-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.949-0.436-1.711-0.034 c-0.869,0.46-3.763,1.914-9.954,8.106c-6.193,6.192-7.636,9.092-8.108,9.956c-0.378,0.69-0.319,1.135,0.036,1.711 c0.4,0.651,2.351,3.069,2.967,3.736c0.492,0.533,0.559,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195 c-0.534,0.803-1.009,1.098-1.665,0.606c0.314,0.378,0.643,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.853,42.705,20.37,41.951z" fill="url(#SVGID_5_)" opacity="0.5"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -608.1406 2931.3247)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-1610.521" x2="-1610.521" y1="-2533.3467" y2="-2471.428">
-<stop offset="0" style="stop-color:#CF8122"/>
-<stop offset="0.5" style="stop-color:#8C4105"/>
-<stop offset="1" style="stop-color:#CF8122"/>
+ <stop offset="0" style="stop-color:#CF8122"/>
+ <stop offset="0.5" style="stop-color:#8C4105"/>
+ <stop offset="1" style="stop-color:#CF8122"/>
</linearGradient>
-<path d="M2.899,45.012c1.275-2.777,10.299-14.804,18.804-23.31 c8.506-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26 c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.533,18.959S3.489,41.869,2.195,44.688 c-0.038,0.087-0.063,0.166-0.101,0.251c0.07,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_6_)" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M2.899,45.012c1.275-2.777,10.299-14.804,18.804-23.31 c8.506-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26 c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.533,18.959S3.489,41.869,2.195,44.688 c-0.038,0.087-0.063,0.166-0.101,0.251c0.07,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_6_)" opacity="0.5"/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="12.38" x2="17.62" y1="23.65" y2="23.65">
+
<stop offset="0" stop-color="#878A8C"/>
+
<stop offset="0.2606" stop-color="#BDC2C4"/>
+
<stop offset="0.6606" stop-color="#5B6163"/>
+
<stop offset="1" stop-color="#959A9C"/>
+
</linearGradient>
<rect fill="url(#SVGID_1__)" height="7.853" width="5.105" x="12.45" y="19.72"/>
<path d="M12.45,24.66c0.82,0.199,1.673,0.315,2.553,0.315,0.881,0,1.732-0.116,2.553-0.315v-4.294h-5.105v4.285z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
<path d="M12.45,24.02c0.82,0.199,1.673,0.315,2.553,0.315,0.881,0,1.732-0.116,2.553-0.315v-4.294h-5.105v4.288z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="15" x2="15" y1="1.975" y2="23.67">
+
<stop offset="0" stop-color="#F2F2F2"/>
+
<stop offset="0.3212" stop-color="#E6E6E6"/>
+
<stop offset="1" stop-color="#666666"/>
+
</linearGradient>
<path d="M15,23.7c-5.98,0-10.85-4.867-10.85-10.85s4.87-10.85,10.85-10.85c5.982,0,10.85,4.866,10.85,10.85s-4.87,10.85-10.85,10.85z" fill="url(#SVGID_2__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="15" x2="15" y1="2.614" y2="23.03">
+
<stop offset="0" stop-color="#D1D7D9"/>
+
<stop offset="0.0667" stop-color="#D1D7D9"/>
+
<stop offset="0.2606" stop-color="#BDC2C4"/>
+
<stop offset="0.6606" stop-color="#7C8487"/>
+
<stop offset="1" stop-color="#ADB3B5"/>
+
</linearGradient>
<circle cx="15" cy="12.85" fill="url(#SVGID_3__)" r="10.21"/>
<path d="M15,21.99c-5.315,0-9.657-4.23-9.843-9.5-0.004,0.116-0.009,0.231-0.009,0.349,0,5.431,4.419,9.851,9.852,9.851s9.852-4.42,9.852-9.851c0-0.117-0.005-0.232-0.009-0.349-0.18,5.27-4.52,9.5-9.84,9.5z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
<path d="M23.3,12.41c0,4.704-3.715,9.346-8.299,9.345-4.58-0.003-8.292-4.646-8.291-9.35,0.002-4.706,3.718-8.517,8.298-8.517,4.57,0.001,8.29,3.814,8.29,8.517z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
<path d="M15,21.07c-2.387-0.002-4.63-0.932-6.315-2.619-1.688-1.688-2.615-3.932-2.614-6.318,0-4.923,4.009-8.929,8.935-8.929,2.387,0,4.632,0.931,6.317,2.618,1.688,1.688,2.616,3.933,2.615,6.318-0.002,4.924-4.01,8.93-8.934,8.93h-0.014z" fill="#231F20" fill-opacity="0.2" stroke-opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="15" x2="15" y1="3.721" y2="20.35">
+
<stop offset="0" stop-color="#CFCFCF"/>
+
<stop offset="0.1091" stop-color="#CFCFCF"/>
+
<stop offset="0.6848" stop-color="#121212"/>
+
<stop offset="1" stop-color="#A6A6A6"/>
+
</linearGradient>
<path d="M15,20.43c-2.216-0.002-4.298-0.864-5.864-2.432-1.567-1.566-2.428-3.65-2.427-5.866,0-4.573,3.723-8.293,8.296-8.293,2.218,0.001,4.3,0.864,5.866,2.432s2.43,3.651,2.428,5.867c-0.001,4.573-3.723,8.292-8.295,8.292h-0.004z" fill="url(#SVGID_4__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="15" x2="15" y1="4.368" y2="19.72">
+
<stop offset="0" stop-color="#F2F2F2"/>
+
<stop offset="1" stop-color="#606769"/>
+
</linearGradient>
<circle cx="15" cy="12.13" fill="url(#SVGID_5__)" r="7.657"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6__" x1="15" x2="15" y1="5.772" y2="18.45">
+
<stop offset="0" stop-color="#1A1A1A"/>
+
<stop offset="0.503" stop-color="#343434"/>
+
<stop offset="0.7515" stop-color="#9E9E9E"/>
+
<stop offset="1" stop-color="#CFCFCF"/>
+
</linearGradient>
<path d="M15,18.51c-1.706-0.001-3.309-0.666-4.514-1.871-1.204-1.206-1.867-2.808-1.867-4.512,0-3.517,2.862-6.378,6.382-6.378,1.706,0,3.308,0.664,4.513,1.871,1.205,1.205,1.868,2.808,1.867,4.513,0,3.51-2.86,6.37-6.38,6.37z" fill="url(#SVGID_6__)"/>
<radialGradient cx="25.77" cy="10.27" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="6.499">
+
<stop offset="0" stop-color="#000000"/>
+
<stop offset="0.5917" stop-color="#000000"/>
+
<stop offset="0.627" stop-color="#050505"/>
+
<stop offset="0.7652" stop-color="#121212"/>
+
<stop offset="0.8876" stop-color="#171717"/>
+
<stop offset="1" stop-color="#171717"/>
+
</radialGradient>
<path d="M20.74,12.14c0,3.172-2.574,5.74-5.744,5.74-3.175-0.001-5.743-2.573-5.741-5.745,0-3.171,2.573-5.742,5.745-5.74,3.17-0.009,5.74,2.562,5.74,5.74z" fill="url(#SVGID_7_)"/>
<radialGradient cx="21.65" cy="5.066" gradientTransform="matrix(1.0143 0 0 1.0141 -9.5579 3.1299)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="10.35">
+
<stop offset="0" stop-color="#242424"/>
+
<stop offset="0.4303" stop-color="#242424"/>
+
<stop offset="0.7818" stop-color="#000000"/>
+
<stop offset="1" stop-color="#000000"/>
+
</radialGradient>
<circle cx="15" cy="12.13" fill="url(#SVGID_8_)" r="4.712"/>
<radialGradient cx="23.96" cy="3.55" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="11.36">
+
<stop offset="0" stop-color="#A700F5"/>
+
<stop offset="0.3091" stop-color="#A700F5"/>
+
<stop offset="0.4364" stop-color="#5E008A"/>
+
<stop offset="0.8061" stop-color="#0E1402"/>
+
<stop offset="1" stop-color="#0E1402"/>
+
</radialGradient>
<path d="M19.21,12.13c0,2.326-1.886,4.21-4.212,4.21-2.326-0.002-4.213-1.888-4.213-4.212,0.004-2.327,1.89-4.21,4.213-4.21,2.33,0.003,4.21,1.888,4.21,4.21z" fill="url(#SVGID_9_)"/>
<radialGradient cx="25.17" cy="13.25" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="4.611">
+
<stop offset="0" stop-color="#48630C"/>
+
<stop offset="0.7879" stop-color="#000000"/>
+
<stop offset="1" stop-color="#000000"/>
+
</radialGradient>
<path d="M19.21,12.13c0,2.326-1.886,4.21-4.212,4.21-2.326-0.002-4.213-1.888-4.213-4.212,0,0,1.444,2.569,4.213,2.569,2.77,0,4.21-2.57,4.21-2.57z" fill="url(#SVGID_10_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="14.98" x2="14.98" y1="7.065" y2="12.09">
+
<stop offset="0" stop-color="#F8FBFF"/>
+
<stop offset="1" stop-color="#808080"/>
+
</linearGradient>
<path d="M14.98,12.07c1.828,0,3.549-0.277,5.067-0.765-0.431-2.41-2.532-4.239-5.067-4.239-2.532,0-4.632,1.83-5.065,4.239,1.515,0.49,3.235,0.77,5.065,0.77z" fill="url(#SVGID_11_)" fill-opacity="0.35" stroke-opacity="0.35"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="5.762" x2="24.29" y1="26.72" y2="26.72">
+
<stop offset="0" stop-color="#878A8C"/>
+
<stop offset="0.2606" stop-color="#BDC2C4"/>
+
<stop offset="0.6606" stop-color="#5B6163"/>
+
<stop offset="1" stop-color="#959A9C"/>
+
</linearGradient>
<path d="M24.24,28c0.025-0.635,0.04-0.508,0.04-0.639v-0.035c0-1.037-0.852-1.879-1.901-1.879h-14.72c-1.05,0-1.9,0.842-1.9,1.879v0.035c0,0.131,0.014,0.004,0.04,0.639h18.44z" fill="url(#SVGID_12_)"/>
<path d="M5.879,26.7h18.29c-0.084-0.234-0.212-0.444-0.377-0.626h-17.53c-0.164,0.19-0.293,0.4-0.377,0.63z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
@@ -131,4 +189,4 @@
<path d="M6.255,26.07h17.54c-0.348-0.383-0.846-0.627-1.407-0.627h-14.72c-0.56,0.01-1.059,0.25-1.407,0.63z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_capture.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_capture.svg Fri May 14 16:09:54 2010 +0300
@@ -1,149 +1,138 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<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"/>
+ <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="M56.506,7.6H3.493C2.666,7.6,2,8.27,2,9.094v41.813C2,51.732,2.666,52.4,3.493,52.4h53.013 C57.33,52.4,58,51.732,58,50.906V9.094C58,8.27,57.33,7.6,56.506,7.6z M8.719,49.413c0,0.412-0.336,0.748-0.745,0.748H4.986 c-0.412,0-0.748-0.336-0.748-0.748V47.92c0-0.41,0.336-0.746,0.748-0.746h2.987c0.409,0,0.745,0.336,0.745,0.746V49.413z M8.719,12.08c0,0.41-0.336,0.746-0.745,0.746H4.986c-0.412,0-0.748-0.336-0.748-0.746v-1.493c0-0.409,0.336-0.748,0.748-0.748 h2.987c0.409,0,0.745,0.339,0.745,0.748V12.08z M15.438,49.413c0,0.412-0.335,0.748-0.745,0.748h-2.987 c-0.412,0-0.747-0.336-0.747-0.748V47.92c0-0.41,0.335-0.746,0.747-0.746h2.987c0.41,0,0.745,0.336,0.745,0.746V49.413z M15.438,12.08c0,0.41-0.335,0.746-0.745,0.746h-2.987c-0.412,0-0.747-0.336-0.747-0.746v-1.493c0-0.409,0.335-0.748,0.747-0.748 h2.987c0.41,0,0.745,0.339,0.745,0.748V12.08z M22.159,49.413c0,0.412-0.337,0.748-0.747,0.748h-2.986 c-0.41,0-0.746-0.336-0.746-0.748V47.92c0-0.41,0.335-0.746,0.746-0.746h2.986c0.41,0,0.747,0.336,0.747,0.746V49.413z M22.159,12.08c0,0.41-0.337,0.746-0.747,0.746h-2.986c-0.41,0-0.746-0.336-0.746-0.746v-1.493c0-0.409,0.335-0.748,0.746-0.748 h2.986c0.41,0,0.747,0.339,0.747,0.748V12.08z M28.88,49.413c0,0.412-0.337,0.748-0.747,0.748h-2.986 c-0.411,0-0.746-0.336-0.746-0.748V47.92c0-0.41,0.335-0.746,0.746-0.746h2.986c0.41,0,0.747,0.336,0.747,0.746V49.413z M28.88,12.08c0,0.41-0.337,0.746-0.747,0.746h-2.986c-0.411,0-0.746-0.336-0.746-0.746v-1.493c0-0.409,0.335-0.748,0.746-0.748 h2.986c0.41,0,0.747,0.339,0.747,0.748V12.08z M35.6,49.413c0,0.412-0.338,0.748-0.747,0.748h-2.985 c-0.412,0-0.748-0.336-0.748-0.748V47.92c0-0.41,0.336-0.746,0.748-0.746h2.985c0.409,0,0.747,0.336,0.747,0.746V49.413z M35.6,12.08c0,0.41-0.338,0.746-0.747,0.746h-2.985c-0.412,0-0.748-0.336-0.748-0.746v-1.493c0-0.409,0.336-0.748,0.748-0.748 h2.985c0.409,0,0.747,0.339,0.747,0.748V12.08z M42.318,49.413c0,0.412-0.335,0.748-0.745,0.748h-2.987 c-0.412,0-0.746-0.336-0.746-0.748V47.92c0-0.41,0.334-0.746,0.746-0.746h2.987c0.41,0,0.745,0.336,0.745,0.746V49.413z M42.318,12.08c0,0.41-0.335,0.746-0.745,0.746h-2.987c-0.412,0-0.746-0.336-0.746-0.746v-1.493c0-0.409,0.334-0.748,0.746-0.748 h2.987c0.41,0,0.745,0.339,0.745,0.748V12.08z M49.039,49.413c0,0.412-0.336,0.748-0.746,0.748h-2.987 c-0.41,0-0.745-0.336-0.745-0.748V47.92c0-0.41,0.335-0.746,0.745-0.746h2.987c0.41,0,0.746,0.336,0.746,0.746V49.413z M49.039,12.08c0,0.41-0.336,0.746-0.746,0.746h-2.987c-0.41,0-0.745-0.336-0.745-0.746v-1.493c0-0.409,0.335-0.748,0.745-0.748 h2.987c0.41,0,0.746,0.339,0.746,0.748V12.08z M55.761,49.413c0,0.412-0.339,0.748-0.748,0.748h-2.987 c-0.41,0-0.745-0.336-0.745-0.748V47.92c0-0.41,0.335-0.746,0.745-0.746h2.987c0.409,0,0.748,0.336,0.748,0.746V49.413z M55.761,12.08c0,0.41-0.339,0.746-0.748,0.746h-2.987c-0.41,0-0.745-0.336-0.745-0.746v-1.493c0-0.409,0.335-0.748,0.745-0.748 h2.987c0.409,0,0.748,0.339,0.748,0.748V12.08z" fill="url(#SVGID_1_)"/>
-<path d="M56.506,7.6H3.493C2.666,7.6,2,8.27,2,9.094v0.745 c0-0.824,0.666-1.493,1.493-1.493h53.013C57.33,8.346,58,9.015,58,9.839V9.094C58,8.27,57.33,7.6,56.506,7.6z" fill="#FFFFFF" fill-opacity="0.55" stroke-opacity="0.55"/>
-<path d="M3.493,52.4h53.013C57.33,52.4,58,51.732,58,50.906v-0.745 c0,0.824-0.67,1.493-1.494,1.493H3.493C2.666,51.654,2,50.985,2,50.161v0.745C2,51.732,2.666,52.4,3.493,52.4z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M56.506,7.6H3.493C2.666,7.6,2,8.27,2,9.094v0.745 c0-0.824,0.666-1.493,1.493-1.493h53.013C57.33,8.346,58,9.015,58,9.839V9.094C58,8.27,57.33,7.6,56.506,7.6z" enable-background="new " fill="#FFFFFF" opacity="0.55"/>
+<path d="M3.493,52.4h53.013C57.33,52.4,58,51.732,58,50.906v-0.745 c0,0.824-0.67,1.493-1.494,1.493H3.493C2.666,51.654,2,50.985,2,50.161v0.745C2,51.732,2.666,52.4,3.493,52.4z" enable-background="new " fill="#FFFFFF" opacity="0.1"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2164" x2="-2164" y1="3641.7637" y2="3611.8926">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="0.5" style="stop-color:#666666"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="0.5" style="stop-color:#666666"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
<rect fill="url(#SVGID_2_)" height="29.871" width="56" x="2" y="15.064"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2164.0005" x2="-2164.0005" y1="3612.0117" y2="3641.8828">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</linearGradient>
<path d="M55.761,43.441c0,0.821-0.673,1.494-1.493,1.494H5.732c-0.82,0-1.494-0.673-1.494-1.494V16.559 c0-0.819,0.674-1.494,1.494-1.494h48.535c0.82,0,1.493,0.675,1.493,1.494V43.441z" fill="url(#SVGID_3_)"/>
-<path d="M54.268,43.441H5.732c-0.82,0-1.494,0.074-1.494-0.748l0,0 c0,0.822,0.674,1.493,1.494,1.493h48.535c0.82,0,1.493-0.671,1.493-1.493l0,0C55.761,43.516,55.088,43.441,54.268,43.441z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M54.268,43.441H5.732c-0.82,0-1.494,0.074-1.494-0.748l0,0 c0,0.822,0.674,1.493,1.494,1.493h48.535c0.82,0,1.493-0.671,1.493-1.493l0,0C55.761,43.516,55.088,43.441,54.268,43.441z" enable-background="new " fill="#FFFFFF" opacity="0.5"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-2164.0005" x2="-2164.0005" y1="3641.8828" y2="3611.8926">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#404040"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#404040"/>
</linearGradient>
<path d="M54.268,15.813c0.41,0,0.745,0.336,0.745,0.745v26.883c0,0.412-0.335,0.745-0.745,0.745H5.732 c-0.411,0-0.746-0.333-0.746-0.745V16.559c0-0.409,0.335-0.745,0.746-0.745H54.268 M54.268,15.064H5.732 c-0.82,0-1.494,0.675-1.494,1.494v26.883c0,0.821,0.674,1.494,1.494,1.494h48.535c0.82,0,1.493-0.673,1.493-1.494V16.559 C55.761,15.739,55.088,15.064,54.268,15.064L54.268,15.064z" fill="url(#SVGID_4_)"/>
-<path d="M54.268,24.025v-5.974c0-0.824-0.67-1.493-1.494-1.493H7.226 c-0.824,0-1.493,0.669-1.493,1.493v9.709L54.268,24.025z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M54.268,24.025v-5.974c0-0.824-0.67-1.493-1.494-1.493H7.226 c-0.824,0-1.493,0.669-1.493,1.493v9.709L54.268,24.025z" enable-background="new " fill="#FFFFFF" opacity="0.2"/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<polygon fill="none" points="30,22.402 30,12.467 30,0 0,0 0,30 30,30 "/>
-<path d="M2.609,27.517c-1.533,0-2.604-1.071-2.604-2.604L0,10.432c0-4.383,3.566-7.949,7.951-7.949 c4.386,0.002,7.953,3.571,7.951,7.956v0.398c0.064-0.008,0.13-0.012,0.195-0.012h12.262c0.904,0,1.641,0.736,1.641,1.642v9.936 c0,0.905-0.736,1.642-1.641,1.642H16.098c-0.067,0-0.135-0.005-0.2-0.013l-0.001,0.882c0,1.386-1.217,2.604-2.604,2.604H2.609z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M2.609,27.517c-1.533,0-2.604-1.071-2.604-2.604L0,10.432c0-4.383,3.566-7.949,7.951-7.949 c4.386,0.002,7.953,3.571,7.951,7.956v0.398c0.064-0.008,0.13-0.012,0.195-0.012h12.262c0.904,0,1.641,0.736,1.641,1.642v9.936 c0,0.905-0.736,1.642-1.641,1.642H16.098c-0.067,0-0.135-0.005-0.2-0.013l-0.001,0.882c0,1.386-1.217,2.604-2.604,2.604H2.609z" opacity="0.35"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="7.9512" x2="7.9512" y1="3.3208" y2="26.41">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="0.3212" style="stop-color:#E6E6E6"/>
-<stop offset="1" style="stop-color:#666666"/>
+ <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="M14.902,10.438c0.002-3.84-3.109-6.953-6.949-6.955C4.113,3.481,1,6.594,1,10.432 c0,0.088,0.006,14.48,0.006,14.48c0,0.936,0.588,1.604,1.604,1.604h10.684c0.842,0,1.604-0.788,1.604-1.604 C14.896,24.912,14.902,10.524,14.902,10.438z" fill="url(#SVGID_1__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="7.9512" x2="7.9512" y1="3.646" y2="26.0921">
-<stop offset="0" style="stop-color:#D0D4D5"/>
-<stop offset="0.1212" style="stop-color:#D0D4D5"/>
-<stop offset="0.5091" style="stop-color:#B0B6B8"/>
-<stop offset="0.5091" style="stop-color:#9FA6A8"/>
-<stop offset="0.6606" style="stop-color:#7D8588"/>
-<stop offset="0.9758" style="stop-color:#ADB3B5"/>
-<stop offset="0.9758" style="stop-color:#595C5E"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+ <stop offset="0.1212" style="stop-color:#D0D4D5"/>
+ <stop offset="0.5091" style="stop-color:#B0B6B8"/>
+ <stop offset="0.5091" style="stop-color:#9FA6A8"/>
+ <stop offset="0.6606" style="stop-color:#7D8588"/>
+ <stop offset="0.9758" style="stop-color:#ADB3B5"/>
+ <stop offset="0.9758" style="stop-color:#595C5E"/>
</linearGradient>
<path d="M2.609,26.195c-0.803,0-1.283-0.479-1.283-1.283c0,0-0.006-14.393-0.006-14.48 c0-3.654,2.975-6.629,6.631-6.629c3.658,0.002,6.633,2.979,6.631,6.635c0,0.087-0.006,14.475-0.006,14.475 c0,0.648-0.637,1.283-1.283,1.283H2.609z" fill="url(#SVGID_2__)"/>
-<path d="M13.986,10.71c-0.002,3.333-2.703,6.621-6.037,6.619c-3.332-0.001-6.033-3.291-6.033-6.622 c0.002-3.334,2.705-6.032,6.037-6.032C11.287,4.676,13.986,7.378,13.986,10.71z" fill="#231F20" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M13.986,10.71c-0.002,3.333-2.703,6.621-6.037,6.619c-3.332-0.001-6.033-3.291-6.033-6.622 c0.002-3.334,2.705-6.032,6.037-6.032C11.287,4.676,13.986,7.378,13.986,10.71z" fill="#231F20" opacity="0.5"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="7.9512" x2="7.9512" y1="4.4121" y2="16.5024">
-<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"/>
+ <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="7.951" cy="10.464" fill="url(#SVGID_3__)" r="6.012"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="7.9512" x2="7.9512" y1="4.6738" y2="16.122">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="1" style="stop-color:#606769"/>
+ <stop offset="0" style="stop-color:#F2F2F2"/>
+ <stop offset="1" style="stop-color:#606769"/>
</linearGradient>
<circle cx="7.951" cy="10.465" fill="url(#SVGID_4__)" r="5.711"/>
<linearGradient gradientTransform="matrix(1 3.000000e-004 -3.000000e-004 1 -0.7997 -0.83)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="5.46" x2="12.0483" y1="7.9976" y2="14.5859">
-<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"/>
+ <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="7.952" cy="10.464" fill="url(#SVGID_5_)" r="4.659"/>
<radialGradient cx="148.6523" cy="-52.0352" gradientTransform="matrix(0.9568 3.000000e-004 -3.000000e-004 0.9568 -133.8237 60.5787)" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="5.2276">
-<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"/>
+ <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"/>
</radialGradient>
<circle cx="7.952" cy="10.464" fill="url(#SVGID_6_)" r="4.358"/>
<radialGradient cx="145.7949" cy="-41.3301" gradientTransform="matrix(0.9651 0 0 0.965 -134.7423 47.3895)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="8.3282">
-<stop offset="0" style="stop-color:#242424"/>
-<stop offset="0.4303" style="stop-color:#242424"/>
-<stop offset="0.7818" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0.4303" style="stop-color:#242424"/>
+ <stop offset="0.7818" style="stop-color:#000000"/>
</radialGradient>
<circle cx="7.951" cy="10.464" fill="url(#SVGID_7_)" r="3.607"/>
<radialGradient cx="146.1094" cy="-80.7524" gradientTransform="matrix(0.9448 3.000000e-004 -3.000000e-004 0.9449 -131.0246 81.9801)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="9.1349">
-<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"/>
+ <stop offset="0.3091" style="stop-color:#A700F5"/>
+ <stop offset="0.4364" style="stop-color:#5E008A"/>
+ <stop offset="0.8061" style="stop-color:#0E1402"/>
</radialGradient>
<circle cx="7.951" cy="10.464" fill="url(#SVGID_8_)" r="3.156"/>
<radialGradient cx="147.0527" cy="-162.396" gradientTransform="matrix(0.9448 3.000000e-004 -3.000000e-004 0.8996 -131.0251 159.1253)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="3.709">
-<stop offset="0" style="stop-color:#48630C"/>
-<stop offset="0.7879" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#48630C"/>
+ <stop offset="0.7879" style="stop-color:#000000"/>
</radialGradient>
<path d="M11.107,10.575c-0.001,1.659-1.414,3.005-3.156,3.004s-3.156-1.348-3.156-3.006 c0,0,1.082,1.833,3.156,1.833C10.025,12.407,11.107,10.575,11.107,10.575z" fill="url(#SVGID_9_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="7.9346" x2="7.9346" y1="6.584" y2="10.4348">
-<stop offset="0" style="stop-color:#F8FBFF"/>
-<stop offset="1" style="stop-color:#808080"/>
+ <stop offset="0" style="stop-color:#F8FBFF"/>
+ <stop offset="1" style="stop-color:#808080"/>
</linearGradient>
-<path d="M7.936,10.416c1.398,0,2.717-0.213,3.879-0.586c-0.33-1.846-1.939-3.246-3.879-3.246 s-3.549,1.4-3.881,3.245C5.219,10.203,6.537,10.416,7.936,10.416z" fill="url(#SVGID_10_)" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M7.936,10.416c1.398,0,2.717-0.213,3.879-0.586c-0.33-1.846-1.939-3.246-3.879-3.246 s-3.549,1.4-3.881,3.245C5.219,10.203,6.537,10.416,7.936,10.416z" fill="url(#SVGID_10_)" opacity="0.35"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="22.2285" x2="22.2285" y1="11.7466" y2="22.9921">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="0.3212" style="stop-color:#E6E6E6"/>
-<stop offset="1" style="stop-color:#666666"/>
+ <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="M29,22.402c0,0.354-0.287,0.642-0.641,0.642H16.098c-0.354,0-0.641-0.288-0.641-0.642v-9.936 c0-0.354,0.287-0.642,0.641-0.642h12.262c0.354,0,0.641,0.288,0.641,0.642V22.402z" fill="url(#SVGID_11_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="22.2285" x2="22.2285" y1="12.0703" y2="22.6757">
-<stop offset="0" style="stop-color:#D0D4D5"/>
-<stop offset="0.1212" style="stop-color:#D0D4D5"/>
-<stop offset="0.5091" style="stop-color:#B0B6B8"/>
-<stop offset="0.5091" style="stop-color:#9FA6A8"/>
-<stop offset="0.6606" style="stop-color:#7D8588"/>
-<stop offset="0.9758" style="stop-color:#ADB3B5"/>
-<stop offset="0.9758" style="stop-color:#595C5E"/>
-<stop offset="1" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+ <stop offset="0.1212" style="stop-color:#D0D4D5"/>
+ <stop offset="0.5091" style="stop-color:#B0B6B8"/>
+ <stop offset="0.5091" style="stop-color:#9FA6A8"/>
+ <stop offset="0.6606" style="stop-color:#7D8588"/>
+ <stop offset="0.9758" style="stop-color:#ADB3B5"/>
+ <stop offset="0.9758" style="stop-color:#595C5E"/>
</linearGradient>
<path d="M16.098,22.725c-0.178,0-0.32-0.145-0.32-0.322v-9.936c0-0.178,0.143-0.322,0.32-0.322h12.262 c0.176,0,0.32,0.145,0.32,0.322v9.936c0,0.178-0.145,0.322-0.32,0.322H16.098z" fill="url(#SVGID_12_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="14.9092" x2="13.6655" y1="17.4346" y2="17.4346">
-<stop offset="0" style="stop-color:#D3D3D4"/>
-<stop offset="1" style="stop-color:#EDEDED"/>
+ <stop offset="0" style="stop-color:#D3D3D4"/>
+ <stop offset="1" style="stop-color:#EDEDED"/>
</linearGradient>
<path d="M14.9,13.788h-1.279v7.293h1.275C14.898,18.812,14.9,15.968,14.9,13.788z" fill="url(#SVGID_13_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="14.9092" x2="13.975" y1="17.4341" y2="17.4341">
-<stop offset="0" style="stop-color:#5F5F5F"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#5F5F5F"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
<rect fill="url(#SVGID_14_)" height="6.651" width="0.961" x="13.941" y="14.108"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="15.4912" x2="14.3045" y1="17.4346" y2="17.4346">
-<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"/>
+ <stop offset="0.1091" style="stop-color:#CFCFCF"/>
+ <stop offset="0.6848" style="stop-color:#121212"/>
+ <stop offset="1" style="stop-color:#A6A6A6"/>
</linearGradient>
<rect fill="url(#SVGID_15_)" height="6.01" width="1.221" x="14.262" y="14.43"/>
-<rect fill-opacity="0.25" height="6.01" stroke-opacity="0.25" width="0.346" x="15.137" y="14.43"/>
+<rect height="6.01" opacity="0.25" width="0.346" x="15.137" y="14.43"/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_collection.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_collection.svg Fri May 14 16:09:54 2010 +0300
@@ -1,105 +1,207 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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_)"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_dialled_call.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_dialled_call.svg Fri May 14 16:09:54 2010 +0300
@@ -1,58 +1,58 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<stop offset="0" style="stop-color:#3AC5EA"/>
-<stop offset="0.297" style="stop-color:#3AC5EA"/>
-<stop offset="0.6667" style="stop-color:#1754C9"/>
-<stop offset="0.7939" style="stop-color:#33ADE1"/>
-<stop offset="1" style="stop-color:#33ADE1"/>
+ <stop offset="0.297" style="stop-color:#3AC5EA"/>
+ <stop offset="0.6667" style="stop-color:#1754C9"/>
+ <stop offset="0.7939" style="stop-color:#33ADE1"/>
</radialGradient>
<path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333c-0.617-0.665-2.567-3.083-2.968-3.735 c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956c6.191-6.192,9.085-7.646,9.956-8.107 c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967c0.534,0.492,0.872,0.588,1.299,0.274 c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778c-2.476-2.889-8.594-5.015-10.751-5.399 c-1.923-0.345-3.876-0.872-6.567,0.235c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352 c-1.108,2.691-0.581,4.645-0.236,6.567c0.386,2.158,2.51,8.275,5.399,10.752c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2070.7568" x2="-2070.3252" y1="-2266.8511" y2="-2263.2749">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+ <stop offset="0" style="stop-color:#2685D2"/>
+ <stop offset="1" style="stop-color:#081D45"/>
</linearGradient>
<path d="M35.172,17.108c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967 c0.534,0.492,0.872,0.588,1.299,0.274c0.048-0.035,0.062-0.046,0.064-0.046c0.253-0.184,1.032-0.738,2.12-1.514 c-0.251-0.204-3.468-2.809-4.8-2.956C36.857,15.598,35.172,17.108,35.172,17.108z" fill="url(#SVGID_2_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -2128.2356 5114.0977)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2070.7607" x2="-2070.3289" y1="5104.5752" y2="5108.1523">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+ <stop offset="0" style="stop-color:#2685D2"/>
+ <stop offset="1" style="stop-color:#081D45"/>
</linearGradient>
<path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.713c0.376,0.666,2.351,3.069,2.967,3.738 c0.493,0.531,0.587,0.869,0.274,1.298c-0.035,0.047-0.046,0.062-0.046,0.062c-0.183,0.253-0.738,1.032-1.515,2.119 c-0.204-0.252-2.807-3.467-2.956-4.799C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="47.9224" x2="3.9991" y1="3.9307" y2="47.854">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+ <stop offset="0" style="stop-color:#ABEEFF"/>
+ <stop offset="1" style="stop-color:#539FDE"/>
</linearGradient>
-<path d="M2.979,47.467c-0.344-1.925-0.873-3.878,0.235-6.567 c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.341,4.269,40.9,3.215c2.691-1.108,4.644-0.581,6.567-0.236 c1.981,0.354,7.296,2.178,10.069,4.711c-2.552-2.815-8.496-4.879-10.617-5.258c-1.923-0.345-3.876-0.872-6.567,0.235 c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567 c0.378,2.122,2.441,8.065,5.258,10.617C5.156,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M2.979,47.467c-0.344-1.925-0.873-3.878,0.235-6.567 c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.341,4.269,40.9,3.215c2.691-1.108,4.644-0.581,6.567-0.236 c1.981,0.354,7.296,2.178,10.069,4.711c-2.552-2.815-8.496-4.879-10.617-5.258c-1.923-0.345-3.876-0.872-6.567,0.235 c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567 c0.378,2.122,2.441,8.065,5.258,10.617C5.156,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="54.3535" x2="3.9474" y1="3.2017" y2="53.6078">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+ <stop offset="0" style="stop-color:#ABEEFF"/>
+ <stop offset="1" style="stop-color:#539FDE"/>
</linearGradient>
-<path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333 c-0.617-0.665-2.567-3.083-2.968-3.735c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956 c6.191-6.192,9.085-7.646,9.956-8.107c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967 c0.534,0.492,0.872,0.588,1.299,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778 c-0.292-0.339-0.634-0.665-1.013-0.982c0.49,0.657,0.198,1.134-0.607,1.666C54.65,9.447,41.576,18.739,40.825,19.29 c-0.431,0.314-0.767,0.219-1.3-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.948-0.436-1.71-0.034 c-0.871,0.46-3.764,1.914-9.956,8.106c-6.193,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.319,1.135,0.035,1.711 c0.4,0.651,2.351,3.069,2.967,3.736c0.493,0.533,0.559,0.896,0.259,1.332c-0.517,0.755-9.828,13.794-10.76,15.195 c-0.533,0.803-1.008,1.098-1.665,0.606c0.314,0.378,0.644,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_5_)" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333 c-0.617-0.665-2.567-3.083-2.968-3.735c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956 c6.191-6.192,9.085-7.646,9.956-8.107c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967 c0.534,0.492,0.872,0.588,1.299,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778 c-0.292-0.339-0.634-0.665-1.013-0.982c0.49,0.657,0.198,1.134-0.607,1.666C54.65,9.447,41.576,18.739,40.825,19.29 c-0.431,0.314-0.767,0.219-1.3-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.948-0.436-1.71-0.034 c-0.871,0.46-3.764,1.914-9.956,8.106c-6.193,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.319,1.135,0.035,1.711 c0.4,0.651,2.351,3.069,2.967,3.736c0.493,0.533,0.559,0.896,0.259,1.332c-0.517,0.755-9.828,13.794-10.76,15.195 c-0.533,0.803-1.008,1.098-1.665,0.606c0.314,0.378,0.644,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_5_)" opacity="0.6"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -141.776 3075.0667)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-2041.9355" x2="-2041.9355" y1="-2305.2153" y2="-2243.2966">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="0.5091" style="stop-color:#081D45"/>
-<stop offset="1" style="stop-color:#2275BD"/>
+ <stop offset="0" style="stop-color:#2685D2"/>
+ <stop offset="0.5091" style="stop-color:#081D45"/>
+ <stop offset="1" style="stop-color:#2275BD"/>
</linearGradient>
<path d="M2.899,45.012c1.275-2.777,10.299-14.804,18.804-23.31c8.505-8.506,20.532-17.529,23.308-18.803 c0.527-0.241,1.02-0.411,1.493-0.545c-0.511-0.096-1.03-0.19-1.565-0.26c-0.086,0.036-0.163,0.063-0.25,0.102 c-2.818,1.293-14.971,10.397-23.533,18.959C12.595,29.717,3.489,41.869,2.195,44.688c-0.038,0.087-0.063,0.166-0.101,0.25 c0.07,0.535,0.166,1.055,0.259,1.565C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_6_)"/>
<rect fill="none" height="60" width="60"/>
</g>
<g>
+<defs>
+</defs>
<polygon fill="none" points="30.152,0.436 15.607,0.436 15.186,0 14.762,0.436 0.152,0.436 0.152,15.436 0,15.592 0.152,15.592 0.152,30.436 30.152,30.436 30.152,15.594 30.295,15.594 30.152,15.447 "/>
-<polygon fill-opacity="0.35" points="8.484,30.434 8.48,15.594 0.4,15.594 0,15.592 15.186,0 30.295,15.594 21.907,15.594 21.915,30.436 " stroke-opacity="0.35"/>
+<polygon opacity="0.35" points="8.484,30.434 8.48,15.594 0.4,15.594 0,15.592 15.186,0 30.295,15.594 21.907,15.594 21.915,30.436 "/>
<linearGradient gradientTransform="matrix(1 1.000000e-004 1.000000e-004 -1 2191.3389 2985.8438)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-2176.5103" x2="-2176.5103" y1="2985.5796" y2="2956.2766">
-<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="1" style="stop-color:#1347BA"/>
+ <stop offset="0.1455" style="stop-color:#45E8FF"/>
+ <stop offset="0.5576" style="stop-color:#30A4D5"/>
+ <stop offset="1" style="stop-color:#1347BA"/>
</linearGradient>
<polygon fill="url(#SVGID_1__)" points="27.438,14.594 15.184,1.861 2.814,14.594 9.48,14.594 9.484,29.142 20.91,29.145 20.907,14.594 "/>
<linearGradient gradientTransform="matrix(1 1.000000e-004 1.000000e-004 -1 2191.3389 2985.8438)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-2176.4844" x2="-2176.4844" y1="2984.1128" y2="2970.6938">
-<stop offset="0" style="stop-color:#B3FCFF"/>
-<stop offset="0.4182" style="stop-color:#B3FCFF"/>
-<stop offset="1" style="stop-color:#5FBAD8"/>
+ <stop offset="0.4182" style="stop-color:#B3FCFF"/>
+ <stop offset="1" style="stop-color:#5FBAD8"/>
</linearGradient>
<polygon fill="url(#SVGID_2__)" points="3.195,14.592 15.182,2.286 27.108,14.594 27.934,14.594 15.184,1.436 2.37,14.592 "/>
<line fill="none" x1="9.484" x2="20.91" y1="29.138" y2="29.14"/>
@@ -61,90 +61,148 @@
</g>
<g transform="matrix(1 0 0 1 30 30)">
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1___" x1="12.38" x2="17.62" y1="23.65" y2="23.65">
+
<stop offset="0" stop-color="#878A8C"/>
+
<stop offset="0.2606" stop-color="#BDC2C4"/>
+
<stop offset="0.6606" stop-color="#5B6163"/>
+
<stop offset="1" stop-color="#959A9C"/>
+
</linearGradient>
<rect fill="url(#SVGID_1___)" height="7.853" width="5.105" x="12.45" y="19.72"/>
<path d="M12.45,24.66c0.82,0.199,1.673,0.315,2.553,0.315,0.881,0,1.732-0.116,2.553-0.315v-4.294h-5.105v4.285z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
<path d="M12.45,24.02c0.82,0.199,1.673,0.315,2.553,0.315,0.881,0,1.732-0.116,2.553-0.315v-4.294h-5.105v4.288z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2___" x1="15" x2="15" y1="1.975" y2="23.67">
+
<stop offset="0" stop-color="#F2F2F2"/>
+
<stop offset="0.3212" stop-color="#E6E6E6"/>
+
<stop offset="1" stop-color="#666666"/>
+
</linearGradient>
<path d="M15,23.7c-5.98,0-10.85-4.867-10.85-10.85s4.87-10.85,10.85-10.85c5.982,0,10.85,4.866,10.85,10.85s-4.87,10.85-10.85,10.85z" fill="url(#SVGID_2___)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="15" x2="15" y1="2.614" y2="23.03">
+
<stop offset="0" stop-color="#D1D7D9"/>
+
<stop offset="0.0667" stop-color="#D1D7D9"/>
+
<stop offset="0.2606" stop-color="#BDC2C4"/>
+
<stop offset="0.6606" stop-color="#7C8487"/>
+
<stop offset="1" stop-color="#ADB3B5"/>
+
</linearGradient>
<circle cx="15" cy="12.85" fill="url(#SVGID_3__)" r="10.21"/>
<path d="M15,21.99c-5.315,0-9.657-4.23-9.843-9.5-0.004,0.116-0.009,0.231-0.009,0.349,0,5.431,4.419,9.851,9.852,9.851s9.852-4.42,9.852-9.851c0-0.117-0.005-0.232-0.009-0.349-0.18,5.27-4.52,9.5-9.84,9.5z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
<path d="M23.3,12.41c0,4.704-3.715,9.346-8.299,9.345-4.58-0.003-8.292-4.646-8.291-9.35,0.002-4.706,3.718-8.517,8.298-8.517,4.57,0.001,8.29,3.814,8.29,8.517z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
<path d="M15,21.07c-2.387-0.002-4.63-0.932-6.315-2.619-1.688-1.688-2.615-3.932-2.614-6.318,0-4.923,4.009-8.929,8.935-8.929,2.387,0,4.632,0.931,6.317,2.618,1.688,1.688,2.616,3.933,2.615,6.318-0.002,4.924-4.01,8.93-8.934,8.93h-0.014z" fill="#231F20" fill-opacity="0.2" stroke-opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="15" x2="15" y1="3.721" y2="20.35">
+
<stop offset="0" stop-color="#CFCFCF"/>
+
<stop offset="0.1091" stop-color="#CFCFCF"/>
+
<stop offset="0.6848" stop-color="#121212"/>
+
<stop offset="1" stop-color="#A6A6A6"/>
+
</linearGradient>
<path d="M15,20.43c-2.216-0.002-4.298-0.864-5.864-2.432-1.567-1.566-2.428-3.65-2.427-5.866,0-4.573,3.723-8.293,8.296-8.293,2.218,0.001,4.3,0.864,5.866,2.432s2.43,3.651,2.428,5.867c-0.001,4.573-3.723,8.292-8.295,8.292h-0.004z" fill="url(#SVGID_4__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="15" x2="15" y1="4.368" y2="19.72">
+
<stop offset="0" stop-color="#F2F2F2"/>
+
<stop offset="1" stop-color="#606769"/>
+
</linearGradient>
<circle cx="15" cy="12.13" fill="url(#SVGID_5__)" r="7.657"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6__" x1="15" x2="15" y1="5.772" y2="18.45">
+
<stop offset="0" stop-color="#1A1A1A"/>
+
<stop offset="0.503" stop-color="#343434"/>
+
<stop offset="0.7515" stop-color="#9E9E9E"/>
+
<stop offset="1" stop-color="#CFCFCF"/>
+
</linearGradient>
<path d="M15,18.51c-1.706-0.001-3.309-0.666-4.514-1.871-1.204-1.206-1.867-2.808-1.867-4.512,0-3.517,2.862-6.378,6.382-6.378,1.706,0,3.308,0.664,4.513,1.871,1.205,1.205,1.868,2.808,1.867,4.513,0,3.51-2.86,6.37-6.38,6.37z" fill="url(#SVGID_6__)"/>
<radialGradient cx="25.77" cy="10.27" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="6.499">
+
<stop offset="0" stop-color="#000000"/>
+
<stop offset="0.5917" stop-color="#000000"/>
+
<stop offset="0.627" stop-color="#050505"/>
+
<stop offset="0.7652" stop-color="#121212"/>
+
<stop offset="0.8876" stop-color="#171717"/>
+
<stop offset="1" stop-color="#171717"/>
+
</radialGradient>
<path d="M20.74,12.14c0,3.172-2.574,5.74-5.744,5.74-3.175-0.001-5.743-2.573-5.741-5.745,0-3.171,2.573-5.742,5.745-5.74,3.17-0.009,5.74,2.562,5.74,5.74z" fill="url(#SVGID_7_)"/>
<radialGradient cx="21.65" cy="5.066" gradientTransform="matrix(1.0143 0 0 1.0141 -9.5579 3.1299)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="10.35">
+
<stop offset="0" stop-color="#242424"/>
+
<stop offset="0.4303" stop-color="#242424"/>
+
<stop offset="0.7818" stop-color="#000000"/>
+
<stop offset="1" stop-color="#000000"/>
+
</radialGradient>
<circle cx="15" cy="12.13" fill="url(#SVGID_8_)" r="4.712"/>
<radialGradient cx="23.96" cy="3.55" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="11.36">
+
<stop offset="0" stop-color="#A700F5"/>
+
<stop offset="0.3091" stop-color="#A700F5"/>
+
<stop offset="0.4364" stop-color="#5E008A"/>
+
<stop offset="0.8061" stop-color="#0E1402"/>
+
<stop offset="1" stop-color="#0E1402"/>
+
</radialGradient>
<path d="M19.21,12.13c0,2.326-1.886,4.21-4.212,4.21-2.326-0.002-4.213-1.888-4.213-4.212,0.004-2.327,1.89-4.21,4.213-4.21,2.33,0.003,4.21,1.888,4.21,4.21z" fill="url(#SVGID_9_)"/>
<radialGradient cx="25.17" cy="13.25" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="4.611">
+
<stop offset="0" stop-color="#48630C"/>
+
<stop offset="0.7879" stop-color="#000000"/>
+
<stop offset="1" stop-color="#000000"/>
+
</radialGradient>
<path d="M19.21,12.13c0,2.326-1.886,4.21-4.212,4.21-2.326-0.002-4.213-1.888-4.213-4.212,0,0,1.444,2.569,4.213,2.569,2.77,0,4.21-2.57,4.21-2.57z" fill="url(#SVGID_10_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="14.98" x2="14.98" y1="7.065" y2="12.09">
+
<stop offset="0" stop-color="#F8FBFF"/>
+
<stop offset="1" stop-color="#808080"/>
+
</linearGradient>
<path d="M14.98,12.07c1.828,0,3.549-0.277,5.067-0.765-0.431-2.41-2.532-4.239-5.067-4.239-2.532,0-4.632,1.83-5.065,4.239,1.515,0.49,3.235,0.77,5.065,0.77z" fill="url(#SVGID_11_)" fill-opacity="0.35" stroke-opacity="0.35"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="5.762" x2="24.29" y1="26.72" y2="26.72">
+
<stop offset="0" stop-color="#878A8C"/>
+
<stop offset="0.2606" stop-color="#BDC2C4"/>
+
<stop offset="0.6606" stop-color="#5B6163"/>
+
<stop offset="1" stop-color="#959A9C"/>
+
</linearGradient>
<path d="M24.24,28c0.025-0.635,0.04-0.508,0.04-0.639v-0.035c0-1.037-0.852-1.879-1.901-1.879h-14.72c-1.05,0-1.9,0.842-1.9,1.879v0.035c0,0.131,0.014,0.004,0.04,0.639h18.44z" fill="url(#SVGID_12_)"/>
<path d="M5.879,26.7h18.29c-0.084-0.234-0.212-0.444-0.377-0.626h-17.53c-0.164,0.19-0.293,0.4-0.377,0.63z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
@@ -152,4 +210,4 @@
<path d="M6.255,26.07h17.54c-0.348-0.383-0.846-0.627-1.407-0.627h-14.72c-0.56,0.01-1.059,0.25-1.407,0.63z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_download.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_download.svg Fri May 14 16:09:54 2010 +0300
@@ -1,44 +1,48 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<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"/>
+ <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="M56.506,7.6H3.493C2.666,7.6,2,8.27,2,9.094v41.813C2,51.732,2.666,52.4,3.493,52.4h53.013 C57.33,52.4,58,51.732,58,50.906V9.094C58,8.27,57.33,7.6,56.506,7.6z M8.719,49.413c0,0.412-0.336,0.748-0.745,0.748H4.986 c-0.412,0-0.748-0.336-0.748-0.748V47.92c0-0.41,0.336-0.746,0.748-0.746h2.987c0.409,0,0.745,0.336,0.745,0.746V49.413z M8.719,12.08c0,0.41-0.336,0.746-0.745,0.746H4.986c-0.412,0-0.748-0.336-0.748-0.746v-1.493c0-0.409,0.336-0.748,0.748-0.748 h2.987c0.409,0,0.745,0.339,0.745,0.748V12.08z M15.438,49.413c0,0.412-0.335,0.748-0.745,0.748h-2.987 c-0.412,0-0.747-0.336-0.747-0.748V47.92c0-0.41,0.335-0.746,0.747-0.746h2.987c0.41,0,0.745,0.336,0.745,0.746V49.413z M15.438,12.08c0,0.41-0.335,0.746-0.745,0.746h-2.987c-0.412,0-0.747-0.336-0.747-0.746v-1.493c0-0.409,0.335-0.748,0.747-0.748 h2.987c0.41,0,0.745,0.339,0.745,0.748V12.08z M22.159,49.413c0,0.412-0.337,0.748-0.747,0.748h-2.986 c-0.41,0-0.746-0.336-0.746-0.748V47.92c0-0.41,0.335-0.746,0.746-0.746h2.986c0.41,0,0.747,0.336,0.747,0.746V49.413z M22.159,12.08c0,0.41-0.337,0.746-0.747,0.746h-2.986c-0.41,0-0.746-0.336-0.746-0.746v-1.493c0-0.409,0.335-0.748,0.746-0.748 h2.986c0.41,0,0.747,0.339,0.747,0.748V12.08z M28.88,49.413c0,0.412-0.337,0.748-0.747,0.748h-2.986 c-0.411,0-0.746-0.336-0.746-0.748V47.92c0-0.41,0.335-0.746,0.746-0.746h2.986c0.41,0,0.747,0.336,0.747,0.746V49.413z M28.88,12.08c0,0.41-0.337,0.746-0.747,0.746h-2.986c-0.411,0-0.746-0.336-0.746-0.746v-1.493c0-0.409,0.335-0.748,0.746-0.748 h2.986c0.41,0,0.747,0.339,0.747,0.748V12.08z M35.6,49.413c0,0.412-0.338,0.748-0.747,0.748h-2.985 c-0.412,0-0.748-0.336-0.748-0.748V47.92c0-0.41,0.336-0.746,0.748-0.746h2.985c0.409,0,0.747,0.336,0.747,0.746V49.413z M35.6,12.08c0,0.41-0.338,0.746-0.747,0.746h-2.985c-0.412,0-0.748-0.336-0.748-0.746v-1.493c0-0.409,0.336-0.748,0.748-0.748 h2.985c0.409,0,0.747,0.339,0.747,0.748V12.08z M42.318,49.413c0,0.412-0.335,0.748-0.745,0.748h-2.987 c-0.412,0-0.746-0.336-0.746-0.748V47.92c0-0.41,0.334-0.746,0.746-0.746h2.987c0.41,0,0.745,0.336,0.745,0.746V49.413z M42.318,12.08c0,0.41-0.335,0.746-0.745,0.746h-2.987c-0.412,0-0.746-0.336-0.746-0.746v-1.493c0-0.409,0.334-0.748,0.746-0.748 h2.987c0.41,0,0.745,0.339,0.745,0.748V12.08z M49.039,49.413c0,0.412-0.336,0.748-0.746,0.748h-2.987 c-0.41,0-0.745-0.336-0.745-0.748V47.92c0-0.41,0.335-0.746,0.745-0.746h2.987c0.41,0,0.746,0.336,0.746,0.746V49.413z M49.039,12.08c0,0.41-0.336,0.746-0.746,0.746h-2.987c-0.41,0-0.745-0.336-0.745-0.746v-1.493c0-0.409,0.335-0.748,0.745-0.748 h2.987c0.41,0,0.746,0.339,0.746,0.748V12.08z M55.761,49.413c0,0.412-0.339,0.748-0.748,0.748h-2.987 c-0.41,0-0.745-0.336-0.745-0.748V47.92c0-0.41,0.335-0.746,0.745-0.746h2.987c0.409,0,0.748,0.336,0.748,0.746V49.413z M55.761,12.08c0,0.41-0.339,0.746-0.748,0.746h-2.987c-0.41,0-0.745-0.336-0.745-0.746v-1.493c0-0.409,0.335-0.748,0.745-0.748 h2.987c0.409,0,0.748,0.339,0.748,0.748V12.08z" fill="url(#SVGID_1_)"/>
-<path d="M56.506,7.6H3.493C2.666,7.6,2,8.27,2,9.094v0.745 c0-0.824,0.666-1.493,1.493-1.493h53.013C57.33,8.346,58,9.015,58,9.839V9.094C58,8.27,57.33,7.6,56.506,7.6z" fill="#FFFFFF" fill-opacity="0.55" stroke-opacity="0.55"/>
-<path d="M3.493,52.4h53.013C57.33,52.4,58,51.732,58,50.906v-0.745 c0,0.824-0.67,1.493-1.494,1.493H3.493C2.666,51.654,2,50.985,2,50.161v0.745C2,51.732,2.666,52.4,3.493,52.4z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M56.506,7.6H3.493C2.666,7.6,2,8.27,2,9.094v0.745 c0-0.824,0.666-1.493,1.493-1.493h53.013C57.33,8.346,58,9.015,58,9.839V9.094C58,8.27,57.33,7.6,56.506,7.6z" enable-background="new " fill="#FFFFFF" opacity="0.55"/>
+<path d="M3.493,52.4h53.013C57.33,52.4,58,51.732,58,50.906v-0.745 c0,0.824-0.67,1.493-1.494,1.493H3.493C2.666,51.654,2,50.985,2,50.161v0.745C2,51.732,2.666,52.4,3.493,52.4z" enable-background="new " fill="#FFFFFF" opacity="0.1"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2164" x2="-2164" y1="3641.7637" y2="3611.8926">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="0.5" style="stop-color:#666666"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="0.5" style="stop-color:#666666"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
<rect fill="url(#SVGID_2_)" height="29.871" width="56" x="2" y="15.064"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2164.0005" x2="-2164.0005" y1="3612.0117" y2="3641.8828">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</linearGradient>
<path d="M55.761,43.441c0,0.821-0.673,1.494-1.493,1.494H5.732c-0.82,0-1.494-0.673-1.494-1.494V16.559 c0-0.819,0.674-1.494,1.494-1.494h48.535c0.82,0,1.493,0.675,1.493,1.494V43.441z" fill="url(#SVGID_3_)"/>
-<path d="M54.268,43.441H5.732c-0.82,0-1.494,0.074-1.494-0.748l0,0 c0,0.822,0.674,1.493,1.494,1.493h48.535c0.82,0,1.493-0.671,1.493-1.493l0,0C55.761,43.516,55.088,43.441,54.268,43.441z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M54.268,43.441H5.732c-0.82,0-1.494,0.074-1.494-0.748l0,0 c0,0.822,0.674,1.493,1.494,1.493h48.535c0.82,0,1.493-0.671,1.493-1.493l0,0C55.761,43.516,55.088,43.441,54.268,43.441z" enable-background="new " fill="#FFFFFF" opacity="0.5"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-2164.0005" x2="-2164.0005" y1="3641.8828" y2="3611.8926">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#404040"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#404040"/>
</linearGradient>
<path d="M54.268,15.813c0.41,0,0.745,0.336,0.745,0.745v26.883c0,0.412-0.335,0.745-0.745,0.745H5.732 c-0.411,0-0.746-0.333-0.746-0.745V16.559c0-0.409,0.335-0.745,0.746-0.745H54.268 M54.268,15.064H5.732 c-0.82,0-1.494,0.675-1.494,1.494v26.883c0,0.821,0.674,1.494,1.494,1.494h48.535c0.82,0,1.493-0.673,1.493-1.494V16.559 C55.761,15.739,55.088,15.064,54.268,15.064L54.268,15.064z" fill="url(#SVGID_4_)"/>
-<path d="M54.268,24.025v-5.974c0-0.824-0.67-1.493-1.494-1.493H7.226 c-0.824,0-1.493,0.669-1.493,1.493v9.709L54.268,24.025z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M54.268,24.025v-5.974c0-0.824-0.67-1.493-1.494-1.493H7.226 c-0.824,0-1.493,0.669-1.493,1.493v9.709L54.268,24.025z" enable-background="new " fill="#FFFFFF" opacity="0.2"/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<polygon fill="none" points="30.096,0 0.096,0 0.096,14.833 0,14.833 0.096,14.933 0.096,30 14.601,30 15.021,30.438 15.447,30 30.096,30 30.096,14.963 30.215,14.841 30.096,14.841 "/>
-<polygon fill-opacity="0.35" points="0,14.833 3.596,14.828 3.625,14.859 8.375,14.859 8.375,0 21.73,0.001 21.73,14.843 30.215,14.841 15.021,30.438 " stroke-opacity="0.35"/>
+<polygon opacity="0.35" points="0,14.833 3.596,14.828 3.625,14.859 8.375,14.859 8.375,0 21.73,0.001 21.73,14.843 30.215,14.841 15.021,30.438 "/>
<linearGradient gradientTransform="matrix(1 1.000000e-004 1.000000e-004 -1 2191.3389 2985.8491)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-2176.5142" x2="-2176.5142" y1="2984.646" y2="2957.3247">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+ <stop offset="0" style="stop-color:#C6FF45"/>
+ <stop offset="0.7273" style="stop-color:#66A00E"/>
+ <stop offset="1" style="stop-color:#387300"/>
</linearGradient>
<polygon fill="url(#SVGID_1__)" points="2.846,15.859 15.025,28.575 27.398,15.845 20.732,15.843 20.727,1.292 9.375,1.291 9.375,15.859 "/>
<line fill="none" x1="20.727" x2="9.375" y1="1.297" y2="1.296"/>
@@ -46,10 +50,10 @@
<polygon fill="#E7FFB9" points="20.555,15.867 27.527,15.867 27,16.458 20.555,16.458 "/>
<polygon fill="#E7FFB9" points="2.459,15.859 9.365,15.859 9.365,16.451 3.08,16.451 "/>
<linearGradient gradientTransform="matrix(1 1.000000e-004 1.000000e-004 -1 2191.3389 2985.8491)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-2165.6621" x2="-2187.9482" y1="2963.2173" y2="2963.2173">
-<stop offset="0" style="stop-color:#AAE535"/>
-<stop offset="1" style="stop-color:#5D9C0A"/>
+ <stop offset="0" style="stop-color:#AAE535"/>
+ <stop offset="1" style="stop-color:#5D9C0A"/>
</linearGradient>
<polygon fill="url(#SVGID_2__)" points="27.016,15.844 15.025,28.15 3.172,15.829 2.348,15.83 15.025,29 27.842,15.844 "/>
<rect fill="none" height="30" width="30" x="0.096"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_missed_call.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_missed_call.svg Fri May 14 16:09:54 2010 +0300
@@ -1,150 +1,210 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<stop offset="0" style="stop-color:#3AC5EA"/>
-<stop offset="0.297" style="stop-color:#3AC5EA"/>
-<stop offset="0.6667" style="stop-color:#1754C9"/>
-<stop offset="0.7939" style="stop-color:#33ADE1"/>
-<stop offset="1" style="stop-color:#33ADE1"/>
+ <stop offset="0.297" style="stop-color:#3AC5EA"/>
+ <stop offset="0.6667" style="stop-color:#1754C9"/>
+ <stop offset="0.7939" style="stop-color:#33ADE1"/>
</radialGradient>
<path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333c-0.617-0.665-2.567-3.083-2.968-3.735 c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956c6.191-6.192,9.085-7.646,9.956-8.107 c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967c0.534,0.492,0.872,0.588,1.299,0.274 c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778c-2.476-2.889-8.594-5.015-10.751-5.399 c-1.923-0.345-3.876-0.872-6.567,0.235c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352 c-1.108,2.691-0.581,4.645-0.236,6.567c0.386,2.158,2.51,8.275,5.399,10.752c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2070.7568" x2="-2070.3252" y1="-2266.8511" y2="-2263.2749">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+ <stop offset="0" style="stop-color:#2685D2"/>
+ <stop offset="1" style="stop-color:#081D45"/>
</linearGradient>
<path d="M35.172,17.108c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967 c0.534,0.492,0.872,0.588,1.299,0.274c0.048-0.035,0.062-0.046,0.064-0.046c0.253-0.184,1.032-0.738,2.12-1.514 c-0.251-0.204-3.468-2.809-4.8-2.956C36.857,15.598,35.172,17.108,35.172,17.108z" fill="url(#SVGID_2_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -2128.2356 5114.0977)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2070.7607" x2="-2070.3289" y1="5104.5752" y2="5108.1523">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+ <stop offset="0" style="stop-color:#2685D2"/>
+ <stop offset="1" style="stop-color:#081D45"/>
</linearGradient>
<path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.713c0.376,0.666,2.351,3.069,2.967,3.738 c0.493,0.531,0.587,0.869,0.274,1.298c-0.035,0.047-0.046,0.062-0.046,0.062c-0.183,0.253-0.738,1.032-1.515,2.119 c-0.204-0.252-2.807-3.467-2.956-4.799C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="47.9224" x2="3.9991" y1="3.9307" y2="47.854">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+ <stop offset="0" style="stop-color:#ABEEFF"/>
+ <stop offset="1" style="stop-color:#539FDE"/>
</linearGradient>
-<path d="M2.979,47.467c-0.344-1.925-0.873-3.878,0.235-6.567 c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.341,4.269,40.9,3.215c2.691-1.108,4.644-0.581,6.567-0.236 c1.981,0.354,7.296,2.178,10.069,4.711c-2.552-2.815-8.496-4.879-10.617-5.258c-1.923-0.345-3.876-0.872-6.567,0.235 c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567 c0.378,2.122,2.441,8.065,5.258,10.617C5.156,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M2.979,47.467c-0.344-1.925-0.873-3.878,0.235-6.567 c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.341,4.269,40.9,3.215c2.691-1.108,4.644-0.581,6.567-0.236 c1.981,0.354,7.296,2.178,10.069,4.711c-2.552-2.815-8.496-4.879-10.617-5.258c-1.923-0.345-3.876-0.872-6.567,0.235 c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567 c0.378,2.122,2.441,8.065,5.258,10.617C5.156,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="54.3535" x2="3.9474" y1="3.2017" y2="53.6078">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+ <stop offset="0" style="stop-color:#ABEEFF"/>
+ <stop offset="1" style="stop-color:#539FDE"/>
</linearGradient>
-<path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333 c-0.617-0.665-2.567-3.083-2.968-3.735c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956 c6.191-6.192,9.085-7.646,9.956-8.107c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967 c0.534,0.492,0.872,0.588,1.299,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778 c-0.292-0.339-0.634-0.665-1.013-0.982c0.49,0.657,0.198,1.134-0.607,1.666C54.65,9.447,41.576,18.739,40.825,19.29 c-0.431,0.314-0.767,0.219-1.3-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.948-0.436-1.71-0.034 c-0.871,0.46-3.764,1.914-9.956,8.106c-6.193,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.319,1.135,0.035,1.711 c0.4,0.651,2.351,3.069,2.967,3.736c0.493,0.533,0.559,0.896,0.259,1.332c-0.517,0.755-9.828,13.794-10.76,15.195 c-0.533,0.803-1.008,1.098-1.665,0.606c0.314,0.378,0.644,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_5_)" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333 c-0.617-0.665-2.567-3.083-2.968-3.735c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956 c6.191-6.192,9.085-7.646,9.956-8.107c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967 c0.534,0.492,0.872,0.588,1.299,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778 c-0.292-0.339-0.634-0.665-1.013-0.982c0.49,0.657,0.198,1.134-0.607,1.666C54.65,9.447,41.576,18.739,40.825,19.29 c-0.431,0.314-0.767,0.219-1.3-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.948-0.436-1.71-0.034 c-0.871,0.46-3.764,1.914-9.956,8.106c-6.193,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.319,1.135,0.035,1.711 c0.4,0.651,2.351,3.069,2.967,3.736c0.493,0.533,0.559,0.896,0.259,1.332c-0.517,0.755-9.828,13.794-10.76,15.195 c-0.533,0.803-1.008,1.098-1.665,0.606c0.314,0.378,0.644,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_5_)" opacity="0.6"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -141.776 3075.0667)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-2041.9355" x2="-2041.9355" y1="-2305.2153" y2="-2243.2966">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="0.5091" style="stop-color:#081D45"/>
-<stop offset="1" style="stop-color:#2275BD"/>
+ <stop offset="0" style="stop-color:#2685D2"/>
+ <stop offset="0.5091" style="stop-color:#081D45"/>
+ <stop offset="1" style="stop-color:#2275BD"/>
</linearGradient>
<path d="M2.899,45.012c1.275-2.777,10.299-14.804,18.804-23.31c8.505-8.506,20.532-17.529,23.308-18.803 c0.527-0.241,1.02-0.411,1.493-0.545c-0.511-0.096-1.03-0.19-1.565-0.26c-0.086,0.036-0.163,0.063-0.25,0.102 c-2.818,1.293-14.971,10.397-23.533,18.959C12.595,29.717,3.489,41.869,2.195,44.688c-0.038,0.087-0.063,0.166-0.101,0.25 c0.07,0.535,0.166,1.055,0.259,1.565C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_6_)"/>
<rect fill="none" height="60" width="60"/>
</g>
<g>
+<defs>
+</defs>
<polygon fill="none" points="15.053,0 14.626,0.439 0,0.439 0,30.439 30,30.439 30,0.439 15.476,0.439 "/>
-<path d="M24.884,30.438c-10.001,0-15.735-4.635-15.735-12.715v-4.339H2.053L15.053,0l12.88,13.385h-6.962v4.339 c0,2.189,2.56,2.768,3.913,2.768h1v9.947H24.884z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M24.884,30.438c-10.001,0-15.735-4.635-15.735-12.715v-4.339H2.053L15.053,0l12.88,13.385h-6.962v4.339 c0,2.189,2.56,2.768,3.913,2.768h1v9.947H24.884z" opacity="0.35"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3014.6338)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-2179" x2="-2179" y1="3012.1528" y2="2984.2842">
-<stop offset="0" style="stop-color:#FF7042"/>
-<stop offset="1" style="stop-color:#991B23"/>
+ <stop offset="0" style="stop-color:#FF7042"/>
+ <stop offset="1" style="stop-color:#991B23"/>
</linearGradient>
<path d="M19.971,17.724v-5.339h5.611L15.049,1.438L4.418,12.385h5.73v5.339 c0,9.024,7.509,11.715,14.735,11.715v-7.947C22.658,21.491,19.971,20.392,19.971,17.724z" fill="url(#SVGID_1__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="15" x2="15" y1="1.7129" y2="22.5894">
-<stop offset="0" style="stop-color:#FFB259"/>
-<stop offset="1" style="stop-color:#991B23"/>
+ <stop offset="0" style="stop-color:#FFB259"/>
+ <stop offset="1" style="stop-color:#991B23"/>
</linearGradient>
<polygon fill="url(#SVGID_2__)" points="15.049,2.438 24.62,12.385 25.582,12.385 15.049,1.438 4.418,12.385 5.389,12.385 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="22.4268" x2="22.4268" y1="1.7129" y2="22.5894">
-<stop offset="0" style="stop-color:#FF7042"/>
-<stop offset="1" style="stop-color:#991B23"/>
+ <stop offset="0" style="stop-color:#FF7042"/>
+ <stop offset="1" style="stop-color:#991B23"/>
</linearGradient>
<path d="M19.971,17.724v1c0,2.668,2.688,3.768,4.913,3.768v-1C22.658,21.491,19.971,20.392,19.971,17.724z" fill="url(#SVGID_3__)"/>
<rect fill="none" height="30" width="30" y="0.439"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1___" x1="12.38" x2="17.62" y1="23.65" y2="23.65">
+
<stop offset="0" stop-color="#878A8C"/>
+
<stop offset="0.2606" stop-color="#BDC2C4"/>
+
<stop offset="0.6606" stop-color="#5B6163"/>
+
<stop offset="1" stop-color="#959A9C"/>
+
</linearGradient>
<rect fill="url(#SVGID_1___)" height="7.853" width="5.105" x="12.45" y="19.72"/>
<path d="M12.45,24.66c0.82,0.199,1.673,0.315,2.553,0.315,0.881,0,1.732-0.116,2.553-0.315v-4.294h-5.105v4.285z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
<path d="M12.45,24.02c0.82,0.199,1.673,0.315,2.553,0.315,0.881,0,1.732-0.116,2.553-0.315v-4.294h-5.105v4.288z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2___" x1="15" x2="15" y1="1.975" y2="23.67">
+
<stop offset="0" stop-color="#F2F2F2"/>
+
<stop offset="0.3212" stop-color="#E6E6E6"/>
+
<stop offset="1" stop-color="#666666"/>
+
</linearGradient>
<path d="M15,23.7c-5.98,0-10.85-4.867-10.85-10.85s4.87-10.85,10.85-10.85c5.982,0,10.85,4.866,10.85,10.85s-4.87,10.85-10.85,10.85z" fill="url(#SVGID_2___)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3___" x1="15" x2="15" y1="2.614" y2="23.03">
+
<stop offset="0" stop-color="#D1D7D9"/>
+
<stop offset="0.0667" stop-color="#D1D7D9"/>
+
<stop offset="0.2606" stop-color="#BDC2C4"/>
+
<stop offset="0.6606" stop-color="#7C8487"/>
+
<stop offset="1" stop-color="#ADB3B5"/>
+
</linearGradient>
<circle cx="15" cy="12.85" fill="url(#SVGID_3___)" r="10.21"/>
<path d="M15,21.99c-5.315,0-9.657-4.23-9.843-9.5-0.004,0.116-0.009,0.231-0.009,0.349,0,5.431,4.419,9.851,9.852,9.851s9.852-4.42,9.852-9.851c0-0.117-0.005-0.232-0.009-0.349-0.18,5.27-4.52,9.5-9.84,9.5z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
<path d="M23.3,12.41c0,4.704-3.715,9.346-8.299,9.345-4.58-0.003-8.292-4.646-8.291-9.35,0.002-4.706,3.718-8.517,8.298-8.517,4.57,0.001,8.29,3.814,8.29,8.517z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
<path d="M15,21.07c-2.387-0.002-4.63-0.932-6.315-2.619-1.688-1.688-2.615-3.932-2.614-6.318,0-4.923,4.009-8.929,8.935-8.929,2.387,0,4.632,0.931,6.317,2.618,1.688,1.688,2.616,3.933,2.615,6.318-0.002,4.924-4.01,8.93-8.934,8.93h-0.014z" fill="#231F20" fill-opacity="0.2" stroke-opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="15" x2="15" y1="3.721" y2="20.35">
+
<stop offset="0" stop-color="#CFCFCF"/>
+
<stop offset="0.1091" stop-color="#CFCFCF"/>
+
<stop offset="0.6848" stop-color="#121212"/>
+
<stop offset="1" stop-color="#A6A6A6"/>
+
</linearGradient>
<path d="M15,20.43c-2.216-0.002-4.298-0.864-5.864-2.432-1.567-1.566-2.428-3.65-2.427-5.866,0-4.573,3.723-8.293,8.296-8.293,2.218,0.001,4.3,0.864,5.866,2.432s2.43,3.651,2.428,5.867c-0.001,4.573-3.723,8.292-8.295,8.292h-0.004z" fill="url(#SVGID_4__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="15" x2="15" y1="4.368" y2="19.72">
+
<stop offset="0" stop-color="#F2F2F2"/>
+
<stop offset="1" stop-color="#606769"/>
+
</linearGradient>
<circle cx="15" cy="12.13" fill="url(#SVGID_5__)" r="7.657"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6__" x1="15" x2="15" y1="5.772" y2="18.45">
+
<stop offset="0" stop-color="#1A1A1A"/>
+
<stop offset="0.503" stop-color="#343434"/>
+
<stop offset="0.7515" stop-color="#9E9E9E"/>
+
<stop offset="1" stop-color="#CFCFCF"/>
+
</linearGradient>
<path d="M15,18.51c-1.706-0.001-3.309-0.666-4.514-1.871-1.204-1.206-1.867-2.808-1.867-4.512,0-3.517,2.862-6.378,6.382-6.378,1.706,0,3.308,0.664,4.513,1.871,1.205,1.205,1.868,2.808,1.867,4.513,0,3.51-2.86,6.37-6.38,6.37z" fill="url(#SVGID_6__)"/>
<radialGradient cx="25.77" cy="10.27" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="6.499">
+
<stop offset="0" stop-color="#000000"/>
+
<stop offset="0.5917" stop-color="#000000"/>
+
<stop offset="0.627" stop-color="#050505"/>
+
<stop offset="0.7652" stop-color="#121212"/>
+
<stop offset="0.8876" stop-color="#171717"/>
+
<stop offset="1" stop-color="#171717"/>
+
</radialGradient>
<path d="M20.74,12.14c0,3.172-2.574,5.74-5.744,5.74-3.175-0.001-5.743-2.573-5.741-5.745,0-3.171,2.573-5.742,5.745-5.74,3.17-0.009,5.74,2.562,5.74,5.74z" fill="url(#SVGID_7_)"/>
<radialGradient cx="21.65" cy="5.066" gradientTransform="matrix(1.0143 0 0 1.0141 -9.5579 3.1299)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="10.35">
+
<stop offset="0" stop-color="#242424"/>
+
<stop offset="0.4303" stop-color="#242424"/>
+
<stop offset="0.7818" stop-color="#000000"/>
+
<stop offset="1" stop-color="#000000"/>
+
</radialGradient>
<circle cx="15" cy="12.13" fill="url(#SVGID_8_)" r="4.712"/>
<radialGradient cx="23.96" cy="3.55" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="11.36">
+
<stop offset="0" stop-color="#A700F5"/>
+
<stop offset="0.3091" stop-color="#A700F5"/>
+
<stop offset="0.4364" stop-color="#5E008A"/>
+
<stop offset="0.8061" stop-color="#0E1402"/>
+
<stop offset="1" stop-color="#0E1402"/>
+
</radialGradient>
<path d="M19.21,12.13c0,2.326-1.886,4.21-4.212,4.21-2.326-0.002-4.213-1.888-4.213-4.212,0.004-2.327,1.89-4.21,4.213-4.21,2.33,0.003,4.21,1.888,4.21,4.21z" fill="url(#SVGID_9_)"/>
<radialGradient cx="25.17" cy="13.25" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="4.611">
+
<stop offset="0" stop-color="#48630C"/>
+
<stop offset="0.7879" stop-color="#000000"/>
+
<stop offset="1" stop-color="#000000"/>
+
</radialGradient>
<path d="M19.21,12.13c0,2.326-1.886,4.21-4.212,4.21-2.326-0.002-4.213-1.888-4.213-4.212,0,0,1.444,2.569,4.213,2.569,2.77,0,4.21-2.57,4.21-2.57z" fill="url(#SVGID_10_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="14.98" x2="14.98" y1="7.065" y2="12.09">
+
<stop offset="0" stop-color="#F8FBFF"/>
+
<stop offset="1" stop-color="#808080"/>
+
</linearGradient>
<path d="M14.98,12.07c1.828,0,3.549-0.277,5.067-0.765-0.431-2.41-2.532-4.239-5.067-4.239-2.532,0-4.632,1.83-5.065,4.239,1.515,0.49,3.235,0.77,5.065,0.77z" fill="url(#SVGID_11_)" fill-opacity="0.35" stroke-opacity="0.35"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="5.762" x2="24.29" y1="26.72" y2="26.72">
+
<stop offset="0" stop-color="#878A8C"/>
+
<stop offset="0.2606" stop-color="#BDC2C4"/>
+
<stop offset="0.6606" stop-color="#5B6163"/>
+
<stop offset="1" stop-color="#959A9C"/>
+
</linearGradient>
<path d="M24.24,28c0.025-0.635,0.04-0.508,0.04-0.639v-0.035c0-1.037-0.852-1.879-1.901-1.879h-14.72c-1.05,0-1.9,0.842-1.9,1.879v0.035c0,0.131,0.014,0.004,0.04,0.639h18.44z" fill="url(#SVGID_12_)"/>
<path d="M5.879,26.7h18.29c-0.084-0.234-0.212-0.444-0.377-0.626h-17.53c-0.164,0.19-0.293,0.4-0.377,0.63z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
@@ -152,4 +212,4 @@
<path d="M6.255,26.07h17.54c-0.348-0.383-0.846-0.627-1.407-0.627h-14.72c-0.56,0.01-1.059,0.25-1.407,0.63z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_player.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_player.svg Fri May 14 16:09:54 2010 +0300
@@ -1,56 +1,60 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<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"/>
+ <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="M56.506,7.6H3.493C2.666,7.6,2,8.27,2,9.094v41.813C2,51.732,2.666,52.4,3.493,52.4h53.013 C57.33,52.4,58,51.732,58,50.906V9.094C58,8.27,57.33,7.6,56.506,7.6z M8.719,49.413c0,0.412-0.336,0.748-0.745,0.748H4.986 c-0.412,0-0.748-0.336-0.748-0.748V47.92c0-0.41,0.336-0.746,0.748-0.746h2.987c0.409,0,0.745,0.336,0.745,0.746V49.413z M8.719,12.08c0,0.41-0.336,0.746-0.745,0.746H4.986c-0.412,0-0.748-0.336-0.748-0.746v-1.493c0-0.409,0.336-0.748,0.748-0.748 h2.987c0.409,0,0.745,0.339,0.745,0.748V12.08z M15.438,49.413c0,0.412-0.335,0.748-0.745,0.748h-2.987 c-0.412,0-0.747-0.336-0.747-0.748V47.92c0-0.41,0.335-0.746,0.747-0.746h2.987c0.41,0,0.745,0.336,0.745,0.746V49.413z M15.438,12.08c0,0.41-0.335,0.746-0.745,0.746h-2.987c-0.412,0-0.747-0.336-0.747-0.746v-1.493c0-0.409,0.335-0.748,0.747-0.748 h2.987c0.41,0,0.745,0.339,0.745,0.748V12.08z M22.159,49.413c0,0.412-0.337,0.748-0.747,0.748h-2.986 c-0.41,0-0.746-0.336-0.746-0.748V47.92c0-0.41,0.335-0.746,0.746-0.746h2.986c0.41,0,0.747,0.336,0.747,0.746V49.413z M22.159,12.08c0,0.41-0.337,0.746-0.747,0.746h-2.986c-0.41,0-0.746-0.336-0.746-0.746v-1.493c0-0.409,0.335-0.748,0.746-0.748 h2.986c0.41,0,0.747,0.339,0.747,0.748V12.08z M28.88,49.413c0,0.412-0.337,0.748-0.747,0.748h-2.986 c-0.411,0-0.746-0.336-0.746-0.748V47.92c0-0.41,0.335-0.746,0.746-0.746h2.986c0.41,0,0.747,0.336,0.747,0.746V49.413z M28.88,12.08c0,0.41-0.337,0.746-0.747,0.746h-2.986c-0.411,0-0.746-0.336-0.746-0.746v-1.493c0-0.409,0.335-0.748,0.746-0.748 h2.986c0.41,0,0.747,0.339,0.747,0.748V12.08z M35.6,49.413c0,0.412-0.338,0.748-0.747,0.748h-2.985 c-0.412,0-0.748-0.336-0.748-0.748V47.92c0-0.41,0.336-0.746,0.748-0.746h2.985c0.409,0,0.747,0.336,0.747,0.746V49.413z M35.6,12.08c0,0.41-0.338,0.746-0.747,0.746h-2.985c-0.412,0-0.748-0.336-0.748-0.746v-1.493c0-0.409,0.336-0.748,0.748-0.748 h2.985c0.409,0,0.747,0.339,0.747,0.748V12.08z M42.318,49.413c0,0.412-0.335,0.748-0.745,0.748h-2.987 c-0.412,0-0.746-0.336-0.746-0.748V47.92c0-0.41,0.334-0.746,0.746-0.746h2.987c0.41,0,0.745,0.336,0.745,0.746V49.413z M42.318,12.08c0,0.41-0.335,0.746-0.745,0.746h-2.987c-0.412,0-0.746-0.336-0.746-0.746v-1.493c0-0.409,0.334-0.748,0.746-0.748 h2.987c0.41,0,0.745,0.339,0.745,0.748V12.08z M49.039,49.413c0,0.412-0.336,0.748-0.746,0.748h-2.987 c-0.41,0-0.745-0.336-0.745-0.748V47.92c0-0.41,0.335-0.746,0.745-0.746h2.987c0.41,0,0.746,0.336,0.746,0.746V49.413z M49.039,12.08c0,0.41-0.336,0.746-0.746,0.746h-2.987c-0.41,0-0.745-0.336-0.745-0.746v-1.493c0-0.409,0.335-0.748,0.745-0.748 h2.987c0.41,0,0.746,0.339,0.746,0.748V12.08z M55.761,49.413c0,0.412-0.339,0.748-0.748,0.748h-2.987 c-0.41,0-0.745-0.336-0.745-0.748V47.92c0-0.41,0.335-0.746,0.745-0.746h2.987c0.409,0,0.748,0.336,0.748,0.746V49.413z M55.761,12.08c0,0.41-0.339,0.746-0.748,0.746h-2.987c-0.41,0-0.745-0.336-0.745-0.746v-1.493c0-0.409,0.335-0.748,0.745-0.748 h2.987c0.409,0,0.748,0.339,0.748,0.748V12.08z" fill="url(#SVGID_1_)"/>
-<path d="M56.506,7.6H3.493C2.666,7.6,2,8.27,2,9.094v0.745 c0-0.824,0.666-1.493,1.493-1.493h53.013C57.33,8.346,58,9.015,58,9.839V9.094C58,8.27,57.33,7.6,56.506,7.6z" fill="#FFFFFF" fill-opacity="0.55" stroke-opacity="0.55"/>
-<path d="M3.493,52.4h53.013C57.33,52.4,58,51.732,58,50.906v-0.745 c0,0.824-0.67,1.493-1.494,1.493H3.493C2.666,51.654,2,50.985,2,50.161v0.745C2,51.732,2.666,52.4,3.493,52.4z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M56.506,7.6H3.493C2.666,7.6,2,8.27,2,9.094v0.745 c0-0.824,0.666-1.493,1.493-1.493h53.013C57.33,8.346,58,9.015,58,9.839V9.094C58,8.27,57.33,7.6,56.506,7.6z" enable-background="new " fill="#FFFFFF" opacity="0.55"/>
+<path d="M3.493,52.4h53.013C57.33,52.4,58,51.732,58,50.906v-0.745 c0,0.824-0.67,1.493-1.494,1.493H3.493C2.666,51.654,2,50.985,2,50.161v0.745C2,51.732,2.666,52.4,3.493,52.4z" enable-background="new " fill="#FFFFFF" opacity="0.1"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2164" x2="-2164" y1="3641.7637" y2="3611.8926">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="0.5" style="stop-color:#666666"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="0.5" style="stop-color:#666666"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
<rect fill="url(#SVGID_2_)" height="29.871" width="56" x="2" y="15.064"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2164.0005" x2="-2164.0005" y1="3612.0117" y2="3641.8828">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</linearGradient>
<path d="M55.761,43.441c0,0.821-0.673,1.494-1.493,1.494H5.732c-0.82,0-1.494-0.673-1.494-1.494V16.559 c0-0.819,0.674-1.494,1.494-1.494h48.535c0.82,0,1.493,0.675,1.493,1.494V43.441z" fill="url(#SVGID_3_)"/>
-<path d="M54.268,43.441H5.732c-0.82,0-1.494,0.074-1.494-0.748l0,0 c0,0.822,0.674,1.493,1.494,1.493h48.535c0.82,0,1.493-0.671,1.493-1.493l0,0C55.761,43.516,55.088,43.441,54.268,43.441z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M54.268,43.441H5.732c-0.82,0-1.494,0.074-1.494-0.748l0,0 c0,0.822,0.674,1.493,1.494,1.493h48.535c0.82,0,1.493-0.671,1.493-1.493l0,0C55.761,43.516,55.088,43.441,54.268,43.441z" enable-background="new " fill="#FFFFFF" opacity="0.5"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-2164.0005" x2="-2164.0005" y1="3641.8828" y2="3611.8926">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#404040"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#404040"/>
</linearGradient>
<path d="M54.268,15.813c0.41,0,0.745,0.336,0.745,0.745v26.883c0,0.412-0.335,0.745-0.745,0.745H5.732 c-0.411,0-0.746-0.333-0.746-0.745V16.559c0-0.409,0.335-0.745,0.746-0.745H54.268 M54.268,15.064H5.732 c-0.82,0-1.494,0.675-1.494,1.494v26.883c0,0.821,0.674,1.494,1.494,1.494h48.535c0.82,0,1.493-0.673,1.493-1.494V16.559 C55.761,15.739,55.088,15.064,54.268,15.064L54.268,15.064z" fill="url(#SVGID_4_)"/>
-<path d="M54.268,24.025v-5.974c0-0.824-0.67-1.493-1.494-1.493H7.226 c-0.824,0-1.493,0.669-1.493,1.493v9.709L54.268,24.025z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M54.268,24.025v-5.974c0-0.824-0.67-1.493-1.494-1.493H7.226 c-0.824,0-1.493,0.669-1.493,1.493v9.709L54.268,24.025z" enable-background="new " fill="#FFFFFF" opacity="0.2"/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
<rect fill="none" height="30" width="30"/>
-<path d="M15,29.999C6.729,29.999,0,23.271,0,15S6.729,0.001,15,0.001c8.271,0,15,6.729,15,14.999 S23.271,29.999,15,29.999L15,29.999z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M15,29.999C6.729,29.999,0,23.271,0,15S6.729,0.001,15,0.001c8.271,0,15,6.729,15,14.999 S23.271,29.999,15,29.999L15,29.999z" opacity="0.35"/>
<linearGradient gradientTransform="matrix(0.5 0 0 0.5 579.9604 -1693.241)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-1129.9209" x2="-1129.9209" y1="3388.3521" y2="3444.3481">
-<stop offset="0" style="stop-color:#D5F5B5"/>
-<stop offset="1" style="stop-color:#40AD00"/>
+ <stop offset="0" style="stop-color:#D5F5B5"/>
+ <stop offset="1" style="stop-color:#40AD00"/>
</linearGradient>
<path d="M15,28.999C7.279,28.999,1,22.72,1,15C1,7.281,7.279,1.001,15,1.001c7.718,0,14,6.28,14,13.999 C29,22.72,22.718,28.999,15,28.999L15,28.999z" fill="url(#SVGID_1__)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 2908.0361)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-2179.0005" x2="-2179.0005" y1="2906.6362" y2="2878.8359">
-<stop offset="0" style="stop-color:#8CFF24"/>
-<stop offset="1" style="stop-color:#15570B"/>
+ <stop offset="0" style="stop-color:#8CFF24"/>
+ <stop offset="1" style="stop-color:#15570B"/>
</linearGradient>
<path d="M28.599,15c0,7.512-6.09,13.6-13.599,13.6C7.486,28.6,1.4,22.512,1.4,15C1.4,7.491,7.486,1.4,15,1.4 C22.509,1.4,28.599,7.491,28.599,15z" fill="url(#SVGID_2__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="16.5117" x2="16.5117" y1="21.3633" y2="7.2163">
-<stop offset="0" style="stop-color:#82DA3B"/>
-<stop offset="1" style="stop-color:#11470A"/>
+ <stop offset="0" style="stop-color:#82DA3B"/>
+ <stop offset="1" style="stop-color:#11470A"/>
</linearGradient>
<polygon fill="url(#SVGID_3__)" points="10.353,7.134 22.671,14.21 10.353,21.429 "/>
<polygon fill="#FFFFFF" points="11.11,8.444 22.008,14.734 11.11,21.026 "/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_podcast.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_podcast.svg Fri May 14 16:09:54 2010 +0300
@@ -1,56 +1,60 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<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"/>
+ <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="M56.506,7.6H3.493C2.666,7.6,2,8.27,2,9.094v41.813C2,51.732,2.666,52.4,3.493,52.4h53.013 C57.33,52.4,58,51.732,58,50.906V9.094C58,8.27,57.33,7.6,56.506,7.6z M8.719,49.413c0,0.412-0.336,0.748-0.745,0.748H4.986 c-0.412,0-0.748-0.336-0.748-0.748V47.92c0-0.41,0.336-0.746,0.748-0.746h2.987c0.409,0,0.745,0.336,0.745,0.746V49.413z M8.719,12.08c0,0.41-0.336,0.746-0.745,0.746H4.986c-0.412,0-0.748-0.336-0.748-0.746v-1.493c0-0.409,0.336-0.748,0.748-0.748 h2.987c0.409,0,0.745,0.339,0.745,0.748V12.08z M15.438,49.413c0,0.412-0.335,0.748-0.745,0.748h-2.987 c-0.412,0-0.747-0.336-0.747-0.748V47.92c0-0.41,0.335-0.746,0.747-0.746h2.987c0.41,0,0.745,0.336,0.745,0.746V49.413z M15.438,12.08c0,0.41-0.335,0.746-0.745,0.746h-2.987c-0.412,0-0.747-0.336-0.747-0.746v-1.493c0-0.409,0.335-0.748,0.747-0.748 h2.987c0.41,0,0.745,0.339,0.745,0.748V12.08z M22.159,49.413c0,0.412-0.337,0.748-0.747,0.748h-2.986 c-0.41,0-0.746-0.336-0.746-0.748V47.92c0-0.41,0.335-0.746,0.746-0.746h2.986c0.41,0,0.747,0.336,0.747,0.746V49.413z M22.159,12.08c0,0.41-0.337,0.746-0.747,0.746h-2.986c-0.41,0-0.746-0.336-0.746-0.746v-1.493c0-0.409,0.335-0.748,0.746-0.748 h2.986c0.41,0,0.747,0.339,0.747,0.748V12.08z M28.88,49.413c0,0.412-0.337,0.748-0.747,0.748h-2.986 c-0.411,0-0.746-0.336-0.746-0.748V47.92c0-0.41,0.335-0.746,0.746-0.746h2.986c0.41,0,0.747,0.336,0.747,0.746V49.413z M28.88,12.08c0,0.41-0.337,0.746-0.747,0.746h-2.986c-0.411,0-0.746-0.336-0.746-0.746v-1.493c0-0.409,0.335-0.748,0.746-0.748 h2.986c0.41,0,0.747,0.339,0.747,0.748V12.08z M35.6,49.413c0,0.412-0.338,0.748-0.747,0.748h-2.985 c-0.412,0-0.748-0.336-0.748-0.748V47.92c0-0.41,0.336-0.746,0.748-0.746h2.985c0.409,0,0.747,0.336,0.747,0.746V49.413z M35.6,12.08c0,0.41-0.338,0.746-0.747,0.746h-2.985c-0.412,0-0.748-0.336-0.748-0.746v-1.493c0-0.409,0.336-0.748,0.748-0.748 h2.985c0.409,0,0.747,0.339,0.747,0.748V12.08z M42.318,49.413c0,0.412-0.335,0.748-0.745,0.748h-2.987 c-0.412,0-0.746-0.336-0.746-0.748V47.92c0-0.41,0.334-0.746,0.746-0.746h2.987c0.41,0,0.745,0.336,0.745,0.746V49.413z M42.318,12.08c0,0.41-0.335,0.746-0.745,0.746h-2.987c-0.412,0-0.746-0.336-0.746-0.746v-1.493c0-0.409,0.334-0.748,0.746-0.748 h2.987c0.41,0,0.745,0.339,0.745,0.748V12.08z M49.039,49.413c0,0.412-0.336,0.748-0.746,0.748h-2.987 c-0.41,0-0.745-0.336-0.745-0.748V47.92c0-0.41,0.335-0.746,0.745-0.746h2.987c0.41,0,0.746,0.336,0.746,0.746V49.413z M49.039,12.08c0,0.41-0.336,0.746-0.746,0.746h-2.987c-0.41,0-0.745-0.336-0.745-0.746v-1.493c0-0.409,0.335-0.748,0.745-0.748 h2.987c0.41,0,0.746,0.339,0.746,0.748V12.08z M55.761,49.413c0,0.412-0.339,0.748-0.748,0.748h-2.987 c-0.41,0-0.745-0.336-0.745-0.748V47.92c0-0.41,0.335-0.746,0.745-0.746h2.987c0.409,0,0.748,0.336,0.748,0.746V49.413z M55.761,12.08c0,0.41-0.339,0.746-0.748,0.746h-2.987c-0.41,0-0.745-0.336-0.745-0.746v-1.493c0-0.409,0.335-0.748,0.745-0.748 h2.987c0.409,0,0.748,0.339,0.748,0.748V12.08z" fill="url(#SVGID_1_)"/>
-<path d="M56.506,7.6H3.493C2.666,7.6,2,8.27,2,9.094v0.745 c0-0.824,0.666-1.493,1.493-1.493h53.013C57.33,8.346,58,9.015,58,9.839V9.094C58,8.27,57.33,7.6,56.506,7.6z" fill="#FFFFFF" fill-opacity="0.55" stroke-opacity="0.55"/>
-<path d="M3.493,52.4h53.013C57.33,52.4,58,51.732,58,50.906v-0.745 c0,0.824-0.67,1.493-1.494,1.493H3.493C2.666,51.654,2,50.985,2,50.161v0.745C2,51.732,2.666,52.4,3.493,52.4z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M56.506,7.6H3.493C2.666,7.6,2,8.27,2,9.094v0.745 c0-0.824,0.666-1.493,1.493-1.493h53.013C57.33,8.346,58,9.015,58,9.839V9.094C58,8.27,57.33,7.6,56.506,7.6z" enable-background="new " fill="#FFFFFF" opacity="0.55"/>
+<path d="M3.493,52.4h53.013C57.33,52.4,58,51.732,58,50.906v-0.745 c0,0.824-0.67,1.493-1.494,1.493H3.493C2.666,51.654,2,50.985,2,50.161v0.745C2,51.732,2.666,52.4,3.493,52.4z" enable-background="new " fill="#FFFFFF" opacity="0.1"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2164" x2="-2164" y1="3641.7637" y2="3611.8926">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="0.5" style="stop-color:#666666"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="0.5" style="stop-color:#666666"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
<rect fill="url(#SVGID_2_)" height="29.871" width="56" x="2" y="15.064"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2164.0005" x2="-2164.0005" y1="3612.0117" y2="3641.8828">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</linearGradient>
<path d="M55.761,43.441c0,0.821-0.673,1.494-1.493,1.494H5.732c-0.82,0-1.494-0.673-1.494-1.494V16.559 c0-0.819,0.674-1.494,1.494-1.494h48.535c0.82,0,1.493,0.675,1.493,1.494V43.441z" fill="url(#SVGID_3_)"/>
-<path d="M54.268,43.441H5.732c-0.82,0-1.494,0.074-1.494-0.748l0,0 c0,0.822,0.674,1.493,1.494,1.493h48.535c0.82,0,1.493-0.671,1.493-1.493l0,0C55.761,43.516,55.088,43.441,54.268,43.441z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M54.268,43.441H5.732c-0.82,0-1.494,0.074-1.494-0.748l0,0 c0,0.822,0.674,1.493,1.494,1.493h48.535c0.82,0,1.493-0.671,1.493-1.493l0,0C55.761,43.516,55.088,43.441,54.268,43.441z" enable-background="new " fill="#FFFFFF" opacity="0.5"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-2164.0005" x2="-2164.0005" y1="3641.8828" y2="3611.8926">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#404040"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#404040"/>
</linearGradient>
<path d="M54.268,15.813c0.41,0,0.745,0.336,0.745,0.745v26.883c0,0.412-0.335,0.745-0.745,0.745H5.732 c-0.411,0-0.746-0.333-0.746-0.745V16.559c0-0.409,0.335-0.745,0.746-0.745H54.268 M54.268,15.064H5.732 c-0.82,0-1.494,0.675-1.494,1.494v26.883c0,0.821,0.674,1.494,1.494,1.494h48.535c0.82,0,1.493-0.673,1.493-1.494V16.559 C55.761,15.739,55.088,15.064,54.268,15.064L54.268,15.064z" fill="url(#SVGID_4_)"/>
-<path d="M54.268,24.025v-5.974c0-0.824-0.67-1.493-1.494-1.493H7.226 c-0.824,0-1.493,0.669-1.493,1.493v9.709L54.268,24.025z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M54.268,24.025v-5.974c0-0.824-0.67-1.493-1.494-1.493H7.226 c-0.824,0-1.493,0.669-1.493,1.493v9.709L54.268,24.025z" enable-background="new " fill="#FFFFFF" opacity="0.2"/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
<rect fill="none" height="30" width="30"/>
-<path d="M4.452,29.001c-1.903,0-3.451-1.549-3.451-3.453V4.453c0-1.903,1.548-3.452,3.451-3.452h21.095 c1.905,0,3.454,1.548,3.454,3.452v21.095c0,1.904-1.549,3.453-3.454,3.453H4.452z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M4.452,29.001c-1.903,0-3.451-1.549-3.451-3.453V4.453c0-1.903,1.548-3.452,3.451-3.452h21.095 c1.905,0,3.454,1.548,3.454,3.452v21.095c0,1.904-1.549,3.453-3.454,3.453H4.452z" opacity="0.35"/>
<path d="M27.932,25.493c0,1.346-1.092,2.438-2.44,2.438H4.508c-1.347,0-2.438-1.093-2.438-2.438V4.509 c0-1.348,1.091-2.44,2.438-2.44h20.983c1.348,0,2.44,1.093,2.44,2.44V25.493z" fill="#F7B388"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3347.6641)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-2190.8022" x2="-2167.4888" y1="3344.4668" y2="3321.1533">
-<stop offset="0" style="stop-color:#DF4F20"/>
-<stop offset="0.5" style="stop-color:#F48228"/>
-<stop offset="1" style="stop-color:#CF3A21"/>
+ <stop offset="0" style="stop-color:#DF4F20"/>
+ <stop offset="0.5" style="stop-color:#F48228"/>
+ <stop offset="1" style="stop-color:#CF3A21"/>
</linearGradient>
<path d="M4.508,27.188c-0.935,0-1.697-0.761-1.697-1.695V4.509c0-0.937,0.763-1.696,1.697-1.696h20.983 c0.937,0,1.697,0.762,1.697,1.696v20.984c0,0.935-0.76,1.695-1.697,1.695H4.508z" fill="url(#SVGID_1__)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3347.6641)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-2178.999" x2="-2178.999" y1="3345.792" y2="3319.6384">
-<stop offset="0" style="stop-color:#C5422B"/>
-<stop offset="0.5" style="stop-color:#F48228"/>
-<stop offset="1" style="stop-color:#AD1B00"/>
+ <stop offset="0" style="stop-color:#C5422B"/>
+ <stop offset="0.5" style="stop-color:#F48228"/>
+ <stop offset="1" style="stop-color:#AD1B00"/>
</linearGradient>
<path d="M25.547,2.413c1.125,0,2.041,0.916,2.041,2.04v21.095c0,1.124-0.917,2.04-2.041,2.04H4.452 c-1.124,0-2.038-0.916-2.038-2.04V4.453c0-1.124,0.915-2.04,2.038-2.04H25.547 M25.547,2.001H4.452 c-1.353,0-2.451,1.098-2.451,2.452v21.095c0,1.354,1.098,2.453,2.451,2.453h21.095c1.354,0,2.454-1.1,2.454-2.453V4.453 C28.001,3.099,26.901,2.001,25.547,2.001L25.547,2.001z" fill="url(#SVGID_2__)"/>
<circle cx="8.615" cy="21.385" fill="#FFFFFF" r="2.508"/>
<path d="M20.547,23.614h3.345c0-9.651-7.854-17.506-17.505-17.506v3.344C14.196,9.453,20.547,15.805,20.547,23.614z" fill="#FFFFFF"/>
<path d="M14.466,23.614h3.343c0-6.299-5.124-11.424-11.422-11.424v3.345C10.842,15.535,14.466,19.158,14.466,23.614z " fill="#FFFFFF"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_received_call.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_received_call.svg Fri May 14 16:09:54 2010 +0300
@@ -1,51 +1,53 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<stop offset="0" style="stop-color:#3AC5EA"/>
-<stop offset="0.297" style="stop-color:#3AC5EA"/>
-<stop offset="0.6667" style="stop-color:#1754C9"/>
-<stop offset="0.7939" style="stop-color:#33ADE1"/>
-<stop offset="1" style="stop-color:#33ADE1"/>
+ <stop offset="0.297" style="stop-color:#3AC5EA"/>
+ <stop offset="0.6667" style="stop-color:#1754C9"/>
+ <stop offset="0.7939" style="stop-color:#33ADE1"/>
</radialGradient>
<path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333c-0.617-0.665-2.567-3.083-2.968-3.735 c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956c6.191-6.192,9.085-7.646,9.956-8.107 c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967c0.534,0.492,0.872,0.588,1.299,0.274 c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778c-2.476-2.889-8.594-5.015-10.751-5.399 c-1.923-0.345-3.876-0.872-6.567,0.235c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352 c-1.108,2.691-0.581,4.645-0.236,6.567c0.386,2.158,2.51,8.275,5.399,10.752c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2070.7568" x2="-2070.3252" y1="-2266.8511" y2="-2263.2749">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+ <stop offset="0" style="stop-color:#2685D2"/>
+ <stop offset="1" style="stop-color:#081D45"/>
</linearGradient>
<path d="M35.172,17.108c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967 c0.534,0.492,0.872,0.588,1.299,0.274c0.048-0.035,0.062-0.046,0.064-0.046c0.253-0.184,1.032-0.738,2.12-1.514 c-0.251-0.204-3.468-2.809-4.8-2.956C36.857,15.598,35.172,17.108,35.172,17.108z" fill="url(#SVGID_2_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -2128.2356 5114.0977)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2070.7607" x2="-2070.3289" y1="5104.5752" y2="5108.1523">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+ <stop offset="0" style="stop-color:#2685D2"/>
+ <stop offset="1" style="stop-color:#081D45"/>
</linearGradient>
<path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.713c0.376,0.666,2.351,3.069,2.967,3.738 c0.493,0.531,0.587,0.869,0.274,1.298c-0.035,0.047-0.046,0.062-0.046,0.062c-0.183,0.253-0.738,1.032-1.515,2.119 c-0.204-0.252-2.807-3.467-2.956-4.799C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="47.9224" x2="3.9991" y1="3.9307" y2="47.854">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+ <stop offset="0" style="stop-color:#ABEEFF"/>
+ <stop offset="1" style="stop-color:#539FDE"/>
</linearGradient>
-<path d="M2.979,47.467c-0.344-1.925-0.873-3.878,0.235-6.567 c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.341,4.269,40.9,3.215c2.691-1.108,4.644-0.581,6.567-0.236 c1.981,0.354,7.296,2.178,10.069,4.711c-2.552-2.815-8.496-4.879-10.617-5.258c-1.923-0.345-3.876-0.872-6.567,0.235 c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567 c0.378,2.122,2.441,8.065,5.258,10.617C5.156,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M2.979,47.467c-0.344-1.925-0.873-3.878,0.235-6.567 c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.341,4.269,40.9,3.215c2.691-1.108,4.644-0.581,6.567-0.236 c1.981,0.354,7.296,2.178,10.069,4.711c-2.552-2.815-8.496-4.879-10.617-5.258c-1.923-0.345-3.876-0.872-6.567,0.235 c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567 c0.378,2.122,2.441,8.065,5.258,10.617C5.156,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="54.3535" x2="3.9474" y1="3.2017" y2="53.6078">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+ <stop offset="0" style="stop-color:#ABEEFF"/>
+ <stop offset="1" style="stop-color:#539FDE"/>
</linearGradient>
-<path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333 c-0.617-0.665-2.567-3.083-2.968-3.735c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956 c6.191-6.192,9.085-7.646,9.956-8.107c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967 c0.534,0.492,0.872,0.588,1.299,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778 c-0.292-0.339-0.634-0.665-1.013-0.982c0.49,0.657,0.198,1.134-0.607,1.666C54.65,9.447,41.576,18.739,40.825,19.29 c-0.431,0.314-0.767,0.219-1.3-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.948-0.436-1.71-0.034 c-0.871,0.46-3.764,1.914-9.956,8.106c-6.193,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.319,1.135,0.035,1.711 c0.4,0.651,2.351,3.069,2.967,3.736c0.493,0.533,0.559,0.896,0.259,1.332c-0.517,0.755-9.828,13.794-10.76,15.195 c-0.533,0.803-1.008,1.098-1.665,0.606c0.314,0.378,0.644,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_5_)" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333 c-0.617-0.665-2.567-3.083-2.968-3.735c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956 c6.191-6.192,9.085-7.646,9.956-8.107c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967 c0.534,0.492,0.872,0.588,1.299,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778 c-0.292-0.339-0.634-0.665-1.013-0.982c0.49,0.657,0.198,1.134-0.607,1.666C54.65,9.447,41.576,18.739,40.825,19.29 c-0.431,0.314-0.767,0.219-1.3-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.948-0.436-1.71-0.034 c-0.871,0.46-3.764,1.914-9.956,8.106c-6.193,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.319,1.135,0.035,1.711 c0.4,0.651,2.351,3.069,2.967,3.736c0.493,0.533,0.559,0.896,0.259,1.332c-0.517,0.755-9.828,13.794-10.76,15.195 c-0.533,0.803-1.008,1.098-1.665,0.606c0.314,0.378,0.644,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_5_)" opacity="0.6"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -141.776 3075.0667)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-2041.9355" x2="-2041.9355" y1="-2305.2153" y2="-2243.2966">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="0.5091" style="stop-color:#081D45"/>
-<stop offset="1" style="stop-color:#2275BD"/>
+ <stop offset="0" style="stop-color:#2685D2"/>
+ <stop offset="0.5091" style="stop-color:#081D45"/>
+ <stop offset="1" style="stop-color:#2275BD"/>
</linearGradient>
<path d="M2.899,45.012c1.275-2.777,10.299-14.804,18.804-23.31c8.505-8.506,20.532-17.529,23.308-18.803 c0.527-0.241,1.02-0.411,1.493-0.545c-0.511-0.096-1.03-0.19-1.565-0.26c-0.086,0.036-0.163,0.063-0.25,0.102 c-2.818,1.293-14.971,10.397-23.533,18.959C12.595,29.717,3.489,41.869,2.195,44.688c-0.038,0.087-0.063,0.166-0.101,0.25 c0.07,0.535,0.166,1.055,0.259,1.565C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_6_)"/>
<rect fill="none" height="60" width="60"/>
</g>
<g>
+<defs>
+</defs>
<polygon fill="none" points="30.096,0 0.096,0 0.096,14.833 0,14.833 0.096,14.933 0.096,30 14.601,30 15.021,30.438 15.447,30 30.096,30 30.096,14.963 30.215,14.841 30.096,14.841 "/>
-<polygon fill-opacity="0.35" points="0,14.833 3.596,14.828 3.625,14.859 8.375,14.859 8.375,0 21.73,0.001 21.73,14.843 30.215,14.841 15.021,30.438 " stroke-opacity="0.35"/>
+<polygon opacity="0.35" points="0,14.833 3.596,14.828 3.625,14.859 8.375,14.859 8.375,0 21.73,0.001 21.73,14.843 30.215,14.841 15.021,30.438 "/>
<linearGradient gradientTransform="matrix(1 1.000000e-004 1.000000e-004 -1 2191.3389 2985.8491)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-2176.5142" x2="-2176.5142" y1="2984.646" y2="2957.3247">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+ <stop offset="0" style="stop-color:#C6FF45"/>
+ <stop offset="0.7273" style="stop-color:#66A00E"/>
+ <stop offset="1" style="stop-color:#387300"/>
</linearGradient>
<polygon fill="url(#SVGID_1__)" points="2.846,15.859 15.025,28.575 27.398,15.845 20.732,15.843 20.727,1.292 9.375,1.291 9.375,15.859 "/>
<line fill="none" x1="20.727" x2="9.375" y1="1.297" y2="1.296"/>
@@ -53,98 +55,156 @@
<polygon fill="#E7FFB9" points="20.555,15.867 27.527,15.867 27,16.458 20.555,16.458 "/>
<polygon fill="#E7FFB9" points="2.459,15.859 9.365,15.859 9.365,16.451 3.08,16.451 "/>
<linearGradient gradientTransform="matrix(1 1.000000e-004 1.000000e-004 -1 2191.3389 2985.8491)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-2165.6621" x2="-2187.9482" y1="2963.2173" y2="2963.2173">
-<stop offset="0" style="stop-color:#AAE535"/>
-<stop offset="1" style="stop-color:#5D9C0A"/>
+ <stop offset="0" style="stop-color:#AAE535"/>
+ <stop offset="1" style="stop-color:#5D9C0A"/>
</linearGradient>
<polygon fill="url(#SVGID_2__)" points="27.016,15.844 15.025,28.15 3.172,15.829 2.348,15.83 15.025,29 27.842,15.844 "/>
<rect fill="none" height="30" width="30" x="0.096"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1___" x1="12.38" x2="17.62" y1="23.65" y2="23.65">
+
<stop offset="0" stop-color="#878A8C"/>
+
<stop offset="0.2606" stop-color="#BDC2C4"/>
+
<stop offset="0.6606" stop-color="#5B6163"/>
+
<stop offset="1" stop-color="#959A9C"/>
+
</linearGradient>
<rect fill="url(#SVGID_1___)" height="7.853" width="5.105" x="12.45" y="19.72"/>
<path d="M12.45,24.66c0.82,0.199,1.673,0.315,2.553,0.315,0.881,0,1.732-0.116,2.553-0.315v-4.294h-5.105v4.285z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
<path d="M12.45,24.02c0.82,0.199,1.673,0.315,2.553,0.315,0.881,0,1.732-0.116,2.553-0.315v-4.294h-5.105v4.288z" fill="#020202" fill-opacity="0.2" stroke-opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2___" x1="15" x2="15" y1="1.975" y2="23.67">
+
<stop offset="0" stop-color="#F2F2F2"/>
+
<stop offset="0.3212" stop-color="#E6E6E6"/>
+
<stop offset="1" stop-color="#666666"/>
+
</linearGradient>
<path d="M15,23.7c-5.98,0-10.85-4.867-10.85-10.85s4.87-10.85,10.85-10.85c5.982,0,10.85,4.866,10.85,10.85s-4.87,10.85-10.85,10.85z" fill="url(#SVGID_2___)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="15" x2="15" y1="2.614" y2="23.03">
+
<stop offset="0" stop-color="#D1D7D9"/>
+
<stop offset="0.0667" stop-color="#D1D7D9"/>
+
<stop offset="0.2606" stop-color="#BDC2C4"/>
+
<stop offset="0.6606" stop-color="#7C8487"/>
+
<stop offset="1" stop-color="#ADB3B5"/>
+
</linearGradient>
<circle cx="15" cy="12.85" fill="url(#SVGID_3__)" r="10.21"/>
<path d="M15,21.99c-5.315,0-9.657-4.23-9.843-9.5-0.004,0.116-0.009,0.231-0.009,0.349,0,5.431,4.419,9.851,9.852,9.851s9.852-4.42,9.852-9.851c0-0.117-0.005-0.232-0.009-0.349-0.18,5.27-4.52,9.5-9.84,9.5z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
<path d="M23.3,12.41c0,4.704-3.715,9.346-8.299,9.345-4.58-0.003-8.292-4.646-8.291-9.35,0.002-4.706,3.718-8.517,8.298-8.517,4.57,0.001,8.29,3.814,8.29,8.517z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
<path d="M15,21.07c-2.387-0.002-4.63-0.932-6.315-2.619-1.688-1.688-2.615-3.932-2.614-6.318,0-4.923,4.009-8.929,8.935-8.929,2.387,0,4.632,0.931,6.317,2.618,1.688,1.688,2.616,3.933,2.615,6.318-0.002,4.924-4.01,8.93-8.934,8.93h-0.014z" fill="#231F20" fill-opacity="0.2" stroke-opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="15" x2="15" y1="3.721" y2="20.35">
+
<stop offset="0" stop-color="#CFCFCF"/>
+
<stop offset="0.1091" stop-color="#CFCFCF"/>
+
<stop offset="0.6848" stop-color="#121212"/>
+
<stop offset="1" stop-color="#A6A6A6"/>
+
</linearGradient>
<path d="M15,20.43c-2.216-0.002-4.298-0.864-5.864-2.432-1.567-1.566-2.428-3.65-2.427-5.866,0-4.573,3.723-8.293,8.296-8.293,2.218,0.001,4.3,0.864,5.866,2.432s2.43,3.651,2.428,5.867c-0.001,4.573-3.723,8.292-8.295,8.292h-0.004z" fill="url(#SVGID_4__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5__" x1="15" x2="15" y1="4.368" y2="19.72">
+
<stop offset="0" stop-color="#F2F2F2"/>
+
<stop offset="1" stop-color="#606769"/>
+
</linearGradient>
<circle cx="15" cy="12.13" fill="url(#SVGID_5__)" r="7.657"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6__" x1="15" x2="15" y1="5.772" y2="18.45">
+
<stop offset="0" stop-color="#1A1A1A"/>
+
<stop offset="0.503" stop-color="#343434"/>
+
<stop offset="0.7515" stop-color="#9E9E9E"/>
+
<stop offset="1" stop-color="#CFCFCF"/>
+
</linearGradient>
<path d="M15,18.51c-1.706-0.001-3.309-0.666-4.514-1.871-1.204-1.206-1.867-2.808-1.867-4.512,0-3.517,2.862-6.378,6.382-6.378,1.706,0,3.308,0.664,4.513,1.871,1.205,1.205,1.868,2.808,1.867,4.513,0,3.51-2.86,6.37-6.38,6.37z" fill="url(#SVGID_6__)"/>
<radialGradient cx="25.77" cy="10.27" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="6.499">
+
<stop offset="0" stop-color="#000000"/>
+
<stop offset="0.5917" stop-color="#000000"/>
+
<stop offset="0.627" stop-color="#050505"/>
+
<stop offset="0.7652" stop-color="#121212"/>
+
<stop offset="0.8876" stop-color="#171717"/>
+
<stop offset="1" stop-color="#171717"/>
+
</radialGradient>
<path d="M20.74,12.14c0,3.172-2.574,5.74-5.744,5.74-3.175-0.001-5.743-2.573-5.741-5.745,0-3.171,2.573-5.742,5.745-5.74,3.17-0.009,5.74,2.562,5.74,5.74z" fill="url(#SVGID_7_)"/>
<radialGradient cx="21.65" cy="5.066" gradientTransform="matrix(1.0143 0 0 1.0141 -9.5579 3.1299)" gradientUnits="userSpaceOnUse" id="SVGID_8_" r="10.35">
+
<stop offset="0" stop-color="#242424"/>
+
<stop offset="0.4303" stop-color="#242424"/>
+
<stop offset="0.7818" stop-color="#000000"/>
+
<stop offset="1" stop-color="#000000"/>
+
</radialGradient>
<circle cx="15" cy="12.13" fill="url(#SVGID_8_)" r="4.712"/>
<radialGradient cx="23.96" cy="3.55" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_9_" r="11.36">
+
<stop offset="0" stop-color="#A700F5"/>
+
<stop offset="0.3091" stop-color="#A700F5"/>
+
<stop offset="0.4364" stop-color="#5E008A"/>
+
<stop offset="0.8061" stop-color="#0E1402"/>
+
<stop offset="1" stop-color="#0E1402"/>
+
</radialGradient>
<path d="M19.21,12.13c0,2.326-1.886,4.21-4.212,4.21-2.326-0.002-4.213-1.888-4.213-4.212,0.004-2.327,1.89-4.21,4.213-4.21,2.33,0.003,4.21,1.888,4.21,4.21z" fill="url(#SVGID_9_)"/>
<radialGradient cx="25.17" cy="13.25" gradientTransform="matrix(1.0143 3.000000e-004 -3.000000e-004 1.0141 -10.5185 2.1979)" gradientUnits="userSpaceOnUse" id="SVGID_10_" r="4.611">
+
<stop offset="0" stop-color="#48630C"/>
+
<stop offset="0.7879" stop-color="#000000"/>
+
<stop offset="1" stop-color="#000000"/>
+
</radialGradient>
<path d="M19.21,12.13c0,2.326-1.886,4.21-4.212,4.21-2.326-0.002-4.213-1.888-4.213-4.212,0,0,1.444,2.569,4.213,2.569,2.77,0,4.21-2.57,4.21-2.57z" fill="url(#SVGID_10_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="14.98" x2="14.98" y1="7.065" y2="12.09">
+
<stop offset="0" stop-color="#F8FBFF"/>
+
<stop offset="1" stop-color="#808080"/>
+
</linearGradient>
<path d="M14.98,12.07c1.828,0,3.549-0.277,5.067-0.765-0.431-2.41-2.532-4.239-5.067-4.239-2.532,0-4.632,1.83-5.065,4.239,1.515,0.49,3.235,0.77,5.065,0.77z" fill="url(#SVGID_11_)" fill-opacity="0.35" stroke-opacity="0.35"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="5.762" x2="24.29" y1="26.72" y2="26.72">
+
<stop offset="0" stop-color="#878A8C"/>
+
<stop offset="0.2606" stop-color="#BDC2C4"/>
+
<stop offset="0.6606" stop-color="#5B6163"/>
+
<stop offset="1" stop-color="#959A9C"/>
+
</linearGradient>
<path d="M24.24,28c0.025-0.635,0.04-0.508,0.04-0.639v-0.035c0-1.037-0.852-1.879-1.901-1.879h-14.72c-1.05,0-1.9,0.842-1.9,1.879v0.035c0,0.131,0.014,0.004,0.04,0.639h18.44z" fill="url(#SVGID_12_)"/>
<path d="M5.879,26.7h18.29c-0.084-0.234-0.212-0.444-0.377-0.626h-17.53c-0.164,0.19-0.293,0.4-0.377,0.63z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
@@ -152,4 +212,4 @@
<path d="M6.255,26.07h17.54c-0.348-0.383-0.846-0.627-1.407-0.627h-14.72c-0.56,0.01-1.059,0.25-1.407,0.63z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_recent.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_recent.svg Fri May 14 16:09:54 2010 +0300
@@ -1,71 +1,74 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<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"/>
+ <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="M56.506,7.6H3.493C2.666,7.6,2,8.27,2,9.094v41.813C2,51.732,2.666,52.4,3.493,52.4h53.013 C57.33,52.4,58,51.732,58,50.906V9.094C58,8.27,57.33,7.6,56.506,7.6z M8.719,49.413c0,0.412-0.336,0.748-0.745,0.748H4.986 c-0.412,0-0.748-0.336-0.748-0.748V47.92c0-0.41,0.336-0.746,0.748-0.746h2.987c0.409,0,0.745,0.336,0.745,0.746V49.413z M8.719,12.08c0,0.41-0.336,0.746-0.745,0.746H4.986c-0.412,0-0.748-0.336-0.748-0.746v-1.493c0-0.409,0.336-0.748,0.748-0.748 h2.987c0.409,0,0.745,0.339,0.745,0.748V12.08z M15.438,49.413c0,0.412-0.335,0.748-0.745,0.748h-2.987 c-0.412,0-0.747-0.336-0.747-0.748V47.92c0-0.41,0.335-0.746,0.747-0.746h2.987c0.41,0,0.745,0.336,0.745,0.746V49.413z M15.438,12.08c0,0.41-0.335,0.746-0.745,0.746h-2.987c-0.412,0-0.747-0.336-0.747-0.746v-1.493c0-0.409,0.335-0.748,0.747-0.748 h2.987c0.41,0,0.745,0.339,0.745,0.748V12.08z M22.159,49.413c0,0.412-0.337,0.748-0.747,0.748h-2.986 c-0.41,0-0.746-0.336-0.746-0.748V47.92c0-0.41,0.335-0.746,0.746-0.746h2.986c0.41,0,0.747,0.336,0.747,0.746V49.413z M22.159,12.08c0,0.41-0.337,0.746-0.747,0.746h-2.986c-0.41,0-0.746-0.336-0.746-0.746v-1.493c0-0.409,0.335-0.748,0.746-0.748 h2.986c0.41,0,0.747,0.339,0.747,0.748V12.08z M28.88,49.413c0,0.412-0.337,0.748-0.747,0.748h-2.986 c-0.411,0-0.746-0.336-0.746-0.748V47.92c0-0.41,0.335-0.746,0.746-0.746h2.986c0.41,0,0.747,0.336,0.747,0.746V49.413z M28.88,12.08c0,0.41-0.337,0.746-0.747,0.746h-2.986c-0.411,0-0.746-0.336-0.746-0.746v-1.493c0-0.409,0.335-0.748,0.746-0.748 h2.986c0.41,0,0.747,0.339,0.747,0.748V12.08z M35.6,49.413c0,0.412-0.338,0.748-0.747,0.748h-2.985 c-0.412,0-0.748-0.336-0.748-0.748V47.92c0-0.41,0.336-0.746,0.748-0.746h2.985c0.409,0,0.747,0.336,0.747,0.746V49.413z M35.6,12.08c0,0.41-0.338,0.746-0.747,0.746h-2.985c-0.412,0-0.748-0.336-0.748-0.746v-1.493c0-0.409,0.336-0.748,0.748-0.748 h2.985c0.409,0,0.747,0.339,0.747,0.748V12.08z M42.318,49.413c0,0.412-0.335,0.748-0.745,0.748h-2.987 c-0.412,0-0.746-0.336-0.746-0.748V47.92c0-0.41,0.334-0.746,0.746-0.746h2.987c0.41,0,0.745,0.336,0.745,0.746V49.413z M42.318,12.08c0,0.41-0.335,0.746-0.745,0.746h-2.987c-0.412,0-0.746-0.336-0.746-0.746v-1.493c0-0.409,0.334-0.748,0.746-0.748 h2.987c0.41,0,0.745,0.339,0.745,0.748V12.08z M49.039,49.413c0,0.412-0.336,0.748-0.746,0.748h-2.987 c-0.41,0-0.745-0.336-0.745-0.748V47.92c0-0.41,0.335-0.746,0.745-0.746h2.987c0.41,0,0.746,0.336,0.746,0.746V49.413z M49.039,12.08c0,0.41-0.336,0.746-0.746,0.746h-2.987c-0.41,0-0.745-0.336-0.745-0.746v-1.493c0-0.409,0.335-0.748,0.745-0.748 h2.987c0.41,0,0.746,0.339,0.746,0.748V12.08z M55.761,49.413c0,0.412-0.339,0.748-0.748,0.748h-2.987 c-0.41,0-0.745-0.336-0.745-0.748V47.92c0-0.41,0.335-0.746,0.745-0.746h2.987c0.409,0,0.748,0.336,0.748,0.746V49.413z M55.761,12.08c0,0.41-0.339,0.746-0.748,0.746h-2.987c-0.41,0-0.745-0.336-0.745-0.746v-1.493c0-0.409,0.335-0.748,0.745-0.748 h2.987c0.409,0,0.748,0.339,0.748,0.748V12.08z" fill="url(#SVGID_1_)"/>
-<path d="M56.506,7.6H3.493C2.666,7.6,2,8.27,2,9.094v0.745 c0-0.824,0.666-1.493,1.493-1.493h53.013C57.33,8.346,58,9.015,58,9.839V9.094C58,8.27,57.33,7.6,56.506,7.6z" fill="#FFFFFF" fill-opacity="0.55" stroke-opacity="0.55"/>
-<path d="M3.493,52.4h53.013C57.33,52.4,58,51.732,58,50.906v-0.745 c0,0.824-0.67,1.493-1.494,1.493H3.493C2.666,51.654,2,50.985,2,50.161v0.745C2,51.732,2.666,52.4,3.493,52.4z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M56.506,7.6H3.493C2.666,7.6,2,8.27,2,9.094v0.745 c0-0.824,0.666-1.493,1.493-1.493h53.013C57.33,8.346,58,9.015,58,9.839V9.094C58,8.27,57.33,7.6,56.506,7.6z" enable-background="new " fill="#FFFFFF" opacity="0.55"/>
+<path d="M3.493,52.4h53.013C57.33,52.4,58,51.732,58,50.906v-0.745 c0,0.824-0.67,1.493-1.494,1.493H3.493C2.666,51.654,2,50.985,2,50.161v0.745C2,51.732,2.666,52.4,3.493,52.4z" enable-background="new " fill="#FFFFFF" opacity="0.1"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2164" x2="-2164" y1="3641.7637" y2="3611.8926">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="0.5" style="stop-color:#666666"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="0.5" style="stop-color:#666666"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
<rect fill="url(#SVGID_2_)" height="29.871" width="56" x="2" y="15.064"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2164.0005" x2="-2164.0005" y1="3612.0117" y2="3641.8828">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</linearGradient>
<path d="M55.761,43.441c0,0.821-0.673,1.494-1.493,1.494H5.732c-0.82,0-1.494-0.673-1.494-1.494V16.559 c0-0.819,0.674-1.494,1.494-1.494h48.535c0.82,0,1.493,0.675,1.493,1.494V43.441z" fill="url(#SVGID_3_)"/>
-<path d="M54.268,43.441H5.732c-0.82,0-1.494,0.074-1.494-0.748l0,0 c0,0.822,0.674,1.493,1.494,1.493h48.535c0.82,0,1.493-0.671,1.493-1.493l0,0C55.761,43.516,55.088,43.441,54.268,43.441z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M54.268,43.441H5.732c-0.82,0-1.494,0.074-1.494-0.748l0,0 c0,0.822,0.674,1.493,1.494,1.493h48.535c0.82,0,1.493-0.671,1.493-1.493l0,0C55.761,43.516,55.088,43.441,54.268,43.441z" enable-background="new " fill="#FFFFFF" opacity="0.5"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-2164.0005" x2="-2164.0005" y1="3641.8828" y2="3611.8926">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#404040"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#404040"/>
</linearGradient>
<path d="M54.268,15.813c0.41,0,0.745,0.336,0.745,0.745v26.883c0,0.412-0.335,0.745-0.745,0.745H5.732 c-0.411,0-0.746-0.333-0.746-0.745V16.559c0-0.409,0.335-0.745,0.746-0.745H54.268 M54.268,15.064H5.732 c-0.82,0-1.494,0.675-1.494,1.494v26.883c0,0.821,0.674,1.494,1.494,1.494h48.535c0.82,0,1.493-0.673,1.493-1.494V16.559 C55.761,15.739,55.088,15.064,54.268,15.064L54.268,15.064z" fill="url(#SVGID_4_)"/>
-<path d="M54.268,24.025v-5.974c0-0.824-0.67-1.493-1.494-1.493H7.226 c-0.824,0-1.493,0.669-1.493,1.493v9.709L54.268,24.025z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M54.268,24.025v-5.974c0-0.824-0.67-1.493-1.494-1.493H7.226 c-0.824,0-1.493,0.669-1.493,1.493v9.709L54.268,24.025z" enable-background="new " fill="#FFFFFF" opacity="0.2"/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
-<path d="M14.999,30C6.729,30,0,23.271,0,15S6.729,0,14.999,0C23.271,0,30,6.729,30,15S23.271,30,14.999,30L14.999,30 z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M14.999,30C6.729,30,0,23.271,0,15S6.729,0,14.999,0C23.271,0,30,6.729,30,15S23.271,30,14.999,30L14.999,30 z" opacity="0.35"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="15" x2="15" y1="1.1948" y2="28.8709">
-<stop offset="0" style="stop-color:#BDC2C4"/>
-<stop offset="1" style="stop-color:#454B4D"/>
+ <stop offset="0" style="stop-color:#BDC2C4"/>
+ <stop offset="1" style="stop-color:#454B4D"/>
</linearGradient>
<path d="M14.999,29C7.281,29,1,22.72,1,15S7.281,1,14.999,1C22.72,1,29,7.28,29,15S22.72,29,14.999,29 L14.999,29z" fill="url(#SVGID_1__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="15" x2="15" y1="1.5835" y2="28.5506">
-<stop offset="0" style="stop-color:#D1D7D9"/>
-<stop offset="0.2364" style="stop-color:#BDC2C4"/>
-<stop offset="1" style="stop-color:#697173"/>
+ <stop offset="0" style="stop-color:#D1D7D9"/>
+ <stop offset="0.2364" style="stop-color:#BDC2C4"/>
+ <stop offset="1" style="stop-color:#697173"/>
</linearGradient>
<circle cx="15" cy="15" fill="url(#SVGID_2__)" r="13.611"/>
-<path d="M15.474,15.476c4.559,0,8.961-0.286,13.127-0.81C28.425,7.305,22.406,1.389,14.999,1.389 c-7.36,0-13.357,5.847-13.6,13.151C5.846,15.143,10.568,15.476,15.474,15.476z" fill="#F1F1F2" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M15.474,15.476c4.559,0,8.961-0.286,13.127-0.81C28.425,7.305,22.406,1.389,14.999,1.389 c-7.36,0-13.357,5.847-13.6,13.151C5.846,15.143,10.568,15.476,15.474,15.476z" fill="#F1F1F2" opacity="0.35"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="1.5186" x2="28.6768" y1="8.2915" y2="8.2915">
-<stop offset="0" style="stop-color:#C0C5C7"/>
-<stop offset="0.2" style="stop-color:#F7FDFF"/>
-<stop offset="0.8" style="stop-color:#F7FDFF"/>
-<stop offset="1" style="stop-color:#CDD3D5"/>
+ <stop offset="0" style="stop-color:#C0C5C7"/>
+ <stop offset="0.2" style="stop-color:#F7FDFF"/>
+ <stop offset="0.8" style="stop-color:#F7FDFF"/>
+ <stop offset="1" style="stop-color:#CDD3D5"/>
</linearGradient>
<path d="M14.999,1.778c7.453,0,13.503,5.99,13.605,13.416c0.002-0.063,0.007-0.129,0.007-0.194 c0-7.517-6.095-13.611-13.612-13.611C7.482,1.389,1.389,7.483,1.389,15c0,0.065,0.003,0.131,0.005,0.194 C1.498,7.769,7.548,1.778,14.999,1.778z" fill="url(#SVGID_3__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="14.999" x2="14.999" y1="27.249" y2="2.9914">
-<stop offset="0" style="stop-color:#BDC2C4"/>
-<stop offset="1" style="stop-color:#454B4D"/>
+ <stop offset="0" style="stop-color:#BDC2C4"/>
+ <stop offset="1" style="stop-color:#454B4D"/>
</linearGradient>
<path d="M14.999,27.055C8.352,27.055,2.944,21.648,2.944,15S8.352,2.945,14.999,2.945 c6.648,0,12.056,5.406,12.056,12.055S21.647,27.055,14.999,27.055L14.999,27.055z" fill="url(#SVGID_4__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="15.001" x2="15.001" y1="26.3296" y2="3.0368">
-<stop offset="0" style="stop-color:#FAF9F9"/>
-<stop offset="0.4" style="stop-color:#FAF9F9"/>
-<stop offset="1" style="stop-color:#808184"/>
+ <stop offset="0.4" style="stop-color:#FAF9F9"/>
+ <stop offset="1" style="stop-color:#808184"/>
</linearGradient>
<path d="M14.999,26.666C8.566,26.666,3.333,21.432,3.333,15S8.566,3.334,14.999,3.334S26.668,8.568,26.668,15 S21.432,26.666,14.999,26.666L14.999,26.666z" fill="url(#SVGID_5_)"/>
-<path d="M14.999,15.832c3.849,0,7.521-0.322,10.89-0.905C25.848,8.956,20.98,4.111,14.999,4.111 c-5.979,0-10.846,4.845-10.886,10.815C7.479,15.51,11.15,15.832,14.999,15.832z" fill="#FFFFFF" fill-opacity="0.7" stroke-opacity="0.7"/>
+<path d="M14.999,15.832c3.849,0,7.521-0.322,10.89-0.905C25.848,8.956,20.98,4.111,14.999,4.111 c-5.979,0-10.846,4.845-10.886,10.815C7.479,15.51,11.15,15.832,14.999,15.832z" fill="#FFFFFF" opacity="0.7"/>
<rect fill="#404041" height="2.335" width="0.777" x="14.611" y="4.396"/>
<rect fill="#404041" height="2.333" width="0.777" x="14.611" y="23.842"/>
<rect fill="#404041" height="0.779" width="2.333" x="23.556" y="14.896"/>
@@ -78,23 +81,23 @@
<rect fill="#404041" height="1.882" transform="matrix(0.8678 -0.497 0.497 0.8678 -9.1555 13.0056)" width="0.627" x="19.548" y="22.766"/>
<rect fill="#404041" height="1.884" transform="matrix(0.497 -0.8678 0.8678 0.497 -5.7368 10.9541)" width="0.627" x="6.267" y="9.483"/>
<rect fill="#404041" height="1.882" transform="matrix(0.4991 -0.8665 0.8665 0.4991 -5.7273 30.3844)" width="0.63" x="23.105" y="19.206"/>
-<path d="M15.953,15.552c-0.04-0.188-0.133-0.352-0.261-0.482l1.34-4.418l-1.117-0.34l-1.392,4.587 c-0.24,0.138-0.42,0.372-0.475,0.653h-2.55v0.389h2.55c0.009,0.05,0.024,0.101,0.043,0.148L8.091,22.09l0.505,0.506l5.978-5.979 c0.129,0.063,0.273,0.102,0.427,0.102c0.471,0,0.862-0.333,0.953-0.777h9.158v-0.389H15.953z" fill="#231F20" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M15.953,15.552c-0.04-0.188-0.133-0.352-0.261-0.482l1.34-4.418l-1.117-0.34l-1.392,4.587 c-0.24,0.138-0.42,0.372-0.475,0.653h-2.55v0.389h2.55c0.009,0.05,0.024,0.101,0.043,0.148L8.091,22.09l0.505,0.506l5.978-5.979 c0.129,0.063,0.273,0.102,0.427,0.102c0.471,0,0.862-0.333,0.953-0.777h9.158v-0.389H15.953z" fill="#231F20" opacity="0.2"/>
<linearGradient gradientTransform="matrix(0.9569 0.2903 -0.2903 0.9569 409.6663 189.0642)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-428.2788" x2="-428.2788" y1="-57.4336" y2="-51.435">
-<stop offset="0" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#231F20"/>
+ <stop offset="0" style="stop-color:#58595B"/>
+ <stop offset="1" style="stop-color:#231F20"/>
</linearGradient>
<polygon fill="url(#SVGID_6_)" points="17.032,10.101 15.915,9.763 14.22,15.344 15.339,15.684 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="8.3799" x2="15.2201" y1="21.7544" y2="14.9142">
-<stop offset="0" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#231F20"/>
+ <stop offset="0" style="stop-color:#58595B"/>
+ <stop offset="1" style="stop-color:#231F20"/>
</linearGradient>
<polygon fill="url(#SVGID_7_)" points="15.479,15.16 14.974,14.655 8.091,21.539 8.596,22.044 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="18.3057" x2="18.3057" y1="14.9443" y2="15.5124">
-<stop offset="0" style="stop-color:#FF0000"/>
-<stop offset="1" style="stop-color:#A8000B"/>
+ <stop offset="0" style="stop-color:#FF0000"/>
+ <stop offset="1" style="stop-color:#A8000B"/>
</linearGradient>
<path d="M25.111,15h-9.158c-0.091-0.442-0.482-0.778-0.953-0.778S14.138,14.558,14.049,15h-2.55v0.389h2.55 c0.089,0.443,0.48,0.778,0.951,0.778s0.862-0.335,0.953-0.778h9.158V15z" fill="url(#SVGID_8_)"/>
<circle cx="15" cy="15.194" fill="#F99792" r="0.583"/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_service.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_service.svg Fri May 14 16:09:54 2010 +0300
@@ -1,66 +1,70 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<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"/>
+ <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="M56.506,7.6H3.493C2.666,7.6,2,8.27,2,9.094v41.813C2,51.732,2.666,52.4,3.493,52.4h53.013 C57.33,52.4,58,51.732,58,50.906V9.094C58,8.27,57.33,7.6,56.506,7.6z M8.719,49.413c0,0.412-0.336,0.748-0.745,0.748H4.986 c-0.412,0-0.748-0.336-0.748-0.748V47.92c0-0.41,0.336-0.746,0.748-0.746h2.987c0.409,0,0.745,0.336,0.745,0.746V49.413z M8.719,12.08c0,0.41-0.336,0.746-0.745,0.746H4.986c-0.412,0-0.748-0.336-0.748-0.746v-1.493c0-0.409,0.336-0.748,0.748-0.748 h2.987c0.409,0,0.745,0.339,0.745,0.748V12.08z M15.438,49.413c0,0.412-0.335,0.748-0.745,0.748h-2.987 c-0.412,0-0.747-0.336-0.747-0.748V47.92c0-0.41,0.335-0.746,0.747-0.746h2.987c0.41,0,0.745,0.336,0.745,0.746V49.413z M15.438,12.08c0,0.41-0.335,0.746-0.745,0.746h-2.987c-0.412,0-0.747-0.336-0.747-0.746v-1.493c0-0.409,0.335-0.748,0.747-0.748 h2.987c0.41,0,0.745,0.339,0.745,0.748V12.08z M22.159,49.413c0,0.412-0.337,0.748-0.747,0.748h-2.986 c-0.41,0-0.746-0.336-0.746-0.748V47.92c0-0.41,0.335-0.746,0.746-0.746h2.986c0.41,0,0.747,0.336,0.747,0.746V49.413z M22.159,12.08c0,0.41-0.337,0.746-0.747,0.746h-2.986c-0.41,0-0.746-0.336-0.746-0.746v-1.493c0-0.409,0.335-0.748,0.746-0.748 h2.986c0.41,0,0.747,0.339,0.747,0.748V12.08z M28.88,49.413c0,0.412-0.337,0.748-0.747,0.748h-2.986 c-0.411,0-0.746-0.336-0.746-0.748V47.92c0-0.41,0.335-0.746,0.746-0.746h2.986c0.41,0,0.747,0.336,0.747,0.746V49.413z M28.88,12.08c0,0.41-0.337,0.746-0.747,0.746h-2.986c-0.411,0-0.746-0.336-0.746-0.746v-1.493c0-0.409,0.335-0.748,0.746-0.748 h2.986c0.41,0,0.747,0.339,0.747,0.748V12.08z M35.6,49.413c0,0.412-0.338,0.748-0.747,0.748h-2.985 c-0.412,0-0.748-0.336-0.748-0.748V47.92c0-0.41,0.336-0.746,0.748-0.746h2.985c0.409,0,0.747,0.336,0.747,0.746V49.413z M35.6,12.08c0,0.41-0.338,0.746-0.747,0.746h-2.985c-0.412,0-0.748-0.336-0.748-0.746v-1.493c0-0.409,0.336-0.748,0.748-0.748 h2.985c0.409,0,0.747,0.339,0.747,0.748V12.08z M42.318,49.413c0,0.412-0.335,0.748-0.745,0.748h-2.987 c-0.412,0-0.746-0.336-0.746-0.748V47.92c0-0.41,0.334-0.746,0.746-0.746h2.987c0.41,0,0.745,0.336,0.745,0.746V49.413z M42.318,12.08c0,0.41-0.335,0.746-0.745,0.746h-2.987c-0.412,0-0.746-0.336-0.746-0.746v-1.493c0-0.409,0.334-0.748,0.746-0.748 h2.987c0.41,0,0.745,0.339,0.745,0.748V12.08z M49.039,49.413c0,0.412-0.336,0.748-0.746,0.748h-2.987 c-0.41,0-0.745-0.336-0.745-0.748V47.92c0-0.41,0.335-0.746,0.745-0.746h2.987c0.41,0,0.746,0.336,0.746,0.746V49.413z M49.039,12.08c0,0.41-0.336,0.746-0.746,0.746h-2.987c-0.41,0-0.745-0.336-0.745-0.746v-1.493c0-0.409,0.335-0.748,0.745-0.748 h2.987c0.41,0,0.746,0.339,0.746,0.748V12.08z M55.761,49.413c0,0.412-0.339,0.748-0.748,0.748h-2.987 c-0.41,0-0.745-0.336-0.745-0.748V47.92c0-0.41,0.335-0.746,0.745-0.746h2.987c0.409,0,0.748,0.336,0.748,0.746V49.413z M55.761,12.08c0,0.41-0.339,0.746-0.748,0.746h-2.987c-0.41,0-0.745-0.336-0.745-0.746v-1.493c0-0.409,0.335-0.748,0.745-0.748 h2.987c0.409,0,0.748,0.339,0.748,0.748V12.08z" fill="url(#SVGID_1_)"/>
-<path d="M56.506,7.6H3.493C2.666,7.6,2,8.27,2,9.094v0.745 c0-0.824,0.666-1.493,1.493-1.493h53.013C57.33,8.346,58,9.015,58,9.839V9.094C58,8.27,57.33,7.6,56.506,7.6z" fill="#FFFFFF" fill-opacity="0.55" stroke-opacity="0.55"/>
-<path d="M3.493,52.4h53.013C57.33,52.4,58,51.732,58,50.906v-0.745 c0,0.824-0.67,1.493-1.494,1.493H3.493C2.666,51.654,2,50.985,2,50.161v0.745C2,51.732,2.666,52.4,3.493,52.4z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M56.506,7.6H3.493C2.666,7.6,2,8.27,2,9.094v0.745 c0-0.824,0.666-1.493,1.493-1.493h53.013C57.33,8.346,58,9.015,58,9.839V9.094C58,8.27,57.33,7.6,56.506,7.6z" enable-background="new " fill="#FFFFFF" opacity="0.55"/>
+<path d="M3.493,52.4h53.013C57.33,52.4,58,51.732,58,50.906v-0.745 c0,0.824-0.67,1.493-1.494,1.493H3.493C2.666,51.654,2,50.985,2,50.161v0.745C2,51.732,2.666,52.4,3.493,52.4z" enable-background="new " fill="#FFFFFF" opacity="0.1"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2164" x2="-2164" y1="3641.7637" y2="3611.8926">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="0.5" style="stop-color:#666666"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="0.5" style="stop-color:#666666"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
<rect fill="url(#SVGID_2_)" height="29.871" width="56" x="2" y="15.064"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2164.0005" x2="-2164.0005" y1="3612.0117" y2="3641.8828">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</linearGradient>
<path d="M55.761,43.441c0,0.821-0.673,1.494-1.493,1.494H5.732c-0.82,0-1.494-0.673-1.494-1.494V16.559 c0-0.819,0.674-1.494,1.494-1.494h48.535c0.82,0,1.493,0.675,1.493,1.494V43.441z" fill="url(#SVGID_3_)"/>
-<path d="M54.268,43.441H5.732c-0.82,0-1.494,0.074-1.494-0.748l0,0 c0,0.822,0.674,1.493,1.494,1.493h48.535c0.82,0,1.493-0.671,1.493-1.493l0,0C55.761,43.516,55.088,43.441,54.268,43.441z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M54.268,43.441H5.732c-0.82,0-1.494,0.074-1.494-0.748l0,0 c0,0.822,0.674,1.493,1.494,1.493h48.535c0.82,0,1.493-0.671,1.493-1.493l0,0C55.761,43.516,55.088,43.441,54.268,43.441z" enable-background="new " fill="#FFFFFF" opacity="0.5"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-2164.0005" x2="-2164.0005" y1="3641.8828" y2="3611.8926">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#404040"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#404040"/>
</linearGradient>
<path d="M54.268,15.813c0.41,0,0.745,0.336,0.745,0.745v26.883c0,0.412-0.335,0.745-0.745,0.745H5.732 c-0.411,0-0.746-0.333-0.746-0.745V16.559c0-0.409,0.335-0.745,0.746-0.745H54.268 M54.268,15.064H5.732 c-0.82,0-1.494,0.675-1.494,1.494v26.883c0,0.821,0.674,1.494,1.494,1.494h48.535c0.82,0,1.493-0.673,1.493-1.494V16.559 C55.761,15.739,55.088,15.064,54.268,15.064L54.268,15.064z" fill="url(#SVGID_4_)"/>
-<path d="M54.268,24.025v-5.974c0-0.824-0.67-1.493-1.494-1.493H7.226 c-0.824,0-1.493,0.669-1.493,1.493v9.709L54.268,24.025z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M54.268,24.025v-5.974c0-0.824-0.67-1.493-1.494-1.493H7.226 c-0.824,0-1.493,0.669-1.493,1.493v9.709L54.268,24.025z" enable-background="new " fill="#FFFFFF" opacity="0.2"/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
-<path d="M15,29.5C7.004,29.5,0.5,22.996,0.5,15C0.5,7.004,7.004,0.5,15,0.5 c7.995,0,14.5,6.505,14.5,14.5S22.995,29.5,15,29.5L15,29.5z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M15,29.5C7.004,29.5,0.5,22.996,0.5,15C0.5,7.004,7.004,0.5,15,0.5 c7.995,0,14.5,6.505,14.5,14.5S22.995,29.5,15,29.5L15,29.5z" enable-background="new " opacity="0.35"/>
<radialGradient cx="435.2295" cy="910.6348" gradientTransform="matrix(0.618 0 0 0.618 -253.9715 -552.4329)" gradientUnits="userSpaceOnUse" id="SVGID_1__" r="28.704">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#94FFFF"/>
+ <stop offset="0.5" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</radialGradient>
<circle cx="15" cy="15" fill="url(#SVGID_1__)" r="13.464"/>
-<path d="M27.983,14.263c-0.299-5.259-3.704-9.788-8.679-11.54l-0.605,0.1L15.18,2.15 l-4.386,2.615l-0.165,1.102H8.083l1.006,1.71L6.365,9.8l-0.635,2.744l2.25,3.987l2.297-0.469l0.839,0.723l0.655,0.064l0.433,1.691 l-0.571,1.484l2.084,5.332h2.126l2.107-1.701v-0.695l0.557-0.863l0.459-0.236c-0.116,0.18-0.3,0.586-0.3,0.586 c-0.02,0.139,0.299,2.855,1.234,2.643c0.711-0.16,3.248-4.873,3.296-5.322c0.096-0.887-0.387-1.252-0.683-1.391l-0.329-0.156 l-1.515,1.52c-0.162,0.012-0.309,0.039-0.44,0.078v-1.26l1.645-1.605l0.837-2.698l1.275-1.038l-0.28-0.508l0.962-0.926l-0.538-0.979 l0.41,0.049l2.396,5.362l0.49-0.39c-0.015-0.262-0.043-0.521-0.073-0.779L27.983,14.263z M15.161,8.231l-0.2-0.535h1.202 l0.586,1.316h-0.871V8.23L15.161,8.231L15.161,8.231z M19.129,10.882l0.961,1.402l0.064,0.168l-0.984-0.595l-0.234-0.848 L19.129,10.882z M20.573,13.331l0.29,0.29l-0.375,0.084l-0.085-0.104L20.573,13.331z M13.06,3.903l0.611,0.946l-0.694,0.212 l-0.271-0.154L13.06,3.903z" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M27.983,14.263c-0.299-5.259-3.704-9.788-8.679-11.54l-0.605,0.1L15.18,2.15 l-4.386,2.615l-0.165,1.102H8.083l1.006,1.71L6.365,9.8l-0.635,2.744l2.25,3.987l2.297-0.469l0.839,0.723l0.655,0.064l0.433,1.691 l-0.571,1.484l2.084,5.332h2.126l2.107-1.701v-0.695l0.557-0.863l0.459-0.236c-0.116,0.18-0.3,0.586-0.3,0.586 c-0.02,0.139,0.299,2.855,1.234,2.643c0.711-0.16,3.248-4.873,3.296-5.322c0.096-0.887-0.387-1.252-0.683-1.391l-0.329-0.156 l-1.515,1.52c-0.162,0.012-0.309,0.039-0.44,0.078v-1.26l1.645-1.605l0.837-2.698l1.275-1.038l-0.28-0.508l0.962-0.926l-0.538-0.979 l0.41,0.049l2.396,5.362l0.49-0.39c-0.015-0.262-0.043-0.521-0.073-0.779L27.983,14.263z M15.161,8.231l-0.2-0.535h1.202 l0.586,1.316h-0.871V8.23L15.161,8.231L15.161,8.231z M19.129,10.882l0.961,1.402l0.064,0.168l-0.984-0.595l-0.234-0.848 L19.129,10.882z M20.573,13.331l0.29,0.29l-0.375,0.084l-0.085-0.104L20.573,13.331z M13.06,3.903l0.611,0.946l-0.694,0.212 l-0.271-0.154L13.06,3.903z" enable-background="new " opacity="0.3"/>
<linearGradient gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="333.1904" x2="333.1904" y1="416.6045" y2="431.9054">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#C8E4EB"/>
+ <stop offset="0" style="stop-color:#31A7F8"/>
+ <stop offset="0.497" style="stop-color:#1E74DC"/>
+ <stop offset="1" style="stop-color:#C8E4EB"/>
</linearGradient>
-<path d="M15,1.536C7.564,1.536,1.536,7.565,1.536,15 c0,7.439,6.029,13.464,13.464,13.464c7.438,0,13.465-6.027,13.465-13.464C28.465,7.565,22.438,1.536,15,1.536z M15,27.428 C8.146,27.428,2.571,21.854,2.571,15C2.571,8.147,8.146,2.571,15,2.571S27.428,8.147,27.428,15 C27.428,21.854,21.854,27.428,15,27.428z" fill="url(#SVGID_2__)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M15,1.536C7.564,1.536,1.536,7.565,1.536,15 c0,7.439,6.029,13.464,13.464,13.464c7.438,0,13.465-6.027,13.465-13.464C28.465,7.565,22.438,1.536,15,1.536z M15,27.428 C8.146,27.428,2.571,21.854,2.571,15C2.571,8.147,8.146,2.571,15,2.571S27.428,8.147,27.428,15 C27.428,21.854,21.854,27.428,15,27.428z" enable-background="new " fill="url(#SVGID_2__)" opacity="0.3"/>
<radialGradient cx="333.6309" cy="418.627" gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_3__" r="9.0429">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+ <stop offset="0" style="stop-color:#94FF26"/>
+ <stop offset="0.3152" style="stop-color:#94FF26"/>
+ <stop offset="0.7273" style="stop-color:#1FC211"/>
+ <stop offset="1" style="stop-color:#0BA133"/>
</radialGradient>
<path d="M22.296,18.848l-1.401,1.402c0,0-0.848,0-0.887,0.336c-0.02,0.145-0.065,0.771-0.208,1.094 c-0.282,0.195-0.619,0.842-0.619,0.842s-0.175,1.25,0.761,1.037C20.871,23.35,23.734,19.523,22.296,18.848z" fill="url(#SVGID_3__)"/>
<radialGradient cx="333.6299" cy="418.6211" gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_4__" r="10.4663">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+ <stop offset="0" style="stop-color:#94FF26"/>
+ <stop offset="0.3152" style="stop-color:#94FF26"/>
+ <stop offset="0.7273" style="stop-color:#1FC211"/>
+ <stop offset="1" style="stop-color:#0BA133"/>
</radialGradient>
<path d="M19.132,3.213c-0.23,0.087-0.387,0.146-0.387,0.146l-3.463-0.663L13.583,3.76l0.894,1.383 l-1.563,0.48l-0.842-0.48l0.296-0.84l-1.098,0.76l-0.196,1.324H8.988L9.759,7.7l-2.932,2.39l-0.552,2.387l1.088,2.107L8.018,15 l2.297-0.469l0.839,0.721l0.763,0.074l0.83,3.246l-0.552,1.436l1.22,2.697l0.343,1.119h2.126l1.202-0.65l0.905-1.053V20.85 l1.724-0.881v-1.885l0.681-1.297l1.521-1.366l0.363-1.585l-1.988,0.443l-0.522-0.637l0.371-0.594l-1.411-0.854l-0.601-2.164 l1.042-0.68l0.96,1.402l0.359,0.922l0.722,0.721l0.842,0.44l0.936-0.151l1.039-1l-0.731-1.334l-0.921,0.24l-0.833-0.991l0.791-0.552 l2.482,0.301v0.883l2.161,4.452l0.491-0.393C27.176,9.158,23.783,4.849,19.132,3.213z M18.004,9.23l-1.134,0.3h-1.511V8.749h-1.443 L12.774,9.05l-1.741-0.482l-0.482-0.901l2.404-0.541h2.406L15,6.164h1.202l0.67,1.503l1.134,0.398V9.23H18.004z M20.589,7.247 l-2.044-0.361V6.165l1.022-0.24l0.3-0.36l0.722,0.6V7.247L20.589,7.247z" fill="url(#SVGID_4__)"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_tv.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_video_tv.svg Fri May 14 16:09:54 2010 +0300
@@ -1,71 +1,74 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<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"/>
+ <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="M56.506,7.6H3.493C2.666,7.6,2,8.27,2,9.094v41.813C2,51.732,2.666,52.4,3.493,52.4h53.013 C57.33,52.4,58,51.732,58,50.906V9.094C58,8.27,57.33,7.6,56.506,7.6z M8.719,49.413c0,0.412-0.336,0.748-0.745,0.748H4.986 c-0.412,0-0.748-0.336-0.748-0.748V47.92c0-0.41,0.336-0.746,0.748-0.746h2.987c0.409,0,0.745,0.336,0.745,0.746V49.413z M8.719,12.08c0,0.41-0.336,0.746-0.745,0.746H4.986c-0.412,0-0.748-0.336-0.748-0.746v-1.493c0-0.409,0.336-0.748,0.748-0.748 h2.987c0.409,0,0.745,0.339,0.745,0.748V12.08z M15.438,49.413c0,0.412-0.335,0.748-0.745,0.748h-2.987 c-0.412,0-0.747-0.336-0.747-0.748V47.92c0-0.41,0.335-0.746,0.747-0.746h2.987c0.41,0,0.745,0.336,0.745,0.746V49.413z M15.438,12.08c0,0.41-0.335,0.746-0.745,0.746h-2.987c-0.412,0-0.747-0.336-0.747-0.746v-1.493c0-0.409,0.335-0.748,0.747-0.748 h2.987c0.41,0,0.745,0.339,0.745,0.748V12.08z M22.159,49.413c0,0.412-0.337,0.748-0.747,0.748h-2.986 c-0.41,0-0.746-0.336-0.746-0.748V47.92c0-0.41,0.335-0.746,0.746-0.746h2.986c0.41,0,0.747,0.336,0.747,0.746V49.413z M22.159,12.08c0,0.41-0.337,0.746-0.747,0.746h-2.986c-0.41,0-0.746-0.336-0.746-0.746v-1.493c0-0.409,0.335-0.748,0.746-0.748 h2.986c0.41,0,0.747,0.339,0.747,0.748V12.08z M28.88,49.413c0,0.412-0.337,0.748-0.747,0.748h-2.986 c-0.411,0-0.746-0.336-0.746-0.748V47.92c0-0.41,0.335-0.746,0.746-0.746h2.986c0.41,0,0.747,0.336,0.747,0.746V49.413z M28.88,12.08c0,0.41-0.337,0.746-0.747,0.746h-2.986c-0.411,0-0.746-0.336-0.746-0.746v-1.493c0-0.409,0.335-0.748,0.746-0.748 h2.986c0.41,0,0.747,0.339,0.747,0.748V12.08z M35.6,49.413c0,0.412-0.338,0.748-0.747,0.748h-2.985 c-0.412,0-0.748-0.336-0.748-0.748V47.92c0-0.41,0.336-0.746,0.748-0.746h2.985c0.409,0,0.747,0.336,0.747,0.746V49.413z M35.6,12.08c0,0.41-0.338,0.746-0.747,0.746h-2.985c-0.412,0-0.748-0.336-0.748-0.746v-1.493c0-0.409,0.336-0.748,0.748-0.748 h2.985c0.409,0,0.747,0.339,0.747,0.748V12.08z M42.318,49.413c0,0.412-0.335,0.748-0.745,0.748h-2.987 c-0.412,0-0.746-0.336-0.746-0.748V47.92c0-0.41,0.334-0.746,0.746-0.746h2.987c0.41,0,0.745,0.336,0.745,0.746V49.413z M42.318,12.08c0,0.41-0.335,0.746-0.745,0.746h-2.987c-0.412,0-0.746-0.336-0.746-0.746v-1.493c0-0.409,0.334-0.748,0.746-0.748 h2.987c0.41,0,0.745,0.339,0.745,0.748V12.08z M49.039,49.413c0,0.412-0.336,0.748-0.746,0.748h-2.987 c-0.41,0-0.745-0.336-0.745-0.748V47.92c0-0.41,0.335-0.746,0.745-0.746h2.987c0.41,0,0.746,0.336,0.746,0.746V49.413z M49.039,12.08c0,0.41-0.336,0.746-0.746,0.746h-2.987c-0.41,0-0.745-0.336-0.745-0.746v-1.493c0-0.409,0.335-0.748,0.745-0.748 h2.987c0.41,0,0.746,0.339,0.746,0.748V12.08z M55.761,49.413c0,0.412-0.339,0.748-0.748,0.748h-2.987 c-0.41,0-0.745-0.336-0.745-0.748V47.92c0-0.41,0.335-0.746,0.745-0.746h2.987c0.409,0,0.748,0.336,0.748,0.746V49.413z M55.761,12.08c0,0.41-0.339,0.746-0.748,0.746h-2.987c-0.41,0-0.745-0.336-0.745-0.746v-1.493c0-0.409,0.335-0.748,0.745-0.748 h2.987c0.409,0,0.748,0.339,0.748,0.748V12.08z" fill="url(#SVGID_1_)"/>
-<path d="M56.506,7.6H3.493C2.666,7.6,2,8.27,2,9.094v0.745 c0-0.824,0.666-1.493,1.493-1.493h53.013C57.33,8.346,58,9.015,58,9.839V9.094C58,8.27,57.33,7.6,56.506,7.6z" fill="#FFFFFF" fill-opacity="0.55" stroke-opacity="0.55"/>
-<path d="M3.493,52.4h53.013C57.33,52.4,58,51.732,58,50.906v-0.745 c0,0.824-0.67,1.493-1.494,1.493H3.493C2.666,51.654,2,50.985,2,50.161v0.745C2,51.732,2.666,52.4,3.493,52.4z" fill="#FFFFFF" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M56.506,7.6H3.493C2.666,7.6,2,8.27,2,9.094v0.745 c0-0.824,0.666-1.493,1.493-1.493h53.013C57.33,8.346,58,9.015,58,9.839V9.094C58,8.27,57.33,7.6,56.506,7.6z" enable-background="new " fill="#FFFFFF" opacity="0.55"/>
+<path d="M3.493,52.4h53.013C57.33,52.4,58,51.732,58,50.906v-0.745 c0,0.824-0.67,1.493-1.494,1.493H3.493C2.666,51.654,2,50.985,2,50.161v0.745C2,51.732,2.666,52.4,3.493,52.4z" enable-background="new " fill="#FFFFFF" opacity="0.1"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2164" x2="-2164" y1="3641.7637" y2="3611.8926">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="0.5" style="stop-color:#666666"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="0.5" style="stop-color:#666666"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
<rect fill="url(#SVGID_2_)" height="29.871" width="56" x="2" y="15.064"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2164.0005" x2="-2164.0005" y1="3612.0117" y2="3641.8828">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</linearGradient>
<path d="M55.761,43.441c0,0.821-0.673,1.494-1.493,1.494H5.732c-0.82,0-1.494-0.673-1.494-1.494V16.559 c0-0.819,0.674-1.494,1.494-1.494h48.535c0.82,0,1.493,0.675,1.493,1.494V43.441z" fill="url(#SVGID_3_)"/>
-<path d="M54.268,43.441H5.732c-0.82,0-1.494,0.074-1.494-0.748l0,0 c0,0.822,0.674,1.493,1.494,1.493h48.535c0.82,0,1.493-0.671,1.493-1.493l0,0C55.761,43.516,55.088,43.441,54.268,43.441z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M54.268,43.441H5.732c-0.82,0-1.494,0.074-1.494-0.748l0,0 c0,0.822,0.674,1.493,1.494,1.493h48.535c0.82,0,1.493-0.671,1.493-1.493l0,0C55.761,43.516,55.088,43.441,54.268,43.441z" enable-background="new " fill="#FFFFFF" opacity="0.5"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3656.9473)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-2164.0005" x2="-2164.0005" y1="3641.8828" y2="3611.8926">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#404040"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#404040"/>
</linearGradient>
<path d="M54.268,15.813c0.41,0,0.745,0.336,0.745,0.745v26.883c0,0.412-0.335,0.745-0.745,0.745H5.732 c-0.411,0-0.746-0.333-0.746-0.745V16.559c0-0.409,0.335-0.745,0.746-0.745H54.268 M54.268,15.064H5.732 c-0.82,0-1.494,0.675-1.494,1.494v26.883c0,0.821,0.674,1.494,1.494,1.494h48.535c0.82,0,1.493-0.673,1.493-1.494V16.559 C55.761,15.739,55.088,15.064,54.268,15.064L54.268,15.064z" fill="url(#SVGID_4_)"/>
-<path d="M54.268,24.025v-5.974c0-0.824-0.67-1.493-1.494-1.493H7.226 c-0.824,0-1.493,0.669-1.493,1.493v9.709L54.268,24.025z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M54.268,24.025v-5.974c0-0.824-0.67-1.493-1.494-1.493H7.226 c-0.824,0-1.493,0.669-1.493,1.493v9.709L54.268,24.025z" enable-background="new " fill="#FFFFFF" opacity="0.2"/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<polygon fill="none" points="0,4.111 0,24.333 0,30 30,30 30,24.333 30,4.111 30,0 0,0 "/>
-<path d="M8.389,27.667c-0.893,0-1.633-0.681-1.74-1.557H1.777C0.797,26.11,0,25.313,0,24.333V4.111 c0-0.98,0.797-1.777,1.777-1.777h26.444c0.98,0,1.778,0.797,1.778,1.777v20.222c0,0.98-0.798,1.777-1.778,1.777h-4.87 c-0.108,0.876-0.848,1.557-1.74,1.557H8.389z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M8.389,27.667c-0.893,0-1.633-0.681-1.74-1.557H1.777C0.797,26.11,0,25.313,0,24.333V4.111 c0-0.98,0.797-1.777,1.777-1.777h26.444c0.98,0,1.778,0.797,1.778,1.777v20.222c0,0.98-0.798,1.777-1.778,1.777h-4.87 c-0.108,0.876-0.848,1.557-1.74,1.557H8.389z" opacity="0.35"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="15" x2="15" y1="26.5859" y2="24.8039">
-<stop offset="0" style="stop-color:#404040"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#404040"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
<path d="M22.365,25.889c0,0.431-0.338,0.778-0.754,0.778H8.389c-0.416,0-0.754-0.348-0.754-0.778l0,0 c0-0.43-0.023-1.166-0.023-1.166h14.777C22.389,24.723,22.365,25.459,22.365,25.889L22.365,25.889z" fill="url(#SVGID_1__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="15" x2="15" y1="3.2046" y2="25.112">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="0.1212" style="stop-color:#F2F2F2"/>
-<stop offset="0.5515" style="stop-color:#ADB2B5"/>
-<stop offset="1" style="stop-color:#E6E9E8"/>
+ <stop offset="0.1212" style="stop-color:#F2F2F2"/>
+ <stop offset="0.5515" style="stop-color:#ADB2B5"/>
+ <stop offset="1" style="stop-color:#E6E9E8"/>
</linearGradient>
<path d="M29,24.333c0,0.431-0.35,0.777-0.778,0.777H1.777C1.348,25.11,1,24.764,1,24.333V4.111 c0-0.429,0.348-0.777,0.777-0.777h26.444C28.65,3.334,29,3.683,29,4.111V24.333z" fill="url(#SVGID_2__)"/>
-<path d="M28.222,24.723H1.777C1.348,24.723,1,24.374,1,23.944v0.389c0,0.431,0.348,0.777,0.777,0.777 h26.444c0.429,0,0.778-0.347,0.778-0.777v-0.389C29,24.374,28.65,24.723,28.222,24.723z" fill="#231F20" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M28.222,24.723H1.777C1.348,24.723,1,24.374,1,23.944v0.389c0,0.431,0.348,0.777,0.777,0.777 h26.444c0.429,0,0.778-0.347,0.778-0.777v-0.389C29,24.374,28.65,24.723,28.222,24.723z" fill="#231F20" opacity="0.3"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3__" x1="14.999" x2="14.999" y1="20.7036" y2="5.2349">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</linearGradient>
<rect fill="url(#SVGID_3__)" height="15.943" width="24.889" x="2.555" y="4.89"/>
<rect fill="#FFFFFF" height="0.39" width="24.889" x="2.555" y="20.443"/>
-<polygon fill="#FFFFFF" fill-opacity="0.2" points="2.95,13.056 27.055,9.876 27.055,5.277 2.943,5.277 " stroke-opacity="0.2"/>
+<polygon fill="#FFFFFF" opacity="0.2" points="2.95,13.056 27.055,9.876 27.055,5.277 2.943,5.277 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4__" x1="14.999" x2="14.999" y1="24.2773" y2="21.3131">
-<stop offset="0" style="stop-color:#57CDEA"/>
-<stop offset="1" style="stop-color:#196BDE"/>
+ <stop offset="0" style="stop-color:#57CDEA"/>
+ <stop offset="1" style="stop-color:#196BDE"/>
</linearGradient>
<path d="M15,21.806c0.537,0,0.971,0.436,0.971,0.972S15.537,23.75,15,23.75c-0.535,0-0.973-0.437-0.973-0.973 S14.465,21.806,15,21.806 M15,21.222c-0.859,0-1.557,0.697-1.557,1.556c0,0.859,0.697,1.556,1.557,1.556s1.555-0.696,1.555-1.556 C16.555,21.919,15.859,21.222,15,21.222L15,21.222z" fill="url(#SVGID_4__)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="15" x2="15" y1="3.7866" y2="24.3979">
-<stop offset="0" style="stop-color:#E6E9E8"/>
-<stop offset="1" style="stop-color:#ADB2B5"/>
+ <stop offset="0" style="stop-color:#E6E9E8"/>
+ <stop offset="1" style="stop-color:#ADB2B5"/>
</linearGradient>
<path d="M27.832,3.722H2.166c-0.43,0-0.777,0.349-0.777,0.778v19.055c0,0.431,0.348,0.778,0.777,0.778h11.369 c-0.414-0.39-0.674-0.941-0.674-1.556c0-0.613,0.26-1.165,0.674-1.556H2.166V4.5h25.666v16.722H16.465 c0.414,0.391,0.674,0.942,0.674,1.556c0,0.614-0.26,1.166-0.674,1.556h11.367c0.43,0,0.779-0.348,0.779-0.778V4.5 C28.611,4.07,28.262,3.722,27.832,3.722z" fill="url(#SVGID_5_)"/>
-<path d="M21.611,26.277H8.389c-0.35,0-0.643-0.248-0.727-0.583c-0.016,0.063-0.027,0.127-0.027,0.194 c0,0.431,0.338,0.778,0.754,0.778h13.223c0.416,0,0.754-0.348,0.754-0.778c0-0.067-0.012-0.132-0.027-0.194 C22.254,26.029,21.963,26.277,21.611,26.277z" fill="#FFFFFF" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M21.611,26.277H8.389c-0.35,0-0.643-0.248-0.727-0.583c-0.016,0.063-0.027,0.127-0.027,0.194 c0,0.431,0.338,0.778,0.754,0.778h13.223c0.416,0,0.754-0.348,0.754-0.778c0-0.067-0.012-0.132-0.027-0.194 C22.254,26.029,21.963,26.277,21.611,26.277z" fill="#FFFFFF" opacity="0.35"/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voice_call.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voice_call.svg Fri May 14 16:09:54 2010 +0300
@@ -1,42 +1,42 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<stop offset="0" style="stop-color:#3AC5EA"/>
-<stop offset="0.297" style="stop-color:#3AC5EA"/>
-<stop offset="0.6667" style="stop-color:#1754C9"/>
-<stop offset="0.7939" style="stop-color:#33ADE1"/>
-<stop offset="1" style="stop-color:#33ADE1"/>
+ <stop offset="0.297" style="stop-color:#3AC5EA"/>
+ <stop offset="0.6667" style="stop-color:#1754C9"/>
+ <stop offset="0.7939" style="stop-color:#33ADE1"/>
</radialGradient>
<path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333c-0.617-0.665-2.567-3.083-2.968-3.735 c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956c6.191-6.192,9.085-7.646,9.956-8.107 c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967c0.534,0.492,0.872,0.588,1.299,0.274 c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778c-2.476-2.889-8.594-5.015-10.751-5.399 c-1.923-0.345-3.876-0.872-6.567,0.235c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352 c-1.108,2.691-0.581,4.645-0.236,6.567c0.386,2.158,2.51,8.275,5.399,10.752c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2070.7568" x2="-2070.3252" y1="-2266.8511" y2="-2263.2749">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+ <stop offset="0" style="stop-color:#2685D2"/>
+ <stop offset="1" style="stop-color:#081D45"/>
</linearGradient>
<path d="M35.172,17.108c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967 c0.534,0.492,0.872,0.588,1.299,0.274c0.048-0.035,0.062-0.046,0.064-0.046c0.253-0.184,1.032-0.738,2.12-1.514 c-0.251-0.204-3.468-2.809-4.8-2.956C36.857,15.598,35.172,17.108,35.172,17.108z" fill="url(#SVGID_2_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -2128.2356 5114.0977)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2070.7607" x2="-2070.3289" y1="5104.5752" y2="5108.1523">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+ <stop offset="0" style="stop-color:#2685D2"/>
+ <stop offset="1" style="stop-color:#081D45"/>
</linearGradient>
<path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.713c0.376,0.666,2.351,3.069,2.967,3.738 c0.493,0.531,0.587,0.869,0.274,1.298c-0.035,0.047-0.046,0.062-0.046,0.062c-0.183,0.253-0.738,1.032-1.515,2.119 c-0.204-0.252-2.807-3.467-2.956-4.799C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="47.9224" x2="3.9991" y1="3.9307" y2="47.854">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+ <stop offset="0" style="stop-color:#ABEEFF"/>
+ <stop offset="1" style="stop-color:#539FDE"/>
</linearGradient>
-<path d="M2.979,47.467c-0.344-1.925-0.873-3.878,0.235-6.567 c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.341,4.269,40.9,3.215c2.691-1.108,4.644-0.581,6.567-0.236 c1.981,0.354,7.296,2.178,10.069,4.711c-2.552-2.815-8.496-4.879-10.617-5.258c-1.923-0.345-3.876-0.872-6.567,0.235 c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567 c0.378,2.122,2.441,8.065,5.258,10.617C5.156,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M2.979,47.467c-0.344-1.925-0.873-3.878,0.235-6.567 c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.341,4.269,40.9,3.215c2.691-1.108,4.644-0.581,6.567-0.236 c1.981,0.354,7.296,2.178,10.069,4.711c-2.552-2.815-8.496-4.879-10.617-5.258c-1.923-0.345-3.876-0.872-6.567,0.235 c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567 c0.378,2.122,2.441,8.065,5.258,10.617C5.156,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="54.3535" x2="3.9474" y1="3.2017" y2="53.6078">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+ <stop offset="0" style="stop-color:#ABEEFF"/>
+ <stop offset="1" style="stop-color:#539FDE"/>
</linearGradient>
-<path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333 c-0.617-0.665-2.567-3.083-2.968-3.735c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956 c6.191-6.192,9.085-7.646,9.956-8.107c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967 c0.534,0.492,0.872,0.588,1.299,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778 c-0.292-0.339-0.634-0.665-1.013-0.982c0.49,0.657,0.198,1.134-0.607,1.666C54.65,9.447,41.576,18.739,40.825,19.29 c-0.431,0.314-0.767,0.219-1.3-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.948-0.436-1.71-0.034 c-0.871,0.46-3.764,1.914-9.956,8.106c-6.193,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.319,1.135,0.035,1.711 c0.4,0.651,2.351,3.069,2.967,3.736c0.493,0.533,0.559,0.896,0.259,1.332c-0.517,0.755-9.828,13.794-10.76,15.195 c-0.533,0.803-1.008,1.098-1.665,0.606c0.314,0.378,0.644,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_5_)" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333 c-0.617-0.665-2.567-3.083-2.968-3.735c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956 c6.191-6.192,9.085-7.646,9.956-8.107c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967 c0.534,0.492,0.872,0.588,1.299,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778 c-0.292-0.339-0.634-0.665-1.013-0.982c0.49,0.657,0.198,1.134-0.607,1.666C54.65,9.447,41.576,18.739,40.825,19.29 c-0.431,0.314-0.767,0.219-1.3-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.948-0.436-1.71-0.034 c-0.871,0.46-3.764,1.914-9.956,8.106c-6.193,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.319,1.135,0.035,1.711 c0.4,0.651,2.351,3.069,2.967,3.736c0.493,0.533,0.559,0.896,0.259,1.332c-0.517,0.755-9.828,13.794-10.76,15.195 c-0.533,0.803-1.008,1.098-1.665,0.606c0.314,0.378,0.644,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_5_)" opacity="0.6"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -141.776 3075.0667)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-2041.9355" x2="-2041.9355" y1="-2305.2153" y2="-2243.2966">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="0.5091" style="stop-color:#081D45"/>
-<stop offset="1" style="stop-color:#2275BD"/>
+ <stop offset="0" style="stop-color:#2685D2"/>
+ <stop offset="0.5091" style="stop-color:#081D45"/>
+ <stop offset="1" style="stop-color:#2275BD"/>
</linearGradient>
<path d="M2.899,45.012c1.275-2.777,10.299-14.804,18.804-23.31c8.505-8.506,20.532-17.529,23.308-18.803 c0.527-0.241,1.02-0.411,1.493-0.545c-0.511-0.096-1.03-0.19-1.565-0.26c-0.086,0.036-0.163,0.063-0.25,0.102 c-2.818,1.293-14.971,10.397-23.533,18.959C12.595,29.717,3.489,41.869,2.195,44.688c-0.038,0.087-0.063,0.166-0.101,0.25 c0.07,0.535,0.166,1.055,0.259,1.565C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_6_)"/>
<rect fill="none" height="60" width="60"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voice_recorder.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voice_recorder.svg Fri May 14 16:09:54 2010 +0300
@@ -1,40 +1,42 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
+<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" opacity="0.1"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="267.0962" x2="290.189" y1="468.0112" y2="468.0112">
-<stop offset="0" style="stop-color:#A8B1B3"/>
-<stop offset="0.3818" style="stop-color:#FFFFFF"/>
-<stop offset="0.7091" style="stop-color:#686E70"/>
-<stop offset="1" style="stop-color:#A6B0B3"/>
+ <stop offset="0" style="stop-color:#A8B1B3"/>
+ <stop offset="0.3818" style="stop-color:#FFFFFF"/>
+ <stop offset="0.7091" style="stop-color:#686E70"/>
+ <stop offset="1" style="stop-color:#A6B0B3"/>
</linearGradient>
<path d="M47.688,5.382c-4.507-4.509-11.819-4.509-16.327,0L21.019,15.725l16.328,16.328l10.341-10.342 C52.198,17.202,52.199,9.893,47.688,5.382z" fill="url(#SVGID_1_)"/>
-<path d="M47.688,5.382c-4.507-4.509-11.819-4.509-16.327,0l-1.634,1.633 c4.51-4.509,9.643-2.331,14.151,2.178c4.511,4.51,6.687,9.644,2.178,14.151l1.632-1.633C52.198,17.202,52.199,9.893,47.688,5.382z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M47.688,5.382c-4.507-4.509-11.819-4.509-16.327,0l-1.634,1.633 c4.51-4.509,11.821-4.509,16.33,0c4.51,4.511,4.508,11.821,0,16.329l1.632-1.633C52.198,17.202,52.199,9.893,47.688,5.382z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M47.688,5.382c-4.507-4.509-11.819-4.509-16.327,0l-1.634,1.633 c4.51-4.509,9.643-2.331,14.151,2.178c4.511,4.51,6.687,9.644,2.178,14.151l1.632-1.633C52.198,17.202,52.199,9.893,47.688,5.382z" fill="#FFFFFF" opacity="0.2"/>
+<path d="M47.688,5.382c-4.507-4.509-11.819-4.509-16.327,0l-1.634,1.633 c4.51-4.509,11.821-4.509,16.33,0c4.51,4.511,4.508,11.821,0,16.329l1.632-1.633C52.198,17.202,52.199,9.893,47.688,5.382z" fill="#FFFFFF" opacity="0.2"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="267.0962" x2="290.1899" y1="493.0283" y2="493.0283">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.3818" style="stop-color:#7A7A7A"/>
-<stop offset="0.7091" style="stop-color:#1A1A1A"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.3818" style="stop-color:#7A7A7A"/>
+ <stop offset="0.7091" style="stop-color:#1A1A1A"/>
+ <stop offset="1" style="stop-color:#4D4D4D"/>
</linearGradient>
<path d="M21.019,15.725l-8.709,8.707c-4.51,4.51-4.51,11.821,0,16.33c4.508,4.51,11.821,4.51,16.33,0 l8.708-8.709L21.019,15.725z" fill="url(#SVGID_2_)"/>
-<path d="M16.664,36.407c-4.51-4.509-8.318-8.01-3.81-12.52l-0.544,0.544c-4.51,4.51-4.51,11.821,0,16.33 c4.508,4.51,11.821,4.51,16.33,0l0.543-0.545C24.674,44.728,21.173,40.916,16.664,36.407z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M15.031,38.04c-4.508-4.508-6.685-9.643-2.177-14.152l-0.544,0.544c-4.51,4.51-4.51,11.821,0,16.33 c4.508,4.51,11.821,4.51,16.33,0l0.543-0.545C24.674,44.728,19.541,42.55,15.031,38.04z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M13.398,39.674C8.889,35.164,7.8,28.941,12.31,24.432l0,0c-4.51,4.51-4.51,11.821,0,16.33 c4.508,4.51,11.821,4.51,16.33,0l0,0C24.131,45.271,17.909,44.183,13.398,39.674z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M16.664,36.407c-4.51-4.509-8.318-8.01-3.81-12.52l-0.544,0.544c-4.51,4.51-4.51,11.821,0,16.33 c4.508,4.51,11.821,4.51,16.33,0l0.543-0.545C24.674,44.728,21.173,40.916,16.664,36.407z" opacity="0.1"/>
+<path d="M15.031,38.04c-4.508-4.508-6.685-9.643-2.177-14.152l-0.544,0.544c-4.51,4.51-4.51,11.821,0,16.33 c4.508,4.51,11.821,4.51,16.33,0l0.543-0.545C24.674,44.728,19.541,42.55,15.031,38.04z" opacity="0.2"/>
+<path d="M13.398,39.674C8.889,35.164,7.8,28.941,12.31,24.432l0,0c-4.51,4.51-4.51,11.821,0,16.33 c4.508,4.51,11.821,4.51,16.33,0l0,0C24.131,45.271,17.909,44.183,13.398,39.674z" opacity="0.2"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="266.3257" x2="290.9585" y1="483.7915" y2="483.7915">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.3818" style="stop-color:#7A7A7A"/>
-<stop offset="0.7091" style="stop-color:#1A1A1A"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.3818" style="stop-color:#7A7A7A"/>
+ <stop offset="0.7091" style="stop-color:#1A1A1A"/>
+ <stop offset="1" style="stop-color:#4D4D4D"/>
</linearGradient>
<path d="M34.626,35.862c-0.301,0.3-0.79,0.3-1.09,0L17.208,19.534c-0.299-0.3-0.299-0.789,0-1.089 l2.721-2.721c0.301-0.3,0.791-0.3,1.09,0l16.328,16.328c0.3,0.3,0.3,0.79,0,1.089L34.626,35.862z" fill="url(#SVGID_3_)"/>
-<path d="M37.347,32.053L21.019,15.725c-0.3-0.3-0.79-0.3-1.09,0l-0.544,0.544 c0.301-0.299,0.79-0.299,1.09,0l16.328,16.328c0.3,0.3,0.3,0.79,0,1.089l0.544-0.544C37.647,32.843,37.647,32.353,37.347,32.053z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<rect fill-opacity="0.1" height="0.77" stroke-opacity="0.1" transform="matrix(0.7071 0.7071 -0.7071 0.7071 27.5824 -8.4675)" width="23.093" x="12.465" y="28.674"/>
-<rect fill="#FFFFFF" fill-opacity="0.2" height="0.771" stroke-opacity="0.2" transform="matrix(0.7071 0.7071 -0.7071 0.7071 25.326 -13.911)" width="23.091" x="17.909" y="23.23"/>
-<rect fill-opacity="0.2" height="0.769" stroke-opacity="0.2" transform="matrix(0.7071 0.7071 -0.7071 0.7071 27.3549 -9.0122)" width="23.091" x="13.01" y="28.13"/>
-<rect fill-opacity="0.4" height="0.769" stroke-opacity="0.4" transform="matrix(0.7071 0.7071 -0.7071 0.7071 27.131 -9.5558)" width="23.092" x="13.554" y="27.586"/>
+<path d="M37.347,32.053L21.019,15.725c-0.3-0.3-0.79-0.3-1.09,0l-0.544,0.544 c0.301-0.299,0.79-0.299,1.09,0l16.328,16.328c0.3,0.3,0.3,0.79,0,1.089l0.544-0.544C37.647,32.843,37.647,32.353,37.347,32.053z" fill="#FFFFFF" opacity="0.2"/>
+<rect height="0.77" opacity="0.1" transform="matrix(0.7071 0.7071 -0.7071 0.7071 27.5824 -8.4675)" width="23.093" x="12.465" y="28.674"/>
+<rect fill="#FFFFFF" height="0.771" opacity="0.2" transform="matrix(0.7071 0.7071 -0.7071 0.7071 25.326 -13.911)" width="23.091" x="17.909" y="23.23"/>
+<rect height="0.769" opacity="0.2" transform="matrix(0.7071 0.7071 -0.7071 0.7071 27.3549 -9.0122)" width="23.091" x="13.01" y="28.13"/>
+<rect height="0.769" opacity="0.4" transform="matrix(0.7071 0.7071 -0.7071 0.7071 27.131 -9.5558)" width="23.092" x="13.554" y="27.586"/>
<path d="M22.652,15.179c0.301-0.299,0.301-0.786,0-1.087l-1.089,1.087C21.864,15.481,22.351,15.48,22.652,15.179z" fill="#FFFFFF"/>
<path d="M27.005,10.824c0.301-0.3,0.301-0.787,0-1.088l-1.087,1.088C26.217,11.126,26.705,11.125,27.005,10.824z" fill="#FFFFFF"/>
<path d="M31.361,6.471c0.291-0.291,0.293-0.753,0.021-1.055c-0.19,0.167-0.384,0.329-0.566,0.511l-0.544,0.544 C30.571,6.771,31.059,6.771,31.361,6.471z" fill="#FFFFFF"/>
@@ -57,196 +59,174 @@
<circle cx="36.803" cy="16.269" fill="#FFFFFF" r="0.769"/>
<circle cx="41.157" cy="11.914" fill="#FFFFFF" r="0.77"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="267.4819" x2="267.4819" y1="462.314" y2="479.7079">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
-<stop offset="0.7152" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.2" style="stop-color:#504E4E"/>
+ <stop offset="0.7152" style="stop-color:#000000"/>
</linearGradient>
<path d="M23.196,14.637c0.301-0.302,0.301-0.788,0-1.091l-1.088,1.091 C22.409,14.937,22.895,14.937,23.196,14.637z" fill="url(#SVGID_4_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="267.481" x2="267.481" y1="462.3311" y2="479.7029">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
-<stop offset="0.7152" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.2" style="stop-color:#504E4E"/>
+ <stop offset="0.7152" style="stop-color:#000000"/>
</linearGradient>
<path d="M27.549,10.28c0.302-0.3,0.302-0.788,0-1.088l-1.087,1.088C26.763,10.582,27.249,10.581,27.549,10.28 z" fill="url(#SVGID_5_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="267.481" x2="267.481" y1="462.3467" y2="479.6524">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
-<stop offset="0.7152" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.2" style="stop-color:#504E4E"/>
+ <stop offset="0.7152" style="stop-color:#000000"/>
</linearGradient>
<path d="M31.903,5.927c0.292-0.291,0.294-0.754,0.023-1.057c-0.192,0.168-0.386,0.33-0.566,0.512 l-0.545,0.545C31.116,6.228,31.603,6.228,31.903,5.927z" fill="url(#SVGID_6_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="270.9458" x2="270.9458" y1="462.3418" y2="479.7027">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
-<stop offset="0.7152" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.2" style="stop-color:#504E4E"/>
+ <stop offset="0.7152" style="stop-color:#000000"/>
</linearGradient>
<circle cx="27.549" cy="14.635" fill="url(#SVGID_7_)" r="0.769"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="270.9458" x2="270.9458" y1="462.3311" y2="479.6974">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
-<stop offset="0.7152" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.2" style="stop-color:#504E4E"/>
+ <stop offset="0.7152" style="stop-color:#000000"/>
</linearGradient>
<circle cx="31.905" cy="10.28" fill="url(#SVGID_8_)" r="0.769"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="270.9458" x2="270.9458" y1="462.3247" y2="479.6966">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
-<stop offset="0.7152" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.2" style="stop-color:#504E4E"/>
+ <stop offset="0.7152" style="stop-color:#000000"/>
</linearGradient>
<circle cx="36.26" cy="5.926" fill="url(#SVGID_9_)" r="0.769"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="274.7954" x2="274.7954" y1="462.314" y2="479.7079">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
-<stop offset="0.7152" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.2" style="stop-color:#504E4E"/>
+ <stop offset="0.7152" style="stop-color:#000000"/>
</linearGradient>
<circle cx="28.094" cy="19.534" fill="url(#SVGID_10_)" r="0.77"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="274.7944" x2="274.7944" y1="462.3257" y2="479.7086">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
-<stop offset="0.7152" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.2" style="stop-color:#504E4E"/>
+ <stop offset="0.7152" style="stop-color:#000000"/>
</linearGradient>
<circle cx="32.448" cy="15.181" fill="url(#SVGID_11_)" r="0.77"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="274.7944" x2="274.7944" y1="462.3267" y2="479.6985">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
-<stop offset="0.7152" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.2" style="stop-color:#504E4E"/>
+ <stop offset="0.7152" style="stop-color:#000000"/>
</linearGradient>
<circle cx="36.803" cy="10.825" fill="url(#SVGID_12_)" r="0.769"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="289.8052" x2="289.8052" y1="462.335" y2="479.7068">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
-<stop offset="0.7152" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.2" style="stop-color:#504E4E"/>
+ <stop offset="0.7152" style="stop-color:#000000"/>
</linearGradient>
<path d="M38.437,29.876c-0.301,0.301-0.301,0.788,0,1.088l1.088-1.088 C39.225,29.574,38.737,29.575,38.437,29.876z" fill="url(#SVGID_13_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="289.8052" x2="289.8052" y1="462.3247" y2="479.7076">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
-<stop offset="0.7152" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.2" style="stop-color:#504E4E"/>
+ <stop offset="0.7152" style="stop-color:#000000"/>
</linearGradient>
<path d="M42.79,25.521c-0.301,0.301-0.301,0.787,0,1.09l1.088-1.09C43.579,25.22,43.091,25.22,42.79,25.521z " fill="url(#SVGID_14_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="289.8032" x2="289.8032" y1="462.3516" y2="479.6407">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
-<stop offset="0.7152" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.2" style="stop-color:#504E4E"/>
+ <stop offset="0.7152" style="stop-color:#000000"/>
</linearGradient>
<path d="M48.201,21.146c-0.302-0.274-0.765-0.271-1.057,0.02c-0.301,0.302-0.301,0.788,0,1.089l0.544-0.544 C47.871,21.529,48.034,21.335,48.201,21.146z" fill="url(#SVGID_15_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="286.3403" x2="286.3403" y1="462.3247" y2="479.7076">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
-<stop offset="0.7152" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.2" style="stop-color:#504E4E"/>
+ <stop offset="0.7152" style="stop-color:#000000"/>
</linearGradient>
<circle cx="38.436" cy="25.521" fill="url(#SVGID_16_)" r="0.77"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="286.3403" x2="286.3403" y1="462.3271" y2="479.7046">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
-<stop offset="0.7152" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.2" style="stop-color:#504E4E"/>
+ <stop offset="0.7152" style="stop-color:#000000"/>
</linearGradient>
<circle cx="42.79" cy="21.167" fill="url(#SVGID_17_)" r="0.77"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_18_" x1="286.3403" x2="286.3403" y1="462.3262" y2="479.7036">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
-<stop offset="0.7152" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.2" style="stop-color:#504E4E"/>
+ <stop offset="0.7152" style="stop-color:#000000"/>
</linearGradient>
<path d="M47.688,17.357c-0.297,0.3-0.786,0.3-1.088,0c-0.301-0.301-0.301-0.788,0-1.089s0.787-0.301,1.088,0 C47.991,16.569,47.989,17.057,47.688,17.357z" fill="url(#SVGID_18_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_19_" x1="282.4907" x2="282.4907" y1="462.3296" y2="479.707">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
-<stop offset="0.7152" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.2" style="stop-color:#504E4E"/>
+ <stop offset="0.7152" style="stop-color:#000000"/>
</linearGradient>
<path d="M34.08,25.521c-0.298,0.301-0.786,0.301-1.088,0c-0.301-0.301-0.301-0.788,0-1.089 c0.301-0.3,0.789-0.301,1.088,0C34.383,24.734,34.381,25.22,34.08,25.521z" fill="url(#SVGID_19_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_20_" x1="282.4917" x2="282.4917" y1="462.3237" y2="479.7066">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
-<stop offset="0.7152" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.2" style="stop-color:#504E4E"/>
+ <stop offset="0.7152" style="stop-color:#000000"/>
</linearGradient>
<circle cx="37.892" cy="20.622" fill="url(#SVGID_20_)" r="0.77"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_21_" x1="282.4917" x2="282.4917" y1="462.3267" y2="479.7041">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
-<stop offset="0.7152" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.2" style="stop-color:#504E4E"/>
+ <stop offset="0.7152" style="stop-color:#000000"/>
</linearGradient>
<circle cx="42.246" cy="16.269" fill="url(#SVGID_21_)" r="0.77"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_22_" x1="278.6431" x2="278.6431" y1="462.3335" y2="479.7054">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
-<stop offset="0.7152" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.2" style="stop-color:#504E4E"/>
+ <stop offset="0.7152" style="stop-color:#000000"/>
</linearGradient>
<circle cx="32.992" cy="20.078" fill="url(#SVGID_22_)" r="0.769"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_23_" x1="278.6431" x2="278.6431" y1="462.3223" y2="479.7107">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
-<stop offset="0.7152" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.2" style="stop-color:#504E4E"/>
+ <stop offset="0.7152" style="stop-color:#000000"/>
</linearGradient>
<circle cx="37.347" cy="15.724" fill="url(#SVGID_23_)" r="0.77"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 172.3383 -513.3235)" gradientUnits="userSpaceOnUse" id="SVGID_24_" x1="278.6431" x2="278.6431" y1="462.3242" y2="479.7016">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2" style="stop-color:#504E4E"/>
-<stop offset="0.7152" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.2" style="stop-color:#504E4E"/>
+ <stop offset="0.7152" style="stop-color:#000000"/>
</linearGradient>
<circle cx="41.702" cy="11.369" fill="url(#SVGID_24_)" r="0.769"/>
<linearGradient gradientTransform="matrix(1 0 0 1 -374.1758 -502.9102)" gradientUnits="userSpaceOnUse" id="SVGID_25_" x1="404.7837" x2="396.38" y1="554.8911" y2="554.8911">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.2545" style="stop-color:#1A1A1A"/>
-<stop offset="0.6182" style="stop-color:#7A7A7A"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.2545" style="stop-color:#1A1A1A"/>
+ <stop offset="0.6182" style="stop-color:#7A7A7A"/>
+ <stop offset="1" style="stop-color:#4D4D4D"/>
</linearGradient>
<path d="M30.288,54.397c-0.001,1.216-0.979,2.203-2.185,2.203h-3.328c-1.207,0-2.185-0.987-2.185-2.2v-5.618 c0-1.215,0.978-1.42,2.185-1.42h3.327c1.207,0,2.184,0.205,2.184,1.42L30.288,54.397z" fill="url(#SVGID_25_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_26_" x1="14.8921" x2="37.9844" y1="56.0747" y2="56.0747">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.3818" style="stop-color:#999999"/>
-<stop offset="0.7515" style="stop-color:#1A1A1A"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.3818" style="stop-color:#999999"/>
+ <stop offset="0.7515" style="stop-color:#1A1A1A"/>
+ <stop offset="1" style="stop-color:#4D4D4D"/>
</linearGradient>
<path d="M37.937,58c0.032-0.767,0.048-0.92,0.048-1.078v-0.506c0-1.251-1.026-2.267-2.292-2.267H17.186 c-1.266,0-2.293,1.016-2.293,2.267v0.506c0,0.158,0.019,0.312,0.049,1.078H37.937z" fill="url(#SVGID_26_)"/>
-<path d="M15.032,55.661h22.811c-0.101-0.282-0.255-0.537-0.453-0.755H15.488 C15.29,55.124,15.135,55.379,15.032,55.661z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M14.904,57.243c0.009,0.154,0.02,0.381,0.035,0.757h22.997c0.017-0.376,0.028-0.603,0.037-0.757H14.904z" fill-opacity="0.35" stroke-opacity="0.35"/>
-<path d="M15.488,54.906H37.39c-0.42-0.462-1.021-0.757-1.698-0.757H17.186 C16.509,54.149,15.908,54.444,15.488,54.906z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M30,49.086v-0.304c0-1.215-0.906-1.42-2.022-1.42h-3.079c-1.115,0-2.02,0.205-2.02,1.42v0.304 c0.391,0.721,1.147,1.216,2.02,1.216h3.079C28.854,50.302,29.606,49.807,30,49.086z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M29.518,47.992v-0.294c-0.371-0.265-0.918-0.336-1.54-0.336h-3.079c-0.62,0-1.169,0.071-1.539,0.336v0.294 c0,0.85,0.69,1.54,1.539,1.54h3.079C28.827,49.532,29.518,48.842,29.518,47.992z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M28.64,40.762l1.648-1.649V25.67c0-0.298-0.062-0.58-0.164-0.84l-1.305-1.307 c-0.261-0.104-0.542-0.163-0.841-0.163h-3.079c-1.273,0-2.309,1.036-2.309,2.31v18.275C24.807,43.534,26.924,42.476,28.64,40.762z" fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M28.64,40.762l0.878-0.879V25.67c0-0.85-0.691-1.54-1.54-1.54h-3.079c-0.849,0-1.539,0.69-1.539,1.54v18.097 C25.293,43.269,27.125,42.275,28.64,40.762z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M15.032,55.661h22.811c-0.101-0.282-0.255-0.537-0.453-0.755H15.488 C15.29,55.124,15.135,55.379,15.032,55.661z" fill="#FFFFFF" opacity="0.2"/>
+<path d="M14.904,57.243c0.009,0.154,0.02,0.381,0.035,0.757h22.997c0.017-0.376,0.028-0.603,0.037-0.757H14.904z" opacity="0.35"/>
+<path d="M15.488,54.906H37.39c-0.42-0.462-1.021-0.757-1.698-0.757H17.186 C16.509,54.149,15.908,54.444,15.488,54.906z" fill="#FFFFFF" opacity="0.4"/>
+<path d="M30,49.086v-0.304c0-1.215-0.906-1.42-2.022-1.42h-3.079c-1.115,0-2.02,0.205-2.02,1.42v0.304 c0.391,0.721,1.147,1.216,2.02,1.216h3.079C28.854,50.302,29.606,49.807,30,49.086z" opacity="0.1"/>
+<path d="M29.518,47.992v-0.294c-0.371-0.265-0.918-0.336-1.54-0.336h-3.079c-0.62,0-1.169,0.071-1.539,0.336v0.294 c0,0.85,0.69,1.54,1.539,1.54h3.079C28.827,49.532,29.518,48.842,29.518,47.992z" opacity="0.2"/>
+<path d="M28.64,40.762l1.648-1.649V25.67c0-0.298-0.062-0.58-0.164-0.84l-1.305-1.307 c-0.261-0.104-0.542-0.163-0.841-0.163h-3.079c-1.273,0-2.309,1.036-2.309,2.31v18.275C24.807,43.534,26.924,42.476,28.64,40.762z" opacity="0.1"/>
+<path d="M28.64,40.762l0.878-0.879V25.67c0-0.85-0.691-1.54-1.54-1.54h-3.079c-0.849,0-1.539,0.69-1.539,1.54v18.097 C25.293,43.269,27.125,42.275,28.64,40.762z" opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_27_" x1="26.4395" x2="26.4395" y1="25.1289" y2="48.4234">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.3818" style="stop-color:#7A7A7A"/>
-<stop offset="0.7091" style="stop-color:#1A1A1A"/>
-<stop offset="1" style="stop-color:#4D4D4D"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.3818" style="stop-color:#7A7A7A"/>
+ <stop offset="0.7091" style="stop-color:#1A1A1A"/>
+ <stop offset="1" style="stop-color:#4D4D4D"/>
</linearGradient>
<path d="M28.748,47.992c0,0.426-0.344,0.77-0.77,0.77h-3.079c-0.425,0-0.768-0.344-0.768-0.77V25.67 c0-0.425,0.343-0.771,0.768-0.771h3.079c0.426,0,0.77,0.346,0.77,0.771V47.992z" fill="url(#SVGID_27_)"/>
-<path d="M26.439,29.237c-2.124,0-3.849-1.727-3.849-3.848c0-2.123,1.725-3.85,3.849-3.85 c2.121,0,3.848,1.727,3.848,3.85C30.288,27.511,28.56,29.237,26.439,29.237L26.439,29.237z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M26.439,29.237c-2.124,0-3.849-1.727-3.849-3.848c0-2.123,1.725-3.85,3.849-3.85 c2.121,0,3.848,1.727,3.848,3.85C30.288,27.511,28.56,29.237,26.439,29.237L26.439,29.237z" opacity="0.35"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_28_" x1="26.439" x2="26.439" y1="22.3696" y2="28.3803">
-<stop offset="0" style="stop-color:#9D9B9C"/>
-<stop offset="0.1515" style="stop-color:#D6D4D4"/>
-<stop offset="0.703" style="stop-color:#555557"/>
-<stop offset="0.9879" style="stop-color:#575757"/>
-<stop offset="1" style="stop-color:#575757"/>
+ <stop offset="0" style="stop-color:#9D9B9C"/>
+ <stop offset="0.1515" style="stop-color:#D6D4D4"/>
+ <stop offset="0.703" style="stop-color:#555557"/>
+ <stop offset="0.9879" style="stop-color:#575757"/>
</linearGradient>
<circle cx="26.439" cy="25.39" fill="url(#SVGID_28_)" r="3.079"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_29_" x1="26.4385" x2="26.4385" y1="23.8794" y2="26.8862">
-<stop offset="0" style="stop-color:#646464"/>
-<stop offset="1" style="stop-color:#EBEBEB"/>
+ <stop offset="0" style="stop-color:#646464"/>
+ <stop offset="1" style="stop-color:#EBEBEB"/>
</linearGradient>
<path d="M26.439,26.93c-0.851,0-1.541-0.691-1.541-1.54c0-0.85,0.69-1.54,1.541-1.54 c0.847,0,1.539,0.69,1.539,1.54C27.978,26.238,27.287,26.93,26.439,26.93L26.439,26.93z" fill="url(#SVGID_29_)"/>
-<rect fill-opacity="0.2" height="0.769" stroke-opacity="0.2" width="7.697" x="22.59" y="53.381"/>
-<rect fill-opacity="0.1" height="0.77" stroke-opacity="0.1" width="7.697" x="22.59" y="52.611"/>
+<rect height="0.769" opacity="0.2" width="7.697" x="22.59" y="53.381"/>
+<rect height="0.77" opacity="0.1" width="7.697" x="22.59" y="52.611"/>
<rect fill="none" height="60" width="60"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip.svg Fri May 14 16:09:54 2010 +0300
@@ -1,73 +1,75 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<stop offset="0" style="stop-color:#3AC5EA"/>
-<stop offset="0.297" style="stop-color:#3AC5EA"/>
-<stop offset="0.6667" style="stop-color:#1754C9"/>
-<stop offset="0.7939" style="stop-color:#33ADE1"/>
-<stop offset="1" style="stop-color:#33ADE1"/>
+ <stop offset="0.297" style="stop-color:#3AC5EA"/>
+ <stop offset="0.6667" style="stop-color:#1754C9"/>
+ <stop offset="0.7939" style="stop-color:#33ADE1"/>
</radialGradient>
<path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333c-0.617-0.665-2.567-3.083-2.968-3.735 c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956c6.191-6.192,9.085-7.646,9.956-8.107 c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967c0.534,0.492,0.872,0.588,1.299,0.274 c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778c-2.476-2.889-8.594-5.015-10.751-5.399 c-1.923-0.345-3.876-0.872-6.567,0.235c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352 c-1.108,2.691-0.581,4.645-0.236,6.567c0.386,2.158,2.51,8.275,5.399,10.752c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2070.7568" x2="-2070.3252" y1="-2266.8511" y2="-2263.2749">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+ <stop offset="0" style="stop-color:#2685D2"/>
+ <stop offset="1" style="stop-color:#081D45"/>
</linearGradient>
<path d="M35.172,17.108c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967 c0.534,0.492,0.872,0.588,1.299,0.274c0.048-0.035,0.062-0.046,0.064-0.046c0.253-0.184,1.032-0.738,2.12-1.514 c-0.251-0.204-3.468-2.809-4.8-2.956C36.857,15.598,35.172,17.108,35.172,17.108z" fill="url(#SVGID_2_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -2128.2356 5114.0977)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2070.7607" x2="-2070.3289" y1="5104.5752" y2="5108.1523">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+ <stop offset="0" style="stop-color:#2685D2"/>
+ <stop offset="1" style="stop-color:#081D45"/>
</linearGradient>
<path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.713c0.376,0.666,2.351,3.069,2.967,3.738 c0.493,0.531,0.587,0.869,0.274,1.298c-0.035,0.047-0.046,0.062-0.046,0.062c-0.183,0.253-0.738,1.032-1.515,2.119 c-0.204-0.252-2.807-3.467-2.956-4.799C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="47.9224" x2="3.9991" y1="3.9307" y2="47.854">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+ <stop offset="0" style="stop-color:#ABEEFF"/>
+ <stop offset="1" style="stop-color:#539FDE"/>
</linearGradient>
-<path d="M2.979,47.467c-0.344-1.925-0.873-3.878,0.235-6.567 c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.341,4.269,40.9,3.215c2.691-1.108,4.644-0.581,6.567-0.236 c1.981,0.354,7.296,2.178,10.069,4.711c-2.552-2.815-8.496-4.879-10.617-5.258c-1.923-0.345-3.876-0.872-6.567,0.235 c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567 c0.378,2.122,2.441,8.065,5.258,10.617C5.156,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M2.979,47.467c-0.344-1.925-0.873-3.878,0.235-6.567 c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.341,4.269,40.9,3.215c2.691-1.108,4.644-0.581,6.567-0.236 c1.981,0.354,7.296,2.178,10.069,4.711c-2.552-2.815-8.496-4.879-10.617-5.258c-1.923-0.345-3.876-0.872-6.567,0.235 c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567 c0.378,2.122,2.441,8.065,5.258,10.617C5.156,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="54.3535" x2="3.9474" y1="3.2017" y2="53.6078">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+ <stop offset="0" style="stop-color:#ABEEFF"/>
+ <stop offset="1" style="stop-color:#539FDE"/>
</linearGradient>
-<path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333 c-0.617-0.665-2.567-3.083-2.968-3.735c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956 c6.191-6.192,9.085-7.646,9.956-8.107c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967 c0.534,0.492,0.872,0.588,1.299,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778 c-0.292-0.339-0.634-0.665-1.013-0.982c0.49,0.657,0.198,1.134-0.607,1.666C54.65,9.447,41.576,18.739,40.825,19.29 c-0.431,0.314-0.767,0.219-1.3-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.948-0.436-1.71-0.034 c-0.871,0.46-3.764,1.914-9.956,8.106c-6.193,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.319,1.135,0.035,1.711 c0.4,0.651,2.351,3.069,2.967,3.736c0.493,0.533,0.559,0.896,0.259,1.332c-0.517,0.755-9.828,13.794-10.76,15.195 c-0.533,0.803-1.008,1.098-1.665,0.606c0.314,0.378,0.644,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_5_)" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333 c-0.617-0.665-2.567-3.083-2.968-3.735c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956 c6.191-6.192,9.085-7.646,9.956-8.107c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967 c0.534,0.492,0.872,0.588,1.299,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778 c-0.292-0.339-0.634-0.665-1.013-0.982c0.49,0.657,0.198,1.134-0.607,1.666C54.65,9.447,41.576,18.739,40.825,19.29 c-0.431,0.314-0.767,0.219-1.3-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.948-0.436-1.71-0.034 c-0.871,0.46-3.764,1.914-9.956,8.106c-6.193,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.319,1.135,0.035,1.711 c0.4,0.651,2.351,3.069,2.967,3.736c0.493,0.533,0.559,0.896,0.259,1.332c-0.517,0.755-9.828,13.794-10.76,15.195 c-0.533,0.803-1.008,1.098-1.665,0.606c0.314,0.378,0.644,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_5_)" opacity="0.6"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -141.776 3075.0667)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-2041.9355" x2="-2041.9355" y1="-2305.2153" y2="-2243.2966">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="0.5091" style="stop-color:#081D45"/>
-<stop offset="1" style="stop-color:#2275BD"/>
+ <stop offset="0" style="stop-color:#2685D2"/>
+ <stop offset="0.5091" style="stop-color:#081D45"/>
+ <stop offset="1" style="stop-color:#2275BD"/>
</linearGradient>
<path d="M2.899,45.012c1.275-2.777,10.299-14.804,18.804-23.31c8.505-8.506,20.532-17.529,23.308-18.803 c0.527-0.241,1.02-0.411,1.493-0.545c-0.511-0.096-1.03-0.19-1.565-0.26c-0.086,0.036-0.163,0.063-0.25,0.102 c-2.818,1.293-14.971,10.397-23.533,18.959C12.595,29.717,3.489,41.869,2.195,44.688c-0.038,0.087-0.063,0.166-0.101,0.25 c0.07,0.535,0.166,1.055,0.259,1.565C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_6_)"/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
-<path d="M15,29.5C7.004,29.5,0.5,22.996,0.5,15C0.5,7.004,7.004,0.5,15,0.5 c7.995,0,14.5,6.505,14.5,14.5S22.995,29.5,15,29.5L15,29.5z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M15,29.5C7.004,29.5,0.5,22.996,0.5,15C0.5,7.004,7.004,0.5,15,0.5 c7.995,0,14.5,6.505,14.5,14.5S22.995,29.5,15,29.5L15,29.5z" enable-background="new " opacity="0.35"/>
<radialGradient cx="435.2295" cy="910.6348" gradientTransform="matrix(0.618 0 0 0.618 -253.9715 -552.4329)" gradientUnits="userSpaceOnUse" id="SVGID_1__" r="28.704">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#94FFFF"/>
+ <stop offset="0.5" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</radialGradient>
<circle cx="15" cy="15" fill="url(#SVGID_1__)" r="13.464"/>
-<path d="M27.983,14.263c-0.299-5.259-3.704-9.788-8.679-11.54l-0.605,0.1L15.18,2.15 l-4.386,2.615l-0.165,1.102H8.083l1.006,1.71L6.365,9.8l-0.635,2.744l2.25,3.987l2.297-0.469l0.839,0.723l0.655,0.064l0.433,1.691 l-0.571,1.484l2.084,5.332h2.126l2.107-1.701v-0.695l0.557-0.863l0.459-0.236c-0.116,0.18-0.3,0.586-0.3,0.586 c-0.02,0.139,0.299,2.855,1.234,2.643c0.711-0.16,3.248-4.873,3.296-5.322c0.096-0.887-0.387-1.252-0.683-1.391l-0.329-0.156 l-1.515,1.52c-0.162,0.012-0.309,0.039-0.44,0.078v-1.26l1.645-1.605l0.837-2.698l1.275-1.038l-0.28-0.508l0.962-0.926l-0.538-0.979 l0.41,0.049l2.396,5.362l0.49-0.39c-0.015-0.262-0.043-0.521-0.073-0.779L27.983,14.263z M15.161,8.231l-0.2-0.535h1.202 l0.586,1.316h-0.871V8.23L15.161,8.231L15.161,8.231z M19.129,10.882l0.961,1.402l0.064,0.168l-0.984-0.595l-0.234-0.848 L19.129,10.882z M20.573,13.331l0.29,0.29l-0.375,0.084l-0.085-0.104L20.573,13.331z M13.06,3.903l0.611,0.946l-0.694,0.212 l-0.271-0.154L13.06,3.903z" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M27.983,14.263c-0.299-5.259-3.704-9.788-8.679-11.54l-0.605,0.1L15.18,2.15 l-4.386,2.615l-0.165,1.102H8.083l1.006,1.71L6.365,9.8l-0.635,2.744l2.25,3.987l2.297-0.469l0.839,0.723l0.655,0.064l0.433,1.691 l-0.571,1.484l2.084,5.332h2.126l2.107-1.701v-0.695l0.557-0.863l0.459-0.236c-0.116,0.18-0.3,0.586-0.3,0.586 c-0.02,0.139,0.299,2.855,1.234,2.643c0.711-0.16,3.248-4.873,3.296-5.322c0.096-0.887-0.387-1.252-0.683-1.391l-0.329-0.156 l-1.515,1.52c-0.162,0.012-0.309,0.039-0.44,0.078v-1.26l1.645-1.605l0.837-2.698l1.275-1.038l-0.28-0.508l0.962-0.926l-0.538-0.979 l0.41,0.049l2.396,5.362l0.49-0.39c-0.015-0.262-0.043-0.521-0.073-0.779L27.983,14.263z M15.161,8.231l-0.2-0.535h1.202 l0.586,1.316h-0.871V8.23L15.161,8.231L15.161,8.231z M19.129,10.882l0.961,1.402l0.064,0.168l-0.984-0.595l-0.234-0.848 L19.129,10.882z M20.573,13.331l0.29,0.29l-0.375,0.084l-0.085-0.104L20.573,13.331z M13.06,3.903l0.611,0.946l-0.694,0.212 l-0.271-0.154L13.06,3.903z" enable-background="new " opacity="0.3"/>
<linearGradient gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="333.1904" x2="333.1904" y1="416.6045" y2="431.9054">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#C8E4EB"/>
+ <stop offset="0" style="stop-color:#31A7F8"/>
+ <stop offset="0.497" style="stop-color:#1E74DC"/>
+ <stop offset="1" style="stop-color:#C8E4EB"/>
</linearGradient>
-<path d="M15,1.536C7.564,1.536,1.536,7.565,1.536,15 c0,7.439,6.029,13.464,13.464,13.464c7.438,0,13.465-6.027,13.465-13.464C28.465,7.565,22.438,1.536,15,1.536z M15,27.428 C8.146,27.428,2.571,21.854,2.571,15C2.571,8.147,8.146,2.571,15,2.571S27.428,8.147,27.428,15 C27.428,21.854,21.854,27.428,15,27.428z" fill="url(#SVGID_2__)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M15,1.536C7.564,1.536,1.536,7.565,1.536,15 c0,7.439,6.029,13.464,13.464,13.464c7.438,0,13.465-6.027,13.465-13.464C28.465,7.565,22.438,1.536,15,1.536z M15,27.428 C8.146,27.428,2.571,21.854,2.571,15C2.571,8.147,8.146,2.571,15,2.571S27.428,8.147,27.428,15 C27.428,21.854,21.854,27.428,15,27.428z" enable-background="new " fill="url(#SVGID_2__)" opacity="0.3"/>
<radialGradient cx="333.6309" cy="418.627" gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_3__" r="9.0429">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+ <stop offset="0" style="stop-color:#94FF26"/>
+ <stop offset="0.3152" style="stop-color:#94FF26"/>
+ <stop offset="0.7273" style="stop-color:#1FC211"/>
+ <stop offset="1" style="stop-color:#0BA133"/>
</radialGradient>
<path d="M22.296,18.848l-1.401,1.402c0,0-0.848,0-0.887,0.336c-0.02,0.145-0.065,0.771-0.208,1.094 c-0.282,0.195-0.619,0.842-0.619,0.842s-0.175,1.25,0.761,1.037C20.871,23.35,23.734,19.523,22.296,18.848z" fill="url(#SVGID_3__)"/>
<radialGradient cx="333.6299" cy="418.6211" gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_4__" r="10.4663">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+ <stop offset="0" style="stop-color:#94FF26"/>
+ <stop offset="0.3152" style="stop-color:#94FF26"/>
+ <stop offset="0.7273" style="stop-color:#1FC211"/>
+ <stop offset="1" style="stop-color:#0BA133"/>
</radialGradient>
<path d="M19.132,3.213c-0.23,0.087-0.387,0.146-0.387,0.146l-3.463-0.663L13.583,3.76l0.894,1.383 l-1.563,0.48l-0.842-0.48l0.296-0.84l-1.098,0.76l-0.196,1.324H8.988L9.759,7.7l-2.932,2.39l-0.552,2.387l1.088,2.107L8.018,15 l2.297-0.469l0.839,0.721l0.763,0.074l0.83,3.246l-0.552,1.436l1.22,2.697l0.343,1.119h2.126l1.202-0.65l0.905-1.053V20.85 l1.724-0.881v-1.885l0.681-1.297l1.521-1.366l0.363-1.585l-1.988,0.443l-0.522-0.637l0.371-0.594l-1.411-0.854l-0.601-2.164 l1.042-0.68l0.96,1.402l0.359,0.922l0.722,0.721l0.842,0.44l0.936-0.151l1.039-1l-0.731-1.334l-0.921,0.24l-0.833-0.991l0.791-0.552 l2.482,0.301v0.883l2.161,4.452l0.491-0.393C27.176,9.158,23.783,4.849,19.132,3.213z M18.004,9.23l-1.134,0.3h-1.511V8.749h-1.443 L12.774,9.05l-1.741-0.482l-0.482-0.901l2.404-0.541h2.406L15,6.164h1.202l0.67,1.503l1.134,0.398V9.23H18.004z M20.589,7.247 l-2.044-0.361V6.165l1.022-0.24l0.3-0.36l0.722,0.6V7.247L20.589,7.247z" fill="url(#SVGID_4__)"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_call_active.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_call_active.svg Fri May 14 16:09:54 2010 +0300
@@ -1,64 +1,66 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
-<stop offset="0.297" style="stop-color:#A7E722"/>
-<stop offset="0.6667" style="stop-color:#428C0F"/>
-<stop offset="0.7939" style="stop-color:#5CA617"/>
-<stop offset="1" style="stop-color:#5CA617"/>
+ <stop offset="0.297" style="stop-color:#A7E722"/>
+ <stop offset="0.6667" style="stop-color:#428C0F"/>
+ <stop offset="0.7939" style="stop-color:#5CA617"/>
</radialGradient>
<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737 c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108 c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274 c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-2.477-2.889-8.594-5.015-10.752-5.399 c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571C11.203,27.277,3.722,37.795,2.668,40.352 c-1.108,2.691-0.581,4.645-0.236,6.567c0.387,2.158,2.511,8.275,5.4,10.752c0.718,0.616,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-1639.3428" x2="-1638.9111" y1="-2494.9824" y2="-2491.4067">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+ <stop offset="0" style="stop-color:#559D13"/>
+ <stop offset="1" style="stop-color:#284F09"/>
</linearGradient>
<path d="M35.172,17.107c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967 c0.535,0.492,0.873,0.588,1.301,0.274c0.047-0.034,0.063-0.046,0.064-0.046c0.252-0.184,1.031-0.739,2.119-1.514 c-0.252-0.205-3.469-2.809-4.801-2.956C36.855,15.598,35.172,17.107,35.172,17.107z" fill="url(#SVGID_2_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -1696.8304 4072.5859)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1639.3467" x2="-1638.9149" y1="4063.0557" y2="4066.6318">
-<stop offset="0" style="stop-color:#559D13"/>
-<stop offset="1" style="stop-color:#284F09"/>
+ <stop offset="0" style="stop-color:#559D13"/>
+ <stop offset="1" style="stop-color:#284F09"/>
</linearGradient>
<path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.714c0.376,0.665,2.351,3.067,2.967,3.737 c0.492,0.53,0.587,0.869,0.274,1.297c-0.035,0.049-0.046,0.063-0.046,0.063c-0.183,0.253-0.738,1.032-1.515,2.12 c-0.203-0.252-2.807-3.469-2.956-4.8C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
-<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112 C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711 c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571 C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617 C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B5DC77" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737 c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108 c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274 c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982 c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273 c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107 c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736 c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606 c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B5DC77" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M2.979,47.466c-0.344-1.923-0.873-3.877,0.235-6.567c1.054-2.557,8.535-13.074,16.573-21.112 C27.825,11.749,38.34,4.268,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236c1.98,0.354,7.297,2.178,10.07,4.711 c-2.553-2.815-8.496-4.879-10.619-5.258c-1.922-0.345-3.875-0.873-6.564,0.236c-2.561,1.053-13.076,8.534-21.113,16.571 C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567c0.378,2.122,2.441,8.065,5.258,10.617 C5.156,54.763,3.333,49.448,2.979,47.466z" fill="#B5DC77" opacity="0.5"/>
+<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.258-1.332c-0.617-0.666-2.567-3.084-2.968-3.737 c-0.353-0.575-0.411-1.02-0.034-1.71c0.473-0.865,1.915-3.764,8.107-9.956c6.192-6.192,9.084-7.646,9.956-8.108 c0.76-0.399,1.037-0.344,1.711,0.036c0.666,0.376,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274 c0.752-0.551,13.828-9.843,15.229-10.774c0.85-0.565,1.141-1.062,0.523-1.779c-0.291-0.339-0.635-0.665-1.012-0.982 c0.488,0.658,0.197,1.134-0.607,1.667c-1.4,0.932-14.475,10.224-15.227,10.775c-0.43,0.313-0.768,0.218-1.299-0.273 c-0.668-0.618-3.07-2.592-3.738-2.969c-0.672-0.38-0.949-0.436-1.711-0.035c-0.869,0.462-3.763,1.915-9.955,8.107 c-6.192,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.32,1.135,0.035,1.711c0.4,0.651,2.351,3.069,2.967,3.736 c0.493,0.533,0.558,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195c-0.534,0.803-1.009,1.098-1.666,0.606 c0.314,0.378,0.643,0.723,0.982,1.013c0.718,0.616,1.213,0.323,1.777-0.525C10.542,55.745,19.852,42.705,20.37,41.951z" fill="#B5DC77" opacity="0.6"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -608.1406 2931.3247)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-1610.522" x2="-1610.522" y1="-2533.3467" y2="-2471.428">
-<stop offset="0" style="stop-color:#447F0F"/>
-<stop offset="0.5" style="stop-color:#284F09"/>
-<stop offset="1" style="stop-color:#40790E"/>
+ <stop offset="0" style="stop-color:#447F0F"/>
+ <stop offset="0.5" style="stop-color:#284F09"/>
+ <stop offset="1" style="stop-color:#40790E"/>
</linearGradient>
-<path d="M2.899,45.012c1.275-2.776,10.299-14.805,18.804-23.31 c8.505-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26 c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.534,18.958c-8.562,8.562-17.667,20.715-18.96,23.535 c-0.038,0.086-0.063,0.165-0.101,0.25c0.071,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_4_)" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M2.899,45.012c1.275-2.776,10.299-14.805,18.804-23.31 c8.505-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26 c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.534,18.958c-8.562,8.562-17.667,20.715-18.96,23.535 c-0.038,0.086-0.063,0.165-0.101,0.25c0.071,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_4_)" opacity="0.5"/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
-<path d="M15,29.5C7.004,29.5,0.5,22.996,0.5,15C0.5,7.004,7.004,0.5,15,0.5 c7.995,0,14.5,6.505,14.5,14.5S22.995,29.5,15,29.5L15,29.5z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M15,29.5C7.004,29.5,0.5,22.996,0.5,15C0.5,7.004,7.004,0.5,15,0.5 c7.995,0,14.5,6.505,14.5,14.5S22.995,29.5,15,29.5L15,29.5z" enable-background="new " opacity="0.35"/>
<radialGradient cx="435.2295" cy="910.6348" gradientTransform="matrix(0.618 0 0 0.618 -253.9715 -552.4329)" gradientUnits="userSpaceOnUse" id="SVGID_1__" r="28.704">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#94FFFF"/>
+ <stop offset="0.5" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</radialGradient>
<circle cx="15" cy="15" fill="url(#SVGID_1__)" r="13.464"/>
-<path d="M27.983,14.263c-0.299-5.259-3.704-9.788-8.679-11.54l-0.605,0.1L15.18,2.15 l-4.386,2.615l-0.165,1.102H8.083l1.006,1.71L6.365,9.8l-0.635,2.744l2.25,3.987l2.297-0.469l0.839,0.723l0.655,0.064l0.433,1.691 l-0.571,1.484l2.084,5.332h2.126l2.107-1.701v-0.695l0.557-0.863l0.459-0.236c-0.116,0.18-0.3,0.586-0.3,0.586 c-0.02,0.139,0.299,2.855,1.234,2.643c0.711-0.16,3.248-4.873,3.296-5.322c0.096-0.887-0.387-1.252-0.683-1.391l-0.329-0.156 l-1.515,1.52c-0.162,0.012-0.309,0.039-0.44,0.078v-1.26l1.645-1.605l0.837-2.698l1.275-1.038l-0.28-0.508l0.962-0.926l-0.538-0.979 l0.41,0.049l2.396,5.362l0.49-0.39c-0.015-0.262-0.043-0.521-0.073-0.779L27.983,14.263z M15.161,8.231l-0.2-0.535h1.202 l0.586,1.316h-0.871V8.23L15.161,8.231L15.161,8.231z M19.129,10.882l0.961,1.402l0.064,0.168l-0.984-0.595l-0.234-0.848 L19.129,10.882z M20.573,13.331l0.29,0.29l-0.375,0.084l-0.085-0.104L20.573,13.331z M13.06,3.903l0.611,0.946l-0.694,0.212 l-0.271-0.154L13.06,3.903z" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M27.983,14.263c-0.299-5.259-3.704-9.788-8.679-11.54l-0.605,0.1L15.18,2.15 l-4.386,2.615l-0.165,1.102H8.083l1.006,1.71L6.365,9.8l-0.635,2.744l2.25,3.987l2.297-0.469l0.839,0.723l0.655,0.064l0.433,1.691 l-0.571,1.484l2.084,5.332h2.126l2.107-1.701v-0.695l0.557-0.863l0.459-0.236c-0.116,0.18-0.3,0.586-0.3,0.586 c-0.02,0.139,0.299,2.855,1.234,2.643c0.711-0.16,3.248-4.873,3.296-5.322c0.096-0.887-0.387-1.252-0.683-1.391l-0.329-0.156 l-1.515,1.52c-0.162,0.012-0.309,0.039-0.44,0.078v-1.26l1.645-1.605l0.837-2.698l1.275-1.038l-0.28-0.508l0.962-0.926l-0.538-0.979 l0.41,0.049l2.396,5.362l0.49-0.39c-0.015-0.262-0.043-0.521-0.073-0.779L27.983,14.263z M15.161,8.231l-0.2-0.535h1.202 l0.586,1.316h-0.871V8.23L15.161,8.231L15.161,8.231z M19.129,10.882l0.961,1.402l0.064,0.168l-0.984-0.595l-0.234-0.848 L19.129,10.882z M20.573,13.331l0.29,0.29l-0.375,0.084l-0.085-0.104L20.573,13.331z M13.06,3.903l0.611,0.946l-0.694,0.212 l-0.271-0.154L13.06,3.903z" enable-background="new " opacity="0.3"/>
<linearGradient gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="333.1904" x2="333.1904" y1="416.6045" y2="431.9054">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#C8E4EB"/>
+ <stop offset="0" style="stop-color:#31A7F8"/>
+ <stop offset="0.497" style="stop-color:#1E74DC"/>
+ <stop offset="1" style="stop-color:#C8E4EB"/>
</linearGradient>
-<path d="M15,1.536C7.564,1.536,1.536,7.565,1.536,15 c0,7.439,6.029,13.464,13.464,13.464c7.438,0,13.465-6.027,13.465-13.464C28.465,7.565,22.438,1.536,15,1.536z M15,27.428 C8.146,27.428,2.571,21.854,2.571,15C2.571,8.147,8.146,2.571,15,2.571S27.428,8.147,27.428,15 C27.428,21.854,21.854,27.428,15,27.428z" fill="url(#SVGID_2__)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M15,1.536C7.564,1.536,1.536,7.565,1.536,15 c0,7.439,6.029,13.464,13.464,13.464c7.438,0,13.465-6.027,13.465-13.464C28.465,7.565,22.438,1.536,15,1.536z M15,27.428 C8.146,27.428,2.571,21.854,2.571,15C2.571,8.147,8.146,2.571,15,2.571S27.428,8.147,27.428,15 C27.428,21.854,21.854,27.428,15,27.428z" enable-background="new " fill="url(#SVGID_2__)" opacity="0.3"/>
<radialGradient cx="333.6309" cy="418.627" gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_3__" r="9.0429">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+ <stop offset="0" style="stop-color:#94FF26"/>
+ <stop offset="0.3152" style="stop-color:#94FF26"/>
+ <stop offset="0.7273" style="stop-color:#1FC211"/>
+ <stop offset="1" style="stop-color:#0BA133"/>
</radialGradient>
<path d="M22.296,18.848l-1.401,1.402c0,0-0.848,0-0.887,0.336c-0.02,0.145-0.065,0.771-0.208,1.094 c-0.282,0.195-0.619,0.842-0.619,0.842s-0.175,1.25,0.761,1.037C20.871,23.35,23.734,19.523,22.296,18.848z" fill="url(#SVGID_3__)"/>
<radialGradient cx="333.6299" cy="418.6211" gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_4__" r="10.4663">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+ <stop offset="0" style="stop-color:#94FF26"/>
+ <stop offset="0.3152" style="stop-color:#94FF26"/>
+ <stop offset="0.7273" style="stop-color:#1FC211"/>
+ <stop offset="1" style="stop-color:#0BA133"/>
</radialGradient>
<path d="M19.132,3.213c-0.23,0.087-0.387,0.146-0.387,0.146l-3.463-0.663L13.583,3.76l0.894,1.383 l-1.563,0.48l-0.842-0.48l0.296-0.84l-1.098,0.76l-0.196,1.324H8.988L9.759,7.7l-2.932,2.39l-0.552,2.387l1.088,2.107L8.018,15 l2.297-0.469l0.839,0.721l0.763,0.074l0.83,3.246l-0.552,1.436l1.22,2.697l0.343,1.119h2.126l1.202-0.65l0.905-1.053V20.85 l1.724-0.881v-1.885l0.681-1.297l1.521-1.366l0.363-1.585l-1.988,0.443l-0.522-0.637l0.371-0.594l-1.411-0.854l-0.601-2.164 l1.042-0.68l0.96,1.402l0.359,0.922l0.722,0.721l0.842,0.44l0.936-0.151l1.039-1l-0.731-1.334l-0.921,0.24l-0.833-0.991l0.791-0.552 l2.482,0.301v0.883l2.161,4.452l0.491-0.393C27.176,9.158,23.783,4.849,19.132,3.213z M18.004,9.23l-1.134,0.3h-1.511V8.749h-1.443 L12.774,9.05l-1.741-0.482l-0.482-0.901l2.404-0.541h2.406L15,6.164h1.202l0.67,1.503l1.134,0.398V9.23H18.004z M20.589,7.247 l-2.044-0.361V6.165l1.022-0.24l0.3-0.36l0.722,0.6V7.247L20.589,7.247z" fill="url(#SVGID_4__)"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_call_end.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_call_end.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
@@ -41,34 +41,36 @@
</g>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
-<path d="M15,29.5C7.004,29.5,0.5,22.996,0.5,15C0.5,7.004,7.004,0.5,15,0.5 c7.995,0,14.5,6.505,14.5,14.5S22.995,29.5,15,29.5L15,29.5z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M15,29.5C7.004,29.5,0.5,22.996,0.5,15C0.5,7.004,7.004,0.5,15,0.5 c7.995,0,14.5,6.505,14.5,14.5S22.995,29.5,15,29.5L15,29.5z" enable-background="new " opacity="0.35"/>
<radialGradient cx="435.2295" cy="910.6348" gradientTransform="matrix(0.618 0 0 0.618 -253.9715 -552.4329)" gradientUnits="userSpaceOnUse" id="SVGID_1__" r="28.704">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#94FFFF"/>
+ <stop offset="0.5" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</radialGradient>
<circle cx="15" cy="15" fill="url(#SVGID_1__)" r="13.464"/>
-<path d="M27.983,14.263c-0.299-5.259-3.704-9.788-8.679-11.54l-0.605,0.1L15.18,2.15 l-4.386,2.615l-0.165,1.102H8.083l1.006,1.71L6.365,9.8l-0.635,2.744l2.25,3.987l2.297-0.469l0.839,0.723l0.655,0.064l0.433,1.691 l-0.571,1.484l2.084,5.332h2.126l2.107-1.701v-0.695l0.557-0.863l0.459-0.236c-0.116,0.18-0.3,0.586-0.3,0.586 c-0.02,0.139,0.299,2.855,1.234,2.643c0.711-0.16,3.248-4.873,3.296-5.322c0.096-0.887-0.387-1.252-0.683-1.391l-0.329-0.156 l-1.515,1.52c-0.162,0.012-0.309,0.039-0.44,0.078v-1.26l1.645-1.605l0.837-2.698l1.275-1.038l-0.28-0.508l0.962-0.926l-0.538-0.979 l0.41,0.049l2.396,5.362l0.49-0.39c-0.015-0.262-0.043-0.521-0.073-0.779L27.983,14.263z M15.161,8.231l-0.2-0.535h1.202 l0.586,1.316h-0.871V8.23L15.161,8.231L15.161,8.231z M19.129,10.882l0.961,1.402l0.064,0.168l-0.984-0.595l-0.234-0.848 L19.129,10.882z M20.573,13.331l0.29,0.29l-0.375,0.084l-0.085-0.104L20.573,13.331z M13.06,3.903l0.611,0.946l-0.694,0.212 l-0.271-0.154L13.06,3.903z" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M27.983,14.263c-0.299-5.259-3.704-9.788-8.679-11.54l-0.605,0.1L15.18,2.15 l-4.386,2.615l-0.165,1.102H8.083l1.006,1.71L6.365,9.8l-0.635,2.744l2.25,3.987l2.297-0.469l0.839,0.723l0.655,0.064l0.433,1.691 l-0.571,1.484l2.084,5.332h2.126l2.107-1.701v-0.695l0.557-0.863l0.459-0.236c-0.116,0.18-0.3,0.586-0.3,0.586 c-0.02,0.139,0.299,2.855,1.234,2.643c0.711-0.16,3.248-4.873,3.296-5.322c0.096-0.887-0.387-1.252-0.683-1.391l-0.329-0.156 l-1.515,1.52c-0.162,0.012-0.309,0.039-0.44,0.078v-1.26l1.645-1.605l0.837-2.698l1.275-1.038l-0.28-0.508l0.962-0.926l-0.538-0.979 l0.41,0.049l2.396,5.362l0.49-0.39c-0.015-0.262-0.043-0.521-0.073-0.779L27.983,14.263z M15.161,8.231l-0.2-0.535h1.202 l0.586,1.316h-0.871V8.23L15.161,8.231L15.161,8.231z M19.129,10.882l0.961,1.402l0.064,0.168l-0.984-0.595l-0.234-0.848 L19.129,10.882z M20.573,13.331l0.29,0.29l-0.375,0.084l-0.085-0.104L20.573,13.331z M13.06,3.903l0.611,0.946l-0.694,0.212 l-0.271-0.154L13.06,3.903z" enable-background="new " opacity="0.3"/>
<linearGradient gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="333.1904" x2="333.1904" y1="416.6045" y2="431.9054">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#C8E4EB"/>
+ <stop offset="0" style="stop-color:#31A7F8"/>
+ <stop offset="0.497" style="stop-color:#1E74DC"/>
+ <stop offset="1" style="stop-color:#C8E4EB"/>
</linearGradient>
-<path d="M15,1.536C7.564,1.536,1.536,7.565,1.536,15 c0,7.439,6.029,13.464,13.464,13.464c7.438,0,13.465-6.027,13.465-13.464C28.465,7.565,22.438,1.536,15,1.536z M15,27.428 C8.146,27.428,2.571,21.854,2.571,15C2.571,8.147,8.146,2.571,15,2.571S27.428,8.147,27.428,15 C27.428,21.854,21.854,27.428,15,27.428z" fill="url(#SVGID_2__)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M15,1.536C7.564,1.536,1.536,7.565,1.536,15 c0,7.439,6.029,13.464,13.464,13.464c7.438,0,13.465-6.027,13.465-13.464C28.465,7.565,22.438,1.536,15,1.536z M15,27.428 C8.146,27.428,2.571,21.854,2.571,15C2.571,8.147,8.146,2.571,15,2.571S27.428,8.147,27.428,15 C27.428,21.854,21.854,27.428,15,27.428z" enable-background="new " fill="url(#SVGID_2__)" opacity="0.3"/>
<radialGradient cx="333.6309" cy="418.627" gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_3__" r="9.0429">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+ <stop offset="0" style="stop-color:#94FF26"/>
+ <stop offset="0.3152" style="stop-color:#94FF26"/>
+ <stop offset="0.7273" style="stop-color:#1FC211"/>
+ <stop offset="1" style="stop-color:#0BA133"/>
</radialGradient>
<path d="M22.296,18.848l-1.401,1.402c0,0-0.848,0-0.887,0.336c-0.02,0.145-0.065,0.771-0.208,1.094 c-0.282,0.195-0.619,0.842-0.619,0.842s-0.175,1.25,0.761,1.037C20.871,23.35,23.734,19.523,22.296,18.848z" fill="url(#SVGID_3__)"/>
<radialGradient cx="333.6299" cy="418.6211" gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_4__" r="10.4663">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+ <stop offset="0" style="stop-color:#94FF26"/>
+ <stop offset="0.3152" style="stop-color:#94FF26"/>
+ <stop offset="0.7273" style="stop-color:#1FC211"/>
+ <stop offset="1" style="stop-color:#0BA133"/>
</radialGradient>
<path d="M19.132,3.213c-0.23,0.087-0.387,0.146-0.387,0.146l-3.463-0.663L13.583,3.76l0.894,1.383 l-1.563,0.48l-0.842-0.48l0.296-0.84l-1.098,0.76l-0.196,1.324H8.988L9.759,7.7l-2.932,2.39l-0.552,2.387l1.088,2.107L8.018,15 l2.297-0.469l0.839,0.721l0.763,0.074l0.83,3.246l-0.552,1.436l1.22,2.697l0.343,1.119h2.126l1.202-0.65l0.905-1.053V20.85 l1.724-0.881v-1.885l0.681-1.297l1.521-1.366l0.363-1.585l-1.988,0.443l-0.522-0.637l0.371-0.594l-1.411-0.854l-0.601-2.164 l1.042-0.68l0.96,1.402l0.359,0.922l0.722,0.721l0.842,0.44l0.936-0.151l1.039-1l-0.731-1.334l-0.921,0.24l-0.833-0.991l0.791-0.552 l2.482,0.301v0.883l2.161,4.452l0.491-0.393C27.176,9.158,23.783,4.849,19.132,3.213z M18.004,9.23l-1.134,0.3h-1.511V8.749h-1.443 L12.774,9.05l-1.741-0.482l-0.482-0.901l2.404-0.541h2.406L15,6.164h1.202l0.67,1.503l1.134,0.398V9.23H18.004z M20.589,7.247 l-2.044-0.361V6.165l1.022-0.24l0.3-0.36l0.722,0.6V7.247L20.589,7.247z" fill="url(#SVGID_4__)"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_call_hold.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_call_hold.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,6 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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"/>
@@ -39,34 +39,36 @@
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
-<path d="M15,29.5C7.004,29.5,0.5,22.996,0.5,15C0.5,7.004,7.004,0.5,15,0.5 c7.995,0,14.5,6.505,14.5,14.5S22.995,29.5,15,29.5L15,29.5z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M15,29.5C7.004,29.5,0.5,22.996,0.5,15C0.5,7.004,7.004,0.5,15,0.5 c7.995,0,14.5,6.505,14.5,14.5S22.995,29.5,15,29.5L15,29.5z" enable-background="new " opacity="0.35"/>
<radialGradient cx="435.2295" cy="910.6348" gradientTransform="matrix(0.618 0 0 0.618 -253.9715 -552.4329)" gradientUnits="userSpaceOnUse" id="SVGID_1__" r="28.704">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#94FFFF"/>
+ <stop offset="0.5" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</radialGradient>
<circle cx="15" cy="15" fill="url(#SVGID_1__)" r="13.464"/>
-<path d="M27.983,14.263c-0.299-5.259-3.704-9.788-8.679-11.54l-0.605,0.1L15.18,2.15 l-4.386,2.615l-0.165,1.102H8.083l1.006,1.71L6.365,9.8l-0.635,2.744l2.25,3.987l2.297-0.469l0.839,0.723l0.655,0.064l0.433,1.691 l-0.571,1.484l2.084,5.332h2.126l2.107-1.701v-0.695l0.557-0.863l0.459-0.236c-0.116,0.18-0.3,0.586-0.3,0.586 c-0.02,0.139,0.299,2.855,1.234,2.643c0.711-0.16,3.248-4.873,3.296-5.322c0.096-0.887-0.387-1.252-0.683-1.391l-0.329-0.156 l-1.515,1.52c-0.162,0.012-0.309,0.039-0.44,0.078v-1.26l1.645-1.605l0.837-2.698l1.275-1.038l-0.28-0.508l0.962-0.926l-0.538-0.979 l0.41,0.049l2.396,5.362l0.49-0.39c-0.015-0.262-0.043-0.521-0.073-0.779L27.983,14.263z M15.161,8.231l-0.2-0.535h1.202 l0.586,1.316h-0.871V8.23L15.161,8.231L15.161,8.231z M19.129,10.882l0.961,1.402l0.064,0.168l-0.984-0.595l-0.234-0.848 L19.129,10.882z M20.573,13.331l0.29,0.29l-0.375,0.084l-0.085-0.104L20.573,13.331z M13.06,3.903l0.611,0.946l-0.694,0.212 l-0.271-0.154L13.06,3.903z" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M27.983,14.263c-0.299-5.259-3.704-9.788-8.679-11.54l-0.605,0.1L15.18,2.15 l-4.386,2.615l-0.165,1.102H8.083l1.006,1.71L6.365,9.8l-0.635,2.744l2.25,3.987l2.297-0.469l0.839,0.723l0.655,0.064l0.433,1.691 l-0.571,1.484l2.084,5.332h2.126l2.107-1.701v-0.695l0.557-0.863l0.459-0.236c-0.116,0.18-0.3,0.586-0.3,0.586 c-0.02,0.139,0.299,2.855,1.234,2.643c0.711-0.16,3.248-4.873,3.296-5.322c0.096-0.887-0.387-1.252-0.683-1.391l-0.329-0.156 l-1.515,1.52c-0.162,0.012-0.309,0.039-0.44,0.078v-1.26l1.645-1.605l0.837-2.698l1.275-1.038l-0.28-0.508l0.962-0.926l-0.538-0.979 l0.41,0.049l2.396,5.362l0.49-0.39c-0.015-0.262-0.043-0.521-0.073-0.779L27.983,14.263z M15.161,8.231l-0.2-0.535h1.202 l0.586,1.316h-0.871V8.23L15.161,8.231L15.161,8.231z M19.129,10.882l0.961,1.402l0.064,0.168l-0.984-0.595l-0.234-0.848 L19.129,10.882z M20.573,13.331l0.29,0.29l-0.375,0.084l-0.085-0.104L20.573,13.331z M13.06,3.903l0.611,0.946l-0.694,0.212 l-0.271-0.154L13.06,3.903z" enable-background="new " opacity="0.3"/>
<linearGradient gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="333.1904" x2="333.1904" y1="416.6045" y2="431.9054">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#C8E4EB"/>
+ <stop offset="0" style="stop-color:#31A7F8"/>
+ <stop offset="0.497" style="stop-color:#1E74DC"/>
+ <stop offset="1" style="stop-color:#C8E4EB"/>
</linearGradient>
-<path d="M15,1.536C7.564,1.536,1.536,7.565,1.536,15 c0,7.439,6.029,13.464,13.464,13.464c7.438,0,13.465-6.027,13.465-13.464C28.465,7.565,22.438,1.536,15,1.536z M15,27.428 C8.146,27.428,2.571,21.854,2.571,15C2.571,8.147,8.146,2.571,15,2.571S27.428,8.147,27.428,15 C27.428,21.854,21.854,27.428,15,27.428z" fill="url(#SVGID_2__)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M15,1.536C7.564,1.536,1.536,7.565,1.536,15 c0,7.439,6.029,13.464,13.464,13.464c7.438,0,13.465-6.027,13.465-13.464C28.465,7.565,22.438,1.536,15,1.536z M15,27.428 C8.146,27.428,2.571,21.854,2.571,15C2.571,8.147,8.146,2.571,15,2.571S27.428,8.147,27.428,15 C27.428,21.854,21.854,27.428,15,27.428z" enable-background="new " fill="url(#SVGID_2__)" opacity="0.3"/>
<radialGradient cx="333.6309" cy="418.627" gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_3__" r="9.0429">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+ <stop offset="0" style="stop-color:#94FF26"/>
+ <stop offset="0.3152" style="stop-color:#94FF26"/>
+ <stop offset="0.7273" style="stop-color:#1FC211"/>
+ <stop offset="1" style="stop-color:#0BA133"/>
</radialGradient>
<path d="M22.296,18.848l-1.401,1.402c0,0-0.848,0-0.887,0.336c-0.02,0.145-0.065,0.771-0.208,1.094 c-0.282,0.195-0.619,0.842-0.619,0.842s-0.175,1.25,0.761,1.037C20.871,23.35,23.734,19.523,22.296,18.848z" fill="url(#SVGID_3__)"/>
<radialGradient cx="333.6299" cy="418.6211" gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_4__" r="10.4663">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+ <stop offset="0" style="stop-color:#94FF26"/>
+ <stop offset="0.3152" style="stop-color:#94FF26"/>
+ <stop offset="0.7273" style="stop-color:#1FC211"/>
+ <stop offset="1" style="stop-color:#0BA133"/>
</radialGradient>
<path d="M19.132,3.213c-0.23,0.087-0.387,0.146-0.387,0.146l-3.463-0.663L13.583,3.76l0.894,1.383 l-1.563,0.48l-0.842-0.48l0.296-0.84l-1.098,0.76l-0.196,1.324H8.988L9.759,7.7l-2.932,2.39l-0.552,2.387l1.088,2.107L8.018,15 l2.297-0.469l0.839,0.721l0.763,0.074l0.83,3.246l-0.552,1.436l1.22,2.697l0.343,1.119h2.126l1.202-0.65l0.905-1.053V20.85 l1.724-0.881v-1.885l0.681-1.297l1.521-1.366l0.363-1.585l-1.988,0.443l-0.522-0.637l0.371-0.594l-1.411-0.854l-0.601-2.164 l1.042-0.68l0.96,1.402l0.359,0.922l0.722,0.721l0.842,0.44l0.936-0.151l1.039-1l-0.731-1.334l-0.921,0.24l-0.833-0.991l0.791-0.552 l2.482,0.301v0.883l2.161,4.452l0.491-0.393C27.176,9.158,23.783,4.849,19.132,3.213z M18.004,9.23l-1.134,0.3h-1.511V8.749h-1.443 L12.774,9.05l-1.741-0.482l-0.482-0.901l2.404-0.541h2.406L15,6.164h1.202l0.67,1.503l1.134,0.398V9.23H18.004z M20.589,7.247 l-2.044-0.361V6.165l1.022-0.24l0.3-0.36l0.722,0.6V7.247L20.589,7.247z" fill="url(#SVGID_4__)"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_call_waiting.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_call_waiting.svg Fri May 14 16:09:54 2010 +0300
@@ -1,72 +1,74 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
-<stop offset="0.297" style="stop-color:#FFC144"/>
-<stop offset="0.6667" style="stop-color:#EF6902"/>
-<stop offset="0.7939" style="stop-color:#FEB037"/>
-<stop offset="1" style="stop-color:#FEB037"/>
+ <stop offset="0.297" style="stop-color:#FFC144"/>
+ <stop offset="0.6667" style="stop-color:#EF6902"/>
+ <stop offset="0.7939" style="stop-color:#FEB037"/>
</radialGradient>
<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.259-1.333c-0.616-0.665-2.566-3.083-2.968-3.735 c-0.353-0.575-0.411-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956c6.191-6.192,9.084-7.646,9.955-8.107 c0.76-0.4,1.037-0.345,1.711,0.035c0.666,0.377,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274 c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.523-1.778c-2.477-2.889-8.594-5.015-10.75-5.399 c-1.924-0.345-3.877-0.872-6.568,0.235c-2.559,1.054-13.074,8.536-21.11,16.572C11.203,27.277,3.723,37.795,2.668,40.352 c-1.107,2.691-0.58,4.645-0.236,6.567c0.387,2.158,2.511,8.275,5.4,10.752c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.853,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-1639.3418" x2="-1638.9102" y1="-2494.9819" y2="-2491.4063">
-<stop offset="0" style="stop-color:#E17B15"/>
-<stop offset="1" style="stop-color:#B05004"/>
+ <stop offset="0" style="stop-color:#E17B15"/>
+ <stop offset="1" style="stop-color:#B05004"/>
</linearGradient>
<path d="M35.172,17.108c0.76-0.4,1.037-0.345,1.711,0.035c0.666,0.377,3.068,2.352,3.734,2.967 c0.535,0.492,0.873,0.588,1.301,0.274c0.047-0.035,0.063-0.046,0.064-0.046c0.252-0.184,1.031-0.738,2.119-1.514 c-0.252-0.204-3.469-2.809-4.801-2.956C36.857,15.598,35.172,17.108,35.172,17.108z" fill="url(#SVGID_2_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -1696.8304 4072.5859)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1639.3462" x2="-1638.9143" y1="4063.0557" y2="4066.6326">
-<stop offset="0" style="stop-color:#E17B15"/>
-<stop offset="1" style="stop-color:#B05004"/>
+ <stop offset="0" style="stop-color:#E17B15"/>
+ <stop offset="1" style="stop-color:#B05004"/>
</linearGradient>
<path d="M17.093,35.188c-0.401,0.763-0.347,1.039,0.034,1.713c0.376,0.666,2.352,3.069,2.967,3.738 c0.493,0.531,0.587,0.869,0.274,1.297c-0.034,0.048-0.046,0.063-0.046,0.063c-0.183,0.253-0.738,1.032-1.515,2.119 c-0.203-0.252-2.807-3.467-2.956-4.799C15.579,36.875,17.093,35.188,17.093,35.188z" fill="url(#SVGID_3_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="48.4072" x2="4.0833" y1="3.4473" y2="47.7712">
-<stop offset="0" style="stop-color:#FFD06E"/>
-<stop offset="1" style="stop-color:#FAB56E"/>
+ <stop offset="0" style="stop-color:#FFD06E"/>
+ <stop offset="1" style="stop-color:#FAB56E"/>
</linearGradient>
-<path d="M2.979,47.467c-0.345-1.925-0.873-3.878,0.235-6.567 c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.34,4.269,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236 c1.98,0.354,7.297,2.178,10.07,4.711c-2.553-2.815-8.496-4.879-10.617-5.258c-1.924-0.345-3.877-0.872-6.568,0.235 c-2.559,1.054-13.074,8.536-21.11,16.572C11.203,27.277,3.723,37.795,2.668,40.352c-1.107,2.691-0.58,4.645-0.236,6.567 c0.379,2.122,2.441,8.065,5.259,10.617C5.155,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M2.979,47.467c-0.345-1.925-0.873-3.878,0.235-6.567 c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.34,4.269,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236 c1.98,0.354,7.297,2.178,10.07,4.711c-2.553-2.815-8.496-4.879-10.617-5.258c-1.924-0.345-3.877-0.872-6.568,0.235 c-2.559,1.054-13.074,8.536-21.11,16.572C11.203,27.277,3.723,37.795,2.668,40.352c-1.107,2.691-0.58,4.645-0.236,6.567 c0.379,2.122,2.441,8.065,5.259,10.617C5.155,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" opacity="0.5"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="53.9023" x2="3.4732" y1="3.6543" y2="54.0835">
-<stop offset="0" style="stop-color:#FFD06E"/>
-<stop offset="1" style="stop-color:#FAB56E"/>
+ <stop offset="0" style="stop-color:#FFD06E"/>
+ <stop offset="1" style="stop-color:#FAB56E"/>
</linearGradient>
-<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.259-1.333 c-0.616-0.665-2.566-3.083-2.968-3.735c-0.353-0.575-0.411-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956 c6.191-6.192,9.084-7.646,9.955-8.107c0.76-0.4,1.037-0.345,1.711,0.035c0.666,0.377,3.068,2.352,3.734,2.967 c0.535,0.492,0.873,0.588,1.301,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.523-1.778 c-0.291-0.339-0.635-0.665-1.012-0.982c0.488,0.657,0.197,1.134-0.607,1.666c-1.4,0.933-14.475,10.225-15.227,10.775 c-0.43,0.314-0.768,0.219-1.299-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.949-0.436-1.711-0.034 c-0.869,0.46-3.763,1.914-9.954,8.106c-6.193,6.192-7.636,9.092-8.108,9.956c-0.378,0.69-0.319,1.135,0.036,1.711 c0.4,0.651,2.351,3.069,2.967,3.736c0.492,0.533,0.559,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195 c-0.534,0.803-1.009,1.098-1.665,0.606c0.314,0.378,0.643,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.853,42.705,20.37,41.951z" fill="url(#SVGID_5_)" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.259-1.333 c-0.616-0.665-2.566-3.083-2.968-3.735c-0.353-0.575-0.411-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956 c6.191-6.192,9.084-7.646,9.955-8.107c0.76-0.4,1.037-0.345,1.711,0.035c0.666,0.377,3.068,2.352,3.734,2.967 c0.535,0.492,0.873,0.588,1.301,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.523-1.778 c-0.291-0.339-0.635-0.665-1.012-0.982c0.488,0.657,0.197,1.134-0.607,1.666c-1.4,0.933-14.475,10.225-15.227,10.775 c-0.43,0.314-0.768,0.219-1.299-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.949-0.436-1.711-0.034 c-0.869,0.46-3.763,1.914-9.954,8.106c-6.193,6.192-7.636,9.092-8.108,9.956c-0.378,0.69-0.319,1.135,0.036,1.711 c0.4,0.651,2.351,3.069,2.967,3.736c0.492,0.533,0.559,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195 c-0.534,0.803-1.009,1.098-1.665,0.606c0.314,0.378,0.643,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.853,42.705,20.37,41.951z" fill="url(#SVGID_5_)" opacity="0.5"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -608.1406 2931.3247)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-1610.521" x2="-1610.521" y1="-2533.3467" y2="-2471.428">
-<stop offset="0" style="stop-color:#CF8122"/>
-<stop offset="0.5" style="stop-color:#8C4105"/>
-<stop offset="1" style="stop-color:#CF8122"/>
+ <stop offset="0" style="stop-color:#CF8122"/>
+ <stop offset="0.5" style="stop-color:#8C4105"/>
+ <stop offset="1" style="stop-color:#CF8122"/>
</linearGradient>
-<path d="M2.899,45.012c1.275-2.777,10.299-14.804,18.804-23.31 c8.506-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26 c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.533,18.959S3.489,41.869,2.195,44.688 c-0.038,0.087-0.063,0.166-0.101,0.251c0.07,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_6_)" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M2.899,45.012c1.275-2.777,10.299-14.804,18.804-23.31 c8.506-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26 c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.533,18.959S3.489,41.869,2.195,44.688 c-0.038,0.087-0.063,0.166-0.101,0.251c0.07,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_6_)" opacity="0.5"/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
-<path d="M15,29.5C7.004,29.5,0.5,22.996,0.5,15C0.5,7.004,7.004,0.5,15,0.5 c7.995,0,14.5,6.505,14.5,14.5S22.995,29.5,15,29.5L15,29.5z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M15,29.5C7.004,29.5,0.5,22.996,0.5,15C0.5,7.004,7.004,0.5,15,0.5 c7.995,0,14.5,6.505,14.5,14.5S22.995,29.5,15,29.5L15,29.5z" enable-background="new " opacity="0.35"/>
<radialGradient cx="435.2295" cy="910.6348" gradientTransform="matrix(0.618 0 0 0.618 -253.9715 -552.4329)" gradientUnits="userSpaceOnUse" id="SVGID_1__" r="28.704">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#94FFFF"/>
+ <stop offset="0.5" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</radialGradient>
<circle cx="15" cy="15" fill="url(#SVGID_1__)" r="13.464"/>
-<path d="M27.983,14.263c-0.299-5.259-3.704-9.788-8.679-11.54l-0.605,0.1L15.18,2.15 l-4.386,2.615l-0.165,1.102H8.083l1.006,1.71L6.365,9.8l-0.635,2.744l2.25,3.987l2.297-0.469l0.839,0.723l0.655,0.064l0.433,1.691 l-0.571,1.484l2.084,5.332h2.126l2.107-1.701v-0.695l0.557-0.863l0.459-0.236c-0.116,0.18-0.3,0.586-0.3,0.586 c-0.02,0.139,0.299,2.855,1.234,2.643c0.711-0.16,3.248-4.873,3.296-5.322c0.096-0.887-0.387-1.252-0.683-1.391l-0.329-0.156 l-1.515,1.52c-0.162,0.012-0.309,0.039-0.44,0.078v-1.26l1.645-1.605l0.837-2.698l1.275-1.038l-0.28-0.508l0.962-0.926l-0.538-0.979 l0.41,0.049l2.396,5.362l0.49-0.39c-0.015-0.262-0.043-0.521-0.073-0.779L27.983,14.263z M15.161,8.231l-0.2-0.535h1.202 l0.586,1.316h-0.871V8.23L15.161,8.231L15.161,8.231z M19.129,10.882l0.961,1.402l0.064,0.168l-0.984-0.595l-0.234-0.848 L19.129,10.882z M20.573,13.331l0.29,0.29l-0.375,0.084l-0.085-0.104L20.573,13.331z M13.06,3.903l0.611,0.946l-0.694,0.212 l-0.271-0.154L13.06,3.903z" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M27.983,14.263c-0.299-5.259-3.704-9.788-8.679-11.54l-0.605,0.1L15.18,2.15 l-4.386,2.615l-0.165,1.102H8.083l1.006,1.71L6.365,9.8l-0.635,2.744l2.25,3.987l2.297-0.469l0.839,0.723l0.655,0.064l0.433,1.691 l-0.571,1.484l2.084,5.332h2.126l2.107-1.701v-0.695l0.557-0.863l0.459-0.236c-0.116,0.18-0.3,0.586-0.3,0.586 c-0.02,0.139,0.299,2.855,1.234,2.643c0.711-0.16,3.248-4.873,3.296-5.322c0.096-0.887-0.387-1.252-0.683-1.391l-0.329-0.156 l-1.515,1.52c-0.162,0.012-0.309,0.039-0.44,0.078v-1.26l1.645-1.605l0.837-2.698l1.275-1.038l-0.28-0.508l0.962-0.926l-0.538-0.979 l0.41,0.049l2.396,5.362l0.49-0.39c-0.015-0.262-0.043-0.521-0.073-0.779L27.983,14.263z M15.161,8.231l-0.2-0.535h1.202 l0.586,1.316h-0.871V8.23L15.161,8.231L15.161,8.231z M19.129,10.882l0.961,1.402l0.064,0.168l-0.984-0.595l-0.234-0.848 L19.129,10.882z M20.573,13.331l0.29,0.29l-0.375,0.084l-0.085-0.104L20.573,13.331z M13.06,3.903l0.611,0.946l-0.694,0.212 l-0.271-0.154L13.06,3.903z" enable-background="new " opacity="0.3"/>
<linearGradient gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="333.1904" x2="333.1904" y1="416.6045" y2="431.9054">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#C8E4EB"/>
+ <stop offset="0" style="stop-color:#31A7F8"/>
+ <stop offset="0.497" style="stop-color:#1E74DC"/>
+ <stop offset="1" style="stop-color:#C8E4EB"/>
</linearGradient>
-<path d="M15,1.536C7.564,1.536,1.536,7.565,1.536,15 c0,7.439,6.029,13.464,13.464,13.464c7.438,0,13.465-6.027,13.465-13.464C28.465,7.565,22.438,1.536,15,1.536z M15,27.428 C8.146,27.428,2.571,21.854,2.571,15C2.571,8.147,8.146,2.571,15,2.571S27.428,8.147,27.428,15 C27.428,21.854,21.854,27.428,15,27.428z" fill="url(#SVGID_2__)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M15,1.536C7.564,1.536,1.536,7.565,1.536,15 c0,7.439,6.029,13.464,13.464,13.464c7.438,0,13.465-6.027,13.465-13.464C28.465,7.565,22.438,1.536,15,1.536z M15,27.428 C8.146,27.428,2.571,21.854,2.571,15C2.571,8.147,8.146,2.571,15,2.571S27.428,8.147,27.428,15 C27.428,21.854,21.854,27.428,15,27.428z" enable-background="new " fill="url(#SVGID_2__)" opacity="0.3"/>
<radialGradient cx="333.6309" cy="418.627" gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_3__" r="9.0429">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+ <stop offset="0" style="stop-color:#94FF26"/>
+ <stop offset="0.3152" style="stop-color:#94FF26"/>
+ <stop offset="0.7273" style="stop-color:#1FC211"/>
+ <stop offset="1" style="stop-color:#0BA133"/>
</radialGradient>
<path d="M22.296,18.848l-1.401,1.402c0,0-0.848,0-0.887,0.336c-0.02,0.145-0.065,0.771-0.208,1.094 c-0.282,0.195-0.619,0.842-0.619,0.842s-0.175,1.25,0.761,1.037C20.871,23.35,23.734,19.523,22.296,18.848z" fill="url(#SVGID_3__)"/>
<radialGradient cx="333.6299" cy="418.6211" gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_4__" r="10.4663">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+ <stop offset="0" style="stop-color:#94FF26"/>
+ <stop offset="0.3152" style="stop-color:#94FF26"/>
+ <stop offset="0.7273" style="stop-color:#1FC211"/>
+ <stop offset="1" style="stop-color:#0BA133"/>
</radialGradient>
<path d="M19.132,3.213c-0.23,0.087-0.387,0.146-0.387,0.146l-3.463-0.663L13.583,3.76l0.894,1.383 l-1.563,0.48l-0.842-0.48l0.296-0.84l-1.098,0.76l-0.196,1.324H8.988L9.759,7.7l-2.932,2.39l-0.552,2.387l1.088,2.107L8.018,15 l2.297-0.469l0.839,0.721l0.763,0.074l0.83,3.246l-0.552,1.436l1.22,2.697l0.343,1.119h2.126l1.202-0.65l0.905-1.053V20.85 l1.724-0.881v-1.885l0.681-1.297l1.521-1.366l0.363-1.585l-1.988,0.443l-0.522-0.637l0.371-0.594l-1.411-0.854l-0.601-2.164 l1.042-0.68l0.96,1.402l0.359,0.922l0.722,0.721l0.842,0.44l0.936-0.151l1.039-1l-0.731-1.334l-0.921,0.24l-0.833-0.991l0.791-0.552 l2.482,0.301v0.883l2.161,4.452l0.491-0.393C27.176,9.158,23.783,4.849,19.132,3.213z M18.004,9.23l-1.134,0.3h-1.511V8.749h-1.443 L12.774,9.05l-1.741-0.482l-0.482-0.901l2.404-0.541h2.406L15,6.164h1.202l0.67,1.503l1.134,0.398V9.23H18.004z M20.589,7.247 l-2.044-0.361V6.165l1.022-0.24l0.3-0.36l0.722,0.6V7.247L20.589,7.247z" fill="url(#SVGID_4__)"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_dialled_call.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_dialled_call.svg Fri May 14 16:09:54 2010 +0300
@@ -1,93 +1,95 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<stop offset="0" style="stop-color:#3AC5EA"/>
-<stop offset="0.297" style="stop-color:#3AC5EA"/>
-<stop offset="0.6667" style="stop-color:#1754C9"/>
-<stop offset="0.7939" style="stop-color:#33ADE1"/>
-<stop offset="1" style="stop-color:#33ADE1"/>
+ <stop offset="0.297" style="stop-color:#3AC5EA"/>
+ <stop offset="0.6667" style="stop-color:#1754C9"/>
+ <stop offset="0.7939" style="stop-color:#33ADE1"/>
</radialGradient>
<path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333c-0.617-0.665-2.567-3.083-2.968-3.735 c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956c6.191-6.192,9.085-7.646,9.956-8.107 c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967c0.534,0.492,0.872,0.588,1.299,0.274 c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778c-2.476-2.889-8.594-5.015-10.751-5.399 c-1.923-0.345-3.876-0.872-6.567,0.235c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352 c-1.108,2.691-0.581,4.645-0.236,6.567c0.386,2.158,2.51,8.275,5.399,10.752c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2070.7568" x2="-2070.3252" y1="-2266.8511" y2="-2263.2749">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+ <stop offset="0" style="stop-color:#2685D2"/>
+ <stop offset="1" style="stop-color:#081D45"/>
</linearGradient>
<path d="M35.172,17.108c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967 c0.534,0.492,0.872,0.588,1.299,0.274c0.048-0.035,0.062-0.046,0.064-0.046c0.253-0.184,1.032-0.738,2.12-1.514 c-0.251-0.204-3.468-2.809-4.8-2.956C36.857,15.598,35.172,17.108,35.172,17.108z" fill="url(#SVGID_2_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -2128.2356 5114.0977)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2070.7607" x2="-2070.3289" y1="5104.5752" y2="5108.1523">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+ <stop offset="0" style="stop-color:#2685D2"/>
+ <stop offset="1" style="stop-color:#081D45"/>
</linearGradient>
<path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.713c0.376,0.666,2.351,3.069,2.967,3.738 c0.493,0.531,0.587,0.869,0.274,1.298c-0.035,0.047-0.046,0.062-0.046,0.062c-0.183,0.253-0.738,1.032-1.515,2.119 c-0.204-0.252-2.807-3.467-2.956-4.799C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="47.9224" x2="3.9991" y1="3.9307" y2="47.854">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+ <stop offset="0" style="stop-color:#ABEEFF"/>
+ <stop offset="1" style="stop-color:#539FDE"/>
</linearGradient>
-<path d="M2.979,47.467c-0.344-1.925-0.873-3.878,0.235-6.567 c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.341,4.269,40.9,3.215c2.691-1.108,4.644-0.581,6.567-0.236 c1.981,0.354,7.296,2.178,10.069,4.711c-2.552-2.815-8.496-4.879-10.617-5.258c-1.923-0.345-3.876-0.872-6.567,0.235 c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567 c0.378,2.122,2.441,8.065,5.258,10.617C5.156,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M2.979,47.467c-0.344-1.925-0.873-3.878,0.235-6.567 c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.341,4.269,40.9,3.215c2.691-1.108,4.644-0.581,6.567-0.236 c1.981,0.354,7.296,2.178,10.069,4.711c-2.552-2.815-8.496-4.879-10.617-5.258c-1.923-0.345-3.876-0.872-6.567,0.235 c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567 c0.378,2.122,2.441,8.065,5.258,10.617C5.156,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="54.3535" x2="3.9474" y1="3.2017" y2="53.6078">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+ <stop offset="0" style="stop-color:#ABEEFF"/>
+ <stop offset="1" style="stop-color:#539FDE"/>
</linearGradient>
-<path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333 c-0.617-0.665-2.567-3.083-2.968-3.735c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956 c6.191-6.192,9.085-7.646,9.956-8.107c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967 c0.534,0.492,0.872,0.588,1.299,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778 c-0.292-0.339-0.634-0.665-1.013-0.982c0.49,0.657,0.198,1.134-0.607,1.666C54.65,9.447,41.576,18.739,40.825,19.29 c-0.431,0.314-0.767,0.219-1.3-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.948-0.436-1.71-0.034 c-0.871,0.46-3.764,1.914-9.956,8.106c-6.193,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.319,1.135,0.035,1.711 c0.4,0.651,2.351,3.069,2.967,3.736c0.493,0.533,0.559,0.896,0.259,1.332c-0.517,0.755-9.828,13.794-10.76,15.195 c-0.533,0.803-1.008,1.098-1.665,0.606c0.314,0.378,0.644,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_5_)" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333 c-0.617-0.665-2.567-3.083-2.968-3.735c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956 c6.191-6.192,9.085-7.646,9.956-8.107c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967 c0.534,0.492,0.872,0.588,1.299,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778 c-0.292-0.339-0.634-0.665-1.013-0.982c0.49,0.657,0.198,1.134-0.607,1.666C54.65,9.447,41.576,18.739,40.825,19.29 c-0.431,0.314-0.767,0.219-1.3-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.948-0.436-1.71-0.034 c-0.871,0.46-3.764,1.914-9.956,8.106c-6.193,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.319,1.135,0.035,1.711 c0.4,0.651,2.351,3.069,2.967,3.736c0.493,0.533,0.559,0.896,0.259,1.332c-0.517,0.755-9.828,13.794-10.76,15.195 c-0.533,0.803-1.008,1.098-1.665,0.606c0.314,0.378,0.644,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_5_)" opacity="0.6"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -141.776 3075.0667)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-2041.9355" x2="-2041.9355" y1="-2305.2153" y2="-2243.2966">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="0.5091" style="stop-color:#081D45"/>
-<stop offset="1" style="stop-color:#2275BD"/>
+ <stop offset="0" style="stop-color:#2685D2"/>
+ <stop offset="0.5091" style="stop-color:#081D45"/>
+ <stop offset="1" style="stop-color:#2275BD"/>
</linearGradient>
<path d="M2.899,45.012c1.275-2.777,10.299-14.804,18.804-23.31c8.505-8.506,20.532-17.529,23.308-18.803 c0.527-0.241,1.02-0.411,1.493-0.545c-0.511-0.096-1.03-0.19-1.565-0.26c-0.086,0.036-0.163,0.063-0.25,0.102 c-2.818,1.293-14.971,10.397-23.533,18.959C12.595,29.717,3.489,41.869,2.195,44.688c-0.038,0.087-0.063,0.166-0.101,0.25 c0.07,0.535,0.166,1.055,0.259,1.565C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_6_)"/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
-<path d="M15,29.5C7.004,29.5,0.5,22.996,0.5,15C0.5,7.004,7.004,0.5,15,0.5 c7.995,0,14.5,6.505,14.5,14.5S22.995,29.5,15,29.5L15,29.5z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M15,29.5C7.004,29.5,0.5,22.996,0.5,15C0.5,7.004,7.004,0.5,15,0.5 c7.995,0,14.5,6.505,14.5,14.5S22.995,29.5,15,29.5L15,29.5z" enable-background="new " opacity="0.35"/>
<radialGradient cx="435.2295" cy="910.6348" gradientTransform="matrix(0.618 0 0 0.618 -253.9715 -552.4329)" gradientUnits="userSpaceOnUse" id="SVGID_1__" r="28.704">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#94FFFF"/>
+ <stop offset="0.5" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</radialGradient>
<circle cx="15" cy="15" fill="url(#SVGID_1__)" r="13.464"/>
-<path d="M27.983,14.263c-0.299-5.259-3.704-9.788-8.679-11.54l-0.605,0.1L15.18,2.15 l-4.386,2.615l-0.165,1.102H8.083l1.006,1.71L6.365,9.8l-0.635,2.744l2.25,3.987l2.297-0.469l0.839,0.723l0.655,0.064l0.433,1.691 l-0.571,1.484l2.084,5.332h2.126l2.107-1.701v-0.695l0.557-0.863l0.459-0.236c-0.116,0.18-0.3,0.586-0.3,0.586 c-0.02,0.139,0.299,2.855,1.234,2.643c0.711-0.16,3.248-4.873,3.296-5.322c0.096-0.887-0.387-1.252-0.683-1.391l-0.329-0.156 l-1.515,1.52c-0.162,0.012-0.309,0.039-0.44,0.078v-1.26l1.645-1.605l0.837-2.698l1.275-1.038l-0.28-0.508l0.962-0.926l-0.538-0.979 l0.41,0.049l2.396,5.362l0.49-0.39c-0.015-0.262-0.043-0.521-0.073-0.779L27.983,14.263z M15.161,8.231l-0.2-0.535h1.202 l0.586,1.316h-0.871V8.23L15.161,8.231L15.161,8.231z M19.129,10.882l0.961,1.402l0.064,0.168l-0.984-0.595l-0.234-0.848 L19.129,10.882z M20.573,13.331l0.29,0.29l-0.375,0.084l-0.085-0.104L20.573,13.331z M13.06,3.903l0.611,0.946l-0.694,0.212 l-0.271-0.154L13.06,3.903z" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M27.983,14.263c-0.299-5.259-3.704-9.788-8.679-11.54l-0.605,0.1L15.18,2.15 l-4.386,2.615l-0.165,1.102H8.083l1.006,1.71L6.365,9.8l-0.635,2.744l2.25,3.987l2.297-0.469l0.839,0.723l0.655,0.064l0.433,1.691 l-0.571,1.484l2.084,5.332h2.126l2.107-1.701v-0.695l0.557-0.863l0.459-0.236c-0.116,0.18-0.3,0.586-0.3,0.586 c-0.02,0.139,0.299,2.855,1.234,2.643c0.711-0.16,3.248-4.873,3.296-5.322c0.096-0.887-0.387-1.252-0.683-1.391l-0.329-0.156 l-1.515,1.52c-0.162,0.012-0.309,0.039-0.44,0.078v-1.26l1.645-1.605l0.837-2.698l1.275-1.038l-0.28-0.508l0.962-0.926l-0.538-0.979 l0.41,0.049l2.396,5.362l0.49-0.39c-0.015-0.262-0.043-0.521-0.073-0.779L27.983,14.263z M15.161,8.231l-0.2-0.535h1.202 l0.586,1.316h-0.871V8.23L15.161,8.231L15.161,8.231z M19.129,10.882l0.961,1.402l0.064,0.168l-0.984-0.595l-0.234-0.848 L19.129,10.882z M20.573,13.331l0.29,0.29l-0.375,0.084l-0.085-0.104L20.573,13.331z M13.06,3.903l0.611,0.946l-0.694,0.212 l-0.271-0.154L13.06,3.903z" enable-background="new " opacity="0.3"/>
<linearGradient gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="333.1904" x2="333.1904" y1="416.6045" y2="431.9054">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#C8E4EB"/>
+ <stop offset="0" style="stop-color:#31A7F8"/>
+ <stop offset="0.497" style="stop-color:#1E74DC"/>
+ <stop offset="1" style="stop-color:#C8E4EB"/>
</linearGradient>
-<path d="M15,1.536C7.564,1.536,1.536,7.565,1.536,15 c0,7.439,6.029,13.464,13.464,13.464c7.438,0,13.465-6.027,13.465-13.464C28.465,7.565,22.438,1.536,15,1.536z M15,27.428 C8.146,27.428,2.571,21.854,2.571,15C2.571,8.147,8.146,2.571,15,2.571S27.428,8.147,27.428,15 C27.428,21.854,21.854,27.428,15,27.428z" fill="url(#SVGID_2__)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M15,1.536C7.564,1.536,1.536,7.565,1.536,15 c0,7.439,6.029,13.464,13.464,13.464c7.438,0,13.465-6.027,13.465-13.464C28.465,7.565,22.438,1.536,15,1.536z M15,27.428 C8.146,27.428,2.571,21.854,2.571,15C2.571,8.147,8.146,2.571,15,2.571S27.428,8.147,27.428,15 C27.428,21.854,21.854,27.428,15,27.428z" enable-background="new " fill="url(#SVGID_2__)" opacity="0.3"/>
<radialGradient cx="333.6309" cy="418.627" gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_3__" r="9.0429">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+ <stop offset="0" style="stop-color:#94FF26"/>
+ <stop offset="0.3152" style="stop-color:#94FF26"/>
+ <stop offset="0.7273" style="stop-color:#1FC211"/>
+ <stop offset="1" style="stop-color:#0BA133"/>
</radialGradient>
<path d="M22.296,18.848l-1.401,1.402c0,0-0.848,0-0.887,0.336c-0.02,0.145-0.065,0.771-0.208,1.094 c-0.282,0.195-0.619,0.842-0.619,0.842s-0.175,1.25,0.761,1.037C20.871,23.35,23.734,19.523,22.296,18.848z" fill="url(#SVGID_3__)"/>
<radialGradient cx="333.6299" cy="418.6211" gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_4__" r="10.4663">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+ <stop offset="0" style="stop-color:#94FF26"/>
+ <stop offset="0.3152" style="stop-color:#94FF26"/>
+ <stop offset="0.7273" style="stop-color:#1FC211"/>
+ <stop offset="1" style="stop-color:#0BA133"/>
</radialGradient>
<path d="M19.132,3.213c-0.23,0.087-0.387,0.146-0.387,0.146l-3.463-0.663L13.583,3.76l0.894,1.383 l-1.563,0.48l-0.842-0.48l0.296-0.84l-1.098,0.76l-0.196,1.324H8.988L9.759,7.7l-2.932,2.39l-0.552,2.387l1.088,2.107L8.018,15 l2.297-0.469l0.839,0.721l0.763,0.074l0.83,3.246l-0.552,1.436l1.22,2.697l0.343,1.119h2.126l1.202-0.65l0.905-1.053V20.85 l1.724-0.881v-1.885l0.681-1.297l1.521-1.366l0.363-1.585l-1.988,0.443l-0.522-0.637l0.371-0.594l-1.411-0.854l-0.601-2.164 l1.042-0.68l0.96,1.402l0.359,0.922l0.722,0.721l0.842,0.44l0.936-0.151l1.039-1l-0.731-1.334l-0.921,0.24l-0.833-0.991l0.791-0.552 l2.482,0.301v0.883l2.161,4.452l0.491-0.393C27.176,9.158,23.783,4.849,19.132,3.213z M18.004,9.23l-1.134,0.3h-1.511V8.749h-1.443 L12.774,9.05l-1.741-0.482l-0.482-0.901l2.404-0.541h2.406L15,6.164h1.202l0.67,1.503l1.134,0.398V9.23H18.004z M20.589,7.247 l-2.044-0.361V6.165l1.022-0.24l0.3-0.36l0.722,0.6V7.247L20.589,7.247z" fill="url(#SVGID_4__)"/>
</g>
<g>
+<defs>
+</defs>
<polygon fill="none" points="30.152,0.436 15.607,0.436 15.186,0 14.762,0.436 0.152,0.436 0.152,15.436 0,15.592 0.152,15.592 0.152,30.436 30.152,30.436 30.152,15.594 30.295,15.594 30.152,15.447 "/>
-<polygon fill-opacity="0.35" points="8.484,30.434 8.48,15.594 0.4,15.594 0,15.592 15.186,0 30.295,15.594 21.907,15.594 21.915,30.436 " stroke-opacity="0.35"/>
+<polygon opacity="0.35" points="8.484,30.434 8.48,15.594 0.4,15.594 0,15.592 15.186,0 30.295,15.594 21.907,15.594 21.915,30.436 "/>
<linearGradient gradientTransform="matrix(1 1.000000e-004 1.000000e-004 -1 2191.3389 2985.8438)" gradientUnits="userSpaceOnUse" id="SVGID_1___" x1="-2176.5103" x2="-2176.5103" y1="2985.5796" y2="2956.2766">
-<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="1" style="stop-color:#1347BA"/>
+ <stop offset="0.1455" style="stop-color:#45E8FF"/>
+ <stop offset="0.5576" style="stop-color:#30A4D5"/>
+ <stop offset="1" style="stop-color:#1347BA"/>
</linearGradient>
<polygon fill="url(#SVGID_1___)" points="27.438,14.594 15.184,1.861 2.814,14.594 9.48,14.594 9.484,29.142 20.91,29.145 20.907,14.594 "/>
<linearGradient gradientTransform="matrix(1 1.000000e-004 1.000000e-004 -1 2191.3389 2985.8438)" gradientUnits="userSpaceOnUse" id="SVGID_2___" x1="-2176.4844" x2="-2176.4844" y1="2984.1128" y2="2970.6938">
-<stop offset="0" style="stop-color:#B3FCFF"/>
-<stop offset="0.4182" style="stop-color:#B3FCFF"/>
-<stop offset="1" style="stop-color:#5FBAD8"/>
+ <stop offset="0.4182" style="stop-color:#B3FCFF"/>
+ <stop offset="1" style="stop-color:#5FBAD8"/>
</linearGradient>
<polygon fill="url(#SVGID_2___)" points="3.195,14.592 15.182,2.286 27.108,14.594 27.934,14.594 15.184,1.436 2.37,14.592 "/>
<line fill="none" x1="9.484" x2="20.91" y1="29.138" y2="29.14"/>
<polygon fill="#33AEDB" points="20.912,29.436 9.484,29.434 9.484,28.842 20.912,28.844 "/>
<rect fill="none" height="30" width="30" x="0.152" y="0.436"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_missed_call.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_missed_call.svg Fri May 14 16:09:54 2010 +0300
@@ -1,93 +1,97 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<stop offset="0" style="stop-color:#3AC5EA"/>
-<stop offset="0.297" style="stop-color:#3AC5EA"/>
-<stop offset="0.6667" style="stop-color:#1754C9"/>
-<stop offset="0.7939" style="stop-color:#33ADE1"/>
-<stop offset="1" style="stop-color:#33ADE1"/>
+ <stop offset="0.297" style="stop-color:#3AC5EA"/>
+ <stop offset="0.6667" style="stop-color:#1754C9"/>
+ <stop offset="0.7939" style="stop-color:#33ADE1"/>
</radialGradient>
<path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333c-0.617-0.665-2.567-3.083-2.968-3.735 c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956c6.191-6.192,9.085-7.646,9.956-8.107 c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967c0.534,0.492,0.872,0.588,1.299,0.274 c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778c-2.476-2.889-8.594-5.015-10.751-5.399 c-1.923-0.345-3.876-0.872-6.567,0.235c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352 c-1.108,2.691-0.581,4.645-0.236,6.567c0.386,2.158,2.51,8.275,5.399,10.752c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2070.7568" x2="-2070.3252" y1="-2266.8511" y2="-2263.2749">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+ <stop offset="0" style="stop-color:#2685D2"/>
+ <stop offset="1" style="stop-color:#081D45"/>
</linearGradient>
<path d="M35.172,17.108c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967 c0.534,0.492,0.872,0.588,1.299,0.274c0.048-0.035,0.062-0.046,0.064-0.046c0.253-0.184,1.032-0.738,2.12-1.514 c-0.251-0.204-3.468-2.809-4.8-2.956C36.857,15.598,35.172,17.108,35.172,17.108z" fill="url(#SVGID_2_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -2128.2356 5114.0977)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2070.7607" x2="-2070.3289" y1="5104.5752" y2="5108.1523">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+ <stop offset="0" style="stop-color:#2685D2"/>
+ <stop offset="1" style="stop-color:#081D45"/>
</linearGradient>
<path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.713c0.376,0.666,2.351,3.069,2.967,3.738 c0.493,0.531,0.587,0.869,0.274,1.298c-0.035,0.047-0.046,0.062-0.046,0.062c-0.183,0.253-0.738,1.032-1.515,2.119 c-0.204-0.252-2.807-3.467-2.956-4.799C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="47.9224" x2="3.9991" y1="3.9307" y2="47.854">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+ <stop offset="0" style="stop-color:#ABEEFF"/>
+ <stop offset="1" style="stop-color:#539FDE"/>
</linearGradient>
-<path d="M2.979,47.467c-0.344-1.925-0.873-3.878,0.235-6.567 c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.341,4.269,40.9,3.215c2.691-1.108,4.644-0.581,6.567-0.236 c1.981,0.354,7.296,2.178,10.069,4.711c-2.552-2.815-8.496-4.879-10.617-5.258c-1.923-0.345-3.876-0.872-6.567,0.235 c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567 c0.378,2.122,2.441,8.065,5.258,10.617C5.156,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M2.979,47.467c-0.344-1.925-0.873-3.878,0.235-6.567 c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.341,4.269,40.9,3.215c2.691-1.108,4.644-0.581,6.567-0.236 c1.981,0.354,7.296,2.178,10.069,4.711c-2.552-2.815-8.496-4.879-10.617-5.258c-1.923-0.345-3.876-0.872-6.567,0.235 c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567 c0.378,2.122,2.441,8.065,5.258,10.617C5.156,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="54.3535" x2="3.9474" y1="3.2017" y2="53.6078">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+ <stop offset="0" style="stop-color:#ABEEFF"/>
+ <stop offset="1" style="stop-color:#539FDE"/>
</linearGradient>
-<path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333 c-0.617-0.665-2.567-3.083-2.968-3.735c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956 c6.191-6.192,9.085-7.646,9.956-8.107c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967 c0.534,0.492,0.872,0.588,1.299,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778 c-0.292-0.339-0.634-0.665-1.013-0.982c0.49,0.657,0.198,1.134-0.607,1.666C54.65,9.447,41.576,18.739,40.825,19.29 c-0.431,0.314-0.767,0.219-1.3-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.948-0.436-1.71-0.034 c-0.871,0.46-3.764,1.914-9.956,8.106c-6.193,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.319,1.135,0.035,1.711 c0.4,0.651,2.351,3.069,2.967,3.736c0.493,0.533,0.559,0.896,0.259,1.332c-0.517,0.755-9.828,13.794-10.76,15.195 c-0.533,0.803-1.008,1.098-1.665,0.606c0.314,0.378,0.644,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_5_)" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333 c-0.617-0.665-2.567-3.083-2.968-3.735c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956 c6.191-6.192,9.085-7.646,9.956-8.107c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967 c0.534,0.492,0.872,0.588,1.299,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778 c-0.292-0.339-0.634-0.665-1.013-0.982c0.49,0.657,0.198,1.134-0.607,1.666C54.65,9.447,41.576,18.739,40.825,19.29 c-0.431,0.314-0.767,0.219-1.3-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.948-0.436-1.71-0.034 c-0.871,0.46-3.764,1.914-9.956,8.106c-6.193,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.319,1.135,0.035,1.711 c0.4,0.651,2.351,3.069,2.967,3.736c0.493,0.533,0.559,0.896,0.259,1.332c-0.517,0.755-9.828,13.794-10.76,15.195 c-0.533,0.803-1.008,1.098-1.665,0.606c0.314,0.378,0.644,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_5_)" opacity="0.6"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -141.776 3075.0667)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-2041.9355" x2="-2041.9355" y1="-2305.2153" y2="-2243.2966">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="0.5091" style="stop-color:#081D45"/>
-<stop offset="1" style="stop-color:#2275BD"/>
+ <stop offset="0" style="stop-color:#2685D2"/>
+ <stop offset="0.5091" style="stop-color:#081D45"/>
+ <stop offset="1" style="stop-color:#2275BD"/>
</linearGradient>
<path d="M2.899,45.012c1.275-2.777,10.299-14.804,18.804-23.31c8.505-8.506,20.532-17.529,23.308-18.803 c0.527-0.241,1.02-0.411,1.493-0.545c-0.511-0.096-1.03-0.19-1.565-0.26c-0.086,0.036-0.163,0.063-0.25,0.102 c-2.818,1.293-14.971,10.397-23.533,18.959C12.595,29.717,3.489,41.869,2.195,44.688c-0.038,0.087-0.063,0.166-0.101,0.25 c0.07,0.535,0.166,1.055,0.259,1.565C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_6_)"/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
-<path d="M15,29.5C7.004,29.5,0.5,22.996,0.5,15C0.5,7.004,7.004,0.5,15,0.5 c7.995,0,14.5,6.505,14.5,14.5S22.995,29.5,15,29.5L15,29.5z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M15,29.5C7.004,29.5,0.5,22.996,0.5,15C0.5,7.004,7.004,0.5,15,0.5 c7.995,0,14.5,6.505,14.5,14.5S22.995,29.5,15,29.5L15,29.5z" enable-background="new " opacity="0.35"/>
<radialGradient cx="435.2295" cy="910.6348" gradientTransform="matrix(0.618 0 0 0.618 -253.9715 -552.4329)" gradientUnits="userSpaceOnUse" id="SVGID_1__" r="28.704">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#94FFFF"/>
+ <stop offset="0.5" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</radialGradient>
<circle cx="15" cy="15" fill="url(#SVGID_1__)" r="13.464"/>
-<path d="M27.983,14.263c-0.299-5.259-3.704-9.788-8.679-11.54l-0.605,0.1L15.18,2.15 l-4.386,2.615l-0.165,1.102H8.083l1.006,1.71L6.365,9.8l-0.635,2.744l2.25,3.987l2.297-0.469l0.839,0.723l0.655,0.064l0.433,1.691 l-0.571,1.484l2.084,5.332h2.126l2.107-1.701v-0.695l0.557-0.863l0.459-0.236c-0.116,0.18-0.3,0.586-0.3,0.586 c-0.02,0.139,0.299,2.855,1.234,2.643c0.711-0.16,3.248-4.873,3.296-5.322c0.096-0.887-0.387-1.252-0.683-1.391l-0.329-0.156 l-1.515,1.52c-0.162,0.012-0.309,0.039-0.44,0.078v-1.26l1.645-1.605l0.837-2.698l1.275-1.038l-0.28-0.508l0.962-0.926l-0.538-0.979 l0.41,0.049l2.396,5.362l0.49-0.39c-0.015-0.262-0.043-0.521-0.073-0.779L27.983,14.263z M15.161,8.231l-0.2-0.535h1.202 l0.586,1.316h-0.871V8.23L15.161,8.231L15.161,8.231z M19.129,10.882l0.961,1.402l0.064,0.168l-0.984-0.595l-0.234-0.848 L19.129,10.882z M20.573,13.331l0.29,0.29l-0.375,0.084l-0.085-0.104L20.573,13.331z M13.06,3.903l0.611,0.946l-0.694,0.212 l-0.271-0.154L13.06,3.903z" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M27.983,14.263c-0.299-5.259-3.704-9.788-8.679-11.54l-0.605,0.1L15.18,2.15 l-4.386,2.615l-0.165,1.102H8.083l1.006,1.71L6.365,9.8l-0.635,2.744l2.25,3.987l2.297-0.469l0.839,0.723l0.655,0.064l0.433,1.691 l-0.571,1.484l2.084,5.332h2.126l2.107-1.701v-0.695l0.557-0.863l0.459-0.236c-0.116,0.18-0.3,0.586-0.3,0.586 c-0.02,0.139,0.299,2.855,1.234,2.643c0.711-0.16,3.248-4.873,3.296-5.322c0.096-0.887-0.387-1.252-0.683-1.391l-0.329-0.156 l-1.515,1.52c-0.162,0.012-0.309,0.039-0.44,0.078v-1.26l1.645-1.605l0.837-2.698l1.275-1.038l-0.28-0.508l0.962-0.926l-0.538-0.979 l0.41,0.049l2.396,5.362l0.49-0.39c-0.015-0.262-0.043-0.521-0.073-0.779L27.983,14.263z M15.161,8.231l-0.2-0.535h1.202 l0.586,1.316h-0.871V8.23L15.161,8.231L15.161,8.231z M19.129,10.882l0.961,1.402l0.064,0.168l-0.984-0.595l-0.234-0.848 L19.129,10.882z M20.573,13.331l0.29,0.29l-0.375,0.084l-0.085-0.104L20.573,13.331z M13.06,3.903l0.611,0.946l-0.694,0.212 l-0.271-0.154L13.06,3.903z" enable-background="new " opacity="0.3"/>
<linearGradient gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="333.1904" x2="333.1904" y1="416.6045" y2="431.9054">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#C8E4EB"/>
+ <stop offset="0" style="stop-color:#31A7F8"/>
+ <stop offset="0.497" style="stop-color:#1E74DC"/>
+ <stop offset="1" style="stop-color:#C8E4EB"/>
</linearGradient>
-<path d="M15,1.536C7.564,1.536,1.536,7.565,1.536,15 c0,7.439,6.029,13.464,13.464,13.464c7.438,0,13.465-6.027,13.465-13.464C28.465,7.565,22.438,1.536,15,1.536z M15,27.428 C8.146,27.428,2.571,21.854,2.571,15C2.571,8.147,8.146,2.571,15,2.571S27.428,8.147,27.428,15 C27.428,21.854,21.854,27.428,15,27.428z" fill="url(#SVGID_2__)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M15,1.536C7.564,1.536,1.536,7.565,1.536,15 c0,7.439,6.029,13.464,13.464,13.464c7.438,0,13.465-6.027,13.465-13.464C28.465,7.565,22.438,1.536,15,1.536z M15,27.428 C8.146,27.428,2.571,21.854,2.571,15C2.571,8.147,8.146,2.571,15,2.571S27.428,8.147,27.428,15 C27.428,21.854,21.854,27.428,15,27.428z" enable-background="new " fill="url(#SVGID_2__)" opacity="0.3"/>
<radialGradient cx="333.6309" cy="418.627" gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_3__" r="9.0429">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+ <stop offset="0" style="stop-color:#94FF26"/>
+ <stop offset="0.3152" style="stop-color:#94FF26"/>
+ <stop offset="0.7273" style="stop-color:#1FC211"/>
+ <stop offset="1" style="stop-color:#0BA133"/>
</radialGradient>
<path d="M22.296,18.848l-1.401,1.402c0,0-0.848,0-0.887,0.336c-0.02,0.145-0.065,0.771-0.208,1.094 c-0.282,0.195-0.619,0.842-0.619,0.842s-0.175,1.25,0.761,1.037C20.871,23.35,23.734,19.523,22.296,18.848z" fill="url(#SVGID_3__)"/>
<radialGradient cx="333.6299" cy="418.6211" gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_4__" r="10.4663">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+ <stop offset="0" style="stop-color:#94FF26"/>
+ <stop offset="0.3152" style="stop-color:#94FF26"/>
+ <stop offset="0.7273" style="stop-color:#1FC211"/>
+ <stop offset="1" style="stop-color:#0BA133"/>
</radialGradient>
<path d="M19.132,3.213c-0.23,0.087-0.387,0.146-0.387,0.146l-3.463-0.663L13.583,3.76l0.894,1.383 l-1.563,0.48l-0.842-0.48l0.296-0.84l-1.098,0.76l-0.196,1.324H8.988L9.759,7.7l-2.932,2.39l-0.552,2.387l1.088,2.107L8.018,15 l2.297-0.469l0.839,0.721l0.763,0.074l0.83,3.246l-0.552,1.436l1.22,2.697l0.343,1.119h2.126l1.202-0.65l0.905-1.053V20.85 l1.724-0.881v-1.885l0.681-1.297l1.521-1.366l0.363-1.585l-1.988,0.443l-0.522-0.637l0.371-0.594l-1.411-0.854l-0.601-2.164 l1.042-0.68l0.96,1.402l0.359,0.922l0.722,0.721l0.842,0.44l0.936-0.151l1.039-1l-0.731-1.334l-0.921,0.24l-0.833-0.991l0.791-0.552 l2.482,0.301v0.883l2.161,4.452l0.491-0.393C27.176,9.158,23.783,4.849,19.132,3.213z M18.004,9.23l-1.134,0.3h-1.511V8.749h-1.443 L12.774,9.05l-1.741-0.482l-0.482-0.901l2.404-0.541h2.406L15,6.164h1.202l0.67,1.503l1.134,0.398V9.23H18.004z M20.589,7.247 l-2.044-0.361V6.165l1.022-0.24l0.3-0.36l0.722,0.6V7.247L20.589,7.247z" fill="url(#SVGID_4__)"/>
</g>
<g>
+<defs>
+</defs>
<polygon fill="none" points="15.053,0 14.626,0.439 0,0.439 0,30.439 30,30.439 30,0.439 15.476,0.439 "/>
-<path d="M24.884,30.438c-10.001,0-15.735-4.635-15.735-12.715v-4.339H2.053L15.053,0l12.88,13.385h-6.962v4.339 c0,2.189,2.56,2.768,3.913,2.768h1v9.947H24.884z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M24.884,30.438c-10.001,0-15.735-4.635-15.735-12.715v-4.339H2.053L15.053,0l12.88,13.385h-6.962v4.339 c0,2.189,2.56,2.768,3.913,2.768h1v9.947H24.884z" opacity="0.35"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 2194 3014.6338)" gradientUnits="userSpaceOnUse" id="SVGID_1___" x1="-2179" x2="-2179" y1="3012.1528" y2="2984.2842">
-<stop offset="0" style="stop-color:#FF7042"/>
-<stop offset="1" style="stop-color:#991B23"/>
+ <stop offset="0" style="stop-color:#FF7042"/>
+ <stop offset="1" style="stop-color:#991B23"/>
</linearGradient>
<path d="M19.971,17.724v-5.339h5.611L15.049,1.438L4.418,12.385h5.73v5.339 c0,9.024,7.509,11.715,14.735,11.715v-7.947C22.658,21.491,19.971,20.392,19.971,17.724z" fill="url(#SVGID_1___)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2___" x1="15" x2="15" y1="1.7129" y2="22.5894">
-<stop offset="0" style="stop-color:#FFB259"/>
-<stop offset="1" style="stop-color:#991B23"/>
+ <stop offset="0" style="stop-color:#FFB259"/>
+ <stop offset="1" style="stop-color:#991B23"/>
</linearGradient>
<polygon fill="url(#SVGID_2___)" points="15.049,2.438 24.62,12.385 25.582,12.385 15.049,1.438 4.418,12.385 5.389,12.385 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3___" x1="22.4268" x2="22.4268" y1="1.7129" y2="22.5894">
-<stop offset="0" style="stop-color:#FF7042"/>
-<stop offset="1" style="stop-color:#991B23"/>
+ <stop offset="0" style="stop-color:#FF7042"/>
+ <stop offset="1" style="stop-color:#991B23"/>
</linearGradient>
<path d="M19.971,17.724v1c0,2.668,2.688,3.768,4.913,3.768v-1C22.658,21.491,19.971,20.392,19.971,17.724z" fill="url(#SVGID_3___)"/>
<rect fill="none" height="30" width="30" y="0.439"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_received_call.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_voip_received_call.svg Fri May 14 16:09:54 2010 +0300
@@ -1,82 +1,86 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<stop offset="0" style="stop-color:#3AC5EA"/>
-<stop offset="0.297" style="stop-color:#3AC5EA"/>
-<stop offset="0.6667" style="stop-color:#1754C9"/>
-<stop offset="0.7939" style="stop-color:#33ADE1"/>
-<stop offset="1" style="stop-color:#33ADE1"/>
+ <stop offset="0.297" style="stop-color:#3AC5EA"/>
+ <stop offset="0.6667" style="stop-color:#1754C9"/>
+ <stop offset="0.7939" style="stop-color:#33ADE1"/>
</radialGradient>
<path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333c-0.617-0.665-2.567-3.083-2.968-3.735 c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956c6.191-6.192,9.085-7.646,9.956-8.107 c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967c0.534,0.492,0.872,0.588,1.299,0.274 c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778c-2.476-2.889-8.594-5.015-10.751-5.399 c-1.923-0.345-3.876-0.872-6.567,0.235c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352 c-1.108,2.691-0.581,4.645-0.236,6.567c0.386,2.158,2.51,8.275,5.399,10.752c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -98.2555 3084.1135)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-2070.7568" x2="-2070.3252" y1="-2266.8511" y2="-2263.2749">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+ <stop offset="0" style="stop-color:#2685D2"/>
+ <stop offset="1" style="stop-color:#081D45"/>
</linearGradient>
<path d="M35.172,17.108c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967 c0.534,0.492,0.872,0.588,1.299,0.274c0.048-0.035,0.062-0.046,0.064-0.046c0.253-0.184,1.032-0.738,2.12-1.514 c-0.251-0.204-3.468-2.809-4.8-2.956C36.857,15.598,35.172,17.108,35.172,17.108z" fill="url(#SVGID_2_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -2128.2356 5114.0977)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-2070.7607" x2="-2070.3289" y1="5104.5752" y2="5108.1523">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="1" style="stop-color:#081D45"/>
+ <stop offset="0" style="stop-color:#2685D2"/>
+ <stop offset="1" style="stop-color:#081D45"/>
</linearGradient>
<path d="M17.092,35.188c-0.401,0.763-0.346,1.039,0.035,1.713c0.376,0.666,2.351,3.069,2.967,3.738 c0.493,0.531,0.587,0.869,0.274,1.298c-0.035,0.047-0.046,0.062-0.046,0.062c-0.183,0.253-0.738,1.032-1.515,2.119 c-0.204-0.252-2.807-3.467-2.956-4.799C15.579,36.875,17.092,35.188,17.092,35.188z" fill="url(#SVGID_3_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="47.9224" x2="3.9991" y1="3.9307" y2="47.854">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+ <stop offset="0" style="stop-color:#ABEEFF"/>
+ <stop offset="1" style="stop-color:#539FDE"/>
</linearGradient>
-<path d="M2.979,47.467c-0.344-1.925-0.873-3.878,0.235-6.567 c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.341,4.269,40.9,3.215c2.691-1.108,4.644-0.581,6.567-0.236 c1.981,0.354,7.296,2.178,10.069,4.711c-2.552-2.815-8.496-4.879-10.617-5.258c-1.923-0.345-3.876-0.872-6.567,0.235 c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567 c0.378,2.122,2.441,8.065,5.258,10.617C5.156,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M2.979,47.467c-0.344-1.925-0.873-3.878,0.235-6.567 c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.341,4.269,40.9,3.215c2.691-1.108,4.644-0.581,6.567-0.236 c1.981,0.354,7.296,2.178,10.069,4.711c-2.552-2.815-8.496-4.879-10.617-5.258c-1.923-0.345-3.876-0.872-6.567,0.235 c-2.559,1.054-13.075,8.536-21.112,16.572C11.203,27.277,3.722,37.795,2.668,40.352c-1.108,2.691-0.581,4.645-0.236,6.567 c0.378,2.122,2.441,8.065,5.258,10.617C5.156,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="54.3535" x2="3.9474" y1="3.2017" y2="53.6078">
-<stop offset="0" style="stop-color:#ABEEFF"/>
-<stop offset="1" style="stop-color:#539FDE"/>
+ <stop offset="0" style="stop-color:#ABEEFF"/>
+ <stop offset="1" style="stop-color:#539FDE"/>
</linearGradient>
-<path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333 c-0.617-0.665-2.567-3.083-2.968-3.735c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956 c6.191-6.192,9.085-7.646,9.956-8.107c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967 c0.534,0.492,0.872,0.588,1.299,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778 c-0.292-0.339-0.634-0.665-1.013-0.982c0.49,0.657,0.198,1.134-0.607,1.666C54.65,9.447,41.576,18.739,40.825,19.29 c-0.431,0.314-0.767,0.219-1.3-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.948-0.436-1.71-0.034 c-0.871,0.46-3.764,1.914-9.956,8.106c-6.193,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.319,1.135,0.035,1.711 c0.4,0.651,2.351,3.069,2.967,3.736c0.493,0.533,0.559,0.896,0.259,1.332c-0.517,0.755-9.828,13.794-10.76,15.195 c-0.533,0.803-1.008,1.098-1.665,0.606c0.314,0.378,0.644,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_5_)" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M20.37,41.951c0.3-0.437,0.234-0.799-0.258-1.333 c-0.617-0.665-2.567-3.083-2.968-3.735c-0.353-0.575-0.412-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956 c6.191-6.192,9.085-7.646,9.956-8.107c0.76-0.4,1.038-0.345,1.711,0.035c0.666,0.377,3.069,2.352,3.735,2.967 c0.534,0.492,0.872,0.588,1.299,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.524-1.778 c-0.292-0.339-0.634-0.665-1.013-0.982c0.49,0.657,0.198,1.134-0.607,1.666C54.65,9.447,41.576,18.739,40.825,19.29 c-0.431,0.314-0.767,0.219-1.3-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.948-0.436-1.71-0.034 c-0.871,0.46-3.764,1.914-9.956,8.106c-6.193,6.192-7.635,9.092-8.107,9.956c-0.378,0.69-0.319,1.135,0.035,1.711 c0.4,0.651,2.351,3.069,2.967,3.736c0.493,0.533,0.559,0.896,0.259,1.332c-0.517,0.755-9.828,13.794-10.76,15.195 c-0.533,0.803-1.008,1.098-1.665,0.606c0.314,0.378,0.644,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.852,42.705,20.37,41.951z" fill="url(#SVGID_5_)" opacity="0.6"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -141.776 3075.0667)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-2041.9355" x2="-2041.9355" y1="-2305.2153" y2="-2243.2966">
-<stop offset="0" style="stop-color:#2685D2"/>
-<stop offset="0.5091" style="stop-color:#081D45"/>
-<stop offset="1" style="stop-color:#2275BD"/>
+ <stop offset="0" style="stop-color:#2685D2"/>
+ <stop offset="0.5091" style="stop-color:#081D45"/>
+ <stop offset="1" style="stop-color:#2275BD"/>
</linearGradient>
<path d="M2.899,45.012c1.275-2.777,10.299-14.804,18.804-23.31c8.505-8.506,20.532-17.529,23.308-18.803 c0.527-0.241,1.02-0.411,1.493-0.545c-0.511-0.096-1.03-0.19-1.565-0.26c-0.086,0.036-0.163,0.063-0.25,0.102 c-2.818,1.293-14.971,10.397-23.533,18.959C12.595,29.717,3.489,41.869,2.195,44.688c-0.038,0.087-0.063,0.166-0.101,0.25 c0.07,0.535,0.166,1.055,0.259,1.565C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_6_)"/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(1 0 0 1 30 30)">
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
-<path d="M15,29.5C7.004,29.5,0.5,22.996,0.5,15C0.5,7.004,7.004,0.5,15,0.5 c7.995,0,14.5,6.505,14.5,14.5S22.995,29.5,15,29.5L15,29.5z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M15,29.5C7.004,29.5,0.5,22.996,0.5,15C0.5,7.004,7.004,0.5,15,0.5 c7.995,0,14.5,6.505,14.5,14.5S22.995,29.5,15,29.5L15,29.5z" enable-background="new " opacity="0.35"/>
<radialGradient cx="435.2295" cy="910.6348" gradientTransform="matrix(0.618 0 0 0.618 -253.9715 -552.4329)" gradientUnits="userSpaceOnUse" id="SVGID_1__" r="28.704">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#94FFFF"/>
+ <stop offset="0.5" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</radialGradient>
<circle cx="15" cy="15" fill="url(#SVGID_1__)" r="13.464"/>
-<path d="M27.983,14.263c-0.299-5.259-3.704-9.788-8.679-11.54l-0.605,0.1L15.18,2.15 l-4.386,2.615l-0.165,1.102H8.083l1.006,1.71L6.365,9.8l-0.635,2.744l2.25,3.987l2.297-0.469l0.839,0.723l0.655,0.064l0.433,1.691 l-0.571,1.484l2.084,5.332h2.126l2.107-1.701v-0.695l0.557-0.863l0.459-0.236c-0.116,0.18-0.3,0.586-0.3,0.586 c-0.02,0.139,0.299,2.855,1.234,2.643c0.711-0.16,3.248-4.873,3.296-5.322c0.096-0.887-0.387-1.252-0.683-1.391l-0.329-0.156 l-1.515,1.52c-0.162,0.012-0.309,0.039-0.44,0.078v-1.26l1.645-1.605l0.837-2.698l1.275-1.038l-0.28-0.508l0.962-0.926l-0.538-0.979 l0.41,0.049l2.396,5.362l0.49-0.39c-0.015-0.262-0.043-0.521-0.073-0.779L27.983,14.263z M15.161,8.231l-0.2-0.535h1.202 l0.586,1.316h-0.871V8.23L15.161,8.231L15.161,8.231z M19.129,10.882l0.961,1.402l0.064,0.168l-0.984-0.595l-0.234-0.848 L19.129,10.882z M20.573,13.331l0.29,0.29l-0.375,0.084l-0.085-0.104L20.573,13.331z M13.06,3.903l0.611,0.946l-0.694,0.212 l-0.271-0.154L13.06,3.903z" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M27.983,14.263c-0.299-5.259-3.704-9.788-8.679-11.54l-0.605,0.1L15.18,2.15 l-4.386,2.615l-0.165,1.102H8.083l1.006,1.71L6.365,9.8l-0.635,2.744l2.25,3.987l2.297-0.469l0.839,0.723l0.655,0.064l0.433,1.691 l-0.571,1.484l2.084,5.332h2.126l2.107-1.701v-0.695l0.557-0.863l0.459-0.236c-0.116,0.18-0.3,0.586-0.3,0.586 c-0.02,0.139,0.299,2.855,1.234,2.643c0.711-0.16,3.248-4.873,3.296-5.322c0.096-0.887-0.387-1.252-0.683-1.391l-0.329-0.156 l-1.515,1.52c-0.162,0.012-0.309,0.039-0.44,0.078v-1.26l1.645-1.605l0.837-2.698l1.275-1.038l-0.28-0.508l0.962-0.926l-0.538-0.979 l0.41,0.049l2.396,5.362l0.49-0.39c-0.015-0.262-0.043-0.521-0.073-0.779L27.983,14.263z M15.161,8.231l-0.2-0.535h1.202 l0.586,1.316h-0.871V8.23L15.161,8.231L15.161,8.231z M19.129,10.882l0.961,1.402l0.064,0.168l-0.984-0.595l-0.234-0.848 L19.129,10.882z M20.573,13.331l0.29,0.29l-0.375,0.084l-0.085-0.104L20.573,13.331z M13.06,3.903l0.611,0.946l-0.694,0.212 l-0.271-0.154L13.06,3.903z" enable-background="new " opacity="0.3"/>
<linearGradient gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="333.1904" x2="333.1904" y1="416.6045" y2="431.9054">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#C8E4EB"/>
+ <stop offset="0" style="stop-color:#31A7F8"/>
+ <stop offset="0.497" style="stop-color:#1E74DC"/>
+ <stop offset="1" style="stop-color:#C8E4EB"/>
</linearGradient>
-<path d="M15,1.536C7.564,1.536,1.536,7.565,1.536,15 c0,7.439,6.029,13.464,13.464,13.464c7.438,0,13.465-6.027,13.465-13.464C28.465,7.565,22.438,1.536,15,1.536z M15,27.428 C8.146,27.428,2.571,21.854,2.571,15C2.571,8.147,8.146,2.571,15,2.571S27.428,8.147,27.428,15 C27.428,21.854,21.854,27.428,15,27.428z" fill="url(#SVGID_2__)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M15,1.536C7.564,1.536,1.536,7.565,1.536,15 c0,7.439,6.029,13.464,13.464,13.464c7.438,0,13.465-6.027,13.465-13.464C28.465,7.565,22.438,1.536,15,1.536z M15,27.428 C8.146,27.428,2.571,21.854,2.571,15C2.571,8.147,8.146,2.571,15,2.571S27.428,8.147,27.428,15 C27.428,21.854,21.854,27.428,15,27.428z" enable-background="new " fill="url(#SVGID_2__)" opacity="0.3"/>
<radialGradient cx="333.6309" cy="418.627" gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_3__" r="9.0429">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+ <stop offset="0" style="stop-color:#94FF26"/>
+ <stop offset="0.3152" style="stop-color:#94FF26"/>
+ <stop offset="0.7273" style="stop-color:#1FC211"/>
+ <stop offset="1" style="stop-color:#0BA133"/>
</radialGradient>
<path d="M22.296,18.848l-1.401,1.402c0,0-0.848,0-0.887,0.336c-0.02,0.145-0.065,0.771-0.208,1.094 c-0.282,0.195-0.619,0.842-0.619,0.842s-0.175,1.25,0.761,1.037C20.871,23.35,23.734,19.523,22.296,18.848z" fill="url(#SVGID_3__)"/>
<radialGradient cx="333.6299" cy="418.6211" gradientTransform="matrix(1.7647 0 0 1.7647 -572.9794 -733.5799)" gradientUnits="userSpaceOnUse" id="SVGID_4__" r="10.4663">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+ <stop offset="0" style="stop-color:#94FF26"/>
+ <stop offset="0.3152" style="stop-color:#94FF26"/>
+ <stop offset="0.7273" style="stop-color:#1FC211"/>
+ <stop offset="1" style="stop-color:#0BA133"/>
</radialGradient>
<path d="M19.132,3.213c-0.23,0.087-0.387,0.146-0.387,0.146l-3.463-0.663L13.583,3.76l0.894,1.383 l-1.563,0.48l-0.842-0.48l0.296-0.84l-1.098,0.76l-0.196,1.324H8.988L9.759,7.7l-2.932,2.39l-0.552,2.387l1.088,2.107L8.018,15 l2.297-0.469l0.839,0.721l0.763,0.074l0.83,3.246l-0.552,1.436l1.22,2.697l0.343,1.119h2.126l1.202-0.65l0.905-1.053V20.85 l1.724-0.881v-1.885l0.681-1.297l1.521-1.366l0.363-1.585l-1.988,0.443l-0.522-0.637l0.371-0.594l-1.411-0.854l-0.601-2.164 l1.042-0.68l0.96,1.402l0.359,0.922l0.722,0.721l0.842,0.44l0.936-0.151l1.039-1l-0.731-1.334l-0.921,0.24l-0.833-0.991l0.791-0.552 l2.482,0.301v0.883l2.161,4.452l0.491-0.393C27.176,9.158,23.783,4.849,19.132,3.213z M18.004,9.23l-1.134,0.3h-1.511V8.749h-1.443 L12.774,9.05l-1.741-0.482l-0.482-0.901l2.404-0.541h2.406L15,6.164h1.202l0.67,1.503l1.134,0.398V9.23H18.004z M20.589,7.247 l-2.044-0.361V6.165l1.022-0.24l0.3-0.36l0.722,0.6V7.247L20.589,7.247z" fill="url(#SVGID_4__)"/>
</g>
<g>
+<defs>
+</defs>
<polygon fill="none" points="30.096,0 0.096,0 0.096,14.833 0,14.833 0.096,14.933 0.096,30 14.601,30 15.021,30.438 15.447,30 30.096,30 30.096,14.963 30.215,14.841 30.096,14.841 "/>
-<polygon fill-opacity="0.35" points="0,14.833 3.596,14.828 3.625,14.859 8.375,14.859 8.375,0 21.73,0.001 21.73,14.843 30.215,14.841 15.021,30.438 " stroke-opacity="0.35"/>
+<polygon opacity="0.35" points="0,14.833 3.596,14.828 3.625,14.859 8.375,14.859 8.375,0 21.73,0.001 21.73,14.843 30.215,14.841 15.021,30.438 "/>
<linearGradient gradientTransform="matrix(1 1.000000e-004 1.000000e-004 -1 2191.3389 2985.8491)" gradientUnits="userSpaceOnUse" id="SVGID_1___" x1="-2176.5142" x2="-2176.5142" y1="2984.646" y2="2957.3247">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+ <stop offset="0" style="stop-color:#C6FF45"/>
+ <stop offset="0.7273" style="stop-color:#66A00E"/>
+ <stop offset="1" style="stop-color:#387300"/>
</linearGradient>
<polygon fill="url(#SVGID_1___)" points="2.846,15.859 15.025,28.575 27.398,15.845 20.732,15.843 20.727,1.292 9.375,1.291 9.375,15.859 "/>
<line fill="none" x1="20.727" x2="9.375" y1="1.297" y2="1.296"/>
@@ -84,10 +88,10 @@
<polygon fill="#E7FFB9" points="20.555,15.867 27.527,15.867 27,16.458 20.555,16.458 "/>
<polygon fill="#E7FFB9" points="2.459,15.859 9.365,15.859 9.365,16.451 3.08,16.451 "/>
<linearGradient gradientTransform="matrix(1 1.000000e-004 1.000000e-004 -1 2191.3389 2985.8491)" gradientUnits="userSpaceOnUse" id="SVGID_2___" x1="-2165.6621" x2="-2187.9482" y1="2963.2173" y2="2963.2173">
-<stop offset="0" style="stop-color:#AAE535"/>
-<stop offset="1" style="stop-color:#5D9C0A"/>
+ <stop offset="0" style="stop-color:#AAE535"/>
+ <stop offset="1" style="stop-color:#5D9C0A"/>
</linearGradient>
<polygon fill="url(#SVGID_2___)" points="27.016,15.844 15.025,28.15 3.172,15.829 2.348,15.83 15.025,29 27.842,15.844 "/>
<rect fill="none" height="30" width="30" x="0.096"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_waiting_call.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_waiting_call.svg Fri May 14 16:09:54 2010 +0300
@@ -1,41 +1,41 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
-<stop offset="0.297" style="stop-color:#FFC144"/>
-<stop offset="0.6667" style="stop-color:#EF6902"/>
-<stop offset="0.7939" style="stop-color:#FEB037"/>
-<stop offset="1" style="stop-color:#FEB037"/>
+ <stop offset="0.297" style="stop-color:#FFC144"/>
+ <stop offset="0.6667" style="stop-color:#EF6902"/>
+ <stop offset="0.7939" style="stop-color:#FEB037"/>
</radialGradient>
<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.259-1.333c-0.616-0.665-2.566-3.083-2.968-3.735 c-0.353-0.575-0.411-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956c6.191-6.192,9.084-7.646,9.955-8.107 c0.76-0.4,1.037-0.345,1.711,0.035c0.666,0.377,3.068,2.352,3.734,2.967c0.535,0.492,0.873,0.588,1.301,0.274 c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.523-1.778c-2.477-2.889-8.594-5.015-10.75-5.399 c-1.924-0.345-3.877-0.872-6.568,0.235c-2.559,1.054-13.074,8.536-21.11,16.572C11.203,27.277,3.723,37.795,2.668,40.352 c-1.107,2.691-0.58,4.645-0.236,6.567c0.387,2.158,2.511,8.275,5.4,10.752c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.853,42.705,20.37,41.951z" fill="url(#SVGID_1_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -564.6201 2940.3716)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-1639.3418" x2="-1638.9102" y1="-2494.9819" y2="-2491.4063">
-<stop offset="0" style="stop-color:#E17B15"/>
-<stop offset="1" style="stop-color:#B05004"/>
+ <stop offset="0" style="stop-color:#E17B15"/>
+ <stop offset="1" style="stop-color:#B05004"/>
</linearGradient>
<path d="M35.172,17.108c0.76-0.4,1.037-0.345,1.711,0.035c0.666,0.377,3.068,2.352,3.734,2.967 c0.535,0.492,0.873,0.588,1.301,0.274c0.047-0.035,0.063-0.046,0.064-0.046c0.252-0.184,1.031-0.738,2.119-1.514 c-0.252-0.204-3.469-2.809-4.801-2.956C36.857,15.598,35.172,17.108,35.172,17.108z" fill="url(#SVGID_2_)"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 0.7071 -0.7071 -1696.8304 4072.5859)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1639.3462" x2="-1638.9143" y1="4063.0557" y2="4066.6326">
-<stop offset="0" style="stop-color:#E17B15"/>
-<stop offset="1" style="stop-color:#B05004"/>
+ <stop offset="0" style="stop-color:#E17B15"/>
+ <stop offset="1" style="stop-color:#B05004"/>
</linearGradient>
<path d="M17.093,35.188c-0.401,0.763-0.347,1.039,0.034,1.713c0.376,0.666,2.352,3.069,2.967,3.738 c0.493,0.531,0.587,0.869,0.274,1.297c-0.034,0.048-0.046,0.063-0.046,0.063c-0.183,0.253-0.738,1.032-1.515,2.119 c-0.203-0.252-2.807-3.467-2.956-4.799C15.579,36.875,17.093,35.188,17.093,35.188z" fill="url(#SVGID_3_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="48.4072" x2="4.0833" y1="3.4473" y2="47.7712">
-<stop offset="0" style="stop-color:#FFD06E"/>
-<stop offset="1" style="stop-color:#FAB56E"/>
+ <stop offset="0" style="stop-color:#FFD06E"/>
+ <stop offset="1" style="stop-color:#FAB56E"/>
</linearGradient>
-<path d="M2.979,47.467c-0.345-1.925-0.873-3.878,0.235-6.567 c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.34,4.269,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236 c1.98,0.354,7.297,2.178,10.07,4.711c-2.553-2.815-8.496-4.879-10.617-5.258c-1.924-0.345-3.877-0.872-6.568,0.235 c-2.559,1.054-13.074,8.536-21.11,16.572C11.203,27.277,3.723,37.795,2.668,40.352c-1.107,2.691-0.58,4.645-0.236,6.567 c0.379,2.122,2.441,8.065,5.259,10.617C5.155,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M2.979,47.467c-0.345-1.925-0.873-3.878,0.235-6.567 c1.054-2.559,8.535-13.075,16.573-21.112C27.825,11.749,38.34,4.269,40.9,3.215c2.689-1.108,4.643-0.581,6.566-0.236 c1.98,0.354,7.297,2.178,10.07,4.711c-2.553-2.815-8.496-4.879-10.617-5.258c-1.924-0.345-3.877-0.872-6.568,0.235 c-2.559,1.054-13.074,8.536-21.11,16.572C11.203,27.277,3.723,37.795,2.668,40.352c-1.107,2.691-0.58,4.645-0.236,6.567 c0.379,2.122,2.441,8.065,5.259,10.617C5.155,54.763,3.333,49.448,2.979,47.467z" fill="url(#SVGID_4_)" opacity="0.5"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="53.9023" x2="3.4732" y1="3.6543" y2="54.0835">
-<stop offset="0" style="stop-color:#FFD06E"/>
-<stop offset="1" style="stop-color:#FAB56E"/>
+ <stop offset="0" style="stop-color:#FFD06E"/>
+ <stop offset="1" style="stop-color:#FAB56E"/>
</linearGradient>
-<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.259-1.333 c-0.616-0.665-2.566-3.083-2.968-3.735c-0.353-0.575-0.411-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956 c6.191-6.192,9.084-7.646,9.955-8.107c0.76-0.4,1.037-0.345,1.711,0.035c0.666,0.377,3.068,2.352,3.734,2.967 c0.535,0.492,0.873,0.588,1.301,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.523-1.778 c-0.291-0.339-0.635-0.665-1.012-0.982c0.488,0.657,0.197,1.134-0.607,1.666c-1.4,0.933-14.475,10.225-15.227,10.775 c-0.43,0.314-0.768,0.219-1.299-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.949-0.436-1.711-0.034 c-0.869,0.46-3.763,1.914-9.954,8.106c-6.193,6.192-7.636,9.092-8.108,9.956c-0.378,0.69-0.319,1.135,0.036,1.711 c0.4,0.651,2.351,3.069,2.967,3.736c0.492,0.533,0.559,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195 c-0.534,0.803-1.009,1.098-1.665,0.606c0.314,0.378,0.643,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.853,42.705,20.37,41.951z" fill="url(#SVGID_5_)" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M20.37,41.951c0.299-0.437,0.233-0.799-0.259-1.333 c-0.616-0.665-2.566-3.083-2.968-3.735c-0.353-0.575-0.411-1.021-0.034-1.711c0.473-0.864,1.915-3.763,8.107-9.956 c6.191-6.192,9.084-7.646,9.955-8.107c0.76-0.4,1.037-0.345,1.711,0.035c0.666,0.377,3.068,2.352,3.734,2.967 c0.535,0.492,0.873,0.588,1.301,0.274c0.752-0.551,13.828-9.843,15.229-10.775c0.85-0.564,1.141-1.061,0.523-1.778 c-0.291-0.339-0.635-0.665-1.012-0.982c0.488,0.657,0.197,1.134-0.607,1.666c-1.4,0.933-14.475,10.225-15.227,10.775 c-0.43,0.314-0.768,0.219-1.299-0.273c-0.668-0.616-3.07-2.591-3.738-2.968c-0.672-0.38-0.949-0.436-1.711-0.034 c-0.869,0.46-3.763,1.914-9.954,8.106c-6.193,6.192-7.636,9.092-8.108,9.956c-0.378,0.69-0.319,1.135,0.036,1.711 c0.4,0.651,2.351,3.069,2.967,3.736c0.492,0.533,0.559,0.896,0.259,1.332c-0.518,0.755-9.828,13.794-10.76,15.195 c-0.534,0.803-1.009,1.098-1.665,0.606c0.314,0.378,0.643,0.723,0.981,1.013c0.718,0.615,1.213,0.323,1.777-0.525 C10.542,55.745,19.853,42.705,20.37,41.951z" fill="url(#SVGID_5_)" opacity="0.5"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -608.1406 2931.3247)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-1610.521" x2="-1610.521" y1="-2533.3467" y2="-2471.428">
-<stop offset="0" style="stop-color:#CF8122"/>
-<stop offset="0.5" style="stop-color:#8C4105"/>
-<stop offset="1" style="stop-color:#CF8122"/>
+ <stop offset="0" style="stop-color:#CF8122"/>
+ <stop offset="0.5" style="stop-color:#8C4105"/>
+ <stop offset="1" style="stop-color:#CF8122"/>
</linearGradient>
-<path d="M2.899,45.012c1.275-2.777,10.299-14.804,18.804-23.31 c8.506-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26 c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.533,18.959S3.489,41.869,2.195,44.688 c-0.038,0.087-0.063,0.166-0.101,0.251c0.07,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_6_)" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M2.899,45.012c1.275-2.777,10.299-14.804,18.804-23.31 c8.506-8.506,20.531-17.529,23.309-18.803c0.527-0.241,1.02-0.411,1.492-0.545c-0.512-0.096-1.031-0.19-1.566-0.26 c-0.086,0.036-0.162,0.063-0.248,0.102c-2.818,1.293-14.972,10.397-23.533,18.959S3.489,41.869,2.195,44.688 c-0.038,0.087-0.063,0.166-0.101,0.251c0.07,0.534,0.165,1.054,0.259,1.564C2.489,46.03,2.658,45.539,2.899,45.012z" fill="url(#SVGID_6_)" opacity="0.5"/>
<rect fill="none" height="60" width="60"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_warning.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_warning.svg Fri May 14 16:09:54 2010 +0300
@@ -1,33 +1,34 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+ <stop offset="0" style="stop-color:#FEF4CE"/>
+ <stop offset="1" style="stop-color:#FFC501"/>
</linearGradient>
<polygon fill="url(#SVGID_1_)" points="2,54.248 30,5.752 58,54.248 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="29.9995" x2="29.9995" y1="8.3774" y2="52.771">
-<stop offset="0" style="stop-color:#FEE16E"/>
-<stop offset="0.1394" style="stop-color:#FEE16E"/>
-<stop offset="0.7879" style="stop-color:#F6A800"/>
-<stop offset="1" style="stop-color:#FED43A"/>
+ <stop offset="0.1394" style="stop-color:#FEE16E"/>
+ <stop offset="0.7879" style="stop-color:#F6A800"/>
+ <stop offset="1" style="stop-color:#FED43A"/>
</linearGradient>
<polygon fill="url(#SVGID_2_)" points="4.564,52.768 30,8.713 55.436,52.768 "/>
-<rect fill-opacity="0.1" height="18.612" stroke-opacity="0.1" width="5.91" x="26.86" y="22.119"/>
-<circle cx="29.815" cy="46.689" fill-opacity="0.1" r="3.242" stroke-opacity="0.1"/>
-<rect fill-opacity="0.2" height="18.612" stroke-opacity="0.2" width="5.91" x="26.86" y="21.511"/>
-<circle cx="29.815" cy="46.08" fill-opacity="0.2" r="3.242" stroke-opacity="0.2"/>
+<rect height="18.612" opacity="0.1" width="5.91" x="26.86" y="22.119"/>
+<circle cx="29.815" cy="46.689" opacity="0.1" r="3.242"/>
+<rect height="18.612" opacity="0.2" width="5.91" x="26.86" y="21.511"/>
+<circle cx="29.815" cy="46.08" opacity="0.2" r="3.242"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="29.8145" x2="29.8145" y1="20.8052" y2="48.7668">
-<stop offset="0" style="stop-color:#666666"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#666666"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
<rect fill="url(#SVGID_3_)" height="18.612" width="5.91" x="26.86" y="20.902"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="29.8145" x2="29.8145" y1="42.1816" y2="48.7683">
-<stop offset="0" style="stop-color:#666666"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#666666"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
<circle cx="29.815" cy="45.475" fill="url(#SVGID_4_)" r="3.242"/>
<rect fill="none" height="60" width="60"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_web_feeds.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_web_feeds.svg Fri May 14 16:09:54 2010 +0300
@@ -1,23 +1,25 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -346.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="287.9697" x2="336.3918" y1="-351.5146" y2="-399.9242">
-<stop offset="0" style="stop-color:#DF4F20"/>
-<stop offset="0.5" style="stop-color:#F48228"/>
-<stop offset="1" style="stop-color:#CF3A21"/>
+ <stop offset="0" style="stop-color:#DF4F20"/>
+ <stop offset="0.5" style="stop-color:#F48228"/>
+ <stop offset="1" style="stop-color:#CF3A21"/>
</linearGradient>
<path d="M8.211,55.314c-1.943,0-3.524-1.582-3.524-3.524V8.212c0-1.945,1.581-3.526,3.524-3.526h43.578 c1.944,0,3.526,1.581,3.526,3.526V51.79c0,1.942-1.582,3.524-3.526,3.524H8.211z" fill="url(#SVGID_1_)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -346.0195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="312.4805" x2="312.4805" y1="-348.7539" y2="-403.0745">
-<stop offset="0" style="stop-color:#C5422B"/>
-<stop offset="0.5" style="stop-color:#F48228"/>
-<stop offset="1" style="stop-color:#AD1B00"/>
+ <stop offset="0" style="stop-color:#C5422B"/>
+ <stop offset="0.5" style="stop-color:#F48228"/>
+ <stop offset="1" style="stop-color:#AD1B00"/>
</linearGradient>
<path d="M51.904,3.857c2.338,0,4.238,1.901,4.238,4.236v43.814c0,2.336-1.9,4.234-4.238,4.234H8.093 c-2.335,0-4.236-1.901-4.236-4.234V8.093c0-2.335,1.902-4.236,4.236-4.236H51.904 M51.904,2.999H8.093 c-2.812,0-5.092,2.282-5.092,5.094v43.814c0,2.81,2.28,5.095,5.092,5.095h43.812c2.815,0,5.097-2.285,5.097-5.095V8.093 C57.001,5.281,54.72,2.999,51.904,2.999L51.904,2.999z" fill="url(#SVGID_2_)"/>
<circle cx="16.742" cy="43.259" fill="#FFFFFF" r="5.208"/>
<path d="M41.524,47.889h6.942c0-20.047-16.309-36.354-36.355-36.354v6.942C28.33,18.476,41.524,31.671,41.524,47.889 z" fill="#FFFFFF"/>
<path d="M28.892,47.889h6.943c0-13.082-10.642-23.721-23.722-23.721v6.942 C21.364,31.108,28.892,38.636,28.892,47.889z" fill="#FFFFFF"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_widget.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_widget.svg Fri May 14 16:09:54 2010 +0300
@@ -1,96 +1,88 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
-<stop offset="0.3576" style="stop-color:#F2C352"/>
-<stop offset="0.8909" style="stop-color:#DE7600"/>
-<stop offset="1" style="stop-color:#E79A26"/>
+ <stop offset="0.3576" style="stop-color:#F2C352"/>
+ <stop offset="0.8909" style="stop-color:#DE7600"/>
+ <stop offset="1" style="stop-color:#E79A26"/>
</linearGradient>
<polygon fill="url(#SVGID_1_)" points="16.246,25.604 7.274,30.295 9.009,20.321 1.775,13.238 11.796,11.81 16.299,2.737 20.758,11.826 30.772,13.307 23.507,20.355 25.195,30.336 "/>
<radialGradient cx="-111.4019" cy="-59.6338" gradientTransform="matrix(0.972 0.0144 -0.0144 0.972 123.6391 66.2654)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="23.7106">
-<stop offset="0" style="stop-color:#FEE16E"/>
-<stop offset="0.1394" style="stop-color:#FEE16E"/>
-<stop offset="0.5515" style="stop-color:#FFC501"/>
-<stop offset="0.7273" style="stop-color:#F6A800"/>
-<stop offset="1" style="stop-color:#FED43A"/>
+ <stop offset="0.1394" style="stop-color:#FEE16E"/>
+ <stop offset="0.5515" style="stop-color:#FFC501"/>
+ <stop offset="0.7273" style="stop-color:#F6A800"/>
+ <stop offset="1" style="stop-color:#FED43A"/>
</radialGradient>
<polygon fill="url(#SVGID_2_)" points="9.787,20.071 3.331,13.748 12.277,12.471 16.294,4.375 20.273,12.488 29.212,13.81 22.727,20.1 24.235,29.008 16.246,24.785 8.239,28.973 "/>
<radialGradient cx="-111.1436" cy="-41.29" gradientTransform="matrix(0.972 0.0144 -0.0144 0.972 123.6391 66.2654)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="8.4911">
-<stop offset="0" style="stop-color:#FED95A"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+ <stop offset="0" style="stop-color:#FED95A"/>
+ <stop offset="1" style="stop-color:#FFC501"/>
</radialGradient>
<polygon fill="url(#SVGID_3_)" points="16.259,24.059 8.378,28.182 8.239,28.973 16.246,24.785 24.235,29.008 24.1,28.206 "/>
<radialGradient cx="-111.1377" cy="-56.7529" gradientTransform="matrix(0.972 0.0144 -0.0144 0.972 123.6391 66.2654)" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="32.9523">
-<stop offset="0" style="stop-color:#FEF4CE"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+ <stop offset="0" style="stop-color:#FEF4CE"/>
+ <stop offset="1" style="stop-color:#FFC501"/>
</radialGradient>
<polygon fill="url(#SVGID_4_)" points="12.629,13.199 16.273,5.825 19.9,13.209 28.561,14.442 29.212,13.81 20.273,12.488 16.294,4.375 12.277,12.471 3.331,13.748 3.981,14.384 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="16.2739" x2="16.2739" y1="31.8535" y2="56.5747">
-<stop offset="0" style="stop-color:#E9F0F2"/>
-<stop offset="0.0424" style="stop-color:#E9F0F2"/>
-<stop offset="0.3152" style="stop-color:#BDC2C4"/>
-<stop offset="0.6727" style="stop-color:#949DA1"/>
-<stop offset="1" style="stop-color:#98A1A4"/>
+ <stop offset="0.0424" style="stop-color:#E9F0F2"/>
+ <stop offset="0.3152" style="stop-color:#BDC2C4"/>
+ <stop offset="0.6727" style="stop-color:#949DA1"/>
+ <stop offset="1" style="stop-color:#98A1A4"/>
</linearGradient>
<path d="M26.754,31.854H5.795c-0.891,0-1.613,0.721-1.613,1.611v20.961c0,0.889,0.722,1.611,1.613,1.611 h20.959c0.89,0,1.612-0.723,1.612-1.611V33.465C28.366,32.574,27.644,31.854,26.754,31.854z" fill="url(#SVGID_5_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="43.6836" x2="43.6836" y1="31.8535" y2="56.5747">
-<stop offset="0" style="stop-color:#E9F0F2"/>
-<stop offset="0.0424" style="stop-color:#E9F0F2"/>
-<stop offset="0.3152" style="stop-color:#BDC2C4"/>
-<stop offset="0.6727" style="stop-color:#949DA1"/>
-<stop offset="1" style="stop-color:#98A1A4"/>
+ <stop offset="0.0424" style="stop-color:#E9F0F2"/>
+ <stop offset="0.3152" style="stop-color:#BDC2C4"/>
+ <stop offset="0.6727" style="stop-color:#949DA1"/>
+ <stop offset="1" style="stop-color:#98A1A4"/>
</linearGradient>
<path d="M54.163,31.854H33.204c-0.891,0-1.613,0.721-1.613,1.611v20.961c0,0.889,0.723,1.611,1.613,1.611 h20.959c0.891,0,1.613-0.723,1.613-1.611V33.465C55.776,32.574,55.054,31.854,54.163,31.854z" fill="url(#SVGID_6_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="43.6836" x2="43.6836" y1="4.4453" y2="29.167">
-<stop offset="0" style="stop-color:#E9F0F2"/>
-<stop offset="0.0424" style="stop-color:#E9F0F2"/>
-<stop offset="0.3152" style="stop-color:#BDC2C4"/>
-<stop offset="0.6727" style="stop-color:#949DA1"/>
-<stop offset="1" style="stop-color:#98A1A4"/>
+ <stop offset="0.0424" style="stop-color:#E9F0F2"/>
+ <stop offset="0.3152" style="stop-color:#BDC2C4"/>
+ <stop offset="0.6727" style="stop-color:#949DA1"/>
+ <stop offset="1" style="stop-color:#98A1A4"/>
</linearGradient>
<path d="M54.163,4.445H33.204c-0.891,0-1.613,0.721-1.613,1.611v20.959c0,0.893,0.723,1.613,1.613,1.613 h20.959c0.891,0,1.613-0.721,1.613-1.613V6.057C55.776,5.166,55.054,4.445,54.163,4.445z" fill="url(#SVGID_7_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="16.2739" x2="16.2739" y1="31.8535" y2="56.0371">
-<stop offset="0" style="stop-color:#E9F0F2"/>
-<stop offset="0.0424" style="stop-color:#E9F0F2"/>
-<stop offset="0.7455" style="stop-color:#98A1A4"/>
-<stop offset="1" style="stop-color:#98A1A4"/>
+ <stop offset="0.0424" style="stop-color:#E9F0F2"/>
+ <stop offset="0.7455" style="stop-color:#98A1A4"/>
</linearGradient>
<path d="M28.366,54.426c0,0.889-0.723,1.611-1.612,1.611H5.795c-0.891,0-1.613-0.723-1.613-1.611V33.465 c0-0.891,0.722-1.611,1.613-1.611h20.959c0.89,0,1.612,0.721,1.612,1.611V54.426z" fill="url(#SVGID_8_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="16.2739" x2="16.2739" y1="31.8535" y2="56.0371">
-<stop offset="0" style="stop-color:#F6FDFF"/>
-<stop offset="0.3152" style="stop-color:#D1D7D9"/>
-<stop offset="0.6727" style="stop-color:#949DA1"/>
-<stop offset="1" style="stop-color:#B7C3C7"/>
+ <stop offset="0" style="stop-color:#F6FDFF"/>
+ <stop offset="0.3152" style="stop-color:#D1D7D9"/>
+ <stop offset="0.6727" style="stop-color:#949DA1"/>
+ <stop offset="1" style="stop-color:#B7C3C7"/>
</linearGradient>
<path d="M26.754,31.854H5.795c-0.891,0-1.613,0.721-1.613,1.611v20.961c0,0.889,0.722,1.611,1.613,1.611 h20.959c0.89,0,1.612-0.723,1.612-1.611V33.465C28.366,32.574,27.644,31.854,26.754,31.854z M27.561,54.426 c0,0.443-0.363,0.807-0.807,0.807H5.795c-0.445,0-0.807-0.363-0.807-0.807V33.465c0-0.443,0.362-0.805,0.807-0.805h20.959 c0.444,0,0.807,0.361,0.807,0.805V54.426z" fill="url(#SVGID_9_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="43.6836" x2="43.6836" y1="31.8535" y2="56.0371">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="0.5818" style="stop-color:#1B66D8"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#36B5FF"/>
+ <stop offset="0.5818" style="stop-color:#1B66D8"/>
</linearGradient>
<path d="M55.776,54.426c0,0.889-0.723,1.611-1.613,1.611H33.204c-0.891,0-1.613-0.723-1.613-1.611V33.465 c0-0.891,0.723-1.611,1.613-1.611h20.959c0.891,0,1.613,0.721,1.613,1.611V54.426z" fill="url(#SVGID_10_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="43.6836" x2="43.6836" y1="31.8535" y2="57.1121">
-<stop offset="0" style="stop-color:#36DBFF"/>
-<stop offset="0.7394" style="stop-color:#12428C"/>
-<stop offset="1" style="stop-color:#2AA9D9"/>
+ <stop offset="0" style="stop-color:#36DBFF"/>
+ <stop offset="0.7394" style="stop-color:#12428C"/>
+ <stop offset="1" style="stop-color:#2AA9D9"/>
</linearGradient>
<path d="M54.163,31.854H33.204c-0.891,0-1.613,0.721-1.613,1.611v20.961c0,0.889,0.723,1.611,1.613,1.611 h20.959c0.891,0,1.613-0.723,1.613-1.611V33.465C55.776,32.574,55.054,31.854,54.163,31.854z M54.97,54.426 c0,0.443-0.363,0.807-0.807,0.807H33.204c-0.445,0-0.807-0.363-0.807-0.807V33.465c0-0.443,0.361-0.805,0.807-0.805h20.959 c0.443,0,0.807,0.361,0.807,0.805V54.426z" fill="url(#SVGID_11_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="43.6836" x2="43.6836" y1="4.4453" y2="29.167">
-<stop offset="0" style="stop-color:#E9F0F2"/>
-<stop offset="0.0424" style="stop-color:#E9F0F2"/>
-<stop offset="0.7455" style="stop-color:#98A1A4"/>
-<stop offset="1" style="stop-color:#98A1A4"/>
+ <stop offset="0.0424" style="stop-color:#E9F0F2"/>
+ <stop offset="0.7455" style="stop-color:#98A1A4"/>
</linearGradient>
<path d="M55.776,27.016c0,0.893-0.723,1.613-1.613,1.613H33.204c-0.891,0-1.613-0.721-1.613-1.613V6.057 c0-0.891,0.723-1.611,1.613-1.611h20.959c0.891,0,1.613,0.721,1.613,1.611V27.016z" fill="url(#SVGID_12_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="43.6836" x2="43.6836" y1="4.4453" y2="29.167">
-<stop offset="0" style="stop-color:#F6FDFF"/>
-<stop offset="0.3152" style="stop-color:#D1D7D9"/>
-<stop offset="0.6727" style="stop-color:#949DA1"/>
-<stop offset="1" style="stop-color:#B7C3C7"/>
+ <stop offset="0" style="stop-color:#F6FDFF"/>
+ <stop offset="0.3152" style="stop-color:#D1D7D9"/>
+ <stop offset="0.6727" style="stop-color:#949DA1"/>
+ <stop offset="1" style="stop-color:#B7C3C7"/>
</linearGradient>
<path d="M54.163,4.445H33.204c-0.891,0-1.613,0.721-1.613,1.611v20.959c0,0.893,0.723,1.613,1.613,1.613 h20.959c0.891,0,1.613-0.721,1.613-1.613V6.057C55.776,5.166,55.054,4.445,54.163,4.445z M54.97,27.016 c0,0.443-0.363,0.807-0.807,0.807H33.204c-0.445,0-0.807-0.363-0.807-0.807V6.057c0-0.443,0.361-0.805,0.807-0.805h20.959 c0.443,0,0.807,0.361,0.807,0.805V27.016z" fill="url(#SVGID_13_)"/>
<rect fill="none" height="60" width="60.001"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_wire_connect.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,89 @@
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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"/>
+
+<stop offset="0.7939" stop-color="#080808"/>
+
+<stop offset="1" stop-color="#585858"/>
+
+</linearGradient>
+<path d="M12.21,58c-0.875,0-1.592-0.717-1.592-1.593l-1.599-12.65c0-0.876,0.684-1.814,1.518-2.085l10.38-3.372c0.834-0.271,2.232-0.492,3.107-0.492h11.94c0.875,0,2.273,0.222,3.107,0.492l10.38,3.372c0.832,0.271,1.514,1.209,1.514,2.085l-1.592,12.64c0,0.876-0.717,1.593-1.594,1.593h-35.59z" fill="url(#SVGID_1_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="30" x2="30" y1="38.61" y2="56.99">
+
+<stop offset="0" stop-color="#4D4D4D"/>
+
+<stop offset="1" stop-color="#1A1A1A"/>
+
+</linearGradient>
+<path d="M12.21,57.2c-0.438,0-0.795-0.357-0.795-0.796l-1.602-12.64c0-0.532,0.461-1.164,0.965-1.328l10.37-3.367c0.771-0.249,2.084-0.457,2.877-0.457h11.94c0.793,0,2.104,0.208,2.861,0.454l10.4,3.376c0.488,0.158,0.949,0.79,0.949,1.322l-1.594,12.64c0,0.438-0.357,0.796-0.797,0.796h-35.59z" fill="url(#SVGID_2_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="30" x2="30" y1="40.2" y2="55.43">
+
+<stop offset="0" stop-color="#707070"/>
+
+<stop offset="1" stop-color="#323232"/>
+
+</linearGradient>
+<path d="M13,55.61l-1.59-11.7,10.2-3.314c0.639-0.207,1.783-0.392,2.418-0.392h11.94c0.635,0,1.764,0.179,2.369,0.376l10.25,3.332-1.592,11.7h-34.01z" fill="url(#SVGID_3_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="25.52" x2="34.48" y1="8.511" y2="8.511">
+
+<stop offset="0" stop-color="#A8B1B3"/>
+
+<stop offset="0.3818" stop-color="#FFFFFF"/>
+
+<stop offset="0.7091" stop-color="#686E70"/>
+
+<stop offset="1" stop-color="#A6B0B3"/>
+
+</linearGradient>
+<polygon fill="url(#SVGID_4_)" points="30.48,2,29.45,2,25.52,5.596,25.52,15.02,34.48,15.02,34.48,5.596"/>
+<polygon fill="#FFFFFF" fill-opacity="0.6" points="30.48,2,29.45,2,25.52,5.596,25.52,6.391,29.45,2.796,30.48,2.796,34.48,6.391,34.48,5.596" stroke-opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="24.82" x2="35.18" y1="26.08" y2="26.08">
+
+<stop offset="0" stop-color="#A8B1B3"/>
+
+<stop offset="0.3818" stop-color="#FFFFFF"/>
+
+<stop offset="0.7091" stop-color="#686E70"/>
+
+<stop offset="1" stop-color="#A6B0B3"/>
+
+</linearGradient>
+<rect fill="url(#SVGID_5_)" height="23.46" width="10.35" x="24.82" y="14.35"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="24.82" x2="35.18" y1="22.17" y2="22.17">
+
+<stop offset="0" stop-color="#4D4D4D"/>
+
+<stop offset="0.3818" stop-color="#7A7A7A"/>
+
+<stop offset="0.7091" stop-color="#1A1A1A"/>
+
+<stop offset="1" stop-color="#4D4D4D"/>
+
+</linearGradient>
+<rect fill="url(#SVGID_6_)" height="4.777" width="10.35" x="24.82" y="19.78"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="24.82" x2="35.18" y1="29.07" y2="29.07">
+
+<stop offset="0" stop-color="#4D4D4D"/>
+
+<stop offset="0.3818" stop-color="#7A7A7A"/>
+
+<stop offset="0.7091" stop-color="#1A1A1A"/>
+
+<stop offset="1" stop-color="#4D4D4D"/>
+
+</linearGradient>
+<rect fill="url(#SVGID_7_)" height="2.388" width="10.35" x="24.82" y="27.88"/>
+<rect fill="#FFFFFF" fill-opacity="0.3" height="0.797" stroke-opacity="0.3" width="10.35" x="24.82" y="30.27"/>
+<rect fill-opacity="0.3" height="0.796" stroke-opacity="0.3" width="10.35" x="24.82" y="36.98"/>
+<rect fill-opacity="0.15" height="0.796" stroke-opacity="0.15" width="10.35" x="24.82" y="36.19"/>
+<rect fill="#FFFFFF" fill-opacity="0.3" height="0.796" stroke-opacity="0.3" width="10.35" x="24.82" y="24.56"/>
+<rect fill="#FFFFFF" fill-opacity="0.6" height="0.797" stroke-opacity="0.6" width="10.35" x="24.82" y="14.35"/>
+<rect fill="#FFFFFF" fill-opacity="0.15" height="0.797" stroke-opacity="0.15" width="10.35" x="24.82" y="15.95"/>
+<rect fill="#FFFFFF" fill-opacity="0.3" height="0.796" stroke-opacity="0.3" width="10.35" x="24.82" y="15.15"/>
+<rect fill="none" height="60" width="60"/>
+</g>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_wlan.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_wlan.svg Fri May 14 16:09:54 2010 +0300
@@ -1,73 +1,74 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<stop offset="0" style="stop-color:#DBDBDB"/>
-<stop offset="0.097" style="stop-color:#DBDBDB"/>
-<stop offset="0.6848" style="stop-color:#919191"/>
-<stop offset="1" style="stop-color:#B8B8B8"/>
+ <stop offset="0.097" style="stop-color:#DBDBDB"/>
+ <stop offset="0.6848" style="stop-color:#919191"/>
+ <stop offset="1" style="stop-color:#B8B8B8"/>
</linearGradient>
<path d="M37.109,51.521H22.957l3.86-36.345c0-1.776,1.44-3.216,3.216-3.216l0,0 c1.776,0,3.216,1.439,3.216,3.216L37.109,51.521z" fill="url(#SVGID_1_)"/>
-<polygon fill-opacity="0.2" points="23.212,48.949 36.854,48.949 36.726,47.662 23.34,47.662 " stroke-opacity="0.2"/>
-<polygon fill-opacity="0.1" points="23.34,47.662 36.726,47.662 36.599,46.375 23.467,46.375 " stroke-opacity="0.1"/>
-<polygon fill-opacity="0.3" points="23.083,50.235 36.982,50.235 36.854,48.949 23.212,48.949 " stroke-opacity="0.3"/>
+<polygon opacity="0.2" points="23.212,48.949 36.854,48.949 36.726,47.662 23.34,47.662 "/>
+<polygon opacity="0.1" points="23.34,47.662 36.726,47.662 36.599,46.375 23.467,46.375 "/>
+<polygon opacity="0.3" points="23.083,50.235 36.982,50.235 36.854,48.949 23.212,48.949 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="11.4971" x2="48.7082" y1="54.1401" y2="54.1401">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="1" style="stop-color:#919191"/>
+ <stop offset="0" style="stop-color:#F2F2F2"/>
+ <stop offset="1" style="stop-color:#919191"/>
</linearGradient>
<path d="M48.688,58v-3.859c0-2.133-1.729-3.86-3.859-3.86H15.237c-2.131,0-3.859,1.728-3.859,3.86V58H48.688z " fill="url(#SVGID_2_)"/>
-<path d="M44.828,50.28H15.237c-2.131,0-3.859,1.728-3.859,3.86v1.286c0-2.132,1.729-3.86,3.859-3.86 h29.591c2.131,0,3.859,1.729,3.859,3.86v-1.286C48.688,52.008,46.959,50.28,44.828,50.28z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M44.828,50.28H15.237c-2.131,0-3.859,1.728-3.859,3.86v1.286c0-2.132,1.729-3.86,3.859-3.86 h29.591c2.131,0,3.859,1.729,3.859,3.86v-1.286C48.688,52.008,46.959,50.28,44.828,50.28z" fill="#FFFFFF" opacity="0.5"/>
<linearGradient gradientTransform="matrix(-0.7071 -0.7071 -0.7071 0.7071 1644.7402 729.6548)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="1671.6611" x2="1651.5664" y1="642.4497" y2="662.2676">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+ <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.31,2l4.156,4.152c-5.422,5.422-5.42,14.244,0,19.665l-4.154,4.155 C1.601,22.258,1.601,9.711,9.31,2z" fill="url(#SVGID_3_)"/>
<linearGradient gradientTransform="matrix(-0.7071 -0.7071 -0.7071 0.7071 1644.7402 729.6548)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="1664.2842" x2="1644.192" y1="634.9834" y2="654.7988">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+ <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="M18.738,7.264l4.153,4.152c-2.52,2.52-2.52,6.617,0,9.136l-4.153,4.153 C13.928,19.898,13.928,12.074,18.738,7.264z" fill="url(#SVGID_4_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="8.5073" x2="8.5073" y1="29.6333" y2="-3.0658">
-<stop offset="0" style="stop-color:#AAE535"/>
-<stop offset="1" style="stop-color:#5D9C0A"/>
+ <stop offset="0" style="stop-color:#AAE535"/>
+ <stop offset="1" style="stop-color:#5D9C0A"/>
</linearGradient>
<path d="M9.312,28.686c-3.692-3.693-5.597-8.497-5.753-13.344C3.388,20.618,5.293,25.95,9.312,29.973 l4.154-4.155c-0.217-0.218-0.411-0.448-0.61-0.677L9.312,28.686z" fill="url(#SVGID_5_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="19.0176" x2="19.0176" y1="24.7275" y2="9.0601">
-<stop offset="0" style="stop-color:#AAE535"/>
-<stop offset="1" style="stop-color:#5D9C0A"/>
+ <stop offset="0" style="stop-color:#AAE535"/>
+ <stop offset="1" style="stop-color:#5D9C0A"/>
</linearGradient>
<path d="M18.738,23.419c-2.242-2.24-3.424-5.136-3.577-8.077c-0.174,3.369,1.009,6.797,3.577,9.363 l4.153-4.153c-0.22-0.22-0.397-0.466-0.578-0.708L18.738,23.419z" fill="url(#SVGID_6_)"/>
<path d="M9.31,3.286l3.546,3.542c0.2-0.228,0.393-0.459,0.61-0.676L9.31,2c-4.018,4.02-5.921,9.352-5.75,14.628 C3.715,11.779,5.619,6.979,9.31,3.286z" fill="#FFFFFF"/>
<path d="M18.738,8.551l3.576,3.574c0.181-0.242,0.358-0.487,0.578-0.709l-4.153-4.152 c-2.568,2.568-3.751,5.996-3.577,9.364C15.314,13.688,16.496,10.792,18.738,8.551z" fill="#FFFFFF"/>
<linearGradient gradientTransform="matrix(0.7071 -0.7071 0.7071 0.7071 -1770.332 729.6548)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="1802.8955" x2="1782.8008" y1="773.6841" y2="793.502">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+ <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="M50.69,2l-4.156,4.152c5.422,5.422,5.42,14.244,0,19.665l4.154,4.155 C58.399,22.258,58.399,9.711,50.69,2z" fill="url(#SVGID_7_)"/>
<linearGradient gradientTransform="matrix(0.7071 -0.7071 0.7071 0.7071 -1770.332 729.6548)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="1795.5195" x2="1775.4272" y1="766.2183" y2="786.0338">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+ <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="M41.262,7.264l-4.153,4.152c2.52,2.52,2.52,6.617,0,9.136l4.153,4.153 C46.072,19.898,46.072,12.074,41.262,7.264z" fill="url(#SVGID_8_)"/>
<linearGradient gradientTransform="matrix(-1 0 0 1 -125.5918 0)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="-177.0845" x2="-177.0845" y1="29.6333" y2="-3.0658">
-<stop offset="0" style="stop-color:#AAE535"/>
-<stop offset="1" style="stop-color:#5D9C0A"/>
+ <stop offset="0" style="stop-color:#AAE535"/>
+ <stop offset="1" style="stop-color:#5D9C0A"/>
</linearGradient>
<path d="M50.688,28.686c3.692-3.693,5.597-8.497,5.753-13.344c0.171,5.276-1.734,10.608-5.753,14.631 l-4.154-4.155c0.217-0.218,0.411-0.448,0.61-0.677L50.688,28.686z" fill="url(#SVGID_9_)"/>
<linearGradient gradientTransform="matrix(-1 0 0 1 -125.5918 0)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="-166.5747" x2="-166.5747" y1="24.7275" y2="9.0601">
-<stop offset="0" style="stop-color:#AAE535"/>
-<stop offset="1" style="stop-color:#5D9C0A"/>
+ <stop offset="0" style="stop-color:#AAE535"/>
+ <stop offset="1" style="stop-color:#5D9C0A"/>
</linearGradient>
<path d="M41.262,23.419c2.242-2.24,3.424-5.136,3.577-8.077c0.175,3.369-1.009,6.797-3.577,9.363 l-4.153-4.153c0.22-0.22,0.397-0.466,0.578-0.708L41.262,23.419z" fill="url(#SVGID_10_)"/>
<path d="M50.69,3.286l-3.546,3.542c-0.2-0.228-0.393-0.459-0.61-0.676L50.69,2c4.018,4.02,5.921,9.352,5.75,14.628 C56.285,11.779,54.381,6.979,50.69,3.286z" fill="#FFFFFF"/>
<path d="M41.262,8.551l-3.576,3.574c-0.181-0.242-0.358-0.487-0.578-0.709l4.153-4.152 c2.568,2.568,3.752,5.996,3.577,9.364C44.686,13.688,43.504,10.792,41.262,8.551z" fill="#FFFFFF"/>
-<rect fill-opacity="0.1" height="1.287" stroke-opacity="0.1" width="37.31" x="11.378" y="56.713"/>
+<rect height="1.287" opacity="0.1" width="37.31" x="11.378" y="56.713"/>
<rect fill="none" height="60" width="60"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_wlan_off.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_wlan_off.svg Fri May 14 16:09:54 2010 +0300
@@ -1,84 +1,87 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<stop offset="0" style="stop-color:#DBDBDB"/>
-<stop offset="0.097" style="stop-color:#DBDBDB"/>
-<stop offset="0.6848" style="stop-color:#919191"/>
-<stop offset="1" style="stop-color:#B8B8B8"/>
+ <stop offset="0.097" style="stop-color:#DBDBDB"/>
+ <stop offset="0.6848" style="stop-color:#919191"/>
+ <stop offset="1" style="stop-color:#B8B8B8"/>
</linearGradient>
<path d="M37.109,51.521H22.957l3.86-36.345c0-1.776,1.44-3.216,3.216-3.216l0,0 c1.776,0,3.216,1.439,3.216,3.216L37.109,51.521z" fill="url(#SVGID_1_)"/>
-<polygon fill-opacity="0.2" points="23.212,48.949 36.854,48.949 36.726,47.662 23.34,47.662 " stroke-opacity="0.2"/>
-<polygon fill-opacity="0.1" points="23.34,47.662 36.726,47.662 36.599,46.375 23.467,46.375 " stroke-opacity="0.1"/>
-<polygon fill-opacity="0.3" points="23.083,50.235 36.982,50.235 36.854,48.949 23.212,48.949 " stroke-opacity="0.3"/>
+<polygon opacity="0.2" points="23.212,48.949 36.854,48.949 36.726,47.662 23.34,47.662 "/>
+<polygon opacity="0.1" points="23.34,47.662 36.726,47.662 36.599,46.375 23.467,46.375 "/>
+<polygon opacity="0.3" points="23.083,50.235 36.982,50.235 36.854,48.949 23.212,48.949 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="11.4971" x2="48.7082" y1="54.1401" y2="54.1401">
-<stop offset="0" style="stop-color:#F2F2F2"/>
-<stop offset="1" style="stop-color:#919191"/>
+ <stop offset="0" style="stop-color:#F2F2F2"/>
+ <stop offset="1" style="stop-color:#919191"/>
</linearGradient>
<path d="M48.688,58v-3.859c0-2.133-1.729-3.86-3.859-3.86H15.237c-2.131,0-3.859,1.728-3.859,3.86V58H48.688z " fill="url(#SVGID_2_)"/>
-<path d="M44.828,50.28H15.237c-2.131,0-3.859,1.728-3.859,3.86v1.286c0-2.132,1.729-3.86,3.859-3.86 h29.591c2.131,0,3.859,1.729,3.859,3.86v-1.286C48.688,52.008,46.959,50.28,44.828,50.28z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M44.828,50.28H15.237c-2.131,0-3.859,1.728-3.859,3.86v1.286c0-2.132,1.729-3.86,3.859-3.86 h29.591c2.131,0,3.859,1.729,3.859,3.86v-1.286C48.688,52.008,46.959,50.28,44.828,50.28z" fill="#FFFFFF" opacity="0.5"/>
<linearGradient gradientTransform="matrix(-0.7071 -0.7071 -0.7071 0.7071 1644.7402 729.6548)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="1671.6611" x2="1651.5664" y1="642.4497" y2="662.2676">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+ <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.31,2l4.156,4.152c-5.422,5.422-5.42,14.244,0,19.665l-4.154,4.155 C1.601,22.258,1.601,9.711,9.31,2z" fill="url(#SVGID_3_)"/>
<linearGradient gradientTransform="matrix(-0.7071 -0.7071 -0.7071 0.7071 1644.7402 729.6548)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="1664.2842" x2="1644.192" y1="634.9834" y2="654.7988">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+ <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="M18.738,7.264l4.153,4.152c-2.52,2.52-2.52,6.617,0,9.136l-4.153,4.153 C13.928,19.898,13.928,12.074,18.738,7.264z" fill="url(#SVGID_4_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="8.5073" x2="8.5073" y1="29.6333" y2="-3.0658">
-<stop offset="0" style="stop-color:#AAE535"/>
-<stop offset="1" style="stop-color:#5D9C0A"/>
+ <stop offset="0" style="stop-color:#AAE535"/>
+ <stop offset="1" style="stop-color:#5D9C0A"/>
</linearGradient>
<path d="M9.312,28.686c-3.692-3.693-5.597-8.497-5.753-13.344C3.388,20.618,5.293,25.95,9.312,29.973 l4.154-4.155c-0.217-0.218-0.411-0.448-0.61-0.677L9.312,28.686z" fill="url(#SVGID_5_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="19.0176" x2="19.0176" y1="24.7275" y2="9.0601">
-<stop offset="0" style="stop-color:#AAE535"/>
-<stop offset="1" style="stop-color:#5D9C0A"/>
+ <stop offset="0" style="stop-color:#AAE535"/>
+ <stop offset="1" style="stop-color:#5D9C0A"/>
</linearGradient>
<path d="M18.738,23.419c-2.242-2.24-3.424-5.136-3.577-8.077c-0.174,3.369,1.009,6.797,3.577,9.363 l4.153-4.153c-0.22-0.22-0.397-0.466-0.578-0.708L18.738,23.419z" fill="url(#SVGID_6_)"/>
<path d="M9.31,3.286l3.546,3.542c0.2-0.228,0.393-0.459,0.61-0.676L9.31,2c-4.018,4.02-5.921,9.352-5.75,14.628 C3.715,11.779,5.619,6.979,9.31,3.286z" fill="#FFFFFF"/>
<path d="M18.738,8.551l3.576,3.574c0.181-0.242,0.358-0.487,0.578-0.709l-4.153-4.152 c-2.568,2.568-3.751,5.996-3.577,9.364C15.314,13.688,16.496,10.792,18.738,8.551z" fill="#FFFFFF"/>
<linearGradient gradientTransform="matrix(0.7071 -0.7071 0.7071 0.7071 -1770.332 729.6548)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="1802.8955" x2="1782.8008" y1="773.6841" y2="793.502">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+ <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="M50.69,2l-4.156,4.152c5.422,5.422,5.42,14.244,0,19.665l4.154,4.155 C58.399,22.258,58.399,9.711,50.69,2z" fill="url(#SVGID_7_)"/>
<linearGradient gradientTransform="matrix(0.7071 -0.7071 0.7071 0.7071 -1770.332 729.6548)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="1795.5195" x2="1775.4272" y1="766.2183" y2="786.0338">
-<stop offset="0" style="stop-color:#C6FF45"/>
-<stop offset="0.7273" style="stop-color:#66A00E"/>
-<stop offset="1" style="stop-color:#387300"/>
+ <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="M41.262,7.264l-4.153,4.152c2.52,2.52,2.52,6.617,0,9.136l4.153,4.153 C46.072,19.898,46.072,12.074,41.262,7.264z" fill="url(#SVGID_8_)"/>
<linearGradient gradientTransform="matrix(-1 0 0 1 -125.5918 0)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="-177.0845" x2="-177.0845" y1="29.6333" y2="-3.0658">
-<stop offset="0" style="stop-color:#AAE535"/>
-<stop offset="1" style="stop-color:#5D9C0A"/>
+ <stop offset="0" style="stop-color:#AAE535"/>
+ <stop offset="1" style="stop-color:#5D9C0A"/>
</linearGradient>
<path d="M50.688,28.686c3.692-3.693,5.597-8.497,5.753-13.344c0.171,5.276-1.734,10.608-5.753,14.631 l-4.154-4.155c0.217-0.218,0.411-0.448,0.61-0.677L50.688,28.686z" fill="url(#SVGID_9_)"/>
<linearGradient gradientTransform="matrix(-1 0 0 1 -125.5918 0)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="-166.5747" x2="-166.5747" y1="24.7275" y2="9.0601">
-<stop offset="0" style="stop-color:#AAE535"/>
-<stop offset="1" style="stop-color:#5D9C0A"/>
+ <stop offset="0" style="stop-color:#AAE535"/>
+ <stop offset="1" style="stop-color:#5D9C0A"/>
</linearGradient>
<path d="M41.262,23.419c2.242-2.24,3.424-5.136,3.577-8.077c0.175,3.369-1.009,6.797-3.577,9.363 l-4.153-4.153c0.22-0.22,0.397-0.466,0.578-0.708L41.262,23.419z" fill="url(#SVGID_10_)"/>
<path d="M50.69,3.286l-3.546,3.542c-0.2-0.228-0.393-0.459-0.61-0.676L50.69,2c4.018,4.02,5.921,9.352,5.75,14.628 C56.285,11.779,54.381,6.979,50.69,3.286z" fill="#FFFFFF"/>
<path d="M41.262,8.551l-3.576,3.574c-0.181-0.242-0.358-0.487-0.578-0.709l4.153-4.152 c2.568,2.568,3.752,5.996,3.577,9.364C44.686,13.688,43.504,10.792,41.262,8.551z" fill="#FFFFFF"/>
-<rect fill-opacity="0.1" height="1.287" stroke-opacity="0.1" width="37.31" x="11.378" y="56.713"/>
+<rect height="1.287" opacity="0.1" width="37.31" x="11.378" y="56.713"/>
<rect fill="none" height="60" width="60"/>
</g>
<g transform="matrix(2 0 0 2 0 0)">
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
-<rect fill-opacity="0.35" height="33.866" stroke-opacity="0.35" transform="matrix(-0.6985 0.7156 -0.7156 -0.6985 35.9922 14.2223)" width="3.706" x="13.147" y="-2.239"/>
+<rect height="33.866" opacity="0.35" transform="matrix(-0.6985 0.7156 -0.7156 -0.6985 35.9922 14.2223)" width="3.706" x="13.147" y="-2.239"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -257 670.6689)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="260" x2="284" y1="655.9761" y2="655.9761">
-<stop offset="0" style="stop-color:#FF4D00"/>
-<stop offset="0.8424" style="stop-color:#CC1414"/>
-<stop offset="1" style="stop-color:#FF4D00"/>
+ <stop offset="0" style="stop-color:#FF4D00"/>
+ <stop offset="0.8424" style="stop-color:#CC1414"/>
+ <stop offset="1" style="stop-color:#FF4D00"/>
</linearGradient>
<polygon fill="url(#SVGID_1__)" points="25.809,26.431 3,4.177 4.191,2.956 27,25.21 "/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_zipmgr.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_large_zipmgr.svg Fri May 14 16:09:54 2010 +0300
@@ -1,145 +1,147 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="60" width="60"/>
<rect fill="none" height="60" width="60"/>
<linearGradient gradientTransform="matrix(-1 0 0 1 -1148.998 0)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-1188.8574" x2="-1185.7031" y1="44.1982" y2="44.1982">
-<stop offset="0" style="stop-color:#959A9C"/>
-<stop offset="0.3394" style="stop-color:#5B6163"/>
-<stop offset="0.7394" style="stop-color:#BDC2C4"/>
-<stop offset="1" style="stop-color:#878A8C"/>
+ <stop offset="0" style="stop-color:#959A9C"/>
+ <stop offset="0.3394" style="stop-color:#5B6163"/>
+ <stop offset="0.7394" style="stop-color:#BDC2C4"/>
+ <stop offset="1" style="stop-color:#878A8C"/>
</linearGradient>
<path d="M36.705,55.458c0,0.969,0.705,1.754,1.576,1.754l0,0c0.871,0,1.578-0.785,1.578-1.754V32.937 c0-0.969-0.707-1.752-1.578-1.752l0,0c-0.871,0-1.576,0.784-1.576,1.752V55.458z" fill="url(#SVGID_1_)"/>
<linearGradient gradientTransform="matrix(-1 0 0 1 -1148.998 0)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-1190.4336" x2="-1184.125" y1="50.5068" y2="50.5068">
-<stop offset="0" style="stop-color:#B7BDBF"/>
-<stop offset="0.297" style="stop-color:#8D9699"/>
-<stop offset="0.7333" style="stop-color:#E5EBED"/>
-<stop offset="1" style="stop-color:#B4BDBF"/>
+ <stop offset="0" style="stop-color:#B7BDBF"/>
+ <stop offset="0.297" style="stop-color:#8D9699"/>
+ <stop offset="0.7333" style="stop-color:#E5EBED"/>
+ <stop offset="1" style="stop-color:#B4BDBF"/>
</linearGradient>
<path d="M35.127,50.901c0,0.437,0.352,0.789,0.789,0.789h4.73c0.438,0,0.789-0.353,0.789-0.789v-0.789 c0-0.436-0.352-0.789-0.789-0.789h-4.73c-0.438,0-0.789,0.354-0.789,0.789V50.901z" fill="url(#SVGID_2_)"/>
-<path d="M35.916,49.324h4.73c0.438,0,0.789,0.354,0.789,0.789v0.789c0-0.435-0.352-0.789-0.789-0.789 h-4.73c-0.438,0-0.789,0.354-0.789,0.789v-0.789C35.127,49.677,35.479,49.324,35.916,49.324z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<rect fill-opacity="0.2" height="0.789" stroke-opacity="0.2" width="3.154" x="36.705" y="51.69"/>
+<path d="M35.916,49.324h4.73c0.438,0,0.789,0.354,0.789,0.789v0.789c0-0.435-0.352-0.789-0.789-0.789 h-4.73c-0.438,0-0.789,0.354-0.789,0.789v-0.789C35.127,49.677,35.479,49.324,35.916,49.324z" fill="#FFFFFF" opacity="0.3"/>
+<rect height="0.789" opacity="0.2" width="3.154" x="36.705" y="51.69"/>
<linearGradient gradientTransform="matrix(-1 0 0 1 -1148.998 0)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1190.4336" x2="-1184.125" y1="46.5635" y2="46.5635">
-<stop offset="0" style="stop-color:#B7BDBF"/>
-<stop offset="0.297" style="stop-color:#8D9699"/>
-<stop offset="0.7333" style="stop-color:#E5EBED"/>
-<stop offset="1" style="stop-color:#B4BDBF"/>
+ <stop offset="0" style="stop-color:#B7BDBF"/>
+ <stop offset="0.297" style="stop-color:#8D9699"/>
+ <stop offset="0.7333" style="stop-color:#E5EBED"/>
+ <stop offset="1" style="stop-color:#B4BDBF"/>
</linearGradient>
<path d="M35.127,46.958c0,0.437,0.352,0.789,0.789,0.789h4.73c0.438,0,0.789-0.352,0.789-0.789v-0.789 c0-0.435-0.352-0.788-0.789-0.788h-4.73c-0.438,0-0.789,0.353-0.789,0.788V46.958z" fill="url(#SVGID_3_)"/>
-<path d="M35.916,45.38h4.73c0.438,0,0.789,0.353,0.789,0.788v0.789c0-0.436-0.352-0.789-0.789-0.789h-4.73 c-0.438,0-0.789,0.354-0.789,0.789v-0.789C35.127,45.733,35.479,45.38,35.916,45.38z" fill-opacity="0.3" stroke-opacity="0.3"/>
-<rect fill-opacity="0.2" height="0.789" stroke-opacity="0.2" width="3.154" x="36.705" y="47.746"/>
+<path d="M35.916,45.38h4.73c0.438,0,0.789,0.353,0.789,0.788v0.789c0-0.436-0.352-0.789-0.789-0.789h-4.73 c-0.438,0-0.789,0.354-0.789,0.789v-0.789C35.127,45.733,35.479,45.38,35.916,45.38z" opacity="0.3"/>
+<rect height="0.789" opacity="0.2" width="3.154" x="36.705" y="47.746"/>
<linearGradient gradientTransform="matrix(-1 0 0 1 -1148.998 0)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-1190.4336" x2="-1184.125" y1="39.4648" y2="39.4648">
-<stop offset="0" style="stop-color:#B7BDBF"/>
-<stop offset="0.297" style="stop-color:#8D9699"/>
-<stop offset="0.7333" style="stop-color:#E5EBED"/>
-<stop offset="1" style="stop-color:#B4BDBF"/>
+ <stop offset="0" style="stop-color:#B7BDBF"/>
+ <stop offset="0.297" style="stop-color:#8D9699"/>
+ <stop offset="0.7333" style="stop-color:#E5EBED"/>
+ <stop offset="1" style="stop-color:#B4BDBF"/>
</linearGradient>
<path d="M35.127,39.859c0,0.436,0.352,0.789,0.789,0.789h4.73c0.438,0,0.789-0.354,0.789-0.789v-0.789 c0-0.437-0.352-0.789-0.789-0.789h-4.73c-0.438,0-0.789,0.353-0.789,0.789V39.859z" fill="url(#SVGID_4_)"/>
-<path d="M35.916,38.282h4.73c0.438,0,0.789,0.353,0.789,0.789v0.789c0-0.437-0.352-0.789-0.789-0.789 h-4.73c-0.438,0-0.789,0.352-0.789,0.789v-0.789C35.127,38.634,35.479,38.282,35.916,38.282z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<rect fill-opacity="0.2" height="0.789" stroke-opacity="0.2" width="3.154" x="36.705" y="40.648"/>
+<path d="M35.916,38.282h4.73c0.438,0,0.789,0.353,0.789,0.789v0.789c0-0.437-0.352-0.789-0.789-0.789 h-4.73c-0.438,0-0.789,0.352-0.789,0.789v-0.789C35.127,38.634,35.479,38.282,35.916,38.282z" fill="#FFFFFF" opacity="0.3"/>
+<rect height="0.789" opacity="0.2" width="3.154" x="36.705" y="40.648"/>
<linearGradient gradientTransform="matrix(-1 0 0 1 -1148.998 0)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-1190.4336" x2="-1184.125" y1="35.521" y2="35.521">
-<stop offset="0" style="stop-color:#B7BDBF"/>
-<stop offset="0.297" style="stop-color:#8D9699"/>
-<stop offset="0.7333" style="stop-color:#E5EBED"/>
-<stop offset="1" style="stop-color:#B4BDBF"/>
+ <stop offset="0" style="stop-color:#B7BDBF"/>
+ <stop offset="0.297" style="stop-color:#8D9699"/>
+ <stop offset="0.7333" style="stop-color:#E5EBED"/>
+ <stop offset="1" style="stop-color:#B4BDBF"/>
</linearGradient>
<path d="M35.127,35.916c0,0.437,0.352,0.789,0.789,0.789h4.73c0.438,0,0.789-0.352,0.789-0.789v-0.789 c0-0.435-0.352-0.789-0.789-0.789h-4.73c-0.438,0-0.789,0.354-0.789,0.789V35.916z" fill="url(#SVGID_5_)"/>
-<path d="M35.916,35.916h4.73c0.438,0,0.789-0.353,0.789-0.789v0.789c0,0.437-0.352,0.789-0.789,0.789h-4.73 c-0.438,0-0.789-0.352-0.789-0.789v-0.789C35.127,35.563,35.479,35.916,35.916,35.916z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M35.916,46.958h4.73c0.438,0,0.789-0.353,0.789-0.789v0.789c0,0.437-0.352,0.789-0.789,0.789h-4.73 c-0.438,0-0.789-0.352-0.789-0.789v-0.789C35.127,46.605,35.479,46.958,35.916,46.958z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M35.916,50.901h4.73c0.438,0,0.789-0.352,0.789-0.789v0.789c0,0.437-0.352,0.789-0.789,0.789h-4.73 c-0.438,0-0.789-0.353-0.789-0.789v-0.789C35.127,50.549,35.479,50.901,35.916,50.901z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M35.916,34.338h4.73c0.438,0,0.789,0.354,0.789,0.789v0.789c0-0.436-0.352-0.789-0.789-0.789 h-4.73c-0.438,0-0.789,0.354-0.789,0.789v-0.789C35.127,34.691,35.479,34.338,35.916,34.338z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<rect fill-opacity="0.2" height="0.789" stroke-opacity="0.2" width="3.154" x="36.705" y="36.704"/>
+<path d="M35.916,35.916h4.73c0.438,0,0.789-0.353,0.789-0.789v0.789c0,0.437-0.352,0.789-0.789,0.789h-4.73 c-0.438,0-0.789-0.352-0.789-0.789v-0.789C35.127,35.563,35.479,35.916,35.916,35.916z" opacity="0.2"/>
+<path d="M35.916,46.958h4.73c0.438,0,0.789-0.353,0.789-0.789v0.789c0,0.437-0.352,0.789-0.789,0.789h-4.73 c-0.438,0-0.789-0.352-0.789-0.789v-0.789C35.127,46.605,35.479,46.958,35.916,46.958z" opacity="0.2"/>
+<path d="M35.916,50.901h4.73c0.438,0,0.789-0.352,0.789-0.789v0.789c0,0.437-0.352,0.789-0.789,0.789h-4.73 c-0.438,0-0.789-0.353-0.789-0.789v-0.789C35.127,50.549,35.479,50.901,35.916,50.901z" opacity="0.2"/>
+<path d="M35.916,34.338h4.73c0.438,0,0.789,0.354,0.789,0.789v0.789c0-0.436-0.352-0.789-0.789-0.789 h-4.73c-0.438,0-0.789,0.354-0.789,0.789v-0.789C35.127,34.691,35.479,34.338,35.916,34.338z" fill="#FFFFFF" opacity="0.3"/>
+<rect height="0.789" opacity="0.2" width="3.154" x="36.705" y="36.704"/>
<linearGradient gradientTransform="matrix(-1 0 0 1 -1148.998 0)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="-1196.7441" x2="-1177.8145" y1="31.5776" y2="31.5776">
-<stop offset="0" style="stop-color:#959A9C"/>
-<stop offset="0.3394" style="stop-color:#5B6163"/>
-<stop offset="0.7394" style="stop-color:#BDC2C4"/>
-<stop offset="1" style="stop-color:#878A8C"/>
+ <stop offset="0" style="stop-color:#959A9C"/>
+ <stop offset="0.3394" style="stop-color:#5B6163"/>
+ <stop offset="0.7394" style="stop-color:#BDC2C4"/>
+ <stop offset="1" style="stop-color:#878A8C"/>
</linearGradient>
<path d="M47.746,31.184c0,0.871-0.707,1.576-1.576,1.576H30.395c-0.871,0-1.578-0.706-1.578-1.576v-0.789 h18.93V31.184z" fill="url(#SVGID_6_)"/>
<linearGradient gradientTransform="matrix(-1 0 0 1 -1148.998 0)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="-1203.8418" x2="-1170.7168" y1="26.8457" y2="26.8457">
-<stop offset="0" style="stop-color:#67AD1A"/>
-<stop offset="0.2606" style="stop-color:#358C0C"/>
-<stop offset="1" style="stop-color:#AFED23"/>
+ <stop offset="0" style="stop-color:#67AD1A"/>
+ <stop offset="0.2606" style="stop-color:#358C0C"/>
+ <stop offset="1" style="stop-color:#AFED23"/>
</linearGradient>
<path d="M21.719,28.817c0,0.871,0.705,1.578,1.578,1.578h29.971c0.871,0,1.576-0.707,1.576-1.578v-3.944 c0-0.871-0.705-1.578-1.576-1.578H23.297c-0.873,0-1.578,0.707-1.578,1.578V28.817z" fill="url(#SVGID_7_)"/>
-<path d="M23.297,29.606h29.971c0.871,0,1.576-0.707,1.576-1.578v0.789c0,0.871-0.705,1.578-1.576,1.578H23.297 c-0.873,0-1.578-0.707-1.578-1.578v-0.789C21.719,28.899,22.424,29.606,23.297,29.606z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M23.297,23.296h29.971c0.871,0,1.576,0.707,1.576,1.578v0.789 c0-0.871-0.705-1.578-1.576-1.578H23.297c-0.873,0-1.578,0.707-1.578,1.578v-0.789C21.719,24.003,22.424,23.296,23.297,23.296z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M23.297,29.606h29.971c0.871,0,1.576-0.707,1.576-1.578v0.789c0,0.871-0.705,1.578-1.576,1.578H23.297 c-0.873,0-1.578-0.707-1.578-1.578v-0.789C21.719,28.899,22.424,29.606,23.297,29.606z" opacity="0.2"/>
+<path d="M23.297,23.296h29.971c0.871,0,1.576,0.707,1.576,1.578v0.789 c0-0.871-0.705-1.578-1.576-1.578H23.297c-0.873,0-1.578,0.707-1.578,1.578v-0.789C21.719,24.003,22.424,23.296,23.297,23.296z" fill="#FFFFFF" opacity="0.5"/>
<linearGradient gradientTransform="matrix(-1 0 0 1 -1148.998 0)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="-1203.8418" x2="-1170.7168" y1="19.7471" y2="19.7471">
-<stop offset="0" style="stop-color:#FFC501"/>
-<stop offset="0.2545" style="stop-color:#F6A800"/>
-<stop offset="1" style="stop-color:#FEEFA7"/>
+ <stop offset="0" style="stop-color:#FFC501"/>
+ <stop offset="0.2545" style="stop-color:#F6A800"/>
+ <stop offset="1" style="stop-color:#FEEFA7"/>
</linearGradient>
<path d="M21.719,21.718c0,0.872,0.705,1.578,1.578,1.578h29.971c0.871,0,1.576-0.706,1.576-1.578v-3.943 c0-0.872-0.705-1.578-1.576-1.578H23.297c-0.873,0-1.578,0.706-1.578,1.578V21.718z" fill="url(#SVGID_8_)"/>
-<path d="M23.297,22.507h29.971c0.871,0,1.576-0.706,1.576-1.578v0.789c0,0.872-0.705,1.578-1.576,1.578H23.297 c-0.873,0-1.578-0.706-1.578-1.578v-0.789C21.719,21.801,22.424,22.507,23.297,22.507z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M23.297,16.198h29.971c0.871,0,1.576,0.706,1.576,1.578v0.789 c0-0.872-0.705-1.578-1.576-1.578H23.297c-0.873,0-1.578,0.706-1.578,1.578v-0.789C21.719,16.904,22.424,16.198,23.297,16.198z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M23.297,22.507h29.971c0.871,0,1.576-0.706,1.576-1.578v0.789c0,0.872-0.705,1.578-1.576,1.578H23.297 c-0.873,0-1.578-0.706-1.578-1.578v-0.789C21.719,21.801,22.424,22.507,23.297,22.507z" opacity="0.2"/>
+<path d="M23.297,16.198h29.971c0.871,0,1.576,0.706,1.576,1.578v0.789 c0-0.872-0.705-1.578-1.576-1.578H23.297c-0.873,0-1.578,0.706-1.578,1.578v-0.789C21.719,16.904,22.424,16.198,23.297,16.198z" fill="#FFFFFF" opacity="0.5"/>
<linearGradient gradientTransform="matrix(-1 0 0 1 -1148.998 0)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="-1203.8418" x2="-1170.7168" y1="12.6484" y2="12.6484">
-<stop offset="0" style="stop-color:#E8522A"/>
-<stop offset="0.2061" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#FF7236"/>
+ <stop offset="0" style="stop-color:#E8522A"/>
+ <stop offset="0.2061" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#FF7236"/>
</linearGradient>
<path d="M21.719,14.62c0,0.871,0.705,1.578,1.578,1.578h29.971c0.871,0,1.576-0.707,1.576-1.578v-3.944 c0-0.871-0.705-1.578-1.576-1.578H23.297c-0.873,0-1.578,0.707-1.578,1.578V14.62z" fill="url(#SVGID_9_)"/>
-<path d="M23.297,15.409h29.971c0.871,0,1.576-0.707,1.576-1.578v0.789c0,0.871-0.705,1.578-1.576,1.578H23.297 c-0.873,0-1.578-0.707-1.578-1.578v-0.789C21.719,14.702,22.424,15.409,23.297,15.409z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M23.297,9.099h29.971c0.871,0,1.576,0.707,1.576,1.578v0.789c0-0.871-0.705-1.578-1.576-1.578 H23.297c-0.873,0-1.578,0.707-1.578,1.578v-0.789C21.719,9.806,22.424,9.099,23.297,9.099z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M23.297,15.409h29.971c0.871,0,1.576-0.707,1.576-1.578v0.789c0,0.871-0.705,1.578-1.576,1.578H23.297 c-0.873,0-1.578-0.707-1.578-1.578v-0.789C21.719,14.702,22.424,15.409,23.297,15.409z" opacity="0.2"/>
+<path d="M23.297,9.099h29.971c0.871,0,1.576,0.707,1.576,1.578v0.789c0-0.871-0.705-1.578-1.576-1.578 H23.297c-0.873,0-1.578,0.707-1.578,1.578v-0.789C21.719,9.806,22.424,9.099,23.297,9.099z" fill="#FFFFFF" opacity="0.5"/>
<linearGradient gradientTransform="matrix(-1 0 0 1 -1148.998 0)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="-1195.9551" x2="-1178.3573" y1="55.6343" y2="55.6343">
-<stop offset="0" style="stop-color:#959A9C"/>
-<stop offset="0.3394" style="stop-color:#5B6163"/>
-<stop offset="0.7394" style="stop-color:#BDC2C4"/>
-<stop offset="1" style="stop-color:#878A8C"/>
+ <stop offset="0" style="stop-color:#959A9C"/>
+ <stop offset="0.3394" style="stop-color:#5B6163"/>
+ <stop offset="0.7394" style="stop-color:#BDC2C4"/>
+ <stop offset="1" style="stop-color:#878A8C"/>
</linearGradient>
<path d="M29.605,56.423c0,0.871,0.705,1.578,1.578,1.578h14.197c0.869,0,1.576-0.707,1.576-1.578v-1.578 c0-0.872-0.707-1.577-1.576-1.577H31.184c-0.873,0-1.578,0.706-1.578,1.577V56.423z" fill="url(#SVGID_10_)"/>
-<path d="M31.184,57.212h14.197c0.869,0,1.576-0.708,1.576-1.578v0.789c0,0.871-0.707,1.578-1.576,1.578H31.184 c-0.873,0-1.578-0.707-1.578-1.578v-0.789C29.605,56.504,30.311,57.212,31.184,57.212z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M31.184,53.268h14.197c0.869,0,1.576,0.706,1.576,1.577v0.789 c0-0.872-0.707-1.578-1.576-1.578H31.184c-0.873,0-1.578,0.706-1.578,1.578v-0.789C29.605,53.974,30.311,53.268,31.184,53.268z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M31.184,57.212h14.197c0.869,0,1.576-0.708,1.576-1.578v0.789c0,0.871-0.707,1.578-1.576,1.578H31.184 c-0.873,0-1.578-0.707-1.578-1.578v-0.789C29.605,56.504,30.311,57.212,31.184,57.212z" opacity="0.2"/>
+<path d="M31.184,53.268h14.197c0.869,0,1.576,0.706,1.576,1.577v0.789 c0-0.872-0.707-1.578-1.576-1.578H31.184c-0.873,0-1.578,0.706-1.578,1.578v-0.789C29.605,53.974,30.311,53.268,31.184,53.268z" fill="#FFFFFF" opacity="0.3"/>
<linearGradient gradientTransform="matrix(-1 0 0 1 -1148.998 0)" gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="-1176.2363" x2="-1176.2363" y1="38.8081" y2="45.1177">
-<stop offset="0" style="stop-color:#B6B6B6"/>
-<stop offset="0.4727" style="stop-color:#949D9D"/>
-<stop offset="0.8909" style="stop-color:#464B4D"/>
-<stop offset="1" style="stop-color:#676D6E"/>
+ <stop offset="0" style="stop-color:#B6B6B6"/>
+ <stop offset="0.4727" style="stop-color:#949D9D"/>
+ <stop offset="0.8909" style="stop-color:#464B4D"/>
+ <stop offset="1" style="stop-color:#676D6E"/>
</linearGradient>
<path d="M5.154,43.804c0,0.87,0.707,1.577,1.578,1.577h41.014c0.871,0,1.576-0.707,1.576-1.577v-3.155 c0-0.873-0.705-1.578-1.576-1.578H6.732C5.861,39.071,5.154,43.804,5.154,43.804z" fill="url(#SVGID_11_)"/>
<linearGradient gradientTransform="matrix(-1 0 0 1 -1148.998 0)" gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="-1176.2363" x2="-1176.2363" y1="38.8081" y2="45.1177">
-<stop offset="0" style="stop-color:#E0E0E0"/>
-<stop offset="0.4727" style="stop-color:#ABB5B5"/>
-<stop offset="0.8909" style="stop-color:#464B4D"/>
-<stop offset="1" style="stop-color:#676D6E"/>
+ <stop offset="0" style="stop-color:#E0E0E0"/>
+ <stop offset="0.4727" style="stop-color:#ABB5B5"/>
+ <stop offset="0.8909" style="stop-color:#464B4D"/>
+ <stop offset="1" style="stop-color:#676D6E"/>
</linearGradient>
<path d="M5.154,43.804c0,0.87,0.707,1.577,1.578,1.577h41.014c0.871,0,1.576-0.707,1.576-1.577v-3.155 c0-0.873-0.705-1.578-1.576-1.578H6.732C5.861,39.071,5.154,43.804,5.154,43.804z M5.943,40.648c0-0.434,0.354-0.789,0.789-0.789 h41.014c0.436,0,0.789,0.355,0.789,0.789v3.155c0,0.434-0.354,0.789-0.789,0.789H6.732c-0.436,0-0.789-0.355-0.789-0.789V40.648z" fill="url(#SVGID_12_)"/>
<linearGradient gradientTransform="matrix(-1 0 0 1 -1148.998 0)" gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="-1177.8145" x2="-1177.8145" y1="2.0005" y2="8.3101">
-<stop offset="0" style="stop-color:#D9D9D9"/>
-<stop offset="0.4727" style="stop-color:#AFBABA"/>
-<stop offset="0.8909" style="stop-color:#646B6E"/>
-<stop offset="1" style="stop-color:#757C7D"/>
+ <stop offset="0" style="stop-color:#D9D9D9"/>
+ <stop offset="0.4727" style="stop-color:#AFBABA"/>
+ <stop offset="0.8909" style="stop-color:#646B6E"/>
+ <stop offset="1" style="stop-color:#757C7D"/>
</linearGradient>
<path d="M6.732,8.31H50.9c0.871,0,1.578-0.706,1.578-1.577V3.578C52.479,2.707,51.771,2,50.9,2H6.732 C5.861,2,5.154,2.707,5.154,3.578C5.154,3.578,5.861,8.31,6.732,8.31z" fill="url(#SVGID_13_)"/>
<linearGradient gradientTransform="matrix(-1 0 0 1 -1148.998 0)" gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="-1177.8145" x2="-1177.8145" y1="2.0005" y2="8.3101">
-<stop offset="0" style="stop-color:#F5F5F5"/>
-<stop offset="0.4727" style="stop-color:#D0DEDE"/>
-<stop offset="0.8909" style="stop-color:#646B6E"/>
-<stop offset="1" style="stop-color:#757C7D"/>
+ <stop offset="0" style="stop-color:#F5F5F5"/>
+ <stop offset="0.4727" style="stop-color:#D0DEDE"/>
+ <stop offset="0.8909" style="stop-color:#646B6E"/>
+ <stop offset="1" style="stop-color:#757C7D"/>
</linearGradient>
<path d="M5.154,3.578c0,0,0.707,4.732,1.578,4.732H50.9c0.871,0,1.578-0.706,1.578-1.577V3.578 C52.479,2.707,51.771,2,50.9,2H6.732C5.861,2,5.154,2.707,5.154,3.578z M5.943,3.578c0-0.435,0.354-0.789,0.789-0.789H50.9 c0.436,0,0.789,0.354,0.789,0.789v3.155c0,0.434-0.354,0.788-0.789,0.788H6.732C6.297,7.521,5.943,3.578,5.943,3.578z" fill="url(#SVGID_14_)"/>
<linearGradient gradientTransform="matrix(-1 0 0 1 -1148.998 0)" gradientUnits="userSpaceOnUse" id="SVGID_15_" x1="-1160.0684" x2="-1160.0684" y1="2.0005" y2="45.4">
-<stop offset="0" style="stop-color:#DAE0E3"/>
-<stop offset="0.5273" style="stop-color:#8C9A9B"/>
-<stop offset="1" style="stop-color:#292F36"/>
+ <stop offset="0" style="stop-color:#DAE0E3"/>
+ <stop offset="0.5273" style="stop-color:#8C9A9B"/>
+ <stop offset="1" style="stop-color:#292F36"/>
</linearGradient>
<path d="M5.775,2.332L16.986,8.31v30.761L5.775,45.049c-0.375-0.288-0.621-0.736-0.621-1.245V3.578 C5.154,3.067,5.4,2.62,5.775,2.332z" fill="url(#SVGID_15_)"/>
<linearGradient gradientTransform="matrix(-1 0 0 1 -1148.998 0)" gradientUnits="userSpaceOnUse" id="SVGID_16_" x1="-1154.9414" x2="-1154.9414" y1="2.2153" y2="45.1406">
-<stop offset="0" style="stop-color:#EBF2F5"/>
-<stop offset="0.2545" style="stop-color:#C8D0D2"/>
-<stop offset="0.5273" style="stop-color:#A1B1B3"/>
-<stop offset="1" style="stop-color:#292F36"/>
+ <stop offset="0" style="stop-color:#EBF2F5"/>
+ <stop offset="0.2545" style="stop-color:#C8D0D2"/>
+ <stop offset="0.5273" style="stop-color:#A1B1B3"/>
+ <stop offset="1" style="stop-color:#292F36"/>
</linearGradient>
<path d="M5.775,2.332l0.957,0.509V44.54l-0.957,0.509c-0.375-0.288-0.621-0.736-0.621-1.245V3.578 C5.154,3.067,5.4,2.62,5.775,2.332z" fill="url(#SVGID_16_)"/>
<linearGradient gradientTransform="matrix(-1 0 0 1 -1148.998 0)" gradientUnits="userSpaceOnUse" id="SVGID_17_" x1="-1164.0117" x2="-1164.0117" y1="1.7437" y2="45.7098">
-<stop offset="0" style="stop-color:#B5BABD"/>
-<stop offset="0.5273" style="stop-color:#758182"/>
-<stop offset="1" style="stop-color:#292F36"/>
+ <stop offset="0" style="stop-color:#B5BABD"/>
+ <stop offset="0.5273" style="stop-color:#758182"/>
+ <stop offset="1" style="stop-color:#292F36"/>
</linearGradient>
<polygon fill="url(#SVGID_17_)" points="13.041,6.208 16.986,8.31 16.986,39.071 13.041,41.173 "/>
-<path d="M16.986,39.071L5.775,45.049c-0.338-0.26-0.563-0.655-0.604-1.104C5.232,44.097,16.986,39.071,16.986,39.071z " fill-opacity="0.1" stroke-opacity="0.1"/>
-<path d="M5.172,3.436c0.041-0.449,0.266-0.844,0.604-1.104L16.986,8.31 C16.986,8.31,5.232,3.284,5.172,3.436z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<rect fill-opacity="0.2" height="0.789" stroke-opacity="0.2" width="18.93" x="28.816" y="30.395"/>
-<rect fill-opacity="0.2" height="0.788" stroke-opacity="0.2" width="3.154" x="36.705" y="32.76"/>
+<path d="M16.986,39.071L5.775,45.049c-0.338-0.26-0.563-0.655-0.604-1.104C5.232,44.097,16.986,39.071,16.986,39.071z " opacity="0.1"/>
+<path d="M5.172,3.436c0.041-0.449,0.266-0.844,0.604-1.104L16.986,8.31 C16.986,8.31,5.232,3.284,5.172,3.436z" fill="#FFFFFF" opacity="0.3"/>
+<rect height="0.789" opacity="0.2" width="18.93" x="28.816" y="30.395"/>
+<rect height="0.788" opacity="0.2" width="3.154" x="36.705" y="32.76"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_0_3mp.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_0_3mp.svg Fri May 14 16:09:54 2010 +0300
@@ -1,12 +1,21 @@
-<?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" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
+<?xml version="1.0" ?>
+<!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" 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 opacity="0.5">
+
<rect fill="none" height="30" width="30" x="0.002"/>
+
</g>
+
<path d="M1,3v24h28v-24h-28zm25,21h-22v-18h22v18z"/>
+
<path d="M7.488,11.28c0.752,0,1.32,0.267,1.705,0.801,0.383,0.534,0.576,1.477,0.576,2.827,0,1.481-0.195,2.485-0.584,3.016-0.389,0.528-0.963,0.793-1.721,0.793-0.664,0-1.166-0.176-1.504-0.526-0.34-0.353-0.561-0.797-0.662-1.334-0.104-0.537-0.154-1.187-0.154-1.947,0-1.325,0.197-2.261,0.592-2.808,0.393-0.54,0.979-0.82,1.752-0.82zm-0.033,6.63c0.332,0,0.574-0.187,0.729-0.56,0.156-0.373,0.232-1.187,0.232-2.438,0-1.204-0.08-1.975-0.238-2.313-0.16-0.336-0.4-0.505-0.723-0.505-0.293,0-0.51,0.117-0.648,0.352-0.137,0.234-0.225,0.54-0.258,0.918-0.035,0.378-0.051,0.894-0.051,1.548,0,1.289,0.076,2.11,0.229,2.466,0.154,0.34,0.396,0.52,0.728,0.52z"/>
+
<path d="M11.42,18.72c-0.215,0-0.398-0.075-0.553-0.229-0.152-0.153-0.229-0.335-0.229-0.548,0-0.215,0.074-0.396,0.227-0.547,0.15-0.148,0.336-0.225,0.555-0.225,0.215,0,0.396,0.075,0.549,0.225,0.15,0.149,0.227,0.332,0.227,0.547,0,0.216-0.076,0.397-0.227,0.551-0.15,0.16-0.33,0.24-0.55,0.24z"/>
+
<path d="M13.78,14.38c0.957,0,1.555-0.098,1.793-0.293,0.236-0.195,0.354-0.495,0.354-0.898,0-0.354-0.096-0.622-0.284-0.801-0.191-0.179-0.476-0.269-0.853-0.269-0.332,0-0.799,0.083-1.402,0.249h-0.01v-0.859c0.613-0.153,1.166-0.229,1.66-0.229,0.746,0,1.307,0.149,1.68,0.449,0.375,0.3,0.563,0.749,0.563,1.348,0,0.413-0.113,0.769-0.338,1.067-0.226,0.297-0.547,0.508-0.967,0.632,0.457,0.081,0.805,0.272,1.047,0.573,0.244,0.301,0.365,0.678,0.365,1.131,0,0.744-0.22,1.305-0.652,1.678-0.437,0.372-1.086,0.559-1.956,0.559-0.521,0-1.055-0.076-1.602-0.229v-0.85h0.01c0.637,0.158,1.141,0.238,1.508,0.238,0.443,0,0.775-0.111,0.999-0.334,0.225-0.225,0.336-0.559,0.336-1.004,0-0.479-0.135-0.822-0.4-1.03-0.268-0.208-0.885-0.313-1.852-0.313v-0.828z"/>
+
<path d="M24.86,11.36v7.28h-1.328v-5.04l-1.373,2.617h-0.561l-1.38-2.62v5.039h-1.334v-7.28h1.123l1.871,3.56,1.869-3.56h1.107z"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_12mp.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_12mp.svg Fri May 14 16:09:54 2010 +0300
@@ -1,11 +1,19 @@
-<?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" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
+<?xml version="1.0" ?>
+<!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" 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 opacity="0.5">
+
<rect fill="none" height="30" width="30" x="0.001"/>
+
</g>
+
<path d="M0.999,3v24h28v-24h-28zm25,21h-22v-18h22v18z"/>
+
<path d="M10.74,17.9v0.781h-4.31v-0.781h1.533v-5.448l-1.529,0.35v-0.781l2.152-0.679h0.709v6.559h1.449v-0.004z"/>
+
<path d="M16.18,17.83v0.851h-4.354v-0.533c0-0.508,0.088-0.959,0.264-1.353s0.393-0.729,0.65-1.008c0.256-0.279,0.582-0.584,0.977-0.916,0.471-0.397,0.77-0.705,0.893-0.923,0.125-0.218,0.186-0.435,0.186-0.649,0-0.378-0.1-0.662-0.301-0.852-0.199-0.191-0.5-0.286-0.9-0.286-0.422,0-0.936,0.109-1.537,0.327h-0.01v-0.869c0.631-0.198,1.246-0.298,1.846-0.298,0.738,0,1.301,0.162,1.684,0.485,0.385,0.324,0.576,0.802,0.576,1.434,0,0.354-0.087,0.704-0.259,1.047-0.174,0.344-0.58,0.784-1.22,1.321-0.359,0.303-0.639,0.555-0.84,0.757-0.203,0.202-0.373,0.424-0.512,0.665-0.137,0.244-0.213,0.51-0.227,0.8h3.084z"/>
+
<path d="M23.57,11.4v7.28h-1.328v-5.04l-1.371,2.617h-0.563l-1.378-2.617v5.04h-1.331v-7.281h1.122l1.869,3.56,1.871-3.56h1.11z"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_1_3mp.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_1_3mp.svg Fri May 14 16:09:54 2010 +0300
@@ -1,12 +1,21 @@
-<?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">
+<?xml version="1.0" ?>
+<!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>
+
<path d="M0.998,3v24h28v-24h-28zm25,21h-22v-18h22v18z"/>
+
<path d="M9.573,17.86v0.781h-4.31v-0.781h1.533v-5.45l-1.533,0.352v-0.78l2.152-0.68h0.709v6.559h1.449z"/>
+
<path d="M11.3,18.72c-0.215,0-0.398-0.076-0.553-0.23-0.152-0.152-0.229-0.334-0.229-0.547,0-0.215,0.074-0.396,0.227-0.547,0.15-0.148,0.336-0.225,0.555-0.225,0.215,0,0.396,0.076,0.549,0.225,0.15,0.15,0.227,0.332,0.227,0.547s-0.076,0.398-0.227,0.551c-0.16,0.16-0.34,0.24-0.55,0.24z"/>
+
<path d="M13.66,14.38c0.957,0,1.555-0.098,1.793-0.293,0.236-0.195,0.355-0.496,0.355-0.898,0-0.355-0.096-0.623-0.285-0.801-0.191-0.18-0.475-0.27-0.852-0.27-0.332,0-0.799,0.084-1.402,0.25h-0.01v-0.859c0.613-0.154,1.166-0.23,1.66-0.23,0.746,0,1.307,0.15,1.68,0.449,0.375,0.301,0.563,0.75,0.563,1.348,0,0.414-0.113,0.77-0.338,1.068-0.225,0.297-0.547,0.508-0.967,0.631,0.457,0.082,0.805,0.273,1.047,0.574,0.244,0.301,0.365,0.678,0.365,1.131,0,0.744-0.219,1.305-0.652,1.678-0.436,0.371-1.086,0.559-1.955,0.559-0.521,0-1.055-0.076-1.602-0.23v-0.85h0.01c0.637,0.16,1.141,0.24,1.508,0.24,0.443,0,0.775-0.111,0.998-0.334,0.225-0.225,0.336-0.559,0.336-1.004,0-0.479-0.135-0.822-0.4-1.031-0.268-0.207-0.885-0.313-1.852-0.313v-0.827z"/>
+
<path d="M24.74,11.36v7.281h-1.328v-5.039l-1.373,2.617h-0.561l-1.377-2.617v5.039h-1.334v-7.281h1.123l1.871,3.561,1.869-3.561h1.105z"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_3mp.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_3mp.svg Fri May 14 16:09:54 2010 +0300
@@ -1,10 +1,17 @@
-<?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" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
+<?xml version="1.0" ?>
+<!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" 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 opacity="0.5">
+
<rect fill="none" height="30" width="30" x="0.003"/>
+
</g>
+
<path d="M1,3v24h28v-24h-28zm25,21h-22v-18h22v18z"/>
+
<path d="M9.762,14.38c0.957,0,1.555-0.098,1.793-0.293,0.236-0.195,0.355-0.494,0.355-0.898,0-0.354-0.096-0.621-0.285-0.801-0.191-0.178-0.475-0.268-0.852-0.268-0.332,0-0.799,0.082-1.402,0.248h-0.01v-0.86c0.613-0.152,1.166-0.229,1.66-0.229,0.746,0,1.307,0.148,1.68,0.449,0.375,0.299,0.563,0.748,0.563,1.348,0,0.412-0.113,0.768-0.338,1.066-0.225,0.297-0.547,0.508-0.967,0.633,0.457,0.08,0.805,0.271,1.047,0.572,0.244,0.303,0.365,0.68,0.365,1.131,0,0.746-0.219,1.305-0.652,1.678-0.436,0.373-1.086,0.559-1.955,0.559-0.521,0-1.055-0.076-1.602-0.229v-0.85h0.01c0.637,0.157,1.141,0.237,1.508,0.237,0.443,0,0.775-0.11,0.998-0.334,0.225-0.224,0.336-0.558,0.336-1.004,0-0.479-0.135-0.822-0.4-1.029-0.268-0.209-0.885-0.313-1.852-0.313v-0.829z"/>
+
<path d="M20.84,11.36v7.28h-1.328v-5.04l-1.373,2.617h-0.56l-1.38-2.62v5.039h-1.334v-7.28h1.123l1.871,3.559,1.869-3.559h1.11z"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_9mp.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_9mp.svg Fri May 14 16:09:54 2010 +0300
@@ -1,10 +1,17 @@
-<?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" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
+<?xml version="1.0" ?>
+<!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" 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 opacity="0.5">
+
<rect fill="none" height="30" width="30" x="0.002"/>
+
</g>
+
<path d="M1,3v24h28v-24h-28zm25,21h-22v-18h22v18z"/>
+
<path d="M9.594,18.6v-0.84c0.303,0.078,0.637,0.117,1.006,0.117,0.539,0,0.947-0.168,1.221-0.506,0.273-0.336,0.434-0.889,0.482-1.652-0.334,0.305-0.764,0.459-1.283,0.459-0.625,0-1.102-0.203-1.43-0.604-0.326-0.41-0.49-0.98-0.49-1.72,0-0.813,0.195-1.447,0.584-1.898,0.389-0.453,0.951-0.68,1.688-0.68,0.764,0,1.342,0.268,1.732,0.805,0.391,0.535,0.586,1.443,0.586,2.727,0,1.26-0.246,2.225-0.736,2.898-0.492,0.672-1.219,1.009-2.184,1.009-0.35,0-0.74-0.04-1.176-0.12zm1.746-3.24c0.318,0,0.563-0.119,0.734-0.354,0.17-0.236,0.256-0.572,0.256-1.004,0-0.635-0.08-1.111-0.238-1.432-0.16-0.318-0.398-0.479-0.713-0.479-0.311,0-0.545,0.119-0.707,0.357-0.16,0.236-0.24,0.707-0.24,1.41,0,0.535,0.074,0.918,0.227,1.15,0.15,0.22,0.38,0.34,0.68,0.34z"/>
+
<path d="M20.9,11.36v7.282h-1.328v-5.04l-1.373,2.617h-0.561l-1.377-2.617v5.04h-1.334v-7.282h1.123l1.871,3.561,1.869-3.561h1.112z"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_accented_characters.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_accented_characters.svg Fri May 14 16:09:54 2010 +0300
@@ -1,10 +1,17 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
+
<path d="M5.394,8.9c-1.107,0-2.283,0.171-3.527,0.513v1.528c1.217-0.362,2.259-0.544,3.128-0.544,0.533,0,0.967,0.087,1.302,0.262,0.335,0.174,0.574,0.42,0.718,0.738,0.144,0.317,0.215,0.774,0.215,1.368v1.118c-1.107,0-2.037,0.05-2.789,0.148-0.752,0.1-1.401,0.305-1.947,0.615-0.548,0.312-0.952,0.718-1.216,1.221-0.263,0.502-0.395,1.105-0.395,1.81,0,1.101,0.304,1.957,0.913,2.568,0.607,0.612,1.452,0.918,2.532,0.918,1.559,0,2.707-0.629,3.445-1.887l0.44,1.71h1.2v-8.295c0-1.313-0.358-2.275-1.077-2.887-0.717-0.607-1.698-0.913-2.942-0.913zm1.835,8.11c0,0.827-0.21,1.481-0.63,1.963-0.421,0.482-1.004,0.723-1.749,0.723-0.588,0-1.032-0.177-1.332-0.533-0.302-0.354-0.451-0.857-0.451-1.507,0-0.766,0.229-1.369,0.687-1.81s1.278-0.662,2.461-0.662h1.015v1.832z"/>
+
<polygon points="19.86,10.4,19.86,9.074,11.94,9.074,11.94,10.6,17.28,10.6,11.52,19.66,11.52,21,19.99,21,19.99,19.46,14.09,19.46"/>
+
<path d="M29,19.44c-0.471,0.157-1.142,0.236-2.01,0.236-1.004,0-1.764-0.409-2.275-1.226-0.514-0.817-0.77-1.991-0.77-3.522,0-1.429,0.258-2.541,0.774-3.338,0.516-0.796,1.272-1.194,2.271-1.194,0.772,0,1.416,0.082,1.928,0.246v-1.494c-0.725-0.17-1.397-0.256-2.02-0.256-1.702,0-2.999,0.521-3.892,1.563-0.892,1.043-1.338,2.518-1.338,4.425,0,2.044,0.41,3.601,1.23,4.671,0.82,1.069,2.051,1.604,3.691,1.604,0.175,0,0.332-0.022,0.501-0.03-0.234,0.652-0.441,1.331-0.612,1.866h-1.48v1h2v-0.001h1c0.088,0.04,0.368-1.64,0.73-3.089,0.087-0.021,0.183-0.029,0.268-0.054v-1.409z"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_activitystream.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_activitystream.svg Fri May 14 16:09:54 2010 +0300
@@ -1,10 +1,17 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
+
<path d="M21.94,7.903c0.108,0.996,0.446,4.888-0.639,7.017-0.015,0.028-0.035,0.052-0.05,0.08h3.439c-0.311-0.36-0.514-0.724-0.534-1.075-0.009-0.146,0-0.75,0.003-0.896,0.947-0.685,1.361-1.57,1.861-2.618,0.926-1.938,0.587-6.022,0.587-6.022,0-2.011-2.43-4.378-4.34-4.378h-1.214c-1.253,0-2.889,1.016-3.874,2.282,2.33,0.791,4.67,3.135,4.75,5.621z"/>
+
<path d="M15,24.82l-2.916-6.596c-1.45,1.83-5.827,4.19-6.08,4.53v5.25h9.09c-0.05-0.29-0.09-0.58-0.09-0.89v-2.294z"/>
+
<path d="M27.11,17h-7.223c-1.6,0-2.89,1.29-2.89,2.89v7.221c0,1.596,1.294,2.89,2.889,2.89h7.223c1.6,0,2.89-1.29,2.89-2.89v-7.22c0-1.6-1.29-2.89-2.89-2.89zm-7.3,11.56c-0.752,0-1.361-0.608-1.361-1.359s0.609-1.36,1.361-1.36,1.363,0.609,1.363,1.36-0.61,1.36-1.36,1.36zm5.29,0h-1.93c0.002-0.08,0.012-0.159,0.012-0.241,0-2.48-2.021-4.5-4.506-4.5-0.078,0-0.154,0.008-0.23,0.012v-1.928c0.076-0.002,0.152-0.012,0.23-0.012,3.549,0,6.438,2.884,6.438,6.428,0,0.08-0.01,0.16-0.01,0.24zm3.44,0h-1.93c0.003-0.082,0.013-0.164,0.013-0.245,0-4.377-3.564-7.937-7.947-7.937-0.078,0-0.154,0.009-0.23,0.012v-1.929c0.078-0.001,0.152-0.011,0.23-0.011,5.448,0,9.879,4.424,9.879,9.864,0.01,0.08-0.01,0.16-0.01,0.25z"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_account.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_account.svg Fri May 14 16:09:54 2010 +0300
@@ -1,13 +1,28 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
<polygon points="9.49,8.148 17.801,10.801 19.199,8 13.601,6.601 "/>
-<path d="M26.276,13.787c-0.674-1.237-1.272-2.938-1.272-2.938l-1.788-0.328L21.608,9.9l0.913,1.239l0.656-0.291 c0,0,0.804,0.767,0.766,1.021c-0.023,0.18-0.61,0.795-0.967,1.155C24.143,13.082,25.256,13.344,26.276,13.787z"/>
-<path d="M11.898,20.631c0-0.656,0.365-1.461,0.365-1.461c0.072-0.948-0.95-3.501-0.95-3.501h-1.058l-0.367-0.806 c-3.43,0.729-3.575-0.146-4.088-1.096c-0.51-0.95,0.075-3.503,0.403-3.906c0.328-0.4,2.885-2.153,2.885-2.153L8.76,7.233 C8.538,6.758,9.964,6.102,9.964,6.102c0.548,0.367,0.912,0,0.912,0l0.146-0.366l-0.146-0.546l1.132-1.405l1.082-0.25 c0.624-0.103,1.259-0.171,1.911-0.171c1.384,0,2.705,0.255,3.936,0.7l-1.136,1.136l1.398,1.401l1.401-1.401l-0.772-0.771 c3.694,1.698,6.348,5.271,6.739,9.499c0.886,0.422,1.694,0.975,2.404,1.637C28.979,15.376,29,15.19,29,15c0-7.733-6.267-14-14-14 S1,7.267,1,15s6.267,14,14,14c0.19,0,0.376-0.021,0.564-0.028c-1.408-1.509-2.334-3.47-2.522-5.644 C12.803,22.758,11.898,21.202,11.898,20.631z M5.199,22l-1.398-4.199l1.986-0.393l1.401,2.801L5.199,22z"/>
+<path d="M26.276,13.787c-0.674-1.237-1.272-2.938-1.272-2.938l-1.788-0.328L21.608,9.9l0.913,1.239l0.656-0.291
+ c0,0,0.804,0.767,0.766,1.021c-0.023,0.18-0.61,0.795-0.967,1.155C24.143,13.082,25.256,13.344,26.276,13.787z"/>
+<path d="M11.898,20.631c0-0.656,0.365-1.461,0.365-1.461c0.072-0.948-0.95-3.501-0.95-3.501h-1.058l-0.367-0.806
+ c-3.43,0.729-3.575-0.146-4.088-1.096c-0.51-0.95,0.075-3.503,0.403-3.906c0.328-0.4,2.885-2.153,2.885-2.153L8.76,7.233
+ C8.538,6.758,9.964,6.102,9.964,6.102c0.548,0.367,0.912,0,0.912,0l0.146-0.366l-0.146-0.546l1.132-1.405l1.082-0.25
+ c0.624-0.103,1.259-0.171,1.911-0.171c1.384,0,2.705,0.255,3.936,0.7l-1.136,1.136l1.398,1.401l1.401-1.401l-0.772-0.771
+ c3.694,1.698,6.348,5.271,6.739,9.499c0.886,0.422,1.694,0.975,2.404,1.637C28.979,15.376,29,15.19,29,15c0-7.733-6.267-14-14-14
+ S1,7.267,1,15s6.267,14,14,14c0.19,0,0.376-0.021,0.564-0.028c-1.408-1.509-2.334-3.47-2.522-5.644
+ C12.803,22.758,11.898,21.202,11.898,20.631z M5.199,22l-1.398-4.199l1.986-0.393l1.401,2.801L5.199,22z"/>
<path d="M19.979,13.35c0.332-0.091,0.67-0.163,1.016-0.219l-0.736-0.605l-1.06-0.874l0.656,1.569L19.979,13.35z"/>
-<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"/>
+<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"/>
<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>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_contact.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
+</g>
+<path d="M8.648,14.904c0.002,0.148,0.014,0.419,0.004,0.566c-0.007,0.102-0.043,0.209-0.08,0.317h5.857
+ c-0.037-0.108-0.072-0.216-0.079-0.317c-0.011-0.157,0-0.437,0.003-0.596c1.086-0.732,2.027-1.654,2.6-2.776
+ c1.061-2.08,0.672-7.392,0.672-7.392C17.625,2.538,14.383,0,12.189,0h-1.391C8.605,0,5.375,2.538,5.375,4.707
+ c0,0-0.332,5.294,0.658,7.392C6.577,13.243,7.536,14.175,8.648,14.904z"/>
+<path d="M13,22.5c0-0.768,0.102-1.51,0.273-2.225L11.5,24.286l-3.401-7.694C6.402,18.725,1.295,21.482,1,21.87V28h13.769
+ C13.66,26.446,13,24.551,13,22.5z"/>
+<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"/>
+<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_add_field.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_field.svg Fri May 14 16:09:54 2010 +0300
@@ -1,11 +1,19 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
-<rect height="7" width="26" x="2" y="2"/>
+<rect x="2" y="2" width="26" height="7"/>
<path d="M28,13.828V11h-3.656c0.512,0,1.023,0.195,1.414,0.586L28,13.828z"/>
<path d="M18.515,16H4v-3h17.515l1.414-1.414C23.319,11.195,23.831,11,24.344,11H2v7h14.515L18.515,16z"/>
-<path d="M24.343,13L13.736,23.606l-0.707,6.364l6.364-0.707L30,18.657L24.343,13z M18.687,27.142l-2.828-2.828l8.484-8.485 l2.829,2.829L18.687,27.142z"/>
+<path d="M24.343,13L13.736,23.606l-0.707,6.364l6.364-0.707L30,18.657L24.343,13z M18.687,27.142l-2.828-2.828l8.484-8.485
+ l2.829,2.829L18.687,27.142z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_calendar.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_calendar.svg Fri May 14 16:09:54 2010 +0300
@@ -1,11 +1,27 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
-<path d="M18.881,18.278c-1.127,0.918-1.888,1.747-2.285,2.485C16.199,21.499,16,22.26,16,23.042V24h7v-1.035h-4.652 c0.029-0.588,0.141-1.068,0.308-1.378c0.165-0.308,0.396-0.613,0.687-0.911c0.295-0.3,0.761-0.712,1.4-1.237 c0.582-0.478,1.019-0.882,1.314-1.215c0.296-0.335,0.519-0.69,0.672-1.07c0.15-0.38,0.226-0.798,0.226-1.256 c0-0.953-0.306-1.673-0.915-2.164C21.428,13.245,20.531,13,19.35,13c-0.963,0-1.953,0.149-2.971,0.445v1.481 c0.928-0.329,1.71-0.496,2.346-0.496c1.142,0,1.714,0.52,1.714,1.555c0,0.399-0.111,0.759-0.332,1.076 C19.885,17.381,19.477,17.786,18.881,18.278z"/>
-<path d="M23,3V1h-3v2h-4.137c0.496,0.919,0.836,1.932,1.006,3H26v3h-9.131c-0.11,0.694-0.293,1.364-0.546,2H26v16H6V16.87 c-1.068-0.171-2.081-0.51-3-1.007V30h26V3H23z"/>
+<path d="M18.881,18.278c-1.127,0.918-1.888,1.747-2.285,2.485C16.199,21.499,16,22.26,16,23.042V24h7v-1.035h-4.652
+ c0.029-0.588,0.141-1.068,0.308-1.378c0.165-0.308,0.396-0.613,0.687-0.911c0.295-0.3,0.761-0.712,1.4-1.237
+ c0.582-0.478,1.019-0.882,1.314-1.215c0.296-0.335,0.519-0.69,0.672-1.07c0.15-0.38,0.226-0.798,0.226-1.256
+ c0-0.953-0.306-1.673-0.915-2.164C21.428,13.245,20.531,13,19.35,13c-0.963,0-1.953,0.149-2.971,0.445v1.481
+ c0.928-0.329,1.71-0.496,2.346-0.496c1.142,0,1.714,0.52,1.714,1.555c0,0.399-0.111,0.759-0.332,1.076
+ C19.885,17.381,19.477,17.786,18.881,18.278z"/>
+<path d="M23,3V1h-3v2h-4.137c0.496,0.919,0.836,1.932,1.006,3H26v3h-9.131c-0.11,0.694-0.293,1.364-0.546,2H26v16H6V16.87
+ c-1.068-0.171-2.081-0.51-3-1.007V30h26V3H23z"/>
<path d="M11,16.323V23H9v1h6v-1h-1.563v-8.096C12.706,15.492,11.885,15.971,11,16.323z"/>
-<path d="M15,7.5C15,3.364,11.636,0,7.5,0S0,3.364,0,7.5S3.364,15,7.5,15S15,11.636,15,7.5z M13,7.5c0,2.857-2.192,5.212-4.982,5.474 L12,7H8.973C8.788,4.948,7.568,3.19,5.838,2.258C6.363,2.091,6.921,2,7.5,2C10.533,2,13,4.468,13,7.5z M2,7.5 c0-1.521,0.621-2.898,1.622-3.896C5.353,3.878,6.706,5.257,6.945,7H4l3.983,5.976C7.824,12.989,7.663,13,7.5,13 C4.467,13,2,10.532,2,7.5z"/>
+<path d="M15,7.5C15,3.364,11.636,0,7.5,0S0,3.364,0,7.5S3.364,15,7.5,15S15,11.636,15,7.5z M13,7.5c0,2.857-2.192,5.212-4.982,5.474
+ L12,7H8.973C8.788,4.948,7.568,3.19,5.838,2.258C6.363,2.091,6.921,2,7.5,2C10.533,2,13,4.468,13,7.5z M2,7.5
+ c0-1.521,0.621-2.898,1.622-3.896C5.353,3.878,6.706,5.257,6.945,7H4l3.983,5.976C7.824,12.989,7.663,13,7.5,13
+ C4.467,13,2,10.532,2,7.5z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_contact.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_contact.svg Fri May 14 16:09:54 2010 +0300
@@ -1,11 +1,24 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
<path d="M22,19.5c-0.169-0.222-3.088-1.801-4.056-3.02L16,21l-1.943-4.521c-0.968,1.22-3.888,2.797-4.057,3.019V23h12V19.5z"/>
-<path d="M19.294,9.689c0-1.053-1.188-2.249-2.314-2.588C16.985,7.234,17,7.365,17,7.5c0,2.868-1.283,5.438-3.299,7.181 c0.198,0.195,0.415,0.378,0.67,0.546c0.002,0.086,0.007,0.53,0.001,0.614c-0.004,0.058-0.024,0.12-0.046,0.183 c0-0.001,0.001-0.002,0.001-0.002h3.347c0,0,0,0.001,0.001,0.001c-0.021-0.062-0.042-0.124-0.046-0.182 c-0.007-0.09,0-0.523,0.001-0.614c0.621-0.418,1.056-0.91,1.382-1.553C19.618,12.487,19.294,9.689,19.294,9.689z"/>
-<path d="M15.231,2c0.641,0.897,1.125,1.909,1.424,3H24v20H8v-8.025C7.833,16.983,7.669,17,7.5,17c-0.866,0-1.702-0.127-2.5-0.345V19 H3v2h2v3H3v2h2v2h22V2H15.231z"/>
-<path d="M7.5,0C3.364,0,0,3.364,0,7.5S3.364,15,7.5,15S15,11.636,15,7.5S11.636,0,7.5,0z M2,7.5c0-1.521,0.62-2.898,1.621-3.896 C5.353,3.878,6.706,5.257,6.945,7H4l3.983,5.976C7.824,12.989,7.663,13,7.5,13C4.467,13,2,10.532,2,7.5z M8.018,12.974L12,7H8.973 C8.788,4.948,7.568,3.19,5.838,2.258C6.363,2.091,6.921,2,7.5,2C10.533,2,13,4.468,13,7.5C13,10.357,10.809,12.712,8.018,12.974z"/>
+<path d="M19.294,9.689c0-1.053-1.188-2.249-2.314-2.588C16.985,7.234,17,7.365,17,7.5c0,2.868-1.283,5.438-3.299,7.181
+ c0.198,0.195,0.415,0.378,0.67,0.546c0.002,0.086,0.007,0.53,0.001,0.614c-0.004,0.058-0.024,0.12-0.046,0.183
+ c0-0.001,0.001-0.002,0.001-0.002h3.347c0,0,0,0.001,0.001,0.001c-0.021-0.062-0.042-0.124-0.046-0.182
+ c-0.007-0.09,0-0.523,0.001-0.614c0.621-0.418,1.056-0.91,1.382-1.553C19.618,12.487,19.294,9.689,19.294,9.689z"/>
+<path d="M15.231,2c0.641,0.897,1.125,1.909,1.424,3H24v20H8v-8.025C7.833,16.983,7.669,17,7.5,17c-0.866,0-1.702-0.127-2.5-0.345V19
+ H3v2h2v3H3v2h2v2h22V2H15.231z"/>
+<path d="M7.5,0C3.364,0,0,3.364,0,7.5S3.364,15,7.5,15S15,11.636,15,7.5S11.636,0,7.5,0z M2,7.5c0-1.521,0.62-2.898,1.621-3.896
+ C5.353,3.878,6.706,5.257,6.945,7H4l3.983,5.976C7.824,12.989,7.663,13,7.5,13C4.467,13,2,10.532,2,7.5z M8.018,12.974L12,7H8.973
+ C8.788,4.948,7.568,3.19,5.838,2.258C6.363,2.091,6.921,2,7.5,2C10.533,2,13,4.468,13,7.5C13,10.357,10.809,12.712,8.018,12.974z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_favourites.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_favourites.svg Fri May 14 16:09:54 2010 +0300
@@ -1,9 +1,20 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
-<path d="M30,12h-9.704L17.008,2l-0.856,2.596C16.691,5.789,17,7.107,17,8.5c0,4.222-2.77,7.805-6.586,9.038l1.266,0.945L8,29 l9.006-6.633L26,29l-3.672-10.517L30,12z"/>
-<path d="M15,8.5C15,4.364,11.636,1,7.5,1S0,4.364,0,8.5S3.364,16,7.5,16S15,12.636,15,8.5z M2,8.5c0-1.521,0.62-2.898,1.621-3.896 C5.353,4.878,6.706,6.257,6.945,8H4l3.983,5.976C7.824,13.989,7.663,14,7.5,14C4.467,14,2,11.532,2,8.5z M8.018,13.974L12,8H8.973 C8.788,5.948,7.568,4.19,5.838,3.258C6.363,3.091,6.921,3,7.5,3C10.533,3,13,5.468,13,8.5C13,11.357,10.809,13.712,8.018,13.974z"/>
+<path d="M29,13l-8.982-1.1l-3.212-6.315C16.934,6.204,17,6.844,17,7.5c0,5.238-4.262,9.5-9.5,9.5c-0.137,0-0.27-0.015-0.405-0.021
+ L9.5,19.316L8,28l8-4.1l8,4.1l-1.5-8.684L29,13z"/>
+<path d="M15,7.5C15,3.364,11.636,0,7.5,0S0,3.364,0,7.5S3.364,15,7.5,15S15,11.636,15,7.5z M13,7.5c0,2.857-2.191,5.212-4.982,5.474
+ L12,7H8.973C8.787,4.948,7.568,3.19,5.838,2.258C6.363,2.092,6.921,2,7.5,2C10.533,2,13,4.468,13,7.5z M2,7.5
+ c0-1.521,0.621-2.898,1.621-3.896C5.354,3.878,6.706,5.258,6.945,7H4l3.983,5.976C7.824,12.989,7.663,13,7.5,13
+ C4.467,13,2,10.532,2,7.5z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_groups.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_groups.svg Fri May 14 16:09:54 2010 +0300
@@ -1,12 +1,32 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
-<path d="M24.155,15.925c-0.009-0.146,0-0.75,0.003-0.896c0.947-0.685,1.361-1.57,1.861-2.618c0.926-1.938,0.587-6.022,0.587-6.022 C26.606,4.367,24.183,2,22.269,2h-1.214c-1.252,0-2.888,1.014-3.872,2.279c2.331,0.78,4.674,3.089,4.756,5.625 c0.119,1.085,0.433,4.913-0.639,7.016c-0.443,0.869-0.993,1.603-1.683,2.243c0.58,0.635,2.017,1.678,4.27,3.099 c1.084,0.683,1.412,0.889,1.708,1.28l0.304,0.402C25.965,24.031,26,24.137,26,24.246V26h4v-5.72 C30,20.28,24.273,17.909,24.155,15.925z"/>
-<path d="M17.916,20.221L15,26.816l-2.915-6.596C10.631,22.049,6.253,24.413,6,24.746V30h18v-5.25 C23.747,24.416,19.369,22.05,17.916,20.221z"/>
-<path d="M19.518,16.012c0.908-1.782,0.423-5.978,0.423-5.978c0-1.439-1.482-3.064-3.023-3.727C16.966,6.699,17,7.096,17,7.5 c0,4.112-2.632,7.612-6.295,8.932c0.45,0.768,1.045,1.379,1.852,1.908c0.003,0.128,0.01,0.794,0.002,0.921 c-0.006,0.087-0.036,0.179-0.068,0.271h5.021c-0.031-0.093-0.062-0.185-0.067-0.271c-0.009-0.135-0.001-0.784,0.001-0.921 C18.375,17.712,19.027,16.975,19.518,16.012z"/>
-<path d="M10.372,19.177c-0.711-0.645-1.262-1.385-1.685-2.259C8.298,16.967,7.903,17,7.5,17c-0.691,0-1.365-0.079-2.015-0.22 C4.217,18.53,0,20.276,0,20.276V26h4v-1.759c0-0.109,0.036-0.216,0.103-0.303l0.306-0.401c0.297-0.394,0.623-0.599,1.703-1.277 C8.348,20.852,9.781,19.814,10.372,19.177z"/>
-<path d="M7.5,15c4.136,0,7.5-3.364,7.5-7.5S11.636,0,7.5,0S0,3.364,0,7.5S3.364,15,7.5,15z M13,7.5c0,2.857-2.191,5.212-4.982,5.474 L12,7H8.973C8.788,4.948,7.568,3.19,5.838,2.258C6.363,2.091,6.921,2,7.5,2C10.533,2,13,4.468,13,7.5z M3.621,3.604 C5.353,3.878,6.706,5.257,6.945,7H4l3.983,5.976C7.824,12.989,7.663,13,7.5,13C4.467,13,2,10.532,2,7.5 C2,5.979,2.62,4.602,3.621,3.604z"/>
+<path d="M24.155,15.925c-0.009-0.146,0-0.75,0.003-0.896c0.947-0.685,1.361-1.57,1.861-2.618c0.926-1.938,0.587-6.022,0.587-6.022
+ C26.606,4.367,24.183,2,22.269,2h-1.214c-1.252,0-2.888,1.014-3.872,2.279c2.331,0.78,4.674,3.089,4.756,5.625
+ c0.119,1.085,0.433,4.913-0.639,7.016c-0.443,0.869-0.993,1.603-1.683,2.243c0.58,0.635,2.017,1.678,4.27,3.099
+ c1.084,0.683,1.412,0.889,1.708,1.28l0.304,0.402C25.965,24.031,26,24.137,26,24.246V26h4v-5.72
+ C30,20.28,24.273,17.909,24.155,15.925z"/>
+<path d="M17.916,20.221L15,26.816l-2.915-6.596C10.631,22.049,6.253,24.413,6,24.746V30h18v-5.25
+ C23.747,24.416,19.369,22.05,17.916,20.221z"/>
+<path d="M19.518,16.012c0.908-1.782,0.423-5.978,0.423-5.978c0-1.439-1.482-3.064-3.023-3.727C16.966,6.699,17,7.096,17,7.5
+ c0,4.112-2.632,7.612-6.295,8.932c0.45,0.768,1.045,1.379,1.852,1.908c0.003,0.128,0.01,0.794,0.002,0.921
+ c-0.006,0.087-0.036,0.179-0.068,0.271h5.021c-0.031-0.093-0.062-0.185-0.067-0.271c-0.009-0.135-0.001-0.784,0.001-0.921
+ C18.375,17.712,19.027,16.975,19.518,16.012z"/>
+<path d="M10.372,19.177c-0.711-0.645-1.262-1.385-1.685-2.259C8.298,16.967,7.903,17,7.5,17c-0.691,0-1.365-0.079-2.015-0.22
+ C4.217,18.53,0,20.276,0,20.276V26h4v-1.759c0-0.109,0.036-0.216,0.103-0.303l0.306-0.401c0.297-0.394,0.623-0.599,1.703-1.277
+ C8.348,20.852,9.781,19.814,10.372,19.177z"/>
+<path d="M7.5,15c4.136,0,7.5-3.364,7.5-7.5S11.636,0,7.5,0S0,3.364,0,7.5S3.364,15,7.5,15z M13,7.5c0,2.857-2.191,5.212-4.982,5.474
+ L12,7H8.973C8.788,4.948,7.568,3.19,5.838,2.258C6.363,2.091,6.921,2,7.5,2C10.533,2,13,4.468,13,7.5z M3.621,3.604
+ C5.353,3.878,6.706,5.257,6.945,7H4l3.983,5.976C7.824,12.989,7.663,13,7.5,13C4.467,13,2,10.532,2,7.5
+ C2,5.979,2.62,4.602,3.621,3.604z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_homescreen.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_homescreen.svg Fri May 14 16:09:54 2010 +0300
@@ -1,9 +1,20 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
-<path d="M24,1h-9.591c0.565,0.601,1.06,1.269,1.454,2H25v18H11v-4.677c-0.636,0.253-1.306,0.436-2,0.547V26c0,1.65,1.35,3,3,3h12 c1.65,0,3-1.35,3-3V4C27,2.35,25.65,1,24,1z M14,26h-3v-2h3V26z M18,27c-1.104,0-2-0.896-2-2s0.896-2,2-2c1.105,0,2,0.896,2,2 S19.105,27,18,27z M25,26h-3v-2h3V26z"/>
-<path d="M15,7.5C15,3.364,11.636,0,7.5,0S0,3.364,0,7.5S3.364,15,7.5,15S15,11.636,15,7.5z M2,7.5c0-1.521,0.621-2.898,1.621-3.896 C5.354,3.878,6.706,5.257,6.945,7H4l3.983,5.976C7.824,12.989,7.663,13,7.5,13C4.467,13,2,10.532,2,7.5z M8.018,12.974L12,7H8.973 C8.787,4.948,7.568,3.19,5.838,2.258C6.363,2.091,6.921,2,7.5,2C10.533,2,13,4.468,13,7.5C13,10.357,10.809,12.712,8.018,12.974z"/>
+<path d="M24,1h-9.591c0.565,0.601,1.06,1.269,1.454,2H25v18H11v-4.677c-0.636,0.253-1.306,0.436-2,0.547V26c0,1.65,1.35,3,3,3h12
+ c1.65,0,3-1.35,3-3V4C27,2.35,25.65,1,24,1z M14,26h-3v-2h3V26z M18,27c-1.104,0-2-0.896-2-2s0.896-2,2-2c1.105,0,2,0.896,2,2
+ S19.105,27,18,27z M25,26h-3v-2h3V26z"/>
+<path d="M15,7.5C15,3.364,11.636,0,7.5,0S0,3.364,0,7.5S3.364,15,7.5,15S15,11.636,15,7.5z M2,7.5c0-1.521,0.621-2.898,1.621-3.896
+ C5.354,3.878,6.706,5.257,6.945,7H4l3.983,5.976C7.824,12.989,7.663,13,7.5,13C4.467,13,2,10.532,2,7.5z M8.018,12.974L12,7H8.973
+ C8.787,4.948,7.568,3.19,5.838,2.258C6.363,2.091,6.921,2,7.5,2C10.533,2,13,4.468,13,7.5C13,10.357,10.809,12.712,8.018,12.974z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_phonebook.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_phonebook.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,13 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
+
<path d="M10.52,8.506c1.35,0.571,2.732,0.287,3.599-0.017v3.875h1.766v-3.871c0.866,0.304,2.249,0.588,3.599,0.017,2.926-1.238,2.831-3.499,2.831-3.499s-1.41-1.298-4.335-0.06c-2.645,1.12-2.94,2.791-2.973,3.101h-0.01c-0.032-0.31-0.328-1.98-2.973-3.101-2.925-1.238-4.335,0.06-4.335,0.06s-0.102,2.261,2.825,3.499z"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_video_collection.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_add_to_video_collection.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,13 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
+
<path d="M7.5,0c-4.136,0-7.5,3.364-7.5,7.5s3.364,7.5,7.5,7.5,7.5-3.36,7.5-7.5-3.36-7.5-7.5-7.5zm-5.5,7.5c0-1.521,0.621-2.898,1.621-3.896,1.733,0.274,3.085,1.653,3.324,3.396h-2.945l3.983,5.976c-0.159,0.01-0.32,0.02-0.483,0.02-3.033,0-5.5-2.47-5.5-5.5zm6.018,5.47l3.982-5.97h-3.027c-0.186-2.052-1.405-3.81-3.135-4.742,0.525-0.167,1.083-0.258,1.662-0.258,3.03,0,5.5,2.468,5.5,5.5,0,2.86-2.19,5.21-4.982,5.47z"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_addcity.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_addcity.svg Fri May 14 16:09:54 2010 +0300
@@ -1,12 +1,21 @@
-<?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">
-<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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<rect fill="none" width="30" height="30"/>
+<rect x="5" y="5" width="4" height="3"/>
+<rect x="5" y="10" width="4" height="3"/>
+<rect x="5" y="15" width="4" height="3"/>
+<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 x="18" y="21" width="9" height="3"/>
+<rect x="21" y="18" width="3" height="9"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alarm.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alarm.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,13 @@
-<?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">
+<?xml version="1.0" ?>
+<!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="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"/>
+
<path d="M12.47,23.87c-1.675,0.432-3.569-0.033-4.935-1.396-1.363-1.365-1.83-3.262-1.399-4.938l6.334,6.34z"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alarm_inactive.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alarm_inactive.svg Fri May 14 16:09:54 2010 +0300
@@ -1,11 +1,20 @@
-<?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">
-<rect fill="none" height="30" width="30"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<rect fill="none" width="30" height="30"/>
<path d="M22.213,3.21l0.707-0.707c0.779-0.777,2.053-0.777,2.83,0c0.777,0.778,0.777,2.051,0,2.828l-0.707,0.708L22.213,3.21z"/>
<path d="M11.593,22.994c-1.675,0.431-3.569-0.033-4.935-1.397c-1.363-1.364-1.83-3.262-1.399-4.937L11.593,22.994z"/>
-<path d="M22.5,13c1.539,0,2.989,0.376,4.276,1.028c1.092-3.451,0.283-7.387-2.44-10.111c-3.891-3.89-10.254-3.89-14.143,0L5.95,8.16 C4.037,7.475,3.313,7.968,2.436,8.846L1,10.281l12.011,12.011C13.123,17.15,17.332,13,22.5,13z"/>
-<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" transform="matrix(0.7071 0.7071 -0.7071 0.7071 22.4997 -9.3199)" width="8.999" x="18" y="20.999"/>
-<rect height="3" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -9.3199 22.4997)" width="8.999" x="18" y="21"/>
+<path d="M22.5,13c1.539,0,2.989,0.376,4.276,1.028c1.092-3.451,0.283-7.387-2.44-10.111c-3.891-3.89-10.254-3.89-14.143,0L5.95,8.16
+ C4.037,7.475,3.313,7.968,2.436,8.846L1,10.281l12.011,12.011C13.123,17.15,17.332,13,22.5,13z"/>
+<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 x="18" y="20.999" transform="matrix(0.7071 0.7071 -0.7071 0.7071 22.4997 -9.3199)" width="8.999" height="3"/>
+<rect x="18" y="21" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -9.3199 22.4997)" width="8.999" height="3"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alarm_new.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alarm_new.svg Fri May 14 16:09:54 2010 +0300
@@ -1,13 +1,22 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
<path d="M22.213,3.21l0.707-0.707c0.779-0.777,2.053-0.777,2.83,0c0.777,0.778,0.777,2.051,0,2.828l-0.707,0.708L22.213,3.21z"/>
<path d="M11.593,22.994c-1.675,0.431-3.569-0.033-4.935-1.397c-1.363-1.364-1.83-3.262-1.399-4.937L11.593,22.994z"/>
-<path d="M22.5,13c1.539,0,2.989,0.376,4.276,1.028c1.092-3.451,0.283-7.387-2.44-10.111c-3.891-3.89-10.254-3.89-14.143,0L5.95,8.16 C4.037,7.475,3.313,7.968,2.436,8.846L1,10.281l12.011,12.011C13.123,17.15,17.332,13,22.5,13z"/>
-<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"/>
+<path d="M22.5,13c1.539,0,2.989,0.376,4.276,1.028c1.092-3.451,0.283-7.387-2.44-10.111c-3.891-3.89-10.254-3.89-14.143,0L5.95,8.16
+ C4.037,7.475,3.313,7.968,2.436,8.846L1,10.281l12.011,12.011C13.123,17.15,17.332,13,22.5,13z"/>
+<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 x="18" y="21" width="9" height="3"/>
+<rect x="21" y="18" width="3" height="9"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alarm_snooze.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alarm_snooze.svg Fri May 14 16:09:54 2010 +0300
@@ -1,10 +1,17 @@
-<?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">
+<?xml version="1.0" ?>
+<!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="M22.21,3.211l0.707-0.707c0.779-0.777,2.054-0.777,2.83,0s0.776,2.051,0,2.828l-0.707,0.707-2.83-2.828z"/>
+
<path d="M18.9,29v-1.805l6.233-9.879h-5.823v-2.02h9.551v1.771l-6.271,9.914h6.41v2.02h-10.1z"/>
+
<path d="M9.701,21.1l-4.442-4.44c-0.431,1.676,0.036,3.572,1.399,4.938,0.865,0.863,1.943,1.365,3.043,1.508v-2.006z"/>
+
<path d="M24.34,3.918c-3.892-3.891-10.25-3.891-14.14,0l-4.25,4.242c-1.913-0.685-2.637-0.191-3.514,0.686l-1.436,1.434,8.729,8.729h7.58v-5.709h9.664c0.77-3.26-0.1-6.849-2.63-9.382z"/>
+
<path d="M11.46,29v-1.053l3.637-5.762h-3.398v-1.18h5.571v1.031l-3.657,5.783h3.739v1.18h-5.887z"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alpha_mode.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_alpha_mode.svg Fri May 14 16:09:54 2010 +0300
@@ -1,9 +1,15 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
+
<path d="M25.95,2.57c0.484,0,1.034,0.091,1.648,0.273v-1.366c-0.62-0.167-1.237-0.25-1.852-0.25-1.505,0-2.634,0.485-3.387,1.457s-1.129,2.426-1.129,4.363c0,2.161,0.374,3.715,1.121,4.66s1.863,1.418,3.348,1.418c0.646,0,1.278-0.083,1.898-0.25v-1.328c-0.558,0.156-1.083,0.234-1.578,0.234-0.849,0-1.485-0.372-1.91-1.117s-0.637-1.972-0.637-3.68c0-1.469,0.206-2.571,0.617-3.309s1.03-1.101,1.86-1.101z"/>
+
<polygon points="17,18,21,18,21,22.93,12,22.93,12,18.93,5,23.97,12,29,12,25.93,24,25.93,24,16,17,16"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_app_exit.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_app_exit.svg Fri May 14 16:09:54 2010 +0300
@@ -1,7 +1,11 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_applications_all.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_applications_all.svg Fri May 14 16:09:54 2010 +0300
@@ -1,11 +1,18 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
<path d="M16,3v11h11V3H16z M24,11h-5V6h5V11z"/>
<path d="M16,27h11V16H16V27z M19,19h5v5h-5V19z"/>
-<rect height="12" width="12" x="2" y="2"/>
+<rect x="2" y="2" width="12" height="12"/>
<path d="M3,27h11V16H3V27z M6,19h5v5H6V19z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_applications_collections.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_applications_collections.svg Fri May 14 16:09:54 2010 +0300
@@ -1,12 +1,19 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
<polygon points="5.999,1 5.999,4 26,4 26,24 29,24 29,1 "/>
<path d="M1,29h23V6H1V29z M4,9h17v17H4V9z"/>
-<rect height="6" width="6" x="6" y="11"/>
+<rect x="6" y="11" width="6" height="6"/>
<path d="M13,17h6v-6h-6V17z M15,13h2v2h-2V13z"/>
<path d="M6,24h6v-6H6V24z M8,20h2v2H8V20z"/>
<path d="M13,24h6v-6h-6V24z M15,20h2v2h-2V20z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_arrow_down.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_arrow_down.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,15 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
<polygon points="2,5 15,27 28,5 "/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_arrow_up.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_arrow_up.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,15 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
<polygon points="2,25 15,3 28,25 "/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_artists.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_artists.svg Fri May 14 16:09:54 2010 +0300
@@ -1,10 +1,22 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
-<path d="M8.648,14.904c0.002,0.148,0.014,0.419,0.004,0.566c-0.007,0.102-0.043,0.209-0.08,0.317h5.857l0.001,0.001 c-0.037-0.108-0.073-0.217-0.08-0.318c-0.011-0.157,0-0.437,0.003-0.596c1.086-0.732,2.027-1.654,2.6-2.776 c1.061-2.08,0.672-7.392,0.672-7.392C17.625,2.538,14.383,0,12.189,0h-1.391C8.605,0,5.375,2.538,5.375,4.707 c0,0-0.332,5.294,0.658,7.392C6.577,13.243,7.536,14.175,8.648,14.904z"/>
-<path d="M21,22.021v-0.839c-1.642-1.041-4.826-2.992-6.097-4.591L11.5,24.286l-3.401-7.694C6.401,18.725,1.294,21.482,1,21.87V28 h15.111C16.038,27.677,16,27.343,16,27C16,24.396,18.2,22.251,21,22.021z"/>
-<path d="M23,15v9.3c-0.456-0.187-0.961-0.3-1.5-0.3c-1.934,0-3.5,1.343-3.5,3c0,1.656,1.566,3,3.5,3s3.5-1.344,3.5-3v-7.333L29,21 v-4L23,15z"/>
+<path d="M8.648,14.904c0.002,0.148,0.014,0.419,0.004,0.566c-0.007,0.102-0.043,0.209-0.08,0.317h5.857l0.001,0.001
+ c-0.037-0.108-0.073-0.217-0.08-0.318c-0.011-0.157,0-0.437,0.003-0.596c1.086-0.732,2.027-1.654,2.6-2.776
+ c1.061-2.08,0.672-7.392,0.672-7.392C17.625,2.538,14.383,0,12.189,0h-1.391C8.605,0,5.375,2.538,5.375,4.707
+ c0,0-0.332,5.294,0.658,7.392C6.577,13.243,7.536,14.175,8.648,14.904z"/>
+<path d="M21,22.021v-0.839c-1.642-1.041-4.826-2.992-6.097-4.591L11.5,24.286l-3.401-7.694C6.401,18.725,1.294,21.482,1,21.87V28
+ h15.111C16.038,27.677,16,27.343,16,27C16,24.396,18.2,22.251,21,22.021z"/>
+<path d="M23,15v9.3c-0.456-0.187-0.961-0.3-1.5-0.3c-1.934,0-3.5,1.343-3.5,3c0,1.656,1.566,3,3.5,3s3.5-1.344,3.5-3v-7.333L29,21
+ v-4L23,15z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_aspect_ratio_natural.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_aspect_ratio_natural.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,13 @@
-<?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">
+<?xml version="1.0" ?>
+<!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>
+
<path d="M2,3v24h26v-24h-26zm23,21h-20v-18h20v18z"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_aspect_ratio_stretched.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_aspect_ratio_stretched.svg Fri May 14 16:09:54 2010 +0300
@@ -1,13 +1,23 @@
-<?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">
+<?xml version="1.0" ?>
+<!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>
+
<path d="M2,3v24h26v-24h-26zm23,21h-20v-18h20v18z"/>
+
<path d="M19,12h-8v6h8v-6zm-2,4h-4v-2h4v2z"/>
+
<polygon points="15,7,12,10,18,10"/>
+
<polygon points="15,23,18,20,12,20"/>
+
<polygon points="21,12,21,18,24,15"/>
+
<polygon points="9,12,6,15,9,18"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_aspect_ratio_zoom.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_aspect_ratio_zoom.svg Fri May 14 16:09:54 2010 +0300
@@ -1,12 +1,21 @@
-<?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">
+<?xml version="1.0" ?>
+<!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>
+
<path d="M25,22.28v1.72h-4.914c-0.518,0.064-1.04,0.109-1.57,0.109-0.535,0-1.061-0.044-1.582-0.109h-4.455l-3,3h18.52v-7.275c-0.213,0.248-0.428,0.496-0.662,0.729-0.71,0.72-1.5,1.32-2.34,1.83z"/>
+
<path d="M5,6h2.348c0.539-1.081,1.244-2.093,2.107-3h-7.455v18.75l3-3.001v-12.75z"/>
+
<rect height="2" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 -15.0422 48.8201)" width="4.999" x="0.09" y="26.52"/>
+
<path d="M10.72,21.52l1.499-1.498c4.112,3.081,9.965,2.763,13.7-0.977,4.102-4.101,4.102-10.75,0-14.85-4.1-4.102-10.75-4.102-14.85,0-3.739,3.738-4.058,9.591-0.977,13.7l-1.49,1.5-0.707-0.707-4.949,4.95,3.535,3.535,4.95-4.95-0.71-0.69zm2.48-15.21c2.924-2.925,7.682-2.924,10.6,0s2.925,7.682,0,10.6c-2.924,2.925-7.683,2.924-10.6,0-2.93-2.91-2.93-7.674,0-10.6z"/>
+
<polygon points="17,16,20,16,20,13,23,13,23,10,20,10,20,7,17,7,17,10,14,10,14,13,17,13"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_attach.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_attach.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,16 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
-<path d="M11,1v19.5c0,2.205,1.794,4,4,4c2.205,0,4-1.795,4-4V8h-3v12.5c0,0.551-0.449,1-1,1s-1-0.449-1-1V4h7v18.5 c0,2.481-2.019,4.5-4.5,4.5h-3C11.019,27,9,24.981,9,22.5V8H6v14.5c0,4.136,3.364,7.5,7.5,7.5h3c4.136,0,7.5-3.364,7.5-7.5V1H11z"/>
+<path d="M11,1v19.5c0,2.205,1.794,4,4,4c2.205,0,4-1.795,4-4V8h-3v12.5c0,0.551-0.449,1-1,1s-1-0.449-1-1V4h7v18.5
+ c0,2.481-2.019,4.5-4.5,4.5h-3C11.019,27,9,24.981,9,22.5V8H6v14.5c0,4.136,3.364,7.5,7.5,7.5h3c4.136,0,7.5-3.364,7.5-7.5V1H11z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_audio.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_audio.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,13 @@
-<?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">
+<?xml version="1.0" ?>
+<!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>
+
<path d="M10,3v17.44c-0.751-0.28-1.599-0.44-2.5-0.44-3.037,0-5.5,1.79-5.5,4s2.463,4,5.5,4,5.5-1.791,5.5-4v-15h11v9.44c-0.75-0.28-1.6-0.44-2.5-0.44-3.037,0-5.5,1.791-5.5,4s2.463,4,5.5,4,5.5-1.791,5.5-4v-19h-17z"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_autoflash.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_autoflash.svg Fri May 14 16:09:54 2010 +0300
@@ -1,9 +1,15 @@
-<?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">
+<?xml version="1.0" ?>
+<!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>
+
<path d="M11.25,29l-1.008-3.844h-5.279l-1.031,3.84h-2.93l5.039-17.47h3.797l4.824,17.47h-3.406zm-1.484-5.81l-2.145-8.684-2.203,8.684h4.348z"/>
+
<polygon points="24.13,21,28,9.999,19.36,10,22.54,1,17.24,1,13,13,21.64,13,18.83,21,14,21,21.5,29,29,21"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_automatic.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_automatic.svg Fri May 14 16:09:54 2010 +0300
@@ -1,9 +1,15 @@
-<?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">
+<?xml version="1.0" ?>
+<!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>
+
<path d="M17.28,20.82h2.273l-3.21-11.64h-2.532l-3.359,11.65h1.953l0.688-2.563h3.524l0.67,2.55zm-3.89-3.87l1.469-5.789,1.431,5.789h-2.899z"/>
+
<path d="M1,3v24h28v-24h-28zm25,21h-22v-18h22v18z"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_back.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_back.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,15 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
<polygon points="11,8 11,3 1,10 11,17 11,12 25,12 25,22 17,22 17,26 29,26 29,8 "/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_backspace1.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_backspace1.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,9 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<rect fill="none" height="30" width="30"/>
+
<polygon points="28,13,10,13,10,9,1,15,10,21,10,17,28,17"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_backspace2.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_backspace2.svg Fri May 14 16:09:54 2010 +0300
@@ -1,7 +1,11 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bluetooth.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bluetooth.svg Fri May 14 16:09:54 2010 +0300
@@ -1,7 +1,11 @@
-<?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" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<?xml version="1.0" ?>
+<!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" 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"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bluetooth_headset.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bluetooth_headset.svg Fri May 14 16:09:54 2010 +0300
@@ -1,12 +1,21 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
<path d="M1,17.5C1,19.985,2.791,22,5,22v-9C2.791,13,1,15.015,1,17.5z"/>
<path d="M29,17.5c0,2.485-1.791,4.5-4,4.5v-9C27.209,13,29,15.015,29,17.5z"/>
<polygon points="24,21.173 24,16.829 22,18.829 22,19.173 "/>
<path d="M15,5c3.379,0,6.206,2.406,6.858,5.595L24,13.094V12c0-4.971-4.029-9-9-9s-9,4.029-9,9v11h2V12C8,8.141,11.141,5,15,5z"/>
-<path d="M17,8v8.778l-3.736-3.666L12,14.446l5,4.555l-5,4.612l1.264,1.332l3.743-3.486 L17,30l6-6.999l-4-4l4-4L17,8z M20.473,23.001l-1.998,2.5V21.28L20.473,23.001z M18.475,16.779v-4.223l1.998,2.444L18.475,16.779z" fill-rule="evenodd"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17,8v8.778l-3.736-3.666L12,14.446l5,4.555l-5,4.612l1.264,1.332l3.743-3.486
+ L17,30l6-6.999l-4-4l4-4L17,8z M20.473,23.001l-1.998,2.5V21.28L20.473,23.001z M18.475,16.779v-4.223l1.998,2.444L18.475,16.779z"
+ />
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bluetooth_off.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bluetooth_off.svg Fri May 14 16:09:54 2010 +0300
@@ -1,7 +1,11 @@
-<?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="31px" version="1.1" viewBox="0 0 31 31" width="31px" x="0px" 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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ width="31px" height="31px" viewBox="0 0 31 31" enable-background="new 0 0 31 31" xml:space="preserve">
+<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 x="-2.414" y="14.566" transform="matrix(-0.7079 -0.7063 0.7063 -0.7079 15.5243 37.4201)" width="35.827" height="1.867"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bold.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bold.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,9 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bt_add_new.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bt_add_new.svg Fri May 14 16:09:54 2010 +0300
@@ -1,10 +1,20 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
-<path d="M13.914,18.463c0.347-0.736,0.777-1.424,1.294-2.041l-2.747-2.537L18,9l-8-8v10.282L5.563,6.986L4,8.549l5.543,5.336 L4,19.286l1.563,1.562L10,16.554V27l3.113-3.113C13.046,23.433,13,22.973,13,22.5c0-0.79,0.107-1.554,0.29-2.288l-1.286,1.286 v-4.944L13.914,18.463z M12.004,6.336l2.473,2.473l-2.473,2.474V6.336z"/>
-<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"/>
+<path d="M13.914,18.463c0.347-0.736,0.777-1.424,1.294-2.041l-2.747-2.537L18,9l-8-8v10.282L5.563,6.986L4,8.549l5.543,5.336
+ L4,19.286l1.563,1.562L10,16.554V27l3.113-3.113C13.046,23.433,13,22.973,13,22.5c0-0.79,0.107-1.554,0.29-2.288l-1.286,1.286
+ v-4.944L13.914,18.463z M12.004,6.336l2.473,2.473l-2.473,2.474V6.336z"/>
+<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"/>
<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_bt_pair.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bt_pair.svg Fri May 14 16:09:54 2010 +0300
@@ -1,9 +1,15 @@
-<?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">
+<?xml version="1.0" ?>
+<!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>
+
<path d="M7,0v10.28l-4.437-4.294-1.563,1.563,5.543,5.336-5.543,5.41,1.563,1.562,4.437-4.3v10.45l8-8-5.539-5.115,5.539-4.88-8-8zm4.48,18.02l-2.473,2.473v-4.944l2.473,2.47zm-2.476-7.74v-4.944l2.473,2.473-2.476,2.471z" fill-rule="evenodd"/>
+
<path d="M20,4v10.28l-4.438-4.296-1.56,1.566,5.543,5.336-5.54,5.4,1.563,1.562,4.44-4.3v10.45l8-8-5.539-5.115,5.54-4.88-8-8zm4.48,18.02l-2.473,2.473v-4.944l2.47,2.47zm-2.48-7.74v-4.944l2.473,2.473-2.47,2.47z" fill-rule="evenodd"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bt_show_all.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bt_show_all.svg Fri May 14 16:09:54 2010 +0300
@@ -1,11 +1,24 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
-<path d="M12,24.028c1.14-1.123,2.367-2.026,3.658-2.688L17,20l-3.561-3.071L17,14l-5-5 v6.327l-2.996-2.645L8,13.645l3.563,3.284L8,20.253l1.004,0.961L12,18.57V24.028z M13.146,12.283l1.589,1.521l-1.589,1.522V12.283z M13.146,18.57l1.589,1.521l-1.589,1.522V18.57z" fill-rule="evenodd"/>
-<path d="M10.428,28.235C9.914,27.583,9.889,26.7,10.3,26H5V8h15v12.065C20.332,20.035,20.665,20,21,20c0.673,0,1.339,0.083,2,0.203 V5H2v24h9.086C10.865,28.748,10.641,28.506,10.428,28.235z"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12,24.028c1.14-1.123,2.367-2.026,3.658-2.688L17,20l-3.561-3.071L17,14l-5-5
+ v6.327l-2.996-2.645L8,13.645l3.563,3.284L8,20.253l1.004,0.961L12,18.57V24.028z M13.146,12.283l1.589,1.521l-1.589,1.522V12.283z
+ M13.146,18.57l1.589,1.521l-1.589,1.522V18.57z"/>
+<path d="M10.428,28.235C9.914,27.583,9.889,26.7,10.3,26H5V8h15v12.065C20.332,20.035,20.665,20,21,20c0.673,0,1.339,0.083,2,0.203
+ V5H2v24h9.086C10.865,28.748,10.641,28.506,10.428,28.235z"/>
<path d="M25,20.748c1.034,0.386,2.041,0.906,3,1.581V0H7v3h18V20.748z"/>
-<path d="M30,27c-2.454-3.123-5.586-5-9-5s-6.546,1.877-9,5h2.654 c0.695-0.709,1.521-1.386,2.463-1.921C17.047,25.376,17,25.682,17,26c0,2.21,1.792,4,4,4s4-1.79,4-4 c0-0.318-0.047-0.624-0.117-0.921c0.941,0.535,1.768,1.212,2.463,1.921H30z M21,28c-1.104,0-2-0.447-2-1s0.896-1,2-1s2,0.447,2,1 S22.104,28,21,28z" fill-rule="evenodd"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M30,27c-2.454-3.123-5.586-5-9-5s-6.546,1.877-9,5h2.654
+ c0.695-0.709,1.521-1.386,2.463-1.921C17.047,25.376,17,25.682,17,26c0,2.21,1.792,4,4,4s4-1.79,4-4
+ c0-0.318-0.047-0.624-0.117-0.921c0.941,0.535,1.768,1.212,2.463,1.921H30z M21,28c-1.104,0-2-0.447-2-1s0.896-1,2-1s2,0.447,2,1
+ S22.104,28,21,28z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bt_show_pair.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bt_show_pair.svg Fri May 14 16:09:54 2010 +0300
@@ -1,10 +1,23 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
-<path d="M7,0v10.282L2.563,5.986L1,7.549l5.543,5.336L1,18.286l1.563,1.562L7,15.554V26 l8-8l-5.539-5.115L15,8L7,0z M11.477,18.025l-2.473,2.473v-4.944L11.477,18.025z M9.004,10.282V5.336l2.473,2.473L9.004,10.282z" fill-rule="evenodd"/>
-<path d="M16.262,21.057c1.367-0.612,2.792-0.959,4.243-1.024L21,19.554V20 c0.675,0,1.342,0.083,2.004,0.204v-0.65l0.811,0.811c1.595,0.411,3.129,1.183,4.563,2.259L29,22l-5.539-5.115L29,12l-8-8v10.282 l-4.438-4.296L15,11.549l5.543,5.336L16.262,21.057z M23.004,9.336l2.473,2.473l-2.473,2.474V9.336z" fill-rule="evenodd"/>
-<path d="M30,27c-2.454-3.123-5.586-5-9-5s-6.546,1.877-9,5h2.654 c0.695-0.709,1.522-1.386,2.463-1.921C17.047,25.376,17,25.682,17,26c0,2.21,1.792,4,4,4s4-1.79,4-4 c0-0.318-0.047-0.624-0.117-0.921c0.94,0.535,1.768,1.212,2.463,1.921H30z M21,28c-1.104,0-2-0.447-2-1s0.896-1,2-1s2,0.447,2,1 S22.104,28,21,28z" fill-rule="evenodd"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7,0v10.282L2.563,5.986L1,7.549l5.543,5.336L1,18.286l1.563,1.562L7,15.554V26
+ l8-8l-5.539-5.115L15,8L7,0z M11.477,18.025l-2.473,2.473v-4.944L11.477,18.025z M9.004,10.282V5.336l2.473,2.473L9.004,10.282z"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.262,21.057c1.367-0.612,2.792-0.959,4.243-1.024L21,19.554V20
+ c0.675,0,1.342,0.083,2.004,0.204v-0.65l0.811,0.811c1.595,0.411,3.129,1.183,4.563,2.259L29,22l-5.539-5.115L29,12l-8-8v10.282
+ l-4.438-4.296L15,11.549l5.543,5.336L16.262,21.057z M23.004,9.336l2.473,2.473l-2.473,2.474V9.336z"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M30,27c-2.454-3.123-5.586-5-9-5s-6.546,1.877-9,5h2.654
+ c0.695-0.709,1.522-1.386,2.463-1.921C17.047,25.376,17,25.682,17,26c0,2.21,1.792,4,4,4s4-1.79,4-4
+ c0-0.318-0.047-0.624-0.117-0.921c0.94,0.535,1.768,1.212,2.463,1.921H30z M21,28c-1.104,0-2-0.447-2-1s0.896-1,2-1s2,0.447,2,1
+ S22.104,28,21,28z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bt_unpair.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bt_unpair.svg Fri May 14 16:09:54 2010 +0300
@@ -1,12 +1,24 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
-<path d="M15,8L7,0v10.282L2.563,5.986L1,7.549l5.543,5.336L1,18.286l1.563,1.562L7,15.554V26l6.489-6.489 c0.238-0.717,0.563-1.394,0.956-2.023l-4.984-4.603L15,8z M9.004,5.336l2.473,2.473l-2.473,2.474V5.336z M11.477,18.025 l-2.473,2.473v-4.944L11.477,18.025z"/>
-<path d="M22.004,9.336l2.473,2.473l-1.229,1.229c0.99,0.077,1.939,0.305,2.822,0.664L28,12l-8-8v9.345 c0.644-0.176,1.313-0.284,2.004-0.319V9.336z"/>
+<path d="M15,8L7,0v10.282L2.563,5.986L1,7.549l5.543,5.336L1,18.286l1.563,1.562L7,15.554V26l6.489-6.489
+ c0.238-0.717,0.563-1.394,0.956-2.023l-4.984-4.603L15,8z M9.004,5.336l2.473,2.473l-2.473,2.474V5.336z M11.477,18.025
+ l-2.473,2.473v-4.944L11.477,18.025z"/>
+<path d="M22.004,9.336l2.473,2.473l-1.229,1.229c0.99,0.077,1.939,0.305,2.822,0.664L28,12l-8-8v9.345
+ c0.644-0.176,1.313-0.284,2.004-0.319V9.336z"/>
<path d="M17.194,14.623c0.64-0.432,1.34-0.778,2.077-1.046l-3.709-3.591L14,11.549L17.194,14.623z"/>
-<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"/>
-<polygon points="26.742,20.378 24.621,18.257 22.5,20.378 20.379,18.257 18.257,20.378 20.379,22.5 18.257,24.621 20.379,26.742 22.5,24.621 24.621,26.742 26.742,24.621 24.621,22.5 "/>
+<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"/>
+<polygon points="26.742,20.378 24.621,18.257 22.5,20.378 20.379,18.257 18.257,20.378 20.379,22.5 18.257,24.621 20.379,26.742
+ 22.5,24.621 24.621,26.742 26.742,24.621 24.621,22.5 "/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bullet.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_bullet.svg Fri May 14 16:09:54 2010 +0300
@@ -1,15 +1,27 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
+
<rect height="2" width="17" x="9" y="9"/>
+
<circle cx="5.5" cy="10" r="1.5"/>
+
<rect height="2" width="17" x="9" y="14"/>
+
<rect height="2" width="17" x="8.999" y="19"/>
+
<rect height="2" width="17" x="8.999" y="24"/>
+
<circle cx="5.5" cy="15" r="1.5"/>
+
<circle cx="5.5" cy="20" r="1.5"/>
+
<circle cx="5.5" cy="25" r="1.5"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_call.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_call.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,9 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_call_diverted.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_call_diverted.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,15 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
<polygon points="28,8 19,8 22.086,11.086 17.171,16 2,16 2,19.95 18.879,19.95 18.879,19.849 18.93,19.899 24.914,13.914 28,17 "/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_camcoder_off.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_camcoder_off.svg Fri May 14 16:09:54 2010 +0300
@@ -1,12 +1,19 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="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"/>
+<rect x="13.74" y="-3.242" transform="matrix(0.7063 -0.7079 0.7079 0.7063 -6.0767 14.6963)" width="1.868" height="35.827"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_camcorder.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_camcorder.svg Fri May 14 16:09:54 2010 +0300
@@ -1,9 +1,16 @@
-<?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">
-<rect fill="none" height="30" width="30"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<rect fill="none" width="30" height="30"/>
<polygon points="29,14 25,11 29,8 "/>
<path d="M6.027,7.025v14.949H26V7.025H6.027z M24.026,20H8V9h16.026V20z"/>
<polygon points="5,9 2,7 2,20 5,18 "/>
-<rect height="1" width="11.999" x="10" y="12"/>
+<rect x="10" y="12" width="11.999" height="1"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_camera.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_camera.svg Fri May 14 16:09:54 2010 +0300
@@ -1,9 +1,15 @@
-<?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">
+<?xml version="1.0" ?>
+<!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"/>
+
<rect height="2" width="5" x="20" y="3.5"/>
+
<path d="M2,6.5v20h26v-20h-26zm23,17h-20v-14h20v14z"/>
+
<path d="M15.5,10.5c-3.314,0-6,2.686-6,6s2.686,6,6,6,6-2.686,6-6-2.69-6-6-6zm0,9c-1.656,0-3-1.344-3-3s1.344-3,3-3,3,1.344,3,3-1.34,3-3,3z"/>
+
<circle cx="7.688" cy="12.17" r="1.5"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_capture.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_capture.svg Fri May 14 16:09:54 2010 +0300
@@ -1,9 +1,15 @@
-<?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">
+<?xml version="1.0" ?>
+<!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"/>
+
<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"/>
+
<polygon points="24,12.64,24,26,4,26,4,12,17.18,12,17.38,9.798,16.51,9,1,9,1,29,27,29,27,12.9"/>
+
<polygon points="24.54,7.014,29,11.08,22.99,10.53,18.92,15,19.46,8.988,15,4.922,21.01,5.465,25.08,1"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_change_cam_mode.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_change_cam_mode.svg Fri May 14 16:09:54 2010 +0300
@@ -1,13 +1,23 @@
-<?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">
+<?xml version="1.0" ?>
+<!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"/>
+
<circle cx="4.665" cy="8.688" r="1"/>
+
<rect height="2" width="3.999" x="13" y="2"/>
+
<path d="M12,16v12h15v-12h-15zm13,10h-11v-8h11v8z"/>
+
<polygon points="29,19.37,29,21.08,27.52,20.22,26.04,19.37,27.52,18.51,29,17.66"/>
+
<path d="M7.396,14.34l3.281,1.894c0.109-0.018,0.216-0.033,0.322-0.059v-1.17h2.078c0.763-0.777,1.236-1.84,1.236-3.014,0-2.377-1.935-4.313-4.313-4.313s-4.313,1.936-4.313,4.313c0,1.396,0.677,2.627,1.708,3.415v-1.064zm2.604-4.666c1.275,0,2.313,1.039,2.313,2.313,0,1.275-1.038,2.313-2.313,2.313s-2.313-1.038-2.313-2.313c0.004-1.28,1.041-2.316,2.316-2.316z"/>
+
<polygon points="7.396,16.99,3,16.99,3,6.986,17,6.986,17,15,19,15,19,4.986,1,4.986,1,18.99,7.396,18.99"/>
+
<polygon points="10.99,17.57,8.396,16.07,8.396,20.87,8.396,25.67,10.99,24.17"/>
+
<rect height="1" width="8.999" x="15" y="19.01"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_ciphering_off.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_ciphering_off.svg Fri May 14 16:09:54 2010 +0300
@@ -1,11 +1,20 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
-<path d="M13.52,17.666C13.2,18.021,13,18.485,13,19c0,0.738,0.404,1.376,1,1.723V22c0,0.553,0.447,1,1,1s1-0.447,1-1v-1.277 c0.119-0.069,0.225-0.158,0.326-0.249L13.52,17.666z"/>
+<path d="M13.52,17.666C13.2,18.021,13,18.485,13,19c0,0.738,0.404,1.376,1,1.723V22c0,0.553,0.447,1,1,1s1-0.447,1-1v-1.277
+ c0.119-0.069,0.225-0.158,0.326-0.249L13.52,17.666z"/>
<polygon points="20.854,25 7,25 7,15 10.853,15 7,11.147 7,12 4,12 4,28 23.854,28 "/>
-<path d="M11.413,7.264C12.062,5.93,13.419,5,15,5c2.206,0,4,1.794,4,4v3h-2.851l3,3H23v3.851l3,2.999V12h-3V9c0-4.4-3.6-8-8-8 c-2.67,0-5.04,1.33-6.495,3.356L11.413,7.264z"/>
-<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"/>
+<path d="M11.413,7.264C12.062,5.93,13.419,5,15,5c2.206,0,4,1.794,4,4v3h-2.851l3,3H23v3.851l3,2.999V12h-3V9c0-4.4-3.6-8-8-8
+ c-2.67,0-5.04,1.33-6.495,3.356L11.413,7.264z"/>
+<rect x="13.74" y="-3.242" transform="matrix(0.7063 -0.7079 0.7079 0.7063 -6.0767 14.6963)" width="1.868" height="35.827"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_close_up.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_close_up.svg Fri May 14 16:09:54 2010 +0300
@@ -1,9 +1,15 @@
-<?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">
+<?xml version="1.0" ?>
+<!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="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"/>
+
<path d="M24.98,25.12c-3.402,1.809-7.385,0.973-8.889-1.869l12.33-6.549c1.51,2.84-0.03,6.61-3.44,8.42z"/>
+
<rect height="11.94" width="3" x="13.5" y="17.06"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_collapse.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_collapse.svg Fri May 14 16:09:54 2010 +0300
@@ -1,9 +1,15 @@
-<?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">
+<?xml version="1.0" ?>
+<!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>
+
<path d="M2,2v26h26v-26h-26zm23,23h-20v-20h20v20z"/>
-<polygon points="13,22,17,22,17,17,22,17,22,13,17,13,17,8,13,8,13,13,8,13,8,17,13,17"/>
-</svg>
+
+<rect height="4" width="14" x="8" y="13"/>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_communication.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_communication.svg Fri May 14 16:09:54 2010 +0300
@@ -1,7 +1,26 @@
-<?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">
-<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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<rect fill="none" width="29.999" height="30"/>
+<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"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_conference.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_conference.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,13 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
+
<path d="M10.52,8.506c1.35,0.571,2.732,0.287,3.599-0.017v3.875h1.766v-3.871c0.866,0.304,2.249,0.588,3.599,0.017,2.926-1.238,2.831-3.499,2.831-3.499s-1.41-1.298-4.335-0.06c-2.645,1.12-2.94,2.791-2.973,3.101h-0.01c-0.032-0.31-0.328-1.98-2.973-3.101-2.925-1.238-4.335,0.06-4.335,0.06s-0.102,2.261,2.825,3.499z"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_contact_all.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_contact_all.svg Fri May 14 16:09:54 2010 +0300
@@ -1,10 +1,23 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
-<path d="M11,26c-1.104,0-2-0.896-2-2s0.896-2,2-2c0.718,0,1.343,0.381,1.695,0.949c0.083-0.055,0.167-0.109,0.262-0.171 c1.875-1.218,3.101-2.121,3.656-2.697c-0.025-0.025-0.044-0.056-0.069-0.081H4V2h14v4.68c0.638-0.346,1.318-0.577,2-0.65V3 c0-1.65-1.35-3-3-3H5C3.35,0,2,1.35,2,3v22c0,1.65,1.35,3,3,3h6V26z M7,25H4v-2h3V25z"/>
-<path d="M18.828,19.312c0.002,0.117,0.009,0.728,0.001,0.844c-0.005,0.079-0.032,0.164-0.061,0.249h4.464 c-0.028-0.085-0.056-0.17-0.061-0.249c-0.008-0.123,0-0.719,0-0.844c0.828-0.575,1.407-1.251,1.844-2.134 c0.808-1.634,0.375-5.479,0.375-5.479C25.391,9.994,23.196,8,21.525,8h-1.06c-1.67,0-3.869,1.994-3.869,3.698 c0,0-0.383,3.827,0.372,5.474C17.384,18.072,17.981,18.737,18.828,19.312z"/>
-<path d="M23.593,21.035L21,27.082l-2.592-6.047c-1.292,1.677-5.184,3.844-5.408,4.148V30h16v-4.813 C28.775,24.882,24.884,22.713,23.593,21.035z"/>
+<path d="M11,26c-1.104,0-2-0.896-2-2s0.896-2,2-2c0.718,0,1.343,0.381,1.695,0.949c0.083-0.055,0.167-0.109,0.262-0.171
+ c1.875-1.218,3.101-2.121,3.656-2.697c-0.025-0.025-0.044-0.056-0.069-0.081H4V2h14v4.68c0.638-0.346,1.318-0.577,2-0.65V3
+ c0-1.65-1.35-3-3-3H5C3.35,0,2,1.35,2,3v22c0,1.65,1.35,3,3,3h6V26z M7,25H4v-2h3V25z"/>
+<path d="M18.828,19.312c0.002,0.117,0.009,0.728,0.001,0.844c-0.005,0.079-0.032,0.164-0.061,0.249h4.464
+ c-0.028-0.085-0.056-0.17-0.061-0.249c-0.008-0.123,0-0.719,0-0.844c0.828-0.575,1.407-1.251,1.844-2.134
+ c0.808-1.634,0.375-5.479,0.375-5.479C25.391,9.994,23.196,8,21.525,8h-1.06c-1.67,0-3.869,1.994-3.869,3.698
+ c0,0-0.383,3.827,0.372,5.474C17.384,18.072,17.981,18.737,18.828,19.312z"/>
+<path d="M23.593,21.035L21,27.082l-2.592-6.047c-1.292,1.677-5.184,3.844-5.408,4.148V30h16v-4.813
+ C28.775,24.882,24.884,22.713,23.593,21.035z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_contacts.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_contacts.svg Fri May 14 16:09:54 2010 +0300
@@ -1,10 +1,20 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
<path d="M5,2v2H3v2h2v3H3v2h2v3H3v2h2v3H3v2h2v3H3v2h2v2h22V2H5z M24,25H8V5h16V25z"/>
-<path d="M14.371,15.227c0.002,0.086,0.007,0.53,0.001,0.614c-0.004,0.058-0.024,0.12-0.046,0.183c0-0.001,0.001-0.002,0.001-0.002 h3.347c0,0,0,0.001,0.001,0.001c-0.021-0.062-0.042-0.124-0.046-0.182c-0.007-0.09,0-0.523,0.001-0.614 c0.621-0.418,1.056-0.91,1.382-1.553c0.606-1.187,0.282-3.984,0.282-3.984C19.294,8.45,17.647,7,16.395,7H15.6 c-1.254,0-2.902,1.45-2.902,2.689c0,0-0.287,2.783,0.278,3.981C13.288,14.325,13.735,14.809,14.371,15.227z"/>
+<path d="M14.371,15.227c0.002,0.086,0.007,0.53,0.001,0.614c-0.004,0.058-0.024,0.12-0.046,0.183c0-0.001,0.001-0.002,0.001-0.002
+ h3.347c0,0,0,0.001,0.001,0.001c-0.021-0.062-0.042-0.124-0.046-0.182c-0.007-0.09,0-0.523,0.001-0.614
+ c0.621-0.418,1.056-0.91,1.382-1.553c0.606-1.187,0.282-3.984,0.282-3.984C19.294,8.45,17.647,7,16.395,7H15.6
+ c-1.254,0-2.902,1.45-2.902,2.689c0,0-0.287,2.783,0.278,3.981C13.288,14.325,13.735,14.809,14.371,15.227z"/>
<path d="M22,19.5c-0.169-0.222-3.088-1.801-4.056-3.02L16,21l-1.943-4.521c-0.968,1.22-3.888,2.797-4.057,3.019V23h12V19.5z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_continuous_capture.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_continuous_capture.svg Fri May 14 16:09:54 2010 +0300
@@ -1,10 +1,17 @@
-<?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">
+<?xml version="1.0" ?>
+<!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>
+
<path d="M1,2v16h18v-16h-18zm15,13h-12v-10h12v10z"/>
+
<polygon points="26,12,26,25,14,25,11,25,11,28,29,28,29,12"/>
+
<polygon points="21,7,21,20,9,20,6,20,6,23,24,23,24,7"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_contrast.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_contrast.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,16 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
-<path d="M15,2C7.82,2,2,7.82,2,14.999c0,7.18,5.82,13,13,13s13-5.82,13-13C28,7.82,22.18,2,15,2z M15,24.999 c-5.514,0-10-4.486-10-10C5,9.486,9.486,5,15,5V24.999z"/>
+<path d="M15,2C7.82,2,2,7.82,2,14.999c0,7.18,5.82,13,13,13s13-5.82,13-13C28,7.82,22.18,2,15,2z M15,24.999
+ c-5.514,0-10-4.486-10-10C5,9.486,9.486,5,15,5V24.999z"/>
</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_corrupted.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
+</g>
+<path d="M16.65,4l-3.458,7.778l5.952,5.951L16.387,26H29V4H16.65z M26,23h-6.505l1.938-5.811l-5.854-5.854L17.505,7H26V23z"/>
+<path d="M10.808,12.222L14.461,4H1v22h13.279l2.576-7.729L10.808,12.222z M13.171,23H4V7h6.939l-2.518,5.664l6.146,6.146L13.171,23z
+ "/>
+</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_countdown_timer.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_countdown_timer.svg Fri May 14 16:09:54 2010 +0300
@@ -1,9 +1,18 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
-<path d="M15,2c-1.942,0-3.779,0.438-5.434,1.202l2.306,2.306C12.857,5.183,13.907,5,15,5c5.514,0,10,4.486,10,10s-4.486,10-10,10 S5,20.514,5,15c0-1.093,0.183-2.143,0.508-3.127L3.201,9.566C2.438,11.221,2,13.058,2,15c0,7.18,5.82,13,13,13s13-5.82,13-13 S22.18,2,15,2z"/>
-<rect height="13" transform="matrix(0.707 -0.7072 0.7072 0.707 -4.2932 10.3659)" width="5" x="7.864" y="3.864"/>
+<path d="M15,2c-1.942,0-3.779,0.438-5.434,1.202l2.306,2.306C12.857,5.183,13.907,5,15,5c5.514,0,10,4.486,10,10s-4.486,10-10,10
+ S5,20.514,5,15c0-1.093,0.183-2.143,0.508-3.127L3.201,9.566C2.438,11.221,2,13.058,2,15c0,7.18,5.82,13,13,13s13-5.82,13-13
+ S22.18,2,15,2z"/>
+<rect x="7.864" y="3.864" transform="matrix(0.707 -0.7072 0.7072 0.707 -4.2932 10.3659)" width="5" height="13"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_create_email.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_create_email.svg Fri May 14 16:09:54 2010 +0300
@@ -1,10 +1,17 @@
-<?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">
+<?xml version="1.0" ?>
+<!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>
+
<path d="M9.293,14.96c0,1.567,0.373,2.805,1.121,3.712,0.747,0.907,1.668,1.36,2.762,1.36,0.608,0,1.148-0.108,1.626-0.32l1.918-1.918c0.072-0.123,0.146-0.239,0.216-0.373,0.012,0.041,0.029,0.076,0.041,0.115l2.424-2.423c0.02-1.68,0.336-4.327,0.953-7.96h-3.787c-2.206,0-3.97,0.692-5.291,2.078-1.317,1.382-1.977,3.292-1.977,5.722zm4.237-4.17c0.665-0.993,1.472-1.49,2.42-1.49h0.848l-0.506,4.006c-0.219,1.695-0.497,2.885-0.834,3.568-0.338,0.684-0.779,1.025-1.326,1.025-0.611,0-1.03-0.246-1.258-0.738-0.229-0.492-0.342-1.271-0.342-2.338,0-1.69,0.33-3.04,1-4.03z"/>
+
<path d="M6.736,13.33c0-2.825,0.818-5.033,2.454-6.624s3.762-2.386,6.378-2.386c2.479,0,4.391,0.754,5.735,2.263,1.062,1.19,1.696,2.781,1.921,4.758,0.777-0.527,1.844-0.448,2.533,0.241l0.206,0.206c-0.173-2.918-1.066-5.232-2.691-6.935-1.82-1.903-4.41-2.855-7.77-2.855-3.373,0-6.157,1.019-8.354,3.056s-3.295,4.842-3.295,8.415c0,3.746,1.068,6.629,3.206,8.647,1.26,1.189,2.782,2.02,4.554,2.508l0.138-1.24c0.044-0.399,0.212-0.769,0.471-1.072-3.65-1.1-5.484-4.09-5.484-8.99z"/>
+
<path d="M24.34,13l-10.6,10.61-0.707,6.364,6.364-0.707,10.61-10.6-5.66-5.66zm-5.65,14.14l-2.828-2.828,8.484-8.485,2.829,2.829-8.48,8.49z"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_create_event.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_create_event.svg Fri May 14 16:09:54 2010 +0300
@@ -1,12 +1,20 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
-<rect height="2" width="2" x="7" y="6"/>
-<rect height="2" width="10" x="10" y="6"/>
+<rect x="7" y="6" width="2" height="2"/>
+<rect x="10" y="6" width="10" height="2"/>
<path d="M5,3h18v8.557c0.785-0.716,1.999-0.7,2.758,0.059L26,11.857V0H2v29h9.128l0.333-3H5V3z"/>
<polygon points="26,29 26,25.515 22.515,29 "/>
-<path d="M24.343,13.029L13.736,23.636L13.029,30l6.364-0.707L30,18.687L24.343,13.029z M18.687,27.171l-2.828-2.828l8.484-8.485 l2.829,2.829L18.687,27.171z"/>
+<path d="M24.343,13.029L13.736,23.636L13.029,30l6.364-0.707L30,18.687L24.343,13.029z M18.687,27.171l-2.828-2.828l8.484-8.485
+ l2.829,2.829L18.687,27.171z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_create_group.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_create_group.svg Fri May 14 16:09:54 2010 +0300
@@ -1,13 +1,30 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
-<path d="M10.372,17.177c-0.732-0.662-1.289-1.417-1.714-2.314c-1.002-2.12-0.705-5.979-0.611-6.944 c0.072-2.494,2.419-4.848,4.768-5.638C11.827,1.015,10.188,0,8.936,0H7.722C5.807,0,3.38,2.367,3.38,4.388 c0,0-0.29,4.066,0.575,6.022c0.475,1.067,0.918,1.963,1.889,2.645c0.003,0.14,0.012,0.733,0.003,0.87 C5.729,15.909,0,18.276,0,18.276V24h4v-1.927l0.407-0.536c0.296-0.391,0.623-0.597,1.705-1.277 C8.353,18.849,9.781,17.814,10.372,17.177z"/>
-<path d="M13.179,20.696l-1.094-2.476C10.631,20.049,6.253,22.413,6,22.746V28h8.769C13.66,26.446,13,24.551,13,22.5 C13,21.883,13.065,21.281,13.179,20.696z"/>
-<path d="M10.046,8.034c0,0-0.43,4.175,0.419,5.972c0.466,0.982,1.139,1.708,2.092,2.334c0.002,0.128,0.01,0.794,0.001,0.921 c-0.005,0.087-0.037,0.179-0.068,0.271h1.921c1.206-1.953,3.094-3.442,5.334-4.122c0.585-1.979,0.194-5.376,0.194-5.376 c0-1.858-2.47-4.034-4.35-4.034h-1.191C12.52,4,10.046,6.176,10.046,8.034z"/>
-<path d="M21.938,7.903c0.081,0.743,0.289,3.097-0.061,5.128C22.084,13.018,22.29,13,22.5,13c0.566,0,1.117,0.059,1.656,0.154 c0-0.049,0.001-0.101,0.002-0.126c0.947-0.685,1.361-1.57,1.861-2.618c0.926-1.938,0.587-6.022,0.587-6.022 C26.606,2.367,24.183,0,22.269,0h-1.214c-1.253,0-2.889,1.016-3.874,2.282C19.521,3.073,21.859,5.417,21.938,7.903z"/>
-<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"/>
+<path d="M10.372,17.177c-0.732-0.662-1.289-1.417-1.714-2.314c-1.002-2.12-0.705-5.979-0.611-6.944
+ c0.072-2.494,2.419-4.848,4.768-5.638C11.827,1.015,10.188,0,8.936,0H7.722C5.807,0,3.38,2.367,3.38,4.388
+ c0,0-0.29,4.066,0.575,6.022c0.475,1.067,0.918,1.963,1.889,2.645c0.003,0.14,0.012,0.733,0.003,0.87
+ C5.729,15.909,0,18.276,0,18.276V24h4v-1.927l0.407-0.536c0.296-0.391,0.623-0.597,1.705-1.277
+ C8.353,18.849,9.781,17.814,10.372,17.177z"/>
+<path d="M13.179,20.696l-1.094-2.476C10.631,20.049,6.253,22.413,6,22.746V28h8.769C13.66,26.446,13,24.551,13,22.5
+ C13,21.883,13.065,21.281,13.179,20.696z"/>
+<path d="M10.046,8.034c0,0-0.43,4.175,0.419,5.972c0.466,0.982,1.139,1.708,2.092,2.334c0.002,0.128,0.01,0.794,0.001,0.921
+ c-0.005,0.087-0.037,0.179-0.068,0.271h1.921c1.206-1.953,3.094-3.442,5.334-4.122c0.585-1.979,0.194-5.376,0.194-5.376
+ c0-1.858-2.47-4.034-4.35-4.034h-1.191C12.52,4,10.046,6.176,10.046,8.034z"/>
+<path d="M21.938,7.903c0.081,0.743,0.289,3.097-0.061,5.128C22.084,13.018,22.29,13,22.5,13c0.566,0,1.117,0.059,1.656,0.154
+ c0-0.049,0.001-0.101,0.002-0.126c0.947-0.685,1.361-1.57,1.861-2.618c0.926-1.938,0.587-6.022,0.587-6.022
+ C26.606,2.367,24.183,0,22.269,0h-1.214c-1.253,0-2.889,1.016-3.874,2.282C19.521,3.073,21.859,5.417,21.938,7.903z"/>
+<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"/>
<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_create_message.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_create_message.svg Fri May 14 16:09:54 2010 +0300
@@ -1,9 +1,19 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
-<path d="M11.749,23.386c0.05-0.452,0.252-0.872,0.573-1.193L13.515,21H4.414l6.115-6.115L14,18.355l3.471-3.471l1.08,1.08 l0.707-0.707l-1.08-1.08L24,8.355v2.677c0.619-0.107,1.279,0.075,1.758,0.553L27,12.828V4H1v20h10.681L11.749,23.386z M22.527,7 L14,15.527L5.473,7H22.527z M4,8.355l5.822,5.822L4,20V8.355z"/>
-<path d="M24.343,13L13.736,23.606l-0.707,6.364l6.364-0.707L30,18.657L24.343,13z M18.687,27.142l-2.828-2.828l8.484-8.485 l2.829,2.829L18.687,27.142z"/>
+<path d="M11.749,23.386c0.05-0.452,0.252-0.872,0.573-1.193L13.515,21H4.414l6.115-6.115L14,18.355l3.471-3.471l1.08,1.08
+ l0.707-0.707l-1.08-1.08L24,8.355v2.677c0.619-0.107,1.279,0.075,1.758,0.553L27,12.828V4H1v20h10.681L11.749,23.386z M22.527,7
+ L14,15.527L5.473,7H22.527z M4,8.355l5.822,5.822L4,20V8.355z"/>
+<path d="M24.343,13L13.736,23.606l-0.707,6.364l6.364-0.707L30,18.657L24.343,13z M18.687,27.142l-2.828-2.828l8.484-8.485
+ l2.829,2.829L18.687,27.142z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_day_light_saving_time.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_day_light_saving_time.svg Fri May 14 16:09:54 2010 +0300
@@ -1,11 +1,19 @@
-<?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">
+<?xml version="1.0" ?>
+<!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="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"/>
+
<path d="M15,1c-7.732,0-14,6.268-14,14,0,7.73,6.268,14,14,14,7.731,0,14-6.27,14-14,0-7.732-6.27-14-14-14zm0,25c-6.075,0-11-4.92-11-11,0-6.076,4.925-11,11-11s11,4.924,11,11c0,6.08-4.92,11-11,11z"/>
+
<rect height="9" width="2" x="14.04" y="6.009"/>
+
<rect height="9.001" transform="matrix(0.8281 0.5605 -0.5605 0.8281 9.3921 -7.8538)" width="2" x="16.5" y="6.888"/>
+
<circle cx="15.03" cy="15.01" r="1"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_delete.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_delete.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,15 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
<path d="M19,4V1h-8v3H5v3h20V4H19z M13,3h4v1h-4V3z"/>
<path d="M6,29h18V8H6V29z M19,11h2v14h-2V11z M14,11h2v14h-2V11z M9,11h2v14H9V11z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_details.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_details.svg Fri May 14 16:09:54 2010 +0300
@@ -1,18 +1,28 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
-<rect height="2" width="2" x="6" y="6"/>
-<rect height="2" width="9.941" x="9.059" y="6"/>
-<rect height="2" width="2" x="6" y="11"/>
-<rect height="2" width="2" x="6" y="16"/>
-<rect height="2" width="2" x="6" y="21"/>
+<rect x="6" y="6" width="2" height="2"/>
+<rect x="9.059" y="6" width="9.941" height="2"/>
+<rect x="6" y="11" width="2" height="2"/>
+<rect x="6" y="16" width="2" height="2"/>
+<rect x="6" y="21" width="2" height="2"/>
<path d="M9.059,23h0.71c-0.264-0.369-0.501-0.756-0.71-1.161V23z"/>
<path d="M9.059,11v2h0.078c0.395-0.731,0.889-1.399,1.454-2H9.059z"/>
-<path d="M21.45,26.129C20.246,26.683,18.91,27,17.5,27c-1.516,0-2.944-0.366-4.217-1H4V3h18v6.137c1.171,0.633,2.188,1.509,3,2.554 V0H1v29h23.326C24.078,28.745,21.45,26.129,21.45,26.129z"/>
-<rect height="2" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -10.8558 27.5915)" width="4" x="25.878" y="25.9"/>
-<path d="M24.349,20.542C24.765,19.611,25,18.584,25,17.5c0-4.136-3.364-7.5-7.5-7.5S10,13.364,10,17.5s3.364,7.5,7.5,7.5 c1.596,0,3.074-0.505,4.291-1.358l2.552,2.551l2.828-2.828L24.349,20.542z M12,17.5c0-3.032,2.467-5.5,5.5-5.5s5.5,2.468,5.5,5.5 S20.533,23,17.5,23S12,20.532,12,17.5z"/>
+<path d="M21.45,26.129C20.246,26.683,18.91,27,17.5,27c-1.516,0-2.944-0.366-4.217-1H4V3h18v6.137c1.171,0.633,2.188,1.509,3,2.554
+ V0H1v29h23.326C24.078,28.745,21.45,26.129,21.45,26.129z"/>
+<rect x="25.878" y="25.9" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -10.8558 27.5915)" width="4" height="2"/>
+<path d="M24.349,20.542C24.765,19.611,25,18.584,25,17.5c0-4.136-3.364-7.5-7.5-7.5S10,13.364,10,17.5s3.364,7.5,7.5,7.5
+ c1.596,0,3.074-0.505,4.291-1.358l2.552,2.551l2.828-2.828L24.349,20.542z M12,17.5c0-3.032,2.467-5.5,5.5-5.5s5.5,2.468,5.5,5.5
+ S20.533,23,17.5,23S12,20.532,12,17.5z"/>
<polygon points="22,19 22,16 19,16 19,13 16,13 16,16 13,16 13,19 16,19 16,22 19,22 19,19 "/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_dialer.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_dialer.svg Fri May 14 16:09:54 2010 +0300
@@ -1,17 +1,24 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
-<rect height="5" width="5" x="12" y="2"/>
-<rect height="5" width="5" x="12" y="9"/>
-<rect height="5" width="5" x="12" y="16"/>
-<rect height="5" width="5" x="5" y="2"/>
-<rect height="5" width="5" x="5" y="9"/>
-<rect height="5" width="5" x="5" y="16"/>
-<rect height="5" width="5" x="19" y="2"/>
-<rect height="5" width="5" x="19" y="9"/>
-<rect height="5" width="5" x="19" y="16"/>
-<rect height="5" width="5" x="12" y="23"/>
+<rect x="12" y="2" width="5" height="5"/>
+<rect x="12" y="9" width="5" height="5"/>
+<rect x="12" y="16" width="5" height="5"/>
+<rect x="5" y="2" width="5" height="5"/>
+<rect x="5" y="9" width="5" height="5"/>
+<rect x="5" y="16" width="5" height="5"/>
+<rect x="19" y="2" width="5" height="5"/>
+<rect x="19" y="9" width="5" height="5"/>
+<rect x="19" y="16" width="5" height="5"/>
+<rect x="12" y="23" width="5" height="5"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_disconnect.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_disconnect.svg Fri May 14 16:09:54 2010 +0300
@@ -1,12 +1,19 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
<polygon points="16.854,21 12.854,17 1,17 11,27 14,24.344 10.657,21 "/>
<polygon points="25.15,21 28,21 28,17 21.149,17 "/>
<polygon points="13.148,9 17.149,13 29,13 19,3 16,5.657 19.343,9 "/>
<polygon points="4.853,9 2,9 2,13 8.853,13 "/>
-<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"/>
+<rect x="13.74" y="-3.242" transform="matrix(0.7063 -0.7079 0.7079 0.7063 -6.0767 14.6963)" width="1.868" height="35.827"/>
</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_drm_rights_expired.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
+</g>
+<path d="M11,5h6c0.553,0,1,0.447,1,1s-0.447,1-1,1h-5.851L19,14.851v-2.626c1.041-0.593,2.136-1.309,2.136-1.309
+ c0.529-0.418,0.915-1.316,0.858-1.996c0,0-0.68-4.737-1.039-5.313c0,0-1.628-2.606-7.067-2.606C9.759,1,7.98,2.492,7.361,3.213
+ l2.664,2.663C10.089,5.385,10.491,5,11,5z"/>
+<polygon points="17.785,21.932 15.061,19.208 14.572,19.71 15.846,21.081 14.568,22.456 16,23.846 16,24.278 14,26.691 12,24.279
+ 12,16.147 9,13.147 9,15.998 10,15.998 10,25 13.315,29 14.684,29 18,25 18,23 17.365,22.384 "/>
+<rect x="13.741" y="-3.24" transform="matrix(0.7076 -0.7066 0.7066 0.7076 -6.0779 14.6588)" width="1.866" height="35.827"/>
+</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_drop_call.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_drop_call.svg Fri May 14 16:09:54 2010 +0300
@@ -1,13 +1,23 @@
-<?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">
+<?xml version="1.0" ?>
+<!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>
+
<path d="M7.129,14.84c-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.245-1.647-2.695-2.898-2.695h-0.795c-1.254,0-2.903,1.45-2.903,2.689,0,0-0.287,2.783,0.279,3.981,0.311,0.654,0.76,1.139,1.395,1.556,0.002,0.085,0.007,0.529,0.002,0.614-0.078,1.22-3.673,3.39-3.873,3.66v3.5h11.5v-3.5c-0.2-0.26-4.295-2.44-4.371-3.66z"/>
+
<path d="M11.02,12.17l2.82-2.818c-0.124-0.181-0.2-0.352-0.21-0.507-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.244-1.64-2.694-2.89-2.694h-0.8c-1.254,0-2.902,1.45-2.902,2.689,0,0-0.118,1.153-0.052,2.294,1.202,0.875,2.088,2.216,2.145,3.568,0.098,0.898,0.291,3.486-0.496,5.031-0.215,0.422-0.468,0.806-0.762,1.156,0.403,0.321,1.018,0.747,1.815,1.261h3.505l-3.82-3.83z"/>
+
<path d="M24.26,17.11c0.001-0.137,0.002-0.266,0.003-0.314,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.043,0.425-0.071,1.04l6.54,6.54z"/>
+
<path d="M30,22.85v-0.444c-0.079-0.104-0.616-0.434-1.328-0.884l1.33,1.32z"/>
+
<path d="M18.41,19.56c-1.64,1.318-3.989,2.618-4.161,2.844v4.6h11.6l-7.44-7.44z"/>
+
<rect height="20.98" transform="matrix(0.7066 -0.7076 0.7076 0.7066 -6.9576 21.0662)" width="1.867" x="20.99" y="8.434"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_edit.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_edit.svg Fri May 14 16:09:54 2010 +0300
@@ -1,11 +1,20 @@
-<?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">
-<rect fill="none" height="30" width="30"/>
-<rect fill="none" height="30" width="30"/>
-<rect height="18.75" transform="matrix(-0.707 -0.7072 0.7072 -0.707 20.7598 33.8275)" width="6" x="14.39" y="3.239"/>
-<polygon points="7.045,16.59,4.924,15.53,18.18,2.272,20.3,3.332"/>
-<polygon points="14.47,25.08,13.41,22.96,26.67,9.697,27.73,11.82"/>
-<polygon points="7.84,26.93,13.41,26.14,11.82,22.42,7.576,18.18,3.862,16.59,3.067,22.16"/>
-<polygon points="2.935,23.09,2.272,27.73,6.913,27.06"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
+</g>
+<path d="M25.502,4.497c-3.124-3.124-6.923-4.391-8.485-2.828c-0.001,0.001-0.002,0.002-0.003,0.003L2.871,15.814l-0.008,0.07l0,0
+ l-0.019,0.173L1.489,28.445l-0.032,0.097l0.098-0.032l12.595-1.415l0.542-0.539c0,0,0,0,0-0.001l13.635-13.569
+ c0.001-0.001,0.002-0.002,0.004-0.003C29.893,11.42,28.626,7.621,25.502,4.497z M7.257,25.857l-3.13-3.131l0.656-5.995l0.082-0.082
+ c1.639,0.432,3.549,1.566,5.266,3.282c1.665,1.665,2.781,3.512,3.241,5.117l-0.137,0.137L7.257,25.857z M26.916,11.568
+ l-12.15,12.093c-0.459-1.606-1.575-3.456-3.241-5.123c-1.708-1.709-3.617-2.856-5.253-3.295L18.428,3.086
+ c0.355-0.355,2.922,0.087,5.66,2.825S27.269,11.216,26.916,11.568z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,9 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs_attach.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs_attach.svg Fri May 14 16:09:54 2010 +0300
@@ -1,17 +1,31 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
+
<polygon points="23.47,22.38,24.72,24.4,24.72,22.38"/>
+
<polygon points="23.47,22.38,24.72,24.4,24.72,22.38"/>
+
<polygon points="20.3,17.36,21.81,19.8,24.72,19.8,20.52,13.07,18.45,14.36,20.32,17.36"/>
+
<polygon points="19.46,19.8,17.95,17.36,13.86,17.36,15.37,19.8"/>
+
<polygon points="13.02,19.8,11.51,17.36,7.38,17.36,8.891,19.8"/>
+
<polygon points="5.279,17.76,5.279,19.8,6.541,19.8"/>
+
<polygon points="5.279,17.76,5.279,19.8,6.541,19.8"/>
+
<polygon points="20.33,3.264,20.33,0.895,9.633,0.895,9.633,11.51,20.33,11.51,20.33,9.141,11.93,9.141,11.93,7.354,18.34,7.354,18.34,5.051,11.93,5.051,11.93,3.264"/>
+
<polygon points="20.33,3.264,20.33,0.895,9.633,0.895,9.633,11.51,20.33,11.51,20.33,9.141,11.93,9.141,11.93,7.354,18.34,7.354,18.34,5.051,11.93,5.051,11.93,3.264"/>
+
<rect fill="none" height="30" width="30"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs_context.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs_context.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,13 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
+
<rect fill="none" height="30" width="30"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs_multipdp.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs_multipdp.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,13 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
+
<rect fill="none" height="30" width="30"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs_suspended.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_egprs_suspended.svg Fri May 14 16:09:54 2010 +0300
@@ -1,11 +1,19 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
+
<polygon points="5.279,19.7,5.279,17.27,14.8,17.27,12.75,19.7"/>
+
<polygon points="21.42,14.55,21.5,14.61,21.45,14.67,10.38,27.86,9.381,29.05,7.515,27.48,8.938,25.79,19.63,13.04"/>
+
<polygon points="20.34,3.321,20.34,0.952,9.633,0.952,9.633,11.57,20.34,11.57,20.34,9.199,11.93,9.199,11.93,7.411,18.34,7.411,18.34,5.109,11.93,5.109,11.93,3.321"/>
+
<rect fill="none" height="30" width="30"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_end_call.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_end_call.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,9 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_enter.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_enter.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,9 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_exit.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_exit.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,16 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
-<polygon points="26.314,6.515 23.485,3.686 15,12.171 6.515,3.686 3.687,6.515 12.172,15 3.687,23.485 6.515,26.313 15,17.828 23.485,26.313 26.314,23.485 17.828,15 "/>
+<polygon points="26.314,6.515 23.485,3.686 15,12.171 6.515,3.686 3.687,6.515 12.172,15 3.687,23.485 6.515,26.313 15,17.828
+ 23.485,26.313 26.314,23.485 17.828,15 "/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_expand.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_expand.svg Fri May 14 16:09:54 2010 +0300
@@ -1,9 +1,15 @@
-<?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">
+<?xml version="1.0" ?>
+<!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>
+
<path d="M2,2v26h26v-26h-26zm23,23h-20v-20h20v20z"/>
-<rect height="4" width="14" x="8" y="13"/>
-</svg>
+
+<polygon points="13,22,17,22,17,17,22,17,22,13,17,13,17,8,13,8,13,13,8,13,8,17,13,17"/>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_exposure.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_exposure.svg Fri May 14 16:09:54 2010 +0300
@@ -1,7 +1,11 @@
-<?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" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<?xml version="1.0" ?>
+<!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" 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"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_face_tracking.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_face_tracking.svg Fri May 14 16:09:54 2010 +0300
@@ -1,12 +1,21 @@
-<?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">
+<?xml version="1.0" ?>
+<!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="4,10,4,5,11,5,11,2,1,2,1,10"/>
+
<polygon points="4,20,1,20,1,28,11,28,11,25,4,25"/>
+
<polygon points="26,10,29,10,29,2,19,2,19,5,26,5"/>
+
<polygon points="26,20,26,25,19,25,19,28,29,28,29,20"/>
+
<path d="M8.006,22.35l-0.006,1.2h14l-0.006-1.205s-4.371-2.604-4.81-4.053c-0.019-0.061-0.04-0.121-0.044-0.178v-0.738c0.001-0.023,0.001-0.059,0.001-0.072,0.819-0.553,1.394-1.201,1.824-2.049,0.8-1.568,0.372-5.262,0.372-5.262,0-1.635-2.173-3.549-3.827-3.549h-1.049c-1.654,0-3.831,1.914-3.831,3.549,0,0-0.38,3.676,0.368,5.256,0.411,0.865,1.002,1.504,1.841,2.055,0.003,0.113,0.009,0.699,0.002,0.811-0.005,0.076-0.032,0.156-0.061,0.238h0.018c-0.53,1.46-4.784,4-4.784,4z"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_face_tracking_off.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_face_tracking_off.svg Fri May 14 16:09:54 2010 +0300
@@ -1,16 +1,29 @@
-<?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">
+<?xml version="1.0" ?>
+<!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>
+
<path d="M10.93,15.08c0.023,0.059,0.044,0.121,0.07,0.175,0.411,0.865,1.002,1.503,1.841,2.054,0.003,0.113,0.009,0.699,0.002,0.811-0.005,0.076-0.032,0.156-0.061,0.238h0.018c-0.539,1.459-4.793,3.992-4.793,3.992l-0.007,1.2h11.4l-8.47-8.47z"/>
+
<path d="M19.1,14.95c0.617-1.695,0.24-4.953,0.24-4.953,0-1.635-2.173-3.549-3.827-3.549h-1.049c-0.86,0-1.854,0.521-2.618,1.248l7.26,7.254z"/>
+
<polygon points="4,20,1,20,1,28,11,28,11,25,4,25"/>
+
<polygon points="26,10,29,10,29,2,19,2,19,5,26,5"/>
+
<polygon points="9.148,5,11,5,11,2,6.148,2"/>
+
<polygon points="1,5.148,1,10,4,10,4,8.148"/>
+
<polygon points="29,24.85,29,20,26,20,26,21.85"/>
+
<polygon points="20.85,25,19,25,19,28,23.85,28"/>
+
<rect height="35.83" transform="matrix(0.7061 -0.7082 0.7082 0.7061 -6.212 15.0307)" width="1.867" x="14.07" y="-2.915"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_failed.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<rect fill="none" width="30" height="30"/>
+<path fill="none" 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"/>
+<path fill="none" 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"/>
+<path d="M15,1.999C7.82,1.999,2,7.819,2,15c0,7.18,5.82,13,13,13s13-5.82,13-13C28,7.819,22.18,1.999,15,1.999z M15,4.999
+ c2.217,0,4.26,0.734,5.92,1.959L6.958,20.919C5.733,19.26,5,17.216,5,15C5,9.485,9.486,4.999,15,4.999z M15,25
+ c-2.217,0-4.26-0.734-5.92-1.959L23.041,9.079C24.266,10.739,25,12.783,25,15C25,20.514,20.514,25,15,25z"/>
+</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_favourites.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_favourites.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,15 @@
-<?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">
-<rect fill="none" height="30" width="30"/>
-<polygon points="15.01,22.54,5.718,29.35,9.3,18.38,0,11.61,11.47,11.61,15.01,0.645,18.53,11.61,30,11.61,20.71,18.38,24.28,29.36"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
+</g>
+<polygon points="15,22.9 7,27 8.5,18.316 2,12 10.982,10.9 15,3 19.018,10.9 28,12 21.5,18.316 23,27 "/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_favourites_remove.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_favourites_remove.svg Fri May 14 16:09:54 2010 +0300
@@ -1,13 +1,19 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
-<g fill-opacity="0.5" stroke-opacity="0.5">
-<rect fill="none" height="30" width="30"/>
-</g>
-<path d="M22.5,13c0.458,0,0.904,0.044,1.346,0.106L28,10H17.296L14.008,0l-3.3,10H0l8.68,6.483L5,27l8.128-5.986 C13.846,16.48,17.769,13,22.5,13z"/>
-<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"/>
+<path d="M22.5,13c0.749,0,1.475,0.096,2.174,0.261L27,11l-8.982-1.1L14,2L9.982,9.9L1,11l6.5,6.316L6,26l7.004-3.59
+ C13.053,17.214,17.292,13,22.5,13z"/>
+<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 x="18" y="21" width="9" height="3"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_filter.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_filter.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,17 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
-<path d="M23.663,4.066L25,2H3l9,13.91V29l4-3V15.909L18.529,12H23c2.209,0,4-1.791,4-4 C27,6.018,25.555,4.384,23.663,4.066z M21.323,4l-2.588,4H9.265L6.676,4H21.323z M23,10h-3.177l2.589-4H23c1.103,0,2,0.897,2,2 S24.103,10,23,10z" fill-rule="evenodd"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M23.663,4.066L25,2H3l9,13.91V29l4-3V15.909L18.529,12H23c2.209,0,4-1.791,4-4
+ C27,6.018,25.555,4.384,23.663,4.066z M21.323,4l-2.588,4H9.265L6.676,4H21.323z M23,10h-3.177l2.589-4H23c1.103,0,2,0.897,2,2
+ S24.103,10,23,10z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_flash.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_flash.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,9 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_flash_charging.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_flash_charging.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,13 @@
-<?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">
+<?xml version="1.0" ?>
+<!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="M1,14v15h11v-15h-11zm8,12h-5v-9h5v9z"/>
+
<rect height="2" width="5" x="4" y="11"/>
+
<polygon points="24.13,21,28,10,19.36,10,22.54,1,17.24,1,13,13,21.64,13,18.83,21,14,21,21.5,29,29,21"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_flash_off.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_flash_off.svg Fri May 14 16:09:54 2010 +0300
@@ -1,12 +1,21 @@
-<?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">
+<?xml version="1.0" ?>
+<!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>
+
<rect height="35.83" transform="matrix(0.7061 -0.7082 0.7082 0.7061 -6.248 14.9445)" width="1.867" x="13.94" y="-2.915"/>
+
<polygon points="19.84,15.81,21.88,10,14.03,10"/>
+
<polygon points="13.44,9.416,16.42,1,11.12,1,9.527,5.499"/>
+
<polygon points="7.362,11.63,6.878,13,8.732,13"/>
+
<polygon points="13.75,18.02,12.71,21,7.878,21,15.38,29,19.9,24.17"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_folder.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_folder.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,13 @@
-<?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">
+<?xml version="1.0" ?>
+<!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>
+
<path d="M14,6v-3h-12v22h26v-19h-14zm11,16h-20v-16h6v3h14v13z"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_forward.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_forward.svg Fri May 14 16:09:54 2010 +0300
@@ -1,9 +1,15 @@
-<?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">
+<?xml version="1.0" ?>
+<!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="5,26,16,15,5,4"/>
+
<polygon points="27,15,16,4,16,15,16,26"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_forward_email.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_forward_email.svg Fri May 14 16:09:54 2010 +0300
@@ -1,10 +1,17 @@
-<?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">
+<?xml version="1.0" ?>
+<!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>
+
<path d="M15,25v-1.232c-5.504-0.278-8.264-3.418-8.264-9.434,0-2.825,0.818-5.033,2.454-6.624s3.762-2.386,6.378-2.386c2.479,0,4.391,0.754,5.735,2.263s2.017,3.648,2.017,6.419c0,0.165-0.014,0.313-0.019,0.471l2.437,1.827c0.158-0.74,0.262-1.54,0.262-2.448,0-3.427-0.909-6.093-2.728-7.998s-4.41-2.862-7.77-2.862c-3.372,0-6.157,1.019-8.354,3.056s-3.295,4.842-3.295,8.415c0,3.746,1.068,6.629,3.206,8.647,2.072,1.957,4.843,2.957,8.298,3.017-0.23-0.33-0.36-0.72-0.36-1.14z"/>
+
<path d="M11.28,10.23c-1.321,1.386-1.982,3.295-1.982,5.729,0,1.567,0.374,2.805,1.121,3.712s1.668,1.36,2.762,1.36c0.696,0,1.301-0.146,1.824-0.423v-1.61c0-0.205,0.04-0.398,0.097-0.584-0.274,0.314-0.593,0.484-0.964,0.484-0.61,0-1.03-0.246-1.258-0.738s-0.342-1.271-0.342-2.338c0-1.695,0.333-3.04,0.998-4.033s1.472-1.49,2.42-1.49h0.848l-0.506,4.006c-0.195,1.513-0.44,2.6-0.729,3.307,0.36-0.38,0.87-0.62,1.43-0.62h2.416c-0.013-0.217-0.02-0.451-0.02-0.711,0-1.668,0.319-4.38,0.957-8.135h-3.787c-2.21-0.001-3.97,0.692-5.29,2.075z"/>
+
<polygon points="30,22,22,16,22,19,17,19,17,25,22,25,22,28"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_forward_msg.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_forward_msg.svg Fri May 14 16:09:54 2010 +0300
@@ -1,9 +1,15 @@
-<?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">
+<?xml version="1.0" ?>
+<!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>
+
<path d="M5.414,21l6.115-6.115,3.47,3.48v-0.36c0-1.104,0.896-2,2-2h0.355l1.115-1.115,1.11,1.12h0.41v-1l-0.822-0.822,5.82-5.825v6.395l3,2.25v-13h-26v20h13v-3h-9.586zm18.12-14l-8.53,8.53-8.527-8.53h17.05zm-18.53,1.355l5.822,5.822-5.82,5.82v-11.64z"/>
+
<polygon points="30,21,22,15,22,18,17,18,17,24,22,24,22,27"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_genres.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_genres.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,13 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
+
</g>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_geotag.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_geotag.svg Fri May 14 16:09:54 2010 +0300
@@ -1,9 +1,15 @@
-<?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">
+<?xml version="1.0" ?>
+<!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"/>
+
<rect height="9.914" width="8" x="11" y="5"/>
+
<rect height="2" width="12" x="9.041" y="2.021"/>
+
<path d="M15,9.633c-4.417,0-8,4.198-8,9.375h16c0-5.18-3.58-9.377-8-9.377z"/>
+
<rect height="14.25" width="2" x="14.02" y="13.77"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_geotag_off.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_geotag_off.svg Fri May 14 16:09:54 2010 +0300
@@ -1,9 +1,15 @@
-<?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">
+<?xml version="1.0" ?>
+<!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"/>
+
<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"/>
+
<path d="M8.87,13.02c-1.161,1.62-1.87,3.7-1.87,5.99h7.021v9.014h2v-7.85l-7.15-7.15z"/>
+
<rect height="35.83" transform="matrix(0.7061 -0.7082 0.7082 0.7061 -6.2123 15.031)" width="1.867" x="14.07" y="-2.915"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_go.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_go.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,13 @@
-<?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">
+<?xml version="1.0" ?>
+<!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="27,15,15,6,15,11,4,11,4,19,15,19,15,24"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_gps.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_gps.svg Fri May 14 16:09:54 2010 +0300
@@ -1,10 +1,17 @@
-<?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">
+<?xml version="1.0" ?>
+<!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>
+
<rect height="10" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 -4.2124 42.9407)" width="6.001" x="3.787" y="17.34"/>
+
<rect height="10" transform="matrix(0.7071 0.7071 -0.7071 0.7071 11.3431 -13.8113)" width="5.999" x="19.34" y="1.786"/>
+
<polygon points="19.28,16.92,20.93,15.27,13.86,8.201,10.15,8.731,7.494,6.079,6.08,7.493,8.731,10.15,8.201,13.86,15.27,20.93,16.92,19.28,17.39,24.46,20.22,21.64,23.05,24.46,24.46,23.05,21.64,20.22,24.46,17.39"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_gps_off.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
+</g>
+<rect x="3.787" y="17.343" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 -4.2124 42.9407)" width="6.001" height="10"/>
+<rect x="19.344" y="1.786" transform="matrix(0.7071 0.7071 -0.7071 0.7071 11.3431 -13.8113)" width="5.999" height="10"/>
+<polygon points="20.176,16.025 20.93,15.271 13.858,8.201 12.539,8.39 "/>
+<polygon points="23.004,18.854 24.465,17.394 21.251,17.102 "/>
+<polygon points="17.101,21.248 17.394,24.464 18.855,23.002 "/>
+<polygon points="8.39,12.537 8.201,13.857 15.272,20.929 16.027,20.174 "/>
+<rect x="13.74" y="-3.242" transform="matrix(0.7063 -0.7079 0.7079 0.7063 -6.0767 14.6963)" width="1.868" height="35.827"/>
+</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_group.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_group.svg Fri May 14 16:09:54 2010 +0300
@@ -1,11 +1,28 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
-<path d="M24.155,14.925c-0.009-0.146,0-0.75,0.003-0.896c0.947-0.685,1.361-1.57,1.861-2.618c0.926-1.938,0.587-6.022,0.587-6.022 C26.606,3.367,24.183,1,22.269,1h-1.214c-1.253,0-2.89,1.015-3.874,2.282c2.34,0.791,4.678,3.135,4.758,5.621 c0.108,0.996,0.446,4.888-0.639,7.017c-0.438,0.86-0.994,1.603-1.683,2.243c0.582,0.637,2.014,1.676,4.27,3.099 c1.084,0.683,1.411,0.889,1.707,1.28L26,23.078V25h4v-5.72C30,19.28,24.273,16.909,24.155,14.925z"/>
-<path d="M4,23.073l0.407-0.536c0.296-0.391,0.622-0.597,1.704-1.277c2.242-1.411,3.67-2.445,4.261-3.083 c-0.731-0.662-1.288-1.417-1.714-2.314c-1.002-2.12-0.705-5.979-0.611-6.944c0.071-2.494,2.42-4.848,4.768-5.638 C11.827,2.014,10.188,1,8.936,1H7.722C5.807,1,3.38,3.367,3.38,5.388c0,0-0.29,4.066,0.575,6.022 c0.475,1.067,0.918,1.963,1.889,2.645c0.003,0.14,0.012,0.733,0.004,0.87C5.729,16.909,0,19.276,0,19.276V25h4V23.073z"/>
-<path d="M17.916,19.221L15,25.816l-2.915-6.596C10.631,21.049,6.253,23.413,6,23.746V29h18v-5.25 C23.747,23.416,19.369,21.05,17.916,19.221z"/>
-<path d="M12.557,17.34c0.003,0.128,0.01,0.794,0.002,0.921c-0.006,0.087-0.036,0.179-0.068,0.271h5.021 c-0.031-0.093-0.062-0.185-0.067-0.271c-0.009-0.135-0.001-0.784,0.001-0.921c0.931-0.628,1.583-1.365,2.073-2.328 c0.908-1.782,0.423-5.978,0.423-5.978c0-1.858-2.47-4.034-4.35-4.034h-1.191c-1.88,0-4.354,2.176-4.354,4.034 c0,0-0.431,4.175,0.419,5.972C10.932,15.988,11.604,16.714,12.557,17.34z"/>
+<path d="M24.155,14.925c-0.009-0.146,0-0.75,0.003-0.896c0.947-0.685,1.361-1.57,1.861-2.618c0.926-1.938,0.587-6.022,0.587-6.022
+ C26.606,3.367,24.183,1,22.269,1h-1.214c-1.253,0-2.89,1.015-3.874,2.282c2.34,0.791,4.678,3.135,4.758,5.621
+ c0.108,0.996,0.446,4.888-0.639,7.017c-0.438,0.86-0.994,1.603-1.683,2.243c0.582,0.637,2.014,1.676,4.27,3.099
+ c1.084,0.683,1.411,0.889,1.707,1.28L26,23.078V25h4v-5.72C30,19.28,24.273,16.909,24.155,14.925z"/>
+<path d="M4,23.073l0.407-0.536c0.296-0.391,0.622-0.597,1.704-1.277c2.242-1.411,3.67-2.445,4.261-3.083
+ c-0.731-0.662-1.288-1.417-1.714-2.314c-1.002-2.12-0.705-5.979-0.611-6.944c0.071-2.494,2.42-4.848,4.768-5.638
+ C11.827,2.014,10.188,1,8.936,1H7.722C5.807,1,3.38,3.367,3.38,5.388c0,0-0.29,4.066,0.575,6.022
+ c0.475,1.067,0.918,1.963,1.889,2.645c0.003,0.14,0.012,0.733,0.004,0.87C5.729,16.909,0,19.276,0,19.276V25h4V23.073z"/>
+<path d="M17.916,19.221L15,25.816l-2.915-6.596C10.631,21.049,6.253,23.413,6,23.746V29h18v-5.25
+ C23.747,23.416,19.369,21.05,17.916,19.221z"/>
+<path d="M12.557,17.34c0.003,0.128,0.01,0.794,0.002,0.921c-0.006,0.087-0.036,0.179-0.068,0.271h5.021
+ c-0.031-0.093-0.062-0.185-0.067-0.271c-0.009-0.135-0.001-0.784,0.001-0.921c0.931-0.628,1.583-1.365,2.073-2.328
+ c0.908-1.782,0.423-5.978,0.423-5.978c0-1.858-2.47-4.034-4.35-4.034h-1.191c-1.88,0-4.354,2.176-4.354,4.034
+ c0,0-0.431,4.175,0.419,5.972C10.932,15.988,11.604,16.714,12.557,17.34z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hd.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hd.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,13 @@
-<?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">
-<rect fill="none" height="30" width="30"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<rect fill="none" width="30" height="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"/>
-<path d="M15.785,10.632h2.484c1.141,0,1.991,0.338,2.555,1.014c0.563,0.676,0.844,1.742,0.844,3.199 c0,1.594-0.296,2.746-0.889,3.457c-0.592,0.712-1.486,1.066-2.687,1.066h-2.309L15.785,10.632L15.785,10.632z M17.396,11.628v6.731 h0.731c0.608,0,1.073-0.244,1.392-0.734c0.319-0.49,0.479-1.395,0.479-2.71c0-1.168-0.156-2.008-0.469-2.52 c-0.313-0.512-0.787-0.768-1.424-0.768L17.396,11.628L17.396,11.628z"/>
+<path d="M15.785,10.632h2.484c1.141,0,1.991,0.338,2.555,1.014c0.563,0.676,0.844,1.742,0.844,3.199
+ c0,1.594-0.296,2.746-0.889,3.457c-0.592,0.712-1.486,1.066-2.687,1.066h-2.309L15.785,10.632L15.785,10.632z M17.396,11.628v6.731
+ h0.731c0.608,0,1.073-0.244,1.392-0.734c0.319-0.49,0.479-1.395,0.479-2.71c0-1.168-0.156-2.008-0.469-2.52
+ c-0.313-0.512-0.787-0.768-1.424-0.768L17.396,11.628L17.396,11.628z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_help_all.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_help_all.svg Fri May 14 16:09:54 2010 +0300
@@ -1,10 +1,31 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
-<path d="M17.479,20.006c-0.683,0-1.26,0.239-1.735,0.726c-0.478,0.483-0.714,1.071-0.714,1.764c0,0.693,0.236,1.286,0.714,1.771 C16.22,24.757,16.797,25,17.479,25c0.674,0,1.249-0.243,1.729-0.733c0.483-0.485,0.721-1.078,0.721-1.771 c0-0.692-0.235-1.28-0.711-1.764C18.74,20.245,18.163,20.006,17.479,20.006z"/>
-<path d="M23.146,2.437C21.915,1.479,20.128,1,17.791,1C16.385,1,14.788,1.248,13,1.741V3.34c0.692,0.158,1.332,0.37,1.915,0.641 c0.793-0.152,1.524-0.238,2.178-0.238c1.179,0,2.063,0.265,2.65,0.788c0.591,0.524,0.884,1.313,0.884,2.364 c0,0.504-0.12,1.02-0.363,1.545c-0.189,0.409-0.627,0.974-1.295,1.682C18.979,10.306,19,10.479,19,10.674 c0,1.055-0.233,2.135-0.694,3.209c-0.457,1.045-1.35,2.23-2.795,3.724v0.114h3.938v-1.433c0-0.643,0.168-1.205,0.498-1.696 c0.329-0.487,0.987-1.226,1.97-2.213c1.343-1.368,2.191-2.461,2.552-3.284C24.822,8.268,25,7.46,25,6.674 C25,4.804,24.382,3.393,23.146,2.437z"/>
-<path d="M5,8.452V5.741C6.788,5.248,8.385,5,9.791,5c2.337,0,4.124,0.479,5.355,1.437C16.382,7.393,17,8.804,17,10.674 c0,0.786-0.178,1.594-0.532,2.421c-0.36,0.823-1.209,1.916-2.552,3.284c-0.982,0.987-1.641,1.726-1.97,2.213 c-0.33,0.491-0.498,1.054-0.498,1.696v1.433H7.511v-1.653c0-1.062,0.233-1.982,0.698-2.76c0.464-0.776,1.183-1.634,2.155-2.567 c1.024-1.01,1.657-1.778,1.899-2.301c0.243-0.525,0.363-1.041,0.363-1.545c0-1.052-0.293-1.84-0.884-2.364 c-0.588-0.523-1.472-0.788-2.65-0.788C7.944,7.742,6.582,7.979,5,8.452z M9.479,29c-0.683,0-1.26-0.243-1.735-0.733 c-0.478-0.485-0.714-1.078-0.714-1.771c0-0.692,0.236-1.28,0.714-1.764c0.476-0.486,1.053-0.726,1.735-0.726 c0.684,0,1.261,0.239,1.738,0.726c0.476,0.483,0.711,1.071,0.711,1.764c0,0.693-0.237,1.286-0.721,1.771 C10.729,28.757,10.153,29,9.479,29z"/>
+<path d="M17.479,20.006c-0.683,0-1.26,0.239-1.735,0.726c-0.478,0.483-0.714,1.071-0.714,1.764c0,0.693,0.236,1.286,0.714,1.771
+ C16.22,24.757,16.797,25,17.479,25c0.674,0,1.249-0.243,1.729-0.733c0.483-0.485,0.721-1.078,0.721-1.771
+ c0-0.692-0.235-1.28-0.711-1.764C18.74,20.245,18.163,20.006,17.479,20.006z"/>
+<path d="M23.146,2.437C21.915,1.479,20.128,1,17.791,1C16.385,1,14.788,1.248,13,1.741V3.34c0.692,0.158,1.332,0.37,1.915,0.641
+ c0.793-0.152,1.524-0.238,2.178-0.238c1.179,0,2.063,0.265,2.65,0.788c0.591,0.524,0.884,1.313,0.884,2.364
+ c0,0.504-0.12,1.02-0.363,1.545c-0.189,0.409-0.627,0.974-1.295,1.682C18.979,10.306,19,10.479,19,10.674
+ c0,1.055-0.233,2.135-0.694,3.209c-0.457,1.045-1.35,2.23-2.795,3.724v0.114h3.938v-1.433c0-0.643,0.168-1.205,0.498-1.696
+ c0.329-0.487,0.987-1.226,1.97-2.213c1.343-1.368,2.191-2.461,2.552-3.284C24.822,8.268,25,7.46,25,6.674
+ C25,4.804,24.382,3.393,23.146,2.437z"/>
+<path d="M5,8.452V5.741C6.788,5.248,8.385,5,9.791,5c2.337,0,4.124,0.479,5.355,1.437C16.382,7.393,17,8.804,17,10.674
+ c0,0.786-0.178,1.594-0.532,2.421c-0.36,0.823-1.209,1.916-2.552,3.284c-0.982,0.987-1.641,1.726-1.97,2.213
+ c-0.33,0.491-0.498,1.054-0.498,1.696v1.433H7.511v-1.653c0-1.062,0.233-1.982,0.698-2.76c0.464-0.776,1.183-1.634,2.155-2.567
+ c1.024-1.01,1.657-1.778,1.899-2.301c0.243-0.525,0.363-1.041,0.363-1.545c0-1.052-0.293-1.84-0.884-2.364
+ c-0.588-0.523-1.472-0.788-2.65-0.788C7.944,7.742,6.582,7.979,5,8.452z M9.479,29c-0.683,0-1.26-0.243-1.735-0.733
+ c-0.478-0.485-0.714-1.078-0.714-1.771c0-0.692,0.236-1.28,0.714-1.764c0.476-0.486,1.053-0.726,1.735-0.726
+ c0.684,0,1.261,0.239,1.738,0.726c0.476,0.483,0.711,1.071,0.711,1.764c0,0.693-0.237,1.286-0.721,1.771
+ C10.729,28.757,10.153,29,9.479,29z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_history.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_history.svg Fri May 14 16:09:54 2010 +0300
@@ -1,18 +1,27 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
-<rect height="2" width="2" x="6" y="6"/>
-<rect height="2" width="10" x="9" y="6"/>
-<rect height="2" width="2" x="6" y="11"/>
-<rect height="2" width="10" x="9" y="11"/>
-<rect height="2" width="2" x="6" y="16"/>
-<rect height="2" width="2" x="6" y="21"/>
+<rect x="6" y="6" width="2" height="2"/>
+<rect x="9" y="6" width="10" height="2"/>
+<rect x="6" y="11" width="2" height="2"/>
+<rect x="9" y="11" width="10" height="2"/>
+<rect x="6" y="16" width="2" height="2"/>
+<rect x="6" y="21" width="2" height="2"/>
<path d="M9,21v2h4.025C13.017,22.833,13,22.669,13,22.5c0-0.512,0.052-1.01,0.131-1.5H9z"/>
<path d="M15.591,16H9v2h5.137C14.531,17.269,15.025,16.601,15.591,16z"/>
-<path d="M4,26V3h18v10.025C22.166,13.017,22.331,13,22.5,13c0.866,0,1.702,0.127,2.5,0.345V0H1v29h14.591 c-0.813-0.865-1.468-1.879-1.914-3H4z"/>
-<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"/>
+<path d="M4,26V3h18v10.025C22.166,13.017,22.331,13,22.5,13c0.866,0,1.702,0.127,2.5,0.345V0H1v29h14.591
+ c-0.813-0.865-1.468-1.879-1.914-3H4z"/>
+<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"/>
<polygon points="23,22 23,18 21,18 21,22 21,24 23,24 27,24 27,22 "/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hold_call.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hold_call.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,9 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_home.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_home.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,13 @@
-<?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">
+<?xml version="1.0" ?>
+<!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>
+
<path d="M29,14l-14-13-14,13,3,3v12h22v-12l3-2.999zm-6.46,0h-15.08l7.539-7,7.54,7zm0.46,12h-5v-7h-6v7h-5v-10h16v10z"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa.svg Fri May 14 16:09:54 2010 +0300
@@ -1,9 +1,15 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
+
<path d="M6.864,14.16c0.727-0.922,1.144-2.201,1.144-3.72,0-1.288-0.417-4.766-3.377-4.766-2.039,0-3.266,1.814-3.266,1.814l0.755,3.327s1.138-1.578,2.245-1.578c0.545,0,1.199,0.266,1.199,1.552,0,1.524-1.21,1.86-1.67,1.86h-1.291v3.435h1.295c0.33,0,2.188,0.4,2.015,2.369-0.331,3.822-3.281,1.695-3.613,1.373l-0.562-0.559-0.738,3.37s1.095,1.631,3.228,1.631c2.848,0,4.159-2.992,4.159-5.771,0-1.85-0.58-3.43-1.523-4.33z"/>
+
<rect fill="none" height="30" width="30"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa_attach.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa_attach.svg Fri May 14 16:09:54 2010 +0300
@@ -1,17 +1,31 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
+
<polygon points="23.4,22.26,24.64,24.26,24.64,22.26"/>
+
<polygon points="21.76,19.7,24.64,19.7,20.47,13.02,18.42,14.3"/>
+
<polygon points="19.42,19.7,17.92,17.28,13.86,17.28,15.36,19.7"/>
+
<polygon points="13.03,19.7,11.53,17.28,7.427,17.28,8.927,19.7"/>
+
<polygon points="5.341,17.68,5.341,19.7,6.594,19.7"/>
+
<path d="M22.18,7.594v1.319h1.179v1.291c-0.159,0.045-0.368,0.083-0.699,0.083-1.218,0-1.942-0.823-1.942-2.201,0-0.674,0.261-2.843,3.199-1.952l0.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.575,0.13,3.16,2.3,3.499,3.311,3.499,1.373,0,2.112-0.448,2.112-0.448v-3.576h-2.538z"/>
+
<path d="M13.39,1.219h4.371v1.917h-2.691v1.663s3.421-0.518,3.215,3.622c0,0,0.107,2.896-2.588,3.165-0.778,0.079-2.327-0.174-2.327-0.174l0.021-1.946s3.291,0.862,3.291-1.245c0-2.252-3.291-1.487-3.291-1.487v-5.523z"/>
+
<rect height="1.487" width="1.486" x="10.76" y="10.04"/>
+
<path d="M9.353,5.866c0.506-0.523,0.79-1.249,0.79-2.107,0-0.728-0.288-2.7-2.343-2.7-1.415,0-2.266,1.029-2.266,1.029l0.527,1.883s0.788-0.896,1.557-0.896c0.379,0,0.828,0.152,0.828,0.879,0,0.866-0.836,1.051-1.158,1.051h-0.891v1.946h0.897c0.232,0,1.52,0.223,1.402,1.342-0.231,2.167-2.279,0.961-2.51,0.777l-0.393-0.315-0.512,1.903s0.761,0.925,2.245,0.925c1.977,0,2.885-1.693,2.885-3.266,0-1.045-0.4-1.936-1.057-2.448z"/>
+
<rect fill="none" height="30" width="30"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa_context.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa_context.svg Fri May 14 16:09:54 2010 +0300
@@ -1,11 +1,19 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
+
<path d="M13.37,1.285h4.357v1.911h-2.687v1.656s3.413-0.515,3.208,3.611c0,0,0.106,2.887-2.58,3.154-0.775,0.079-2.318-0.175-2.318-0.175l0.02-1.938s3.28,0.86,3.28-1.241c0-2.244-3.28-1.482-3.28-1.482v-5.494z"/>
+
<rect height="1.482" width="1.482" x="10.74" y="10.08"/>
+
<path d="M9.341,5.917c0.501-0.521,0.79-1.245,0.79-2.101,0-0.726-0.289-2.691-2.339-2.691-1.407,0-2.258,1.026-2.258,1.026l0.527,1.876s0.785-0.893,1.552-0.893c0.378,0,0.826,0.152,0.826,0.877,0,0.861-0.834,1.048-1.154,1.048h-0.892v1.938h0.892c0.231,0,1.517,0.223,1.397,1.337-0.229,2.161-2.27,0.958-2.499,0.775l-0.393-0.313-0.51,1.897s0.761,0.921,2.24,0.921c1.968,0,2.873-1.688,2.873-3.255,0-1.042-0.398-1.928-1.049-2.438z"/>
+
<rect fill="none" height="30" width="30"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa_multipdp.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa_multipdp.svg Fri May 14 16:09:54 2010 +0300
@@ -1,11 +1,19 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
+
<path d="M13.39,1.271h4.371v1.917h-2.691v1.662s3.421-0.518,3.215,3.622c0,0,0.107,2.898-2.588,3.166-0.778,0.077-2.327-0.174-2.327-0.174l0.021-1.945s3.291,0.862,3.291-1.246c0-2.251-3.291-1.487-3.291-1.487v-5.521z"/>
+
<rect height="1.487" width="1.486" x="10.76" y="10.09"/>
+
<path d="M9.353,5.917c0.506-0.523,0.79-1.248,0.79-2.108,0-0.729-0.288-2.7-2.343-2.7-1.413,0-2.264,1.029-2.264,1.029l0.529,1.884s0.786-0.897,1.554-0.897c0.38,0,0.83,0.153,0.83,0.88,0,0.865-0.837,1.052-1.158,1.052h-0.894v1.945h0.897c0.232,0,1.52,0.224,1.402,1.342-0.231,2.167-2.28,0.964-2.51,0.777l-0.393-0.313-0.512,1.902s0.761,0.924,2.245,0.924c1.977,0,2.884-1.693,2.884-3.265,0-1.047-0.4-1.937-1.057-2.448z"/>
+
<rect fill="none" height="30" width="30"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa_suspended.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_hsdpa_suspended.svg Fri May 14 16:09:54 2010 +0300
@@ -1,14 +1,25 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
+
<polygon points="5.342,19.62,5.342,17.21,14.8,17.21,12.76,19.62"/>
+
<polygon points="21.39,14.63,9.415,28.9,7.564,27.35,19.59,13.01"/>
+
<path d="M22.18,7.633v1.318h1.179v1.29c-0.159,0.044-0.368,0.082-0.699,0.082-1.218,0-1.943-0.823-1.943-2.2,0-0.675,0.262-2.843,3.2-1.953l0.32,0.165,0.374-1.299s-0.691-0.448-1.841-0.448c-2.076-0.002-3.559,1.436-3.474,3.573,0.13,3.16,2.3,3.499,3.311,3.499,1.373,0,2.112-0.447,2.112-0.447v-3.577h-2.537z"/>
+
<path d="M13.39,1.257h4.371v1.917h-2.691v1.661s3.421-0.517,3.215,3.623c0,0,0.107,2.897-2.588,3.165-0.778,0.08-2.327-0.175-2.327-0.175l0.021-1.945s3.291,0.863,3.291-1.245c0-2.252-3.291-1.487-3.291-1.487v-5.506z"/>
+
<rect height="1.487" width="1.486" x="10.77" y="10.08"/>
+
<path d="M9.354,5.904c0.506-0.524,0.79-1.247,0.79-2.107,0-0.73-0.288-2.7-2.343-2.7-1.415,0-2.266,1.029-2.266,1.029l0.527,1.883s0.788-0.896,1.557-0.896c0.379,0,0.828,0.152,0.828,0.88,0,0.864-0.836,1.05-1.158,1.05h-0.89v1.945h0.897c0.232,0,1.52,0.225,1.402,1.342-0.231,2.167-2.28,0.962-2.51,0.778l-0.393-0.315-0.512,1.903s0.761,0.925,2.245,0.925c1.977,0,2.884-1.695,2.884-3.267,0-1.047-0.4-1.936-1.056-2.449z"/>
+
<rect fill="none" height="30" width="30"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_img_quality.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_img_quality.svg Fri May 14 16:09:54 2010 +0300
@@ -1,10 +1,17 @@
-<?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">
+<?xml version="1.0" ?>
+<!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"/>
+
<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"/>
+
<rect height="3.375" width="3.375" x="19.69" y="18.84"/>
+
<rect height="3.375" width="3.375" x="19.69" y="13.31"/>
+
<polygon points="18.38,5.625,18.38,2.25,15,2.25,2.25,15,15,27.75,18.38,27.75,18.38,24.38,15,24.38,15,22.22,18.38,22.22,18.38,18.84,15,18.84,15,16.69,18.38,16.69,18.38,13.31,15,13.31,15,11.16,18.38,11.16,18.38,7.781,15,7.781,15,5.625"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_info.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_info.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,13 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
+
</g>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_iso.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_iso.svg Fri May 14 16:09:54 2010 +0300
@@ -1,10 +1,17 @@
-<?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">
+<?xml version="1.0" ?>
+<!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>
+
<path d="M2.854,21.55v-1.512h1.081v-10.08h-1.081v-1.512h4.588v1.512h-1.082v10.08h1.081v1.512h-4.587z"/>
+
<path d="M11.58,21.69c-0.955,0-1.896-0.12-2.821-0.36v-1.564c1.014,0.275,1.913,0.413,2.698,0.413,0.744,0,1.325-0.167,1.745-0.501,0.418-0.334,0.628-0.809,0.628-1.424,0-0.58-0.173-1.035-0.519-1.366s-0.987-0.764-1.925-1.297c-1.025-0.574-1.717-1.152-2.074-1.736-0.357-0.582-0.536-1.246-0.536-1.99,0-1.184,0.396-2.072,1.191-2.668,0.793-0.594,1.829-0.892,3.106-0.892,0.926,0,1.778,0.088,2.558,0.264v1.529c-0.826-0.188-1.594-0.281-2.303-0.281-0.645,0-1.16,0.152-1.547,0.457s-0.58,0.727-0.58,1.266c0,0.521,0.168,0.939,0.506,1.253,0.336,0.313,0.912,0.695,1.727,1.146,1.125,0.627,1.878,1.233,2.259,1.819s0.571,1.245,0.571,1.978c0,1.318-0.391,2.307-1.174,2.967-0.79,0.65-1.96,0.98-3.52,0.98z"/>
+
<path d="M22.36,21.69c-1.582,0-2.772-0.554-3.573-1.661-0.799-1.107-1.199-2.845-1.199-5.212,0-2.227,0.4-3.868,1.199-4.926,0.801-1.058,1.991-1.587,3.573-1.587,1.594,0,2.79,0.544,3.591,1.63,0.799,1.088,1.199,2.715,1.199,4.883,0,2.361-0.401,4.098-1.204,5.207-0.81,1.11-2.01,1.66-3.59,1.66zm0-1.51c0.732,0,1.29-0.383,1.675-1.146,0.383-0.766,0.575-2.17,0.575-4.215,0-1.852-0.19-3.147-0.571-3.889s-0.94-1.112-1.679-1.112c-0.732,0-1.291,0.354-1.675,1.06s-0.575,2.02-0.575,3.941c0,1.893,0.19,3.26,0.571,4.1,0.37,0.84,0.93,1.26,1.67,1.26z"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_italic.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_italic.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,13 @@
-<?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">
+<?xml version="1.0" ?>
+<!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 fill-rule="evenodd" points="11,3,11,6,14,6,10,24,7,24,7,27,20,27,20,24,17,24,21,6,24,6,24,3"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_join_call.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_join_call.svg Fri May 14 16:09:54 2010 +0300
@@ -1,10 +1,17 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
+
<path d="M24.68,17.44l-2.552,5.771-2.551-5.771c-0.549,0.688-1.57,1.464-2.574,2.146v6.41h13v-4.594c-0.23-0.3-4.06-2.37-5.33-3.97z"/>
+
<path d="M7.129,14.84c-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.245-1.647-2.695-2.898-2.695h-0.795c-1.254,0-2.903,1.45-2.903,2.689,0,0-0.287,2.783,0.279,3.981,0.311,0.654,0.76,1.139,1.395,1.556,0.002,0.085,0.007,0.529,0.002,0.614-0.062,0.98-2.734,2.58-3.873,3.31v3.85h1.454l7.665-5.078c-1.004-0.7-1.953-1.5-1.99-2.08z"/>
+
<polygon points="11,18.08,2,23.54,11,29,11,26,15,26,15,21,11,21"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_landscape.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_landscape.svg Fri May 14 16:09:54 2010 +0300
@@ -1,11 +1,19 @@
-<?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" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
+<?xml version="1.0" ?>
+<!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" 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 opacity="0.5">
+
<rect fill="none" height="30" width="30" x="0.002"/>
+
</g>
+
<path d="M29,28c0.002-0.07,0.006-0.141,0.006-0.211,0-6.719-2.422-12.16-5.41-12.16-1.65,0-3.125,1.667-4.117,4.286-1.57-7.04-4.9-11.92-8.78-11.92-5.234,0-9.488,8.881-9.703,20h28z"/>
+
<circle cx="23.5" cy="4.891" r="2.891"/>
+
<circle cx="23.5" cy="7.438" r="2.5"/>
+
<path d="M29,6.438c0,1.381-1.119,2.5-2.5,2.5h-6c-1.381,0-2.5-1.119-2.5-2.5s1.119-2.5,2.5-2.5h6c1.38,0,2.5,1.119,2.5,2.5z"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_lap.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_lap.svg Fri May 14 16:09:54 2010 +0300
@@ -1,17 +1,34 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
-<rect height="6" width="2" x="20" y="15"/>
-<path d="M19.5,10.115C19.991,10.047,20.49,10,21,10s1.009,0.047,1.5,0.115V9.634H24V8.75C24,8.334,23.664,8,23.249,8h-4.5 C18.334,8,18,8.334,18,8.75v0.884h1.5V10.115z"/>
-<path d="M21,12c-4.971,0-9,4.029-9,9c0,4.972,4.029,9,9,9s9-4.028,9-9C30,16.029,25.971,12,21,12z M21,28c-3.866,0-7-3.134-7-7 s3.134-7,7-7s7,3.134,7,7S24.866,28,21,28z"/>
-<path d="M29.697,14.291C29.886,13.898,30,13.464,30,13c0-1.656-1.344-3-3-3c-0.766,0-1.457,0.296-1.987,0.769 C26.877,11.502,28.49,12.729,29.697,14.291z"/>
-<path d="M16.987,10.769C16.457,10.296,15.766,10,15,10c-1.656,0-3,1.344-3,3c0,0.464,0.114,0.898,0.303,1.291 C13.51,12.729,15.123,11.502,16.987,10.769z"/>
-<path d="M7.5,2.115C7.991,2.047,8.49,2,9,2s1.009,0.047,1.5,0.115V1.634H12V0.75C12,0.334,11.664,0,11.249,0h-4.5 C6.334,0,6,0.334,6,0.75v0.884h1.5V2.115z"/>
-<path d="M17.697,6.291C17.886,5.898,18,5.464,18,5c0-1.656-1.344-3-3-3c-0.766,0-1.457,0.296-1.987,0.769 C14.877,3.502,16.49,4.729,17.697,6.291z"/>
-<path d="M4.987,2.769C4.457,2.296,3.766,2,3,2C1.344,2,0,3.344,0,5c0,0.464,0.114,0.898,0.303,1.291 C1.51,4.729,3.123,3.502,4.987,2.769z"/>
-<path d="M10,21c0-0.368,0.025-0.73,0.063-1.089C9.715,19.964,9.362,20,9,20c-3.866,0-7-3.134-7-7s3.134-7,7-7 c1.958,0,3.727,0.806,4.996,2.102C14.32,8.035,14.656,8,15,8c0.365,0,0.724,0.054,1.076,0.133c0.037-0.164,0.092-0.32,0.157-0.472 C14.594,5.444,11.969,4,9,4c-4.971,0-9,4.029-9,9c0,4.972,4.029,9,9,9c0.355,0,0.703-0.025,1.047-0.066 C10.021,21.625,10,21.315,10,21z"/>
-<rect height="6" width="2" x="8" y="7"/>
+<rect x="20" y="15" width="2" height="6"/>
+<path d="M19.5,10.115C19.991,10.047,20.49,10,21,10s1.009,0.047,1.5,0.115V9.634H24V8.75C24,8.334,23.664,8,23.249,8h-4.5
+ C18.334,8,18,8.334,18,8.75v0.884h1.5V10.115z"/>
+<path d="M21,12c-4.971,0-9,4.029-9,9c0,4.972,4.029,9,9,9s9-4.028,9-9C30,16.029,25.971,12,21,12z M21,28c-3.866,0-7-3.134-7-7
+ s3.134-7,7-7s7,3.134,7,7S24.866,28,21,28z"/>
+<path d="M29.697,14.291C29.886,13.898,30,13.464,30,13c0-1.656-1.344-3-3-3c-0.766,0-1.457,0.296-1.987,0.769
+ C26.877,11.502,28.49,12.729,29.697,14.291z"/>
+<path d="M16.987,10.769C16.457,10.296,15.766,10,15,10c-1.656,0-3,1.344-3,3c0,0.464,0.114,0.898,0.303,1.291
+ C13.51,12.729,15.123,11.502,16.987,10.769z"/>
+<path d="M7.5,2.115C7.991,2.047,8.49,2,9,2s1.009,0.047,1.5,0.115V1.634H12V0.75C12,0.334,11.664,0,11.249,0h-4.5
+ C6.334,0,6,0.334,6,0.75v0.884h1.5V2.115z"/>
+<path d="M17.697,6.291C17.886,5.898,18,5.464,18,5c0-1.656-1.344-3-3-3c-0.766,0-1.457,0.296-1.987,0.769
+ C14.877,3.502,16.49,4.729,17.697,6.291z"/>
+<path d="M4.987,2.769C4.457,2.296,3.766,2,3,2C1.344,2,0,3.344,0,5c0,0.464,0.114,0.898,0.303,1.291
+ C1.51,4.729,3.123,3.502,4.987,2.769z"/>
+<path d="M10,21c0-0.368,0.025-0.73,0.063-1.089C9.715,19.964,9.362,20,9,20c-3.866,0-7-3.134-7-7s3.134-7,7-7
+ c1.958,0,3.727,0.806,4.996,2.102C14.32,8.035,14.656,8,15,8c0.365,0,0.724,0.054,1.076,0.133c0.037-0.164,0.092-0.32,0.157-0.472
+ C14.594,5.444,11.969,4,9,4c-4.971,0-9,4.029-9,9c0,4.972,4.029,9,9,9c0.355,0,0.703-0.025,1.047-0.066
+ C10.021,21.625,10,21.315,10,21z"/>
+<rect x="8" y="7" width="2" height="6"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_last_result.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_last_result.svg Fri May 14 16:09:54 2010 +0300
@@ -1,10 +1,20 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
-<rect height="4" width="20" x="7" y="18"/>
+<rect x="7" y="18" width="20" height="4"/>
<path d="M16.655,10c-0.415,1.519-1.196,2.885-2.246,4H27v-4H16.655z"/>
-<path d="M15,7.5C15,3.364,11.636,0,7.5,0S0,3.364,0,7.5S3.364,15,7.5,15S15,11.636,15,7.5z M7.5,2C10.532,2,13,4.467,13,7.5 c0,0.579-0.092,1.137-0.258,1.662c-0.934-1.73-2.69-2.95-4.742-3.135V3L2.026,6.982C2.288,4.191,4.643,2,7.5,2z M2,7.5 c0-0.163,0.011-0.324,0.024-0.483L8,11V8.055c1.742,0.239,3.122,1.593,3.395,3.324C10.398,12.38,9.021,13,7.5,13 C4.468,13,2,10.533,2,7.5z"/>
+<path d="M15,7.5C15,3.364,11.636,0,7.5,0S0,3.364,0,7.5S3.364,15,7.5,15S15,11.636,15,7.5z M7.5,2C10.532,2,13,4.467,13,7.5
+ c0,0.579-0.092,1.137-0.258,1.662c-0.934-1.73-2.69-2.95-4.742-3.135V3L2.026,6.982C2.288,4.191,4.643,2,7.5,2z M2,7.5
+ c0-0.163,0.011-0.324,0.024-0.483L8,11V8.055c1.742,0.239,3.122,1.593,3.395,3.324C10.398,12.38,9.021,13,7.5,13
+ C4.468,13,2,10.533,2,7.5z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_light.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_light.svg Fri May 14 16:09:54 2010 +0300
@@ -1,12 +1,21 @@
-<?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">
+<?xml version="1.0" ?>
+<!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"/>
+
<rect height="4" width="2" x="14" y="0"/>
+
<rect height="4" width="6" x="12" y="26"/>
+
<path d="M15,6.214c-5.002,0-8.495,3.298-8.495,8.019,0,0.695,0,2.539,4.627,8.769l0.899,1.213h5.95l0.899-1.213c4.624-6.23,4.624-8.074,4.624-8.769,0-4.718-3.49-8.016-8.5-8.016zm1.47,15.01h-2.932s-4.035-5.436-4.035-6.982c0-3.355,2.464-5.021,5.5-5.019,3.038-0.002,5.5,1.663,5.5,5.019,0,1.54-4.03,6.98-4.03,6.98z"/>
+
<rect height="2" width="4" y="10"/>
+
<rect height="2" width="4" x="26" y="10"/>
+
<rect height="4" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -0.7621 5.2862)" width="2" x="5" y="1.563"/>
+
<rect height="4" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 38.4511 23.053)" width="2" x="23" y="1.563"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_light_off.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_light_off.svg Fri May 14 16:09:54 2010 +0300
@@ -1,10 +1,17 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
+
<path d="M11.13,8.065c0.958-0.876,2.313-1.317,3.822-1.315,2.901-0.002,5.25,1.612,5.25,4.861,0,0.715-0.877,2.285-1.793,3.734l1.641,1.641c1.595-2.465,2.402-4.267,2.402-5.375,0-4.252-3.012-7.111-7.506-7.111-2.239,0-4.111,0.713-5.424,1.958l1.614,1.618z"/>
+
<path d="M15.22,18.38h-1.666s-1.937-2.652-3.063-4.727l-2.979-2.981c-0.035,0.308-0.058,0.621-0.058,0.944,0,1.482,1.441,4.205,4.283,8.093l0.674,0.922h5.057l-2.25-2.24z"/>
+
<rect height="33.24" transform="matrix(-0.7062 0.708 -0.708 -0.7062 36.1343 15.0037)" width="1.4" x="14.25" y="-1.62"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_location.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_location.svg Fri May 14 16:09:54 2010 +0300
@@ -1,7 +1,11 @@
-<?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">
+<?xml version="1.0" ?>
+<!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.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"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_location_collection.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_location_collection.svg Fri May 14 16:09:54 2010 +0300
@@ -1,9 +1,15 @@
-<?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">
+<?xml version="1.0" ?>
+<!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="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"/>
+
<polygon points="5.999,1,5.999,4,26,4,26,24,29,24,29,1"/>
+
<path d="M1,29h23v-23h-23v23zm3-20h17v17h-17v-17z"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_log.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_log.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,13 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
+
<path d="M10.52,8.506c1.35,0.571,2.732,0.287,3.599-0.017v3.875h1.766v-3.871c0.866,0.304,2.249,0.588,3.599,0.017,2.926-1.238,2.831-3.499,2.831-3.499s-1.41-1.298-4.335-0.06c-2.645,1.12-2.94,2.791-2.973,3.101h-0.01c-0.032-0.31-0.328-1.98-2.973-3.101-2.925-1.238-4.335,0.06-4.335,0.06s-0.102,2.261,2.825,3.499z"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_low_light.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_low_light.svg Fri May 14 16:09:54 2010 +0300
@@ -1,10 +1,17 @@
-<?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">
+<?xml version="1.0" ?>
+<!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"/>
+
<rect height="4" width="2" x="14" y="0"/>
+
<rect height="4" width="6" x="12" y="26"/>
+
<path d="M15,6.215c-5.001,0-8.495,3.297-8.495,8.019,0,0.694,0,2.538,4.627,8.769l0.898,1.213h5.951l0.898-1.213c4.625-6.23,4.625-8.074,4.625-8.769,0-4.718-3.49-8.015-8.5-8.015zm1.47,15h-2.931s-4.036-5.435-4.036-6.981c0-3.355,2.463-5.021,5.5-5.019,3.037-0.002,5.5,1.663,5.5,5.019,0,1.54-4.03,6.98-4.03,6.98z"/>
+
<rect height="4" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -0.7621 5.2862)" width="2" x="5" y="1.563"/>
+
<rect height="4" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 38.4511 23.053)" width="2" x="23" y="1.563"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_lsk_horizontal.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_lsk_horizontal.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,13 @@
-<?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">
+<?xml version="1.0" ?>
+<!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>
+
<path d="M19,10h-18v4h18c3.309,0,6,2.691,6,6h4c0-5.51-4.49-10-10-10z"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_lsk_vertical.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_lsk_vertical.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,13 @@
-<?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">
+<?xml version="1.0" ?>
+<!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>
+
<path d="M10,11v18h4v-18c0-3.309,2.691-6,6-6v-4c-5.51,0-10,4.486-10,10z"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_memory_in_use.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_memory_in_use.svg Fri May 14 16:09:54 2010 +0300
@@ -1,10 +1,17 @@
-<?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">
+<?xml version="1.0" ?>
+<!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>
+
<path d="M18.24,1h-14.24v28h22v-20.24l-7.76-7.758zm4.76,25h-16v-22h10l6,6v16z"/>
+
<polygon points="16.75,5,16,5,16,7,14,7,14,5,12,5,12,7,10,7,10,5,8,5,8,15,22,15,22,10.25"/>
+
<rect height="2" width="14" x="8" y="23"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_merge.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_merge.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,15 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
<path d="M29,17l-8-6v4h-4v-0.025C12.5,14.738,8.827,11.364,8.13,7H4.089c0.346,3.111,1.762,5.895,3.858,8H1v4h20v4L29,17z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_mic_mute.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_mic_mute.svg Fri May 14 16:09:54 2010 +0300
@@ -1,9 +1,15 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
+
<path d="M20,26h-5v-4.808l1.023-1.022-9.19-9.19-1.387,1.388c-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.05h-5c-0.553,0-1,0.447-1,1v2h15v-2c0-0.55-0.45-1-1-1z"/>
+
<rect height="35.83" transform="matrix(0.7066 -0.7076 0.7076 0.7066 -6.1479 14.8607)" width="1.867" x="13.91" y="-3.069"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_mic_unmute.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_mic_unmute.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,9 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_minus.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_minus.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,13 @@
-<?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">
-<rect fill="none" height="30" width="30"/>
-<rect height="4" width="22" x="4" y="13"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<rect fill="none" width="30" height="30"/>
+<rect x="4" y="13" width="22" height="4"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_missed_call_unseen.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_missed_call_unseen.svg Fri May 14 16:09:54 2010 +0300
@@ -1,10 +1,17 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
<path d="M22,14L13,2L4,14h5v6c0,4.418,3.582,8,8,8h5v-5h-3c-1.103,0-2-0.897-2-2v-7H22z"/>
-<rect height="3.615" transform="matrix(0.9029 -0.4298 0.4298 0.9029 -0.8692 12.117)" width="6.284" x="23.244" y="6.175"/>
-<rect height="6.285" transform="matrix(0.9206 0.3906 -0.3906 0.9206 3.0913 -8.0028)" width="3.615" x="19.413" y="0.456"/>
+<rect x="23.244" y="6.175" transform="matrix(0.9029 -0.4298 0.4298 0.9029 -0.8692 12.117)" width="6.284" height="3.615"/>
+<rect x="19.413" y="0.456" transform="matrix(0.9206 0.3906 -0.3906 0.9206 3.0913 -8.0028)" width="3.615" height="6.285"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_mobile.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_mobile.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,16 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
-<path d="M21,1H9C7.35,1,6,2.35,6,4v22c0,1.65,1.35,3,3,3h12c1.65,0,3-1.35,3-3V4C24,2.35,22.65,1,21,1z M11,26H8v-2h3V26z M15,27 c-1.104,0-2-0.896-2-2s0.896-2,2-2c1.105,0,2,0.896,2,2S16.105,27,15,27z M22,26h-3v-2h3V26z M22,21H8V3h14V21z"/>
+<path d="M21,1H9C7.35,1,6,2.35,6,4v22c0,1.65,1.35,3,3,3h12c1.65,0,3-1.35,3-3V4C24,2.35,22.65,1,21,1z M11,26H8v-2h3V26z M15,27
+ c-1.104,0-2-0.896-2-2s0.896-2,2-2c1.105,0,2,0.896,2,2S16.105,27,15,27z M22,26h-3v-2h3V26z M22,21H8V3h14V21z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_mono_recognize_song.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_mono_recognize_song.svg Fri May 14 16:09:54 2010 +0300
@@ -1,9 +1,23 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
-<path d="M23,5L13,2v17.357C12.31,19.129,11.549,19,10.75,19C7.574,19,5,21.016,5,23.5S7.574,28,10.75,28S17,25.984,17,23.5 c0-0.168,0-13.449,0-13.449L23,12V5z"/>
-<path d="M20,17.014v-1.581C21.043,15.145,21.975,15,22.795,15c1.363,0,2.405,0.279,3.124,0.838C26.64,16.396,27,17.219,27,18.31 c0,0.459-0.104,0.93-0.311,1.412c-0.21,0.48-0.705,1.118-1.488,1.916c-0.573,0.576-0.957,1.007-1.149,1.291 c-0.192,0.286-0.29,0.614-0.29,0.989v0.836h-2.297v-0.965c0-0.619,0.136-1.156,0.407-1.609c0.271-0.453,0.689-0.953,1.257-1.498 c0.598-0.589,0.967-1.037,1.108-1.342c0.142-0.307,0.212-0.607,0.212-0.901c0-0.613-0.171-1.073-0.516-1.379 c-0.343-0.306-0.858-0.46-1.546-0.46C21.718,16.6,20.923,16.737,20,17.014z M22.613,29c-0.398,0-0.735-0.142-1.013-0.428 c-0.278-0.283-0.416-0.629-0.416-1.033s0.138-0.747,0.416-1.029c0.277-0.283,0.614-0.423,1.013-0.423s0.735,0.14,1.014,0.423 c0.277,0.282,0.415,0.625,0.415,1.029s-0.139,0.75-0.421,1.033C23.342,28.858,23.006,29,22.613,29z"/>
+<path d="M23,5L13,2v17.357C12.31,19.129,11.549,19,10.75,19C7.574,19,5,21.016,5,23.5S7.574,28,10.75,28S17,25.984,17,23.5
+ c0-0.168,0-13.449,0-13.449L23,12V5z"/>
+<path d="M20,17.014v-1.581C21.043,15.145,21.975,15,22.795,15c1.363,0,2.405,0.279,3.124,0.838C26.64,16.396,27,17.219,27,18.31
+ c0,0.459-0.104,0.93-0.311,1.412c-0.21,0.48-0.705,1.118-1.488,1.916c-0.573,0.576-0.957,1.007-1.149,1.291
+ c-0.192,0.286-0.29,0.614-0.29,0.989v0.836h-2.297v-0.965c0-0.619,0.136-1.156,0.407-1.609c0.271-0.453,0.689-0.953,1.257-1.498
+ c0.598-0.589,0.967-1.037,1.108-1.342c0.142-0.307,0.212-0.607,0.212-0.901c0-0.613-0.171-1.073-0.516-1.379
+ c-0.343-0.306-0.858-0.46-1.546-0.46C21.718,16.6,20.923,16.737,20,17.014z M22.613,29c-0.398,0-0.735-0.142-1.013-0.428
+ c-0.278-0.283-0.416-0.629-0.416-1.033s0.138-0.747,0.416-1.029c0.277-0.283,0.614-0.423,1.013-0.423s0.735,0.14,1.014,0.423
+ c0.277,0.282,0.415,0.625,0.415,1.029s-0.139,0.75-0.421,1.033C23.342,28.858,23.006,29,22.613,29z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_more.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_more.svg Fri May 14 16:09:54 2010 +0300
@@ -1,10 +1,17 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
+
<g fill-opacity="0.5" stroke-opacity="0.5">
+
<rect fill="none" height="30" width="30"/>
+
</g>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_music_albums.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_music_albums.svg Fri May 14 16:09:54 2010 +0300
@@ -1,10 +1,18 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
-<path d="M10.5,22c1.934,0,3.5-1.344,3.5-3v-7.333L18,13V9l-6-2v9.3c-0.456-0.187-0.961-0.3-1.5-0.3C8.566,16,7,17.343,7,19 C7,20.656,8.566,22,10.5,22z"/>
+<path d="M10.5,22c1.934,0,3.5-1.344,3.5-3v-7.333L18,13V9l-6-2v9.3c-0.456-0.187-0.961-0.3-1.5-0.3C8.566,16,7,17.343,7,19
+ C7,20.656,8.566,22,10.5,22z"/>
<path d="M23,6h1V5.268V3H1v24h23v-2.268V24h-1V6z M20,24H4V6h16V24z"/>
<path d="M25,6.079V7h-1v16h1v0.921c2.449-2.195,4-5.372,4-8.921S27.449,8.274,25,6.079z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_new_event.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_new_event.svg Fri May 14 16:09:54 2010 +0300
@@ -1,7 +1,11 @@
-<?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">
+<?xml version="1.0" ?>
+<!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="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"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_next.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_next.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,15 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
<polygon points="20,4 20,15 20,26 24,26 24,4 "/>
<polygon points="6,26 20,15 6,4 "/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_night.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_night.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,13 @@
-<?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">
+<?xml version="1.0" ?>
+<!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>
+
<path d="M15.25,15c0-5.596,3.541-10.35,8.5-12.18-1.4-0.521-2.92-0.82-4.5-0.82-7.18,0-13,5.82-13,13s5.821,13,13,13c1.584,0,3.096-0.297,4.5-0.816-4.96-1.83-8.5-6.58-8.5-12.18z"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_night_portrait.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_night_portrait.svg Fri May 14 16:09:54 2010 +0300
@@ -1,7 +1,18 @@
-<?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">
-<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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<rect fill="none" width="30" height="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"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_notes_all.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_notes_all.svg Fri May 14 16:09:54 2010 +0300
@@ -1,15 +1,22 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
<polygon points="19,29 27,21 19,21 "/>
-<rect height="2" width="2" x="9" y="14"/>
-<rect height="2" width="8.999" x="12" y="14"/>
-<rect height="2" width="2" x="9" y="9"/>
-<rect height="2" width="8.999" x="12" y="9"/>
+<rect x="9" y="14" width="2" height="2"/>
+<rect x="12" y="14" width="8.999" height="2"/>
+<rect x="9" y="9" width="2" height="2"/>
+<rect x="12" y="9" width="8.999" height="2"/>
<polygon points="22,2 22,5 24,5 24,20 27,20 27,2 "/>
<polygon points="6,5 8,5 8,2 3,2 3,29 18,29 18,26 6,26 "/>
-<rect height="5" width="10" x="10"/>
+<rect x="10" width="10" height="5"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_notes_collections.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_notes_collections.svg Fri May 14 16:09:54 2010 +0300
@@ -1,15 +1,22 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
<polygon points="6,1 6,4 26,4 26,16 29,16 29,1 "/>
<polygon points="17,29 24,22 17,22 "/>
<polygon points="26,20 29,17 26,17 "/>
<polygon points="1,29 16,29 16,26 4,26 4,9 21,9 21,21 24,21 24,6 1,6 "/>
-<rect height="2" width="2" x="7" y="17"/>
-<rect height="2" width="8" x="10" y="17"/>
-<rect height="2" width="2" x="7" y="12"/>
-<rect height="2" width="8" x="10" y="12"/>
+<rect x="7" y="17" width="2" height="2"/>
+<rect x="10" y="17" width="8" height="2"/>
+<rect x="7" y="12" width="2" height="2"/>
+<rect x="10" y="12" width="8" height="2"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_offline.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_offline.svg Fri May 14 16:09:54 2010 +0300
@@ -1,10 +1,17 @@
-<?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" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<?xml version="1.0" ?>
+<!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" 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"/>
+
<polygon points="28.6,17.96,26.54,15.9,22.72,19.73,18.9,15.9,16.83,17.96,20.66,21.79,16.83,25.61,18.9,27.67,22.72,23.85,26.54,27.67,28.6,25.61,24.78,21.79"/>
+
<rect fill="none" height="29.03" width="29.03" x="0.54" y="0.639"/>
+
<rect fill="none" height="29.03" width="29.03" x="0.54" y="0.639"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_one.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_one.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,15 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
<path d="M22,22.813V25H10.01v-2.188H14V7l-4,1V6l6-2h2v18.813H22z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_online_support.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_online_support.svg Fri May 14 16:09:54 2010 +0300
@@ -1,10 +1,28 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
<polygon points="9.49,8.148 17.801,10.801 19.199,8 13.601,6.601 "/>
-<path d="M15,1C7.267,1,1,7.267,1,15c0,0.278,0.025,0.55,0.042,0.824c0.045-0.025,0.082-0.062,0.13-0.083l4.591-2.088 c-0.423-1.019,0.124-3.402,0.441-3.792c0.328-0.4,2.885-2.153,2.885-2.153L8.76,7.233C8.538,6.758,9.964,6.102,9.964,6.102 c0.548,0.367,0.912,0,0.912,0l0.146-0.366l-0.146-0.546l1.132-1.405l1.082-0.25c0.624-0.103,1.259-0.171,1.911-0.171 c1.384,0,2.705,0.255,3.936,0.7l-1.136,1.136l1.398,1.401l1.401-1.401l-0.772-0.771c3.815,1.754,6.528,5.505,6.777,9.915 c-0.795-1.197-1.602-3.495-1.602-3.495l-1.788-0.328L21.608,9.9l0.913,1.239l0.656-0.291c0,0,0.804,0.767,0.766,1.021 c-0.034,0.258-1.237,1.424-1.237,1.424l-1.057,0.377l-1.391-1.145l-1.06-0.874l0.656,1.569l0.878,0.913c0,0,1.534-0.219,1.753-0.037 c0.22,0.181-0.293,1.572-0.293,1.572l-2.557,2.626l-0.253,2.627c-1.426,0.734-1.571,1.859-1.571,1.859s-0.365-0.069-1.313,0.991 c-0.95,1.057-1.973,0.78-1.973,0.78c-1.206,0-1.425-0.78-1.425-1.037c0-0.107-0.212-0.519-0.457-1.004 c0.017,0.693-0.313,1.353-0.901,1.731c-0.329,0.212-0.706,0.318-1.083,0.318c-0.345,0-0.69-0.089-1-0.268l-0.866-0.501l-0.839,1.453 c-0.129,0.752-0.032,1.416,0.099,1.899C10.103,28.319,12.47,29,15,29c7.733,0,14-6.267,14-14S22.733,1,15,1z M24.172,22.484 c-0.474,0.579-1.002,1.112-1.575,1.593l-1.185-1.067l1.399-2.801l1.989,0.392L24.172,22.484z"/>
-<path d="M6.062,24.525l2-3.464l2.599,1.5L9.83,14L2,17.562l2.598,1.5l-2,3.464c0,0-1.938,5.475,4.063,6.475 C6.66,29,5.463,27.051,6.062,24.525z"/>
+<path d="M15,1C7.267,1,1,7.267,1,15c0,0.278,0.025,0.55,0.042,0.824c0.045-0.025,0.082-0.062,0.13-0.083l4.591-2.088
+ c-0.423-1.019,0.124-3.402,0.441-3.792c0.328-0.4,2.885-2.153,2.885-2.153L8.76,7.233C8.538,6.758,9.964,6.102,9.964,6.102
+ c0.548,0.367,0.912,0,0.912,0l0.146-0.366l-0.146-0.546l1.132-1.405l1.082-0.25c0.624-0.103,1.259-0.171,1.911-0.171
+ c1.384,0,2.705,0.255,3.936,0.7l-1.136,1.136l1.398,1.401l1.401-1.401l-0.772-0.771c3.815,1.754,6.528,5.505,6.777,9.915
+ c-0.795-1.197-1.602-3.495-1.602-3.495l-1.788-0.328L21.608,9.9l0.913,1.239l0.656-0.291c0,0,0.804,0.767,0.766,1.021
+ c-0.034,0.258-1.237,1.424-1.237,1.424l-1.057,0.377l-1.391-1.145l-1.06-0.874l0.656,1.569l0.878,0.913c0,0,1.534-0.219,1.753-0.037
+ c0.22,0.181-0.293,1.572-0.293,1.572l-2.557,2.626l-0.253,2.627c-1.426,0.734-1.571,1.859-1.571,1.859s-0.365-0.069-1.313,0.991
+ c-0.95,1.057-1.973,0.78-1.973,0.78c-1.206,0-1.425-0.78-1.425-1.037c0-0.107-0.212-0.519-0.457-1.004
+ c0.017,0.693-0.313,1.353-0.901,1.731c-0.329,0.212-0.706,0.318-1.083,0.318c-0.345,0-0.69-0.089-1-0.268l-0.866-0.501l-0.839,1.453
+ c-0.129,0.752-0.032,1.416,0.099,1.899C10.103,28.319,12.47,29,15,29c7.733,0,14-6.267,14-14S22.733,1,15,1z M24.172,22.484
+ c-0.474,0.579-1.002,1.112-1.575,1.593l-1.185-1.067l1.399-2.801l1.989,0.392L24.172,22.484z"/>
+<path d="M6.062,24.525l2-3.464l2.599,1.5L9.83,14L2,17.562l2.598,1.5l-2,3.464c0,0-1.938,5.475,4.063,6.475
+ C6.66,29,5.463,27.051,6.062,24.525z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_options_menu.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_options_menu.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,9 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<polygon points="28.5,7,15,25,1.5,7"/>
+
<rect fill="none" height="30" width="30"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_organize.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_organize.svg Fri May 14 16:09:54 2010 +0300
@@ -1,11 +1,19 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
+
<polygon points="13,18,13,21.47,10,21.47,15.03,29,20,21.47,17,21.47,17,18"/>
+
<g fill-opacity="0.5" stroke-opacity="0.5">
+
<rect fill="none" height="30" width="30"/>
+
</g>
-</svg>
+
+</svg>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_outbox.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<rect fill="none" width="30" height="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 "/>
+</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_ovistore.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_ovistore.svg Fri May 14 16:09:54 2010 +0300
@@ -1,11 +1,53 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
-<path d="M14.54,22.262c-0.276,0-0.479,0.133-0.639,0.418c-0.175,0.316-0.265,0.792-0.265,1.413c0,1.836,0.68,1.836,0.903,1.836 c0.278,0,0.479-0.134,0.635-0.421c0.171-0.316,0.257-0.792,0.257-1.415c0-0.622-0.086-1.099-0.257-1.415 C15.021,22.394,14.818,22.262,14.54,22.262z"/>
-<path d="M23.822,22.263c-0.183,0-0.339,0.11-0.479,0.336c-0.13,0.212-0.207,0.476-0.229,0.786h1.362 c-0.021-0.313-0.094-0.578-0.215-0.793C24.074,22.263,23.885,22.263,23.822,22.263z"/>
-<path d="M8.616,10.402c-1.563,0-1.686,1.897-1.686,3.354c0,1.493,0.069,3.776,1.686,3.776c1.614,0,1.703-2.038,1.703-3.776 C10.319,12.404,10.109,10.402,8.616,10.402z"/>
-<path d="M21.452,4C20.397,1.653,17.91,0,15,0S9.603,1.653,8.548,4H2v25h26V4H21.452z M24.5,5.399c0.836,0,1.5,0.475,1.5,1.3 C26,7.543,25.37,8,24.5,8S23,7.543,23,6.7C23,5.856,23.613,5.399,24.5,5.399z M22.574,9.173c0.154-0.211,0.377-0.218,0.647-0.218 c0.09,0,0.188,0,0.188,0L26,9v8.711c0,0.255,0,0.728-0.397,1.008C25.396,18.867,25.079,19,24.598,19c-0.463,0-0.612-0.18-0.82-0.326 c-0.395-0.279-0.395-0.753-0.395-1.008v-7.098c0,0-0.071,0-0.161,0c-0.271,0-0.493-0.001-0.647-0.212 c-0.073-0.098-0.174-0.262-0.174-0.592C22.4,9.448,22.501,9.271,22.574,9.173z M15,1.625c1.813,0,3.377,0.96,4.249,2.375h-8.498 C11.623,2.585,13.188,1.625,15,1.625z M7.36,26.744c-0.371,0.301-0.935,0.455-1.676,0.455c-0.413,0-0.758-0.029-1.026-0.084 c-0.26-0.055-0.486-0.123-0.67-0.203l-0.12-0.053v-1.4l0.298,0.166c0.167,0.094,0.378,0.177,0.625,0.246 c0.25,0.07,0.521,0.105,0.806,0.105c0.223,0,0.389-0.045,0.492-0.137c0.098-0.086,0.145-0.219,0.145-0.409 c0-0.089-0.016-0.168-0.048-0.243c-0.03-0.066-0.087-0.139-0.168-0.209c-0.06-0.051-0.21-0.152-0.574-0.337 c-0.469-0.23-0.788-0.43-0.972-0.608c-0.188-0.183-0.319-0.379-0.387-0.585c-0.067-0.194-0.101-0.429-0.101-0.696 c0-0.555,0.201-0.996,0.598-1.309c0.379-0.305,0.872-0.459,1.466-0.459c0.356,0,0.667,0.029,0.926,0.085 c0.263,0.058,0.482,0.126,0.668,0.208l0.12,0.053v1.392l-0.296-0.161c-0.174-0.094-0.384-0.178-0.625-0.249 c-0.238-0.073-0.454-0.108-0.645-0.108c-0.184,0-0.319,0.041-0.411,0.129c-0.092,0.086-0.134,0.193-0.134,0.338 c0,0.078,0.015,0.143,0.044,0.188c0.042,0.061,0.095,0.119,0.159,0.172c0.072,0.055,0.248,0.154,0.524,0.295 c0.438,0.219,0.747,0.4,0.942,0.557c0.212,0.17,0.371,0.371,0.471,0.6c0.1,0.226,0.148,0.504,0.148,0.851 C7.94,25.957,7.745,26.432,7.36,26.744z M11.795,26.958l-0.129,0.05c-0.117,0.044-0.268,0.088-0.453,0.128 c-0.178,0.042-0.403,0.062-0.703,0.062c-0.598,0-1.053-0.18-1.351-0.537c-0.289-0.347-0.436-0.843-0.436-1.475v-2.827H7.969v-1.291 h0.754v-0.675l1.71-0.893v1.567h1.277v1.291h-1.276v2.705c0,0.438,0.06,0.636,0.11,0.724c0.033,0.059,0.103,0.137,0.319,0.137 c0.114,0,0.228-0.017,0.338-0.049c0.119-0.032,0.22-0.07,0.304-0.113l0.289-0.143V26.958z M8.491,19C5.147,19,4,16.729,4,13.847 C4,11,5.559,9,8.525,9C11.594,9,13,11.017,13,13.916C12.998,16.95,11.576,19,8.491,19z M16.461,26.398 c-0.473,0.531-1.119,0.801-1.921,0.801c-0.8,0-1.448-0.27-1.927-0.801c-0.471-0.526-0.71-1.302-0.71-2.305 c0-0.995,0.234-1.768,0.695-2.297c0.469-0.538,1.122-0.812,1.942-0.812c0.813,0,1.465,0.278,1.934,0.825 c0.461,0.536,0.694,1.305,0.694,2.283C17.168,25.097,16.93,25.872,16.461,26.398z M15.383,17.523L12.859,9h2.934l1.793,7.375 L19.484,9h2.477l-2.652,8.523C19.016,18.4,18.578,19,17.346,19C16.112,19,15.656,18.4,15.383,17.523z M21.17,22.447l-0.25-0.063 c-0.121-0.029-0.238-0.045-0.359-0.045c-0.383,0-0.629,0.097-0.752,0.295c-0.098,0.156-0.213,0.488-0.213,1.179v3.309h-1.71v-4.786 c0-0.252-0.011-0.607-0.028-1.061l-0.008-0.208h1.64c0,0,0.038,0.28,0.045,0.332c0.05-0.054,0.104-0.103,0.161-0.147 c0.227-0.176,0.49-0.267,0.785-0.267c0.189,0,0.373,0.026,0.545,0.076l0.145,0.042V22.447z M26.203,24.67h-3.102 c0.022,0.383,0.115,0.683,0.275,0.893c0.179,0.232,0.434,0.346,0.779,0.346c0.344,0,0.644-0.024,0.893-0.072 c0.245-0.051,0.463-0.117,0.645-0.201l0.283-0.129v1.35l-0.116,0.053c-0.216,0.099-0.47,0.172-0.756,0.219 c-0.284,0.049-0.688,0.073-1.2,0.073c-0.833,0-1.477-0.271-1.911-0.803c-0.425-0.521-0.64-1.284-0.64-2.267 c0-0.972,0.207-1.742,0.617-2.292c0.423-0.566,1.046-0.854,1.852-0.854c0.821,0,1.434,0.271,1.818,0.802 c0.373,0.509,0.563,1.277,0.563,2.281V24.67z"/>
+<path d="M14.54,22.262c-0.276,0-0.479,0.133-0.639,0.418c-0.175,0.316-0.265,0.792-0.265,1.413c0,1.836,0.68,1.836,0.903,1.836
+ c0.278,0,0.479-0.134,0.635-0.421c0.171-0.316,0.257-0.792,0.257-1.415c0-0.622-0.086-1.099-0.257-1.415
+ C15.021,22.394,14.818,22.262,14.54,22.262z"/>
+<path d="M23.822,22.263c-0.183,0-0.339,0.11-0.479,0.336c-0.13,0.212-0.207,0.476-0.229,0.786h1.362
+ c-0.021-0.313-0.094-0.578-0.215-0.793C24.074,22.263,23.885,22.263,23.822,22.263z"/>
+<path d="M8.616,10.402c-1.563,0-1.686,1.897-1.686,3.354c0,1.493,0.069,3.776,1.686,3.776c1.614,0,1.703-2.038,1.703-3.776
+ C10.319,12.404,10.109,10.402,8.616,10.402z"/>
+<path d="M21.452,4C20.397,1.653,17.91,0,15,0S9.603,1.653,8.548,4H2v25h26V4H21.452z M24.5,5.399c0.836,0,1.5,0.475,1.5,1.3
+ C26,7.543,25.37,8,24.5,8S23,7.543,23,6.7C23,5.856,23.613,5.399,24.5,5.399z M22.574,9.173c0.154-0.211,0.377-0.218,0.647-0.218
+ c0.09,0,0.188,0,0.188,0L26,9v8.711c0,0.255,0,0.728-0.397,1.008C25.396,18.867,25.079,19,24.598,19c-0.463,0-0.612-0.18-0.82-0.326
+ c-0.395-0.279-0.395-0.753-0.395-1.008v-7.098c0,0-0.071,0-0.161,0c-0.271,0-0.493-0.001-0.647-0.212
+ c-0.073-0.098-0.174-0.262-0.174-0.592C22.4,9.448,22.501,9.271,22.574,9.173z M15,1.625c1.813,0,3.377,0.96,4.249,2.375h-8.498
+ C11.623,2.585,13.188,1.625,15,1.625z M7.36,26.744c-0.371,0.301-0.935,0.455-1.676,0.455c-0.413,0-0.758-0.029-1.026-0.084
+ c-0.26-0.055-0.486-0.123-0.67-0.203l-0.12-0.053v-1.4l0.298,0.166c0.167,0.094,0.378,0.177,0.625,0.246
+ c0.25,0.07,0.521,0.105,0.806,0.105c0.223,0,0.389-0.045,0.492-0.137c0.098-0.086,0.145-0.219,0.145-0.409
+ c0-0.089-0.016-0.168-0.048-0.243c-0.03-0.066-0.087-0.139-0.168-0.209c-0.06-0.051-0.21-0.152-0.574-0.337
+ c-0.469-0.23-0.788-0.43-0.972-0.608c-0.188-0.183-0.319-0.379-0.387-0.585c-0.067-0.194-0.101-0.429-0.101-0.696
+ c0-0.555,0.201-0.996,0.598-1.309c0.379-0.305,0.872-0.459,1.466-0.459c0.356,0,0.667,0.029,0.926,0.085
+ c0.263,0.058,0.482,0.126,0.668,0.208l0.12,0.053v1.392l-0.296-0.161c-0.174-0.094-0.384-0.178-0.625-0.249
+ c-0.238-0.073-0.454-0.108-0.645-0.108c-0.184,0-0.319,0.041-0.411,0.129c-0.092,0.086-0.134,0.193-0.134,0.338
+ c0,0.078,0.015,0.143,0.044,0.188c0.042,0.061,0.095,0.119,0.159,0.172c0.072,0.055,0.248,0.154,0.524,0.295
+ c0.438,0.219,0.747,0.4,0.942,0.557c0.212,0.17,0.371,0.371,0.471,0.6c0.1,0.226,0.148,0.504,0.148,0.851
+ C7.94,25.957,7.745,26.432,7.36,26.744z M11.795,26.958l-0.129,0.05c-0.117,0.044-0.268,0.088-0.453,0.128
+ c-0.178,0.042-0.403,0.062-0.703,0.062c-0.598,0-1.053-0.18-1.351-0.537c-0.289-0.347-0.436-0.843-0.436-1.475v-2.827H7.969v-1.291
+ h0.754v-0.675l1.71-0.893v1.567h1.277v1.291h-1.276v2.705c0,0.438,0.06,0.636,0.11,0.724c0.033,0.059,0.103,0.137,0.319,0.137
+ c0.114,0,0.228-0.017,0.338-0.049c0.119-0.032,0.22-0.07,0.304-0.113l0.289-0.143V26.958z M8.491,19C5.147,19,4,16.729,4,13.847
+ C4,11,5.559,9,8.525,9C11.594,9,13,11.017,13,13.916C12.998,16.95,11.576,19,8.491,19z M16.461,26.398
+ c-0.473,0.531-1.119,0.801-1.921,0.801c-0.8,0-1.448-0.27-1.927-0.801c-0.471-0.526-0.71-1.302-0.71-2.305
+ c0-0.995,0.234-1.768,0.695-2.297c0.469-0.538,1.122-0.812,1.942-0.812c0.813,0,1.465,0.278,1.934,0.825
+ c0.461,0.536,0.694,1.305,0.694,2.283C17.168,25.097,16.93,25.872,16.461,26.398z M15.383,17.523L12.859,9h2.934l1.793,7.375
+ L19.484,9h2.477l-2.652,8.523C19.016,18.4,18.578,19,17.346,19C16.112,19,15.656,18.4,15.383,17.523z M21.17,22.447l-0.25-0.063
+ c-0.121-0.029-0.238-0.045-0.359-0.045c-0.383,0-0.629,0.097-0.752,0.295c-0.098,0.156-0.213,0.488-0.213,1.179v3.309h-1.71v-4.786
+ c0-0.252-0.011-0.607-0.028-1.061l-0.008-0.208h1.64c0,0,0.038,0.28,0.045,0.332c0.05-0.054,0.104-0.103,0.161-0.147
+ c0.227-0.176,0.49-0.267,0.785-0.267c0.189,0,0.373,0.026,0.545,0.076l0.145,0.042V22.447z M26.203,24.67h-3.102
+ c0.022,0.383,0.115,0.683,0.275,0.893c0.179,0.232,0.434,0.346,0.779,0.346c0.344,0,0.644-0.024,0.893-0.072
+ c0.245-0.051,0.463-0.117,0.645-0.201l0.283-0.129v1.35l-0.116,0.053c-0.216,0.099-0.47,0.172-0.756,0.219
+ c-0.284,0.049-0.688,0.073-1.2,0.073c-0.833,0-1.477-0.271-1.911-0.803c-0.425-0.521-0.64-1.284-0.64-2.267
+ c0-0.972,0.207-1.742,0.617-2.292c0.423-0.566,1.046-0.854,1.852-0.854c0.821,0,1.434,0.271,1.818,0.802
+ c0.373,0.509,0.563,1.277,0.563,2.281V24.67z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pause.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pause.svg Fri May 14 16:09:54 2010 +0300
@@ -1,9 +1,15 @@
-<?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">
+<?xml version="1.0" ?>
+<!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>
+
<rect height="22" width="4" x="7" y="4"/>
+
<rect height="22" width="4" x="19" y="4"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pd_attach.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pd_attach.svg Fri May 14 16:09:54 2010 +0300
@@ -1,17 +1,31 @@
-<?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" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<?xml version="1.0" ?>
+<!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" 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"/>
+
<polygon points="16.74,22.22,18.21,24.58,22.22,24.58,20.76,22.22"/>
+
<polygon points="10.48,22.22,11.94,24.58,15.93,24.58,14.47,22.22"/>
+
<polygon points="23.03,22.22,24.25,24.17,24.25,22.22"/>
+
<polygon points="9.66,24.58,9.667,24.58,8.199,22.22,5.432,22.22,9.496,28.73,11.48,27.49,10.79,26.39"/>
+
<polygon points="19.97,17.36,21.43,19.72,24.24,19.72,20.18,13.21,18.18,14.46,19.99,17.36"/>
+
<polygon points="19.15,19.72,17.69,17.36,13.74,17.37,15.2,19.72"/>
+
<polygon points="5.432,17.76,5.432,19.72,6.655,19.72"/>
+
<polygon points="12.92,19.72,11.46,17.37,7.463,17.37,8.929,19.72"/>
+
<rect fill="none" height="29.03" width="29.03" x="0.323" y="0.639"/>
+
<rect fill="none" height="29.03" width="29.03" x="0.323" y="0.639"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pd_context.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pd_context.svg Fri May 14 16:09:54 2010 +0300
@@ -1,11 +1,19 @@
-<?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" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<?xml version="1.0" ?>
+<!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" 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"/>
+
<polygon fill="none" points="16.28,3.692,16.28,6.661,19.16,4.277,19.16,3.692"/>
+
<path d="M9.249,1.578v3.663l4.917,4.154v5.738h2.115v-5.728l4.992-4.128v-3.696h-12.02zm7.031,5.083v-2.969h2.879v0.585l-2.88,2.384zm-2.11-0.034l-2.807-2.369v-0.566h2.804v2.935h0.006z"/>
+
<rect fill="none" height="29.03" width="29.03" x="0.746" y="0.639"/>
+
<rect fill="none" height="29.03" width="29.03" x="0.746" y="0.639"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pd_multipdp.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pd_multipdp.svg Fri May 14 16:09:54 2010 +0300
@@ -1,11 +1,19 @@
-<?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" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<?xml version="1.0" ?>
+<!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" 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"/>
+
<polygon points="20,13.3,18,14.55,19.8,17.46,5.247,17.46,5.247,19.81,24.06,19.81"/>
+
<polygon points="9.313,28.73,11.31,27.48,9.503,24.58,12.46,24.58,15.05,28.73,17.05,27.48,15.24,24.58,24.06,24.58,24.06,22.22,5.247,22.22"/>
+
<rect fill="none" height="29.03" width="29.03" x="0.14" y="0.639"/>
+
<rect fill="none" height="29.03" width="29.03" x="0.14" y="0.639"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pd_suspended.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_pd_suspended.svg Fri May 14 16:09:54 2010 +0300
@@ -1,14 +1,25 @@
-<?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" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<?xml version="1.0" ?>
+<!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" 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"/>
+
<polygon points="24.77,22.22,24.77,24.57,20.51,24.57,20.51,24.57,14.72,24.57,16.69,22.22"/>
+
<polygon points="5.954,22.22,11.08,22.22,9.095,24.57,5.954,24.57"/>
+
<polygon points="24.77,17.36,24.77,19.72,18.78,19.72,20.75,17.36"/>
+
<polygon points="5.954,19.72,5.954,17.36,15.17,17.36,13.19,19.72"/>
+
<polygon points="21.57,14.73,21.65,14.79,21.6,14.85,10.89,27.61,9.923,28.76,8.117,27.25,9.493,25.61,19.84,13.27"/>
-<rect fill="none" height="29.03" width="29.03" x="0.846" y="0.639"/>
+
<rect fill="none" height="29.03" width="29.03" x="0.846" y="0.639"/>
-</svg>
+
+<rect fill="none" height="29.03" width="29.03" x="0.846" y="0.639"/>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_person_activitystream.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_person_activitystream.svg Fri May 14 16:09:54 2010 +0300
@@ -1,10 +1,27 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
-<path d="M8.649,14.904c0.002,0.148,0.013,0.419,0.003,0.566c-0.006,0.102-0.042,0.209-0.08,0.317h5.857 c-0.037-0.108-0.073-0.216-0.079-0.317c-0.01-0.157,0-0.437,0.002-0.596c1.086-0.732,2.028-1.654,2.6-2.776 c1.061-2.08,0.672-7.392,0.672-7.392C17.625,2.538,14.382,0,12.19,0h-1.391C8.606,0,5.375,2.538,5.375,4.707 c0,0-0.333,5.294,0.659,7.392C6.577,13.243,7.536,14.175,8.649,14.904z"/>
-<path d="M13,27.11v-6.216l-1.5,3.392l-3.401-7.694C6.402,18.725,1.294,21.482,1,21.87V28h12.09C13.036,27.711,13,27.415,13,27.11z"/>
-<path d="M25.111,17h-7.223C16.294,17,15,18.294,15,19.89v7.221c0,1.596,1.294,2.89,2.889,2.89h7.223C26.706,30,28,28.706,28,27.11 V19.89C28,18.294,26.706,17,25.111,17z M17.807,28.555c-0.752,0-1.361-0.608-1.361-1.359s0.609-1.36,1.361-1.36 s1.363,0.609,1.363,1.36S18.559,28.555,17.807,28.555z M23.102,28.555H21.17c0.002-0.08,0.012-0.159,0.012-0.241 c0-2.48-2.021-4.5-4.506-4.5c-0.078,0-0.154,0.008-0.23,0.012v-1.928c0.076-0.002,0.152-0.012,0.23-0.012 c3.549,0,6.438,2.884,6.438,6.428C23.113,28.396,23.105,28.475,23.102,28.555z M26.543,28.555H24.61 c0.003-0.082,0.013-0.164,0.013-0.245c0-4.377-3.564-7.937-7.947-7.937c-0.078,0-0.154,0.009-0.23,0.012v-1.929 c0.078-0.001,0.152-0.011,0.23-0.011c5.448,0,9.879,4.424,9.879,9.864C26.555,28.391,26.544,28.473,26.543,28.555z"/>
+<path d="M8.649,14.904c0.002,0.148,0.013,0.419,0.003,0.566c-0.006,0.102-0.042,0.209-0.08,0.317h5.857
+ c-0.037-0.108-0.073-0.216-0.079-0.317c-0.01-0.157,0-0.437,0.002-0.596c1.086-0.732,2.028-1.654,2.6-2.776
+ c1.061-2.08,0.672-7.392,0.672-7.392C17.625,2.538,14.382,0,12.19,0h-1.391C8.606,0,5.375,2.538,5.375,4.707
+ c0,0-0.333,5.294,0.659,7.392C6.577,13.243,7.536,14.175,8.649,14.904z"/>
+<path d="M13,27.11v-6.216l-1.5,3.392l-3.401-7.694C6.402,18.725,1.294,21.482,1,21.87V28h12.09C13.036,27.711,13,27.415,13,27.11z"
+ />
+<path d="M25.111,17h-7.223C16.294,17,15,18.294,15,19.89v7.221c0,1.596,1.294,2.89,2.889,2.89h7.223C26.706,30,28,28.706,28,27.11
+ V19.89C28,18.294,26.706,17,25.111,17z M17.807,28.555c-0.752,0-1.361-0.608-1.361-1.359s0.609-1.36,1.361-1.36
+ s1.363,0.609,1.363,1.36S18.559,28.555,17.807,28.555z M23.102,28.555H21.17c0.002-0.08,0.012-0.159,0.012-0.241
+ c0-2.48-2.021-4.5-4.506-4.5c-0.078,0-0.154,0.008-0.23,0.012v-1.928c0.076-0.002,0.152-0.012,0.23-0.012
+ c3.549,0,6.438,2.884,6.438,6.428C23.113,28.396,23.105,28.475,23.102,28.555z M26.543,28.555H24.61
+ c0.003-0.082,0.013-0.164,0.013-0.245c0-4.377-3.564-7.937-7.947-7.937c-0.078,0-0.154,0.009-0.23,0.012v-1.929
+ c0.078-0.001,0.152-0.011,0.23-0.011c5.448,0,9.879,4.424,9.879,9.864C26.555,28.391,26.544,28.473,26.543,28.555z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_person_history.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_person_history.svg Fri May 14 16:09:54 2010 +0300
@@ -1,11 +1,23 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
-<path d="M8.649,14.904c0.002,0.148,0.013,0.419,0.003,0.566C8.646,15.572,8.609,15.68,8.572,16h5.857 c-0.037-0.32-0.073-0.428-0.079-0.529c-0.01-0.157,0-0.437,0.002-0.596c1.086-0.732,2.028-1.654,2.6-2.776 c1.061-2.08,0.672-7.392,0.672-7.392C17.625,2.538,14.382,0,12.19,0h-1.391C8.606,0,5.375,2.538,5.375,4.707 c0,0-0.333,5.294,0.659,7.392C6.577,13.243,7.536,14.175,8.649,14.904z"/>
-<path d="M13.274,20.275L11.5,24.286l-3.401-7.694C6.402,18.725,1.294,21.482,1,21.87V28h13.769C13.66,26.446,13,24.551,13,22.5 C13,21.732,13.102,20.99,13.274,20.275z"/>
-<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"/>
+<path d="M8.649,14.904c0.002,0.148,0.013,0.419,0.003,0.566C8.646,15.572,8.609,15.68,8.572,16h5.857
+ c-0.037-0.32-0.073-0.428-0.079-0.529c-0.01-0.157,0-0.437,0.002-0.596c1.086-0.732,2.028-1.654,2.6-2.776
+ c1.061-2.08,0.672-7.392,0.672-7.392C17.625,2.538,14.382,0,12.19,0h-1.391C8.606,0,5.375,2.538,5.375,4.707
+ c0,0-0.333,5.294,0.659,7.392C6.577,13.243,7.536,14.175,8.649,14.904z"/>
+<path d="M13.274,20.275L11.5,24.286l-3.401-7.694C6.402,18.725,1.294,21.482,1,21.87V28h13.769C13.66,26.446,13,24.551,13,22.5
+ C13,21.732,13.102,20.99,13.274,20.275z"/>
+<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"/>
<polygon points="23,22 23,18 21,18 21,24 27,24 27,22 "/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_photo_albums.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_photo_albums.svg Fri May 14 16:09:54 2010 +0300
@@ -1,9 +1,27 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
<path d="M3,5v3H1v2h2v2H1v2h2v2H1v2h2v2H1v2h2v3h26V5H3z M26,22H6V8h20V22z"/>
-<path d="M9.243,13.314c0.405-0.221,0.651-0.603,0.789-0.881c0.477,0.275,1.009,0.524,1.556,0.742 c0.449,0.179,1.003,0.36,1.614,0.547c-0.47,0.105-0.979,0.303-1.479,0.687c-1.603,1.229-1.786,2.46-1.328,2.87 s2.097,0.743,3.708-0.974c0.615-0.657,0.835-1.519,0.915-2.057c2.166,0.609,4.643,1.29,6.448,2.117 c-0.907-0.107-2.054-0.052-3.058,0.594c-2.037,1.308-1.852,3.128-1.268,3.564c0.581,0.436,3.111,1.079,5.158-0.747 c0.801-0.713,0.885-1.773,0.85-2.429c0.75,0.569,1.361,1.122,1.852,1.634v-1.914v-0.006v-4.936 c-0.469,0.524-0.889,1.192-1.162,2.033c-0.306,0.938-0.02,1.781,0.281,2.341c-0.028-0.015-0.052-0.031-0.08-0.046 c-1.096-0.558-3.502-1.213-6.131-1.951c0.393-0.042,0.869-0.146,1.301-0.405c1.086-0.652,1.352-1.691,0.963-2.256 c-0.278-0.399-1.191-0.742-2.199,0.359c-0.504,0.552-0.749,1.623-0.834,2.084c-1.775-0.503-3.599-1.042-5.155-1.613 c0.403-0.036,0.907-0.14,1.36-0.411c1.086-0.654,1.27-1.371,0.985-1.691c-0.321-0.358-1.2-0.783-2.381,0.307 c-0.487,0.449-0.639,1.129-0.688,1.51c-3.417-1.469-2.146-2.951-2.146-2.951c-0.092-0.359-0.32-0.717-0.687-0.102 C7.902,10.217,8.24,11.016,9.002,11.7c-0.236-0.012-0.497,0.014-0.771,0.106c-1.072,0.363-1.365,1.003-1.178,1.317 C7.24,13.439,8.09,13.943,9.243,13.314z"/>
+<path d="M9.243,13.314c0.405-0.221,0.651-0.603,0.789-0.881c0.477,0.275,1.009,0.524,1.556,0.742
+ c0.449,0.179,1.003,0.36,1.614,0.547c-0.47,0.105-0.979,0.303-1.479,0.687c-1.603,1.229-1.786,2.46-1.328,2.87
+ s2.097,0.743,3.708-0.974c0.615-0.657,0.835-1.519,0.915-2.057c2.166,0.609,4.643,1.29,6.448,2.117
+ c-0.907-0.107-2.054-0.052-3.058,0.594c-2.037,1.308-1.852,3.128-1.268,3.564c0.581,0.436,3.111,1.079,5.158-0.747
+ c0.801-0.713,0.885-1.773,0.85-2.429c0.75,0.569,1.361,1.122,1.852,1.634v-1.914v-0.006v-4.936
+ c-0.469,0.524-0.889,1.192-1.162,2.033c-0.306,0.938-0.02,1.781,0.281,2.341c-0.028-0.015-0.052-0.031-0.08-0.046
+ c-1.096-0.558-3.502-1.213-6.131-1.951c0.393-0.042,0.869-0.146,1.301-0.405c1.086-0.652,1.352-1.691,0.963-2.256
+ c-0.278-0.399-1.191-0.742-2.199,0.359c-0.504,0.552-0.749,1.623-0.834,2.084c-1.775-0.503-3.599-1.042-5.155-1.613
+ c0.403-0.036,0.907-0.14,1.36-0.411c1.086-0.654,1.27-1.371,0.985-1.691c-0.321-0.358-1.2-0.783-2.381,0.307
+ c-0.487,0.449-0.639,1.129-0.688,1.51c-3.417-1.469-2.146-2.951-2.146-2.951c-0.092-0.359-0.32-0.717-0.687-0.102
+ C7.902,10.217,8.24,11.016,9.002,11.7c-0.236-0.012-0.497,0.014-0.771,0.106c-1.072,0.363-1.365,1.003-1.178,1.317
+ C7.24,13.439,8.09,13.943,9.243,13.314z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_photos.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_photos.svg Fri May 14 16:09:54 2010 +0300
@@ -1,9 +1,26 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
<path d="M2,5v20h26V5H2z M26,23H4V7h22V23z"/>
-<path d="M25,8H5v14h20V8z M24,21h-2.9c0.117-0.1,0.234-0.206,0.35-0.324c0.756-0.773,0.836-1.923,0.802-2.632 c0.708,0.617,1.286,1.216,1.749,1.771V21z M24,12.388c-0.443,0.568-0.839,1.292-1.098,2.202c-0.288,1.017-0.02,1.929,0.266,2.535 c-0.026-0.016-0.049-0.033-0.075-0.049c-1.035-0.604-3.308-1.314-5.79-2.114c0.371-0.045,0.82-0.158,1.229-0.438 c1.024-0.707,1.275-1.832,0.908-2.443c-0.262-0.434-1.124-0.805-2.076,0.389c-0.477,0.598-0.707,1.759-0.788,2.258 c-1.677-0.545-3.397-1.129-4.868-1.747c0.381-0.04,0.857-0.152,1.284-0.446c1.026-0.708,1.2-1.485,0.931-1.832 c-0.303-0.389-1.133-0.849-2.248,0.332c-0.461,0.487-0.604,1.223-0.65,1.636c-3.228-1.591-2.025-3.197-2.025-3.197 c-0.087-0.39-0.303-0.776-0.648-0.11c-0.498,0.957-0.178,1.822,0.541,2.564c-0.224-0.013-0.469,0.015-0.729,0.115 c-1.014,0.393-1.289,1.086-1.111,1.427c0.176,0.342,0.979,0.888,2.068,0.206c0.382-0.239,0.615-0.652,0.744-0.954 c0.45,0.299,0.953,0.568,1.47,0.804c0.425,0.194,0.947,0.391,1.525,0.593c-0.444,0.114-0.925,0.327-1.397,0.744 c-1.514,1.332-1.688,2.664-1.255,3.108s1.979,0.806,3.502-1.055c0.581-0.711,0.789-1.645,0.864-2.228 c2.046,0.66,4.385,1.397,6.091,2.295c-0.856-0.118-1.94-0.058-2.889,0.642c-1.522,1.121-1.723,2.579-1.47,3.377H6V9h18V12.388z"/>
+<path d="M25,8H5v14h20V8z M24,21h-2.9c0.117-0.1,0.234-0.206,0.35-0.324c0.756-0.773,0.836-1.923,0.802-2.632
+ c0.708,0.617,1.286,1.216,1.749,1.771V21z M24,12.388c-0.443,0.568-0.839,1.292-1.098,2.202c-0.288,1.017-0.02,1.929,0.266,2.535
+ c-0.026-0.016-0.049-0.033-0.075-0.049c-1.035-0.604-3.308-1.314-5.79-2.114c0.371-0.045,0.82-0.158,1.229-0.438
+ c1.024-0.707,1.275-1.832,0.908-2.443c-0.262-0.434-1.124-0.805-2.076,0.389c-0.477,0.598-0.707,1.759-0.788,2.258
+ c-1.677-0.545-3.397-1.129-4.868-1.747c0.381-0.04,0.857-0.152,1.284-0.446c1.026-0.708,1.2-1.485,0.931-1.832
+ c-0.303-0.389-1.133-0.849-2.248,0.332c-0.461,0.487-0.604,1.223-0.65,1.636c-3.228-1.591-2.025-3.197-2.025-3.197
+ c-0.087-0.39-0.303-0.776-0.648-0.11c-0.498,0.957-0.178,1.822,0.541,2.564c-0.224-0.013-0.469,0.015-0.729,0.115
+ c-1.014,0.393-1.289,1.086-1.111,1.427c0.176,0.342,0.979,0.888,2.068,0.206c0.382-0.239,0.615-0.652,0.744-0.954
+ c0.45,0.299,0.953,0.568,1.47,0.804c0.425,0.194,0.947,0.391,1.525,0.593c-0.444,0.114-0.925,0.327-1.397,0.744
+ c-1.514,1.332-1.688,2.664-1.255,3.108s1.979,0.806,3.502-1.055c0.581-0.711,0.789-1.645,0.864-2.228
+ c2.046,0.66,4.385,1.397,6.091,2.295c-0.856-0.118-1.94-0.058-2.889,0.642c-1.522,1.121-1.723,2.579-1.47,3.377H6V9h18V12.388z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_play.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_play.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,13 @@
-<?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">
+<?xml version="1.0" ?>
+<!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="5,15,5,3,15.39,9,25.78,15,15.39,21,5,27"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_play_history.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_play_history.svg Fri May 14 16:09:54 2010 +0300
@@ -1,10 +1,17 @@
-<?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">
+<?xml version="1.0" ?>
+<!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>
+
<path d="M22.5,13c0.232,0,0.461,0.019,0.688,0.035l1.81-1.04-21-12v24l9.998-5.713c1.56-3.13,4.78-5.29,8.5-5.29z"/>
+
<path d="M22.5,15c-4.136,0-7.5,3.364-7.5,7.5s3.364,7.5,7.5,7.5,7.5-3.364,7.5-7.5-3.36-7.5-7.5-7.5zm0,13c-3.033,0-5.5-2.468-5.5-5.5s2.467-5.5,5.5-5.5,5.5,2.468,5.5,5.5-2.47,5.5-5.5,5.5z"/>
+
<polygon points="23,22,23,18,21,18,21,22,21,24,23,24,27,24,27,22"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_playlist.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_playlist.svg Fri May 14 16:09:54 2010 +0300
@@ -1,17 +1,26 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
-<rect height="2" width="2" x="7" y="6"/>
-<rect height="2" width="9.941" x="10.059" y="6"/>
-<rect height="2" width="2" x="7" y="11"/>
-<rect height="2" width="9.941" x="10.059" y="11"/>
-<rect height="2" width="2" x="7" y="16"/>
-<rect height="2" width="9.941" x="10.059" y="16"/>
-<rect height="2" width="2" x="7" y="21"/>
-<rect height="2" width="9.941" x="10.059" y="21"/>
-<path d="M16.115,26H5V3h18v10c0.213,0,0.426,0.034,0.633,0.103L26,13.892V0H2v29h14.463C16.167,28.387,16,27.711,16,27 C16,26.657,16.043,26.324,16.115,26z"/>
-<path d="M23,15v9.3c-0.456-0.187-0.961-0.3-1.5-0.3c-1.934,0-3.5,1.343-3.5,3c0,1.656,1.566,3,3.5,3s3.5-1.344,3.5-3v-7.333L29,21 v-4L23,15z"/>
+<rect x="7" y="6" width="2" height="2"/>
+<rect x="10.059" y="6" width="9.941" height="2"/>
+<rect x="7" y="11" width="2" height="2"/>
+<rect x="10.059" y="11" width="9.941" height="2"/>
+<rect x="7" y="16" width="2" height="2"/>
+<rect x="10.059" y="16" width="9.941" height="2"/>
+<rect x="7" y="21" width="2" height="2"/>
+<rect x="10.059" y="21" width="9.941" height="2"/>
+<path d="M16.115,26H5V3h18v10c0.213,0,0.426,0.034,0.633,0.103L26,13.892V0H2v29h14.463C16.167,28.387,16,27.711,16,27
+ C16,26.657,16.043,26.324,16.115,26z"/>
+<path d="M23,15v9.3c-0.456-0.187-0.961-0.3-1.5-0.3c-1.934,0-3.5,1.343-3.5,3c0,1.656,1.566,3,3.5,3s3.5-1.344,3.5-3v-7.333L29,21
+ v-4L23,15z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_plus.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_plus.svg Fri May 14 16:09:54 2010 +0300
@@ -1,7 +1,14 @@
-<?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">
-<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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<rect fill="none" width="30" height="30"/>
+<rect x="4" y="13" width="22" height="4"/>
+<rect x="13" y="4" width="4" height="22"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_podcast.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_podcast.svg Fri May 14 16:09:54 2010 +0300
@@ -1,10 +1,17 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
+
<g fill-opacity="0.5" stroke-opacity="0.5">
+
<rect fill="none" height="30" width="30"/>
+
</g>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_portrait.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_portrait.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,11 @@
-<?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">
-<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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<rect fill="none" width="30" height="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_predictive_text_off.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_predictive_text_off.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,20 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
-<path d="M25.502,4.497c-3.124-3.124-6.923-4.391-8.485-2.828c-0.001,0.001-0.002,0.002-0.003,0.003L2.871,15.814l-0.008,0.07l0,0 l-0.019,0.173L1.489,28.445l-0.032,0.097l0.098-0.032l12.595-1.415l0.542-0.539c0,0,0,0,0-0.001l13.635-13.569 c0.001-0.001,0.002-0.002,0.004-0.003C29.893,11.42,28.626,7.621,25.502,4.497z M7.257,25.857l-3.13-3.131l0.656-5.995l0.082-0.082 c1.639,0.432,3.549,1.566,5.266,3.282c1.665,1.665,2.781,3.512,3.24,5.117l-0.137,0.137L7.257,25.857z M26.916,11.568l-12.15,12.093 c-0.459-1.606-1.574-3.456-3.241-5.123c-1.708-1.709-3.617-2.856-5.253-3.295L18.428,3.086c0.355-0.355,2.922,0.087,5.66,2.825 S27.269,11.216,26.916,11.568z"/>
+<path d="M25.502,4.497c-3.124-3.124-6.923-4.391-8.485-2.828c-0.001,0.001-0.002,0.002-0.003,0.003L2.871,15.814l-0.008,0.07l0,0
+ l-0.019,0.173L1.489,28.445l-0.032,0.097l0.098-0.032l12.595-1.415l0.542-0.539c0,0,0,0,0-0.001l13.635-13.569
+ c0.001-0.001,0.002-0.002,0.004-0.003C29.893,11.42,28.626,7.621,25.502,4.497z M7.257,25.857l-3.13-3.131l0.656-5.995l0.082-0.082
+ c1.639,0.432,3.549,1.566,5.266,3.282c1.665,1.665,2.781,3.512,3.24,5.117l-0.137,0.137L7.257,25.857z M26.916,11.568l-12.15,12.093
+ c-0.459-1.606-1.574-3.456-3.241-5.123c-1.708-1.709-3.617-2.856-5.253-3.295L18.428,3.086c0.355-0.355,2.922,0.087,5.66,2.825
+ S27.269,11.216,26.916,11.568z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_predictive_text_on.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_predictive_text_on.svg Fri May 14 16:09:54 2010 +0300
@@ -1,10 +1,22 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
-<path d="M25.502,4.497c-3.124-3.124-6.923-4.391-8.485-2.828c-0.001,0.001-0.002,0.002-0.003,0.003L2.871,15.814l-0.008,0.07l0,0 l-0.019,0.173L1.489,28.445l-0.032,0.097l0.098-0.032l12.595-1.415l0.542-0.539c0,0,0,0,0-0.001l13.635-13.569 c0.001-0.001,0.002-0.002,0.004-0.003C29.893,11.42,28.626,7.621,25.502,4.497z M7.257,25.857l-3.13-3.131l0.656-5.995l0.082-0.082 c1.639,0.432,3.549,1.566,5.266,3.282c1.665,1.665,2.781,3.512,3.24,5.117l-0.137,0.137L7.257,25.857z M26.916,11.568l-12.15,12.093 c-0.459-1.606-1.574-3.456-3.241-5.123c-1.708-1.709-3.617-2.856-5.253-3.295L18.428,3.086c0.355-0.355,2.922,0.087,5.66,2.825 S27.269,11.216,26.916,11.568z"/>
-<rect height="1.995" width="11.986" x="16.014" y="28.005"/>
-<rect height="1.995" width="8" x="20" y="24.005"/>
+<path d="M25.502,4.497c-3.124-3.124-6.923-4.391-8.485-2.828c-0.001,0.001-0.002,0.002-0.003,0.003L2.871,15.814l-0.008,0.07l0,0
+ l-0.019,0.173L1.489,28.445l-0.032,0.097l0.098-0.032l12.595-1.415l0.542-0.539c0,0,0,0,0-0.001l13.635-13.569
+ c0.001-0.001,0.002-0.002,0.004-0.003C29.893,11.42,28.626,7.621,25.502,4.497z M7.257,25.857l-3.13-3.131l0.656-5.995l0.082-0.082
+ c1.639,0.432,3.549,1.566,5.266,3.282c1.665,1.665,2.781,3.512,3.24,5.117l-0.137,0.137L7.257,25.857z M26.916,11.568l-12.15,12.093
+ c-0.459-1.606-1.574-3.456-3.241-5.123c-1.708-1.709-3.617-2.856-5.253-3.295L18.428,3.086c0.355-0.355,2.922,0.087,5.66,2.825
+ S27.269,11.216,26.916,11.568z"/>
+<rect x="16.014" y="28.005" width="11.986" height="1.995"/>
+<rect x="20" y="24.005" width="8" height="1.995"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_presentation.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_presentation.svg Fri May 14 16:09:54 2010 +0300
@@ -1,9 +1,15 @@
-<?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">
+<?xml version="1.0" ?>
+<!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>
+
<path d="M29,7v-4h-28v4h1v16h-1v4h28v-4h-1v-16h1zm-3,16h-22v-16h22v16z"/>
+
<polygon points="5,22,25,22,25,21,24,21,24,10,21,10,21,21,19,21,19,13,16,13,16,21,14,21,14,17,11,17,11,21,9,21,9,15,6,15,6,21,5,21"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_previous.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_previous.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,15 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
<polygon points="6,4 6,26 10,26 10,15 10,4 "/>
<polygon points="10,15 24,26 24,4 "/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_private_call.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_private_call.svg Fri May 14 16:09:54 2010 +0300
@@ -1,14 +1,25 @@
-<?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">
+<?xml version="1.0" ?>
+<!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>
+
<path d="M7.129,15.84c-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.245-1.647-2.695-2.898-2.695h-0.795c-1.254,0-2.903,1.45-2.903,2.689,0,0-0.287,2.783,0.279,3.981,0.311,0.654,0.76,1.139,1.395,1.556,0.002,0.085,0.007,0.529,0.002,0.614-0.078,1.22-3.673,3.39-3.873,3.66v3.5h11.5v-3.5c-0.2-0.26-4.295-2.44-4.371-3.66z"/>
+
<path d="M16.35,16.61c-0.603-1.273-0.687-3.219-0.65-4.633-1.034-0.719-2.033-1.543-2.07-2.138-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.241-1.64-2.691-2.89-2.691h-0.8c-1.254,0-2.902,1.45-2.902,2.689,0,0-0.118,1.153-0.052,2.294,1.202,0.875,2.088,2.216,2.145,3.568,0.098,0.898,0.291,3.486-0.496,5.031-0.215,0.422-0.468,0.806-0.762,1.156,0.403,0.321,1.018,0.747,1.815,1.261h5.229c-0.07-0.13-0.15-0.25-0.22-0.39z"/>
+
<path d="M26.45,10.53c0-0.746-0.465-1.543-1.115-2.195l-7.244,7.245c0.022,0.059,0.044,0.121,0.069,0.175,0.361,0.764,0.877,1.345,1.569,1.85l6.752-6.752c-0.03-0.21-0.04-0.33-0.04-0.33z"/>
+
<path d="M24.26,18.6c-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.297-0.583,0.424-1.461,0.466-2.332l-12.29,12.3v2.28h1.386l8.84-8.84c-0.12-0.2-0.21-0.38-0.22-0.56z"/>
+
<path d="M23.76,7.263c-0.38-0.159-0.76-0.263-1.12-0.263h-1.04c-1.645,0-3.81,1.904-3.81,3.53,0,0-0.14,1.365-0.079,2.785l6.05-6.057z"/>
+
<path d="M25.77,20.5l-7.49,7.5h3.665l5.967-5.968c-0.71-0.46-1.48-0.99-2.14-1.53z"/>
+
<path d="M30,23.41c-0.042-0.055-0.223-0.179-0.479-0.346l-4.94,4.94h3.665l1.76-1.75v-2.844z"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_qcif.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_qcif.svg Fri May 14 16:09:54 2010 +0300
@@ -1,10 +1,21 @@
-<?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">
-<rect fill="none" height="30" width="30"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<rect fill="none" width="30" height="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"/>
-<path d="M14.953,18.406c-0.928,0-1.625-0.295-2.092-0.887c-0.469-0.59-0.701-1.563-0.701-2.912c0-1.211,0.234-2.122,0.705-2.728 c0.471-0.607,1.176-0.912,2.117-0.912c0.383,0,0.77,0.053,1.156,0.156v0.856c-0.384-0.115-0.728-0.172-1.029-0.172 c-0.519,0-0.906,0.23-1.162,0.691c-0.258,0.461-0.387,1.15-0.387,2.067c0,1.066,0.133,1.834,0.397,2.3 c0.267,0.467,0.664,0.698,1.192,0.698c0.312,0,0.64-0.049,0.986-0.146v0.83C15.752,18.354,15.355,18.406,14.953,18.406z"/>
+<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"/>
+<path d="M14.953,18.406c-0.928,0-1.625-0.295-2.092-0.887c-0.469-0.59-0.701-1.563-0.701-2.912c0-1.211,0.234-2.122,0.705-2.728
+ c0.471-0.607,1.176-0.912,2.117-0.912c0.383,0,0.77,0.053,1.156,0.156v0.856c-0.384-0.115-0.728-0.172-1.029-0.172
+ c-0.519,0-0.906,0.23-1.162,0.691c-0.258,0.461-0.387,1.15-0.387,2.067c0,1.066,0.133,1.834,0.397,2.3
+ c0.267,0.467,0.664,0.698,1.192,0.698c0.312,0,0.64-0.049,0.986-0.146v0.83C15.752,18.354,15.355,18.406,14.953,18.406z"/>
<path d="M16.725,18.328v-0.84h0.603v-5.601h-0.603v-0.84h2.549v0.84h-0.6v5.602h0.6v0.84L16.725,18.328L16.725,18.328z"/>
<path d="M20.344,18.328v-7.281h3.74v0.84h-2.398v2.301h1.871v0.85h-1.871v3.291L20.344,18.328L20.344,18.328z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_radio_collections.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_radio_collections.svg Fri May 14 16:09:54 2010 +0300
@@ -1,9 +1,15 @@
-<?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">
+<?xml version="1.0" ?>
+<!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="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"/>
+
<path d="M0,30h25v-25h-25v25zm3-22h19v19h-19v-19z"/>
+
<path d="M8.082,16.93v4.336c-0.374-0.152-0.787-0.244-1.228-0.244-1.582,0-2.864,1.098-2.864,2.454,0,1.355,1.282,2.454,2.864,2.454,1.581,0,2.863-1.099,2.863-2.454v-6.001l3.272,1.092v-3.272l-4.908-1.636v3.267z"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_radio_stations.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_radio_stations.svg Fri May 14 16:09:54 2010 +0300
@@ -1,19 +1,35 @@
-<?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">
+<?xml version="1.0" ?>
+<!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>
+
<rect height="2" width="2" x="7" y="6"/>
+
<rect height="2" width="2" x="7" y="11"/>
+
<rect height="2" width="2" x="7" y="16"/>
+
<rect height="2" width="2" x="7" y="21"/>
+
<rect height="2" width="9.942" x="10.06" y="6"/>
+
<rect height="2" width="9.942" x="10.06" y="11"/>
+
<rect height="2" width="4.941" x="10.06" y="21"/>
+
<path d="M15,17c0-0.357,0.103-0.699,0.277-1h-5.219v2h4.94v-1z"/>
+
<path d="M11.32,26h-6.32v-23h18v10.84c0.23-0.124,0.473-0.216,0.727-0.243,0.101-0.24,0.246-0.461,0.435-0.648l1.362-1.363c0.145-0.144,0.308-0.252,0.478-0.342v-11.25h-24v29h9.325c-0.18-0.469-0.296-0.963-0.296-1.486,0.01-0.53,0.12-1.04,0.3-1.51z"/>
+
<path d="M22.58,23.63l1.36,1.37c0.06-0.055,0.119-0.104,0.179-0.163,2.506-2.506,2.502-6.587-0.006-9.097-0.058-0.057-0.117-0.104-0.173-0.154l-1.362,1.361c0.058,0.053,0.114,0.101,0.172,0.156,1.757,1.756,1.759,4.613,0.004,6.367-0.05,0.05-0.11,0.1-0.17,0.15z"/>
+
<path d="M27.11,13.16c-0.055-0.056-0.112-0.101-0.17-0.155l-1.362,1.363c0.055,0.052,0.114,0.1,0.17,0.155,3.101,3.099,3.104,8.136,0.008,11.23-0.058,0.058-0.121,0.108-0.183,0.164l1.367,1.366c0.06-0.057,0.123-0.107,0.183-0.166,3.83-3.84,3.83-10.1-0.02-13.95z"/>
+
<path d="M22.03,19l-5.03-2v8.305c-0.254-0.152-0.666-0.244-1.107-0.244-1.583,0-2.864,1.098-2.864,2.453s1.28,2.49,2.86,2.49c1.59,0,3.11-1,3.11-2.49v-6.51l3.029,1v-3z"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_recentlog.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_recentlog.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,13 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
+
<path d="M10.52,8.506c1.35,0.571,2.732,0.287,3.599-0.017v3.875h1.766v-3.871c0.866,0.304,2.249,0.588,3.599,0.017,2.926-1.238,2.831-3.499,2.831-3.499s-1.41-1.298-4.335-0.06c-2.645,1.12-2.94,2.791-2.973,3.101h-0.01c-0.032-0.31-0.328-1.98-2.973-3.101-2.925-1.238-4.335,0.06-4.335,0.06s-0.102,2.261,2.825,3.499z"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_redeye.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_redeye.svg Fri May 14 16:09:54 2010 +0300
@@ -1,7 +1,11 @@
-<?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">
+<?xml version="1.0" ?>
+<!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.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"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_refresh.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_refresh.svg Fri May 14 16:09:54 2010 +0300
@@ -1,7 +1,11 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<rect fill="none" height="30" width="30"/>
+
<path d="M8,15c0-1.931,0.799-3.666,2.069-4.932l3.517,3.518,1.061-10.25-10.26,1.054,3.539,3.538c-1.811,1.809-2.933,4.308-2.933,7.068,0,5.021,3.705,9.166,8.528,9.88l0.309-2.984c-3.31-0.56-5.84-3.44-5.84-6.9z"/>
+
<path d="M16.41,16.41l-1.061,10.25,10.25-1.061-3.538-3.539c1.82-1.8,2.94-4.3,2.94-7.06,0-5.021-3.705-9.166-8.528-9.88l-0.309,2.984c3.31,0.557,5.84,3.436,5.84,6.896,0,1.93-0.793,3.673-2.061,4.939l-3.53-3.53z"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reject_call.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reject_call.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,13 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
+
<rect height="35.83" transform="matrix(0.7066 -0.7076 0.7076 0.7066 -6.0774 14.6889)" width="1.867" x="13.74" y="-3.24"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_remove_from_collection.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_remove_from_collection.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,13 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
+
<path d="M10.52,8.506c1.35,0.571,2.732,0.287,3.599-0.017v3.875h1.766v-3.871c0.866,0.304,2.249,0.588,3.599,0.017,2.926-1.238,2.831-3.499,2.831-3.499s-1.41-1.298-4.335-0.06c-2.645,1.12-2.94,2.791-2.973,3.101h-0.01c-0.032-0.31-0.328-1.98-2.973-3.101-2.925-1.238-4.335,0.06-4.335,0.06s-0.102,2.261,2.825,3.499z"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_remove_from_video_collection.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_remove_from_video_collection.svg Fri May 14 16:09:54 2010 +0300
@@ -1,9 +1,15 @@
-<?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" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<?xml version="1.0" ?>
+<!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" 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"/>
+
<path d="M22.5,15c-4.137,0-7.5,3.364-7.5,7.5s3.363,7.5,7.5,7.5,7.5-3.364,7.5-7.5-3.36-7.5-7.5-7.5zm0,13c-3.033,0-5.5-2.468-5.5-5.5s2.467-5.5,5.5-5.5,5.5,2.468,5.5,5.5-2.47,5.5-5.5,5.5z"/>
+
<rect height="3" width="9" x="18" y="21"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_repeat.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_repeat.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,16 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
-<path d="M15,2C8.158,2,2.563,7.289,2.051,14h3C5.554,8.954,9.824,5,15,5c5.514,0,10,4.486,10,10c0,5.515-4.486,10-10,10 c-3.523,0-6.621-1.836-8.402-4.598L10,17H2v8l2.445-2.445C6.8,25.848,10.642,28,15,28c7.18,0,13-5.82,13-13S22.18,2,15,2z"/>
+<path d="M15,2C8.158,2,2.563,7.289,2.051,14h3C5.554,8.954,9.824,5,15,5c5.514,0,10,4.486,10,10c0,5.515-4.486,10-10,10
+ c-3.523,0-6.621-1.836-8.402-4.598L10,17H2v8l2.445-2.445C6.8,25.848,10.642,28,15,28c7.18,0,13-5.82,13-13S22.18,2,15,2z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_repeat_exception.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_repeat_exception.svg Fri May 14 16:09:54 2010 +0300
@@ -1,11 +1,20 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
<path d="M3.98,8.128C2.902,9.856,2.214,11.854,2.051,14h3c0.132-1.319,0.526-2.562,1.122-3.681L3.98,8.128z"/>
-<path d="M15,5c5.514,0,10,4.486,10,10c0,1.691-0.426,3.283-1.169,4.681l2.19,2.19C27.268,19.876,28,17.526,28,15 c0-7.18-5.82-13-13-13c-2.528,0-4.883,0.726-6.877,1.975l2.198,2.197C11.719,5.428,13.309,5,15,5z"/>
-<path d="M15,25c-3.523,0-6.621-1.836-8.402-4.598L10,17H2v8l2.445-2.445C6.8,25.848,10.642,28,15,28c2.527,0,4.877-0.732,6.873-1.98 l-2.189-2.189C18.285,24.574,16.691,25,15,25z"/>
-<rect height="1.868" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 14.6748 35.4224)" width="35.827" x="-3.24" y="13.738"/>
+<path d="M15,5c5.514,0,10,4.486,10,10c0,1.691-0.426,3.283-1.169,4.681l2.19,2.19C27.268,19.876,28,17.526,28,15
+ c0-7.18-5.82-13-13-13c-2.528,0-4.883,0.726-6.877,1.975l2.198,2.197C11.719,5.428,13.309,5,15,5z"/>
+<path d="M15,25c-3.523,0-6.621-1.836-8.402-4.598L10,17H2v8l2.445-2.445C6.8,25.848,10.642,28,15,28c2.527,0,4.877-0.732,6.873-1.98
+ l-2.189-2.189C18.285,24.574,16.691,25,15,25z"/>
+<rect x="-3.24" y="13.738" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 14.6748 35.4224)" width="35.827" height="1.868"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_replace_call.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_replace_call.svg Fri May 14 16:09:54 2010 +0300
@@ -1,7 +1,11 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reply.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reply.svg Fri May 14 16:09:54 2010 +0300
@@ -1,9 +1,15 @@
-<?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">
+<?xml version="1.0" ?>
+<!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>
+
<path d="M14.8,22.6c-0.217-0.163-0.387-0.371-0.52-0.6h-8.866l6.115-6.115,3.41,3.41,0.481-0.36,3.05-3.05,0.436,0.436,0.809-0.605-0.537-0.537,5.82-5.825v3.928c0.611,0.357,1,1.003,1,1.717v1h2v-11h-26v20h16l-3.2-2.4zm8.73-14.6l-8.53,8.53-8.527-8.53h17.05zm-18.53,1.355l5.822,5.822-5.82,5.82v-11.64z"/>
+
<polygon points="29,18,24,18,24,15,16,21,24,27,24,24,29,24"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reply_all.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reply_all.svg Fri May 14 16:09:54 2010 +0300
@@ -1,10 +1,17 @@
-<?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">
+<?xml version="1.0" ?>
+<!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>
+
<path d="M27,16h2c0.366,0,0.705,0.105,1,0.277v-13.28h-24v3h21v10z"/>
+
<path d="M15.33,23h-10.92l5.115-5.115,3.471,3.48,1.189-1.189c0.137-0.298,0.342-0.563,0.61-0.766l0.621-0.466,1.05-1.05,0.15,0.15,0.808-0.606-0.251-0.251,4.82-4.81v1.64l0.8-0.6c0.606-0.455,1.417-0.528,2.095-0.189,0.039,0.02,0.068,0.051,0.105,0.072v-5.28h-24v18h18.33l-4-3zm5.2-12l-7.53,7.53-7.527-7.53h15.05zm-16.53,1.36l4.822,4.822-4.822,4.82v-9.645z"/>
+
<polygon points="29,18,24,18,24,15,16,21,24,27,24,24,29,24"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reply_all_email.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reply_all_email.svg Fri May 14 16:09:54 2010 +0300
@@ -1,11 +1,19 @@
-<?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">
+<?xml version="1.0" ?>
+<!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>
+
<path d="M14.48,10.68c-1.992,0-3.585,0.628-4.777,1.885-1.193,1.258-1.79,2.989-1.79,5.197,0,1.423,0.337,2.545,1.012,3.367,0.675,0.824,1.506,1.234,2.494,1.234,0.758,0,1.401-0.181,1.932-0.545s1.019-0.972,1.463-1.823c0.031,0.11,0.074,0.21,0.112,0.313l2.128-1.596c-0.011-0.198-0.018-0.414-0.018-0.651,0-1.515,0.288-3.975,0.864-7.381h-3.409zm-0.25,5.58c-0.197,1.538-0.448,2.618-0.753,3.238-0.304,0.62-0.704,0.93-1.197,0.93-0.552,0-0.931-0.223-1.136-0.669-0.206-0.447-0.309-1.154-0.309-2.121,0-1.539,0.301-2.759,0.901-3.66s1.328-1.353,2.185-1.353h0.766l-0.46,3.63z"/>
+
<path d="M16.19,24.64c-0.816,0.148-1.612,0.225-2.388,0.225-5.465,0-8.197-2.861-8.197-8.584,0-2.563,0.738-4.566,2.216-6.01,1.477-1.443,3.396-2.165,5.759-2.165,2.239,0,3.965,0.685,5.18,2.053,1.214,1.369,1.82,3.311,1.82,5.824,0,0.029-0.003,0.054-0.003,0.082l2.22-1.66c0.037-0.028,0.081-0.041,0.12-0.066-0.23-2.387-1.02-4.306-2.383-5.741-1.64-1.726-3.98-2.589-7.02-2.589-3.045,0-5.56,0.923-7.543,2.772-1.985,1.848-2.977,4.388-2.977,7.638,0,3.398,0.965,6.015,2.896,7.846,1.929,1.82,4.524,2.74,7.784,2.74,0.766,0,1.644-0.088,2.636-0.266,0.764-0.138,1.433-0.301,2.013-0.489l-2.14-1.6z"/>
+
<path d="M17.58,4.108c2.239,0,3.965,0.685,5.18,2.053,1.214,1.369,1.82,3.311,1.82,5.824,0,0.037-0.004,0.068-0.004,0.104,0.164,0.672,0.267,1.391,0.335,2.133,0.66,0.35,1.08,1.04,1.08,1.79v0.071c0.654-1.065,1-2.46,1-4.223,0-3.108-0.821-5.527-2.463-7.256-1.64-1.731-3.98-2.594-7.02-2.594-2.769,0-5.094,0.771-6.984,2.3,0.94-0.192,1.93-0.3,2.98-0.3,0.92,0,1.79,0.073,2.61,0.215,0.46-0.067,0.95-0.107,1.45-0.107z"/>
+
<polygon points="29,19,24,19,24,16,16,22,24,28,24,25,29,25"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reply_email.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reply_email.svg Fri May 14 16:09:54 2010 +0300
@@ -1,10 +1,17 @@
-<?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">
+<?xml version="1.0" ?>
+<!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>
+
<path d="M14.8,20.4l2.013-1.51c0.092-0.151,0.184-0.301,0.271-0.469,0.021,0.074,0.051,0.138,0.075,0.209l2.4-1.801c-0.007-0.173-0.015-0.344-0.015-0.541,0-1.668,0.319-4.38,0.957-8.135h-3.787c-2.206,0-3.97,0.692-5.291,2.078s-1.982,3.295-1.982,5.729c0,1.567,0.374,2.805,1.121,3.712s1.668,1.36,2.762,1.36c0.362,0,0.697-0.045,1.013-0.12,0.13-0.19,0.28-0.37,0.47-0.51zm-1.78-2.24c-0.228-0.492-0.342-1.271-0.342-2.338,0-1.695,0.333-3.04,0.998-4.033s1.472-1.49,2.42-1.49h0.848l-0.506,4.006c-0.219,1.695-0.497,2.885-0.834,3.568s-0.78,1.02-1.33,1.02c-0.61,0-1.03-0.25-1.26-0.74z"/>
+
<path d="M15.02,23.76c-5.419-0.321-8.133-3.461-8.133-9.43,0-2.825,0.818-5.033,2.454-6.624s3.762-2.386,6.378-2.386c2.479,0,4.391,0.754,5.735,2.263s2.017,3.648,2.017,6.419c0,0.029-0.003,0.055-0.003,0.084,0.47-0.131,0.977-0.104,1.429,0.121,0.632,0.316,1.032,0.943,1.085,1.641,0.101-0.618,0.169-1.271,0.169-1.996,0-3.427-0.909-6.093-2.728-7.998s-4.43-2.842-7.79-2.842c-3.372,0-6.157,1.019-8.354,3.056s-3.296,4.844-3.296,8.414c0,3.746,1.068,6.629,3.206,8.647s5.011,3.028,8.62,3.028c0.632,0,1.356-0.072,2.127-0.182l-2.94-2.21z"/>
+
<polygon points="29,19,24,19,24,16,16,22,24,28,24,25,29,25"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reset.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_reset.svg Fri May 14 16:09:54 2010 +0300
@@ -1,9 +1,18 @@
-<?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">
-<rect fill="none" height="30" width="30"/>
-<rect height="6" width="2" x="10" y="12.5"/>
-<path d="M11,8C4.925,8,0,12.926,0,19c0,6.076,4.925,11,11,11s11-4.924,11-11C22,12.926,17.075,8,11,8z M11,27c-4.419,0-8-3.582-8-8 s3.581-8,8-8c4.418,0,8,3.582,8,8S15.418,27,11,27z"/>
-<path d="M30,13h-2c0-4.502-3.662-8.166-8.166-8.166c-0.094,0-0.188,0.002-0.279,0.004L19.48,2.84 c0.117-0.004,0.234-0.006,0.354-0.006C25.439,2.834,30,7.395,30,13L30,13z"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<rect fill="none" width="30" height="30"/>
+<rect x="10" y="12.5" width="2" height="6"/>
+<path d="M11,8C4.925,8,0,12.926,0,19c0,6.076,4.925,11,11,11s11-4.924,11-11C22,12.926,17.075,8,11,8z M11,27c-4.419,0-8-3.582-8-8
+ s3.581-8,8-8c4.418,0,8,3.582,8,8S15.418,27,11,27z"/>
+<path d="M30,13h-2c0-4.502-3.662-8.166-8.166-8.166c-0.094,0-0.188,0.002-0.279,0.004L19.48,2.84
+ c0.117-0.004,0.234-0.006,0.354-0.006C25.439,2.834,30,7.395,30,13L30,13z"/>
<polygon points="20,4 20,8 17.001,6 14,4 17.001,2.002 20,0 "/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_restore_settings.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_restore_settings.svg Fri May 14 16:09:54 2010 +0300
@@ -1,11 +1,25 @@
-<?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">
-<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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<rect fill="none" width="30" height="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 "/>
-<path d="M2.921,6.375c-0.289,0.289-0.543,0.6-0.781,0.918l5.024,5.023c0.624,0.623,1.638,0.623,2.263-0.002l0.565-0.564 c0.625-0.625,0.624-1.639,0-2.264L5.247,4.742C4.407,5.143,3.616,5.682,2.921,6.375z"/>
-<path d="M25.083,21.602L16.882,13.4c0.402-2.592-0.383-5.334-2.375-7.326C11.192,2.76,5.8,2.76,2.485,6.074s-3.313,8.707,0,12.021 c1.992,1.992,4.734,2.777,7.326,2.375l8.201,8.201c1.771,1.771,4.654,1.771,6.428,0l0.643-0.643 C26.854,26.256,26.854,23.371,25.083,21.602z M22.345,25.367l-0.566,0.566c-0.625,0.623-1.637,0.625-2.262,0l-8.821-8.822 c-2.013,0.879-4.443,0.508-6.089-1.139c-2.144-2.143-2.144-5.633,0-7.777c2.145-2.145,5.635-2.145,7.779,0 c1.645,1.645,2.016,4.076,1.139,6.088l8.82,8.822C22.97,23.73,22.97,24.742,22.345,25.367z"/>
-<rect height="2" transform="matrix(-0.7072 0.7071 -0.7071 -0.7072 20.3094 20.3716)" width="9.826" x="1.023" y="13.392"/>
-<path d="M20.837,23.793c0.133,0.133,0.098,0.379-0.078,0.555l0,0c-0.174,0.174-0.422,0.209-0.553,0.078l-1.424-1.422 c-0.131-0.133-0.096-0.381,0.078-0.555l0,0c0.176-0.174,0.424-0.209,0.555-0.078L20.837,23.793z"/>
+<path d="M2.921,6.375c-0.289,0.289-0.543,0.6-0.781,0.918l5.024,5.023c0.624,0.623,1.638,0.623,2.263-0.002l0.565-0.564
+ c0.625-0.625,0.624-1.639,0-2.264L5.247,4.742C4.407,5.143,3.616,5.682,2.921,6.375z"/>
+<path d="M25.083,21.602L16.882,13.4c0.402-2.592-0.383-5.334-2.375-7.326C11.192,2.76,5.8,2.76,2.485,6.074s-3.313,8.707,0,12.021
+ c1.992,1.992,4.734,2.777,7.326,2.375l8.201,8.201c1.771,1.771,4.654,1.771,6.428,0l0.643-0.643
+ C26.854,26.256,26.854,23.371,25.083,21.602z M22.345,25.367l-0.566,0.566c-0.625,0.623-1.637,0.625-2.262,0l-8.821-8.822
+ c-2.013,0.879-4.443,0.508-6.089-1.139c-2.144-2.143-2.144-5.633,0-7.777c2.145-2.145,5.635-2.145,7.779,0
+ c1.645,1.645,2.016,4.076,1.139,6.088l8.82,8.822C22.97,23.73,22.97,24.742,22.345,25.367z"/>
+<rect x="1.023" y="13.392" transform="matrix(-0.7072 0.7071 -0.7071 -0.7072 20.3094 20.3716)" width="9.826" height="2"/>
+<path d="M20.837,23.793c0.133,0.133,0.098,0.379-0.078,0.555l0,0c-0.174,0.174-0.422,0.209-0.553,0.078l-1.424-1.422
+ c-0.131-0.133-0.096-0.381,0.078-0.555l0,0c0.176-0.174,0.424-0.209,0.555-0.078L20.837,23.793z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_rewind.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_rewind.svg Fri May 14 16:09:54 2010 +0300
@@ -1,9 +1,15 @@
-<?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">
+<?xml version="1.0" ?>
+<!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="14,15,25,26,25,4"/>
+
<polygon points="3,15,14,26,14,15,14,4"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_rsk_horizontal.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_rsk_horizontal.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,13 @@
-<?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">
+<?xml version="1.0" ?>
+<!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>
+
<path d="M1,20h4c0-3.309,2.691-6,6-6h18v-4h-18c-5.514,0-10,4.49-10,10z"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_rsk_vertical.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_rsk_vertical.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,13 @@
-<?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">
+<?xml version="1.0" ?>
+<!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>
+
<path d="M20,29v-4c-3.309,0-6-2.691-6-6v-18h-4v18c0,5.51,4.49,10,10,10z"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_search.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_search.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,13 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
+<rect fill="none" height="30" width="30"/>
+
<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"/>
+
<path d="M25.64,4.355c-3.809-3.807-9.981-3.807-13.79,0-3.44,3.447-3.757,8.825-0.97,12.64l-1.681,1.68-0.53-0.531-4.773,4.773,3.182,3.183,4.773-4.772-0.53-0.531,1.681-1.681c3.814,2.791,9.193,2.475,12.64-0.972,3.81-3.8,3.81-9.978,0-13.78zm-2.12,11.66c-2.633,2.631-6.916,2.632-9.546,0-1.27-1.27-1.97-2.97-1.97-4.77,0-1.804,0.703-3.499,1.977-4.774,2.63-2.631,6.914-2.631,9.546,0,2.62,2.633,2.62,6.914-0.01,9.544z"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_search_stop.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_search_stop.svg Fri May 14 16:09:54 2010 +0300
@@ -1,15 +1,20 @@
-<?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">
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
<g>
-<g fill-opacity="0.5" stroke-opacity="0.5">
-<rect fill="none" height="30" width="30" x="0" y="0.006"/>
-</g>
-<g>
-<rect height="2" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 -13.8982 48.1905)" width="4.998" x="0.532" y="25.973"/>
-<path d="M11.802,8.788c0.351-1.107,0.959-2.15,1.836-3.026c2.924-2.925,7.682-2.924,10.605,0c2.923,2.924,2.925,7.682,0,10.604 c-0.876,0.877-1.919,1.484-3.026,1.836l2.303,2.303c1.026-0.498,1.992-1.164,2.846-2.017c4.102-4.101,4.102-10.749,0-14.849 c-4.101-4.102-10.748-4.102-14.85,0c-0.853,0.853-1.519,1.818-2.016,2.846L11.802,8.788z"/>
-<path d="M15.777,21.058l-6.829-6.83c0.349,1.1,0.874,2.156,1.593,3.115l-1.499,1.498l-0.707-0.707l-4.949,4.951l3.535,3.535 l4.95-4.951l-0.707-0.707l1.499-1.498C13.622,20.184,14.677,20.71,15.777,21.058z"/>
-<rect height="35.827" transform="matrix(-0.7062 0.708 -0.708 -0.7062 34.8635 16.0136)" width="1.868" x="13.175" y="-2.673"/>
-</g>
+ <g opacity="0.5">
+ <rect x="0" y="0.006" fill="none" width="30" height="30"/>
+ </g>
+ <g>
+ <rect x="0.532" y="25.973" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 -13.8982 48.1905)" width="4.998" height="2"/>
+ <path d="M11.802,8.788c0.351-1.107,0.959-2.15,1.836-3.026c2.924-2.925,7.682-2.924,10.605,0c2.923,2.924,2.925,7.682,0,10.604
+ c-0.876,0.877-1.919,1.484-3.026,1.836l2.303,2.303c1.026-0.498,1.992-1.164,2.846-2.017c4.102-4.101,4.102-10.749,0-14.849
+ c-4.101-4.102-10.748-4.102-14.85,0c-0.853,0.853-1.519,1.818-2.016,2.846L11.802,8.788z"/>
+ <path d="M15.777,21.058l-6.829-6.83c0.349,1.1,0.874,2.156,1.593,3.115l-1.499,1.498l-0.707-0.707l-4.949,4.951l3.535,3.535
+ l4.95-4.951l-0.707-0.707l1.499-1.498C13.622,20.184,14.677,20.71,15.777,21.058z"/>
+ <rect x="13.175" y="-2.673" transform="matrix(-0.7062 0.708 -0.708 -0.7062 34.8635 16.0136)" width="1.868" height="35.827"/>
+ </g>
</g>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_seek_next.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_seek_next.svg Fri May 14 16:09:54 2010 +0300
@@ -1,10 +1,17 @@
-<?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">
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
<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"/>
-<g fill-opacity="0.5" stroke-opacity="0.5">
-<rect fill="none" height="30" width="30"/>
+<rect x="23" y="5" width="4" height="20"/>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_seek_previous.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_seek_previous.svg Fri May 14 16:09:54 2010 +0300
@@ -1,10 +1,17 @@
-<?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">
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
<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"/>
-<g fill-opacity="0.5" stroke-opacity="0.5">
-<rect fill="none" height="30" width="30"/>
+<rect x="3" y="5.133" width="4" height="20"/>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_send.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_send.svg Fri May 14 16:09:54 2010 +0300
@@ -1,11 +1,19 @@
-<?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">
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
<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 "/>
-<g fill-opacity="0.5" stroke-opacity="0.5">
-<rect fill="none" height="30" width="30"/>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
-<path d="M5,6v18h24V6H5z M24.527,9L17,16.527L9.473,9H24.527z M8,10.355l4.822,4.822L8,20V10.355z M8.414,21l5.115-5.115L17,19.355 l3.471-3.471L25.586,21H8.414z M26,20l-4.822-4.822L26,10.355V20z"/>
+<path d="M5,6v18h24V6H5z M24.527,9L17,16.527L9.473,9H24.527z M8,10.355l4.822,4.822L8,20V10.355z M8.414,21l5.115-5.115L17,19.355
+ l3.471-3.471L25.586,21H8.414z M26,20l-4.822-4.822L26,10.355V20z"/>
</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_send_mycard.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<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 "/>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
+</g>
+<path d="M5,6v18h24V6H5z M27,22H7V8h20V22z"/>
+<rect x="18" y="11" width="7" height="2"/>
+<rect x="18" y="15" width="7" height="2"/>
+<path d="M13.447,16.48c-0.004-0.076,0-0.443,0-0.52c0.553-0.355,0.939-0.771,1.23-1.313c0.537-1.007,0.25-3.373,0.25-3.373
+ c0-1.049-1.465-2.275-2.577-2.275h-0.706c-1.115,0-2.58,1.227-2.58,2.275c0,0-0.255,2.355,0.248,3.369
+ c0.276,0.554,0.676,0.963,1.24,1.316c0.002,0.071,0.006,0.447,0.002,0.52c-0.07,1.028-2.377,1.604-2.555,1.827V20h8v-1.69
+ C15.821,18.086,13.516,17.509,13.447,16.48z"/>
+</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_settings.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_settings.svg Fri May 14 16:09:54 2010 +0300
@@ -1,7 +1,11 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_shake_warning.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_shake_warning.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,24 @@
-<?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.006 0 30 30" width="30px" x="0px" 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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0.006 0 30 30" enable-background="new 0.006 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<rect x="0.006" fill="none" width="30" height="30"/>
+<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"/>
<path d="M12,24.001c-3.037-0.18-5.489-1.845-5.889-3.987H4c0.389,3.234,3.788,5.798,8,6V24.001z"/>
<path d="M18.012,28.01c5.376-0.275,9.678-3.713,9.994-7.996h2.006c-0.31,5.382-5.511,9.708-12,10V28.01z"/>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_share.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_share.svg Fri May 14 16:09:54 2010 +0300
@@ -1,12 +1,21 @@
-<?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">
+<?xml version="1.0" ?>
+<!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>
+
<circle cx="23" cy="6" r="4.5"/>
+
<circle cx="23" cy="24" r="4.5"/>
+
<circle cx="7" cy="15" r="4.5"/>
+
<path d="M13.26,13.28l4.997-2.852c-0.685-0.73-1.203-1.617-1.493-2.604l-4.947,2.824c0.67,0.75,1.17,1.64,1.44,2.63z"/>
+
<path d="M18.26,19.57l-4.996-2.852c-0.272,0.992-0.772,1.887-1.443,2.631l4.946,2.824c0.29-0.99,0.81-1.87,1.49-2.6z"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_share_photo.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_share_photo.svg Fri May 14 16:09:54 2010 +0300
@@ -1,12 +1,29 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
-<path d="M15.4,21.8L16,21H6V9h18v3.388c-0.162,0.208-0.314,0.444-0.459,0.695c0.418,0.118,0.793,0.362,1.059,0.717l0.4,0.534V8H5v14 h10.29C15.328,21.934,15.354,21.862,15.4,21.8z"/>
-<path d="M10.206,17.969c0.433,0.444,1.979,0.806,3.502-1.055c0.581-0.711,0.789-1.645,0.864-2.228 c1.593,0.514,3.359,1.076,4.871,1.723l0.453-0.604c-0.803-0.269-1.684-0.55-2.594-0.843c0.371-0.045,0.82-0.158,1.229-0.438 c1.024-0.707,1.275-1.832,0.908-2.443c-0.262-0.434-1.124-0.805-2.076,0.389c-0.477,0.598-0.707,1.759-0.788,2.258 c-1.677-0.545-3.397-1.129-4.868-1.747c0.381-0.04,0.857-0.152,1.284-0.446c1.026-0.708,1.2-1.485,0.931-1.832 c-0.303-0.389-1.133-0.849-2.248,0.332c-0.461,0.487-0.604,1.223-0.65,1.636c-3.228-1.591-2.025-3.197-2.025-3.197 c-0.087-0.39-0.303-0.776-0.648-0.11c-0.498,0.957-0.178,1.822,0.541,2.564c-0.224-0.013-0.469,0.015-0.729,0.115 c-1.014,0.393-1.289,1.086-1.111,1.427c0.176,0.342,0.979,0.888,2.068,0.206c0.382-0.239,0.615-0.652,0.744-0.954 c0.45,0.299,0.953,0.568,1.47,0.804c0.425,0.194,0.947,0.391,1.525,0.593c-0.444,0.114-0.925,0.327-1.397,0.744 C9.947,16.192,9.773,17.524,10.206,17.969z"/>
+<path d="M15.4,21.8L16,21H6V9h18v3.388c-0.162,0.208-0.314,0.444-0.459,0.695c0.418,0.118,0.793,0.362,1.059,0.717l0.4,0.534V8H5v14
+ h10.29C15.328,21.934,15.354,21.862,15.4,21.8z"/>
+<path d="M10.206,17.969c0.433,0.444,1.979,0.806,3.502-1.055c0.581-0.711,0.789-1.645,0.864-2.228
+ c1.593,0.514,3.359,1.076,4.871,1.723l0.453-0.604c-0.803-0.269-1.684-0.55-2.594-0.843c0.371-0.045,0.82-0.158,1.229-0.438
+ c1.024-0.707,1.275-1.832,0.908-2.443c-0.262-0.434-1.124-0.805-2.076,0.389c-0.477,0.598-0.707,1.759-0.788,2.258
+ c-1.677-0.545-3.397-1.129-4.868-1.747c0.381-0.04,0.857-0.152,1.284-0.446c1.026-0.708,1.2-1.485,0.931-1.832
+ c-0.303-0.389-1.133-0.849-2.248,0.332c-0.461,0.487-0.604,1.223-0.65,1.636c-3.228-1.591-2.025-3.197-2.025-3.197
+ c-0.087-0.39-0.303-0.776-0.648-0.11c-0.498,0.957-0.178,1.822,0.541,2.564c-0.224-0.013-0.469,0.015-0.729,0.115
+ c-1.014,0.393-1.289,1.086-1.111,1.427c0.176,0.342,0.979,0.888,2.068,0.206c0.382-0.239,0.615-0.652,0.744-0.954
+ c0.45,0.299,0.953,0.568,1.47,0.804c0.425,0.194,0.947,0.391,1.525,0.593c-0.444,0.114-0.925,0.327-1.397,0.744
+ C9.947,16.192,9.773,17.524,10.206,17.969z"/>
<path d="M17.774,17.623c-1.341,0.987-1.655,2.234-1.538,3.063l2.715-3.62C18.553,17.17,18.152,17.344,17.774,17.623z"/>
-<path d="M15.211,23.895c-0.142-0.283-0.195-0.59-0.194-0.895H4V7h22v8.667l2,2.667V5H2v20h15C16.242,25,15.55,24.572,15.211,23.895z "/>
+<path d="M15.211,23.895c-0.142-0.283-0.195-0.59-0.194-0.895H4V7h22v8.667l2,2.667V5H2v20h15C16.242,25,15.55,24.572,15.211,23.895z
+ "/>
<polygon points="29,23 23,15 17,23 20,23 20,28 26,28 26,23 "/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_share_photo_off.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_share_photo_off.svg Fri May 14 16:09:54 2010 +0300
@@ -1,19 +1,29 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
<path d="M17.774,17.623c-1.341,0.987-1.655,2.234-1.538,3.063l2.715-3.62C18.553,17.17,18.152,17.344,17.774,17.623z"/>
-<path d="M13.148,9H24v3.388c-0.162,0.208-0.314,0.444-0.459,0.695c0.418,0.118,0.793,0.362,1.059,0.717l0.4,0.534V8H12.148L13.148,9 z"/>
+<path d="M13.148,9H24v3.388c-0.162,0.208-0.314,0.444-0.459,0.695c0.418,0.118,0.793,0.362,1.059,0.717l0.4,0.534V8H12.148L13.148,9
+ z"/>
<path d="M6,10.147l-1-1V22h10.29c0.038-0.066,0.063-0.138,0.11-0.2L16,21H6V10.147z"/>
<polygon points="11.148,7 26,7 26,15.667 28,18.334 28,5 9.148,5 "/>
<path d="M15.211,23.895c-0.142-0.283-0.195-0.59-0.194-0.895H4V8.147l-2-2V25h15C16.242,25,15.55,24.572,15.211,23.895z"/>
-<path d="M18.609,14.46c0.953-0.709,1.188-1.786,0.83-2.38c-0.262-0.434-1.124-0.805-2.076,0.389 c-0.105,0.132-0.196,0.293-0.278,0.467L18.609,14.46z"/>
+<path d="M18.609,14.46c0.953-0.709,1.188-1.786,0.83-2.38c-0.262-0.434-1.124-0.805-2.076,0.389
+ c-0.105,0.132-0.196,0.293-0.278,0.467L18.609,14.46z"/>
<path d="M11.084,15.23c-1.152,1.201-1.271,2.335-0.878,2.738c0.39,0.399,1.681,0.717,3.043-0.573L11.084,15.23z"/>
-<path d="M7.979,12.126c-0.855,0.401-1.094,1.023-0.928,1.342c0.176,0.342,0.979,0.888,2.068,0.206 c0.083-0.053,0.156-0.115,0.227-0.182L7.979,12.126z"/>
+<path d="M7.979,12.126c-0.855,0.401-1.094,1.023-0.928,1.342c0.176,0.342,0.979,0.888,2.068,0.206
+ c0.083-0.053,0.156-0.115,0.227-0.182L7.979,12.126z"/>
<polygon points="17.795,21.941 17,23 18.854,23 "/>
<polygon points="27.15,23 29,23 23,15 21.35,17.2 "/>
<polygon points="20,24.146 20,28 23.854,28 "/>
-<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"/>
+<rect x="13.74" y="-3.242" transform="matrix(0.7063 -0.7079 0.7079 0.7063 -6.0767 14.6963)" width="1.868" height="35.827"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sharpness.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sharpness.svg Fri May 14 16:09:54 2010 +0300
@@ -1,14 +1,25 @@
-<?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">
+<?xml version="1.0" ?>
+<!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>
+
<polyline points="1,29,9,7,17,29,1,29"/>
+
<polygon points="22.36,7.977,23,6.391,23.63,7.977,25.68,7.977,23,1,20.31,7.977"/>
+
<polygon points="20.36,12.98,21.56,9.977,19.54,9.977,18.39,12.98"/>
+
<polygon points="27.61,12.98,26.45,9.977,24.43,9.977,25.63,12.98"/>
+
<path d="M27,16.4c0,0.002-0.002,0.006-0.002,0.008h-0.002c-0.002,0.758-0.227,1.461-0.596,2.066l1.447,1.445c0.682-0.934,1.102-2.072,1.146-3.303v-0.02l-0.621-1.615h-1.95l0.566,1.416z"/>
+
<path d="M19.59,18.47c-0.369-0.605-0.593-1.307-0.595-2.064h-0.002l0.002-0.002c0-0.002-0.002-0.006-0.002-0.008l0.566-1.416h-1.95l-0.62,1.61c0.04,1.24,0.461,2.385,1.146,3.324l1.44-1.44z"/>
+
<path d="M23,20.4c-0.719,0-1.384-0.205-1.967-0.537l-1.455,1.457c0.972,0.68,2.15,1.082,3.422,1.082s2.449-0.402,3.42-1.082l-1.455-1.455c-0.58,0.34-1.24,0.54-1.96,0.54z"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_shift.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_shift.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,9 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_show_view.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_show_view.svg Fri May 14 16:09:54 2010 +0300
@@ -1,16 +1,27 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
-<rect height="2" width="2" x="8" y="16"/>
-<rect height="2" width="7.941" x="11.059" y="16"/>
-<rect height="2" width="2" x="7.971" y="21"/>
-<rect height="2" width="2" x="8" y="11"/>
-<rect height="2" width="7.941" x="11.059" y="11"/>
+<rect x="8" y="16" width="2" height="2"/>
+<rect x="11.059" y="16" width="7.941" height="2"/>
+<rect x="7.971" y="21" width="2" height="2"/>
+<rect x="8" y="11" width="2" height="2"/>
+<rect x="11.059" y="11" width="7.941" height="2"/>
<path d="M16.382,21h-5.353v2h2.112C14.169,22.162,15.254,21.491,16.382,21z"/>
-<path d="M10.428,28.235C10.143,27.873,10,27.437,10,27H6V8h15v12c1.014,0,2.018,0.146,3,0.416V5H3v25h9.029 C11.476,29.457,10.935,28.881,10.428,28.235z"/>
+<path d="M10.428,28.235C10.143,27.873,10,27.437,10,27H6V8h15v12c1.014,0,2.018,0.146,3,0.416V5H3v25h9.029
+ C11.476,29.457,10.935,28.881,10.428,28.235z"/>
<path d="M26,21.18c1.042,0.496,2.048,1.136,3,1.931V0H8v3h18V21.18z"/>
-<path d="M30,27c-2.454-3.123-5.586-5-9-5s-6.546,1.877-9,5h2.654 c0.695-0.709,1.522-1.386,2.463-1.921C17.047,25.376,17,25.682,17,26c0,2.21,1.792,4,4,4s4-1.79,4-4 c0-0.318-0.047-0.624-0.117-0.921c0.94,0.535,1.768,1.212,2.463,1.921H30z M21,28c-1.104,0-2-0.447-2-1s0.896-1,2-1s2,0.447,2,1 S22.104,28,21,28z" fill-rule="evenodd"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M30,27c-2.454-3.123-5.586-5-9-5s-6.546,1.877-9,5h2.654
+ c0.695-0.709,1.522-1.386,2.463-1.921C17.047,25.376,17,25.682,17,26c0,2.21,1.792,4,4,4s4-1.79,4-4
+ c0-0.318-0.047-0.624-0.117-0.921c0.94,0.535,1.768,1.212,2.463,1.921H30z M21,28c-1.104,0-2-0.447-2-1s0.896-1,2-1s2,0.447,2,1
+ S22.104,28,21,28z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_shuffle.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_shuffle.svg Fri May 14 16:09:54 2010 +0300
@@ -1,9 +1,15 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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">
+
<rect fill="none" height="30" width="30"/>
+
</g>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_shuffle_off.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_shuffle_off.svg Fri May 14 16:09:54 2010 +0300
@@ -1,12 +1,21 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
+
<polygon points="18.23,22.37,7.737,22.37,7.737,19.06,0,24.03,7.737,29,7.737,25.69,21.54,25.69"/>
+
<rect height="39.4" transform="matrix(0.7066 -0.7076 0.7076 0.7066 -6.2267 15.051)" width="1.867" x="14.1" y="-4.667"/>
+
<g fill-opacity="0.5" stroke-opacity="0.5">
+
<rect fill="none" height="30" width="30"/>
+
</g>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_smiley.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_smiley.svg Fri May 14 16:09:54 2010 +0300
@@ -1,11 +1,20 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
-<path d="M15,1C7.28,1,1,7.28,1,15s6.28,14,14,14s14-6.28,14-14S22.72,1,15,1z M15,26C8.935,26,4,21.065,4,15S8.935,4,15,4 s11,4.935,11,11S21.065,26,15,26z"/>
+<path d="M15,1C7.28,1,1,7.28,1,15s6.28,14,14,14s14-6.28,14-14S22.72,1,15,1z M15,26C8.935,26,4,21.065,4,15S8.935,4,15,4
+ s11,4.935,11,11S21.065,26,15,26z"/>
<ellipse cx="9.5" cy="10.5" rx="1.5" ry="2.5"/>
<ellipse cx="20.5" cy="10.5" rx="1.5" ry="2.5"/>
-<path d="M6,15c0,4.963,4.038,9,9,9c4.963,0,9-4.037,9-9H6z M20.742,19H9.258c-0.422-0.604-0.751-1.277-0.967-2h13.418 C21.493,17.723,21.164,18.396,20.742,19z"/>
+<path d="M6,15c0,4.963,4.038,9,9,9c4.963,0,9-4.037,9-9H6z M20.742,19H9.258c-0.422-0.604-0.751-1.277-0.967-2h13.418
+ C21.493,17.723,21.164,18.396,20.742,19z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_songs_all.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_songs_all.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,16 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
-<path d="M25,5L15,2v17.357C14.31,19.129,13.549,19,12.75,19C9.574,19,7,21.016,7,23.5S9.574,28,12.75,28S19,25.984,19,23.5 c0-0.168,0-13.449,0-13.449L25,12V5z"/>
+<path d="M25,5L15,2v17.357C14.31,19.129,13.549,19,12.75,19C9.574,19,7,21.016,7,23.5S9.574,28,12.75,28S19,25.984,19,23.5
+ c0-0.168,0-13.449,0-13.449L25,12V5z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sort.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sort.svg Fri May 14 16:09:54 2010 +0300
@@ -1,12 +1,19 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
-<rect height="4" width="25.998" x="2" y="2"/>
-<rect height="4" width="20.998" x="2.002" y="9"/>
-<rect height="4" width="15.998" x="2.002" y="16"/>
-<rect height="4" width="10.998" x="2.002" y="23"/>
+<rect x="2" y="2" width="25.998" height="4"/>
+<rect x="2.002" y="9" width="20.998" height="4"/>
+<rect x="2.002" y="16" width="15.998" height="4"/>
+<rect x="2.002" y="23" width="10.998" height="4"/>
<polygon points="26,22 26,17 20,17 20,22 17,22 23,30 29,22 "/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_space.svg Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +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">
-<rect fill="none" height="30" width="30"/>
-<path d="M28.5,18.47h-27v-6.944h3.301v3.563h20.4v-3.563h3.3v6.943z"/>
-</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_space_c.svg Mon May 03 12:48:33 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="30" viewBox="0 0 30 30" width="30">
-<rect fill="none" height="30" width="30"/>
-<rect fill="none" height="30" width="30" y="0"/>
-<polygon points="30,21.47,30,17.92,0,17.92,0,21.47"/>
-</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_space_itut.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,6 @@
+<?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">
+<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_l.svg Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +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">
-<rect fill="none" height="30" width="30"/>
-<polygon points="5.043,8.533,5.043,17.92,28.5,17.92,28.5,21.46,1.5,21.46,1.5,8.533"/>
-</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_space_r.svg Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +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">
-<rect fill="none" height="30" width="30"/>
-<polygon points="24.96,8.533,24.96,17.92,1.5,17.92,1.5,21.46,28.5,21.46,28.5,8.533"/>
-</svg>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_space_vkb.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,7 @@
+<?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 86 30" width="86px" x="0px" 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 "/>
+</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_speaker.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_speaker.svg Fri May 14 16:09:54 2010 +0300
@@ -1,11 +1,20 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
-<rect height="12" width="7" x="1" y="9"/>
+<rect x="1" y="9" width="7" height="12"/>
<polygon points="10,8 10,22 21,27 21,3 "/>
-<path d="M23.889,21.954l-1.676-1.094C23.382,19.069,24,17.043,24,15s-0.618-4.069-1.787-5.86l1.676-1.094 C25.27,10.164,26,12.568,26,15S25.27,19.836,23.889,21.954L23.889,21.954z"/>
-<path d="M26.702,24.602l-1.598-1.203C26.999,20.882,28,17.979,28,15s-1.001-5.882-2.896-8.398l1.598-1.203 C28.859,8.265,30,11.584,30,15S28.859,21.735,26.702,24.602L26.702,24.602z"/>
+<path d="M23.889,21.954l-1.676-1.094C23.382,19.069,24,17.043,24,15s-0.618-4.069-1.787-5.86l1.676-1.094
+ C25.27,10.164,26,12.568,26,15S25.27,19.836,23.889,21.954L23.889,21.954z"/>
+<path d="M26.702,24.602l-1.598-1.203C26.999,20.882,28,17.979,28,15s-1.001-5.882-2.896-8.398l1.598-1.203
+ C28.859,8.265,30,11.584,30,15S28.859,21.735,26.702,24.602L26.702,24.602z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_speaker_off.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_speaker_off.svg Fri May 14 16:09:54 2010 +0300
@@ -1,9 +1,16 @@
-<?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">
-<rect fill="none" height="30" width="30"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<rect fill="none" width="30" height="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 "/>
<polygon points="10,14.148 10,22 21,27 21,25.146 "/>
-<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"/>
+<rect x="13.74" y="-3.242" transform="matrix(0.7063 -0.7079 0.7079 0.7063 -6.0767 14.6963)" width="1.868" height="35.827"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_special_characters_itut.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_special_characters_itut.svg Fri May 14 16:09:54 2010 +0300
@@ -1,9 +1,15 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
+
<polygon points="28.63,16.39,28.88,7.395,26.39,7.395,26.65,16.39"/>
+
<path d="M28.6,18.03c-0.264-0.264-0.586-0.395-0.965-0.395s-0.699,0.131-0.964,0.395c-0.264,0.265-0.395,0.585-0.395,0.964s0.132,0.702,0.399,0.97c0.267,0.266,0.587,0.399,0.959,0.399,0.379,0,0.701-0.134,0.965-0.399,0.27-0.27,0.4-0.59,0.4-0.97s-0.13-0.7-0.4-0.97z"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_special_characters_qwerty.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_special_characters_qwerty.svg Fri May 14 16:09:54 2010 +0300
@@ -1,12 +1,21 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
+
<path d="M23.37,22.59c0.588-0.173,1.039-0.468,1.354-0.886,0.314-0.416,0.472-0.914,0.472-1.493,0-0.839-0.262-1.468-0.786-1.887s-1.308-0.629-2.352-0.629c-0.692,0-1.468,0.107-2.324,0.321v1.203h0.014c0.843-0.232,1.497-0.349,1.962-0.349,0.528,0,0.927,0.125,1.192,0.376,0.268,0.251,0.4,0.624,0.4,1.121,0,0.565-0.166,0.984-0.499,1.258s-1.169,0.41-2.509,0.41v1.142c1.354,0,2.217,0.146,2.591,0.438s0.561,0.772,0.561,1.442c0,0.624-0.156,1.093-0.468,1.404-0.313,0.313-0.778,0.469-1.398,0.469-0.515,0-1.219-0.111-2.112-0.335h-0.014v1.189c0.766,0.214,1.513,0.321,2.242,0.321,1.217,0,2.13-0.261,2.737-0.783,0.609-0.521,0.913-1.304,0.913-2.348,0-0.634-0.17-1.161-0.509-1.582-0.32-0.4-0.81-0.67-1.45-0.79z"/>
+
<polygon points="4.013,13.54,5.54,13.54,5.383,10.67,7.798,12.24,8.545,10.93,6.014,9.616,8.545,8.313,7.798,7.002,5.383,8.546,5.54,5.69,4.013,5.69,4.162,8.546,1.746,7.002,1,8.313,3.531,9.616,1,10.93,1.746,12.24,4.162,10.67"/>
+
<path d="M19.55,13.35c0.73-0.853,1.259-1.992,1.585-3.42l-1.651-0.373c-0.238,1.057-0.545,1.89-0.921,2.498l-2.49-3.216c0.936-0.631,1.583-1.202,1.942-1.714s0.54-1.075,0.54-1.688c0-0.753-0.273-1.348-0.818-1.785s-1.3-0.657-2.26-0.657c-1.041,0-1.852,0.238-2.433,0.715-0.581,0.476-0.872,1.159-0.872,2.05,0,0.808,0.443,1.79,1.328,2.946-0.891,0.51-1.529,1.051-1.917,1.623-0.4,0.58-0.59,1.25-0.59,2.03,0,1.052,0.338,1.867,1.013,2.445s1.646,0.867,2.913,0.867c1.234,0,2.283-0.346,3.146-1.037l0.697,0.904h2.482l-1.7-2.18zm-4.99-8.698c0.208-0.21,0.52-0.315,0.934-0.315,0.35,0,0.629,0.103,0.839,0.308,0.21,0.204,0.315,0.465,0.315,0.779,0,0.848-0.487,1.597-1.461,2.25-0.359-0.471-0.605-0.851-0.738-1.142-0.133-0.29-0.199-0.602-0.199-0.934,0.01-0.42,0.11-0.736,0.32-0.946zm0.74,9.598c-0.548,0-1.025-0.182-1.432-0.544s-0.61-0.884-0.61-1.564c0-0.907,0.382-1.666,1.146-2.274l2.822,3.686c-0.56,0.46-1.21,0.69-1.93,0.69z"/>
+
<polygon points="26.64,11.84,26.88,3.166,24.48,3.166,24.73,11.84"/>
+
<path d="M26.62,13.43c-0.254-0.254-0.564-0.381-0.93-0.381s-0.675,0.127-0.93,0.381c-0.254,0.255-0.381,0.564-0.381,0.93s0.128,0.677,0.386,0.935c0.257,0.257,0.565,0.386,0.925,0.386,0.365,0,0.676-0.129,0.93-0.386,0.24-0.27,0.37-0.58,0.37-0.94s-0.13-0.68-0.38-0.93z"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_split.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_split.svg Fri May 14 16:09:54 2010 +0300
@@ -1,9 +1,15 @@
-<?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">
-<rect fill="none" height="30" width="30"/>
-<path d="M12.934,4.151C13.57,4.063,14.215,4,14.875,4c0.588,0,1.162,0.048,1.729,0.118V3h1.836V1.918C18.439,1.411,18.027,1,17.52,1 h-5.505c-0.506,0-0.916,0.41-0.916,0.918V3h1.836V4.151z"/>
-<path d="M9.789,5.017C9.16,4.4,8.318,4,7.367,4c-1.932,0-3.5,1.566-3.5,3.5c0,0.561,0.139,1.086,0.375,1.554 C5.717,7.285,7.619,5.891,9.789,5.017z"/>
-<path d="M25.795,9.096c0.252-0.479,0.408-1.016,0.408-1.596c0-1.934-1.568-3.5-3.5-3.5c-0.961,0-1.807,0.409-2.438,1.037 C22.43,5.919,24.328,7.321,25.795,9.096z"/>
-<path d="M15,6C8.371,6,3,11.374,3,18c0,6.629,5.371,12,12,12c6.627,0,12-5.371,12-12C27,11.374,21.627,6,15,6z M15,18 c0,0-4.004,8-4.004,8.063C8.035,24.59,6,21.533,6,18c0-4.971,4.029-9,9-9c4.971,0,9,4.029,9,9H15z"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<rect fill="none" width="30" height="30"/>
+<path d="M12.934,4.151C13.57,4.063,14.215,4,14.875,4c0.588,0,1.162,0.048,1.729,0.118V3h1.836V1.918C18.439,1.411,18.027,1,17.52,1
+ h-5.505c-0.506,0-0.916,0.41-0.916,0.918V3h1.836V4.151z"/>
+<path d="M9.789,5.017C9.16,4.4,8.318,4,7.367,4c-1.932,0-3.5,1.566-3.5,3.5c0,0.561,0.139,1.086,0.375,1.554
+ C5.717,7.285,7.619,5.891,9.789,5.017z"/>
+<path d="M25.795,9.096c0.252-0.479,0.408-1.016,0.408-1.596c0-1.934-1.568-3.5-3.5-3.5c-0.961,0-1.807,0.409-2.438,1.037
+ C22.43,5.919,24.328,7.321,25.795,9.096z"/>
+<path d="M15,6C8.371,6,3,11.374,3,18c0,6.629,5.371,12,12,12c6.627,0,12-5.371,12-12C27,11.374,21.627,6,15,6z M15,18
+ c0,0-4.004,8-4.004,8.063C8.035,24.59,6,21.533,6,18c0-4.971,4.029-9,9-9c4.971,0,9,4.029,9,9H15z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sport.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sport.svg Fri May 14 16:09:54 2010 +0300
@@ -1,11 +1,23 @@
-<?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">
-<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"/>
-<path d="M10.266,18.777l-0.539-1.771c-0.297-1.66,0.633-3.42,2.766-5.232c0.646-0.549,2.512-2.381,3.532-3.408l2.326-2.33 l4.746,4.572l-2.326,2.332c-0.291,0.289-2.871,2.872-3.938,3.777c-0.143,0.121-0.262,0.229-0.357,0.32l0.205,1.237l-5.5,1 L10.266,18.777z"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<rect fill="none" width="30" height="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"/>
+<path d="M10.266,18.777l-0.539-1.771c-0.297-1.66,0.633-3.42,2.766-5.232c0.646-0.549,2.512-2.381,3.532-3.408l2.326-2.33
+ l4.746,4.572l-2.326,2.332c-0.291,0.289-2.871,2.872-3.938,3.777c-0.143,0.121-0.262,0.229-0.357,0.32l0.205,1.237l-5.5,1
+ L10.266,18.777z"/>
<circle cx="25" cy="5" r="4"/>
-<path d="M11.584,29c-0.572,0-1.141-0.244-1.537-0.719c-0.707-0.85-0.592-2.111,0.256-2.818l4.965-4.135l-3.303-3.965 c-0.707-0.848-0.594-2.109,0.256-2.816c0.848-0.707,2.109-0.592,2.816,0.256l4.582,5.5c0.707,0.85,0.594,2.111-0.256,2.818 l-6.5,5.416C12.49,28.848,12.035,29,11.584,29L11.584,29z"/>
-<path d="M3.002,28.084c-0.578,0-1.152-0.25-1.549-0.732c-0.699-0.854-0.574-2.115,0.279-2.813l6.988-5.726l2.361-4.278 c0.533-0.967,1.75-1.316,2.719-0.783c0.967,0.533,1.318,1.75,0.783,2.717l-2.547,4.615c-0.123,0.224-0.287,0.42-0.482,0.58 l-7.287,5.969C3.896,27.936,3.447,28.084,3.002,28.084L3.002,28.084z"/>
+<path d="M11.584,29c-0.572,0-1.141-0.244-1.537-0.719c-0.707-0.85-0.592-2.111,0.256-2.818l4.965-4.135l-3.303-3.965
+ c-0.707-0.848-0.594-2.109,0.256-2.816c0.848-0.707,2.109-0.592,2.816,0.256l4.582,5.5c0.707,0.85,0.594,2.111-0.256,2.818
+ l-6.5,5.416C12.49,28.848,12.035,29,11.584,29L11.584,29z"/>
+<path d="M3.002,28.084c-0.578,0-1.152-0.25-1.549-0.732c-0.699-0.854-0.574-2.115,0.279-2.813l6.988-5.726l2.361-4.278
+ c0.533-0.967,1.75-1.316,2.719-0.783c0.967,0.533,1.318,1.75,0.783,2.717l-2.547,4.615c-0.123,0.224-0.287,0.42-0.482,0.58
+ l-7.287,5.969C3.896,27.936,3.447,28.084,3.002,28.084L3.002,28.084z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_stabilization.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_stabilization.svg Fri May 14 16:09:54 2010 +0300
@@ -1,11 +1,14 @@
-<?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">
-<rect fill="none" height="30" width="30"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<rect fill="none" width="30" height="30"/>
<path d="M3.949,4v17h22.1V4H3.949z M23,18H7V7h16V18z"/>
<circle cx="9.001" cy="9.02" r="1"/>
-<rect height="2" width="4" x="20.049" y="1"/>
-<path d="M15.422,8c-2.48,0-4.5,2.018-4.5,4.5c0,2.48,2.02,4.5,4.5,4.5c2.482,0,4.5-2.02,4.5-4.5C19.922,10.018,17.904,8,15.422,8z M15.422,14.5c-1.104,0-2-0.896-2-2c0-1.105,0.896-2,2-2c1.105,0,2,0.895,2,2C17.422,13.604,16.527,14.5,15.422,14.5z"/>
+<rect x="20.049" y="1" width="4" height="2"/>
+<path d="M15.422,8c-2.48,0-4.5,2.018-4.5,4.5c0,2.48,2.02,4.5,4.5,4.5c2.482,0,4.5-2.02,4.5-4.5C19.922,10.018,17.904,8,15.422,8z
+ M15.422,14.5c-1.104,0-2-0.896-2-2c0-1.105,0.896-2,2-2c1.105,0,2,0.895,2,2C17.422,13.604,16.527,14.5,15.422,14.5z"/>
<polygon points="3,27 3,21 1,21 1,29 11,29 11,27 "/>
<polygon points="27,27 27,21 29,21 29,29 19,29 19,27 "/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_stabilization_off.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_stabilization_off.svg Fri May 14 16:09:54 2010 +0300
@@ -1,13 +1,16 @@
-<?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">
-<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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<rect fill="none" width="30" height="30"/>
+<rect x="14.067" y="-2.916" transform="matrix(-0.7061 0.7082 -0.7082 -0.7061 36.214 14.9658)" width="1.867" height="35.829"/>
+<rect x="20.049" y="1" width="4" height="2"/>
<polygon points="3,27 3,21 1,21 1,29 11,29 11,27 "/>
<polygon points="29,24.85 29,21 27,21 27,22.85 "/>
<polygon points="11.148,7 23,7 23,18 22.148,18 25.148,21 26.049,21 26.049,4 8.148,4 "/>
<polygon points="13.853,18 7,18 7,11.147 3.949,8.097 3.949,21 16.854,21 "/>
<polygon points="22.854,27 19,27 19,29 24.854,29 "/>
-<path d="M14.768,10.619c0.206-0.072,0.424-0.119,0.654-0.119c1.105,0,2,0.896,2,2c0,0.23-0.047,0.448-0.117,0.654l1.853,1.853 c0.483-0.717,0.766-1.58,0.766-2.507c0-2.482-2.019-4.5-4.5-4.5c-0.928,0-1.79,0.283-2.507,0.766L14.768,10.619z"/>
+<path d="M14.768,10.619c0.206-0.072,0.424-0.119,0.654-0.119c1.105,0,2,0.896,2,2c0,0.23-0.047,0.448-0.117,0.654l1.853,1.853
+ c0.483-0.717,0.766-1.58,0.766-2.507c0-2.482-2.019-4.5-4.5-4.5c-0.928,0-1.79,0.283-2.507,0.766L14.768,10.619z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_start.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_start.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,9 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<rect fill="none" height="30" width="30"/>
+
<polygon points="4.608,15,4.608,3,15,9,25.39,15,15,21,4.608,27"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_station_scan.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_station_scan.svg Fri May 14 16:09:54 2010 +0300
@@ -1,14 +1,25 @@
-<?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">
+<?xml version="1.0" ?>
+<!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>
+
<rect height="15" width="4" x="13" y="8"/>
+
<rect height="7" width="2" x="9" y="12"/>
+
<rect height="7" width="2" x="5" y="12"/>
+
<rect height="7" width="2" x="1" y="12"/>
+
<rect height="7" width="2" x="27" y="12"/>
+
<rect height="7" width="2" x="23" y="12"/>
+
<rect height="7" width="2" x="19" y="12"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_stop.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_stop.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,9 @@
-<?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">
+<?xml version="1.0" ?>
+<!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"/>
+
<rect height="24" width="24" x="3" y="3"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_stopwatch.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_stopwatch.svg Fri May 14 16:09:54 2010 +0300
@@ -1,11 +1,17 @@
-<?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">
-<rect fill="none" height="30" width="30"/>
-<path d="M12.934,4.15C13.57,4.063,14.215,4,14.876,4c0.587,0,1.161,0.047,1.729,0.117V3h1.834V1.918C18.439,1.41,18.027,1,17.521,1 h-5.506c-0.507,0-0.916,0.41-0.916,0.918V3h1.835V4.15z"/>
-<path d="M9.789,5.016C9.16,4.398,8.318,4,7.368,4c-1.933,0-3.5,1.566-3.5,3.5c0,0.561,0.139,1.086,0.374,1.553 C5.717,7.283,7.62,5.891,9.789,5.016z"/>
-<path d="M25.795,9.096c0.253-0.479,0.408-1.016,0.408-1.596c0-1.934-1.567-3.5-3.5-3.5c-0.961,0-1.807,0.408-2.438,1.037 C22.43,5.918,24.328,7.32,25.795,9.096z"/>
-<path d="M15,6C8.372,6,3,11.373,3,18c0,6.629,5.372,12,12,12c6.627,0,12-5.371,12-12C27,11.373,21.627,6,15,6z M15,27 c-4.971,0-9-4.029-9-9c0-4.971,4.029-9,9-9c4.971,0,9,4.029,9,9C24,22.971,19.971,27,15,27z"/>
-<rect height="10" width="2" x="14" y="10"/>
-<rect height="2" width="10" x="12" y="17"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<rect fill="none" width="30" height="30"/>
+<path d="M12.934,4.15C13.57,4.063,14.215,4,14.876,4c0.587,0,1.161,0.047,1.729,0.117V3h1.834V1.918C18.439,1.41,18.027,1,17.521,1
+ h-5.506c-0.507,0-0.916,0.41-0.916,0.918V3h1.835V4.15z"/>
+<path d="M9.789,5.016C9.16,4.398,8.318,4,7.368,4c-1.933,0-3.5,1.566-3.5,3.5c0,0.561,0.139,1.086,0.374,1.553
+ C5.717,7.283,7.62,5.891,9.789,5.016z"/>
+<path d="M25.795,9.096c0.253-0.479,0.408-1.016,0.408-1.596c0-1.934-1.567-3.5-3.5-3.5c-0.961,0-1.807,0.408-2.438,1.037
+ C22.43,5.918,24.328,7.32,25.795,9.096z"/>
+<path d="M15,6C8.372,6,3,11.373,3,18c0,6.629,5.372,12,12,12c6.627,0,12-5.371,12-12C27,11.373,21.627,6,15,6z M15,27
+ c-4.971,0-9-4.029-9-9c0-4.971,4.029-9,9-9c4.971,0,9,4.029,9,9C24,22.971,19.971,27,15,27z"/>
+<rect x="14" y="10" width="2" height="10"/>
+<rect x="12" y="17" width="10" height="2"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_store.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_store.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,13 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
+
<circle cx="22.5" cy="25.5" r="2.5"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sym_itut.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sym_itut.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,13 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
+
<path d="M29.26,10.94c-0.496-0.525-1.241-0.788-2.233-0.788-1.171,0-2.075,0.459-2.714,1.378-0.433-0.919-1.295-1.378-2.587-1.378-1.23,0-2.174,0.528-2.828,1.585l-0.391-1.443h-1.315v9.7h2.255v-5.902c0-0.769,0.147-1.386,0.44-1.851,0.295-0.465,0.719-0.697,1.273-0.697,0.438,0,0.767,0.155,0.985,0.465,0.22,0.31,0.329,0.772,0.329,1.386v6.59h2.246v-5.902c0-0.774,0.15-1.393,0.449-1.854,0.3-0.462,0.729-0.693,1.29-0.693,0.433,0,0.754,0.14,0.966,0.419,0.21,0.279,0.314,0.757,0.314,1.432v6.59h2.24v-6.699c0-1.04-0.25-1.83-0.74-2.36z"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sym_qwerty.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_sym_qwerty.svg Fri May 14 16:09:54 2010 +0300
@@ -1,11 +1,19 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
+
<path d="M29.3,4.477c-0.466-0.495-1.165-0.742-2.098-0.742-1.099,0-1.948,0.433-2.547,1.297-0.406-0.864-1.216-1.297-2.43-1.297-1.156,0-2.042,0.497-2.656,1.492l-0.367-1.359h-1.234v9.132h2.117v-5.555c0-0.724,0.138-1.305,0.414-1.742s0.675-0.656,1.195-0.656c0.411,0,0.72,0.146,0.926,0.438s0.309,0.727,0.309,1.305v6.21h2.109v-5.555c0-0.729,0.141-1.312,0.422-1.746s0.685-0.652,1.211-0.652c0.406,0,0.708,0.132,0.906,0.395s0.297,0.712,0.297,1.348v6.21h2.13v-6.305c0-0.984-0.23-1.723-0.7-2.218z"/>
+
<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"/>
+
<path d="M23.37,22.59c0.588-0.173,1.039-0.468,1.354-0.886,0.314-0.416,0.472-0.914,0.472-1.493,0-0.839-0.262-1.468-0.786-1.887s-1.308-0.629-2.352-0.629c-0.692,0-1.468,0.107-2.324,0.321v1.203h0.014c0.843-0.232,1.497-0.349,1.962-0.349,0.528,0,0.927,0.125,1.192,0.376,0.268,0.251,0.4,0.624,0.4,1.121,0,0.565-0.166,0.984-0.499,1.258s-1.169,0.41-2.509,0.41v1.142c1.354,0,2.217,0.146,2.591,0.438s0.561,0.772,0.561,1.442c0,0.624-0.156,1.093-0.468,1.404-0.313,0.313-0.778,0.469-1.398,0.469-0.515,0-1.219-0.111-2.112-0.335h-0.014v1.189c0.766,0.214,1.513,0.321,2.242,0.321,1.217,0,2.13-0.261,2.737-0.783,0.609-0.521,0.913-1.304,0.913-2.348,0-0.634-0.17-1.161-0.509-1.582-0.32-0.4-0.81-0.67-1.45-0.79z"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tab_active.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tab_active.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,15 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
<circle cx="15" cy="15" r="13"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tab_passive.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tab_passive.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,16 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
-<path d="M15,2C7.82,2,2,7.82,2,15s5.82,13,13,13s13-5.82,13-13S22.18,2,15,2z M15,25C9.486,25,5,20.514,5,15S9.486,5,15,5 s10,4.486,10,10S20.514,25,15,25z"/>
+<path d="M15,2C7.82,2,2,7.82,2,15s5.82,13,13,13s13-5.82,13-13S22.18,2,15,2z M15,25C9.486,25,5,20.514,5,15S9.486,5,15,5
+ s10,4.486,10,10S20.514,25,15,25z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tag.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tag.svg Fri May 14 16:09:54 2010 +0300
@@ -1,10 +1,17 @@
-<?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">
+<?xml version="1.0" ?>
+<!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>
+
<path d="M12.73,2h-8.636l-2.094,2.094v8.638l15.68,15.68,10.73-10.73-15.68-15.68zm-8.73,9.9v-6.978l0.922-0.922h6.981l13.68,13.68-7.903,7.903-13.68-13.68z"/>
+
<rect height="11.95" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -6.6464 16.0459)" width="7.321" x="12.38" y="10.07"/>
+
<circle cx="7" cy="7" r="2"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_text_align_center.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_text_align_center.svg Fri May 14 16:09:54 2010 +0300
@@ -1,11 +1,19 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
+
<rect height="2" width="22" x="4" y="12"/>
+
<rect height="2" width="16" x="7" y="16"/>
+
<rect height="2" width="22" x="4" y="20"/>
+
<rect height="2" width="16" x="7" y="24"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_text_align_justify.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_text_align_justify.svg Fri May 14 16:09:54 2010 +0300
@@ -1,11 +1,19 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
+
<rect height="2" width="22" x="4" y="12"/>
+
<rect height="2" width="22" x="4" y="16"/>
+
<rect height="2" width="22" x="4" y="20"/>
+
<rect height="2" width="22" x="4" y="24"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_text_align_left.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_text_align_left.svg Fri May 14 16:09:54 2010 +0300
@@ -1,11 +1,19 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
+
<rect height="2" width="22" x="4" y="12"/>
+
<rect height="2" width="16" x="4" y="16"/>
+
<rect height="2" width="22" x="4" y="20"/>
+
<rect height="2" width="16" x="4" y="24"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_text_align_right.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_text_align_right.svg Fri May 14 16:09:54 2010 +0300
@@ -1,11 +1,19 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
+
<rect height="2" width="22" x="4" y="12"/>
+
<rect height="2" width="16" x="10" y="16"/>
+
<rect height="2" width="22" x="4" y="20"/>
+
<rect height="2" width="16" x="10" y="24"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tick.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tick.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,15 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
<polygon points="29,6.029 26.172,3.201 10.018,19.354 3.143,12.48 0.314,15.308 10.007,25 10.019,24.988 10.03,25 "/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tip.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_tip.svg Fri May 14 16:09:54 2010 +0300
@@ -1,10 +1,19 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
-<rect height="2" width="10" x="10" y="23"/>
-<rect height="2" width="10" x="10" y="26"/>
-<path d="M24,10.889C24,4.753,19.971,2,15,2s-9,2.753-9,8.889c0,3.335,1.196,6.32,3.082,8.356L10,22h10l0.918-2.755 C22.804,17.209,24,14.224,24,10.889z M15,5c3.981,0,6,1.981,6,5.889C21,15.285,18.252,19,15,19s-6-3.715-6-8.111 C9,6.981,11.019,5,15,5z"/>
+<rect x="10" y="23" width="10" height="2"/>
+<rect x="10" y="26" width="10" height="2"/>
+<path d="M24,10.889C24,4.753,19.971,2,15,2s-9,2.753-9,8.889c0,3.335,1.196,6.32,3.082,8.356L10,22h10l0.918-2.755
+ C22.804,17.209,24,14.224,24,10.889z M15,5c3.981,0,6,1.981,6,5.889C21,15.285,18.252,19,15,19s-6-3.715-6-8.111
+ C9,6.981,11.019,5,15,5z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_two.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_two.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,9 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,13 @@
-<?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" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<?xml version="1.0" ?>
+<!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" 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"/>
+
<rect fill="none" height="29.03" width="29.03" x="0.54" y="0.83"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma_attach.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma_attach.svg Fri May 14 16:09:54 2010 +0300
@@ -1,16 +1,29 @@
-<?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" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<?xml version="1.0" ?>
+<!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" 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"/>
+
<polygon points="11.42,22.44,12.78,24.63,16.51,24.63,15.14,22.44"/>
+
<polygon points="23.12,22.44,24.25,24.26,24.25,22.44"/>
+
<polygon points="10.66,24.63,10.67,24.63,9.303,22.44,6.724,22.44,10.51,28.5,12.36,27.35,11.72,26.32"/>
+
<polygon points="20.26,17.92,21.62,20.11,24.25,20.11,20.46,14.05,18.6,15.21,20.28,17.92"/>
+
<polygon points="19.51,20.11,18.14,17.92,14.46,17.92,15.82,20.11"/>
+
<polygon points="6.724,18.28,6.724,20.11,7.859,20.11"/>
+
<polygon points="13.7,20.11,12.34,17.92,8.615,17.92,9.979,20.11"/>
+
<rect fill="none" height="29.03" width="29.03" x="0.323" y="0.83"/>
+
<rect fill="none" height="29.03" width="29.03" x="0.323" y="0.83"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma_context.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma_context.svg Fri May 14 16:09:54 2010 +0300
@@ -1,10 +1,17 @@
-<?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" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<?xml version="1.0" ?>
+<!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" 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"/>
+
<polygon points="20.9,14,19.04,15.16,20.72,17.85,7.215,17.85,7.215,20.04,24.67,20.03"/>
+
<rect fill="none" height="29.03" width="29.03" x="0.746" y="0.83"/>
+
<rect fill="none" height="29.03" width="29.03" x="0.746" y="0.83"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma_multipdp.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma_multipdp.svg Fri May 14 16:09:54 2010 +0300
@@ -1,11 +1,19 @@
-<?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" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<?xml version="1.0" ?>
+<!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" 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"/>
+
<polygon points="20.29,14,18.44,15.16,20.11,17.85,6.608,17.85,6.608,20.04,24.06,20.03"/>
+
<polygon points="10.35,28.39,12.21,27.23,10.53,24.53,13.27,24.53,15.68,28.39,17.53,27.23,15.85,24.53,24.04,24.53,24.04,22.34,6.583,22.34"/>
+
<rect fill="none" height="29.03" width="29.03" x="0.14" y="0.83"/>
+
<rect fill="none" height="29.03" width="29.03" x="0.14" y="0.83"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma_suspended.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_uma_suspended.svg Fri May 14 16:09:54 2010 +0300
@@ -1,13 +1,23 @@
-<?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" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<?xml version="1.0" ?>
+<!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" 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"/>
+
<polygon points="7.246,22.38,12.02,22.38,10.17,24.57,7.246,24.57"/>
+
<polygon points="24.77,17.85,24.77,20.05,19.19,20.05,21.02,17.85"/>
+
<polygon points="7.246,20.05,7.246,17.85,15.83,17.85,13.98,20.05"/>
+
<polygon points="21.8,15.4,21.86,15.46,21.82,15.51,11.84,27.4,10.94,28.47,9.261,27.06,10.54,25.53,20.18,14.05"/>
-<rect fill="none" height="29.03" width="29.03" x="0.846" y="0.83"/>
+
<rect fill="none" height="29.03" width="29.03" x="0.846" y="0.83"/>
-</svg>
+
+<rect fill="none" height="29.03" width="29.03" x="0.846" y="0.83"/>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_unblock.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_unblock.svg Fri May 14 16:09:54 2010 +0300
@@ -1,11 +1,22 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
-<path d="M13.116,23.909c-0.544-0.116-1.07-0.276-1.574-0.483l1.558-2.225 c0.424-3.082,2.324-5.697,4.971-7.099l3.658-5.225c1.07,1.175,1.836,2.629,2.179,4.238c1.504,0.225,2.893,0.799,4.081,1.644 C27.857,7.702,22.087,2,15,2C7.832,2,2,7.831,2,15c0,7.088,5.703,12.857,12.76,12.988C13.915,26.8,13.342,25.412,13.116,23.909z M5.889,15c0-5.024,4.088-9.111,9.111-9.111c1.225,0,2.391,0.246,3.458,0.686L8.271,21.122C6.797,19.503,5.889,17.358,5.889,15z" fill-rule="evenodd"/>
-<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" transform="matrix(0.7071 -0.7072 0.7072 0.7071 -9.3196 22.502)" width="9" x="18" y="20.999"/>
-<rect height="3" transform="matrix(-0.7071 -0.7072 0.7072 -0.7071 22.4979 54.319)" width="9" x="18" y="21"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.116,23.909c-0.544-0.116-1.07-0.276-1.574-0.483l1.558-2.225
+ c0.424-3.082,2.324-5.697,4.971-7.099l3.658-5.225c1.07,1.175,1.836,2.629,2.179,4.238c1.504,0.225,2.893,0.799,4.081,1.644
+ C27.857,7.702,22.087,2,15,2C7.832,2,2,7.831,2,15c0,7.088,5.703,12.857,12.76,12.988C13.915,26.8,13.342,25.412,13.116,23.909z
+ M5.889,15c0-5.024,4.088-9.111,9.111-9.111c1.225,0,2.391,0.246,3.458,0.686L8.271,21.122C6.797,19.503,5.889,17.358,5.889,15z"/>
+<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 x="18" y="20.999" transform="matrix(0.7071 -0.7072 0.7072 0.7071 -9.3196 22.502)" width="9" height="3"/>
+<rect x="18" y="21" transform="matrix(-0.7071 -0.7072 0.7072 -0.7071 22.4979 54.319)" width="9" height="3"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_underline.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_underline.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,9 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_unknown.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_unknown.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,13 @@
-<?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" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<?xml version="1.0" ?>
+<!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" 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"/>
+
<rect fill="none" height="29.03" width="29.03" x="0.54" y="0.202"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_update_existing.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_update_existing.svg Fri May 14 16:09:54 2010 +0300
@@ -1,11 +1,24 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
-<path d="M8.572,15.788h5.857l0.001,0.001c-0.037-0.108-0.073-0.217-0.08-0.318c-0.007-0.1-0.005-0.241-0.002-0.377 c-0.362-0.547-0.454-1.237-0.196-1.859C14.462,12.487,15.191,12,16,12h0.995c1.005-2.141,0.63-7.293,0.63-7.293 C17.625,2.538,14.383,0,12.189,0h-1.391C8.605,0,5.375,2.538,5.375,4.707c0,0-0.332,5.294,0.658,7.392 c0.544,1.145,1.503,2.076,2.615,2.806c0.002,0.148,0.014,0.419,0.004,0.566C8.646,15.572,8.609,15.68,8.572,15.788z"/>
-<path d="M14,21.5c0-1.65,0.469-3.185,1.248-4.515c-0.126-0.134-0.242-0.266-0.345-0.395L11.5,24.286l-3.401-7.694 C6.401,18.725,1.294,21.482,1,21.87V28h15.792C15.075,26.36,14,24.056,14,21.5z"/>
-<path d="M30,21.5c0-3.52-2.613-6.433-6-6.92v2.021c2.28,0.464,4,2.483,4,4.898c0,1.506-0.669,2.857-1.726,3.774L24,23v3.398v2.021 V29h6l-2.316-2.316C29.103,25.404,30,23.558,30,21.5z"/>
-<path d="M18.316,16.316C16.897,17.596,16,19.442,16,21.5c0,3.52,2.613,6.433,6,6.92v-2.021c-2.28-0.464-4-2.483-4-4.898 c0-1.506,0.669-2.857,1.726-3.774L22,20v-3.398V14.58V14h-6L18.316,16.316z"/>
+<path d="M8.572,15.788h5.857l0.001,0.001c-0.037-0.108-0.073-0.217-0.08-0.318c-0.007-0.1-0.005-0.241-0.002-0.377
+ c-0.362-0.547-0.454-1.237-0.196-1.859C14.462,12.487,15.191,12,16,12h0.995c1.005-2.141,0.63-7.293,0.63-7.293
+ C17.625,2.538,14.383,0,12.189,0h-1.391C8.605,0,5.375,2.538,5.375,4.707c0,0-0.332,5.294,0.658,7.392
+ c0.544,1.145,1.503,2.076,2.615,2.806c0.002,0.148,0.014,0.419,0.004,0.566C8.646,15.572,8.609,15.68,8.572,15.788z"/>
+<path d="M14,21.5c0-1.65,0.469-3.185,1.248-4.515c-0.126-0.134-0.242-0.266-0.345-0.395L11.5,24.286l-3.401-7.694
+ C6.401,18.725,1.294,21.482,1,21.87V28h15.792C15.075,26.36,14,24.056,14,21.5z"/>
+<path d="M30,21.5c0-3.52-2.613-6.433-6-6.92v2.021c2.28,0.464,4,2.483,4,4.898c0,1.506-0.669,2.857-1.726,3.774L24,23v3.398v2.021
+ V29h6l-2.316-2.316C29.103,25.404,30,23.558,30,21.5z"/>
+<path d="M18.316,16.316C16.897,17.596,16,19.442,16,21.5c0,3.52,2.613,6.433,6,6.92v-2.021c-2.28-0.464-4-2.483-4-4.898
+ c0-1.506,0.669-2.857,1.726-3.774L22,20v-3.398V14.58V14h-6L18.316,16.316z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_user_defined.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_user_defined.svg Fri May 14 16:09:54 2010 +0300
@@ -1,9 +1,15 @@
-<?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" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
-<g fill-opacity="0.5" stroke-opacity="0.5">
+<?xml version="1.0" ?>
+<!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" 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 opacity="0.5">
+
<rect fill="none" height="30" width="30" x="0.002"/>
+
</g>
+
<path d="M1,3v24h28v-24h-28zm25,21h-22v-18h22v18z"/>
+
<path d="M19.78,9.176v11.65h-2.125v-8.062l-2.195,4.187h-0.898l-2.203-4.187v8.062h-2.133v-11.64h1.797l2.992,5.695,2.992-5.695h1.767z"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_vga.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_vga.svg Fri May 14 16:09:54 2010 +0300
@@ -1,9 +1,16 @@
-<?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">
-<rect fill="none" height="30" width="30"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<rect fill="none" width="30" height="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"/>
-<path d="M14.895,19.09c-0.896,0-1.57-0.324-2.025-0.971c-0.454-0.646-0.682-1.719-0.682-3.219c0-1.297,0.282-2.285,0.846-2.969 c0.564-0.682,1.397-1.021,2.5-1.021c0.565,0,1.098,0.068,1.596,0.209v0.912c-0.444-0.133-0.938-0.197-1.487-0.197 c-0.626,0-1.103,0.266-1.427,0.797c-0.324,0.531-0.486,1.277-0.486,2.236c0,1.264,0.119,2.133,0.355,2.604s0.58,0.705,1.031,0.705 c0.286,0,0.514-0.102,0.682-0.303c0.168-0.203,0.252-0.471,0.252-0.803v-1.498h-1.058V14.67H17.5v4.334h-0.833l-0.22-0.715 c-0.15,0.25-0.367,0.447-0.65,0.588C15.514,19.02,15.213,19.09,14.895,19.09z"/>
-<path d="M22.807,19.004l-0.461-1.762h-2.423l-0.473,1.762h-1.343l2.31-8.008h1.74l2.213,8.008H22.807z M22.125,16.34l-0.982-3.98 l-1.01,3.98H22.125z"/>
+<path d="M14.895,19.09c-0.896,0-1.57-0.324-2.025-0.971c-0.454-0.646-0.682-1.719-0.682-3.219c0-1.297,0.282-2.285,0.846-2.969
+ c0.564-0.682,1.397-1.021,2.5-1.021c0.565,0,1.098,0.068,1.596,0.209v0.912c-0.444-0.133-0.938-0.197-1.487-0.197
+ c-0.626,0-1.103,0.266-1.427,0.797c-0.324,0.531-0.486,1.277-0.486,2.236c0,1.264,0.119,2.133,0.355,2.604s0.58,0.705,1.031,0.705
+ c0.286,0,0.514-0.102,0.682-0.303c0.168-0.203,0.252-0.471,0.252-0.803v-1.498h-1.058V14.67H17.5v4.334h-0.833l-0.22-0.715
+ c-0.15,0.25-0.367,0.447-0.65,0.588C15.514,19.02,15.213,19.09,14.895,19.09z"/>
+<path d="M22.807,19.004l-0.461-1.762h-2.423l-0.473,1.762h-1.343l2.31-8.008h1.74l2.213,8.008H22.807z M22.125,16.34l-0.982-3.98
+ l-1.01,3.98H22.125z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_vga_wide.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_vga_wide.svg Fri May 14 16:09:54 2010 +0300
@@ -1,12 +1,21 @@
-<?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">
+<?xml version="1.0" ?>
+<!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" x="0.002"/>
+
</g>
+
<path d="M0,3v24h30v-24h-30zm27,21h-24v-18h24v18z"/>
+
<path d="M5.806,17.91l-1.254-5.824h1.133l0.848,4.578,1.121-4.578h1.136l1.031,4.578,0.938-4.578h0.94l-1.391,5.824h-1.168l-1.008-4.441-1.121,4.441h-1.207z"/>
+
<path d="M13.37,17.91l-1.547-5.824h1.121l1.129,4.695,1.16-4.695h0.957l-1.613,5.824h-1.212z"/>
+
<path d="M18.56,17.98c-0.651,0-1.142-0.235-1.473-0.705s-0.496-1.251-0.496-2.342c0-0.942,0.205-1.662,0.615-2.158s1.017-0.744,1.818-0.744c0.411,0,0.798,0.051,1.16,0.152v0.664c-0.323-0.097-0.684-0.145-1.082-0.145-0.456,0-0.802,0.193-1.037,0.58s-0.354,0.929-0.354,1.627c0,0.919,0.086,1.55,0.258,1.893s0.422,0.514,0.75,0.514c0.208,0,0.374-0.073,0.496-0.221s0.184-0.342,0.184-0.584v-1.09h-0.77v-0.66h1.824v3.152h-0.605l-0.16-0.52c-0.109,0.183-0.267,0.325-0.473,0.428s-0.42,0.16-0.65,0.16z"/>
+
<path d="M24.31,17.91l-0.336-1.281h-1.762l-0.344,1.281h-0.977l1.68-5.824h1.266l1.609,5.824h-1.137zm-0.49-1.93l-0.715-2.895-0.734,2.895h1.447z"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_video.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_video.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,13 @@
-<?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">
+<?xml version="1.0" ?>
+<!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>
+
<path d="M2,6h2v2h-2v3h4v8h-4v3h2v2h-2v3h26v-3h-2v-2h2v-3h-4v-8h4v-3h-2v-2h2v-3h-26v3zm4,0h3v2h-3v-2zm8,2h-3v-2h3v2zm2-2h3v2h-3v-2zm-10,16h3v2h-3v-2zm8,2h-3v-2h3v2zm2-2h3v2h-3v-2zm8,2h-3v-2h3v2zm-3-5h-12v-8h12v8zm3-11h-3v-2h3v2z"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_video_call.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_video_call.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,13 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
+
<path d="M27,27h-3v-1.262c3.449-0.89,6-4.012,6-7.738,0-4.419-3.581-8-8-8s-8,3.581-8,8c0,3.727,2.551,6.849,6,7.738v1.26h-3c-1.1,0-2,0.9-2,2v1h14v-1c0-1.1-0.9-2-2-2zm-10-9c0-2.757,2.243-5,5-5s5,2.243,5,5-2.243,5-5,5-5-2.24-5-5z"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_video_collection.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_video_collection.svg Fri May 14 16:09:54 2010 +0300
@@ -1,10 +1,17 @@
-<?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">
+<?xml version="1.0" ?>
+<!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>
+
<path d="M6,13h2v1h-2v2h2v3h-2v2h2v1h-2v2h13v-2h-1v-1h1v-2h-2v-3h2v-2h-1v-1h1v-2h-13v2zm3,0h2v1h-2v-1zm3,1v-1h2v1h-2zm-3,7h2v1h-2v-1zm5,0v1h-2v-1h2zm3,1h-2v-1h2v1zm-2-3h-5v-3h5v3zm2-5h-2v-1h2v1z"/>
+
<polygon points="5.999,1,5.999,4,26,4,26,24,29,24,29,1"/>
+
<path d="M1,29h23v-23h-23v23zm3-20h17v17h-17v-17z"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_video_services.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_video_services.svg Fri May 14 16:09:54 2010 +0300
@@ -1,10 +1,17 @@
-<?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">
+<?xml version="1.0" ?>
+<!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>
+
<path d="M13.13,21c0.17-1.069,0.508-2.081,1.003-3h-5.13v-8h12v3.13c0.49-0.078,0.988-0.13,1.5-0.13s1.01,0.052,1.5,0.13v-3.13h4v-3h-2v-2h2v-3h-26v3h2v2h-2v3h4v8h-4v3h2v2h-2v3h11.67c-0.371-0.937-0.594-1.945-0.648-3h-2.02v-2h2.13zm7.87-16h3v2h-3v-2zm-5,0h3v2h-3v-2zm-5,0h3v2h-3v-2zm-5,0h3v2h-3v-2zm3,18h-3v-2h3v2z"/>
+
<polygon points="19.6,18.89,23.97,20.29,24.71,18.82,21.76,18.08"/>
+
<path d="M22.5,15c-4.143,0-7.5,3.357-7.5,7.5s3.357,7.5,7.5,7.5,7.5-3.357,7.5-7.5-3.36-7.5-7.5-7.5zm3.96,5.47l0.346-0.152s0.422,0.403,0.403,0.537c-0.019,0.135-0.653,0.749-0.653,0.749l-0.56,0.19-0.732-0.603-0.557-0.46,0.346,0.826,0.461,0.48s0.807-0.115,0.922-0.02-0.152,0.827-0.152,0.827l-1.346,1.383-0.135,1.383c-0.75,0.386-0.826,0.979-0.826,0.979s-0.191-0.036-0.691,0.521c-0.5,0.556-1.039,0.41-1.039,0.41-0.633,0-0.748-0.41-0.748-0.546,0-0.134-0.635-1.172-0.635-1.519,0-0.345,0.192-0.769,0.192-0.769,0.038-0.499-0.499-1.843-0.499-1.843h-0.558l-0.192-0.424c-1.806,0.385-1.883-0.077-2.152-0.577-0.268-0.499,0.039-1.843,0.212-2.055s1.519-1.134,1.519-1.134l-0.174-0.25c-0.115-0.25,0.635-0.595,0.635-0.595,0.288,0.192,0.48,0,0.48,0l0.076-0.193-0.051-0.188c0.67-0.28,1.39-0.44,2.15-0.44,0.55,0,1.08,0.083,1.581,0.234l-0.108,0.107,0.737,0.737,0.412-0.412c1.061,0.577,1.907,1.495,2.401,2.604l-0.699-0.129-0.846-0.326,0.49,0.66zm-9.25,3.51l0.79,0.02,1,1-0.97,0.692c-0.37-0.51-0.65-1.09-0.82-1.71zm8.67,2.74l0.12-1.72,1.209,0.326c-0.334,0.555-0.76,1.048-1.262,1.453l-0.07-0.06z"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_virtual_input.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_virtual_input.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,9 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_voice_mailbox.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_voice_mailbox.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,9 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_vol_down.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_vol_down.svg Fri May 14 16:09:54 2010 +0300
@@ -1,12 +1,21 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
-<rect height="12" width="7" x="1" y="9"/>
+<rect x="1" y="9" width="7" height="12"/>
<path d="M13,22.5c0-4.727,3.474-8.646,8-9.37V3L10,8v14l3.045,1.384C13.018,23.093,13,22.799,13,22.5z"/>
-<path d="M25.916,13.646c-0.22-1.963-0.904-3.876-2.027-5.6L22.213,9.14c0.805,1.232,1.341,2.578,1.602,3.962 C24.545,13.204,25.248,13.387,25.916,13.646z"/>
-<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"/>
+<path d="M25.916,13.646c-0.22-1.963-0.904-3.876-2.027-5.6L22.213,9.14c0.805,1.232,1.341,2.578,1.602,3.962
+ C24.545,13.204,25.248,13.387,25.916,13.646z"/>
+<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 x="18" y="21" width="9" height="3"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_vol_up.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_vol_up.svg Fri May 14 16:09:54 2010 +0300
@@ -1,13 +1,23 @@
-<?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"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<g opacity="0.5">
+ <rect fill="none" width="30" height="30"/>
</g>
-<rect height="12" width="7" x="1" y="9"/>
+<rect x="1" y="9" width="7" height="12"/>
<path d="M13,22.5c0-4.727,3.474-8.646,8-9.37V3L10,8v14l3.045,1.384C13.018,23.093,13,22.799,13,22.5z"/>
-<path d="M25.916,13.646c-0.22-1.963-0.904-3.876-2.027-5.6L22.213,9.14c0.805,1.232,1.341,2.578,1.602,3.962 C24.545,13.204,25.248,13.387,25.916,13.646z"/>
-<path d="M29.91,16.57C29.964,16.05,30,15.526,30,15c0-3.416-1.141-6.735-3.298-9.602l-1.598,1.203 c1.844,2.449,2.833,5.265,2.886,8.159C28.711,15.273,29.357,15.881,29.91,16.57z"/>
-<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"/>
+<path d="M25.916,13.646c-0.22-1.963-0.904-3.876-2.027-5.6L22.213,9.14c0.805,1.232,1.341,2.578,1.602,3.962
+ C24.545,13.204,25.248,13.387,25.916,13.646z"/>
+<path d="M29.91,16.57C29.964,16.05,30,15.526,30,15c0-3.416-1.141-6.735-3.298-9.602l-1.598,1.203
+ c1.844,2.449,2.833,5.265,2.886,8.159C28.711,15.273,29.357,15.881,29.91,16.57z"/>
+<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"/>
<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_wcdma.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,13 @@
-<?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" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<?xml version="1.0" ?>
+<!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" 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"/>
+
<rect fill="none" height="29.03" width="29.03" x="0.54" y="0.775"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma_attach.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma_attach.svg Fri May 14 16:09:54 2010 +0300
@@ -1,16 +1,29 @@
-<?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" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<?xml version="1.0" ?>
+<!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" 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"/>
+
<polygon points="23.03,22.36,24.25,24.31,24.25,22.36"/>
+
<polygon points="19.97,17.5,21.43,19.86,24.25,19.86,20.18,13.35,18.18,14.6,19.99,17.5"/>
+
<polygon points="19.16,19.86,17.69,17.5,13.74,17.5,15.2,19.86"/>
+
<polygon points="12.93,19.86,11.46,17.5,7.463,17.5,8.929,19.86"/>
+
<polygon points="5.432,17.89,5.432,19.86,6.652,19.86"/>
+
<path d="M11.89,6.522c0.646-0.499,1.015-1.193,1.015-2.013,0-0.698-0.272-1.336-0.764-1.802-0.542-0.512-1.313-0.779-2.238-0.779-1.125,0-2.102,0.415-2.598,0.767l-0.301,0.215,0.674,1.803,0.509-0.364c0.322-0.227,0.9-0.491,1.482-0.491,0.485,0,1.06,0.146,1.06,0.844,0,0.824-1.07,1.006-1.482,1.006h-1.146v1.857h1.148c0.295,0,1.779,0.062,1.792,1.284,0.002,0.148-0.024,0.521-0.313,0.814-0.262,0.26-0.664,0.397-1.195,0.397-0.72,0-1.409-0.298-1.699-0.472l-0.507-0.306-0.652,1.822,0.319,0.208c0.47,0.312,1.427,0.676,2.55,0.676,2.534,0,3.69-1.62,3.69-3.123,0-1.005-0.52-1.859-1.35-2.345z"/>
+
<path d="M19.04,6.136v1.915h1.838v1.876c-0.242,0.064-0.57,0.12-1.084,0.12-1.901,0-3.036-1.196-3.036-3.197,0-0.982,0.297-1.794,0.859-2.348,0.554-0.547,1.358-0.836,2.323-0.836,0.735,0,1.311,0.11,1.813,0.345l0.501,0.238,0.585-1.887-0.378-0.181c-0.441-0.218-1.366-0.467-2.494-0.467-3.244,0-5.422,2.087-5.422,5.19,0,1.509,0.519,2.874,1.42,3.744,0.945,0.9,2.167,1.341,3.743,1.341,1.488,0,2.664-0.407,2.987-0.532l0.3-0.12v-5.2h-3.965z"/>
+
<rect fill="none" height="29.03" width="29.03" x="0.323" y="0.775"/>
+
<rect fill="none" height="29.03" width="29.03" x="0.323" y="0.775"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma_context.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma_context.svg Fri May 14 16:09:54 2010 +0300
@@ -1,10 +1,17 @@
-<?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" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<?xml version="1.0" ?>
+<!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" 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"/>
+
<path d="M19.46,6.134v1.915h1.84v1.876c-0.244,0.065-0.572,0.12-1.084,0.12-1.902,0-3.035-1.196-3.035-3.197,0-0.982,0.294-1.794,0.856-2.348,0.554-0.547,1.358-0.835,2.325-0.835,0.736,0,1.312,0.109,1.812,0.344l0.501,0.238,0.587-1.887-0.378-0.181c-0.443-0.218-1.367-0.467-2.494-0.467-3.246,0-5.423,2.087-5.423,5.191,0,1.509,0.519,2.874,1.421,3.744,0.941,0.9,2.164,1.341,3.743,1.341,1.485,0,2.661-0.407,2.984-0.532l0.312-0.121v-5.196h-3.963z"/>
+
<rect fill="none" height="29.03" width="29.03" x="0.746" y="0.775"/>
+
<rect fill="none" height="29.03" width="29.03" x="0.746" y="0.775"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma_multipdp.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma_multipdp.svg Fri May 14 16:09:54 2010 +0300
@@ -1,10 +1,17 @@
-<?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" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<?xml version="1.0" ?>
+<!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" 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"/>
+
<polygon points="9.312,28.82,11.31,27.58,9.506,24.67,12.45,24.67,15.05,28.82,17.05,27.58,15.24,24.67,24.06,24.67,24.06,22.31,5.247,22.31"/>
+
<rect fill="none" height="29.03" width="29.03" x="0.14" y="0.775"/>
+
<rect fill="none" height="29.03" width="29.03" x="0.14" y="0.775"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma_suspended.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wcdma_suspended.svg Fri May 14 16:09:54 2010 +0300
@@ -1,13 +1,23 @@
-<?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" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<?xml version="1.0" ?>
+<!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" 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"/>
+
<polygon points="5.953,22.32,11.08,22.32,9.094,24.68,5.953,24.68"/>
+
<polygon points="24.77,17.47,24.77,19.83,18.78,19.83,20.75,17.47"/>
+
<polygon points="5.953,19.82,5.953,17.47,15.17,17.47,13.19,19.83"/>
+
<polygon points="21.58,14.84,21.65,14.9,21.6,14.95,10.89,27.72,9.925,28.87,8.121,27.35,9.494,25.71,19.84,13.38"/>
-<rect fill="none" height="29.03" width="29.03" x="0.846" y="0.775"/>
+
<rect fill="none" height="29.03" width="29.03" x="0.846" y="0.775"/>
-</svg>
+
+<rect fill="none" height="29.03" width="29.03" x="0.846" y="0.775"/>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,13 @@
-<?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">
+<?xml version="1.0" ?>
+<!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" 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"/>
+
<path d="M20.74,19.37h-2.713v-8.736h2.918c0.836,0,1.463,0.177,1.881,0.53s0.627,0.882,0.627,1.585c0,1-0.484,1.672-1.453,2.016,1.113,0.254,1.67,0.969,1.67,2.145,0,0.82-0.244,1.436-0.732,1.846-0.5,0.41-1.23,0.62-2.21,0.62zm-1.1-5.03h0.791c0.48,0,0.834-0.115,1.059-0.346s0.337-0.596,0.337-1.096c0-0.426-0.103-0.746-0.308-0.961s-0.512-0.322-0.918-0.322h-0.961v2.731zm0,4.04h0.885c0.521,0,0.896-0.12,1.129-0.36,0.232-0.239,0.349-0.635,0.349-1.187,0-0.517-0.12-0.896-0.36-1.144-0.24-0.247-0.615-0.368-1.127-0.368h-0.873v3.059h0.003z"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance_cloudy.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance_cloudy.svg Fri May 14 16:09:54 2010 +0300
@@ -1,11 +1,29 @@
-<?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">
-<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"/>
-<path d="M11,4.143c0.364,0,0.72,0.035,1.071,0.082V2.061C11.719,2.021,11.362,2,11,2 s-0.719,0.021-1.071,0.061v2.164C10.28,4.178,10.636,4.143,11,4.143z" fill-rule="evenodd"/>
-<path d="M17.256,7.26l1.528-1.529c-0.449-0.557-0.957-1.064-1.515-1.514L15.74,5.744 C16.312,6.18,16.821,6.689,17.256,7.26z" fill-rule="evenodd"/>
-<path d="M6.832,15.748c0.137-0.33,0.302-0.643,0.478-0.947 c0.11-0.201,0.229-0.395,0.354-0.584c0.001-0.002,0.002-0.004,0.003-0.006c-0.426-0.635-0.676-1.4-0.676-2.223c0-2.209,1.791-4,4-4 c1.512,0,2.812,0.85,3.492,2.086C14.81,10.039,15.137,10,15.473,10c0.409,0,0.81,0.035,1.205,0.088 c-0.795-2.383-3.039-4.1-5.688-4.1c-3.313,0-6,2.686-6,6c0,1.453,0.518,2.787,1.378,3.824C6.523,15.791,6.676,15.762,6.832,15.748z" fill-rule="evenodd"/>
-<path d="M23.523,20.045h-0.718c0.021-0.223,0.034-0.449,0.034-0.678 c0-4.068-3.298-7.367-7.367-7.367c-3.51,0-6.44,2.455-7.182,5.74c-0.212-0.02-0.428-0.031-0.646-0.031 C3.976,17.709,1,20.684,1,24.354c0,1.348,0.402,2.6,1.092,3.646h26.312C28.782,27.254,29,26.414,29,25.521 C29,22.496,26.548,20.045,23.523,20.045z" fill-rule="evenodd"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<rect fill-rule="evenodd" clip-rule="evenodd" fill="none" width="30" height="30"/>
+<path fill-rule="evenodd" clip-rule="evenodd" 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"/>
+<path fill-rule="evenodd" clip-rule="evenodd" 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"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11,4.143c0.364,0,0.72,0.035,1.071,0.082V2.061C11.719,2.021,11.362,2,11,2
+ s-0.719,0.021-1.071,0.061v2.164C10.28,4.178,10.636,4.143,11,4.143z"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.256,7.26l1.528-1.529c-0.449-0.557-0.957-1.064-1.515-1.514L15.74,5.744
+ C16.312,6.18,16.821,6.689,17.256,7.26z"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.832,15.748c0.137-0.33,0.302-0.643,0.478-0.947
+ c0.11-0.201,0.229-0.395,0.354-0.584c0.001-0.002,0.002-0.004,0.003-0.006c-0.426-0.635-0.676-1.4-0.676-2.223c0-2.209,1.791-4,4-4
+ c1.512,0,2.812,0.85,3.492,2.086C14.81,10.039,15.137,10,15.473,10c0.409,0,0.81,0.035,1.205,0.088
+ c-0.795-2.383-3.039-4.1-5.688-4.1c-3.313,0-6,2.686-6,6c0,1.453,0.518,2.787,1.378,3.824C6.523,15.791,6.676,15.762,6.832,15.748z"
+ />
+<path fill-rule="evenodd" clip-rule="evenodd" d="M23.523,20.045h-0.718c0.021-0.223,0.034-0.449,0.034-0.678
+ c0-4.068-3.298-7.367-7.367-7.367c-3.51,0-6.44,2.455-7.182,5.74c-0.212-0.02-0.428-0.031-0.646-0.031
+ C3.976,17.709,1,20.684,1,24.354c0,1.348,0.402,2.6,1.092,3.646h26.312C28.782,27.254,29,26.414,29,25.521
+ C29,22.496,26.548,20.045,23.523,20.045z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance_fluorescent.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance_fluorescent.svg Fri May 14 16:09:54 2010 +0300
@@ -1,10 +1,17 @@
-<?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">
+<?xml version="1.0" ?>
+<!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>
+
<rect height="10" width="3" y="10"/>
+
<rect height="10" width="3" x="27" y="10"/>
+
<path d="M5,10v10h20v-10h-20zm17,7h-14v-4h14v4z"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance_incandescent.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance_incandescent.svg Fri May 14 16:09:54 2010 +0300
@@ -1,10 +1,17 @@
-<?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">
+<?xml version="1.0" ?>
+<!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>
+
<path d="M15,2c-5.238,0-9.5,3.701-9.5,8.25,0,2.645,1.417,5.395,3.501,7.01l1.53,4.74h8.938l1.53-4.738c2.085-1.617,3.501-4.369,3.501-7.012,0-4.549-4.26-8.25-9.5-8.25zm3.47,13.33l-1.19,3.67h-4.57l-1.184-3.668c-1.819-0.93-3.03-3.21-3.03-5.08,0-2.9,2.91-5.25,6.5-5.25s6.5,2.35,6.5,5.25c0,1.87-1.21,4.15-3.03,5.08z"/>
+
<rect height="2" width="9" x="10.5" y="23"/>
+
<rect height="2" width="9" x="10.5" y="26"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance_sunny.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_white_balance_sunny.svg Fri May 14 16:09:54 2010 +0300
@@ -1,14 +1,31 @@
-<?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">
-<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"/>
-<path d="M13.633,1.104v4.035c0.994-0.148,2.006-0.146,3,0.006V1.104 C15.635,0.996,14.629,0.996,13.633,1.104z" fill-rule="evenodd"/>
-<path d="M1.213,16.523h4.036c-0.149-0.994-0.146-2.006,0.005-3H1.213 C1.106,14.521,1.106,15.527,1.213,16.523z" fill-rule="evenodd"/>
-<path d="M29.053,13.523h-4.036c0.149,0.994,0.146,2.006-0.005,3h4.041 C29.159,15.525,29.159,14.52,29.053,13.523z" fill-rule="evenodd"/>
-<path d="M23.915,4.119l-2.854,2.854c0.81,0.598,1.522,1.316,2.118,2.125l2.857-2.857 C25.406,5.459,24.694,4.748,23.915,4.119z" fill-rule="evenodd"/>
-<path d="M6.351,25.926l2.854-2.854c-0.809-0.598-1.521-1.314-2.117-2.125l-2.857,2.857 C4.859,24.586,5.571,25.297,6.351,25.926z" fill-rule="evenodd"/>
-<path d="M4.229,6.24l2.854,2.855c0.598-0.811,1.315-1.523,2.125-2.119L6.351,4.119 C5.569,4.75,4.858,5.461,4.229,6.24z" fill-rule="evenodd"/>
-<path d="M26.036,23.805l-2.854-2.854c-0.598,0.809-1.315,1.521-2.125,2.117l2.857,2.857 C24.696,25.297,25.407,24.584,26.036,23.805z" fill-rule="evenodd"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<rect fill="none" width="30" height="30"/>
+<path fill-rule="evenodd" clip-rule="evenodd" 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"/>
+<path fill-rule="evenodd" clip-rule="evenodd" 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"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13.633,1.104v4.035c0.994-0.148,2.006-0.146,3,0.006V1.104
+ C15.635,0.996,14.629,0.996,13.633,1.104z"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M1.213,16.523h4.036c-0.149-0.994-0.146-2.006,0.005-3H1.213
+ C1.106,14.521,1.106,15.527,1.213,16.523z"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M29.053,13.523h-4.036c0.149,0.994,0.146,2.006-0.005,3h4.041
+ C29.159,15.525,29.159,14.52,29.053,13.523z"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M23.915,4.119l-2.854,2.854c0.81,0.598,1.522,1.316,2.118,2.125l2.857-2.857
+ C25.406,5.459,24.694,4.748,23.915,4.119z"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M6.351,25.926l2.854-2.854c-0.809-0.598-1.521-1.314-2.117-2.125l-2.857,2.857
+ C4.859,24.586,5.571,25.297,6.351,25.926z"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M4.229,6.24l2.854,2.855c0.598-0.811,1.315-1.523,2.125-2.119L6.351,4.119
+ C5.569,4.75,4.858,5.461,4.229,6.24z"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M26.036,23.805l-2.854-2.854c-0.598,0.809-1.315,1.521-2.125,2.117l2.857,2.857
+ C24.696,25.297,25.407,24.584,26.036,23.805z"/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax.svg Fri May 14 16:09:54 2010 +0300
@@ -1,10 +1,17 @@
-<?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" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<?xml version="1.0" ?>
+<!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" 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"/>
+
<path d="M13.29,13.09s1.869-3.837,6.86-3.837c4.989,0,6.825,3.77,6.825,3.77s-0.916-4.89-6.926-4.89c-6.01,0.002-6.76,4.96-6.76,4.96z"/>
+
<path d="M11.25,12s2.173-5.229,8.896-5.229c6.721,0,8.452,5.16,8.452,5.16s-1.56-6.519-8.554-6.519c-7,0.003-8.8,6.589-8.8,6.589z"/>
+
<rect fill="none" height="29.03" width="29.03" x="0.54" y="0.016"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax_attach.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax_attach.svg Fri May 14 16:09:54 2010 +0300
@@ -1,18 +1,33 @@
-<?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" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<?xml version="1.0" ?>
+<!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" 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"/>
+
<path d="M12.14,6.755s1.063-2.185,3.905-2.185c2.841,0,3.887,2.146,3.887,2.146s-0.521-2.784-3.944-2.784c-3.43,0-3.85,2.823-3.85,2.823z"/>
+
<path d="M10.98,6.136s1.237-2.978,5.064-2.978c3.826,0,4.813,2.938,4.813,2.938s-0.889-3.711-4.87-3.711c-3.97,0-5,3.751-5,3.751z"/>
+
<polygon points="9.66,22.52,9.664,22.52,8.199,20.17,5.432,20.17,9.497,26.68,11.48,25.44,10.79,24.34"/>
+
<polygon points="10.48,20.16,11.94,22.52,15.93,22.52,14.47,20.16"/>
+
<polygon points="16.74,20.16,18.21,22.52,22.22,22.52,20.76,20.16"/>
+
<polygon points="23.03,20.16,24.25,22.12,24.25,20.16"/>
+
<polygon points="19.97,15.31,21.43,17.67,24.25,17.67,20.18,11.16,18.18,12.41,19.99,15.31"/>
+
<polygon points="19.16,17.67,17.69,15.31,13.74,15.31,15.2,17.67"/>
+
<polygon points="12.92,17.67,11.46,15.31,7.463,15.31,8.928,17.67"/>
+
<polygon points="5.432,15.7,5.432,17.67,6.651,17.67"/>
+
<rect fill="none" height="29.03" width="29.03" x="0.323" y="0.016"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax_context.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax_context.svg Fri May 14 16:09:54 2010 +0300
@@ -1,12 +1,21 @@
-<?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" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<?xml version="1.0" ?>
+<!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" 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"/>
+
<path d="M12.56,6.755s1.063-2.185,3.905-2.185c2.841,0,3.888,2.146,3.888,2.146s-0.522-2.785-3.944-2.785c-3.42,0.001-3.85,2.824-3.85,2.824z"/>
+
<path d="M11.4,6.137s1.238-2.979,5.065-2.979c3.826,0,4.814,2.939,4.814,2.939s-0.891-3.712-4.871-3.712c-3.97,0-5,3.752-5,3.752z"/>
+
<polygon points="24.67,20.17,5.854,20.17,9.92,26.68,11.92,25.43,10.1,22.52,10.12,22.52,10.12,22.52,24.67,22.52"/>
+
<polygon points="20.6,11.16,18.6,12.4,20.42,15.31,5.854,15.31,5.854,17.67,24.67,17.67"/>
+
<rect fill="none" height="29.03" width="29.03" x="0.746" y="0.016"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax_multipdp.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax_multipdp.svg Fri May 14 16:09:54 2010 +0300
@@ -1,12 +1,21 @@
-<?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" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<?xml version="1.0" ?>
+<!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" 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"/>
+
<path d="M11.96,6.778s1.063-2.186,3.905-2.186c2.84,0,3.888,2.146,3.888,2.146s-0.522-2.785-3.944-2.785c-3.43,0-3.85,2.825-3.85,2.825z"/>
+
<path d="M10.8,6.159s1.237-2.978,5.065-2.978c3.826,0,4.813,2.938,4.813,2.938s-0.89-3.711-4.87-3.711c-3.98,0-5,3.751-5,3.751z"/>
+
<polygon points="20,11.23,17.99,12.47,19.81,15.38,5.247,15.38,5.247,17.74,24.06,17.73"/>
+
<polygon points="9.312,26.66,11.31,25.41,9.506,22.5,12.45,22.5,15.05,26.66,17.05,25.41,15.24,22.5,24.06,22.5,24.06,20.14,5.247,20.14"/>
+
<rect fill="none" height="29.03" width="29.03" x="0.14" y="0.016"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax_suspended.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wimax_suspended.svg Fri May 14 16:09:54 2010 +0300
@@ -1,15 +1,27 @@
-<?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" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<?xml version="1.0" ?>
+<!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" 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"/>
+
<path d="M12.66,6.763s1.064-2.185,3.905-2.185,3.888,2.146,3.888,2.146-0.522-2.784-3.944-2.784c-3.42-0.001-3.85,2.823-3.85,2.823z"/>
+
<path d="M11.5,6.144s1.238-2.978,5.065-2.978c3.826,0,4.814,2.938,4.814,2.938s-0.89-3.712-4.871-3.712c-3.97,0-5,3.752-5,3.752z"/>
+
<polygon points="24.77,20.12,24.77,22.48,20.51,22.48,20.51,22.48,14.73,22.48,16.69,20.12"/>
+
<polygon points="5.954,20.12,11.08,20.12,9.094,22.48,5.954,22.48"/>
+
<polygon points="24.77,15.27,24.77,17.63,18.78,17.63,20.75,15.27"/>
+
<polygon points="5.954,17.62,5.954,15.27,15.17,15.27,13.19,17.63"/>
+
<polygon points="21.58,12.64,21.65,12.7,21.6,12.75,10.89,25.52,9.926,26.67,8.122,25.15,9.495,23.51,19.84,11.18"/>
+
<rect fill="none" height="29.03" width="29.03" x="0.846" y="0.016"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wlan.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wlan.svg Fri May 14 16:09:54 2010 +0300
@@ -1,10 +1,17 @@
-<?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" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<?xml version="1.0" ?>
+<!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" 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"/>
+
<path d="M9.169,9.54c0,1.972,1.073,3.372,1.125,3.443,0.269-0.18,0.721-0.494,0.99-0.675-0.057-0.077-0.921-1.374-0.921-2.769,0-1.553,0.864-2.698,0.919-2.771-0.267-0.18-0.724-0.491-0.988-0.68-0.05,0.091-1.121,1.448-1.121,3.46z"/>
+
<path d="M24,9.535c0-2.969-1.629-5.159-1.682-5.234-0.264,0.181-0.72,0.494-0.983,0.674,0.047,0.071,1.472,2.088,1.472,4.56,0,2.673-1.425,4.484-1.472,4.558,0.264,0.185,0.72,0.498,0.983,0.679,0.04-0.07,1.68-2.35,1.68-5.235z"/>
+
<path d="M20.83,9.535c0-1.974-1.072-3.373-1.125-3.445-0.264,0.18-0.721,0.494-0.99,0.675,0.057,0.08,0.923,1.378,0.923,2.77,0,1.553-0.866,2.697-0.921,2.769,0.268,0.18,0.718,0.493,0.986,0.679,0.05-0.08,1.13-1.44,1.13-3.445z"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wlan_offline.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_wlan_offline.svg Fri May 14 16:09:54 2010 +0300
@@ -1,21 +1,39 @@
-<?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" style="enable-background:new 0 0 30 30;" version="1.1" viewBox="0 0 30 30" width="30px" x="0px" y="0px">
+<?xml version="1.0" ?>
+<!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" 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"/>
+
<path d="M8.413,5.349c0.141-0.223,0.24-0.351,0.253-0.369-0.269-0.185-0.721-0.498-0.985-0.679-0.008,0.011-0.059,0.087-0.127,0.192l0.859,0.856z"/>
+
<path d="M6.045,8.871c-0.019,0.221-0.045,0.44-0.045,0.669,0,2.967,1.627,5.158,1.676,5.232,0.267-0.181,0.721-0.494,0.99-0.674-0.049-0.066-1.267-1.82-1.439-4.05l-1.182-1.179z"/>
+
<path d="M10.76,7.692c0.234-0.54,0.488-0.884,0.518-0.922-0.267-0.18-0.724-0.491-0.988-0.68-0.021,0.033-0.213,0.288-0.432,0.703l0.902,0.899z"/>
+
<path d="M22.32,4.301c-0.264,0.181-0.72,0.494-0.983,0.674,0.047,0.071,1.472,2.088,1.472,4.56,0,2.673-1.425,4.484-1.472,4.558,0.264,0.185,0.72,0.498,0.983,0.679,0.04-0.07,1.68-2.35,1.68-5.235,0-2.969-1.63-5.16-1.68-5.234z"/>
+
<path d="M18.71,12.3c0.268,0.18,0.718,0.493,0.986,0.679,0.053-0.078,1.127-1.438,1.127-3.448,0-1.974-1.072-3.373-1.125-3.445-0.264,0.18-0.721,0.494-0.99,0.675,0.057,0.08,0.923,1.378,0.923,2.77,0,1.558-0.86,2.698-0.92,2.768z"/>
+
<rect height="33.24" transform="matrix(0.7057 -0.7085 0.7085 0.7057 -6.2107 15.042)" width="1.4" x="14.3" y="-1.622"/>
+
<g display="none">
+
<rect fill="none" height="30" width="30"/>
+
<rect fill="none" height="30" width="30"/>
+
<polygon points="13.66,10.55,15.87,3.375,11.37,3.375,10.22,7.104"/>
+
<polygon points="19.54,16.43,21.25,10.88,18.62,10.88,16.74,10.88,13.99,10.88"/>
+
<polygon points="14.63,17.74,13.74,20.63,10.38,20.63,16.01,26.62,19.64,22.75"/>
+
<polygon points="8.754,11.86,8.361,13.13,9.613,13.13,10.02,13.13"/>
+
</g>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_work.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_work.svg Fri May 14 16:09:54 2010 +0300
@@ -1,11 +1,19 @@
-<?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">
+<?xml version="1.0" ?>
+<!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>
+
<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"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_world_clock.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_world_clock.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,9 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_zoom.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_zoom.svg Fri May 14 16:09:54 2010 +0300
@@ -1,9 +1,19 @@
-<?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">
-<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"/>
-<rect height="3" width="7" x="15" y="14"/>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+ <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">
+]>
+<svg version="1.1"
+ xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+ x="0px" y="0px" width="30px" height="30px" viewBox="0 0 30 30" enable-background="new 0 0 30 30" xml:space="preserve">
+<defs>
+</defs>
+<rect fill="none" width="30" height="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 x="-0.025" y="26.525" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 -15.239 48.7386)" width="4.999" height="2"/>
+<rect x="15" y="14" width="7" height="3"/>
<polygon points="20,6 17,6 17,8 15,8 15,11 17,11 17,13 20,13 20,11 22,11 22,8 20,8 "/>
</svg>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_zoom_in.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_zoom_in.svg Fri May 14 16:09:54 2010 +0300
@@ -1,10 +1,17 @@
-<?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">
+<?xml version="1.0" ?>
+<!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>
+
<path d="M25.92,4.191c-4.1-4.102-10.75-4.102-14.85,0-3.739,3.738-4.057,9.591-0.977,13.7l-1.49,1.5-0.707-0.707-4.949,4.95,3.535,3.535,4.95-4.95-0.707-0.707,1.499-1.498c4.112,3.081,9.965,2.763,13.7-0.977,4.1-4.08,4.1-10.73,0-14.83zm-2.12,12.73c-2.924,2.925-7.683,2.924-10.6,0-2.924-2.923-2.926-7.682,0-10.6,2.924-2.925,7.682-2.924,10.6,0s2.93,7.67,0,10.6z"/>
+
<rect height="2" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 -15.0422 48.8201)" width="4.999" x="0.09" y="26.52"/>
+
<polygon points="20,7,17,7,17,10,14,10,14,13,17,13,17,16,20,16,20,13,23,13,23,10,20,10"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_zoom_out.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_mono_zoom_out.svg Fri May 14 16:09:54 2010 +0300
@@ -1,10 +1,17 @@
-<?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">
+<?xml version="1.0" ?>
+<!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>
+
<path d="M25.92,4.191c-4.1-4.102-10.75-4.102-14.85,0-3.739,3.738-4.057,9.591-0.977,13.7l-1.49,1.5-0.707-0.707-4.949,4.95,3.535,3.535,4.95-4.95-0.707-0.707,1.499-1.498c4.112,3.081,9.965,2.763,13.7-0.977,4.1-4.08,4.1-10.73,0-14.83zm-2.12,12.73c-2.924,2.925-7.683,2.924-10.6,0-2.924-2.923-2.926-7.682,0-10.6,2.924-2.925,7.682-2.924,10.6,0s2.93,7.67,0,10.6z"/>
+
<rect height="2" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 -15.0422 48.8201)" width="4.999" x="0.09" y="26.52"/>
+
<rect height="3" width="9" x="14" y="10"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_add.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_add.svg Fri May 14 16:09:54 2010 +0300
@@ -1,19 +1,19 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="2" y2="28.0005">
+ <stop offset="0" style="stop-color:#4EDEFF"/>
+ <stop offset="1" style="stop-color:#048CC6"/>
+</linearGradient>
<polygon fill="url(#SVGID_1_)" points="28,12 18,12 18,2 12,2 12,12 2,12 2,18 12,18 12,28 18,28 18,18 28,18 "/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="6" x="12" y="2"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="10" x="2" y="12"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="10" x="18" y="12"/>
+<rect fill="#FFFFFF" height="1" opacity="0.4" width="6" x="12" y="2"/>
+<rect fill="#FFFFFF" height="1" opacity="0.4" width="10" x="2" y="12"/>
+<rect fill="#FFFFFF" height="1" opacity="0.4" width="10" x="18" y="12"/>
<rect fill="none" height="30" width="30"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="2" y2="28.0005">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
-</linearGradient>
-</defs>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_allday.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_allday.svg Fri May 14 16:09:54 2010 +0300
@@ -1,46 +1,48 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
+<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" opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="10.3691" y2="27.0025">
-<stop offset="0" style="stop-color:#F9F9F9"/>
-<stop offset="1" style="stop-color:#B5B5B5"/>
+ <stop offset="0" style="stop-color:#F9F9F9"/>
+ <stop offset="1" style="stop-color:#B5B5B5"/>
</linearGradient>
<rect fill="url(#SVGID_1_)" height="22" width="22" x="4" y="5"/>
<polygon fill="#FFFFFF" points="21,22 21,27 26,22 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="5" y2="11">
-<stop offset="0" style="stop-color:#FF7042"/>
-<stop offset="1" style="stop-color:#991B23"/>
+ <stop offset="0" style="stop-color:#FF7042"/>
+ <stop offset="1" style="stop-color:#991B23"/>
</linearGradient>
<rect fill="url(#SVGID_2_)" height="6" width="22" x="4" y="5"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="10" x2="10" y1="6" y2="10">
-<stop offset="0" style="stop-color:#4A050A"/>
-<stop offset="1" style="stop-color:#B00F25"/>
+ <stop offset="0" style="stop-color:#4A050A"/>
+ <stop offset="1" style="stop-color:#B00F25"/>
</linearGradient>
<circle cx="10" cy="8" fill="url(#SVGID_3_)" r="2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="20" x2="20" y1="6" y2="10">
-<stop offset="0" style="stop-color:#4A050A"/>
-<stop offset="1" style="stop-color:#B00F25"/>
+ <stop offset="0" style="stop-color:#4A050A"/>
+ <stop offset="1" style="stop-color:#B00F25"/>
</linearGradient>
<circle cx="20" cy="8" fill="url(#SVGID_4_)" r="2"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="22" x="4" y="5"/>
+<rect fill="#FFFFFF" height="1" opacity="0.4" width="22" x="4" y="5"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="10" x2="10" y1="3" y2="9">
-<stop offset="0" style="stop-color:#FFFCFE"/>
-<stop offset="1" style="stop-color:#8C8C8C"/>
+ <stop offset="0" style="stop-color:#FFFCFE"/>
+ <stop offset="1" style="stop-color:#8C8C8C"/>
</linearGradient>
<path d="M11,8c0,0.55-0.45,1-1,1l0,0C9.45,9,9,8.55,9,8V4c0-0.55,0.45-1,1-1l0,0c0.55,0,1,0.45,1,1V8z" fill="url(#SVGID_5_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="20" x2="20" y1="3" y2="9">
-<stop offset="0" style="stop-color:#FFFCFE"/>
-<stop offset="1" style="stop-color:#8C8C8C"/>
+ <stop offset="0" style="stop-color:#FFFCFE"/>
+ <stop offset="1" style="stop-color:#8C8C8C"/>
</linearGradient>
<path d="M21,8c0,0.55-0.45,1-1,1l0,0c-0.55,0-1-0.45-1-1V4c0-0.55,0.45-1,1-1l0,0c0.55,0,1,0.45,1,1V8z" fill="url(#SVGID_6_)"/>
-<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="22" x="4" y="11"/>
+<rect height="1" opacity="0.2" width="22" x="4" y="11"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="15.0005" x2="15.0005" y1="23.834" y2="13.7479">
-<stop offset="0" style="stop-color:#303030"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#303030"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
<path d="M18.019,22.906V24h-6.036v-1.094h2.146v-7.629l-2.146,0.492v-1.094l3.015-0.95h0.991v9.181H18.019z" fill="url(#SVGID_7_)"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_anniversary.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_anniversary.svg Fri May 14 16:09:54 2010 +0300
@@ -1,58 +1,55 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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"/>
-<rect fill-opacity="0.6" height="7" stroke-opacity="0.6" width="6" x="12" y="10"/>
-<rect fill-opacity="0.6" height="7" stroke-opacity="0.6" width="6" x="19.5" y="10"/>
-<path d="M11,6.375c0-3.11-2.807-5.11-2.927-5.194C7.901,1.061,7.701,1,7.5,1 S7.099,1.061,6.927,1.181C6.807,1.265,4,3.265,4,6.375C4,8.543,5.406,10,7.5,10S11,8.543,11,6.375z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<path d="M18.5,6.375c0-3.11-2.807-5.11-2.927-5.194C15.401,1.061,15.201,1,15,1 s-0.401,0.061-0.573,0.181C14.307,1.265,11.5,3.265,11.5,6.375C11.5,8.543,12.906,10,15,10C17.094,10,18.5,8.543,18.5,6.375z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<path d="M26,6.375c0-3.11-2.807-5.11-2.927-5.194C22.9,1.061,22.701,1,22.5,1 s-0.4,0.061-0.573,0.181C21.807,1.265,19,3.265,19,6.375C19,8.543,20.406,10,22.5,10S26,8.543,26,6.375z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<rect enable-background="new " height="7" opacity="0.6" width="6" x="4.5" y="10"/>
+<rect enable-background="new " height="7" opacity="0.6" width="6" x="12" y="10"/>
+<rect enable-background="new " height="7" opacity="0.6" width="6" x="19.5" y="10"/>
+<path d="M11,6.375c0-3.11-2.807-5.11-2.927-5.194C7.901,1.061,7.701,1,7.5,1 S7.099,1.061,6.927,1.181C6.807,1.265,4,3.265,4,6.375C4,8.543,5.406,10,7.5,10S11,8.543,11,6.375z" enable-background="new " opacity="0.6"/>
+<path d="M18.5,6.375c0-3.11-2.807-5.11-2.927-5.194C15.401,1.061,15.201,1,15,1 s-0.401,0.061-0.573,0.181C14.307,1.265,11.5,3.265,11.5,6.375C11.5,8.543,12.906,10,15,10C17.094,10,18.5,8.543,18.5,6.375z" enable-background="new " opacity="0.6"/>
+<path d="M26,6.375c0-3.11-2.807-5.11-2.927-5.194C22.9,1.061,22.701,1,22.5,1 s-0.4,0.061-0.573,0.181C21.807,1.265,19,3.265,19,6.375C19,8.543,20.406,10,22.5,10S26,8.543,26,6.375z" enable-background="new " opacity="0.6"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -66 -46)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="71.5" x2="75.5" y1="-59.5" y2="-59.5">
-<stop offset="0" style="stop-color:#F5F5F5"/>
-<stop offset="0.7818" style="stop-color:#CCCCCC"/>
-<stop offset="1" style="stop-color:#D1D1D1"/>
+ <stop offset="0" style="stop-color:#F5F5F5"/>
+ <stop offset="0.7818" style="stop-color:#CCCCCC"/>
+ <stop offset="1" style="stop-color:#D1D1D1"/>
</linearGradient>
<rect fill="url(#SVGID_1_)" height="5" width="4" x="5.5" y="11"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -66 -46)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="79" x2="83" y1="-59.5" y2="-59.5">
-<stop offset="0" style="stop-color:#F5F5F5"/>
-<stop offset="0.7818" style="stop-color:#CCCCCC"/>
-<stop offset="1" style="stop-color:#D1D1D1"/>
+ <stop offset="0" style="stop-color:#F5F5F5"/>
+ <stop offset="0.7818" style="stop-color:#CCCCCC"/>
+ <stop offset="1" style="stop-color:#D1D1D1"/>
</linearGradient>
<rect fill="url(#SVGID_2_)" height="5" width="4" x="13" y="11"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -66 -46)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="86.5" x2="90.5" y1="-59.5" y2="-59.5">
-<stop offset="0" style="stop-color:#F5F5F5"/>
-<stop offset="0.7818" style="stop-color:#CCCCCC"/>
-<stop offset="1" style="stop-color:#D1D1D1"/>
+ <stop offset="0" style="stop-color:#F5F5F5"/>
+ <stop offset="0.7818" style="stop-color:#CCCCCC"/>
+ <stop offset="1" style="stop-color:#D1D1D1"/>
</linearGradient>
<rect fill="url(#SVGID_3_)" height="5" width="4" x="20.5" y="11"/>
-<rect fill-opacity="0.6" height="14" stroke-opacity="0.6" width="26" x="2" y="15"/>
+<rect enable-background="new " height="14" opacity="0.6" width="26" x="2" y="15"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -66 -46)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="69" x2="93" y1="-68" y2="-68">
-<stop offset="0" style="stop-color:#FFC222"/>
-<stop offset="0.2303" style="stop-color:#FFE896"/>
-<stop offset="1" style="stop-color:#FFB701"/>
+ <stop offset="0" style="stop-color:#FFC222"/>
+ <stop offset="0.2303" style="stop-color:#FFE896"/>
+ <stop offset="1" style="stop-color:#FFB701"/>
</linearGradient>
<rect fill="url(#SVGID_4_)" height="12" width="24" x="3" y="16"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="24" x="3" y="16"/>
-<rect fill-opacity="0.5" height="2" stroke-opacity="0.5" width="24" x="3" y="21"/>
+<rect enable-background="new " fill="#FFFFFF" height="1" opacity="0.4" width="24" x="3" y="16"/>
+<rect enable-background="new " height="2" opacity="0.5" width="24" x="3" y="21"/>
<linearGradient gradientTransform="matrix(1 0 0 1 -72 -681)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="79.5" x2="79.5" y1="685.8193" y2="692.2366">
-<stop offset="0" style="stop-color:#FFE692"/>
-<stop offset="0.5879" style="stop-color:#ED8C0D"/>
-<stop offset="1" style="stop-color:#ED8C0D"/>
+ <stop offset="0" style="stop-color:#FFE692"/>
+ <stop offset="0.5879" style="stop-color:#ED8C0D"/>
</linearGradient>
<path d="M5,6.375C5,7.824,5.834,9,7.5,9S10,7.824,10,6.375C10,3.75,7.5,2,7.5,2S5,3.75,5,6.375z" fill="url(#SVGID_5_)"/>
<linearGradient gradientTransform="matrix(1 0 0 1 -72 -681)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="87" x2="87" y1="685.8193" y2="692.2366">
-<stop offset="0" style="stop-color:#FFE692"/>
-<stop offset="0.5879" style="stop-color:#ED8C0D"/>
-<stop offset="1" style="stop-color:#ED8C0D"/>
+ <stop offset="0" style="stop-color:#FFE692"/>
+ <stop offset="0.5879" style="stop-color:#ED8C0D"/>
</linearGradient>
<path d="M12.5,6.375C12.5,7.824,13.334,9,15,9s2.5-1.176,2.5-2.625C17.5,3.75,15,2,15,2S12.5,3.75,12.5,6.375 z" fill="url(#SVGID_6_)"/>
<linearGradient gradientTransform="matrix(1 0 0 1 -72 -681)" gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="94.5" x2="94.5" y1="685.8193" y2="692.2366">
-<stop offset="0" style="stop-color:#FFE692"/>
-<stop offset="0.5879" style="stop-color:#ED8C0D"/>
-<stop offset="1" style="stop-color:#ED8C0D"/>
+ <stop offset="0" style="stop-color:#FFE692"/>
+ <stop offset="0.5879" style="stop-color:#ED8C0D"/>
</linearGradient>
<path d="M20,6.375C20,7.824,20.834,9,22.5,9S25,7.824,25,6.375C25,3.75,22.5,2,22.5,2S20,3.75,20,6.375z" fill="url(#SVGID_7_)"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_assistant.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_assistant.svg Fri May 14 16:09:54 2010 +0300
@@ -1,71 +1,73 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
+<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" opacity="0.6"/>
<radialGradient cx="-109.0669" cy="28.1328" gradientTransform="matrix(0.9352 0 0 0.9448 112.9225 -13.3229)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="18.8576">
-<stop offset="0" style="stop-color:#FFE2D9"/>
-<stop offset="0.5091" style="stop-color:#FFC6B3"/>
-<stop offset="0.7636" style="stop-color:#FFA98E"/>
-<stop offset="1" style="stop-color:#E88160"/>
+ <stop offset="0" style="stop-color:#FFE2D9"/>
+ <stop offset="0.5091" style="stop-color:#FFC6B3"/>
+ <stop offset="0.7636" style="stop-color:#FFA98E"/>
+ <stop offset="1" style="stop-color:#E88160"/>
</radialGradient>
<path d="M23.583,16.562c-0.045-0.021-0.093-0.025-0.139-0.039V16.52c-0.009-0.001-0.016-0.003-0.026-0.004 c-0.067-0.018-0.135-0.033-0.207-0.038c-8.628-1.522-12.587-6.368-12.886-5.084c-0.237,1.021-2.656,3.228-3.923,4.33 c0.01,0.048,0.017,0.094,0.026,0.142c0,0,0.046,0.228,0.142,0.612c-0.101,0.011-0.2,0.03-0.295,0.073 c-0.806,0.344-1.059,1.686-0.564,2.992c0.495,1.31,1.548,2.092,2.353,1.749c0.051-0.021,0.094-0.059,0.138-0.087 c0.47,1.066,1.044,2.212,1.749,3.359c1.18,1.422,2.988,3.091,4.984,3.091c2.415,0,3.894-1.341,4.909-2.69 c0.025-0.057,0.053-0.111,0.08-0.157c0.754-1.192,1.363-2.389,1.859-3.504c0.788,0.278,1.801-0.464,2.303-1.724 C24.607,18.277,24.381,16.926,23.583,16.562z" fill="url(#SVGID_1_)"/>
-<path d="M19.673,25.178c-0.265-1.736-1.984-3.087-4.082-3.087c-1.524,0-2.844,0.718-3.561,1.772H9.556 c0.133,0.234,0.25,0.466,0.394,0.701c1.18,1.422,2.988,3.091,4.984,3.091C17.221,27.655,18.663,26.452,19.673,25.178z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M19.673,25.178c-0.265-1.736-1.984-3.087-4.082-3.087c-1.524,0-2.844,0.718-3.561,1.772H9.556 c0.133,0.234,0.25,0.466,0.394,0.701c1.18,1.422,2.988,3.091,4.984,3.091C17.221,27.655,18.663,26.452,19.673,25.178z" opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.8647" x2="14.8647" y1="4.5264" y2="15.6558">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.3758" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+ <stop offset="0" style="stop-color:#8A5D3B"/>
+ <stop offset="0.3758" style="stop-color:#632F00"/>
+ <stop offset="1" style="stop-color:#361700"/>
</linearGradient>
<path d="M14.691,4.363c-2.99,0-4.43,1.381-5.541,2.821C7.344,7.467,4.48,9.146,6.503,16.5 c1.267-1.102,3.585-4.086,3.822-5.106c0.302-1.296,4.328,3.652,13.12,5.126c0.103-0.41,0.15-0.654,0.15-0.654 C24.976,9.587,21.972,4.609,14.691,4.363z" fill="url(#SVGID_2_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="15.0005" x2="15.0005" y1="13.9004" y2="2.2864">
-<stop offset="0" style="stop-color:#838487"/>
-<stop offset="0.4727" style="stop-color:#BDBEC3"/>
-<stop offset="1" style="stop-color:#E4E6EB"/>
+ <stop offset="0" style="stop-color:#838487"/>
+ <stop offset="0.4727" style="stop-color:#BDBEC3"/>
+ <stop offset="1" style="stop-color:#E4E6EB"/>
</linearGradient>
<path d="M6.389,13.818c-0.015-0.219-0.031-0.434-0.031-0.656c0-5.068,3.876-9.191,8.642-9.191 s8.643,4.123,8.643,9.191c0,0.223-0.018,0.438-0.031,0.656h1.993c0.013-0.219,0.032-0.434,0.032-0.656C25.637,6.996,20.875,2,15,2 S4.364,6.996,4.364,13.162c0,0.223,0.02,0.438,0.032,0.656H6.389z" fill="url(#SVGID_3_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="9.6821" x2="9.6821" y1="26.708" y2="20.8698">
-<stop offset="0" style="stop-color:#969696"/>
-<stop offset="1" style="stop-color:#464646"/>
+ <stop offset="0" style="stop-color:#969696"/>
+ <stop offset="1" style="stop-color:#464646"/>
</linearGradient>
<path d="M13.818,25.045H9.091c-0.978,0-1.772-0.795-1.772-1.771v-2.364H5.545v2.364 c0,1.949,1.596,3.545,3.545,3.545h4.728V25.045z" fill="url(#SVGID_4_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="9.6821" x2="9.6821" y1="21.2051" y2="25.5689">
-<stop offset="0" style="stop-color:#838487"/>
-<stop offset="0.4727" style="stop-color:#BDBEC3"/>
-<stop offset="1" style="stop-color:#E4E6EB"/>
+ <stop offset="0" style="stop-color:#838487"/>
+ <stop offset="0.4727" style="stop-color:#BDBEC3"/>
+ <stop offset="1" style="stop-color:#E4E6EB"/>
</linearGradient>
<path d="M7.318,23.273v-1.183v-1.182H5.545v1.182c0,1.95,1.596,3.546,3.545,3.546h4.728v-0.592H9.091 C8.113,25.045,7.318,24.25,7.318,23.273z" fill="url(#SVGID_5_)"/>
-<path d="M25.604,13.816C25.278,7.959,20.663,3.313,15,3.313S4.722,7.959,4.396,13.816c0,0,0,0,0,0.002h1.994 c-0.015-0.219-0.031-0.434-0.031-0.656c0-5.068,3.876-9.191,8.642-9.191s8.643,4.123,8.643,9.191c0,0.223-0.018,0.438-0.031,0.656 h1.993C25.604,13.816,25.604,13.816,25.604,13.816z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M25.604,13.816C25.278,7.959,20.663,3.313,15,3.313S4.722,7.959,4.396,13.816c0,0,0,0,0,0.002h1.994 c-0.015-0.219-0.031-0.434-0.031-0.656c0-5.068,3.876-9.191,8.642-9.191s8.643,4.123,8.643,9.191c0,0.223-0.018,0.438-0.031,0.656 h1.993C25.604,13.816,25.604,13.816,25.604,13.816z" opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="15.5903" x2="15.5903" y1="23.2168" y2="27.3616">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="0.7636" style="stop-color:#0487BF"/>
-<stop offset="1" style="stop-color:#059FE0"/>
+ <stop offset="0" style="stop-color:#4EDEFF"/>
+ <stop offset="0.7636" style="stop-color:#0487BF"/>
+ <stop offset="1" style="stop-color:#059FE0"/>
</linearGradient>
<ellipse cx="15.591" cy="25.635" fill="url(#SVGID_6_)" rx="2.954" ry="2.365"/>
-<path d="M15.591,24.455c1.376,0,2.521,0.754,2.851,1.771c0.062-0.189,0.104-0.386,0.104-0.592 c0-1.305-1.321-2.361-2.954-2.361c-1.632,0-2.955,1.057-2.955,2.361c0,0.206,0.043,0.402,0.104,0.592 C13.07,25.209,14.215,24.455,15.591,24.455z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M15.591,24.455c1.376,0,2.521,0.754,2.851,1.771c0.062-0.189,0.104-0.386,0.104-0.592 c0-1.305-1.321-2.361-2.954-2.361c-1.632,0-2.955,1.057-2.955,2.361c0,0.206,0.043,0.402,0.104,0.592 C13.07,25.209,14.215,24.455,15.591,24.455z" fill="#FFFFFF" opacity="0.3"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="4.9546" x2="4.9546" y1="12.833" y2="22.1473">
-<stop offset="0" style="stop-color:#7A7A7A"/>
-<stop offset="1" style="stop-color:#212121"/>
+ <stop offset="0" style="stop-color:#7A7A7A"/>
+ <stop offset="1" style="stop-color:#212121"/>
</linearGradient>
<path d="M2.021,17.547c0.207,2.609,1.889,4.644,3.758,4.539c1.867-0.102,2.29-2.248,2.082-4.857 c-0.207-2.608-0.968-4.69-2.837-4.589C3.156,12.742,1.813,14.939,2.021,17.547z" fill="url(#SVGID_7_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="4.2163" x2="4.2163" y1="12.8813" y2="22.1374">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="0.7636" style="stop-color:#0487BF"/>
-<stop offset="1" style="stop-color:#059FE0"/>
+ <stop offset="0" style="stop-color:#4EDEFF"/>
+ <stop offset="0.7636" style="stop-color:#0487BF"/>
+ <stop offset="1" style="stop-color:#059FE0"/>
</linearGradient>
<path d="M6.432,18.152c0-2.214-0.646-4.167-1.641-5.467c-1.742,0.27-2.969,2.365-2.77,4.861 c0.204,2.566,1.834,4.564,3.666,4.533C6.156,20.954,6.432,19.605,6.432,18.152z" fill="url(#SVGID_8_)"/>
-<path d="M2.064,17.828c0.238-1.885,1.303-3.335,2.727-3.555c0.897,1.174,1.484,2.893,1.595,4.842 c0.026-0.316,0.045-0.636,0.045-0.963c0-2.214-0.646-4.167-1.641-5.467c-1.742,0.27-2.969,2.365-2.77,4.861 C2.029,17.645,2.052,17.732,2.064,17.828z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M2.064,17.828c0.238-1.885,1.303-3.335,2.727-3.555c0.897,1.174,1.484,2.893,1.595,4.842 c0.026-0.316,0.045-0.636,0.045-0.963c0-2.214-0.646-4.167-1.641-5.467c-1.742,0.27-2.969,2.365-2.77,4.861 C2.029,17.645,2.052,17.732,2.064,17.828z" fill="#FFFFFF" opacity="0.3"/>
<linearGradient gradientTransform="matrix(-1 0 0 1 -911 0)" gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="-936.0454" x2="-936.0454" y1="12.833" y2="22.1473">
-<stop offset="0" style="stop-color:#7A7A7A"/>
-<stop offset="1" style="stop-color:#212121"/>
+ <stop offset="0" style="stop-color:#7A7A7A"/>
+ <stop offset="1" style="stop-color:#212121"/>
</linearGradient>
<path d="M27.979,17.547c-0.207,2.609-1.889,4.644-3.758,4.539c-1.867-0.102-2.289-2.248-2.082-4.857 c0.207-2.608,0.969-4.69,2.837-4.589C26.844,12.742,28.188,14.939,27.979,17.547z" fill="url(#SVGID_9_)"/>
<linearGradient gradientTransform="matrix(-1 0 0 1 -911 0)" gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="-936.7837" x2="-936.7837" y1="12.8813" y2="22.1374">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="0.7636" style="stop-color:#0487BF"/>
-<stop offset="1" style="stop-color:#059FE0"/>
+ <stop offset="0" style="stop-color:#4EDEFF"/>
+ <stop offset="0.7636" style="stop-color:#0487BF"/>
+ <stop offset="1" style="stop-color:#059FE0"/>
</linearGradient>
<path d="M23.568,18.152c0-2.214,0.646-4.167,1.641-5.467c1.742,0.27,2.969,2.365,2.77,4.861 c-0.203,2.566-1.834,4.564-3.666,4.533C23.844,20.954,23.568,19.605,23.568,18.152z" fill="url(#SVGID_10_)"/>
-<path d="M27.936,17.828c-0.237-1.885-1.303-3.335-2.727-3.555c-0.896,1.174-1.484,2.893-1.596,4.842 c-0.025-0.316-0.045-0.636-0.045-0.963c0-2.214,0.646-4.167,1.641-5.467c1.742,0.27,2.969,2.365,2.77,4.861 C27.971,17.645,27.948,17.732,27.936,17.828z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M27.936,17.828c-0.237-1.885-1.303-3.335-2.727-3.555c-0.896,1.174-1.484,2.893-1.596,4.842 c-0.025-0.316-0.045-0.636-0.045-0.963c0-2.214,0.646-4.167,1.641-5.467c1.742,0.27,2.969,2.365,2.77,4.861 C27.971,17.645,27.948,17.732,27.936,17.828z" fill="#FFFFFF" opacity="0.3"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_attachment.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_attachment.svg Fri May 14 16:09:54 2010 +0300
@@ -1,16 +1,16 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15.5005" x2="15.5005" y1="28" y2="2.0005">
+ <stop offset="0" style="stop-color:#8C8E8F"/>
+ <stop offset="0.6545" style="stop-color:#D9D9D9"/>
+ <stop offset="1" style="stop-color:#AEB2B3"/>
+</linearGradient>
<path d="M22,2h-8c-1.101,0-2,0.9-2,2v14.5c0,1.934,1.567,3.5,3.5,3.5s3.5-1.566,3.5-3.5V7h-2v11.5 c0,0.827-0.673,1.5-1.5,1.5S14,19.327,14,18.5V4h8v17.395L18.93,26H12.07L9,21.395V10H7v12l4,6h9l4-6V4C24,2.9,23.101,2,22,2z" fill="url(#SVGID_1_)"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15.5005" x2="15.5005" y1="28" y2="2.0005">
-<stop offset="0" style="stop-color:#8C8E8F"/>
-<stop offset="0.6545" style="stop-color:#D9D9D9"/>
-<stop offset="1" style="stop-color:#AEB2B3"/>
-</linearGradient>
-</defs>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_authorised.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_authorised.svg Fri May 14 16:09:54 2010 +0300
@@ -1,45 +1,45 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
-<rect fill="none" height="30" width="30"/>
+ <rect fill="none" height="30" width="30"/>
</g>
-<path d="M4.358,30c-0.942,0-1.709-0.768-1.709-1.71V13.747 c0-0.943,0.767-1.711,1.709-1.711h0.663V9.979C5.099,4.471,9.63,0,15.122,0c5.491,0,10.022,4.471,10.101,9.966v2.07h0.42 c0.941,0,1.709,0.768,1.709,1.711V28.29c0,0.942-0.768,1.71-1.709,1.71H4.358z M20.145,12.036V9.979 c-0.058-2.692-2.312-4.9-5.021-4.9s-4.965,2.208-5.021,4.922v2.035H20.145z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M4.358,30c-0.942,0-1.709-0.768-1.709-1.71V13.747 c0-0.943,0.767-1.711,1.709-1.711h0.663V9.979C5.099,4.471,9.63,0,15.122,0c5.491,0,10.022,4.471,10.101,9.966v2.07h0.42 c0.941,0,1.709,0.768,1.709,1.711V28.29c0,0.942-0.768,1.71-1.709,1.71H4.358z M20.145,12.036V9.979 c-0.058-2.692-2.312-4.9-5.021-4.9s-4.965,2.208-5.021,4.922v2.035H20.145z" enable-background="new " opacity="0.35"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -361.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="273.6377" x2="291.5699" y1="-368.7476" y2="-368.7476">
-<stop offset="0" style="stop-color:#8C8C8C"/>
-<stop offset="0.5333" style="stop-color:#B3B3B3"/>
-<stop offset="1" style="stop-color:#808080"/>
+ <stop offset="0" style="stop-color:#8C8C8C"/>
+ <stop offset="0.5333" style="stop-color:#B3B3B3"/>
+ <stop offset="1" style="stop-color:#808080"/>
</linearGradient>
<path d="M15.122,1c-4.984,0-9.03,4.009-9.101,8.979v3.338H9.1V9.979c0.069-3.266,2.74-5.9,6.021-5.9 s5.951,2.635,6.021,5.9v4.477h3.078V9.979C24.152,5.009,20.107,1,15.122,1z" fill="url(#SVGID_1_)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -361.0195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="274.1973" x2="291.0081" y1="-369.0322" y2="-369.0322">
-<stop offset="0" style="stop-color:#CCCCCC"/>
-<stop offset="0.5152" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#CCCCCC"/>
+ <stop offset="0" style="stop-color:#CCCCCC"/>
+ <stop offset="0.5152" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#CCCCCC"/>
</linearGradient>
<path d="M21.714,13.888V9.979c-0.077-3.574-3.032-6.469-6.592-6.469c-3.559,0-6.514,2.895-6.592,6.458v4.488 H6.591V9.979c0.065-4.636,3.893-8.41,8.531-8.41c4.64,0,8.465,3.774,8.53,8.418v3.9L21.714,13.888L21.714,13.888z" fill="url(#SVGID_2_)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -361.0195)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="274.5469" x2="290.6592" y1="-369.0322" y2="-369.0322">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.5" style="stop-color:#B3B3B3"/>
-<stop offset="1" style="stop-color:#FFFFFF"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="0.5" style="stop-color:#B3B3B3"/>
+ <stop offset="1" style="stop-color:#FFFFFF"/>
</linearGradient>
<path d="M6.945,14.102V9.979c0.063-4.44,3.731-8.055,8.177-8.055S23.234,5.542,23.3,9.99v3.541h-1.231V9.979 c-0.08-3.767-3.196-6.824-6.945-6.824c-3.75,0-6.865,3.053-6.946,6.805v4.142H6.945z" fill="url(#SVGID_3_)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -361.0195)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="271.1289" x2="293.832" y1="-382.0376" y2="-382.0376">
-<stop offset="0" style="stop-color:#ED8C0D"/>
-<stop offset="0.24" style="stop-color:#FFE692"/>
-<stop offset="0.75" style="stop-color:#ED8C0D"/>
-<stop offset="0.8667" style="stop-color:#FFB81F"/>
-<stop offset="1" style="stop-color:#ED8C0D"/>
+ <stop offset="0" style="stop-color:#ED8C0D"/>
+ <stop offset="0.24" style="stop-color:#FFE692"/>
+ <stop offset="0.75" style="stop-color:#ED8C0D"/>
+ <stop offset="0.8667" style="stop-color:#FFB81F"/>
+ <stop offset="1" style="stop-color:#ED8C0D"/>
</linearGradient>
<path d="M26.352,28.29c0,0.392-0.317,0.71-0.709,0.71H4.358c-0.392,0-0.709-0.318-0.709-0.71V13.747 c0-0.392,0.317-0.711,0.709-0.711h21.283c0.393,0,0.709,0.319,0.709,0.711V28.29H26.352z" fill="url(#SVGID_4_)"/>
-<path d="M25.643,13.036H4.358c-0.392,0-0.709,0.319-0.709,0.711v0.709 c0-0.392,0.317-0.709,0.709-0.709h21.283c0.393,0,0.709,0.317,0.709,0.709v-0.709C26.352,13.355,26.033,13.036,25.643,13.036z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M25.643,29H4.358c-0.392,0-0.709-0.318-0.709-0.71v-0.709 c0,0.392,0.317,0.709,0.709,0.709h21.283c0.393,0,0.709-0.317,0.709-0.709v0.709C26.352,28.682,26.033,29,25.643,29z" fill-opacity="0.25" stroke-opacity="0.25"/>
-<path d="M15,25.82c-0.689,0-1.25-0.562-1.25-1.25v-1.838 c-0.769-0.441-1.25-1.256-1.25-2.162c0-1.379,1.122-2.5,2.5-2.5c1.379,0,2.5,1.121,2.5,2.5c0,0.904-0.48,1.721-1.25,2.162v1.838 C16.25,25.26,15.689,25.82,15,25.82L15,25.82z" fill="#FFE591" fill-opacity="0.25" stroke-opacity="0.25"/>
+<path d="M25.643,13.036H4.358c-0.392,0-0.709,0.319-0.709,0.711v0.709 c0-0.392,0.317-0.709,0.709-0.709h21.283c0.393,0,0.709,0.317,0.709,0.709v-0.709C26.352,13.355,26.033,13.036,25.643,13.036z" enable-background="new " fill="#FFFFFF" opacity="0.4"/>
+<path d="M25.643,29H4.358c-0.392,0-0.709-0.318-0.709-0.71v-0.709 c0,0.392,0.317,0.709,0.709,0.709h21.283c0.393,0,0.709-0.317,0.709-0.709v0.709C26.352,28.682,26.033,29,25.643,29z" enable-background="new " opacity="0.25"/>
+<path d="M15,25.82c-0.689,0-1.25-0.562-1.25-1.25v-1.838 c-0.769-0.441-1.25-1.256-1.25-2.162c0-1.379,1.122-2.5,2.5-2.5c1.379,0,2.5,1.121,2.5,2.5c0,0.904-0.48,1.721-1.25,2.162v1.838 C16.25,25.26,15.689,25.82,15,25.82L15,25.82z" enable-background="new " fill="#FFE591" opacity="0.25"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -361.0195)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="282.4805" x2="282.4805" y1="-386.0986" y2="-379.7186">
-<stop offset="0" style="stop-color:#A67C52"/>
-<stop offset="1" style="stop-color:#603813"/>
+ <stop offset="0" style="stop-color:#A67C52"/>
+ <stop offset="1" style="stop-color:#603813"/>
</linearGradient>
<path d="M17,20.57c0-1.104-0.896-2-2-2c-1.104,0-2,0.896-2,2c0,0.839,0.518,1.555,1.25,1.852v2.148 c0,0.414,0.336,0.75,0.75,0.75s0.75-0.336,0.75-0.75v-2.148C16.482,22.125,17,21.409,17,20.57z" fill="url(#SVGID_5_)"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_blocked.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_blocked.svg Fri May 14 16:09:54 2010 +0300
@@ -1,19 +1,21 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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"/>
+<defs>
+</defs>
+<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" 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">
-<stop offset="0" style="stop-color:#EBEBEB"/>
-<stop offset="1" style="stop-color:#FFFFFF"/>
+ <stop offset="0" style="stop-color:#EBEBEB"/>
+ <stop offset="1" style="stop-color:#FFFFFF"/>
</linearGradient>
<path d="M15,1.502c-7.457,0-13.5,6.042-13.5,13.499s6.043,13.5,13.5,13.5c7.456,0,13.5-6.043,13.5-13.5 S22.456,1.502,15,1.502z" fill="url(#SVGID_1_)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -282.4805 -376.0195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="297.4795" x2="297.4795" y1="-377.5215" y2="-404.4265">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="0.7939" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#E8522A"/>
+ <stop offset="0" style="stop-color:#FF7236"/>
+ <stop offset="0.7939" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#E8522A"/>
</linearGradient>
<path d="M15,1.502c-7.457,0-13.5,6.042-13.5,13.499s6.043,13.5,13.5,13.5c7.456,0,13.5-6.043,13.5-13.5 S22.456,1.502,15,1.502z M15,5.024c1.9,0,3.673,0.543,5.187,1.47L6.493,20.189c-0.928-1.514-1.471-3.285-1.471-5.188 C5.022,9.5,9.498,5.024,15,5.024z M15,24.979c-1.901,0-3.672-0.544-5.187-1.47L23.508,9.813c0.926,1.513,1.471,3.286,1.471,5.186 C24.979,20.503,20.503,24.979,15,24.979z" fill="url(#SVGID_2_)"/>
<rect fill="none" height="30.001" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bluetooth_offline.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bluetooth_offline.svg Fri May 14 16:09:54 2010 +0300
@@ -1,29 +1,37 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
+<path clip-rule="evenodd" 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-rule="evenodd" opacity="0.6"/>
<radialGradient cx="41.9736" cy="5.1909" gradientTransform="matrix(0.9686 0 0 1 -26.1192 0)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="23.5175">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="0.7636" style="stop-color:#0487BF"/>
-<stop offset="1" style="stop-color:#059FE0"/>
+ <stop offset="0" style="stop-color:#4EDEFF"/>
+ <stop offset="0.7636" style="stop-color:#0487BF"/>
+ <stop offset="1" style="stop-color:#059FE0"/>
</radialGradient>
-<path d="M15,29c5.941,0,10-2.915,10-14.031C25,3.915,20.941,1,15,1 C9.115,1,5,3.915,5,14.969C5,26.085,9.115,29,15,29L15,29z" fill="url(#SVGID_1_)" fill-rule="evenodd"/>
-<path d="M14.537,3.475v9.976l-4.043-4.168L9,10.798l5.1,5.177L9,21.215 l1.494,1.515l4.043-4.166v9.911L22,20.962l-4.914-4.987L22,11.05L14.537,3.475z M19.014,20.962L16.65,23.36v-4.797L19.014,20.962z M16.65,13.45V8.651l2.363,2.398L16.65,13.45z" fill-opacity="0.2" fill-rule="evenodd" stroke-opacity="0.2"/>
-<path d="M14.068,2.467v9.976l-4.043-4.168L8.531,9.79l5.1,5.177l-5.1,5.24 l1.494,1.515l4.043-4.166v9.911l7.463-7.513l-4.914-4.987l4.914-4.925L14.068,2.467z M18.545,19.954l-2.363,2.398v-4.797 L18.545,19.954z M16.182,12.442V7.644l2.363,2.398L16.182,12.442z" fill="#FFFFFF" fill-rule="evenodd"/>
-<rect fill="none" fill-rule="evenodd" height="30" width="30"/>
+<path clip-rule="evenodd" d="M15,29c5.941,0,10-2.915,10-14.031C25,3.915,20.941,1,15,1 C9.115,1,5,3.915,5,14.969C5,26.085,9.115,29,15,29L15,29z" fill="url(#SVGID_1_)" fill-rule="evenodd"/>
+<path clip-rule="evenodd" d="M14.537,3.475v9.976l-4.043-4.168L9,10.798l5.1,5.177L9,21.215 l1.494,1.515l4.043-4.166v9.911L22,20.962l-4.914-4.987L22,11.05L14.537,3.475z M19.014,20.962L16.65,23.36v-4.797L19.014,20.962z M16.65,13.45V8.651l2.363,2.398L16.65,13.45z" fill-rule="evenodd" opacity="0.2"/>
+<path clip-rule="evenodd" d="M14.068,2.467v9.976l-4.043-4.168L8.531,9.79l5.1,5.177l-5.1,5.24 l1.494,1.515l4.043-4.166v9.911l7.463-7.513l-4.914-4.987l4.914-4.925L14.068,2.467z M18.545,19.954l-2.363,2.398v-4.797 L18.545,19.954z M16.182,12.442V7.644l2.363,2.398L16.182,12.442z" fill="#FFFFFF" fill-rule="evenodd"/>
+<rect clip-rule="evenodd" fill="none" fill-rule="evenodd" height="30" width="30"/>
</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"/>
+<rect height="34.27" 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>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bt_low_battery.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bt_low_battery.svg Fri May 14 16:09:54 2010 +0300
@@ -1,39 +1,40 @@
-<?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"/>
-<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"/>
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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="7.1992" x2="22.7988" y1="16.2998" y2="16.2998">
-<stop offset="0" style="stop-color:#7C7E87"/>
-<stop offset="0.4182" style="stop-color:#D0D0D2"/>
-<stop offset="1" style="stop-color:#94979D"/>
-</linearGradient>
-<rect fill="url(#SVGID_1_)" height="23.4" width="15.6" x="7.199" y="4.6"/>
+<defs>
+</defs>
+<rect fill="none" height="30" width="30"/>
+<polygon 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 "/>
+<g>
+ <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="7.1992" x2="22.7988" y1="16.2998" y2="16.2998">
+ <stop offset="0" style="stop-color:#7C7E87"/>
+ <stop offset="0.4182" style="stop-color:#D0D0D2"/>
+ <stop offset="1" style="stop-color:#94979D"/>
+ </linearGradient>
+ <rect fill="url(#SVGID_1_)" height="23.4" width="15.6" x="7.199" y="4.6"/>
</g>
<g>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="9.5" x2="20.5" y1="16.2988" y2="16.2988">
-<stop offset="0" style="stop-color:#EFEFEF"/>
-<stop offset="0.5636" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#FFFFFF"/>
-</linearGradient>
-<rect fill="url(#SVGID_2_)" height="18" width="11" x="9.5" y="7.299"/>
+ <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="9.5" x2="20.5" y1="16.2988" y2="16.2988">
+ <stop offset="0" style="stop-color:#EFEFEF"/>
+ <stop offset="0.5636" style="stop-color:#FFFFFF"/>
+ </linearGradient>
+ <rect fill="url(#SVGID_2_)" height="18" width="11" x="9.5" y="7.299"/>
</g>
<g>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="12.4004" x2="17.5996" y1="3.2998" y2="3.2998">
-<stop offset="0" style="stop-color:#7C7E87"/>
-<stop offset="0.5394" style="stop-color:#D0D0D2"/>
-<stop offset="1" style="stop-color:#94979D"/>
-</linearGradient>
-<rect fill="url(#SVGID_3_)" height="2.6" width="5.199" x="12.4" y="2"/>
+ <linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="12.4004" x2="17.5996" y1="3.2998" y2="3.2998">
+ <stop offset="0" style="stop-color:#7C7E87"/>
+ <stop offset="0.5394" style="stop-color:#D0D0D2"/>
+ <stop offset="1" style="stop-color:#94979D"/>
+ </linearGradient>
+ <rect fill="url(#SVGID_3_)" height="2.6" width="5.199" x="12.4" y="2"/>
</g>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="9.416" x2="20.4993" y1="23.8594" y2="23.8594">
-<stop offset="0" style="stop-color:#D4270D"/>
-<stop offset="0.3394" style="stop-color:#EB7A29"/>
-<stop offset="1" style="stop-color:#C90000"/>
+ <stop offset="0" style="stop-color:#D4270D"/>
+ <stop offset="0.3394" style="stop-color:#EB7A29"/>
+ <stop offset="1" style="stop-color:#C90000"/>
</linearGradient>
<rect fill="url(#SVGID_4_)" height="3" width="11" x="9.5" y="22.359"/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bt_signal_high.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bt_signal_high.svg Fri May 14 16:09:54 2010 +0300
@@ -1,41 +1,43 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
-<rect fill-opacity="0.35" height="12" stroke-opacity="0.35" width="8" x="1" y="15"/>
-<rect fill-opacity="0.35" height="18" stroke-opacity="0.35" width="8" x="11" y="9"/>
-<rect fill-opacity="0.35" height="24" stroke-opacity="0.35" width="8" x="21" y="3"/>
+<rect height="12" opacity="0.35" width="8" x="1" y="15"/>
+<rect height="18" opacity="0.35" width="8" x="11" y="9"/>
+<rect height="24" opacity="0.35" width="8" x="21" y="3"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="15.8965" y2="26.0217">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+ <stop offset="0" style="stop-color:#A0F800"/>
+ <stop offset="1" style="stop-color:#319E00"/>
</linearGradient>
<rect fill="url(#SVGID_1_)" height="10" width="6" x="2" y="16"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="5" x2="5" y1="7.3999" y2="24.801">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+ <stop offset="0" style="stop-color:#A0F800"/>
+ <stop offset="1" style="stop-color:#319E00"/>
</linearGradient>
<rect fill="url(#SVGID_2_)" height="8" width="4" x="3" y="17"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="15" x2="15" y1="9.959" y2="25.959">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+ <stop offset="0" style="stop-color:#A0F800"/>
+ <stop offset="1" style="stop-color:#319E00"/>
</linearGradient>
<rect fill="url(#SVGID_3_)" height="16" width="6" x="12" y="10"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="15" x2="15" y1="5.75" y2="24.7824">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+ <stop offset="0" style="stop-color:#A0F800"/>
+ <stop offset="1" style="stop-color:#319E00"/>
</linearGradient>
<rect fill="url(#SVGID_4_)" height="14" width="4" x="13" y="11"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="25" x2="25" y1="4" y2="25.7514">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+ <stop offset="0" style="stop-color:#A0F800"/>
+ <stop offset="1" style="stop-color:#319E00"/>
</linearGradient>
<rect fill="url(#SVGID_5_)" height="22" width="6" x="22" y="4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="25" x2="25" y1="5" y2="24.774">
-<stop offset="0" style="stop-color:#88E400"/>
-<stop offset="1" style="stop-color:#319E00"/>
+ <stop offset="0" style="stop-color:#88E400"/>
+ <stop offset="1" style="stop-color:#319E00"/>
</linearGradient>
<rect fill="url(#SVGID_6_)" height="20" width="4" x="23" y="5"/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bt_signal_low.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bt_signal_low.svg Fri May 14 16:09:54 2010 +0300
@@ -1,47 +1,49 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
-<rect fill-opacity="0.35" height="12" stroke-opacity="0.35" width="8" x="1" y="15"/>
-<rect fill-opacity="0.35" height="18" stroke-opacity="0.35" width="8" x="11" y="9"/>
-<rect fill-opacity="0.35" height="24" stroke-opacity="0.35" width="8" x="21" y="3"/>
+<rect height="12" opacity="0.35" width="8" x="1" y="15"/>
+<rect height="18" opacity="0.35" width="8" x="11" y="9"/>
+<rect height="24" opacity="0.35" width="8" x="21" y="3"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="16" y2="26.1373">
-<stop offset="0" style="stop-color:#FBB03B"/>
-<stop offset="1" style="stop-color:#E14F16"/>
+ <stop offset="0" style="stop-color:#FBB03B"/>
+ <stop offset="1" style="stop-color:#E14F16"/>
</linearGradient>
<rect fill="url(#SVGID_1_)" height="10" width="6" x="2" y="16"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="5" x2="5" y1="17" y2="25.1098">
-<stop offset="0" style="stop-color:#DE8029"/>
-<stop offset="1" style="stop-color:#D82E09"/>
+ <stop offset="0" style="stop-color:#DE8029"/>
+ <stop offset="1" style="stop-color:#D82E09"/>
</linearGradient>
<rect fill="url(#SVGID_2_)" height="8" width="4" x="3" y="17"/>
<linearGradient gradientTransform="matrix(-1 0 0 1 11700.957 0)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="11685.957" x2="11685.957" y1="4" y2="26">
-<stop offset="0" style="stop-color:#E6E6E6"/>
-<stop offset="1" style="stop-color:#6F6F6F"/>
+ <stop offset="0" style="stop-color:#E6E6E6"/>
+ <stop offset="1" style="stop-color:#6F6F6F"/>
</linearGradient>
<rect fill="url(#SVGID_3_)" height="16" width="6" x="12" y="10"/>
<linearGradient gradientTransform="matrix(-1 0 0 1 11700.957 0)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="11685.957" x2="11685.957" y1="5.75" y2="25">
-<stop offset="0" style="stop-color:#C4C4C4"/>
-<stop offset="1" style="stop-color:#4F4F4F"/>
+ <stop offset="0" style="stop-color:#C4C4C4"/>
+ <stop offset="1" style="stop-color:#4F4F4F"/>
</linearGradient>
<rect fill="url(#SVGID_4_)" height="14" width="4" x="13" y="11"/>
-<polygon fill="#FFFFFF" fill-opacity="0.3" points="12,12.389 12,10 14.39,10 " stroke-opacity="0.3"/>
-<polygon fill="#FFFFFF" fill-opacity="0.3" points="18,17.703 12,23.703 12,18.047 18,12.047 " stroke-opacity="0.3"/>
-<polygon fill="#FFFFFF" fill-opacity="0.3" points="18,23.359 18,26 15.36,26 " stroke-opacity="0.3"/>
+<polygon fill="#FFFFFF" opacity="0.3" points="12,12.389 12,10 14.39,10 "/>
+<polygon fill="#FFFFFF" opacity="0.3" points="18,17.703 12,23.703 12,18.047 18,12.047 "/>
+<polygon fill="#FFFFFF" opacity="0.3" points="18,23.359 18,26 15.36,26 "/>
<linearGradient gradientTransform="matrix(-1 0 0 1 11720.957 0)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="11695.957" x2="11695.957" y1="4" y2="26">
-<stop offset="0" style="stop-color:#E6E6E6"/>
-<stop offset="1" style="stop-color:#6F6F6F"/>
+ <stop offset="0" style="stop-color:#E6E6E6"/>
+ <stop offset="1" style="stop-color:#6F6F6F"/>
</linearGradient>
<rect fill="url(#SVGID_5_)" height="22" width="6" x="22" y="4"/>
<linearGradient gradientTransform="matrix(-1 0 0 1 11720.957 0)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="11695.957" x2="11695.957" y1="5" y2="25">
-<stop offset="0" style="stop-color:#C4C4C4"/>
-<stop offset="1" style="stop-color:#4F4F4F"/>
+ <stop offset="0" style="stop-color:#C4C4C4"/>
+ <stop offset="1" style="stop-color:#4F4F4F"/>
</linearGradient>
<rect fill="url(#SVGID_6_)" height="20" width="4" x="23" y="5"/>
-<polygon fill="#FFFFFF" fill-opacity="0.3" points="22,9.639 22,4 27.64,4 " stroke-opacity="0.3"/>
-<polygon fill="#FFFFFF" fill-opacity="0.3" points="28,14.953 22,20.953 22,15.297 28,9.297 " stroke-opacity="0.3"/>
-<polygon fill="#FFFFFF" fill-opacity="0.3" points="28,20.609 28,26 22.61,26 " stroke-opacity="0.3"/>
+<polygon fill="#FFFFFF" opacity="0.3" points="22,9.639 22,4 27.64,4 "/>
+<polygon fill="#FFFFFF" opacity="0.3" points="28,14.953 22,20.953 22,15.297 28,9.297 "/>
+<polygon fill="#FFFFFF" opacity="0.3" points="28,20.609 28,26 22.61,26 "/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bt_signal_medium.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_bt_signal_medium.svg Fri May 14 16:09:54 2010 +0300
@@ -1,44 +1,46 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
-<rect fill-opacity="0.35" height="12" stroke-opacity="0.35" width="8" x="1" y="15"/>
-<rect fill-opacity="0.35" height="18" stroke-opacity="0.35" width="8" x="11" y="9"/>
-<rect fill-opacity="0.35" height="24" stroke-opacity="0.35" width="8" x="21" y="3"/>
+<rect height="12" opacity="0.35" width="8" x="1" y="15"/>
+<rect height="18" opacity="0.35" width="8" x="11" y="9"/>
+<rect height="24" opacity="0.35" width="8" x="21" y="3"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="9.75" y2="25.5">
-<stop offset="0" style="stop-color:#FFF48F"/>
-<stop offset="1" style="stop-color:#FFB120"/>
+ <stop offset="0" style="stop-color:#FFF48F"/>
+ <stop offset="1" style="stop-color:#FFB120"/>
</linearGradient>
<rect fill="url(#SVGID_1_)" height="10" width="6" x="2" y="16"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="5" x2="5" y1="12" y2="24.6">
-<stop offset="0" style="stop-color:#FECF5E"/>
-<stop offset="1" style="stop-color:#FF9E01"/>
+ <stop offset="0" style="stop-color:#FECF5E"/>
+ <stop offset="1" style="stop-color:#FF9E01"/>
</linearGradient>
<rect fill="url(#SVGID_2_)" height="8" width="4" x="3" y="17"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="15" x2="15" y1="9.917" y2="26.0034">
-<stop offset="0" style="stop-color:#FFF48F"/>
-<stop offset="1" style="stop-color:#FFB120"/>
+ <stop offset="0" style="stop-color:#FFF48F"/>
+ <stop offset="1" style="stop-color:#FFB120"/>
</linearGradient>
<rect fill="url(#SVGID_3_)" height="16" width="6" x="12" y="10"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="15" x2="15" y1="10.7813" y2="24.5625">
-<stop offset="0" style="stop-color:#FECF5E"/>
-<stop offset="1" style="stop-color:#FF9E01"/>
+ <stop offset="0" style="stop-color:#FECF5E"/>
+ <stop offset="1" style="stop-color:#FF9E01"/>
</linearGradient>
<rect fill="url(#SVGID_4_)" height="14" width="4" x="13" y="11"/>
<linearGradient gradientTransform="matrix(-1 0 0 1 11381.0703 0)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="11356.0703" x2="11356.0703" y1="4" y2="25.7514">
-<stop offset="0" style="stop-color:#E6E6E6"/>
-<stop offset="1" style="stop-color:#6F6F6F"/>
+ <stop offset="0" style="stop-color:#E6E6E6"/>
+ <stop offset="1" style="stop-color:#6F6F6F"/>
</linearGradient>
<rect fill="url(#SVGID_5_)" height="22" width="6" x="22" y="4"/>
<linearGradient gradientTransform="matrix(-1 0 0 1 11381.0703 0)" gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="11356.0703" x2="11356.0703" y1="5" y2="24.774">
-<stop offset="0" style="stop-color:#C4C4C4"/>
-<stop offset="1" style="stop-color:#4F4F4F"/>
+ <stop offset="0" style="stop-color:#C4C4C4"/>
+ <stop offset="1" style="stop-color:#4F4F4F"/>
</linearGradient>
<rect fill="url(#SVGID_6_)" height="20" width="4" x="23" y="5"/>
-<polygon fill="#FFFFFF" fill-opacity="0.3" points="22,9.641 22,4 27.641,4 " stroke-opacity="0.3"/>
-<polygon fill="#FFFFFF" fill-opacity="0.3" points="28,14.953 22,20.953 22,15.297 28,9.297 " stroke-opacity="0.3"/>
-<polygon fill="#FFFFFF" fill-opacity="0.3" points="28,20.611 28,26 22.611,26 " stroke-opacity="0.3"/>
+<polygon fill="#FFFFFF" opacity="0.3" points="22,9.641 22,4 27.641,4 "/>
+<polygon fill="#FFFFFF" opacity="0.3" points="28,14.953 22,20.953 22,15.297 28,9.297 "/>
+<polygon fill="#FFFFFF" opacity="0.3" points="28,20.611 28,26 22.611,26 "/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_business_card.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_business_card.svg Fri May 14 16:09:54 2010 +0300
@@ -1,29 +1,31 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
<rect fill-opacity="0.6" height="22" width="28" x="1" y="4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="3.9473" y2="24.6524">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#C8C8C8"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#C8C8C8"/>
</linearGradient>
<rect fill="url(#SVGID_1_)" height="20" width="26" x="2" y="5"/>
<rect fill="#FFFFFF" height="1" width="26" x="2" y="5"/>
-<rect fill="#020202" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="26" x="2" y="24"/>
+<rect fill="#020202" height="1" opacity="0.2" width="26" x="2" y="24"/>
<rect fill="#FFFFFF" height="14" width="14" x="3" y="7"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="10" x2="10" y1="20.1982" y2="7.7075">
-<stop offset="0" style="stop-color:#3FA8F4"/>
-<stop offset="1" style="stop-color:#8DC8E1"/>
+ <stop offset="0" style="stop-color:#3FA8F4"/>
+ <stop offset="1" style="stop-color:#8DC8E1"/>
</linearGradient>
<rect fill="url(#SVGID_2_)" height="12" width="12" x="4" y="8"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="9.7114" x2="9.7114" y1="19.9209" y2="3.3869">
-<stop offset="0" style="stop-color:#146BAF"/>
-<stop offset="1" style="stop-color:#013B77"/>
+ <stop offset="0" style="stop-color:#146BAF"/>
+ <stop offset="1" style="stop-color:#013B77"/>
</linearGradient>
<path d="M15,20c-0.046-1.653-1.578-2.359-2.485-2.926l-1.296-0.788c-0.534-0.37,0.098-0.794,0.467-1.508 c0.547-1.06,0.667-1.647,0.667-2.505c0-1.559-1.161-2.851-2.616-2.851c-0.009,0-0.016,0.002-0.026,0.003 C9.703,9.425,9.695,9.423,9.686,9.423c-1.456,0-2.615,1.292-2.615,2.851c0,0.857,0.121,1.446,0.667,2.505 c0.37,0.716,1.001,1.138,0.466,1.508l-1.575,0.788C5.722,17.641,4.469,18.347,4.422,20H15z" fill="url(#SVGID_3_)"/>
-<rect fill="#020202" fill-opacity="0.5" height="2" stroke-opacity="0.5" width="7" x="19" y="8"/>
-<rect fill="#020202" fill-opacity="0.5" height="2" stroke-opacity="0.5" width="7" x="19" y="13"/>
+<rect fill="#020202" height="2" opacity="0.5" width="7" x="19" y="8"/>
+<rect fill="#020202" height="2" opacity="0.5" width="7" x="19" y="13"/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_calendar.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_calendar.svg Fri May 14 16:09:54 2010 +0300
@@ -1,52 +1,54 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
<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 gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="10.3691" y2="27.0025">
-<stop offset="0" style="stop-color:#F9F9F9"/>
-<stop offset="1" style="stop-color:#B5B5B5"/>
+ <stop offset="0" style="stop-color:#F9F9F9"/>
+ <stop offset="1" style="stop-color:#B5B5B5"/>
</linearGradient>
<rect fill="url(#SVGID_1_)" height="22" width="24" x="3" y="5"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="11.2095" x2="11.2095" y1="23.834" y2="13.7479">
-<stop offset="0" style="stop-color:#303030"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#303030"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
<path d="M14.228,22.906V24H8.191v-1.094h2.146v-7.629L8.191,15.77v-1.094l3.015-0.95h0.991v9.181H14.228z" fill="url(#SVGID_2_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="18.7939" x2="18.7939" y1="23.834" y2="13.7479">
-<stop offset="0" style="stop-color:#303030"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#303030"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
<path d="M21.843,22.811V24h-6.098v-0.745c0-0.711,0.123-1.343,0.369-1.894s0.55-1.021,0.909-1.412 c0.359-0.389,0.816-0.816,1.367-1.281c0.66-0.557,1.078-0.986,1.251-1.292s0.26-0.608,0.26-0.909c0-0.529-0.14-0.926-0.421-1.193 c-0.279-0.266-0.7-0.399-1.261-0.399c-0.593,0-1.31,0.153-2.153,0.458h-0.014v-1.217c0.885-0.277,1.746-0.417,2.584-0.417 c1.035,0,1.82,0.227,2.358,0.681c0.538,0.453,0.807,1.121,0.807,2.006c0,0.496-0.12,0.985-0.362,1.467 c-0.242,0.48-0.811,1.097-1.709,1.849c-0.502,0.424-0.893,0.776-1.176,1.06s-0.521,0.594-0.715,0.934 c-0.193,0.339-0.299,0.711-0.317,1.117H21.843z" fill="url(#SVGID_3_)"/>
<polygon fill="#FFFFFF" points="22,22 22,27 27,22 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="14.9995" x2="14.9995" y1="5" y2="11">
-<stop offset="0" style="stop-color:#FF7042"/>
-<stop offset="1" style="stop-color:#991B23"/>
+ <stop offset="0" style="stop-color:#FF7042"/>
+ <stop offset="1" style="stop-color:#991B23"/>
</linearGradient>
<rect fill="url(#SVGID_4_)" height="6" width="24" x="3" y="5"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="10" x2="10" y1="6" y2="10">
-<stop offset="0" style="stop-color:#4A050A"/>
-<stop offset="1" style="stop-color:#B00F25"/>
+ <stop offset="0" style="stop-color:#4A050A"/>
+ <stop offset="1" style="stop-color:#B00F25"/>
</linearGradient>
<circle cx="10" cy="8" fill="url(#SVGID_5_)" r="2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="20" x2="20" y1="6" y2="10">
-<stop offset="0" style="stop-color:#4A050A"/>
-<stop offset="1" style="stop-color:#B00F25"/>
+ <stop offset="0" style="stop-color:#4A050A"/>
+ <stop offset="1" style="stop-color:#B00F25"/>
</linearGradient>
<circle cx="20" cy="8" fill="url(#SVGID_6_)" r="2"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="24" x="3" y="5"/>
+<rect fill="#FFFFFF" height="1" opacity="0.4" width="24" x="3" y="5"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="10" x2="10" y1="3" y2="9">
-<stop offset="0" style="stop-color:#FFFCFE"/>
-<stop offset="1" style="stop-color:#8C8C8C"/>
+ <stop offset="0" style="stop-color:#FFFCFE"/>
+ <stop offset="1" style="stop-color:#8C8C8C"/>
</linearGradient>
<path d="M11,8c0,0.55-0.45,1-1,1l0,0C9.45,9,9,8.55,9,8V4c0-0.55,0.45-1,1-1l0,0c0.55,0,1,0.45,1,1V8z" fill="url(#SVGID_7_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="20" x2="20" y1="3" y2="9">
-<stop offset="0" style="stop-color:#FFFCFE"/>
-<stop offset="1" style="stop-color:#8C8C8C"/>
+ <stop offset="0" style="stop-color:#FFFCFE"/>
+ <stop offset="1" style="stop-color:#8C8C8C"/>
</linearGradient>
<path d="M21,8c0,0.55-0.45,1-1,1l0,0c-0.55,0-1-0.45-1-1V4c0-0.55,0.45-1,1-1l0,0c0.55,0,1,0.45,1,1V8z" fill="url(#SVGID_8_)"/>
-<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="24" x="3" y="11"/>
+<rect height="1" opacity="0.2" width="24" x="3" y="11"/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_car.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_car.svg Fri May 14 16:09:54 2010 +0300
@@ -1,79 +1,81 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
+<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" opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.5" x2="5.5" y1="22" y2="26">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="0.6848" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#646464"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="0.6848" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#646464"/>
</linearGradient>
<path d="M3,22v3c0,0.55,0.563,1,1.25,1h2.5C7.438,26,8,25.55,8,25v-3H3z" fill="url(#SVGID_1_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="24.5" x2="24.5" y1="22" y2="26">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="0.6848" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#646464"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="0.6848" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#646464"/>
</linearGradient>
<path d="M22,22v3c0,0.55,0.563,1,1.25,1h2.5c0.688,0,1.25-0.45,1.25-1v-3H22z" fill="url(#SVGID_2_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="14.9995" x2="14.9995" y1="4.0625" y2="14.942">
-<stop offset="0" style="stop-color:#F7CC01"/>
-<stop offset="1" style="stop-color:#FFAB01"/>
+ <stop offset="0" style="stop-color:#F7CC01"/>
+ <stop offset="1" style="stop-color:#FFAB01"/>
</linearGradient>
<path d="M27.5,15L25,7c-0.267-1.067-2-3-4-3H9C7,4,5.267,5.933,5,7l-2.5,8H27.5z" fill="url(#SVGID_3_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="15.0005" x2="15.0005" y1="5.5454" y2="13.4578">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
<path d="M4.541,13.5l1.891-6.053C6.572,6.899,7.762,5.5,9,5.5h12c1.238,0,2.428,1.399,2.545,1.863 l1.916,6.137H4.541z" fill="url(#SVGID_4_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="2" x2="28" y1="17.5" y2="17.5">
-<stop offset="0" style="stop-color:#FFC501"/>
-<stop offset="1" style="stop-color:#FFB701"/>
+ <stop offset="0" style="stop-color:#FFC501"/>
+ <stop offset="1" style="stop-color:#FFB701"/>
</linearGradient>
<path d="M25,12H5c-1.65,0-3,1.35-3,3v6c0,1.1,0.9,2,2,2h22c1.1,0,2-0.9,2-2v-6C28,13.35,26.65,12,25,12z" fill="url(#SVGID_5_)"/>
-<path d="M7.416,12l1.04,3.383C8.908,16.85,10.465,18,12,18h6c1.535,0,3.092-1.15,3.544-2.617 L22.584,12H7.416z" fill="#FFFFFF" fill-opacity="0.35" stroke-opacity="0.35"/>
+<path d="M7.416,12l1.04,3.383C8.908,16.85,10.465,18,12,18h6c1.535,0,3.092-1.15,3.544-2.617 L22.584,12H7.416z" fill="#FFFFFF" opacity="0.35"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="6" x2="6" y1="18" y2="13.0005">
-<stop offset="0" style="stop-color:#F0B901"/>
-<stop offset="1" style="stop-color:#ED7E00"/>
+ <stop offset="0" style="stop-color:#F0B901"/>
+ <stop offset="1" style="stop-color:#ED7E00"/>
</linearGradient>
<path d="M6,18c-1.654,0-3-1.121-3-2.5S4.346,13,6,13s3,1.121,3,2.5S7.654,18,6,18L6,18z" fill="url(#SVGID_6_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="6" x2="6" y1="13.834" y2="17.1665">
-<stop offset="0" style="stop-color:#FAFAFA"/>
-<stop offset="1" style="stop-color:#C8C8D2"/>
+ <stop offset="0" style="stop-color:#FAFAFA"/>
+ <stop offset="1" style="stop-color:#C8C8D2"/>
</linearGradient>
<ellipse cx="6" cy="15.5" fill="url(#SVGID_7_)" rx="2" ry="1.666"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="24" x2="24" y1="18" y2="13.0005">
-<stop offset="0" style="stop-color:#F0B901"/>
-<stop offset="1" style="stop-color:#ED7E00"/>
+ <stop offset="0" style="stop-color:#F0B901"/>
+ <stop offset="1" style="stop-color:#ED7E00"/>
</linearGradient>
<path d="M24,18c-1.654,0-3-1.121-3-2.5s1.346-2.5,3-2.5s3,1.121,3,2.5S25.654,18,24,18L24,18z" fill="url(#SVGID_8_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="24" x2="24" y1="13.834" y2="17.1665">
-<stop offset="0" style="stop-color:#FAFAFA"/>
-<stop offset="1" style="stop-color:#C8C8D2"/>
+ <stop offset="0" style="stop-color:#FAFAFA"/>
+ <stop offset="1" style="stop-color:#C8C8D2"/>
</linearGradient>
<ellipse cx="24" cy="15.5" fill="url(#SVGID_9_)" rx="2" ry="1.666"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="2" x2="28" y1="19.5" y2="19.5">
-<stop offset="0" style="stop-color:#FF9000"/>
-<stop offset="0.511" style="stop-color:#FFC501"/>
-<stop offset="1" style="stop-color:#FF8800"/>
+ <stop offset="0" style="stop-color:#FF9000"/>
+ <stop offset="0.511" style="stop-color:#FFC501"/>
+ <stop offset="1" style="stop-color:#FF8800"/>
</linearGradient>
<rect fill="url(#SVGID_10_)" height="1" width="26" x="2" y="19"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="15.0005" x2="15.0005" y1="17" y2="12.0005">
-<stop offset="0" style="stop-color:#D67900"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+ <stop offset="0" style="stop-color:#D67900"/>
+ <stop offset="1" style="stop-color:#FFC501"/>
</linearGradient>
<path d="M8.461,12l0.951,3.088C9.735,16.14,10.9,17,12,17h6c1.1,0,2.265-0.86,2.588-1.912L21.539,12H8.461z" fill="url(#SVGID_11_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="14.9995" x2="14.9995" y1="12.0625" y2="16.4384">
-<stop offset="0" style="stop-color:#FFE896"/>
-<stop offset="1" style="stop-color:#FFB701"/>
+ <stop offset="0" style="stop-color:#FFE896"/>
+ <stop offset="1" style="stop-color:#FFB701"/>
</linearGradient>
<path d="M8.984,12l0.905,2.941C10.15,15.786,11.116,16.5,12,16.5h6c0.884,0,1.85-0.714,2.11-1.559L21.016,12 H8.984z" fill="url(#SVGID_12_)"/>
-<path d="M23.225,8.01l-0.164-0.523C22.977,7.199,21.979,6,21,6H9C8.035,6,7.01,7.203,6.908,7.596 L6.283,9.599L23.225,8.01z" fill="#FFFFFF" fill-opacity="0.25" stroke-opacity="0.25"/>
+<path d="M23.225,8.01l-0.164-0.523C22.977,7.199,21.979,6,21,6H9C8.035,6,7.01,7.203,6.908,7.596 L6.283,9.599L23.225,8.01z" fill="#FFFFFF" opacity="0.25"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="15.0005" x2="15.0005" y1="23" y2="21">
-<stop offset="0" style="stop-color:#565656"/>
-<stop offset="1" style="stop-color:#212121"/>
+ <stop offset="0" style="stop-color:#565656"/>
+ <stop offset="1" style="stop-color:#212121"/>
</linearGradient>
<path d="M22,21H8c-1.1,0-2,0.9-2,2h18C24,21.9,23.1,21,22,21z" fill="url(#SVGID_13_)"/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_charger.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_charger.svg Fri May 14 16:09:54 2010 +0300
@@ -1,63 +1,65 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
+<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" opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="8" x2="11" y1="7" y2="7">
-<stop offset="0" style="stop-color:#A8B1B3"/>
-<stop offset="0.4" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#686E70"/>
+ <stop offset="0" style="stop-color:#A8B1B3"/>
+ <stop offset="0.4" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#686E70"/>
</linearGradient>
<rect fill="url(#SVGID_1_)" height="10" width="3" x="8" y="2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="8" x2="11" y1="9.5" y2="9.5">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.4" style="stop-color:#7A7A7A"/>
-<stop offset="1" style="stop-color:#1A1A1A"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.4" style="stop-color:#7A7A7A"/>
+ <stop offset="1" style="stop-color:#1A1A1A"/>
</linearGradient>
<rect fill="url(#SVGID_2_)" height="5" width="3" x="8" y="7"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="19" x2="22" y1="10" y2="10">
-<stop offset="0" style="stop-color:#323232"/>
-<stop offset="0.4" style="stop-color:#787878"/>
-<stop offset="1" style="stop-color:#323232"/>
+ <stop offset="0" style="stop-color:#323232"/>
+ <stop offset="0.4" style="stop-color:#787878"/>
+ <stop offset="1" style="stop-color:#323232"/>
</linearGradient>
<rect fill="url(#SVGID_3_)" height="4" width="3" x="19" y="8"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="19" x2="22" y1="7" y2="7">
-<stop offset="0" style="stop-color:#A8B1B3"/>
-<stop offset="0.4" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#686E70"/>
+ <stop offset="0" style="stop-color:#A8B1B3"/>
+ <stop offset="0.4" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#686E70"/>
</linearGradient>
<rect fill="url(#SVGID_4_)" height="10" width="3" x="19" y="2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="19" x2="22" y1="9.5" y2="9.5">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.4" style="stop-color:#7A7A7A"/>
-<stop offset="1" style="stop-color:#1A1A1A"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.4" style="stop-color:#7A7A7A"/>
+ <stop offset="1" style="stop-color:#1A1A1A"/>
</linearGradient>
<rect fill="url(#SVGID_5_)" height="5" width="3" x="19" y="7"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="13" x2="17" y1="24.5" y2="24.5">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.4" style="stop-color:#7A7A7A"/>
-<stop offset="1" style="stop-color:#1A1A1A"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.4" style="stop-color:#7A7A7A"/>
+ <stop offset="1" style="stop-color:#1A1A1A"/>
</linearGradient>
<rect fill="url(#SVGID_6_)" height="7" width="4" x="13" y="21"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="11" x2="19" y1="23.5" y2="23.5">
-<stop offset="0" style="stop-color:#4D4D4D"/>
-<stop offset="0.4" style="stop-color:#7A7A7A"/>
-<stop offset="1" style="stop-color:#1A1A1A"/>
+ <stop offset="0" style="stop-color:#4D4D4D"/>
+ <stop offset="0.4" style="stop-color:#7A7A7A"/>
+ <stop offset="1" style="stop-color:#1A1A1A"/>
</linearGradient>
<rect fill="url(#SVGID_7_)" height="3" width="8" x="11" y="22"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="14.9995" x2="14.9995" y1="11" y2="23.0005">
-<stop offset="0" style="stop-color:#C8C8C8"/>
-<stop offset="0.8" style="stop-color:#383838"/>
-<stop offset="1" style="stop-color:#121212"/>
+ <stop offset="0" style="stop-color:#C8C8C8"/>
+ <stop offset="0.8" style="stop-color:#383838"/>
+ <stop offset="1" style="stop-color:#121212"/>
</linearGradient>
<path d="M5,11v6c0,3.3,2.7,6,6,6h8c3.3,0,6-2.7,6-6v-6H5z" fill="url(#SVGID_8_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="14.9995" x2="14.9995" y1="12" y2="22.0005">
-<stop offset="0" style="stop-color:#8C8C8C"/>
-<stop offset="0.5" style="stop-color:#636363"/>
-<stop offset="1" style="stop-color:#1C1C1C"/>
+ <stop offset="0" style="stop-color:#8C8C8C"/>
+ <stop offset="0.5" style="stop-color:#636363"/>
+ <stop offset="1" style="stop-color:#1C1C1C"/>
</linearGradient>
<path d="M11,22c-2.757,0-5-2.243-5-5v-5h18v5c0,2.757-2.243,5-5,5H11z" fill="url(#SVGID_9_)"/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_collapse.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_collapse.svg Fri May 14 16:09:54 2010 +0300
@@ -1,16 +1,23 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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"/>
-<polygon fill-opacity="0.2" points="24,13.88,17.99,13.88,17.99,8,13.99,8,13.99,13.88,8,13.88,8,17.88,13.99,17.88,13.99,24,17.99,24,17.99,17.88,24,17.88" stroke-opacity="0.2"/>
<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="28" x="1" y="1"/>
<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="28" x="1" y="28"/>
-<polygon fill="#FFFFFF" points="23,12.88,16.99,12.88,16.99,7,12.99,7,12.99,12.88,7,12.88,7,16.88,12.99,16.88,12.99,23,16.99,23,16.99,16.88,23,16.88"/>
+<polygon fill-opacity="0.2" points="23.99,14,7.99,14,7.99,18,23.99,18" stroke-opacity="0.2"/>
+<polygon fill="#FFFFFF" points="23,13,7,13,7,17,23,17"/>
<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="1.175" y2="29.18">
-<stop offset="0" stop-color="#4EDEFF"/>
-<stop offset="1" stop-color="#048CC6"/>
+
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="1" y2="29.19">
+
+<stop offset="0" stop-color="#F7992E"/>
+
+<stop offset="1" stop-color="#D82E09"/>
+
</linearGradient>
+
</defs>
-</svg>
+</g>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_company_details.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_company_details.svg Fri May 14 16:09:54 2010 +0300
@@ -1,88 +1,90 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
-<rect fill-opacity="0.6" height="21" stroke-opacity="0.6" width="15" x="14" y="8"/>
+<rect height="21" opacity="0.6" width="15" x="14" y="8"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="21.5" x2="21.5" y1="9.2114" y2="27.8131">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#787878"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#787878"/>
</linearGradient>
<rect fill="url(#SVGID_1_)" height="19" width="13" x="15" y="9"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="23.5" x2="23.5" y1="14" y2="11">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+ <stop offset="0" style="stop-color:#A0F800"/>
+ <stop offset="1" style="stop-color:#319E00"/>
</linearGradient>
<rect fill="url(#SVGID_2_)" height="3" width="9" x="19" y="11"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="23.5" x2="23.5" y1="19" y2="16">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+ <stop offset="0" style="stop-color:#A0F800"/>
+ <stop offset="1" style="stop-color:#319E00"/>
</linearGradient>
<rect fill="url(#SVGID_3_)" height="3" width="9" x="19" y="16"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="23.5" x2="23.5" y1="24" y2="21">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+ <stop offset="0" style="stop-color:#A0F800"/>
+ <stop offset="1" style="stop-color:#319E00"/>
</linearGradient>
<rect fill="url(#SVGID_4_)" height="3" width="9" x="19" y="21"/>
-<rect fill-opacity="0.6" height="28" stroke-opacity="0.6" width="19" x="1" y="1"/>
+<rect height="28" opacity="0.6" width="19" x="1" y="1"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="10.4995" x2="10.4995" y1="2.2896" y2="27.7443">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#787878"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#787878"/>
</linearGradient>
<rect fill="url(#SVGID_5_)" height="26" width="17" x="2" y="2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="5.5" x2="5.5" y1="4.0557" y2="8.9507">
-<stop offset="0" style="stop-color:#30BCE8"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+ <stop offset="0" style="stop-color:#30BCE8"/>
+ <stop offset="1" style="stop-color:#048CC6"/>
</linearGradient>
<rect fill="url(#SVGID_6_)" height="5" width="3" x="4" y="4"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="3" x="4" y="8"/>
+<rect fill="#FFFFFF" height="1" opacity="0.4" width="3" x="4" y="8"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="5.5" x2="5.5" y1="12.0557" y2="16.9512">
-<stop offset="0" style="stop-color:#30BCE8"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+ <stop offset="0" style="stop-color:#30BCE8"/>
+ <stop offset="1" style="stop-color:#048CC6"/>
</linearGradient>
<rect fill="url(#SVGID_7_)" height="5" width="3" x="4" y="12"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="3" x="4" y="16"/>
+<rect fill="#FFFFFF" height="1" opacity="0.4" width="3" x="4" y="16"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="5.5" x2="5.5" y1="20.0557" y2="24.9507">
-<stop offset="0" style="stop-color:#30BCE8"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+ <stop offset="0" style="stop-color:#30BCE8"/>
+ <stop offset="1" style="stop-color:#048CC6"/>
</linearGradient>
<rect fill="url(#SVGID_8_)" height="5" width="3" x="4" y="20"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="3" x="4" y="24"/>
+<rect fill="#FFFFFF" height="1" opacity="0.4" width="3" x="4" y="24"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="10.5" x2="10.5" y1="4.0557" y2="8.9507">
-<stop offset="0" style="stop-color:#30BCE8"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+ <stop offset="0" style="stop-color:#30BCE8"/>
+ <stop offset="1" style="stop-color:#048CC6"/>
</linearGradient>
<rect fill="url(#SVGID_9_)" height="5" width="3" x="9" y="4"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="3" x="9" y="8"/>
+<rect fill="#FFFFFF" height="1" opacity="0.4" width="3" x="9" y="8"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="10.5" x2="10.5" y1="12.0557" y2="16.9512">
-<stop offset="0" style="stop-color:#30BCE8"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+ <stop offset="0" style="stop-color:#30BCE8"/>
+ <stop offset="1" style="stop-color:#048CC6"/>
</linearGradient>
<rect fill="url(#SVGID_10_)" height="5" width="3" x="9" y="12"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="3" x="9" y="16"/>
+<rect fill="#FFFFFF" height="1" opacity="0.4" width="3" x="9" y="16"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="10.5" x2="10.5" y1="20.0557" y2="24.9507">
-<stop offset="0" style="stop-color:#30BCE8"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+ <stop offset="0" style="stop-color:#30BCE8"/>
+ <stop offset="1" style="stop-color:#048CC6"/>
</linearGradient>
<rect fill="url(#SVGID_11_)" height="5" width="3" x="9" y="20"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="3" x="9" y="24"/>
+<rect fill="#FFFFFF" height="1" opacity="0.4" width="3" x="9" y="24"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="15.4995" x2="15.4995" y1="4.0557" y2="8.9507">
-<stop offset="0" style="stop-color:#30BCE8"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+ <stop offset="0" style="stop-color:#30BCE8"/>
+ <stop offset="1" style="stop-color:#048CC6"/>
</linearGradient>
<rect fill="url(#SVGID_12_)" height="5" width="3" x="14" y="4"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="3" x="14" y="8"/>
+<rect fill="#FFFFFF" height="1" opacity="0.4" width="3" x="14" y="8"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_13_" x1="15.4995" x2="15.4995" y1="12.0557" y2="16.9512">
-<stop offset="0" style="stop-color:#30BCE8"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+ <stop offset="0" style="stop-color:#30BCE8"/>
+ <stop offset="1" style="stop-color:#048CC6"/>
</linearGradient>
<rect fill="url(#SVGID_13_)" height="5" width="3" x="14" y="12"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="3" x="14" y="16"/>
+<rect fill="#FFFFFF" height="1" opacity="0.4" width="3" x="14" y="16"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_14_" x1="15.4995" x2="15.4995" y1="20.0557" y2="24.9507">
-<stop offset="0" style="stop-color:#30BCE8"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+ <stop offset="0" style="stop-color:#30BCE8"/>
+ <stop offset="1" style="stop-color:#048CC6"/>
</linearGradient>
<rect fill="url(#SVGID_14_)" height="5" width="3" x="14" y="20"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="3" x="14" y="24"/>
+<rect fill="#FFFFFF" height="1" opacity="0.4" width="3" x="14" y="24"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_connected.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_connected.svg Fri May 14 16:09:54 2010 +0300
@@ -1,19 +1,19 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
<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"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="2" y2="28.0005">
+ <stop offset="0" style="stop-color:#A0F800"/>
+ <stop offset="1" style="stop-color:#319E00"/>
+</linearGradient>
<circle cx="15" cy="15" fill="url(#SVGID_1_)" r="13"/>
-<polygon fill-opacity="0.2" points="23.172,9 13.979,18.192 9.736,13.95 6.908,16.778 13.979,23.85 26,11.829 " stroke-opacity="0.2"/>
+<polygon opacity="0.2" points="23.172,9 13.979,18.192 9.736,13.95 6.908,16.778 13.979,23.85 26,11.829 "/>
<polygon fill="#FFFFFF" points="21.717,7.575 12.525,16.768 8.282,12.525 5.454,15.354 12.525,22.425 24.546,10.404 "/>
-<path d="M15,3c7.011,0,12.71,5.555,12.975,12.5C27.981,15.332,28,15.169,28,15c0-7.18-5.82-13-13-13 S2,7.82,2,15c0,0.169,0.019,0.332,0.025,0.5C2.29,8.555,7.989,3,15,3z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="2" y2="28.0005">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
-</linearGradient>
-</defs>
+<path d="M15,3c7.011,0,12.71,5.555,12.975,12.5C27.981,15.332,28,15.169,28,15c0-7.18-5.82-13-13-13 S2,7.82,2,15c0,0.169,0.019,0.332,0.025,0.5C2.29,8.555,7.989,3,15,3z" fill="#FFFFFF" opacity="0.4"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_connection.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_connection.svg Fri May 14 16:09:54 2010 +0300
@@ -1,37 +1,34 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
-<path d="M29.58,12.911L19.063,2.596c-0.339-0.333-0.685-0.402-0.916-0.402c-0.564,0-1.165,0.449-1.165,1.281v4.399 h-7.73c-0.842,0-1.525,0.689-1.525,1.537v4.051c0,0.847,0.684,1.535,1.525,1.535h19.482c0.555,0,0.998-0.273,1.186-0.73 C30.105,13.808,29.979,13.301,29.58,12.911z" fill-opacity="0.35" stroke-opacity="0.35"/>
+<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" opacity="0.35"/>
+<path d="M29.58,12.911L19.063,2.596c-0.339-0.333-0.685-0.402-0.916-0.402c-0.564,0-1.165,0.449-1.165,1.281v4.399 h-7.73c-0.842,0-1.525,0.689-1.525,1.537v4.051c0,0.847,0.684,1.535,1.525,1.535h19.482c0.555,0,0.998-0.273,1.186-0.73 C30.105,13.808,29.979,13.301,29.58,12.911z" opacity="0.35"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="11.1406" x2="11.1406" y1="16.103" y2="27.0009">
-<stop offset="0" style="stop-color:#CDEDBD"/>
-<stop offset="0.9879" style="stop-color:#139900"/>
-<stop offset="1" style="stop-color:#139900"/>
+ <stop offset="0" style="stop-color:#CDEDBD"/>
+ <stop offset="0.9879" style="stop-color:#139900"/>
</linearGradient>
<path d="M21.279,20.589c0,0.294-0.236,0.538-0.527,0.538h-8.205c-0.287,0-0.525,0.241-0.525,0.537v4.861 c0,0.295-0.172,0.37-0.38,0.165L1.125,16.373c-0.211-0.205-0.144-0.372,0.145-0.372h19.482c0.289,0,0.527,0.241,0.527,0.537V20.589z " fill="url(#SVGID_1_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="11.7783" x2="11.7783" y1="17.0737" y2="24.8819">
-<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"/>
+ <stop offset="0" style="stop-color:#82C94C"/>
+ <stop offset="0.2545" style="stop-color:#439020"/>
+ <stop offset="0.5091" style="stop-color:#0D4D07"/>
</linearGradient>
<path d="M3.336,17.06h16.885v3.009h-7.674c-0.872,0-1.584,0.715-1.584,1.596v2.878L3.336,17.06z" fill="url(#SVGID_2_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="18.8643" x2="18.8643" y1="3.2227" y2="14.1618">
-<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"/>
+ <stop offset="0.4909" style="stop-color:#CDEDBD"/>
+ <stop offset="0.9879" style="stop-color:#139900"/>
</linearGradient>
<path d="M8.727,9.411c0-0.296,0.235-0.537,0.525-0.537h8.206c0.288,0,0.524-0.242,0.524-0.538V3.475 c0-0.297,0.172-0.37,0.381-0.165l10.516,10.315c0.211,0.205,0.144,0.372-0.145,0.372H9.252c-0.289,0-0.525-0.241-0.525-0.535V9.411z " fill="url(#SVGID_3_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="18.2266" x2="18.2266" y1="5.4292" y2="12.9712">
-<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"/>
+ <stop offset="0" style="stop-color:#B2F56E"/>
+ <stop offset="0.703" style="stop-color:#439020"/>
+ <stop offset="0.9879" style="stop-color:#0D4D07"/>
</linearGradient>
<path d="M9.785,12.938V9.933h7.673c0.872,0,1.583-0.718,1.583-1.597V5.458l7.627,7.48H9.785z" fill="url(#SVGID_4_)"/>
<rect fill="none" height="30" width="30" x="0.002"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_contacts.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_contacts.svg Fri May 14 16:09:54 2010 +0300
@@ -1,42 +1,44 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
+<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" opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="18" x2="18" y1="2" y2="28.0005">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+ <stop offset="0" style="stop-color:#A0F800"/>
+ <stop offset="1" style="stop-color:#319E00"/>
</linearGradient>
<rect fill="url(#SVGID_1_)" height="26" width="18" x="9" y="2"/>
-<path d="M19.134,16.857c-0.005-0.08,0-0.161,0.002-0.242c0.532-0.371,0.993-0.9,1.274-1.472 c0.52-1.056,0.389-3.753,0.389-3.753c0-1.102-1.65-2.391-2.725-2.391h-0.386c-1.075,0-2.726,1.289-2.726,2.391 c0,0-0.098,2.688,0.39,3.753c0.267,0.582,0.736,1.116,1.281,1.487c0.001,0.075,0.007,0.151,0.002,0.227 c-0.066,1.08-3.579,2.914-3.751,3.148V23h10v-2.992C22.713,19.772,19.2,17.938,19.134,16.857z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M19.134,16.857c-0.005-0.08,0-0.161,0.002-0.242c0.532-0.371,0.993-0.9,1.274-1.472 c0.52-1.056,0.389-3.753,0.389-3.753c0-1.102-1.65-2.391-2.725-2.391h-0.386c-1.075,0-2.726,1.289-2.726,2.391 c0,0-0.098,2.688,0.39,3.753c0.267,0.582,0.736,1.116,1.281,1.487c0.001,0.075,0.007,0.151,0.002,0.227 c-0.066,1.08-3.579,2.914-3.751,3.148V23h10v-2.992C22.713,19.772,19.2,17.938,19.134,16.857z" opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="7" x2="7" y1="2" y2="28.0005">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#A5A5A5"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#A5A5A5"/>
</linearGradient>
<rect fill="url(#SVGID_2_)" height="26" width="4" x="5" y="2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="5" x2="5" y1="6.75" y2="8.75">
-<stop offset="0" style="stop-color:#ABABAB"/>
-<stop offset="1" style="stop-color:#4F4F4F"/>
+ <stop offset="0" style="stop-color:#ABABAB"/>
+ <stop offset="1" style="stop-color:#4F4F4F"/>
</linearGradient>
<path d="M7,8c0,0.55-0.45,1-1,1H4C3.45,9,3,8.55,3,8l0,0c0-0.55,0.45-1,1-1h2C6.55,7,7,7.45,7,8L7,8z" fill="url(#SVGID_3_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="5" x2="5" y1="11.75" y2="13.75">
-<stop offset="0" style="stop-color:#ABABAB"/>
-<stop offset="1" style="stop-color:#4F4F4F"/>
+ <stop offset="0" style="stop-color:#ABABAB"/>
+ <stop offset="1" style="stop-color:#4F4F4F"/>
</linearGradient>
<path d="M7,13c0,0.55-0.45,1-1,1H4c-0.55,0-1-0.45-1-1l0,0c0-0.55,0.45-1,1-1h2C6.55,12,7,12.45,7,13L7,13z" fill="url(#SVGID_4_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="5" x2="5" y1="16.75" y2="18.75">
-<stop offset="0" style="stop-color:#ABABAB"/>
-<stop offset="1" style="stop-color:#4F4F4F"/>
+ <stop offset="0" style="stop-color:#ABABAB"/>
+ <stop offset="1" style="stop-color:#4F4F4F"/>
</linearGradient>
<path d="M7,18c0,0.55-0.45,1-1,1H4c-0.55,0-1-0.45-1-1l0,0c0-0.55,0.45-1,1-1h2C6.55,17,7,17.45,7,18L7,18z" fill="url(#SVGID_5_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="5" x2="5" y1="21.75" y2="23.75">
-<stop offset="0" style="stop-color:#ABABAB"/>
-<stop offset="1" style="stop-color:#4F4F4F"/>
+ <stop offset="0" style="stop-color:#ABABAB"/>
+ <stop offset="1" style="stop-color:#4F4F4F"/>
</linearGradient>
<path d="M7,23c0,0.55-0.45,1-1,1H4c-0.55,0-1-0.45-1-1l0,0c0-0.55,0.45-1,1-1h2C6.55,22,7,22.45,7,23L7,23z" fill="url(#SVGID_6_)"/>
<path d="M19.134,15.857c-0.005-0.08,0-0.161,0.002-0.242c0.532-0.371,0.993-0.9,1.274-1.472 c0.52-1.056,0.389-3.753,0.389-3.753c0-1.102-1.65-2.391-2.725-2.391h-0.386c-1.075,0-2.726,1.289-2.726,2.391 c0,0-0.098,2.688,0.39,3.753c0.267,0.582,0.736,1.116,1.281,1.487c0.001,0.075,0.007,0.151,0.002,0.227 c-0.066,1.08-3.579,2.914-3.751,3.148V22h10v-2.992C22.713,18.772,19.2,16.938,19.134,15.857z" fill="#FFFFFF"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="22" x="5" y="2"/>
+<rect fill="#FFFFFF" height="1" opacity="0.4" width="22" x="5" y="2"/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_corrupted.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_corrupted.svg Fri May 14 16:09:54 2010 +0300
@@ -1,17 +1,19 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
<polygon fill-opacity="0.6" points="29,2 14.405,2 12,8.615 20.064,16.679 14.838,28 29,28 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="20.7363" x2="20.7363" y1="27" y2="3.4999">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#666666"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#666666"/>
</linearGradient>
<polygon fill="url(#SVGID_1_)" points="28,3 15.514,3 13.473,8.615 21.537,16.679 16.772,27 28,27 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="19.9287" x2="19.9287" y1="21.125" y2="9.0729">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</linearGradient>
<polygon fill="url(#SVGID_2_)" points="26,9 13.858,9 21.537,16.679 19.542,21 26,21 "/>
<polygon fill="#F1F1F2" points="17,7 17,5 14.787,5 14.06,7 "/>
@@ -20,38 +22,38 @@
<polygon fill="#F1F1F2" points="14,23 14,25 14.392,25 15.314,23 "/>
<rect fill="#F1F1F2" height="2" width="3" x="19" y="23"/>
<rect fill="#F1F1F2" height="2" width="2" x="24" y="23"/>
-<polygon fill="#FFFFFF" fill-opacity="0.3" points="28,4 28,3 15.514,3 15.15,4 " stroke-opacity="0.3"/>
-<polygon fill="#FFFFFF" fill-opacity="0.1" points="28,26 17.234,26 16.772,27 28,27 " stroke-opacity="0.1"/>
-<polygon fill="#FFFFFF" fill-opacity="0.3" points="26,20 20.004,20 19.542,21 26,21 " stroke-opacity="0.3"/>
-<polygon fill="#00006B" fill-opacity="0.2" points="26,9 13.858,9 14.858,10 26,10 " stroke-opacity="0.2"/>
-<polygon fill-opacity="0.1" points="17,6 17,5 14.787,5 14.423,6 " stroke-opacity="0.1"/>
-<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="3" x="19" y="5"/>
-<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="2" x="24" y="5"/>
+<polygon fill="#FFFFFF" opacity="0.3" points="28,4 28,3 15.514,3 15.15,4 "/>
+<polygon fill="#FFFFFF" opacity="0.1" points="28,26 17.234,26 16.772,27 28,27 "/>
+<polygon fill="#FFFFFF" opacity="0.3" points="26,20 20.004,20 19.542,21 26,21 "/>
+<polygon fill="#00006B" opacity="0.2" points="26,9 13.858,9 14.858,10 26,10 "/>
+<polygon opacity="0.1" points="17,6 17,5 14.787,5 14.423,6 "/>
+<rect height="1" opacity="0.1" width="3" x="19" y="5"/>
+<rect height="1" opacity="0.1" width="2" x="24" y="5"/>
<polygon fill-opacity="0.6" points="9,9.385 11.686,2 1,2 1,28 12.007,28 16.936,17.321 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="9.4683" x2="9.4683" y1="27" y2="3.4999">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#666666"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#666666"/>
</linearGradient>
<polygon fill="url(#SVGID_3_)" points="9,9.385 11.321,3 2,3 2,27 12.469,27 16.936,17.321 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="10.4683" x2="10.4683" y1="21.125" y2="9.0729">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</linearGradient>
<polygon fill="url(#SVGID_4_)" points="9,9.385 9.14,9 4,9 4,21 15.238,21 16.936,17.321 "/>
<rect fill="#F1F1F2" height="2" width="2" x="4" y="5"/>
<polygon fill="#F1F1F2" points="8,5 8,7 9.867,7 10.595,5 "/>
<rect fill="#F1F1F2" height="2" width="2" x="4" y="23"/>
<rect fill="#F1F1F2" height="2" width="3" x="8" y="23"/>
-<polygon fill="#FFFFFF" fill-opacity="0.3" points="2,3 2,4 10.958,4 11.321,3 " stroke-opacity="0.3"/>
-<polygon fill="#FFFFFF" fill-opacity="0.1" points="2,26 2,27 12.469,27 12.93,26 " stroke-opacity="0.1"/>
-<polygon fill="#FFFFFF" fill-opacity="0.3" points="4,20 4,21 15.238,21 15.699,20 " stroke-opacity="0.3"/>
-<polygon fill="#00006B" fill-opacity="0.2" points="9.14,9 4,9 4,10 9.614,10 9,9.385 " stroke-opacity="0.2"/>
-<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="2" x="4" y="5"/>
-<polygon fill-opacity="0.1" points="8,5 8,6 10.23,6 10.595,5 " stroke-opacity="0.1"/>
-<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="2" x="4" y="23"/>
-<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="3" x="8" y="23"/>
-<polygon fill-opacity="0.1" points="13,23 13,24 13.854,24 14.314,23 " stroke-opacity="0.1"/>
-<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="3" x="19" y="23"/>
-<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="2" x="24" y="23"/>
+<polygon fill="#FFFFFF" opacity="0.3" points="2,3 2,4 10.958,4 11.321,3 "/>
+<polygon fill="#FFFFFF" opacity="0.1" points="2,26 2,27 12.469,27 12.93,26 "/>
+<polygon fill="#FFFFFF" opacity="0.3" points="4,20 4,21 15.238,21 15.699,20 "/>
+<polygon fill="#00006B" opacity="0.2" points="9.14,9 4,9 4,10 9.614,10 9,9.385 "/>
+<rect height="1" opacity="0.1" width="2" x="4" y="5"/>
+<polygon opacity="0.1" points="8,5 8,6 10.23,6 10.595,5 "/>
+<rect height="1" opacity="0.1" width="2" x="4" y="23"/>
+<rect height="1" opacity="0.1" width="3" x="8" y="23"/>
+<polygon opacity="0.1" points="13,23 13,24 13.854,24 14.314,23 "/>
+<rect height="1" opacity="0.1" width="3" x="19" y="23"/>
+<rect height="1" opacity="0.1" width="2" x="24" y="23"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_day.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_day.svg Fri May 14 16:09:54 2010 +0300
@@ -1,46 +1,48 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
+<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" opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="10.3691" y2="27.0025">
-<stop offset="0" style="stop-color:#F9F9F9"/>
-<stop offset="1" style="stop-color:#B5B5B5"/>
+ <stop offset="0" style="stop-color:#F9F9F9"/>
+ <stop offset="1" style="stop-color:#B5B5B5"/>
</linearGradient>
<rect fill="url(#SVGID_1_)" height="22" width="22" x="4" y="5"/>
<polygon fill="#FFFFFF" points="21,22 21,27 26,22 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="5" y2="11">
-<stop offset="0" style="stop-color:#FF7042"/>
-<stop offset="1" style="stop-color:#991B23"/>
+ <stop offset="0" style="stop-color:#FF7042"/>
+ <stop offset="1" style="stop-color:#991B23"/>
</linearGradient>
<rect fill="url(#SVGID_2_)" height="6" width="22" x="4" y="5"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="10" x2="10" y1="6" y2="10">
-<stop offset="0" style="stop-color:#4A050A"/>
-<stop offset="1" style="stop-color:#B00F25"/>
+ <stop offset="0" style="stop-color:#4A050A"/>
+ <stop offset="1" style="stop-color:#B00F25"/>
</linearGradient>
<circle cx="10" cy="8" fill="url(#SVGID_3_)" r="2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="20" x2="20" y1="6" y2="10">
-<stop offset="0" style="stop-color:#4A050A"/>
-<stop offset="1" style="stop-color:#B00F25"/>
+ <stop offset="0" style="stop-color:#4A050A"/>
+ <stop offset="1" style="stop-color:#B00F25"/>
</linearGradient>
<circle cx="20" cy="8" fill="url(#SVGID_4_)" r="2"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="22" x="4" y="5"/>
+<rect fill="#FFFFFF" height="1" opacity="0.4" width="22" x="4" y="5"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="10" x2="10" y1="3" y2="9">
-<stop offset="0" style="stop-color:#FFFCFE"/>
-<stop offset="1" style="stop-color:#8C8C8C"/>
+ <stop offset="0" style="stop-color:#FFFCFE"/>
+ <stop offset="1" style="stop-color:#8C8C8C"/>
</linearGradient>
<path d="M11,8c0,0.55-0.45,1-1,1l0,0C9.45,9,9,8.55,9,8V4c0-0.55,0.45-1,1-1l0,0c0.55,0,1,0.45,1,1V8z" fill="url(#SVGID_5_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="20" x2="20" y1="3" y2="9">
-<stop offset="0" style="stop-color:#FFFCFE"/>
-<stop offset="1" style="stop-color:#8C8C8C"/>
+ <stop offset="0" style="stop-color:#FFFCFE"/>
+ <stop offset="1" style="stop-color:#8C8C8C"/>
</linearGradient>
<path d="M21,8c0,0.55-0.45,1-1,1l0,0c-0.55,0-1-0.45-1-1V4c0-0.55,0.45-1,1-1l0,0c0.55,0,1,0.45,1,1V8z" fill="url(#SVGID_6_)"/>
-<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="22" x="4" y="11"/>
+<rect height="1" opacity="0.2" width="22" x="4" y="11"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="15.0005" x2="15.0005" y1="23.834" y2="13.7479">
-<stop offset="0" style="stop-color:#303030"/>
-<stop offset="1" style="stop-color:#000000"/>
+ <stop offset="0" style="stop-color:#303030"/>
+ <stop offset="1" style="stop-color:#000000"/>
</linearGradient>
<path d="M18.019,22.906V24h-6.036v-1.094h2.146v-7.629l-2.146,0.492v-1.094l3.015-0.95h0.991v9.181H18.019z" fill="url(#SVGID_7_)"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_disconnected.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_disconnected.svg Fri May 14 16:09:54 2010 +0300
@@ -1,30 +1,30 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="30" width="30" x="0"/>
<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"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="2" y2="28.0005">
+ <stop offset="0" style="stop-color:#CCF87C"/>
+ <stop offset="1" style="stop-color:#689E4F"/>
+</linearGradient>
<circle cx="15" cy="15" fill="url(#SVGID_1_)" r="13"/>
-<path d="M15,3c7.01,0,12.709,5.555,12.975,12.5C27.981,15.332,28,15.169,28,15c0-7.18-5.82-13-13-13 C7.82,2,2,7.82,2,15c0,0.169,0.019,0.332,0.025,0.5C2.29,8.555,7.989,3,15,3z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M15,3c7.01,0,12.709,5.555,12.975,12.5C27.981,15.332,28,15.169,28,15c0-7.18-5.82-13-13-13 C7.82,2,2,7.82,2,15c0,0.169,0.019,0.332,0.025,0.5C2.29,8.555,7.989,3,15,3z" fill="#FFFFFF" opacity="0.4"/>
<polygon fill="#F0F0F0" points="21.717,7.576 12.525,16.768 8.283,12.525 5.455,15.354 12.525,22.425 24.547,10.404 "/>
-<rect fill-opacity="0.5" height="3" stroke-opacity="0.5" transform="matrix(0.7071 0.7071 -0.7071 0.7071 16.5104 -10.5666)" width="1" x="20.51" y="13.147"/>
-<rect fill-opacity="0.5" height="2" stroke-opacity="0.5" transform="matrix(0.7071 0.7071 -0.7071 0.7071 15.1925 -13.7483)" width="1" x="23.692" y="10.465"/>
-<rect fill-opacity="0.5" height="3" stroke-opacity="0.5" transform="matrix(0.7071 0.7071 -0.7071 0.7071 12.0966 -11.2234)" width="1" x="19.096" y="7.49"/>
-<rect fill-opacity="0.5" height="3" stroke-opacity="0.5" transform="matrix(0.7071 0.7071 -0.7071 0.7071 17.975 -7.0313)" width="1" x="16.975" y="16.682"/>
-<rect fill-opacity="0.5" height="3" stroke-opacity="0.5" transform="matrix(0.7071 0.7071 -0.7071 0.7071 13.5609 -7.6881)" width="1" x="15.561" y="11.025"/>
-<rect fill-opacity="0.5" height="3" stroke-opacity="0.5" transform="matrix(0.7071 0.7071 -0.7071 0.7071 19.4396 -3.4957)" width="1" x="13.44" y="20.218"/>
-<rect fill-opacity="0.5" height="2" stroke-opacity="0.5" transform="matrix(0.7074 0.7069 -0.7069 0.7074 14.8717 -4.507)" width="1" x="12.379" y="14.707"/>
-<rect fill-opacity="0.5" height="1.001" stroke-opacity="0.5" transform="matrix(0.7071 0.7071 -0.7071 0.7071 12.6318 -13.9304)" width="3" x="21.632" y="7.782"/>
-<rect fill-opacity="0.5" height="1" stroke-opacity="0.5" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 2.9036 43.2242)" width="3" x="8.904" y="20.511"/>
-<rect fill-opacity="0.5" height="1.001" stroke-opacity="0.5" transform="matrix(-0.7069 -0.7073 0.7073 -0.7069 -0.6353 34.686)" width="3" x="5.368" y="16.974"/>
-<rect fill-opacity="0.5" height="1" stroke-opacity="0.5" transform="matrix(0.7071 0.7071 -0.7071 0.7071 12.1969 -2.981)" width="3" x="8.197" y="12.732"/>
-<rect fill-opacity="0.5" height="3" stroke-opacity="0.5" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 0.661 28.1527)" width="1" x="5.661" y="12.44"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="2" y2="28.0005">
-<stop offset="0" style="stop-color:#CCF87C"/>
-<stop offset="1" style="stop-color:#689E4F"/>
-</linearGradient>
-</defs>
+<rect height="3" opacity="0.5" transform="matrix(0.7071 0.7071 -0.7071 0.7071 16.5104 -10.5666)" width="1" x="20.51" y="13.147"/>
+<rect height="2" opacity="0.5" transform="matrix(0.7071 0.7071 -0.7071 0.7071 15.1925 -13.7483)" width="1" x="23.692" y="10.465"/>
+<rect height="3" opacity="0.5" transform="matrix(0.7071 0.7071 -0.7071 0.7071 12.0966 -11.2234)" width="1" x="19.096" y="7.49"/>
+<rect height="3" opacity="0.5" transform="matrix(0.7071 0.7071 -0.7071 0.7071 17.975 -7.0313)" width="1" x="16.975" y="16.682"/>
+<rect height="3" opacity="0.5" transform="matrix(0.7071 0.7071 -0.7071 0.7071 13.5609 -7.6881)" width="1" x="15.561" y="11.025"/>
+<rect height="3" opacity="0.5" transform="matrix(0.7071 0.7071 -0.7071 0.7071 19.4396 -3.4957)" width="1" x="13.44" y="20.218"/>
+<rect height="2" opacity="0.5" transform="matrix(0.7074 0.7069 -0.7069 0.7074 14.8717 -4.507)" width="1" x="12.379" y="14.707"/>
+<rect height="1.001" opacity="0.5" transform="matrix(0.7071 0.7071 -0.7071 0.7071 12.6318 -13.9304)" width="3" x="21.632" y="7.782"/>
+<rect height="1" opacity="0.5" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 2.9036 43.2242)" width="3" x="8.904" y="20.511"/>
+<rect height="1.001" opacity="0.5" transform="matrix(-0.7069 -0.7073 0.7073 -0.7069 -0.6353 34.686)" width="3" x="5.368" y="16.974"/>
+<rect height="1" opacity="0.5" transform="matrix(0.7071 0.7071 -0.7071 0.7071 12.1969 -2.981)" width="3" x="8.197" y="12.732"/>
+<rect height="3" opacity="0.5" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 0.661 28.1527)" width="1" x="5.661" y="12.44"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_draft.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_draft.svg Fri May 14 16:09:54 2010 +0300
@@ -1,45 +1,43 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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="14.9995" x2="14.9995" y1="2" y2="28.0005">
+ <stop offset="0" style="stop-color:#F9F9F9"/>
+ <stop offset="1" style="stop-color:#B5B5B5"/>
+</linearGradient>
<polygon fill="url(#SVGID_1_)" points="4,2 4,28 20,28 26,22 26,2 "/>
<polygon fill="#FFFFFF" points="26,22 20,22 20,28 "/>
-<rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="16" x="7" y="6.5"/>
-<rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="16" x="7" y="10.5"/>
-<rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="11" x="7" y="14.5"/>
+<rect enable-background="new " height="1.5" opacity="0.5" width="16" x="7" y="6.5"/>
+<rect enable-background="new " height="1.5" opacity="0.5" width="16" x="7" y="10.5"/>
+<rect enable-background="new " height="1.5" opacity="0.5" width="11" x="7" y="14.5"/>
<g>
-<rect height="1" width="2" x="7" y="28"/>
-<rect height="1" width="2" x="5" y="1"/>
-<rect height="1" width="2" x="3" y="28"/>
-<rect height="1" width="2" x="11" y="28"/>
-<rect height="1" width="2" x="9" y="1"/>
-<rect height="1" width="2" x="13" y="1"/>
-<rect height="2" width="1" x="3" y="25"/>
-<rect height="2" width="1" x="3" y="1"/>
-<rect height="2" width="1" x="3" y="9"/>
-<rect height="2" width="1" x="3" y="21"/>
-<rect height="2" width="1" x="3" y="17"/>
-<rect height="2" width="1" x="3" y="13"/>
-<rect height="1" width="2" x="21" y="1"/>
-<rect height="2" width="1" x="26" y="15.143"/>
-<rect height="2" width="1" x="26" y="19.143"/>
-<rect height="2" width="1" x="26" y="7.143"/>
-<rect height="1" width="2" x="15" y="28"/>
-<rect height="2" width="1" x="26" y="11.143"/>
-<rect height="2" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 26.9375 57.7243)" width="1" x="24.924" y="22.283"/>
-<polygon points="19,28 19,29 20.414,29 20.828,28.586 20.242,28 "/>
-<rect height="2" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 20.1098 60.5524)" width="1" x="22.096" y="25.111"/>
-<rect height="1" width="2" x="17" y="1"/>
-<rect height="1" width="2" x="25" y="1"/>
-<rect height="2" width="1" x="3" y="5"/>
-<rect height="2" width="1" x="26" y="3"/>
+ <rect height="1" width="2" x="7" y="28"/>
+ <rect height="1" width="2" x="5" y="1"/>
+ <rect height="1" width="2" x="3" y="28"/>
+ <rect height="1" width="2" x="11" y="28"/>
+ <rect height="1" width="2" x="9" y="1"/>
+ <rect height="1" width="2" x="13" y="1"/>
+ <rect height="2" width="1" x="3" y="25"/>
+ <rect height="2" width="1" x="3" y="1"/>
+ <rect height="2" width="1" x="3" y="9"/>
+ <rect height="2" width="1" x="3" y="21"/>
+ <rect height="2" width="1" x="3" y="17"/>
+ <rect height="2" width="1" x="3" y="13"/>
+ <rect height="1" width="2" x="21" y="1"/>
+ <rect height="2" width="1" x="26" y="15.143"/>
+ <rect height="2" width="1" x="26" y="19.143"/>
+ <rect height="2" width="1" x="26" y="7.143"/>
+ <rect height="1" width="2" x="15" y="28"/>
+ <rect height="2" width="1" x="26" y="11.143"/>
+ <rect height="2" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 26.9375 57.7243)" width="1" x="24.924" y="22.283"/>
+ <polygon points="19,28 19,29 20.414,29 20.828,28.586 20.242,28 "/>
+ <rect height="2" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 20.1098 60.5524)" width="1" x="22.096" y="25.111"/>
+ <rect height="1" width="2" x="17" y="1"/>
+ <rect height="1" width="2" x="25" y="1"/>
+ <rect height="2" width="1" x="3" y="5"/>
+ <rect height="2" width="1" x="26" y="3"/>
</g>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="2" y2="28.0005">
-<stop offset="0" style="stop-color:#F9F9F9"/>
-<stop offset="1" style="stop-color:#B5B5B5"/>
-</linearGradient>
-</defs>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_email.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_email.svg Fri May 14 16:09:54 2010 +0300
@@ -1,19 +1,19 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
+<path d="M15,29C7.28,29,1,22.72,1,15S7.28,1,15,1s14,6.28,14,14S22.72,29,15,29L15,29z" opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="1.9409" y2="28.3052">
+ <stop offset="0" style="stop-color:#4EDEFF"/>
+ <stop offset="1" style="stop-color:#048CC6"/>
+</linearGradient>
<circle cx="15" cy="15" fill="url(#SVGID_1_)" r="13"/>
-<path d="M15,3c7.012,0,12.71,5.555,12.975,12.5C27.98,15.333,28,15.169,28,15c0-7.179-5.82-13-13-13 S2,7.821,2,15c0,0.169,0.02,0.333,0.025,0.5C2.29,8.555,7.988,3,15,3z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M24.75,16.235c0,1.563-0.315,2.916-0.943,4.059c-0.762,1.408-1.864,2.115-3.307,2.115 c-1.401,0-2.413-0.707-3.045-2.115c-0.762,0.824-1.744,1.237-2.948,1.237c-1.415,0-2.546-0.542-3.401-1.621 c-0.792-1.001-1.189-2.217-1.189-3.66c0-1.451,0.397-2.662,1.189-3.638c0.844-1.053,1.979-1.574,3.401-1.574 c1.06,0,1.894,0.286,2.503,0.863v-0.635h2.055v7.098c0,1.377,0.477,2.068,1.436,2.068c0.782,0,1.385-0.541,1.807-1.62 c0.311-0.804,0.467-1.659,0.467-2.577c0-2.12-0.766-3.93-2.289-5.438c-1.523-1.509-3.352-2.26-5.484-2.26 c-2.144,0-3.965,0.748-5.463,2.244c-1.498,1.498-2.248,3.313-2.248,5.453c0,2.139,0.75,3.963,2.258,5.467 c1.503,1.512,3.32,2.263,5.453,2.263V26c-2.688,0-4.987-0.956-6.891-2.865C6.204,21.22,5.25,18.918,5.25,16.235 c0-2.673,0.955-4.964,2.865-6.873C10.027,7.456,12.319,6.5,15,6.5c2.688,0,4.986,0.95,6.892,2.856 C23.796,11.257,24.75,13.552,24.75,16.235z M16.885,16.157c0-2.074-0.793-3.113-2.378-3.113c-0.794,0-1.409,0.354-1.839,1.061 c-0.374,0.599-0.557,1.312-0.557,2.146c0,2.182,0.797,3.271,2.394,3.271C16.092,19.521,16.885,18.401,16.885,16.157z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M15,3c7.012,0,12.71,5.555,12.975,12.5C27.98,15.333,28,15.169,28,15c0-7.179-5.82-13-13-13 S2,7.821,2,15c0,0.169,0.02,0.333,0.025,0.5C2.29,8.555,7.988,3,15,3z" fill="#FFFFFF" opacity="0.4"/>
+<path d="M24.75,16.235c0,1.563-0.315,2.916-0.943,4.059c-0.762,1.408-1.864,2.115-3.307,2.115 c-1.401,0-2.413-0.707-3.045-2.115c-0.762,0.824-1.744,1.237-2.948,1.237c-1.415,0-2.546-0.542-3.401-1.621 c-0.792-1.001-1.189-2.217-1.189-3.66c0-1.451,0.397-2.662,1.189-3.638c0.844-1.053,1.979-1.574,3.401-1.574 c1.06,0,1.894,0.286,2.503,0.863v-0.635h2.055v7.098c0,1.377,0.477,2.068,1.436,2.068c0.782,0,1.385-0.541,1.807-1.62 c0.311-0.804,0.467-1.659,0.467-2.577c0-2.12-0.766-3.93-2.289-5.438c-1.523-1.509-3.352-2.26-5.484-2.26 c-2.144,0-3.965,0.748-5.463,2.244c-1.498,1.498-2.248,3.313-2.248,5.453c0,2.139,0.75,3.963,2.258,5.467 c1.503,1.512,3.32,2.263,5.453,2.263V26c-2.688,0-4.987-0.956-6.891-2.865C6.204,21.22,5.25,18.918,5.25,16.235 c0-2.673,0.955-4.964,2.865-6.873C10.027,7.456,12.319,6.5,15,6.5c2.688,0,4.986,0.95,6.892,2.856 C23.796,11.257,24.75,13.552,24.75,16.235z M16.885,16.157c0-2.074-0.793-3.113-2.378-3.113c-0.794,0-1.409,0.354-1.839,1.061 c-0.374,0.599-0.557,1.312-0.557,2.146c0,2.182,0.797,3.271,2.394,3.271C16.092,19.521,16.885,18.401,16.885,16.157z" opacity="0.2"/>
<path d="M24.75,14.985c0,1.563-0.315,2.916-0.943,4.059c-0.762,1.408-1.864,2.115-3.307,2.115 c-1.401,0-2.413-0.707-3.045-2.115c-0.762,0.824-1.744,1.237-2.948,1.237c-1.415,0-2.546-0.542-3.401-1.621 c-0.792-1.001-1.189-2.217-1.189-3.66c0-1.451,0.397-2.662,1.189-3.638c0.844-1.053,1.979-1.574,3.401-1.574 c1.06,0,1.894,0.286,2.503,0.863v-0.635h2.055v7.098c0,1.377,0.477,2.068,1.436,2.068c0.782,0,1.385-0.541,1.807-1.62 c0.311-0.804,0.467-1.659,0.467-2.577c0-2.12-0.766-3.93-2.289-5.438c-1.523-1.509-3.352-2.26-5.484-2.26 c-2.144,0-3.965,0.748-5.463,2.244c-1.498,1.498-2.248,3.313-2.248,5.453c0,2.139,0.75,3.963,2.258,5.467 c1.503,1.512,3.32,2.263,5.453,2.263v2.035c-2.688,0-4.987-0.956-6.891-2.865C6.204,19.97,5.25,17.668,5.25,14.985 c0-2.673,0.955-4.964,2.865-6.873C10.027,6.206,12.319,5.25,15,5.25c2.688,0,4.986,0.95,6.892,2.856 C23.796,10.007,24.75,12.302,24.75,14.985z M16.885,14.907c0-2.074-0.793-3.113-2.378-3.113c-0.794,0-1.409,0.354-1.839,1.061 c-0.374,0.599-0.557,1.312-0.557,2.146c0,2.182,0.797,3.271,2.394,3.271C16.092,18.271,16.885,17.151,16.885,14.907z" fill="#FFFFFF"/>
<rect fill="none" height="30" width="30"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="1.9409" y2="28.3052">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
-</linearGradient>
-</defs>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_email_home.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,33 @@
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
+<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" opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="1.9409" y2="28.3052">
+ <stop offset="0" style="stop-color:#4EDEFF"/>
+ <stop offset="1" style="stop-color:#048CC6"/>
+</linearGradient>
+<circle cx="15" cy="15" fill="url(#SVGID_1_)" r="13"/>
+<path d="M15,3c7.012,0,12.71,5.555,12.975,12.5C27.98,15.333,28,15.169,28,15c0-7.179-5.82-13-13-13 S2,7.821,2,15c0,0.169,0.02,0.333,0.025,0.5C2.29,8.555,7.988,3,15,3z" fill="#FFFFFF" opacity="0.4"/>
+<path d="M24.75,16.235c0,1.563-0.315,2.916-0.943,4.059c-0.762,1.408-1.864,2.115-3.307,2.115 c-1.401,0-2.413-0.707-3.045-2.115c-0.762,0.824-1.744,1.237-2.948,1.237c-1.415,0-2.546-0.542-3.401-1.621 c-0.792-1.001-1.189-2.217-1.189-3.66c0-1.451,0.397-2.662,1.189-3.638c0.844-1.053,1.979-1.574,3.401-1.574 c1.06,0,1.894,0.286,2.503,0.863v-0.635h2.055v7.098c0,1.377,0.477,2.068,1.436,2.068c0.782,0,1.385-0.541,1.807-1.62 c0.311-0.804,0.467-1.659,0.467-2.577c0-2.12-0.766-3.93-2.289-5.438c-1.523-1.509-3.352-2.26-5.484-2.26 c-2.144,0-3.965,0.748-5.463,2.244c-1.498,1.498-2.248,3.313-2.248,5.453c0,2.139,0.75,3.963,2.258,5.467 c1.503,1.512,3.32,2.263,5.453,2.263V26c-2.688,0-4.987-0.956-6.891-2.865C6.204,21.22,5.25,18.918,5.25,16.235 c0-2.673,0.955-4.964,2.865-6.873C10.027,7.456,12.319,6.5,15,6.5c2.688,0,4.986,0.95,6.892,2.856 C23.796,11.257,24.75,13.552,24.75,16.235z M16.885,16.157c0-2.074-0.793-3.113-2.378-3.113c-0.794,0-1.409,0.354-1.839,1.061 c-0.374,0.599-0.557,1.312-0.557,2.146c0,2.182,0.797,3.271,2.394,3.271C16.092,19.521,16.885,18.401,16.885,16.157z" opacity="0.2"/>
+<path d="M24.75,14.985c0,1.563-0.315,2.916-0.943,4.059c-0.762,1.408-1.864,2.115-3.307,2.115 c-1.401,0-2.413-0.707-3.045-2.115c-0.762,0.824-1.744,1.237-2.948,1.237c-1.415,0-2.546-0.542-3.401-1.621 c-0.792-1.001-1.189-2.217-1.189-3.66c0-1.451,0.397-2.662,1.189-3.638c0.844-1.053,1.979-1.574,3.401-1.574 c1.06,0,1.894,0.286,2.503,0.863v-0.635h2.055v7.098c0,1.377,0.477,2.068,1.436,2.068c0.782,0,1.385-0.541,1.807-1.62 c0.311-0.804,0.467-1.659,0.467-2.577c0-2.12-0.766-3.93-2.289-5.438c-1.523-1.509-3.352-2.26-5.484-2.26 c-2.144,0-3.965,0.748-5.463,2.244c-1.498,1.498-2.248,3.313-2.248,5.453c0,2.139,0.75,3.963,2.258,5.467 c1.503,1.512,3.32,2.263,5.453,2.263v2.035c-2.688,0-4.987-0.956-6.891-2.865C6.204,19.97,5.25,17.668,5.25,14.985 c0-2.673,0.955-4.964,2.865-6.873C10.027,6.206,12.319,5.25,15,5.25c2.688,0,4.986,0.95,6.892,2.856 C23.796,10.007,24.75,12.302,24.75,14.985z M16.885,14.907c0-2.074-0.793-3.113-2.378-3.113c-0.794,0-1.409,0.354-1.839,1.061 c-0.374,0.599-0.557,1.312-0.557,2.146c0,2.182,0.797,3.271,2.394,3.271C16.092,18.271,16.885,17.151,16.885,14.907z" fill="#FFFFFF"/>
+<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" enable-background="new " 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"/>
+</linearGradient>
+<circle cx="21" cy="22" fill="url(#SVGID_1__)" r="7"/>
+<polygon enable-background="new " opacity="0.2" points="25.34,24 20.999,19.4 16.66,24 16,23.3 20.999,18 26,23.3 "/>
+<polygon enable-background="new " 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 "/>
+<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" enable-background="new " fill="#FFFFFF" 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 "/>
+</g>
+</svg>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_email_work.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,36 @@
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
+<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" opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="1.9409" y2="28.3052">
+ <stop offset="0" style="stop-color:#4EDEFF"/>
+ <stop offset="1" style="stop-color:#048CC6"/>
+</linearGradient>
+<circle cx="15" cy="15" fill="url(#SVGID_1_)" r="13"/>
+<path d="M15,3c7.012,0,12.71,5.555,12.975,12.5C27.98,15.333,28,15.169,28,15c0-7.179-5.82-13-13-13 S2,7.821,2,15c0,0.169,0.02,0.333,0.025,0.5C2.29,8.555,7.988,3,15,3z" fill="#FFFFFF" opacity="0.4"/>
+<path d="M24.75,16.235c0,1.563-0.315,2.916-0.943,4.059c-0.762,1.408-1.864,2.115-3.307,2.115 c-1.401,0-2.413-0.707-3.045-2.115c-0.762,0.824-1.744,1.237-2.948,1.237c-1.415,0-2.546-0.542-3.401-1.621 c-0.792-1.001-1.189-2.217-1.189-3.66c0-1.451,0.397-2.662,1.189-3.638c0.844-1.053,1.979-1.574,3.401-1.574 c1.06,0,1.894,0.286,2.503,0.863v-0.635h2.055v7.098c0,1.377,0.477,2.068,1.436,2.068c0.782,0,1.385-0.541,1.807-1.62 c0.311-0.804,0.467-1.659,0.467-2.577c0-2.12-0.766-3.93-2.289-5.438c-1.523-1.509-3.352-2.26-5.484-2.26 c-2.144,0-3.965,0.748-5.463,2.244c-1.498,1.498-2.248,3.313-2.248,5.453c0,2.139,0.75,3.963,2.258,5.467 c1.503,1.512,3.32,2.263,5.453,2.263V26c-2.688,0-4.987-0.956-6.891-2.865C6.204,21.22,5.25,18.918,5.25,16.235 c0-2.673,0.955-4.964,2.865-6.873C10.027,7.456,12.319,6.5,15,6.5c2.688,0,4.986,0.95,6.892,2.856 C23.796,11.257,24.75,13.552,24.75,16.235z M16.885,16.157c0-2.074-0.793-3.113-2.378-3.113c-0.794,0-1.409,0.354-1.839,1.061 c-0.374,0.599-0.557,1.312-0.557,2.146c0,2.182,0.797,3.271,2.394,3.271C16.092,19.521,16.885,18.401,16.885,16.157z" opacity="0.2"/>
+<path d="M24.75,14.985c0,1.563-0.315,2.916-0.943,4.059c-0.762,1.408-1.864,2.115-3.307,2.115 c-1.401,0-2.413-0.707-3.045-2.115c-0.762,0.824-1.744,1.237-2.948,1.237c-1.415,0-2.546-0.542-3.401-1.621 c-0.792-1.001-1.189-2.217-1.189-3.66c0-1.451,0.397-2.662,1.189-3.638c0.844-1.053,1.979-1.574,3.401-1.574 c1.06,0,1.894,0.286,2.503,0.863v-0.635h2.055v7.098c0,1.377,0.477,2.068,1.436,2.068c0.782,0,1.385-0.541,1.807-1.62 c0.311-0.804,0.467-1.659,0.467-2.577c0-2.12-0.766-3.93-2.289-5.438c-1.523-1.509-3.352-2.26-5.484-2.26 c-2.144,0-3.965,0.748-5.463,2.244c-1.498,1.498-2.248,3.313-2.248,5.453c0,2.139,0.75,3.963,2.258,5.467 c1.503,1.512,3.32,2.263,5.453,2.263v2.035c-2.688,0-4.987-0.956-6.891-2.865C6.204,19.97,5.25,17.668,5.25,14.985 c0-2.673,0.955-4.964,2.865-6.873C10.027,6.206,12.319,5.25,15,5.25c2.688,0,4.986,0.95,6.892,2.856 C23.796,10.007,24.75,12.302,24.75,14.985z M16.885,14.907c0-2.074-0.793-3.113-2.378-3.113c-0.794,0-1.409,0.354-1.839,1.061 c-0.374,0.599-0.557,1.312-0.557,2.146c0,2.182,0.797,3.271,2.394,3.271C16.092,18.271,16.885,17.151,16.885,14.907z" fill="#FFFFFF"/>
+<rect fill="none" height="30" width="30"/>
+</g>
+<g>
+<defs>
+</defs>
+<g>
+ <rect fill="none" height="30" width="30"/>
+</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" 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" 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" 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 height="6" opacity="0.3" width="1" x="22" y="20"/>
+</g>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_expand.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_expand.svg Fri May 14 16:09:54 2010 +0300
@@ -1,16 +1,23 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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"/>
+<polygon fill-opacity="0.2" points="24,13.88,17.99,13.88,17.99,8,13.99,8,13.99,13.88,8,13.88,8,17.88,13.99,17.88,13.99,24,17.99,24,17.99,17.88,24,17.88" stroke-opacity="0.2"/>
<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="28" x="1" y="1"/>
<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="28" x="1" y="28"/>
-<polygon fill-opacity="0.2" points="23.99,14,7.99,14,7.99,18,23.99,18" stroke-opacity="0.2"/>
-<polygon fill="#FFFFFF" points="23,13,7,13,7,17,23,17"/>
+<polygon fill="#FFFFFF" points="23,12.88,16.99,12.88,16.99,7,12.99,7,12.99,12.88,7,12.88,7,16.88,12.99,16.88,12.99,23,16.99,23,16.99,16.88,23,16.88"/>
<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="1" y2="29.19">
-<stop offset="0" stop-color="#F7992E"/>
-<stop offset="1" stop-color="#D82E09"/>
+
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="1.175" y2="29.18">
+
+<stop offset="0" stop-color="#4EDEFF"/>
+
+<stop offset="1" stop-color="#048CC6"/>
+
</linearGradient>
+
</defs>
-</svg>
+</g>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fail.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fail.svg Fri May 14 16:09:54 2010 +0300
@@ -1,20 +1,22 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9985" x2="14.9985" y1="4.7378" y2="61.75">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#4F4F4F"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#4F4F4F"/>
</linearGradient>
<circle cx="14.999" cy="15" fill="url(#SVGID_1_)" r="10"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="2" y2="27.9507">
-<stop offset="0" style="stop-color:#FF4D00"/>
-<stop offset="1" style="stop-color:#800000"/>
+ <stop offset="0" style="stop-color:#FF4D00"/>
+ <stop offset="1" style="stop-color:#800000"/>
</linearGradient>
<path d="M15,2C7.82,2,2,7.82,2,15s5.82,13,13,13s13-5.82,13-13S22.18,2,15,2z M15.001,6 c1.788,0,3.45,0.527,4.851,1.427L7.428,19.852C6.528,18.451,6,16.788,6,15C6,10.028,10.03,6,15.001,6z M15.001,24 c-1.929,0-3.711-0.611-5.176-1.645l12.53-12.531C23.389,11.289,24,13.071,24,15C24,19.971,19.971,24,15.001,24z" fill="url(#SVGID_2_)"/>
-<path d="M15,3c7.011,0,12.71,5.555,12.975,12.5C27.981,15.332,28,15.169,28,15c0-7.18-5.82-13-13-13 S2,7.82,2,15c0,0.169,0.019,0.332,0.025,0.5C2.29,8.555,7.989,3,15,3z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M15,3c7.011,0,12.71,5.555,12.975,12.5C27.981,15.332,28,15.169,28,15c0-7.18-5.82-13-13-13 S2,7.82,2,15c0,0.169,0.019,0.332,0.025,0.5C2.29,8.555,7.989,3,15,3z" fill="#FFFFFF" opacity="0.4"/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_family.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_family.svg Fri May 14 16:09:54 2010 +0300
@@ -1,38 +1,40 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
+<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" opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="8.9995" x2="8.9995" y1="4.041" y2="26.2553">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+ <stop offset="0" style="stop-color:#4EDEFF"/>
+ <stop offset="1" style="stop-color:#048CC6"/>
</linearGradient>
<path d="M10.998,16.347c-0.008-0.125,0-0.252,0.004-0.379c0.852-0.585,1.589-1.415,2.039-2.311 c0.831-1.661,0.623-5.901,0.623-5.901C13.664,6.026,11.023,4,9.303,4H8.686c-1.72,0-4.36,2.026-4.36,3.756 c0,0-0.155,4.226,0.624,5.901c0.425,0.912,1.178,1.752,2.049,2.335c0.003,0.117,0.011,0.237,0.004,0.354 C6.896,18.044,1.274,20.927,1,21.295V26h16v-4.701C16.725,20.93,11.104,18.044,10.998,16.347z" fill="url(#SVGID_1_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="8.9995" x2="8.9995" y1="4.041" y2="26.1808">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="0.7212" style="stop-color:#19A3D6"/>
-<stop offset="1" style="stop-color:#57CDFF"/>
+ <stop offset="0" style="stop-color:#4EDEFF"/>
+ <stop offset="0.7212" style="stop-color:#19A3D6"/>
+ <stop offset="1" style="stop-color:#57CDFF"/>
</linearGradient>
<path d="M10.998,16.347c-0.008-0.125,0-0.252,0.004-0.379c0.852-0.585,1.589-1.415,2.039-2.311 c0.831-1.661,0.623-5.901,0.623-5.901C13.664,6.026,11.023,4,9.303,4H8.686c-1.72,0-4.36,2.026-4.36,3.756 c0,0-0.155,4.226,0.624,5.901c0.425,0.912,1.178,1.752,2.049,2.335c0.003,0.117,0.011,0.237,0.004,0.354 C6.896,18.044,1.274,20.927,1,21.295V26h16v-4.701C16.725,20.93,11.104,18.044,10.998,16.347z M16.111,25.107H1.889v-3.358 c0.188-0.12,0.441-0.274,0.676-0.42c2.75-1.688,5.225-3.335,5.324-4.925c0.007-0.12,0.005-0.234,0-0.35l-0.01-0.465L7.49,15.248 c-0.756-0.505-1.389-1.225-1.736-1.971c-0.563-1.21-0.58-4.371-0.54-5.487c0.001-1.157,2.109-2.897,3.472-2.897h0.617 c1.363,0,3.473,1.74,3.473,2.863c0.076,1.594-0.001,4.444-0.529,5.498c-0.377,0.753-1.014,1.474-1.746,1.976l-0.374,0.258 l-0.013,0.455c-0.007,0.205-0.01,0.335-0.002,0.462c0.1,1.59,2.574,3.238,5.324,4.927c0.234,0.146,0.488,0.3,0.676,0.421V25.107z" fill="url(#SVGID_2_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="22" x2="22" y1="6.3789" y2="25.932">
-<stop offset="0" style="stop-color:#DE8029"/>
-<stop offset="0.2606" style="stop-color:#DE4E29"/>
-<stop offset="1" style="stop-color:#D82E09"/>
+ <stop offset="0" style="stop-color:#DE8029"/>
+ <stop offset="0.2606" style="stop-color:#DE4E29"/>
+ <stop offset="1" style="stop-color:#D82E09"/>
</linearGradient>
<path d="M23.748,17.225c-0.007-0.115,0-0.23,0.004-0.346c0.744-0.531,1.391-1.286,1.783-2.102 c0.729-1.508,0.546-5.363,0.546-5.363C26.081,7.842,23.771,6,22.265,6h-0.54c-1.504,0-3.814,1.842-3.814,3.414 c0,0-0.137,3.842,0.545,5.363c0.371,0.83,1.031,1.594,1.793,2.124c0.003,0.107,0.01,0.217,0.004,0.323 c-0.094,1.543-5.012,4.162-5.252,4.498V26h14v-4.273C28.76,21.39,23.842,18.768,23.748,17.225z" fill="url(#SVGID_3_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="22" x2="22" y1="6.0371" y2="29.6193">
-<stop offset="0" style="stop-color:#DE8029"/>
-<stop offset="0.2606" style="stop-color:#DE4E29"/>
-<stop offset="1" style="stop-color:#D86D56"/>
+ <stop offset="0" style="stop-color:#DE8029"/>
+ <stop offset="0.2606" style="stop-color:#DE4E29"/>
+ <stop offset="1" style="stop-color:#D86D56"/>
</linearGradient>
<path d="M23.748,17.225c-0.007-0.115,0-0.23,0.004-0.346c0.744-0.531,1.391-1.286,1.783-2.102 c0.729-1.508,0.546-5.363,0.546-5.363C26.081,7.842,23.771,6,22.265,6h-0.54c-1.504,0-3.814,1.842-3.814,3.414 c0,0-0.137,3.842,0.545,5.363c0.371,0.83,1.031,1.594,1.793,2.124c0.003,0.107,0.01,0.217,0.004,0.323 c-0.094,1.543-5.012,4.162-5.252,4.498V26h14v-4.273C28.76,21.39,23.842,18.768,23.748,17.225z M28.125,25.092h-12.25v-2.905 c0.158-0.104,0.361-0.233,0.551-0.354c2.984-1.904,4.617-3.194,4.699-4.551c0.006-0.115,0.004-0.223,0-0.332l-0.016-0.466 l-0.375-0.337c-0.647-0.451-1.189-1.091-1.484-1.753c-0.434-0.963-0.516-3.545-0.466-4.946c0.001-0.993,1.814-2.539,2.94-2.539h0.54 c1.127,0,2.941,1.546,2.941,2.506c0.066,1.443,0.001,4.016-0.453,4.955c-0.323,0.671-0.868,1.312-1.497,1.76l-0.365,0.262 l-0.014,0.46c-0.006,0.187-0.01,0.309-0.002,0.43c0.082,1.357,1.715,2.647,4.698,4.554c0.189,0.121,0.393,0.25,0.552,0.355V25.092z" fill="url(#SVGID_4_)"/>
-<path d="M7.972,27L8,25.972c0.074-2.631,1.977-3.813,3.234-4.596l0.156-0.097l1.674-0.842 c-0.006-0.009-0.012-0.018-0.018-0.026c-0.166-0.232-0.371-0.522-0.547-0.863c-0.744-1.44-0.995-2.394-0.995-3.775 c0-2.632,2.001-4.772,4.462-4.772h0.102c2.445,0.019,4.43,2.152,4.43,4.772c0,1.381-0.252,2.334-0.995,3.775 c-0.177,0.341-0.382,0.629-0.546,0.861c-0.015,0.02-0.029,0.041-0.045,0.063c0,0,1.6,0.973,1.746,1.06 c1.303,0.776,3.271,1.95,3.342,4.44L24.028,27H7.972z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M7.972,27L8,25.972c0.074-2.631,1.977-3.813,3.234-4.596l0.156-0.097l1.674-0.842 c-0.006-0.009-0.012-0.018-0.018-0.026c-0.166-0.232-0.371-0.522-0.547-0.863c-0.744-1.44-0.995-2.394-0.995-3.775 c0-2.632,2.001-4.772,4.462-4.772h0.102c2.445,0.019,4.43,2.152,4.43,4.772c0,1.381-0.252,2.334-0.995,3.775 c-0.177,0.341-0.382,0.629-0.546,0.861c-0.015,0.02-0.029,0.041-0.045,0.063c0,0,1.6,0.973,1.746,1.06 c1.303,0.776,3.271,1.95,3.342,4.44L24.028,27H7.972z" opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="16" x2="16" y1="25.8955" y2="4.0108">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#FCBA63"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#FCBA63"/>
</linearGradient>
<path d="M23,26c-0.062-2.188-2.088-3.122-3.289-3.873l-1.715-1.043c-0.707-0.489,0.129-1.05,0.618-1.995 c0.724-1.402,0.884-2.181,0.884-3.316c0-2.063-1.536-3.772-3.463-3.772c-0.012,0-0.021,0.003-0.035,0.005 C15.989,12.003,15.979,12,15.967,12c-1.928,0-3.462,1.71-3.462,3.772c0,1.136,0.159,1.915,0.884,3.316 c0.488,0.947,1.324,1.506,0.617,1.995l-2.085,1.043C10.72,22.878,9.062,23.812,9,26H23z" fill="url(#SVGID_5_)"/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_favorite.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_favorite.svg Fri May 14 16:09:54 2010 +0300
@@ -1,17 +1,16 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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.006,22.895 5.718,29.71 9.3,18.732 0,11.963 11.473,11.963 15.009,1 18.531,11.963 30,11.963 20.709,18.732 24.281,29.711 " stroke-opacity="0.6"/>
-<path d="M17.823,12.963l-2.816-8.717l-2.827,8.717H3.001l7.444,5.387l-2.862,8.723l7.424-5.416l7.413,5.416 l-2.855-8.723l7.437-5.387H17.823z" fill="url(#SVGID_1_)"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="12.907,13.963 15.005,7.493 17.096,13.963 25.621,13.963 27.001,12.963 17.823,12.963 15.007,4.246 12.18,12.963 3.001,12.963 4.383,13.963 " stroke-opacity="0.4"/>
+<defs>
+</defs>
+<polygon 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 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="2.9937" y2="27.438">
+ <stop offset="0" style="stop-color:#FFE896"/>
+ <stop offset="1" style="stop-color:#FFB701"/>
+</linearGradient>
+<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 "/>
+<polygon fill="#FFFFFF" fill-opacity="0.4" points="11.693,11.954 15,5.253 18.307,11.954 26.959,13.201 27.852,12.331 18.971,11.04 15,2.994 11.029,11.04 2.149,12.331 3.042,13.201 "/>
<rect fill="none" height="30" width="30"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15.0005" x2="15.0005" y1="4.2461" y2="27.0728">
-<stop offset="0" style="stop-color:#FECF5E"/>
-<stop offset="1" style="stop-color:#FF9E01"/>
-</linearGradient>
-</defs>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fax.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fax.svg Fri May 14 16:09:54 2010 +0300
@@ -1,89 +1,175 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
-</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"/>
+
</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"/>
+
+</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"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fax_home.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fax_home.svg Fri May 14 16:09:54 2010 +0300
@@ -1,100 +1,197 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fax_work.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_fax_work.svg Fri May 14 16:09:54 2010 +0300
@@ -1,99 +1,195 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_flash.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_flash.svg Fri May 14 16:09:54 2010 +0300
@@ -1,39 +1,39 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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"/>
+<defs>
+</defs>
+<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" 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">
-<stop offset="0" style="stop-color:#C7D4E6"/>
-<stop offset="0.2865" style="stop-color:#C7D4E6"/>
-<stop offset="0.6966" style="stop-color:#7288A2"/>
-<stop offset="1" style="stop-color:#2B3842"/>
+ <stop offset="0" style="stop-color:#C7D4E6"/>
+ <stop offset="0.2865" style="stop-color:#C7D4E6"/>
+ <stop offset="0.6966" style="stop-color:#7288A2"/>
+ <stop offset="1" style="stop-color:#2B3842"/>
</radialGradient>
<circle cx="15" cy="15" fill="url(#SVGID_1_)" r="13"/>
+<linearGradient gradientTransform="matrix(1.1364 0 0 -1.1364 895.5911 -433.8352)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-774.8306" x2="-774.8306" y1="-391.5132" y2="-384.2012">
+ <stop offset="0" style="stop-color:#627995"/>
+ <stop offset="0.8708" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#FFFFFF"/>
+</linearGradient>
<path d="M5.477,10.928c7.065-12.188,17.325-4.704,19.199,0.142c0.002,0.021,0.018,0.011,0.012-0.013 c-0.629-4.677-4.697-8.285-9.623-8.285c-4.878,0-8.917,3.539-9.604,8.15C5.455,10.953,5.471,10.961,5.477,10.928z" fill="url(#SVGID_2_)"/>
<radialGradient cx="-2686.8755" cy="522.4854" gradientTransform="matrix(2.2479 0 0 -2.2479 6054.5376 1164.6696)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="10.0661">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.4831" style="stop-color:#FFFFFF"/>
-<stop offset="0.8989" style="stop-color:#627995"/>
-<stop offset="1" style="stop-color:#3F607E"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="0.4831" style="stop-color:#FFFFFF"/>
+ <stop offset="0.8989" style="stop-color:#627995"/>
+ <stop offset="1" style="stop-color:#3F607E"/>
</radialGradient>
<path d="M15.064,3.238c-4.846,0-8.86,3.455-9.59,7.695c2.184,1.027,3.792-1.483,8.994-1.164 c4.73,0.206,8.146,2.484,10.203,1.305C24.012,6.768,19.962,3.238,15.064,3.238z" fill="url(#SVGID_3_)"/>
<path d="M20.242,6.594c-4.72,0-6.709,3.967-7.915,7.425c-1.269,3.636-2.079,4.225-3.53,4.225H8.366 c-0.334,0-0.603,0.269-0.603,0.603v3.336c0,0.336,0.269,0.604,0.603,0.604h0.431c4.315,0,6.17-3.007,7.272-5.78 c0.641,0,3.104,0,3.104,0c0.335,0,0.604-0.269,0.604-0.604v-3.336c0-0.335-0.27-0.604-0.604-0.604c0,0-0.561,0-1.123,0 c0.779-1.129,1.514-1.323,2.192-1.323h0.431c0.333,0,0.603-0.271,0.603-0.605V7.197c0-0.331-0.27-0.604-0.603-0.604H20.242 L20.242,6.594z" fill="#1F2430"/>
<radialGradient cx="-2686.96" cy="511.5801" gradientTransform="matrix(2.2479 0 0 -2.2479 6054.5376 1164.6696)" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="3.0503">
-<stop offset="0" style="stop-color:#1F2430"/>
-<stop offset="0.1011" style="stop-color:#1F2430"/>
-<stop offset="1" style="stop-color:#FFFFFF"/>
+ <stop offset="0" style="stop-color:#1F2430"/>
+ <stop offset="0.1011" style="stop-color:#1F2430"/>
+ <stop offset="1" style="stop-color:#FFFFFF"/>
</radialGradient>
<path d="M20.242,7.195c-4.314,0-6.133,3.549-7.346,7.021l0,0c-1.252,3.592-2.171,4.63-4.1,4.63H8.366v3.338 h0.431c4.063,0,5.767-2.876,6.86-5.783c0.495,0,3.517,0,3.517,0v-3.335c0,0-1.478,0-2.188,0c0.909-1.781,1.877-2.532,3.254-2.532 h0.433V7.197h-0.431V7.195z" fill="url(#SVGID_4_)"/>
<path d="M13.201,14.323L13.201,14.323c-1.146,3.284-2.076,4.846-4.512,4.846v2.69c4.125,0,5.691-2.909,6.743-5.779 c0.142,0,3.413,0,3.413,0v-2.693c0,0-2.079,0-2.375,0c1.023-2.216,2.127-3.176,3.876-3.176v-2.69 C16.094,7.521,14.377,10.959,13.201,14.323z" fill="#FFFFFF"/>
<path d="M15.064,3.238c-4.846,0-8.86,3.455-9.59,7.695c2.184,1.027,3.792-1.483,8.994-1.164 c4.73,0.206,8.146,2.484,10.203,1.305C24.012,6.768,19.962,3.238,15.064,3.238z" fill="#FFFFFF" fill-opacity="0.3"/>
<rect fill="none" height="30" width="30"/>
-<defs>
-<linearGradient gradientTransform="matrix(1.1364 0 0 -1.1364 895.5911 -433.8352)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-774.8306" x2="-774.8306" y1="-391.5132" y2="-384.2012">
-<stop offset="0" style="stop-color:#627995"/>
-<stop offset="0.8708" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#FFFFFF"/>
-</linearGradient>
-</defs>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_folder.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_folder.svg Fri May 14 16:09:54 2010 +0300
@@ -1,20 +1,20 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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"/>
+<defs>
+</defs>
+<polygon opacity="0.6" points="1,27 1,3 14,3 14,6 29,6 29,27 "/>
<polygon fill="#FEAB29" points="13,7 13,4 2,4 2,26 28,26 28,7 "/>
<rect fill="#FFFFFF" height="1" width="15" x="13" y="7"/>
<rect fill="#FFFFFF" height="1" width="11" x="2" y="4"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="10.7192" y2="25.8892">
+ <stop offset="0" style="stop-color:#FEE06A"/>
+ <stop offset="0.9091" style="stop-color:#FFC501"/>
+ <stop offset="1" style="stop-color:#FFB701"/>
+</linearGradient>
<rect fill="url(#SVGID_1_)" height="16" width="26" x="2" y="10"/>
-<rect fill="#FFFFFF" fill-opacity="0.6" height="1" stroke-opacity="0.6" width="26" x="2" y="10"/>
+<rect fill="#FFFFFF" height="1" opacity="0.6" width="26" x="2" y="10"/>
<rect fill="none" height="30" width="30"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="10.7192" y2="25.8892">
-<stop offset="0" style="stop-color:#FEE06A"/>
-<stop offset="0.9091" style="stop-color:#FFC501"/>
-<stop offset="1" style="stop-color:#FFB701"/>
-</linearGradient>
-</defs>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_follow_up.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_follow_up.svg Fri May 14 16:09:54 2010 +0300
@@ -1,29 +1,31 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="24.7227" x2="9.9584" y1="12.5005" y2="12.5005">
-<stop offset="0" style="stop-color:#DE8029"/>
-<stop offset="0.2606" style="stop-color:#DE4E29"/>
-<stop offset="1" style="stop-color:#D82E09"/>
+ <stop offset="0" style="stop-color:#DE8029"/>
+ <stop offset="0.2606" style="stop-color:#DE4E29"/>
+ <stop offset="1" style="stop-color:#D82E09"/>
</linearGradient>
<path d="M21.875,13.75L25,20c0,0-2.5,0-3.75,0c-2.5,0-3.75-2.5-6.875-2.5c-0.625,0-4.375,0-4.375,0V5 c0,0,3.75,0,4.375,0C17.5,5,18.75,7.5,21.25,7.5c1.25,0,3.75,0,3.75,0L21.875,13.75z" fill="url(#SVGID_1_)"/>
-<path d="M21.625,14.25L24.5,20c0.304,0,0.5,0,0.5,0l-3.125-6.25L21.625,14.25z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M21.25,8.5c0.903,0,2.457,0,3.25,0l0.5-1c0,0-2.5,0-3.75,0c-2.5,0-3.75-2.5-6.875-2.5 C13.75,5,10,5,10,5v1c0,0,3.75,0,4.375,0C17.5,6,18.75,8.5,21.25,8.5z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M21.625,14.25L24.5,20c0.304,0,0.5,0,0.5,0l-3.125-6.25L21.625,14.25z" fill="#FFFFFF" opacity="0.4"/>
+<path d="M21.25,8.5c0.903,0,2.457,0,3.25,0l0.5-1c0,0-2.5,0-3.75,0c-2.5,0-3.75-2.5-6.875-2.5 C13.75,5,10,5,10,5v1c0,0,3.75,0,4.375,0C17.5,6,18.75,8.5,21.25,8.5z" fill="#FFFFFF" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="9" x2="6.0412" y1="15.9995" y2="15.9995">
-<stop offset="0" style="stop-color:#8C8E8F"/>
-<stop offset="0.6545" style="stop-color:#D9D9D9"/>
-<stop offset="1" style="stop-color:#AEB2B3"/>
+ <stop offset="0" style="stop-color:#8C8E8F"/>
+ <stop offset="0.6545" style="stop-color:#D9D9D9"/>
+ <stop offset="1" style="stop-color:#AEB2B3"/>
</linearGradient>
<rect fill="url(#SVGID_2_)" height="24" width="3" x="6" y="4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="9.9585" x2="5.0415" y1="3" y2="3">
-<stop offset="0" style="stop-color:#4F4F4F"/>
-<stop offset="0.589" style="stop-color:#BFBFBF"/>
-<stop offset="1" style="stop-color:#6B6B6B"/>
+ <stop offset="0" style="stop-color:#4F4F4F"/>
+ <stop offset="0.589" style="stop-color:#BFBFBF"/>
+ <stop offset="1" style="stop-color:#6B6B6B"/>
</linearGradient>
<rect fill="url(#SVGID_3_)" height="2" width="5" x="5" y="2"/>
-<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="3" x="6" y="4"/>
+<rect height="1" opacity="0.2" width="3" x="6" y="4"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_forward.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_forward.svg Fri May 14 16:09:54 2010 +0300
@@ -1,18 +1,18 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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 "/>
+<linearGradient gradientTransform="matrix(-1 0 0 1 594 0)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="579" x2="579" y1="4.8848" y2="25.2603">
+ <stop offset="0" style="stop-color:#FEE06A"/>
+ <stop offset="1" style="stop-color:#FFB701"/>
+</linearGradient>
<polygon fill="url(#SVGID_1_)" points="16,19 2,19 2,11 16,11 16,5 28,15 16,25 "/>
-<polygon fill="#FFFFFF" fill-opacity="0.5" points="16,6.135 16,5 28,15 27.319,15.567 " stroke-opacity="0.5"/>
-<rect fill="#FFFFFF" fill-opacity="0.5" height="1.135" stroke-opacity="0.5" width="14" x="2" y="11"/>
+<polygon fill="#FFFFFF" opacity="0.5" points="16,6.135 16,5 28,15 27.319,15.567 "/>
+<rect fill="#FFFFFF" height="1.135" opacity="0.5" width="14" x="2" y="11"/>
<rect fill="none" height="30" width="30"/>
-<defs>
-<linearGradient gradientTransform="matrix(-1 0 0 1 594 0)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="579" x2="579" y1="4.8848" y2="25.2603">
-<stop offset="0" style="stop-color:#FEE06A"/>
-<stop offset="1" style="stop-color:#FFB701"/>
-</linearGradient>
-</defs>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_gprs.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_gprs.svg Fri May 14 16:09:54 2010 +0300
@@ -1,21 +1,21 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="2.2749" y2="32.0078">
+ <stop offset="0" style="stop-color:#4EDEFF"/>
+ <stop offset="1" style="stop-color:#048CC6"/>
+</linearGradient>
<circle cx="15" cy="15" fill="url(#SVGID_1_)" r="13"/>
-<path d="M15,3c7.011,0,12.71,5.555,12.975,12.5C27.981,15.332,28,15.168,28,15c0-7.18-5.82-13-13-13 S2,7.82,2,15c0,0.168,0.019,0.332,0.025,0.5C2.29,8.555,7.989,3,15,3z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<polygon fill-opacity="0.2" points="25.839,14.5 7.454,14.5 7.454,11.5 20.253,11.5 18.975,9.57 21.476,7.914 25.839,14.5 " stroke-opacity="0.2"/>
-<polygon fill-opacity="0.2" points="6.454,16.5 24.839,16.5 24.839,19.5 12.04,19.5 13.318,21.428 10.817,23.086 6.454,16.5 " stroke-opacity="0.2"/>
+<path d="M15,3c7.011,0,12.71,5.555,12.975,12.5C27.981,15.332,28,15.168,28,15c0-7.18-5.82-13-13-13 S2,7.82,2,15c0,0.168,0.019,0.332,0.025,0.5C2.29,8.555,7.989,3,15,3z" fill="#FFFFFF" opacity="0.4"/>
+<polygon opacity="0.2" points="25.839,14.5 7.454,14.5 7.454,11.5 20.253,11.5 18.975,9.57 21.476,7.914 25.839,14.5 "/>
+<polygon opacity="0.2" points="6.454,16.5 24.839,16.5 24.839,19.5 12.04,19.5 13.318,21.428 10.817,23.086 6.454,16.5 "/>
<polygon fill="#FFFFFF" points="24.839,13.5 6.454,13.5 6.454,10.5 19.253,10.5 17.975,8.57 20.476,6.914 24.839,13.5 "/>
<polygon fill="#FFFFFF" points="5.454,15.5 23.839,15.5 23.839,18.5 11.04,18.5 12.318,20.428 9.817,22.086 5.454,15.5 "/>
<rect fill="none" height="30" width="30"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="2.2749" y2="32.0078">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
-</linearGradient>
-</defs>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_homescreen.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,67 @@
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
+<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"/>
+ <stop offset="1" style="stop-color:#221F1F"/>
+</linearGradient>
+<path d="M15,28.307c-7.168,0-13-5.831-13-13c0-7.167,5.832-13,13-13c7.17,0,13,5.833,13,13 C28,22.476,22.17,28.307,15,28.307L15,28.307z" fill="url(#SVGID_1_)" opacity="0.2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="15.0005" x2="15.0005" y1="2.8374" y2="28.3903">
+ <stop offset="0" style="stop-color:#A8A9AC"/>
+ <stop offset="1" style="stop-color:#000000"/>
+</linearGradient>
+<path d="M15,27.973c-6.984,0-12.666-5.683-12.666-12.667C2.334,8.321,8.016,2.639,15,2.639 s12.668,5.682,12.668,12.667C27.668,22.29,21.984,27.973,15,27.973L15,27.973z" fill="url(#SVGID_2_)" opacity="0.4"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="14.9995" x2="14.9995" y1="2.6943" y2="27.3623">
+ <stop offset="0" style="stop-color:#F4F5F5"/>
+ <stop offset="0.7818" style="stop-color:#CCCBCB"/>
+ <stop offset="1" style="stop-color:#D0D0D1"/>
+</linearGradient>
+<circle cx="15" cy="14.973" fill="url(#SVGID_3_)" r="12.334"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="15.0005" x2="15.0005" y1="3.1831" y2="26.6896">
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#DEDEDD"/>
+</linearGradient>
+<path d="M15,3.639c6.25,0,11.334,5.084,11.334,11.333S21.25,26.307,15,26.307S3.666,21.222,3.666,14.973 S8.75,3.639,15,3.639 M15,3.306c-6.432,0-11.666,5.234-11.666,11.667C3.334,21.406,8.568,26.64,15,26.64 c6.434,0,11.668-5.233,11.668-11.667C26.668,8.54,21.434,3.306,15,3.306L15,3.306z" fill="url(#SVGID_4_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="14.9995" x2="14.9995" y1="2.5444" y2="27.4902">
+ <stop offset="0" style="stop-color:#E2E2E2"/>
+ <stop offset="1" style="stop-color:#99999A"/>
+</linearGradient>
+<path d="M15,2.973c6.617,0,12,5.383,12,12c0,6.618-5.383,12.001-12,12.001S3,21.591,3,14.973 C3,8.356,8.383,2.973,15,2.973 M15,2.639c-6.811,0-12.334,5.523-12.334,12.333c0,6.812,5.523,12.334,12.334,12.334 c6.813,0,12.334-5.522,12.334-12.334C27.334,8.162,21.813,2.639,15,2.639L15,2.639z" fill="url(#SVGID_5_)"/>
+<polygon fill="#020202" points="14.916,7.065 6,13.421 7.061,15.624 14.916,9.843 22.773,15.624 24,13.582 "/>
+<polygon fill="#020202" points="8.496,16.097 8.496,22.863 13.158,22.863 13.158,19.516 16.762,19.516 16.762,22.863 21.375,22.863 21.375,16.097 14.936,11.376 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="14.9995" x2="14.9995" y1="6.6069" y2="22.331">
+ <stop offset="0" style="stop-color:#2143F2"/>
+ <stop offset="1" style="stop-color:#0ABDD0"/>
+</linearGradient>
+<polygon fill="url(#SVGID_6_)" points="14.916,6.337 6,12.693 7.061,14.896 14.916,9.115 22.773,14.896 24,12.854 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="14.9878" x2="14.9878" y1="6.6958" y2="13.1186">
+ <stop offset="0" style="stop-color:#3067FC"/>
+ <stop offset="1" style="stop-color:#0D98A9"/>
+</linearGradient>
+<path d="M14.914,7.221l8.131,5.832l-0.48,0.797l-7.436-5.47l-0.213-0.156L14.703,8.38l-7.371,5.425 l-0.42-0.877L14.914,7.221 M14.916,6.778L6.455,12.81l0.74,1.541l7.721-5.682l7.752,5.704l0.854-1.419L14.916,6.778L14.916,6.778z" fill="url(#SVGID_7_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="14.9351" x2="14.9351" y1="5.8877" y2="22.3399">
+ <stop offset="0" style="stop-color:#2143F2"/>
+ <stop offset="1" style="stop-color:#0ABDD0"/>
+</linearGradient>
+<polygon fill="url(#SVGID_8_)" points="8.496,15.37 8.496,22.135 13.158,22.135 13.158,18.788 16.762,18.788 16.762,22.135 21.375,22.135 21.375,15.37 14.936,10.648 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="14.9351" x2="14.9351" y1="11.1875" y2="21.9653">
+ <stop offset="0" style="stop-color:#2167FC"/>
+ <stop offset="1" style="stop-color:#0D98A9"/>
+</linearGradient>
+<path d="M14.936,11.54l5.721,4.194v5.682h-3.178v-2.987v-0.359h-0.359h-4.318h-0.359v0.359v2.987H9.215 v-5.682L14.936,11.54 M14.936,11.094l-6.08,4.458v6.224h3.945v-3.347h4.318v3.347h3.896v-6.224L14.936,11.094L14.936,11.094z" fill="url(#SVGID_9_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="14.9995" x2="14.9995" y1="6.5171" y2="14.0168">
+ <stop offset="0" style="stop-color:#109AAF"/>
+ <stop offset="1" style="stop-color:#0C8C9C"/>
+</linearGradient>
+<path d="M14.916,6.778l8.605,6.176l-0.854,1.419l-7.539-5.547l-0.213-0.157l-0.213,0.157l-7.508,5.525 l-0.74-1.541L14.916,6.778 M14.916,6.337L6,12.693l1.061,2.203l7.855-5.782l7.857,5.782L24,12.854L14.916,6.337L14.916,6.337z" fill="url(#SVGID_10_)"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="14.9351" x2="14.9351" y1="10.7378" y2="22.3243">
+ <stop offset="0" style="stop-color:#109AAF"/>
+ <stop offset="1" style="stop-color:#0C8C9C"/>
+</linearGradient>
+<path d="M14.936,11.094l6.08,4.458v6.224h-3.896v-2.987v-0.359h-0.357h-3.604h-0.357v0.359v2.987H8.855 v-6.224L14.936,11.094 M14.936,10.648L8.496,15.37v6.765h4.662v-3.347h3.604v3.347h4.613V15.37L14.936,10.648L14.936,10.648z" fill="url(#SVGID_11_)"/>
+<rect fill="none" height="30" width="30"/>
+</g>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_hs_offline.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_hs_offline.svg Fri May 14 16:09:54 2010 +0300
@@ -1,70 +1,80 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="2.2749" y2="32.0078">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+ <stop offset="0" style="stop-color:#4EDEFF"/>
+ <stop offset="1" style="stop-color:#048CC6"/>
</linearGradient>
<circle cx="15" cy="15" fill="url(#SVGID_1_)" r="13"/>
-<path d="M15,3c7.011,0,12.71,5.555,12.975,12.5C27.981,15.332,28,15.168,28,15c0-7.18-5.82-13-13-13 S2,7.82,2,15c0,0.168,0.019,0.332,0.025,0.5C2.29,8.555,7.989,3,15,3z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<polygon fill-opacity="0.2" points="25.839,14.5 7.454,14.5 7.454,11.5 20.253,11.5 18.975,9.57 21.476,7.914 25.839,14.5 " stroke-opacity="0.2"/>
-<polygon fill-opacity="0.2" points="6.454,16.5 24.839,16.5 24.839,19.5 12.04,19.5 13.318,21.428 10.817,23.086 6.454,16.5 " stroke-opacity="0.2"/>
+<path d="M15,3c7.011,0,12.71,5.555,12.975,12.5C27.981,15.332,28,15.168,28,15c0-7.18-5.82-13-13-13 S2,7.82,2,15c0,0.168,0.019,0.332,0.025,0.5C2.29,8.555,7.989,3,15,3z" fill="#FFFFFF" opacity="0.4"/>
+<polygon opacity="0.2" points="25.839,14.5 7.454,14.5 7.454,11.5 20.253,11.5 18.975,9.57 21.476,7.914 25.839,14.5 "/>
+<polygon opacity="0.2" points="6.454,16.5 24.839,16.5 24.839,19.5 12.04,19.5 13.318,21.428 10.817,23.086 6.454,16.5 "/>
<polygon fill="#FFFFFF" points="24.839,13.5 6.454,13.5 6.454,10.5 19.253,10.5 17.975,8.57 20.476,6.914 24.839,13.5 "/>
<polygon fill="#FFFFFF" points="5.454,15.5 23.839,15.5 23.839,18.5 11.04,18.5 12.318,20.428 9.817,22.086 5.454,15.5 "/>
<rect fill="none" height="30" width="30"/>
</g>
<g>
+<defs>
+</defs>
<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -330.8975)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="274.9814" x2="274.9814" y1="-359.3721" y2="-352.3351">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.66" style="stop-color:#E0E1E2"/>
-<stop offset="1" style="stop-color:#B9BCBD"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="0.66" style="stop-color:#E0E1E2"/>
+ <stop offset="1" style="stop-color:#B9BCBD"/>
</linearGradient>
<polygon fill="url(#SVGID_1__)" points="12.601,28.542 2.4,28.542 2.4,22.27 7.5,18.343 12.601,22.27 "/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -330.8975)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="274.9795" x2="274.9795" y1="-354.4097" y2="-359.3443">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.66" style="stop-color:#E0E1E2"/>
-<stop offset="1" style="stop-color:#B9BCBD"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="0.66" style="stop-color:#E0E1E2"/>
+ <stop offset="1" style="stop-color:#B9BCBD"/>
</linearGradient>
<path d="M7.5,18.857l4.693,3.613v5.665H2.809v-5.666L7.5,18.857 M7.5,18.343L2.4,22.27v6.273h10.2V22.27 L7.5,18.343L7.5,18.343z" fill="url(#SVGID_2_)"/>
-<polygon fill-opacity="0.2" points="12.601,23.826 12.601,22.27 7.5,18.343 2.4,22.27 2.4,23.952 7.5,19.872 " stroke-opacity="0.2"/>
+<polygon enable-background="new " opacity="0.2" points="12.601,23.826 12.601,22.27 7.5,18.343 2.4,22.27 2.4,23.952 7.5,19.872 "/>
<polygon fill="#727272" points="12.601,23.826 12.601,22.27 7.5,18.343 2.4,22.27 2.4,23.952 7.5,18.853 "/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -330.8975)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="274.9805" x2="274.9805" y1="-354.707" y2="-359.5847">
-<stop offset="0" style="stop-color:#D07100"/>
-<stop offset="1" style="stop-color:#A23600"/>
+ <stop offset="0" style="stop-color:#D07100"/>
+ <stop offset="1" style="stop-color:#A23600"/>
</linearGradient>
<rect fill="url(#SVGID_3_)" height="4.59" width="3.061" x="5.971" y="23.952"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -330.8975)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="274.9814" x2="274.9814" y1="-359.4072" y2="-354.8671">
-<stop offset="0" style="stop-color:#D07100"/>
-<stop offset="1" style="stop-color:#A23600"/>
+ <stop offset="0" style="stop-color:#D07100"/>
+ <stop offset="1" style="stop-color:#A23600"/>
</linearGradient>
<path d="M8.622,24.36v3.774H6.378V24.36H8.622 M9.031,23.952H5.971v4.59h3.061V23.952L9.031,23.952z" fill="url(#SVGID_4_)"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -267.4805 -330.8975)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="274.9795" x2="274.9795" y1="-346.8545" y2="-354.5899">
-<stop offset="0" style="stop-color:#DE8029"/>
-<stop offset="0.26" style="stop-color:#DE4E29"/>
-<stop offset="1" style="stop-color:#D82E09"/>
+ <stop offset="0" style="stop-color:#DE8029"/>
+ <stop offset="0.26" style="stop-color:#DE4E29"/>
+ <stop offset="1" style="stop-color:#D82E09"/>
</linearGradient>
<path d="M7.5,18.343l5.101,5.1l1.02-1.02c0,0-5.502-5.488-5.759-5.76c-0.255-0.271-0.422-0.285-0.738,0.016 C6.81,16.979,1.38,22.422,1.38,22.422l1.021,1.02L7.5,18.343z" fill="url(#SVGID_5_)"/>
<radialGradient cx="-3057.9365" cy="-384.3403" gradientTransform="matrix(0.125 0 0 -0.125 389.692 -31.3322)" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="65.2801">
-<stop offset="0" style="stop-color:#F7D481"/>
-<stop offset="1" style="stop-color:#F5340A"/>
+ <stop offset="0" style="stop-color:#F7D481"/>
+ <stop offset="1" style="stop-color:#F5340A"/>
</radialGradient>
<path d="M7.125,17.087c0.316-0.301,0.481-0.285,0.738-0.016c0.225,0.24,4.56,4.564,5.553,5.556l0.204-0.205 c0,0-5.502-5.488-5.759-5.76c-0.255-0.271-0.422-0.285-0.738,0.016C6.81,16.979,1.38,22.422,1.38,22.422l0.205,0.204 C2.569,21.638,6.846,17.353,7.125,17.087z" fill="url(#SVGID_6_)"/>
-<rect fill-opacity="0.2" height="0.511" stroke-opacity="0.2" width="3.061" x="5.971" y="23.952"/>
+<rect enable-background="new " height="0.511" opacity="0.2" width="3.061" x="5.971" y="23.952"/>
<rect fill="none" height="30" width="30"/>
</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"/>
+<rect height="34.27" 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>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_hs_widget.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_hs_widget.svg Fri May 14 16:09:54 2010 +0300
@@ -1,46 +1,45 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
<path d="M17.167,15.49c-0.878,0-1.592-0.714-1.592-1.592V4.937c0-0.877,0.714-1.592,1.592-1.592h8.963 c0.878,0,1.592,0.714,1.592,1.592v8.961c0,0.877-0.714,1.592-1.592,1.592H17.167z" fill-opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="9.1099" x2="9.1099" y1="14.7993" y2="29.1976">
-<stop offset="0" style="stop-color:#E8EEEF"/>
-<stop offset="0.0424" style="stop-color:#E8EEEF"/>
-<stop offset="0.2606" style="stop-color:#BBBFC1"/>
-<stop offset="0.5394" style="stop-color:#929A9E"/>
-<stop offset="1" style="stop-color:#969EA1"/>
+ <stop offset="0.0424" style="stop-color:#E8EEEF"/>
+ <stop offset="0.2606" style="stop-color:#BBBFC1"/>
+ <stop offset="0.5394" style="stop-color:#929A9E"/>
+ <stop offset="1" style="stop-color:#969EA1"/>
</linearGradient>
<path d="M4.63,27.471c-0.571,0-1.036-0.464-1.036-1.034v-8.962c0-0.571,0.465-1.035,1.036-1.035h8.962 c0.57,0,1.034,0.464,1.034,1.035v8.962c0,0.57-0.464,1.034-1.034,1.034H4.63z" fill="url(#SVGID_1_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="21.6484" x2="21.6484" y1="14.2666" y2="29.5001">
-<stop offset="0" style="stop-color:#9FDBED"/>
-<stop offset="0.7333" style="stop-color:#3261AA"/>
-<stop offset="1" style="stop-color:#2B84C4"/>
+ <stop offset="0" style="stop-color:#9FDBED"/>
+ <stop offset="0.7333" style="stop-color:#3261AA"/>
+ <stop offset="1" style="stop-color:#2B84C4"/>
</linearGradient>
<path d="M17.167,27.47c-0.569,0-1.034-0.464-1.034-1.034v-8.961c0-0.571,0.465-1.035,1.034-1.035h8.963 c0.569,0,1.033,0.463,1.033,1.035v8.961c0,0.57-0.464,1.034-1.033,1.034H17.167z" fill="url(#SVGID_2_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="21.6484" x2="21.6484" y1="1.8657" y2="17.1518">
-<stop offset="0" style="stop-color:#E8EEEF"/>
-<stop offset="0.0424" style="stop-color:#E8EEEF"/>
-<stop offset="0.2606" style="stop-color:#BBBFC1"/>
-<stop offset="0.5394" style="stop-color:#929A9E"/>
-<stop offset="1" style="stop-color:#969EA1"/>
+ <stop offset="0.0424" style="stop-color:#E8EEEF"/>
+ <stop offset="0.2606" style="stop-color:#BBBFC1"/>
+ <stop offset="0.5394" style="stop-color:#929A9E"/>
+ <stop offset="1" style="stop-color:#969EA1"/>
</linearGradient>
<path d="M17.167,14.932c-0.569,0-1.034-0.462-1.034-1.034V4.937c0-0.571,0.465-1.035,1.034-1.035h8.963 c0.569,0,1.033,0.463,1.033,1.035v8.961c0,0.571-0.464,1.034-1.033,1.034H17.167z" fill="url(#SVGID_3_)"/>
<polygon fill-opacity="0.6" points="4.988,10.178 1.52,6.882 6.245,6.136 8.309,1.82 10.479,6.082 15.222,6.71 11.838,10.092 12.706,14.796 8.445,12.624 4.237,14.902 "/>
<radialGradient cx="8.146" cy="58.4453" gradientTransform="matrix(1 0 0 -1 0.1597 62.4922)" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="10.161">
-<stop offset="0" style="stop-color:#FBDF6F"/>
-<stop offset="0.14" style="stop-color:#FBDF6F"/>
-<stop offset="0.55" style="stop-color:#FFC512"/>
-<stop offset="0.73" style="stop-color:#F2A61E"/>
-<stop offset="1" style="stop-color:#FBD23C"/>
+ <stop offset="0.14" style="stop-color:#FBDF6F"/>
+ <stop offset="0.55" style="stop-color:#FFC512"/>
+ <stop offset="0.73" style="stop-color:#F2A61E"/>
+ <stop offset="1" style="stop-color:#FBD23C"/>
</radialGradient>
<polygon fill="url(#SVGID_4_)" points="5.559,9.985 2.67,7.24 6.605,6.619 8.324,3.023 10.131,6.574 14.081,7.098 11.263,9.915 11.985,13.831 8.436,12.022 4.934,13.92 "/>
<radialGradient cx="8.2612" cy="57.21" gradientTransform="matrix(1 0 0 -1 0.1597 62.4922)" gradientUnits="userSpaceOnUse" id="SVGID_5_" r="14.1249">
-<stop offset="0" style="stop-color:#FFF3CD"/>
-<stop offset="1" style="stop-color:#FFC512"/>
+ <stop offset="0" style="stop-color:#FFF3CD"/>
+ <stop offset="1" style="stop-color:#FFC512"/>
</radialGradient>
<polygon fill="url(#SVGID_5_)" points="6.766,6.938 8.324,3.663 9.971,6.894 13.797,7.38 14.081,7.098 10.131,6.574 8.324,3.023 6.605,6.619 2.67,7.24 2.96,7.516 "/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_html.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_html.svg Fri May 14 16:09:54 2010 +0300
@@ -1,47 +1,91 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<polygon fill-opacity="0.6" points="3,29,3,1,27,1,27,22.41,20.41,29" stroke-opacity="0.6"/>
+
<linearGradient gradientTransform="matrix(1 0 0 -1 214.52 -8.0195)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-199.5" x2="-199.5" y1="-10.02" y2="-36.02">
+
<stop offset="0" stop-color="#F9F9F9"/>
+
<stop offset="1" stop-color="#B5B5B5"/>
+
</linearGradient>
+
<polygon fill="url(#SVGID_1_)" points="4,2,4,28,20,28,26,22,26,2"/>
+
<linearGradient gradientTransform="matrix(1 0 0 -1 214.52 -8.0195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-194.6" x2="-191.5" y1="-29.94" y2="-33.04">
+
<stop offset="0" stop-color="#F9F9F9"/>
+
<stop offset="1" stop-color="#DCDCDC"/>
+
</linearGradient>
+
<polygon fill="url(#SVGID_2_)" points="26,22,20,22,20,28"/>
+
<linearGradient gradientTransform="matrix(1 0 0 -1 214.52 -8.0195)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-199.5" x2="-199.5" y1="-5.646" y2="-15.02">
+
<stop offset="0" stop-color="#4EDEFF"/>
+
<stop offset="1" stop-color="#048CC6"/>
+
</linearGradient>
+
<rect fill="url(#SVGID_3_)" height="5.393" width="22" x="4" y="2"/>
+
<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="22" x="4" y="2"/>
+
<linearGradient gradientTransform="matrix(1 0 0 -1 214.52 -8.0195)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-207.5" x2="-207.5" y1="-19.02" y2="-28.09">
+
<stop offset="0" stop-color="#646464"/>
+
<stop offset="1" stop-color="#3C3C3C"/>
+
</linearGradient>
+
<polygon fill="url(#SVGID_4_)" points="9,18.5,6.332,15.5,9,12.5,9,11,5,15.5,9,20"/>
+
<linearGradient gradientTransform="matrix(1 0 0 -1 214.52 -8.0195)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-191.5" x2="-191.5" y1="-19.02" y2="-28.09">
+
<stop offset="0" stop-color="#646464"/>
+
<stop offset="1" stop-color="#3C3C3C"/>
+
</linearGradient>
+
<polygon fill="url(#SVGID_5_)" points="21,18.5,23.67,15.5,21,12.5,21,11,25,15.5,21,20"/>
+
<rect fill="none" height="30" width="30"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="11.7" x2="11.7" y1="19.52" y2="14.94">
+
<stop offset="0" stop-color="#646464"/>
+
<stop offset="1" stop-color="#3C3C3C"/>
+
</linearGradient>
+
<rect fill="url(#SVGID_6_)" height="1.049" width="1.049" x="11.17" y="14.92"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="14.99" x2="14.99" y1="19.52" y2="14.94">
+
<stop offset="0" stop-color="#646464"/>
+
<stop offset="1" stop-color="#3C3C3C"/>
+
</linearGradient>
+
<rect fill="url(#SVGID_7_)" height="1.049" width="1.049" x="14.46" y="14.92"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="18.28" x2="18.28" y1="19.52" y2="14.94">
+
<stop offset="0" stop-color="#646464"/>
+
<stop offset="1" stop-color="#3C3C3C"/>
+
</linearGradient>
+
<rect fill="url(#SVGID_8_)" height="1.049" width="1.05" x="17.75" y="14.92"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_im.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_im.svg Fri May 14 16:09:54 2010 +0300
@@ -1,23 +1,23 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
+<linearGradient gradientTransform="matrix(1 0 0 1 -367 -507)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="382" x2="382" y1="511.0117" y2="533.0017">
+ <stop offset="0" style="stop-color:#4EDEFF"/>
+ <stop offset="1" style="stop-color:#048CC6"/>
+</linearGradient>
<path d="M6.924,26.143c-0.131,0-0.213-0.2-0.213-0.512v-4.305l-0.077-0.049C3.688,19.395,2,16.643,2,13.726 c0-5.44,5.831-9.868,13-9.868c7.168,0,13,4.428,13,9.868c0,5.442-5.832,9.869-13,9.869c-1.618,0-3.201-0.226-4.706-0.669 l-0.105-0.031l-2.824,2.971C7.2,26.039,7.035,26.143,6.924,26.143L6.924,26.143z" fill="url(#SVGID_1_)"/>
-<path d="M15,4.785c6.961,0,12.646,4.18,12.969,9.405 C27.979,14.035,28,13.883,28,13.726c0-5.44-5.832-9.868-13-9.868c-7.169,0-13,4.428-13,9.868c0,0.149,0.023,0.296,0.033,0.446 C2.368,8.956,8.047,4.785,15,4.785z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M15,4.785c6.961,0,12.646,4.18,12.969,9.405 C27.979,14.035,28,13.883,28,13.726c0-5.44-5.832-9.868-13-9.868c-7.169,0-13,4.428-13,9.868c0,0.149,0.023,0.296,0.033,0.446 C2.368,8.956,8.047,4.785,15,4.785z" enable-background="new " fill="#FFFFFF" opacity="0.3"/>
<rect fill="#FFFFFF" height="1.084" width="13" x="8.5" y="8.688"/>
-<rect fill-opacity="0.2" height="0.541" stroke-opacity="0.2" width="13" x="8.5" y="9.771"/>
+<rect enable-background="new " height="0.541" opacity="0.2" width="13" x="8.5" y="9.771"/>
<rect fill="#FFFFFF" height="1.084" width="13" x="8.5" y="12.688"/>
-<rect fill-opacity="0.2" height="0.541" stroke-opacity="0.2" width="13" x="8.5" y="13.771"/>
+<rect enable-background="new " height="0.541" opacity="0.2" width="13" x="8.5" y="13.771"/>
<rect fill="#FFFFFF" height="1.084" width="13" x="8.5" y="16.688"/>
-<rect fill-opacity="0.2" height="0.541" stroke-opacity="0.2" width="13" x="8.5" y="17.771"/>
+<rect enable-background="new " height="0.541" opacity="0.2" width="13" x="8.5" y="17.771"/>
<rect fill="none" height="30" width="30"/>
-<defs>
-<linearGradient gradientTransform="matrix(1 0 0 1 -367 -507)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="382" x2="382" y1="511.0117" y2="533.0017">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
-</linearGradient>
-</defs>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_image.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_image.svg Fri May 14 16:09:54 2010 +0300
@@ -1,53 +1,103 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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">
+
<stop offset="0" stop-color="#DFDFDF"/>
+
<stop offset="1" stop-color="#B5B5B5"/>
+
</linearGradient>
+
<rect fill="url(#SVGID_1_)" height="22" width="28" x="1" y="4"/>
+
<rect fill="#FFFFFF" height="20" width="26" x="2" y="5"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="4.792" x2="22.61" y1="4.792" y2="22.61">
+
<stop offset="0" stop-color="#7EBA3E"/>
+
<stop offset="1" stop-color="#33773B"/>
+
</linearGradient>
+
<rect fill="url(#SVGID_2_)" height="18" width="24" x="3" y="6"/>
+
<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="28" x="1" y="25"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="7.994" x2="32.65" y1="10.39" y2="24.21">
+
<stop offset="0" stop-color="#A7FF00"/>
+
<stop offset="1" stop-color="#138F00"/>
+
</linearGradient>
+
<path d="M27,18.73c-0.327-0.234-0.694-0.459-1.109-0.658-2.262-1.08-9.354-2.498-14.11-4.163-4.755-1.665-3.118-3.442-3.118-3.442-0.106-0.389-0.37-0.777-0.792-0.111-1.122,1.768,1.143,3.228,3.646,4.163,3.118,1.166,10.33,2.419,13.16,4.385,0.956,0.665,1.717,1.31,2.324,1.905v-2.066z" fill="url(#SVGID_3_)"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="9.47" x2="23.28" y1="14.5" y2="27.5">
+
<stop offset="0" stop-color="#A7FF00"/>
+
<stop offset="1" stop-color="#138F00"/>
+
</linearGradient>
+
<path d="M9.721,19.19c0.528,0.444,2.42,0.806,4.28-1.056,1.109-1.109,1.109-2.774,1.109-2.774s-2.008-0.611-3.857,0.721c-1.846,1.33-2.057,2.66-1.529,3.11z" fill="url(#SVGID_4_)"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="8.799" x2="22.61" y1="15.21" y2="28.21">
+
<stop offset="0" stop-color="#A7FF00"/>
+
<stop offset="1" stop-color="#138F00"/>
+
</linearGradient>
+
<path d="M5.061,13.93c0.216,0.342,1.197,0.887,2.528,0.207,0.794-0.407,1.071-1.322,1.071-1.322s-1.002-0.704-2.24-0.312c-1.238,0.39-1.575,1.08-1.359,1.42z" fill="url(#SVGID_5_)"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="11.88" x2="25.69" y1="11.94" y2="24.95">
+
<stop offset="0" stop-color="#A7FF00"/>
+
<stop offset="1" stop-color="#138F00"/>
+
</linearGradient>
+
<path d="M13.9,11.03c-0.37-0.389-1.385-0.848-2.748,0.333-0.814,0.705-0.824,1.946-0.824,1.946s1.352,0.163,2.435-0.447c1.25-0.71,1.47-1.49,1.14-1.83z" fill="url(#SVGID_6_)"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="14.24" x2="28.06" y1="9.425" y2="22.43">
+
<stop offset="0" stop-color="#A7FF00"/>
+
<stop offset="1" stop-color="#138F00"/>
+
</linearGradient>
+
<path d="M21.43,13.08c-0.32-0.434-1.374-0.805-2.537,0.389-0.754,0.773-1.008,2.501-1.008,2.501s1.352,0.163,2.436-0.448c1.25-0.7,1.56-1.83,1.11-2.44z" fill="url(#SVGID_7_)"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="12.08" x2="25.89" y1="11.73" y2="24.73">
+
<stop offset="0" stop-color="#A7FF00"/>
+
<stop offset="1" stop-color="#138F00"/>
+
</linearGradient>
+
<path d="M17.93,22.48c0.671,0.473,3.591,1.17,5.955-0.809,1.411-1.182,0.898-3.266,0.898-3.266s-3.038-1.205-5.391,0.213c-2.35,1.43-2.13,3.4-1.46,3.87z" fill="url(#SVGID_8_)"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="16.78" x2="30.59" y1="6.738" y2="19.73">
+
<stop offset="0" stop-color="#A7FF00"/>
+
<stop offset="1" stop-color="#138F00"/>
+
</linearGradient>
+
<path d="M27,13.39c-0.542,0.568-1.025,1.292-1.342,2.203-0.617,1.781,0.855,3.279,0.855,3.279s0.18-0.04,0.48-0.13v-5.352z" fill="url(#SVGID_9_)"/>
+
<rect fill="none" height="30" width="30"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_internet.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_internet.svg Fri May 14 16:09:54 2010 +0300
@@ -1,37 +1,35 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
<radialGradient cx="-453.8818" cy="-299.3193" gradientTransform="matrix(0.3502 0 0 0.3502 173.9495 115.3211)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="48.9059">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#94FFFF"/>
+ <stop offset="0.5" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</radialGradient>
<circle cx="15" cy="15" fill="url(#SVGID_1_)" r="13"/>
-<path d="M27.536,14.288c-0.288-5.078-3.577-9.45-8.38-11.141l-0.585,0.096l-3.397-0.65l-4.235,2.525l-0.159,1.064 H8.322l0.971,1.651L6.662,9.979l-0.613,2.649l2.173,3.851l2.218-0.453l0.81,0.696l0.633,0.063l0.418,1.634l-0.552,1.432L13.763,25 h2.053l2.035-1.644v-0.671l0.537-0.833l0.444-0.227c-0.113,0.172-0.29,0.566-0.29,0.566c-0.019,0.134,0.289,2.755,1.192,2.55 c0.686-0.155,3.135-4.705,3.182-5.138c0.093-0.855-0.373-1.209-0.659-1.343l-0.318-0.15l-1.462,1.466 c-0.157,0.012-0.298,0.038-0.426,0.076v-1.217l1.588-1.551l0.808-2.604l1.231-1.002l-0.27-0.491l0.929-0.894l-0.519-0.946 l0.395,0.048l2.313,5.178L27,15.796c-0.015-0.254-0.042-0.503-0.071-0.753L27.536,14.288z M15.156,8.464l-0.193-0.516h1.161 l0.565,1.271h-0.841V8.464H15.156z M18.987,11.024l0.927,1.353l0.063,0.162l-0.95-0.574L18.8,11.146L18.987,11.024z M20.381,13.388 l0.28,0.28l-0.362,0.081l-0.082-0.1L20.381,13.388z M13.127,4.286l0.59,0.913l-0.67,0.205l-0.262-0.149L13.127,4.286z" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M15,2C7.821,2,2,7.821,2,15c0,7.182,5.821,13,13,13c7.182,0,13-5.818,13-13 C28,7.821,22.182,2,15,2z M15,27C8.383,27,3,21.617,3,15S8.383,3,15,3s12,5.383,12,12S21.617,27,15,27z" fill="url(#SVGID_2_)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M27.536,14.288c-0.288-5.078-3.577-9.45-8.38-11.141l-0.585,0.096l-3.397-0.65l-4.235,2.525l-0.159,1.064 H8.322l0.971,1.651L6.662,9.979l-0.613,2.649l2.173,3.851l2.218-0.453l0.81,0.696l0.633,0.063l0.418,1.634l-0.552,1.432L13.763,25 h2.053l2.035-1.644v-0.671l0.537-0.833l0.444-0.227c-0.113,0.172-0.29,0.566-0.29,0.566c-0.019,0.134,0.289,2.755,1.192,2.55 c0.686-0.155,3.135-4.705,3.182-5.138c0.093-0.855-0.373-1.209-0.659-1.343l-0.318-0.15l-1.462,1.466 c-0.157,0.012-0.298,0.038-0.426,0.076v-1.217l1.588-1.551l0.808-2.604l1.231-1.002l-0.27-0.491l0.929-0.894l-0.519-0.946 l0.395,0.048l2.313,5.178L27,15.796c-0.015-0.254-0.042-0.503-0.071-0.753L27.536,14.288z M15.156,8.464l-0.193-0.516h1.161 l0.565,1.271h-0.841V8.464H15.156z M18.987,11.024l0.927,1.353l0.063,0.162l-0.95-0.574L18.8,11.146L18.987,11.024z M20.381,13.388 l0.28,0.28l-0.362,0.081l-0.082-0.1L20.381,13.388z M13.127,4.286l0.59,0.913l-0.67,0.205l-0.262-0.149L13.127,4.286z" opacity="0.3"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="2.0625" y2="28.1316">
+ <stop offset="0" style="stop-color:#31A7F8"/>
+ <stop offset="0.497" style="stop-color:#1E74DC"/>
+ <stop offset="1" style="stop-color:#C8E4EB"/>
+</linearGradient>
+<path d="M15,2C7.821,2,2,7.821,2,15c0,7.182,5.821,13,13,13c7.182,0,13-5.818,13-13 C28,7.821,22.182,2,15,2z M15,27C8.383,27,3,21.617,3,15S8.383,3,15,3s12,5.383,12,12S21.617,27,15,27z" fill="url(#SVGID_2_)" opacity="0.3"/>
<radialGradient cx="15.75" cy="5.5" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="15.4173">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+ <stop offset="0.3152" style="stop-color:#94FF26"/>
+ <stop offset="0.7273" style="stop-color:#1FC211"/>
+ <stop offset="1" style="stop-color:#0BA133"/>
</radialGradient>
<path d="M22.044,18.714l-1.353,1.355c0,0-0.818,0-0.856,0.324c-0.018,0.14-0.063,0.744-0.201,1.056 c-0.272,0.188-0.597,0.813-0.597,0.813s-0.169,1.206,0.734,1.001C20.669,23.06,23.434,19.367,22.044,18.714z" fill="url(#SVGID_3_)"/>
<radialGradient cx="15.75" cy="5.5005" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="17.8335">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+ <stop offset="0.3152" style="stop-color:#94FF26"/>
+ <stop offset="0.7273" style="stop-color:#1FC211"/>
+ <stop offset="1" style="stop-color:#0BA133"/>
</radialGradient>
<path d="M18.99,3.619c-0.222,0.084-0.374,0.142-0.374,0.142l-3.344-0.64l-1.64,1.026l0.863,1.335 l-1.509,0.464l-0.813-0.464l0.286-0.811l-1.06,0.734L11.21,6.683H9.196L9.941,7.95L7.11,10.259l-0.533,2.304l1.051,2.035L8.259,15 l2.218-0.453l0.81,0.696l0.736,0.072l0.801,3.134l-0.533,1.386l1.178,2.604l0.332,1.081h2.053l1.16-0.628l0.875-1.016v-1.229 l1.663-0.849v-1.821l0.658-1.251l1.467-1.32l0.351-1.53l-1.919,0.428l-0.505-0.615l0.359-0.574l-1.363-0.824l-0.581-2.089 l1.007-0.656l0.927,1.353L20.3,11.79l0.696,0.696l0.813,0.425l0.903-0.146l1.003-0.965l-0.706-1.288l-0.889,0.232l-0.804-0.957 l0.764-0.533l2.397,0.29v0.853l2.086,4.298l0.474-0.379C26.756,9.359,23.48,5.199,18.99,3.619z M17.901,9.429l-1.095,0.29h-1.458 V8.964h-1.394l-1.103,0.291L11.17,8.79l-0.465-0.87l2.321-0.522h2.322L15,6.469h1.161l0.646,1.451l1.095,0.384V9.429z M20.397,7.514 l-1.974-0.349V6.469l0.987-0.232l0.29-0.348l0.696,0.58V7.514z" fill="url(#SVGID_4_)"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="2.0625" y2="28.1316">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#C8E4EB"/>
-</linearGradient>
-</defs>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_intranet.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_intranet.svg Fri May 14 16:09:54 2010 +0300
@@ -1,39 +1,37 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
<path d="M28,16v-2h-2.051c-0.115-1.279-0.455-2.491-0.971-3.606l1.779-1.027l-1-1.732L23.98,8.66 c-0.725-1.023-1.617-1.916-2.641-2.641l1.026-1.778l-1.732-1l-1.027,1.779C18.491,4.505,17.279,4.166,16,4.051V2h-2v2.051 c-1.279,0.115-2.491,0.454-3.606,0.97L9.366,3.241l-1.732,1L8.661,6.02C7.637,6.744,6.744,7.637,6.02,8.66L4.242,7.634l-1,1.732 l1.779,1.027C4.505,11.509,4.166,12.721,4.05,14H2v2h2.05c0.116,1.279,0.455,2.491,0.971,3.606l-1.779,1.027l1,1.732L6.02,21.34 c0.724,1.023,1.617,1.916,2.641,2.641l-1.027,1.778l1.732,1l1.027-1.779c1.115,0.516,2.327,0.854,3.606,0.97V28h2v-2.051 c1.279-0.115,2.491-0.454,3.606-0.97l1.027,1.779l1.732-1L21.34,23.98c1.023-0.725,1.916-1.617,2.641-2.641l1.777,1.026l1-1.732 l-1.779-1.027c0.516-1.115,0.855-2.327,0.971-3.606H28z" fill="#FFFFFF"/>
<radialGradient cx="-453.8818" cy="-296.3535" gradientTransform="matrix(0.3502 0 0 0.3502 173.9495 115.3211)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="37.62">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#94FFFF"/>
+ <stop offset="0.5" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</radialGradient>
<circle cx="15" cy="15" fill="url(#SVGID_1_)" r="10"/>
-<path d="M24.643,14.452c-0.221-3.906-2.75-7.27-6.445-8.568l-0.451,0.072l-2.612-0.501l-3.258,1.942l-0.123,0.82 h-1.89l0.747,1.27l-2.023,1.65l-0.472,2.039l1.672,2.961l1.706-0.349l0.623,0.535l0.486,0.048l0.321,1.259l-0.424,1.101l1.55,3.96 h1.579l1.566-1.263v-0.516l0.412-0.643l0.342-0.174c-0.087,0.133-0.223,0.436-0.223,0.436c-0.014,0.104,0.223,2.119,0.917,1.963 c0.527-0.12,2.411-3.621,2.448-3.954c0.07-0.656-0.287-0.929-0.508-1.032l-0.244-0.115l-1.125,1.127 c-0.121,0.01-0.229,0.029-0.328,0.059v-0.937l1.222-1.192l0.622-2.002l0.947-0.771l-0.209-0.378l0.715-0.687l-0.398-0.729 l0.305,0.036l1.778,3.983l0.364-0.292c-0.011-0.195-0.032-0.386-0.055-0.577L24.643,14.452z M15.12,9.973l-0.148-0.397h0.893 l0.435,0.977h-0.647V9.973H15.12z M18.067,11.941l0.713,1.042l0.049,0.124l-0.731-0.442l-0.176-0.629L18.067,11.941z M19.139,13.76 l0.216,0.216l-0.278,0.063l-0.063-0.078L19.139,13.76z M13.559,6.759l0.454,0.702l-0.515,0.158l-0.202-0.114L13.559,6.759z" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M15,5C9.478,5,5,9.478,5,15c0,5.523,4.478,10,10,10c5.525,0,10-4.477,10-10 C25,9.478,20.525,5,15,5z M15,24.231c-5.09,0-9.231-4.141-9.231-9.231S9.91,5.769,15,5.769c5.09,0,9.23,4.141,9.23,9.231 S20.09,24.231,15,24.231z" fill="url(#SVGID_2_)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M24.643,14.452c-0.221-3.906-2.75-7.27-6.445-8.568l-0.451,0.072l-2.612-0.501l-3.258,1.942l-0.123,0.82 h-1.89l0.747,1.27l-2.023,1.65l-0.472,2.039l1.672,2.961l1.706-0.349l0.623,0.535l0.486,0.048l0.321,1.259l-0.424,1.101l1.55,3.96 h1.579l1.566-1.263v-0.516l0.412-0.643l0.342-0.174c-0.087,0.133-0.223,0.436-0.223,0.436c-0.014,0.104,0.223,2.119,0.917,1.963 c0.527-0.12,2.411-3.621,2.448-3.954c0.07-0.656-0.287-0.929-0.508-1.032l-0.244-0.115l-1.125,1.127 c-0.121,0.01-0.229,0.029-0.328,0.059v-0.937l1.222-1.192l0.622-2.002l0.947-0.771l-0.209-0.378l0.715-0.687l-0.398-0.729 l0.305,0.036l1.778,3.983l0.364-0.292c-0.011-0.195-0.032-0.386-0.055-0.577L24.643,14.452z M15.12,9.973l-0.148-0.397h0.893 l0.435,0.977h-0.647V9.973H15.12z M18.067,11.941l0.713,1.042l0.049,0.124l-0.731-0.442l-0.176-0.629L18.067,11.941z M19.139,13.76 l0.216,0.216l-0.278,0.063l-0.063-0.078L19.139,13.76z M13.559,6.759l0.454,0.702l-0.515,0.158l-0.202-0.114L13.559,6.759z" opacity="0.3"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="5.0479" y2="25.1011">
+ <stop offset="0" style="stop-color:#31A7F8"/>
+ <stop offset="0.497" style="stop-color:#1E74DC"/>
+ <stop offset="1" style="stop-color:#C8E4EB"/>
+</linearGradient>
+<path d="M15,5C9.478,5,5,9.478,5,15c0,5.523,4.478,10,10,10c5.525,0,10-4.477,10-10 C25,9.478,20.525,5,15,5z M15,24.231c-5.09,0-9.231-4.141-9.231-9.231S9.91,5.769,15,5.769c5.09,0,9.23,4.141,9.23,9.231 S20.09,24.231,15,24.231z" fill="url(#SVGID_2_)" opacity="0.3"/>
<radialGradient cx="15.5771" cy="7.6904" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="11.8606">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+ <stop offset="0.3152" style="stop-color:#94FF26"/>
+ <stop offset="0.7273" style="stop-color:#1FC211"/>
+ <stop offset="1" style="stop-color:#0BA133"/>
</radialGradient>
<path d="M20.418,17.856L19.377,18.9c0,0-0.629,0-0.658,0.248c-0.014,0.107-0.049,0.573-0.154,0.813 c-0.209,0.145-0.459,0.625-0.459,0.625s-0.129,0.928,0.564,0.77C19.361,21.199,21.486,18.359,20.418,17.856z" fill="url(#SVGID_3_)"/>
<radialGradient cx="15.5776" cy="7.6934" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="13.7178">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+ <stop offset="0.3152" style="stop-color:#94FF26"/>
+ <stop offset="0.7273" style="stop-color:#1FC211"/>
+ <stop offset="1" style="stop-color:#0BA133"/>
</radialGradient>
<path d="M18.068,6.245c-0.17,0.065-0.287,0.108-0.287,0.108l-2.572-0.49l-1.262,0.789l0.664,1.027 l-1.16,0.355L12.827,7.68l0.22-0.624l-0.815,0.565l-0.147,0.98h-1.549l0.574,0.975l-2.178,1.776l-0.41,1.772l0.808,1.566L9.814,15 l1.707-0.348l0.622,0.535l0.566,0.055l0.616,2.41l-0.41,1.066l0.905,2.004l0.256,0.832h1.58l0.893-0.484l0.672-0.781v-0.945 l1.279-0.652V17.29l0.506-0.962l1.129-1.016l0.27-1.177l-1.477,0.329l-0.387-0.475l0.275-0.44l-1.049-0.635l-0.445-1.606 l0.773-0.504l0.713,1.039l0.268,0.688l0.535,0.535l0.625,0.327l0.695-0.112l0.771-0.742l-0.543-0.991l-0.684,0.179l-0.617-0.735 l0.588-0.41l1.844,0.224v0.655l1.604,3.306l0.365-0.291C24.043,10.66,21.523,7.461,18.068,6.245z M17.232,10.715l-0.844,0.223 h-1.121v-0.581h-1.071l-0.849,0.225l-1.294-0.358l-0.356-0.668l1.785-0.402h1.786L15,8.438h0.893l0.496,1.117l0.844,0.294V10.715z M19.152,9.242l-1.518-0.27V8.438l0.758-0.18l0.223-0.266l0.537,0.445V9.242z" fill="url(#SVGID_4_)"/>
<rect fill="none" height="30" width="30"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="5.0479" y2="25.1011">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#C8E4EB"/>
-</linearGradient>
-</defs>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_java.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_java.svg Fri May 14 16:09:54 2010 +0300
@@ -1,28 +1,30 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
+<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" opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="13.9995" x2="13.9995" y1="2.8911" y2="23.5236">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#A5A5A5"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#A5A5A5"/>
</linearGradient>
<path d="M24,10h-8V8.365c0.943-0.553,2-1.146,2-2.261C18,4.392,16.217,3,14.5,3C12.782,3,11,4.392,11,6.104 c0,1.115,1.053,1.711,2,2.263V10h-2c-1.1,0-2,0.9-2,2v5H7.365c-0.553-0.943-1.146-2-2.261-2C3.392,15,2,16.783,2,18.5 C2,20.218,3.392,22,5.104,22c1.115,0,1.711-1.053,2.263-2H9v1c0,1.1,0.9,2,2,2h2.225v-1.866C12.141,20.503,11,19.822,11,18.548 C11,16.591,13.037,15,15,15c1.961,0,4,1.591,4,3.548c0,1.273-1.141,1.952-2.219,2.584V23H24c1.1,0,2-0.9,2-2v-9 C26,10.9,25.1,10,24,10z" fill="url(#SVGID_1_)"/>
-<path d="M16.781,21.132v1C17.859,21.5,19,20.821,19,19.548c0-0.175-0.034-0.342-0.065-0.51 C18.684,20.005,17.711,20.587,16.781,21.132z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M11,11h2v-1h-2c-1.1,0-2,0.9-2,2v1C9,11.9,9.9,11,11,11z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M14.5,4c1.529,0,3.104,1.106,3.43,2.559C17.972,6.416,18,6.268,18,6.104 C18,4.392,16.217,3,14.5,3C12.782,3,11,4.392,11,6.104c0,0.163,0.028,0.313,0.07,0.455C11.396,5.107,12.969,4,14.5,4z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M24,10h-8v1h8c1.1,0,2,0.9,2,2v-1C26,10.9,25.1,10,24,10z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M5.104,16c1.114,0,1.708,1.057,2.261,2H9v-1H7.365c-0.553-0.943-1.146-2-2.261-2 C3.392,15,2,16.783,2,18.5c0,0.167,0.023,0.334,0.049,0.5C2.284,17.454,3.559,16,5.104,16z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M11.065,19.038C11.034,19.206,11,19.373,11,19.548c0,1.274,1.141,1.955,2.225,2.586v-1 C12.289,20.59,11.316,20.006,11.065,19.038z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<rect fill-opacity="0.6" height="12" stroke-opacity="0.6" width="12" x="17" y="16"/>
+<path d="M16.781,21.132v1C17.859,21.5,19,20.821,19,19.548c0-0.175-0.034-0.342-0.065-0.51 C18.684,20.005,17.711,20.587,16.781,21.132z" fill="#FFFFFF" opacity="0.4"/>
+<path d="M11,11h2v-1h-2c-1.1,0-2,0.9-2,2v1C9,11.9,9.9,11,11,11z" fill="#FFFFFF" opacity="0.4"/>
+<path d="M14.5,4c1.529,0,3.104,1.106,3.43,2.559C17.972,6.416,18,6.268,18,6.104 C18,4.392,16.217,3,14.5,3C12.782,3,11,4.392,11,6.104c0,0.163,0.028,0.313,0.07,0.455C11.396,5.107,12.969,4,14.5,4z" fill="#FFFFFF" opacity="0.4"/>
+<path d="M24,10h-8v1h8c1.1,0,2,0.9,2,2v-1C26,10.9,25.1,10,24,10z" fill="#FFFFFF" opacity="0.4"/>
+<path d="M5.104,16c1.114,0,1.708,1.057,2.261,2H9v-1H7.365c-0.553-0.943-1.146-2-2.261-2 C3.392,15,2,16.783,2,18.5c0,0.167,0.023,0.334,0.049,0.5C2.284,17.454,3.559,16,5.104,16z" fill="#FFFFFF" opacity="0.4"/>
+<path d="M11.065,19.038C11.034,19.206,11,19.373,11,19.548c0,1.274,1.141,1.955,2.225,2.586v-1 C12.289,20.59,11.316,20.006,11.065,19.038z" fill="#FFFFFF" opacity="0.4"/>
+<rect height="12" opacity="0.6" width="12" x="17" y="16"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="23" x2="23" y1="17" y2="27">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+ <stop offset="0" style="stop-color:#4EDEFF"/>
+ <stop offset="1" style="stop-color:#048CC6"/>
</linearGradient>
<rect fill="url(#SVGID_2_)" height="10" width="10" x="18" y="17"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="10" x="18" y="17"/>
-<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="10" x="18" y="26"/>
+<rect fill="#FFFFFF" height="1" opacity="0.4" width="10" x="18" y="17"/>
+<rect height="1" opacity="0.2" width="10" x="18" y="26"/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_landline.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_landline.svg Fri May 14 16:09:54 2010 +0300
@@ -1,73 +1,75 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
+<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" opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="8.1636" y2="25.0077">
-<stop offset="0" style="stop-color:#E6E6E6"/>
-<stop offset="1" style="stop-color:#626262"/>
+ <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,2H5c-1.1,0-2-0.9-2-2V10c0-1.1,0.9-2,2-2h20c1.1,0,2,0.9,2,2V23z" fill="url(#SVGID_1_)"/>
-<path d="M25,8H5c-1.1,0-2,0.9-2,2v1c0-1.1,0.9-2,2-2h20c1.1,0,2,0.9,2,2v-1C27,8.9,26.1,8,25,8z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M8,24c2.206,0,4-1.794,4-4V8H4v12C4,22.206,5.794,24,8,24z" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M25,8H5c-1.1,0-2,0.9-2,2v1c0-1.1,0.9-2,2-2h20c1.1,0,2,0.9,2,2v-1C27,8.9,26.1,8,25,8z" fill="#FFFFFF" opacity="0.4"/>
+<path d="M8,24c2.206,0,4-1.794,4-4V8H4v12C4,22.206,5.794,24,8,24z" opacity="0.1"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="8" x2="8" y1="5.1729" y2="23.0078">
-<stop offset="0" style="stop-color:#A0A7A8"/>
-<stop offset="1" style="stop-color:#252629"/>
+ <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,3l0,0c-1.65,0-3-1.35-3-3V8c0-1.65,1.35-3,3-3l0,0c1.65,0,3,1.35,3,3V20z" fill="url(#SVGID_2_)"/>
-<path d="M8,5C6.35,5,5,6.35,5,8v1c0-1.65,1.35-3,3-3s3,1.35,3,3V8C11,6.35,9.65,5,8,5z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M10,11v11.217c0.609-0.55,1-1.337,1-2.217V9L10,11z" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M6,22.217V11L5,9v11C5,20.88,5.391,21.667,6,22.217z" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M8,5C6.35,5,5,6.35,5,8v1c0-1.65,1.35-3,3-3s3,1.35,3,3V8C11,6.35,9.65,5,8,5z" fill="#FFFFFF" opacity="0.3"/>
+<path d="M10,11v11.217c0.609-0.55,1-1.337,1-2.217V9L10,11z" opacity="0.3"/>
+<path d="M6,22.217V11L5,9v11C5,20.88,5.391,21.667,6,22.217z" opacity="0.3"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="14.4995" x2="14.4995" y1="14" y2="23.9798">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+ <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"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="18.5" x2="18.5" y1="14" y2="23.9798">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+ <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"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="22.5" x2="22.5" y1="14" y2="23.9798">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+ <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"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="14.4995" x2="14.4995" y1="13.0005" y2="22.9802">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+ <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"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="18.5" x2="18.5" y1="13.0005" y2="22.9802">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+ <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"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="22.5" x2="22.5" y1="13.0005" y2="22.9802">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+ <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"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="14.4995" x2="14.4995" y1="12.0005" y2="21.9802">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+ <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"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_10_" x1="18.5" x2="18.5" y1="12.0005" y2="21.9802">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+ <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="17" y="20"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_11_" x1="22.5" x2="22.5" y1="12.0005" y2="21.9802">
-<stop offset="0" style="stop-color:#696D6F"/>
-<stop offset="1" style="stop-color:#252629"/>
+ <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"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_12_" x1="18.5" x2="18.5" y1="10.1875" y2="13.0632">
-<stop offset="0" style="stop-color:#30BCE8"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+ <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"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_landline_home.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_landline_home.svg Fri May 14 16:09:54 2010 +0300
@@ -1,58 +1,113 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_landline_work.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_landline_work.svg Fri May 14 16:09:54 2010 +0300
@@ -1,57 +1,111 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_link.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_link.svg Fri May 14 16:09:54 2010 +0300
@@ -1,25 +1,25 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
+<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" opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="2.2749" y2="32.0078">
+ <stop offset="0" style="stop-color:#4EDEFF"/>
+ <stop offset="1" style="stop-color:#048CC6"/>
+</linearGradient>
<circle cx="15" cy="15" fill="url(#SVGID_1_)" r="13"/>
-<path d="M15,3c7.011,0,12.71,5.555,12.975,12.5C27.981,15.332,28,15.169,28,15c0-7.18-5.82-13-13-13 S2,7.82,2,15c0,0.169,0.019,0.332,0.025,0.5C2.29,8.555,7.989,3,15,3z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M13,16c0,0.553-0.447,1-1,1H6c-0.553,0-1-0.447-1-1l0,0c0-0.553,0.447-1,1-1h6C12.553,15,13,15.447,13,16 L13,16z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M27,16c0,0.553-0.447,1-1,1h-6c-0.553,0-1-0.447-1-1l0,0c0-0.553,0.447-1,1-1h6C26.553,15,27,15.447,27,16 L27,16z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M13,13h6c0.737,0,1.375,0.405,1.722,1h2.136c-0.447-1.721-1.999-3-3.857-3h-6c-1.858,0-3.41,1.279-3.857,3 h2.136C11.625,13.405,12.263,13,13,13z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M20.722,18c-0.347,0.595-0.984,1-1.722,1h-6c-0.737,0-1.375-0.405-1.722-1H9.143c0.447,1.721,1.999,3,3.857,3 h6c1.858,0,3.41-1.279,3.857-3H20.722z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M15,3c7.011,0,12.71,5.555,12.975,12.5C27.981,15.332,28,15.169,28,15c0-7.18-5.82-13-13-13 S2,7.82,2,15c0,0.169,0.019,0.332,0.025,0.5C2.29,8.555,7.989,3,15,3z" fill="#FFFFFF" opacity="0.4"/>
+<path d="M13,16c0,0.553-0.447,1-1,1H6c-0.553,0-1-0.447-1-1l0,0c0-0.553,0.447-1,1-1h6C12.553,15,13,15.447,13,16 L13,16z" opacity="0.2"/>
+<path d="M27,16c0,0.553-0.447,1-1,1h-6c-0.553,0-1-0.447-1-1l0,0c0-0.553,0.447-1,1-1h6C26.553,15,27,15.447,27,16 L27,16z" opacity="0.2"/>
+<path d="M13,13h6c0.737,0,1.375,0.405,1.722,1h2.136c-0.447-1.721-1.999-3-3.857-3h-6c-1.858,0-3.41,1.279-3.857,3 h2.136C11.625,13.405,12.263,13,13,13z" opacity="0.2"/>
+<path d="M20.722,18c-0.347,0.595-0.984,1-1.722,1h-6c-0.737,0-1.375-0.405-1.722-1H9.143c0.447,1.721,1.999,3,3.857,3 h6c1.858,0,3.41-1.279,3.857-3H20.722z" opacity="0.2"/>
<path d="M12,15c0,0.553-0.447,1-1,1H5c-0.553,0-1-0.447-1-1l0,0c0-0.553,0.447-1,1-1h6C11.553,14,12,14.447,12,15 L12,15z" fill="#FFFFFF"/>
<path d="M26,15c0,0.553-0.447,1-1,1h-6c-0.553,0-1-0.447-1-1l0,0c0-0.553,0.447-1,1-1h6C25.553,14,26,14.447,26,15 L26,15z" fill="#FFFFFF"/>
<path d="M12,12h6c0.737,0,1.375,0.405,1.722,1h2.136c-0.447-1.721-1.999-3-3.857-3h-6c-1.858,0-3.41,1.279-3.857,3 h2.136C10.625,12.405,11.263,12,12,12z" fill="#FFFFFF"/>
<path d="M19.722,17c-0.347,0.595-0.984,1-1.722,1h-6c-0.737,0-1.375-0.405-1.722-1H8.143 c0.447,1.721,1.999,3,3.857,3h6c1.858,0,3.41-1.279,3.857-3H19.722z" fill="#FFFFFF"/>
<rect fill="none" height="30" width="30"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="2.2749" y2="32.0078">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
-</linearGradient>
-</defs>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_location.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_location.svg Fri May 14 16:09:54 2010 +0300
@@ -1,28 +1,30 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
-<g fill-opacity="0.5" stroke-opacity="0.5">
-<rect fill="none" height="30" width="30"/>
+<g opacity="0.5">
+ <rect fill="none" height="30" width="30"/>
</g>
-<ellipse cx="15.37" cy="27.279" fill="#333333" fill-opacity="0.2" rx="7.052" ry="2.721" stroke-opacity="0.2"/>
-<path d="M18.615,27.279c0,0.69-1.455,1.251-3.246,1.251c-1.79,0-3.244-0.561-3.244-1.251 c0-0.694,1.454-1.253,3.244-1.253C17.16,26.026,18.615,26.586,18.615,27.279z" fill="#333333" fill-opacity="0.4" stroke-opacity="0.4"/>
+<ellipse cx="15.37" cy="27.279" enable-background="new " fill="#333333" opacity="0.2" rx="7.052" ry="2.721"/>
+<path d="M18.615,27.279c0,0.69-1.455,1.251-3.246,1.251c-1.79,0-3.244-0.561-3.244-1.251 c0-0.694,1.454-1.253,3.244-1.253C17.16,26.026,18.615,26.586,18.615,27.279z" fill="#333333" opacity="0.4"/>
<path d="M24.592,1.348c-1.578,1.113-4.293,2.684-5.461,2.684c-0.002,0-0.002,0-0.004,0 c-0.266-0.032-0.66-0.29-1.078-0.564c-0.836-0.547-1.984-1.297-3.656-1.309c-1.232,0-3.102,1.206-4.354,2.131L9.262,2.275L3.5,4.49 l1.32,3.416l0.777-0.299l6.963,18.037L15.896,28l0.865-3.971l-1.742-4.511l0.313-0.802c0.641-1.651,2.09-4.584,3.254-5.409 c0.305-0.216,1.156-0.646,1.84-0.988c0.693-0.351,1.293-0.65,1.646-0.876c2.91-1.866,3.971-8.396,4.08-9.135L26.5,0L24.592,1.348z" fill-opacity="0.6"/>
<linearGradient gradientTransform="matrix(0.9331 -0.3596 -0.3596 -0.9331 -71.0508 -951.4899)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-269.8569" x2="-272.3403" y1="-932.4741" y2="-932.4741">
-<stop offset="0" style="stop-color:#8C8E8F"/>
-<stop offset="0.65" style="stop-color:#D9D9D9"/>
-<stop offset="1" style="stop-color:#AEB2B3"/>
+ <stop offset="0" style="stop-color:#8C8E8F"/>
+ <stop offset="0.65" style="stop-color:#D9D9D9"/>
+ <stop offset="1" style="stop-color:#AEB2B3"/>
</linearGradient>
<polygon fill="url(#SVGID_1_)" points="6.169,6.32 8.51,5.417 15.725,24.106 15.24,26.318 13.383,25.006 "/>
<linearGradient gradientTransform="matrix(0.9331 -0.3596 -0.3596 -0.9331 -71.0508 -951.4899)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-269.0659" x2="-273.1762" y1="-920.6802" y2="-920.6802">
-<stop offset="0" style="stop-color:#4F4F4F"/>
-<stop offset="0.59" style="stop-color:#BFBFBF"/>
-<stop offset="1" style="stop-color:#6B6B6B"/>
+ <stop offset="0" style="stop-color:#4F4F4F"/>
+ <stop offset="0.59" style="stop-color:#BFBFBF"/>
+ <stop offset="1" style="stop-color:#6B6B6B"/>
</linearGradient>
<polygon fill="url(#SVGID_2_)" points="4.79,5.063 8.689,3.563 9.291,5.121 5.393,6.619 "/>
-<rect fill-opacity="0.2" height="0.834" stroke-opacity="0.2" transform="matrix(-0.933 0.3598 -0.3598 -0.933 16.7306 9.4024)" width="2.508" x="6.236" y="5.841"/>
+<rect enable-background="new " height="0.834" opacity="0.2" transform="matrix(-0.933 0.3598 -0.3598 -0.933 16.7306 9.4024)" width="2.508" x="6.236" y="5.841"/>
<path d="M9.59,5.896c0,0,3.352-2.754,4.811-2.742c2.279,0.017,3.373,1.721,4.609,1.864 c1.805,0.214,6.158-2.858,6.158-2.858s-1.021,6.767-3.635,8.445c-0.688,0.437-2.859,1.419-3.523,1.891 c-1.844,1.307-3.609,5.862-3.609,5.862L9.59,5.896z" fill="#33A02C"/>
-<path d="M14.746,4.046c2.279,0.021,3.373,1.723,4.607,1.868 c1.396,0.162,4.318-1.639,5.566-2.461c0.164-0.773,0.244-1.293,0.244-1.293s-4.354,3.072-6.158,2.858 c-1.234-0.144-2.328-1.849-4.607-1.864C12.939,3.143,9.59,5.896,9.59,5.896l0.346,0.896C9.936,6.792,13.285,4.038,14.746,4.046z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M14.746,4.046c2.279,0.021,3.373,1.723,4.607,1.868 c1.396,0.162,4.318-1.639,5.566-2.461c0.164-0.773,0.244-1.293,0.244-1.293s-4.354,3.072-6.158,2.858 c-1.234-0.144-2.328-1.849-4.607-1.864C12.939,3.143,9.59,5.896,9.59,5.896l0.346,0.896C9.936,6.792,13.285,4.038,14.746,4.046z" enable-background="new " fill="#FFFFFF" opacity="0.4"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_lock.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,45 @@
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
+<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" 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" opacity="0.4"/>
+<rect height="2" opacity="0.2" width="24" x="3" y="23"/>
+<rect height="2" opacity="0.2" width="24" x="3" y="19"/>
+<rect fill="none" height="30" width="30" x="0"/>
+</g>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_meeting.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_meeting.svg Fri May 14 16:09:54 2010 +0300
@@ -1,49 +1,51 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
+<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" opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5.6558" x2="22.9905" y1="15.9707" y2="15.9707">
-<stop offset="0" style="stop-color:#FFCA26"/>
-<stop offset="1" style="stop-color:#FEAB0E"/>
+ <stop offset="0" style="stop-color:#FFCA26"/>
+ <stop offset="1" style="stop-color:#FEAB0E"/>
</linearGradient>
<path d="M8.514,8.838C7.975,8.916,7.43,9.006,7.096,9.053L6.391,9.025l-1.074,7.865l0.521,0.492 c1.512,1.336,5.945,5.82,10.537,5.82l2.107-0.076l0,0c1.711-0.063,3.928-3.133,4.145-3.422C24.459,17.523,16.092,7.641,8.514,8.838z " fill="url(#SVGID_1_)"/>
-<path d="M10.77,14.654c-0.434-0.279-0.932-0.428-1.441-0.428c-0.215,0-0.432,0.025-0.648,0.076 c-0.98,0.232-1.709,0.977-2.293,1.574L6.178,16.09c-0.285,0.285-0.459,0.662-0.559,1.086l0.219,0.207 c1.512,1.336,5.945,5.82,10.537,5.82l0.201-0.008c0.195-0.148,0.375-0.291,0.496-0.412c0.67-0.676,0.934-1.541,0.75-2.449 C17.775,19.791,17.33,18.445,10.77,14.654z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M10.77,14.654c-0.434-0.279-0.932-0.428-1.441-0.428c-0.215,0-0.432,0.025-0.648,0.076 c-0.98,0.232-1.709,0.977-2.293,1.574L6.178,16.09c-0.285,0.285-0.459,0.662-0.559,1.086l0.219,0.207 c1.512,1.336,5.945,5.82,10.537,5.82l0.201-0.008c0.195-0.148,0.375-0.291,0.496-0.412c0.67-0.676,0.934-1.541,0.75-2.449 C17.775,19.791,17.33,18.445,10.77,14.654z" opacity="0.2"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -6 35)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="17.6895" x2="17.6895" y1="20.0127" y2="-2.761">
-<stop offset="0" style="stop-color:#FFF2A9"/>
-<stop offset="0.1337" style="stop-color:#FFE89A"/>
-<stop offset="0.3918" style="stop-color:#FFCF72"/>
-<stop offset="0.7449" style="stop-color:#FFA732"/>
-<stop offset="1" style="stop-color:#FF8800"/>
+ <stop offset="0" style="stop-color:#FFF2A9"/>
+ <stop offset="0.1337" style="stop-color:#FFE89A"/>
+ <stop offset="0.3918" style="stop-color:#FFCF72"/>
+ <stop offset="0.7449" style="stop-color:#FFA732"/>
+ <stop offset="1" style="stop-color:#FF8800"/>
</linearGradient>
<path d="M10.238,15.496c-0.398-0.256-0.859-0.33-1.332-0.219c-0.801,0.189-1.455,0.945-2.029,1.52 c-0.576,0.58-0.346,2.322-0.322,2.627c0.025,0.348,0.213,0.662,0.502,0.852c0.465,0.314,4.816,3.188,5.398,3.574 c0.188,0.125,0.693,0.252,1.197,0.025c0.18-0.076,2.178-1.258,2.721-1.801c0.471-0.475,0.602-1.021,0.465-1.602 C16.791,19.287,10.238,15.496,10.238,15.496z" fill="url(#SVGID_2_)"/>
-<path d="M6.877,17.797c0.574-0.574,1.229-1.33,2.029-1.52c0.473-0.111,0.934-0.037,1.332,0.219 c0,0,6.221,3.602,6.568,4.879c0.094-0.287,0.105-0.59,0.031-0.902c-0.047-1.186-6.6-4.977-6.6-4.977 c-0.398-0.256-0.859-0.33-1.332-0.219c-0.801,0.189-1.455,0.945-2.029,1.52c-0.418,0.42-0.41,1.445-0.367,2.098 C6.547,18.453,6.645,18.031,6.877,17.797z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M8.514,8.838C8.467,8.844,8.42,8.852,8.373,8.857C8.061,9.242,7.766,9.615,7.514,9.939 c-0.711,1.094-0.439,1.959-0.217,2.379c0.432,0.807,1.412,1.309,2.557,1.309c0.73,0,1.459-0.197,2.104-0.574 c1.033-0.6,1.846-1.178,2.461-1.754c1.135,0.576,3.246,1.908,4.084,2.779c1.008,1.049,2.641,4.008,2.949,5.154 c0.121,0.443,0.4,0.773,0.779,0.99c0.207-0.26,0.35-0.455,0.396-0.518C24.459,17.523,16.092,7.641,8.514,8.838z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M6.877,17.797c0.574-0.574,1.229-1.33,2.029-1.52c0.473-0.111,0.934-0.037,1.332,0.219 c0,0,6.221,3.602,6.568,4.879c0.094-0.287,0.105-0.59,0.031-0.902c-0.047-1.186-6.6-4.977-6.6-4.977 c-0.398-0.256-0.859-0.33-1.332-0.219c-0.801,0.189-1.455,0.945-2.029,1.52c-0.418,0.42-0.41,1.445-0.367,2.098 C6.547,18.453,6.645,18.031,6.877,17.797z" fill="#FFFFFF" opacity="0.4"/>
+<path d="M8.514,8.838C8.467,8.844,8.42,8.852,8.373,8.857C8.061,9.242,7.766,9.615,7.514,9.939 c-0.711,1.094-0.439,1.959-0.217,2.379c0.432,0.807,1.412,1.309,2.557,1.309c0.73,0,1.459-0.197,2.104-0.574 c1.033-0.6,1.846-1.178,2.461-1.754c1.135,0.576,3.246,1.908,4.084,2.779c1.008,1.049,2.641,4.008,2.949,5.154 c0.121,0.443,0.4,0.773,0.779,0.99c0.207-0.26,0.35-0.455,0.396-0.518C24.459,17.523,16.092,7.641,8.514,8.838z" opacity="0.2"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 -6 35)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="22.4619" x2="22.4619" y1="29.3672" y2="-5.6876">
-<stop offset="0" style="stop-color:#FFF2A9"/>
-<stop offset="0.1337" style="stop-color:#FFE89A"/>
-<stop offset="0.3918" style="stop-color:#FFCF72"/>
-<stop offset="0.7449" style="stop-color:#FFA732"/>
-<stop offset="1" style="stop-color:#FF8800"/>
+ <stop offset="0" style="stop-color:#FFF2A9"/>
+ <stop offset="0.1337" style="stop-color:#FFE89A"/>
+ <stop offset="0.3918" style="stop-color:#FFCF72"/>
+ <stop offset="0.7449" style="stop-color:#FFA732"/>
+ <stop offset="1" style="stop-color:#FF8800"/>
</linearGradient>
<path d="M23.408,9.369c-0.021,0-1.93-0.008-2.07-0.023c-4.553-4.561-7.27-3.404-9.592-2.574 c-0.789,0.361-3.404,3.717-3.404,3.717c-1.143,1.76,1.277,2.773,3.121,1.699c1.561-0.908,2.311-1.6,2.725-2.08 c0.953,0.326,3.936,2.141,5.025,3.275c1.09,1.133,2.83,4.232,3.191,5.582c0.213,0.773,1.377,0.488,1.377,0.488l1.096-0.486 L23.408,9.369z" fill="url(#SVGID_3_)"/>
-<path d="M8.342,11.488c0,0,2.615-3.355,3.404-3.717c2.322-0.83,5.039-1.986,9.592,2.574 c0.141,0.016,2.049,0.023,2.07,0.023l1.326,8.662l0.143-0.064l-1.469-9.598c-0.021,0-1.93-0.008-2.07-0.023 c-4.553-4.561-7.27-3.404-9.592-2.574c-0.789,0.361-3.404,3.717-3.404,3.717c-0.34,0.523-0.359,0.979-0.178,1.334 C8.209,11.715,8.268,11.604,8.342,11.488z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M23.934,19.385l0.943-0.418l-1.469-9.598c-0.012,0-0.561-0.002-1.092-0.006L23.934,19.385z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M8.342,11.488c0,0,2.615-3.355,3.404-3.717c2.322-0.83,5.039-1.986,9.592,2.574 c0.141,0.016,2.049,0.023,2.07,0.023l1.326,8.662l0.143-0.064l-1.469-9.598c-0.021,0-1.93-0.008-2.07-0.023 c-4.553-4.561-7.27-3.404-9.592-2.574c-0.789,0.361-3.404,3.717-3.404,3.717c-0.34,0.523-0.359,0.979-0.178,1.334 C8.209,11.715,8.268,11.604,8.342,11.488z" fill="#FFFFFF" opacity="0.4"/>
+<path d="M23.934,19.385l0.943-0.418l-1.469-9.598c-0.012,0-0.561-0.002-1.092-0.006L23.934,19.385z" opacity="0.2"/>
<linearGradient gradientTransform="matrix(0.9869 -0.1613 0.1613 0.9869 -176.9958 -51.6826)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="189.8135" x2="189.8135" y1="90.9219" y2="103.5013">
-<stop offset="0" style="stop-color:#F9F9F9"/>
-<stop offset="0.1669" style="stop-color:#EEEEEE"/>
-<stop offset="0.7665" style="stop-color:#C5C5C5"/>
-<stop offset="1" style="stop-color:#B5B5B5"/>
+ <stop offset="0" style="stop-color:#F9F9F9"/>
+ <stop offset="0.1669" style="stop-color:#EEEEEE"/>
+ <stop offset="0.7665" style="stop-color:#C5C5C5"/>
+ <stop offset="1" style="stop-color:#B5B5B5"/>
</linearGradient>
<polygon fill="url(#SVGID_4_)" points="28.863,18.926 24.967,19.572 23.057,7.729 26.953,7.084 "/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="25.953,8.084 27.732,19.113 28.863,18.926 26.953,7.084 23.057,7.729 23.188,8.541 " stroke-opacity="0.4"/>
-<path d="M7.75,8.953c-0.254,0.039-0.482,0.076-0.654,0.1L6.391,9.025l-1.074,7.865l0.521,0.492 c0.135,0.119,0.301,0.271,0.482,0.436L7.75,8.953z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<polygon fill="#FFFFFF" opacity="0.4" points="25.953,8.084 27.732,19.113 28.863,18.926 26.953,7.084 23.057,7.729 23.188,8.541 "/>
+<path d="M7.75,8.953c-0.254,0.039-0.482,0.076-0.654,0.1L6.391,9.025l-1.074,7.865l0.521,0.492 c0.135,0.119,0.301,0.271,0.482,0.436L7.75,8.953z" opacity="0.2"/>
<linearGradient gradientTransform="matrix(-0.9869 -0.1613 -0.1613 0.9869 -641.6711 -51.6826)" gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-647.7456" x2="-647.7456" y1="-46.2344" y2="-33.6554">
-<stop offset="0" style="stop-color:#F9F9F9"/>
-<stop offset="1" style="stop-color:#B5B5B5"/>
+ <stop offset="0" style="stop-color:#F9F9F9"/>
+ <stop offset="1" style="stop-color:#B5B5B5"/>
</linearGradient>
<polygon fill="url(#SVGID_5_)" points="1.137,18.926 5.033,19.572 6.945,7.729 3.047,7.084 "/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="3.047,7.084 2.863,8.219 5.945,8.729 4.217,19.436 5.033,19.572 6.945,7.729 " stroke-opacity="0.4"/>
+<polygon fill="#FFFFFF" opacity="0.4" points="3.047,7.084 2.863,8.219 5.945,8.729 4.217,19.436 5.033,19.572 6.945,7.729 "/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_message.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_message.svg Fri May 14 16:09:54 2010 +0300
@@ -1,30 +1,30 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
<rect fill-opacity="0.6" height="20" width="28" x="1" y="5"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="6.0415" y2="24.042">
-<stop offset="0" style="stop-color:#FEAB0E"/>
-<stop offset="0.3091" style="stop-color:#FEAB0E"/>
-<stop offset="0.7879" style="stop-color:#FFDA33"/>
-<stop offset="1" style="stop-color:#FFE377"/>
+ <stop offset="0" style="stop-color:#FEAB0E"/>
+ <stop offset="0.3091" style="stop-color:#FEAB0E"/>
+ <stop offset="0.7879" style="stop-color:#FFDA33"/>
+ <stop offset="1" style="stop-color:#FFE377"/>
</linearGradient>
<rect fill="url(#SVGID_1_)" height="18" width="26" x="2" y="6"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="15,12.633 2.241,24 3.409,24 15,14.526 26.591,24 27.759,24 " stroke-opacity="0.4"/>
+<polygon fill="#FFFFFF" opacity="0.4" points="15,12.633 2.241,24 3.409,24 15,14.526 26.591,24 27.759,24 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="6" y2="24.0005">
-<stop offset="0" style="stop-color:#C9700B"/>
-<stop offset="0.0072" style="stop-color:#C9700B"/>
-<stop offset="0.2727" style="stop-color:#C9700B"/>
-<stop offset="0.7212" style="stop-color:#E8AC22"/>
-<stop offset="1" style="stop-color:#E8AC22"/>
+ <stop offset="0.0072" style="stop-color:#C9700B"/>
+ <stop offset="0.2727" style="stop-color:#C9700B"/>
+ <stop offset="0.7212" style="stop-color:#E8AC22"/>
</linearGradient>
-<polygon fill="url(#SVGID_2_)" fill-opacity="0.5" points="28,6 15.137,6.947 2,6 2,6.161 10.863,15.487 2,23.941 2,24 2.241,24 11.328,15.902 15,19.365 18.672,15.902 27.759,24 28,24 28,23.941 19.162,15.487 28,6.161 " stroke-opacity="0.5"/>
+<polygon fill="url(#SVGID_2_)" opacity="0.5" points="28,6 15.137,6.947 2,6 2,6.161 10.863,15.487 2,23.941 2,24 2.241,24 11.328,15.902 15,19.365 18.672,15.902 27.759,24 28,24 28,23.941 19.162,15.487 28,6.161 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="15" x2="15" y1="6.0957" y2="17.2921">
-<stop offset="0" style="stop-color:#FFF278"/>
-<stop offset="1" style="stop-color:#FFFCDA"/>
+ <stop offset="0" style="stop-color:#FFF278"/>
+ <stop offset="1" style="stop-color:#FFFCDA"/>
</linearGradient>
<polygon fill="url(#SVGID_3_)" points="2.127,6 15,17.47 27.873,6 "/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_missed_call.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_missed_call.svg Fri May 14 16:09:54 2010 +0300
@@ -1,18 +1,18 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
+<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" opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="2" y2="28.0005">
+ <stop offset="0" style="stop-color:#FF4D00"/>
+ <stop offset="1" style="stop-color:#800000"/>
+</linearGradient>
<path d="M23,18c0,2.757-2.243,5-5,5s-5-2.243-5-5v-4h7L11,2L2,14h6v4c0,5.5,4.5,10,10,10s10-4.5,10-10H23z" fill="url(#SVGID_1_)"/>
-<path d="M13,18v1c0,2.757,2.243,5,5,5s5-2.243,5-5h4.949C27.982,18.671,28,18.338,28,18h-5 c0,2.757-2.243,5-5,5S13,20.757,13,18z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="11,3 19.25,14 20,14 11,2 2,14 2.75,14 " stroke-opacity="0.4"/>
+<path d="M13,18v1c0,2.757,2.243,5,5,5s5-2.243,5-5h4.949C27.982,18.671,28,18.338,28,18h-5 c0,2.757-2.243,5-5,5S13,20.757,13,18z" fill="#FFFFFF" opacity="0.4"/>
+<polygon fill="#FFFFFF" opacity="0.4" points="11,3 19.25,14 20,14 11,2 2,14 2.75,14 "/>
<rect fill="none" height="30" width="30"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="2" y2="28.0005">
-<stop offset="0" style="stop-color:#FF4D00"/>
-<stop offset="1" style="stop-color:#800000"/>
-</linearGradient>
-</defs>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mms.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mms.svg Fri May 14 16:09:54 2010 +0300
@@ -1,66 +1,129 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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">
+
<stop offset="0" stop-color="#DFDFDF"/>
+
<stop offset="1" stop-color="#B5B5B5"/>
+
</linearGradient>
+
<rect fill="url(#SVGID_1_)" height="22" width="28" x="1" y="4"/>
+
<rect fill="#FFFFFF" height="20" width="26" x="2" y="5"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="4.792" x2="22.61" y1="4.792" y2="22.61">
+
<stop offset="0" stop-color="#7EBA3E"/>
+
<stop offset="1" stop-color="#33773B"/>
+
</linearGradient>
+
<rect fill="url(#SVGID_2_)" height="18" width="24" x="3" y="6"/>
+
<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="28" x="1" y="25"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="7.994" x2="32.65" y1="10.39" y2="24.21">
+
<stop offset="0" stop-color="#A7FF00"/>
+
<stop offset="1" stop-color="#138F00"/>
+
</linearGradient>
+
<path d="M27,18.73c-0.327-0.234-0.694-0.459-1.109-0.658-2.262-1.08-9.354-2.498-14.11-4.163-4.755-1.665-3.118-3.442-3.118-3.442-0.106-0.389-0.37-0.777-0.792-0.111-1.122,1.768,1.143,3.228,3.646,4.163,3.118,1.166,10.33,2.419,13.16,4.385,0.956,0.665,1.717,1.31,2.324,1.905v-2.066z" fill="url(#SVGID_3_)"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="9.47" x2="23.28" y1="14.5" y2="27.5">
+
<stop offset="0" stop-color="#A7FF00"/>
+
<stop offset="1" stop-color="#138F00"/>
+
</linearGradient>
+
<path d="M9.721,19.19c0.528,0.444,2.42,0.806,4.28-1.056,1.109-1.109,1.109-2.774,1.109-2.774s-2.008-0.611-3.857,0.721c-1.846,1.33-2.057,2.66-1.529,3.11z" fill="url(#SVGID_4_)"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="8.799" x2="22.61" y1="15.21" y2="28.21">
+
<stop offset="0" stop-color="#A7FF00"/>
+
<stop offset="1" stop-color="#138F00"/>
+
</linearGradient>
+
<path d="M5.061,13.93c0.216,0.342,1.197,0.887,2.528,0.207,0.794-0.407,1.071-1.322,1.071-1.322s-1.002-0.704-2.24-0.312c-1.238,0.39-1.575,1.08-1.359,1.42z" fill="url(#SVGID_5_)"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="11.88" x2="25.69" y1="11.94" y2="24.95">
+
<stop offset="0" stop-color="#A7FF00"/>
+
<stop offset="1" stop-color="#138F00"/>
+
</linearGradient>
+
<path d="M13.9,11.03c-0.37-0.389-1.385-0.848-2.748,0.333-0.814,0.705-0.824,1.946-0.824,1.946s1.352,0.163,2.435-0.447c1.25-0.71,1.47-1.49,1.14-1.83z" fill="url(#SVGID_6_)"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="14.24" x2="28.06" y1="9.425" y2="22.43">
+
<stop offset="0" stop-color="#A7FF00"/>
+
<stop offset="1" stop-color="#138F00"/>
+
</linearGradient>
+
<path d="M21.43,13.08c-0.32-0.434-1.374-0.805-2.537,0.389-0.754,0.773-1.008,2.501-1.008,2.501s1.352,0.163,2.436-0.448c1.25-0.7,1.56-1.83,1.11-2.44z" fill="url(#SVGID_7_)"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="12.08" x2="25.89" y1="11.73" y2="24.73">
+
<stop offset="0" stop-color="#A7FF00"/>
+
<stop offset="1" stop-color="#138F00"/>
-</linearGradient>
-<path d="M17.93,22.48c0.671,0.473,3.591,1.17,5.955-0.809,1.411-1.182,0.898-3.266,0.898-3.266s-3.038-1.205-5.391,0.213c-2.35,1.43-2.13,3.4-1.46,3.87z" fill="url(#SVGID_8_)"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="16.78" x2="30.59" y1="6.738" y2="19.73">
-<stop offset="0" stop-color="#A7FF00"/>
-<stop offset="1" stop-color="#138F00"/>
+
</linearGradient>
-<path d="M27,13.39c-0.542,0.568-1.025,1.292-1.342,2.203-0.617,1.781,0.855,3.279,0.855,3.279s0.18-0.04,0.48-0.13v-5.352z" fill="url(#SVGID_9_)"/>
-<rect fill="none" height="30" width="30"/>
-<path d="M20.96,28.68c-1.825,0-3.309-1.187-3.309-2.646s1.483-2.647,3.309-2.647c0.224,0,0.445,0.018,0.661,0.053v-7.245l5.735,1.537v4.111l-3.089-0.828v5.02c0,1.47-1.49,2.66-3.31,2.66z" fill-opacity="0.6" stroke-opacity="0.6" style="enable-background:new;"/>
-<linearGradient gradientTransform="matrix(0.8824 0 0 0.8824 -252.2905 -982.9092)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="311.4" x2="311.4" y1="1131" y2="1148">
-<stop offset="0" stop-color="#DE8029"/>
-<stop offset="0.2606" stop-color="#DE4E29"/>
-<stop offset="1" stop-color="#D82E09"/>
+
+<path d="M17.93,22.48c0.671,0.473,3.591,1.17,5.955-0.809,1.411-1.182,0.898-3.266,0.898-3.266s-3.038-1.205-5.391,0.213c-2.35,1.43-2.13,3.4-1.46,3.87z" fill="url(#SVGID_8_)"/>
+
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="16.78" x2="30.59" y1="6.738" y2="19.73">
+
+<stop offset="0" stop-color="#A7FF00"/>
+
+<stop offset="1" stop-color="#138F00"/>
+
</linearGradient>
+
+<path d="M27,13.39c-0.542,0.568-1.025,1.292-1.342,2.203-0.617,1.781,0.855,3.279,0.855,3.279s0.18-0.04,0.48-0.13v-5.352z" fill="url(#SVGID_9_)"/>
+
+<rect fill="none" height="30" width="30"/>
+
+<path d="M20.96,28.68c-1.825,0-3.309-1.187-3.309-2.646s1.483-2.647,3.309-2.647c0.224,0,0.445,0.018,0.661,0.053v-7.245l5.735,1.537v4.111l-3.089-0.828v5.02c0,1.47-1.49,2.66-3.31,2.66z" opacity="0.6" style="enable-background:new;"/>
+
+<linearGradient gradientTransform="matrix(0.8824 0 0 0.8824 -252.2905 -982.9092)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="311.4" x2="311.4" y1="1131" y2="1148">
+
+<stop offset="0" stop-color="#DE8029"/>
+
+<stop offset="0.2606" stop-color="#DE4E29"/>
+
+<stop offset="1" stop-color="#D82E09"/>
+
+</linearGradient>
+
<path d="M22.06,16.77v7.229c-0.34-0.109-0.712-0.17-1.103-0.17-1.584,0-2.868,0.987-2.868,2.206s1.284,2.206,2.868,2.206c1.583,0,2.867-0.988,2.867-2.206v-5.595l3.088,0.828v-3.198l-4.86-1.3z" fill="url(#SVGID_1__)"/>
-<path d="M20.96,27.8c-1.487,0-2.709-0.871-2.854-1.985-0.009,0.072-0.014,0.146-0.014,0.221,0,1.219,1.283,2.206,2.867,2.206,1.583,0,2.867-0.988,2.867-2.206v-0.45c-0.02,1.22-1.3,2.21-2.88,2.21z" fill-opacity="0.2" stroke-opacity="0.2" style="enable-background:new;"/>
-<polygon fill-opacity="0.2" points="23.82,20.44,26.91,21.26,26.91,20.82,23.82,20" stroke-opacity="0.2" style="enable-background:new;"/>
-<path d="M20.96,24.27c0.391,0,0.763,0.062,1.103,0.171v-0.441c-0.339-0.109-0.712-0.17-1.103-0.17-1.584,0-2.867,0.987-2.867,2.206,0,0.074,0.005,0.147,0.014,0.22,0.15-1.12,1.37-1.99,2.86-1.99z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4" style="enable-background:new;"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="22.06,16.77,22.06,17.21,26.91,18.51,26.91,18.07" stroke-opacity="0.4" style="enable-background:new;"/>
+
+<path d="M20.96,27.8c-1.487,0-2.709-0.871-2.854-1.985-0.009,0.072-0.014,0.146-0.014,0.221,0,1.219,1.283,2.206,2.867,2.206,1.583,0,2.867-0.988,2.867-2.206v-0.45c-0.02,1.22-1.3,2.21-2.88,2.21z" opacity="0.2" style="enable-background:new;"/>
+
+<polygon opacity="0.2" points="23.82,20.44,26.91,21.26,26.91,20.82,23.82,20" style="enable-background:new;"/>
+
+<path d="M20.96,24.27c0.391,0,0.763,0.062,1.103,0.171v-0.441c-0.339-0.109-0.712-0.17-1.103-0.17-1.584,0-2.867,0.987-2.867,2.206,0,0.074,0.005,0.147,0.014,0.22,0.15-1.12,1.37-1.99,2.86-1.99z" fill="#FFFFFF" opacity="0.4" style="enable-background:new;"/>
+
+<polygon fill="#FFFFFF" opacity="0.4" points="22.06,16.77,22.06,17.21,26.91,18.51,26.91,18.07" style="enable-background:new;"/>
+
<rect fill="none" height="15" width="15" x="15" y="15"/>
+
<rect fill="none" height="30" width="30"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mobile.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mobile.svg Fri May 14 16:09:54 2010 +0300
@@ -1,46 +1,48 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
+<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" opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="-4.1611" y2="28.2423">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#9B9D9E"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#9B9D9E"/>
</linearGradient>
<path d="M24,26.338c0,1.084-0.879,1.963-1.963,1.963H7.963C6.879,28.301,6,27.422,6,26.338V3.994 C6,2.91,6.879,2.032,7.963,2.032h14.074C23.121,2.032,24,2.91,24,3.994V26.338z" fill="url(#SVGID_1_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="21.0811" y2="27.3765">
-<stop offset="0" style="stop-color:#A6A8AB"/>
-<stop offset="0.703" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#808184"/>
+ <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="13" y="23.301"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="14.9995" x2="14.9995" y1="23.1904" y2="26.3381">
-<stop offset="0" style="stop-color:#F0F0F0"/>
-<stop offset="1" style="stop-color:#9B9D9E"/>
+ <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="14" y="24.301"/>
-<path d="M22.037,2.032H7.963C6.879,2.032,6,2.91,6,3.994v1C6,3.91,6.879,3.032,7.963,3.032h14.074 C23.121,3.032,24,3.91,24,4.994v-1C24,2.91,23.121,2.032,22.037,2.032z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M22.037,2.032H7.963C6.879,2.032,6,2.91,6,3.994v1C6,3.91,6.879,3.032,7.963,3.032h14.074 C23.121,3.032,24,3.91,24,4.994v-1C24,2.91,23.121,2.032,22.037,2.032z" fill="#FFFFFF" opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="15.0005" x2="15.0005" y1="22.2461" y2="4.1392">
-<stop offset="0" style="stop-color:#DADADB"/>
-<stop offset="1" style="stop-color:#9B9D9E"/>
+ <stop offset="0" style="stop-color:#DADADB"/>
+ <stop offset="1" style="stop-color:#9B9D9E"/>
</linearGradient>
<rect fill="url(#SVGID_4_)" height="18.301" width="16" x="7" y="4.032"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="14.9995" x2="14.9995" y1="5.0322" y2="21.3059">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="1" style="stop-color:#1347BA"/>
+ <stop offset="0" style="stop-color:#3BC8EB"/>
+ <stop offset="1" style="stop-color:#1347BA"/>
</linearGradient>
<rect fill="url(#SVGID_5_)" height="16.301" width="14" x="8" y="5.032"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="9" x2="9" y1="24.3008" y2="26.2852">
-<stop offset="0" style="stop-color:#1CAB00"/>
-<stop offset="1" style="stop-color:#1F6300"/>
+ <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="24.301"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="21" x2="21" y1="24.3008" y2="26.3008">
-<stop offset="0" style="stop-color:#E63B00"/>
-<stop offset="1" style="stop-color:#8C0000"/>
+ <stop offset="0" style="stop-color:#E63B00"/>
+ <stop offset="1" style="stop-color:#8C0000"/>
</linearGradient>
<rect fill="url(#SVGID_7_)" height="2" width="4" x="19" y="24.301"/>
-<polygon fill="#FFFFFF" fill-opacity="0.2" points="22,11.162 22,5.032 8,5.032 8,12.301 " stroke-opacity="0.2"/>
+<polygon fill="#FFFFFF" opacity="0.2" points="22,11.162 22,5.032 8,5.032 8,12.301 "/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mobile_home.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mobile_home.svg Fri May 14 16:09:54 2010 +0300
@@ -1,55 +1,107 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mobile_work.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_mobile_work.svg Fri May 14 16:09:54 2010 +0300
@@ -1,54 +1,105 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
+
</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"/>
-</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"/>
+
</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"/>
+
+<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"/>
+
</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"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_doc.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_doc.svg Fri May 14 16:09:54 2010 +0300
@@ -1,10 +1,17 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<rect fill="none" height="30" width="30"/>
+
<rect height="27" width="21.6" x="4.201" y="1.5"/>
+
<rect fill="#336699" height="24.3" width="18.9" x="5.55" y="2.851"/>
+
<path d="M6.9,4.2v21.6h16.2v-21.6s-14.14,0-16.2,0z" fill="#FFFFFF"/>
+
<rect fill="#F6F6F5" height="18.9" width="13.5" x="8.25" y="5.55"/>
+
<path d="M18.14,10.69v1.209l1.11-0.083-2.952,4.246,0.271-3.326v-0.838h0.793v-1.21h-9.11v1.209h0.791v0.805l-0.83,8.861h1.041l4.059-5.508-0.339,5.508h1.034l6.841-9.666h0.87v-1.2h-3.567zm-6.58,5.27l0.258-4.063h2.623l-2.88,4.06z" fill="#0A50A1"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_pdf.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_pdf.svg Fri May 14 16:09:54 2010 +0300
@@ -1,10 +1,17 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<rect fill="none" height="30" width="30"/>
+
<rect height="27" width="21.6" x="4.201" y="1.5"/>
+
<rect fill="#FF0000" height="24.3" width="18.9" x="5.551" y="2.85"/>
+
<path d="M6.901,4.199v21.6h16.2v-21.6s-14.14-0.001-16.2-0.001z" fill="#FFFFFF"/>
+
<rect fill="#F6F6F5" height="18.9" width="13.5" x="8.25" y="5.55"/>
+
<path d="M16.97,17.67c-0.629-1.442-1.301-3.105-1.503-3.802,0,0,1.54-6.305-0.319-6.305-2.705,0-0.414,6.441-0.414,6.441s-0.91,3.215-1.242,3.909c-1.168,0-5.157,2.126-3.504,3.781,0.854,0.855,2.521-0.056,4.005-3.224,0.261-0.259,2.221-0.506,2.502-0.225,0.988,1.67,2.624,4.454,3.679,3.404,1.37-1.4-1.84-3.99-3.21-3.99zm-6.49,3.55c-0.454-0.454-0.309-1.569,2.651-2.479-1.04,2.07-2.19,2.93-2.65,2.48zm4.54-12.93c1.065,0,0.202,3.646,0.022,4.391,0,0-1.21-4.388-0.02-4.388zm4.72,12.87c-0.487,0.487-1.961-2.063-2.296-2.614,1.52,0.47,2.79,2.13,2.3,2.61z" fill="#FF0000"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_ppt.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_ppt.svg Fri May 14 16:09:54 2010 +0300
@@ -1,13 +1,23 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<rect fill="none" height="30" width="30"/>
+
<rect height="27" width="21.6" x="4.2" y="1.5"/>
+
<rect fill="#F96D11" height="24.3" width="18.9" x="5.55" y="2.85"/>
+
<rect fill="#FFFFFF" height="21.6" width="16.2" x="6.899" y="4.2"/>
+
<rect fill="#F6F6F5" height="18.9" width="13.5" x="8.25" y="5.55"/>
+
<rect fill="#F96D11" height="1.35" width="5.399" x="9.601" y="6.901"/>
+
<rect fill="#F96D11" height="1.35" width="5.399" x="9.601" y="9.601"/>
+
<circle cx="14.32" cy="18.38" fill="#FAA513" r="4.725"/>
+
<path d="M20.4,18.37c-0.006-3.349-2.729-6.067-6.075-6.067v6.067h6.08z" fill="#F96D11"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_rtf.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_rtf.svg Fri May 14 16:09:54 2010 +0300
@@ -1,12 +1,21 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<rect fill="none" height="30" width="30"/>
+
<rect height="27" width="21.6" x="4.2" y="1.5"/>
+
<path d="M5.55,2.85v24.3h18.9v-24.3s-16.76,0-18.9,0z"/>
+
<path d="M6.9,4.2v21.6h16.2v-21.6h-16.2z" fill="#FFFFFF"/>
+
<rect fill="#F6F6F5" height="18.9" width="13.5" x="8.25" y="5.55"/>
+
<path d="M10.58,12.88c0.371-0.77,0.937-1.065,1.758-1.065,0.074,0,0.159,0,0.245,0.011v1.01c-0.14-0.008-0.266-0.008-0.396-0.008-0.938,0-1.375,0.425-1.375,1.408v3.688h-1.097v-6.056h0.619l0.26,1.01z"/>
+
<path d="M16.47,17.82c-0.424,0.117-0.872,0.192-1.311,0.192-0.96,0-1.364-0.438-1.364-1.384v-4.01h-0.735v-0.746h0.745l0.438-1.45h0.661v1.45h1.47v0.746h-1.47v3.817c0,0.489,0.085,0.811,0.65,0.811,0.309,0,0.617-0.075,0.915-0.149v0.718z"/>
+
<path d="M20.3,10.53c-0.267-0.084-0.543-0.158-0.82-0.158-0.746,0-0.788,0.468-0.788,1.503h1.107v0.746h-1.107v5.311h-1.108v-5.313h-0.736v-0.744h0.736c0-1.334,0.201-2.271,1.695-2.271,0.352,0,0.694,0.041,1.022,0.128v0.793z"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_xls.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ms_xls.svg Fri May 14 16:09:54 2010 +0300
@@ -1,13 +1,23 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<rect fill="none" height="30" width="30"/>
+
<rect height="27" width="21.6" x="4.199" y="1.5"/>
+
<rect fill="#33A02C" height="24.3" width="18.9" x="5.549" y="2.85"/>
+
<rect fill="#FFFFFF" height="21.6" width="16.2" x="6.899" y="4.2"/>
+
<rect fill="#F6F6F5" height="18.9" width="13.5" x="8.25" y="5.55"/>
+
<polygon points="21.72,10.9,13.15,21.75,8.659,21.75,16.82,10.9"/>
+
<path d="M17.5,12.25c-0.581,0.77-4.178,5.553-6.132,8.153h1.13c0.581-0.735,4.366-5.531,6.438-8.153h-1.44z" fill="#33A02C"/>
+
<polygon points="8.25,10.06,16,21.75,21.31,21.75,13.15,10.06"/>
+
<path d="M10.76,11.41c1.756,2.649,5.378,8.108,5.962,8.989h1.992c-1.865-2.672-5.686-8.145-6.276-8.989h-1.67z" fill="#33A02C"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_new_chat.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_new_chat.svg Fri May 14 16:09:54 2010 +0300
@@ -1,39 +1,49 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
<linearGradient gradientTransform="matrix(1 0 0 1 -367 -507)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="382" x2="382" y1="511.0117" y2="533.0017">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+ <stop offset="0" style="stop-color:#4EDEFF"/>
+ <stop offset="1" style="stop-color:#048CC6"/>
</linearGradient>
<path d="M6.924,26.143c-0.131,0-0.213-0.2-0.213-0.512v-4.305l-0.077-0.049C3.688,19.395,2,16.643,2,13.726 c0-5.44,5.831-9.868,13-9.868c7.168,0,13,4.428,13,9.868c0,5.442-5.832,9.869-13,9.869c-1.618,0-3.201-0.226-4.706-0.669 l-0.105-0.031l-2.824,2.971C7.2,26.039,7.035,26.143,6.924,26.143L6.924,26.143z" fill="url(#SVGID_1_)"/>
-<path d="M15,4.785c6.961,0,12.646,4.18,12.969,9.405 C27.979,14.035,28,13.883,28,13.726c0-5.44-5.832-9.868-13-9.868c-7.169,0-13,4.428-13,9.868c0,0.149,0.023,0.296,0.033,0.446 C2.368,8.956,8.047,4.785,15,4.785z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M15,4.785c6.961,0,12.646,4.18,12.969,9.405 C27.979,14.035,28,13.883,28,13.726c0-5.44-5.832-9.868-13-9.868c-7.169,0-13,4.428-13,9.868c0,0.149,0.023,0.296,0.033,0.446 C2.368,8.956,8.047,4.785,15,4.785z" enable-background="new " fill="#FFFFFF" opacity="0.3"/>
<rect fill="#FFFFFF" height="1.084" width="13" x="8.5" y="8.688"/>
-<rect fill-opacity="0.2" height="0.541" stroke-opacity="0.2" width="13" x="8.5" y="9.771"/>
+<rect enable-background="new " height="0.541" opacity="0.2" width="13" x="8.5" y="9.771"/>
<rect fill="#FFFFFF" height="1.084" width="13" x="8.5" y="12.688"/>
-<rect fill-opacity="0.2" height="0.541" stroke-opacity="0.2" width="13" x="8.5" y="13.771"/>
+<rect enable-background="new " height="0.541" opacity="0.2" width="13" x="8.5" y="13.771"/>
<rect fill="#FFFFFF" height="1.084" width="13" x="8.5" y="16.688"/>
-<rect fill-opacity="0.2" height="0.541" stroke-opacity="0.2" width="13" x="8.5" y="17.771"/>
+<rect enable-background="new " height="0.541" opacity="0.2" width="13" x="8.5" y="17.771"/>
<rect fill="none" height="30" width="30"/>
</g>
<g>
<rect fill="none" height="15" width="15" x="15"/>
-<rect fill-opacity="0.6" height="4.412" stroke-opacity="0.6" style="enable-background:new;" transform="matrix(-0.2587 0.9659 -0.9659 -0.2587 29.2728 -12.3701)" width="7.941" x="15.41" y="2.841"/>
+<rect height="4.412" opacity="0.6" style="enable-background:new;" transform="matrix(-0.2587 0.9659 -0.9659 -0.2587 29.2728 -12.3701)" width="7.941" x="15.41" y="2.841"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 90.98 116.5195)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-70.19" x2="-73.15" y1="114.9" y2="107.7">
+
<stop offset="0" stop-color="#DE8029"/>
+
<stop offset="0.26" stop-color="#DE4E29"/>
+
<stop offset="1" stop-color="#D82E09"/>
+
</linearGradient>
<polygon fill="url(#SVGID_1__)" points="20.17,8.913,16.76,8,18.59,1.181,22,2.094"/>
-<rect fill-opacity="0.6" height="4.411" stroke-opacity="0.6" style="enable-background:new;" transform="matrix(-0.7072 0.7071 -0.7071 -0.7072 48.0833 -1.2961)" width="9.707" x="19.46" y="7.104"/>
+<rect height="4.411" opacity="0.6" style="enable-background:new;" transform="matrix(-0.7072 0.7071 -0.7071 -0.7072 48.0833 -1.2961)" width="9.707" x="19.46" y="7.104"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 90.98 116.5195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-63.01" x2="-70.68" y1="110.1" y2="104.1">
+
<stop offset="0" stop-color="#DE8029"/>
+
<stop offset="0.26" stop-color="#DE4E29"/>
+
<stop offset="1" stop-color="#D82E09"/>
+
</linearGradient>
<polygon fill="url(#SVGID_2_)" points="22.44,13.68,19.94,11.18,26.18,4.942,28.68,7.438"/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_new_email_event.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_new_email_event.svg Fri May 14 16:09:54 2010 +0300
@@ -1,35 +1,45 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
+<path d="M15,29C7.28,29,1,22.72,1,15S7.28,1,15,1s14,6.28,14,14S22.72,29,15,29L15,29z" opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="1.9409" y2="28.3052">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+ <stop offset="0" style="stop-color:#4EDEFF"/>
+ <stop offset="1" style="stop-color:#048CC6"/>
</linearGradient>
<circle cx="15" cy="15" fill="url(#SVGID_1_)" r="13"/>
-<path d="M15,3c7.012,0,12.71,5.555,12.975,12.5C27.98,15.333,28,15.169,28,15c0-7.179-5.82-13-13-13 S2,7.821,2,15c0,0.169,0.02,0.333,0.025,0.5C2.29,8.555,7.988,3,15,3z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M24.75,16.235c0,1.563-0.315,2.916-0.943,4.059c-0.762,1.408-1.864,2.115-3.307,2.115 c-1.401,0-2.413-0.707-3.045-2.115c-0.762,0.824-1.744,1.237-2.948,1.237c-1.415,0-2.546-0.542-3.401-1.621 c-0.792-1.001-1.189-2.217-1.189-3.66c0-1.451,0.397-2.662,1.189-3.638c0.844-1.053,1.979-1.574,3.401-1.574 c1.06,0,1.894,0.286,2.503,0.863v-0.635h2.055v7.098c0,1.377,0.477,2.068,1.436,2.068c0.782,0,1.385-0.541,1.807-1.62 c0.311-0.804,0.467-1.659,0.467-2.577c0-2.12-0.766-3.93-2.289-5.438c-1.523-1.509-3.352-2.26-5.484-2.26 c-2.144,0-3.965,0.748-5.463,2.244c-1.498,1.498-2.248,3.313-2.248,5.453c0,2.139,0.75,3.963,2.258,5.467 c1.503,1.512,3.32,2.263,5.453,2.263V26c-2.688,0-4.987-0.956-6.891-2.865C6.204,21.22,5.25,18.918,5.25,16.235 c0-2.673,0.955-4.964,2.865-6.873C10.027,7.456,12.319,6.5,15,6.5c2.688,0,4.986,0.95,6.892,2.856 C23.796,11.257,24.75,13.552,24.75,16.235z M16.885,16.157c0-2.074-0.793-3.113-2.378-3.113c-0.794,0-1.409,0.354-1.839,1.061 c-0.374,0.599-0.557,1.312-0.557,2.146c0,2.182,0.797,3.271,2.394,3.271C16.092,19.521,16.885,18.401,16.885,16.157z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M15,3c7.012,0,12.71,5.555,12.975,12.5C27.98,15.333,28,15.169,28,15c0-7.179-5.82-13-13-13 S2,7.821,2,15c0,0.169,0.02,0.333,0.025,0.5C2.29,8.555,7.988,3,15,3z" fill="#FFFFFF" opacity="0.4"/>
+<path d="M24.75,16.235c0,1.563-0.315,2.916-0.943,4.059c-0.762,1.408-1.864,2.115-3.307,2.115 c-1.401,0-2.413-0.707-3.045-2.115c-0.762,0.824-1.744,1.237-2.948,1.237c-1.415,0-2.546-0.542-3.401-1.621 c-0.792-1.001-1.189-2.217-1.189-3.66c0-1.451,0.397-2.662,1.189-3.638c0.844-1.053,1.979-1.574,3.401-1.574 c1.06,0,1.894,0.286,2.503,0.863v-0.635h2.055v7.098c0,1.377,0.477,2.068,1.436,2.068c0.782,0,1.385-0.541,1.807-1.62 c0.311-0.804,0.467-1.659,0.467-2.577c0-2.12-0.766-3.93-2.289-5.438c-1.523-1.509-3.352-2.26-5.484-2.26 c-2.144,0-3.965,0.748-5.463,2.244c-1.498,1.498-2.248,3.313-2.248,5.453c0,2.139,0.75,3.963,2.258,5.467 c1.503,1.512,3.32,2.263,5.453,2.263V26c-2.688,0-4.987-0.956-6.891-2.865C6.204,21.22,5.25,18.918,5.25,16.235 c0-2.673,0.955-4.964,2.865-6.873C10.027,7.456,12.319,6.5,15,6.5c2.688,0,4.986,0.95,6.892,2.856 C23.796,11.257,24.75,13.552,24.75,16.235z M16.885,16.157c0-2.074-0.793-3.113-2.378-3.113c-0.794,0-1.409,0.354-1.839,1.061 c-0.374,0.599-0.557,1.312-0.557,2.146c0,2.182,0.797,3.271,2.394,3.271C16.092,19.521,16.885,18.401,16.885,16.157z" opacity="0.2"/>
<path d="M24.75,14.985c0,1.563-0.315,2.916-0.943,4.059c-0.762,1.408-1.864,2.115-3.307,2.115 c-1.401,0-2.413-0.707-3.045-2.115c-0.762,0.824-1.744,1.237-2.948,1.237c-1.415,0-2.546-0.542-3.401-1.621 c-0.792-1.001-1.189-2.217-1.189-3.66c0-1.451,0.397-2.662,1.189-3.638c0.844-1.053,1.979-1.574,3.401-1.574 c1.06,0,1.894,0.286,2.503,0.863v-0.635h2.055v7.098c0,1.377,0.477,2.068,1.436,2.068c0.782,0,1.385-0.541,1.807-1.62 c0.311-0.804,0.467-1.659,0.467-2.577c0-2.12-0.766-3.93-2.289-5.438c-1.523-1.509-3.352-2.26-5.484-2.26 c-2.144,0-3.965,0.748-5.463,2.244c-1.498,1.498-2.248,3.313-2.248,5.453c0,2.139,0.75,3.963,2.258,5.467 c1.503,1.512,3.32,2.263,5.453,2.263v2.035c-2.688,0-4.987-0.956-6.891-2.865C6.204,19.97,5.25,17.668,5.25,14.985 c0-2.673,0.955-4.964,2.865-6.873C10.027,6.206,12.319,5.25,15,5.25c2.688,0,4.986,0.95,6.892,2.856 C23.796,10.007,24.75,12.302,24.75,14.985z M16.885,14.907c0-2.074-0.793-3.113-2.378-3.113c-0.794,0-1.409,0.354-1.839,1.061 c-0.374,0.599-0.557,1.312-0.557,2.146c0,2.182,0.797,3.271,2.394,3.271C16.092,18.271,16.885,17.151,16.885,14.907z" fill="#FFFFFF"/>
<rect fill="none" height="30" width="30"/>
</g>
<g>
<rect fill="none" height="15" width="15" x="15"/>
-<rect fill-opacity="0.6" height="4.412" stroke-opacity="0.6" style="enable-background:new;" transform="matrix(-0.2587 0.9659 -0.9659 -0.2587 29.2728 -12.3701)" width="7.941" x="15.41" y="2.841"/>
+<rect height="4.412" opacity="0.6" style="enable-background:new;" transform="matrix(-0.2587 0.9659 -0.9659 -0.2587 29.2728 -12.3701)" width="7.941" x="15.41" y="2.841"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 90.98 116.5195)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-70.19" x2="-73.15" y1="114.9" y2="107.7">
+
<stop offset="0" stop-color="#DE8029"/>
+
<stop offset="0.26" stop-color="#DE4E29"/>
+
<stop offset="1" stop-color="#D82E09"/>
+
</linearGradient>
<polygon fill="url(#SVGID_1__)" points="20.17,8.913,16.76,8,18.59,1.181,22,2.094"/>
-<rect fill-opacity="0.6" height="4.411" stroke-opacity="0.6" style="enable-background:new;" transform="matrix(-0.7072 0.7071 -0.7071 -0.7072 48.0833 -1.2961)" width="9.707" x="19.46" y="7.104"/>
+<rect height="4.411" opacity="0.6" style="enable-background:new;" transform="matrix(-0.7072 0.7071 -0.7071 -0.7072 48.0833 -1.2961)" width="9.707" x="19.46" y="7.104"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 90.98 116.5195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-63.01" x2="-70.68" y1="110.1" y2="104.1">
+
<stop offset="0" stop-color="#DE8029"/>
+
<stop offset="0.26" stop-color="#DE4E29"/>
+
<stop offset="1" stop-color="#D82E09"/>
+
</linearGradient>
<polygon fill="url(#SVGID_2_)" points="22.44,13.68,19.94,11.18,26.18,4.942,28.68,7.438"/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_new_event.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_new_event.svg Fri May 14 16:09:54 2010 +0300
@@ -1,22 +1,24 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
<linearGradient gradientTransform="matrix(0.9659 0.2588 -0.2588 0.9659 -33.6532 76.8338)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="24.6367" x2="22.6711" y1="-83.0146" y2="-67.3022">
-<stop offset="0" style="stop-color:#DE8029"/>
-<stop offset="0.2606" style="stop-color:#DE4E29"/>
-<stop offset="1" style="stop-color:#D82E09"/>
+ <stop offset="0" style="stop-color:#DE8029"/>
+ <stop offset="0.2606" style="stop-color:#DE4E29"/>
+ <stop offset="1" style="stop-color:#D82E09"/>
</linearGradient>
<polygon fill="url(#SVGID_1_)" points="10.369,17.828 3.5,15.987 7.182,2.249 14.05,4.09 "/>
<rect fill-opacity="0.6" height="9.11" transform="matrix(-0.7071 0.7071 -0.7071 -0.7071 45.0957 18.5742)" width="19.778" x="8.812" y="14.072"/>
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 -141.4365 187.3474)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-4.9067" x2="-7.3346" y1="-241.8184" y2="-222.4105">
-<stop offset="0" style="stop-color:#DE8029"/>
-<stop offset="0.2606" style="stop-color:#DE4E29"/>
-<stop offset="1" style="stop-color:#D82E09"/>
+ <stop offset="0" style="stop-color:#DE8029"/>
+ <stop offset="0.2606" style="stop-color:#DE4E29"/>
+ <stop offset="1" style="stop-color:#D82E09"/>
</linearGradient>
<polygon fill="url(#SVGID_2_)" points="14.93,27.427 9.902,22.398 22.473,9.827 27.5,14.855 "/>
<rect fill="none" height="30" width="30" x="0"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_new_tip.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_new_tip.svg Fri May 14 16:09:54 2010 +0300
@@ -1,61 +1,74 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
+<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" opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="21" x2="9.1644" y1="24.75" y2="24.75">
+ <stop offset="0" style="stop-color:#969696"/>
+ <stop offset="0.6242" style="stop-color:#F2F2F2"/>
+ <stop offset="1" style="stop-color:#B3B3B3"/>
+</linearGradient>
<polygon fill="url(#SVGID_1_)" points="8.998,21.5 8.998,27.071 9.999,28 20,28 21,27.071 21,21.5 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="1.0713" y2="20.5717">
-<stop offset="0" style="stop-color:#FEE06A"/>
-<stop offset="0.503" style="stop-color:#FFC501"/>
-<stop offset="1" style="stop-color:#FEAB29"/>
+ <stop offset="0" style="stop-color:#FEE06A"/>
+ <stop offset="0.503" style="stop-color:#FFC501"/>
+ <stop offset="1" style="stop-color:#FEAB29"/>
</linearGradient>
<path d="M15,2C7.455,2,4.219,7.377,5.156,12.925c0.936,5.544,4.402,10.848,9.826,10.924l0,0 c0.006,0,0.012,0,0.018,0c0.008,0,0.014,0,0.02,0l0,0c5.424-0.076,8.89-5.38,9.824-10.924C25.779,7.377,22.544,2,15,2z" fill="url(#SVGID_2_)"/>
-<polygon fill="url(#SVGID_1_)" points="8.998,21.5 8.998,27.071 9.999,28 20,28 21,27.071 21,21.5 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="21" x2="9.1644" y1="24.75" y2="24.75">
+ <stop offset="0" style="stop-color:#969696"/>
+ <stop offset="0.6242" style="stop-color:#F2F2F2"/>
+ <stop offset="1" style="stop-color:#B3B3B3"/>
+</linearGradient>
+<polygon fill="url(#SVGID_3_)" points="8.998,21.5 8.998,27.071 9.999,28 20,28 21,27.071 21,21.5 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="8.998" x2="21" y1="24.2852" y2="24.2852">
-<stop offset="0" style="stop-color:#A0A8AC"/>
-<stop offset="0.1212" style="stop-color:#BDC3C4"/>
-<stop offset="0.2848" style="stop-color:#E9EFF2"/>
-<stop offset="0.6727" style="stop-color:#949DA1"/>
-<stop offset="0.8182" style="stop-color:#D9DFE1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+ <stop offset="0" style="stop-color:#A0A8AC"/>
+ <stop offset="0.1212" style="stop-color:#BDC3C4"/>
+ <stop offset="0.2848" style="stop-color:#E9EFF2"/>
+ <stop offset="0.6727" style="stop-color:#949DA1"/>
+ <stop offset="0.8182" style="stop-color:#D9DFE1"/>
+ <stop offset="0.9636" style="stop-color:#ADB3B5"/>
+ <stop offset="1" style="stop-color:#595C5E"/>
</linearGradient>
<rect fill="url(#SVGID_4_)" height="5.571" width="12.002" x="8.998" y="21.5"/>
-<path d="M8.443,20.5c1.655,1.991,3.857,3.31,6.539,3.349l0,0c0.006,0,0.012,0,0.018,0c0.008,0,0.014,0,0.02,0l0,0 c2.682-0.039,4.884-1.357,6.539-3.349H8.443z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M8.443,20.5c1.655,1.991,3.857,3.31,6.539,3.349l0,0c0.006,0,0.012,0,0.018,0c0.008,0,0.014,0,0.02,0l0,0 c2.682-0.039,4.884-1.357,6.539-3.349H8.443z" opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="8.998" x2="21" y1="24.2852" y2="24.2852">
-<stop offset="0" style="stop-color:#A8B1B3"/>
-<stop offset="0.4" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#686E70"/>
+ <stop offset="0" style="stop-color:#A8B1B3"/>
+ <stop offset="0.4" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#686E70"/>
</linearGradient>
<rect fill="url(#SVGID_5_)" height="5.571" width="12.002" x="8.998" y="21.5"/>
-<rect fill-opacity="0.25" height="0.929" stroke-opacity="0.25" width="12.002" x="8.998" y="22.633"/>
-<rect fill-opacity="0.25" height="0.927" stroke-opacity="0.25" width="12.002" x="8.998" y="24.491"/>
-<path d="M6.23,9.388C8.414,10.377,11.529,11,15,11c3.475,0,6.592-0.624,8.775-1.615 c-0.779-3.471-3.676-6.199-8.771-6.199C9.908,3.186,7.008,5.914,6.23,9.388z" fill="#FFFFFF" fill-opacity="0.6" stroke-opacity="0.6"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="21" x2="9.1644" y1="24.75" y2="24.75">
-<stop offset="0" style="stop-color:#969696"/>
-<stop offset="0.6242" style="stop-color:#F2F2F2"/>
-<stop offset="1" style="stop-color:#B3B3B3"/>
-</linearGradient>
-</defs>
+<rect height="0.929" opacity="0.25" width="12.002" x="8.998" y="22.633"/>
+<rect height="0.927" opacity="0.25" width="12.002" x="8.998" y="24.491"/>
+<path d="M6.23,9.388C8.414,10.377,11.529,11,15,11c3.475,0,6.592-0.624,8.775-1.615 c-0.779-3.471-3.676-6.199-8.771-6.199C9.908,3.186,7.008,5.914,6.23,9.388z" fill="#FFFFFF" opacity="0.6"/>
</g>
<g>
<rect fill="none" height="15" width="15" x="15"/>
-<rect fill-opacity="0.6" height="4.412" stroke-opacity="0.6" style="enable-background:new;" transform="matrix(-0.2587 0.9659 -0.9659 -0.2587 29.2728 -12.3701)" width="7.941" x="15.41" y="2.841"/>
+<rect height="4.412" opacity="0.6" style="enable-background:new;" transform="matrix(-0.2587 0.9659 -0.9659 -0.2587 29.2728 -12.3701)" width="7.941" x="15.41" y="2.841"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 90.98 116.5195)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-70.19" x2="-73.15" y1="114.9" y2="107.7">
+
<stop offset="0" stop-color="#DE8029"/>
+
<stop offset="0.26" stop-color="#DE4E29"/>
+
<stop offset="1" stop-color="#D82E09"/>
+
</linearGradient>
<polygon fill="url(#SVGID_1__)" points="20.17,8.913,16.76,8,18.59,1.181,22,2.094"/>
-<rect fill-opacity="0.6" height="4.411" stroke-opacity="0.6" style="enable-background:new;" transform="matrix(-0.7072 0.7071 -0.7071 -0.7072 48.0833 -1.2961)" width="9.707" x="19.46" y="7.104"/>
+<rect height="4.411" opacity="0.6" style="enable-background:new;" transform="matrix(-0.7072 0.7071 -0.7071 -0.7072 48.0833 -1.2961)" width="9.707" x="19.46" y="7.104"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 90.98 116.5195)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-63.01" x2="-70.68" y1="110.1" y2="104.1">
+
<stop offset="0" stop-color="#DE8029"/>
+
<stop offset="0.26" stop-color="#DE4E29"/>
+
<stop offset="1" stop-color="#D82E09"/>
+
</linearGradient>
<polygon fill="url(#SVGID_2__)" points="22.44,13.68,19.94,11.18,26.18,4.942,28.68,7.438"/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_nfc_offline.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_nfc_offline.svg Fri May 14 16:09:54 2010 +0300
@@ -1,34 +1,44 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
-<path d="M19.504,28c-0.969,0-1.717-0.479-1.977-0.731c-0.281-0.272-6.77-6.299-7.045-6.556 C8.711,19.297,7.709,17.222,7.709,15c0-4.021,3.271-7.292,7.291-7.292c4.021,0,7.291,3.271,7.291,7.292 c0,2.994-1.887,5.729-4.695,6.804l-0.624,0.239l2.231,2.038c0.031,0.029,0.998,0.961,2.143,0.961h1.211 c1.371,0,2.486-1.116,2.486-2.487V7.444c0-1.371-1.115-2.487-2.486-2.487H7.445c-1.371,0-2.487,1.116-2.487,2.487v11.803 c0,0.966,0.524,1.609,0.838,1.907c0.233,0.224,5.935,5.453,7.452,6.846H4.477C3.111,28,2,26.89,2,25.523V4.477 C2,3.11,3.111,2,4.477,2h21.047C26.889,2,28,3.11,28,4.477v21.047C28,26.89,26.889,28,25.523,28H19.504z M15,11.371 c-2,0-3.628,1.628-3.628,3.629S13,18.628,15,18.628s3.629-1.627,3.629-3.628S17,11.371,15,11.371L15,11.371z" fill="url(#SVGID_1_)"/>
+<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" opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="2" y2="28.0005">
+ <stop offset="0" style="stop-color:#A0F800"/>
+ <stop offset="1" style="stop-color:#319E00"/>
+</linearGradient>
<path d="M19.504,28c-0.969,0-1.717-0.479-1.977-0.731c-0.281-0.272-6.77-6.299-7.045-6.556 C8.711,19.297,7.709,17.222,7.709,15c0-4.021,3.271-7.292,7.291-7.292c4.021,0,7.291,3.271,7.291,7.292 c0,2.994-1.887,5.729-4.695,6.804l-0.624,0.239l2.231,2.038c0.031,0.029,0.998,0.961,2.143,0.961h1.211 c1.371,0,2.486-1.116,2.486-2.487V7.444c0-1.371-1.115-2.487-2.486-2.487H7.445c-1.371,0-2.487,1.116-2.487,2.487v11.803 c0,0.966,0.524,1.609,0.838,1.907c0.233,0.224,5.935,5.453,7.452,6.846H4.477C3.111,28,2,26.89,2,25.523V4.477 C2,3.11,3.111,2,4.477,2h21.047C26.889,2,28,3.11,28,4.477v21.047C28,26.89,26.889,28,25.523,28H19.504z M15,11.371 c-2,0-3.628,1.628-3.628,3.629S13,18.628,15,18.628s3.629-1.627,3.629-3.628S17,11.371,15,11.371L15,11.371z" fill="url(#SVGID_1_)"/>
-<path d="M22.261,15.394c0.007-0.132,0.03-0.261,0.03-0.394c0-4.021-3.271-7.292-7.291-7.292 c-4.02,0-7.291,3.271-7.291,7.292c0,0.159,0.018,0.315,0.027,0.474C8.008,11.698,11.158,8.708,15,8.708 C18.816,8.708,21.951,11.656,22.261,15.394z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M15,19.628c2,0,3.629-1.627,3.629-3.628c0-0.171-0.027-0.335-0.051-0.5 c-0.246,1.763-1.749,3.128-3.578,3.128s-3.331-1.365-3.577-3.128c-0.023,0.165-0.051,0.329-0.051,0.5 C11.372,18.001,13,19.628,15,19.628z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M4.958,19.247v1c0,0.966,0.524,1.609,0.838,1.907C5.99,22.34,9.95,25.975,12.158,28h1.09 c-1.518-1.393-7.219-6.622-7.452-6.846C5.482,20.856,4.958,20.213,4.958,19.247z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M25.523,2H4.477C3.111,2,2,3.11,2,4.477v1C2,4.11,3.111,3,4.477,3h21.047 C26.889,3,28,4.11,28,5.477v-1C28,3.11,26.889,2,25.523,2z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M21.346,26.042h1.211c1.371,0,2.486-1.116,2.486-2.487v-1c0,1.371-1.115,2.487-2.486,2.487 h-1.211c-1.145,0-2.111-0.932-2.143-0.961l-1.47-1.343c-0.048,0.02-0.089,0.047-0.138,0.065l-0.624,0.239l2.231,2.038 C19.234,25.11,20.201,26.042,21.346,26.042z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="2" y2="28.0005">
+ <stop offset="0" style="stop-color:#A0F800"/>
+ <stop offset="1" style="stop-color:#319E00"/>
+</linearGradient>
+<path d="M19.504,28c-0.969,0-1.717-0.479-1.977-0.731c-0.281-0.272-6.77-6.299-7.045-6.556 C8.711,19.297,7.709,17.222,7.709,15c0-4.021,3.271-7.292,7.291-7.292c4.021,0,7.291,3.271,7.291,7.292 c0,2.994-1.887,5.729-4.695,6.804l-0.624,0.239l2.231,2.038c0.031,0.029,0.998,0.961,2.143,0.961h1.211 c1.371,0,2.486-1.116,2.486-2.487V7.444c0-1.371-1.115-2.487-2.486-2.487H7.445c-1.371,0-2.487,1.116-2.487,2.487v11.803 c0,0.966,0.524,1.609,0.838,1.907c0.233,0.224,5.935,5.453,7.452,6.846H4.477C3.111,28,2,26.89,2,25.523V4.477 C2,3.11,3.111,2,4.477,2h21.047C26.889,2,28,3.11,28,4.477v21.047C28,26.89,26.889,28,25.523,28H19.504z M15,11.371 c-2,0-3.628,1.628-3.628,3.629S13,18.628,15,18.628s3.629-1.627,3.629-3.628S17,11.371,15,11.371L15,11.371z" fill="url(#SVGID_2_)"/>
+<path d="M22.261,15.394c0.007-0.132,0.03-0.261,0.03-0.394c0-4.021-3.271-7.292-7.291-7.292 c-4.02,0-7.291,3.271-7.291,7.292c0,0.159,0.018,0.315,0.027,0.474C8.008,11.698,11.158,8.708,15,8.708 C18.816,8.708,21.951,11.656,22.261,15.394z" fill="#FFFFFF" opacity="0.4"/>
+<path d="M15,19.628c2,0,3.629-1.627,3.629-3.628c0-0.171-0.027-0.335-0.051-0.5 c-0.246,1.763-1.749,3.128-3.578,3.128s-3.331-1.365-3.577-3.128c-0.023,0.165-0.051,0.329-0.051,0.5 C11.372,18.001,13,19.628,15,19.628z" fill="#FFFFFF" opacity="0.4"/>
+<path d="M4.958,19.247v1c0,0.966,0.524,1.609,0.838,1.907C5.99,22.34,9.95,25.975,12.158,28h1.09 c-1.518-1.393-7.219-6.622-7.452-6.846C5.482,20.856,4.958,20.213,4.958,19.247z" fill="#FFFFFF" opacity="0.4"/>
+<path d="M25.523,2H4.477C3.111,2,2,3.11,2,4.477v1C2,4.11,3.111,3,4.477,3h21.047 C26.889,3,28,4.11,28,5.477v-1C28,3.11,26.889,2,25.523,2z" fill="#FFFFFF" opacity="0.4"/>
+<path d="M21.346,26.042h1.211c1.371,0,2.486-1.116,2.486-2.487v-1c0,1.371-1.115,2.487-2.486,2.487 h-1.211c-1.145,0-2.111-0.932-2.143-0.961l-1.47-1.343c-0.048,0.02-0.089,0.047-0.138,0.065l-0.624,0.239l2.231,2.038 C19.234,25.11,20.201,26.042,21.346,26.042z" fill="#FFFFFF" opacity="0.4"/>
<rect fill="none" height="30" width="30"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="2" y2="28.0005">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
-</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"/>
+<rect height="34.27" 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>
+</svg>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_no_signal.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,37 @@
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
+<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">
+ <stop offset="0" style="stop-color:#C4C4C4"/>
+ <stop offset="1" style="stop-color:#4F4F4F"/>
+</linearGradient>
+<rect fill="url(#SVGID_1_)" height="10" width="6" x="2" y="16"/>
+<polygon fill="#FFFFFF" opacity="0.3" points="2,16 2,20 8,26 8,20.344 3.656,16 "/>
+<rect fill-opacity="0.6" height="18" width="8" x="11" y="9"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="4" y2="25.939">
+ <stop offset="0" style="stop-color:#C4C4C4"/>
+ <stop offset="1" style="stop-color:#4F4F4F"/>
+</linearGradient>
+<rect fill="url(#SVGID_2_)" height="16" width="6" x="12" y="10"/>
+<polygon fill="#FFFFFF" opacity="0.3" points="18,12.39 18,10 15.609,10 "/>
+<polygon fill="#FFFFFF" opacity="0.3" points="12,17.703 18,23.703 18,18.047 12,12.047 "/>
+<polygon fill="#FFFFFF" opacity="0.3" points="12,23.36 12,26 14.639,26 "/>
+<rect fill-opacity="0.6" height="24" width="8" x="21" y="3"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="25" x2="25" y1="4" y2="25.9388">
+ <stop offset="0" style="stop-color:#C4C4C4"/>
+ <stop offset="1" style="stop-color:#4F4F4F"/>
+</linearGradient>
+<rect fill="url(#SVGID_3_)" height="22" width="6" x="22" y="4"/>
+<polygon fill="#FFFFFF" opacity="0.3" points="28,9.64 28,4 22.359,4 "/>
+<polygon fill="#FFFFFF" opacity="0.3" points="22,14.953 28,20.953 28,15.297 22,9.297 "/>
+<polygon fill="#FFFFFF" opacity="0.3" points="22,20.61 22,26 27.389,26 "/>
+<rect fill="#FFFFFF" height="1" opacity="0.4" width="6" x="2" y="16"/>
+<rect fill="#FFFFFF" height="1" opacity="0.4" width="6" x="12" y="10"/>
+<rect fill="#FFFFFF" height="1" opacity="0.4" width="6" x="22" y="4"/>
+<rect fill="none" height="30" width="30"/>
+</g>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_note.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_note.svg Fri May 14 16:09:54 2010 +0300
@@ -1,21 +1,23 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
<polygon fill-opacity="0.6" points="2,28 2,2 28,2 28,21.414 21.414,28 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="3" y2="27.0005">
-<stop offset="0" style="stop-color:#FFD338"/>
-<stop offset="1" style="stop-color:#F6A800"/>
+ <stop offset="0" style="stop-color:#FFD338"/>
+ <stop offset="1" style="stop-color:#F6A800"/>
</linearGradient>
<polygon fill="url(#SVGID_1_)" points="3,3 3,27 21,27 27,21 27,3 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="20.959" x2="23.9587" y1="20.959" y2="23.9587">
-<stop offset="0" style="stop-color:#FEFFD9"/>
-<stop offset="1" style="stop-color:#FFCF01"/>
+ <stop offset="0" style="stop-color:#FEFFD9"/>
+ <stop offset="1" style="stop-color:#FFCF01"/>
</linearGradient>
<polygon fill="url(#SVGID_2_)" points="27,21 21,21 21,27 "/>
-<rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="20" x="5" y="8.5"/>
-<rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="20" x="5" y="12.5"/>
-<rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="14" x="5" y="16.5"/>
+<rect height="1.5" opacity="0.5" width="20" x="5" y="8.5"/>
+<rect height="1.5" opacity="0.5" width="20" x="5" y="12.5"/>
+<rect height="1.5" opacity="0.5" width="14" x="5" y="16.5"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_offline.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_offline.svg Fri May 14 16:09:54 2010 +0300
@@ -1,21 +1,21 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
<radialGradient cx="15" cy="11.0723" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="16.3651">
-<stop offset="0" style="stop-color:#DCDCDC"/>
-<stop offset="1" style="stop-color:#787878"/>
+ <stop offset="0" style="stop-color:#DCDCDC"/>
+ <stop offset="1" style="stop-color:#787878"/>
</radialGradient>
<path d="M15,28.5C7.556,28.5,1.5,22.445,1.5,15C1.5,7.557,7.556,1.5,15,1.5c7.443,0,13.5,6.057,13.5,13.5 C28.5,22.445,22.443,28.5,15,28.5L15,28.5z" fill="url(#SVGID_1_)"/>
-<path d="M15,1.5C7.556,1.5,1.5,7.557,1.5,15c0,7.445,6.056,13.5,13.5,13.5 c7.443,0,13.5-6.055,13.5-13.5C28.5,7.557,22.443,1.5,15,1.5z M15,26.045C8.233,26.045,2.728,21.768,2.728,15 C2.728,8.233,8.233,2.728,15,2.728S27.273,8.233,27.273,15C27.273,21.768,21.767,26.045,15,26.045z" fill="url(#SVGID_2_)" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M15,19.909c-5.414,0-9.818-3.579-9.818-7.978S9.586,3.955,15,3.955 c5.414,0,9.818,3.578,9.818,7.977S20.414,19.909,15,19.909L15,19.909z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
-<defs>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="15.0005" x2="15.0005" y1="28.5" y2="1.5005">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#B4B4B4"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#B4B4B4"/>
</linearGradient>
-</defs>
+<path d="M15,1.5C7.556,1.5,1.5,7.557,1.5,15c0,7.445,6.056,13.5,13.5,13.5 c7.443,0,13.5-6.055,13.5-13.5C28.5,7.557,22.443,1.5,15,1.5z M15,26.045C8.233,26.045,2.728,21.768,2.728,15 C2.728,8.233,8.233,2.728,15,2.728S27.273,8.233,27.273,15C27.273,21.768,21.767,26.045,15,26.045z" fill="url(#SVGID_2_)" opacity="0.3"/>
+<path d="M15,19.909c-5.414,0-9.818-3.579-9.818-7.978S9.586,3.955,15,3.955 c5.414,0,9.818,3.578,9.818,7.977S20.414,19.909,15,19.909L15,19.909z" fill="#FFFFFF" opacity="0.2"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_online.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_online.svg Fri May 14 16:09:54 2010 +0300
@@ -1,23 +1,23 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
<radialGradient cx="15" cy="11.4824" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="19.5752">
-<stop offset="0" style="stop-color:#B2F56E"/>
-<stop offset="0.4" style="stop-color:#62B82E"/>
-<stop offset="1" style="stop-color:#0D4D07"/>
+ <stop offset="0" style="stop-color:#B2F56E"/>
+ <stop offset="0.4" style="stop-color:#62B82E"/>
+ <stop offset="1" style="stop-color:#0D4D07"/>
</radialGradient>
<path d="M15,28.5C7.556,28.5,1.5,22.445,1.5,15C1.5,7.557,7.556,1.5,15,1.5c7.443,0,13.5,6.057,13.5,13.5 C28.5,22.445,22.443,28.5,15,28.5L15,28.5z" fill="url(#SVGID_1_)"/>
-<path d="M15,1.5C7.556,1.5,1.5,7.557,1.5,15c0,7.445,6.056,13.5,13.5,13.5 c7.443,0,13.5-6.055,13.5-13.5C28.5,7.557,22.443,1.5,15,1.5z M15,26.045C8.233,26.045,2.728,21.768,2.728,15 C2.728,8.233,8.233,2.728,15,2.728S27.273,8.233,27.273,15C27.273,21.768,21.767,26.045,15,26.045z" fill="url(#SVGID_2_)" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M15,19.909c-5.414,0-9.818-3.579-9.818-7.978S9.586,3.955,15,3.955 c5.414,0,9.818,3.578,9.818,7.977S20.414,19.909,15,19.909L15,19.909z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="15.0005" x2="15.0005" y1="28.5" y2="1.5005">
+ <stop offset="0" style="stop-color:#D7EDCA"/>
+ <stop offset="1" style="stop-color:#62B82E"/>
+</linearGradient>
+<path d="M15,1.5C7.556,1.5,1.5,7.557,1.5,15c0,7.445,6.056,13.5,13.5,13.5 c7.443,0,13.5-6.055,13.5-13.5C28.5,7.557,22.443,1.5,15,1.5z M15,26.045C8.233,26.045,2.728,21.768,2.728,15 C2.728,8.233,8.233,2.728,15,2.728S27.273,8.233,27.273,15C27.273,21.768,21.767,26.045,15,26.045z" fill="url(#SVGID_2_)" opacity="0.4"/>
+<path d="M15,19.909c-5.414,0-9.818-3.579-9.818-7.978S9.586,3.955,15,3.955 c5.414,0,9.818,3.578,9.818,7.977S20.414,19.909,15,19.909L15,19.909z" fill="#FFFFFF" opacity="0.2"/>
<rect fill="none" height="30" width="30"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="15.0005" x2="15.0005" y1="28.5" y2="1.5005">
-<stop offset="0" style="stop-color:#D7EDCA"/>
-<stop offset="1" style="stop-color:#62B82E"/>
-</linearGradient>
-</defs>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_operator.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_operator.svg Fri May 14 16:09:54 2010 +0300
@@ -1,41 +1,43 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="2" y2="28.0005">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#B1B1B1"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#B1B1B1"/>
</linearGradient>
<polygon fill="url(#SVGID_1_)" points="26,9 26,28 4,28 4,2 19,2 "/>
<polygon fill="#FFFFFF" points="19,2 4,2 4,3 18.586,3 26,10.484 26,9 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="15.0005" x2="15.0005" y1="25" y2="12.0005">
-<stop offset="0" style="stop-color:#666666"/>
-<stop offset="1" style="stop-color:#282828"/>
+ <stop offset="0" style="stop-color:#666666"/>
+ <stop offset="1" style="stop-color:#282828"/>
</linearGradient>
<rect fill="url(#SVGID_2_)" height="13" width="16" x="7" y="12"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="14.9995" x2="14.9995" y1="13" y2="23.9727">
-<stop offset="0" style="stop-color:#FEE06A"/>
-<stop offset="1" style="stop-color:#FFB701"/>
+ <stop offset="0" style="stop-color:#FEE06A"/>
+ <stop offset="1" style="stop-color:#FFB701"/>
</linearGradient>
<polygon fill="url(#SVGID_3_)" points="18,13 18,16 17,16 17,13 13,13 13,16 12,16 12,13 8,13 8,18 22,18 22,13 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="10" x2="10" y1="13.0005" y2="23.9721">
-<stop offset="0" style="stop-color:#FEE06A"/>
-<stop offset="1" style="stop-color:#FFB701"/>
+ <stop offset="0" style="stop-color:#FEE06A"/>
+ <stop offset="1" style="stop-color:#FFB701"/>
</linearGradient>
<rect fill="url(#SVGID_4_)" height="5" width="4" x="8" y="19"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="14.9995" x2="14.9995" y1="13.0005" y2="23.9721">
-<stop offset="0" style="stop-color:#FEE06A"/>
-<stop offset="1" style="stop-color:#FFB701"/>
+ <stop offset="0" style="stop-color:#FEE06A"/>
+ <stop offset="1" style="stop-color:#FFB701"/>
</linearGradient>
<rect fill="url(#SVGID_5_)" height="5" width="4" x="13" y="19"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="20" x2="20" y1="13.0005" y2="23.9721">
-<stop offset="0" style="stop-color:#FEE06A"/>
-<stop offset="1" style="stop-color:#FFB701"/>
+ <stop offset="0" style="stop-color:#FEE06A"/>
+ <stop offset="1" style="stop-color:#FFB701"/>
</linearGradient>
<rect fill="url(#SVGID_6_)" height="5" width="4" x="18" y="19"/>
-<rect fill="#FFFFFF" fill-opacity="0.3" height="1" stroke-opacity="0.3" width="14" x="8" y="13"/>
+<rect fill="#FFFFFF" height="1" opacity="0.3" width="14" x="8" y="13"/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_outbox.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_outbox.svg Fri May 14 16:09:54 2010 +0300
@@ -1,30 +1,32 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
+<polygon opacity="0.6" points="11,19 11,12 7,12 15,1.333 23,12 19,12 19,19 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="2.7603" y2="18.0948">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+ <stop offset="0" style="stop-color:#A0F800"/>
+ <stop offset="1" style="stop-color:#319E00"/>
</linearGradient>
<polygon fill="url(#SVGID_1_)" points="15,3 9,11 12,11 12,18 18,18 18,11 21,11 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="2.7603" y2="18.0948">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="0.7576" style="stop-color:#4CB400"/>
-<stop offset="1" style="stop-color:#89CC6A"/>
+ <stop offset="0" style="stop-color:#A0F800"/>
+ <stop offset="0.7576" style="stop-color:#4CB400"/>
+ <stop offset="1" style="stop-color:#89CC6A"/>
</linearGradient>
<path d="M15,3l-6,8h3v7h6v-7h3L15,3z M17,10v7h-4v-7h-2l4-5.333L19,10H17z" fill="url(#SVGID_2_)"/>
-<polygon fill-opacity="0.6" points="1,28 1,19 5,19 5,22 25,22 25,19 29,19 29,28 " stroke-opacity="0.6"/>
+<polygon opacity="0.6" points="1,28 1,19 5,19 5,22 25,22 25,19 29,19 29,28 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="14.9995" x2="14.9995" y1="19.8877" y2="27.0436">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+ <stop offset="0" style="stop-color:#4EDEFF"/>
+ <stop offset="1" style="stop-color:#048CC6"/>
</linearGradient>
<polygon fill="url(#SVGID_3_)" points="26,20 26,23 4,23 4,20 2,20 2,23 2,26 2,27 28,27 28,26 28,23 28,20 "/>
-<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="26" x="2" y="26"/>
-<rect fill="#FFFFFF" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="2" x="2" y="20"/>
-<rect fill="#FFFFFF" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="2" x="26" y="20"/>
-<rect fill="#FFFFFF" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="22" x="4" y="23"/>
+<rect height="1" opacity="0.2" width="26" x="2" y="26"/>
+<rect fill="#FFFFFF" height="1" opacity="0.2" width="2" x="2" y="20"/>
+<rect fill="#FFFFFF" height="1" opacity="0.2" width="2" x="26" y="20"/>
+<rect fill="#FFFFFF" height="1" opacity="0.2" width="22" x="4" y="23"/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ovi.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_ovi.svg Fri May 14 16:09:54 2010 +0300
@@ -1,11 +1,19 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<rect fill="none" height="30" width="30"/>
+
<rect fill="none" height="30" width="30"/>
+
<rect fill="#44A51C" height="30" width="30"/>
+
<path d="M7.069,9.857c-3.87,0-5.903,2.655-5.903,6.435,0,3.829,1.497,6.84,5.863,6.84,4.022,0,5.882-2.724,5.882-6.754,0-3.85-1.83-6.523-5.841-6.523zm-0.042,11.2c-2.063,0-2.152-2.928-2.152-4.844,0-1.868,0.156-4.297,2.152-4.297,1.901,0,2.169,2.567,2.169,4.297,0.001,2.23-0.112,4.84-2.169,4.84z" fill="#FFFFFF"/>
+
<path d="M17.85,23.13c1.57,0,2.125-0.788,2.498-1.933l3.385-11.16h-3.158l-2.42,9.658-2.282-9.658h-3.739l3.212,11.16c0.35,1.14,0.93,1.93,2.5,1.93z" fill="#FFFFFF"/>
+
<path d="M26.99,5.348c-1.162,0-1.969,0.587-1.969,1.667,0,1.082,0.827,1.667,1.969,1.667,1.143,0,1.967-0.585,1.967-1.667,0-1.058-0.87-1.667-1.97-1.667z" fill="#FFFFFF"/>
+
<path d="M25.69,22.77c0.263,0.191,0.681,0.358,1.27,0.358,0.615,0,1.018-0.169,1.282-0.358,0.507-0.357,0.507-0.963,0.507-1.289v-11.44h-3.525-0.244c-0.341,0-0.626,0.007-0.818,0.275-0.098,0.124-0.229,0.351-0.229,0.759,0,0.424,0.132,0.628,0.229,0.756,0.192,0.272,0.478,0.273,0.818,0.273,0.115,0,0.209-0.001,0.209-0.001v9.385c-0.01,0.31-0.01,0.92,0.5,1.27z" fill="#FFFFFF"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_pager.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_pager.svg Fri May 14 16:09:54 2010 +0300
@@ -1,42 +1,43 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
+<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" opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="6.2002" y2="23.8229">
-<stop offset="0" style="stop-color:#808080"/>
-<stop offset="0.5" style="stop-color:#636363"/>
-<stop offset="1" style="stop-color:#1C1C1C"/>
+ <stop offset="0" style="stop-color:#808080"/>
+ <stop offset="0.5" style="stop-color:#636363"/>
+ <stop offset="1" style="stop-color:#1C1C1C"/>
</linearGradient>
<path d="M28,22c0,1.1-0.9,2-2,2H4c-1.1,0-2-0.9-2-2V8c0-1.1,0.9-2,2-2h22c1.1,0,2,0.9,2,2V22z" fill="url(#SVGID_1_)"/>
-<path d="M26,6H4C2.9,6,2,6.9,2,8v1c0-1.1,0.9-2,2-2h22c1.1,0,2,0.9,2,2V8C28,6.9,27.1,6,26,6z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M26,6H4C2.9,6,2,6.9,2,8v1c0-1.1,0.9-2,2-2h22c1.1,0,2,0.9,2,2V8C28,6.9,27.1,6,26,6z" fill="#FFFFFF" opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="8.1113" y2="17.9019">
-<stop offset="0" style="stop-color:#4F4F4F"/>
-<stop offset="1" style="stop-color:#9E9E9E"/>
+ <stop offset="0" style="stop-color:#4F4F4F"/>
+ <stop offset="1" style="stop-color:#9E9E9E"/>
</linearGradient>
<path d="M4,18c-0.55,0-1-0.45-1-1V9c0-0.55,0.45-1,1-1h22c0.55,0,1,0.45,1,1v8c0,0.55-0.45,1-1,1H4z" fill="url(#SVGID_2_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="14.9995" x2="14.9995" y1="9.0889" y2="16.9214">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="1" style="stop-color:#1E6BC4"/>
+ <stop offset="0" style="stop-color:#3BC8EB"/>
+ <stop offset="1" style="stop-color:#1E6BC4"/>
</linearGradient>
<rect fill="url(#SVGID_3_)" height="8" width="22" x="4" y="9"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="24.5" x2="24.5" y1="20.0225" y2="21.9805">
-<stop offset="0" style="stop-color:#96D12A"/>
-<stop offset="0.3939" style="stop-color:#96D12A"/>
-<stop offset="1" style="stop-color:#4B8B00"/>
+ <stop offset="0.3939" style="stop-color:#96D12A"/>
+ <stop offset="1" style="stop-color:#4B8B00"/>
</linearGradient>
<rect fill="url(#SVGID_4_)" height="2" width="3" x="23" y="20"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="19.5" x2="19.5" y1="20.0225" y2="21.9805">
-<stop offset="0" style="stop-color:#C0C0C0"/>
-<stop offset="1" style="stop-color:#4F4F4F"/>
+ <stop offset="0" style="stop-color:#C0C0C0"/>
+ <stop offset="1" style="stop-color:#4F4F4F"/>
</linearGradient>
<rect fill="url(#SVGID_5_)" height="2" width="3" x="18" y="20"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="12.5" x2="12.5" y1="20.0225" y2="21.9805">
-<stop offset="0" style="stop-color:#DE6F00"/>
-<stop offset="1" style="stop-color:#AB0000"/>
+ <stop offset="0" style="stop-color:#DE6F00"/>
+ <stop offset="1" style="stop-color:#AB0000"/>
</linearGradient>
<rect fill="url(#SVGID_6_)" height="2" width="3" x="11" y="20"/>
-<polygon fill="#FFFFFF" fill-opacity="0.2" points="26,12 4,13 4,9 26,9 " stroke-opacity="0.2"/>
+<polygon fill="#FFFFFF" opacity="0.2" points="26,12 4,13 4,9 26,9 "/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_pair.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_pair.svg Fri May 14 16:09:54 2010 +0300
@@ -1,22 +1,22 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="10.3721" x2="10.3721" y1="1" y2="24.4868">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="0.2143" style="stop-color:#36B5FF"/>
-<stop offset="0.5879" style="stop-color:#1B66D8"/>
-<stop offset="1" style="stop-color:#2183E0"/>
+ <stop offset="0.2143" style="stop-color:#36B5FF"/>
+ <stop offset="0.5879" style="stop-color:#1B66D8"/>
+ <stop offset="1" style="stop-color:#2183E0"/>
</linearGradient>
<path d="M16.389,8.041L9.514,1v9.274L5.734,6.407L4.355,7.815l4.75,4.871l-4.75,4.869l1.377,1.406 l3.781-3.865v9.274l6.875-7.037l-4.541-4.647L16.389,8.041z M13.645,8.056l-2.195,2.243l-0.004-4.49L13.645,8.056z M13.645,17.321 l-2.199,2.241l0.004-4.49L13.645,17.321z" fill="url(#SVGID_1_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="19.6279" x2="19.6279" y1="5.6289" y2="29.1157">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="0.2143" style="stop-color:#36B5FF"/>
-<stop offset="0.5879" style="stop-color:#1B66D8"/>
-<stop offset="1" style="stop-color:#2183E0"/>
+ <stop offset="0.2143" style="stop-color:#36B5FF"/>
+ <stop offset="0.5879" style="stop-color:#1B66D8"/>
+ <stop offset="1" style="stop-color:#2183E0"/>
</linearGradient>
<path d="M25.645,12.67l-6.873-7.041v9.274l-3.779-3.867l-1.381,1.408l4.752,4.871l-4.752,4.869l1.377,1.406 l3.783-3.865V29l6.873-7.039l-4.539-4.646L25.645,12.67z M22.9,12.683l-2.195,2.245l-0.002-4.492L22.9,12.683z M22.9,21.95 l-2.197,2.241l0.002-4.49L22.9,21.95z" fill="url(#SVGID_2_)"/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_person.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_person.svg Fri May 14 16:09:54 2010 +0300
@@ -1,42 +1,42 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15.0024" x2="15.0024" y1="24.1553" y2="17.2445">
-<stop offset="0" style="stop-color:#FFA98E"/>
-<stop offset="0.2" style="stop-color:#FFA98E"/>
-<stop offset="0.9628" style="stop-color:#D45D36"/>
-<stop offset="1" style="stop-color:#D45D36"/>
+ <stop offset="0.2" style="stop-color:#FFA98E"/>
+ <stop offset="0.9628" style="stop-color:#D45D36"/>
</linearGradient>
<path d="M19.167,20.203c-0.92-0.404-0.89-2.39-0.512-2.99c0.066-0.105,0.127-0.209,0.191-0.314h-7.693 c0.064,0.105,0.124,0.209,0.19,0.314c0.379,0.601,0.408,2.586-0.511,2.99c-0.92,0.405,4.274,3.932,4.274,3.932 S20.087,20.608,19.167,20.203z" fill="url(#SVGID_1_)"/>
-<path d="M11.344,17.213c0.154,0.244,0.245,0.721,0.243,1.225c0.866,0.945,2.058,1.894,3.355,1.894 c1.663,0,2.726-0.854,3.475-1.778c-0.02-0.546,0.072-1.076,0.238-1.34c0.066-0.105,0.127-0.209,0.191-0.314h-7.693 C11.218,17.004,11.277,17.107,11.344,17.213z" fill-opacity="0.1" stroke-opacity="0.1"/>
+<path d="M11.344,17.213c0.154,0.244,0.245,0.721,0.243,1.225c0.866,0.945,2.058,1.894,3.355,1.894 c1.663,0,2.726-0.854,3.475-1.778c-0.02-0.546,0.072-1.076,0.238-1.34c0.066-0.105,0.127-0.209,0.191-0.314h-7.693 C11.218,17.004,11.277,17.107,11.344,17.213z" opacity="0.1"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="19.8359" y2="28">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="1" style="stop-color:#BA1212"/>
+ <stop offset="0" style="stop-color:#FF7236"/>
+ <stop offset="1" style="stop-color:#BA1212"/>
</linearGradient>
<path d="M24.696,22.273c-0.968-0.51-5.761-2.212-5.852-2.318l-3.662,3.086l-3.935-3.205 C11.14,20,6.4,21.684,5.304,22.273C4.049,22.949,2,24.501,2,28h26C28,24.501,25.662,22.783,24.696,22.273z" fill="url(#SVGID_2_)"/>
<path d="M24.229,23.158c-0.513-0.271-2.506-1.021-3.825-1.518c-0.627-0.236-1.068-0.402-1.385-0.525l-0.312,0.263 c0.204,0.077,0.43,0.163,0.696,0.263c1.319,0.496,3.313,1.247,3.825,1.518c0.411,0.217,2.283,1.334,2.691,3.842h1 C26.513,24.492,24.641,23.375,24.229,23.158z" fill="#FF7B56"/>
<path d="M6.777,23.154c0.538-0.289,2.28-0.961,3.552-1.451c0.441-0.17,0.802-0.309,1.104-0.427l-0.328-0.267 c-0.384,0.157-0.942,0.373-1.775,0.693c-1.271,0.49-3.014,1.162-3.552,1.451C4.223,23.991,3.314,25.282,3.068,27h1 C4.314,25.282,5.223,23.991,6.777,23.154z" fill="#FF7B56"/>
<radialGradient cx="-107.9609" cy="23.2217" gradientTransform="matrix(0.9352 0 0 0.9448 112.9225 -13.3229)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="14.0323">
-<stop offset="0" style="stop-color:#FFE2D9"/>
-<stop offset="0.5091" style="stop-color:#FFC6B3"/>
-<stop offset="0.7636" style="stop-color:#FFA98E"/>
-<stop offset="1" style="stop-color:#E88160"/>
+ <stop offset="0" style="stop-color:#FFE2D9"/>
+ <stop offset="0.5091" style="stop-color:#FFC6B3"/>
+ <stop offset="0.7636" style="stop-color:#FFA98E"/>
+ <stop offset="1" style="stop-color:#E88160"/>
</radialGradient>
<path d="M21.378,11.076c-0.033-0.016-0.069-0.019-0.104-0.029v-0.001c-0.006-0.001-0.012-0.003-0.02-0.004 c-0.05-0.013-0.101-0.024-0.153-0.028c-6.421-1.133-9.367-4.738-9.59-3.783c-0.176,0.76-1.977,2.402-2.919,3.223 c0.008,0.036,0.013,0.069,0.02,0.105c0,0,0.034,0.169,0.105,0.455c-0.075,0.008-0.148,0.023-0.22,0.055 c-0.6,0.256-0.788,1.254-0.42,2.227c0.368,0.975,1.152,1.557,1.751,1.302c0.038-0.017,0.069-0.044,0.103-0.065 c0.35,0.795,0.777,1.646,1.302,2.5c0.878,1.059,2.224,2.3,3.709,2.3c1.797,0,2.897-0.997,3.653-2.002 c0.019-0.042,0.039-0.082,0.06-0.116c0.561-0.888,1.015-1.778,1.383-2.607c0.587,0.207,1.341-0.346,1.714-1.283 C22.14,12.354,21.972,11.348,21.378,11.076z" fill="url(#SVGID_3_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="14.8901" x2="14.8901" y1="2.1216" y2="10.4031">
-<stop offset="0" style="stop-color:#8A5D3B"/>
-<stop offset="0.3758" style="stop-color:#632F00"/>
-<stop offset="1" style="stop-color:#361700"/>
+ <stop offset="0" style="stop-color:#8A5D3B"/>
+ <stop offset="0.3758" style="stop-color:#632F00"/>
+ <stop offset="1" style="stop-color:#361700"/>
</linearGradient>
<path d="M14.762,2c-2.226,0-3.297,1.026-4.123,2.099c-1.345,0.21-3.476,1.46-1.971,6.933 c0.942-0.82,2.668-3.041,2.844-3.801c0.225-0.964,3.221,2.719,9.763,3.815c0.077-0.306,0.112-0.487,0.112-0.487 C22.414,5.887,20.179,2.183,14.762,2z" fill="url(#SVGID_4_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="15.0591" x2="15.0591" y1="20.1875" y2="25.6254">
-<stop offset="0" style="stop-color:#BC1C24"/>
-<stop offset="1" style="stop-color:#6B1C24"/>
+ <stop offset="0" style="stop-color:#BC1C24"/>
+ <stop offset="1" style="stop-color:#6B1C24"/>
</linearGradient>
<path d="M20.96,20.781c-1.13-0.426-2.075-0.779-2.115-0.826l-3.662,3.086l-3.935-3.205 c-0.047,0.071-0.971,0.43-2.09,0.861l6.046,4.939L20.96,20.781z" fill="url(#SVGID_5_)"/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_phone_disabled.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_phone_disabled.svg Fri May 14 16:09:54 2010 +0300
@@ -1,58 +1,66 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
+<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" opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="-4.1611" y2="28.2423">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#9B9D9E"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#9B9D9E"/>
</linearGradient>
<path d="M24,26.338c0,1.084-0.879,1.963-1.963,1.963H7.963C6.879,28.301,6,27.422,6,26.338V3.994 C6,2.91,6.879,2.032,7.963,2.032h14.074C23.121,2.032,24,2.91,24,3.994V26.338z" fill="url(#SVGID_1_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="21.0811" y2="27.3765">
-<stop offset="0" style="stop-color:#A6A8AB"/>
-<stop offset="0.703" style="stop-color:#58595B"/>
-<stop offset="1" style="stop-color:#808184"/>
+ <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="13" y="23.301"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="14.9995" x2="14.9995" y1="23.1904" y2="26.3381">
-<stop offset="0" style="stop-color:#F0F0F0"/>
-<stop offset="1" style="stop-color:#9B9D9E"/>
+ <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="14" y="24.301"/>
-<path d="M22.037,2.032H7.963C6.879,2.032,6,2.91,6,3.994v1C6,3.91,6.879,3.032,7.963,3.032h14.074 C23.121,3.032,24,3.91,24,4.994v-1C24,2.91,23.121,2.032,22.037,2.032z" fill="#FFFFFF" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M22.037,2.032H7.963C6.879,2.032,6,2.91,6,3.994v1C6,3.91,6.879,3.032,7.963,3.032h14.074 C23.121,3.032,24,3.91,24,4.994v-1C24,2.91,23.121,2.032,22.037,2.032z" fill="#FFFFFF" opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="15.0005" x2="15.0005" y1="22.2461" y2="4.1392">
-<stop offset="0" style="stop-color:#DADADB"/>
-<stop offset="1" style="stop-color:#9B9D9E"/>
+ <stop offset="0" style="stop-color:#DADADB"/>
+ <stop offset="1" style="stop-color:#9B9D9E"/>
</linearGradient>
<rect fill="url(#SVGID_4_)" height="18.301" width="16" x="7" y="4.032"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="14.9995" x2="14.9995" y1="5.0322" y2="21.3059">
-<stop offset="0" style="stop-color:#3BC8EB"/>
-<stop offset="1" style="stop-color:#1347BA"/>
+ <stop offset="0" style="stop-color:#3BC8EB"/>
+ <stop offset="1" style="stop-color:#1347BA"/>
</linearGradient>
<rect fill="url(#SVGID_5_)" height="16.301" width="14" x="8" y="5.032"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="9" x2="9" y1="24.3008" y2="26.2852">
-<stop offset="0" style="stop-color:#1CAB00"/>
-<stop offset="1" style="stop-color:#1F6300"/>
+ <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="24.301"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="21" x2="21" y1="24.3008" y2="26.3008">
-<stop offset="0" style="stop-color:#E63B00"/>
-<stop offset="1" style="stop-color:#8C0000"/>
+ <stop offset="0" style="stop-color:#E63B00"/>
+ <stop offset="1" style="stop-color:#8C0000"/>
</linearGradient>
<rect fill="url(#SVGID_7_)" height="2" width="4" x="19" y="24.301"/>
-<polygon fill="#FFFFFF" fill-opacity="0.2" points="22,11.162 22,5.032 8,5.032 8,12.301 " stroke-opacity="0.2"/>
+<polygon fill="#FFFFFF" opacity="0.2" points="22,11.162 22,5.032 8,5.032 8,12.301 "/>
</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"/>
+<rect height="34.27" 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>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_phonebook.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_phonebook.svg Fri May 14 16:09:54 2010 +0300
@@ -1,42 +1,44 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
+<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" opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="18" x2="18" y1="2" y2="28.0005">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+ <stop offset="0" style="stop-color:#A0F800"/>
+ <stop offset="1" style="stop-color:#319E00"/>
</linearGradient>
<rect fill="url(#SVGID_1_)" height="26" width="18" x="9" y="2"/>
-<path d="M19.134,16.857c-0.005-0.08,0-0.161,0.002-0.242c0.532-0.371,0.993-0.9,1.274-1.472 c0.52-1.056,0.389-3.753,0.389-3.753c0-1.102-1.65-2.391-2.725-2.391h-0.386c-1.075,0-2.726,1.289-2.726,2.391 c0,0-0.098,2.688,0.39,3.753c0.267,0.582,0.736,1.116,1.281,1.487c0.001,0.075,0.007,0.151,0.002,0.227 c-0.066,1.08-3.579,2.914-3.751,3.148V23h10v-2.992C22.713,19.772,19.2,17.938,19.134,16.857z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M19.134,16.857c-0.005-0.08,0-0.161,0.002-0.242c0.532-0.371,0.993-0.9,1.274-1.472 c0.52-1.056,0.389-3.753,0.389-3.753c0-1.102-1.65-2.391-2.725-2.391h-0.386c-1.075,0-2.726,1.289-2.726,2.391 c0,0-0.098,2.688,0.39,3.753c0.267,0.582,0.736,1.116,1.281,1.487c0.001,0.075,0.007,0.151,0.002,0.227 c-0.066,1.08-3.579,2.914-3.751,3.148V23h10v-2.992C22.713,19.772,19.2,17.938,19.134,16.857z" opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="7" x2="7" y1="2" y2="28.0005">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#A5A5A5"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#A5A5A5"/>
</linearGradient>
<rect fill="url(#SVGID_2_)" height="26" width="4" x="5" y="2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="5" x2="5" y1="6.75" y2="8.75">
-<stop offset="0" style="stop-color:#ABABAB"/>
-<stop offset="1" style="stop-color:#4F4F4F"/>
+ <stop offset="0" style="stop-color:#ABABAB"/>
+ <stop offset="1" style="stop-color:#4F4F4F"/>
</linearGradient>
<path d="M7,8c0,0.55-0.45,1-1,1H4C3.45,9,3,8.55,3,8l0,0c0-0.55,0.45-1,1-1h2C6.55,7,7,7.45,7,8L7,8z" fill="url(#SVGID_3_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="5" x2="5" y1="11.75" y2="13.75">
-<stop offset="0" style="stop-color:#ABABAB"/>
-<stop offset="1" style="stop-color:#4F4F4F"/>
+ <stop offset="0" style="stop-color:#ABABAB"/>
+ <stop offset="1" style="stop-color:#4F4F4F"/>
</linearGradient>
<path d="M7,13c0,0.55-0.45,1-1,1H4c-0.55,0-1-0.45-1-1l0,0c0-0.55,0.45-1,1-1h2C6.55,12,7,12.45,7,13L7,13z" fill="url(#SVGID_4_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="5" x2="5" y1="16.75" y2="18.75">
-<stop offset="0" style="stop-color:#ABABAB"/>
-<stop offset="1" style="stop-color:#4F4F4F"/>
+ <stop offset="0" style="stop-color:#ABABAB"/>
+ <stop offset="1" style="stop-color:#4F4F4F"/>
</linearGradient>
<path d="M7,18c0,0.55-0.45,1-1,1H4c-0.55,0-1-0.45-1-1l0,0c0-0.55,0.45-1,1-1h2C6.55,17,7,17.45,7,18L7,18z" fill="url(#SVGID_5_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="5" x2="5" y1="21.75" y2="23.75">
-<stop offset="0" style="stop-color:#ABABAB"/>
-<stop offset="1" style="stop-color:#4F4F4F"/>
+ <stop offset="0" style="stop-color:#ABABAB"/>
+ <stop offset="1" style="stop-color:#4F4F4F"/>
</linearGradient>
<path d="M7,23c0,0.55-0.45,1-1,1H4c-0.55,0-1-0.45-1-1l0,0c0-0.55,0.45-1,1-1h2C6.55,22,7,22.45,7,23L7,23z" fill="url(#SVGID_6_)"/>
<path d="M19.134,15.857c-0.005-0.08,0-0.161,0.002-0.242c0.532-0.371,0.993-0.9,1.274-1.472 c0.52-1.056,0.389-3.753,0.389-3.753c0-1.102-1.65-2.391-2.725-2.391h-0.386c-1.075,0-2.726,1.289-2.726,2.391 c0,0-0.098,2.688,0.39,3.753c0.267,0.582,0.736,1.116,1.281,1.487c0.001,0.075,0.007,0.151,0.002,0.227 c-0.066,1.08-3.579,2.914-3.751,3.148V22h10v-2.992C22.713,18.772,19.2,16.938,19.134,15.857z" fill="#FFFFFF"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="22" x="5" y="2"/>
+<rect fill="#FFFFFF" height="1" opacity="0.4" width="22" x="5" y="2"/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_play.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_play.svg Fri May 14 16:09:54 2010 +0300
@@ -1,15 +1,27 @@
-<?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">
-<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;"/>
+<?xml version="1.0" ?>
+<!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">
+
+<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" 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;"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="24.71,15,5.294,4.412,5.294,5.294,23.9,15.44" stroke-opacity="0.4" style="enable-background:new;"/>
+
+<polygon fill="#753200" opacity="0.1" points="5.294,24.71,5.294,25.59,24.71,15,23.9,14.56" style="enable-background:new;"/>
+
+<polygon fill="#FFFFFF" opacity="0.4" points="24.71,15,5.294,4.412,5.294,5.294,23.9,15.44" style="enable-background:new;"/>
+
<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="-399.8" y2="-423.8">
+
<stop offset="0" stop-color="#4EDEFF"/>
+
<stop offset="1" stop-color="#048CC6"/>
+
</linearGradient>
+
</defs>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_playlist.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_playlist.svg Fri May 14 16:09:54 2010 +0300
@@ -1,34 +1,40 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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 27,1 27,22.414 20.414,29 " stroke-opacity="0.6"/>
+<polygon opacity="0.6" points="3,29 3,1 27,1 27,22.414 20.414,29 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="2" y2="28.0005">
-<stop offset="0" style="stop-color:#F9F9F9"/>
-<stop offset="1" style="stop-color:#B5B5B5"/>
+ <stop offset="0" style="stop-color:#F9F9F9"/>
+ <stop offset="1" style="stop-color:#B5B5B5"/>
</linearGradient>
<polygon fill="url(#SVGID_1_)" points="4,2 4,28 20,28 26,22 26,2 "/>
<polygon fill="#FFFFFF" points="26,22 20,22 20,28 "/>
-<rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="16" x="7" y="6.5"/>
-<rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="16" x="7" y="10.5"/>
-<rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="11" x="7" y="14.5"/>
+<rect enable-background="new " height="1.5" opacity="0.5" width="16" x="7" y="6.5"/>
+<rect enable-background="new " height="1.5" opacity="0.5" width="16" x="7" y="10.5"/>
+<rect enable-background="new " height="1.5" opacity="0.5" width="11" x="7" y="14.5"/>
</g>
<g>
-<path d="M20.96,28.68c-1.825,0-3.309-1.187-3.309-2.646s1.483-2.647,3.309-2.647c0.224,0,0.445,0.018,0.661,0.053v-7.245l5.735,1.537v4.111l-3.089-0.828v5.02c0,1.47-1.49,2.66-3.31,2.66z" fill-opacity="0.6" stroke-opacity="0.6" style="enable-background:new;"/>
+<path d="M20.96,28.68c-1.825,0-3.309-1.187-3.309-2.646s1.483-2.647,3.309-2.647c0.224,0,0.445,0.018,0.661,0.053v-7.245l5.735,1.537v4.111l-3.089-0.828v5.02c0,1.47-1.49,2.66-3.31,2.66z" opacity="0.6" style="enable-background:new;"/>
<path d="M22.06,16.77v7.229c-0.34-0.109-0.712-0.17-1.103-0.17-1.584,0-2.868,0.987-2.868,2.206s1.284,2.206,2.868,2.206c1.583,0,2.867-0.988,2.867-2.206v-5.595l3.088,0.828v-3.198l-4.86-1.3z" fill="url(#SVGID_1__)"/>
-<path d="M20.96,27.8c-1.487,0-2.709-0.871-2.854-1.985-0.009,0.072-0.014,0.146-0.014,0.221,0,1.219,1.283,2.206,2.867,2.206,1.583,0,2.867-0.988,2.867-2.206v-0.45c-0.02,1.22-1.3,2.21-2.88,2.21z" fill-opacity="0.2" stroke-opacity="0.2" style="enable-background:new;"/>
-<polygon fill-opacity="0.2" points="23.82,20.44,26.91,21.26,26.91,20.82,23.82,20" stroke-opacity="0.2" style="enable-background:new;"/>
-<path d="M20.96,24.27c0.391,0,0.763,0.062,1.103,0.171v-0.441c-0.339-0.109-0.712-0.17-1.103-0.17-1.584,0-2.867,0.987-2.867,2.206,0,0.074,0.005,0.147,0.014,0.22,0.15-1.12,1.37-1.99,2.86-1.99z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4" style="enable-background:new;"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="22.06,16.77,22.06,17.21,26.91,18.51,26.91,18.07" stroke-opacity="0.4" style="enable-background:new;"/>
+<path d="M20.96,27.8c-1.487,0-2.709-0.871-2.854-1.985-0.009,0.072-0.014,0.146-0.014,0.221,0,1.219,1.283,2.206,2.867,2.206,1.583,0,2.867-0.988,2.867-2.206v-0.45c-0.02,1.22-1.3,2.21-2.88,2.21z" opacity="0.2" style="enable-background:new;"/>
+<polygon opacity="0.2" points="23.82,20.44,26.91,21.26,26.91,20.82,23.82,20" style="enable-background:new;"/>
+<path d="M20.96,24.27c0.391,0,0.763,0.062,1.103,0.171v-0.441c-0.339-0.109-0.712-0.17-1.103-0.17-1.584,0-2.867,0.987-2.867,2.206,0,0.074,0.005,0.147,0.014,0.22,0.15-1.12,1.37-1.99,2.86-1.99z" fill="#FFFFFF" opacity="0.4" style="enable-background:new;"/>
+<polygon fill="#FFFFFF" opacity="0.4" points="22.06,16.77,22.06,17.21,26.91,18.51,26.91,18.07" style="enable-background:new;"/>
<rect fill="none" height="15" width="15" x="15" y="15"/>
<defs>
+
<linearGradient gradientTransform="matrix(0.8824 0 0 0.8824 -252.2905 -982.9092)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="311.4" x2="311.4" y1="1131" y2="1148">
+
<stop offset="0" stop-color="#DE8029"/>
+
<stop offset="0.2606" stop-color="#DE4E29"/>
+
<stop offset="1" stop-color="#D82E09"/>
+
</linearGradient>
+
</defs>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_presentation.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_presentation.svg Fri May 14 16:09:54 2010 +0300
@@ -1,53 +1,55 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="3" y2="7">
-<stop offset="0" style="stop-color:#B2B2B2"/>
-<stop offset="1" style="stop-color:#666666"/>
+ <stop offset="0" style="stop-color:#B2B2B2"/>
+ <stop offset="1" style="stop-color:#666666"/>
</linearGradient>
<rect fill="url(#SVGID_1_)" height="4" width="26" x="2" y="3"/>
<rect fill="#FFFFFF" height="18" width="24" x="3" y="7"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="8" y2="24.0005">
-<stop offset="0" style="stop-color:#E6E7E7"/>
-<stop offset="1" style="stop-color:#999999"/>
+ <stop offset="0" style="stop-color:#E6E7E7"/>
+ <stop offset="1" style="stop-color:#999999"/>
</linearGradient>
<rect fill="url(#SVGID_2_)" height="16" width="22" x="4" y="8"/>
-<polygon fill="#FFFFFF" fill-opacity="0.7" points="20,10 20,13 15,13 15,17 10,17 10,15 5,15 5,23 25,23 25,10 " stroke-opacity="0.7"/>
+<polygon fill="#FFFFFF" opacity="0.7" points="20,10 20,13 15,13 15,17 10,17 10,15 5,15 5,23 25,23 25,10 "/>
<rect fill="#808080" height="2" width="26" x="2" y="25"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="26" x="2" y="3"/>
-<rect fill="#FFFFFF" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="26" x="2" y="25"/>
-<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="26" x="2" y="6"/>
+<rect fill="#FFFFFF" height="1" opacity="0.4" width="26" x="2" y="3"/>
+<rect fill="#FFFFFF" height="1" opacity="0.2" width="26" x="2" y="25"/>
+<rect height="1" opacity="0.2" width="26" x="2" y="6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="7.5" x2="7.5" y1="10.9995" y2="21.8879">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+ <stop offset="0" style="stop-color:#A0F800"/>
+ <stop offset="1" style="stop-color:#319E00"/>
</linearGradient>
<rect fill="url(#SVGID_3_)" height="6" width="3" x="6" y="16"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="12.5" x2="12.5" y1="11.0005" y2="21.888">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+ <stop offset="0" style="stop-color:#A0F800"/>
+ <stop offset="1" style="stop-color:#319E00"/>
</linearGradient>
<rect fill="url(#SVGID_4_)" height="4" width="3" x="11" y="18"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="17.5" x2="17.5" y1="11" y2="21.8882">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+ <stop offset="0" style="stop-color:#A0F800"/>
+ <stop offset="1" style="stop-color:#319E00"/>
</linearGradient>
<rect fill="url(#SVGID_5_)" height="8" width="3" x="16" y="14"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="22.5" x2="22.5" y1="11" y2="21.888">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+ <stop offset="0" style="stop-color:#A0F800"/>
+ <stop offset="1" style="stop-color:#319E00"/>
</linearGradient>
<rect fill="url(#SVGID_6_)" height="11" width="3" x="21" y="11"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="3" x="6" y="16"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="3" x="11" y="18"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="3" x="16" y="14"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="3" x="21" y="11"/>
+<rect fill="#FFFFFF" height="1" opacity="0.4" width="3" x="6" y="16"/>
+<rect fill="#FFFFFF" height="1" opacity="0.4" width="3" x="11" y="18"/>
+<rect fill="#FFFFFF" height="1" opacity="0.4" width="3" x="16" y="14"/>
+<rect fill="#FFFFFF" height="1" opacity="0.4" width="3" x="21" y="11"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="5" x2="19" y1="12.5" y2="12.5">
-<stop offset="0" style="stop-color:#DE8029"/>
-<stop offset="1" style="stop-color:#D82E09"/>
+ <stop offset="0" style="stop-color:#DE8029"/>
+ <stop offset="1" style="stop-color:#D82E09"/>
</linearGradient>
<polygon fill="url(#SVGID_7_)" points="19,9 15.564,9 11.394,13.172 10.223,12 5,12 5,14 9.394,14 11.394,16 16.394,11 19,11 "/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_priority_high.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_priority_high.svg Fri May 14 16:09:54 2010 +0300
@@ -1,21 +1,23 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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">
-<stop offset="0" style="stop-color:#FF4D00"/>
-<stop offset="1" style="stop-color:#800000"/>
+ <stop offset="0" style="stop-color:#FF4D00"/>
+ <stop offset="1" style="stop-color:#800000"/>
</linearGradient>
<path d="M20,2l-2,15h-6L10,2H20z" fill="url(#SVGID_1_)"/>
<path d="M15,29c-2.757,0-5-2.243-5-5s2.243-5,5-5s5,2.243,5,5S17.757,29,15,29L15,29z" fill-opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="20.333" y2="27.8994">
-<stop offset="0" style="stop-color:#FF4D00"/>
-<stop offset="1" style="stop-color:#800000"/>
+ <stop offset="0" style="stop-color:#FF4D00"/>
+ <stop offset="1" style="stop-color:#800000"/>
</linearGradient>
<circle cx="15" cy="24" fill="url(#SVGID_2_)" r="4"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="19.866,3 20,2 10,2 10.134,3 " stroke-opacity="0.4"/>
-<path d="M15,21c2.036,0,3.7,1.53,3.95,3.5C18.971,24.334,19,24.172,19,24c0-2.208-1.792-4-4-4 c-2.21,0-4,1.792-4,4c0,0.172,0.029,0.334,0.05,0.5C11.299,22.53,12.962,21,15,21z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<polygon fill="#FFFFFF" opacity="0.4" points="19.866,3 20,2 10,2 10.134,3 "/>
+<path d="M15,21c2.036,0,3.7,1.53,3.95,3.5C18.971,24.334,19,24.172,19,24c0-2.208-1.792-4-4-4 c-2.21,0-4,1.792-4,4c0,0.172,0.029,0.334,0.05,0.5C11.299,22.53,12.962,21,15,21z" fill="#FFFFFF" opacity="0.4"/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_priority_low.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_priority_low.svg Fri May 14 16:09:54 2010 +0300
@@ -1,18 +1,18 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="1.8545" y2="28.0011">
+ <stop offset="0" style="stop-color:#4EDEFF"/>
+ <stop offset="1" style="stop-color:#048CC6"/>
+</linearGradient>
<polygon fill="url(#SVGID_1_)" points="19,16 19,2 11,2 11,16 5,16 15,28 25,16 "/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="19,16 19,17 24.167,17 25,16 " stroke-opacity="0.4"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="11,17 11,16 5,16 5.833,17 " stroke-opacity="0.4"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="8" x="11" y="2"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="1.8545" y2="28.0011">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
-</linearGradient>
-</defs>
+<polygon fill="#FFFFFF" opacity="0.4" points="19,16 19,17 24.167,17 25,16 "/>
+<polygon fill="#FFFFFF" opacity="0.4" points="11,17 11,16 5,16 5.833,17 "/>
+<rect fill="#FFFFFF" height="1" opacity="0.4" width="8" x="11" y="2"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_selected.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_selected.svg Fri May 14 16:09:54 2010 +0300
@@ -1,27 +1,51 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="1.219" y2="29.44">
+
<stop offset="0" stop-color="#B9BCBD"/>
+
<stop offset="0.3394" stop-color="#E0E1E2"/>
+
<stop offset="1" stop-color="#FFFFFF"/>
+
</linearGradient>
+
<path d="M15,29c-7.721,0-14-6.28-14-14s6.279-14,14-14,14,6.28,14,14-6.28,14-14,14z" fill="url(#SVGID_1_)"/>
+
<path d="M15,1c-7.721,0-14,6.28-14,14s6.279,14,14,14c-7.169,0-13-5.83-13-13s5.831-13,13-13,13,5.832,13,13-5.831,13-13,13c7.721,0,14-6.28,14-14s-6.28-14-14-14z" fill-opacity="0.1" stroke-opacity="0.1"/>
+
<path d="M15,2c7.551,0,13.71,6.013,13.98,13.5,0-0.17,0.02-0.33,0.02-0.5,0-7.72-6.279-14-14-14s-14,6.28-14,14c0,0.169,0.02,0.333,0.025,0.5,0.266-7.487,6.424-13.5,13.98-13.5z" fill-opacity="0.1" stroke-opacity="0.1"/>
+
<path d="M15,24c-4.963,0-9-4.038-9-9s4.037-9,9-9,9,4.038,9,9-4.04,9-9,9z" fill-opacity="0.4" stroke-opacity="0.4"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="15" x2="15" y1="7.125" y2="23.25">
+
<stop offset="0" stop-color="#A0F800"/>
+
<stop offset="1" stop-color="#319E00"/>
+
</linearGradient>
+
<path d="M15,23c-4.411,0-8-3.59-8-8s3.589-8,8-8,8,3.59,8,8-3.59,8-8,8z" fill="url(#SVGID_2_)"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="15" x2="15" y1="7" y2="23">
+
<stop offset="0" stop-color="#D6FF8C"/>
+
<stop offset="0.3394" stop-color="#7AD900"/>
+
<stop offset="0.6182" stop-color="#5BC000"/>
+
<stop offset="1" stop-color="#96DB00"/>
+
</linearGradient>
+
<path d="M15,8c3.859,0,7,3.141,7,7s-3.141,7-7,7-7-3.141-7-7,3.14-7,7-7m0-1c-4.411,0-8,3.59-8,8s3.589,8,8,8,8-3.59,8-8-3.59-8-8-8z" fill="url(#SVGID_3_)"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_selected_highlight.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_selected_highlight.svg Fri May 14 16:09:54 2010 +0300
@@ -1,30 +1,57 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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">
+
<stop offset="0" stop-color="#4EDEFF"/>
+
<stop offset="1" stop-color="#16A0D4"/>
+
</linearGradient>
+
<path d="M15,29c-7.72,0-14-6.28-14-14s6.28-14,14-14,14,6.28,14,14-6.28,14-14,14z" fill="url(#SVGID_1_)"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="15" x2="15" y1="3.188" y2="27.38">
+
<stop offset="0" stop-color="#E0E1E2"/>
+
<stop offset="1" stop-color="#FFFFFF"/>
+
</linearGradient>
+
<path d="M15,27c-6.617,0-12-5.38-12-12s5.383-12,12-12,12,5.383,12,12-5.38,12-12,12z" fill="url(#SVGID_2_)"/>
+
<path d="M15,4c6.448,0,11.71,5.115,11.98,11.5,0-0.17,0.02-0.33,0.02-0.5,0-6.617-5.383-12-12-12s-12,5.383-12,12c0,0.169,0.019,0.333,0.025,0.5,0.265-6.385,5.527-11.5,11.98-11.5z" fill-opacity="0.2" stroke-opacity="0.2"/>
+
<path d="M15,24c-4.963,0-9-4.038-9-9s4.037-9,9-9,9,4.038,9,9-4.04,9-9,9z" fill-opacity="0.6" stroke-opacity="0.6"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="15" x2="15" y1="7.125" y2="23.25">
+
<stop offset="0" stop-color="#A0F800"/>
+
<stop offset="1" stop-color="#319E00"/>
+
</linearGradient>
+
<path d="M15,23c-4.411,0-8-3.59-8-8s3.589-8,8-8,8,3.59,8,8-3.59,8-8,8z" fill="url(#SVGID_3_)"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="15" x2="15" y1="7" y2="23">
+
<stop offset="0" stop-color="#D6FF8C"/>
+
<stop offset="0.3394" stop-color="#7AD900"/>
+
<stop offset="0.6182" stop-color="#5BC000"/>
+
<stop offset="1" stop-color="#96DB00"/>
+
</linearGradient>
+
<path d="M15,8c3.859,0,7,3.141,7,7s-3.141,7-7,7-7-3.141-7-7,3.14-7,7-7m0-1c-4.411,0-8,3.59-8,8s3.589,8,8,8,8-3.59,8-8-3.59-8-8-8z" fill="url(#SVGID_4_)"/>
+
<rect fill="none" height="30" width="30"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_unselected.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_unselected.svg Fri May 14 16:09:54 2010 +0300
@@ -1,15 +1,27 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
+
<path d="M15,29c-7.721,0-14-6.28-14-14s6.279-14,14-14,14,6.28,14,14-6.28,14-14,14z" fill="url(#SVGID_1_)"/>
+
<path d="M15,1c-7.721,0-14,6.28-14,14s6.279,14,14,14c-7.169,0-13-5.83-13-13s5.831-13,13-13,13,5.832,13,13-5.831,13-13,13c7.721,0,14-6.28,14-14s-6.28-14-14-14z" fill-opacity="0.1" stroke-opacity="0.1"/>
+
<path d="M15,2c7.551,0,13.71,6.013,13.98,13.5,0-0.17,0.02-0.33,0.02-0.5,0-7.72-6.279-14-14-14s-14,6.28-14,14c0,0.169,0.02,0.333,0.025,0.5,0.266-7.487,6.424-13.5,13.98-13.5z" fill-opacity="0.1" stroke-opacity="0.1"/>
+
<defs>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="1.219" y2="29.44">
+
<stop offset="0" stop-color="#E0E1E2"/>
+
<stop offset="1" stop-color="#FFFFFF"/>
+
</linearGradient>
+
</defs>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_unselected_highlight.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_radio_unselected_highlight.svg Fri May 14 16:09:54 2010 +0300
@@ -1,18 +1,33 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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">
+
<stop offset="0" stop-color="#4EDEFF"/>
+
<stop offset="1" stop-color="#16A0D4"/>
+
</linearGradient>
+
<path d="M15,29c-7.72,0-14-6.28-14-14s6.28-14,14-14,14,6.28,14,14-6.28,14-14,14z" fill="url(#SVGID_1_)"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="15" x2="15" y1="3.188" y2="27.38">
+
<stop offset="0" stop-color="#E0E1E2"/>
+
<stop offset="1" stop-color="#FFFFFF"/>
+
</linearGradient>
+
<path d="M15,27c-6.617,0-12-5.38-12-12s5.383-12,12-12,12,5.383,12,12-5.38,12-12,12z" fill="url(#SVGID_2_)"/>
+
<path d="M15,3c-6.617,0-12,5.383-12,12,0,6.238,4.785,11.37,10.88,11.94-5.543-0.56-9.88-5.25-9.88-10.94,0-6.065,4.935-11,11-11s11,4.935,11,11c0,5.687-4.337,10.38-9.877,10.94,6.1-0.57,10.88-5.7,10.88-11.94,0-6.617-5.38-12-12-12z" fill-opacity="0.1" stroke-opacity="0.1"/>
+
<path d="M15,4c6.448,0,11.71,5.115,11.98,11.5,0-0.17,0.02-0.33,0.02-0.5,0-6.617-5.383-12-12-12s-12,5.383-12,12c0,0.169,0.019,0.333,0.025,0.5,0.265-6.385,5.527-11.5,11.98-11.5z" fill-opacity="0.1" stroke-opacity="0.1"/>
+
<rect fill="none" height="30" width="30"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reboot.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reboot.svg Fri May 14 16:09:54 2010 +0300
@@ -1,29 +1,31 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
<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"/>
+<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" opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="2" y2="28.0005">
-<stop offset="0" style="stop-color:#FF7236"/>
-<stop offset="0.7939" style="stop-color:#BA1212"/>
-<stop offset="1" style="stop-color:#E8522A"/>
+ <stop offset="0" style="stop-color:#FF7236"/>
+ <stop offset="0.7939" style="stop-color:#BA1212"/>
+ <stop offset="1" style="stop-color:#E8522A"/>
</linearGradient>
<circle cx="15" cy="15" fill="url(#SVGID_1_)" r="13"/>
-<path d="M15,3c7.011,0,12.71,5.555,12.975,12.5C27.981,15.332,28,15.169,28,15c0-7.18-5.82-13-13-13 S2,7.82,2,15c0,0.169,0.019,0.332,0.025,0.5C2.29,8.555,7.989,3,15,3z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M20.632,8.973c-0.419-0.315-0.917-0.481-1.439-0.481c-0.691,0-1.345,0.313-1.796,0.83V7.396 C17.396,6.074,16.321,5,15,5s-2.396,1.074-2.396,2.396V9.32c-0.452-0.516-1.105-0.83-1.796-0.83c-0.522,0-1.021,0.166-1.438,0.48 c-2.385,1.79-3.752,4.525-3.752,7.505c0,5.173,4.209,9.382,9.383,9.382s9.383-4.209,9.383-9.382 C24.383,13.497,23.016,10.762,20.632,8.973z M15,21.065c-2.529,0-4.587-2.059-4.587-4.59c0-1.457,0.669-2.796,1.834-3.672 c0.132-0.099,0.25-0.209,0.356-0.329v2.255c0,1.322,1.075,2.398,2.396,2.398s2.396-1.076,2.396-2.398v-2.254 c0.106,0.119,0.225,0.229,0.355,0.327c1.167,0.878,1.836,2.217,1.836,3.673C19.588,19.007,17.529,21.065,15,21.065z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M15,3c7.011,0,12.71,5.555,12.975,12.5C27.981,15.332,28,15.169,28,15c0-7.18-5.82-13-13-13 S2,7.82,2,15c0,0.169,0.019,0.332,0.025,0.5C2.29,8.555,7.989,3,15,3z" fill="#FFFFFF" opacity="0.4"/>
+<path d="M20.632,8.973c-0.419-0.315-0.917-0.481-1.439-0.481c-0.691,0-1.345,0.313-1.796,0.83V7.396 C17.396,6.074,16.321,5,15,5s-2.396,1.074-2.396,2.396V9.32c-0.452-0.516-1.105-0.83-1.796-0.83c-0.522,0-1.021,0.166-1.438,0.48 c-2.385,1.79-3.752,4.525-3.752,7.505c0,5.173,4.209,9.382,9.383,9.382s9.383-4.209,9.383-9.382 C24.383,13.497,23.016,10.762,20.632,8.973z M15,21.065c-2.529,0-4.587-2.059-4.587-4.59c0-1.457,0.669-2.796,1.834-3.672 c0.132-0.099,0.25-0.209,0.356-0.329v2.255c0,1.322,1.075,2.398,2.396,2.398s2.396-1.076,2.396-2.398v-2.254 c0.106,0.119,0.225,0.229,0.355,0.327c1.167,0.878,1.836,2.217,1.836,3.673C19.588,19.007,17.529,21.065,15,21.065z" opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="8.8188" y2="38.4606">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.5273" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#CAD1D4"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="0.5273" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#CAD1D4"/>
</linearGradient>
<path d="M20.03,9.343c-0.616-0.464-1.492-0.34-1.955,0.277c-0.463,0.616-0.341,1.494,0.278,1.955 c1.42,1.068,2.234,2.698,2.234,4.472c0,3.083-2.507,5.59-5.588,5.59s-5.587-2.507-5.587-5.59c0-1.773,0.814-3.404,2.234-4.473 c0.618-0.463,0.74-1.338,0.277-1.955c-0.463-0.616-1.339-0.74-1.955-0.277c-2.131,1.6-3.353,4.045-3.353,6.705 c0,4.623,3.762,8.382,8.383,8.382s8.383-3.759,8.383-8.382C23.383,13.387,22.161,10.942,20.03,9.343z" fill="url(#SVGID_2_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="14.9995" x2="14.9995" y1="5.4111" y2="24.9469">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="0.5273" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#CAD1D4"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="0.5273" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#CAD1D4"/>
</linearGradient>
<path d="M15,15.699c0.771,0,1.396-0.626,1.396-1.398V6.967c0-0.772-0.625-1.396-1.396-1.396 s-1.396,0.623-1.396,1.396v7.334C13.604,15.073,14.229,15.699,15,15.699z" fill="url(#SVGID_3_)"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_received.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_received.svg Fri May 14 16:09:54 2010 +0300
@@ -1,20 +1,22 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
+<polygon opacity="0.6" points="2.865,15 10,15 10,1 20,1 20,15 27.135,15 15,29.563 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="1.8545" y2="28.0011">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="0.7576" style="stop-color:#4CB400"/>
-<stop offset="1" style="stop-color:#89CC6A"/>
+ <stop offset="0" style="stop-color:#A0F800"/>
+ <stop offset="0.7576" style="stop-color:#4CB400"/>
+ <stop offset="1" style="stop-color:#89CC6A"/>
</linearGradient>
<polygon fill="url(#SVGID_1_)" points="19,16 19,2 11,2 11,16 5,16 15,28 25,16 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="2.8687" y2="26.4384">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+ <stop offset="0" style="stop-color:#A0F800"/>
+ <stop offset="1" style="stop-color:#319E00"/>
</linearGradient>
<polygon fill="url(#SVGID_2_)" points="7.135,17 12,17 12,3 18,3 18,17 22.865,17 15,26.438 "/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_record.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_record.svg Fri May 14 16:09:54 2010 +0300
@@ -1,17 +1,17 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="2" y2="28.0005">
+ <stop offset="0" style="stop-color:#DE5229"/>
+ <stop offset="1" style="stop-color:#D81A00"/>
+</linearGradient>
<circle cx="15" cy="15" fill="url(#SVGID_1_)" r="13"/>
-<path d="M15,3.182c6.98,0,12.659,5.505,12.97,12.409C27.979,15.394,28,15.199,28,15 c0-7.18-5.82-13-13-13S2,7.82,2,15c0,0.199,0.021,0.394,0.03,0.591C2.342,8.687,8.02,3.182,15,3.182z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M15,3.182c6.98,0,12.659,5.505,12.97,12.409C27.979,15.394,28,15.199,28,15 c0-7.18-5.82-13-13-13S2,7.82,2,15c0,0.199,0.021,0.394,0.03,0.591C2.342,8.687,8.02,3.182,15,3.182z" fill="#FFFFFF" opacity="0.4"/>
<rect fill="none" height="30" width="30"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="2" y2="28.0005">
-<stop offset="0" style="stop-color:#DE5229"/>
-<stop offset="1" style="stop-color:#D81A00"/>
-</linearGradient>
-</defs>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_refresh.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_refresh.svg Fri May 14 16:09:54 2010 +0300
@@ -1,24 +1,26 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
+<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" opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="4.0454" x2="24.9205" y1="5.4551" y2="26.3301">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+ <stop offset="0" style="stop-color:#A0F800"/>
+ <stop offset="1" style="stop-color:#319E00"/>
</linearGradient>
<path d="M8,15c0-1.931,0.799-3.666,2.068-4.932l3.518,3.518l1.061-10.253L4.394,4.394l3.538,3.538 C6.122,9.741,5,12.239,5,15c0,5.021,3.705,9.166,8.528,9.88l0.309-2.984C10.53,21.338,8,18.462,8,15z" fill="url(#SVGID_1_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="5.4556" x2="26.3306" y1="4.0459" y2="24.921">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+ <stop offset="0" style="stop-color:#A0F800"/>
+ <stop offset="1" style="stop-color:#319E00"/>
</linearGradient>
<path d="M16.414,16.414l-1.061,10.253l10.253-1.061l-3.538-3.539C23.878,20.259,25,17.762,25,15 c0-5.021-3.705-9.166-8.528-9.88l-0.309,2.984C19.47,8.661,22,11.538,22,15c0,1.93-0.793,3.673-2.061,4.939L16.414,16.414z" fill="url(#SVGID_2_)"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="14.507,4.681 14.646,3.333 4.394,4.394 5.602,5.602 " stroke-opacity="0.4"/>
-<path d="M8.033,15.676C8.014,15.893,8,16.111,8,16.333c0,3.414,2.463,6.254,5.702,6.866l0.135-1.304 C10.748,21.375,8.338,18.83,8.033,15.676z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M19.939,21.272C21.207,20.006,22,18.263,22,16.333c0-0.228-0.012-0.452-0.033-0.674 c-0.158,1.665-0.905,3.16-2.027,4.28l-3.525-3.525l-0.123,1.193L19.939,21.272z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M7.297,8.63C5.863,10.359,5,12.578,5,15c0,0.235,0.016,0.467,0.032,0.698 c0.158-2.506,1.23-4.765,2.899-6.434L7.297,8.63z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M22.703,22.702c-0.201,0.243-0.412,0.476-0.635,0.698l2.33,2.331l1.208-0.125L22.703,22.702z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M16.472,6.453c4.597,0.681,8.171,4.479,8.496,9.182C24.981,15.424,25,15.214,25,15 c0-5.021-3.705-9.166-8.528-9.88l-0.135,1.305L16.472,6.453z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<polygon fill="#FFFFFF" opacity="0.4" points="14.507,4.681 14.646,3.333 4.394,4.394 5.602,5.602 "/>
+<path d="M8.033,15.676C8.014,15.893,8,16.111,8,16.333c0,3.414,2.463,6.254,5.702,6.866l0.135-1.304 C10.748,21.375,8.338,18.83,8.033,15.676z" fill="#FFFFFF" opacity="0.4"/>
+<path d="M19.939,21.272C21.207,20.006,22,18.263,22,16.333c0-0.228-0.012-0.452-0.033-0.674 c-0.158,1.665-0.905,3.16-2.027,4.28l-3.525-3.525l-0.123,1.193L19.939,21.272z" fill="#FFFFFF" opacity="0.4"/>
+<path d="M7.297,8.63C5.863,10.359,5,12.578,5,15c0,0.235,0.016,0.467,0.032,0.698 c0.158-2.506,1.23-4.765,2.899-6.434L7.297,8.63z" fill="#FFFFFF" opacity="0.4"/>
+<path d="M22.703,22.702c-0.201,0.243-0.412,0.476-0.635,0.698l2.33,2.331l1.208-0.125L22.703,22.702z" fill="#FFFFFF" opacity="0.4"/>
+<path d="M16.472,6.453c4.597,0.681,8.171,4.479,8.496,9.182C24.981,15.424,25,15.214,25,15 c0-5.021-3.705-9.166-8.528-9.88l-0.135,1.305L16.472,6.453z" fill="#FFFFFF" opacity="0.4"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reminder.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reminder.svg Fri May 14 16:09:54 2010 +0300
@@ -1,41 +1,43 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
<linearGradient gradientTransform="matrix(-0.7071 -0.7071 -0.7071 0.7071 -1585.0613 -656.5991)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-1608.3745" x2="-1605.019" y1="-670.4932" y2="-670.4932">
-<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"/>
+ <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="M22.626,4.998l0.707-0.707c0.777-0.777,2.051-0.777,2.828,0c0.778,0.779,0.777,2.051,0,2.829 l-0.707,0.707L22.626,4.998z" fill="url(#SVGID_1_)"/>
-<path d="M23.333,4.291c0.205-0.205,0.445-0.352,0.702-0.449c0.502,0.33,0.978,0.716,1.419,1.156 c0.441,0.441,0.826,0.918,1.157,1.42c-0.098,0.256-0.245,0.497-0.45,0.702l-0.707,0.707l-2.828-2.829L23.333,4.291z" fill="#873900" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M23.333,4.291c0.205-0.205,0.445-0.352,0.702-0.449c0.502,0.33,0.978,0.716,1.419,1.156 c0.441,0.441,0.826,0.918,1.157,1.42c-0.098,0.256-0.245,0.497-0.45,0.702l-0.707,0.707l-2.828-2.829L23.333,4.291z" fill="#873900" opacity="0.2"/>
<linearGradient gradientTransform="matrix(-0.7071 -0.7071 -0.7071 0.7071 -1585.0613 -656.5991)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-1613.5698" x2="-1600.1477" y1="-661.9927" y2="-661.9927">
-<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"/>
+ <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="M19.09,22.676l5.657-5.656c3.119-3.119,3.119-8.195,0-11.314s-8.194-3.119-11.313,0l-5.657,5.658 L19.09,22.676z" fill="url(#SVGID_2_)"/>
-<path d="M24.747,5.705c3.119,3.119,3.119,8.195,0,11.314l-0.707,0.707 c3.119-3.119,3.119-8.194,0-11.313s-8.194-3.119-11.313,0l0.707-0.708C16.553,2.586,21.628,2.586,24.747,5.705z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M24.747,5.705c3.119,3.119,3.119,8.195,0,11.314l-0.707,0.707 c3.119-3.119,3.119-8.194,0-11.313s-8.194-3.119-11.313,0l0.707-0.708C16.553,2.586,21.628,2.586,24.747,5.705z" fill="#FFFFFF" opacity="0.4"/>
<linearGradient gradientTransform="matrix(-0.7071 -0.7071 -0.7071 0.7071 -1585.0613 -656.5991)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-1615.3008" x2="-1598.524" y1="-653.4927" y2="-653.4927">
-<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"/>
+ <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="M9.19,9.949l11.314,11.313c0.685,1.913,0.191,2.637-0.687,3.515l-1.436,1.436L4.241,12.07 l1.436-1.436C6.555,9.756,7.278,9.264,9.19,9.949z" fill="url(#SVGID_3_)"/>
-<rect fill="#873900" fill-opacity="0.2" height="1" stroke-opacity="0.2" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 15.1665 36.7847)" width="16" x="7.201" y="14.752"/>
-<rect fill="#753200" fill-opacity="0.1" height="1" stroke-opacity="0.1" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 6.6295 40.3212)" width="19.999" x="1.666" y="18.288"/>
+<rect fill="#873900" height="1" opacity="0.2" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 15.1665 36.7847)" width="16" x="7.201" y="14.752"/>
+<rect fill="#753200" height="1" opacity="0.1" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 6.6295 40.3212)" width="19.999" x="1.666" y="18.288"/>
<linearGradient gradientTransform="matrix(-0.7071 -0.7071 -0.7071 0.7071 -1585.0613 -656.5991)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-1606.6431" x2="-1606.6431" y1="-647.9927" y2="-650.8915">
-<stop offset="0" style="stop-color:#F56700"/>
-<stop offset="1" style="stop-color:#EF2D00"/>
+ <stop offset="0" style="stop-color:#F56700"/>
+ <stop offset="1" style="stop-color:#EF2D00"/>
</linearGradient>
<path d="M14.1,21.929c-1.396,1.001-3.485,0.757-4.909-0.667c-1.423-1.424-1.667-3.514-0.666-4.908 L14.1,21.929z" fill="url(#SVGID_4_)"/>
-<path d="M8.071,17.314c0.101-0.342,0.243-0.668,0.453-0.961l5.575,5.575 c-0.293,0.21-0.62,0.353-0.961,0.453L8.071,17.314z" fill="#753200" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M20.818,22.99L7.462,9.635C7.918,9.6,8.47,9.689,9.19,9.949l11.314,11.313 C20.763,21.983,20.853,22.535,20.818,22.99z" fill="#FFF6C9" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M8.071,17.314c0.101-0.342,0.243-0.668,0.453-0.961l5.575,5.575 c-0.293,0.21-0.62,0.353-0.961,0.453L8.071,17.314z" fill="#753200" opacity="0.4"/>
+<path d="M20.818,22.99L7.462,9.635C7.918,9.6,8.47,9.689,9.19,9.949l11.314,11.313 C20.763,21.983,20.853,22.535,20.818,22.99z" fill="#FFF6C9" opacity="0.5"/>
<rect fill="none" height="30" width="30" x="0.453"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_repeat.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_repeat.svg Fri May 14 16:09:54 2010 +0300
@@ -1,20 +1,20 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="2.6978" x2="23.286" y1="3.7852" y2="24.3734">
+ <stop offset="0" style="stop-color:#A0F800"/>
+ <stop offset="1" style="stop-color:#319E00"/>
+</linearGradient>
<path d="M23.285,7.901l-2.47,2.472c3.178,3.178,3.178,8.351,0,11.529c-3.179,3.178-8.352,3.178-11.529,0 c-3.18-3.179-3.18-8.352,0-11.529l4.117,4.117l1.235-11.941L2.697,3.784l4.117,4.117c-4.549,4.55-4.549,11.922,0,16.472 c4.549,4.548,11.922,4.548,16.471,0C27.834,19.823,27.834,12.451,23.285,7.901z" fill="url(#SVGID_1_)"/>
-<path d="M5.905,8.935c-1.874,2.376-2.694,5.308-2.456,8.174c0.22-2.649,1.338-5.237,3.365-7.266 L5.905,8.935z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M23.285,9.843c2.027,2.028,3.146,4.616,3.366,7.266c0.272-3.296-0.844-6.686-3.366-9.207 l-2.47,2.472c0.331,0.331,0.62,0.689,0.883,1.059L23.285,9.843z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M6.966,17.108c-0.284,2.397,0.483,4.898,2.32,6.735c3.178,3.178,8.351,3.178,11.529,0 c1.836-1.837,2.604-4.338,2.319-6.735c-0.21,1.753-0.978,3.452-2.319,4.794c-3.179,3.178-8.352,3.178-11.529,0 C7.943,20.561,7.175,18.861,6.966,17.108z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="14.436,4.511 14.639,2.549 2.697,3.784 4.456,5.544 " stroke-opacity="0.4"/>
+<path d="M5.905,8.935c-1.874,2.376-2.694,5.308-2.456,8.174c0.22-2.649,1.338-5.237,3.365-7.266 L5.905,8.935z" fill="#FFFFFF" opacity="0.4"/>
+<path d="M23.285,9.843c2.027,2.028,3.146,4.616,3.366,7.266c0.272-3.296-0.844-6.686-3.366-9.207 l-2.47,2.472c0.331,0.331,0.62,0.689,0.883,1.059L23.285,9.843z" fill="#FFFFFF" opacity="0.4"/>
+<path d="M6.966,17.108c-0.284,2.397,0.483,4.898,2.32,6.735c3.178,3.178,8.351,3.178,11.529,0 c1.836-1.837,2.604-4.338,2.319-6.735c-0.21,1.753-0.978,3.452-2.319,4.794c-3.179,3.178-8.352,3.178-11.529,0 C7.943,20.561,7.175,18.861,6.966,17.108z" fill="#FFFFFF" opacity="0.4"/>
+<polygon fill="#FFFFFF" opacity="0.4" points="14.436,4.511 14.639,2.549 2.697,3.784 4.456,5.544 "/>
<rect fill="none" height="30" width="30"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="2.6978" x2="23.286" y1="3.7852" y2="24.3734">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
-</linearGradient>
-</defs>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_repeat_exception.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_repeat_exception.svg Fri May 14 16:09:54 2010 +0300
@@ -1,30 +1,38 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="2.6978" x2="23.286" y1="3.7852" y2="24.3734">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+ <stop offset="0" style="stop-color:#A0F800"/>
+ <stop offset="1" style="stop-color:#319E00"/>
</linearGradient>
<path d="M23.285,7.901l-2.47,2.472c3.178,3.178,3.178,8.351,0,11.529c-3.179,3.178-8.352,3.178-11.529,0 c-3.18-3.179-3.18-8.352,0-11.529l4.117,4.117l1.235-11.941L2.697,3.784l4.117,4.117c-4.549,4.55-4.549,11.922,0,16.472 c4.549,4.548,11.922,4.548,16.471,0C27.834,19.823,27.834,12.451,23.285,7.901z" fill="url(#SVGID_1_)"/>
-<path d="M5.905,8.935c-1.874,2.376-2.694,5.308-2.456,8.174c0.22-2.649,1.338-5.237,3.365-7.266 L5.905,8.935z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M23.285,9.843c2.027,2.028,3.146,4.616,3.366,7.266c0.272-3.296-0.844-6.686-3.366-9.207 l-2.47,2.472c0.331,0.331,0.62,0.689,0.883,1.059L23.285,9.843z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M6.966,17.108c-0.284,2.397,0.483,4.898,2.32,6.735c3.178,3.178,8.351,3.178,11.529,0 c1.836-1.837,2.604-4.338,2.319-6.735c-0.21,1.753-0.978,3.452-2.319,4.794c-3.179,3.178-8.352,3.178-11.529,0 C7.943,20.561,7.175,18.861,6.966,17.108z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="14.436,4.511 14.639,2.549 2.697,3.784 4.456,5.544 " stroke-opacity="0.4"/>
+<path d="M5.905,8.935c-1.874,2.376-2.694,5.308-2.456,8.174c0.22-2.649,1.338-5.237,3.365-7.266 L5.905,8.935z" fill="#FFFFFF" opacity="0.4"/>
+<path d="M23.285,9.843c2.027,2.028,3.146,4.616,3.366,7.266c0.272-3.296-0.844-6.686-3.366-9.207 l-2.47,2.472c0.331,0.331,0.62,0.689,0.883,1.059L23.285,9.843z" fill="#FFFFFF" opacity="0.4"/>
+<path d="M6.966,17.108c-0.284,2.397,0.483,4.898,2.32,6.735c3.178,3.178,8.351,3.178,11.529,0 c1.836-1.837,2.604-4.338,2.319-6.735c-0.21,1.753-0.978,3.452-2.319,4.794c-3.179,3.178-8.352,3.178-11.529,0 C7.943,20.561,7.175,18.861,6.966,17.108z" fill="#FFFFFF" opacity="0.4"/>
+<polygon fill="#FFFFFF" opacity="0.4" points="14.436,4.511 14.639,2.549 2.697,3.784 4.456,5.544 "/>
<rect fill="none" height="30" width="30"/>
</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"/>
+<rect height="34.27" 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>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reply.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reply.svg Fri May 14 16:09:54 2010 +0300
@@ -1,17 +1,17 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="4.8848" y2="25.2603">
+ <stop offset="0" style="stop-color:#A0F800"/>
+ <stop offset="1" style="stop-color:#319E00"/>
+</linearGradient>
<polygon fill="url(#SVGID_1_)" points="14,19 28,19 28,11 14,11 14,5 2,15 14,25 "/>
-<polygon fill="#FFFFFF" fill-opacity="0.5" points="14,6.135 14,5 2,15 2.681,15.567 " stroke-opacity="0.5"/>
-<rect fill="#FFFFFF" fill-opacity="0.5" height="1.135" stroke-opacity="0.5" width="14" x="14" y="11"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="4.8848" y2="25.2603">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
-</linearGradient>
-</defs>
+<polygon fill="#FFFFFF" opacity="0.5" points="14,6.135 14,5 2,15 2.681,15.567 "/>
+<rect fill="#FFFFFF" height="1.135" opacity="0.5" width="14" x="14" y="11"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reply_all.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_reply_all.svg Fri May 14 16:09:54 2010 +0300
@@ -1,20 +1,37 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<rect fill="none" height="30" width="30"/>
+
<rect fill="none" height="30" width="30"/>
+
<polygon fill-opacity="0.6" points="17.81,7.626,17.81,0.938,4.161,12.31,6.692,14.42,1.348,18.88,15,30.25,15,23.56,28.12,23.56,28.12,15.13,28.12,14.19,28.12,7.626" stroke-opacity="0.6"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1" x1="16.41" x2="16.41" y1="2.87" y2="14.34">
+
<stop offset="0" stop-color="#86D100"/>
+
<stop offset="1" stop-color="#2F9600"/>
+
</linearGradient>
+
<polygon fill="url(#SVGID_1)" points="15,7.5,15,14.19,27.19,14.19,27.19,8.564,16.88,8.564,16.88,2.939,5.625,12.31,7.424,13.81"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2" x1="15" x2="15" y1="9.39" y2="28.5">
+
<stop offset="0" stop-color="#A0F800"/>
+
<stop offset="1" stop-color="#319E00"/>
+
</linearGradient>
+
<polygon fill="url(#SVGID_2)" points="14.06,22.63,27.19,22.63,27.19,15.13,14.06,15.13,14.06,9.501,2.813,18.88,14.06,28.25"/>
+
<polygon fill="#FFFFFF" fill-opacity="0.5" points="14.06,10.56,14.06,9.501,2.813,18.88,3.451,19.41" stroke-opacity="0.5"/>
+
<rect fill="#FFFFFF" fill-opacity="0.5" height="1.064" stroke-opacity="0.5" width="13.12" x="14.06" y="15.13"/>
+
<rect fill-opacity="0.2" height="0.938" stroke-opacity="0.2" width="12.19" x="15" y="13.25"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_rgb.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_rgb.svg Fri May 14 16:09:54 2010 +0300
@@ -1,7 +1,9 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
<path d="M15,14c-3.309,0-6-2.691-6-6s2.691-6,6-6c3.31,0,6,2.691,6,6S18.311,14,15,14L15,14z" fill="#FF0000"/>
@@ -12,4 +14,4 @@
<rect fill="none" height="30" width="30" x="0"/>
<rect fill="none" height="30" width="30" x="0"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_secure.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_secure.svg Fri May 14 16:09:54 2010 +0300
@@ -1,43 +1,45 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
+ <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"/>
+ <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"/>
+ <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"/>
+ <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"/>
+<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" 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" opacity="0.4"/>
+<rect height="2" opacity="0.2" width="24" x="3" y="23"/>
+<rect height="2" opacity="0.2" width="24" x="3" y="19"/>
<rect fill="none" height="30" width="30" x="0"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_selected.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_selected.svg Fri May 14 16:09:54 2010 +0300
@@ -1,21 +1,39 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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">
+
<stop offset="0" stop-color="#E0E1E2"/>
+
<stop offset="1" stop-color="#FFFFFF"/>
+
</linearGradient>
+
<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"/>
+
<path d="M1,1v28h1v-25c0-0.55,0.45-1,1-1h24c0.55,0,1,0.45,1,1v25h1v-28h-28z" fill-opacity="0.1" stroke-opacity="0.1"/>
+
<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="28" x="1" y="1"/>
+
<path d="M0,0v30h30v-30h-30zm29,29h-28v-28h28v28z" fill-opacity="0.6" stroke-opacity="0.6"/>
+
<polygon fill-opacity="0.6" points="11.89,22.98,4.213,15.31,8.303,11.22,12.54,15.46,21.7,6.31,25.79,10.4,12.49,23.69" stroke-opacity="0.6"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="15" x2="15" y1="6.972" y2="23.64">
+
<stop offset="0" stop-color="#A0F800"/>
+
<stop offset="1" stop-color="#319E00"/>
+
</linearGradient>
+
<polygon fill="url(#SVGID_2_)" points="24.37,10.4,21.7,7.724,12.54,16.88,8.303,12.63,5.627,15.31,12.54,22.22,12.54,22.21,12.55,22.22"/>
+
<polygon fill="#FFFFFF" fill-opacity="0.4" points="8.303,13.63,12.54,17.88,21.7,8.724,23.87,10.9,24.37,10.4,21.7,7.724,12.54,16.88,8.303,12.63,5.627,15.31,6.127,15.81" stroke-opacity="0.4"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_selected_highlight.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_selected_highlight.svg Fri May 14 16:09:54 2010 +0300
@@ -1,25 +1,47 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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">
+
<stop offset="0" stop-color="#4EDEFF"/>
+
<stop offset="1" stop-color="#16A0D4"/>
+
</linearGradient>
+
<rect fill="url(#SVGID_1_)" height="28" width="28" x="1" y="1"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="15" x2="15" y1="3.188" y2="27.38">
+
<stop offset="0" stop-color="#E0E1E2"/>
+
<stop offset="1" stop-color="#FFFFFF"/>
+
</linearGradient>
+
<rect fill="url(#SVGID_2_)" height="24" width="24" x="3" y="3"/>
+
<path d="M3,3v24h2v-20c0-0.55,0.45-1,1-1h18c0.55,0,1,0.45,1,1v20h2v-24h-24z" fill-opacity="0.05" stroke-opacity="0.05"/>
+
<path d="M3,3v24h1v-21c0-0.55,0.45-1,1-1h20c0.55,0,1,0.45,1,1v21h1v-24h-24z" fill-opacity="0.1" stroke-opacity="0.1"/>
+
<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="24" x="3" y="3"/>
+
<polygon fill-opacity="0.6" points="11.89,22.98,4.213,15.31,8.303,11.22,12.54,15.46,21.7,6.31,25.79,10.4,12.49,23.69" stroke-opacity="0.6"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="15" x2="15" y1="6.972" y2="23.64">
+
<stop offset="0" stop-color="#A0F800"/>
+
<stop offset="1" stop-color="#319E00"/>
+
</linearGradient>
+
<polygon fill="url(#SVGID_3_)" points="24.37,10.4,21.7,7.724,12.54,16.88,8.303,12.63,5.627,15.31,12.54,22.22,12.54,22.21,12.55,22.22"/>
+
<polygon fill="#FFFFFF" fill-opacity="0.4" points="8.303,13.63,12.54,17.88,21.7,8.724,23.87,10.9,24.37,10.4,21.7,7.724,12.54,16.88,8.303,12.63,5.627,15.31,6.127,15.81" stroke-opacity="0.4"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_selected_partial.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_selected_partial.svg Fri May 14 16:09:54 2010 +0300
@@ -1,26 +1,49 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="1.219" y2="29.44">
+
<stop offset="0" stop-color="#E0E1E2"/>
+
<stop offset="1" stop-color="#FFFFFF"/>
+
</linearGradient>
+
<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"/>
+
<path d="M1,1v28h1v-25c0-0.55,0.45-1,1-1h24c0.55,0,1,0.45,1,1v25h1v-28h-28z" fill-opacity="0.1" stroke-opacity="0.1"/>
+
<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="28" x="1" y="1"/>
+
<path d="M0,0v30h30v-30h-30zm29,29h-28v-28h28v28z" fill-opacity="0.6" stroke-opacity="0.6"/>
+
<rect fill-opacity="0.4" height="18" stroke-opacity="0.4" width="18" x="6" y="6"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="15" x2="15" y1="7.125" y2="23.25">
+
<stop offset="0" stop-color="#A0F800"/>
+
<stop offset="1" stop-color="#319E00"/>
+
</linearGradient>
+
<rect fill="url(#SVGID_2_)" height="16" width="16" x="7" y="7"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="15" x2="15" y1="7" y2="23">
+
<stop offset="0" stop-color="#D6FF8C"/>
+
<stop offset="0.3394" stop-color="#7AD900"/>
+
<stop offset="0.6182" stop-color="#5BC000"/>
+
<stop offset="1" stop-color="#96DB00"/>
+
</linearGradient>
+
<path d="M22,8v14h-14v-14h14m1-1h-16v16h16v-16z" fill="url(#SVGID_3_)"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sent.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sent.svg Fri May 14 16:09:54 2010 +0300
@@ -1,20 +1,22 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
+<polygon opacity="0.6" points="10,29 10,15 2.865,15 15,0.438 27.135,15 20,15 20,29 "/>
<linearGradient gradientTransform="matrix(1 0 0 -1 0 682)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="653.8545" y2="680.0006">
-<stop offset="0" style="stop-color:#57CDFF"/>
-<stop offset="0.2788" style="stop-color:#19A3D6"/>
-<stop offset="1" style="stop-color:#4EDEFF"/>
+ <stop offset="0" style="stop-color:#57CDFF"/>
+ <stop offset="0.2788" style="stop-color:#19A3D6"/>
+ <stop offset="1" style="stop-color:#4EDEFF"/>
</linearGradient>
<polygon fill="url(#SVGID_1_)" points="19,14 19,28 11,28 11,14 5,14 15,2 25,14 "/>
<linearGradient gradientTransform="matrix(1 0 0 -1 0 682)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="654.8691" y2="678.4384">
-<stop offset="0" style="stop-color:#048CC6"/>
-<stop offset="1" style="stop-color:#4EDEFF"/>
+ <stop offset="0" style="stop-color:#048CC6"/>
+ <stop offset="1" style="stop-color:#4EDEFF"/>
</linearGradient>
<polygon fill="url(#SVGID_2_)" points="7.135,13 12,13 12,27 18,27 18,13 22.865,13 15,3.563 "/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_signal_good.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_signal_good.svg Fri May 14 16:09:54 2010 +0300
@@ -1,29 +1,31 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
<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.752">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+ <stop offset="0" style="stop-color:#A0F800"/>
+ <stop offset="1" style="stop-color:#319E00"/>
</linearGradient>
<rect fill="url(#SVGID_1_)" height="10" width="6" x="2" y="16"/>
<rect fill-opacity="0.6" height="18" width="8" x="11" y="9"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="4" y2="25.752">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+ <stop offset="0" style="stop-color:#A0F800"/>
+ <stop offset="1" style="stop-color:#319E00"/>
</linearGradient>
<rect fill="url(#SVGID_2_)" height="16" width="6" x="12" y="10"/>
<rect fill-opacity="0.6" height="24" width="8" x="21" y="3"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="25" x2="25" y1="4" y2="25.7519">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+ <stop offset="0" style="stop-color:#A0F800"/>
+ <stop offset="1" style="stop-color:#319E00"/>
</linearGradient>
<rect fill="url(#SVGID_3_)" height="22" width="6" x="22" y="4"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="6" x="2" y="16"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="6" x="12" y="10"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="6" x="22" y="4"/>
+<rect fill="#FFFFFF" height="1" opacity="0.4" width="6" x="2" y="16"/>
+<rect fill="#FFFFFF" height="1" opacity="0.4" width="6" x="12" y="10"/>
+<rect fill="#FFFFFF" height="1" opacity="0.4" width="6" x="22" y="4"/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_signal_low.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_signal_low.svg Fri May 14 16:09:54 2010 +0300
@@ -1,35 +1,37 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
<rect fill-opacity="0.6" height="12" width="8" x="1" y="15"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="16" y2="26.1378">
-<stop offset="0" style="stop-color:#DE8029"/>
-<stop offset="1" style="stop-color:#D82E09"/>
+ <stop offset="0" style="stop-color:#DE8029"/>
+ <stop offset="1" style="stop-color:#D82E09"/>
</linearGradient>
<rect fill="url(#SVGID_1_)" height="10" width="6" x="2" y="16"/>
<rect fill-opacity="0.6" height="18" width="8" x="11" y="9"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="4" y2="26.0007">
-<stop offset="0" style="stop-color:#C4C4C4"/>
-<stop offset="1" style="stop-color:#4F4F4F"/>
+ <stop offset="0" style="stop-color:#C4C4C4"/>
+ <stop offset="1" style="stop-color:#4F4F4F"/>
</linearGradient>
<rect fill="url(#SVGID_2_)" height="16" width="6" x="12" y="10"/>
-<polygon fill="#FFFFFF" fill-opacity="0.3" points="18,12.39 18,10 15.61,10 " stroke-opacity="0.3"/>
-<polygon fill="#FFFFFF" fill-opacity="0.3" points="12,17.703 18,23.703 18,18.047 12,12.047 " stroke-opacity="0.3"/>
-<polygon fill="#FFFFFF" fill-opacity="0.3" points="12,23.36 12,26 14.64,26 " stroke-opacity="0.3"/>
+<polygon fill="#FFFFFF" opacity="0.3" points="18,12.39 18,10 15.61,10 "/>
+<polygon fill="#FFFFFF" opacity="0.3" points="12,17.703 18,23.703 18,18.047 12,12.047 "/>
+<polygon fill="#FFFFFF" opacity="0.3" points="12,23.36 12,26 14.64,26 "/>
<rect fill-opacity="0.6" height="24" width="8" x="21" y="3"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="25" x2="25" y1="4" y2="26.0005">
-<stop offset="0" style="stop-color:#C4C4C4"/>
-<stop offset="1" style="stop-color:#4F4F4F"/>
+ <stop offset="0" style="stop-color:#C4C4C4"/>
+ <stop offset="1" style="stop-color:#4F4F4F"/>
</linearGradient>
<rect fill="url(#SVGID_3_)" height="22" width="6" x="22" y="4"/>
-<polygon fill="#FFFFFF" fill-opacity="0.3" points="28,9.64 28,4 22.36,4 " stroke-opacity="0.3"/>
-<polygon fill="#FFFFFF" fill-opacity="0.3" points="22,14.953 28,20.953 28,15.297 22,9.297 " stroke-opacity="0.3"/>
-<polygon fill="#FFFFFF" fill-opacity="0.3" points="22,20.61 22,26 27.39,26 " stroke-opacity="0.3"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="6" x="2" y="16"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="6" x="12" y="10"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="6" x="22" y="4"/>
+<polygon fill="#FFFFFF" opacity="0.3" points="28,9.64 28,4 22.36,4 "/>
+<polygon fill="#FFFFFF" opacity="0.3" points="22,14.953 28,20.953 28,15.297 22,9.297 "/>
+<polygon fill="#FFFFFF" opacity="0.3" points="22,20.61 22,26 27.39,26 "/>
+<rect fill="#FFFFFF" height="1" opacity="0.4" width="6" x="2" y="16"/>
+<rect fill="#FFFFFF" height="1" opacity="0.4" width="6" x="12" y="10"/>
+<rect fill="#FFFFFF" height="1" opacity="0.4" width="6" x="22" y="4"/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_signal_medium.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_signal_medium.svg Fri May 14 16:09:54 2010 +0300
@@ -1,32 +1,34 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
<rect fill-opacity="0.6" height="12" width="8" x="1" y="15"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="5" x2="5" y1="9.7495" y2="25.5003">
-<stop offset="0" style="stop-color:#FECF5E"/>
-<stop offset="1" style="stop-color:#FF9E01"/>
+ <stop offset="0" style="stop-color:#FECF5E"/>
+ <stop offset="1" style="stop-color:#FF9E01"/>
</linearGradient>
<rect fill="url(#SVGID_1_)" height="10" width="6" x="2" y="16"/>
<rect fill-opacity="0.6" height="18" width="8" x="11" y="9"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="9.75" y2="25.5005">
-<stop offset="0" style="stop-color:#FECF5E"/>
-<stop offset="1" style="stop-color:#FF9E01"/>
+ <stop offset="0" style="stop-color:#FECF5E"/>
+ <stop offset="1" style="stop-color:#FF9E01"/>
</linearGradient>
<rect fill="url(#SVGID_2_)" height="16" width="6" x="12" y="10"/>
<rect fill-opacity="0.6" height="24" width="8" x="21" y="3"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="25" x2="25" y1="4" y2="25.7519">
-<stop offset="0" style="stop-color:#C4C4C4"/>
-<stop offset="1" style="stop-color:#4F4F4F"/>
+ <stop offset="0" style="stop-color:#C4C4C4"/>
+ <stop offset="1" style="stop-color:#4F4F4F"/>
</linearGradient>
<rect fill="url(#SVGID_3_)" height="22" width="6" x="22" y="4"/>
-<polygon fill="#FFFFFF" fill-opacity="0.3" points="28,9.64 28,4 22.36,4 " stroke-opacity="0.3"/>
-<polygon fill="#FFFFFF" fill-opacity="0.3" points="22,14.953 28,20.953 28,15.297 22,9.297 " stroke-opacity="0.3"/>
-<polygon fill="#FFFFFF" fill-opacity="0.3" points="22,20.61 22,26 27.39,26 " stroke-opacity="0.3"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="6" x="2" y="16"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="6" x="12" y="10"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="6" x="22" y="4"/>
+<polygon fill="#FFFFFF" opacity="0.3" points="28,9.64 28,4 22.36,4 "/>
+<polygon fill="#FFFFFF" opacity="0.3" points="22,14.953 28,20.953 28,15.297 22,9.297 "/>
+<polygon fill="#FFFFFF" opacity="0.3" points="22,20.61 22,26 27.39,26 "/>
+<rect fill="#FFFFFF" height="1" opacity="0.4" width="6" x="2" y="16"/>
+<rect fill="#FFFFFF" height="1" opacity="0.4" width="6" x="12" y="10"/>
+<rect fill="#FFFFFF" height="1" opacity="0.4" width="6" x="22" y="4"/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sisx.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sisx.svg Fri May 14 16:09:54 2010 +0300
@@ -1,28 +1,30 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
+<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" opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="13.9995" x2="13.9995" y1="2.8911" y2="23.5236">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#A5A5A5"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#A5A5A5"/>
</linearGradient>
<path d="M24,10h-8V8.365c0.943-0.553,2-1.146,2-2.261C18,4.392,16.217,3,14.5,3C12.782,3,11,4.392,11,6.104 c0,1.115,1.053,1.711,2,2.263V10h-2c-1.1,0-2,0.9-2,2v5H7.365c-0.553-0.943-1.146-2-2.261-2C3.392,15,2,16.783,2,18.5 C2,20.218,3.392,22,5.104,22c1.115,0,1.711-1.053,2.263-2H9v1c0,1.1,0.9,2,2,2h2.225v-1.866C12.141,20.503,11,19.822,11,18.548 C11,16.591,13.037,15,15,15c1.961,0,4,1.591,4,3.548c0,1.273-1.141,1.952-2.219,2.584V23H24c1.1,0,2-0.9,2-2v-9 C26,10.9,25.1,10,24,10z" fill="url(#SVGID_1_)"/>
-<path d="M16.781,21.132v1C17.859,21.5,19,20.821,19,19.548c0-0.175-0.034-0.342-0.065-0.51 C18.684,20.005,17.711,20.587,16.781,21.132z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M11,11h2v-1h-2c-1.1,0-2,0.9-2,2v1C9,11.9,9.9,11,11,11z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M14.5,4c1.529,0,3.104,1.106,3.43,2.559C17.972,6.416,18,6.268,18,6.104 C18,4.392,16.217,3,14.5,3C12.782,3,11,4.392,11,6.104c0,0.163,0.028,0.313,0.07,0.455C11.396,5.107,12.969,4,14.5,4z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M24,10h-8v1h8c1.1,0,2,0.9,2,2v-1C26,10.9,25.1,10,24,10z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M5.104,16c1.114,0,1.708,1.057,2.261,2H9v-1H7.365c-0.553-0.943-1.146-2-2.261-2 C3.392,15,2,16.783,2,18.5c0,0.167,0.023,0.334,0.049,0.5C2.284,17.454,3.559,16,5.104,16z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M11.065,19.038C11.034,19.206,11,19.373,11,19.548c0,1.274,1.141,1.955,2.225,2.586v-1 C12.289,20.59,11.316,20.006,11.065,19.038z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<rect fill-opacity="0.6" height="12" stroke-opacity="0.6" width="12" x="17" y="16"/>
+<path d="M16.781,21.132v1C17.859,21.5,19,20.821,19,19.548c0-0.175-0.034-0.342-0.065-0.51 C18.684,20.005,17.711,20.587,16.781,21.132z" fill="#FFFFFF" opacity="0.4"/>
+<path d="M11,11h2v-1h-2c-1.1,0-2,0.9-2,2v1C9,11.9,9.9,11,11,11z" fill="#FFFFFF" opacity="0.4"/>
+<path d="M14.5,4c1.529,0,3.104,1.106,3.43,2.559C17.972,6.416,18,6.268,18,6.104 C18,4.392,16.217,3,14.5,3C12.782,3,11,4.392,11,6.104c0,0.163,0.028,0.313,0.07,0.455C11.396,5.107,12.969,4,14.5,4z" fill="#FFFFFF" opacity="0.4"/>
+<path d="M24,10h-8v1h8c1.1,0,2,0.9,2,2v-1C26,10.9,25.1,10,24,10z" fill="#FFFFFF" opacity="0.4"/>
+<path d="M5.104,16c1.114,0,1.708,1.057,2.261,2H9v-1H7.365c-0.553-0.943-1.146-2-2.261-2 C3.392,15,2,16.783,2,18.5c0,0.167,0.023,0.334,0.049,0.5C2.284,17.454,3.559,16,5.104,16z" fill="#FFFFFF" opacity="0.4"/>
+<path d="M11.065,19.038C11.034,19.206,11,19.373,11,19.548c0,1.274,1.141,1.955,2.225,2.586v-1 C12.289,20.59,11.316,20.006,11.065,19.038z" fill="#FFFFFF" opacity="0.4"/>
+<rect height="12" opacity="0.6" width="12" x="17" y="16"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="23" x2="23" y1="17" y2="27">
-<stop offset="0" style="stop-color:#DE6929"/>
-<stop offset="1" style="stop-color:#D9340F"/>
+ <stop offset="0" style="stop-color:#DE6929"/>
+ <stop offset="1" style="stop-color:#D9340F"/>
</linearGradient>
<rect fill="url(#SVGID_2_)" height="10" width="10" x="18" y="17"/>
-<rect fill="#FFFFFF" fill-opacity="0.4" height="1" stroke-opacity="0.4" width="10" x="18" y="17"/>
-<rect fill-opacity="0.2" height="1" stroke-opacity="0.2" width="10" x="18" y="26"/>
+<rect fill="#FFFFFF" height="1" opacity="0.4" width="10" x="18" y="17"/>
+<rect height="1" opacity="0.2" width="10" x="18" y="26"/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_angry.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_angry.svg Fri May 14 16:09:54 2010 +0300
@@ -1,59 +1,61 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<g>
-<rect fill="none" height="30" width="30"/>
+ <rect fill="none" height="30" width="30"/>
</g>
-<circle cx="15" cy="15" fill-opacity="0.6" r="14" stroke-opacity="0.6"/>
+<circle cx="15" cy="15" opacity="0.6" r="14"/>
<radialGradient cx="14.8193" cy="9.7041" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="18.1413">
-<stop offset="0" style="stop-color:#FF6855"/>
-<stop offset="1" style="stop-color:#CC0E06"/>
+ <stop offset="0" style="stop-color:#FF6855"/>
+ <stop offset="1" style="stop-color:#CC0E06"/>
</radialGradient>
<path d="M15,28C7.832,28,2,22.168,2,15C2,7.832,7.832,2,15,2s13,5.832,13,13C28,22.168,22.168,28,15,28L15,28 z" fill="url(#SVGID_1_)"/>
-<path d="M15,3c6.999,0,12.709,5.564,12.975,12.5C27.981,15.333,28,15.169,28,15 c0-7.168-5.832-13-13-13S2,7.832,2,15c0,0.169,0.019,0.333,0.025,0.5C2.291,8.564,8.001,3,15,3z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M15,3c6.999,0,12.709,5.564,12.975,12.5C27.981,15.333,28,15.169,28,15 c0-7.168-5.832-13-13-13S2,7.832,2,15c0,0.169,0.019,0.333,0.025,0.5C2.291,8.564,8.001,3,15,3z" fill="#FFFFFF" opacity="0.3"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="8.5" x2="8.5" y1="10.3823" y2="16.7968">
-<stop offset="0" style="stop-color:#D82E09"/>
-<stop offset="1" style="stop-color:#FACCB9"/>
+ <stop offset="0" style="stop-color:#D82E09"/>
+ <stop offset="1" style="stop-color:#FACCB9"/>
</linearGradient>
<path d="M8.5,17C7.074,17,6,15.495,6,13.5S7.074,10,8.5,10s2.5,1.505,2.5,3.5S9.926,17,8.5,17L8.5,17z" fill="url(#SVGID_2_)"/>
<ellipse cx="8.5" cy="13.5" fill="#0C3554" rx="1.5" ry="2.5"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="8.583" x2="8.583" y1="12.9707" y2="16.1465">
-<stop offset="0" style="stop-color:#0C3554"/>
-<stop offset="1" style="stop-color:#6D93B3"/>
+ <stop offset="0" style="stop-color:#0C3554"/>
+ <stop offset="1" style="stop-color:#6D93B3"/>
</linearGradient>
<path d="M7.166,14.623C7.414,15.437,7.915,16,8.5,16c0.828,0,1.5-1.119,1.5-2.5 c0-0.155-0.012-0.305-0.027-0.452C9.819,13.018,9.662,13,9.5,13C8.43,13,7.522,13.677,7.166,14.623z" fill="url(#SVGID_3_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="21.5" x2="21.5" y1="9.9517" y2="17.1103">
-<stop offset="0" style="stop-color:#D82E09"/>
-<stop offset="1" style="stop-color:#FACCB9"/>
+ <stop offset="0" style="stop-color:#D82E09"/>
+ <stop offset="1" style="stop-color:#FACCB9"/>
</linearGradient>
<path d="M21.5,17c-1.426,0-2.5-1.505-2.5-3.5s1.074-3.5,2.5-3.5s2.5,1.505,2.5,3.5S22.926,17,21.5,17L21.5,17 z" fill="url(#SVGID_4_)"/>
<ellipse cx="21.5" cy="13.5" fill="#0C3554" rx="1.5" ry="2.5"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="21.583" x2="21.583" y1="13.0908" y2="16.2688">
-<stop offset="0" style="stop-color:#0C3554"/>
-<stop offset="1" style="stop-color:#6D93B3"/>
+ <stop offset="0" style="stop-color:#0C3554"/>
+ <stop offset="1" style="stop-color:#6D93B3"/>
</linearGradient>
<path d="M20.166,14.623C20.414,15.437,20.915,16,21.5,16c0.828,0,1.5-1.119,1.5-2.5 c0-0.155-0.012-0.305-0.027-0.452C22.819,13.018,22.662,13,22.5,13C21.43,13,20.522,13.677,20.166,14.623z" fill="url(#SVGID_5_)"/>
-<ellipse cx="8.258" cy="11.352" fill-opacity="0.2" rx="4.361" ry="1.541" stroke-opacity="0.2" transform="matrix(0.9259 0.3777 -0.3777 0.9259 4.8993 -2.2783)"/>
+<ellipse cx="8.258" cy="11.352" opacity="0.2" rx="4.361" ry="1.541" transform="matrix(0.9259 0.3777 -0.3777 0.9259 4.8993 -2.2783)"/>
<ellipse cx="8.26" cy="10.89" fill="#3B2314" rx="4.361" ry="1" transform="matrix(0.9259 0.3777 -0.3777 0.9259 4.7258 -2.3134)"/>
-<ellipse cx="21.92" cy="11.352" fill-opacity="0.2" rx="4.36" ry="1.541" stroke-opacity="0.2" transform="matrix(-0.9259 0.3777 -0.3777 -0.9259 46.5039 13.5832)"/>
+<ellipse cx="21.92" cy="11.352" opacity="0.2" rx="4.36" ry="1.541" transform="matrix(-0.9259 0.3777 -0.3777 -0.9259 46.5039 13.5832)"/>
<ellipse cx="21.918" cy="10.89" fill="#3B2314" rx="4.36" ry="1" transform="matrix(-0.9259 0.3778 -0.3778 -0.9259 46.3259 12.6935)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="14.9995" x2="14.9995" y1="18.0986" y2="25.1188">
-<stop offset="0" style="stop-color:#942006"/>
-<stop offset="1" style="stop-color:#FFAA5C"/>
+ <stop offset="0" style="stop-color:#942006"/>
+ <stop offset="1" style="stop-color:#FFAA5C"/>
</linearGradient>
<path d="M24,22.9c0,1.933-4.029,2.1-9,2.1s-9-0.167-9-2.1c0-1.934,4.029-4.9,9-4.9S24,20.967,24,22.9z" fill="url(#SVGID_6_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="14.9995" x2="14.9995" y1="19.1426" y2="23.9429">
-<stop offset="0" style="stop-color:#E6E6E6"/>
-<stop offset="1" style="stop-color:#FFFFFF"/>
+ <stop offset="0" style="stop-color:#E6E6E6"/>
+ <stop offset="1" style="stop-color:#FFFFFF"/>
</linearGradient>
<path d="M24,22.5c0,1.381-4.029,1.5-9,1.5s-9-0.119-9-1.5s4.029-3.5,9-3.5S24,21.119,24,22.5z" fill="url(#SVGID_7_)"/>
-<path d="M14,19.03v4.968C14.328,23.999,14.662,24,15,24v-5C14.662,19,14.328,19.012,14,19.03z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M16,19.03C15.672,19.012,15.338,19,15,19v5c0.338,0,0.672-0.001,1-0.002V19.03z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M9,23.807c0.316,0.033,0.646,0.062,1,0.084v-4.156c-0.354,0.109-0.684,0.229-1,0.353V23.807z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M10,23.891c0.318,0.021,0.654,0.037,1,0.051v-4.475c-0.346,0.082-0.682,0.17-1,0.268V23.891z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M19,23.941c0.346-0.014,0.682-0.029,1-0.051v-4.156c-0.318-0.098-0.654-0.186-1-0.268V23.941z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M20,23.891c0.354-0.022,0.684-0.051,1-0.084v-3.72c-0.316-0.124-0.646-0.243-1-0.353V23.891z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M15,20c4.664,0,8.498,1.426,8.954,2.742C23.984,22.666,24,22.586,24,22.5c0-1.381-4.029-3.5-9-3.5 s-9,2.119-9,3.5c0,0.086,0.016,0.166,0.046,0.242C6.502,21.426,10.336,20,15,20z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M14,19.03v4.968C14.328,23.999,14.662,24,15,24v-5C14.662,19,14.328,19.012,14,19.03z" opacity="0.2"/>
+<path d="M16,19.03C15.672,19.012,15.338,19,15,19v5c0.338,0,0.672-0.001,1-0.002V19.03z" fill="#FFFFFF" opacity="0.5"/>
+<path d="M9,23.807c0.316,0.033,0.646,0.062,1,0.084v-4.156c-0.354,0.109-0.684,0.229-1,0.353V23.807z" opacity="0.2"/>
+<path d="M10,23.891c0.318,0.021,0.654,0.037,1,0.051v-4.475c-0.346,0.082-0.682,0.17-1,0.268V23.891z" fill="#FFFFFF" opacity="0.5"/>
+<path d="M19,23.941c0.346-0.014,0.682-0.029,1-0.051v-4.156c-0.318-0.098-0.654-0.186-1-0.268V23.941z" opacity="0.2"/>
+<path d="M20,23.891c0.354-0.022,0.684-0.051,1-0.084v-3.72c-0.316-0.124-0.646-0.243-1-0.353V23.891z" fill="#FFFFFF" opacity="0.5"/>
+<path d="M15,20c4.664,0,8.498,1.426,8.954,2.742C23.984,22.666,24,22.586,24,22.5c0-1.381-4.029-3.5-9-3.5 s-9,2.119-9,3.5c0,0.086,0.016,0.166,0.046,0.242C6.502,21.426,10.336,20,15,20z" opacity="0.2"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_bigsmile.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_bigsmile.svg Fri May 14 16:09:54 2010 +0300
@@ -1,54 +1,56 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<g>
-<rect fill="none" height="30" width="30"/>
+ <rect fill="none" height="30" width="30"/>
</g>
<g>
-<rect fill="none" height="30" width="30"/>
+ <rect fill="none" height="30" width="30"/>
</g>
-<circle cx="15" cy="15" fill-opacity="0.6" r="14" stroke-opacity="0.6"/>
+<circle cx="15" cy="15" opacity="0.6" r="14"/>
<radialGradient cx="15" cy="3.7026" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="23.0618">
-<stop offset="0" style="stop-color:#FEE891"/>
-<stop offset="0.7818" style="stop-color:#FFB701"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+ <stop offset="0" style="stop-color:#FEE891"/>
+ <stop offset="0.7818" style="stop-color:#FFB701"/>
+ <stop offset="1" style="stop-color:#FFC501"/>
</radialGradient>
<path d="M15,28C7.832,28,2,22.168,2,15C2,7.832,7.832,2,15,2c7.168,0,13,5.832,13,13 C28,22.168,22.168,28,15,28L15,28z" fill="url(#SVGID_1_)"/>
-<path d="M15,3c7,0,12.709,5.564,12.975,12.5C27.98,15.333,28,15.169,28,15c0-7.168-5.832-13-13-13 C7.832,2,2,7.832,2,15c0,0.169,0.019,0.333,0.025,0.5C2.291,8.564,8,3,15,3z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M15,3c7,0,12.709,5.564,12.975,12.5C27.98,15.333,28,15.169,28,15c0-7.168-5.832-13-13-13 C7.832,2,2,7.832,2,15c0,0.169,0.019,0.333,0.025,0.5C2.291,8.564,8,3,15,3z" fill="#FFFFFF" opacity="0.3"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="8.7505" x2="8.7505" y1="7.9351" y2="14.8952">
-<stop offset="0" style="stop-color:#DB9D00"/>
-<stop offset="1" style="stop-color:#FFEEA9"/>
+ <stop offset="0" style="stop-color:#DB9D00"/>
+ <stop offset="1" style="stop-color:#FFEEA9"/>
</linearGradient>
<path d="M11,15c-0.754,0-1.394-0.564-1.487-1.313C9.3,12,8.874,12,8.691,12c-0.134,0-0.49,0-0.703,1.688 C7.894,14.436,7.254,15,6.5,15H6.443l-0.118-0.01c-0.41-0.052-0.765-0.253-1.01-0.57c-0.246-0.317-0.354-0.71-0.304-1.108 C5.424,10.036,6.893,8,8.846,8c1.111,0,3.063,0.69,3.644,5.313c0.05,0.396-0.058,0.79-0.304,1.107 c-0.245,0.316-0.6,0.518-0.997,0.568l-0.063,0.008L11,15z" fill="url(#SVGID_2_)"/>
<path d="M11,14c-0.248,0-0.464-0.185-0.495-0.438C10.214,11.249,9.371,11,8.691,11s-1.404,0.249-1.695,2.563 c-0.034,0.273-0.273,0.466-0.559,0.434c-0.273-0.035-0.468-0.285-0.434-0.559C6.343,10.742,7.458,9,8.846,9s2.313,1.742,2.651,4.438 c0.034,0.274-0.16,0.524-0.434,0.559C11.042,13.999,11.021,14,11,14L11,14z" fill="#0C3554"/>
<linearGradient gradientTransform="matrix(-1 0 0 1 -566.5 0)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-587.7495" x2="-587.7495" y1="7.9351" y2="14.8952">
-<stop offset="0" style="stop-color:#DB9D00"/>
-<stop offset="1" style="stop-color:#FFEEA9"/>
+ <stop offset="0" style="stop-color:#DB9D00"/>
+ <stop offset="1" style="stop-color:#FFEEA9"/>
</linearGradient>
<path d="M19,15c0.754,0,1.394-0.564,1.487-1.313C20.7,12,21.126,12,21.309,12c0.134,0,0.49,0,0.703,1.688 C22.106,14.436,22.746,15,23.5,15h0.057l0.118-0.01c0.41-0.052,0.765-0.253,1.01-0.57c0.246-0.317,0.354-0.71,0.304-1.108 C24.576,10.036,23.107,8,21.154,8c-1.111,0-3.063,0.69-3.644,5.313c-0.05,0.396,0.058,0.79,0.304,1.107 c0.245,0.316,0.6,0.518,0.997,0.568l0.063,0.008L19,15z" fill="url(#SVGID_3_)"/>
<path d="M19,14c0.248,0,0.464-0.185,0.495-0.438C19.786,11.249,20.629,11,21.309,11s1.404,0.249,1.695,2.563 c0.034,0.273,0.273,0.466,0.559,0.434c0.273-0.035,0.468-0.285,0.434-0.559C23.657,10.742,22.542,9,21.154,9 s-2.313,1.742-2.651,4.438c-0.034,0.274,0.16,0.524,0.434,0.559C18.958,13.999,18.979,14,19,14L19,14z" fill="#0C3554"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="15" x2="15" y1="15.9014" y2="27.1496">
-<stop offset="0" style="stop-color:#D48D00"/>
-<stop offset="1" style="stop-color:#FFF1B8"/>
+ <stop offset="0" style="stop-color:#D48D00"/>
+ <stop offset="1" style="stop-color:#FFF1B8"/>
</linearGradient>
<path d="M15,16c-6,0-10.945,1-10.945,1C4.561,22.605,9.265,27,15,27c5.734,0,10.439-4.395,10.945-10 C25.945,17,21,16,15,16z" fill="url(#SVGID_4_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="15" x2="15" y1="16.9189" y2="26.1216">
-<stop offset="0" style="stop-color:#460800"/>
-<stop offset="1" style="stop-color:#992323"/>
+ <stop offset="0" style="stop-color:#460800"/>
+ <stop offset="1" style="stop-color:#992323"/>
</linearGradient>
<path d="M4.055,17C4.561,22.045,9.265,26,15,26c5.734,0,10.439-3.955,10.945-9H4.055z" fill="url(#SVGID_5_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="6.3335" x2="23.505" y1="19" y2="19">
-<stop offset="0" style="stop-color:#E6E6E6"/>
-<stop offset="0.5333" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#E6E6E6"/>
+ <stop offset="0" style="stop-color:#E6E6E6"/>
+ <stop offset="0.5333" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#E6E6E6"/>
</linearGradient>
<polygon fill="url(#SVGID_6_)" points="23,20 7,20 6,18 24,18 "/>
-<polygon fill-opacity="0.2" points="23.5,19 24,18 6,18 6.5,19 " stroke-opacity="0.2"/>
+<polygon opacity="0.2" points="23.5,19 24,18 6,18 6.5,19 "/>
<radialGradient cx="14.9717" cy="20.0801" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="5.1583">
-<stop offset="0" style="stop-color:#CC1900"/>
-<stop offset="1" style="stop-color:#950A04"/>
+ <stop offset="0" style="stop-color:#CC1900"/>
+ <stop offset="1" style="stop-color:#950A04"/>
</radialGradient>
<ellipse cx="15" cy="23.5" fill="url(#SVGID_7_)" rx="5" ry="1.5"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_cry.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_cry.svg Fri May 14 16:09:54 2010 +0300
@@ -1,46 +1,48 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<g>
-<rect fill="none" height="30" width="30"/>
+ <rect fill="none" height="30" width="30"/>
</g>
-<circle cx="15" cy="15" fill-opacity="0.6" r="14" stroke-opacity="0.6"/>
+<circle cx="15" cy="15" opacity="0.6" r="14"/>
<radialGradient cx="15" cy="3.7026" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="23.0618">
-<stop offset="0" style="stop-color:#FEE891"/>
-<stop offset="0.7818" style="stop-color:#FFB701"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+ <stop offset="0" style="stop-color:#FEE891"/>
+ <stop offset="0.7818" style="stop-color:#FFB701"/>
+ <stop offset="1" style="stop-color:#FFC501"/>
</radialGradient>
<path d="M15,28C7.832,28,2,22.168,2,15C2,7.832,7.832,2,15,2s13,5.832,13,13C28,22.168,22.168,28,15,28L15,28 z" fill="url(#SVGID_1_)"/>
-<path d="M15,3c6.999,0,12.709,5.564,12.975,12.5C27.981,15.333,28,15.169,28,15 c0-7.168-5.832-13-13-13S2,7.832,2,15c0,0.169,0.019,0.333,0.025,0.5C2.291,8.564,8.001,3,15,3z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<ellipse cx="22.92" cy="7.352" fill-opacity="0.2" rx="4.361" ry="1.541" stroke-opacity="0.2" transform="matrix(0.9259 0.3777 -0.3777 0.9259 4.4746 -8.1124)"/>
+<path d="M15,3c6.999,0,12.709,5.564,12.975,12.5C27.981,15.333,28,15.169,28,15 c0-7.168-5.832-13-13-13S2,7.832,2,15c0,0.169,0.019,0.333,0.025,0.5C2.291,8.564,8.001,3,15,3z" fill="#FFFFFF" opacity="0.3"/>
+<ellipse cx="22.92" cy="7.352" opacity="0.2" rx="4.361" ry="1.541" transform="matrix(0.9259 0.3777 -0.3777 0.9259 4.4746 -8.1124)"/>
<ellipse cx="22.922" cy="6.89" fill="#3B2314" rx="4.361" ry="1" transform="matrix(0.9259 0.3777 -0.3777 0.9259 4.3011 -8.1483)"/>
-<ellipse cx="6.92" cy="7.173" fill-opacity="0.2" rx="4.361" ry="1.541" stroke-opacity="0.2" transform="matrix(-0.9259 0.3777 -0.3777 -0.9259 16.0374 11.2006)"/>
+<ellipse cx="6.92" cy="7.173" opacity="0.2" rx="4.361" ry="1.541" transform="matrix(-0.9259 0.3777 -0.3777 -0.9259 16.0374 11.2006)"/>
<ellipse cx="6.918" cy="6.711" fill="#3B2314" rx="4.361" ry="1" transform="matrix(-0.9259 0.3777 -0.3777 -0.9259 15.8594 10.3117)"/>
-<path d="M23.501,23c-0.169,0-0.335-0.086-0.429-0.241C21.691,20.476,18.71,20,15.476,20 s-6.216,0.476-7.597,2.759c-0.144,0.235-0.451,0.312-0.688,0.169s-0.312-0.45-0.168-0.687C8.604,19.625,11.844,18,15.476,18 s6.871,1.625,8.452,4.241c0.144,0.236,0.068,0.544-0.168,0.687C23.678,22.977,23.589,23,23.501,23L23.501,23z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M23.501,22c-0.169,0-0.335-0.086-0.429-0.241C21.691,19.476,18.71,18,15.476,18s-6.216,1.476-7.597,3.759 c-0.144,0.235-0.451,0.312-0.688,0.169s-0.312-0.45-0.168-0.687C8.604,18.625,11.844,17,15.476,17s6.871,1.625,8.452,4.241 c0.144,0.236,0.068,0.544-0.168,0.687C23.678,21.977,23.589,22,23.501,22L23.501,22z" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M6.563,13.688c-0.396,0.724-1.43,1.504-1.656,3.094c-0.167,1.178,0.756,3.182,0.438,4.438 c-0.815,3.219-0.67,4.492,0.438,4.719c1.219,0.25,2.622-2.725,3-4.906C8.998,19.787,8.345,18.11,8.625,17 c0.275-1.088,1.746-2.412,2.438-3.752C12.063,11.311,12,11,12,11l-4.918,0.872C7.082,11.872,7.152,12.612,6.563,13.688z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M23.501,23c-0.169,0-0.335-0.086-0.429-0.241C21.691,20.476,18.71,20,15.476,20 s-6.216,0.476-7.597,2.759c-0.144,0.235-0.451,0.312-0.688,0.169s-0.312-0.45-0.168-0.687C8.604,19.625,11.844,18,15.476,18 s6.871,1.625,8.452,4.241c0.144,0.236,0.068,0.544-0.168,0.687C23.678,22.977,23.589,23,23.501,23L23.501,23z" fill="#FFFFFF" opacity="0.4"/>
+<path d="M23.501,22c-0.169,0-0.335-0.086-0.429-0.241C21.691,19.476,18.71,18,15.476,18s-6.216,1.476-7.597,3.759 c-0.144,0.235-0.451,0.312-0.688,0.169s-0.312-0.45-0.168-0.687C8.604,18.625,11.844,17,15.476,17s6.871,1.625,8.452,4.241 c0.144,0.236,0.068,0.544-0.168,0.687C23.678,21.977,23.589,22,23.501,22L23.501,22z" opacity="0.4"/>
+<path d="M6.563,13.688c-0.396,0.724-1.43,1.504-1.656,3.094c-0.167,1.178,0.756,3.182,0.438,4.438 c-0.815,3.219-0.67,4.492,0.438,4.719c1.219,0.25,2.622-2.725,3-4.906C8.998,19.787,8.345,18.11,8.625,17 c0.275-1.088,1.746-2.412,2.438-3.752C12.063,11.311,12,11,12,11l-4.918,0.872C7.082,11.872,7.152,12.612,6.563,13.688z" opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="15.4756" x2="15.4756" y1="17.5723" y2="22.6656">
-<stop offset="0" style="stop-color:#460800"/>
-<stop offset="1" style="stop-color:#992323"/>
+ <stop offset="0" style="stop-color:#460800"/>
+ <stop offset="1" style="stop-color:#992323"/>
</linearGradient>
<path d="M23.501,22.5c-0.169,0-0.335-0.086-0.429-0.241c-1.381-2.283-4.362-3.759-7.597-3.759 s-6.216,1.476-7.597,3.759c-0.144,0.235-0.451,0.312-0.688,0.169s-0.312-0.45-0.168-0.687c1.581-2.616,4.82-4.241,8.452-4.241 s6.871,1.625,8.452,4.241c0.144,0.236,0.068,0.544-0.168,0.687C23.678,22.477,23.589,22.5,23.501,22.5L23.501,22.5z" fill="url(#SVGID_2_)"/>
-<path d="M23.443,13.688c0.396,0.724,1.43,1.504,1.656,3.094c0.168,1.178-0.756,3.182-0.438,4.438 c0.816,3.219,0.67,4.492-0.438,4.719c-1.219,0.25-2.621-2.725-3-4.906c-0.216-1.244,0.438-2.921,0.156-4.031 c-0.275-1.088-1.746-2.412-2.438-3.752c-1-1.938-0.938-2.248-0.938-2.248l4.919,0.872C22.925,11.872,22.854,12.612,23.443,13.688z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M23.443,13.688c0.396,0.724,1.43,1.504,1.656,3.094c0.168,1.178-0.756,3.182-0.438,4.438 c0.816,3.219,0.67,4.492-0.438,4.719c-1.219,0.25-2.621-2.725-3-4.906c-0.216-1.244,0.438-2.921,0.156-4.031 c-0.275-1.088-1.746-2.412-2.438-3.752c-1-1.938-0.938-2.248-0.938-2.248l4.919,0.872C22.925,11.872,22.854,12.612,23.443,13.688z" opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="7.4126" x2="7.4126" y1="12.042" y2="25.838">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+ <stop offset="0" style="stop-color:#4EDEFF"/>
+ <stop offset="1" style="stop-color:#048CC6"/>
</linearGradient>
<path d="M5.563,13.688c-0.396,0.724-1.43,1.504-1.656,3.094c-0.167,1.178,0.756,3.182,0.438,4.438 c-0.815,3.219-0.67,4.492,0.438,4.719c1.219,0.25,2.622-2.725,3-4.906C7.998,19.787,7.345,18.11,7.625,17 c0.275-1.088,1.746-2.412,2.438-3.752C11.063,11.311,11,11,11,11l-4.918,0.872C6.082,11.872,6.152,12.612,5.563,13.688z" fill="url(#SVGID_3_)"/>
<linearGradient gradientTransform="matrix(-1 0 0 1 -1800.1367 0)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-1822.73" x2="-1822.73" y1="12.042" y2="25.838">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+ <stop offset="0" style="stop-color:#4EDEFF"/>
+ <stop offset="1" style="stop-color:#048CC6"/>
</linearGradient>
<path d="M24.443,13.688c0.396,0.724,1.43,1.504,1.656,3.094c0.168,1.178-0.756,3.182-0.438,4.438 c0.816,3.219,0.67,4.492-0.438,4.719c-1.219,0.25-2.621-2.725-3-4.906c-0.216-1.244,0.438-2.921,0.156-4.031 c-0.275-1.088-1.746-2.412-2.438-3.752c-1-1.938-0.938-2.248-0.938-2.248l4.919,0.872C23.925,11.872,23.854,12.612,24.443,13.688z" fill="url(#SVGID_4_)"/>
-<path d="M11.813,9.888c0.119,0.54,0.023,1.019-0.213,1.07l-5.984,1.309 c-0.236,0.052-0.522-0.343-0.641-0.883l0,0c-0.118-0.54-0.022-1.019,0.213-1.07l5.984-1.309C11.408,8.953,11.695,9.348,11.813,9.888 L11.813,9.888z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M24.848,12.26c-0.102,0.543-0.376,0.947-0.613,0.902l-6.021-1.128c-0.237-0.045-0.347-0.521-0.245-1.063l0,0 c0.102-0.543,0.377-0.947,0.613-0.902l6.021,1.128C24.84,11.241,24.95,11.717,24.848,12.26L24.848,12.26z" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M25.033,11.277c-0.103,0.543-0.377,0.947-0.615,0.902l-6.02-1.128 c-0.238-0.044-0.348-0.521-0.246-1.064l0,0c0.102-0.543,0.377-0.946,0.615-0.902l6.02,1.128 C25.024,10.259,25.135,10.734,25.033,11.277L25.033,11.277z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M11.813,9.888c0.119,0.54,0.023,1.019-0.213,1.07l-5.984,1.309 c-0.236,0.052-0.522-0.343-0.641-0.883l0,0c-0.118-0.54-0.022-1.019,0.213-1.07l5.984-1.309C11.408,8.953,11.695,9.348,11.813,9.888 L11.813,9.888z" fill="#FFFFFF" opacity="0.3"/>
+<path d="M24.848,12.26c-0.102,0.543-0.376,0.947-0.613,0.902l-6.021-1.128c-0.237-0.045-0.347-0.521-0.245-1.063l0,0 c0.102-0.543,0.377-0.947,0.613-0.902l6.021,1.128C24.84,11.241,24.95,11.717,24.848,12.26L24.848,12.26z" opacity="0.4"/>
+<path d="M25.033,11.277c-0.103,0.543-0.377,0.947-0.615,0.902l-6.02-1.128 c-0.238-0.044-0.348-0.521-0.246-1.064l0,0c0.102-0.543,0.377-0.946,0.615-0.902l6.02,1.128 C25.024,10.259,25.135,10.734,25.033,11.277L25.033,11.277z" fill="#FFFFFF" opacity="0.3"/>
<path d="M24.94,11.769c-0.051,0.272-0.284,0.456-0.522,0.411l-6.02-1.128c-0.238-0.044-0.389-0.3-0.338-0.572l0,0 c0.051-0.271,0.285-0.456,0.521-0.411l6.021,1.128C24.84,11.241,24.992,11.497,24.94,11.769L24.94,11.769z" fill="#3B2314"/>
-<path d="M12.026,10.865c0.118,0.54,0.022,1.019-0.214,1.07l-5.983,1.309C5.594,13.295,5.307,12.9,5.188,12.36l0,0 c-0.117-0.54-0.021-1.019,0.215-1.07l5.982-1.309C11.621,9.93,11.908,10.325,12.026,10.865L12.026,10.865z" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M12.026,10.865c0.118,0.54,0.022,1.019-0.214,1.07l-5.983,1.309C5.594,13.295,5.307,12.9,5.188,12.36l0,0 c-0.117-0.54-0.021-1.019,0.215-1.07l5.982-1.309C11.621,9.93,11.908,10.325,12.026,10.865L12.026,10.865z" opacity="0.4"/>
<path d="M11.92,10.376c0.059,0.27-0.084,0.53-0.32,0.582l-5.984,1.309c-0.236,0.052-0.475-0.125-0.533-0.395l0,0 c-0.06-0.27,0.084-0.53,0.32-0.582l5.982-1.309C11.621,9.93,11.861,10.106,11.92,10.376L11.92,10.376z" fill="#3B2314"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_evil.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_evil.svg Fri May 14 16:09:54 2010 +0300
@@ -1,38 +1,38 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<g>
-<rect fill="none" height="30" width="30"/>
+ <rect fill="none" height="30" width="30"/>
</g>
-<path d="M26.827,7.531L28.439,2l-4.335,2.378C21.655,2.277,18.479,1,15,1S8.345,2.277,5.896,4.378L1.56,2l1.613,5.531 C1.804,9.694,1,12.25,1,15c0,7.732,6.268,14,14,14c7.732,0,14-6.268,14-14C29,12.25,28.196,9.694,26.827,7.531z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M26.827,7.531L28.439,2l-4.335,2.378C21.655,2.277,18.479,1,15,1S8.345,2.277,5.896,4.378L1.56,2l1.613,5.531 C1.804,9.694,1,12.25,1,15c0,7.732,6.268,14,14,14c7.732,0,14-6.268,14-14C29,12.25,28.196,9.694,26.827,7.531z" opacity="0.6"/>
<radialGradient cx="15" cy="3.4897" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="23.3695">
-<stop offset="0" style="stop-color:#FEE891"/>
-<stop offset="0.7818" style="stop-color:#FFB701"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+ <stop offset="0" style="stop-color:#FEE891"/>
+ <stop offset="0.7818" style="stop-color:#FFB701"/>
+ <stop offset="1" style="stop-color:#FFC501"/>
</radialGradient>
<path d="M15,28C7.832,28,2,22.168,2,15c0-2.45,0.698-4.848,2.019-6.935L4.26,7.684L3.196,4.038l2.826,1.55 l0.525-0.451C8.905,3.114,11.907,2,15,2c3.093,0,6.096,1.114,8.453,3.137l0.525,0.451l2.825-1.55l-1.063,3.646l0.241,0.381 C27.303,10.151,28,12.549,28,15C28,22.168,22.168,28,15,28L15,28z" fill="url(#SVGID_1_)"/>
-<path d="M6.022,6.587l0.525-0.451C8.905,4.114,11.907,3,15,3c3.093,0,6.096,1.114,8.453,3.137 l0.525,0.451l2.479-1.36l0.347-1.19l-2.825,1.55l-0.525-0.451C21.096,3.114,18.093,2,15,2c-3.093,0-6.095,1.114-8.453,3.137 L6.022,5.587l-2.826-1.55l0.347,1.19L6.022,6.587z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M15.075,24.834c-5.617,0-9.75-2.753-11.056-7.363c-0.075-0.266,0.079-0.543,0.345-0.618 c0.262-0.075,0.542,0.079,0.617,0.345C6.158,21.353,9.856,22.834,15,22.834c5.143,0,8.993-1.481,10.17-5.637 c0.074-0.266,0.355-0.42,0.617-0.345c0.266,0.075,0.42,0.353,0.344,0.618C24.826,22.081,20.692,24.834,15.075,24.834L15.075,24.834z " fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M27,19.803l-0.942-2.238c0.062-0.307-0.087-0.621-0.347-0.707 c-0.262-0.09-0.542,0.092-0.617,0.408c-1.177,4.936-4.949,7.068-10.093,7.068c-5.144,0-8.917-2.133-10.095-7.068 c-0.075-0.316-0.355-0.498-0.617-0.408c-0.259,0.086-0.408,0.4-0.346,0.707L3,19.803c0.497,0,0.957-0.506,1.293-1.015 C5.888,23.535,9.807,25.834,15,25.834c5.189,0,9.107-2.295,10.704-7.039C25.994,19.178,26.407,19.568,27,19.803z" fill="#FFFFFF" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M6.022,6.587l0.525-0.451C8.905,4.114,11.907,3,15,3c3.093,0,6.096,1.114,8.453,3.137 l0.525,0.451l2.479-1.36l0.347-1.19l-2.825,1.55l-0.525-0.451C21.096,3.114,18.093,2,15,2c-3.093,0-6.095,1.114-8.453,3.137 L6.022,5.587l-2.826-1.55l0.347,1.19L6.022,6.587z" fill="#FFFFFF" opacity="0.3"/>
+<path d="M15.075,24.834c-5.617,0-9.75-2.753-11.056-7.363c-0.075-0.266,0.079-0.543,0.345-0.618 c0.262-0.075,0.542,0.079,0.617,0.345C6.158,21.353,9.856,22.834,15,22.834c5.143,0,8.993-1.481,10.17-5.637 c0.074-0.266,0.355-0.42,0.617-0.345c0.266,0.075,0.42,0.353,0.344,0.618C24.826,22.081,20.692,24.834,15.075,24.834L15.075,24.834z " opacity="0.2"/>
+<path d="M27,19.803l-0.942-2.238c0.062-0.307-0.087-0.621-0.347-0.707 c-0.262-0.09-0.542,0.092-0.617,0.408c-1.177,4.936-4.949,7.068-10.093,7.068c-5.144,0-8.917-2.133-10.095-7.068 c-0.075-0.316-0.355-0.498-0.617-0.408c-0.259,0.086-0.408,0.4-0.346,0.707L3,19.803c0.497,0,0.957-0.506,1.293-1.015 C5.888,23.535,9.807,25.834,15,25.834c5.189,0,9.107-2.295,10.704-7.039C25.994,19.178,26.407,19.568,27,19.803z" fill="#FFFFFF" opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="16.9766" y2="24.878">
+ <stop offset="0" style="stop-color:#460800"/>
+ <stop offset="1" style="stop-color:#992323"/>
+</linearGradient>
<path d="M27,19.334l-0.942-1.885c0.062-0.259-0.087-0.523-0.347-0.597c-0.262-0.075-0.542,0.079-0.617,0.345 c-1.177,4.155-4.95,6.637-10.094,6.637s-8.917-2.481-10.094-6.637c-0.075-0.266-0.355-0.42-0.617-0.345 c-0.259,0.073-0.408,0.338-0.346,0.597L3,19.334c0.497,0,0.957-0.426,1.293-0.854C5.888,22.478,9.807,24.834,15,24.834 c5.189,0,9.107-2.354,10.704-6.348C25.994,18.807,26.407,19.137,27,19.334z" fill="url(#SVGID_2_)"/>
-<path d="M12.703,14.146l-9-4c-0.252-0.112-0.548,0.001-0.66,0.254c-0.112,0.252,0.001,0.548,0.254,0.66l0.662,0.294 c-0.188,0.895-0.137,2.118,0.393,3.214c0.519,1.075,1.408,1.851,2.57,2.246C7.296,16.941,7.683,17,8.067,17 c1.561,0,3.104-0.955,3.806-2.128l0.423,0.188c0.066,0.029,0.135,0.043,0.203,0.043c0.192,0,0.375-0.11,0.458-0.297 C13.069,14.554,12.956,14.259,12.703,14.146z M7.243,15.868c-0.916-0.311-1.585-0.894-1.991-1.734 c-0.385-0.796-0.451-1.684-0.353-2.361l6.049,2.688C10.283,15.437,8.674,16.354,7.243,15.868z" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M12.703,13.043l-9-4c-0.252-0.112-0.548,0.001-0.66,0.254C2.931,9.55,3.044,9.845,3.297,9.958 c0,0,9.135,4.043,9.203,4.043c0.192,0,0.375-0.11,0.458-0.297C13.069,13.451,12.956,13.156,12.703,13.043z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M12.703,14.146l-9-4c-0.252-0.112-0.548,0.001-0.66,0.254c-0.112,0.252,0.001,0.548,0.254,0.66l0.662,0.294 c-0.188,0.895-0.137,2.118,0.393,3.214c0.519,1.075,1.408,1.851,2.57,2.246C7.296,16.941,7.683,17,8.067,17 c1.561,0,3.104-0.955,3.806-2.128l0.423,0.188c0.066,0.029,0.135,0.043,0.203,0.043c0.192,0,0.375-0.11,0.458-0.297 C13.069,14.554,12.956,14.259,12.703,14.146z M7.243,15.868c-0.916-0.311-1.585-0.894-1.991-1.734 c-0.385-0.796-0.451-1.684-0.353-2.361l6.049,2.688C10.283,15.437,8.674,16.354,7.243,15.868z" opacity="0.4"/>
+<path d="M12.703,13.043l-9-4c-0.252-0.112-0.548,0.001-0.66,0.254C2.931,9.55,3.044,9.845,3.297,9.958 c0,0,9.135,4.043,9.203,4.043c0.192,0,0.375-0.11,0.458-0.297C13.069,13.451,12.956,13.156,12.703,13.043z" fill="#FFFFFF" opacity="0.3"/>
<path d="M4.555,10.505c-0.5,1.4-0.205,4.357,2.527,5.285c1.889,0.641,4.044-0.755,4.563-2.133L4.555,10.505z" fill="#FFFFFF"/>
<circle cx="7.985" cy="13.228" fill="#0C3554" r="1.5"/>
-<path d="M4.365,11.53l6.729,2.99c0.239-0.273,0.434-0.561,0.546-0.852l-7.088-3.15 C4.451,10.802,4.386,11.15,4.365,11.53z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M4.365,11.53l6.729,2.99c0.239-0.273,0.434-0.561,0.546-0.852l-7.088-3.15 C4.451,10.802,4.386,11.15,4.365,11.53z" opacity="0.2"/>
<path d="M12.703,13.595l-9-4c-0.252-0.112-0.548,0.001-0.66,0.254c-0.112,0.252,0.001,0.548,0.254,0.66l0.662,0.294 c-0.188,0.895-0.137,2.118,0.393,3.214c0.519,1.075,1.408,1.852,2.57,2.247c0.375,0.127,0.761,0.185,1.146,0.185 c1.561,0,3.104-0.956,3.806-2.128l0.423,0.188c0.066,0.029,0.135,0.043,0.203,0.043c0.192,0,0.375-0.11,0.458-0.297 C13.069,14.002,12.956,13.707,12.703,13.595z M7.243,15.316c-0.916-0.311-1.585-0.894-1.991-1.734 c-0.385-0.796-0.451-1.684-0.353-2.361l6.049,2.688C10.283,14.885,8.674,15.802,7.243,15.316z" fill="#3B2314"/>
-<path d="M17.043,14.807c0.083,0.187,0.266,0.297,0.457,0.297c0.068,0,0.137-0.014,0.203-0.043l0.424-0.188 C18.829,16.045,20.371,17,21.933,17c0.385,0,0.771-0.059,1.146-0.186c1.162-0.395,2.051-1.171,2.57-2.246 c0.529-1.096,0.58-2.32,0.393-3.214l0.662-0.294c0.252-0.112,0.365-0.408,0.254-0.66c-0.112-0.252-0.408-0.366-0.66-0.254l-9,4 C17.045,14.259,16.932,14.554,17.043,14.807z M19.052,14.461l6.049-2.688c0.098,0.677,0.032,1.565-0.353,2.361 c-0.406,0.84-1.076,1.423-1.991,1.734C21.326,16.354,19.717,15.437,19.052,14.461z" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M17.043,13.704C17.126,13.89,17.309,14,17.5,14c0.068,0,9.203-4.043,9.203-4.043 c0.252-0.112,0.365-0.408,0.254-0.66c-0.112-0.252-0.408-0.366-0.66-0.254l-9,4C17.045,13.156,16.932,13.451,17.043,13.704z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M17.043,14.807c0.083,0.187,0.266,0.297,0.457,0.297c0.068,0,0.137-0.014,0.203-0.043l0.424-0.188 C18.829,16.045,20.371,17,21.933,17c0.385,0,0.771-0.059,1.146-0.186c1.162-0.395,2.051-1.171,2.57-2.246 c0.529-1.096,0.58-2.32,0.393-3.214l0.662-0.294c0.252-0.112,0.365-0.408,0.254-0.66c-0.112-0.252-0.408-0.366-0.66-0.254l-9,4 C17.045,14.259,16.932,14.554,17.043,14.807z M19.052,14.461l6.049-2.688c0.098,0.677,0.032,1.565-0.353,2.361 c-0.406,0.84-1.076,1.423-1.991,1.734C21.326,16.354,19.717,15.437,19.052,14.461z" opacity="0.4"/>
+<path d="M17.043,13.704C17.126,13.89,17.309,14,17.5,14c0.068,0,9.203-4.043,9.203-4.043 c0.252-0.112,0.365-0.408,0.254-0.66c-0.112-0.252-0.408-0.366-0.66-0.254l-9,4C17.045,13.156,16.932,13.451,17.043,13.704z" fill="#FFFFFF" opacity="0.3"/>
<path d="M25.444,10.505c0.501,1.4,0.205,4.357-2.526,5.285c-1.889,0.641-4.045-0.755-4.563-2.133L25.444,10.505z" fill="#FFFFFF"/>
<circle cx="22.015" cy="13.228" fill="#0C3554" r="1.5"/>
-<path d="M25.635,11.53l-6.729,2.99c-0.238-0.273-0.434-0.561-0.545-0.852l7.087-3.15 C25.549,10.802,25.613,11.15,25.635,11.53z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M25.635,11.53l-6.729,2.99c-0.238-0.273-0.434-0.561-0.545-0.852l7.087-3.15 C25.549,10.802,25.613,11.15,25.635,11.53z" opacity="0.2"/>
<path d="M17.043,14.255c0.083,0.187,0.266,0.297,0.457,0.297c0.068,0,0.137-0.014,0.203-0.043l0.424-0.188 c0.702,1.172,2.244,2.128,3.806,2.128c0.385,0,0.771-0.058,1.146-0.185c1.162-0.395,2.051-1.172,2.57-2.247 c0.529-1.096,0.58-2.32,0.393-3.214l0.662-0.294c0.252-0.112,0.365-0.408,0.254-0.66c-0.112-0.252-0.408-0.366-0.66-0.254l-9,4 C17.045,13.707,16.932,14.002,17.043,14.255z M19.052,13.909l6.049-2.688c0.098,0.677,0.032,1.565-0.353,2.361 c-0.406,0.84-1.076,1.423-1.991,1.734C21.326,15.802,19.717,14.885,19.052,13.909z" fill="#3B2314"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="16.9766" y2="24.878">
-<stop offset="0" style="stop-color:#460800"/>
-<stop offset="1" style="stop-color:#992323"/>
-</linearGradient>
-</defs>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_eyebrows.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_eyebrows.svg Fri May 14 16:09:54 2010 +0300
@@ -1,69 +1,71 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<g>
-<rect fill="none" height="30" width="30"/>
+ <rect fill="none" height="30" width="30"/>
</g>
-<circle cx="15" cy="15" fill-opacity="0.6" r="14" stroke-opacity="0.6"/>
+<circle cx="15" cy="15" opacity="0.6" r="14"/>
<radialGradient cx="15" cy="3.7026" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="23.0618">
-<stop offset="0" style="stop-color:#FEE891"/>
-<stop offset="0.7818" style="stop-color:#FFB701"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+ <stop offset="0" style="stop-color:#FEE891"/>
+ <stop offset="0.7818" style="stop-color:#FFB701"/>
+ <stop offset="1" style="stop-color:#FFC501"/>
</radialGradient>
<path d="M15,28C7.832,28,2,22.168,2,15C2,7.832,7.832,2,15,2c7.168,0,13,5.832,13,13 C28,22.168,22.168,28,15,28L15,28z" fill="url(#SVGID_1_)"/>
-<path d="M15,3c7,0,12.709,5.564,12.975,12.5C27.98,15.333,28,15.169,28,15c0-7.168-5.832-13-13-13 C7.832,2,2,7.832,2,15c0,0.169,0.019,0.333,0.025,0.5C2.291,8.564,8,3,15,3z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M15,2c7.563,0,13.709,6.002,13.975,13.5C28.98,15.333,29,15.169,29,15c0-7.732-6.268-14-14-14 C7.268,1,1,7.268,1,15c0,0.169,0.02,0.333,0.025,0.5C1.291,8.002,7.437,2,15,2z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M15,3c7,0,12.709,5.564,12.975,12.5C27.98,15.333,28,15.169,28,15c0-7.168-5.832-13-13-13 C7.832,2,2,7.832,2,15c0,0.169,0.019,0.333,0.025,0.5C2.291,8.564,8,3,15,3z" fill="#FFFFFF" opacity="0.3"/>
+<path d="M15,2c7.563,0,13.709,6.002,13.975,13.5C28.98,15.333,29,15.169,29,15c0-7.732-6.268-14-14-14 C7.268,1,1,7.268,1,15c0,0.169,0.02,0.333,0.025,0.5C1.291,8.002,7.437,2,15,2z" fill="#FFFFFF" opacity="0.3"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="22.5" y2="26.25">
-<stop offset="0" style="stop-color:#D48D00"/>
-<stop offset="1" style="stop-color:#FFF1B8"/>
+ <stop offset="0" style="stop-color:#D48D00"/>
+ <stop offset="1" style="stop-color:#FFF1B8"/>
</linearGradient>
<ellipse cx="15" cy="24" fill="url(#SVGID_2_)" rx="4" ry="2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="14.9995" x2="14.9995" y1="23.25" y2="25.125">
-<stop offset="0" style="stop-color:#460800"/>
-<stop offset="1" style="stop-color:#992323"/>
+ <stop offset="0" style="stop-color:#460800"/>
+ <stop offset="1" style="stop-color:#992323"/>
</linearGradient>
<ellipse cx="15" cy="24" fill="url(#SVGID_3_)" rx="4" ry="1"/>
-<path d="M11.555,24.5C12.248,24.202,13.523,24,15,24c1.477,0,2.752,0.202,3.445,0.5C18.789,24.353,19,24.184,19,24 c0-0.553-1.791-1-4-1c-2.209,0-4,0.447-4,1C11,24.184,11.211,24.353,11.555,24.5z" fill-opacity="0.4" stroke-opacity="0.4"/>
-<ellipse cx="20.936" cy="5.254" fill-opacity="0.2" rx="4.36" ry="1.541" stroke-opacity="0.2" transform="matrix(0.9218 -0.3876 0.3876 0.9218 -0.3997 8.5257)"/>
+<path d="M11.555,24.5C12.248,24.202,13.523,24,15,24c1.477,0,2.752,0.202,3.445,0.5C18.789,24.353,19,24.184,19,24 c0-0.553-1.791-1-4-1c-2.209,0-4,0.447-4,1C11,24.184,11.211,24.353,11.555,24.5z" opacity="0.4"/>
+<ellipse cx="20.936" cy="5.254" opacity="0.2" rx="4.36" ry="1.541" transform="matrix(0.9218 -0.3876 0.3876 0.9218 -0.3997 8.5257)"/>
<ellipse cx="20.61" cy="4.926" fill="#3B2314" rx="4.361" ry="1" transform="matrix(0.9218 -0.3876 0.3876 0.9218 -0.2983 8.373)"/>
-<ellipse cx="8.446" cy="6.419" fill-opacity="0.2" rx="4.361" ry="1.541" stroke-opacity="0.2" transform="matrix(-0.9963 -0.0858 0.0858 -0.9963 16.31 13.5396)"/>
+<ellipse cx="8.446" cy="6.419" opacity="0.2" rx="4.361" ry="1.541" transform="matrix(-0.9963 -0.0858 0.0858 -0.9963 16.31 13.5396)"/>
<ellipse cx="8.655" cy="6.007" fill="#3B2314" rx="4.361" ry="1" transform="matrix(-0.9963 -0.0858 0.0858 -0.9963 16.7619 12.7348)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="8.5" x2="8.5" y1="7.5415" y2="19.6124">
-<stop offset="0" style="stop-color:#DB9D00"/>
-<stop offset="1" style="stop-color:#FFEEA9"/>
+ <stop offset="0" style="stop-color:#DB9D00"/>
+ <stop offset="1" style="stop-color:#FFEEA9"/>
</linearGradient>
<path d="M8.5,19C5.467,19,3,16.533,3,13.5C3,10.467,5.467,8,8.5,8s5.5,2.467,5.5,5.5 C14,16.533,11.533,19,8.5,19L8.5,19z" fill="url(#SVGID_4_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="8.5" x2="8.5" y1="8.625" y2="18.5013">
-<stop offset="0" style="stop-color:#CCCCCC"/>
-<stop offset="0.2" style="stop-color:#EEEEEE"/>
-<stop offset="1" style="stop-color:#FCFCFC"/>
+ <stop offset="0" style="stop-color:#CCCCCC"/>
+ <stop offset="0.2" style="stop-color:#EEEEEE"/>
+ <stop offset="1" style="stop-color:#FCFCFC"/>
</linearGradient>
<circle cx="8.5" cy="13.5" fill="url(#SVGID_5_)" r="4.5"/>
-<path d="M8.5,10c2.314,0,4.198,1.753,4.45,4c0.019-0.166,0.05-0.329,0.05-0.5C13,11.015,10.985,9,8.5,9 S4,11.015,4,13.5c0,0.171,0.032,0.334,0.05,0.5C4.302,11.753,6.186,10,8.5,10z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M8.5,10c2.314,0,4.198,1.753,4.45,4c0.019-0.166,0.05-0.329,0.05-0.5C13,11.015,10.985,9,8.5,9 S4,11.015,4,13.5c0,0.171,0.032,0.334,0.05,0.5C4.302,11.753,6.186,10,8.5,10z" opacity="0.2"/>
<path d="M9.5,15C8.122,15,7,13.878,7,12.5S8.122,10,9.5,10s2.5,1.122,2.5,2.5S10.878,15,9.5,15L9.5,15z" fill="#0C3554"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="10.0005" x2="10.0005" y1="12.0034" y2="14.1348">
-<stop offset="0" style="stop-color:#0C3554"/>
-<stop offset="1" style="stop-color:#84B2D9"/>
+ <stop offset="0" style="stop-color:#0C3554"/>
+ <stop offset="1" style="stop-color:#84B2D9"/>
</linearGradient>
<circle cx="10" cy="13" fill="url(#SVGID_6_)" r="1"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="21.5" x2="21.5" y1="7.5415" y2="19.6124">
-<stop offset="0" style="stop-color:#DB9D00"/>
-<stop offset="1" style="stop-color:#FFEEA9"/>
+ <stop offset="0" style="stop-color:#DB9D00"/>
+ <stop offset="1" style="stop-color:#FFEEA9"/>
</linearGradient>
<path d="M21.5,19c-3.033,0-5.5-2.467-5.5-5.5c0-3.033,2.467-5.5,5.5-5.5s5.5,2.467,5.5,5.5 C27,16.533,24.533,19,21.5,19L21.5,19z" fill="url(#SVGID_7_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="21.5" x2="21.5" y1="8.625" y2="18.5013">
-<stop offset="0" style="stop-color:#CCCCCC"/>
-<stop offset="0.2" style="stop-color:#EEEEEE"/>
-<stop offset="1" style="stop-color:#FCFCFC"/>
+ <stop offset="0" style="stop-color:#CCCCCC"/>
+ <stop offset="0.2" style="stop-color:#EEEEEE"/>
+ <stop offset="1" style="stop-color:#FCFCFC"/>
</linearGradient>
<circle cx="21.5" cy="13.5" fill="url(#SVGID_8_)" r="4.5"/>
-<path d="M21.5,10c2.314,0,4.197,1.753,4.449,4C25.969,13.834,26,13.671,26,13.5c0-2.485-2.015-4.5-4.5-4.5 S17,11.015,17,13.5c0,0.171,0.031,0.334,0.051,0.5C17.303,11.753,19.186,10,21.5,10z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M21.5,10c2.314,0,4.197,1.753,4.449,4C25.969,13.834,26,13.671,26,13.5c0-2.485-2.015-4.5-4.5-4.5 S17,11.015,17,13.5c0,0.171,0.031,0.334,0.051,0.5C17.303,11.753,19.186,10,21.5,10z" opacity="0.2"/>
<path d="M22.5,15c-1.379,0-2.5-1.122-2.5-2.5s1.121-2.5,2.5-2.5s2.5,1.122,2.5,2.5S23.879,15,22.5,15L22.5,15z" fill="#0C3554"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="23" x2="23" y1="12.0039" y2="14.1352">
-<stop offset="0" style="stop-color:#0C3554"/>
-<stop offset="1" style="stop-color:#84B2D9"/>
+ <stop offset="0" style="stop-color:#0C3554"/>
+ <stop offset="1" style="stop-color:#84B2D9"/>
</linearGradient>
<circle cx="23" cy="13" fill="url(#SVGID_9_)" r="1"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_heart.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_heart.svg Fri May 14 16:09:54 2010 +0300
@@ -1,16 +1,18 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<g>
-<rect fill="none" height="30" width="30"/>
+ <rect fill="none" height="30" width="30"/>
</g>
-<path d="M14.05,27.266c-0.25-0.904-2.137-3.52-5.009-5.513 c-0.451-0.313-0.938-0.623-1.437-0.942C4.647,18.923,0.967,16.572,1,11.517C1.042,5.269,4.802,2,8.495,2 c2.596,0,4.931,1.478,6.507,4.038c1.564-2.464,3.938-3.929,6.52-3.929c3.572,0,7.437,2.926,7.479,9.351 c0.032,4.867-3.461,7.167-6.267,9.017c-0.61,0.402-1.204,0.793-1.744,1.198c-2.774,2.083-4.815,4.783-5.003,5.56L15.08,29 L14.05,27.266z" fill-opacity="0.6" fill-rule="evenodd" stroke-opacity="0.6"/>
+<path clip-rule="evenodd" d="M14.05,27.266c-0.25-0.904-2.137-3.52-5.009-5.513 c-0.451-0.313-0.938-0.623-1.437-0.942C4.647,18.923,0.967,16.572,1,11.517C1.042,5.269,4.802,2,8.495,2 c2.596,0,4.931,1.478,6.507,4.038c1.564-2.464,3.938-3.929,6.52-3.929c3.572,0,7.437,2.926,7.479,9.351 c0.032,4.867-3.461,7.167-6.267,9.017c-0.61,0.402-1.204,0.793-1.744,1.198c-2.774,2.083-4.815,4.783-5.003,5.56L15.08,29 L14.05,27.266z" fill-rule="evenodd" opacity="0.6"/>
<radialGradient cx="30.8457" cy="15.8979" gradientTransform="matrix(0.9286 0 0 0.984 -13.6423 -6.1737)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="13.8351">
-<stop offset="0" style="stop-color:#FF6855"/>
-<stop offset="1" style="stop-color:#CC0E06"/>
+ <stop offset="0" style="stop-color:#FF6855"/>
+ <stop offset="1" style="stop-color:#CC0E06"/>
</radialGradient>
-<path d="M14.994,8.245C11.629-0.077,2.064,1.864,2,11.523 c-0.035,5.305,4.555,7.288,7.611,9.408c2.963,2.057,5.072,4.87,5.403,6.068c0.283-1.174,2.632-4.066,5.375-6.125 c3-2.252,7.646-4.104,7.611-9.409C27.937,1.783,18.205,0.255,14.994,8.245z" fill="url(#SVGID_1_)" fill-rule="evenodd"/>
-<path d="M14.994,9.245 c3.146-7.832,12.552-6.514,12.984,2.659c0.006-0.146,0.022-0.286,0.021-0.438c-0.063-9.683-9.795-11.211-13.006-3.221 C11.629-0.077,2.064,1.864,2,11.523C2,11.675,2.015,11.815,2.021,11.962C2.448,2.796,11.696,1.088,14.994,9.245z" fill="#FFFFFF" fill-opacity="0.3" fill-rule="evenodd" stroke-opacity="0.3"/>
+<path clip-rule="evenodd" d="M14.994,8.245C11.629-0.077,2.064,1.864,2,11.523 c-0.035,5.305,4.555,7.288,7.611,9.408c2.963,2.057,5.072,4.87,5.403,6.068c0.283-1.174,2.632-4.066,5.375-6.125 c3-2.252,7.646-4.104,7.611-9.409C27.937,1.783,18.205,0.255,14.994,8.245z" fill="url(#SVGID_1_)" fill-rule="evenodd"/>
+<path clip-rule="evenodd" d="M14.994,9.245 c3.146-7.832,12.552-6.514,12.984,2.659c0.006-0.146,0.022-0.286,0.021-0.438c-0.063-9.683-9.795-11.211-13.006-3.221 C11.629-0.077,2.064,1.864,2,11.523C2,11.675,2.015,11.815,2.021,11.962C2.448,2.796,11.696,1.088,14.994,9.245z" fill="#FFFFFF" fill-rule="evenodd" opacity="0.3"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_irritated.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_irritated.svg Fri May 14 16:09:54 2010 +0300
@@ -1,26 +1,28 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<g>
-<rect fill="none" height="30" width="30"/>
+ <rect fill="none" height="30" width="30"/>
</g>
-<circle cx="15" cy="15" fill-opacity="0.6" r="14" stroke-opacity="0.6"/>
+<circle cx="15" cy="15" opacity="0.6" r="14"/>
<radialGradient cx="15" cy="3.7026" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="23.0618">
-<stop offset="0" style="stop-color:#FEE891"/>
-<stop offset="0.7818" style="stop-color:#FFB701"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+ <stop offset="0" style="stop-color:#FEE891"/>
+ <stop offset="0.7818" style="stop-color:#FFB701"/>
+ <stop offset="1" style="stop-color:#FFC501"/>
</radialGradient>
<path d="M15,28C7.832,28,2,22.168,2,15C2,7.832,7.832,2,15,2c7.168,0,13,5.832,13,13 C28,22.168,22.168,28,15,28L15,28z" fill="url(#SVGID_1_)"/>
-<path d="M15,3c7,0,12.709,5.564,12.975,12.5C27.98,15.333,28,15.169,28,15c0-7.168-5.832-13-13-13 C7.832,2,2,7.832,2,15c0,0.169,0.019,0.333,0.025,0.5C2.291,8.564,8,3,15,3z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M24.854,22.146l-3-3c-0.195-0.195-0.512-0.195-0.707,0L18.5,21.793l-2.646-2.646 c-0.195-0.195-0.512-0.195-0.707,0L12.5,21.793l-2.646-2.646c-0.195-0.195-0.512-0.195-0.707,0l-3,3 c-0.195,0.195-0.195,0.512,0,0.707C6.244,22.951,6.372,23,6.5,23s0.256-0.049,0.354-0.146L9.5,20.207l2.646,2.646 C12.244,22.951,12.372,23,12.5,23s0.256-0.049,0.354-0.146l2.646-2.646l2.646,2.646C18.244,22.951,18.372,23,18.5,23 s0.256-0.049,0.354-0.146l2.646-2.646l2.646,2.646C24.244,22.951,24.372,23,24.5,23s0.256-0.049,0.354-0.146 C25.049,22.658,25.049,22.342,24.854,22.146z" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M24.854,20.146l-3-3c-0.195-0.195-0.512-0.195-0.707,0L18.5,19.793l-2.646-2.646 c-0.195-0.195-0.512-0.195-0.707,0L12.5,19.793l-2.646-2.646c-0.195-0.195-0.512-0.195-0.707,0l-3,3 c-0.195,0.195-0.195,0.512,0,0.707C6.244,20.951,6.372,21,6.5,21s0.256-0.049,0.354-0.146L9.5,18.207l2.646,2.646 C12.244,20.951,12.372,21,12.5,21s0.256-0.049,0.354-0.146l2.646-2.646l2.646,2.646C18.244,20.951,18.372,21,18.5,21 s0.256-0.049,0.354-0.146l2.646-2.646l2.646,2.646C24.244,20.951,24.372,21,24.5,21s0.256-0.049,0.354-0.146 C25.049,20.658,25.049,20.342,24.854,20.146z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M15,3c7,0,12.709,5.564,12.975,12.5C27.98,15.333,28,15.169,28,15c0-7.168-5.832-13-13-13 C7.832,2,2,7.832,2,15c0,0.169,0.019,0.333,0.025,0.5C2.291,8.564,8,3,15,3z" fill="#FFFFFF" opacity="0.3"/>
+<path d="M24.854,22.146l-3-3c-0.195-0.195-0.512-0.195-0.707,0L18.5,21.793l-2.646-2.646 c-0.195-0.195-0.512-0.195-0.707,0L12.5,21.793l-2.646-2.646c-0.195-0.195-0.512-0.195-0.707,0l-3,3 c-0.195,0.195-0.195,0.512,0,0.707C6.244,22.951,6.372,23,6.5,23s0.256-0.049,0.354-0.146L9.5,20.207l2.646,2.646 C12.244,22.951,12.372,23,12.5,23s0.256-0.049,0.354-0.146l2.646-2.646l2.646,2.646C18.244,22.951,18.372,23,18.5,23 s0.256-0.049,0.354-0.146l2.646-2.646l2.646,2.646C24.244,22.951,24.372,23,24.5,23s0.256-0.049,0.354-0.146 C25.049,22.658,25.049,22.342,24.854,22.146z" opacity="0.4"/>
+<path d="M24.854,20.146l-3-3c-0.195-0.195-0.512-0.195-0.707,0L18.5,19.793l-2.646-2.646 c-0.195-0.195-0.512-0.195-0.707,0L12.5,19.793l-2.646-2.646c-0.195-0.195-0.512-0.195-0.707,0l-3,3 c-0.195,0.195-0.195,0.512,0,0.707C6.244,20.951,6.372,21,6.5,21s0.256-0.049,0.354-0.146L9.5,18.207l2.646,2.646 C12.244,20.951,12.372,21,12.5,21s0.256-0.049,0.354-0.146l2.646-2.646l2.646,2.646C18.244,20.951,18.372,21,18.5,21 s0.256-0.049,0.354-0.146l2.646-2.646l2.646,2.646C24.244,20.951,24.372,21,24.5,21s0.256-0.049,0.354-0.146 C25.049,20.658,25.049,20.342,24.854,20.146z" fill="#FFFFFF" opacity="0.3"/>
<path d="M24.854,21.146l-3-3c-0.195-0.195-0.512-0.195-0.707,0L18.5,20.793l-2.646-2.646 c-0.195-0.195-0.512-0.195-0.707,0L12.5,20.793l-2.646-2.646c-0.195-0.195-0.512-0.195-0.707,0l-3,3 c-0.195,0.195-0.195,0.512,0,0.707C6.244,21.951,6.372,22,6.5,22s0.256-0.049,0.354-0.146L9.5,19.207l2.646,2.646 C12.244,21.951,12.372,22,12.5,22s0.256-0.049,0.354-0.146l2.646-2.646l2.646,2.646C18.244,21.951,18.372,22,18.5,22 s0.256-0.049,0.354-0.146l2.646-2.646l2.646,2.646C24.244,21.951,24.372,22,24.5,22s0.256-0.049,0.354-0.146 C25.049,21.658,25.049,21.342,24.854,21.146z" fill="#3B2314"/>
-<path d="M6.5,16c-0.198,0-0.386-0.118-0.464-0.314c-0.103-0.256,0.022-0.547,0.279-0.65l3.839-2.536l-3.839-0.535 c-0.256-0.103-0.381-0.394-0.279-0.65c0.103-0.257,0.395-0.382,0.65-0.279l6.161,1.464l-6.161,3.465C6.625,15.989,6.562,16,6.5,16 L6.5,16z" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M6.5,14c-0.198,0-0.386-0.119-0.464-0.314c-0.103-0.256,0.022-0.547,0.279-0.65l3.839-0.536 L6.314,9.965c-0.256-0.103-0.381-0.394-0.279-0.65c0.103-0.257,0.395-0.382,0.65-0.279l6.161,3.464l-6.161,1.465 C6.625,13.989,6.562,14,6.5,14L6.5,14z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M6.5,16c-0.198,0-0.386-0.118-0.464-0.314c-0.103-0.256,0.022-0.547,0.279-0.65l3.839-2.536l-3.839-0.535 c-0.256-0.103-0.381-0.394-0.279-0.65c0.103-0.257,0.395-0.382,0.65-0.279l6.161,1.464l-6.161,3.465C6.625,15.989,6.562,16,6.5,16 L6.5,16z" opacity="0.4"/>
+<path d="M6.5,14c-0.198,0-0.386-0.119-0.464-0.314c-0.103-0.256,0.022-0.547,0.279-0.65l3.839-0.536 L6.314,9.965c-0.256-0.103-0.381-0.394-0.279-0.65c0.103-0.257,0.395-0.382,0.65-0.279l6.161,3.464l-6.161,1.465 C6.625,13.989,6.562,14,6.5,14L6.5,14z" fill="#FFFFFF" opacity="0.3"/>
<path d="M6.5,15c-0.198,0-0.386-0.119-0.464-0.314c-0.103-0.256,0.022-0.547,0.279-0.65l3.839-1.536l-3.839-1.536 c-0.256-0.103-0.381-0.394-0.279-0.65c0.103-0.257,0.395-0.382,0.65-0.279l6.161,2.464l-6.161,2.464C6.625,14.989,6.562,15,6.5,15 L6.5,15z" fill="#3B2314"/>
-<path d="M23.346,16c0.199,0,0.387-0.118,0.465-0.314c0.103-0.256-0.022-0.547-0.279-0.65L19.692,12.5l3.839-0.535 c0.257-0.103,0.382-0.394,0.279-0.65c-0.103-0.257-0.395-0.382-0.65-0.279L17,12.5l6.16,3.465C23.221,15.989,23.284,16,23.346,16 L23.346,16z" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M23.346,14c0.199,0,0.387-0.119,0.465-0.314c0.103-0.256-0.022-0.547-0.279-0.65L19.692,12.5 l3.839-2.535c0.257-0.103,0.382-0.394,0.279-0.65c-0.103-0.257-0.395-0.382-0.65-0.279L17,12.5l6.16,1.465 C23.221,13.989,23.284,14,23.346,14L23.346,14z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M23.346,16c0.199,0,0.387-0.118,0.465-0.314c0.103-0.256-0.022-0.547-0.279-0.65L19.692,12.5l3.839-0.535 c0.257-0.103,0.382-0.394,0.279-0.65c-0.103-0.257-0.395-0.382-0.65-0.279L17,12.5l6.16,3.465C23.221,15.989,23.284,16,23.346,16 L23.346,16z" opacity="0.4"/>
+<path d="M23.346,14c0.199,0,0.387-0.119,0.465-0.314c0.103-0.256-0.022-0.547-0.279-0.65L19.692,12.5 l3.839-2.535c0.257-0.103,0.382-0.394,0.279-0.65c-0.103-0.257-0.395-0.382-0.65-0.279L17,12.5l6.16,1.465 C23.221,13.989,23.284,14,23.346,14L23.346,14z" fill="#FFFFFF" opacity="0.3"/>
<path d="M23.346,15c0.199,0,0.387-0.119,0.465-0.314c0.103-0.256-0.022-0.547-0.279-0.65L19.692,12.5l3.839-1.536 c0.257-0.103,0.382-0.394,0.279-0.65c-0.103-0.257-0.395-0.382-0.65-0.279L17,12.5l6.16,2.464C23.221,14.989,23.284,15,23.346,15 L23.346,15z" fill="#3B2314"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_kissing.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_kissing.svg Fri May 14 16:09:54 2010 +0300
@@ -1,42 +1,44 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<g>
-<rect fill="none" height="30" width="30"/>
+ <rect fill="none" height="30" width="30"/>
</g>
-<circle cx="15" cy="15" fill-opacity="0.6" r="14" stroke-opacity="0.6"/>
+<circle cx="15" cy="15" opacity="0.6" r="14"/>
<radialGradient cx="15" cy="3.7026" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="23.0618">
-<stop offset="0" style="stop-color:#FEE891"/>
-<stop offset="0.7818" style="stop-color:#FFB701"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+ <stop offset="0" style="stop-color:#FEE891"/>
+ <stop offset="0.7818" style="stop-color:#FFB701"/>
+ <stop offset="1" style="stop-color:#FFC501"/>
</radialGradient>
<path d="M15,28C7.832,28,2,22.168,2,15C2,7.832,7.832,2,15,2c7.168,0,13,5.832,13,13 C28,22.168,22.168,28,15,28L15,28z" fill="url(#SVGID_1_)"/>
-<path d="M15,3c7,0,12.709,5.564,12.975,12.5C27.98,15.333,28,15.169,28,15c0-7.168-5.832-13-13-13 C7.832,2,2,7.832,2,15c0,0.169,0.019,0.333,0.025,0.5C2.291,8.564,8,3,15,3z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M15,3c7,0,12.709,5.564,12.975,12.5C27.98,15.333,28,15.169,28,15c0-7.168-5.832-13-13-13 C7.832,2,2,7.832,2,15c0,0.169,0.019,0.333,0.025,0.5C2.291,8.564,8,3,15,3z" fill="#FFFFFF" opacity="0.3"/>
<radialGradient cx="6" cy="-65.7227" gradientTransform="matrix(1 0 0 1.1014 0 84.2272)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="5.1913">
-<stop offset="0" style="stop-color:#F36227"/>
-<stop offset="1" style="stop-color:#FFB701"/>
+ <stop offset="0" style="stop-color:#F36227"/>
+ <stop offset="1" style="stop-color:#FFB701"/>
</radialGradient>
<ellipse cx="6" cy="14.746" fill="url(#SVGID_2_)" rx="4" ry="2.746"/>
<radialGradient cx="24" cy="-65.7227" gradientTransform="matrix(1 0 0 1.1014 0 84.2272)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="5.1913">
-<stop offset="0" style="stop-color:#F36227"/>
-<stop offset="1" style="stop-color:#FFB701"/>
+ <stop offset="0" style="stop-color:#F36227"/>
+ <stop offset="1" style="stop-color:#FFB701"/>
</radialGradient>
<ellipse cx="24" cy="14.746" fill="url(#SVGID_3_)" rx="4" ry="2.746"/>
-<path d="M17.387,16c-1.181,0-1.919,0.746-2.386,1.25C14.534,16.746,13.794,16,12.613,16 C10,16,10,18.5,6.25,19.75C8.75,19.75,7.5,26,15,26s6.25-6.25,8.75-6.25C20,18.5,20.568,16,17.387,16z" fill="#3B2314" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M17.387,16c-1.181,0-1.919,0.746-2.386,1.25C14.534,16.746,13.794,16,12.613,16 C10,16,10,18.5,6.25,19.75C8.75,19.75,7.5,26,15,26s6.25-6.25,8.75-6.25C20,18.5,20.568,16,17.387,16z" fill="#3B2314" opacity="0.4"/>
<radialGradient cx="15.1372" cy="19.4775" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="7.6943">
-<stop offset="0" style="stop-color:#FF6855"/>
-<stop offset="1" style="stop-color:#CC0E06"/>
+ <stop offset="0" style="stop-color:#FF6855"/>
+ <stop offset="1" style="stop-color:#CC0E06"/>
</radialGradient>
<path d="M17.387,16c-1.181,0-1.919,0.746-2.386,1.25C14.534,16.746,13.794,16,12.613,16 C10,16,10,18.5,6.25,19.75c2.5,0,2.5,5,8.75,5s6.25-5,8.75-5C20,18.5,20.568,16,17.387,16z" fill="url(#SVGID_4_)"/>
-<ellipse cx="14.941" cy="19.75" fill="#821014" fill-opacity="0.9" rx="2.441" ry="0.625" stroke-opacity="0.9"/>
-<ellipse cx="11.754" cy="21.625" fill="#FFFFFF" fill-opacity="0.5" rx="1.754" ry="0.625" stroke-opacity="0.5"/>
-<ellipse cx="18.629" cy="21.625" fill="#FFFFFF" fill-opacity="0.5" rx="1.129" ry="0.625" stroke-opacity="0.5"/>
-<path d="M9.016,11.611c-1.108,0-2.177-0.421-3.002-1.17l-0.675,0.675 c-0.195,0.195-0.512,0.195-0.707,0s-0.195-0.512,0-0.707L6.04,9l0.352,0.402c0.672,0.769,1.628,1.209,2.624,1.209 s1.952-0.44,2.624-1.209c0.182-0.209,0.498-0.23,0.706-0.047c0.208,0.182,0.229,0.498,0.047,0.706 C11.53,11.046,10.3,11.611,9.016,11.611L9.016,11.611z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M20.984,11.611c1.108,0,2.177-0.421,3.002-1.17l0.676,0.675c0.195,0.195,0.512,0.195,0.707,0 s0.195-0.512,0-0.707L23.96,9l-0.353,0.402c-0.672,0.769-1.627,1.209-2.623,1.209s-1.951-0.44-2.623-1.209 c-0.183-0.209-0.498-0.23-0.706-0.047c-0.208,0.182-0.229,0.498-0.048,0.706C18.47,11.046,19.7,11.611,20.984,11.611L20.984,11.611z " fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M9.016,13.125c-1.108,0-2.177-0.421-3.002-1.17L5.338,12.63c-0.195,0.195-0.512,0.195-0.707,0 s-0.195-0.512,0-0.707l1.409-1.409l0.352,0.402c0.672,0.769,1.628,1.209,2.624,1.209s1.952-0.44,2.624-1.209 c0.182-0.209,0.498-0.23,0.706-0.047c0.208,0.182,0.229,0.498,0.047,0.706C11.53,12.56,10.3,13.125,9.016,13.125L9.016,13.125z" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M20.984,13.125c1.108,0,2.177-0.421,3.002-1.17l0.676,0.675c0.195,0.195,0.512,0.195,0.707,0 s0.195-0.512,0-0.707l-1.409-1.409l-0.353,0.402c-0.672,0.769-1.627,1.209-2.623,1.209s-1.951-0.44-2.623-1.209 c-0.183-0.209-0.498-0.23-0.706-0.047c-0.208,0.182-0.229,0.498-0.048,0.706C18.47,12.56,19.7,13.125,20.984,13.125L20.984,13.125z" fill-opacity="0.4" stroke-opacity="0.4"/>
+<ellipse cx="14.941" cy="19.75" fill="#821014" opacity="0.9" rx="2.441" ry="0.625"/>
+<ellipse cx="11.754" cy="21.625" fill="#FFFFFF" opacity="0.5" rx="1.754" ry="0.625"/>
+<ellipse cx="18.629" cy="21.625" fill="#FFFFFF" opacity="0.5" rx="1.129" ry="0.625"/>
+<path d="M9.016,11.611c-1.108,0-2.177-0.421-3.002-1.17l-0.675,0.675 c-0.195,0.195-0.512,0.195-0.707,0s-0.195-0.512,0-0.707L6.04,9l0.352,0.402c0.672,0.769,1.628,1.209,2.624,1.209 s1.952-0.44,2.624-1.209c0.182-0.209,0.498-0.23,0.706-0.047c0.208,0.182,0.229,0.498,0.047,0.706 C11.53,11.046,10.3,11.611,9.016,11.611L9.016,11.611z" fill="#FFFFFF" opacity="0.3"/>
+<path d="M20.984,11.611c1.108,0,2.177-0.421,3.002-1.17l0.676,0.675c0.195,0.195,0.512,0.195,0.707,0 s0.195-0.512,0-0.707L23.96,9l-0.353,0.402c-0.672,0.769-1.627,1.209-2.623,1.209s-1.951-0.44-2.623-1.209 c-0.183-0.209-0.498-0.23-0.706-0.047c-0.208,0.182-0.229,0.498-0.048,0.706C18.47,11.046,19.7,11.611,20.984,11.611L20.984,11.611z " fill="#FFFFFF" opacity="0.3"/>
+<path d="M9.016,13.125c-1.108,0-2.177-0.421-3.002-1.17L5.338,12.63c-0.195,0.195-0.512,0.195-0.707,0 s-0.195-0.512,0-0.707l1.409-1.409l0.352,0.402c0.672,0.769,1.628,1.209,2.624,1.209s1.952-0.44,2.624-1.209 c0.182-0.209,0.498-0.23,0.706-0.047c0.208,0.182,0.229,0.498,0.047,0.706C11.53,12.56,10.3,13.125,9.016,13.125L9.016,13.125z" opacity="0.4"/>
+<path d="M20.984,13.125c1.108,0,2.177-0.421,3.002-1.17l0.676,0.675c0.195,0.195,0.512,0.195,0.707,0 s0.195-0.512,0-0.707l-1.409-1.409l-0.353,0.402c-0.672,0.769-1.627,1.209-2.623,1.209s-1.951-0.44-2.623-1.209 c-0.183-0.209-0.498-0.23-0.706-0.047c-0.208,0.182-0.229,0.498-0.048,0.706C18.47,12.56,19.7,13.125,20.984,13.125L20.984,13.125z" opacity="0.4"/>
<path d="M9.016,12.313c-1.108,0-2.177-0.421-3.002-1.17l-0.675,0.675c-0.195,0.195-0.512,0.195-0.707,0 s-0.195-0.512,0-0.707L6.04,9.701l0.352,0.402c0.672,0.769,1.628,1.209,2.624,1.209s1.952-0.44,2.624-1.209 c0.182-0.209,0.498-0.23,0.706-0.047c0.208,0.182,0.229,0.498,0.047,0.706C11.53,11.747,10.3,12.313,9.016,12.313L9.016,12.313z" fill="#3B2314"/>
<path d="M20.984,12.313c1.108,0,2.177-0.421,3.002-1.17l0.676,0.675c0.195,0.195,0.512,0.195,0.707,0 s0.195-0.512,0-0.707L23.96,9.701l-0.353,0.402c-0.672,0.769-1.627,1.209-2.623,1.209s-1.951-0.44-2.623-1.209 c-0.183-0.209-0.498-0.23-0.706-0.047c-0.208,0.182-0.229,0.498-0.048,0.706C18.47,11.747,19.7,12.313,20.984,12.313L20.984,12.313z " fill="#3B2314"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_nerd.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_nerd.svg Fri May 14 16:09:54 2010 +0300
@@ -1,46 +1,48 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<g>
-<rect fill="none" height="30" width="30"/>
+ <rect fill="none" height="30" width="30"/>
</g>
-<circle cx="15" cy="15" fill-opacity="0.6" r="14" stroke-opacity="0.6"/>
+<circle cx="15" cy="15" opacity="0.6" r="14"/>
<radialGradient cx="15" cy="3.7026" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="23.0618">
-<stop offset="0" style="stop-color:#FEE891"/>
-<stop offset="0.7818" style="stop-color:#FFB701"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+ <stop offset="0" style="stop-color:#FEE891"/>
+ <stop offset="0.7818" style="stop-color:#FFB701"/>
+ <stop offset="1" style="stop-color:#FFC501"/>
</radialGradient>
<path d="M15,28C7.832,28,2,22.168,2,15C2,7.832,7.832,2,15,2c7.168,0,13,5.832,13,13 C28,22.168,22.168,28,15,28L15,28z" fill="url(#SVGID_1_)"/>
-<path d="M15,3c7,0,12.709,5.564,12.975,12.5C27.98,15.333,28,15.169,28,15c0-7.168-5.832-13-13-13 C7.832,2,2,7.832,2,15c0,0.169,0.019,0.333,0.025,0.5C2.291,8.564,8,3,15,3z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M27,13.5c0-0.537-0.08-1.055-0.225-1.545C26.85,11.972,26.92,12,27,12h1.67c-0.15-0.688-0.357-1.354-0.605-2 H27c-0.383,0-0.703,0.222-0.871,0.536C25.15,9.013,23.445,8,21.5,8c-2.517,0-4.634,1.692-5.287,4h-2.425 C13.134,9.692,11.017,8,8.5,8c-1.945,0-3.651,1.013-4.628,2.537C3.703,10.222,3.382,10,3,10H1.936c-0.248,0.646-0.455,1.312-0.605,2 H3c0.08,0,0.15-0.028,0.224-0.045C3.081,12.445,3,12.963,3,13.5C3,16.537,5.462,19,8.5,19c2.869,0,5.222-2.197,5.475-5h2.051 c0.253,2.803,2.605,5,5.475,5C24.537,19,27,16.537,27,13.5z M13,13.505C12.997,15.984,10.98,18,8.5,18C6.019,18,4,15.981,4,13.5 S6.019,9,8.5,9c2.48,0,4.497,2.016,4.5,4.495V13.505z M21.5,18c-2.481,0-4.5-2.019-4.5-4.5S19.019,9,21.5,9s4.5,2.019,4.5,4.5 S23.981,18,21.5,18z" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M15,3c7,0,12.709,5.564,12.975,12.5C27.98,15.333,28,15.169,28,15c0-7.168-5.832-13-13-13 C7.832,2,2,7.832,2,15c0,0.169,0.019,0.333,0.025,0.5C2.291,8.564,8,3,15,3z" fill="#FFFFFF" opacity="0.3"/>
+<path d="M27,13.5c0-0.537-0.08-1.055-0.225-1.545C26.85,11.972,26.92,12,27,12h1.67c-0.15-0.688-0.357-1.354-0.605-2 H27c-0.383,0-0.703,0.222-0.871,0.536C25.15,9.013,23.445,8,21.5,8c-2.517,0-4.634,1.692-5.287,4h-2.425 C13.134,9.692,11.017,8,8.5,8c-1.945,0-3.651,1.013-4.628,2.537C3.703,10.222,3.382,10,3,10H1.936c-0.248,0.646-0.455,1.312-0.605,2 H3c0.08,0,0.15-0.028,0.224-0.045C3.081,12.445,3,12.963,3,13.5C3,16.537,5.462,19,8.5,19c2.869,0,5.222-2.197,5.475-5h2.051 c0.253,2.803,2.605,5,5.475,5C24.537,19,27,16.537,27,13.5z M13,13.505C12.997,15.984,10.98,18,8.5,18C6.019,18,4,15.981,4,13.5 S6.019,9,8.5,9c2.48,0,4.497,2.016,4.5,4.495V13.505z M21.5,18c-2.481,0-4.5-2.019-4.5-4.5S19.019,9,21.5,9s4.5,2.019,4.5,4.5 S23.981,18,21.5,18z" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="4" x2="13" y1="12.5" y2="12.5">
-<stop offset="0" style="stop-color:#CCCCCC"/>
-<stop offset="0.2" style="stop-color:#EEEEEE"/>
-<stop offset="1" style="stop-color:#FCFCFC"/>
+ <stop offset="0" style="stop-color:#CCCCCC"/>
+ <stop offset="0.2" style="stop-color:#EEEEEE"/>
+ <stop offset="1" style="stop-color:#FCFCFC"/>
</linearGradient>
<path d="M8.5,17C6.019,17,4,14.981,4,12.5S6.019,8,8.5,8s4.5,2.019,4.5,4.5S10.981,17,8.5,17L8.5,17z" fill="url(#SVGID_2_)"/>
<path d="M8.5,7C5.462,7,3,9.462,3,12.5S5.462,18,8.5,18s5.5-2.462,5.5-5.5S11.538,7,8.5,7z M8.5,17 C6.019,17,4,14.981,4,12.5S6.019,8,8.5,8s4.5,2.019,4.5,4.5S10.981,17,8.5,17z" fill="#3B2314"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="17" x2="26" y1="12.5" y2="12.5">
-<stop offset="0" style="stop-color:#CCCCCC"/>
-<stop offset="0.2" style="stop-color:#EEEEEE"/>
-<stop offset="1" style="stop-color:#FCFCFC"/>
+ <stop offset="0" style="stop-color:#CCCCCC"/>
+ <stop offset="0.2" style="stop-color:#EEEEEE"/>
+ <stop offset="1" style="stop-color:#FCFCFC"/>
</linearGradient>
<path d="M21.5,17c-2.481,0-4.5-2.019-4.5-4.5S19.019,8,21.5,8s4.5,2.019,4.5,4.5S23.981,17,21.5,17L21.5,17z" fill="url(#SVGID_3_)"/>
<path d="M21.5,7C18.463,7,16,9.462,16,12.5s2.463,5.5,5.5,5.5s5.5-2.462,5.5-5.5S24.537,7,21.5,7z M21.5,17 c-2.481,0-4.5-2.019-4.5-4.5S19.019,8,21.5,8s4.5,2.019,4.5,4.5S23.981,17,21.5,17z" fill="#3B2314"/>
<rect fill="#3B2314" height="2" width="4" x="13" y="11"/>
<path d="M30,10c0,0.552-0.448,1-1,1h-2c-0.553,0-1-0.448-1-1l0,0c0-0.552,0.447-1,1-1h2C29.552,9,30,9.448,30,10 L30,10z" fill="#3B2314"/>
<path d="M4,10c0,0.552-0.448,1-1,1H1c-0.552,0-1-0.448-1-1l0,0c0-0.552,0.448-1,1-1h2C3.552,9,4,9.448,4,10L4,10z" fill="#3B2314"/>
-<path d="M8.5,9c2.31,0,4.197,1.756,4.449,4C12.968,12.834,13,12.671,13,12.5C13,10.019,10.981,8,8.5,8 S4,10.019,4,12.5c0,0.171,0.032,0.334,0.051,0.5C4.303,10.756,6.19,9,8.5,9z" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M21.5,9c2.311,0,4.197,1.756,4.449,4C25.969,12.834,26,12.671,26,12.5c0-2.481-2.019-4.5-4.5-4.5 S17,10.019,17,12.5c0,0.171,0.031,0.334,0.051,0.5C17.303,10.756,19.189,9,21.5,9z" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M15.075,25c-5.617,0-9.75-2.752-11.056-7.363c-0.075-0.266,0.079-0.542,0.345-0.617 c0.262-0.075,0.542,0.078,0.617,0.345C6.158,21.52,9.856,23,15,23c5.143,0,8.993-1.48,10.17-5.636 c0.074-0.267,0.355-0.42,0.617-0.345c0.266,0.075,0.42,0.352,0.344,0.617C24.826,22.248,20.692,25,15.075,25L15.075,25z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M27,19.969l-0.942-2.238c0.062-0.307-0.087-0.621-0.347-0.707 c-0.262-0.09-0.542,0.093-0.617,0.409C23.917,22.367,20.145,24.5,15,24.5c-5.144,0-8.917-2.133-10.095-7.067 c-0.075-0.316-0.355-0.499-0.617-0.409c-0.259,0.086-0.408,0.4-0.346,0.707L3,19.969c0.497,0,0.957-0.505,1.293-1.014 C5.888,23.702,9.807,26,15,26c5.189,0,9.107-2.295,10.704-7.038C25.994,19.344,26.407,19.734,27,19.969z" fill="#FFFFFF" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M8.5,9c2.31,0,4.197,1.756,4.449,4C12.968,12.834,13,12.671,13,12.5C13,10.019,10.981,8,8.5,8 S4,10.019,4,12.5c0,0.171,0.032,0.334,0.051,0.5C4.303,10.756,6.19,9,8.5,9z" opacity="0.3"/>
+<path d="M21.5,9c2.311,0,4.197,1.756,4.449,4C25.969,12.834,26,12.671,26,12.5c0-2.481-2.019-4.5-4.5-4.5 S17,10.019,17,12.5c0,0.171,0.031,0.334,0.051,0.5C17.303,10.756,19.189,9,21.5,9z" opacity="0.3"/>
+<path d="M15.075,25c-5.617,0-9.75-2.752-11.056-7.363c-0.075-0.266,0.079-0.542,0.345-0.617 c0.262-0.075,0.542,0.078,0.617,0.345C6.158,21.52,9.856,23,15,23c5.143,0,8.993-1.48,10.17-5.636 c0.074-0.267,0.355-0.42,0.617-0.345c0.266,0.075,0.42,0.352,0.344,0.617C24.826,22.248,20.692,25,15.075,25L15.075,25z" opacity="0.2"/>
+<path d="M27,19.969l-0.942-2.238c0.062-0.307-0.087-0.621-0.347-0.707 c-0.262-0.09-0.542,0.093-0.617,0.409C23.917,22.367,20.145,24.5,15,24.5c-5.144,0-8.917-2.133-10.095-7.067 c-0.075-0.316-0.355-0.499-0.617-0.409c-0.259,0.086-0.408,0.4-0.346,0.707L3,19.969c0.497,0,0.957-0.505,1.293-1.014 C5.888,23.702,9.807,26,15,26c5.189,0,9.107-2.295,10.704-7.038C25.994,19.344,26.407,19.734,27,19.969z" fill="#FFFFFF" opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="14.9995" x2="14.9995" y1="17.1426" y2="25.0441">
-<stop offset="0" style="stop-color:#460800"/>
-<stop offset="1" style="stop-color:#992323"/>
+ <stop offset="0" style="stop-color:#460800"/>
+ <stop offset="1" style="stop-color:#992323"/>
</linearGradient>
<path d="M27,19.5l-0.942-1.885c0.062-0.258-0.087-0.522-0.347-0.596c-0.262-0.075-0.542,0.078-0.617,0.345 C23.917,21.52,20.144,24,15,24s-8.917-2.48-10.094-6.636c-0.075-0.267-0.355-0.42-0.617-0.345c-0.259,0.073-0.408,0.338-0.346,0.596 L3,19.5c0.497,0,0.957-0.426,1.293-0.854C5.888,22.645,9.807,25,15,25c5.189,0,9.107-2.354,10.704-6.348 C25.994,18.974,26.407,19.303,27,19.5z" fill="url(#SVGID_4_)"/>
<circle cx="8.5" cy="12.5" fill="#0C3554" r="1.5"/>
<circle cx="21.5" cy="12.5" fill="#0C3554" r="1.5"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_neutral.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_neutral.svg Fri May 14 16:09:54 2010 +0300
@@ -1,56 +1,58 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<g>
-<rect fill="none" height="30" width="30"/>
+ <rect fill="none" height="30" width="30"/>
</g>
-<circle cx="15" cy="15" fill-opacity="0.6" r="14" stroke-opacity="0.6"/>
+<circle cx="15" cy="15" opacity="0.6" r="14"/>
<radialGradient cx="15" cy="3.7026" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="23.0618">
-<stop offset="0" style="stop-color:#FEE891"/>
-<stop offset="0.7818" style="stop-color:#FFB701"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+ <stop offset="0" style="stop-color:#FEE891"/>
+ <stop offset="0.7818" style="stop-color:#FFB701"/>
+ <stop offset="1" style="stop-color:#FFC501"/>
</radialGradient>
<path d="M15,28C7.832,28,2,22.168,2,15C2,7.832,7.832,2,15,2c7.168,0,13,5.832,13,13 C28,22.168,22.168,28,15,28L15,28z" fill="url(#SVGID_1_)"/>
-<path d="M15,3c7,0,12.709,5.564,12.975,12.5C27.98,15.333,28,15.169,28,15c0-7.168-5.832-13-13-13 C7.832,2,2,7.832,2,15c0,0.169,0.019,0.333,0.025,0.5C2.291,8.564,8,3,15,3z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M15,3c7,0,12.709,5.564,12.975,12.5C27.98,15.333,28,15.169,28,15c0-7.168-5.832-13-13-13 C7.832,2,2,7.832,2,15c0,0.169,0.019,0.333,0.025,0.5C2.291,8.564,8,3,15,3z" fill="#FFFFFF" opacity="0.3"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="8.5" x2="8.5" y1="7.5415" y2="19.6124">
-<stop offset="0" style="stop-color:#DB9D00"/>
-<stop offset="1" style="stop-color:#FFEEA9"/>
+ <stop offset="0" style="stop-color:#DB9D00"/>
+ <stop offset="1" style="stop-color:#FFEEA9"/>
</linearGradient>
<path d="M8.5,19C5.467,19,3,16.533,3,13.5C3,10.467,5.467,8,8.5,8s5.5,2.467,5.5,5.5 C14,16.533,11.533,19,8.5,19L8.5,19z" fill="url(#SVGID_2_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="8.5" x2="8.5" y1="8.625" y2="18.5013">
-<stop offset="0" style="stop-color:#CCCCCC"/>
-<stop offset="0.2" style="stop-color:#EEEEEE"/>
-<stop offset="1" style="stop-color:#FCFCFC"/>
+ <stop offset="0" style="stop-color:#CCCCCC"/>
+ <stop offset="0.2" style="stop-color:#EEEEEE"/>
+ <stop offset="1" style="stop-color:#FCFCFC"/>
</linearGradient>
<circle cx="8.5" cy="13.5" fill="url(#SVGID_3_)" r="4.5"/>
-<path d="M8.5,10c2.314,0,4.198,1.753,4.45,4c0.019-0.166,0.05-0.329,0.05-0.5C13,11.015,10.985,9,8.5,9 S4,11.015,4,13.5c0,0.171,0.032,0.334,0.05,0.5C4.302,11.753,6.186,10,8.5,10z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M8.5,10c2.314,0,4.198,1.753,4.45,4c0.019-0.166,0.05-0.329,0.05-0.5C13,11.015,10.985,9,8.5,9 S4,11.015,4,13.5c0,0.171,0.032,0.334,0.05,0.5C4.302,11.753,6.186,10,8.5,10z" opacity="0.2"/>
<path d="M8.5,16C7.122,16,6,14.878,6,13.5S7.122,11,8.5,11s2.5,1.122,2.5,2.5S9.878,16,8.5,16L8.5,16z" fill="#0C3554"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="9.0005" x2="9.0005" y1="13.0034" y2="15.1348">
-<stop offset="0" style="stop-color:#0C3554"/>
-<stop offset="1" style="stop-color:#9BD1FF"/>
+ <stop offset="0" style="stop-color:#0C3554"/>
+ <stop offset="1" style="stop-color:#9BD1FF"/>
</linearGradient>
<circle cx="9" cy="14" fill="url(#SVGID_4_)" r="1"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="21.5" x2="21.5" y1="7.5415" y2="19.6124">
-<stop offset="0" style="stop-color:#DB9D00"/>
-<stop offset="1" style="stop-color:#FFEEA9"/>
+ <stop offset="0" style="stop-color:#DB9D00"/>
+ <stop offset="1" style="stop-color:#FFEEA9"/>
</linearGradient>
<path d="M21.5,19c-3.033,0-5.5-2.467-5.5-5.5c0-3.033,2.467-5.5,5.5-5.5s5.5,2.467,5.5,5.5 C27,16.533,24.533,19,21.5,19L21.5,19z" fill="url(#SVGID_5_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="21.5" x2="21.5" y1="8.625" y2="18.5013">
-<stop offset="0" style="stop-color:#CCCCCC"/>
-<stop offset="0.2" style="stop-color:#EEEEEE"/>
-<stop offset="1" style="stop-color:#FCFCFC"/>
+ <stop offset="0" style="stop-color:#CCCCCC"/>
+ <stop offset="0.2" style="stop-color:#EEEEEE"/>
+ <stop offset="1" style="stop-color:#FCFCFC"/>
</linearGradient>
<circle cx="21.5" cy="13.5" fill="url(#SVGID_6_)" r="4.5"/>
-<path d="M21.5,10c2.314,0,4.197,1.753,4.449,4C25.969,13.834,26,13.671,26,13.5c0-2.485-2.015-4.5-4.5-4.5 S17,11.015,17,13.5c0,0.171,0.031,0.334,0.051,0.5C17.303,11.753,19.186,10,21.5,10z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M21.5,10c2.314,0,4.197,1.753,4.449,4C25.969,13.834,26,13.671,26,13.5c0-2.485-2.015-4.5-4.5-4.5 S17,11.015,17,13.5c0,0.171,0.031,0.334,0.051,0.5C17.303,11.753,19.186,10,21.5,10z" opacity="0.2"/>
<path d="M21.5,16c-1.379,0-2.5-1.122-2.5-2.5s1.121-2.5,2.5-2.5s2.5,1.122,2.5,2.5S22.879,16,21.5,16L21.5,16z" fill="#0C3554"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="22" x2="22" y1="13.0039" y2="15.1352">
-<stop offset="0" style="stop-color:#0C3554"/>
-<stop offset="1" style="stop-color:#9BD1FF"/>
+ <stop offset="0" style="stop-color:#0C3554"/>
+ <stop offset="1" style="stop-color:#9BD1FF"/>
</linearGradient>
<circle cx="22" cy="14" fill="url(#SVGID_7_)" r="1"/>
-<path d="M21,23c0,0.553-0.224,1-0.5,1h-11C9.224,24,9,23.553,9,23l0,0c0-0.553,0.224-1,0.5-1h11 C20.776,22,21,22.447,21,23L21,23z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M21,22c0,0.553-0.224,1-0.5,1h-11C9.224,23,9,22.553,9,22l0,0c0-0.553,0.224-1,0.5-1h11 C20.776,21,21,21.447,21,22L21,22z" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M21,23c0,0.553-0.224,1-0.5,1h-11C9.224,24,9,23.553,9,23l0,0c0-0.553,0.224-1,0.5-1h11 C20.776,22,21,22.447,21,23L21,23z" fill="#FFFFFF" opacity="0.4"/>
+<path d="M21,22c0,0.553-0.224,1-0.5,1h-11C9.224,23,9,22.553,9,22l0,0c0-0.553,0.224-1,0.5-1h11 C20.776,21,21,21.447,21,22L21,22z" opacity="0.4"/>
<path d="M21,22.5c0,0.276-0.224,0.5-0.5,0.5h-11C9.224,23,9,22.776,9,22.5l0,0C9,22.224,9.224,22,9.5,22h11 C20.776,22,21,22.224,21,22.5L21,22.5z" fill="#3B2314"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_sarcastic.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_sarcastic.svg Fri May 14 16:09:54 2010 +0300
@@ -1,64 +1,66 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<g>
-<rect fill="none" height="30" width="30"/>
+ <rect fill="none" height="30" width="30"/>
</g>
-<circle cx="15" cy="15" fill-opacity="0.6" r="14" stroke-opacity="0.6"/>
+<circle cx="15" cy="15" opacity="0.6" r="14"/>
<radialGradient cx="15" cy="3.7026" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="23.0618">
-<stop offset="0" style="stop-color:#FEE891"/>
-<stop offset="0.7818" style="stop-color:#FFB701"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+ <stop offset="0" style="stop-color:#FEE891"/>
+ <stop offset="0.7818" style="stop-color:#FFB701"/>
+ <stop offset="1" style="stop-color:#FFC501"/>
</radialGradient>
<path d="M15,28C7.832,28,2,22.168,2,15C2,7.832,7.832,2,15,2c7.168,0,13,5.832,13,13 C28,22.168,22.168,28,15,28L15,28z" fill="url(#SVGID_1_)"/>
-<path d="M15,3c7,0,12.709,5.564,12.975,12.5C27.98,15.333,28,15.169,28,15c0-7.168-5.832-13-13-13 C7.832,2,2,7.832,2,15c0,0.169,0.019,0.333,0.025,0.5C2.291,8.564,8,3,15,3z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<ellipse cx="21.936" cy="4.792" fill-opacity="0.2" rx="4.361" ry="1.541" stroke-opacity="0.2" transform="matrix(0.9218 -0.3877 0.3877 0.9218 -0.1423 8.8784)"/>
+<path d="M15,3c7,0,12.709,5.564,12.975,12.5C27.98,15.333,28,15.169,28,15c0-7.168-5.832-13-13-13 C7.832,2,2,7.832,2,15c0,0.169,0.019,0.333,0.025,0.5C2.291,8.564,8,3,15,3z" fill="#FFFFFF" opacity="0.3"/>
+<ellipse cx="21.936" cy="4.792" opacity="0.2" rx="4.361" ry="1.541" transform="matrix(0.9218 -0.3877 0.3877 0.9218 -0.1423 8.8784)"/>
<ellipse cx="21.611" cy="4.464" fill="#3B2314" rx="4.361" ry="1" transform="matrix(0.9218 -0.3876 0.3876 0.9218 -0.041 8.7248)"/>
-<ellipse cx="7.636" cy="4.792" fill-opacity="0.2" rx="4.361" ry="1.541" stroke-opacity="0.2" transform="matrix(-0.9218 -0.3877 0.3877 -0.9218 12.8176 12.1696)"/>
+<ellipse cx="7.636" cy="4.792" opacity="0.2" rx="4.361" ry="1.541" transform="matrix(-0.9218 -0.3877 0.3877 -0.9218 12.8176 12.1696)"/>
<ellipse cx="7.961" cy="4.464" fill="#3B2314" rx="4.361" ry="1" transform="matrix(-0.9218 -0.3876 0.3876 -0.9218 13.5697 11.665)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="8.5" x2="8.5" y1="6.5415" y2="18.6124">
-<stop offset="0" style="stop-color:#DB9D00"/>
-<stop offset="1" style="stop-color:#FFEEA9"/>
+ <stop offset="0" style="stop-color:#DB9D00"/>
+ <stop offset="1" style="stop-color:#FFEEA9"/>
</linearGradient>
<path d="M8.5,18C5.467,18,3,15.533,3,12.5S5.467,7,8.5,7S14,9.467,14,12.5S11.533,18,8.5,18L8.5,18z" fill="url(#SVGID_2_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="8.5" x2="8.5" y1="7.625" y2="17.5013">
-<stop offset="0" style="stop-color:#CCCCCC"/>
-<stop offset="0.2" style="stop-color:#EEEEEE"/>
-<stop offset="1" style="stop-color:#FCFCFC"/>
+ <stop offset="0" style="stop-color:#CCCCCC"/>
+ <stop offset="0.2" style="stop-color:#EEEEEE"/>
+ <stop offset="1" style="stop-color:#FCFCFC"/>
</linearGradient>
<circle cx="8.5" cy="12.5" fill="url(#SVGID_3_)" r="4.5"/>
-<path d="M8.5,9c2.314,0,4.198,1.753,4.45,4c0.019-0.166,0.05-0.329,0.05-0.5C13,10.015,10.985,8,8.5,8 S4,10.015,4,12.5c0,0.171,0.032,0.334,0.05,0.5C4.302,10.753,6.186,9,8.5,9z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M8.5,9c2.314,0,4.198,1.753,4.45,4c0.019-0.166,0.05-0.329,0.05-0.5C13,10.015,10.985,8,8.5,8 S4,10.015,4,12.5c0,0.171,0.032,0.334,0.05,0.5C4.302,10.753,6.186,9,8.5,9z" opacity="0.2"/>
<path d="M9.5,14C8.122,14,7,12.878,7,11.5S8.122,9,9.5,9s2.5,1.122,2.5,2.5S10.878,14,9.5,14L9.5,14z" fill="#0C3554"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="10.0005" x2="10.0005" y1="11.0034" y2="13.1348">
-<stop offset="0" style="stop-color:#0C3554"/>
-<stop offset="1" style="stop-color:#84B2D9"/>
+ <stop offset="0" style="stop-color:#0C3554"/>
+ <stop offset="1" style="stop-color:#84B2D9"/>
</linearGradient>
<circle cx="10" cy="12" fill="url(#SVGID_4_)" r="1"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="21.5" x2="21.5" y1="6.5415" y2="18.6124">
-<stop offset="0" style="stop-color:#DB9D00"/>
-<stop offset="1" style="stop-color:#FFEEA9"/>
+ <stop offset="0" style="stop-color:#DB9D00"/>
+ <stop offset="1" style="stop-color:#FFEEA9"/>
</linearGradient>
<path d="M21.5,18c-3.033,0-5.5-2.467-5.5-5.5S18.467,7,21.5,7S27,9.467,27,12.5S24.533,18,21.5,18L21.5,18z" fill="url(#SVGID_5_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="21.5" x2="21.5" y1="7.625" y2="17.5013">
-<stop offset="0" style="stop-color:#CCCCCC"/>
-<stop offset="0.2" style="stop-color:#EEEEEE"/>
-<stop offset="1" style="stop-color:#FCFCFC"/>
+ <stop offset="0" style="stop-color:#CCCCCC"/>
+ <stop offset="0.2" style="stop-color:#EEEEEE"/>
+ <stop offset="1" style="stop-color:#FCFCFC"/>
</linearGradient>
<circle cx="21.5" cy="12.5" fill="url(#SVGID_6_)" r="4.5"/>
-<path d="M21.5,9c2.314,0,4.197,1.753,4.449,4C25.969,12.834,26,12.671,26,12.5c0-2.485-2.015-4.5-4.5-4.5 S17,10.015,17,12.5c0,0.171,0.031,0.334,0.051,0.5C17.303,10.753,19.186,9,21.5,9z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M21.5,9c2.314,0,4.197,1.753,4.449,4C25.969,12.834,26,12.671,26,12.5c0-2.485-2.015-4.5-4.5-4.5 S17,10.015,17,12.5c0,0.171,0.031,0.334,0.051,0.5C17.303,10.753,19.186,9,21.5,9z" opacity="0.2"/>
<path d="M22.5,14c-1.379,0-2.5-1.122-2.5-2.5S21.121,9,22.5,9s2.5,1.122,2.5,2.5S23.879,14,22.5,14L22.5,14z" fill="#0C3554"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="23" x2="23" y1="11.0039" y2="13.1352">
-<stop offset="0" style="stop-color:#0C3554"/>
-<stop offset="1" style="stop-color:#84B2D9"/>
+ <stop offset="0" style="stop-color:#0C3554"/>
+ <stop offset="1" style="stop-color:#84B2D9"/>
</linearGradient>
<circle cx="23" cy="12" fill="url(#SVGID_7_)" r="1"/>
-<path d="M13.552,23.924c0.495,0.051,1.007,0.077,1.523,0.077c5.144,0,8.917-1.481,10.095-5.636 c0.074-0.267,0.354-0.423,0.617-0.346c0.266,0.076,0.42,0.352,0.344,0.617c-0.007,0.026-0.018,0.05-0.024,0.076L27,20.5 c-0.475,0-0.91-0.389-1.242-0.796c-1.609,3.963-5.59,6.827-10.758,6.827c-0.551,0-0.339-0.041-0.871-0.025 c-1.126,0.033-1.155-1.863-1.126-2.137C13.032,24.094,13.278,23.893,13.552,23.924z" fill="#FFFFFF" fill-opacity="0.6" stroke-opacity="0.6"/>
-<path d="M13.552,22.924c0.495,0.051,1.007,0.077,1.523,0.077c5.144,0,8.917-2.481,10.095-6.636 c0.074-0.267,0.354-0.423,0.617-0.346c0.266,0.076,0.42,0.352,0.344,0.617c-0.007,0.026-0.018,0.05-0.024,0.076L27,19.5 c-0.475,0-0.91-1.389-1.242-1.796c-1.609,3.963-5.352,6.79-10.52,6.79c-0.551,0-1.098-0.027-1.627-0.083 c-0.275-0.028-0.608-0.042-0.608-1.042C13.003,23.092,13.278,22.893,13.552,22.924z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M13.552,23.924c0.495,0.051,1.007,0.077,1.523,0.077c5.144,0,8.917-1.481,10.095-5.636 c0.074-0.267,0.354-0.423,0.617-0.346c0.266,0.076,0.42,0.352,0.344,0.617c-0.007,0.026-0.018,0.05-0.024,0.076L27,20.5 c-0.475,0-0.91-0.389-1.242-0.796c-1.609,3.963-5.59,6.827-10.758,6.827c-0.551,0-0.339-0.041-0.871-0.025 c-1.126,0.033-1.155-1.863-1.126-2.137C13.032,24.094,13.278,23.893,13.552,23.924z" fill="#FFFFFF" opacity="0.6"/>
+<path d="M13.552,22.924c0.495,0.051,1.007,0.077,1.523,0.077c5.144,0,8.917-2.481,10.095-6.636 c0.074-0.267,0.354-0.423,0.617-0.346c0.266,0.076,0.42,0.352,0.344,0.617c-0.007,0.026-0.018,0.05-0.024,0.076L27,19.5 c-0.475,0-0.91-1.389-1.242-1.796c-1.609,3.963-5.352,6.79-10.52,6.79c-0.551,0-1.098-0.027-1.627-0.083 c-0.275-0.028-0.608-0.042-0.608-1.042C13.003,23.092,13.278,22.893,13.552,22.924z" opacity="0.2"/>
<linearGradient gradientTransform="matrix(-1 0 0 1 -454 0)" gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="-481" x2="-467" y1="21" y2="21">
-<stop offset="0" style="stop-color:#460800"/>
-<stop offset="1" style="stop-color:#992323"/>
+ <stop offset="0" style="stop-color:#460800"/>
+ <stop offset="1" style="stop-color:#992323"/>
</linearGradient>
<path d="M13.552,23.924c0.495,0.051,1.007,0.077,1.523,0.077c5.144,0,8.917-2.481,10.095-6.636 c0.074-0.267,0.354-0.423,0.617-0.346c0.266,0.076,0.42,0.352,0.344,0.617c-0.007,0.026-0.018,0.05-0.024,0.076L27,19.5 c-0.475,0-0.91-0.389-1.242-0.796c-1.609,3.963-5.515,6.297-10.683,6.297c-0.551,0-1.098-0.028-1.627-0.083 c-0.275-0.029-0.474-0.275-0.445-0.549C13.032,24.094,13.278,23.893,13.552,23.924z" fill="url(#SVGID_8_)"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_sarcastic_mad.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_sarcastic_mad.svg Fri May 14 16:09:54 2010 +0300
@@ -1,46 +1,48 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<g>
-<rect fill="none" height="30" width="30"/>
+ <rect fill="none" height="30" width="30"/>
</g>
-<circle cx="15" cy="15" fill-opacity="0.6" r="14" stroke-opacity="0.6"/>
+<circle cx="15" cy="15" opacity="0.6" r="14"/>
<radialGradient cx="15" cy="3.7026" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="23.0618">
-<stop offset="0" style="stop-color:#FEE891"/>
-<stop offset="0.7818" style="stop-color:#FFB701"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+ <stop offset="0" style="stop-color:#FEE891"/>
+ <stop offset="0.7818" style="stop-color:#FFB701"/>
+ <stop offset="1" style="stop-color:#FFC501"/>
</radialGradient>
<path d="M15,28C7.832,28,2,22.168,2,15C2,7.832,7.832,2,15,2c7.168,0,13,5.832,13,13 C28,22.168,22.168,28,15,28L15,28z" fill="url(#SVGID_1_)"/>
-<path d="M15,3c7,0,12.709,5.564,12.975,12.5C27.98,15.333,28,15.169,28,15c0-7.168-5.832-13-13-13 C7.832,2,2,7.832,2,15c0,0.169,0.019,0.333,0.025,0.5C2.291,8.564,8,3,15,3z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M15,3c7,0,12.709,5.564,12.975,12.5C27.98,15.333,28,15.169,28,15c0-7.168-5.832-13-13-13 C7.832,2,2,7.832,2,15c0,0.169,0.019,0.333,0.025,0.5C2.291,8.564,8,3,15,3z" fill="#FFFFFF" opacity="0.3"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="8.5" x2="8.5" y1="9.917" y2="17.1255">
-<stop offset="0" style="stop-color:#DB9D00"/>
-<stop offset="1" style="stop-color:#FFEEA9"/>
+ <stop offset="0" style="stop-color:#DB9D00"/>
+ <stop offset="1" style="stop-color:#FFEEA9"/>
</linearGradient>
<path d="M8.5,17C7.075,17,6,15.495,6,13.5S7.075,10,8.5,10s2.5,1.505,2.5,3.5S9.925,17,8.5,17L8.5,17z" fill="url(#SVGID_2_)"/>
<ellipse cx="8.5" cy="13.5" fill="#0C3554" rx="1.5" ry="2.5"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="8.5835" x2="8.5835" y1="12.9707" y2="16.1465">
-<stop offset="0" style="stop-color:#0C3554"/>
-<stop offset="1" style="stop-color:#6D93B3"/>
+ <stop offset="0" style="stop-color:#0C3554"/>
+ <stop offset="1" style="stop-color:#6D93B3"/>
</linearGradient>
<path d="M7.167,14.623C7.414,15.437,7.915,16,8.5,16c0.829,0,1.5-1.119,1.5-2.5 c0-0.155-0.011-0.305-0.027-0.452C9.819,13.018,9.662,13,9.5,13C8.429,13,7.522,13.677,7.167,14.623z" fill="url(#SVGID_3_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="21.5" x2="21.5" y1="9.9517" y2="17.1103">
-<stop offset="0" style="stop-color:#DB9D00"/>
-<stop offset="1" style="stop-color:#FFEEA9"/>
+ <stop offset="0" style="stop-color:#DB9D00"/>
+ <stop offset="1" style="stop-color:#FFEEA9"/>
</linearGradient>
<path d="M21.5,17c-1.426,0-2.5-1.505-2.5-3.5s1.074-3.5,2.5-3.5s2.5,1.505,2.5,3.5S22.926,17,21.5,17L21.5,17 z" fill="url(#SVGID_4_)"/>
<ellipse cx="21.5" cy="13.5" fill="#0C3554" rx="1.5" ry="2.5"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="21.583" x2="21.583" y1="13.0908" y2="16.2688">
-<stop offset="0" style="stop-color:#0C3554"/>
-<stop offset="1" style="stop-color:#6D93B3"/>
+ <stop offset="0" style="stop-color:#0C3554"/>
+ <stop offset="1" style="stop-color:#6D93B3"/>
</linearGradient>
<path d="M20.166,14.623C20.414,15.437,20.915,16,21.5,16c0.828,0,1.5-1.119,1.5-2.5 c0-0.155-0.012-0.305-0.027-0.452C22.819,13.018,22.662,13,22.5,13C21.43,13,20.522,13.677,20.166,14.623z" fill="url(#SVGID_5_)"/>
-<path d="M19,21c-2.243,0-3.165,1.107-4,2.5c-0.365,0.608-1.232,1.5-3,1.5s-3-0.791-3-1.5 C9,23.224,8.776,23,8.5,23S8,23.224,8,23.5c0,1.402,1.757,2.5,4,2.5s3-1.061,4-2.5c0.404-0.582,1.232-1.5,3-1.5s3,0.791,3,1.5 c0,0.276,0.224,0.5,0.5,0.5s0.5-0.224,0.5-0.5C23,22.098,21.243,21,19,21z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M19,19c-2.243,0-3.165,1.107-4,2.5c-0.365,0.608-1.232,1.5-3,1.5s-3-0.791-3-1.5C9,21.224,8.776,21,8.5,21 S8,21.224,8,21.5c0,1.402,1.757,2.5,4,2.5s3-1.061,4-2.5c0.404-0.582,1.232-1.5,3-1.5s3,0.791,3,1.5c0,0.276,0.224,0.5,0.5,0.5 s0.5-0.224,0.5-0.5C23,20.098,21.243,19,19,19z" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M19,21c-2.243,0-3.165,1.107-4,2.5c-0.365,0.608-1.232,1.5-3,1.5s-3-0.791-3-1.5 C9,23.224,8.776,23,8.5,23S8,23.224,8,23.5c0,1.402,1.757,2.5,4,2.5s3-1.061,4-2.5c0.404-0.582,1.232-1.5,3-1.5s3,0.791,3,1.5 c0,0.276,0.224,0.5,0.5,0.5s0.5-0.224,0.5-0.5C23,22.098,21.243,21,19,21z" fill="#FFFFFF" opacity="0.4"/>
+<path d="M19,19c-2.243,0-3.165,1.107-4,2.5c-0.365,0.608-1.232,1.5-3,1.5s-3-0.791-3-1.5C9,21.224,8.776,21,8.5,21 S8,21.224,8,21.5c0,1.402,1.757,2.5,4,2.5s3-1.061,4-2.5c0.404-0.582,1.232-1.5,3-1.5s3,0.791,3,1.5c0,0.276,0.224,0.5,0.5,0.5 s0.5-0.224,0.5-0.5C23,20.098,21.243,19,19,19z" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="15.4995" x2="15.4995" y1="20" y2="24.8928">
-<stop offset="0" style="stop-color:#460800"/>
-<stop offset="1" style="stop-color:#992323"/>
+ <stop offset="0" style="stop-color:#460800"/>
+ <stop offset="1" style="stop-color:#992323"/>
</linearGradient>
<path d="M19,20c-2.243,0-3.165,1.107-4,2.5c-0.365,0.608-1.232,1.5-3,1.5s-3-0.791-3-1.5 C9,22.224,8.776,22,8.5,22S8,22.224,8,22.5c0,1.402,1.757,2.5,4,2.5s3-1.061,4-2.5c0.404-0.582,1.232-1.5,3-1.5s3,0.791,3,1.5 c0,0.276,0.224,0.5,0.5,0.5s0.5-0.224,0.5-0.5C23,21.098,21.243,20,19,20z" fill="url(#SVGID_6_)"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_smile.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_smile.svg Fri May 14 16:09:54 2010 +0300
@@ -1,36 +1,38 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<g>
-<rect fill="none" height="30" width="30"/>
+ <rect fill="none" height="30" width="30"/>
</g>
-<circle cx="15" cy="15" fill-opacity="0.6" r="14" stroke-opacity="0.6"/>
+<circle cx="15" cy="15" opacity="0.6" r="14"/>
<radialGradient cx="15" cy="3.7026" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="23.0618">
-<stop offset="0" style="stop-color:#FEE891"/>
-<stop offset="0.7818" style="stop-color:#FFB701"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+ <stop offset="0" style="stop-color:#FEE891"/>
+ <stop offset="0.7818" style="stop-color:#FFB701"/>
+ <stop offset="1" style="stop-color:#FFC501"/>
</radialGradient>
<path d="M15,28C7.832,28,2,22.168,2,15C2,7.832,7.832,2,15,2c7.168,0,13,5.832,13,13 C28,22.168,22.168,28,15,28L15,28z" fill="url(#SVGID_1_)"/>
-<path d="M15,3c7,0,12.709,5.564,12.975,12.5C27.98,15.333,28,15.169,28,15c0-7.168-5.832-13-13-13 C7.832,2,2,7.832,2,15c0,0.169,0.019,0.333,0.025,0.5C2.291,8.564,8,3,15,3z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M15,3c7,0,12.709,5.564,12.975,12.5C27.98,15.333,28,15.169,28,15c0-7.168-5.832-13-13-13 C7.832,2,2,7.832,2,15c0,0.169,0.019,0.333,0.025,0.5C2.291,8.564,8,3,15,3z" fill="#FFFFFF" opacity="0.3"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="8.7505" x2="8.7505" y1="7.9351" y2="14.8952">
-<stop offset="0" style="stop-color:#DB9D00"/>
-<stop offset="1" style="stop-color:#FFEEA9"/>
+ <stop offset="0" style="stop-color:#DB9D00"/>
+ <stop offset="1" style="stop-color:#FFEEA9"/>
</linearGradient>
<path d="M11,15c-0.754,0-1.394-0.564-1.487-1.313C9.3,12,8.874,12,8.691,12c-0.134,0-0.49,0-0.703,1.688 C7.894,14.436,7.254,15,6.5,15H6.443l-0.118-0.01c-0.41-0.052-0.765-0.253-1.01-0.57c-0.246-0.317-0.354-0.71-0.304-1.108 C5.424,10.036,6.893,8,8.846,8c1.111,0,3.063,0.69,3.644,5.313c0.05,0.396-0.058,0.79-0.304,1.107 c-0.245,0.316-0.6,0.518-0.997,0.568l-0.063,0.008L11,15z" fill="url(#SVGID_2_)"/>
<path d="M11,14c-0.248,0-0.464-0.185-0.495-0.438C10.214,11.249,9.371,11,8.691,11s-1.404,0.249-1.695,2.563 c-0.034,0.273-0.273,0.466-0.559,0.434c-0.273-0.035-0.468-0.285-0.434-0.559C6.343,10.742,7.458,9,8.846,9s2.313,1.742,2.651,4.438 c0.034,0.274-0.16,0.524-0.434,0.559C11.042,13.999,11.021,14,11,14L11,14z" fill="#0C3554"/>
<linearGradient gradientTransform="matrix(-1 0 0 1 -566.5 0)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-587.7495" x2="-587.7495" y1="7.9351" y2="14.8952">
-<stop offset="0" style="stop-color:#DB9D00"/>
-<stop offset="1" style="stop-color:#FFEEA9"/>
+ <stop offset="0" style="stop-color:#DB9D00"/>
+ <stop offset="1" style="stop-color:#FFEEA9"/>
</linearGradient>
<path d="M19,15c0.754,0,1.394-0.564,1.487-1.313C20.7,12,21.126,12,21.309,12c0.134,0,0.49,0,0.703,1.688 C22.106,14.436,22.746,15,23.5,15h0.057l0.118-0.01c0.41-0.052,0.765-0.253,1.01-0.57c0.246-0.317,0.354-0.71,0.304-1.108 C24.576,10.036,23.107,8,21.154,8c-1.111,0-3.063,0.69-3.644,5.313c-0.05,0.396,0.058,0.79,0.304,1.107 c0.245,0.316,0.6,0.518,0.997,0.568l0.063,0.008L19,15z" fill="url(#SVGID_3_)"/>
<path d="M19,14c0.248,0,0.464-0.185,0.495-0.438C19.786,11.249,20.629,11,21.309,11s1.404,0.249,1.695,2.563 c0.034,0.273,0.273,0.466,0.559,0.434c0.273-0.035,0.468-0.285,0.434-0.559C23.657,10.742,22.542,9,21.154,9 s-2.313,1.742-2.651,4.438c-0.034,0.274,0.16,0.524,0.434,0.559C18.958,13.999,18.979,14,19,14L19,14z" fill="#0C3554"/>
-<path d="M15.075,25c-5.617,0-9.75-2.753-11.056-7.363c-0.075-0.266,0.079-0.543,0.345-0.618 c0.262-0.075,0.542,0.079,0.617,0.345C6.158,21.519,9.856,23,15,23c5.143,0,8.992-1.481,10.17-5.637 c0.074-0.266,0.355-0.42,0.617-0.345c0.266,0.075,0.42,0.353,0.344,0.618C24.826,22.247,20.692,25,15.075,25L15.075,25z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M27,19.969l-0.942-2.238c0.062-0.307-0.087-0.621-0.347-0.707 c-0.262-0.09-0.542,0.092-0.617,0.408C23.917,22.367,20.145,24.5,15,24.5c-5.143,0-8.917-2.133-10.094-7.068 c-0.075-0.316-0.355-0.498-0.617-0.408c-0.259,0.086-0.408,0.4-0.346,0.707L3,19.969c0.497,0,0.957-0.506,1.293-1.015 C5.888,23.701,9.807,26,15,26c5.189,0,9.107-2.295,10.704-7.039C25.994,19.344,26.407,19.734,27,19.969z" fill="#FFFFFF" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M15.075,25c-5.617,0-9.75-2.753-11.056-7.363c-0.075-0.266,0.079-0.543,0.345-0.618 c0.262-0.075,0.542,0.079,0.617,0.345C6.158,21.519,9.856,23,15,23c5.143,0,8.992-1.481,10.17-5.637 c0.074-0.266,0.355-0.42,0.617-0.345c0.266,0.075,0.42,0.353,0.344,0.618C24.826,22.247,20.692,25,15.075,25L15.075,25z" opacity="0.2"/>
+<path d="M27,19.969l-0.942-2.238c0.062-0.307-0.087-0.621-0.347-0.707 c-0.262-0.09-0.542,0.092-0.617,0.408C23.917,22.367,20.145,24.5,15,24.5c-5.143,0-8.917-2.133-10.094-7.068 c-0.075-0.316-0.355-0.498-0.617-0.408c-0.259,0.086-0.408,0.4-0.346,0.707L3,19.969c0.497,0,0.957-0.506,1.293-1.015 C5.888,23.701,9.807,26,15,26c5.189,0,9.107-2.295,10.704-7.039C25.994,19.344,26.407,19.734,27,19.969z" fill="#FFFFFF" opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="14.9995" x2="14.9995" y1="17.1426" y2="25.0441">
-<stop offset="0" style="stop-color:#460800"/>
-<stop offset="1" style="stop-color:#992323"/>
+ <stop offset="0" style="stop-color:#460800"/>
+ <stop offset="1" style="stop-color:#992323"/>
</linearGradient>
<path d="M27,19.5l-0.942-1.885c0.062-0.259-0.087-0.523-0.347-0.597c-0.262-0.075-0.542,0.079-0.617,0.345 C23.917,21.519,20.144,24,15,24s-8.917-2.481-10.094-6.637c-0.075-0.266-0.355-0.42-0.617-0.345 c-0.259,0.073-0.408,0.338-0.346,0.597L3,19.5c0.497,0,0.957-0.426,1.293-0.854C5.888,22.644,9.807,25,15,25 c5.189,0,9.107-2.354,10.704-6.348C25.994,18.973,26.407,19.303,27,19.5z" fill="url(#SVGID_4_)"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_surprised.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_surprised.svg Fri May 14 16:09:54 2010 +0300
@@ -1,64 +1,66 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<g>
-<rect fill="none" height="30" width="30"/>
+ <rect fill="none" height="30" width="30"/>
</g>
-<circle cx="15" cy="15" fill-opacity="0.6" r="14" stroke-opacity="0.6"/>
+<circle cx="15" cy="15" opacity="0.6" r="14"/>
<radialGradient cx="15" cy="3.7026" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="23.0618">
-<stop offset="0" style="stop-color:#FEE891"/>
-<stop offset="0.7818" style="stop-color:#FFB701"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+ <stop offset="0" style="stop-color:#FEE891"/>
+ <stop offset="0.7818" style="stop-color:#FFB701"/>
+ <stop offset="1" style="stop-color:#FFC501"/>
</radialGradient>
<path d="M15,28C7.832,28,2,22.168,2,15C2,7.832,7.832,2,15,2s13,5.832,13,13C28,22.168,22.168,28,15,28L15,28 z" fill="url(#SVGID_1_)"/>
-<path d="M15,3c6.999,0,12.709,5.564,12.975,12.5C27.981,15.333,28,15.169,28,15 c0-7.168-5.832-13-13-13S2,7.832,2,15c0,0.169,0.019,0.333,0.025,0.5C2.291,8.564,8.001,3,15,3z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M15,3c6.999,0,12.709,5.564,12.975,12.5C27.981,15.333,28,15.169,28,15 c0-7.168-5.832-13-13-13S2,7.832,2,15c0,0.169,0.019,0.333,0.025,0.5C2.291,8.564,8.001,3,15,3z" fill="#FFFFFF" opacity="0.3"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="8.5" x2="8.5" y1="7.5415" y2="19.6124">
-<stop offset="0" style="stop-color:#DB9D00"/>
-<stop offset="1" style="stop-color:#FFEEA9"/>
+ <stop offset="0" style="stop-color:#DB9D00"/>
+ <stop offset="1" style="stop-color:#FFEEA9"/>
</linearGradient>
<path d="M8.5,19C5.468,19,3,16.533,3,13.5C3,10.467,5.468,8,8.5,8c3.033,0,5.5,2.467,5.5,5.5 C14,16.533,11.533,19,8.5,19L8.5,19z" fill="url(#SVGID_2_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="8.5" x2="8.5" y1="8.625" y2="18.5013">
-<stop offset="0" style="stop-color:#CCCCCC"/>
-<stop offset="0.2" style="stop-color:#EEEEEE"/>
-<stop offset="1" style="stop-color:#FCFCFC"/>
+ <stop offset="0" style="stop-color:#CCCCCC"/>
+ <stop offset="0.2" style="stop-color:#EEEEEE"/>
+ <stop offset="1" style="stop-color:#FCFCFC"/>
</linearGradient>
<circle cx="8.5" cy="13.5" fill="url(#SVGID_3_)" r="4.5"/>
-<path d="M8.5,10c2.314,0,4.198,1.753,4.45,4c0.019-0.166,0.05-0.329,0.05-0.5C13,11.015,10.986,9,8.5,9 C6.016,9,4,11.015,4,13.5c0,0.171,0.032,0.334,0.051,0.5C4.303,11.753,6.187,10,8.5,10z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M8.5,10c2.314,0,4.198,1.753,4.45,4c0.019-0.166,0.05-0.329,0.05-0.5C13,11.015,10.986,9,8.5,9 C6.016,9,4,11.015,4,13.5c0,0.171,0.032,0.334,0.051,0.5C4.303,11.753,6.187,10,8.5,10z" opacity="0.2"/>
<path d="M8.5,15.5c-1.102,0-2-0.897-2-2s0.898-2,2-2c1.104,0,2,0.897,2,2S9.604,15.5,8.5,15.5L8.5,15.5z" fill="#0C3554"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="8.5" x2="8.5" y1="13.0034" y2="15.1348">
-<stop offset="0" style="stop-color:#0C3554"/>
-<stop offset="1" style="stop-color:#9BD1FF"/>
+ <stop offset="0" style="stop-color:#0C3554"/>
+ <stop offset="1" style="stop-color:#9BD1FF"/>
</linearGradient>
<circle cx="8.5" cy="14" fill="url(#SVGID_4_)" r="1"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="21.5" x2="21.5" y1="7.5415" y2="19.6124">
-<stop offset="0" style="stop-color:#DB9D00"/>
-<stop offset="1" style="stop-color:#FFEEA9"/>
+ <stop offset="0" style="stop-color:#DB9D00"/>
+ <stop offset="1" style="stop-color:#FFEEA9"/>
</linearGradient>
<path d="M21.5,19c-3.032,0-5.5-2.467-5.5-5.5c0-3.033,2.468-5.5,5.5-5.5c3.033,0,5.5,2.467,5.5,5.5 C27,16.533,24.533,19,21.5,19L21.5,19z" fill="url(#SVGID_5_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="21.5" x2="21.5" y1="8.625" y2="18.5013">
-<stop offset="0" style="stop-color:#CCCCCC"/>
-<stop offset="0.2" style="stop-color:#EEEEEE"/>
-<stop offset="1" style="stop-color:#FCFCFC"/>
+ <stop offset="0" style="stop-color:#CCCCCC"/>
+ <stop offset="0.2" style="stop-color:#EEEEEE"/>
+ <stop offset="1" style="stop-color:#FCFCFC"/>
</linearGradient>
<circle cx="21.5" cy="13.5" fill="url(#SVGID_6_)" r="4.5"/>
-<path d="M21.5,10c2.314,0,4.198,1.753,4.45,4c0.019-0.166,0.05-0.329,0.05-0.5c0-2.485-2.014-4.5-4.5-4.5 c-2.484,0-4.5,2.015-4.5,4.5c0,0.171,0.032,0.334,0.051,0.5C17.303,11.753,19.187,10,21.5,10z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M21.5,10c2.314,0,4.198,1.753,4.45,4c0.019-0.166,0.05-0.329,0.05-0.5c0-2.485-2.014-4.5-4.5-4.5 c-2.484,0-4.5,2.015-4.5,4.5c0,0.171,0.032,0.334,0.051,0.5C17.303,11.753,19.187,10,21.5,10z" opacity="0.2"/>
<path d="M21.5,15.5c-1.102,0-2-0.897-2-2s0.898-2,2-2c1.104,0,2,0.897,2,2S22.604,15.5,21.5,15.5L21.5,15.5z" fill="#0C3554"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_7_" x1="21.5" x2="21.5" y1="13.0039" y2="15.1352">
-<stop offset="0" style="stop-color:#0C3554"/>
-<stop offset="1" style="stop-color:#9BD1FF"/>
+ <stop offset="0" style="stop-color:#0C3554"/>
+ <stop offset="1" style="stop-color:#9BD1FF"/>
</linearGradient>
<circle cx="21.5" cy="14" fill="url(#SVGID_7_)" r="1"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_8_" x1="14.9995" x2="14.9995" y1="17.3955" y2="28.2055">
-<stop offset="0" style="stop-color:#D48D00"/>
-<stop offset="1" style="stop-color:#FFF1B8"/>
+ <stop offset="0" style="stop-color:#D48D00"/>
+ <stop offset="1" style="stop-color:#FFF1B8"/>
</linearGradient>
<ellipse cx="15" cy="22.5" fill="url(#SVGID_8_)" rx="4.5" ry="5"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_9_" x1="14.9995" x2="14.9995" y1="18.5303" y2="26.9376">
-<stop offset="0" style="stop-color:#460800"/>
-<stop offset="1" style="stop-color:#992323"/>
+ <stop offset="0" style="stop-color:#460800"/>
+ <stop offset="1" style="stop-color:#992323"/>
</linearGradient>
<ellipse cx="15" cy="22.5" fill="url(#SVGID_9_)" rx="4.5" ry="3.889"/>
-<path d="M15,19.723c2.266,0,4.121,1.451,4.436,3.333C19.467,22.873,19.5,22.69,19.5,22.5 c0-2.147-2.014-3.889-4.5-3.889c-2.484,0-4.5,1.741-4.5,3.889c0,0.19,0.035,0.373,0.064,0.556C10.88,21.174,12.736,19.723,15,19.723 z" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M15,19.723c2.266,0,4.121,1.451,4.436,3.333C19.467,22.873,19.5,22.69,19.5,22.5 c0-2.147-2.014-3.889-4.5-3.889c-2.484,0-4.5,1.741-4.5,3.889c0,0.19,0.035,0.373,0.064,0.556C10.88,21.174,12.736,19.723,15,19.723 z" opacity="0.4"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_tongue.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_tongue.svg Fri May 14 16:09:54 2010 +0300
@@ -1,45 +1,47 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<g>
-<rect fill="none" height="30" width="30"/>
+ <rect fill="none" height="30" width="30"/>
</g>
-<circle cx="15" cy="15" fill-opacity="0.6" r="14" stroke-opacity="0.6"/>
+<circle cx="15" cy="15" opacity="0.6" r="14"/>
<radialGradient cx="15" cy="3.7026" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="23.0618">
-<stop offset="0" style="stop-color:#FEE891"/>
-<stop offset="0.7818" style="stop-color:#FFB701"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+ <stop offset="0" style="stop-color:#FEE891"/>
+ <stop offset="0.7818" style="stop-color:#FFB701"/>
+ <stop offset="1" style="stop-color:#FFC501"/>
</radialGradient>
<path d="M15,28C7.832,28,2,22.168,2,15C2,7.832,7.832,2,15,2s13,5.832,13,13C28,22.168,22.168,28,15,28L15,28 z" fill="url(#SVGID_1_)"/>
-<path d="M15,3c6.999,0,12.709,5.564,12.975,12.5C27.981,15.333,28,15.169,28,15 c0-7.168-5.832-13-13-13S2,7.832,2,15c0,0.169,0.019,0.333,0.025,0.5C2.291,8.564,8.001,3,15,3z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M27,18.308l-0.942-1.885c0.062-0.259-0.087-0.523-0.347-0.597 c-0.262-0.075-0.398,0.175-0.617,0.346C23,17.808,20.144,19.308,15,19.308s-8-1.5-10.094-3.136c-0.076-0.267-0.355-0.42-0.617-0.346 c-0.26,0.074-0.408,0.338-0.347,0.597L3,18.308c0.497,0,0.957-0.426,1.293-0.854C7,18.808,10,20.308,15,20.308s9-1.5,10.704-2.849 C25.994,17.781,26.407,18.11,27,18.308z" fill="#FFFFFF" fill-opacity="0.6" stroke-opacity="0.6"/>
-<path d="M27,18.016l-0.942-1.885c0.062-0.258-0.087-0.522-0.347-0.596c-0.262-0.075-0.398,0.175-0.617,0.345 C23,17.516,20.144,18.058,15,18.058S7,17.516,4.906,15.88c-0.076-0.267-0.355-0.42-0.617-0.345c-0.26,0.074-0.408,0.338-0.347,0.596 L3,18.016c0.497,0,0.957-0.426,1.293-0.854C7,18.516,10,19.516,15,19.516s9-1,10.704-2.348C25.994,17.489,26.407,17.818,27,18.016z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M9.84,18.578c-1.49,1.831-2.932,6.933,1.082,7.394c4.174,0.479,4.881-5.217,8.221-6.91 C19.304,18.98,9.84,18.578,9.84,18.578z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M15,3c6.999,0,12.709,5.564,12.975,12.5C27.981,15.333,28,15.169,28,15 c0-7.168-5.832-13-13-13S2,7.832,2,15c0,0.169,0.019,0.333,0.025,0.5C2.291,8.564,8.001,3,15,3z" fill="#FFFFFF" opacity="0.3"/>
+<path d="M27,18.308l-0.942-1.885c0.062-0.259-0.087-0.523-0.347-0.597 c-0.262-0.075-0.398,0.175-0.617,0.346C23,17.808,20.144,19.308,15,19.308s-8-1.5-10.094-3.136c-0.076-0.267-0.355-0.42-0.617-0.346 c-0.26,0.074-0.408,0.338-0.347,0.597L3,18.308c0.497,0,0.957-0.426,1.293-0.854C7,18.808,10,20.308,15,20.308s9-1.5,10.704-2.849 C25.994,17.781,26.407,18.11,27,18.308z" fill="#FFFFFF" opacity="0.6"/>
+<path d="M27,18.016l-0.942-1.885c0.062-0.258-0.087-0.522-0.347-0.596c-0.262-0.075-0.398,0.175-0.617,0.345 C23,17.516,20.144,18.058,15,18.058S7,17.516,4.906,15.88c-0.076-0.267-0.355-0.42-0.617-0.345c-0.26,0.074-0.408,0.338-0.347,0.596 L3,18.016c0.497,0,0.957-0.426,1.293-0.854C7,18.516,10,19.516,15,19.516s9-1,10.704-2.348C25.994,17.489,26.407,17.818,27,18.016z" opacity="0.2"/>
+<path d="M9.84,18.578c-1.49,1.831-2.932,6.933,1.082,7.394c4.174,0.479,4.881-5.217,8.221-6.91 C19.304,18.98,9.84,18.578,9.84,18.578z" opacity="0.2"/>
<radialGradient cx="-109.7007" cy="-18.4487" gradientTransform="matrix(1.1747 0 0 1.1055 140.4372 39.6372)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="4.8868">
-<stop offset="0" style="stop-color:#FF6855"/>
-<stop offset="1" style="stop-color:#CC0E06"/>
+ <stop offset="0" style="stop-color:#FF6855"/>
+ <stop offset="1" style="stop-color:#CC0E06"/>
</radialGradient>
<path d="M9.145,18.578c-1.489,1.831-1.379,6.046,1.777,6.287c4.191,0.322,4.186-4.11,7.525-5.804 C18.609,18.98,9.145,18.578,9.145,18.578z" fill="url(#SVGID_2_)"/>
-<path d="M13.201,18.758c-0.479-0.021-0.943-0.043-1.385-0.063c-0.565,1.258-0.637,2.821-0.637,2.821 S11.781,19.969,13.201,18.758z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M13.201,18.758c-0.479-0.021-0.943-0.043-1.385-0.063c-0.565,1.258-0.637,2.821-0.637,2.821 S11.781,19.969,13.201,18.758z" opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="14.9995" x2="14.9995" y1="15.5869" y2="19.5381">
-<stop offset="0" style="stop-color:#460800"/>
-<stop offset="1" style="stop-color:#992323"/>
+ <stop offset="0" style="stop-color:#460800"/>
+ <stop offset="1" style="stop-color:#992323"/>
</linearGradient>
<path d="M27,18.016l-0.942-1.885c0.062-0.258-0.087-0.522-0.347-0.596c-0.262-0.075-0.398,0.175-0.617,0.345 C23,17.516,20.144,18.516,15,18.516s-8-1-10.094-2.636c-0.076-0.267-0.355-0.42-0.617-0.345c-0.26,0.074-0.408,0.338-0.347,0.596 L3,18.016c0.497,0,0.957-0.426,1.293-0.854C7,18.516,10,19.516,15,19.516s9-1,10.704-2.348C25.994,17.489,26.407,17.818,27,18.016z" fill="url(#SVGID_3_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="20.5" x2="20.5" y1="8.7856" y2="15.9438">
-<stop offset="0" style="stop-color:#DB9D00"/>
-<stop offset="1" style="stop-color:#FFEEA9"/>
+ <stop offset="0" style="stop-color:#DB9D00"/>
+ <stop offset="1" style="stop-color:#FFEEA9"/>
</linearGradient>
<path d="M20.5,15.834c-1.426,0-2.5-1.505-2.5-3.5s1.074-3.5,2.5-3.5s2.5,1.505,2.5,3.5 S21.926,15.834,20.5,15.834L20.5,15.834z" fill="url(#SVGID_4_)"/>
<ellipse cx="20.5" cy="12.334" fill="#0C3554" rx="1.5" ry="2.5"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="20.583" x2="20.583" y1="11.9248" y2="15.1028">
-<stop offset="0" style="stop-color:#0C3554"/>
-<stop offset="1" style="stop-color:#6D93B3"/>
+ <stop offset="0" style="stop-color:#0C3554"/>
+ <stop offset="1" style="stop-color:#6D93B3"/>
</linearGradient>
<path d="M19.166,13.457c0.248,0.813,0.749,1.377,1.334,1.377c0.828,0,1.5-1.119,1.5-2.5 c0-0.155-0.012-0.305-0.027-0.452c-0.153-0.03-0.311-0.048-0.473-0.048C20.43,11.834,19.522,12.511,19.166,13.457z" fill="url(#SVGID_5_)"/>
-<path d="M12,14.833c-0.209,0-0.404-0.132-0.475-0.34c-0.041-0.121-0.932-2.159-4.49-2.159 c-0.277,0-0.535-0.724-0.535-1s0.225-0.5,0.5-0.5c4.312,0,5.429,3.205,5.475,3.341c0.087,0.262-0.055,0.545-0.316,0.632 C12.105,14.825,12.053,14.833,12,14.833L12,14.833z" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M12,14.021c-0.209,0-0.404-0.132-0.475-0.34c-0.041-0.121-0.992-3.066-4.552-3.066 c-0.276,0-0.474-0.503-0.474-0.78s0.225-0.5,0.5-0.5c4.312,0,5.429,3.892,5.475,4.028c0.087,0.262-0.055,0.545-0.316,0.632 c-0.053,0.018-0.105-0.661-0.158-0.661V14.021z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M12,14.833c-0.209,0-0.404-0.132-0.475-0.34c-0.041-0.121-0.932-2.159-4.49-2.159 c-0.277,0-0.535-0.724-0.535-1s0.225-0.5,0.5-0.5c4.312,0,5.429,3.205,5.475,3.341c0.087,0.262-0.055,0.545-0.316,0.632 C12.105,14.825,12.053,14.833,12,14.833L12,14.833z" opacity="0.4"/>
+<path d="M12,14.021c-0.209,0-0.404-0.132-0.475-0.34c-0.041-0.121-0.992-3.066-4.552-3.066 c-0.276,0-0.474-0.503-0.474-0.78s0.225-0.5,0.5-0.5c4.312,0,5.429,3.892,5.475,4.028c0.087,0.262-0.055,0.545-0.316,0.632 c-0.053,0.018-0.105-0.661-0.158-0.661V14.021z" fill="#FFFFFF" opacity="0.3"/>
<path d="M12,14.334c-0.209,0-0.404-0.132-0.475-0.34c-0.041-0.121-0.965-2.659-4.525-2.659 c-0.275,0-0.5-0.224-0.5-0.5s0.225-0.5,0.5-0.5c4.312,0,5.429,3.205,5.475,3.341c0.087,0.262-0.055,0.545-0.316,0.632 C12.105,14.326,12.053,14.334,12,14.334L12,14.334z" fill="#0C3554"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_unhappy.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_unhappy.svg Fri May 14 16:09:54 2010 +0300
@@ -1,46 +1,48 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<g>
-<rect fill="none" height="30" width="30"/>
+ <rect fill="none" height="30" width="30"/>
</g>
-<circle cx="15" cy="15" fill-opacity="0.6" r="14" stroke-opacity="0.6"/>
+<circle cx="15" cy="15" opacity="0.6" r="14"/>
<radialGradient cx="15" cy="3.7026" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="23.0618">
-<stop offset="0" style="stop-color:#FEE891"/>
-<stop offset="0.7818" style="stop-color:#FFB701"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+ <stop offset="0" style="stop-color:#FEE891"/>
+ <stop offset="0.7818" style="stop-color:#FFB701"/>
+ <stop offset="1" style="stop-color:#FFC501"/>
</radialGradient>
<path d="M15,28C7.832,28,2,22.168,2,15C2,7.832,7.832,2,15,2s13,5.832,13,13C28,22.168,22.168,28,15,28L15,28 z" fill="url(#SVGID_1_)"/>
-<path d="M15,3c6.999,0,12.709,5.564,12.975,12.5C27.981,15.333,28,15.169,28,15 c0-7.168-5.832-13-13-13S2,7.832,2,15c0,0.169,0.019,0.333,0.025,0.5C2.291,8.564,8.001,3,15,3z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M15,3c6.999,0,12.709,5.564,12.975,12.5C27.981,15.333,28,15.169,28,15 c0-7.168-5.832-13-13-13S2,7.832,2,15c0,0.169,0.019,0.333,0.025,0.5C2.291,8.564,8.001,3,15,3z" fill="#FFFFFF" opacity="0.3"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="8.5" x2="8.5" y1="9.917" y2="17.1255">
-<stop offset="0" style="stop-color:#DB9D00"/>
-<stop offset="1" style="stop-color:#FFEEA9"/>
+ <stop offset="0" style="stop-color:#DB9D00"/>
+ <stop offset="1" style="stop-color:#FFEEA9"/>
</linearGradient>
<path d="M8.5,17C7.074,17,6,15.495,6,13.5S7.074,10,8.5,10c1.425,0,2.5,1.505,2.5,3.5S9.925,17,8.5,17L8.5,17 z" fill="url(#SVGID_2_)"/>
<ellipse cx="8.5" cy="13.5" fill="#0C3554" rx="1.5" ry="2.5"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="8.583" x2="8.583" y1="12.9707" y2="16.1465">
-<stop offset="0" style="stop-color:#0C3554"/>
-<stop offset="1" style="stop-color:#6D93B3"/>
+ <stop offset="0" style="stop-color:#0C3554"/>
+ <stop offset="1" style="stop-color:#6D93B3"/>
</linearGradient>
<path d="M7.166,14.623C7.414,15.437,7.914,16,8.5,16c0.828,0,1.5-1.119,1.5-2.5 c0-0.155-0.012-0.305-0.027-0.452C9.818,13.018,9.662,13,9.5,13C8.429,13,7.521,13.677,7.166,14.623z" fill="url(#SVGID_3_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="21.5" x2="21.5" y1="9.9517" y2="17.1103">
-<stop offset="0" style="stop-color:#DB9D00"/>
-<stop offset="1" style="stop-color:#FFEEA9"/>
+ <stop offset="0" style="stop-color:#DB9D00"/>
+ <stop offset="1" style="stop-color:#FFEEA9"/>
</linearGradient>
<path d="M21.5,17c-1.426,0-2.5-1.505-2.5-3.5s1.074-3.5,2.5-3.5c1.425,0,2.5,1.505,2.5,3.5S22.925,17,21.5,17 L21.5,17z" fill="url(#SVGID_4_)"/>
<ellipse cx="21.5" cy="13.5" fill="#0C3554" rx="1.5" ry="2.5"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="21.583" x2="21.583" y1="13.0908" y2="16.2688">
-<stop offset="0" style="stop-color:#0C3554"/>
-<stop offset="1" style="stop-color:#6D93B3"/>
+ <stop offset="0" style="stop-color:#0C3554"/>
+ <stop offset="1" style="stop-color:#6D93B3"/>
</linearGradient>
<path d="M20.166,14.623C20.414,15.437,20.914,16,21.5,16c0.828,0,1.5-1.119,1.5-2.5 c0-0.155-0.012-0.305-0.027-0.452C22.818,13.018,22.662,13,22.5,13C21.429,13,20.521,13.677,20.166,14.623z" fill="url(#SVGID_5_)"/>
-<path d="M23.025,24c-0.17,0-0.335-0.086-0.429-0.241C21.216,21.476,18.234,21,15,21 s-6.217,0.476-7.598,2.759c-0.143,0.235-0.45,0.312-0.687,0.169s-0.312-0.45-0.169-0.687C8.129,20.625,11.367,19,15,19 c3.631,0,6.871,1.625,8.453,4.241c0.143,0.236,0.066,0.544-0.17,0.687C23.203,23.977,23.113,24,23.025,24L23.025,24z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M23.025,23c-0.17,0-0.335-0.086-0.429-0.241C21.216,20.476,18.234,19,15,19s-6.217,1.476-7.598,3.759 c-0.143,0.235-0.45,0.312-0.687,0.169s-0.312-0.45-0.169-0.687C8.129,19.625,11.367,18,15,18c3.631,0,6.871,1.625,8.453,4.241 c0.143,0.236,0.066,0.544-0.17,0.687C23.203,22.977,23.113,23,23.025,23L23.025,23z" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M23.025,24c-0.17,0-0.335-0.086-0.429-0.241C21.216,21.476,18.234,21,15,21 s-6.217,0.476-7.598,2.759c-0.143,0.235-0.45,0.312-0.687,0.169s-0.312-0.45-0.169-0.687C8.129,20.625,11.367,19,15,19 c3.631,0,6.871,1.625,8.453,4.241c0.143,0.236,0.066,0.544-0.17,0.687C23.203,23.977,23.113,24,23.025,24L23.025,24z" fill="#FFFFFF" opacity="0.4"/>
+<path d="M23.025,23c-0.17,0-0.335-0.086-0.429-0.241C21.216,20.476,18.234,19,15,19s-6.217,1.476-7.598,3.759 c-0.143,0.235-0.45,0.312-0.687,0.169s-0.312-0.45-0.169-0.687C8.129,19.625,11.367,18,15,18c3.631,0,6.871,1.625,8.453,4.241 c0.143,0.236,0.066,0.544-0.17,0.687C23.203,22.977,23.113,23,23.025,23L23.025,23z" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="14.9995" x2="14.9995" y1="18.5723" y2="23.6656">
-<stop offset="0" style="stop-color:#460800"/>
-<stop offset="1" style="stop-color:#992323"/>
+ <stop offset="0" style="stop-color:#460800"/>
+ <stop offset="1" style="stop-color:#992323"/>
</linearGradient>
<path d="M23.025,23.5c-0.17,0-0.335-0.086-0.429-0.241C21.216,20.976,18.234,19.5,15,19.5 s-6.217,1.476-7.598,3.759c-0.143,0.235-0.45,0.312-0.687,0.169s-0.312-0.45-0.169-0.687C8.129,20.125,11.367,18.5,15,18.5 c3.631,0,6.871,1.625,8.453,4.241c0.143,0.236,0.066,0.544-0.17,0.687C23.203,23.477,23.113,23.5,23.025,23.5L23.025,23.5z" fill="url(#SVGID_6_)"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_very_cool.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_very_cool.svg Fri May 14 16:09:54 2010 +0300
@@ -1,54 +1,56 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<g>
-<rect fill="none" height="30" width="30"/>
+ <rect fill="none" height="30" width="30"/>
</g>
-<circle cx="15" cy="15" fill-opacity="0.6" r="14" stroke-opacity="0.6"/>
+<circle cx="15" cy="15" opacity="0.6" r="14"/>
<radialGradient cx="15" cy="3.7026" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="23.0618">
-<stop offset="0" style="stop-color:#FEE891"/>
-<stop offset="0.7818" style="stop-color:#FFB701"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+ <stop offset="0" style="stop-color:#FEE891"/>
+ <stop offset="0.7818" style="stop-color:#FFB701"/>
+ <stop offset="1" style="stop-color:#FFC501"/>
</radialGradient>
<path d="M15,28C7.832,28,2,22.168,2,15C2,7.832,7.832,2,15,2s13,5.832,13,13C28,22.168,22.168,28,15,28L15,28 z" fill="url(#SVGID_1_)"/>
-<path d="M15,3c6.999,0,12.709,5.564,12.975,12.5C27.981,15.333,28,15.169,28,15 c0-7.168-5.832-13-13-13S2,7.832,2,15c0,0.169,0.019,0.333,0.025,0.5C2.291,8.564,8.001,3,15,3z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M28.004,9c0-0.552-0.415-1-0.929-1h-0.498H15H4.359H2.932C2.419,8,2.004,8.448,2.004,9c0,0,0,2.501,0,3 c0,4,2.785,5,6.498,5c3.021,0,5.229-3.359,6.165-6h0.667c0.936,2.641,3.143,6,6.164,6c3.714,0,6.506-1,6.506-5 C28.004,11.501,28.004,9,28.004,9z" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M15,3c6.999,0,12.709,5.564,12.975,12.5C27.981,15.333,28,15.169,28,15 c0-7.168-5.832-13-13-13S2,7.832,2,15c0,0.169,0.019,0.333,0.025,0.5C2.291,8.564,8.001,3,15,3z" fill="#FFFFFF" opacity="0.3"/>
+<path d="M28.004,9c0-0.552-0.415-1-0.929-1h-0.498H15H4.359H2.932C2.419,8,2.004,8.448,2.004,9c0,0,0,2.501,0,3 c0,4,2.785,5,6.498,5c3.021,0,5.229-3.359,6.165-6h0.667c0.936,2.641,3.143,6,6.164,6c3.714,0,6.506-1,6.506-5 C28.004,11.501,28.004,9,28.004,9z" opacity="0.4"/>
<path d="M28.004,8c0-0.552-0.415-1-0.929-1h-0.498H15H4.359H2.932C2.419,7,2.004,7.448,2.004,8c0,0,0,2.501,0,3c0,4,2.785,5,6.498,5 c3.021,0,5.229-3.359,6.165-6h0.667c0.936,2.641,3.143,6,6.164,6c3.714,0,6.506-1,6.506-5C28.004,10.501,28.004,8,28.004,8z"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="8.5781" x2="8.5781" y1="8" y2="14.9378">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#727475"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#727475"/>
</linearGradient>
<path d="M8.502,15c-3.601,0-5.57-0.897-5.57-4c0-1.084,1.259-2.135,1.864-3h9.429 c-0.105,0.908-0.663,2.754-1.867,4.466C11.545,13.622,10.216,15,8.502,15L8.502,15z" fill="url(#SVGID_2_)"/>
<linearGradient gradientTransform="matrix(-1 0 0 1 -656.8359 0)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-678.2617" x2="-678.2617" y1="8" y2="14.9378">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#727475"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#727475"/>
</linearGradient>
<path d="M21.498,15c3.602,0,5.577-0.897,5.577-4c0-1.084-0.329-2.135-0.936-3H15.776 c0.104,0.908,0.663,2.754,1.866,4.466C18.456,13.622,19.785,15,21.498,15L21.498,15z" fill="url(#SVGID_3_)"/>
-<rect fill="#FFFFFF" fill-opacity="0.6" height="1" stroke-opacity="0.6" width="10.212" x="2.932" y="9"/>
-<rect fill="#FFFFFF" fill-opacity="0.6" height="1" stroke-opacity="0.6" width="10.219" x="16.856" y="9"/>
+<rect fill="#FFFFFF" height="1" opacity="0.6" width="10.212" x="2.932" y="9"/>
+<rect fill="#FFFFFF" height="1" opacity="0.6" width="10.219" x="16.856" y="9"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="14.9448" x2="14.9448" y1="15.9014" y2="27.1496">
-<stop offset="0" style="stop-color:#D48D00"/>
-<stop offset="1" style="stop-color:#FFF1B8"/>
+ <stop offset="0" style="stop-color:#D48D00"/>
+ <stop offset="1" style="stop-color:#FFF1B8"/>
</linearGradient>
<path d="M14.945,16C8.945,16,4,17,4,17c0.506,5.606,5.209,10,10.945,10c5.734,0,10.438-4.394,10.944-10 C25.89,17,20.945,16,14.945,16z" fill="url(#SVGID_4_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="14.9448" x2="14.9448" y1="16.9189" y2="26.1216">
-<stop offset="0" style="stop-color:#460800"/>
-<stop offset="1" style="stop-color:#992323"/>
+ <stop offset="0" style="stop-color:#460800"/>
+ <stop offset="1" style="stop-color:#992323"/>
</linearGradient>
<path d="M4,17c0.506,5.046,5.209,9,10.945,9c5.734,0,10.438-3.954,10.944-9H4z" fill="url(#SVGID_5_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="14.9448" x2="14.9448" y1="17.9375" y2="25.0951">
-<stop offset="0" style="stop-color:#E6E6E6"/>
-<stop offset="1" style="stop-color:#FFFFFF"/>
+ <stop offset="0" style="stop-color:#E6E6E6"/>
+ <stop offset="1" style="stop-color:#FFFFFF"/>
</linearGradient>
<path d="M14.945,25c-4.703,0-8.771-2.996-9.76-7h19.52C23.715,22.004,19.646,25,14.945,25L14.945,25z" fill="url(#SVGID_6_)"/>
-<path d="M13.89,24.944c0.33,0.032,0.663,0.052,1,0.054V18h-1V24.944z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M14.89,24.998c0.019,0,0.036,0.002,0.056,0.002c0.318,0,0.633-0.016,0.944-0.043V18h-1V24.998 z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M7.89,22.365c0.313,0.279,0.647,0.539,1,0.781V18h-1V22.365z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M8.89,23.146c0.319,0.219,0.653,0.421,1,0.605V18h-1V23.146z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M19.89,23.813c0.348-0.179,0.679-0.38,1-0.594V18h-1V23.813z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M20.89,23.219c0.351-0.232,0.687-0.48,1-0.752V18h-1V23.219z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M5.512,19h18.865c0.129-0.326,0.243-0.658,0.328-1H5.186C5.27,18.342,5.385,18.674,5.512,19z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M6.634,21c0.263,0.352,0.548,0.688,0.862,1h14.897c0.314-0.313,0.599-0.648,0.862-1H6.634z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M13.89,24.944c0.33,0.032,0.663,0.052,1,0.054V18h-1V24.944z" opacity="0.2"/>
+<path d="M14.89,24.998c0.019,0,0.036,0.002,0.056,0.002c0.318,0,0.633-0.016,0.944-0.043V18h-1V24.998 z" fill="#FFFFFF" opacity="0.5"/>
+<path d="M7.89,22.365c0.313,0.279,0.647,0.539,1,0.781V18h-1V22.365z" opacity="0.2"/>
+<path d="M8.89,23.146c0.319,0.219,0.653,0.421,1,0.605V18h-1V23.146z" fill="#FFFFFF" opacity="0.5"/>
+<path d="M19.89,23.813c0.348-0.179,0.679-0.38,1-0.594V18h-1V23.813z" opacity="0.2"/>
+<path d="M20.89,23.219c0.351-0.232,0.687-0.48,1-0.752V18h-1V23.219z" fill="#FFFFFF" opacity="0.5"/>
+<path d="M5.512,19h18.865c0.129-0.326,0.243-0.658,0.328-1H5.186C5.27,18.342,5.385,18.674,5.512,19z" opacity="0.2"/>
+<path d="M6.634,21c0.263,0.352,0.548,0.688,0.862,1h14.897c0.314-0.313,0.599-0.648,0.862-1H6.634z" opacity="0.2"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_wink.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_wink.svg Fri May 14 16:09:54 2010 +0300
@@ -1,41 +1,43 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<g>
-<rect fill="none" height="30" width="30"/>
+ <rect fill="none" height="30" width="30"/>
</g>
-<circle cx="15" cy="15" fill-opacity="0.6" r="14" stroke-opacity="0.6"/>
+<circle cx="15" cy="15" opacity="0.6" r="14"/>
<radialGradient cx="15" cy="3.7026" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="23.0618">
-<stop offset="0" style="stop-color:#FEE891"/>
-<stop offset="0.7818" style="stop-color:#FFB701"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+ <stop offset="0" style="stop-color:#FEE891"/>
+ <stop offset="0.7818" style="stop-color:#FFB701"/>
+ <stop offset="1" style="stop-color:#FFC501"/>
</radialGradient>
<path d="M15,28C7.832,28,2,22.168,2,15C2,7.832,7.832,2,15,2s13,5.832,13,13C28,22.168,22.168,28,15,28L15,28 z" fill="url(#SVGID_1_)"/>
-<path d="M15,3c6.999,0,12.709,5.564,12.975,12.5C27.981,15.333,28,15.169,28,15 c0-7.168-5.832-13-13-13S2,7.832,2,15c0,0.169,0.019,0.333,0.025,0.5C2.291,8.564,8.001,3,15,3z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M15,3c6.999,0,12.709,5.564,12.975,12.5C27.981,15.333,28,15.169,28,15 c0-7.168-5.832-13-13-13S2,7.832,2,15c0,0.169,0.019,0.333,0.025,0.5C2.291,8.564,8.001,3,15,3z" fill="#FFFFFF" opacity="0.3"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="21.5" x2="21.5" y1="8.7856" y2="15.9438">
-<stop offset="0" style="stop-color:#DB9D00"/>
-<stop offset="1" style="stop-color:#FFEEA9"/>
+ <stop offset="0" style="stop-color:#DB9D00"/>
+ <stop offset="1" style="stop-color:#FFEEA9"/>
</linearGradient>
<path d="M21.5,15.834c-1.426,0-2.5-1.505-2.5-3.5s1.074-3.5,2.5-3.5s2.5,1.505,2.5,3.5 S22.926,15.834,21.5,15.834L21.5,15.834z" fill="url(#SVGID_2_)"/>
<ellipse cx="21.5" cy="12.334" fill="#0C3554" rx="1.5" ry="2.5"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="21.583" x2="21.583" y1="11.9248" y2="15.1028">
-<stop offset="0" style="stop-color:#0C3554"/>
-<stop offset="1" style="stop-color:#6D93B3"/>
+ <stop offset="0" style="stop-color:#0C3554"/>
+ <stop offset="1" style="stop-color:#6D93B3"/>
</linearGradient>
<path d="M20.166,13.457c0.248,0.813,0.749,1.377,1.334,1.377c0.828,0,1.5-1.119,1.5-2.5 c0-0.155-0.012-0.305-0.027-0.452c-0.153-0.03-0.311-0.048-0.473-0.048C21.43,11.834,20.522,12.511,20.166,13.457z" fill="url(#SVGID_3_)"/>
<linearGradient gradientTransform="matrix(-1 0 0 1 -566.5 0)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="-577.7495" x2="-577.7495" y1="8.9351" y2="15.8952">
-<stop offset="0" style="stop-color:#DB9D00"/>
-<stop offset="1" style="stop-color:#FFEEA9"/>
+ <stop offset="0" style="stop-color:#DB9D00"/>
+ <stop offset="1" style="stop-color:#FFEEA9"/>
</linearGradient>
<path d="M9,16c0.754,0,1.394-0.564,1.487-1.313C10.7,13,11.126,13,11.309,13c0.134,0,0.49,0,0.703,1.688 C12.106,15.436,12.746,16,13.5,16h0.057l0.118-0.01c0.41-0.052,0.765-0.253,1.01-0.57c0.246-0.317,0.354-0.71,0.304-1.108 C14.576,11.036,13.107,9,11.154,9c-1.111,0-3.063,0.69-3.644,5.313c-0.05,0.396,0.058,0.79,0.304,1.107 c0.245,0.316,0.6,0.518,0.997,0.568l0.063,0.008L9,16z" fill="url(#SVGID_4_)"/>
<path d="M9,15c0.248,0,0.464-0.185,0.495-0.438C9.786,12.249,10.629,12,11.309,12s1.404,0.249,1.695,2.563 c0.034,0.273,0.273,0.466,0.559,0.434c0.273-0.035,0.468-0.285,0.434-0.559C13.657,11.742,12.542,10,11.154,10 s-2.313,1.742-2.651,4.438c-0.034,0.274,0.16,0.524,0.434,0.559C8.958,14.999,8.979,15,9,15L9,15z" fill="#0C3554"/>
-<path d="M16.448,23.924c-0.495,0.051-1.007,0.077-1.523,0.077c-5.144,0-8.917-1.481-10.095-5.636 c-0.074-0.267-0.354-0.423-0.617-0.346c-0.266,0.076-0.42,0.352-0.344,0.617c0.007,0.026,0.018,0.05,0.024,0.076L3,20.5 c0.475,0,0.91-0.389,1.242-0.796c1.609,3.963,5.59,6.827,10.758,6.827c0.551,0,0.34-0.041,0.871-0.025 c1.127,0.033,1.154-1.863,1.126-2.137C16.969,24.094,16.722,23.893,16.448,23.924z" fill="#FFFFFF" fill-opacity="0.6" stroke-opacity="0.6"/>
-<path d="M16.448,22.924c-0.495,0.051-1.007,0.077-1.523,0.077c-5.144,0-8.917-2.481-10.095-6.636 c-0.074-0.267-0.354-0.423-0.617-0.346c-0.266,0.076-0.42,0.352-0.344,0.617c0.007,0.026,0.018,0.05,0.024,0.076L3,19.5 c0.475,0,0.91-1.389,1.242-1.796c1.609,3.963,5.352,6.79,10.52,6.79c0.551,0,1.099-0.027,1.627-0.083 c0.275-0.028,0.608-0.042,0.608-1.042C16.997,23.092,16.722,22.893,16.448,22.924z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M16.448,23.924c-0.495,0.051-1.007,0.077-1.523,0.077c-5.144,0-8.917-1.481-10.095-5.636 c-0.074-0.267-0.354-0.423-0.617-0.346c-0.266,0.076-0.42,0.352-0.344,0.617c0.007,0.026,0.018,0.05,0.024,0.076L3,20.5 c0.475,0,0.91-0.389,1.242-0.796c1.609,3.963,5.59,6.827,10.758,6.827c0.551,0,0.34-0.041,0.871-0.025 c1.127,0.033,1.154-1.863,1.126-2.137C16.969,24.094,16.722,23.893,16.448,23.924z" fill="#FFFFFF" opacity="0.6"/>
+<path d="M16.448,22.924c-0.495,0.051-1.007,0.077-1.523,0.077c-5.144,0-8.917-2.481-10.095-6.636 c-0.074-0.267-0.354-0.423-0.617-0.346c-0.266,0.076-0.42,0.352-0.344,0.617c0.007,0.026,0.018,0.05,0.024,0.076L3,19.5 c0.475,0,0.91-1.389,1.242-1.796c1.609,3.963,5.352,6.79,10.52,6.79c0.551,0,1.099-0.027,1.627-0.083 c0.275-0.028,0.608-0.042,0.608-1.042C16.997,23.092,16.722,22.893,16.448,22.924z" opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="3" x2="17" y1="21" y2="21">
-<stop offset="0" style="stop-color:#460800"/>
-<stop offset="1" style="stop-color:#992323"/>
+ <stop offset="0" style="stop-color:#460800"/>
+ <stop offset="1" style="stop-color:#992323"/>
</linearGradient>
<path d="M16.448,23.924c-0.495,0.051-1.007,0.077-1.523,0.077c-5.144,0-8.917-2.481-10.095-6.636 c-0.074-0.267-0.354-0.423-0.617-0.346c-0.266,0.076-0.42,0.352-0.344,0.617c0.007,0.026,0.018,0.05,0.024,0.076L3,19.5 c0.475,0,0.91-0.389,1.242-0.796c1.609,3.963,5.515,6.297,10.683,6.297c0.551,0,1.099-0.028,1.627-0.083 c0.274-0.029,0.474-0.275,0.445-0.549C16.969,24.094,16.722,23.893,16.448,23.924z" fill="url(#SVGID_5_)"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_wink_grin.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_wink_grin.svg Fri May 14 16:09:54 2010 +0300
@@ -1,53 +1,55 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<g>
-<rect fill="none" height="30" width="30"/>
+ <rect fill="none" height="30" width="30"/>
</g>
-<circle cx="15" cy="15" fill-opacity="0.6" r="14" stroke-opacity="0.6"/>
+<circle cx="15" cy="15" opacity="0.6" r="14"/>
<radialGradient cx="15" cy="3.7026" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="23.0618">
-<stop offset="0" style="stop-color:#FEE891"/>
-<stop offset="0.7818" style="stop-color:#FFB701"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+ <stop offset="0" style="stop-color:#FEE891"/>
+ <stop offset="0.7818" style="stop-color:#FFB701"/>
+ <stop offset="1" style="stop-color:#FFC501"/>
</radialGradient>
<path d="M15,28C7.832,28,2,22.168,2,15C2,7.832,7.832,2,15,2s13,5.832,13,13C28,22.168,22.168,28,15,28L15,28 z" fill="url(#SVGID_1_)"/>
-<path d="M15,3c6.999,0,12.709,5.564,12.975,12.5C27.981,15.333,28,15.169,28,15 c0-7.168-5.832-13-13-13S2,7.832,2,15c0,0.169,0.019,0.333,0.025,0.5C2.291,8.564,8.001,3,15,3z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M15,3c6.999,0,12.709,5.564,12.975,12.5C27.981,15.333,28,15.169,28,15 c0-7.168-5.832-13-13-13S2,7.832,2,15c0,0.169,0.019,0.333,0.025,0.5C2.291,8.564,8.001,3,15,3z" fill="#FFFFFF" opacity="0.3"/>
<linearGradient gradientTransform="matrix(0.966 0.2584 -0.2584 0.966 -118.0704 191.8488)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="83.0156" x2="83.0156" y1="-203.2881" y2="-194.0849">
-<stop offset="0" style="stop-color:#D48D00"/>
-<stop offset="1" style="stop-color:#FFF1B8"/>
+ <stop offset="0" style="stop-color:#D48D00"/>
+ <stop offset="1" style="stop-color:#FFF1B8"/>
</linearGradient>
<path d="M12.306,25.696c-4.1-1.097-7.131-5.184-8.119-8.915l-0.439-1.656c0,0,7.074,0.857,10.939,1.892 C18.55,18.051,25,20.811,25,20.811l-1.206,1.216C21.073,24.766,16.407,26.793,12.306,25.696L12.306,25.696z" fill="url(#SVGID_2_)"/>
<linearGradient gradientTransform="matrix(0.966 0.2584 -0.2584 0.966 -118.0704 191.8488)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="83.0156" x2="83.0156" y1="-202.2705" y2="-195.1119">
-<stop offset="0" style="stop-color:#460800"/>
-<stop offset="1" style="stop-color:#992323"/>
+ <stop offset="0" style="stop-color:#460800"/>
+ <stop offset="1" style="stop-color:#992323"/>
</linearGradient>
<path d="M12.564,24.73c-4.101-1.098-7.39-4.218-8.378-7.949l-0.439-1.656L25,20.811l-1.206,1.216 C21.073,24.766,16.665,25.827,12.564,24.73L12.564,24.73z" fill="url(#SVGID_3_)"/>
<linearGradient gradientTransform="matrix(0.966 0.2584 -0.2584 0.966 -118.0704 191.8488)" gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="83.0166" x2="83.0166" y1="-201.252" y2="-196.1404">
-<stop offset="0" style="stop-color:#E6E6E6"/>
-<stop offset="1" style="stop-color:#FFFFFF"/>
+ <stop offset="0" style="stop-color:#E6E6E6"/>
+ <stop offset="1" style="stop-color:#FFFFFF"/>
</linearGradient>
<path d="M12.823,23.764c3.863,1.034,7.82-0.02,10.225-2.439L5.183,16.545 C6.057,19.842,8.959,22.73,12.823,23.764z" fill="url(#SVGID_4_)"/>
-<path d="M11.786,23.429c0.32,0.118,0.646,0.228,0.982,0.319l1.291-4.828l-0.996-0.268L11.786,23.429z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M12.769,23.748c0.019,0.004,0.036,0.012,0.055,0.016c0.317,0.086,0.635,0.154,0.953,0.211 l1.28-4.789L14.06,18.92L12.769,23.748z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M18.058,23.936c0.393-0.08,0.775-0.187,1.15-0.307l0.832-3.109l-0.997-0.268L18.058,23.936z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M19.208,23.629c0.408-0.133,0.809-0.283,1.19-0.461l0.638-2.383L20.04,20.52L19.208,23.629z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
-<path d="M22.136,22.115c0.322-0.246,0.63-0.508,0.912-0.791L5.183,16.545c0.104,0.387,0.238,0.768,0.395,1.141 L22.136,22.115z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M6.688,19.395c0.231,0.352,0.486,0.689,0.765,1.014l0.813-3.039L7.3,17.111L6.688,19.395z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M7.269,20.358c0.262,0.296,0.541,0.581,0.84,0.852l0.969-3.624L8.081,17.32L7.269,20.358z" fill="#FFFFFF" fill-opacity="0.5" stroke-opacity="0.5"/>
+<path d="M11.786,23.429c0.32,0.118,0.646,0.228,0.982,0.319l1.291-4.828l-0.996-0.268L11.786,23.429z" opacity="0.2"/>
+<path d="M12.769,23.748c0.019,0.004,0.036,0.012,0.055,0.016c0.317,0.086,0.635,0.154,0.953,0.211 l1.28-4.789L14.06,18.92L12.769,23.748z" fill="#FFFFFF" opacity="0.5"/>
+<path d="M18.058,23.936c0.393-0.08,0.775-0.187,1.15-0.307l0.832-3.109l-0.997-0.268L18.058,23.936z" opacity="0.2"/>
+<path d="M19.208,23.629c0.408-0.133,0.809-0.283,1.19-0.461l0.638-2.383L20.04,20.52L19.208,23.629z" fill="#FFFFFF" opacity="0.5"/>
+<path d="M22.136,22.115c0.322-0.246,0.63-0.508,0.912-0.791L5.183,16.545c0.104,0.387,0.238,0.768,0.395,1.141 L22.136,22.115z" opacity="0.2"/>
+<path d="M6.688,19.395c0.231,0.352,0.486,0.689,0.765,1.014l0.813-3.039L7.3,17.111L6.688,19.395z" opacity="0.2"/>
+<path d="M7.269,20.358c0.262,0.296,0.541,0.581,0.84,0.852l0.969-3.624L8.081,17.32L7.269,20.358z" fill="#FFFFFF" opacity="0.5"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="20.5" x2="20.5" y1="8.7856" y2="15.9438">
-<stop offset="0" style="stop-color:#DB9D00"/>
-<stop offset="1" style="stop-color:#FFEEA9"/>
+ <stop offset="0" style="stop-color:#DB9D00"/>
+ <stop offset="1" style="stop-color:#FFEEA9"/>
</linearGradient>
<path d="M20.5,15.834c-1.425,0-2.5-1.505-2.5-3.5s1.075-3.5,2.5-3.5c1.426,0,2.5,1.505,2.5,3.5 S21.926,15.834,20.5,15.834L20.5,15.834z" fill="url(#SVGID_5_)"/>
<ellipse cx="20.5" cy="12.334" fill="#0C3554" rx="1.5" ry="2.5"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_6_" x1="20.584" x2="20.584" y1="11.9248" y2="15.1028">
-<stop offset="0" style="stop-color:#0C3554"/>
-<stop offset="1" style="stop-color:#6D93B3"/>
+ <stop offset="0" style="stop-color:#0C3554"/>
+ <stop offset="1" style="stop-color:#6D93B3"/>
</linearGradient>
<path d="M19.167,13.457c0.247,0.813,0.749,1.377,1.333,1.377c0.829,0,1.5-1.119,1.5-2.5 c0-0.155-0.011-0.305-0.027-0.452c-0.152-0.03-0.311-0.048-0.473-0.048C20.43,11.834,19.523,12.511,19.167,13.457z" fill="url(#SVGID_6_)"/>
-<path d="M12,14.833c-0.209,0-0.403-0.132-0.474-0.34c-0.042-0.121-0.932-2.159-4.491-2.159 c-0.276,0-0.534-0.724-0.534-1s0.224-0.5,0.5-0.5c4.312,0,5.429,3.205,5.474,3.341c0.088,0.262-0.055,0.545-0.316,0.632 C12.105,14.825,12.053,14.833,12,14.833L12,14.833z" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M12,14.021c-0.209,0-0.403-0.132-0.474-0.34c-0.042-0.121-0.993-3.066-4.552-3.066 c-0.277,0-0.474-0.503-0.474-0.78s0.224-0.5,0.5-0.5c4.312,0,5.429,3.892,5.474,4.028c0.088,0.262-0.055,0.545-0.316,0.632 c-0.053,0.018-0.105-0.661-0.158-0.661V14.021z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M12,14.833c-0.209,0-0.403-0.132-0.474-0.34c-0.042-0.121-0.932-2.159-4.491-2.159 c-0.276,0-0.534-0.724-0.534-1s0.224-0.5,0.5-0.5c4.312,0,5.429,3.205,5.474,3.341c0.088,0.262-0.055,0.545-0.316,0.632 C12.105,14.825,12.053,14.833,12,14.833L12,14.833z" opacity="0.4"/>
+<path d="M12,14.021c-0.209,0-0.403-0.132-0.474-0.34c-0.042-0.121-0.993-3.066-4.552-3.066 c-0.277,0-0.474-0.503-0.474-0.78s0.224-0.5,0.5-0.5c4.312,0,5.429,3.892,5.474,4.028c0.088,0.262-0.055,0.545-0.316,0.632 c-0.053,0.018-0.105-0.661-0.158-0.661V14.021z" fill="#FFFFFF" opacity="0.3"/>
<path d="M12,14.334c-0.209,0-0.403-0.132-0.474-0.34c-0.042-0.121-0.966-2.659-4.525-2.659 c-0.276,0-0.5-0.224-0.5-0.5s0.224-0.5,0.5-0.5c4.312,0,5.429,3.205,5.474,3.341c0.088,0.262-0.055,0.545-0.316,0.632 C12.105,14.326,12.053,14.334,12,14.334L12,14.334z" fill="#0C3554"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_wondering.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_smiley_wondering.svg Fri May 14 16:09:54 2010 +0300
@@ -1,42 +1,44 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<g>
-<rect fill="none" height="30" width="30"/>
+ <rect fill="none" height="30" width="30"/>
</g>
-<circle cx="15" cy="15" fill-opacity="0.6" r="14" stroke-opacity="0.6"/>
+<circle cx="15" cy="15" opacity="0.6" r="14"/>
<radialGradient cx="15" cy="3.7026" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="23.0618">
-<stop offset="0" style="stop-color:#FEE891"/>
-<stop offset="0.7818" style="stop-color:#FFB701"/>
-<stop offset="1" style="stop-color:#FFC501"/>
+ <stop offset="0" style="stop-color:#FEE891"/>
+ <stop offset="0.7818" style="stop-color:#FFB701"/>
+ <stop offset="1" style="stop-color:#FFC501"/>
</radialGradient>
<path d="M15,28C7.832,28,2,22.168,2,15C2,7.832,7.832,2,15,2s13,5.832,13,13C28,22.168,22.168,28,15,28L15,28 z" fill="url(#SVGID_1_)"/>
-<path d="M15,3c6.999,0,12.709,5.564,12.975,12.5C27.981,15.333,28,15.169,28,15 c0-7.168-5.832-13-13-13S2,7.832,2,15c0,0.169,0.019,0.333,0.025,0.5C2.291,8.564,8.001,3,15,3z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
-<path d="M20.797,24.961c-0.095,0.545-0.393,0.946-0.664,0.898l-10.835-1.9 c-0.272-0.048-0.415-0.527-0.319-1.072l0,0c0.096-0.544,0.393-0.945,0.664-0.898l10.836,1.901 C20.75,23.938,20.893,24.416,20.797,24.961L20.797,24.961z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M20.971,23.977c-0.096,0.544-0.394,0.945-0.666,0.898L9.471,22.974c-0.272-0.048-0.416-0.526-0.32-1.071l0,0 c0.096-0.545,0.394-0.946,0.666-0.898l10.834,1.9C20.923,22.952,21.066,23.432,20.971,23.977L20.971,23.977z" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M15,3c6.999,0,12.709,5.564,12.975,12.5C27.981,15.333,28,15.169,28,15 c0-7.168-5.832-13-13-13S2,7.832,2,15c0,0.169,0.019,0.333,0.025,0.5C2.291,8.564,8.001,3,15,3z" fill="#FFFFFF" opacity="0.3"/>
+<path d="M20.797,24.961c-0.095,0.545-0.393,0.946-0.664,0.898l-10.835-1.9 c-0.272-0.048-0.415-0.527-0.319-1.072l0,0c0.096-0.544,0.393-0.945,0.664-0.898l10.836,1.901 C20.75,23.938,20.893,24.416,20.797,24.961L20.797,24.961z" fill="#FFFFFF" opacity="0.4"/>
+<path d="M20.971,23.977c-0.096,0.544-0.394,0.945-0.666,0.898L9.471,22.974c-0.272-0.048-0.416-0.526-0.32-1.071l0,0 c0.096-0.545,0.394-0.946,0.666-0.898l10.834,1.9C20.923,22.952,21.066,23.432,20.971,23.977L20.971,23.977z" opacity="0.4"/>
<path d="M20.884,24.469c-0.048,0.271-0.307,0.453-0.579,0.406L9.471,22.974c-0.272-0.048-0.454-0.307-0.406-0.579 l0,0c0.048-0.271,0.307-0.453,0.578-0.406l10.836,1.901C20.75,23.938,20.932,24.196,20.884,24.469L20.884,24.469z" fill="#3B2314"/>
-<path d="M28,14c0,0.553-0.205,1-0.459,1H16.459C16.205,15,16,14.553,16,14l0,0c0-0.553,0.205-1,0.459-1h11.082 C27.795,13,28,13.447,28,14L28,14z" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M28,14c0,0.553-0.205,1-0.459,1H16.459C16.205,15,16,14.553,16,14l0,0c0-0.553,0.205-1,0.459-1h11.082 C27.795,13,28,13.447,28,14L28,14z" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="22.4746" x2="22.4746" y1="8.208" y2="18.834">
-<stop offset="0" style="stop-color:#DB9D00"/>
-<stop offset="1" style="stop-color:#FFEEA9"/>
+ <stop offset="0" style="stop-color:#DB9D00"/>
+ <stop offset="1" style="stop-color:#FFEEA9"/>
</linearGradient>
<path d="M22.475,19c2.863,0,5.221-2.201,5.475-5H17C17.254,16.799,19.611,19,22.475,19z" fill="url(#SVGID_2_)"/>
<path d="M22.475,18c2.314,0,4.197-1.753,4.449-4h-8.898C18.277,16.247,20.16,18,22.475,18z" fill="#FFFFFF"/>
-<path d="M27.762,15c0.092-0.322,0.156-0.656,0.188-1H17c0.031,0.344,0.096,0.678,0.188,1H27.762z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M27.762,15c0.092-0.322,0.156-0.656,0.188-1H17c0.031,0.344,0.096,0.678,0.188,1H27.762z" opacity="0.2"/>
<path d="M23.525,16c1.207,0,2.217-0.86,2.449-2h-4.898C21.309,15.14,22.318,16,23.525,16z" fill="#0C3554"/>
-<path d="M28,13c0,0.553-0.205,1-0.459,1H16.459C16.205,14,16,13.553,16,13l0,0 c0-0.553,0.205-1,0.459-1h11.082C27.795,12,28,12.447,28,13L28,13z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M28,13c0,0.553-0.205,1-0.459,1H16.459C16.205,14,16,13.553,16,13l0,0 c0-0.553,0.205-1,0.459-1h11.082C27.795,12,28,12.447,28,13L28,13z" fill="#FFFFFF" opacity="0.3"/>
<path d="M28,13.5c0,0.276-0.205,0.5-0.459,0.5H16.459C16.205,14,16,13.776,16,13.5l0,0c0-0.276,0.205-0.5,0.459-0.5 h11.082C27.795,13,28,13.224,28,13.5L28,13.5z" fill="#3B2314"/>
-<path d="M15,14c0,0.553-0.205,1-0.459,1H3.459C3.205,15,3,14.553,3,14l0,0c0-0.553,0.205-1,0.459-1h11.082 C14.795,13,15,13.447,15,14L15,14z" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M15,14c0,0.553-0.205,1-0.459,1H3.459C3.205,15,3,14.553,3,14l0,0c0-0.553,0.205-1,0.459-1h11.082 C14.795,13,15,13.447,15,14L15,14z" opacity="0.4"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="9.4746" x2="9.4746" y1="8.208" y2="18.834">
-<stop offset="0" style="stop-color:#DB9D00"/>
-<stop offset="1" style="stop-color:#FFEEA9"/>
+ <stop offset="0" style="stop-color:#DB9D00"/>
+ <stop offset="1" style="stop-color:#FFEEA9"/>
</linearGradient>
<path d="M9.475,19c2.863,0,5.221-2.201,5.475-5H4C4.254,16.799,6.611,19,9.475,19z" fill="url(#SVGID_3_)"/>
<path d="M9.475,18c2.314,0,4.197-1.753,4.449-4H5.025C5.277,16.247,7.16,18,9.475,18z" fill="#FFFFFF"/>
-<path d="M14.762,15c0.092-0.322,0.156-0.656,0.188-1H4c0.031,0.344,0.096,0.678,0.188,1H14.762z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M14.762,15c0.092-0.322,0.156-0.656,0.188-1H4c0.031,0.344,0.096,0.678,0.188,1H14.762z" opacity="0.2"/>
<path d="M10.525,16c1.207,0,2.217-0.86,2.449-2H8.076C8.309,15.14,9.318,16,10.525,16z" fill="#0C3554"/>
-<path d="M15,13c0,0.553-0.205,1-0.459,1H3.459C3.205,14,3,13.553,3,13l0,0c0-0.553,0.205-1,0.459-1 h11.082C14.795,12,15,12.447,15,13L15,13z" fill="#FFFFFF" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M15,13c0,0.553-0.205,1-0.459,1H3.459C3.205,14,3,13.553,3,13l0,0c0-0.553,0.205-1,0.459-1 h11.082C14.795,12,15,12.447,15,13L15,13z" fill="#FFFFFF" opacity="0.3"/>
<path d="M15,13.5c0,0.276-0.205,0.5-0.459,0.5H3.459C3.205,14,3,13.776,3,13.5l0,0C3,13.224,3.205,13,3.459,13 h11.082C14.795,13,15,13.224,15,13.5L15,13.5z" fill="#3B2314"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sound.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sound.svg Fri May 14 16:09:54 2010 +0300
@@ -1,18 +1,33 @@
-<?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">
-<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;"/>
+<?xml version="1.0" ?>
+<!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">
+
+<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" 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="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" 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" opacity="0.4" style="enable-background:new;"/>
+
+<rect fill="#FFFFFF" height="0.938" opacity="0.4" style="enable-background:new;" width="14.06" x="11.25" y="3.75"/>
+
<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>
+
</defs>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_star_non_favourited.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_star_non_favourited.svg Fri May 14 16:09:54 2010 +0300
@@ -1,17 +1,16 @@
-<?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 fill-opacity="None" stroke-opacity="None">
-<rect fill="none" height="30" width="30"/>
-<polygon fill-opacity="0.6" points="15.006,22.895 5.718,29.71 9.3,18.732 0,11.963 11.473,11.963 15.009,1 18.531,11.963 30,11.963 20.709,18.732 24.281,29.711 " stroke-opacity="0.6"/>
-<path d="M17.823,12.963l-2.816-8.717l-2.827,8.717H3.001l7.444,5.387l-2.862,8.723l7.424-5.416l7.413,5.416 l-2.855-8.723l7.437-5.387H17.823z" fill="url(#SVGID_1_)"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="12.907,13.963 15.005,7.493 17.096,13.963 25.621,13.963 27.001,12.963 17.823,12.963 15.007,4.246 12.18,12.963 3.001,12.963 4.383,13.963 " stroke-opacity="0.4"/>
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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 opacity="None">
+<defs>
+</defs>
+<polygon 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 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="2.9937" y2="27.438">
+ <stop offset="0" style="stop-color:#FFE896"/>
+ <stop offset="1" style="stop-color:#FFB701"/>
+</linearGradient>
+<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 "/>
+<polygon fill="#FFFFFF" fill-opacity="0.4" points="11.693,11.954 15,5.253 18.307,11.954 26.959,13.201 27.852,12.331 18.971,11.04 15,2.994 11.029,11.04 2.149,12.331 3.042,13.201 "/>
<rect fill="none" height="30" width="30"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15.0005" x2="15.0005" y1="4.2461" y2="27.0728">
-<stop offset="0" style="stop-color:#FECF5E"/>
-<stop offset="1" style="stop-color:#FF9E01"/>
-</linearGradient>
-</defs>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_star_offline.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_star_offline.svg Fri May 14 16:09:54 2010 +0300
@@ -1,27 +1,34 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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.006,22.895 5.718,29.71 9.3,18.732 0,11.963 11.473,11.963 15.009,1 18.531,11.963 30,11.963 20.709,18.732 24.281,29.711 " stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15.0005" x2="15.0005" y1="4.2461" y2="27.0728">
-<stop offset="0" style="stop-color:#FECF5E"/>
-<stop offset="1" style="stop-color:#FF9E01"/>
+<defs>
+</defs>
+<polygon 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 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="2.9937" y2="27.438">
+ <stop offset="0" style="stop-color:#FFE896"/>
+ <stop offset="1" style="stop-color:#FFB701"/>
</linearGradient>
-<path d="M17.823,12.963l-2.816-8.717l-2.827,8.717H3.001l7.444,5.387l-2.862,8.723l7.424-5.416l7.413,5.416 l-2.855-8.723l7.437-5.387H17.823z" fill="url(#SVGID_1_)"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="12.907,13.963 15.005,7.493 17.096,13.963 25.621,13.963 27.001,12.963 17.823,12.963 15.007,4.246 12.18,12.963 3.001,12.963 4.383,13.963 " stroke-opacity="0.4"/>
+<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 "/>
+<polygon fill="#FFFFFF" fill-opacity="0.4" points="11.693,11.954 15,5.253 18.307,11.954 26.959,13.201 27.852,12.331 18.971,11.04 15,2.994 11.029,11.04 2.149,12.331 3.042,13.201 "/>
<rect fill="none" height="30" width="30"/>
</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"/>
+<rect height="34.27" 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>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sync.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_sync.svg Fri May 14 16:09:54 2010 +0300
@@ -1,25 +1,27 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
+<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" opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="9.9995" x2="9.9995" y1="3.5" y2="26.5005">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+ <stop offset="0" style="stop-color:#A0F800"/>
+ <stop offset="1" style="stop-color:#319E00"/>
</linearGradient>
<path d="M10,16.5v-4h4l-6-9l-6,9h4v4c0,8,5,10,12,10C16,26.5,10,23.5,10,16.5z" fill="url(#SVGID_1_)"/>
-<path d="M10,16.5V18c0,3.939,1.9,6.612,3.918,8.195C15.176,26.405,16.541,26.5,18,26.5 C16,26.5,10,23.5,10,16.5z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="8,5 13,12.5 14,12.5 8,3.5 2,12.5 3,12.5 " stroke-opacity="0.4"/>
-<path d="M14.131,16.5H19v-3c0-6.655-5.764-9-7-9l-1-1l1-1c5.58,0,13,1.141,13,11v3h4.869L22,28.303L14.131,16.5z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M10,16.5V18c0,3.939,1.9,6.612,3.918,8.195C15.176,26.405,16.541,26.5,18,26.5 C16,26.5,10,23.5,10,16.5z" fill="#FFFFFF" opacity="0.4"/>
+<polygon fill="#FFFFFF" opacity="0.4" points="8,5 13,12.5 14,12.5 8,3.5 2,12.5 3,12.5 "/>
+<path d="M14.131,16.5H19v-3c0-6.655-5.764-9-7-9l-1-1l1-1c5.58,0,13,1.141,13,11v3h4.869L22,28.303L14.131,16.5z" opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="20" x2="20" y1="3.5" y2="26.5005">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+ <stop offset="0" style="stop-color:#4EDEFF"/>
+ <stop offset="1" style="stop-color:#048CC6"/>
</linearGradient>
<path d="M24,17.5v-4c0-8-5-10-12-10c2,0,8,3,8,10v4h-4l6,9l6-9H24z" fill="url(#SVGID_2_)"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="20,17.5 16,17.5 16.666,18.5 20,18.5 " stroke-opacity="0.4"/>
-<path d="M24,14.5v-1c0-8-5-10-12-10c0.707,0,1.914,0.384,3.178,1.177C20.461,5.299,24,7.776,24,14.5z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="24,17.5 24,18.5 27.334,18.5 28,17.5 " stroke-opacity="0.4"/>
+<polygon fill="#FFFFFF" opacity="0.4" points="20,17.5 16,17.5 16.666,18.5 20,18.5 "/>
+<path d="M24,14.5v-1c0-8-5-10-12-10c0.707,0,1.914,0.384,3.178,1.177C20.461,5.299,24,7.776,24,14.5z" fill="#FFFFFF" opacity="0.4"/>
+<polygon fill="#FFFFFF" opacity="0.4" points="24,17.5 24,18.5 27.334,18.5 28,17.5 "/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_tag_inactive.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_tag_inactive.svg Fri May 14 16:09:54 2010 +0300
@@ -1,21 +1,21 @@
-<?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 fill-opacity="None" stroke-opacity="None">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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 opacity="None">
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
-<path d="M2,12.731V4.094L4.094,2h8.638l15.683,15.683L17.683,28.414L2,12.731z M6.904,5.952 c-0.525,0-0.952,0.427-0.952,0.952s0.427,0.953,0.952,0.953S7.857,7.43,7.857,6.904S7.43,5.952,6.904,5.952L6.904,5.952z" fill-opacity="0.6" stroke-opacity="0.6"/>
+<path d="M2,12.731V4.094L4.094,2h8.638l15.683,15.683L17.683,28.414L2,12.731z M6.904,5.952 c-0.525,0-0.952,0.427-0.952,0.952s0.427,0.953,0.952,0.953S7.857,7.43,7.857,6.904S7.43,5.952,6.904,5.952L6.904,5.952z" opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="3" y2="27.0005">
+ <stop offset="0" style="stop-color:#4EDEFF"/>
+ <stop offset="1" style="stop-color:#048CC6"/>
+</linearGradient>
<path d="M27,17.683L12.317,3h-7.81L3,4.508v7.81L17.683,27L27,17.683z M6.904,8.857 c-1.078,0-1.952-0.875-1.952-1.953s0.874-1.952,1.952-1.952s1.953,0.874,1.953,1.952S7.982,8.857,6.904,8.857z" fill="url(#SVGID_1_)"/>
-<path d="M6.904,9.857c1.078,0,1.953-0.875,1.953-1.953c0-0.174-0.03-0.34-0.072-0.5 C8.563,8.239,7.809,8.857,6.904,8.857S5.247,8.239,5.025,7.404c-0.043,0.16-0.073,0.326-0.073,0.5 C4.952,8.982,5.826,9.857,6.904,9.857z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="12.317,4 26.5,18.183 27,17.683 12.317,3 4.508,3 3,4.508 3,5.508 4.508,4 " stroke-opacity="0.4"/>
+<path d="M6.904,9.857c1.078,0,1.953-0.875,1.953-1.953c0-0.174-0.03-0.34-0.072-0.5 C8.563,8.239,7.809,8.857,6.904,8.857S5.247,8.239,5.025,7.404c-0.043,0.16-0.073,0.326-0.073,0.5 C4.952,8.982,5.826,9.857,6.904,9.857z" fill="#FFFFFF" opacity="0.4"/>
+<polygon fill="#FFFFFF" opacity="0.4" points="12.317,4 26.5,18.183 27,17.683 12.317,3 4.508,3 3,4.508 3,5.508 4.508,4 "/>
<rect fill="#FFFFFF" height="7.321" transform="matrix(0.7071 0.7071 -0.7071 0.7071 16.0459 -6.6464)" width="11.95" x="10.071" y="12.385"/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="17.683,22.859 9.232,14.43 8.662,15 17.683,24 23.43,18.253 22.859,17.683 " stroke-opacity="0.4"/>
-<polygon fill-opacity="0.15" points="14.409,10.373 22.289,18.253 22.859,17.683 14.409,9.232 9.232,14.409 9.803,14.979 " stroke-opacity="0.15"/>
+<polygon fill="#FFFFFF" opacity="0.4" points="17.683,22.859 9.232,14.43 8.662,15 17.683,24 23.43,18.253 22.859,17.683 "/>
+<polygon opacity="0.15" points="14.409,10.373 22.289,18.253 22.859,17.683 14.409,9.232 9.232,14.409 9.803,14.979 "/>
<rect fill="none" height="30" width="30"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="3" y2="27.0005">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
-</linearGradient>
-</defs>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_telephony_offline.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_telephony_offline.svg Fri May 14 16:09:54 2010 +0300
@@ -1,38 +1,46 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
-<path d="M23.199,30c-0.816,0-2.131-0.104-3.754-0.592c-2.514-0.758-7.971-4.254-11.512-7.795 c-3.584-3.586-6.553-8.342-7.141-9.887c-0.941-2.486-0.881-5.271-0.639-6.21c0.039-0.13,0.242-0.725,0.691-1.528l0.166-0.289 c0.297-0.488,0.602-0.924,0.938-1.328C2.076,2.218,2.16,2.104,2.234,2.004c0.162-0.221,0.316-0.43,0.67-0.74 c0.793-0.697,1.152-0.939,1.215-0.98C4.406,0.098,4.738,0,5.08,0c0.625,0,1.213,0.316,1.574,0.846l5.164,7.584 c0.291,0.428,0.4,0.956,0.301,1.448c-0.094,0.466-0.363,0.862-0.758,1.116l-2.135,1.367c1.08,1.688,2.367,3.244,4.104,4.98 c1.111,1.111,2.662,2.242,3.879,3.031L17.998,21l0.217-0.811l0.518-0.871c0.307-0.523,0.873-0.842,1.514-0.842 c0.26,0,0.516,0.053,0.758,0.154l0.057,0.023l2.725,1.557l5.26,3.053c0.438,0.25,0.764,0.67,0.893,1.148 c0.121,0.453,0.061,0.922-0.17,1.32c-0.053,0.082-0.258,0.385-0.807,1.068l-0.012,0.061l-0.18,0.184 c-0.291,0.354-0.404,0.463-0.699,0.729l-0.18,0.164c-1.439,1.316-3.023,1.844-3.09,1.867C24.326,29.973,23.592,30,23.199,30 L23.199,30z" fill-opacity="0.6" stroke-opacity="0.6"/>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="12.7437" x2="12.7437" y1="2.375" y2="29.2518">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+<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 " enable-background="new " opacity="0.6"/>
+<linearGradient gradientTransform="matrix(-4.371139e-008 1 1 4.371139e-008 396.0192 -292.4791)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="305.3745" x2="305.3745" y1="-369.2378" y2="-394.3224">
+ <stop offset="0" style="stop-color:#A0F800"/>
+ <stop offset="1" style="stop-color:#319E00"/>
</linearGradient>
-<path d="M7.865,12.045c1.365,2.35,3,4.244,4.758,6.004c1.693,1.693,4.389,3.463,5.594,4.088l6.273,6.717 c-0.553,0.197-2.414,0.303-4.756-0.402c-2.344-0.707-7.668-4.117-11.094-7.545c-3.424-3.426-6.354-8.064-6.912-9.533 C0.852,9.059,0.93,6.508,1.121,5.766c0,0,0.223-0.676,0.748-1.553C2.094,3.837,7.865,12.045,7.865,12.045z" fill="url(#SVGID_1_)"/>
-<radialGradient cx="22.123" cy="17.5088" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="12.7529">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+<path d="M17.757,8.34c-2.193,1.274-3.96,2.8-5.603,4.441c-1.58,1.581-3.231,4.096-3.815,5.221L2.07,23.858 c-0.185-0.516-0.284-2.254,0.374-4.439c0.66-2.188,3.843-7.157,7.042-10.354c3.198-3.196,7.526-5.93,8.897-6.451 c2.161-0.817,4.542-0.744,5.235-0.566c0,0,0.631,0.208,1.449,0.697C25.418,2.955,17.757,8.34,17.757,8.34z" fill="url(#SVGID_1_)"/>
+<radialGradient cx="314.1274" cy="-383.3599" gradientTransform="matrix(-4.371139e-008 1 1 4.371139e-008 396.0192 -292.4791)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="11.9051">
+ <stop offset="0" style="stop-color:#A0F800"/>
+ <stop offset="1" style="stop-color:#319E00"/>
</radialGradient>
-<path d="M28.543,24.129l-5.254-3.049l-2.672-1.527c-0.391-0.164-0.828-0.059-1.025,0.277l-0.77,1.293v0.002 l-0.605,1.012c-0.002-0.002-0.006-0.008-0.008-0.01c-0.396,3.107,1.551,6.043,4.549,6.701c0.396,0.086,0.791,0.129,1.18,0.131 c0.238-0.027,0.432-0.064,0.553-0.105c0,0,1.428-0.467,2.725-1.654c0.434-0.395,0.475-0.41,0.809-0.824 c0.002-0.002,0.002-0.004,0.004-0.008c0.658-0.813,0.875-1.137,0.875-1.137C29.117,24.859,28.957,24.365,28.543,24.129z" fill="url(#SVGID_2_)"/>
-<path d="M18.822,21.123l0.77-1.293c0.197-0.336,0.635-0.441,1.025-0.277l2.672,1.527l5.254,3.049 c0.414,0.236,0.574,0.73,0.359,1.102c0,0-0.217,0.326-0.881,1.143L18.822,21.123z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<radialGradient cx="4.623" cy="1.8936" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="12.9256">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
+<path d="M6.479,27.641l2.846-4.904l1.426-2.494c0.153-0.363,0.055-0.771-0.259-0.957l-1.207-0.717H9.283 l-0.944-0.566c0.002-0.002,0.008-0.006,0.01-0.008c-2.9-0.369-5.641,1.449-6.255,4.246c-0.08,0.371-0.12,0.738-0.122,1.102 c0.025,0.223,0.061,0.403,0.099,0.517c0,0,0.436,1.332,1.543,2.543c0.369,0.405,0.383,0.444,0.77,0.755 c0.001,0.002,0.003,0.002,0.007,0.004c0.76,0.615,1.062,0.816,1.062,0.816C5.798,28.176,6.259,28.028,6.479,27.641z" fill="url(#SVGID_2_)"/>
+<path d="M9.285,18.569l1.207,0.717c0.313,0.186,0.412,0.594,0.259,0.957 l-1.426,2.494l-2.846,4.904c-0.221,0.387-0.682,0.535-1.028,0.334c0,0-0.304-0.201-1.067-0.82L9.285,18.569z" enable-background="new " fill="#FFFFFF" opacity="0.4"/>
+<radialGradient cx="297.7944" cy="-368.7876" gradientTransform="matrix(-4.371139e-008 1 1 4.371139e-008 396.0192 -292.4791)" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="12.0638">
+ <stop offset="0" style="stop-color:#A0F800"/>
+ <stop offset="1" style="stop-color:#319E00"/>
</radialGradient>
-<path d="M10.99,8.992L5.828,1.41c-0.271-0.4-0.791-0.529-1.162-0.289c0,0-0.322,0.209-1.1,0.893 c0,0.001-0.002,0-0.002,0.002C3.141,2.388,3.121,2.527,2.719,3.011C2.16,3.684,1.768,4.354,1.512,4.867 C0.9,8.109,2.879,11.258,6,11.943c0.637,0.141,1.271,0.162,1.887,0.088l1.754-1.123l1.18-0.755 C11.191,9.914,11.264,9.395,10.99,8.992z" fill="url(#SVGID_3_)"/>
-<path d="M3.564,2.016C4.344,1.33,4.666,1.121,4.666,1.121C5.037,0.881,5.557,1.01,5.828,1.41 l5.162,7.582c0.273,0.402,0.201,0.922-0.17,1.161l-1.18,0.755L3.564,2.016z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M20.607,11.257l7.076-4.818c0.373-0.252,0.494-0.738,0.27-1.084c0,0-0.195-0.301-0.832-1.027 c-0.001,0,0-0.002-0.002-0.002c-0.348-0.395-0.478-0.414-0.929-0.789c-0.628-0.521-1.253-0.888-1.733-1.126 C21.432,1.84,18.492,3.688,17.854,6.6c-0.134,0.595-0.152,1.187-0.082,1.762l1.046,1.637l0.707,1.101 C19.746,11.445,20.232,11.513,20.607,11.257z" fill="url(#SVGID_3_)"/>
+<path d="M27.119,4.327c0.639,0.728,0.834,1.029,0.834,1.029 c0.225,0.346,0.104,0.832-0.27,1.084l-7.076,4.818c-0.374,0.255-0.861,0.188-1.082-0.159l-0.707-1.101L27.119,4.327z" enable-background="new " fill="#FFFFFF" opacity="0.4"/>
<rect fill="none" height="30" width="30"/>
</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"/>
+<rect height="34.27" 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>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_text.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_text.svg Fri May 14 16:09:54 2010 +0300
@@ -1,19 +1,17 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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 27,1 27,22.414 20.414,29 " stroke-opacity="0.6"/>
+<polygon opacity="0.6" points="3,29 3,1 27,1 27,22.414 20.414,29 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="2" y2="28.0005">
+ <stop offset="0" style="stop-color:#F9F9F9"/>
+ <stop offset="1" style="stop-color:#B5B5B5"/>
+</linearGradient>
<polygon fill="url(#SVGID_1_)" points="4,2 4,28 20,28 26,22 26,2 "/>
<polygon fill="#FFFFFF" points="26,22 20,22 20,28 "/>
-<rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="16" x="7" y="6.5"/>
-<rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="16" x="7" y="10.5"/>
-<rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="11" x="7" y="14.5"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="2" y2="28.0005">
-<stop offset="0" style="stop-color:#F9F9F9"/>
-<stop offset="1" style="stop-color:#B5B5B5"/>
-</linearGradient>
-</defs>
+<rect enable-background="new " height="1.5" opacity="0.5" width="16" x="7" y="6.5"/>
+<rect enable-background="new " height="1.5" opacity="0.5" width="16" x="7" y="10.5"/>
+<rect enable-background="new " height="1.5" opacity="0.5" width="11" x="7" y="14.5"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_tick.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_tick.svg Fri May 14 16:09:54 2010 +0300
@@ -1,16 +1,16 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
+<polygon enable-background="new " 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 "/>
+<linearGradient gradientTransform="matrix(0.8824 0 0 0.8824 -227.5791 -1120.5674)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="274.9102" x2="274.9102" y1="1274.2861" y2="1300.495">
+ <stop offset="0" style="stop-color:#A0F800"/>
+ <stop offset="1" style="stop-color:#319E00"/>
+</linearGradient>
<polygon fill="url(#SVGID_1_)" points="28.002,8.617 24.289,4.905 11.597,17.601 5.713,11.718 2.001,15.429 11.589,25.013 11.597,25.003 11.605,25.013 "/>
-<polygon fill="#FFFFFF" fill-opacity="0.4" points="5.713,13.103 11.597,18.989 24.289,6.292 27.307,9.31 28.002,8.617 24.289,4.905 11.597,17.601 5.713,11.718 2.001,15.429 2.695,16.12 " stroke-opacity="0.4"/>
-<defs>
-<linearGradient gradientTransform="matrix(0.8824 0 0 0.8824 -227.5791 -1120.5674)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="274.9102" x2="274.9102" y1="1274.2861" y2="1300.495">
-<stop offset="0" style="stop-color:#A0F800"/>
-<stop offset="1" style="stop-color:#319E00"/>
-</linearGradient>
-</defs>
+<polygon enable-background="new " fill="#FFFFFF" opacity="0.4" points="5.713,13.103 11.597,18.989 24.289,6.292 27.307,9.31 28.002,8.617 24.289,4.905 11.597,17.601 5.713,11.718 2.001,15.429 2.695,16.12 "/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_tip.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_tip.svg Fri May 14 16:09:54 2010 +0300
@@ -1,43 +1,48 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
+<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" opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="21" x2="9.1644" y1="24.75" y2="24.75">
+ <stop offset="0" style="stop-color:#969696"/>
+ <stop offset="0.6242" style="stop-color:#F2F2F2"/>
+ <stop offset="1" style="stop-color:#B3B3B3"/>
+</linearGradient>
<polygon fill="url(#SVGID_1_)" points="8.998,21.5 8.998,27.071 9.999,28 20,28 21,27.071 21,21.5 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="1.0713" y2="20.5717">
-<stop offset="0" style="stop-color:#FEE06A"/>
-<stop offset="0.503" style="stop-color:#FFC501"/>
-<stop offset="1" style="stop-color:#FEAB29"/>
+ <stop offset="0" style="stop-color:#FEE06A"/>
+ <stop offset="0.503" style="stop-color:#FFC501"/>
+ <stop offset="1" style="stop-color:#FEAB29"/>
</linearGradient>
<path d="M15,2C7.455,2,4.219,7.377,5.156,12.925c0.936,5.544,4.402,10.848,9.826,10.924l0,0 c0.006,0,0.012,0,0.018,0c0.008,0,0.014,0,0.02,0l0,0c5.424-0.076,8.89-5.38,9.824-10.924C25.779,7.377,22.544,2,15,2z" fill="url(#SVGID_2_)"/>
-<polygon fill="url(#SVGID_1_)" points="8.998,21.5 8.998,27.071 9.999,28 20,28 21,27.071 21,21.5 "/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="21" x2="9.1644" y1="24.75" y2="24.75">
+ <stop offset="0" style="stop-color:#969696"/>
+ <stop offset="0.6242" style="stop-color:#F2F2F2"/>
+ <stop offset="1" style="stop-color:#B3B3B3"/>
+</linearGradient>
+<polygon fill="url(#SVGID_3_)" points="8.998,21.5 8.998,27.071 9.999,28 20,28 21,27.071 21,21.5 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_4_" x1="8.998" x2="21" y1="24.2852" y2="24.2852">
-<stop offset="0" style="stop-color:#A0A8AC"/>
-<stop offset="0.1212" style="stop-color:#BDC3C4"/>
-<stop offset="0.2848" style="stop-color:#E9EFF2"/>
-<stop offset="0.6727" style="stop-color:#949DA1"/>
-<stop offset="0.8182" style="stop-color:#D9DFE1"/>
-<stop offset="0.9636" style="stop-color:#ADB3B5"/>
-<stop offset="1" style="stop-color:#595C5E"/>
+ <stop offset="0" style="stop-color:#A0A8AC"/>
+ <stop offset="0.1212" style="stop-color:#BDC3C4"/>
+ <stop offset="0.2848" style="stop-color:#E9EFF2"/>
+ <stop offset="0.6727" style="stop-color:#949DA1"/>
+ <stop offset="0.8182" style="stop-color:#D9DFE1"/>
+ <stop offset="0.9636" style="stop-color:#ADB3B5"/>
+ <stop offset="1" style="stop-color:#595C5E"/>
</linearGradient>
<rect fill="url(#SVGID_4_)" height="5.571" width="12.002" x="8.998" y="21.5"/>
-<path d="M8.443,20.5c1.655,1.991,3.857,3.31,6.539,3.349l0,0c0.006,0,0.012,0,0.018,0c0.008,0,0.014,0,0.02,0l0,0 c2.682-0.039,4.884-1.357,6.539-3.349H8.443z" fill-opacity="0.2" stroke-opacity="0.2"/>
+<path d="M8.443,20.5c1.655,1.991,3.857,3.31,6.539,3.349l0,0c0.006,0,0.012,0,0.018,0c0.008,0,0.014,0,0.02,0l0,0 c2.682-0.039,4.884-1.357,6.539-3.349H8.443z" opacity="0.2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="8.998" x2="21" y1="24.2852" y2="24.2852">
-<stop offset="0" style="stop-color:#A8B1B3"/>
-<stop offset="0.4" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#686E70"/>
+ <stop offset="0" style="stop-color:#A8B1B3"/>
+ <stop offset="0.4" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#686E70"/>
</linearGradient>
<rect fill="url(#SVGID_5_)" height="5.571" width="12.002" x="8.998" y="21.5"/>
-<rect fill-opacity="0.25" height="0.929" stroke-opacity="0.25" width="12.002" x="8.998" y="22.633"/>
-<rect fill-opacity="0.25" height="0.927" stroke-opacity="0.25" width="12.002" x="8.998" y="24.491"/>
-<path d="M6.23,9.388C8.414,10.377,11.529,11,15,11c3.475,0,6.592-0.624,8.775-1.615 c-0.779-3.471-3.676-6.199-8.771-6.199C9.908,3.186,7.008,5.914,6.23,9.388z" fill="#FFFFFF" fill-opacity="0.6" stroke-opacity="0.6"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="21" x2="9.1644" y1="24.75" y2="24.75">
-<stop offset="0" style="stop-color:#969696"/>
-<stop offset="0.6242" style="stop-color:#F2F2F2"/>
-<stop offset="1" style="stop-color:#B3B3B3"/>
-</linearGradient>
-</defs>
+<rect height="0.929" opacity="0.25" width="12.002" x="8.998" y="22.633"/>
+<rect height="0.927" opacity="0.25" width="12.002" x="8.998" y="24.491"/>
+<path d="M6.23,9.388C8.414,10.377,11.529,11,15,11c3.475,0,6.592-0.624,8.775-1.615 c-0.779-3.471-3.676-6.199-8.771-6.199C9.908,3.186,7.008,5.914,6.23,9.388z" fill="#FFFFFF" opacity="0.6"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_todo.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_todo.svg Fri May 14 16:09:54 2010 +0300
@@ -1,25 +1,27 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
-<polygon fill-opacity="0.6" points="21,3 21,1 9,1 9,3 4,3 4,29 19.414,29 26,22.414 26,3 " stroke-opacity="0.6"/>
+<polygon opacity="0.6" points="21,3 21,1 9,1 9,3 4,3 4,29 19.414,29 26,22.414 26,3 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="2.1206" y2="28.8787">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#B1B1B1"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#B1B1B1"/>
</linearGradient>
<polygon fill="url(#SVGID_1_)" points="25,22 25,4 5,4 5,28 19,28 "/>
-<path d="M10.5,10v2h-2v-2H10.5 M11.5,9h-4v4h4V9L11.5,9z" fill-opacity="0.5" stroke-opacity="0.5"/>
-<rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="9" x="13" y="10.25"/>
-<path d="M10.5,16v2h-2v-2H10.5 M11.5,15h-4v4h4V15L11.5,15z" fill-opacity="0.5" stroke-opacity="0.5"/>
-<rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="9" x="13" y="16.25"/>
+<path d="M10.5,10v2h-2v-2H10.5 M11.5,9h-4v4h4V9L11.5,9z" opacity="0.5"/>
+<rect height="1.5" opacity="0.5" width="9" x="13" y="10.25"/>
+<path d="M10.5,16v2h-2v-2H10.5 M11.5,15h-4v4h4V15L11.5,15z" opacity="0.5"/>
+<rect height="1.5" opacity="0.5" width="9" x="13" y="16.25"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="1.6084" y2="7.4429">
-<stop offset="0" style="stop-color:#D07100"/>
-<stop offset="1" style="stop-color:#A23600"/>
+ <stop offset="0" style="stop-color:#D07100"/>
+ <stop offset="1" style="stop-color:#A23600"/>
</linearGradient>
<rect fill="url(#SVGID_2_)" height="5" width="10" x="10" y="2"/>
-<rect fill="#FFFFFF" fill-opacity="0.3" height="1" stroke-opacity="0.3" width="10" x="10" y="2"/>
+<rect fill="#FFFFFF" height="1" opacity="0.3" width="10" x="10" y="2"/>
<polygon fill="#FFFFFF" points="19,28 25,22 19,22 "/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_todo_done.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_todo_done.svg Fri May 14 16:09:54 2010 +0300
@@ -1,24 +1,26 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
-<polygon fill-opacity="0.6" points="21,3 21,1 9,1 9,3 4,3 4,29 19.414,29 26,22.414 26,3 " stroke-opacity="0.6"/>
+<polygon opacity="0.6" points="21,3 21,1 9,1 9,3 4,3 4,29 19.414,29 26,22.414 26,3 "/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="2.1206" y2="28.8787">
-<stop offset="0" style="stop-color:#FFFFFF"/>
-<stop offset="1" style="stop-color:#B1B1B1"/>
+ <stop offset="0" style="stop-color:#FFFFFF"/>
+ <stop offset="1" style="stop-color:#B1B1B1"/>
</linearGradient>
<polygon fill="url(#SVGID_1_)" points="25,22 25,4 5,4 5,28 19,28 "/>
-<path d="M10.5,10v2h-2v-2H10.5 M11.5,9h-4v4h4V9L11.5,9z" fill-opacity="0.5" stroke-opacity="0.5"/>
-<rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="9" x="13" y="10.25"/>
-<path d="M10.5,16v2h-2v-2H10.5 M11.5,15h-4v4h4V15L11.5,15z" fill-opacity="0.5" stroke-opacity="0.5"/>
-<rect fill-opacity="0.5" height="1.5" stroke-opacity="0.5" width="9" x="13" y="16.25"/>
+<path d="M10.5,10v2h-2v-2H10.5 M11.5,9h-4v4h4V9L11.5,9z" opacity="0.5"/>
+<rect height="1.5" opacity="0.5" width="9" x="13" y="10.25"/>
+<path d="M10.5,16v2h-2v-2H10.5 M11.5,15h-4v4h4V15L11.5,15z" opacity="0.5"/>
+<rect height="1.5" opacity="0.5" width="9" x="13" y="16.25"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="1.6084" y2="7.4429">
-<stop offset="0" style="stop-color:#D07100"/>
-<stop offset="1" style="stop-color:#A23600"/>
+ <stop offset="0" style="stop-color:#D07100"/>
+ <stop offset="1" style="stop-color:#A23600"/>
</linearGradient>
<rect fill="url(#SVGID_2_)" height="5" width="10" x="10" y="2"/>
-<rect fill="#FFFFFF" fill-opacity="0.3" height="1" stroke-opacity="0.3" width="10" x="10" y="2"/>
+<rect fill="#FFFFFF" height="1" opacity="0.3" width="10" x="10" y="2"/>
<polygon fill="#FFFFFF" points="19,28 25,22 19,22 "/>
<rect fill="none" height="30" width="30"/>
</g>
@@ -27,10 +29,15 @@
<polygon fill="url(#SVGID_1__)" points="26.46,15.41,19.39,22.48,15.86,18.95,13.74,21.07,19.39,26.73,28.59,17.54"/>
<rect fill="none" height="30" width="30"/>
<defs>
+
<linearGradient gradientTransform="matrix(0.7071 0.7071 -0.7071 0.7071 417.127 253.8542)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-449" x2="-439.8" y1="111" y2="120.2">
+
<stop offset="0" stop-color="#A0F800"/>
+
<stop offset="1" stop-color="#319E00"/>
+
</linearGradient>
+
</defs>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_unknown.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_unknown.svg Fri May 14 16:09:54 2010 +0300
@@ -1,23 +1,25 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="13.4995" x2="13.4995" y1="2.917" y2="26.9193">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+ <stop offset="0" style="stop-color:#4EDEFF"/>
+ <stop offset="1" style="stop-color:#048CC6"/>
</linearGradient>
<circle cx="13.5" cy="24.5" fill="url(#SVGID_1_)" r="2.5"/>
<path d="M10.511,20.719v-2.654c0-1.242,0.284-2.343,0.843-3.273c0.512-0.857,1.271-1.766,2.316-2.773 c1.214-1.193,1.579-1.766,1.688-2c0.181-0.392,0.272-0.771,0.272-1.123c0-0.758-0.18-1.287-0.551-1.619 c-0.396-0.353-1.066-0.533-1.987-0.533c-1.044,0-2.324,0.225-3.806,0.667L8,7.793V2.98l0.733-0.203C10.598,2.262,12.299,2,13.791,2 c2.549,0,4.557,0.553,5.969,1.643C21.246,4.793,22,6.484,22,8.674c0,0.926-0.208,1.874-0.617,2.816 c-0.412,0.951-1.313,2.125-2.757,3.588c-0.938,0.947-1.56,1.644-1.85,2.072c-0.221,0.326-0.327,0.696-0.327,1.135v2.434H10.511z" fill-opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="2.9165" y2="26.9195">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+ <stop offset="0" style="stop-color:#4EDEFF"/>
+ <stop offset="1" style="stop-color:#048CC6"/>
</linearGradient>
<path d="M19.148,4.434C17.911,3.479,16.126,3,13.791,3C12.384,3,10.787,3.246,9,3.741v2.71 c1.581-0.473,2.945-0.709,4.092-0.709c1.18,0,2.063,0.263,2.654,0.788c0.588,0.526,0.884,1.313,0.884,2.364 c0,0.503-0.123,1.018-0.365,1.544c-0.243,0.524-0.876,1.292-1.901,2.3c-0.971,0.935-1.688,1.791-2.152,2.568 c-0.468,0.777-0.7,1.697-0.7,2.758v1.654h3.938v-1.434c0-0.641,0.167-1.205,0.498-1.693c0.33-0.489,0.986-1.227,1.967-2.215 c1.347-1.366,2.194-2.46,2.552-3.284C20.824,10.268,21,9.461,21,8.674C21,6.805,20.384,5.39,19.148,4.434z" fill="url(#SVGID_2_)"/>
-<path d="M13.5,23c1.209,0,2.218,0.859,2.449,2C15.982,24.838,16,24.672,16,24.5 c0-1.381-1.119-2.5-2.5-2.5S11,23.119,11,24.5c0,0.172,0.018,0.338,0.051,0.5C11.282,23.859,12.291,23,13.5,23z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M16.63,9.895c0-0.22-0.021-0.42-0.046-0.616c-0.047,0.381-0.138,0.767-0.319,1.16 c-0.243,0.524-0.876,1.292-1.901,2.3c-0.971,0.935-1.688,1.791-2.152,2.568c-0.468,0.777-0.7,1.697-0.7,2.758v1 c0-1.061,0.232-1.98,0.7-2.758c0.464-0.777,1.182-1.634,2.152-2.568c1.025-1.008,1.658-1.775,1.901-2.3 C16.507,10.912,16.63,10.397,16.63,9.895z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M19.148,5.434c1.106,0.856,1.712,2.084,1.827,3.672C20.987,8.961,21,8.816,21,8.674 c0-1.869-0.616-3.284-1.852-4.24C17.911,3.479,16.126,3,13.791,3C12.384,3,10.787,3.246,9,3.741v1C10.787,4.246,12.384,4,13.791,4 C16.126,4,17.911,4.479,19.148,5.434z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M13.5,23c1.209,0,2.218,0.859,2.449,2C15.982,24.838,16,24.672,16,24.5 c0-1.381-1.119-2.5-2.5-2.5S11,23.119,11,24.5c0,0.172,0.018,0.338,0.051,0.5C11.282,23.859,12.291,23,13.5,23z" fill="#FFFFFF" opacity="0.4"/>
+<path d="M16.63,9.895c0-0.22-0.021-0.42-0.046-0.616c-0.047,0.381-0.138,0.767-0.319,1.16 c-0.243,0.524-0.876,1.292-1.901,2.3c-0.971,0.935-1.688,1.791-2.152,2.568c-0.468,0.777-0.7,1.697-0.7,2.758v1 c0-1.061,0.232-1.98,0.7-2.758c0.464-0.777,1.182-1.634,2.152-2.568c1.025-1.008,1.658-1.775,1.901-2.3 C16.507,10.912,16.63,10.397,16.63,9.895z" fill="#FFFFFF" opacity="0.4"/>
+<path d="M19.148,5.434c1.106,0.856,1.712,2.084,1.827,3.672C20.987,8.961,21,8.816,21,8.674 c0-1.869-0.616-3.284-1.852-4.24C17.911,3.479,16.126,3,13.791,3C12.384,3,10.787,3.246,9,3.741v1C10.787,4.246,12.384,4,13.791,4 C16.126,4,17.911,4.479,19.148,5.434z" fill="#FFFFFF" opacity="0.4"/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_unselected.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_unselected.svg Fri May 14 16:09:54 2010 +0300
@@ -1,15 +1,27 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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"/>
+
<path d="M1,1v28h1v-25c0-0.55,0.45-1,1-1h24c0.55,0,1,0.45,1,1v25h1v-28h-28z" fill-opacity="0.1" stroke-opacity="0.1"/>
+
<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="28" x="1" y="1"/>
+
<path d="M0,0v30h30v-30h-30zm29,29h-28v-28h28v28z" fill-opacity="0.6" stroke-opacity="0.6"/>
+
<defs>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15" x2="15" y1="1.219" y2="29.44">
+
<stop offset="0" stop-color="#E0E1E2"/>
+
<stop offset="1" stop-color="#FFFFFF"/>
+
</linearGradient>
+
</defs>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_unselected_highlight.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_unselected_highlight.svg Fri May 14 16:09:54 2010 +0300
@@ -1,18 +1,33 @@
-<?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">
+<?xml version="1.0" ?>
+<!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">
+
<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">
+
<stop offset="0" stop-color="#4EDEFF"/>
+
<stop offset="1" stop-color="#16A0D4"/>
+
</linearGradient>
+
<rect fill="url(#SVGID_1_)" height="28" width="28" x="1" y="1"/>
+
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="15" x2="15" y1="3.188" y2="27.38">
+
<stop offset="0" stop-color="#E0E1E2"/>
+
<stop offset="1" stop-color="#FFFFFF"/>
+
</linearGradient>
+
<rect fill="url(#SVGID_2_)" height="24" width="24" x="3" y="3"/>
+
<path d="M3,3v24h2v-20c0-0.55,0.45-1,1-1h18c0.55,0,1,0.45,1,1v20h2v-24h-24z" fill-opacity="0.05" stroke-opacity="0.05"/>
+
<path d="M3,3v24h1v-21c0-0.55,0.45-1,1-1h20c0.55,0,1,0.45,1,1v21h1v-24h-24z" fill-opacity="0.1" stroke-opacity="0.1"/>
+
<rect fill-opacity="0.1" height="1" stroke-opacity="0.1" width="24" x="3" y="3"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_untrusted.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_untrusted.svg Fri May 14 16:09:54 2010 +0300
@@ -1,34 +1,36 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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"/>
+<defs>
+</defs>
+<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" opacity="0.6"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="12" x2="28" 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"/>
+ <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="M20,2c-4.4,0-8,3.6-8,8v6h4v-6c0-2.206,1.794-4,4-4s4,0.794,4,3h4C28,4.6,24.4,2,20,2z" fill="url(#SVGID_1_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="13" x2="27" 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"/>
+ <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="M20,3c-3.859,0-7,3.141-7,7v6h2v-6c0-2.757,2.243-5,5-5s5,1.243,5,4h2C27,5.141,23.859,3,20,3z" fill="url(#SVGID_2_)"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="2" x2="23" 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"/>
+ <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="M23,26c0,1.1-0.9,2-2,2H4c-1.1,0-2-0.9-2-2V16c0-1.1,0.9-2,2-2h17c1.1,0,2,0.9,2,2V26z" fill="url(#SVGID_3_)"/>
-<path d="M21,27H4c-1.1,0-2-0.9-2-2v1c0,1.1,0.9,2,2,2h17c1.1,0,2-0.9,2-2v-1C23,26.1,22.1,27,21,27z" fill="#873900" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M21,14H4c-1.1,0-2,0.9-2,2v1c0-1.1,0.9-2,2-2h17c1.1,0,2,0.9,2,2v-1C23,14.9,22.1,14,21,14z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<rect fill-opacity="0.2" height="2" stroke-opacity="0.2" width="21" x="2" y="23"/>
-<rect fill-opacity="0.2" height="2" stroke-opacity="0.2" width="21" x="2" y="19"/>
+<path d="M21,27H4c-1.1,0-2-0.9-2-2v1c0,1.1,0.9,2,2,2h17c1.1,0,2-0.9,2-2v-1C23,26.1,22.1,27,21,27z" fill="#873900" opacity="0.2"/>
+<path d="M21,14H4c-1.1,0-2,0.9-2,2v1c0-1.1,0.9-2,2-2h17c1.1,0,2,0.9,2,2v-1C23,14.9,22.1,14,21,14z" fill="#FFFFFF" opacity="0.4"/>
+<rect height="2" opacity="0.2" width="21" x="2" y="23"/>
+<rect height="2" opacity="0.2" width="21" x="2" y="19"/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_url_address.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_url_address.svg Fri May 14 16:09:54 2010 +0300
@@ -1,42 +1,42 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
-<polygon fill-opacity="0.6" points="3,29 3,1 27,1 27,22.414 20.414,29 " stroke-opacity="0.6"/>
+<polygon enable-background="new " opacity="0.6" points="3,29 3,1 27,1 27,22.414 20.414,29 "/>
<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 8.9805)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-87.52" x2="-87.52" y1="6.9805" y2="-19.0195">
-<stop offset="0" style="stop-color:#F9F9F9"/>
-<stop offset="1" style="stop-color:#B5B5B5"/>
+ <stop offset="0" style="stop-color:#F9F9F9"/>
+ <stop offset="1" style="stop-color:#B5B5B5"/>
</linearGradient>
<polygon fill="url(#SVGID_1_)" points="4,2 4,28 20,28 26,22 26,2 "/>
<polygon fill="#FFFFFF" points="26,22 20,22 20,28 "/>
-<circle cx="15" cy="14" fill-opacity="0.2" r="8" stroke-opacity="0.2"/>
+<circle cx="15" cy="14" enable-background="new " opacity="0.2" r="8"/>
<radialGradient cx="-32.2568" cy="-444.0615" gradientTransform="matrix(0.3502 0 0 -0.3502 26.2965 -145.2794)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="30.0961">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#94FFFF"/>
+ <stop offset="0.5" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</radialGradient>
<circle cx="15" cy="13" fill="url(#SVGID_2_)" r="8"/>
-<path d="M22.715,12.562c-0.178-3.125-2.201-5.814-5.156-6.855l-0.361,0.059l-2.089-0.399 L12.5,6.919l-0.098,0.654H10.89l0.598,1.018l-1.619,1.32l-0.377,1.63l1.336,2.37l1.365-0.279l0.498,0.429l0.39,0.038l0.257,1.004 l-0.339,0.882l1.239,3.169h1.264l1.252-1.012v-0.414l0.331-0.512l0.272-0.142c-0.068,0.104-0.178,0.351-0.178,0.351 c-0.013,0.082,0.178,1.694,0.733,1.567c0.422-0.097,1.929-2.896,1.957-3.16c0.058-0.526-0.229-0.745-0.405-0.827l-0.195-0.093 l-0.899,0.904c-0.097,0.006-0.183,0.022-0.263,0.047v-0.749l0.979-0.954l0.496-1.604l0.758-0.615l-0.166-0.303l0.572-0.551 l-0.318-0.582l0.242,0.03l1.424,3.187l0.291-0.233c-0.01-0.156-0.025-0.31-0.044-0.464L22.715,12.562z M15.096,8.978l-0.119-0.316 h0.714l0.349,0.781h-0.517V8.978H15.096z M17.453,10.554l0.57,0.832l0.039,0.1l-0.584-0.354l-0.142-0.504L17.453,10.554z M18.313,12.008l0.172,0.173l-0.223,0.049l-0.051-0.061L18.313,12.008z M13.848,6.408l0.363,0.562l-0.413,0.126l-0.161-0.092 L13.848,6.408z" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M22.715,12.562c-0.178-3.125-2.201-5.814-5.156-6.855l-0.361,0.059l-2.089-0.399 L12.5,6.919l-0.098,0.654H10.89l0.598,1.018l-1.619,1.32l-0.377,1.63l1.336,2.37l1.365-0.279l0.498,0.429l0.39,0.038l0.257,1.004 l-0.339,0.882l1.239,3.169h1.264l1.252-1.012v-0.414l0.331-0.512l0.272-0.142c-0.068,0.104-0.178,0.351-0.178,0.351 c-0.013,0.082,0.178,1.694,0.733,1.567c0.422-0.097,1.929-2.896,1.957-3.16c0.058-0.526-0.229-0.745-0.405-0.827l-0.195-0.093 l-0.899,0.904c-0.097,0.006-0.183,0.022-0.263,0.047v-0.749l0.979-0.954l0.496-1.604l0.758-0.615l-0.166-0.303l0.572-0.551 l-0.318-0.582l0.242,0.03l1.424,3.187l0.291-0.233c-0.01-0.156-0.025-0.31-0.044-0.464L22.715,12.562z M15.096,8.978l-0.119-0.316 h0.714l0.349,0.781h-0.517V8.978H15.096z M17.453,10.554l0.57,0.832l0.039,0.1l-0.584-0.354l-0.142-0.504L17.453,10.554z M18.313,12.008l0.172,0.173l-0.223,0.049l-0.051-0.061L18.313,12.008z M13.848,6.408l0.363,0.562l-0.413,0.126l-0.161-0.092 L13.848,6.408z" enable-background="new " opacity="0.3"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 8.9805)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-87.52" x2="-87.52" y1="3.9404" y2="-12.1023">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#C8E4EB"/>
+ <stop offset="0" style="stop-color:#31A7F8"/>
+ <stop offset="0.497" style="stop-color:#1E74DC"/>
+ <stop offset="1" style="stop-color:#C8E4EB"/>
</linearGradient>
-<path d="M15,5c-4.418,0-8,3.583-8,8c0,4.42,3.582,8,8,8 c4.42,0,8-3.58,8-8C23,8.583,19.42,5,15,5z M15,20.385c-4.072,0-7.385-3.313-7.385-7.385c0-4.072,3.313-7.384,7.385-7.384 c4.072,0,7.385,3.313,7.385,7.385C22.385,17.073,19.072,20.385,15,20.385z" fill="url(#SVGID_3_)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M15,5c-4.418,0-8,3.583-8,8c0,4.42,3.582,8,8,8 c4.42,0,8-3.58,8-8C23,8.583,19.42,5,15,5z M15,20.385c-4.072,0-7.385-3.313-7.385-7.385c0-4.072,3.313-7.384,7.385-7.384 c4.072,0,7.385,3.313,7.385,7.385C22.385,17.073,19.072,20.385,15,20.385z" enable-background="new " fill="url(#SVGID_3_)" opacity="0.3"/>
<radialGradient cx="-87.0591" cy="1.8228" gradientTransform="matrix(1 0 0 -1 102.52 8.9805)" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="9.4861">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+ <stop offset="0.3152" style="stop-color:#94FF26"/>
+ <stop offset="0.7273" style="stop-color:#1FC211"/>
+ <stop offset="1" style="stop-color:#0BA133"/>
</radialGradient>
<path d="M19.335,15.286l-0.833,0.833c0,0-0.503,0-0.525,0.199c-0.012,0.086-0.039,0.457-0.125,0.65 c-0.168,0.114-0.367,0.5-0.367,0.5s-0.104,0.742,0.453,0.614C18.488,17.959,20.189,15.688,19.335,15.286z" fill="url(#SVGID_4_)"/>
<radialGradient cx="-87.0596" cy="1.8252" gradientTransform="matrix(1 0 0 -1 102.52 8.9805)" gradientUnits="userSpaceOnUse" id="SVGID_5_" r="10.9749">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+ <stop offset="0.3152" style="stop-color:#94FF26"/>
+ <stop offset="0.7273" style="stop-color:#1FC211"/>
+ <stop offset="1" style="stop-color:#0BA133"/>
</radialGradient>
<path d="M17.455,5.997c-0.137,0.051-0.229,0.087-0.229,0.087l-2.059-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.421l-0.328,1.417l0.646,1.252 l0.389,0.248l1.365-0.279l0.498,0.429l0.453,0.045l0.492,1.929l-0.328,0.852l0.725,1.604l0.205,0.664h1.263l0.713-0.385l0.539-0.625 v-0.758l1.023-0.521v-1.121l0.404-0.771l0.902-0.813l0.217-0.942l-1.182,0.264l-0.312-0.378l0.222-0.354l-0.839-0.506l-0.356-1.286 l0.619-0.404l0.569,0.833l0.216,0.549l0.428,0.429l0.5,0.261l0.557-0.089l0.617-0.594l-0.436-0.792l-0.547,0.143l-0.494-0.59 l0.471-0.328l1.475,0.179v0.524l1.284,2.646l0.291-0.233C22.234,9.53,20.219,6.969,17.455,5.997z M16.785,9.572l-0.674,0.179h-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.572z M18.32,8.393 l-1.213-0.214V7.75l0.606-0.143l0.179-0.215l0.428,0.357V8.393z" fill="url(#SVGID_5_)"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_url_address_home.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,56 @@
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
+<rect fill="none" height="30" width="30"/>
+<polygon enable-background="new " opacity="0.6" points="3,29 3,1 27,1 27,22.414 20.414,29 "/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 8.9805)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-87.52" x2="-87.52" y1="6.9805" y2="-19.0195">
+ <stop offset="0" style="stop-color:#F9F9F9"/>
+ <stop offset="1" style="stop-color:#B5B5B5"/>
+</linearGradient>
+<polygon fill="url(#SVGID_1_)" points="4,2 4,28 20,28 26,22 26,2 "/>
+<polygon fill="#FFFFFF" points="26,22 20,22 20,28 "/>
+<circle cx="15" cy="14" enable-background="new " opacity="0.2" r="8"/>
+<radialGradient cx="-32.2568" cy="-444.0615" gradientTransform="matrix(0.3502 0 0 -0.3502 26.2965 -145.2794)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="30.0961">
+ <stop offset="0" style="stop-color:#94FFFF"/>
+ <stop offset="0.5" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
+</radialGradient>
+<circle cx="15" cy="13" fill="url(#SVGID_2_)" r="8"/>
+<path d="M22.715,12.562c-0.178-3.125-2.201-5.814-5.156-6.855l-0.361,0.059l-2.089-0.399 L12.5,6.919l-0.098,0.654H10.89l0.598,1.018l-1.619,1.32l-0.377,1.63l1.336,2.37l1.365-0.279l0.498,0.429l0.39,0.038l0.257,1.004 l-0.339,0.882l1.239,3.169h1.264l1.252-1.012v-0.414l0.331-0.512l0.272-0.142c-0.068,0.104-0.178,0.351-0.178,0.351 c-0.013,0.082,0.178,1.694,0.733,1.567c0.422-0.097,1.929-2.896,1.957-3.16c0.058-0.526-0.229-0.745-0.405-0.827l-0.195-0.093 l-0.899,0.904c-0.097,0.006-0.183,0.022-0.263,0.047v-0.749l0.979-0.954l0.496-1.604l0.758-0.615l-0.166-0.303l0.572-0.551 l-0.318-0.582l0.242,0.03l1.424,3.187l0.291-0.233c-0.01-0.156-0.025-0.31-0.044-0.464L22.715,12.562z M15.096,8.978l-0.119-0.316 h0.714l0.349,0.781h-0.517V8.978H15.096z M17.453,10.554l0.57,0.832l0.039,0.1l-0.584-0.354l-0.142-0.504L17.453,10.554z M18.313,12.008l0.172,0.173l-0.223,0.049l-0.051-0.061L18.313,12.008z M13.848,6.408l0.363,0.562l-0.413,0.126l-0.161-0.092 L13.848,6.408z" enable-background="new " opacity="0.3"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 8.9805)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-87.52" x2="-87.52" y1="3.9404" y2="-12.1023">
+ <stop offset="0" style="stop-color:#31A7F8"/>
+ <stop offset="0.497" style="stop-color:#1E74DC"/>
+ <stop offset="1" style="stop-color:#C8E4EB"/>
+</linearGradient>
+<path d="M15,5c-4.418,0-8,3.583-8,8c0,4.42,3.582,8,8,8 c4.42,0,8-3.58,8-8C23,8.583,19.42,5,15,5z M15,20.385c-4.072,0-7.385-3.313-7.385-7.385c0-4.072,3.313-7.384,7.385-7.384 c4.072,0,7.385,3.313,7.385,7.385C22.385,17.073,19.072,20.385,15,20.385z" enable-background="new " fill="url(#SVGID_3_)" opacity="0.3"/>
+<radialGradient cx="-87.0591" cy="1.8228" gradientTransform="matrix(1 0 0 -1 102.52 8.9805)" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="9.4861">
+ <stop offset="0.3152" style="stop-color:#94FF26"/>
+ <stop offset="0.7273" style="stop-color:#1FC211"/>
+ <stop offset="1" style="stop-color:#0BA133"/>
+</radialGradient>
+<path d="M19.335,15.286l-0.833,0.833c0,0-0.503,0-0.525,0.199c-0.012,0.086-0.039,0.457-0.125,0.65 c-0.168,0.114-0.367,0.5-0.367,0.5s-0.104,0.742,0.453,0.614C18.488,17.959,20.189,15.688,19.335,15.286z" fill="url(#SVGID_4_)"/>
+<radialGradient cx="-87.0596" cy="1.8252" gradientTransform="matrix(1 0 0 -1 102.52 8.9805)" gradientUnits="userSpaceOnUse" id="SVGID_5_" r="10.9749">
+ <stop offset="0.3152" style="stop-color:#94FF26"/>
+ <stop offset="0.7273" style="stop-color:#1FC211"/>
+ <stop offset="1" style="stop-color:#0BA133"/>
+</radialGradient>
+<path d="M17.455,5.997c-0.137,0.051-0.229,0.087-0.229,0.087l-2.059-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.421l-0.328,1.417l0.646,1.252 l0.389,0.248l1.365-0.279l0.498,0.429l0.453,0.045l0.492,1.929l-0.328,0.852l0.725,1.604l0.205,0.664h1.263l0.713-0.385l0.539-0.625 v-0.758l1.023-0.521v-1.121l0.404-0.771l0.902-0.813l0.217-0.942l-1.182,0.264l-0.312-0.378l0.222-0.354l-0.839-0.506l-0.356-1.286 l0.619-0.404l0.569,0.833l0.216,0.549l0.428,0.429l0.5,0.261l0.557-0.089l0.617-0.594l-0.436-0.792l-0.547,0.143l-0.494-0.59 l0.471-0.328l1.475,0.179v0.524l1.284,2.646l0.291-0.233C22.234,9.53,20.219,6.969,17.455,5.997z M16.785,9.572l-0.674,0.179h-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.572z M18.32,8.393 l-1.213-0.214V7.75l0.606-0.143l0.179-0.215l0.428,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" enable-background="new " 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"/>
+</linearGradient>
+<circle cx="21" cy="22" fill="url(#SVGID_1__)" r="7"/>
+<polygon enable-background="new " opacity="0.2" points="25.34,24 20.999,19.4 16.66,24 16,23.3 20.999,18 26,23.3 "/>
+<polygon enable-background="new " 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 "/>
+<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" enable-background="new " fill="#FFFFFF" 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 "/>
+</g>
+</svg>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_url_address_work.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,59 @@
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
+<rect fill="none" height="30" width="30"/>
+<polygon enable-background="new " opacity="0.6" points="3,29 3,1 27,1 27,22.414 20.414,29 "/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 8.9805)" gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="-87.52" x2="-87.52" y1="6.9805" y2="-19.0195">
+ <stop offset="0" style="stop-color:#F9F9F9"/>
+ <stop offset="1" style="stop-color:#B5B5B5"/>
+</linearGradient>
+<polygon fill="url(#SVGID_1_)" points="4,2 4,28 20,28 26,22 26,2 "/>
+<polygon fill="#FFFFFF" points="26,22 20,22 20,28 "/>
+<circle cx="15" cy="14" enable-background="new " opacity="0.2" r="8"/>
+<radialGradient cx="-32.2568" cy="-444.0615" gradientTransform="matrix(0.3502 0 0 -0.3502 26.2965 -145.2794)" gradientUnits="userSpaceOnUse" id="SVGID_2_" r="30.0961">
+ <stop offset="0" style="stop-color:#94FFFF"/>
+ <stop offset="0.5" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
+</radialGradient>
+<circle cx="15" cy="13" fill="url(#SVGID_2_)" r="8"/>
+<path d="M22.715,12.562c-0.178-3.125-2.201-5.814-5.156-6.855l-0.361,0.059l-2.089-0.399 L12.5,6.919l-0.098,0.654H10.89l0.598,1.018l-1.619,1.32l-0.377,1.63l1.336,2.37l1.365-0.279l0.498,0.429l0.39,0.038l0.257,1.004 l-0.339,0.882l1.239,3.169h1.264l1.252-1.012v-0.414l0.331-0.512l0.272-0.142c-0.068,0.104-0.178,0.351-0.178,0.351 c-0.013,0.082,0.178,1.694,0.733,1.567c0.422-0.097,1.929-2.896,1.957-3.16c0.058-0.526-0.229-0.745-0.405-0.827l-0.195-0.093 l-0.899,0.904c-0.097,0.006-0.183,0.022-0.263,0.047v-0.749l0.979-0.954l0.496-1.604l0.758-0.615l-0.166-0.303l0.572-0.551 l-0.318-0.582l0.242,0.03l1.424,3.187l0.291-0.233c-0.01-0.156-0.025-0.31-0.044-0.464L22.715,12.562z M15.096,8.978l-0.119-0.316 h0.714l0.349,0.781h-0.517V8.978H15.096z M17.453,10.554l0.57,0.832l0.039,0.1l-0.584-0.354l-0.142-0.504L17.453,10.554z M18.313,12.008l0.172,0.173l-0.223,0.049l-0.051-0.061L18.313,12.008z M13.848,6.408l0.363,0.562l-0.413,0.126l-0.161-0.092 L13.848,6.408z" enable-background="new " opacity="0.3"/>
+<linearGradient gradientTransform="matrix(1 0 0 -1 102.52 8.9805)" gradientUnits="userSpaceOnUse" id="SVGID_3_" x1="-87.52" x2="-87.52" y1="3.9404" y2="-12.1023">
+ <stop offset="0" style="stop-color:#31A7F8"/>
+ <stop offset="0.497" style="stop-color:#1E74DC"/>
+ <stop offset="1" style="stop-color:#C8E4EB"/>
+</linearGradient>
+<path d="M15,5c-4.418,0-8,3.583-8,8c0,4.42,3.582,8,8,8 c4.42,0,8-3.58,8-8C23,8.583,19.42,5,15,5z M15,20.385c-4.072,0-7.385-3.313-7.385-7.385c0-4.072,3.313-7.384,7.385-7.384 c4.072,0,7.385,3.313,7.385,7.385C22.385,17.073,19.072,20.385,15,20.385z" enable-background="new " fill="url(#SVGID_3_)" opacity="0.3"/>
+<radialGradient cx="-87.0591" cy="1.8228" gradientTransform="matrix(1 0 0 -1 102.52 8.9805)" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="9.4861">
+ <stop offset="0.3152" style="stop-color:#94FF26"/>
+ <stop offset="0.7273" style="stop-color:#1FC211"/>
+ <stop offset="1" style="stop-color:#0BA133"/>
+</radialGradient>
+<path d="M19.335,15.286l-0.833,0.833c0,0-0.503,0-0.525,0.199c-0.012,0.086-0.039,0.457-0.125,0.65 c-0.168,0.114-0.367,0.5-0.367,0.5s-0.104,0.742,0.453,0.614C18.488,17.959,20.189,15.688,19.335,15.286z" fill="url(#SVGID_4_)"/>
+<radialGradient cx="-87.0596" cy="1.8252" gradientTransform="matrix(1 0 0 -1 102.52 8.9805)" gradientUnits="userSpaceOnUse" id="SVGID_5_" r="10.9749">
+ <stop offset="0.3152" style="stop-color:#94FF26"/>
+ <stop offset="0.7273" style="stop-color:#1FC211"/>
+ <stop offset="1" style="stop-color:#0BA133"/>
+</radialGradient>
+<path d="M17.455,5.997c-0.137,0.051-0.229,0.087-0.229,0.087l-2.059-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.421l-0.328,1.417l0.646,1.252 l0.389,0.248l1.365-0.279l0.498,0.429l0.453,0.045l0.492,1.929l-0.328,0.852l0.725,1.604l0.205,0.664h1.263l0.713-0.385l0.539-0.625 v-0.758l1.023-0.521v-1.121l0.404-0.771l0.902-0.813l0.217-0.942l-1.182,0.264l-0.312-0.378l0.222-0.354l-0.839-0.506l-0.356-1.286 l0.619-0.404l0.569,0.833l0.216,0.549l0.428,0.429l0.5,0.261l0.557-0.089l0.617-0.594l-0.436-0.792l-0.547,0.143l-0.494-0.59 l0.471-0.328l1.475,0.179v0.524l1.284,2.646l0.291-0.233C22.234,9.53,20.219,6.969,17.455,5.997z M16.785,9.572l-0.674,0.179h-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.572z M18.32,8.393 l-1.213-0.214V7.75l0.606-0.143l0.179-0.215l0.428,0.357V8.393z" fill="url(#SVGID_5_)"/>
+</g>
+<g>
+<defs>
+</defs>
+<g>
+ <rect fill="none" height="30" width="30"/>
+</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" 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" 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" 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 height="6" opacity="0.3" width="1" x="22" y="20"/>
+</g>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_video.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_video.svg Fri May 14 16:09:54 2010 +0300
@@ -1,17 +1,19 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<rect fill="none" height="30" width="30"/>
<rect fill-opacity="0.6" height="26" width="28" x="1" y="2"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15.0005" x2="15.0005" y1="27" y2="3.4999">
-<stop offset="0" style="stop-color:#000000"/>
-<stop offset="1" style="stop-color:#666666"/>
+ <stop offset="0" style="stop-color:#000000"/>
+ <stop offset="1" style="stop-color:#666666"/>
</linearGradient>
<rect fill="url(#SVGID_1_)" height="24" width="26" x="2" y="3"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="15.0005" x2="15.0005" y1="21.125" y2="9.0729">
-<stop offset="0" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</linearGradient>
<rect fill="url(#SVGID_2_)" height="12" width="24" x="3" y="9"/>
<rect fill="#F1F1F2" height="2" width="3" x="3" y="5"/>
@@ -24,9 +26,9 @@
<rect fill="#F1F1F2" height="2" width="4" x="13" y="23"/>
<rect fill="#F1F1F2" height="2" width="3" x="19" y="23"/>
<rect fill="#F1F1F2" height="2" width="3" x="24" y="23"/>
-<rect fill="#FFFFFF" fill-opacity="0.3" height="1" stroke-opacity="0.3" width="26" x="2" y="3"/>
-<rect fill="#FFFFFF" fill-opacity="0.1" height="1" stroke-opacity="0.1" width="26" x="2" y="26"/>
-<rect fill="#FFFFFF" fill-opacity="0.3" height="1" stroke-opacity="0.3" width="24" x="3" y="20"/>
-<rect fill="#00006B" fill-opacity="0.2" height="1" stroke-opacity="0.2" width="24" x="3" y="9"/>
+<rect fill="#FFFFFF" height="1" opacity="0.3" width="26" x="2" y="3"/>
+<rect fill="#FFFFFF" height="1" opacity="0.1" width="26" x="2" y="26"/>
+<rect fill="#FFFFFF" height="1" opacity="0.3" width="24" x="3" y="20"/>
+<rect fill="#00006B" height="1" opacity="0.2" width="24" x="3" y="9"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_voip.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,58 @@
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
+<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" opacity="0.6"/>
+<radialGradient cx="-451.0264" cy="-302.1748" gradientTransform="matrix(0.3502 0 0 0.3502 173.9495 115.3211)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="48.9059">
+ <stop offset="0" style="stop-color:#94FFFF"/>
+ <stop offset="0.5" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
+</radialGradient>
+<circle cx="16" cy="14" fill="url(#SVGID_1_)" r="13"/>
+<path d="M28.536,13.287c-0.288-5.078-3.577-9.449-8.38-11.141l-0.585,0.096l-3.397-0.65l-4.235,2.525l-0.159,1.064 H9.322l0.971,1.652L7.662,8.979l-0.613,2.65l2.173,3.85l2.218-0.453l0.81,0.697l0.633,0.063l0.418,1.633l-0.552,1.432L14.763,24 h2.053l2.035-1.645v-0.67l0.537-0.834l0.444-0.227c-0.113,0.172-0.29,0.566-0.29,0.566c-0.019,0.135,0.289,2.756,1.192,2.551 c0.686-0.156,3.135-4.705,3.182-5.139c0.093-0.855-0.373-1.209-0.659-1.342l-0.318-0.15l-1.462,1.465 c-0.157,0.012-0.298,0.039-0.426,0.076v-1.217l1.588-1.551l0.808-2.604l1.231-1.002l-0.27-0.49l0.929-0.895l-0.519-0.945 l0.395,0.047l2.313,5.178L28,14.795c-0.015-0.254-0.042-0.502-0.071-0.752L28.536,13.287z M16.156,7.463l-0.193-0.516h1.161 l0.565,1.271h-0.841V7.463H16.156z M19.987,10.023l0.927,1.354l0.063,0.162l-0.95-0.574L19.8,10.146L19.987,10.023z M21.381,12.387 l0.28,0.281l-0.362,0.08l-0.082-0.1L21.381,12.387z M14.127,3.285l0.59,0.914l-0.67,0.205l-0.262-0.15L14.127,3.285z" opacity="0.3"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="15.9995" x2="15.9995" y1="1.0625" y2="27.1316">
+ <stop offset="0" style="stop-color:#31A7F8"/>
+ <stop offset="0.497" style="stop-color:#1E74DC"/>
+ <stop offset="1" style="stop-color:#C8E4EB"/>
+</linearGradient>
+<path d="M16,1C8.821,1,3,6.82,3,14c0,7.182,5.821,13,13,13c7.182,0,13-5.818,13-13 C29,6.82,23.182,1,16,1z M16,26C9.383,26,4,20.617,4,14S9.383,2,16,2s12,5.383,12,12S22.617,26,16,26z" fill="url(#SVGID_2_)" opacity="0.3"/>
+<radialGradient cx="16.75" cy="4.499" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="15.4173">
+ <stop offset="0.3152" style="stop-color:#94FF26"/>
+ <stop offset="0.7273" style="stop-color:#1FC211"/>
+ <stop offset="1" style="stop-color:#0BA133"/>
+</radialGradient>
+<path d="M23.044,17.713l-1.353,1.355c0,0-0.818,0-0.856,0.324c-0.018,0.141-0.063,0.744-0.201,1.057 c-0.272,0.188-0.597,0.813-0.597,0.813s-0.169,1.205,0.734,1C21.669,22.059,24.434,18.367,23.044,17.713z" fill="url(#SVGID_3_)"/>
+<radialGradient cx="16.75" cy="4.5005" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="17.8328">
+ <stop offset="0.3152" style="stop-color:#94FF26"/>
+ <stop offset="0.7273" style="stop-color:#1FC211"/>
+ <stop offset="1" style="stop-color:#0BA133"/>
+</radialGradient>
+<path d="M19.99,2.619c-0.222,0.084-0.374,0.141-0.374,0.141l-3.344-0.639l-1.64,1.025l0.863,1.336 l-1.509,0.463l-0.813-0.463l0.286-0.811l-1.06,0.734L12.21,5.682h-2.014l0.745,1.268L8.11,9.258l-0.533,2.305l1.051,2.035L9.259,14 l2.218-0.453l0.81,0.695l0.736,0.072l0.801,3.135l-0.533,1.385l1.178,2.605l0.332,1.08h2.053l1.16-0.627l0.875-1.016v-1.23 l1.663-0.848v-1.822l0.658-1.25l1.467-1.32l0.351-1.531l-1.919,0.428l-0.505-0.615l0.359-0.574l-1.363-0.824l-0.581-2.088 l1.007-0.656l0.927,1.352l0.349,0.893l0.696,0.697l0.813,0.424l0.903-0.145l1.003-0.965l-0.706-1.289L23.12,9.744l-0.804-0.957 l0.764-0.533l2.397,0.291v0.852l2.086,4.299l0.474-0.379C27.756,8.359,24.48,4.199,19.99,2.619z M18.901,8.428l-1.095,0.291h-1.458 V7.963h-1.394l-1.103,0.291L12.17,7.789L11.705,6.92l2.321-0.523h2.322L16,5.469h1.161l0.646,1.451l1.095,0.383V8.428z M21.397,6.514l-1.974-0.35V5.469l0.987-0.232l0.29-0.348l0.696,0.58V6.514z" fill="url(#SVGID_4_)"/>
+<path d="M2.73,8.398C2.449,8.582,1.209,9.846,1.185,9.875c-0.489,0.596-0.786,1.178-0.795,1.197 c-0.308,0.727-0.585,2.615-0.205,4.359c0.282,1.289,1.901,4.789,3.796,7.348c2.016,2.721,5.333,5.609,6.953,6.371 c1.669,0.787,2.914,0.85,3.256,0.85c0.176,0,0.325-0.014,0.459-0.039c0.1-0.018,1.208-0.223,2.326-0.977 c0,0,0.467-0.314,0.729-0.555c0.02-0.018,0.786-0.768,0.799-0.785c0.247-0.311,0.358-0.701,0.312-1.102 c-0.049-0.416-0.27-0.805-0.605-1.068c0,0-4.841-3.844-4.875-3.863c-0.257-0.156-0.547-0.238-0.841-0.238 c-0.458,0-0.881,0.199-1.161,0.549l-0.5,0.611c-0.726-0.627-1.689-1.563-2.338-2.438c-0.884-1.193-1.535-2.25-2.041-3.324 l1.232-0.553c0.369-0.166,0.646-0.467,0.786-0.85c0.146-0.396,0.12-0.852-0.067-1.244L5.742,8.617 c-0.269-0.557-0.83-0.914-1.431-0.914c-0.217,0-0.427,0.045-0.622,0.135L2.73,8.398z" opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-0.2866" x2="10.2134" y1="8.4424" y2="26.7754">
+ <stop offset="0" style="stop-color:#E9F0F2"/>
+ <stop offset="0.5212" style="stop-color:#AAB1B5"/>
+ <stop offset="1" style="stop-color:#838F94"/>
+</linearGradient>
+<path d="M5.143,16.264c0.67,1.684,1.561,3.094,2.548,4.428c0.95,1.281,2.554,2.713,3.286,3.242l3.479,5.045 c-0.384,0.076-1.622-0.037-3.097-0.732c-1.477-0.695-4.652-3.467-6.575-6.063c-1.922-2.594-3.398-5.941-3.622-6.965 c-0.352-1.611-0.051-3.287,0.148-3.756c0,0,0.213-0.426,0.646-0.951C2.142,10.285,5.143,16.264,5.143,16.264z" fill="url(#SVGID_5_)"/>
+<radialGradient cx="10.8911" cy="22.9111" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="8.6673">
+ <stop offset="0.0424" style="stop-color:#D1D8D9"/>
+ <stop offset="0.4" style="stop-color:#BBC0C2"/>
+ <stop offset="0.7333" style="stop-color:#7C8C91"/>
+ <stop offset="1" style="stop-color:#A7B3B7"/>
+</radialGradient>
+<path d="M17.592,26.262l-3.165-2.527l-1.612-1.27c-0.241-0.146-0.541-0.119-0.703,0.084l-0.635,0.775v0.002 l-0.5,0.607c0-0.002-0.002-0.006-0.003-0.006c-0.565,2.01,0.43,4.135,2.343,4.865c0.253,0.094,0.509,0.162,0.765,0.201 c0.16,0.004,0.291,0,0.375-0.016c0,0,0.987-0.168,1.959-0.824c0.324-0.217,0.353-0.223,0.614-0.463c0.001-0.002,0-0.004,0.002-0.006 c0.515-0.471,0.689-0.664,0.689-0.664C17.898,26.799,17.842,26.457,17.592,26.262z" fill="url(#SVGID_6_)"/>
+<path d="M11.477,23.324l0.635-0.775c0.162-0.203,0.462-0.23,0.703-0.084l1.612,1.27l3.165,2.527 c0.25,0.195,0.307,0.537,0.129,0.76c0,0-0.176,0.193-0.693,0.668L11.477,23.324z" fill="#FFFFFF" opacity="0.4"/>
+<radialGradient cx="-162.3672" cy="-37.5952" gradientTransform="matrix(0.9891 0.1471 -0.1471 0.9891 159.0668 70.322)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="8.6173">
+ <stop offset="0.0424" style="stop-color:#D1D8D9"/>
+ <stop offset="0.4" style="stop-color:#BBC0C2"/>
+ <stop offset="0.7333" style="stop-color:#7C8C91"/>
+ <stop offset="1" style="stop-color:#A7B3B7"/>
+</radialGradient>
+<path d="M7.502,14.557l-2.66-5.506C4.701,8.762,4.371,8.625,4.104,8.748c0,0-0.232,0.105-0.813,0.479 c0,0.002-0.001,0-0.002,0.002C2.973,9.432,2.947,9.523,2.634,9.801c-0.434,0.389-0.758,0.793-0.978,1.105 c-0.721,2.08,0.275,4.35,2.266,5.109c0.406,0.154,0.822,0.23,1.236,0.242l1.266-0.57l0.853-0.381 C7.545,15.186,7.643,14.85,7.502,14.557z" fill="url(#SVGID_7_)"/>
+<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" opacity="0.4"/>
+</g>
+</svg>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_voip_home.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,72 @@
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
+<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" opacity="0.6"/>
+<radialGradient cx="-451.0264" cy="-302.1748" gradientTransform="matrix(0.3502 0 0 0.3502 173.9495 115.3211)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="48.9059">
+ <stop offset="0" style="stop-color:#94FFFF"/>
+ <stop offset="0.5" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
+</radialGradient>
+<circle cx="16" cy="14" fill="url(#SVGID_1_)" r="13"/>
+<path d="M28.536,13.287c-0.288-5.078-3.577-9.449-8.38-11.141l-0.585,0.096l-3.397-0.65l-4.235,2.525l-0.159,1.064 H9.322l0.971,1.652L7.662,8.979l-0.613,2.65l2.173,3.85l2.218-0.453l0.81,0.697l0.633,0.063l0.418,1.633l-0.552,1.432L14.763,24 h2.053l2.035-1.645v-0.67l0.537-0.834l0.444-0.227c-0.113,0.172-0.29,0.566-0.29,0.566c-0.019,0.135,0.289,2.756,1.192,2.551 c0.686-0.156,3.135-4.705,3.182-5.139c0.093-0.855-0.373-1.209-0.659-1.342l-0.318-0.15l-1.462,1.465 c-0.157,0.012-0.298,0.039-0.426,0.076v-1.217l1.588-1.551l0.808-2.604l1.231-1.002l-0.27-0.49l0.929-0.895l-0.519-0.945 l0.395,0.047l2.313,5.178L28,14.795c-0.015-0.254-0.042-0.502-0.071-0.752L28.536,13.287z M16.156,7.463l-0.193-0.516h1.161 l0.565,1.271h-0.841V7.463H16.156z M19.987,10.023l0.927,1.354l0.063,0.162l-0.95-0.574L19.8,10.146L19.987,10.023z M21.381,12.387 l0.28,0.281l-0.362,0.08l-0.082-0.1L21.381,12.387z M14.127,3.285l0.59,0.914l-0.67,0.205l-0.262-0.15L14.127,3.285z" opacity="0.3"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="15.9995" x2="15.9995" y1="1.0625" y2="27.1316">
+ <stop offset="0" style="stop-color:#31A7F8"/>
+ <stop offset="0.497" style="stop-color:#1E74DC"/>
+ <stop offset="1" style="stop-color:#C8E4EB"/>
+</linearGradient>
+<path d="M16,1C8.821,1,3,6.82,3,14c0,7.182,5.821,13,13,13c7.182,0,13-5.818,13-13 C29,6.82,23.182,1,16,1z M16,26C9.383,26,4,20.617,4,14S9.383,2,16,2s12,5.383,12,12S22.617,26,16,26z" fill="url(#SVGID_2_)" opacity="0.3"/>
+<radialGradient cx="16.75" cy="4.499" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="15.4173">
+ <stop offset="0.3152" style="stop-color:#94FF26"/>
+ <stop offset="0.7273" style="stop-color:#1FC211"/>
+ <stop offset="1" style="stop-color:#0BA133"/>
+</radialGradient>
+<path d="M23.044,17.713l-1.353,1.355c0,0-0.818,0-0.856,0.324c-0.018,0.141-0.063,0.744-0.201,1.057 c-0.272,0.188-0.597,0.813-0.597,0.813s-0.169,1.205,0.734,1C21.669,22.059,24.434,18.367,23.044,17.713z" fill="url(#SVGID_3_)"/>
+<radialGradient cx="16.75" cy="4.5005" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="17.8328">
+ <stop offset="0.3152" style="stop-color:#94FF26"/>
+ <stop offset="0.7273" style="stop-color:#1FC211"/>
+ <stop offset="1" style="stop-color:#0BA133"/>
+</radialGradient>
+<path d="M19.99,2.619c-0.222,0.084-0.374,0.141-0.374,0.141l-3.344-0.639l-1.64,1.025l0.863,1.336 l-1.509,0.463l-0.813-0.463l0.286-0.811l-1.06,0.734L12.21,5.682h-2.014l0.745,1.268L8.11,9.258l-0.533,2.305l1.051,2.035L9.259,14 l2.218-0.453l0.81,0.695l0.736,0.072l0.801,3.135l-0.533,1.385l1.178,2.605l0.332,1.08h2.053l1.16-0.627l0.875-1.016v-1.23 l1.663-0.848v-1.822l0.658-1.25l1.467-1.32l0.351-1.531l-1.919,0.428l-0.505-0.615l0.359-0.574l-1.363-0.824l-0.581-2.088 l1.007-0.656l0.927,1.352l0.349,0.893l0.696,0.697l0.813,0.424l0.903-0.145l1.003-0.965l-0.706-1.289L23.12,9.744l-0.804-0.957 l0.764-0.533l2.397,0.291v0.852l2.086,4.299l0.474-0.379C27.756,8.359,24.48,4.199,19.99,2.619z M18.901,8.428l-1.095,0.291h-1.458 V7.963h-1.394l-1.103,0.291L12.17,7.789L11.705,6.92l2.321-0.523h2.322L16,5.469h1.161l0.646,1.451l1.095,0.383V8.428z M21.397,6.514l-1.974-0.35V5.469l0.987-0.232l0.29-0.348l0.696,0.58V6.514z" fill="url(#SVGID_4_)"/>
+<path d="M2.73,8.398C2.449,8.582,1.209,9.846,1.185,9.875c-0.489,0.596-0.786,1.178-0.795,1.197 c-0.308,0.727-0.585,2.615-0.205,4.359c0.282,1.289,1.901,4.789,3.796,7.348c2.016,2.721,5.333,5.609,6.953,6.371 c1.669,0.787,2.914,0.85,3.256,0.85c0.176,0,0.325-0.014,0.459-0.039c0.1-0.018,1.208-0.223,2.326-0.977 c0,0,0.467-0.314,0.729-0.555c0.02-0.018,0.786-0.768,0.799-0.785c0.247-0.311,0.358-0.701,0.312-1.102 c-0.049-0.416-0.27-0.805-0.605-1.068c0,0-4.841-3.844-4.875-3.863c-0.257-0.156-0.547-0.238-0.841-0.238 c-0.458,0-0.881,0.199-1.161,0.549l-0.5,0.611c-0.726-0.627-1.689-1.563-2.338-2.438c-0.884-1.193-1.535-2.25-2.041-3.324 l1.232-0.553c0.369-0.166,0.646-0.467,0.786-0.85c0.146-0.396,0.12-0.852-0.067-1.244L5.742,8.617 c-0.269-0.557-0.83-0.914-1.431-0.914c-0.217,0-0.427,0.045-0.622,0.135L2.73,8.398z" opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-0.2866" x2="10.2134" y1="8.4424" y2="26.7754">
+ <stop offset="0" style="stop-color:#E9F0F2"/>
+ <stop offset="0.5212" style="stop-color:#AAB1B5"/>
+ <stop offset="1" style="stop-color:#838F94"/>
+</linearGradient>
+<path d="M5.143,16.264c0.67,1.684,1.561,3.094,2.548,4.428c0.95,1.281,2.554,2.713,3.286,3.242l3.479,5.045 c-0.384,0.076-1.622-0.037-3.097-0.732c-1.477-0.695-4.652-3.467-6.575-6.063c-1.922-2.594-3.398-5.941-3.622-6.965 c-0.352-1.611-0.051-3.287,0.148-3.756c0,0,0.213-0.426,0.646-0.951C2.142,10.285,5.143,16.264,5.143,16.264z" fill="url(#SVGID_5_)"/>
+<radialGradient cx="10.8911" cy="22.9111" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="8.6673">
+ <stop offset="0.0424" style="stop-color:#D1D8D9"/>
+ <stop offset="0.4" style="stop-color:#BBC0C2"/>
+ <stop offset="0.7333" style="stop-color:#7C8C91"/>
+ <stop offset="1" style="stop-color:#A7B3B7"/>
+</radialGradient>
+<path d="M17.592,26.262l-3.165-2.527l-1.612-1.27c-0.241-0.146-0.541-0.119-0.703,0.084l-0.635,0.775v0.002 l-0.5,0.607c0-0.002-0.002-0.006-0.003-0.006c-0.565,2.01,0.43,4.135,2.343,4.865c0.253,0.094,0.509,0.162,0.765,0.201 c0.16,0.004,0.291,0,0.375-0.016c0,0,0.987-0.168,1.959-0.824c0.324-0.217,0.353-0.223,0.614-0.463c0.001-0.002,0-0.004,0.002-0.006 c0.515-0.471,0.689-0.664,0.689-0.664C17.898,26.799,17.842,26.457,17.592,26.262z" fill="url(#SVGID_6_)"/>
+<path d="M11.477,23.324l0.635-0.775c0.162-0.203,0.462-0.23,0.703-0.084l1.612,1.27l3.165,2.527 c0.25,0.195,0.307,0.537,0.129,0.76c0,0-0.176,0.193-0.693,0.668L11.477,23.324z" fill="#FFFFFF" opacity="0.4"/>
+<radialGradient cx="-162.3672" cy="-37.5952" gradientTransform="matrix(0.9891 0.1471 -0.1471 0.9891 159.0668 70.322)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="8.6173">
+ <stop offset="0.0424" style="stop-color:#D1D8D9"/>
+ <stop offset="0.4" style="stop-color:#BBC0C2"/>
+ <stop offset="0.7333" style="stop-color:#7C8C91"/>
+ <stop offset="1" style="stop-color:#A7B3B7"/>
+</radialGradient>
+<path d="M7.502,14.557l-2.66-5.506C4.701,8.762,4.371,8.625,4.104,8.748c0,0-0.232,0.105-0.813,0.479 c0,0.002-0.001,0-0.002,0.002C2.973,9.432,2.947,9.523,2.634,9.801c-0.434,0.389-0.758,0.793-0.978,1.105 c-0.721,2.08,0.275,4.35,2.266,5.109c0.406,0.154,0.822,0.23,1.236,0.242l1.266-0.57l0.853-0.381 C7.545,15.186,7.643,14.85,7.502,14.557z" fill="url(#SVGID_7_)"/>
+<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" 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" enable-background="new " 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"/>
+</linearGradient>
+<circle cx="21" cy="22" fill="url(#SVGID_1__)" r="7"/>
+<polygon enable-background="new " opacity="0.2" points="25.34,24 20.999,19.4 16.66,24 16,23.3 20.999,18 26,23.3 "/>
+<polygon enable-background="new " 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 "/>
+<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" enable-background="new " fill="#FFFFFF" 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 "/>
+</g>
+</svg>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_voip_work.svg Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,75 @@
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
+<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" opacity="0.6"/>
+<radialGradient cx="-451.0264" cy="-302.1748" gradientTransform="matrix(0.3502 0 0 0.3502 173.9495 115.3211)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="48.9059">
+ <stop offset="0" style="stop-color:#94FFFF"/>
+ <stop offset="0.5" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
+</radialGradient>
+<circle cx="16" cy="14" fill="url(#SVGID_1_)" r="13"/>
+<path d="M28.536,13.287c-0.288-5.078-3.577-9.449-8.38-11.141l-0.585,0.096l-3.397-0.65l-4.235,2.525l-0.159,1.064 H9.322l0.971,1.652L7.662,8.979l-0.613,2.65l2.173,3.85l2.218-0.453l0.81,0.697l0.633,0.063l0.418,1.633l-0.552,1.432L14.763,24 h2.053l2.035-1.645v-0.67l0.537-0.834l0.444-0.227c-0.113,0.172-0.29,0.566-0.29,0.566c-0.019,0.135,0.289,2.756,1.192,2.551 c0.686-0.156,3.135-4.705,3.182-5.139c0.093-0.855-0.373-1.209-0.659-1.342l-0.318-0.15l-1.462,1.465 c-0.157,0.012-0.298,0.039-0.426,0.076v-1.217l1.588-1.551l0.808-2.604l1.231-1.002l-0.27-0.49l0.929-0.895l-0.519-0.945 l0.395,0.047l2.313,5.178L28,14.795c-0.015-0.254-0.042-0.502-0.071-0.752L28.536,13.287z M16.156,7.463l-0.193-0.516h1.161 l0.565,1.271h-0.841V7.463H16.156z M19.987,10.023l0.927,1.354l0.063,0.162l-0.95-0.574L19.8,10.146L19.987,10.023z M21.381,12.387 l0.28,0.281l-0.362,0.08l-0.082-0.1L21.381,12.387z M14.127,3.285l0.59,0.914l-0.67,0.205l-0.262-0.15L14.127,3.285z" opacity="0.3"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="15.9995" x2="15.9995" y1="1.0625" y2="27.1316">
+ <stop offset="0" style="stop-color:#31A7F8"/>
+ <stop offset="0.497" style="stop-color:#1E74DC"/>
+ <stop offset="1" style="stop-color:#C8E4EB"/>
+</linearGradient>
+<path d="M16,1C8.821,1,3,6.82,3,14c0,7.182,5.821,13,13,13c7.182,0,13-5.818,13-13 C29,6.82,23.182,1,16,1z M16,26C9.383,26,4,20.617,4,14S9.383,2,16,2s12,5.383,12,12S22.617,26,16,26z" fill="url(#SVGID_2_)" opacity="0.3"/>
+<radialGradient cx="16.75" cy="4.499" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="15.4173">
+ <stop offset="0.3152" style="stop-color:#94FF26"/>
+ <stop offset="0.7273" style="stop-color:#1FC211"/>
+ <stop offset="1" style="stop-color:#0BA133"/>
+</radialGradient>
+<path d="M23.044,17.713l-1.353,1.355c0,0-0.818,0-0.856,0.324c-0.018,0.141-0.063,0.744-0.201,1.057 c-0.272,0.188-0.597,0.813-0.597,0.813s-0.169,1.205,0.734,1C21.669,22.059,24.434,18.367,23.044,17.713z" fill="url(#SVGID_3_)"/>
+<radialGradient cx="16.75" cy="4.5005" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="17.8328">
+ <stop offset="0.3152" style="stop-color:#94FF26"/>
+ <stop offset="0.7273" style="stop-color:#1FC211"/>
+ <stop offset="1" style="stop-color:#0BA133"/>
+</radialGradient>
+<path d="M19.99,2.619c-0.222,0.084-0.374,0.141-0.374,0.141l-3.344-0.639l-1.64,1.025l0.863,1.336 l-1.509,0.463l-0.813-0.463l0.286-0.811l-1.06,0.734L12.21,5.682h-2.014l0.745,1.268L8.11,9.258l-0.533,2.305l1.051,2.035L9.259,14 l2.218-0.453l0.81,0.695l0.736,0.072l0.801,3.135l-0.533,1.385l1.178,2.605l0.332,1.08h2.053l1.16-0.627l0.875-1.016v-1.23 l1.663-0.848v-1.822l0.658-1.25l1.467-1.32l0.351-1.531l-1.919,0.428l-0.505-0.615l0.359-0.574l-1.363-0.824l-0.581-2.088 l1.007-0.656l0.927,1.352l0.349,0.893l0.696,0.697l0.813,0.424l0.903-0.145l1.003-0.965l-0.706-1.289L23.12,9.744l-0.804-0.957 l0.764-0.533l2.397,0.291v0.852l2.086,4.299l0.474-0.379C27.756,8.359,24.48,4.199,19.99,2.619z M18.901,8.428l-1.095,0.291h-1.458 V7.963h-1.394l-1.103,0.291L12.17,7.789L11.705,6.92l2.321-0.523h2.322L16,5.469h1.161l0.646,1.451l1.095,0.383V8.428z M21.397,6.514l-1.974-0.35V5.469l0.987-0.232l0.29-0.348l0.696,0.58V6.514z" fill="url(#SVGID_4_)"/>
+<path d="M2.73,8.398C2.449,8.582,1.209,9.846,1.185,9.875c-0.489,0.596-0.786,1.178-0.795,1.197 c-0.308,0.727-0.585,2.615-0.205,4.359c0.282,1.289,1.901,4.789,3.796,7.348c2.016,2.721,5.333,5.609,6.953,6.371 c1.669,0.787,2.914,0.85,3.256,0.85c0.176,0,0.325-0.014,0.459-0.039c0.1-0.018,1.208-0.223,2.326-0.977 c0,0,0.467-0.314,0.729-0.555c0.02-0.018,0.786-0.768,0.799-0.785c0.247-0.311,0.358-0.701,0.312-1.102 c-0.049-0.416-0.27-0.805-0.605-1.068c0,0-4.841-3.844-4.875-3.863c-0.257-0.156-0.547-0.238-0.841-0.238 c-0.458,0-0.881,0.199-1.161,0.549l-0.5,0.611c-0.726-0.627-1.689-1.563-2.338-2.438c-0.884-1.193-1.535-2.25-2.041-3.324 l1.232-0.553c0.369-0.166,0.646-0.467,0.786-0.85c0.146-0.396,0.12-0.852-0.067-1.244L5.742,8.617 c-0.269-0.557-0.83-0.914-1.431-0.914c-0.217,0-0.427,0.045-0.622,0.135L2.73,8.398z" opacity="0.6"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_5_" x1="-0.2866" x2="10.2134" y1="8.4424" y2="26.7754">
+ <stop offset="0" style="stop-color:#E9F0F2"/>
+ <stop offset="0.5212" style="stop-color:#AAB1B5"/>
+ <stop offset="1" style="stop-color:#838F94"/>
+</linearGradient>
+<path d="M5.143,16.264c0.67,1.684,1.561,3.094,2.548,4.428c0.95,1.281,2.554,2.713,3.286,3.242l3.479,5.045 c-0.384,0.076-1.622-0.037-3.097-0.732c-1.477-0.695-4.652-3.467-6.575-6.063c-1.922-2.594-3.398-5.941-3.622-6.965 c-0.352-1.611-0.051-3.287,0.148-3.756c0,0,0.213-0.426,0.646-0.951C2.142,10.285,5.143,16.264,5.143,16.264z" fill="url(#SVGID_5_)"/>
+<radialGradient cx="10.8911" cy="22.9111" gradientUnits="userSpaceOnUse" id="SVGID_6_" r="8.6673">
+ <stop offset="0.0424" style="stop-color:#D1D8D9"/>
+ <stop offset="0.4" style="stop-color:#BBC0C2"/>
+ <stop offset="0.7333" style="stop-color:#7C8C91"/>
+ <stop offset="1" style="stop-color:#A7B3B7"/>
+</radialGradient>
+<path d="M17.592,26.262l-3.165-2.527l-1.612-1.27c-0.241-0.146-0.541-0.119-0.703,0.084l-0.635,0.775v0.002 l-0.5,0.607c0-0.002-0.002-0.006-0.003-0.006c-0.565,2.01,0.43,4.135,2.343,4.865c0.253,0.094,0.509,0.162,0.765,0.201 c0.16,0.004,0.291,0,0.375-0.016c0,0,0.987-0.168,1.959-0.824c0.324-0.217,0.353-0.223,0.614-0.463c0.001-0.002,0-0.004,0.002-0.006 c0.515-0.471,0.689-0.664,0.689-0.664C17.898,26.799,17.842,26.457,17.592,26.262z" fill="url(#SVGID_6_)"/>
+<path d="M11.477,23.324l0.635-0.775c0.162-0.203,0.462-0.23,0.703-0.084l1.612,1.27l3.165,2.527 c0.25,0.195,0.307,0.537,0.129,0.76c0,0-0.176,0.193-0.693,0.668L11.477,23.324z" fill="#FFFFFF" opacity="0.4"/>
+<radialGradient cx="-162.3672" cy="-37.5952" gradientTransform="matrix(0.9891 0.1471 -0.1471 0.9891 159.0668 70.322)" gradientUnits="userSpaceOnUse" id="SVGID_7_" r="8.6173">
+ <stop offset="0.0424" style="stop-color:#D1D8D9"/>
+ <stop offset="0.4" style="stop-color:#BBC0C2"/>
+ <stop offset="0.7333" style="stop-color:#7C8C91"/>
+ <stop offset="1" style="stop-color:#A7B3B7"/>
+</radialGradient>
+<path d="M7.502,14.557l-2.66-5.506C4.701,8.762,4.371,8.625,4.104,8.748c0,0-0.232,0.105-0.813,0.479 c0,0.002-0.001,0-0.002,0.002C2.973,9.432,2.947,9.523,2.634,9.801c-0.434,0.389-0.758,0.793-0.978,1.105 c-0.721,2.08,0.275,4.35,2.266,5.109c0.406,0.154,0.822,0.23,1.236,0.242l1.266-0.57l0.853-0.381 C7.545,15.186,7.643,14.85,7.502,14.557z" fill="url(#SVGID_7_)"/>
+<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" opacity="0.4"/>
+</g>
+<g>
+<defs>
+</defs>
+<g>
+ <rect fill="none" height="30" width="30"/>
+</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" 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" 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" 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 height="6" opacity="0.3" width="1" x="22" y="20"/>
+</g>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_vpn.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_vpn.svg Fri May 14 16:09:54 2010 +0300
@@ -1,55 +1,63 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
<radialGradient cx="-453.8818" cy="-299.3193" gradientTransform="matrix(0.3502 0 0 0.3502 173.9495 115.3211)" gradientUnits="userSpaceOnUse" id="SVGID_1_" r="48.9059">
-<stop offset="0" style="stop-color:#94FFFF"/>
-<stop offset="0.5" style="stop-color:#36B5FF"/>
-<stop offset="1" style="stop-color:#1B66D8"/>
+ <stop offset="0" style="stop-color:#94FFFF"/>
+ <stop offset="0.5" style="stop-color:#36B5FF"/>
+ <stop offset="1" style="stop-color:#1B66D8"/>
</radialGradient>
<circle cx="15" cy="15" fill="url(#SVGID_1_)" r="13"/>
-<path d="M27.536,14.288c-0.288-5.078-3.577-9.45-8.38-11.141l-0.585,0.096l-3.397-0.65l-4.235,2.525l-0.159,1.064 H8.322l0.971,1.651L6.662,9.979l-0.613,2.649l2.173,3.851l2.218-0.453l0.81,0.696l0.633,0.063l0.418,1.634l-0.552,1.432L13.763,25 h2.053l2.035-1.644v-0.671l0.537-0.833l0.444-0.227c-0.113,0.172-0.29,0.566-0.29,0.566c-0.019,0.134,0.289,2.755,1.192,2.55 c0.686-0.155,3.135-4.705,3.182-5.138c0.093-0.855-0.373-1.209-0.659-1.343l-0.318-0.15l-1.462,1.466 c-0.157,0.012-0.298,0.038-0.426,0.076v-1.217l1.588-1.551l0.808-2.604l1.231-1.002l-0.27-0.491l0.929-0.894l-0.519-0.946 l0.395,0.048l2.313,5.178L27,15.796c-0.015-0.254-0.042-0.503-0.071-0.753L27.536,14.288z M15.156,8.464l-0.193-0.516h1.161 l0.565,1.271h-0.841V8.464H15.156z M18.987,11.024l0.927,1.353l0.063,0.162l-0.95-0.574L18.8,11.146L18.987,11.024z M20.381,13.388 l0.28,0.28l-0.362,0.081l-0.082-0.1L20.381,13.388z M13.127,4.286l0.59,0.913l-0.67,0.205l-0.262-0.149L13.127,4.286z" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M27.536,14.288c-0.288-5.078-3.577-9.45-8.38-11.141l-0.585,0.096l-3.397-0.65l-4.235,2.525l-0.159,1.064 H8.322l0.971,1.651L6.662,9.979l-0.613,2.649l2.173,3.851l2.218-0.453l0.81,0.696l0.633,0.063l0.418,1.634l-0.552,1.432L13.763,25 h2.053l2.035-1.644v-0.671l0.537-0.833l0.444-0.227c-0.113,0.172-0.29,0.566-0.29,0.566c-0.019,0.134,0.289,2.755,1.192,2.55 c0.686-0.155,3.135-4.705,3.182-5.138c0.093-0.855-0.373-1.209-0.659-1.343l-0.318-0.15l-1.462,1.466 c-0.157,0.012-0.298,0.038-0.426,0.076v-1.217l1.588-1.551l0.808-2.604l1.231-1.002l-0.27-0.491l0.929-0.894l-0.519-0.946 l0.395,0.048l2.313,5.178L27,15.796c-0.015-0.254-0.042-0.503-0.071-0.753L27.536,14.288z M15.156,8.464l-0.193-0.516h1.161 l0.565,1.271h-0.841V8.464H15.156z M18.987,11.024l0.927,1.353l0.063,0.162l-0.95-0.574L18.8,11.146L18.987,11.024z M20.381,13.388 l0.28,0.28l-0.362,0.081l-0.082-0.1L20.381,13.388z M13.127,4.286l0.59,0.913l-0.67,0.205l-0.262-0.149L13.127,4.286z" opacity="0.3"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="14.9995" x2="14.9995" y1="2.0625" y2="28.1316">
-<stop offset="0" style="stop-color:#31A7F8"/>
-<stop offset="0.497" style="stop-color:#1E74DC"/>
-<stop offset="1" style="stop-color:#C8E4EB"/>
+ <stop offset="0" style="stop-color:#31A7F8"/>
+ <stop offset="0.497" style="stop-color:#1E74DC"/>
+ <stop offset="1" style="stop-color:#C8E4EB"/>
</linearGradient>
-<path d="M15,2C7.821,2,2,7.821,2,15c0,7.182,5.821,13,13,13c7.182,0,13-5.818,13-13 C28,7.821,22.182,2,15,2z M15,27C8.383,27,3,21.617,3,15S8.383,3,15,3s12,5.383,12,12S21.617,27,15,27z" fill="url(#SVGID_2_)" fill-opacity="0.3" stroke-opacity="0.3"/>
+<path d="M15,2C7.821,2,2,7.821,2,15c0,7.182,5.821,13,13,13c7.182,0,13-5.818,13-13 C28,7.821,22.182,2,15,2z M15,27C8.383,27,3,21.617,3,15S8.383,3,15,3s12,5.383,12,12S21.617,27,15,27z" fill="url(#SVGID_2_)" opacity="0.3"/>
<radialGradient cx="15.75" cy="5.5" gradientUnits="userSpaceOnUse" id="SVGID_3_" r="15.4173">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+ <stop offset="0.3152" style="stop-color:#94FF26"/>
+ <stop offset="0.7273" style="stop-color:#1FC211"/>
+ <stop offset="1" style="stop-color:#0BA133"/>
</radialGradient>
<path d="M22.044,18.714l-1.353,1.355c0,0-0.818,0-0.856,0.324c-0.018,0.14-0.063,0.744-0.201,1.056 c-0.272,0.188-0.597,0.813-0.597,0.813s-0.169,1.206,0.734,1.001C20.669,23.06,23.434,19.367,22.044,18.714z" fill="url(#SVGID_3_)"/>
<radialGradient cx="15.75" cy="5.5005" gradientUnits="userSpaceOnUse" id="SVGID_4_" r="17.8335">
-<stop offset="0" style="stop-color:#94FF26"/>
-<stop offset="0.3152" style="stop-color:#94FF26"/>
-<stop offset="0.7273" style="stop-color:#1FC211"/>
-<stop offset="1" style="stop-color:#0BA133"/>
+ <stop offset="0.3152" style="stop-color:#94FF26"/>
+ <stop offset="0.7273" style="stop-color:#1FC211"/>
+ <stop offset="1" style="stop-color:#0BA133"/>
</radialGradient>
<path d="M18.99,3.619c-0.222,0.084-0.374,0.142-0.374,0.142l-3.344-0.64l-1.64,1.026l0.863,1.335 l-1.509,0.464l-0.813-0.464l0.286-0.811l-1.06,0.734L11.21,6.683H9.196L9.941,7.95L7.11,10.259l-0.533,2.304l1.051,2.035L8.259,15 l2.218-0.453l0.81,0.696l0.736,0.072l0.801,3.134l-0.533,1.386l1.178,2.604l0.332,1.081h2.053l1.16-0.628l0.875-1.016v-1.229 l1.663-0.849v-1.821l0.658-1.251l1.467-1.32l0.351-1.53l-1.919,0.428l-0.505-0.615l0.359-0.574l-1.363-0.824l-0.581-2.089 l1.007-0.656l0.927,1.353L20.3,11.79l0.696,0.696l0.813,0.425l0.903-0.146l1.003-0.965l-0.706-1.288l-0.889,0.232l-0.804-0.957 l0.764-0.533l2.397,0.29v0.853l2.086,4.298l0.474-0.379C26.756,9.359,23.48,5.199,18.99,3.619z M17.901,9.429l-1.095,0.29h-1.458 V8.964h-1.394l-1.103,0.291L11.17,8.79l-0.465-0.87l2.321-0.522h2.322L15,6.469h1.161l0.646,1.451l1.095,0.384V9.429z M20.397,7.514 l-1.974-0.349V6.469l0.987-0.232l0.29-0.348l0.696,0.58V7.514z" fill="url(#SVGID_4_)"/>
</g>
<g>
<rect fill="none" height="15" width="15" x="15" y="15"/>
-<path d="M23.82,23.82v-3.53c0-0.729-0.594-1.323-1.324-1.323-0.729,0-1.323,0.594-1.323,1.323v3.53h-2.647v-3.53c0-2.189,1.781-3.971,3.971-3.971s3.971,1.781,3.971,3.971v3.53h-2.646z" fill-opacity="0.6" stroke-opacity="0.6" style="enable-background:new;"/>
+<path d="M23.82,23.82v-3.53c0-0.729-0.594-1.323-1.324-1.323-0.729,0-1.323,0.594-1.323,1.323v3.53h-2.647v-3.53c0-2.189,1.781-3.971,3.971-3.971s3.971,1.781,3.971,3.971v3.53h-2.646z" opacity="0.6" style="enable-background:new;"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 90.98 116.5195)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-68.48" x2="-68.48" y1="99.54" y2="93.17">
+
<stop offset="0" stop-color="#C8C8C8"/>
+
<stop offset="1" stop-color="#646464"/>
+
</linearGradient>
<path d="M20.74,23.38v-3.088c0-0.974,0.792-1.766,1.765-1.766,0.974,0,1.765,0.792,1.765,1.766v3.088h1.766v-3.088c0-1.941-1.589-3.53-3.53-3.53s-3.53,1.589-3.53,3.53v3.088h1.765z" fill="url(#SVGID_1__)"/>
-<rect fill-opacity="0.6" height="7.06" stroke-opacity="0.6" style="enable-background:new;" width="11.47" x="16.76" y="21.62"/>
+<rect height="7.06" opacity="0.6" style="enable-background:new;" width="11.47" x="16.76" y="21.62"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 90.98 116.5195)" gradientUnits="userSpaceOnUse" id="SVGID_2__" x1="-73.77" x2="-63.19" y1="91.37" y2="91.37">
+
<stop offset="0" stop-color="#FFB533"/>
+
<stop offset="0.24" stop-color="#FFE692"/>
+
<stop offset="0.75" stop-color="#ED8C0D"/>
+
<stop offset="1" stop-color="#FFB81F"/>
+
</linearGradient>
<rect fill="url(#SVGID_2__)" height="6.178" width="10.59" x="17.21" y="22.06"/>
-<rect fill-opacity="0.5" height="0.882" stroke-opacity="0.5" style="enable-background:new;" width="10.59" x="17.21" y="26.03"/>
-<rect fill-opacity="0.5" height="0.883" stroke-opacity="0.5" style="enable-background:new;" width="10.59" x="17.21" y="24.26"/>
+<rect height="0.882" opacity="0.5" style="enable-background:new;" width="10.59" x="17.21" y="26.03"/>
+<rect height="0.883" opacity="0.5" style="enable-background:new;" width="10.59" x="17.21" y="24.26"/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wifi.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wifi.svg Fri May 14 16:09:54 2010 +0300
@@ -1,25 +1,25 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="2.2749" y2="32.0078">
+ <stop offset="0" style="stop-color:#4EDEFF"/>
+ <stop offset="1" style="stop-color:#048CC6"/>
+</linearGradient>
<circle cx="15" cy="15" fill="url(#SVGID_1_)" r="13"/>
-<g fill-opacity="0.2" stroke-opacity="0.2">
-<g>
-<path d="M24.99,12.631c-0.283-0.748-1.309-2.688-2.809-4.158c0.485-2.043-0.762-2.379-1.248-2.457 c-0.865-0.055-2.592-0.715-4.184-0.203c-2.305,0.74-4.67,3.051-6.592,5.797C8.193,14.395,7.414,19.094,7,19.234 c0.57,1.799,2.896,4.215,2.896,4.215s-0.687,2.191,1.361,2.535c1.986,0.205,3.936-1.619,3.936-1.619s9.661-1.873,7.774-11.104 C23.006,13.275,24.684,12.729,24.99,12.631z M14.783,20.25c-0.049,0.412-2.373,3.385-3.342,2.664 c-0.914-0.68-1.818-1.74-2.335-3.156c0.023-0.025,1.533-0.443,1.566-0.422c-1.491-6.658,4.111-7.711,4.111-7.711 c0.015,0.002-2.349,2.613-1.457,6.775c-0.005-0.049,1.341-0.365,1.989-0.572C15.531,18.402,14.892,19.322,14.783,20.25z M16.575,20.842c-0.015-0.004,3.059-3.283,2.171-7.441c0.003,0.045-1.344,0.363-1.99,0.57c-0.559-1.488,0.066-5.105,1.385-5.938 c0.785-0.236,2.498,0.49,3.758,2.094c0.424,0.539-0.71,1.391-0.742,1.373C22.646,18.154,16.575,20.842,16.575,20.842z"/>
+<g opacity="0.2">
+ <g>
+ <path d="M24.99,12.631c-0.283-0.748-1.309-2.688-2.809-4.158c0.485-2.043-0.762-2.379-1.248-2.457 c-0.865-0.055-2.592-0.715-4.184-0.203c-2.305,0.74-4.67,3.051-6.592,5.797C8.193,14.395,7.414,19.094,7,19.234 c0.57,1.799,2.896,4.215,2.896,4.215s-0.687,2.191,1.361,2.535c1.986,0.205,3.936-1.619,3.936-1.619s9.661-1.873,7.774-11.104 C23.006,13.275,24.684,12.729,24.99,12.631z M14.783,20.25c-0.049,0.412-2.373,3.385-3.342,2.664 c-0.914-0.68-1.818-1.74-2.335-3.156c0.023-0.025,1.533-0.443,1.566-0.422c-1.491-6.658,4.111-7.711,4.111-7.711 c0.015,0.002-2.349,2.613-1.457,6.775c-0.005-0.049,1.341-0.365,1.989-0.572C15.531,18.402,14.892,19.322,14.783,20.25z M16.575,20.842c-0.015-0.004,3.059-3.283,2.171-7.441c0.003,0.045-1.344,0.363-1.99,0.57c-0.559-1.488,0.066-5.105,1.385-5.938 c0.785-0.236,2.498,0.49,3.758,2.094c0.424,0.539-0.71,1.391-0.742,1.373C22.646,18.154,16.575,20.842,16.575,20.842z"/>
+ </g>
</g>
-</g>
-<path d="M15,3c7.011,0,12.71,5.555,12.975,12.5C27.981,15.332,28,15.168,28,15c0-7.18-5.82-13-13-13 S2,7.82,2,15c0,0.168,0.019,0.332,0.025,0.5C2.29,8.555,7.989,3,15,3z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
+<path d="M15,3c7.011,0,12.71,5.555,12.975,12.5C27.981,15.332,28,15.168,28,15c0-7.18-5.82-13-13-13 S2,7.82,2,15c0,0.168,0.019,0.332,0.025,0.5C2.29,8.555,7.989,3,15,3z" fill="#FFFFFF" opacity="0.4"/>
<g>
-<path d="M23.778,11.643c-0.283-0.749-1.309-2.688-2.809-4.159c0.485-2.042-0.762-2.379-1.248-2.456 c-2.12-0.134-2.895,0.569-3.568,1.059c-1.26,0.916-4.098,0.759-7.208,4.535c-1.964,2.784-1.265,7.074-1.265,7.074 s-1.479,0.41-1.893,0.55c0.57,1.8,2.896,4.216,2.896,4.216s-0.687,2.191,1.361,2.534c1.986,0.205,3.936-1.618,3.936-1.618 s9.661-1.874,7.774-11.104C21.793,12.287,23.471,11.74,23.778,11.643z M12.717,22.778c-1.05,0.314-3.757-1.092-4.824-4.009 c0.023-0.026,1.533-0.443,1.566-0.423c-1.491-6.657,4.822-8.378,4.822-8.378c0.015,0.003-3.06,3.281-2.167,7.443 c-0.005-0.049,1.341-0.366,1.989-0.573C14.662,18.326,14.037,21.945,12.717,22.778z M15.363,19.854 c-0.015-0.004,3.059-3.284,2.17-7.442c0.004,0.046-1.344,0.363-1.99,0.571c-0.558-1.489,0.066-5.106,1.384-5.938 c1.05-0.315,3.758,1.09,4.823,4.009c-0.022,0.024-1.533,0.441-1.565,0.424C21.676,18.131,15.363,19.854,15.363,19.854z" fill="#FFFFFF"/>
+ <path d="M23.778,11.643c-0.283-0.749-1.309-2.688-2.809-4.159c0.485-2.042-0.762-2.379-1.248-2.456 c-2.12-0.134-2.895,0.569-3.568,1.059c-1.26,0.916-4.098,0.759-7.208,4.535c-1.964,2.784-1.265,7.074-1.265,7.074 s-1.479,0.41-1.893,0.55c0.57,1.8,2.896,4.216,2.896,4.216s-0.687,2.191,1.361,2.534c1.986,0.205,3.936-1.618,3.936-1.618 s9.661-1.874,7.774-11.104C21.793,12.287,23.471,11.74,23.778,11.643z M12.717,22.778c-1.05,0.314-3.757-1.092-4.824-4.009 c0.023-0.026,1.533-0.443,1.566-0.423c-1.491-6.657,4.822-8.378,4.822-8.378c0.015,0.003-3.06,3.281-2.167,7.443 c-0.005-0.049,1.341-0.366,1.989-0.573C14.662,18.326,14.037,21.945,12.717,22.778z M15.363,19.854 c-0.015-0.004,3.059-3.284,2.17-7.442c0.004,0.046-1.344,0.363-1.99,0.571c-0.558-1.489,0.066-5.106,1.384-5.938 c1.05-0.315,3.758,1.09,4.823,4.009c-0.022,0.024-1.533,0.441-1.565,0.424C21.676,18.131,15.363,19.854,15.363,19.854z" fill="#FFFFFF"/>
</g>
<rect fill="none" height="30" width="30"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="14.9995" x2="14.9995" y1="2.2749" y2="32.0078">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
-</linearGradient>
-</defs>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wlan.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wlan.svg Fri May 14 16:09:54 2010 +0300
@@ -1,27 +1,27 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
+<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15.4907" x2="15.4907" y1="2.2749" y2="32.0078">
+ <stop offset="0" style="stop-color:#4EDEFF"/>
+ <stop offset="1" style="stop-color:#048CC6"/>
+</linearGradient>
<circle cx="15.491" cy="15" fill="url(#SVGID_1_)" r="13"/>
-<path d="M15.491,3c7.012,0,12.711,5.555,12.975,12.5c0.008-0.168,0.025-0.332,0.025-0.5 c0-7.18-5.82-13-13-13s-13,5.82-13,13c0,0.168,0.02,0.332,0.025,0.5C2.782,8.555,8.481,3,15.491,3z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M22.513,19.506l1.516,1.303c1.529-1.756,2.463-4.045,2.463-6.559c0-2.512-0.934-4.801-2.463-6.559 l-1.516,1.305c1.229,1.406,1.979,3.24,1.979,5.254C24.491,16.266,23.741,18.1,22.513,19.506z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M10.47,19.506c-1.229-1.406-1.979-3.24-1.979-5.256c0-2.014,0.75-3.848,1.979-5.254L8.954,7.691 c-1.529,1.758-2.463,4.047-2.463,6.559c0,2.514,0.934,4.803,2.463,6.559L10.47,19.506z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M19.474,16.893l1.525,1.311c0.926-1.057,1.492-2.438,1.492-3.953s-0.566-2.896-1.492-3.951l-1.525,1.311 c0.627,0.705,1.018,1.623,1.018,2.641S20.101,16.188,19.474,16.893z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M13.509,16.893c-0.625-0.705-1.018-1.625-1.018-2.643s0.393-1.936,1.018-2.641l-1.523-1.311 c-0.928,1.055-1.494,2.436-1.494,3.951s0.566,2.896,1.494,3.953L13.509,16.893z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<polygon fill-opacity="0.2" points="13.38,25.912 16.513,15.025 19.644,25.912 " stroke-opacity="0.2"/>
+<path d="M15.491,3c7.012,0,12.711,5.555,12.975,12.5c0.008-0.168,0.025-0.332,0.025-0.5 c0-7.18-5.82-13-13-13s-13,5.82-13,13c0,0.168,0.02,0.332,0.025,0.5C2.782,8.555,8.481,3,15.491,3z" fill="#FFFFFF" opacity="0.4"/>
+<path d="M22.513,19.506l1.516,1.303c1.529-1.756,2.463-4.045,2.463-6.559c0-2.512-0.934-4.801-2.463-6.559 l-1.516,1.305c1.229,1.406,1.979,3.24,1.979,5.254C24.491,16.266,23.741,18.1,22.513,19.506z" opacity="0.2"/>
+<path d="M10.47,19.506c-1.229-1.406-1.979-3.24-1.979-5.256c0-2.014,0.75-3.848,1.979-5.254L8.954,7.691 c-1.529,1.758-2.463,4.047-2.463,6.559c0,2.514,0.934,4.803,2.463,6.559L10.47,19.506z" opacity="0.2"/>
+<path d="M19.474,16.893l1.525,1.311c0.926-1.057,1.492-2.438,1.492-3.953s-0.566-2.896-1.492-3.951l-1.525,1.311 c0.627,0.705,1.018,1.623,1.018,2.641S20.101,16.188,19.474,16.893z" opacity="0.2"/>
+<path d="M13.509,16.893c-0.625-0.705-1.018-1.625-1.018-2.643s0.393-1.936,1.018-2.641l-1.523-1.311 c-0.928,1.055-1.494,2.436-1.494,3.951s0.566,2.896,1.494,3.953L13.509,16.893z" opacity="0.2"/>
+<polygon opacity="0.2" points="13.38,25.912 16.513,15.025 19.644,25.912 "/>
<path d="M21.513,18.506l1.516,1.303c1.529-1.756,2.463-4.045,2.463-6.559c0-2.512-0.934-4.801-2.463-6.559 l-1.516,1.305c1.229,1.406,1.979,3.24,1.979,5.254C23.491,15.266,22.741,17.1,21.513,18.506z" fill="#FFFFFF"/>
<path d="M9.47,18.506c-1.229-1.406-1.979-3.24-1.979-5.256c0-2.014,0.75-3.848,1.979-5.254L7.954,6.691 c-1.529,1.758-2.463,4.047-2.463,6.559c0,2.514,0.934,4.803,2.463,6.559L9.47,18.506z" fill="#FFFFFF"/>
<path d="M18.474,15.893l1.525,1.311c0.926-1.057,1.492-2.438,1.492-3.953s-0.566-2.896-1.492-3.951l-1.525,1.311 c0.627,0.705,1.018,1.623,1.018,2.641S19.101,15.188,18.474,15.893z" fill="#FFFFFF"/>
<path d="M12.509,15.893c-0.625-0.705-1.018-1.625-1.018-2.643s0.393-1.936,1.018-2.641l-1.523-1.311 c-0.928,1.055-1.494,2.436-1.494,3.951s0.566,2.896,1.494,3.953L12.509,15.893z" fill="#FFFFFF"/>
<polygon fill="#FFFFFF" points="12.38,24.912 15.513,14.025 18.644,24.912 "/>
<rect fill="none" height="30" width="30" x="0.491"/>
-<defs>
-<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15.4907" x2="15.4907" y1="2.2749" y2="32.0078">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
-</linearGradient>
-</defs>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wlan_offline.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wlan_offline.svg Fri May 14 16:09:54 2010 +0300
@@ -1,20 +1,22 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15.4907" x2="15.4907" y1="2.2749" y2="32.0078">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+ <stop offset="0" style="stop-color:#4EDEFF"/>
+ <stop offset="1" style="stop-color:#048CC6"/>
</linearGradient>
<circle cx="15.491" cy="15" fill="url(#SVGID_1_)" r="13"/>
-<path d="M15.491,3c7.012,0,12.711,5.555,12.975,12.5c0.008-0.168,0.025-0.332,0.025-0.5 c0-7.18-5.82-13-13-13s-13,5.82-13,13c0,0.168,0.02,0.332,0.025,0.5C2.782,8.555,8.481,3,15.491,3z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M22.513,19.506l1.516,1.303c1.529-1.756,2.463-4.045,2.463-6.559c0-2.512-0.934-4.801-2.463-6.559 l-1.516,1.305c1.229,1.406,1.979,3.24,1.979,5.254C24.491,16.266,23.741,18.1,22.513,19.506z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M10.47,19.506c-1.229-1.406-1.979-3.24-1.979-5.256c0-2.014,0.75-3.848,1.979-5.254L8.954,7.691 c-1.529,1.758-2.463,4.047-2.463,6.559c0,2.514,0.934,4.803,2.463,6.559L10.47,19.506z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M19.474,16.893l1.525,1.311c0.926-1.057,1.492-2.438,1.492-3.953s-0.566-2.896-1.492-3.951l-1.525,1.311 c0.627,0.705,1.018,1.623,1.018,2.641S20.101,16.188,19.474,16.893z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M13.509,16.893c-0.625-0.705-1.018-1.625-1.018-2.643s0.393-1.936,1.018-2.641l-1.523-1.311 c-0.928,1.055-1.494,2.436-1.494,3.951s0.566,2.896,1.494,3.953L13.509,16.893z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<polygon fill-opacity="0.2" points="13.38,25.912 16.513,15.025 19.644,25.912 " stroke-opacity="0.2"/>
+<path d="M15.491,3c7.012,0,12.711,5.555,12.975,12.5c0.008-0.168,0.025-0.332,0.025-0.5 c0-7.18-5.82-13-13-13s-13,5.82-13,13c0,0.168,0.02,0.332,0.025,0.5C2.782,8.555,8.481,3,15.491,3z" fill="#FFFFFF" opacity="0.4"/>
+<path d="M22.513,19.506l1.516,1.303c1.529-1.756,2.463-4.045,2.463-6.559c0-2.512-0.934-4.801-2.463-6.559 l-1.516,1.305c1.229,1.406,1.979,3.24,1.979,5.254C24.491,16.266,23.741,18.1,22.513,19.506z" opacity="0.2"/>
+<path d="M10.47,19.506c-1.229-1.406-1.979-3.24-1.979-5.256c0-2.014,0.75-3.848,1.979-5.254L8.954,7.691 c-1.529,1.758-2.463,4.047-2.463,6.559c0,2.514,0.934,4.803,2.463,6.559L10.47,19.506z" opacity="0.2"/>
+<path d="M19.474,16.893l1.525,1.311c0.926-1.057,1.492-2.438,1.492-3.953s-0.566-2.896-1.492-3.951l-1.525,1.311 c0.627,0.705,1.018,1.623,1.018,2.641S20.101,16.188,19.474,16.893z" opacity="0.2"/>
+<path d="M13.509,16.893c-0.625-0.705-1.018-1.625-1.018-2.643s0.393-1.936,1.018-2.641l-1.523-1.311 c-0.928,1.055-1.494,2.436-1.494,3.951s0.566,2.896,1.494,3.953L13.509,16.893z" opacity="0.2"/>
+<polygon opacity="0.2" points="13.38,25.912 16.513,15.025 19.644,25.912 "/>
<path d="M21.513,18.506l1.516,1.303c1.529-1.756,2.463-4.045,2.463-6.559c0-2.512-0.934-4.801-2.463-6.559 l-1.516,1.305c1.229,1.406,1.979,3.24,1.979,5.254C23.491,15.266,22.741,17.1,21.513,18.506z" fill="#FFFFFF"/>
<path d="M9.47,18.506c-1.229-1.406-1.979-3.24-1.979-5.256c0-2.014,0.75-3.848,1.979-5.254L7.954,6.691 c-1.529,1.758-2.463,4.047-2.463,6.559c0,2.514,0.934,4.803,2.463,6.559L9.47,18.506z" fill="#FFFFFF"/>
<path d="M18.474,15.893l1.525,1.311c0.926-1.057,1.492-2.438,1.492-3.953s-0.566-2.896-1.492-3.951l-1.525,1.311 c0.627,0.705,1.018,1.623,1.018,2.641S19.101,15.188,18.474,15.893z" fill="#FFFFFF"/>
@@ -23,15 +25,21 @@
<rect fill="none" height="30" width="30" x="0.491"/>
</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"/>
+<rect height="34.27" 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>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wlan_secure.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_small_wlan_secure.svg Fri May 14 16:09:54 2010 +0300
@@ -1,20 +1,22 @@
-<?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">
+<?xml version="1.0" ?>
+<!DOCTYPE svg PUBLIC '-//W3C//DTD SVG 1.1//EN' 'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd'>
+<svg 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>
+<defs>
+</defs>
<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"/>
<linearGradient gradientUnits="userSpaceOnUse" id="SVGID_1_" x1="15.4907" x2="15.4907" y1="2.2749" y2="32.0078">
-<stop offset="0" style="stop-color:#4EDEFF"/>
-<stop offset="1" style="stop-color:#048CC6"/>
+ <stop offset="0" style="stop-color:#4EDEFF"/>
+ <stop offset="1" style="stop-color:#048CC6"/>
</linearGradient>
<circle cx="15.491" cy="15" fill="url(#SVGID_1_)" r="13"/>
-<path d="M15.491,3c7.012,0,12.711,5.555,12.975,12.5c0.008-0.168,0.025-0.332,0.025-0.5 c0-7.18-5.82-13-13-13s-13,5.82-13,13c0,0.168,0.02,0.332,0.025,0.5C2.782,8.555,8.481,3,15.491,3z" fill="#FFFFFF" fill-opacity="0.4" stroke-opacity="0.4"/>
-<path d="M22.513,19.506l1.516,1.303c1.529-1.756,2.463-4.045,2.463-6.559c0-2.512-0.934-4.801-2.463-6.559 l-1.516,1.305c1.229,1.406,1.979,3.24,1.979,5.254C24.491,16.266,23.741,18.1,22.513,19.506z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M10.47,19.506c-1.229-1.406-1.979-3.24-1.979-5.256c0-2.014,0.75-3.848,1.979-5.254L8.954,7.691 c-1.529,1.758-2.463,4.047-2.463,6.559c0,2.514,0.934,4.803,2.463,6.559L10.47,19.506z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M19.474,16.893l1.525,1.311c0.926-1.057,1.492-2.438,1.492-3.953s-0.566-2.896-1.492-3.951l-1.525,1.311 c0.627,0.705,1.018,1.623,1.018,2.641S20.101,16.188,19.474,16.893z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<path d="M13.509,16.893c-0.625-0.705-1.018-1.625-1.018-2.643s0.393-1.936,1.018-2.641l-1.523-1.311 c-0.928,1.055-1.494,2.436-1.494,3.951s0.566,2.896,1.494,3.953L13.509,16.893z" fill-opacity="0.2" stroke-opacity="0.2"/>
-<polygon fill-opacity="0.2" points="13.38,25.912 16.513,15.025 19.644,25.912 " stroke-opacity="0.2"/>
+<path d="M15.491,3c7.012,0,12.711,5.555,12.975,12.5c0.008-0.168,0.025-0.332,0.025-0.5 c0-7.18-5.82-13-13-13s-13,5.82-13,13c0,0.168,0.02,0.332,0.025,0.5C2.782,8.555,8.481,3,15.491,3z" fill="#FFFFFF" opacity="0.4"/>
+<path d="M22.513,19.506l1.516,1.303c1.529-1.756,2.463-4.045,2.463-6.559c0-2.512-0.934-4.801-2.463-6.559 l-1.516,1.305c1.229,1.406,1.979,3.24,1.979,5.254C24.491,16.266,23.741,18.1,22.513,19.506z" opacity="0.2"/>
+<path d="M10.47,19.506c-1.229-1.406-1.979-3.24-1.979-5.256c0-2.014,0.75-3.848,1.979-5.254L8.954,7.691 c-1.529,1.758-2.463,4.047-2.463,6.559c0,2.514,0.934,4.803,2.463,6.559L10.47,19.506z" opacity="0.2"/>
+<path d="M19.474,16.893l1.525,1.311c0.926-1.057,1.492-2.438,1.492-3.953s-0.566-2.896-1.492-3.951l-1.525,1.311 c0.627,0.705,1.018,1.623,1.018,2.641S20.101,16.188,19.474,16.893z" opacity="0.2"/>
+<path d="M13.509,16.893c-0.625-0.705-1.018-1.625-1.018-2.643s0.393-1.936,1.018-2.641l-1.523-1.311 c-0.928,1.055-1.494,2.436-1.494,3.951s0.566,2.896,1.494,3.953L13.509,16.893z" opacity="0.2"/>
+<polygon opacity="0.2" points="13.38,25.912 16.513,15.025 19.644,25.912 "/>
<path d="M21.513,18.506l1.516,1.303c1.529-1.756,2.463-4.045,2.463-6.559c0-2.512-0.934-4.801-2.463-6.559 l-1.516,1.305c1.229,1.406,1.979,3.24,1.979,5.254C23.491,15.266,22.741,17.1,21.513,18.506z" fill="#FFFFFF"/>
<path d="M9.47,18.506c-1.229-1.406-1.979-3.24-1.979-5.256c0-2.014,0.75-3.848,1.979-5.254L7.954,6.691 c-1.529,1.758-2.463,4.047-2.463,6.559c0,2.514,0.934,4.803,2.463,6.559L9.47,18.506z" fill="#FFFFFF"/>
<path d="M18.474,15.893l1.525,1.311c0.926-1.057,1.492-2.438,1.492-3.953s-0.566-2.896-1.492-3.951l-1.525,1.311 c0.627,0.705,1.018,1.623,1.018,2.641S19.101,15.188,18.474,15.893z" fill="#FFFFFF"/>
@@ -24,22 +26,30 @@
</g>
<g>
<rect fill="none" height="15" width="15" x="15" y="15"/>
-<path d="M23.82,23.82v-3.53c0-0.729-0.594-1.323-1.324-1.323-0.729,0-1.323,0.594-1.323,1.323v3.53h-2.647v-3.53c0-2.189,1.781-3.971,3.971-3.971s3.971,1.781,3.971,3.971v3.53h-2.646z" fill-opacity="0.6" stroke-opacity="0.6" style="enable-background:new;"/>
+<path d="M23.82,23.82v-3.53c0-0.729-0.594-1.323-1.324-1.323-0.729,0-1.323,0.594-1.323,1.323v3.53h-2.647v-3.53c0-2.189,1.781-3.971,3.971-3.971s3.971,1.781,3.971,3.971v3.53h-2.646z" opacity="0.6" style="enable-background:new;"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 90.98 116.5195)" gradientUnits="userSpaceOnUse" id="SVGID_1__" x1="-68.48" x2="-68.48" y1="99.54" y2="93.17">
+
<stop offset="0" stop-color="#C8C8C8"/>
+
<stop offset="1" stop-color="#646464"/>
+
</linearGradient>
<path d="M20.74,23.38v-3.088c0-0.974,0.792-1.766,1.765-1.766,0.974,0,1.765,0.792,1.765,1.766v3.088h1.766v-3.088c0-1.941-1.589-3.53-3.53-3.53s-3.53,1.589-3.53,3.53v3.088h1.765z" fill="url(#SVGID_1__)"/>
-<rect fill-opacity="0.6" height="7.06" stroke-opacity="0.6" style="enable-background:new;" width="11.47" x="16.76" y="21.62"/>
+<rect height="7.06" opacity="0.6" style="enable-background:new;" width="11.47" x="16.76" y="21.62"/>
<linearGradient gradientTransform="matrix(1 0 0 -1 90.98 116.5195)" gradientUnits="userSpaceOnUse" id="SVGID_2_" x1="-73.77" x2="-63.19" y1="91.37" y2="91.37">
+
<stop offset="0" stop-color="#FFB533"/>
+
<stop offset="0.24" stop-color="#FFE692"/>
+
<stop offset="0.75" stop-color="#ED8C0D"/>
+
<stop offset="1" stop-color="#FFB81F"/>
+
</linearGradient>
<rect fill="url(#SVGID_2_)" height="6.178" width="10.59" x="17.21" y="22.06"/>
-<rect fill-opacity="0.5" height="0.882" stroke-opacity="0.5" style="enable-background:new;" width="10.59" x="17.21" y="26.03"/>
-<rect fill-opacity="0.5" height="0.883" stroke-opacity="0.5" style="enable-background:new;" width="10.59" x="17.21" y="24.26"/>
+<rect height="0.882" opacity="0.5" style="enable-background:new;" width="10.59" x="17.21" y="26.03"/>
+<rect height="0.883" opacity="0.5" style="enable-background:new;" width="10.59" x="17.21" y="24.26"/>
<rect fill="none" height="30" width="30"/>
</g>
-</svg>
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_battery.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_battery.svg Fri May 14 16:09:54 2010 +0300
@@ -1,7 +1,11 @@
-<?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">
+<?xml version="1.0" ?>
+<!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="M3,3.5v11.5h10v-11.5h-10zm8,9.5h-6v-7.5h6v7.5z"/>
+
<rect height="2" width="5" x="5.5" y="1"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_bluetooth.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_bluetooth.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,9 @@
-<?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">
+<?xml version="1.0" ?>
+<!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="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>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_egprs.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_egprs.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,9 @@
-<?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">
+<?xml version="1.0" ?>
+<!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="M12.5,9.081h-7.925v3.323h10.01v2.6h-13.16v-14h13.16v2.597h-10v2.907h7.922v2.577z"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_gps.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_gps.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,13 @@
-<?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">
+<?xml version="1.0" ?>
+<!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="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"/>
+
<rect height="0.831" transform="matrix(-0.7071 0.7071 -0.7071 -0.7071 28.7026 11.8883)" width="3.298" x="10.24" y="11.47"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_hsdpa.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_hsdpa.svg Fri May 14 16:09:54 2010 +0300
@@ -1,9 +1,15 @@
-<?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">
+<?xml version="1.0" ?>
+<!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="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"/>
+
<path d="M14.7,3.114h-2.951l-0.164,1.159c0.164-0.012,0.305-0.023,0.492-0.023,0.726,0,1.475,0.164,2.002,0.55,0.57,0.386,0.92,1.018,0.92,1.92,0,1.416-1.218,2.669-3.267,2.669-0.923,0-1.695-0.211-2.118-0.433l0.328-1.334c0.328,0.163,1.019,0.374,1.71,0.374,0.736,0,1.521-0.351,1.521-1.158,0-0.797-0.62-1.276-2.141-1.276-0.423,0-0.715,0.023-1.019,0.07l0.49-3.98h4.192v1.462z"/>
+
<path d="M9.971,14.26c-0.309,0.092-0.896,0.223-1.48,0.223-0.808,0-1.393-0.184-1.801-0.528-0.401-0.345-0.624-0.86-0.624-1.438,0.006-1.313,1.078-2.062,2.53-2.062,0.571,0,1.012,0.099,1.23,0.188l-0.211,0.72c-0.244-0.1-0.54-0.169-1.026-0.169-0.834,0-1.472,0.421-1.472,1.274,0,0.82,0.578,1.294,1.4,1.294,0.223,0,0.407-0.023,0.487-0.053v-0.831h-0.685v-0.695h1.651v2.076z"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_missed_call.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_missed_call.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,9 @@
-<?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">
+<?xml version="1.0" ?>
+<!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="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>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_new_email.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_new_email.svg Fri May 14 16:09:54 2010 +0300
@@ -1,7 +1,11 @@
-<?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">
+<?xml version="1.0" ?>
+<!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="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"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_new_im.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_new_im.svg Fri May 14 16:09:54 2010 +0300
@@ -1,8 +1,13 @@
-<?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">
+<?xml version="1.0" ?>
+<!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="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"/>
+
<rect height="1.359" width="5" x="4.359" y="7.82"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_new_message.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_new_message.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,9 @@
-<?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">
+<?xml version="1.0" ?>
+<!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="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>
+
+</svg>
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_progress.axml Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,9 @@
+<animations>
+<icon name="qtg_status_progress" frame_duration="50" playmode="loop">
+<frame>qtg_status_progress_1</frame>
+<frame>qtg_status_progress_2</frame>
+<frame>qtg_status_progress_3</frame>
+<frame>qtg_status_progress_4</frame>
+<frame>qtg_status_progress_5</frame>
+</icon>
+</animations>
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_signal.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_signal.svg Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,9 @@
-<?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">
+<?xml version="1.0" ?>
+<!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="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>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_wcdma.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_wcdma.svg Fri May 14 16:09:54 2010 +0300
@@ -1,7 +1,11 @@
-<?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">
+<?xml version="1.0" ?>
+<!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="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"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_wlan.svg Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/icons/hbdefault/scalable/qtg_status_wlan.svg Fri May 14 16:09:54 2010 +0300
@@ -1,10 +1,17 @@
-<?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">
+<?xml version="1.0" ?>
+<!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="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"/>
+
<path d="M3.867,4.713c0,1.398,0.761,2.39,0.797,2.44,0.19-0.127,0.512-0.35,0.702-0.478-0.041-0.054-0.652-0.973-0.652-1.962,0-1.101,0.611-1.913,0.651-1.964-0.189-0.128-0.513-0.349-0.701-0.482-0.036,0.058-0.797,1.02-0.797,2.446z"/>
+
<path d="M14.38,4.71c0-2.104-1.154-3.657-1.191-3.71-0.19,0.128-0.51,0.35-0.7,0.478,0.033,0.049,1.043,1.48,1.043,3.232,0,1.895-1.01,3.178-1.043,3.231,0.188,0.131,0.51,0.353,0.697,0.481,0.03-0.049,1.19-1.671,1.19-3.712z"/>
+
<path d="M12.13,4.71c0-1.399-0.761-2.391-0.798-2.442-0.187,0.127-0.511,0.35-0.702,0.479,0.041,0.057,0.654,0.977,0.654,1.963,0,1.101-0.613,1.912-0.652,1.963,0.189,0.127,0.51,0.349,0.699,0.481,0.04-0.055,0.8-1.02,0.8-2.444z"/>
-</svg>
+
+</svg>
\ No newline at end of file
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbcombobox/hbcombobox.css Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbcombobox/hbcombobox.css Fri May 14 16:09:54 2010 +0300
@@ -3,11 +3,22 @@
{
layout:combobox_layout_noneditable;
}
+
HbComboBox[editable]
{
layout:combobox_layout_editable;
}
+HbComboBox:portrait
+{
+ max-rows-in-dropdown:8;
+}
+
+HbComboBox:landscape
+{
+ max-rows-in-dropdown:5;
+}
+
HbComboBox::combobox_button
{
fixed-width:var(hb-param-widget-combobox-height);
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbdataformviewitem/hbdataformviewitem.css Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbdataformviewitem/hbdataformviewitem.css Fri May 14 16:09:54 2010 +0300
@@ -69,7 +69,7 @@
HbDataFormViewItem::dataItem_ContentWidget:portrait
{
top:-var(hb-param-margin-gene-middle-vertical);
- left:-var(hb-param-margin-indentation);
+ left:-var(hb-param-margin-gene-left);
right:var(hb-param-margin-gene-right);
bottom:var(hb-param-margin-gene-middle-vertical);
}
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbgridviewitem/hbgridviewitem.css Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbgridviewitem/hbgridviewitem.css Fri May 14 16:09:54 2010 +0300
@@ -2,11 +2,11 @@
layout:layout-1;
}
-HbGridViewItem[icon][!text] {
+HbGridViewItem[layoutName="default"][icon][!text] {
layout:layout-2;
}
-HbGridViewItem[!icon][text] {
+HbGridViewItem[layoutName="default"][!icon][text] {
layout:layout-3;
}
@@ -14,11 +14,13 @@
}
HbGridViewItem::text {
+ size-policy-horizontal:ignored;
text-height: var(hb-param-text-height-tiny);
font-variant: secondary;
text-align: center center;
text-line-count-min: 1;
text-line-count-max: 1;
+ text-wrap-mode: wrap-anywhere;
}
HbGridViewItem::selection-icon {
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbindicatorlistitem/hbindicatorlistitem.widgetml Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbindicatorlistitem/hbindicatorlistitem.widgetml Fri May 14 16:09:54 2010 +0300
@@ -4,12 +4,13 @@
<meshitem src="icon-1" srcEdge="CENTERV" dst="" dstEdge="CENTERV" />
<meshitem src="text-1" srcEdge="LEFT" dst="icon-1" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-middle-horizontal)" />
+ <meshitem src="text-1" srcEdge="RIGHT" dst="" dstEdge="RIGHT" spacing="var(hb-param-margin-gene-popup)" />
<meshitem src="text-1" srcEdge="TOP" dst="" dstEdge="TOP" spacing="-var(hb-param-margin-gene-middle-vertical)"/>
<meshitem src="text-1" srcEdge="BOTTOM" dst="text-2" dstEdge="TOP" spacing="var(hb-param-margin-gene-middle-vertical)"/>
<meshitem src="text-2" srcEdge="LEFT" dst="text-1" dstEdge="LEFT" />
<meshitem src="text-2" srcEdge="RIGHT" dst="text-1" dstEdge="RIGHT" />
- <meshitem src="text-2" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" spacing="var(hb-param-margin-middle-vertical)" />
+ <meshitem src="text-2" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" spacing="var(hb-param-margin-gene-middle-vertical)" />
<meshitem src="background" srcEdge="LEFT" dst="" dstEdge="LEFT" />
<meshitem src="background" srcEdge="TOP" dst="" dstEdge="TOP" />
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbindicatormenuclock/hbindicatormenuclock.css Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-HbIndicatorMenuClock[amPmSymbolPos="0"]
-{
- layout:menuclock_ampmbefore;
-}
-
-HbIndicatorMenuClock
-{
- layout:menuclock_ampmafter;
-}
-
-HbIndicatorMenuClock::time
-{
- font-variant: primary;
- fixed-height: var(hb-param-text-height-primary);
- text-align: left;
- vertical-align: bottom;
-}
-
-HbIndicatorMenuClock::ampmSymbol
-{
- font-variant: primary;
- fixed-height: var(hb-param-text-height-primary);
- text-align: left;
- vertical-align: bottom;
-}
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbindicatormenuclock/hbindicatormenuclock.widgetml Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-<hbwidget version="0.1" type="HbIndicatorMenuClock">
-
-<layout name="menuclock_ampmafter" type="mesh">
- <meshitem src="time" srcEdge="TOP" dst="" dstEdge="TOP" />
- <meshitem src="time" srcEdge="LEFT" dst="" dstEdge="LEFT" />
- <meshitem src="time" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
- <meshitem src="time" srcEdge="RIGHT" dst="ampmSymbol" dstEdge="LEFT" />
- <meshitem src="ampmSymbol" srcEdge="TOP" dst="" dstEdge="TOP" />
- <meshitem src="ampmSymbol" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-</layout>
-
-<layout name="menuclock_ampmbefore" type="mesh">
- <meshitem src="ampmSymbol" srcEdge="TOP" dst="" dstEdge="TOP" />
- <meshitem src="ampmSymbol" srcEdge="LEFT" dst="" dstEdge="LEFT" />
- <meshitem src="ampmSymbol" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
- <meshitem src="ampmSymbol" srcEdge="RIGHT" dst="time" dstEdge="LEFT" />
- <meshitem src="time" srcEdge="TOP" dst="" dstEdge="TOP" />
- <meshitem src="time" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-</layout>
-
-</hbwidget>
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbindicatormenuclock/hbindicatormenuclock_color.css Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-HbIndicatorMenuClock::time{
- color: var(qtc_popup_normal);
-}
-
-HbIndicatorMenuClock::ampmSymbol{
- color: var(qtc_popup_normal);
-}
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbindicatormenucontent/hbindicatormenucontent.css Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbindicatormenucontent/hbindicatormenucontent.css Fri May 14 16:09:54 2010 +0300
@@ -1,19 +1,6 @@
HbIndicatorMenuContent
{
layout:menucontent;
-}
-
-HbIndicatorMenuContent::background
-{
- fixed-width: expr(var(hb-param-screen-width)-9.0un);
- fixed-height: expr(var(hb-param-text-height-primary)+2*var(hb-param-margin-gene-middle-vertical));
+ fixed-width:expr(var(hb-param-screen-short-edge)-9.0un);
+ max-height:expr(var(hb-param-screen-height)-var(hb-param-widget-chrome-height)-var(hb-param-margin-gene-screen));
}
-
-HbIndicatorMenuContent::date
-{
- font-variant: secondary;
- fixed-height: var(hb-param-text-height-secondary);
- text-align: right;
- vertical-align: bottom;
-}
-
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbindicatormenucontent/hbindicatormenucontent.widgetml Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbindicatormenucontent/hbindicatormenucontent.widgetml Fri May 14 16:09:54 2010 +0300
@@ -1,17 +1,10 @@
<hbwidget version="0.1" type="HbIndicatorMenuContent">
-<layout name="menucontent" type="mesh">
- <meshitem src="background" srcEdge="TOP" dst="" dstEdge="TOP" />
- <meshitem src="background" srcEdge="BOTTOM" dst="list" dstEdge="TOP" />
- <meshitem src="background" srcEdge="LEFT" dst="" dstEdge="LEFT" />
- <meshitem src="background" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
- <meshitem src="date" srcEdge="RIGHT" dst="background" dstEdge="RIGHT" spacing="var(hb-param-margin-gene-popup)" />
- <meshitem src="date" srcEdge="CENTERV" dst="background" dstEdge="CENTERV" />
- <meshitem src="clock" srcEdge="LEFT" dst="background" dstEdge="LEFT" spacing="-var(hb-param-margin-gene-popup)" />
- <meshitem src="clock" srcEdge="CENTERV" dst="background" dstEdge="CENTERV" />
- <meshitem src="list" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
- <meshitem src="list" srcEdge="LEFT" dst="background" dstEdge="LEFT" />
- <meshitem src="list" srcEdge="RIGHT" dst="background" dstEdge="RIGHT" />
+<layout name="menucontent" type="mesh">
+ <meshitem src="list" srcEdge="TOP" dst="" dstEdge="TOP" />
+ <meshitem src="list" srcEdge="LEFT" dst="" dstEdge="LEFT" />
+ <meshitem src="list" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
+ <meshitem src="list" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" spacing="var(hb-param-margin-gene-screen)" />
</layout>
</hbwidget>
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbindicatormenucontent/hbindicatormenucontent_color.css Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-HbIndicatorMenuContent::date {
- color: var(qtc_popup_normal);
-}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbinputsmileypicker/hbinputsmileypicker.css Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,4 @@
+HbInputSmileyPicker {
+ max-width:200un;
+ max-height:200un;
+}
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hblineedit/hblineedit.css Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hblineedit/hblineedit.css Fri May 14 16:09:54 2010 +0300
@@ -6,7 +6,13 @@
HbLineEdit::text{
left: -var(hb-param-margin-gene-middle-horizontal);
right: var(hb-param-margin-gene-middle-horizontal);
- top: -var(hb-param-margin-gene-middle-vertical);
- bottom: var(hb-param-margin-gene-middle-vertical);
+ top: -expr(var(hb-param-margin-gene-top)-4px);
+ bottom: expr(var(hb-param-margin-gene-bottom)-4px);
}
+/*
+ Added font information LineEdit in DataFormItem case , its needed to pass loc test of dataform "qtl_dataform_editor_sec".
+*/
+HbDataFormViewItem > HbLineEdit{
+ font-variant:secondary; /* still loclization id xls its not updated to have correct infor , temporary setting font to secondary */
+}
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hblistdialogcontentwidget/hblistdialogcontentwidget.css Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-HbListDialogContentWidget:portrait{
- layout:list_query_layout;
-}
-
-
-
-HbListDialogContentWidget::this:portrait
-{
-
- pref-height:35.0un;
- pref-width:30.0un;
-}
-
-HbListDialogContentWidget::list:portrait{
- left:0.5un;
- right:0.5un;
- top:0.0un;
- bottom:0.0un;
-}
-
-HbListDialogContentWidget::list:landscape{
- left:0.5un;
- right:0.5un;
- top:0.0un;
- bottom:0.0un;
-}
-
-HbListDialogContentWidget:landscape{
- layout:list_query_layout;
-}
-
-
-HbListDialogContentWidget::this:landscape
-{
-
- pref-height:25.0un;
-}
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hblistdialogcontentwidget/hblistdialogcontentwidget.widgetml Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-<hbwidget version="0.1" type="HbListDialogContentWidget">
- <layout name="list_query_layout" type="mesh">
- <meshitem src="list" srcEdge="LEFT" dst="" dstEdge="LEFT" />
- <meshitem src="list" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
- <meshitem src="list" srcEdge="TOP" dst="" dstEdge="TOP" />
- <meshitem src="list" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
- </layout>
-</hbwidget>
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hblistquerycontentwidget/hblistquerycontentwidget.css Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-HbListQueryContentWidget:portrait{
- layout:list_query_layout;
-}
-
-
-
-HbListQueryContentWidget::this:portrait
-{
-
- pref-height:35.0un;
- pref-width:30.0un;
-}
-
-HbListQueryContentWidget::list:portrait{
- left:0.5un;
- right:0.5un;
- top:0.0un;
- bottom:0.0un;
-}
-
-HbListQueryContentWidget::list:landscape{
- left:0.5un;
- right:0.5un;
- top:0.0un;
- bottom:0.0un;
-}
-
-HbListQueryContentWidget:landscape{
- layout:list_query_layout;
-}
-
-
-HbListQueryContentWidget::this:landscape
-{
-
- pref-height:25.0un;
-}
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hblistquerycontentwidget/hblistquerycontentwidget.widgetml Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-<hbwidget version="0.1" type="HbListQueryContentWidget">
- <layout name="list_query_layout" type="mesh">
- <meshitem src="list" srcEdge="LEFT" dst="" dstEdge="LEFT" />
- <meshitem src="list" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
- <meshitem src="list" srcEdge="TOP" dst="" dstEdge="TOP" />
- <meshitem src="list" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
- </layout>
-</hbwidget>
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hblistviewitem/hblistviewitem.css Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hblistviewitem/hblistviewitem.css Fri May 14 16:09:54 2010 +0300
@@ -122,16 +122,26 @@
font-variant: primary;
pref-width:-1;
text-align: left;
+ size-policy-horizontal: ignored;
+ text-line-count-min:1;
+ text-line-count-max:1;
+ text-wrap-mode:no-wrap;
}
HbListViewItem::text-1[modelItemType="StandardItem"][stretchingStyle="StretchLandscape"]:landscape{
pref-width: 30.0un;
+ text-line-count-min:1;
+ text-line-count-max:1;
+ text-wrap-mode:no-wrap;
}
HbListViewItem::text-1[modelItemType="SeparatorItem"]{
text-height: var(hb-param-text-height-secondary);
font-variant: secondary;
text-align: right;
+ text-line-count-min:1;
+ text-line-count-max:1;
+ text-wrap-mode:no-wrap;
}
HbListViewItem::text-2{
@@ -139,10 +149,17 @@
font-variant: secondary;
pref-width:-1;
text-align: left top;
+ size-policy-horizontal: ignored;
+ text-line-count-min:1;
+ text-line-count-max:1;
+ text-wrap-mode:no-wrap;
}
HbListViewItem::text-2[stretchingStyle="StretchLandscape"]:landscape{
pref-width: 30.0un;
+ text-line-count-min:1;
+ text-line-count-max:1;
+ text-wrap-mode:no-wrap;
}
HbListViewItem::text-3{
@@ -150,6 +167,9 @@
fixed-width: 18.0un;
font-variant: secondary;
text-align: right;
+ text-line-count-min:1;
+ text-line-count-max:1;
+ text-wrap-mode:no-wrap;
}
HbListViewItem::frame{
@@ -165,6 +185,9 @@
minimum-width: 0.0un;
fixed-height: 0.0un;
fixed-width: 0.0un;
+ text-line-count-min: 1;
+ text-line-count-max: 1;
+ text-wrap-mode: no-wrap;
}
HbListViewItem::text-3[modelItemType="SeparatorItem"]{
@@ -172,6 +195,9 @@
minimum-width: 0.0un;
fixed-height: 0.0un;
fixed-width: 0.0un;
+ text-line-count-min: 1;
+ text-line-count-max: 1;
+ text-wrap-mode: no-wrap;
}
HbListViewItem::icon-1[modelItemType="SeparatorItem"]{
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbmenu/hbmenu.css Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbmenu/hbmenu.css Fri May 14 16:09:54 2010 +0300
@@ -10,6 +10,8 @@
max-width: expr(var(hb-param-screen-short-edge)-9un);
min-width: expr((var(hb-param-screen-short-edge)-9un)/2);
max-height: 43un;
+ size-policy-vertical: expanding;
+ size-policy-horizontal: expanding;
}
HbMenu[menuType="1"]::content
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbsearchpanel/hbsearchpanel.css Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbsearchpanel/hbsearchpanel.css Fri May 14 16:09:54 2010 +0300
@@ -8,8 +8,6 @@
{
fixed-width:9.0un;
left: -var(hb-param-margin-gene-middle-horizontal);
- top: -var(hb-param-margin-gene-middle-vertical);
- bottom: var(hb-param-margin-gene-middle-vertical);
}
HbSearchPanel::lineedit
@@ -26,12 +24,11 @@
{
fixed-width:9.0un;
right: 0un;
- top: -var(hb-param-margin-gene-middle-vertical);
- bottom: var(hb-param-margin-gene-middle-vertical);
}
HbSearchPanel::progressbutton[progressive="true"]
{
+ fixed-width:9.0un;
right: var(hb-param-margin-gene-middle-horizontal);
}
@@ -39,7 +36,4 @@
{
fixed-width:9.0un;
right: var(hb-param-margin-gene-middle-horizontal);
- top: -var(hb-param-margin-gene-middle-vertical);
- bottom: var(hb-param-margin-gene-middle-vertical);
-
}
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbsearchpanel/hbsearchpanel.widgetml Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbsearchpanel/hbsearchpanel.widgetml Fri May 14 16:09:54 2010 +0300
@@ -1,19 +1,21 @@
<hbwidget version="0.1" type="HbSearchPanel">
<layout name="default" type="mesh">
- <meshitem src="cancelbutton" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
- <meshitem src="cancelbutton" srcEdge="TOP" dst="" dstEdge="TOP" />
- <meshitem src="cancelbutton" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
+ <meshitem src="searchoptionsbutton" srcEdge="LEFT" dst="" dstEdge="LEFT" />
+ <meshitem src="searchoptionsbutton" srcEdge="TOP" dst="lineedit" dstEdge="TOP" />
+ <meshitem src="searchoptionsbutton" srcEdge="BOTTOM" dst="lineedit" dstEdge="BOTTOM" />
<meshitem src="lineedit" srcEdge="LEFT" dst="searchoptionsbutton" dstEdge="RIGHT" />
<meshitem src="lineedit" srcEdge="RIGHT" dst="progressbutton" dstEdge="LEFT" />
- <meshitem src="lineedit" srcEdge="CENTERV" dst="" dstEdge="CENTERV" />
-
- <meshitem src="searchoptionsbutton" srcEdge="LEFT" dst="" dstEdge="LEFT" />
- <meshitem src="searchoptionsbutton" srcEdge="TOP" dst="" dstEdge="TOP" />
- <meshitem src="searchoptionsbutton" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
+ <meshitem src="lineedit" srcEdge="TOP" dst="" dstEdge="TOP" />
+ <meshitem src="lineedit" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
<meshitem src="progressbutton" srcEdge="RIGHT" dst="cancelbutton" dstEdge="LEFT" />
- <meshitem src="progressbutton" srcEdge="TOP" dst="" dstEdge="TOP" />
- <meshitem src="progressbutton" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
+ <meshitem src="progressbutton" srcEdge="TOP" dst="lineedit" dstEdge="TOP" />
+ <meshitem src="progressbutton" srcEdge="BOTTOM" dst="lineedit" dstEdge="BOTTOM" />
+
+ <meshitem src="cancelbutton" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
+ <meshitem src="cancelbutton" srcEdge="TOP" dst="lineedit" dstEdge="TOP" />
+ <meshitem src="cancelbutton" srcEdge="BOTTOM" dst="lineedit" dstEdge="BOTTOM" />
+
</layout>
</hbwidget>
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbslider/hbslider.css Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbslider/hbslider.css Fri May 14 16:09:54 2010 +0300
@@ -6,7 +6,7 @@
HbSlider[orientation="Horizontal"][!TickLabelPresent]
{
layout:slider_horizontal_withoutticklabel;
- min-height:4.0un;
+ min-height:expr(2*var(hb-param-widget-slider-thumb-width));
}
/*HbVolumeSliderPopup > HbSliderPopupContentWidget > HbSlider[orientation="Vertical"]::control:portrait
{
@@ -49,7 +49,7 @@
HbSlider[orientation="Vertical"][!TickLabelPresent]
{
layout:slider_vertical_withoutticklabel;
- min-width:4.0un;
+ min-width:expr(2*var(hb-param-widget-slider-thumb-width));
}
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbslidercontrol/hbslidercontrol.css Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbslidercontrol/hbslidercontrol.css Fri May 14 16:09:54 2010 +0300
@@ -45,14 +45,15 @@
}
HbSliderControl[orientation="Horizontal"]::handle
{
- fixed-width:2un;
- fixed-height:4un;
+ fixed-width:var(hb-param-widget-slider-thumb-width);
+ fixed-height:expr(2*var(hb-param-widget-slider-thumb-width));
}
HbSliderControl[orientation="Vertical"]::handle
{
- fixed-width:4un;
- fixed-height:2un;
+ fixed-width:6un;
+ fixed-height:3un;
+
}
/*Ticks left vertical*/
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbsliderhandle/hbsliderhandle.css Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbsliderhandle/hbsliderhandle.css Fri May 14 16:09:54 2010 +0300
@@ -15,12 +15,12 @@
/*touch area*/
HbSliderControl[orientation="Horizontal"] > HbSliderHandle::toucharea
{
- fixed-width:4.0un;
+ fixed-width:expr(2*var(hb-param-widget-slider-thumb-width));
fixed-height:var(hb-param-touch-area-gene-primary-medium);
}
HbSliderControl[orientation="Vertical"] > HbSliderHandle::toucharea
{
fixed-width:var(hb-param-touch-area-gene-primary-medium);
- fixed-height:4.0un;
+ fixed-height:expr(2*var(hb-param-widget-slider-thumb-width));
}
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbtitlebar/hbtitlebar.css Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbtitlebar/hbtitlebar.css Fri May 14 16:09:54 2010 +0300
@@ -1,6 +1,7 @@
HbTitleBar
{
layout:default;
+ mirroring: disabled;
}
HbTitleBar::status{
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbtitlepane/hbtitlepane.css Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbtitlepane/hbtitlepane.css Fri May 14 16:09:54 2010 +0300
@@ -22,3 +22,13 @@
fixed-width: var(hb-param-graphic-size-secondary);
fixed-height: var(hb-param-graphic-size-secondary);
}
+
+HbTitlePane::left-to-right
+{
+ layout-direction: left-to-right;
+}
+
+HbTitlePane::right-to-left
+{
+ layout-direction: right-to-left;
+}
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbtoolbutton/hbtoolbutton.css Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbtoolbutton/hbtoolbutton.css Fri May 14 16:09:54 2010 +0300
@@ -54,6 +54,7 @@
HbToolButton[toolbutton_extension_layout]{
fixed-width:expr(1/3*var(hb-param-screen-short-edge)-var(hb-param-margin-gene-popup-list)-var(hb-param-margin-gene-popup-list));
+ min-height:var(hb-param-widget-toolbar-height);
}
HbToolButton::text{
@@ -112,25 +113,6 @@
text-line-count-max: 1;
}
-HbSoftKey > HbToolButton[toolButtonStyle="1"]::icon{
- left:-1.0un;
- right:1.0un;
- top:-1.0un;
- bottom:1.0un;
-}
-HbSoftKey > HbToolButton::background{
- left:0un;
- right:0un;
- top:0un;
- bottom:0un;
-}
-HbSoftKey > HbToolButton::icon{
- left:-1.5un;
- right:1.5un;
- top:-1.5un;
- bottom:1.5un;
-}
-
HbToolButton[dialogtoolbar]{
fixed-height:var(hb-param-widget-popup-softkey-height);
}
--- a/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbtreeviewitem/hbtreeviewitem.css Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/rules/widgets/hbtreeviewitem/hbtreeviewitem.css Fri May 14 16:09:54 2010 +0300
@@ -15,35 +15,52 @@
fixed-width: var(hb-param-graphic-size-secondary);
}
+HbTreeViewItem::text-1{
+ size-policy-horizontal: preferred;
+}
+
HbTreeViewItem::text-1[modelItemType="ParentItem"]{
- text-height: var(hb-param-text-height-secondary);
- font-variant: secondary;
+ text-height: var(hb-param-text-height-secondary);
+ font-variant: secondary;
+ text-line-count-min: 1;
+ text-line-count-max: 1;
+ text-wrap-mode: no-wrap;
+}
+
+HbTreeViewItem::text-2{
+ size-policy-horizontal: preferred;
}
-HbListViewItem::text-2[modelItemType="ParentItem"]{
+HbTreeViewItem::text-2[modelItemType="ParentItem"]{
+ minimum-height: 0.0un;
+ minimum-width: 0.0un;
+ fixed-height: 0.0un;
+ fixed-width: 0.0un;
+ text-line-count-min: 1;
+ text-line-count-max: 1;
+ text-wrap-mode: no-wrap;
+}
+
+HbTreeViewItem::text-3[modelItemType="ParentItem"]{
+ minimum-height: 0.0un;
+ minimum-width: 0.0un;
+ fixed-height: 0.0un;
+ fixed-width: 0.0un;
+ text-line-count-min: 1;
+ text-line-count-max: 1;
+ text-wrap-mode: no-wrap;
+}
+
+HbTreeViewItem::icon-1[modelItemType="ParentItem"]{
minimum-height: 0.0un;
minimum-width: 0.0un;
fixed-height: 0.0un;
fixed-width: 0.0un;
}
-HbListViewItem::text-3[modelItemType="ParentItem"]{
+HbTreeViewItem::icon-2[modelItemType="ParentItem"]{
minimum-height: 0.0un;
minimum-width: 0.0un;
fixed-height: 0.0un;
fixed-width: 0.0un;
}
-
-HbListViewItem::icon-1[modelItemType="ParentItem"]{
- minimum-height: 0.0un;
- minimum-width: 0.0un;
- fixed-height: 0.0un;
- fixed-width: 0.0un;
-}
-
-HbListViewItem::icon-2[modelItemType="ParentItem"]{
- minimum-height: 0.0un;
- minimum-width: 0.0un;
- fixed-height: 0.0un;
- fixed-width: 0.0un;
-}
--- a/src/hbcore/resources/themes/style/hbdefault/variables/color/hbcolorgroup.css Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/resources/themes/style/hbdefault/variables/color/hbcolorgroup.css Fri May 14 16:09:54 2010 +0300
@@ -1,10 +1,8 @@
/* Widget color groups */
-
-@variables
+ @variables
{
-
/* Default palette */
qtc_default_decor_normal:#3C3C3C;
qtc_default_decor_pressed:#FFFFFF;
@@ -225,5 +223,4 @@
qtc_multimedia_trans_pressed:#FFFFFF; /* Added 19.02.2010 */
qtc_multimedia_trans_disabled:#787878; /* Added 09.03.2010 */
-
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/resources/variant/typefaces_template.xml Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<typeface_information>
+ <typeface_set language="zh" country="CN">
+ <typeface_mapping role="Primary" family="Courier New" weight="bold"></typeface_mapping>
+ <typeface_mapping role="Secondary" family="Nokia Sans"></typeface_mapping>
+ <typeface_mapping role="Title" family="Nokia Sans Title SemiBold"></typeface_mapping>
+ <typeface_mapping role="PrimarySmall" family="Nokia Sans" weight="bold"></typeface_mapping>
+ <typeface_mapping role="Digital" family="OCR A Extended"></typeface_mapping>
+ </typeface_set>
+ <typeface_set language="zh" country="HK">
+ <typeface_mapping role="Primary" family="OCR A Extended" weight="bold"></typeface_mapping>
+ <typeface_mapping role="Secondary" family="Nokia Sans"></typeface_mapping>
+ <typeface_mapping role="Title" family="Nokia Sans Title SemiBold"></typeface_mapping>
+ <typeface_mapping role="PrimarySmall" family="Nokia Sans" weight="bold"></typeface_mapping>
+ <typeface_mapping role="Digital" family="OCR A Extended"></typeface_mapping>
+ </typeface_set>
+ <typeface_set language="zh" country="TW">
+ <typeface_mapping role="Primary" family="Times New Roman" weight="bold"></typeface_mapping>
+ <typeface_mapping role="Secondary" family="Nokia Sans"></typeface_mapping>
+ <typeface_mapping role="Title" family="Nokia Sans Title SemiBold"></typeface_mapping>
+ <typeface_mapping role="PrimarySmall" family="Nokia Sans" weight="bold"></typeface_mapping>
+ <typeface_mapping role="Digital" family="OCR A Extended"></typeface_mapping>
+ </typeface_set>
+ <typeface_set language="en" country="CN">
+ <typeface_mapping role="Primary" family="Arial Black" weight="bold"></typeface_mapping>
+ <typeface_mapping role="Secondary" family="Nokia Sans"></typeface_mapping>
+ <typeface_mapping role="Title" family="Nokia Sans Title SemiBold"></typeface_mapping>
+ <typeface_mapping role="PrimarySmall" family="Nokia Sans" weight="bold"></typeface_mapping>
+ <typeface_mapping role="Digital" family="OCR A Extended"></typeface_mapping>
+ </typeface_set>
+ <typeface_set language="en" country="HK">
+ <typeface_mapping role="Primary" family="Bell MT" weight="bold"></typeface_mapping>
+ <typeface_mapping role="Secondary" family="Nokia Sans"></typeface_mapping>
+ <typeface_mapping role="Title" family="Nokia Sans Title SemiBold"></typeface_mapping>
+ <typeface_mapping role="PrimarySmall" family="Nokia Sans" weight="bold"></typeface_mapping>
+ <typeface_mapping role="Digital" family="OCR A Extended"></typeface_mapping>
+ </typeface_set>
+ <typeface_set language="en" country="TW">
+ <typeface_mapping role="Primary" family="Broadway" weight="bold"></typeface_mapping>
+ <typeface_mapping role="Secondary" family="Nokia Sans"></typeface_mapping>
+ <typeface_mapping role="Title" family="Nokia Sans Title SemiBold"></typeface_mapping>
+ <typeface_mapping role="PrimarySmall" family="Nokia Sans" weight="bold"></typeface_mapping>
+ <typeface_mapping role="Digital" family="OCR A Extended"></typeface_mapping>
+ </typeface_set>
+ <typeface_set language="ja">
+ <typeface_mapping role="Primary" family="Arial" weight="bold"></typeface_mapping>
+ <typeface_mapping role="Secondary" family="Nokia Sans"></typeface_mapping>
+ <typeface_mapping role="Title" family="Nokia Sans Title SemiBold"></typeface_mapping>
+ <typeface_mapping role="PrimarySmall" family="Nokia Sans" weight="bold"></typeface_mapping>
+ <typeface_mapping role="Digital" family="OCR A Extended"></typeface_mapping>
+ </typeface_set>
+ <typeface_set language="ko">
+ <typeface_mapping role="Primary" family="Book Antiqua" weight="bold"></typeface_mapping>
+ <typeface_mapping role="Secondary" family="Nokia Sans"></typeface_mapping>
+ <typeface_mapping role="Title" family="Nokia Sans Title SemiBold"></typeface_mapping>
+ <typeface_mapping role="PrimarySmall" family="Nokia Sans" weight="bold"></typeface_mapping>
+ <typeface_mapping role="Digital" family="OCR A Extended"></typeface_mapping>
+ </typeface_set>
+ <typeface_set>
+ <typeface_mapping role="Primary" family="Nokia Sans" weight="bold"></typeface_mapping>
+ <typeface_mapping role="Secondary" family="Nokia Sans"></typeface_mapping>
+ <typeface_mapping role="Title" family="Nokia Sans Title SemiBold"></typeface_mapping>
+ <typeface_mapping role="PrimarySmall" family="Nokia Sans" weight="bold"></typeface_mapping>
+ <typeface_mapping role="Digital" family="OCR A Extended"></typeface_mapping>
+ </typeface_set>
+<Information_Set>
+ <ul> Language is a lowercase, two-letter, ISO 639 language code </ul>
+ <ul> Country is an uppercase, two-letter, ISO 3166 country cod </ul>
+ <ul> The default set do not carry any language or country tag </ul>
+ <ul> Anything after default typeface_set is not read </ul>
+ <ul> First fill all the entrier with both language & country, then only language and finally default </ul>
+</Information_Set>
+</typeface_information>
--- a/src/hbcore/style/hbstyle.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/style/hbstyle.cpp Fri May 14 16:09:54 2010 +0300
@@ -23,48 +23,47 @@
**
****************************************************************************/
-#include "hbstyleoptionslider.h"
+#include "hbstyleoptionslider_p.h"
#include "hbstyleoptionsliderelement_p.h"
-#include "hbstyleoptionpushbutton.h"
-#include "hbstyleoptiontoolbutton.h"
-#include "hbstyleoptiontooltip.h"
-#include "hbstyleoptionprogressbar.h"
-#include "hbstyleoptionabstractviewitem.h"
-#include "hbstyleoptionlistviewitem.h"
-#include "hbstyleoptionmenuitem.h"
-#include "hbstyleoptionlabel.h"
-#include "hbstyleoptionscrollbar.h"
-#include "hbstyleoptiontoolbarextension.h"
-#include "hbstyleoptiongridviewitem.h"
-#include "hbstyleoptioncheckbox.h"
+#include "hbstyleoptionpushbutton_p.h"
+#include "hbstyleoptiontoolbutton_p.h"
+#include "hbstyleoptiontooltip_p.h"
+#include "hbstyleoptionprogressbar_p.h"
+#include "hbstyleoptionabstractviewitem_p.h"
+#include "hbstyleoptionlistviewitem_p.h"
+#include "hbstyleoptionmenuitem_p.h"
+#include "hbstyleoptionlabel_p.h"
+#include "hbstyleoptionscrollbar_p.h"
+#include "hbstyleoptiongridviewitem_p.h"
+#include "hbstyleoptioncheckbox_p.h"
#include "hbiconloader_p.h"
-#include "hbstyleoptiontitlepane.h"
+#include "hbstyleoptiontitlepane_p.h"
#include "hbstyleoptionstatusbar_p.h"
-#include "hbstyleoptionindicatorgroup.h"
-#include "hbstyleoptionprogressdialog.h"
-#include "hbstyleoptionnotificationdialog.h"
-#include "hbstyleoptiontreeviewitem.h"
-#include "hbstyleoptioncolorgridviewitem.h"
-#include "hbstyleoptionmessagebox.h"
-#include "hbstyleoptionsoftkey.h" // deprecated
-#include "hbstyleoptionnavigationbutton.h"
-#include "hbstyleoptionindicatorbutton.h"
+#include "hbstyleoptionindicatorgroup_p.h"
+#include "hbstyleoptionprogressdialog_p.h"
+#include "hbstyleoptionnotificationdialog_p.h"
+#include "hbstyleoptiontreeviewitem_p.h"
+#include "hbstyleoptioncolorgridviewitem_p.h"
+#include "hbstyleoptionmessagebox_p.h"
+#include "hbstyleoptionnavigationbutton_p.h"
+#include "hbstyleoptionindicatorbutton_p.h"
#include "hbstyleoptionsignalindicator_p.h"
#include "hbstyleoptionbatteryindicator_p.h"
#include "hbstyle_p.h"
#include "hbstyleloader.h"
#include "hbwidgetloader_p.h"
-#include "hbstyleoptionratingslider.h"
-#include "hbstyleoptiondataformviewitem.h"
+#include "hbwidget_p.h"
+#include "hbstyleoptionratingslider_p.h"
+#include "hbstyleoptiondataformviewitem_p.h"
#include "hbstyleoptiondatagroup_p.h"
#include "hbstyleoptiondatagroupheadingwidget_p.h"
-#include "hbstyleoptiondataform.h"
-#include "hbstyleoptiongroupbox.h"
-#include "hbstyleoptionindexfeedback.h"
-#include "hbstyleoptioncombobox.h"
-#include "hbstyleoptioninputdialog.h"
+#include "hbstyleoptiondataform_p.h"
+#include "hbstyleoptiongroupbox_p.h"
+#include "hbstyleoptionindexfeedback_p.h"
+#include "hbstyleoptioncombobox_p.h"
+#include "hbstyleoptioninputdialog_p.h"
#include "hbstyleoptionprogresssliderhandle_p.h"
-#include "hbstyleoptionprogressslider.h"
+#include "hbstyleoptionprogressslider_p.h"
#include <hbicon.h>
#include <hbstyle.h>
@@ -88,8 +87,8 @@
#include <hbindicatorleveliconitem_p.h>
#include <hbglobal.h>
-#include <QPluginLoader>
-#include <hbstyleinterface.h>
+#include <hbpluginloader_p.h>
+#include "hbstyleinterface_p.h"
#include <hbstyleparameters.h>
#include "hbstyleselector_p.h"
@@ -113,7 +112,6 @@
//Uncomment next define(s) in order to get more debug prints.
//Similar define exists also in the engine side.
//#define HBSTYLE_DEBUG
-#define HBSTYLE_DEBUG_FONT
/*!
@beta
@@ -814,6 +812,7 @@
}
/*!
+
\deprecated HbStyle::registerPlugin(const QString&)
is deprecated. Style plugins are not supported anymore.
@@ -847,31 +846,27 @@
}
// load the plugin
- QPluginLoader* loader = new QPluginLoader(pluginName);
- if (loader == 0)
+ HbPluginLoader* loader = new HbPluginLoader(pluginName);
+ if (!loader)
return -1;
// get the instance pointer
QObject* pluginInstance = loader->instance();
- if (pluginInstance == 0) {
- delete loader;
+ if (!pluginInstance) {
// try the additional paths
- QFileInfo fileInfo( pluginName );
- foreach( QString additionalPath, hbInstance->libraryPaths() ) {
+ QFileInfo fileInfo(pluginName);
+ foreach (QString additionalPath, hbInstance->libraryPaths()) {
const QDir pluginDir(additionalPath);
- loader = new QPluginLoader(pluginDir.absoluteFilePath(fileInfo.fileName()));
- if ( loader ) {
- pluginInstance = loader->instance();
- if ( !pluginInstance ) {
- delete loader;
- } else {
- break;
- }
+ loader->setPluginName(pluginDir.absoluteFilePath(fileInfo.fileName()));
+ pluginInstance = loader->instance();
+ if (pluginInstance) {
+ break;
}
}
- if ( !pluginInstance ) {
+ if (!pluginInstance) {
+ delete loader;
return -1;
}
}
@@ -916,6 +911,7 @@
/*!
+
\deprecated HbStyle::unregisterPlugin(const QString&)
is deprecated. Style plugins are not supported anymore.
@@ -1025,7 +1021,7 @@
case P_GroupBoxHeading_icon:
case P_Label_icon:
case P_GridViewItem_icon: {
- HbIconItem *item = new HbIconItem(HbIcon(),parent);
+ HbIconItem *item = q_check_ptr(new HbIconItem(HbIcon(),parent));
setItemName(item, QLatin1String("icon"));
return item;
}
@@ -1340,10 +1336,8 @@
setItemName(n, QLatin1String("background"));
return n;
}
- case P_Softkey_background: // deprecated
case P_NavigationButton_background:
case P_IndicatorButton_background:
- case P_IndicatorGroup_background: // deprecated
{
HbIconItem *n = new HbIconItem(HbIcon(), parent);
n->setZValue(-1);
@@ -1384,7 +1378,6 @@
setItemName(n, QLatin1String("icon4"));
return n;
}
- case P_IndicatorGroup_signalicon: // deprecated
case P_SignalIndicator_icon:
{
HbIconItem *n = new HbIconItem(parent);
@@ -1394,7 +1387,7 @@
}
case P_SignalLevel_background:
{
- HbIconItem *n = new HbIconItem(parent);
+ HbIndicatorLevelIconItem *n = new HbIndicatorLevelIconItem(parent);
n->setZValue(-1);
setItemName(n, QLatin1String("background"));
return n;
@@ -1405,7 +1398,6 @@
setItemName(n, QLatin1String("levelicon"));
return n;
}
- case P_IndicatorGroup_batteryicon: // deprecated
case P_BatteryIndicator_icon:
{
HbIconItem *n = new HbIconItem(parent);
@@ -1415,7 +1407,7 @@
}
case P_BatteryLevel_background:
{
- HbIconItem *n = new HbIconItem(parent);
+ HbIndicatorLevelIconItem *n = new HbIndicatorLevelIconItem(parent);
n->setZValue(-1);
setItemName(n, QLatin1String("background"));
return n;
@@ -1430,7 +1422,7 @@
{
HbFrameItem *n = new HbFrameItem(parent);
n->setZValue(-1);
- setItemName(n, QLatin1String("frame"));
+ setItemName(n, QLatin1String("background"));
return n;
}
case P_LineEdit_frame_normal:
@@ -1460,7 +1452,7 @@
{
HbFrameItem *n = new HbFrameItem(parent);
n->setZValue(-1);
- setItemName(n, QLatin1String("statusbar"));
+ setItemName(n, QLatin1String("background"));
return n;
}
case P_StatusBar_timetext:
@@ -1522,7 +1514,7 @@
case P_ItemViewItem_radiobutton:
case P_ItemViewItem_selection: {
- HbIconItem *iconItem = new HbIconItem(parent);
+ HbIconItem *iconItem = q_check_ptr(new HbIconItem(parent));
setItemName(iconItem, QLatin1String("selection-icon"));
return iconItem;
}
@@ -1534,6 +1526,9 @@
case P_NotificationDialog_text:{
HbTextItem *n = new HbTextItem(parent);
setItemName(n, QLatin1String("text"));
+ n->setMinimumLines(1);
+ n->setMaximumLines(1);
+ n->setTextWrapping(Hb::TextNoWrap);
return n;
}
case P_NotificationDialog_title:{
@@ -1556,38 +1551,32 @@
}
case P_ItemViewItem_background: {
- HbIconItem *iconItem = new HbIconItem(parent);
+ HbIconItem *iconItem = q_check_ptr(new HbIconItem(parent));
setItemName(iconItem, QLatin1String("background"));
return iconItem;
}
case P_ListViewItem_text: {
- HbTextItem *textItem = new HbTextItem(parent);
- textItem->setMinimumLines(1);
- textItem->setMaximumLines(1);
- textItem->setTextWrapping(Hb::TextNoWrap);
+ HbTextItem *textItem = q_check_ptr(new HbTextItem(parent));
+
return textItem;
}
case P_ListViewItem_richtext: {
- HbRichTextItem *textItem = new HbRichTextItem(parent);
+ HbRichTextItem *textItem = q_check_ptr(new HbRichTextItem(parent));
return textItem;
}
case P_GridViewItem_text: {
- HbTextItem *textItem = new HbTextItem(parent);
+ HbTextItem *textItem = q_check_ptr(new HbTextItem(parent));
// caching do not work properly - text is not refreshed immediatelly
//textItem->setCacheMode(QGraphicsItem::DeviceCoordinateCache);
setItemName(textItem, QLatin1String("text"));
- textItem->setMinimumLines(1);
- textItem->setMaximumLines(1);
- textItem->setTextWrapping(Hb::TextNoWrap);
- textItem->setSizePolicy( QSizePolicy::Ignored, QSizePolicy::Preferred );
return textItem;
}
case P_ListViewItem_icon:
- return new HbIconItem(parent);
+ return q_check_ptr(new HbIconItem(parent));
case P_ColorGridViewItem_colorIcon:
return new HbIconItem("qtg_graf_colorpicker_mask", parent);
@@ -1597,7 +1586,7 @@
return new HbIconItem("qtg_small_tick", parent);
case P_TreeViewItem_expandicon: {
- HbIconItem *iconItem = new HbIconItem(parent);
+ HbIconItem *iconItem = q_check_ptr(new HbIconItem(parent));
setItemName(iconItem, QLatin1String("subitem-indicator"));
return iconItem;
}
@@ -1625,15 +1614,15 @@
return n;
}
case P_ItemViewItem_focus: {
- HbFrameItem *item = new HbFrameItem(parent);
- setItemName(item, QLatin1String("focus-indicator"));
+ HbFrameItem *item = q_check_ptr(new HbFrameItem(parent));
+ //setItemName(item, QLatin1String("focus-indicator"));
return item;
}
case P_ItemHighlight_background:
return new HbFrameItem(parent);
case P_ItemViewItem_frame: {
- HbFrameItem *item = new HbFrameItem(parent);
+ HbFrameItem *item = q_check_ptr(new HbFrameItem(parent));
setItemName(item,"frame");
return item;
}
@@ -1667,7 +1656,7 @@
}
case P_ItemViewItem_touchmultiselection:
{
- HbTouchArea *area = new HbTouchArea(parent);
+ HbTouchArea *area = q_check_ptr(new HbTouchArea(parent));
setItemName(area, "multiselection-toucharea");
return area;
}
@@ -1759,9 +1748,9 @@
qstyleoption_cast<const HbStyleOptionGroupBox*>(option)) {
HbIconItem *iconItem = static_cast<HbIconItem*>(item);
if (opt->collapsed) {
- iconItem->setIconName(QLatin1String("qtg_small_collapse"));
+ iconItem->setIconName(QLatin1String("qtg_small_expand"));
} else {
- iconItem->setIconName(QLatin1String("qtg_small_expand"));
+ iconItem->setIconName(QLatin1String("qtg_small_collapse"));
}
}
break;
@@ -1772,9 +1761,9 @@
qstyleoption_cast<const HbStyleOptionDataGroupHeadingWidget*>(option)) {
HbIconItem *iconItem = static_cast<HbIconItem*>(item);
if (opt->expanded) {
- iconItem->setIconName(QLatin1String("qtg_small_expand"));
+ iconItem->setIconName(QLatin1String("qtg_small_collapse"));
} else {
- iconItem->setIconName(QLatin1String("qtg_small_collapse"));
+ iconItem->setIconName(QLatin1String("qtg_small_expand"));
}
}
break;
@@ -2129,57 +2118,7 @@
}
break;
}
- case P_IndicatorGroup_background: { // deprecated
- const HbStyleOptionIndicatorGroup *opt = qstyleoption_cast<const HbStyleOptionIndicatorGroup *>(option);
-
- if (opt) {
- HbIconItem *iconItem = static_cast<HbIconItem*>( item );
- iconItem->setAspectRatioMode(Qt::IgnoreAspectRatio);
- if (opt->direction == Qt::LeftToRight) {
- if (opt->mode == QIcon::Active) {
- if (opt->transparent) {
- iconItem->setIconName(QLatin1String("qtg_fr_titlebar_trans_pressed_l"));
- } else {
- iconItem->setIconName(QLatin1String("qtg_fr_titlebar_pressed_l"));
- }
- } else if (opt->mode == QIcon::Selected) {
- if (opt->transparent) {
- iconItem->setIconName(QLatin1String("qtg_fr_titlebar_trans_latched_l"));
- } else {
- iconItem->setIconName(QLatin1String("qtg_fr_titlebar_latched_l"));
- }
- } else {
- if (opt->transparent) {
- iconItem->setIconName(QLatin1String("qtg_fr_titlebar_trans_normal_l"));
- } else {
- iconItem->setIconName(QLatin1String("qtg_fr_titlebar_normal_l"));
- }
- }
- } else {
- if (opt->mode == QIcon::Active) {
- if (opt->transparent) {
- iconItem->setIconName(QLatin1String("qtg_fr_titlebar_trans_pressed_r"));
- } else {
- iconItem->setIconName(QLatin1String("qtg_fr_titlebar_pressed_r"));
- }
- } else if (opt->mode == QIcon::Selected) {
- if (opt->transparent) {
- iconItem->setIconName(QLatin1String("qtg_fr_titlebar_trans_latched_r"));
- } else {
- iconItem->setIconName(QLatin1String("qtg_fr_titlebar_latched_r"));
- }
- } else {
- if (opt->transparent) {
- iconItem->setIconName(QLatin1String("qtg_fr_titlebar_trans_normal_r"));
- } else {
- iconItem->setIconName(QLatin1String("qtg_fr_titlebar_normal_r"));
- }
- }
- }
- }
- break;
- }
-
+
case P_IndicatorGroup_icon1:
case P_IndicatorGroup_icon2:
case P_IndicatorGroup_icon3:
@@ -2202,8 +2141,7 @@
break;
}
- case P_SignalIndicator_icon:
- case P_IndicatorGroup_signalicon: { // deprecated
+ case P_SignalIndicator_icon: {
const HbStyleOptionSignalIndicator *opt = qstyleoption_cast<const HbStyleOptionSignalIndicator *>(option);
if (opt) {
HbIconItem *iconItem = static_cast<HbIconItem*>(item);
@@ -2231,9 +2169,13 @@
break;
}
case P_SignalLevel_background: {
- if (option) {
- HbIconItem *iconItem = static_cast<HbIconItem*>(item);
+ const HbStyleOptionSignalIndicator *opt = qstyleoption_cast<const HbStyleOptionSignalIndicator *>(option);
+ if (opt) {
+ HbIndicatorLevelIconItem *iconItem = static_cast<HbIndicatorLevelIconItem*>(item);
iconItem->setIconName("qtg_graf_signal_bg");
+ iconItem->setValue(100 - opt->signalValue);
+ iconItem->setDirection(HbIndicatorLevelIconItem::RightToLeft);
+ iconItem->update();
}
break;
}
@@ -2260,11 +2202,11 @@
}
iconItem->setValue(opt->signalValue);
iconItem->setDirection(HbIndicatorLevelIconItem::LeftToRight);
+ iconItem->update();
}
break;
}
- case P_BatteryIndicator_icon:
- case P_IndicatorGroup_batteryicon: { // deprecated
+ case P_BatteryIndicator_icon: {
if (option) {
HbIconItem *iconItem = static_cast<HbIconItem*>(item);
iconItem->setIconName("qtg_status_battery");
@@ -2272,9 +2214,13 @@
break;
}
case P_BatteryLevel_background: {
- if (option) {
- HbIconItem *iconItem = static_cast<HbIconItem*>(item);
+ const HbStyleOptionBatteryIndicator *opt = qstyleoption_cast<const HbStyleOptionBatteryIndicator *>(option);
+ if (opt) {
+ HbIndicatorLevelIconItem *iconItem = static_cast<HbIndicatorLevelIconItem*>(item);
iconItem->setIconName("qtg_graf_battery_bg");
+ iconItem->setValue(100 - opt->batteryValue);
+ iconItem->setDirection(HbIndicatorLevelIconItem::LeftToRight);
+ iconItem->update();
}
break;
}
@@ -2301,61 +2247,7 @@
}
iconItem->setValue(opt->batteryValue);
iconItem->setDirection(HbIndicatorLevelIconItem::RightToLeft);
- }
- break;
- }
- case P_Softkey_background:{ // deprecated
- const HbStyleOptionSoftKey *opt = qstyleoption_cast<const HbStyleOptionSoftKey *>(option);
-
- if (opt) {
-
- switch (opt->mKey)
- {
- case Hb::PrimarySoftKey:
- // does not exist...
- break;
- case Hb::SecondarySoftKey:
- {
- if (opt) {
- HbIconItem *iconItem = static_cast<HbIconItem*>( item );
- if (opt->direction == Qt::LeftToRight) {
- if (opt->transparent) {
- if (opt->mode == QIcon::Active) {
- iconItem->setIconName(QLatin1String("qtg_fr_titlebar_trans_pressed_r"));
- } else {
- iconItem->setIconName(QLatin1String("qtg_fr_titlebar_trans_normal_r"));
- }
- } else {
- if (opt->mode == QIcon::Active) {
- iconItem->setIconName(QLatin1String("qtg_fr_titlebar_pressed_r"));
- } else {
- iconItem->setIconName(QLatin1String("qtg_fr_titlebar_normal_r"));
- }
- }
- } else {
- if (opt->transparent) {
- if (opt->mode == QIcon::Active) {
- iconItem->setIconName(QLatin1String("qtg_fr_titlebar_trans_pressed_l"));
- } else {
- iconItem->setIconName(QLatin1String("qtg_fr_titlebar_trans_normal_l"));
- }
- } else {
- if (opt->mode == QIcon::Active) {
- iconItem->setIconName(QLatin1String("qtg_fr_titlebar_pressed_l"));
- } else {
- iconItem->setIconName(QLatin1String("qtg_fr_titlebar_normal_l"));
- }
- }
- }
- }
- }
- break;
- case Hb::MiddleSoftKey:
- // does not exist...
- break;
- default:
- break;
- }
+ iconItem->update();
}
break;
}
@@ -2365,34 +2257,18 @@
if (opt) {
HbIconItem *iconItem = static_cast<HbIconItem*>( item );
iconItem->setAspectRatioMode(Qt::IgnoreAspectRatio);
- if (opt->direction == Qt::LeftToRight) {
- if (opt->transparent) {
- if (opt->mode == QIcon::Active) {
- iconItem->setIconName(QLatin1String("qtg_fr_titlebar_trans_pressed_r"));
- } else {
- iconItem->setIconName(QLatin1String("qtg_fr_titlebar_trans_normal_r"));
- }
+ if (opt->transparent) {
+ if (opt->mode == QIcon::Active) {
+ iconItem->setIconName(QLatin1String("qtg_fr_titlebar_trans_pressed_r"));
} else {
- if (opt->mode == QIcon::Active) {
- iconItem->setIconName(QLatin1String("qtg_fr_titlebar_pressed_r"));
- } else {
- iconItem->setIconName(QLatin1String("qtg_fr_titlebar_normal_r"));
- }
- }
+ iconItem->setIconName(QLatin1String("qtg_fr_titlebar_trans_normal_r"));
+ }
} else {
- if (opt->transparent) {
- if (opt->mode == QIcon::Active) {
- iconItem->setIconName(QLatin1String("qtg_fr_titlebar_trans_pressed_l"));
- } else {
- iconItem->setIconName(QLatin1String("qtg_fr_titlebar_trans_normal_l"));
- }
+ if (opt->mode == QIcon::Active) {
+ iconItem->setIconName(QLatin1String("qtg_fr_titlebar_pressed_r"));
} else {
- if (opt->mode == QIcon::Active) {
- iconItem->setIconName(QLatin1String("qtg_fr_titlebar_pressed_l"));
- } else {
- iconItem->setIconName(QLatin1String("qtg_fr_titlebar_normal_l"));
- }
- }
+ iconItem->setIconName(QLatin1String("qtg_fr_titlebar_normal_r"));
+ }
}
}
break;
@@ -2403,45 +2279,23 @@
if (opt) {
HbIconItem *iconItem = static_cast<HbIconItem*>( item );
iconItem->setAspectRatioMode(Qt::IgnoreAspectRatio);
- if (opt->direction == Qt::LeftToRight) {
- if (opt->mode == QIcon::Active) {
- if (opt->transparent) {
- iconItem->setIconName(QLatin1String("qtg_fr_titlebar_trans_pressed_l"));
- } else {
- iconItem->setIconName(QLatin1String("qtg_fr_titlebar_pressed_l"));
- }
- } else if (opt->mode == QIcon::Selected) {
- if (opt->transparent) {
- iconItem->setIconName(QLatin1String("qtg_fr_titlebar_trans_latched_l"));
- } else {
- iconItem->setIconName(QLatin1String("qtg_fr_titlebar_latched_l"));
- }
+ if (opt->mode == QIcon::Active) {
+ if (opt->transparent) {
+ iconItem->setIconName(QLatin1String("qtg_fr_titlebar_trans_pressed_l"));
} else {
- if (opt->transparent) {
- iconItem->setIconName(QLatin1String("qtg_fr_titlebar_trans_normal_l"));
- } else {
- iconItem->setIconName(QLatin1String("qtg_fr_titlebar_normal_l"));
- }
+ iconItem->setIconName(QLatin1String("qtg_fr_titlebar_pressed_l"));
+ }
+ } else if (opt->mode == QIcon::Selected) {
+ if (opt->transparent) {
+ iconItem->setIconName(QLatin1String("qtg_fr_titlebar_trans_latched_l"));
+ } else {
+ iconItem->setIconName(QLatin1String("qtg_fr_titlebar_latched_l"));
}
} else {
- if (opt->mode == QIcon::Active) {
- if (opt->transparent) {
- iconItem->setIconName(QLatin1String("qtg_fr_titlebar_trans_pressed_r"));
- } else {
- iconItem->setIconName(QLatin1String("qtg_fr_titlebar_pressed_r"));
- }
- } else if (opt->mode == QIcon::Selected) {
- if (opt->transparent) {
- iconItem->setIconName(QLatin1String("qtg_fr_titlebar_trans_latched_r"));
- } else {
- iconItem->setIconName(QLatin1String("qtg_fr_titlebar_latched_r"));
- }
+ if (opt->transparent) {
+ iconItem->setIconName(QLatin1String("qtg_fr_titlebar_trans_normal_l"));
} else {
- if (opt->transparent) {
- iconItem->setIconName(QLatin1String("qtg_fr_titlebar_trans_normal_r"));
- } else {
- iconItem->setIconName(QLatin1String("qtg_fr_titlebar_normal_r"));
- }
+ iconItem->setIconName(QLatin1String("qtg_fr_titlebar_normal_l"));
}
}
}
@@ -3266,17 +3120,34 @@
if (const HbStyleOptionListViewItem *opt = qstyleoption_cast<const HbStyleOptionListViewItem *>(option)) {
HbTextItem *textItem = static_cast<HbTextItem*>(item);
- // needs set word wrapping explicitly, if multiple lines supported
if (opt->index == 1) {
- Hb::TextWrapping wrapping = Hb::TextNoWrap;
- if ( opt->minimumLines != 1
- || opt->maximumLines != 1) {
- wrapping = Hb::TextWordWrap;
+ if (opt->multilineSecondaryTextSupported) {
+ if (opt->minimumLines != -1) {
+ // min & max secondary text row counts set by app
+ Hb::TextWrapping wrapping = Hb::TextNoWrap;
+ if ( opt->minimumLines != 1
+ || opt->maximumLines != 1) {
+ wrapping = Hb::TextWordWrap;
+ }
+ textItem->setTextWrapping(wrapping);
+ textItem->setMinimumLines(opt->minimumLines);
+ textItem->setMaximumLines(opt->maximumLines);
+ } else {
+ // min & max secondary text row counts not set by app. Allow setting those from .css
+ // Needed when multilineSecondaryTextSupported changed from FALSE to TRUE and
+ // min & max secondary text row counts has not bee set by app
+ HbWidgetBasePrivate *widgetBasePrivate = d->widgetBasePrivate(textItem);
+ widgetBasePrivate->setApiProtectionFlag(HbWidgetBasePrivate::AC_TextWrapMode, false);
+ widgetBasePrivate->setApiProtectionFlag(HbWidgetBasePrivate::AC_TextLinesMin, false);
+ widgetBasePrivate->setApiProtectionFlag(HbWidgetBasePrivate::AC_TextLinesMax, false);
+ }
+ } else {
+ // min & max secondary text row counts must always be 1. They cannot be overridden by .css
+ textItem->setTextWrapping(Hb::TextNoWrap);
+ textItem->setMinimumLines(1);
+ textItem->setMaximumLines(1);
}
- textItem->setTextWrapping(wrapping);
- textItem->setMinimumLines(opt->minimumLines);
- textItem->setMaximumLines(opt->maximumLines);
- }
+ } // else - default values from .css still in use
setItemName(textItem, QLatin1String("text-") + QString::number(opt->index + 1));
textItem->setText(opt->content.value<QString>());
}
@@ -3346,7 +3217,6 @@
if (const HbStyleOptionGridViewItem*opt = qstyleoption_cast<const HbStyleOptionGridViewItem*>(option)) {
HbTextItem *textItem = static_cast<HbTextItem*>(item);
textItem->setAlignment(Qt::AlignCenter);
- textItem->setTextWrapping(Hb::TextWrapAnywhere);
textItem->setText(opt->text);
}
break;
@@ -3440,12 +3310,17 @@
if (const HbStyleOptionProgressSlider *opt = qstyleoption_cast<const HbStyleOptionProgressSlider *>(option)) {
HbFrameItem *frameItem = static_cast<HbFrameItem*>(item);
frameItem->frameDrawer().setFrameType(HbFrameDrawer::ThreePiecesHorizontal);
- if(opt->pressedState) {
- frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_progslider_frame_pressed"));
- }
- else {
- frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_progslider_frame_normal"));
- }
+ if (opt->disableState ) {
+ frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_progslider_frame_disabled"));
+ }
+ else {
+ if(opt->pressedState) {
+ frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_progslider_frame_pressed"));
+ }
+ else {
+ frameItem->frameDrawer().setFrameGraphicsName(QLatin1String("qtg_fr_progslider_frame_normal"));
+ }
+ }
frameItem->frameDrawer().setFillWholeRect(true);
frameItem->update();
}
@@ -3657,9 +3532,9 @@
if (const HbStyleOptionTreeViewItem *opt = qstyleoption_cast<const HbStyleOptionTreeViewItem *>(option)) {
HbIconItem *iconItem = static_cast<HbIconItem*>(item);
if (opt->expanded) {
- iconItem->setIconName(opt->insidePopup ? QLatin1String("qtg_mono_expand") : QLatin1String("qtg_small_expand"));
+ iconItem->setIconName(opt->insidePopup ? QLatin1String("qtg_mono_collapse") : QLatin1String("qtg_small_collapse"));
} else {
- iconItem->setIconName(opt->insidePopup ? QLatin1String("qtg_mono_collapse") : QLatin1String("qtg_small_collapse"));
+ iconItem->setIconName(opt->insidePopup ? QLatin1String("qtg_mono_expand") : QLatin1String("qtg_small_expand"));
}
}
break;
@@ -3942,28 +3817,6 @@
HbWidgetBase *hbWidget = qobject_cast<HbWidgetBase*>(gWidget);
if ( hbWidget ) {
-#ifdef HBSTYLE_DEBUG_FONT
- QString debugName;
- bool isHbGroupBoxHeadingWidget(false);
- if (!name.isEmpty()) {
- QGraphicsItem* debugParent = hbWidget->parentItem();
- if (debugParent->isWidget()) {
- debugName = static_cast<QGraphicsWidget*>(debugParent)->metaObject()->className();
- if (debugName == "HbGroupBoxHeadingWidget") {
- isHbGroupBoxHeadingWidget = true;
- }
- }
- debugName.append("::");
- debugName.append(name);
- } else {
- debugName = widget->metaObject()->className();
- }
- if ( isHbGroupBoxHeadingWidget ) {
- qDebug() << "HbStyle::polishItem :" << debugName;
- qDebug() << "HbStyle::polishItem : -- Number of maching CSS declarations: " << decl.count();
- }
-
-#endif
HbWidgetBasePrivate* hbWidget_p = HbWidgetBasePrivate::d_ptr(hbWidget);
QFont font;
HbFontSpec fontSpec;
@@ -3971,22 +3824,19 @@
if (extractor.extractFont(&font, &fontSpec, &dummy)) {
if ( !fontSpec.isNull() ) {
if ( font == QFont() ) {
-#ifdef HBSTYLE_DEBUG_FONT
- if ( isHbGroupBoxHeadingWidget )
+#ifdef HBSTYLE_DEBUG
qDebug() << "HbStyle::polishItem : -- Setting fontspec: " << fontSpec.role();
#endif
hbWidget->setFontSpec(fontSpec);
} else {
-#ifdef HBSTYLE_DEBUG_FONT
- if ( isHbGroupBoxHeadingWidget )
+#ifdef HBSTYLE_DEBUG
qDebug() << "HbStyle::polishItem : -- Setting fontspec with overrides: "
<< fontSpec.role() << font;
#endif
hbWidget->setFont(fontSpec.font().resolve(font));
}
} else {
-#ifdef HBSTYLE_DEBUG_FONT
- if ( isHbGroupBoxHeadingWidget )
+#ifdef HBSTYLE_DEBUG
qDebug() << "HbStyle::polishItem : -- Setting explicit font: " << font;
#endif
hbWidget->setFont(font);
@@ -4267,22 +4117,9 @@
#ifdef HBSTYLE_DEBUG
qDebug() << "HbStyle::polish : Polishing" << widget->metaObject()->className();
#endif
-#ifdef HBSTYLE_DEBUG_FONT
- bool isHbGroupBoxHeadingWidget(false);
- if (QString(widget->metaObject()->className()) == "HbGroupBoxHeadingWidget") {
- isHbGroupBoxHeadingWidget = true;
- QVariant gbtype = widget->property( "groupBoxType" );
- qDebug() << "HbStyle::polish : Polishing HbGroupBoxHeadingWidget, type" << gbtype.toInt();
- }
-#endif
HbLayeredStyleLoader *styleLoader = HbLayeredStyleLoader::getStack(HbLayeredStyleLoader::Concern_Layouts);
if(!styleLoader){
-#ifdef HBSTYLE_DEBUG_FONT
- if (isHbGroupBoxHeadingWidget) {
- qDebug() << "HbStyle::polish : HbLayeredStyleLoader returned a null pointer.";
- }
-#endif
#ifdef HBSTYLE_DEBUG
qDebug() << "HbStyle::polish : HbLayeredStyleLoader returned a null pointer.";
#endif
@@ -4306,23 +4143,13 @@
styleRules = styleLoader->styleRulesForNode(n, profile.orientation());
}
-#ifdef HBSTYLE_DEBUG_FONT
- if (isHbGroupBoxHeadingWidget) {
- qDebug() << "HbStyle::polish : Number of style rules:" << styleRules.count();
- }
+#ifdef HBSTYLE_DEBUG
+ qDebug() << "HbStyle::polish : Number of style rules:" << styleRules.count();
#endif
if (!styleRules.count()) {
-#ifdef HBSTYLE_DEBUG
- qDebug() << "HbStyle::polish : No style rules found.";
-#endif
return;
}
const HbVector<HbCss::Declaration> decl = declarations(styleRules, "", widget, profile);
-#ifdef HBSTYLE_DEBUG_FONT
- if (isHbGroupBoxHeadingWidget) {
- qDebug() << "HbStyle::polish : Number of maching CSS declarations: " << decl.count();
- }
-#endif
#ifdef HBSTYLE_DEBUG
qDebug() << "HbStyle::polish : Number of maching CSS declarations: " << decl.count();
#endif
@@ -4340,15 +4167,6 @@
}
bool layoutDefined = extractor.extractLayout(&layoutName, §ionName);
-#ifdef HBSTYLE_DEBUG_FONT
- if (isHbGroupBoxHeadingWidget) {
- if (!layoutDefined) {
- qDebug() << "HbStyle::polish : Couldn't find layout name for the widget.";
- } else {
- qDebug() << "HbStyle::polish : Layout name: " << layoutName;
- }
- }
-#endif
#ifdef HBSTYLE_DEBUG
if (!layoutDefined) {
qDebug() << "HbStyle::polish : Couldn't find layout name for the widget.";
@@ -4369,11 +4187,6 @@
#endif
HbWidgetStyleLoader *loader = HbWidgetStyleLoader::instance();
if ( !loader->loadWidgetML(widget, layoutName, sectionName)) {
-#ifdef HBSTYLE_DEBUG_FONT
- if (isHbGroupBoxHeadingWidget) {
- qDebug() << "HbStyle::polish : Failed to load WidgetML";
- }
-#endif
#ifdef HBSTYLE_DEBUG
qDebug() << "HbStyle::polish : Failed to load WidgetML";
#endif
@@ -4879,4 +4692,10 @@
colorParameters.clear();
}
+HbWidgetBasePrivate *HbStylePrivate::widgetBasePrivate(HbWidgetBase *widgetBase) const
+{
+ return HbWidgetBasePrivate::d_ptr(widgetBase);
+}
+
+
#include "moc_hbstyle.cpp"
--- a/src/hbcore/style/hbstyle.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/style/hbstyle.h Fri May 14 16:09:54 2010 +0300
@@ -115,9 +115,6 @@
P_TitlePane_text,
P_TitlePane_icon,
P_TitleBar_toucharea,
- P_IndicatorGroup_background,
- P_IndicatorGroup_signalicon, // deprecated
- P_IndicatorGroup_batteryicon, // deprecated
P_SignalIndicator_icon,
P_SignalLevel_background,
P_SignalLevel_icon,
@@ -133,7 +130,6 @@
P_ProgressBar_waittrack,
P_ProgressBar_mintext,
P_ProgressBar_maxtext,
- P_Softkey_background, // deprecated
P_NavigationButton_background,
P_IndicatorButton_background,
P_IndicatorButton_handleindication,
--- a/src/hbcore/style/hbstyle_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/style/hbstyle_p.h Fri May 14 16:09:54 2010 +0300
@@ -38,15 +38,15 @@
//
#include <QObject>
-#include <QPluginLoader>
#include <QHash>
#include <QVector>
#include <hbstyle.h>
#include "hbcssparser_p.h"
-#include "hbwidget_p.h"
class HbWidget;
+class HbPluginLoader;
class HbStyleInterface;
+class HbWidgetBasePrivate;
class HbStylePluginInfo
{
@@ -59,7 +59,7 @@
class HbStyleInterfaceInfo
{
public:
- QPluginLoader* loader;
+ HbPluginLoader* loader;
int primitiveBaseId;
};
@@ -88,6 +88,8 @@
void _q_onThemeChanged();
void clearStyleSheetCaches();
+ HbWidgetBasePrivate *widgetBasePrivate(HbWidgetBase *widgetBase) const;
+
HbStyle* q_ptr;
mutable QHash<int, HbStyleInterfaceInfo*> customPrimitives;
--- a/src/hbcore/style/hbstyleinterface.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/style/hbstyleinterface.cpp Fri May 14 16:09:54 2010 +0300
@@ -24,7 +24,7 @@
****************************************************************************/
-#include "hbstyleinterface.h"
+#include "hbstyleinterface_p.h"
/*!
--- a/src/hbcore/style/hbstyleinterface.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbCore module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#ifndef HBSTYLEINTERFACE_H
-#define HBSTYLEINTERFACE_H
-
-#include <hbglobal.h>
-#include <hbstyle.h>
-class HbWidgetBase;
-
-// DEPRECATED API (style plugins are deprecated)
-// Interface used with HbStyle plugins, see HbStyle documentation for more information
-class HbStyleInterface
-{
-public:
- virtual ~HbStyleInterface() {}
-
- virtual int primitiveCount() const = 0;
- virtual QGraphicsItem *createPrimitive( HbStyle::Primitive primitive, QGraphicsItem *parent = 0 ) const = 0;
- virtual void updatePrimitive( QGraphicsItem *item, HbStyle::Primitive primitive, const QStyleOption *option ) const = 0;
- virtual QString layoutPath() const = 0;
- void deprecated();
-};
-
-Q_DECLARE_INTERFACE(HbStyleInterface, "com.nokia.Hb.StyleInterface")
-
-#endif // HBSTYLEINTERFACE_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/style/hbstyleinterface_p.h Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,49 @@
+/****************************************************************************
+**
+** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (developer.feedback@nokia.com)
+**
+** This file is part of the HbCore module of the UI Extensions for Mobile.
+**
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at developer.feedback@nokia.com.
+**
+****************************************************************************/
+
+#ifndef HBSTYLEINTERFACE_H
+#define HBSTYLEINTERFACE_H
+
+#include <hbglobal.h>
+#include <hbstyle.h>
+class HbWidgetBase;
+
+// DEPRECATED API (style plugins are deprecated)
+// Interface used with HbStyle plugins, see HbStyle documentation for more information
+class HbStyleInterface
+{
+public:
+ virtual ~HbStyleInterface() {}
+
+ virtual int primitiveCount() const = 0;
+ virtual QGraphicsItem *createPrimitive( HbStyle::Primitive primitive, QGraphicsItem *parent = 0 ) const = 0;
+ virtual void updatePrimitive( QGraphicsItem *item, HbStyle::Primitive primitive, const QStyleOption *option ) const = 0;
+ virtual QString layoutPath() const = 0;
+ void deprecated();
+};
+
+Q_DECLARE_INTERFACE(HbStyleInterface, "com.nokia.Hb.StyleInterface")
+
+#endif // HBSTYLEINTERFACE_H
--- a/src/hbcore/style/hbstyleoption.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/style/hbstyleoption.cpp Fri May 14 16:09:54 2010 +0300
@@ -23,7 +23,7 @@
**
****************************************************************************/
-#include <hbstyleoption.h>
+#include <hbstyleoption_p.h>
/*!
--- a/src/hbcore/style/hbstyleoption.h Mon May 03 12:48:33 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 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 HBSTYLEOPTION_H
-#define HBSTYLEOPTION_H
-
-#include <hbglobal.h>
-#include <QStyleOptionGraphicsItem>
-
-// Deprecated
-class HB_CORE_EXPORT HbStyleOption : public QStyleOptionGraphicsItem
-{
-public:
- HbStyleOption(int type = HbSO_Widget, int version = 1);
- HbStyleOption(const HbStyleOption& other);
- ~HbStyleOption();
-
- enum OptionType {
- HbSO_Widget = SO_CustomBase,
- HbSO_PushButton,
- HbSO_ToolButton,
- HbSO_MenuItem,
- HbSO_Menu,
- HbSO_Label,
- HbSO_Combo,
- HbSO_ScrollBar,
- HbSO_Slider,
- HbSO_SliderElement,
- HbSO_ProgressBar,
- HbSO_ProgressSlider,
- HbSO_ProgressSliderHandle,
- HbSO_ListViewItem,
- HbSO_Popup,
- HbSO_MessageBox,
- HbSO_RatingSlider,
- HbSO_ProgressDialog,
- HbSO_ToolTip,
- HbSO_AbstractViewItem,
- HbSO_ToolBarExtension,
- HbSO_InputPopup,
- HbSO_GridViewItem,
- HbSO_CheckBox,
- HbSO_Decorator,
- HbSO_TitlePane,
- HbSO_IndicatorGroup,
- HbSO_Softkey,
- HbSO_NavigationButton,
- HbSO_IndicatorButton,
- HbSO_SignalIndicator,
- HbSO_BatteryIndicator,
- HbSO_IndicatorMenu,
- HbSO_NotificationDialog,
- HbSO_TreeViewItem,
- HbSO_SelectionControl,
- HbSO_ColorGridViewItem,
- HbSO_DataForm,
- HbSO_DataItem,
- HbSO_DataFormViewItem,
- HbSO_DataGroup,
- HbSO_DataGroupHeadingWidget,
- HbSO_GroupBox,
- HbSO_IndexFeedback,
- HbSO_StatusBar,
- HbSO_InputDialog,
- // ...
- HbSO_CustomBase = 0xf0000000
- };
-
- enum StyleOptionType { Type = HbSO_Widget };
- enum StyleOptionVersion { Version = 1 };
-
- QFont font; // DEPRECATED
- QRectF boundingRect;
-};
-
-#endif // HBSTYLEOPTION_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/style/hbstyleoption_p.h Fri May 14 16:09:54 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 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 HBSTYLEOPTION_H
+#define HBSTYLEOPTION_H
+
+#include <hbglobal.h>
+#include <QStyleOptionGraphicsItem>
+
+// Deprecated
+class HB_CORE_PRIVATE_EXPORT HbStyleOption : public QStyleOptionGraphicsItem
+{
+public:
+ HbStyleOption(int type = HbSO_Widget, int version = 1);
+ HbStyleOption(const HbStyleOption& other);
+ ~HbStyleOption();
+
+ enum OptionType {
+ HbSO_Widget = SO_CustomBase,
+ HbSO_PushButton,
+ HbSO_ToolButton,
+ HbSO_MenuItem,
+ HbSO_Menu,
+ HbSO_Label,
+ HbSO_Combo,
+ HbSO_ScrollBar,
+ HbSO_Slider,
+ HbSO_SliderElement,
+ HbSO_ProgressBar,
+ HbSO_ProgressSlider,
+ HbSO_ProgressSliderHandle,
+ HbSO_ListViewItem,
+ HbSO_Popup,
+ HbSO_MessageBox,
+ HbSO_RatingSlider,
+ HbSO_ProgressDialog,
+ HbSO_ToolTip,
+ HbSO_AbstractViewItem,
+ HbSO_ToolBarExtension,
+ HbSO_InputPopup,
+ HbSO_GridViewItem,
+ HbSO_CheckBox,
+ HbSO_TitlePane,
+ HbSO_IndicatorGroup,
+ HbSO_NavigationButton,
+ HbSO_IndicatorButton,
+ HbSO_SignalIndicator,
+ HbSO_BatteryIndicator,
+ HbSO_IndicatorMenu,
+ HbSO_NotificationDialog,
+ HbSO_TreeViewItem,
+ HbSO_SelectionControl,
+ HbSO_ColorGridViewItem,
+ HbSO_DataForm,
+ HbSO_DataItem,
+ HbSO_DataFormViewItem,
+ HbSO_DataGroup,
+ HbSO_DataGroupHeadingWidget,
+ HbSO_GroupBox,
+ HbSO_IndexFeedback,
+ HbSO_StatusBar,
+ HbSO_InputDialog,
+ // ...
+ HbSO_CustomBase = 0xf0000000
+ };
+
+ enum StyleOptionType { Type = HbSO_Widget };
+ enum StyleOptionVersion { Version = 1 };
+
+ QFont font; // DEPRECATED
+ QRectF boundingRect;
+};
+
+#endif // HBSTYLEOPTION_H
--- a/src/hbcore/style/hbstyleoptionabstractviewitem.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionabstractviewitem.cpp Fri May 14 16:09:54 2010 +0300
@@ -23,7 +23,7 @@
**
****************************************************************************/
-#include "hbstyleoptionabstractviewitem.h"
+#include "hbstyleoptionabstractviewitem_p.h"
#include <hbnamespace.h>
--- a/src/hbcore/style/hbstyleoptionabstractviewitem.h Mon May 03 12:48:33 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 HBSTYLEOPTIONABSTRACTVIEWITEM_H
-#define HBSTYLEOPTIONABSTRACTVIEWITEM_H
-
-#include <hbstyleoption.h>
-#include <hbglobal.h>
-
-#include <QModelIndex>
-
-// Deprecated
-class HB_CORE_EXPORT HbStyleOptionAbstractViewItem : public HbStyleOption
-{
-public:
- HbStyleOptionAbstractViewItem();
- HbStyleOptionAbstractViewItem(const HbStyleOptionAbstractViewItem &other);
- ~HbStyleOptionAbstractViewItem();
-
- enum StyleOptionType { Type = HbSO_AbstractViewItem };
- enum StyleOptionVersion { Version = 1 };
-
- Qt::CheckState checkState;
- QVariant background;
- QString itemName;
- QString layoutOption;
- int modelItemType;
- int viewItemType;
- QModelIndex index;
- bool singleSelectionMode;
- bool insidePopup;
-};
-
-#endif // HBSTYLEOPTIONABSTRACTVIEWITEM_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/style/hbstyleoptionabstractviewitem_p.h Fri May 14 16:09:54 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 HBSTYLEOPTIONABSTRACTVIEWITEM_H
+#define HBSTYLEOPTIONABSTRACTVIEWITEM_H
+
+#include <hbstyleoption_p.h>
+#include <hbglobal.h>
+
+#include <QModelIndex>
+
+// Deprecated
+class HB_CORE_PRIVATE_EXPORT HbStyleOptionAbstractViewItem : public HbStyleOption
+{
+public:
+ HbStyleOptionAbstractViewItem();
+ HbStyleOptionAbstractViewItem(const HbStyleOptionAbstractViewItem &other);
+ ~HbStyleOptionAbstractViewItem();
+
+ enum StyleOptionType { Type = HbSO_AbstractViewItem };
+ enum StyleOptionVersion { Version = 1 };
+
+ Qt::CheckState checkState;
+ QVariant background;
+ QString itemName;
+ QString layoutOption;
+ int modelItemType;
+ int viewItemType;
+ QModelIndex index;
+ bool singleSelectionMode;
+ bool insidePopup;
+};
+
+#endif // HBSTYLEOPTIONABSTRACTVIEWITEM_H
--- a/src/hbcore/style/hbstyleoptionbatteryindicator_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionbatteryindicator_p.h Fri May 14 16:09:54 2010 +0300
@@ -26,9 +26,9 @@
#ifndef HBSTYLEOPTIONBATTERYINDICATOR_P_H
#define HBSTYLEOPTIONBATTERYINDICATOR_P_H
-#include <hbstyleoption.h>
+#include <hbstyleoption_p.h>
-class HB_CORE_EXPORT HbStyleOptionBatteryIndicator : public HbStyleOption
+class HB_CORE_PRIVATE_EXPORT HbStyleOptionBatteryIndicator : public HbStyleOption
{
public:
HbStyleOptionBatteryIndicator();
--- a/src/hbcore/style/hbstyleoptioncheckbox.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/style/hbstyleoptioncheckbox.cpp Fri May 14 16:09:54 2010 +0300
@@ -23,7 +23,7 @@
**
****************************************************************************/
-#include <hbstyleoptioncheckbox.h>
+#include <hbstyleoptioncheckbox_p.h>
/*!
--- a/src/hbcore/style/hbstyleoptioncheckbox.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbCore module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#ifndef HBSTYLEOPTIONCHECKBOX_H
-#define HBSTYLEOPTIONCHECKBOX_H
-
-#include <hbstyleoption.h>
-
-// Deprecated
-class HB_CORE_EXPORT HbStyleOptionCheckBox : public HbStyleOption
-{
-public:
- HbStyleOptionCheckBox();
- HbStyleOptionCheckBox(const HbStyleOptionCheckBox &other);
- ~HbStyleOptionCheckBox();
-
- enum StyleOptionType { Type = HbSO_CheckBox };
- enum StyleOptionVersion { Version = 1 };
-
- QString text;
-};
-
-#endif // HBSTYLEOPTIONCHECKBOX_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/style/hbstyleoptioncheckbox_p.h Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,45 @@
+/****************************************************************************
+**
+** 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 HBSTYLEOPTIONCHECKBOX_H
+#define HBSTYLEOPTIONCHECKBOX_H
+
+#include <hbstyleoption_p.h>
+
+// Deprecated
+class HB_CORE_PRIVATE_EXPORT HbStyleOptionCheckBox : public HbStyleOption
+{
+public:
+ HbStyleOptionCheckBox();
+ HbStyleOptionCheckBox(const HbStyleOptionCheckBox &other);
+ ~HbStyleOptionCheckBox();
+
+ enum StyleOptionType { Type = HbSO_CheckBox };
+ enum StyleOptionVersion { Version = 1 };
+
+ QString text;
+};
+
+#endif // HBSTYLEOPTIONCHECKBOX_H
--- a/src/hbcore/style/hbstyleoptioncolorgridviewitem.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/style/hbstyleoptioncolorgridviewitem.cpp Fri May 14 16:09:54 2010 +0300
@@ -23,7 +23,7 @@
**
****************************************************************************/
-#include <hbstyleoptioncolorgridviewitem.h>
+#include <hbstyleoptioncolorgridviewitem_p.h>
/*!
\class HbStyleOptionColorGridViewItem
--- a/src/hbcore/style/hbstyleoptioncolorgridviewitem.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbCore module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#ifndef HBSTYLEOPTIONCOLORGRIDVIEWITEM_H
-#define HBSTYLEOPTIONCOLORGRIDVIEWITEM_H
-
-#include <hbstyleoptiongridviewitem.h>
-
-// Deprecated
-class HB_CORE_EXPORT HbStyleOptionColorGridViewItem : public HbStyleOptionGridViewItem
-{
-public:
- HbStyleOptionColorGridViewItem();
- HbStyleOptionColorGridViewItem(const HbStyleOptionColorGridViewItem &other);
- ~HbStyleOptionColorGridViewItem();
-
- enum StyleOptionType { Type = HbSO_ColorGridViewItem };
- enum StyleOptionVersion { Version = 1 };
-
- QColor color; // actual color
- QColor borderColor; // color of borders and/or none field
- QString borderIcon; // name of borders and/or none field
-};
-
-#endif // HBSTYLEOPTIONCOLORGRIDVIEWITEM_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/style/hbstyleoptioncolorgridviewitem_p.h Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,47 @@
+/****************************************************************************
+**
+** 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 HBSTYLEOPTIONCOLORGRIDVIEWITEM_H
+#define HBSTYLEOPTIONCOLORGRIDVIEWITEM_H
+
+#include <hbstyleoptiongridviewitem_p.h>
+
+// Deprecated
+class HB_CORE_PRIVATE_EXPORT HbStyleOptionColorGridViewItem : public HbStyleOptionGridViewItem
+{
+public:
+ HbStyleOptionColorGridViewItem();
+ HbStyleOptionColorGridViewItem(const HbStyleOptionColorGridViewItem &other);
+ ~HbStyleOptionColorGridViewItem();
+
+ enum StyleOptionType { Type = HbSO_ColorGridViewItem };
+ enum StyleOptionVersion { Version = 1 };
+
+ QColor color; // actual color
+ QColor borderColor; // color of borders and/or none field
+ QString borderIcon; // name of borders and/or none field
+};
+
+#endif // HBSTYLEOPTIONCOLORGRIDVIEWITEM_H
--- a/src/hbcore/style/hbstyleoptioncombobox.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/style/hbstyleoptioncombobox.cpp Fri May 14 16:09:54 2010 +0300
@@ -23,7 +23,7 @@
**
****************************************************************************/
-#include <hbstyleoptioncombobox.h>
+#include <hbstyleoptioncombobox_p.h>
/*!
\class HbStyleOptionComboBox
@@ -41,8 +41,7 @@
is deprecated. Styleoptions will not be public.
*/
-HbStyleOptionComboBox::HbStyleOptionComboBox() : HbStyleOption(HbSO_Combo),
- text( ) //CRC: this is not required
+HbStyleOptionComboBox::HbStyleOptionComboBox() : HbStyleOption(HbSO_Combo)
{
type = Type;
version = Version;
--- a/src/hbcore/style/hbstyleoptioncombobox.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbCore module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#ifndef HBSTYLEOPTIONCOMBOBOX_H
-#define HBSTYLEOPTIONCOMBOBOX_H
-
-#include <hbstyleoption.h>
-#include <hbnamespace.h>
-
-// Deprecated
-class HB_CORE_EXPORT HbStyleOptionComboBox : public HbStyleOption
-{
-public:
- HbStyleOptionComboBox();
- HbStyleOptionComboBox(const HbStyleOptionComboBox &other);
- ~HbStyleOptionComboBox();
-
- enum StyleOptionType { Type = HbSO_Combo };
- enum StyleOptionVersion { Version = 1 };
- QString text;
-};
-
-#endif // HBSTYLEOPTIONCOMBOBOX_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/style/hbstyleoptioncombobox_p.h Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,45 @@
+/****************************************************************************
+**
+** 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 HBSTYLEOPTIONCOMBOBOX_H
+#define HBSTYLEOPTIONCOMBOBOX_H
+
+#include <hbstyleoption_p.h>
+#include <hbnamespace.h>
+
+// Deprecated
+class HB_CORE_PRIVATE_EXPORT HbStyleOptionComboBox : public HbStyleOption
+{
+public:
+ HbStyleOptionComboBox();
+ HbStyleOptionComboBox(const HbStyleOptionComboBox &other);
+ ~HbStyleOptionComboBox();
+
+ enum StyleOptionType { Type = HbSO_Combo };
+ enum StyleOptionVersion { Version = 1 };
+ QString text;
+};
+
+#endif // HBSTYLEOPTIONCOMBOBOX_H
--- a/src/hbcore/style/hbstyleoptiondataform.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/style/hbstyleoptiondataform.cpp Fri May 14 16:09:54 2010 +0300
@@ -23,7 +23,7 @@
**
****************************************************************************/
-#include <hbstyleoptiondataform.h>
+#include <hbstyleoptiondataform_p.h>
/*!
--- a/src/hbcore/style/hbstyleoptiondataform.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbCore module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#ifndef HBSTYLEOPTIONDATAFORM_H
-#define HBSTYLEOPTIONDATAFORM_H
-
-#include <hbstyleoption.h>
-#include <hbicon.h>
-
-// Deprecated
-class HB_CORE_EXPORT HbStyleOptionDataForm : public HbStyleOption
-{
-public:
- HbStyleOptionDataForm();
- HbStyleOptionDataForm(const HbStyleOptionDataForm &other);
- ~HbStyleOptionDataForm();
-
- enum StyleOptionType { Type = HbSO_DataForm };
- enum StyleOptionVersion { Version = 1 };
-
- QString heading;
- QString description;
-};
-
-#endif // HBSTYLEOPTIONDATAFORM_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/style/hbstyleoptiondataform_p.h Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,47 @@
+/****************************************************************************
+**
+** 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 HBSTYLEOPTIONDATAFORM_H
+#define HBSTYLEOPTIONDATAFORM_H
+
+#include <hbstyleoption_p.h>
+#include <hbicon.h>
+
+// Deprecated
+class HB_CORE_PRIVATE_EXPORT HbStyleOptionDataForm : public HbStyleOption
+{
+public:
+ HbStyleOptionDataForm();
+ HbStyleOptionDataForm(const HbStyleOptionDataForm &other);
+ ~HbStyleOptionDataForm();
+
+ enum StyleOptionType { Type = HbSO_DataForm };
+ enum StyleOptionVersion { Version = 1 };
+
+ QString heading;
+ QString description;
+};
+
+#endif // HBSTYLEOPTIONDATAFORM_H
--- a/src/hbcore/style/hbstyleoptiondataformviewitem.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/style/hbstyleoptiondataformviewitem.cpp Fri May 14 16:09:54 2010 +0300
@@ -23,7 +23,7 @@
**
****************************************************************************/
-#include <hbstyleoptiondataformviewitem.h>
+#include <hbstyleoptiondataformviewitem_p.h>
/*!
\class HbStyleOptionDataFormViewItem
--- a/src/hbcore/style/hbstyleoptiondataformviewitem.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbCore module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#ifndef HBSTYLEOPTIONDATAFORMVIEWITEM_H
-#define HBSTYLEOPTIONDATAFORMVIEWITEM_H
-
-#include <hbstyleoption.h>
-
-// Deprecated
-class HB_CORE_EXPORT HbStyleOptionDataFormViewItem : public HbStyleOption
-{
-public:
- HbStyleOptionDataFormViewItem( );
-
- HbStyleOptionDataFormViewItem( const HbStyleOptionDataFormViewItem &other );
-
- ~HbStyleOptionDataFormViewItem( );
-
- enum StyleOptionType { Type = HbSO_DataFormViewItem };
- enum StyleOptionVersion { Version = 1 };
- QString description;
-
- QString label;
- QString icon;
-};
-
-#endif //HBSTYLEOPTIONDATAFORMVIEWITEM_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/style/hbstyleoptiondataformviewitem_p.h Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,49 @@
+/****************************************************************************
+**
+** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (developer.feedback@nokia.com)
+**
+** This file is part of the HbCore module of the UI Extensions for Mobile.
+**
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at developer.feedback@nokia.com.
+**
+****************************************************************************/
+
+#ifndef HBSTYLEOPTIONDATAFORMVIEWITEM_H
+#define HBSTYLEOPTIONDATAFORMVIEWITEM_H
+
+#include <hbstyleoption_p.h>
+
+// Deprecated
+class HB_CORE_PRIVATE_EXPORT HbStyleOptionDataFormViewItem : public HbStyleOption
+{
+public:
+ HbStyleOptionDataFormViewItem( );
+
+ HbStyleOptionDataFormViewItem( const HbStyleOptionDataFormViewItem &other );
+
+ ~HbStyleOptionDataFormViewItem( );
+
+ enum StyleOptionType { Type = HbSO_DataFormViewItem };
+ enum StyleOptionVersion { Version = 1 };
+ QString description;
+
+ QString label;
+ QString icon;
+};
+
+#endif //HBSTYLEOPTIONDATAFORMVIEWITEM_H
--- a/src/hbcore/style/hbstyleoptiondatagroup_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/style/hbstyleoptiondatagroup_p.h Fri May 14 16:09:54 2010 +0300
@@ -26,11 +26,11 @@
#ifndef HBSTYLEOPTIONDATAGROUP_H
#define HBSTYLEOPTIONDATAGROUP_H
-#include <hbstyleoption.h>
+#include <hbstyleoption_p.h>
#include <hbicon.h>
// Deprecated
-class HB_CORE_EXPORT HbStyleOptionDataGroup : public HbStyleOption
+class HB_CORE_PRIVATE_EXPORT HbStyleOptionDataGroup : public HbStyleOption
{
public:
HbStyleOptionDataGroup();
--- a/src/hbcore/style/hbstyleoptiondatagroupheadingwidget_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/style/hbstyleoptiondatagroupheadingwidget_p.h Fri May 14 16:09:54 2010 +0300
@@ -26,11 +26,11 @@
#ifndef HBSTYLEOPTIONDATAGROUPHEADINGWIDGET_H
#define HBSTYLEOPTIONDATAGROUPHEADINGWIDGET_H
-#include <hbstyleoption.h>
+#include <hbstyleoption_p.h>
#include <hbicon.h>
// Deprecated
-class HB_CORE_EXPORT HbStyleOptionDataGroupHeadingWidget : public HbStyleOption
+class HB_CORE_PRIVATE_EXPORT HbStyleOptionDataGroupHeadingWidget : public HbStyleOption
{
public:
HbStyleOptionDataGroupHeadingWidget();
--- a/src/hbcore/style/hbstyleoptiondataquery.cpp Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +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 "hbstyleoptiondataquery.h"
-
-/*!
- \this class is deprecated. Use HbStyleOptionInputDialog instead.
-
- \class HbStyleOptionDataQuery
- \brief HbStyleOptionDataQuery has the style component for input dialog
-*/
-
-/*!
- \deprecated HbStyleOptionDataQuery::HbStyleOptionDataQuery()
- is deprecated. Use HbStyleOptionInputDialog instead.
-
- Constructor.
-*/
-
-HbStyleOptionDataQuery::HbStyleOptionDataQuery():HbStyleOptionPopup()
-{
- type = Type;
- version = Version;
- bgImage = 0;
- modeIcon = 0;
-}
-
-/*!
- \deprecated HbStyleOptionDataQuery::HbStyleOptionDataQuery(const HbStyleOptionDataQuery &)
- is deprecated. Use HbStyleOptionInputDialog instead.
-
- Constructor.
-*/
-HbStyleOptionDataQuery::HbStyleOptionDataQuery(const HbStyleOptionDataQuery &other) :
-HbStyleOptionPopup(other)
-{
- type = Type;
- version = Version;
- bgImage = 0;
-}
-
-HbStyleOptionDataQuery::~HbStyleOptionDataQuery()
-{
-}
--- a/src/hbcore/style/hbstyleoptiondataquery.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +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 HBSTYLEOPTIONDATAQUERY_H
-#define HBSTYLEOPTIONDATAQUERY_H
-
-#include <hbnamespace.h>
-#include <hbstyleoptionpopup.h>
-#include <hbicon.h>
-
-// Deprecated
-class HB_CORE_EXPORT HbStyleOptionDataQuery : public HbStyleOptionPopup
-{
-public:
- HbStyleOptionDataQuery();
- HbStyleOptionDataQuery(const HbStyleOptionDataQuery &other);
- ~HbStyleOptionDataQuery();
-
- enum StyleOptionType { Type = HbSO_InputPopup };
- enum StyleOptionVersion { Version = 1 };
- enum Hb::GraphicsItemType itemType;
-
- QGraphicsItem *bgImage;
- HbIcon* modeIcon;
- QRectF editRect;
-};
-
-#endif
-
--- a/src/hbcore/style/hbstyleoptiondecorator.cpp Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +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 "hbstyleoptiondecorator.h"
-
-/*!
- \class HbStyleOptionDecorator
- \brief HbStyleOptionDecorator has the style component for any decorator
-*/
-
-
-/*!
-
- \deprecated HbStyleOptionDecorator::HbStyleOptionDecorator()
- is deprecated. Styleoptions will not be public.
-
-*/
-HbStyleOptionDecorator::HbStyleOptionDecorator() :
- mode(QIcon::Normal), transparent(false)
-{
- type = Type;
- version = Version;
-}
-
-/*!
-
- \deprecated HbStyleOptionDecorator::HbStyleOptionDecorator(const HbStyleOptionDecorator&)
- is deprecated. Styleoptions will not be public.
-
-*/
-HbStyleOptionDecorator::HbStyleOptionDecorator(const HbStyleOptionDecorator &other) :
- HbStyleOption(other),
- mode(other.mode), transparent(other.transparent)
-{
- type = Type;
- version = Version;
-}
-
-HbStyleOptionDecorator::~HbStyleOptionDecorator()
-{
-}
--- a/src/hbcore/style/hbstyleoptiondecorator.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbCore module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#ifndef HBSTYLEOPTIONDECORATOR_H
-#define HBSTYLEOPTIONDECORATOR_H
-
-#include <hbstyleoption.h>
-#include <QIcon>
-
-
-//Deprecated
-class HB_CORE_EXPORT HbStyleOptionDecorator : public HbStyleOption
-{
-public:
- HbStyleOptionDecorator();
- HbStyleOptionDecorator(const HbStyleOptionDecorator &other);
- ~HbStyleOptionDecorator();
-
- enum StyleOptionType { Type = HbSO_Decorator };
- enum StyleOptionVersion { Version = 1 };
-
- QIcon::Mode mode;
- bool transparent;
-};
-
-
-#endif // HBSTYLEOPTIONDECORATOR_H
--- a/src/hbcore/style/hbstyleoptiongridviewitem.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/style/hbstyleoptiongridviewitem.cpp Fri May 14 16:09:54 2010 +0300
@@ -23,7 +23,7 @@
**
****************************************************************************/
-#include "hbstyleoptiongridviewitem.h"
+#include "hbstyleoptiongridviewitem_p.h"
/*!
\class HbStyleOptionGridViewItem
--- a/src/hbcore/style/hbstyleoptiongridviewitem.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +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 HBSTYLEOPTIONGRIDVIEWITEM_H_INCLUDED
-#define HBSTYLEOPTIONGRIDVIEWITEM_H_INCLUDED
-
-#include <hbnamespace.h>
-#include <hbstyleoption.h>
-#include <hbstyleoptionpopup.h>
-#include <hbstyleoptionabstractviewitem.h>
-#include <hbicon.h>
-
-// Deprecated
-class HB_CORE_EXPORT HbStyleOptionGridViewItem : public HbStyleOptionAbstractViewItem
-{
-public:
- HbStyleOptionGridViewItem();
- HbStyleOptionGridViewItem(const HbStyleOptionGridViewItem &other);
- ~HbStyleOptionGridViewItem();
-
- enum StyleOptionType { Type = HbSO_GridViewItem };
- enum StyleOptionVersion { Version = 1 };
-
- QString text;
- HbIcon icon;
-};
-
-#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/style/hbstyleoptiongridviewitem_p.h Fri May 14 16:09:54 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 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 HBSTYLEOPTIONGRIDVIEWITEM_H_INCLUDED
+#define HBSTYLEOPTIONGRIDVIEWITEM_H_INCLUDED
+
+#include <hbnamespace.h>
+#include <hbstyleoption_p.h>
+#include <hbstyleoptionpopup_p.h>
+#include <hbstyleoptionabstractviewitem_p.h>
+#include <hbicon.h>
+
+// Deprecated
+class HB_CORE_PRIVATE_EXPORT HbStyleOptionGridViewItem : public HbStyleOptionAbstractViewItem
+{
+public:
+ HbStyleOptionGridViewItem();
+ HbStyleOptionGridViewItem(const HbStyleOptionGridViewItem &other);
+ ~HbStyleOptionGridViewItem();
+
+ enum StyleOptionType { Type = HbSO_GridViewItem };
+ enum StyleOptionVersion { Version = 1 };
+
+ QString text;
+ HbIcon icon;
+};
+
+#endif
--- a/src/hbcore/style/hbstyleoptiongroupbox.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/style/hbstyleoptiongroupbox.cpp Fri May 14 16:09:54 2010 +0300
@@ -23,7 +23,7 @@
**
****************************************************************************/
-#include <hbstyleoptiongroupbox.h>
+#include <hbstyleoptiongroupbox_p.h>
/*!
--- a/src/hbcore/style/hbstyleoptiongroupbox.h Mon May 03 12:48:33 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 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 HBSTYLEOPTIONGROUPBOX_H
-#define HBSTYLEOPTIONGROUPBOX_H
-
-#include <hbstyleoption.h>
-
-// Deprecated
-class HB_CORE_EXPORT HbStyleOptionGroupBox : public HbStyleOption
-{
-public:
- HbStyleOptionGroupBox();
- HbStyleOptionGroupBox(const HbStyleOptionGroupBox &other);
- ~HbStyleOptionGroupBox();
-
- enum StyleOptionType { Type = HbSO_GroupBox };
- enum StyleOptionVersion { Version = 1 };
-
- bool collapsed;
- QString heading;
- bool marqueeEnabled;
-
- enum GroupBoxType{
- GroupBoxSimpleLabel= 0x1,
- GroupBoxRichLabel= 0x2,
- GroupBoxCollapsingContainer= 0x3
- };
- int groupBoxType;
-};
-
-#endif // HBSTYLEOPTIONGroupBox_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/style/hbstyleoptiongroupbox_p.h Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (developer.feedback@nokia.com)
+**
+** This file is part of the HbCore module of the UI Extensions for Mobile.
+**
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at developer.feedback@nokia.com.
+**
+****************************************************************************/
+
+#ifndef HBSTYLEOPTIONGROUPBOX_H
+#define HBSTYLEOPTIONGROUPBOX_H
+
+#include <hbstyleoption_p.h>
+
+// Deprecated
+class HB_CORE_PRIVATE_EXPORT HbStyleOptionGroupBox : public HbStyleOption
+{
+public:
+ HbStyleOptionGroupBox();
+ HbStyleOptionGroupBox(const HbStyleOptionGroupBox &other);
+ ~HbStyleOptionGroupBox();
+
+ enum StyleOptionType { Type = HbSO_GroupBox };
+ enum StyleOptionVersion { Version = 1 };
+
+ bool collapsed;
+ QString heading;
+ bool marqueeEnabled;
+
+ enum GroupBoxType{
+ GroupBoxSimpleLabel= 0x1,
+ GroupBoxRichLabel= 0x2,
+ GroupBoxCollapsingContainer= 0x3
+ };
+ int groupBoxType;
+};
+
+#endif // HBSTYLEOPTIONGroupBox_H
--- a/src/hbcore/style/hbstyleoptionindexfeedback.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionindexfeedback.cpp Fri May 14 16:09:54 2010 +0300
@@ -23,7 +23,7 @@
**
****************************************************************************/
-#include <hbstyleoptionindexfeedback.h>
+#include <hbstyleoptionindexfeedback_p.h>
/*!
\class HbStyleOptionIndexFeedback
--- a/src/hbcore/style/hbstyleoptionindexfeedback.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +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 HBSTYLEOPTIONINDEXFEEDBACK_H
-#define HBSTYLEOPTIONINDEXFEEDBACK_H
-
-#include <hbstyleoption.h>
-#include <hbfontspec.h>
-#include <hbglobal.h>
-
-// Deprecated
-class HB_CORE_EXPORT HbStyleOptionIndexFeedback : public HbStyleOption
-{
-public:
- HbStyleOptionIndexFeedback();
- HbStyleOptionIndexFeedback(const HbStyleOptionIndexFeedback &other);
- ~HbStyleOptionIndexFeedback();
-
- enum StyleOptionType { Type = HbSO_IndexFeedback };
- enum StyleOptionVersion { Version = 1 };
-
- QString text;
- HbFontSpec fontSpec;
- QRectF textRect;
- QRectF popupRect;
-};
-
-#endif // HBSTYLEOPTIONINDEXFEEDBACK_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/style/hbstyleoptionindexfeedback_p.h Fri May 14 16:09:54 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 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 HBSTYLEOPTIONINDEXFEEDBACK_H
+#define HBSTYLEOPTIONINDEXFEEDBACK_H
+
+#include <hbstyleoption_p.h>
+#include <hbfontspec.h>
+#include <hbglobal.h>
+
+// Deprecated
+class HB_CORE_PRIVATE_EXPORT HbStyleOptionIndexFeedback : public HbStyleOption
+{
+public:
+ HbStyleOptionIndexFeedback();
+ HbStyleOptionIndexFeedback(const HbStyleOptionIndexFeedback &other);
+ ~HbStyleOptionIndexFeedback();
+
+ enum StyleOptionType { Type = HbSO_IndexFeedback };
+ enum StyleOptionVersion { Version = 1 };
+
+ QString text;
+ HbFontSpec fontSpec;
+ QRectF textRect;
+ QRectF popupRect;
+};
+
+#endif // HBSTYLEOPTIONINDEXFEEDBACK_H
--- a/src/hbcore/style/hbstyleoptionindicatorbutton.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionindicatorbutton.cpp Fri May 14 16:09:54 2010 +0300
@@ -23,7 +23,7 @@
**
****************************************************************************/
-#include "hbstyleoptionindicatorbutton.h"
+#include "hbstyleoptionindicatorbutton_p.h"
/*!
\class HbStyleOptionIndicatorButton
--- a/src/hbcore/style/hbstyleoptionindicatorbutton.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbCore module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#ifndef HBSTYLEOPTIONINDICATORBUTTON_H
-#define HBSTYLEOPTIONINDICATORBUTTON_H
-
-#include <hbstyleoption.h>
-
-// Deprecated
-class HB_CORE_EXPORT HbStyleOptionIndicatorButton : public HbStyleOption
-{
-public:
- HbStyleOptionIndicatorButton();
- HbStyleOptionIndicatorButton(const HbStyleOptionIndicatorButton &other);
- ~HbStyleOptionIndicatorButton();
-
- enum StyleOptionType { Type = HbSO_IndicatorButton };
- enum StyleOptionVersion { Version = 1 };
-
- QIcon::Mode mode;
- bool transparent;
-};
-
-#endif // HBSTYLEOPTIONINDICATORBUTTON_H
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/style/hbstyleoptionindicatorbutton_p.h Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,47 @@
+/****************************************************************************
+**
+** 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 HBSTYLEOPTIONINDICATORBUTTON_H
+#define HBSTYLEOPTIONINDICATORBUTTON_H
+
+#include <hbstyleoption_p.h>
+
+// Deprecated
+class HB_CORE_PRIVATE_EXPORT HbStyleOptionIndicatorButton : public HbStyleOption
+{
+public:
+ HbStyleOptionIndicatorButton();
+ HbStyleOptionIndicatorButton(const HbStyleOptionIndicatorButton &other);
+ ~HbStyleOptionIndicatorButton();
+
+ enum StyleOptionType { Type = HbSO_IndicatorButton };
+ enum StyleOptionVersion { Version = 1 };
+
+ QIcon::Mode mode;
+ bool transparent;
+};
+
+#endif // HBSTYLEOPTIONINDICATORBUTTON_H
+
--- a/src/hbcore/style/hbstyleoptionindicatorgroup.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionindicatorgroup.cpp Fri May 14 16:09:54 2010 +0300
@@ -23,7 +23,7 @@
**
****************************************************************************/
-#include "hbstyleoptionindicatorgroup.h"
+#include "hbstyleoptionindicatorgroup_p.h"
/*!
\class HbStyleOptionIndicatorGroup
@@ -51,7 +51,7 @@
*/
HbStyleOptionIndicatorGroup::HbStyleOptionIndicatorGroup(const HbStyleOptionIndicatorGroup &other) :
- HbStyleOptionDecorator(other), iconName(other.iconName)
+ HbStyleOption(other), iconName(other.iconName)
{
type = Type;
version = Version;
--- a/src/hbcore/style/hbstyleoptionindicatorgroup.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbCore module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#ifndef HBSTYLEOPTIONINDICATORGROUP_H
-#define HBSTYLEOPTIONINDICATORGROUP_H
-
-#include <hbstyleoptiondecorator.h>
-#include <QIcon>
-
-// Deprecated
-class HB_CORE_EXPORT HbStyleOptionIndicatorGroup : public HbStyleOptionDecorator
-{
-public:
- HbStyleOptionIndicatorGroup();
- HbStyleOptionIndicatorGroup(const HbStyleOptionIndicatorGroup &other);
- ~HbStyleOptionIndicatorGroup();
-
- enum StyleOptionType { Type = HbSO_IndicatorGroup };
- enum StyleOptionVersion { Version = 1 };
-
- QString iconName;
-};
-
-#endif // HBSTYLEOPTIONINDICATORGROUP_H
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/style/hbstyleoptionindicatorgroup_p.h Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,47 @@
+/****************************************************************************
+**
+** 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 HBSTYLEOPTIONINDICATORGROUP_H
+#define HBSTYLEOPTIONINDICATORGROUP_H
+
+#include <hbstyleoption_p.h>
+#include <QIcon>
+
+// Deprecated
+class HB_CORE_PRIVATE_EXPORT HbStyleOptionIndicatorGroup : public HbStyleOption
+{
+public:
+ HbStyleOptionIndicatorGroup();
+ HbStyleOptionIndicatorGroup(const HbStyleOptionIndicatorGroup &other);
+ ~HbStyleOptionIndicatorGroup();
+
+ enum StyleOptionType { Type = HbSO_IndicatorGroup };
+ enum StyleOptionVersion { Version = 1 };
+
+ QString iconName;
+};
+
+#endif // HBSTYLEOPTIONINDICATORGROUP_H
+
--- a/src/hbcore/style/hbstyleoptionindicatormenu.cpp Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +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 "hbstyleoptionindicatormenu.h"
-
-/*!
- \class HbStyleOptionIndicatorMenu
- \brief HbStyleOptionIndicatorMenu has the style component for indicator menu and content widget.
-*/
-
-
-/*!
-
- \deprecated HbStyleOptionIndicatorMenu::HbStyleOptionIndicatorMenu()
- is deprecated. Styleoptions will not be public.
-
-*/
-HbStyleOptionIndicatorMenu::HbStyleOptionIndicatorMenu()
-{
- type = Type;
- version = Version;
-}
-
-
-/*!
-
- \deprecated HbStyleOptionIndicatorMenu::HbStyleOptionIndicatorMenu(const HbStyleOptionIndicatorMenu&)
- is deprecated. Styleoptions will not be public.
-
-*/
-HbStyleOptionIndicatorMenu::HbStyleOptionIndicatorMenu(const HbStyleOptionIndicatorMenu &other) :
- HbStyleOptionPopup(other), timeString(other.timeString)
-{
- type = Type;
- version = Version;
-}
-
-HbStyleOptionIndicatorMenu::~HbStyleOptionIndicatorMenu()
-{
-}
--- a/src/hbcore/style/hbstyleoptionindicatormenu.h Mon May 03 12:48:33 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 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 HBSTYLEOPTIONINDICATORMENU_H
-#define HBSTYLEOPTIONINDICATORMENU_H
-
-#include <hbglobal.h>
-#include <hbstyleoptionpopup.h>
-
-// Deprecated
-class HB_CORE_EXPORT HbStyleOptionIndicatorMenu : public HbStyleOptionPopup
-{
-public:
- HbStyleOptionIndicatorMenu();
- HbStyleOptionIndicatorMenu(const HbStyleOptionIndicatorMenu &other);
- ~HbStyleOptionIndicatorMenu();
-
- enum StyleOptionType { Type = HbSO_IndicatorMenu };
- enum StyleOptionVersion { Version = 1 };
-
- QString timeString;
-};
-
-
-#endif // HBSTYLEOPTIONINDICATORMENU_H
-
--- a/src/hbcore/style/hbstyleoptioninputdialog.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/style/hbstyleoptioninputdialog.cpp Fri May 14 16:09:54 2010 +0300
@@ -23,7 +23,7 @@
**
****************************************************************************/
-#include "hbstyleoptioninputdialog.h"
+#include "hbstyleoptioninputdialog_p.h"
/*!
\class HbStyleOptionInputDialog
--- a/src/hbcore/style/hbstyleoptioninputdialog.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbCore module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#ifndef HBSTYLEOPTIONINPUTDIALOG_H
-#define HBSTYLEOPTIONINPUTDIALOG_H
-
-#include <hbstyleoption.h>
-#include <hbstyleoptionpopup.h>
-
-// Deprecated
-class HB_CORE_EXPORT HbStyleOptionInputDialog : public HbStyleOptionPopup
-{
-public:
- HbStyleOptionInputDialog();
- HbStyleOptionInputDialog(const HbStyleOptionInputDialog &other);
- ~HbStyleOptionInputDialog();
-
- enum StyleOptionType { Type = HbSO_InputDialog };
- enum StyleOptionVersion { Version = 1 };
-
- QString text;
- QString additionalText;
-};
-
-#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/style/hbstyleoptioninputdialog_p.h Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,47 @@
+/****************************************************************************
+**
+** 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 HBSTYLEOPTIONINPUTDIALOG_H
+#define HBSTYLEOPTIONINPUTDIALOG_H
+
+#include <hbstyleoption_p.h>
+#include <hbstyleoptionpopup_p.h>
+
+// Deprecated
+class HB_CORE_PRIVATE_EXPORT HbStyleOptionInputDialog : public HbStyleOptionPopup
+{
+public:
+ HbStyleOptionInputDialog();
+ HbStyleOptionInputDialog(const HbStyleOptionInputDialog &other);
+ ~HbStyleOptionInputDialog();
+
+ enum StyleOptionType { Type = HbSO_InputDialog };
+ enum StyleOptionVersion { Version = 1 };
+
+ QString text;
+ QString additionalText;
+};
+
+#endif
--- a/src/hbcore/style/hbstyleoptionlabel.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionlabel.cpp Fri May 14 16:09:54 2010 +0300
@@ -23,7 +23,7 @@
**
****************************************************************************/
-#include <hbstyleoptionlabel.h>
+#include <hbstyleoptionlabel_p.h>
/*!
\class HbStyleOptionLabel
--- a/src/hbcore/style/hbstyleoptionlabel.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +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 HBSTYLEOPTIONLABEL_H
-#define HBSTYLEOPTIONLABEL_H
-
-#include <hbstyleoption.h>
-#include <hbicon.h>
-#include <hbnamespace.h>
-#include <hbfontspec.h>
-
-#include <QIcon>
-
-// Deprecated
-class HB_CORE_EXPORT HbStyleOptionLabel : public HbStyleOption
-{
-public:
- HbStyleOptionLabel();
- HbStyleOptionLabel(const HbStyleOptionLabel &other);
- ~HbStyleOptionLabel();
-
- enum StyleOptionType { Type = HbSO_Label };
- enum StyleOptionVersion { Version = 1 };
-
- QString text;
- HbFontSpec fontSpec;
- Qt::TextElideMode elideMode;
- Hb::TextWrapping textWrapMode;
- QColor color;
- HbIcon icon;
- Qt::AspectRatioMode aspectRatioMode;
-
- Qt::Alignment alignment;
-};
-
-#endif // HBSTYLEOPTIONLABEL_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/style/hbstyleoptionlabel_p.h Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,58 @@
+/****************************************************************************
+**
+** 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 HBSTYLEOPTIONLABEL_H
+#define HBSTYLEOPTIONLABEL_H
+
+#include <hbstyleoption_p.h>
+#include <hbicon.h>
+#include <hbnamespace.h>
+#include <hbfontspec.h>
+
+#include <QIcon>
+
+// Deprecated
+class HB_CORE_PRIVATE_EXPORT HbStyleOptionLabel : public HbStyleOption
+{
+public:
+ HbStyleOptionLabel();
+ HbStyleOptionLabel(const HbStyleOptionLabel &other);
+ ~HbStyleOptionLabel();
+
+ enum StyleOptionType { Type = HbSO_Label };
+ enum StyleOptionVersion { Version = 1 };
+
+ QString text;
+ HbFontSpec fontSpec;
+ Qt::TextElideMode elideMode;
+ Hb::TextWrapping textWrapMode;
+ QColor color;
+ HbIcon icon;
+ Qt::AspectRatioMode aspectRatioMode;
+
+ Qt::Alignment alignment;
+};
+
+#endif // HBSTYLEOPTIONLABEL_H
--- a/src/hbcore/style/hbstyleoptionlistviewitem.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionlistviewitem.cpp Fri May 14 16:09:54 2010 +0300
@@ -23,7 +23,7 @@
**
****************************************************************************/
-#include "hbstyleoptionlistviewitem.h"
+#include "hbstyleoptionlistviewitem_p.h"
/*!
\class HbStyleOptionListViewItem
@@ -61,30 +61,56 @@
The itemNameIndex value is incremented by 1 before using it in HbStyle.
Thus itemNameIndex value 0 produces item name "text-1".
+ When index is 1, style option includes secondary text.
+
Default value is 0.
*/
/*!
\var HbStyleOptionListViewItem::minimumLines
- This variable holds minimum count of lines reserved for text.
- Minimum row count for secondary text in middle column can be set using HbListViewItem::setSecondaryTextRowCount().
- For other texts default value is always used.
+ This variable holds minimum count of lines reserved for secondary text (i.e. when index is 1).
+ Minimum row count for secondary text can be set using HbListViewItem::setSecondaryTextRowCount().
+ If minimum and maximum row counts are not set by application, default value is used.
- Default value is 1.
+ For other texts default value is always used. When default value is set, minimum count of lines are read from .css file during layouting the view item.
+ If multilineSecondaryTextSupported is false and text is secondary text, minimum and maximum line counts are forced to 1.
+ These values cannot be overridden from .css during layouting.
+ Default value is -1.
+
+ \sa HbStyleOptionListViewItem::index
+ \sa HbStyleOptionListViewItem::multilineSecondaryTextSupported
\sa HbListViewItem::setSecondaryTextRowCount()
*/
/*!
\var HbStyleOptionListViewItem::maximumLines
- This variable holds maximum count of lines reserved for secondary text.
- Maximum row count for secondary text in middle column can be set using HbListViewItem::setSecondaryTextRowCount().
- For other texts default value is always used.
+ This variable holds minimum count of lines reserved for secondary text (i.e. when index is 1).
+ Maximum row count for secondary text can be set using HbListViewItem::setSecondaryTextRowCount().
+ If minimum and maximum row counts are not set by application, default value is used.
+
+ For other texts default value is always used. When default value is set, maximum count of lines are read from .css file during layouting the view item.
+ If multilineSecondaryTextSupported is false and text is secondary text, minimum and maximum line counts are forced to 1.
+ Then these values cannot be overridden from .css during layouting.
+
+ Default value is -1.
- Default value is 1.
+ \sa HbStyleOptionListViewItem::index
+ \sa HbStyleOptionListViewItem::multilineSecondaryTextSupported
+ \sa HbListViewItem::setSecondaryTextRowCount()
+*/
+/*!
+ \var HbStyleOptionListViewItem::multilineSecondaryTextSupported
+
+ This variable holds whether multine line secondary text is supported.
+
+ Default value is true.
+
+ \sa HbStyleOptionListViewItem::minimumLines
+ \sa HbStyleOptionListViewItem::maximumLines
\sa HbListViewItem::setSecondaryTextRowCount()
*/
@@ -100,9 +126,9 @@
HbStyleOptionAbstractViewItem(),
role(Qt::DisplayRole),
index(0),
- minimumLines(1),
- maximumLines(1)
-
+ minimumLines(-1),
+ maximumLines(-1),
+ multilineSecondaryTextSupported(true)
{
type = Type;
version = Version;
--- a/src/hbcore/style/hbstyleoptionlistviewitem.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +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 HBSTYLEOPTIONLISTVIEWITEM_H
-#define HBSTYLEOPTIONLISTVIEWITEM_H
-
-#include <hbstyleoptionabstractviewitem.h>
-#include <hbglobal.h>
-#include <QVariant>
-
-// Deprecated
-class HB_CORE_EXPORT HbStyleOptionListViewItem : public HbStyleOptionAbstractViewItem
-{
-public:
- HbStyleOptionListViewItem();
- HbStyleOptionListViewItem(const HbStyleOptionListViewItem &other);
- ~HbStyleOptionListViewItem();
-
- enum StyleOptionType { Type = HbSO_ListViewItem };
- enum StyleOptionVersion { Version = 1 };
-
- QVariant content;
- Qt::ItemDataRole role;
- int index;
- int minimumLines;
- int maximumLines;
-};
-
-#endif // HBSTYLEOPTIONLISTVIEWITEM_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/style/hbstyleoptionlistviewitem_p.h Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (developer.feedback@nokia.com)
+**
+** This file is part of the HbCore module of the UI Extensions for Mobile.
+**
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at developer.feedback@nokia.com.
+**
+****************************************************************************/
+
+#ifndef HBSTYLEOPTIONLISTVIEWITEM_H
+#define HBSTYLEOPTIONLISTVIEWITEM_H
+
+#include <hbstyleoptionabstractviewitem_p.h>
+#include <hbglobal.h>
+#include <QVariant>
+
+// Deprecated
+class HB_CORE_PRIVATE_EXPORT HbStyleOptionListViewItem : public HbStyleOptionAbstractViewItem
+{
+public:
+ HbStyleOptionListViewItem();
+ HbStyleOptionListViewItem(const HbStyleOptionListViewItem &other);
+ ~HbStyleOptionListViewItem();
+
+ enum StyleOptionType { Type = HbSO_ListViewItem };
+ enum StyleOptionVersion { Version = 1 };
+
+ QVariant content;
+ Qt::ItemDataRole role;
+ int index;
+ int minimumLines;
+ int maximumLines;
+ bool multilineSecondaryTextSupported;
+};
+
+#endif // HBSTYLEOPTIONLISTVIEWITEM_H
--- a/src/hbcore/style/hbstyleoptionmenuitem.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionmenuitem.cpp Fri May 14 16:09:54 2010 +0300
@@ -23,7 +23,7 @@
**
****************************************************************************/
-#include "hbstyleoptionmenuitem.h"
+#include "hbstyleoptionmenuitem_p.h"
/*!
\class HbStyleOptionMenuItem
--- a/src/hbcore/style/hbstyleoptionmenuitem.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +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 HBSTYLEOPTIONMENUITEM_H
-#define HBSTYLEOPTIONMENUITEM_H
-
-#include <hbicon.h>
-#include <hbglobal.h>
-#include <hbstyleoption.h>
-
-// Deprecated
-class HB_CORE_EXPORT HbStyleOptionMenuItem : public HbStyleOption
-{
-public:
- HbStyleOptionMenuItem();
- HbStyleOptionMenuItem(const HbStyleOptionMenuItem &other);
- ~HbStyleOptionMenuItem();
-
- enum StyleOptionType { Type = HbSO_MenuItem };
- enum StyleOptionVersion { Version = 1 };
-
- QString text;
- bool arrow;
- bool checked;
- bool checkable;
- bool separator;
-};
-
-#endif // HBSTYLEOPTIONMENUITEM_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/style/hbstyleoptionmenuitem_p.h Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** 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 HBSTYLEOPTIONMENUITEM_H
+#define HBSTYLEOPTIONMENUITEM_H
+
+#include <hbicon.h>
+#include <hbglobal.h>
+#include <hbstyleoption_p.h>
+
+// Deprecated
+class HB_CORE_PRIVATE_EXPORT HbStyleOptionMenuItem : public HbStyleOption
+{
+public:
+ HbStyleOptionMenuItem();
+ HbStyleOptionMenuItem(const HbStyleOptionMenuItem &other);
+ ~HbStyleOptionMenuItem();
+
+ enum StyleOptionType { Type = HbSO_MenuItem };
+ enum StyleOptionVersion { Version = 1 };
+
+ QString text;
+ bool arrow;
+ bool checked;
+ bool checkable;
+ bool separator;
+};
+
+#endif // HBSTYLEOPTIONMENUITEM_H
--- a/src/hbcore/style/hbstyleoptionmessagebox.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionmessagebox.cpp Fri May 14 16:09:54 2010 +0300
@@ -23,7 +23,7 @@
**
****************************************************************************/
-#include "hbstyleoptionmessagebox.h"
+#include "hbstyleoptionmessagebox_p.h"
/*!
\this class is deprecated.
--- a/src/hbcore/style/hbstyleoptionmessagebox.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +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_STYLEOPTIONMESSAGEBOX_H
-#define HB_STYLEOPTIONMESSAGEBOX_H
-
-#include <hbstyleoption.h>
-#include <hbstyleoptionpopup.h>
-#include <hbicon.h>
-
-// Deprecated
-class HB_CORE_EXPORT HbStyleOptionMessageBox : public HbStyleOptionPopup
-{
-public:
- HbStyleOptionMessageBox();
- HbStyleOptionMessageBox(const HbStyleOptionMessageBox &other);
- ~HbStyleOptionMessageBox();
-
- enum StyleOptionType { Type = HbSO_MessageBox };
- enum StyleOptionVersion { Version = 1 };
-
- QString text; //deprecated
- HbIcon icon;
- Qt::Alignment textAlignment; //deprecated
- Qt::Alignment iconAlignment; //deprecated
- bool textWrapping; //deprecated
- enum MessageBoxType {
- MessageTypeInformation,
- MessageTypeQuestion,
- MessageTypeWarning
- };
- int messageBoxType;
-
-};
-
-#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/style/hbstyleoptionmessagebox_p.h Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,58 @@
+/****************************************************************************
+**
+** 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_STYLEOPTIONMESSAGEBOX_H
+#define HB_STYLEOPTIONMESSAGEBOX_H
+
+#include <hbstyleoption_p.h>
+#include <hbstyleoptionpopup_p.h>
+#include <hbicon.h>
+
+// Deprecated
+class HB_CORE_PRIVATE_EXPORT HbStyleOptionMessageBox : public HbStyleOptionPopup
+{
+public:
+ HbStyleOptionMessageBox();
+ HbStyleOptionMessageBox(const HbStyleOptionMessageBox &other);
+ ~HbStyleOptionMessageBox();
+
+ enum StyleOptionType { Type = HbSO_MessageBox };
+ enum StyleOptionVersion { Version = 1 };
+
+ QString text; //deprecated
+ HbIcon icon;
+ Qt::Alignment textAlignment; //deprecated
+ Qt::Alignment iconAlignment; //deprecated
+ bool textWrapping; //deprecated
+ enum MessageBoxType {
+ MessageTypeInformation,
+ MessageTypeQuestion,
+ MessageTypeWarning
+ };
+ int messageBoxType;
+
+};
+
+#endif
--- a/src/hbcore/style/hbstyleoptionnavigationbutton.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionnavigationbutton.cpp Fri May 14 16:09:54 2010 +0300
@@ -23,7 +23,7 @@
**
****************************************************************************/
-#include "hbstyleoptionnavigationbutton.h"
+#include "hbstyleoptionnavigationbutton_p.h"
/*!
\class HbStyleOptionNavigationButton
--- a/src/hbcore/style/hbstyleoptionnavigationbutton.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbCore module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#ifndef HBSTYLEOPTIONNAVIGATIONBUTTON_H
-#define HBSTYLEOPTIONNAVIGATIONBUTTON_H
-
-#include <hbstyleoption.h>
-
-// Deprecated
-class HB_CORE_EXPORT HbStyleOptionNavigationButton : public HbStyleOption
-{
-public:
- HbStyleOptionNavigationButton();
- HbStyleOptionNavigationButton(const HbStyleOptionNavigationButton &other);
- ~HbStyleOptionNavigationButton();
-
- enum StyleOptionType { Type = HbSO_NavigationButton };
- enum StyleOptionVersion { Version = 1 };
-
- QIcon::Mode mode;
- bool transparent;
-};
-
-#endif // HBSTYLEOPTIONNAVIGATIONBUTTON_H
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/style/hbstyleoptionnavigationbutton_p.h Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,47 @@
+/****************************************************************************
+**
+** 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 HBSTYLEOPTIONNAVIGATIONBUTTON_H
+#define HBSTYLEOPTIONNAVIGATIONBUTTON_H
+
+#include <hbstyleoption_p.h>
+
+// Deprecated
+class HB_CORE_PRIVATE_EXPORT HbStyleOptionNavigationButton : public HbStyleOption
+{
+public:
+ HbStyleOptionNavigationButton();
+ HbStyleOptionNavigationButton(const HbStyleOptionNavigationButton &other);
+ ~HbStyleOptionNavigationButton();
+
+ enum StyleOptionType { Type = HbSO_NavigationButton };
+ enum StyleOptionVersion { Version = 1 };
+
+ QIcon::Mode mode;
+ bool transparent;
+};
+
+#endif // HBSTYLEOPTIONNAVIGATIONBUTTON_H
+
--- a/src/hbcore/style/hbstyleoptionnotificationdialog.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionnotificationdialog.cpp Fri May 14 16:09:54 2010 +0300
@@ -23,7 +23,7 @@
**
****************************************************************************/
-#include "hbstyleoptionnotificationdialog.h"
+#include "hbstyleoptionnotificationdialog_p.h"
/*!
\class HbStyleOptionNotificationDialog
--- a/src/hbcore/style/hbstyleoptionnotificationdialog.h Mon May 03 12:48:33 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 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 HBSTYLEOPTIONNOTIFICATIONDIALOG_H
-#define HBSTYLEOPTIONNOTIFICATIONDIALOG_H
-
-#include <hbglobal.h>
-#include <hbicon.h>
-#include <hbstyleoptionpopup.h>
-
-
-//Deprecated
-class HB_CORE_EXPORT HbStyleOptionNotificationDialog : public HbStyleOptionPopup
-{
-public:
- HbStyleOptionNotificationDialog();
- HbStyleOptionNotificationDialog(const HbStyleOptionNotificationDialog &other);
- ~HbStyleOptionNotificationDialog();
-
- enum StyleOptionType { Type = HbSO_NotificationDialog };
- enum StyleOptionVersion { Version = 1 };
-
- QString title;
- QString text;
- HbIcon icon;
-
- Qt::Alignment titleAlignment;
- Qt::Alignment textAlignment;
- Qt::Alignment iconAlignment;
- bool titleWrapping;
- bool textWrapping;
- bool isLink;
- Hb::TextWrapping wrappingTitle;
- Hb::TextWrapping wrappingText;
-};
-
-
-#endif // HBSTYLEOPTIONNOTIFICATIONDIALOG_H
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/style/hbstyleoptionnotificationdialog_p.h Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,61 @@
+/****************************************************************************
+**
+** 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 HBSTYLEOPTIONNOTIFICATIONDIALOG_H
+#define HBSTYLEOPTIONNOTIFICATIONDIALOG_H
+
+#include <hbglobal.h>
+#include <hbicon.h>
+#include <hbstyleoptionpopup_p.h>
+
+
+//Deprecated
+class HB_CORE_PRIVATE_EXPORT HbStyleOptionNotificationDialog : public HbStyleOptionPopup
+{
+public:
+ HbStyleOptionNotificationDialog();
+ HbStyleOptionNotificationDialog(const HbStyleOptionNotificationDialog &other);
+ ~HbStyleOptionNotificationDialog();
+
+ enum StyleOptionType { Type = HbSO_NotificationDialog };
+ enum StyleOptionVersion { Version = 1 };
+
+ QString title;
+ QString text;
+ HbIcon icon;
+
+ Qt::Alignment titleAlignment;
+ Qt::Alignment textAlignment;
+ Qt::Alignment iconAlignment;
+ bool titleWrapping;
+ bool textWrapping;
+ bool isLink;
+ Hb::TextWrapping wrappingTitle;
+ Hb::TextWrapping wrappingText;
+};
+
+
+#endif // HBSTYLEOPTIONNOTIFICATIONDIALOG_H
+
--- a/src/hbcore/style/hbstyleoptionpopup.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionpopup.cpp Fri May 14 16:09:54 2010 +0300
@@ -23,7 +23,7 @@
**
****************************************************************************/
-#include "hbstyleoptionpopup.h"
+#include "hbstyleoptionpopup_p.h"
/*!
\class HbStyleOptionPopup
--- a/src/hbcore/style/hbstyleoptionpopup.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbCore module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#ifndef HBSTYLEOPTIONPOPUP_H_INCLUDED
-#define HBSTYLEOPTIONPOPUP_H_INCLUDED
-
-#include <hbnamespace.h>
-#include <hbstyleoption.h>
-
-//Deprecated
-class HB_CORE_EXPORT HbStyleOptionPopup : public HbStyleOption
-{
-public:
- HbStyleOptionPopup();
- HbStyleOptionPopup(const HbStyleOptionPopup &other);
- ~HbStyleOptionPopup();
-
- enum StyleOptionType { Type = HbSO_Popup };
- enum StyleOptionVersion { Version = 1 };
-
- QIcon::Mode headingMode;
-};
-
-#endif
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/style/hbstyleoptionpopup_p.h Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,47 @@
+/****************************************************************************
+**
+** 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 HBSTYLEOPTIONPOPUP_H_INCLUDED
+#define HBSTYLEOPTIONPOPUP_H_INCLUDED
+
+#include <hbnamespace.h>
+#include <hbstyleoption_p.h>
+
+//Deprecated
+class HB_CORE_PRIVATE_EXPORT HbStyleOptionPopup : public HbStyleOption
+{
+public:
+ HbStyleOptionPopup();
+ HbStyleOptionPopup(const HbStyleOptionPopup &other);
+ ~HbStyleOptionPopup();
+
+ enum StyleOptionType { Type = HbSO_Popup };
+ enum StyleOptionVersion { Version = 1 };
+
+ QIcon::Mode headingMode;
+};
+
+#endif
+
--- a/src/hbcore/style/hbstyleoptionprogressbar.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionprogressbar.cpp Fri May 14 16:09:54 2010 +0300
@@ -24,7 +24,7 @@
****************************************************************************/
-#include "hbstyleoptionprogressbar.h"
+#include "hbstyleoptionprogressbar_p.h"
/*!
--- a/src/hbcore/style/hbstyleoptionprogressbar.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +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 HBSTYLEOPTIONPROGRESSBAR_H
-#define HBSTYLEOPTIONPROGRESSBAR_H
-
-#include <hbglobal.h>
-#include <hbicon.h>
-#include <hbstyleoption.h>
-
-//Deprecated
-class HB_CORE_EXPORT HbStyleOptionProgressBar : public HbStyleOption
-{
-public:
- HbStyleOptionProgressBar();
- HbStyleOptionProgressBar(const HbStyleOptionProgressBar &other);
- ~HbStyleOptionProgressBar();
-
-public:
- enum StyleOptionType { Type = HbSO_ProgressBar };
- enum StyleOptionVersion { Version = 1 };
-
- enum HandleState { // deprecated
- PlayNormal,
- PlayPressed,
- PauseNormal,
- PausePressed
- };
-
- enum SliderState // deprecated
- {
- SliderStatePlayNormal,
- SliderStatePlayPressed,
- SliderStatePauseNormal,
- SliderStatePausePressed
- };
-
- int progressValue;
- int minimum;
- int maximum;
- uint inverted : 1; //mirrored
- QString text; // deprecated
- bool isSlider;
- uint stopWaitAnimation : 1;
- QString minText;
- QString maxText;
- Qt::Orientation orientation;
-
- int sliderValue; // deprecated
- QRectF handleRect; // deprecated
- HbIcon thumbIcon; // deprecated
- qreal maskWidth; // deprecated
- bool secondaryType; // deprecated
- HandleState handleState; // deprecated
- SliderState sliderState; // deprecated
- Qt::Alignment minMaxTextAlignment;
-};
-
-#endif // HB_STYLEOPTIONPROGRESSBAR_H
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/style/hbstyleoptionprogressbar_p.h Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,82 @@
+/****************************************************************************
+**
+** 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 HBSTYLEOPTIONPROGRESSBAR_H
+#define HBSTYLEOPTIONPROGRESSBAR_H
+
+#include <hbglobal.h>
+#include <hbicon.h>
+#include <hbstyleoption_p.h>
+
+//Deprecated
+class HB_CORE_PRIVATE_EXPORT HbStyleOptionProgressBar : public HbStyleOption
+{
+public:
+ HbStyleOptionProgressBar();
+ HbStyleOptionProgressBar(const HbStyleOptionProgressBar &other);
+ ~HbStyleOptionProgressBar();
+
+public:
+ enum StyleOptionType { Type = HbSO_ProgressBar };
+ enum StyleOptionVersion { Version = 1 };
+
+ enum HandleState { // deprecated
+ PlayNormal,
+ PlayPressed,
+ PauseNormal,
+ PausePressed
+ };
+
+ enum SliderState // deprecated
+ {
+ SliderStatePlayNormal,
+ SliderStatePlayPressed,
+ SliderStatePauseNormal,
+ SliderStatePausePressed
+ };
+
+ int progressValue;
+ int minimum;
+ int maximum;
+ uint inverted : 1; //mirrored
+ QString text; // deprecated
+ bool isSlider;
+ uint stopWaitAnimation : 1;
+ QString minText;
+ QString maxText;
+ Qt::Orientation orientation;
+
+ int sliderValue; // deprecated
+ QRectF handleRect; // deprecated
+ HbIcon thumbIcon; // deprecated
+ qreal maskWidth; // deprecated
+ bool secondaryType; // deprecated
+ HandleState handleState; // deprecated
+ SliderState sliderState; // deprecated
+ Qt::Alignment minMaxTextAlignment;
+};
+
+#endif // HB_STYLEOPTIONPROGRESSBAR_H
+
--- a/src/hbcore/style/hbstyleoptionprogressdialog.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionprogressdialog.cpp Fri May 14 16:09:54 2010 +0300
@@ -23,7 +23,7 @@
**
****************************************************************************/
-#include "hbstyleoptionprogressdialog.h"
+#include "hbstyleoptionprogressdialog_p.h"
/*!
\class HbStyleOptionProgressDialog
--- a/src/hbcore/style/hbstyleoptionprogressdialog.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbCore module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#ifndef HBSTYLEOPTIONPROGRESSDIALOG_H
-#define HBSTYLEOPTIONPROGRESSDIALOG_H
-
-#include <hbstyleoption.h>
-#include <hbicon.h>
-
-//Deprecated
-class HB_CORE_EXPORT HbStyleOptionProgressDialog : public HbStyleOption
-{
-public:
- HbStyleOptionProgressDialog();
- HbStyleOptionProgressDialog(const HbStyleOptionProgressDialog &other);
- ~HbStyleOptionProgressDialog();
- HbIcon icon;
- QString text;
- Qt::Alignment iconAlignment; // deprecated
- enum StyleOptionType { Type = HbSO_ProgressDialog };
- enum StyleOptionVersion { Version = 1 };
- QSizeF progressBarSize; // deprecated
- bool wrap; // deprecated
- Qt::Alignment textAlignment; // deprecated
-};
-
-#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/style/hbstyleoptionprogressdialog_p.h Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,49 @@
+/****************************************************************************
+**
+** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (developer.feedback@nokia.com)
+**
+** This file is part of the HbCore module of the UI Extensions for Mobile.
+**
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at developer.feedback@nokia.com.
+**
+****************************************************************************/
+
+#ifndef HBSTYLEOPTIONPROGRESSDIALOG_H
+#define HBSTYLEOPTIONPROGRESSDIALOG_H
+
+#include <hbstyleoption_p.h>
+#include <hbicon.h>
+
+//Deprecated
+class HB_CORE_PRIVATE_EXPORT HbStyleOptionProgressDialog : public HbStyleOption
+{
+public:
+ HbStyleOptionProgressDialog();
+ HbStyleOptionProgressDialog(const HbStyleOptionProgressDialog &other);
+ ~HbStyleOptionProgressDialog();
+ HbIcon icon;
+ QString text;
+ Qt::Alignment iconAlignment; // deprecated
+ enum StyleOptionType { Type = HbSO_ProgressDialog };
+ enum StyleOptionVersion { Version = 1 };
+ QSizeF progressBarSize; // deprecated
+ bool wrap; // deprecated
+ Qt::Alignment textAlignment; // deprecated
+};
+
+#endif
--- a/src/hbcore/style/hbstyleoptionprogressslider.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionprogressslider.cpp Fri May 14 16:09:54 2010 +0300
@@ -23,7 +23,7 @@
**
****************************************************************************/
-#include "hbstyleoptionprogressslider.h"
+#include "hbstyleoptionprogressslider_p.h"
/*!
\class HbStyleOptionProgressSlider
@@ -35,6 +35,7 @@
type = Type;
version = Version;
pressedState = false;
+ disableState = false;
}
HbStyleOptionProgressSlider::HbStyleOptionProgressSlider(const HbStyleOptionProgressSlider &other) :
--- a/src/hbcore/style/hbstyleoptionprogressslider.h Mon May 03 12:48:33 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 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 HBSTYLEOPTIONPROGRESSSLIDER_H
-#define HBSTYLEOPTIONPROGRESSSLIDER_H
-
-#include <hbglobal.h>
-#include <hbstyleoptionprogressbar.h>
-
-class HB_CORE_EXPORT HbStyleOptionProgressSlider : public HbStyleOptionProgressBar
-{
-public:
- HbStyleOptionProgressSlider();
- HbStyleOptionProgressSlider(const HbStyleOptionProgressSlider &other);
- ~HbStyleOptionProgressSlider();
-
-public:
- enum StyleOptionType { Type = HbSO_ProgressSlider };
- enum StyleOptionVersion { Version = 1 };
-
- int progressSliderValue;
- bool pressedState;
-};
-
-#endif // HBSTYLEOPTIONPROGRESSSLIDER_H
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/style/hbstyleoptionprogressslider_p.h Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,49 @@
+/****************************************************************************
+**
+** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (developer.feedback@nokia.com)
+**
+** This file is part of the HbCore module of the UI Extensions for Mobile.
+**
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at developer.feedback@nokia.com.
+**
+****************************************************************************/
+
+#ifndef HBSTYLEOPTIONPROGRESSSLIDER_H
+#define HBSTYLEOPTIONPROGRESSSLIDER_H
+
+#include <hbglobal.h>
+#include <hbstyleoptionprogressbar_p.h>
+
+class HB_CORE_PRIVATE_EXPORT HbStyleOptionProgressSlider : public HbStyleOptionProgressBar
+{
+public:
+ HbStyleOptionProgressSlider();
+ HbStyleOptionProgressSlider(const HbStyleOptionProgressSlider &other);
+ ~HbStyleOptionProgressSlider();
+
+public:
+ enum StyleOptionType { Type = HbSO_ProgressSlider };
+ enum StyleOptionVersion { Version = 1 };
+
+ int progressSliderValue;
+ bool pressedState;
+ bool disableState;
+};
+
+#endif // HBSTYLEOPTIONPROGRESSSLIDER_H
+
--- a/src/hbcore/style/hbstyleoptionprogresssliderhandle_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionprogresssliderhandle_p.h Fri May 14 16:09:54 2010 +0300
@@ -28,9 +28,9 @@
#include <hbglobal.h>
#include <hbicon.h>
-#include <hbstyleoption.h>
+#include <hbstyleoption_p.h>
-class HB_CORE_EXPORT HbStyleOptionProgressSliderHandle : public HbStyleOption
+class HB_CORE_PRIVATE_EXPORT HbStyleOptionProgressSliderHandle : public HbStyleOption
{
public:
HbStyleOptionProgressSliderHandle();
--- a/src/hbcore/style/hbstyleoptionpushbutton.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionpushbutton.cpp Fri May 14 16:09:54 2010 +0300
@@ -23,7 +23,7 @@
**
****************************************************************************/
-#include "hbstyleoptionpushbutton.h"
+#include "hbstyleoptionpushbutton_p.h"
#include "hbicon.h"
/*!
--- a/src/hbcore/style/hbstyleoptionpushbutton.h Mon May 03 12:48:33 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 HBSTYLEOPTIONPUSHBUTTON_H
-#define HBSTYLEOPTIONPUSHBUTTON_H
-
-#include <hbstyleoption.h>
-#include <hbicon.h>
-#include <hbframedrawer.h>
-
-// Deprecated
-class HB_CORE_EXPORT HbStyleOptionPushButton : public HbStyleOption
-{
-public:
- HbStyleOptionPushButton();
- HbStyleOptionPushButton(const HbStyleOptionPushButton &other);
- ~HbStyleOptionPushButton();
-
- enum StyleOptionType { Type = HbSO_PushButton };
- enum StyleOptionVersion { Version = 1 };
-
- HbIcon background;
- HbIcon icon;
- QString text;
- QString additionalText;
- HbFrameDrawer *backgroundFrameDrawer;
- bool isCheckable;
- Qt::Alignment textAlignment;
- Qt::Alignment additionalTextAlignment;
- bool hasTextAlignment;
- bool hasAdditionalTextAlignment;
-};
-
-#endif // HBSTYLEOPTIONPUSHBUTTON_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/style/hbstyleoptionpushbutton_p.h Fri May 14 16:09:54 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 HBSTYLEOPTIONPUSHBUTTON_H
+#define HBSTYLEOPTIONPUSHBUTTON_H
+
+#include <hbstyleoption_p.h>
+#include <hbicon.h>
+#include <hbframedrawer.h>
+
+// Deprecated
+class HB_CORE_PRIVATE_EXPORT HbStyleOptionPushButton : public HbStyleOption
+{
+public:
+ HbStyleOptionPushButton();
+ HbStyleOptionPushButton(const HbStyleOptionPushButton &other);
+ ~HbStyleOptionPushButton();
+
+ enum StyleOptionType { Type = HbSO_PushButton };
+ enum StyleOptionVersion { Version = 1 };
+
+ HbIcon background;
+ HbIcon icon;
+ QString text;
+ QString additionalText;
+ HbFrameDrawer *backgroundFrameDrawer;
+ bool isCheckable;
+ Qt::Alignment textAlignment;
+ Qt::Alignment additionalTextAlignment;
+ bool hasTextAlignment;
+ bool hasAdditionalTextAlignment;
+};
+
+#endif // HBSTYLEOPTIONPUSHBUTTON_H
--- a/src/hbcore/style/hbstyleoptionratingslider.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionratingslider.cpp Fri May 14 16:09:54 2010 +0300
@@ -24,7 +24,7 @@
****************************************************************************/
-#include "hbstyleoptionratingslider.h"
+#include "hbstyleoptionratingslider_p.h"
/*!
--- a/src/hbcore/style/hbstyleoptionratingslider.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +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 HBSTYLEOPTIONRATINGSLIDER_H
-#define HBSTYLEOPTIONRATINGSLIDER_H
-
-#include <hbstyleoption.h>
-
-//Deprecated
-class HB_CORE_EXPORT HbStyleOptionRatingSlider : public HbStyleOption
-{
-public:
- HbStyleOptionRatingSlider();
- HbStyleOptionRatingSlider(const HbStyleOptionRatingSlider &other);
- ~HbStyleOptionRatingSlider();
-public:
- enum StyleOptionType { Type = HbSO_RatingSlider };
- enum StyleOptionVersion { Version = 1 };
-
- int progressValue;
- bool inverted;
- int noOfIntervals;
- int noOfStars;
- QString unRatedGraphicsName;
- QString ratedGraphicsName;
-};
-
-#endif
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/style/hbstyleoptionratingslider_p.h Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,51 @@
+/****************************************************************************
+**
+** 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 HBSTYLEOPTIONRATINGSLIDER_H
+#define HBSTYLEOPTIONRATINGSLIDER_H
+
+#include <hbstyleoption_p.h>
+
+//Deprecated
+class HB_CORE_PRIVATE_EXPORT HbStyleOptionRatingSlider : public HbStyleOption
+{
+public:
+ HbStyleOptionRatingSlider();
+ HbStyleOptionRatingSlider(const HbStyleOptionRatingSlider &other);
+ ~HbStyleOptionRatingSlider();
+public:
+ enum StyleOptionType { Type = HbSO_RatingSlider };
+ enum StyleOptionVersion { Version = 1 };
+
+ int progressValue;
+ bool inverted;
+ int noOfIntervals;
+ int noOfStars;
+ QString unRatedGraphicsName;
+ QString ratedGraphicsName;
+};
+
+#endif
+
--- a/src/hbcore/style/hbstyleoptionscrollbar.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionscrollbar.cpp Fri May 14 16:09:54 2010 +0300
@@ -23,7 +23,7 @@
**
****************************************************************************/
-#include "hbstyleoptionscrollbar.h"
+#include "hbstyleoptionscrollbar_p.h"
/*!
\class HbStyleOptionScrollBar
--- a/src/hbcore/style/hbstyleoptionscrollbar.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbCore module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#ifndef HBSTYLEOPTIONSCROLLBAR_H
-#define HBSTYLEOPTIONSCROLLBAR_H
-
-#include <hbglobal.h>
-#include <hbstyleoption.h>
-
-//Deprecated
-class HB_CORE_EXPORT HbStyleOptionScrollBar : public HbStyleOption
-{
-public:
- HbStyleOptionScrollBar();
- HbStyleOptionScrollBar(const HbStyleOptionScrollBar &other);
- ~HbStyleOptionScrollBar();
-
- enum StyleOptionType { Type = HbSO_ScrollBar };
- enum StyleOptionVersion { Version = 1 };
-
- Qt::Orientation orientation;
- bool thumbPressed;
- bool groovePressed;
- bool interactive;
-};
-
-#endif // HBSTYLEOPTIONSCROLLBAR_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/style/hbstyleoptionscrollbar_p.h Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,49 @@
+/****************************************************************************
+**
+** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (developer.feedback@nokia.com)
+**
+** This file is part of the HbCore module of the UI Extensions for Mobile.
+**
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at developer.feedback@nokia.com.
+**
+****************************************************************************/
+
+#ifndef HBSTYLEOPTIONSCROLLBAR_H
+#define HBSTYLEOPTIONSCROLLBAR_H
+
+#include <hbglobal.h>
+#include <hbstyleoption_p.h>
+
+//Deprecated
+class HB_CORE_PRIVATE_EXPORT HbStyleOptionScrollBar : public HbStyleOption
+{
+public:
+ HbStyleOptionScrollBar();
+ HbStyleOptionScrollBar(const HbStyleOptionScrollBar &other);
+ ~HbStyleOptionScrollBar();
+
+ enum StyleOptionType { Type = HbSO_ScrollBar };
+ enum StyleOptionVersion { Version = 1 };
+
+ Qt::Orientation orientation;
+ bool thumbPressed;
+ bool groovePressed;
+ bool interactive;
+};
+
+#endif // HBSTYLEOPTIONSCROLLBAR_H
--- a/src/hbcore/style/hbstyleoptionsignalindicator_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionsignalindicator_p.h Fri May 14 16:09:54 2010 +0300
@@ -26,10 +26,10 @@
#ifndef HBSTYLEOPTIONSIGNALINDICATOR_H
#define HBSTYLEOPTIONSIGNALINDICATOR_H
-#include <hbstyleoption.h>
+#include <hbstyleoption_p.h>
// Deprecated
-class HB_CORE_EXPORT HbStyleOptionSignalIndicator : public HbStyleOption
+class HB_CORE_PRIVATE_EXPORT HbStyleOptionSignalIndicator : public HbStyleOption
{
public:
HbStyleOptionSignalIndicator();
--- a/src/hbcore/style/hbstyleoptionslider.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionslider.cpp Fri May 14 16:09:54 2010 +0300
@@ -23,7 +23,7 @@
**
****************************************************************************/
-#include "hbstyleoptionslider.h"
+#include "hbstyleoptionslider_p.h"
/*!
\class HbStyleOptionSlider
--- a/src/hbcore/style/hbstyleoptionslider.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +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 HBSTYLEOPTIONSLIDER_H
-#define HBSTYLEOPTIONSLIDER_H
-
-#include <hbglobal.h>
-#include <hbnamespace.h>
-#include <hbstyleoption.h>
-#include <hbicon.h>
-
-// Deprecated
-class HB_CORE_EXPORT HbStyleOptionSlider : public HbStyleOption
-{
-public:
- HbStyleOptionSlider();
- HbStyleOptionSlider(const HbStyleOptionSlider &other);
- ~HbStyleOptionSlider();
-
- enum StyleOptionType { Type = HbSO_Slider };
- enum StyleOptionVersion { Version = 1 };
- enum SliderType { CustomType,VolumeType,ZoomType};
-
- int maximum;
- int minimum;
- Qt::Orientation orientation;
- int pageStep;
- int singleStep;
- int sliderPosition;
- int sliderValue;
- int tickInterval;
- Hb::SliderTickPositions tickPosition;
- bool upsideDown;
- int minorTickInterval;
- QStyle::SubControls activeSubControls;
- QStyle::SubControls subControls;
- bool groovePressed;
- QString thumbPath;
- int layoutOption;
- HbIcon sliderElementIcon;
- QString text;
- SliderType sliderType;
- QRectF handleRect;
- qreal span;
-};
-
-#endif // HBSTYLEOPTIONSLIDER_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/style/hbstyleoptionslider_p.h Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** 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 HBSTYLEOPTIONSLIDER_H
+#define HBSTYLEOPTIONSLIDER_H
+
+#include <hbglobal.h>
+#include <hbnamespace.h>
+#include <hbstyleoption_p.h>
+#include <hbicon.h>
+
+// Deprecated
+class HB_CORE_PRIVATE_EXPORT HbStyleOptionSlider : public HbStyleOption
+{
+public:
+ HbStyleOptionSlider();
+ HbStyleOptionSlider(const HbStyleOptionSlider &other);
+ ~HbStyleOptionSlider();
+
+ enum StyleOptionType { Type = HbSO_Slider };
+ enum StyleOptionVersion { Version = 1 };
+ enum SliderType { CustomType,VolumeType,ZoomType};
+
+ int maximum;
+ int minimum;
+ Qt::Orientation orientation;
+ int pageStep;
+ int singleStep;
+ int sliderPosition;
+ int sliderValue;
+ int tickInterval;
+ Hb::SliderTickPositions tickPosition;
+ bool upsideDown;
+ int minorTickInterval;
+ QStyle::SubControls activeSubControls;
+ QStyle::SubControls subControls;
+ bool groovePressed;
+ QString thumbPath;
+ int layoutOption;
+ HbIcon sliderElementIcon;
+ QString text;
+ SliderType sliderType;
+ QRectF handleRect;
+ qreal span;
+};
+
+#endif // HBSTYLEOPTIONSLIDER_H
--- a/src/hbcore/style/hbstyleoptionsliderelement_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionsliderelement_p.h Fri May 14 16:09:54 2010 +0300
@@ -39,7 +39,7 @@
#include <hbglobal.h>
#include <hbicon.h>
-#include <hbstyleoption.h>
+#include <hbstyleoption_p.h>
class HB_AUTOTEST_EXPORT HbStyleOptionSliderElement : public HbStyleOption
{
--- a/src/hbcore/style/hbstyleoptionsoftkey.cpp Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +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 "hbstyleoptionsoftkey.h"
-
-/*!
- \class HbStyleOptionSoftKey
- \brief HbStyleOptionSoftKey has the style component for softkey
-*/
-
-
-/*!
-
- \deprecated HbStyleOptionSoftKey::HbStyleOptionSoftKey()
- is deprecated. Styleoptions will not be public.
-
-*/
-HbStyleOptionSoftKey::HbStyleOptionSoftKey(): HbStyleOptionDecorator()
-{
- type = Type;
- version = Version;
-}
-
-
-/*!
-
- \deprecated HbStyleOptionSoftKey::HbStyleOptionSoftKey(const HbStyleOptionSoftKey&)
- is deprecated. Styleoptions will not be public.
-
-*/
-HbStyleOptionSoftKey::HbStyleOptionSoftKey(const HbStyleOptionSoftKey &other) :
- HbStyleOptionDecorator(other)
-{
- type = Type;
- version = Version;
-}
-
-HbStyleOptionSoftKey::~HbStyleOptionSoftKey()
-{
-}
-
--- a/src/hbcore/style/hbstyleoptionsoftkey.h Mon May 03 12:48:33 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 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 HBSTYLEOPTIONSOFTKEY_H
-#define HBSTYLEOPTIONSOFTKEY_H
-
-#include <hbstyleoptiondecorator.h>
-#include <hbnamespace.h>
-#include <QIcon>
-
-// Deprecated
-class HB_CORE_EXPORT HbStyleOptionSoftKey : public HbStyleOptionDecorator
-{
-public:
- HbStyleOptionSoftKey();
- HbStyleOptionSoftKey(const HbStyleOptionSoftKey &other);
- ~HbStyleOptionSoftKey();
-
- enum StyleOptionType { Type = HbSO_Softkey };
- enum StyleOptionVersion { Version = 1 };
-
- int mKey;
-};
-
-#endif // HBSTYLEOPTIONSOFTKEY_H
-
--- a/src/hbcore/style/hbstyleoptionstatusbar_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/style/hbstyleoptionstatusbar_p.h Fri May 14 16:09:54 2010 +0300
@@ -26,10 +26,10 @@
#ifndef HBSTYLEOPTIONSTATUSBAR_P_H
#define HBSTYLEOPTIONSTATUSBAR_P_H
-#include <hbstyleoption.h>
+#include <hbstyleoption_p.h>
// Deprecated
-class HB_CORE_EXPORT HbStyleOptionStatusBar : public HbStyleOption
+class HB_CORE_PRIVATE_EXPORT HbStyleOptionStatusBar : public HbStyleOption
{
public:
HbStyleOptionStatusBar();
--- a/src/hbcore/style/hbstyleoptiontitlepane.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/style/hbstyleoptiontitlepane.cpp Fri May 14 16:09:54 2010 +0300
@@ -23,7 +23,7 @@
**
****************************************************************************/
-#include "hbstyleoptiontitlepane.h"
+#include "hbstyleoptiontitlepane_p.h"
/*!
\class HbStyleOptionTitlePane
--- a/src/hbcore/style/hbstyleoptiontitlepane.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbCore module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#ifndef HBSTYLEOPTIONTITLEPANE_H
-#define HBSTYLEOPTIONTITLEPANE_H
-
-#include <hbstyleoptiondecorator.h>
-#include <QIcon>
-
-// Deprecated
-class HB_CORE_EXPORT HbStyleOptionTitlePane : public HbStyleOption
-{
-public:
- HbStyleOptionTitlePane();
- HbStyleOptionTitlePane(const HbStyleOptionTitlePane &other);
- ~HbStyleOptionTitlePane();
-
- enum StyleOptionType { Type = HbSO_TitlePane };
- enum StyleOptionVersion { Version = 1 };
-
- QString caption;
- QIcon::Mode mode;
- bool transparent;
-};
-
-#endif // HBSTYLEOPTIONTITLEPANE_H
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/style/hbstyleoptiontitlepane_p.h Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,49 @@
+/****************************************************************************
+**
+** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (developer.feedback@nokia.com)
+**
+** This file is part of the HbCore module of the UI Extensions for Mobile.
+**
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at developer.feedback@nokia.com.
+**
+****************************************************************************/
+
+#ifndef HBSTYLEOPTIONTITLEPANE_H
+#define HBSTYLEOPTIONTITLEPANE_H
+
+#include <QIcon>
+#include <hbstyleoption_p.h>
+
+// Deprecated
+class HB_CORE_PRIVATE_EXPORT HbStyleOptionTitlePane : public HbStyleOption
+{
+public:
+ HbStyleOptionTitlePane();
+ HbStyleOptionTitlePane(const HbStyleOptionTitlePane &other);
+ ~HbStyleOptionTitlePane();
+
+ enum StyleOptionType { Type = HbSO_TitlePane };
+ enum StyleOptionVersion { Version = 1 };
+
+ QString caption;
+ QIcon::Mode mode;
+ bool transparent;
+};
+
+#endif // HBSTYLEOPTIONTITLEPANE_H
+
--- a/src/hbcore/style/hbstyleoptiontoolbarextension.cpp Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +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 "hbstyleoptiontoolbarextension.h"
-
-/*!
- \class HbStyleOptionToolBarExtension
- \brief HbStyleOptionToolBarExtension has the style component for toolbar extension primitives
-
- This class will cease to exist in near future.
-*/
-
-/*!
- Style component for toolbar extension primitives
-
- \deprecated HbStyleOptionToolBarExtension::HbStyleOptionToolBarExtension()
- is deprecated.
-
-*/
-
-
-/*!
-
- \deprecated HbStyleOptionToolBarExtension::HbStyleOptionToolBarExtension()
- is deprecated. Styleoptions will not be public.
-
-*/
-HbStyleOptionToolBarExtension::HbStyleOptionToolBarExtension() :
- HbStyleOptionPopup(),
- opacity(1.0)
-{
- qWarning("HbStyleOptionToolBarExtension::HbStyleOptionToolBarExtension() - is deprecated.");
- type = Type;
- version = Version;
-}
-
-/*!
-
- \deprecated HbStyleOptionToolBarExtension::HbStyleOptionToolBarExtension(const HbStyleOptionToolBarExtension&)
- is deprecated. Styleoptions will not be public.
-
-*/
-HbStyleOptionToolBarExtension::HbStyleOptionToolBarExtension(
- const HbStyleOptionToolBarExtension &other) :
- HbStyleOptionPopup(other),
- opacity(other.opacity)
-{
- qWarning("HbStyleOptionToolBarExtension::HbStyleOptionToolBarExtension() - is deprecated.");
- type = Type;
- version = Version;
-}
-
-HbStyleOptionToolBarExtension::~HbStyleOptionToolBarExtension()
-{
-}
--- a/src/hbcore/style/hbstyleoptiontoolbarextension.h Mon May 03 12:48:33 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 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 HBSTYLEOPTIONTOOLBAREXTENSION_H_INCLUDED
-#define HBSTYLEOPTIONTOOLBAREXTENSION_H_INCLUDED
-
-#include <hbnamespace.h>
-#include <hbstyleoption.h>
-#include <hbstyleoptionpopup.h>
-
-// Deprecated
-class HB_CORE_EXPORT HbStyleOptionToolBarExtension : public HbStyleOptionPopup
-{
-public:
- HbStyleOptionToolBarExtension();
- HbStyleOptionToolBarExtension(const HbStyleOptionToolBarExtension &other);
- ~HbStyleOptionToolBarExtension();
-
- enum StyleOptionType { Type = HbSO_ToolBarExtension };
- enum StyleOptionVersion { Version = 1 };
-
- qreal opacity;
-};
-
-#endif
-
--- a/src/hbcore/style/hbstyleoptiontoolbutton.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/style/hbstyleoptiontoolbutton.cpp Fri May 14 16:09:54 2010 +0300
@@ -23,7 +23,7 @@
**
****************************************************************************/
-#include <hbstyleoptiontoolbutton.h>
+#include <hbstyleoptiontoolbutton_p.h>
/*!
\class HbStyleOptionToolButton
--- a/src/hbcore/style/hbstyleoptiontoolbutton.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +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 HBSTYLEOPTIONTOOLBUTTON_H
-#define HBSTYLEOPTIONTOOLBUTTON_H
-
-#include <hbstyleoption.h>
-#include <hbicon.h>
-
-// Deprecated
-class HB_CORE_EXPORT HbStyleOptionToolButton : public HbStyleOption
-{
-public:
- HbStyleOptionToolButton();
- HbStyleOptionToolButton(const HbStyleOptionToolButton &other);
- ~HbStyleOptionToolButton();
-
- enum StyleOptionType { Type = HbSO_ToolButton };
- enum StyleOptionVersion { Version = 1 };
-
- enum ToolBarPosition
- {
- TB_None,
- TB_OnlyOne,
- TB_Beginning,
- TB_Middle,
- TB_End
- };
-
- QString text;
- HbIcon icon;
- HbIcon customBackground;
- bool backgroundVisible;
- HbStyleOptionToolButton::ToolBarPosition toolBarPosition;
- Qt::Orientation orientation;
- bool isCheckable;
- bool useSecondaryGraphics;
- bool useTransparentGraphics;
- bool isToolBarExtension;
-};
-
-#endif // HBSTYLEOPTIONTOOLBUTTON_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/style/hbstyleoptiontoolbutton_p.h Fri May 14 16:09:54 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 HBSTYLEOPTIONTOOLBUTTON_H
+#define HBSTYLEOPTIONTOOLBUTTON_H
+
+#include <hbstyleoption_p.h>
+#include <hbicon.h>
+
+// Deprecated
+class HB_CORE_PRIVATE_EXPORT HbStyleOptionToolButton : public HbStyleOption
+{
+public:
+ HbStyleOptionToolButton();
+ HbStyleOptionToolButton(const HbStyleOptionToolButton &other);
+ ~HbStyleOptionToolButton();
+
+ enum StyleOptionType { Type = HbSO_ToolButton };
+ enum StyleOptionVersion { Version = 1 };
+
+ enum ToolBarPosition
+ {
+ TB_None,
+ TB_OnlyOne,
+ TB_Beginning,
+ TB_Middle,
+ TB_End
+ };
+
+ QString text;
+ HbIcon icon;
+ HbIcon customBackground;
+ bool backgroundVisible;
+ HbStyleOptionToolButton::ToolBarPosition toolBarPosition;
+ Qt::Orientation orientation;
+ bool isCheckable;
+ bool useSecondaryGraphics;
+ bool useTransparentGraphics;
+ bool isToolBarExtension;
+};
+
+#endif // HBSTYLEOPTIONTOOLBUTTON_H
--- a/src/hbcore/style/hbstyleoptiontooltip.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/style/hbstyleoptiontooltip.cpp Fri May 14 16:09:54 2010 +0300
@@ -23,7 +23,7 @@
**
****************************************************************************/
-#include "hbstyleoptiontooltip.h"
+#include "hbstyleoptiontooltip_p.h"
/*!
\class HbStyleOptionToolTip
--- a/src/hbcore/style/hbstyleoptiontooltip.h Mon May 03 12:48:33 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 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 HBSTYLEOPTIONTOOLTIP_H_INCLUDED
-#define HBSTYLEOPTIONTOOLTIP_H_INCLUDED
-
-#include <hbstyleoption.h>
-#include <hbstyleoptionpopup.h>
-
-// Deprecated
-class HB_CORE_EXPORT HbStyleOptionToolTip : public HbStyleOptionPopup
-{
-public:
- HbStyleOptionToolTip();
- HbStyleOptionToolTip(const HbStyleOptionToolTip &other);
- ~HbStyleOptionToolTip();
-
- enum StyleOptionType { Type = HbSO_ToolTip };
- enum StyleOptionVersion { Version = 1 };
-};
-
-
-#endif
-
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/style/hbstyleoptiontooltip_p.h Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,46 @@
+/****************************************************************************
+**
+** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (developer.feedback@nokia.com)
+**
+** This file is part of the HbCore module of the UI Extensions for Mobile.
+**
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at developer.feedback@nokia.com.
+**
+****************************************************************************/
+
+#ifndef HBSTYLEOPTIONTOOLTIP_H_INCLUDED
+#define HBSTYLEOPTIONTOOLTIP_H_INCLUDED
+
+#include <hbstyleoption_p.h>
+#include <hbstyleoptionpopup_p.h>
+
+// Deprecated
+class HB_CORE_PRIVATE_EXPORT HbStyleOptionToolTip : public HbStyleOptionPopup
+{
+public:
+ HbStyleOptionToolTip();
+ HbStyleOptionToolTip(const HbStyleOptionToolTip &other);
+ ~HbStyleOptionToolTip();
+
+ enum StyleOptionType { Type = HbSO_ToolTip };
+ enum StyleOptionVersion { Version = 1 };
+};
+
+
+#endif
+
--- a/src/hbcore/style/hbstyleoptiontreeviewitem.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/style/hbstyleoptiontreeviewitem.cpp Fri May 14 16:09:54 2010 +0300
@@ -23,7 +23,7 @@
**
****************************************************************************/
-#include "hbstyleoptiontreeviewitem.h"
+#include "hbstyleoptiontreeviewitem_p.h"
/*!
\class HbStyleOptionTreeViewItem
--- a/src/hbcore/style/hbstyleoptiontreeviewitem.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbCore module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#ifndef HBSTYLEOPTIONTREEVIEWITEM_H
-#define HBSTYLEOPTIONTREEVIEWITEM_H
-
-#include <hbstyleoptionlistviewitem.h>
-#include <hbglobal.h>
-#include <QVariant>
-
-// Deprecated
-class HB_CORE_EXPORT HbStyleOptionTreeViewItem : public HbStyleOptionListViewItem
-{
-public:
- HbStyleOptionTreeViewItem();
- HbStyleOptionTreeViewItem(const HbStyleOptionTreeViewItem &other);
- ~HbStyleOptionTreeViewItem();
-
- enum StyleOptionType { Type = HbSO_TreeViewItem };
- enum StyleOptionVersion { Version = 1 };
-
- bool expanded;
-};
-
-#endif // HBSTYLEOPTIONTREEVIEWITEM_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/style/hbstyleoptiontreeviewitem_p.h Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,47 @@
+/****************************************************************************
+**
+** 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 HBSTYLEOPTIONTREEVIEWITEM_H
+#define HBSTYLEOPTIONTREEVIEWITEM_H
+
+#include <hbstyleoptionlistviewitem_p.h>
+#include <hbglobal.h>
+#include <QVariant>
+
+// Deprecated
+class HB_CORE_PRIVATE_EXPORT HbStyleOptionTreeViewItem : public HbStyleOptionListViewItem
+{
+public:
+ HbStyleOptionTreeViewItem();
+ HbStyleOptionTreeViewItem(const HbStyleOptionTreeViewItem &other);
+ ~HbStyleOptionTreeViewItem();
+
+ enum StyleOptionType { Type = HbSO_TreeViewItem };
+ enum StyleOptionVersion { Version = 1 };
+
+ bool expanded;
+};
+
+#endif // HBSTYLEOPTIONTREEVIEWITEM_H
--- a/src/hbcore/style/style.pri Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/style/style.pri Fri May 14 16:09:54 2010 +0300
@@ -28,44 +28,40 @@
DEPENDPATH += $$PWD
PUBLIC_HEADERS += $$PWD/hbstyle.h
-PUBLIC_HEADERS += $$PWD/hbstyleinterface.h
-PUBLIC_HEADERS += $$PWD/hbstyleoption.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptionabstractviewitem.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptioncheckbox.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptioncolorgridviewitem.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptiondataquery.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptiondecorator.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptiongridviewitem.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptionindexfeedback.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptionindicatorgroup.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptionindicatormenu.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptionlabel.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptionlistviewitem.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptionmenuitem.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptionnotificationdialog.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptionmessagebox.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptionpopup.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptionprogressbar.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptionprogressslider.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptionprogressdialog.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptionpushbutton.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptionscrollbar.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptionslider.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptionsoftkey.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptionnavigationbutton.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptionindicatorbutton.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptiontitlepane.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptiontoolbarextension.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptiontoolbutton.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptiontooltip.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptiontreeviewitem.h
-PUBLIC_HEADERS += $$PWD/hbstyleparameters.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptiondataform.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptiondataformviewitem.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptiongroupbox.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptionratingslider.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptioncombobox.h
-PUBLIC_HEADERS += $$PWD/hbstyleoptioninputdialog.h
+PUBLIC_HEADERS += $$PWD/hbstyleparameters.h
+
+PRIVATE_HEADERS += $$PWD/hbstyleoption_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptionabstractviewitem_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptioncheckbox_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptioncolorgridviewitem_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptiongridviewitem_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptionindexfeedback_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptionindicatorgroup_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptionlabel_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptionlistviewitem_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptionmenuitem_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptionnotificationdialog_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptionmessagebox_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptionpopup_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptionprogressbar_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptionprogressslider_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptionprogressdialog_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptionpushbutton_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptionscrollbar_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptionslider_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptionnavigationbutton_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptionindicatorbutton_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptiontitlepane_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptiontoolbutton_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptiontooltip_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptiontreeviewitem_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptiondataform_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptiondataformviewitem_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptiongroupbox_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptionratingslider_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptioncombobox_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleoptioninputdialog_p.h
+PRIVATE_HEADERS += $$PWD/hbstyleinterface_p.h
PRIVATE_HEADERS += $$PWD/hbstyle_p.h
PRIVATE_HEADERS += $$PWD/hbstyleoptionsliderelement_p.h
PRIVATE_HEADERS += $$PWD/hbstyleoptionprogresssliderhandle_p.h
@@ -79,12 +75,9 @@
SOURCES += $$PWD/hbstyleoptionabstractviewitem.cpp
SOURCES += $$PWD/hbstyleoptioncheckbox.cpp
SOURCES += $$PWD/hbstyleoptioncolorgridviewitem.cpp
-SOURCES += $$PWD/hbstyleoptiondataquery.cpp
-SOURCES += $$PWD/hbstyleoptiondecorator.cpp
SOURCES += $$PWD/hbstyleoptiongridviewitem.cpp
SOURCES += $$PWD/hbstyleoptionindexfeedback.cpp
SOURCES += $$PWD/hbstyleoptionindicatorgroup.cpp
-SOURCES += $$PWD/hbstyleoptionindicatormenu.cpp
SOURCES += $$PWD/hbstyleoptionlabel.cpp
SOURCES += $$PWD/hbstyleoptionlistviewitem.cpp
SOURCES += $$PWD/hbstyleoptionmenuitem.cpp
@@ -99,14 +92,12 @@
SOURCES += $$PWD/hbstyleoptionscrollbar.cpp
SOURCES += $$PWD/hbstyleoptionslider.cpp
SOURCES += $$PWD/hbstyleoptionsliderelement.cpp
-SOURCES += $$PWD/hbstyleoptionsoftkey.cpp
SOURCES += $$PWD/hbstyleoptionstatusbar.cpp
SOURCES += $$PWD/hbstyleoptionnavigationbutton.cpp
SOURCES += $$PWD/hbstyleoptionindicatorbutton.cpp
SOURCES += $$PWD/hbstyleoptionsignalindicator.cpp
SOURCES += $$PWD/hbstyleoptionbatteryindicator.cpp
SOURCES += $$PWD/hbstyleoptiontitlepane.cpp
-SOURCES += $$PWD/hbstyleoptiontoolbarextension.cpp
SOURCES += $$PWD/hbstyleoptiontoolbutton.cpp
SOURCES += $$PWD/hbstyleoptiontooltip.cpp
SOURCES += $$PWD/hbstyleoptiontreeviewitem.cpp
@@ -121,3 +112,4 @@
SOURCES += $$PWD/hbstyleoptioncombobox.cpp
SOURCES += $$PWD/hbstyleoptioninputdialog.cpp
+
--- a/src/hbcore/svgext/hbnvgdecoder/hbnvg.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/svgext/hbnvgdecoder/hbnvg.cpp Fri May 14 16:09:54 2010 +0300
@@ -27,7 +27,6 @@
#include "hbnvg_p.h"
#include "hbnvgutil_p.h"
#include "hbnvgcsicon_p.h"
-#include "hbnvgtlvicon_p.h"
#include "hbnvgiconfactory_p.h"
#include "hbnvgicondata_p.h"
#include "hbnvgexception_p.h"
@@ -45,7 +44,7 @@
void HbNvgIconList::addNvgIcon(HbNvgIconFactory::HbNvgIconType type, HbNvgIcon * nvgIcon)
{
- if (type <= HbNvgIconFactory::NvgTlv) {
+ if (type <= HbNvgIconFactory::NvgCs) {
if (icons[type]) {
delete icons[type];
}
@@ -55,7 +54,7 @@
HbNvgIcon * HbNvgIconList::getIcon(HbNvgIconFactory::HbNvgIconType type)
{
- if (type <= HbNvgIconFactory::NvgTlv) {
+ if (type <= HbNvgIconFactory::NvgCs) {
return icons[type];
}
return 0;
@@ -63,8 +62,7 @@
HbNvgIconList::~HbNvgIconList()
{
- delete icons[HbNvgIconFactory::NvgCs];
- delete icons[HbNvgIconFactory::NvgTlv];
+ delete icons[HbNvgIconFactory::NvgCs];
}
HbNvgEnginePrivate::HbNvgEnginePrivate():
--- a/src/hbcore/svgext/hbnvgdecoder/hbnvg_p_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/svgext/hbnvgdecoder/hbnvg_p_p.h Fri May 14 16:09:54 2010 +0300
@@ -39,8 +39,7 @@
public:
HbNvgIconList()
{
- icons[HbNvgIconFactory::NvgCs] = 0;
- icons[HbNvgIconFactory::NvgTlv] = 0;
+ icons[HbNvgIconFactory::NvgCs] = 0;
}
void addNvgIcon(HbNvgIconFactory::HbNvgIconType type, HbNvgIcon * nvgIcon);
@@ -50,7 +49,7 @@
~HbNvgIconList();
private:
- HbNvgIcon * icons[HbNvgIconFactory::NvgTlv + 1];
+ HbNvgIcon * icons[HbNvgIconFactory::NvgCs + 1];
};
class HbNvgEnginePrivate
@@ -88,9 +87,7 @@
void clearBackground();
private :
- void doDrawNvg(const QByteArray &buffer, const QSize &size);
-
- qint32 drawTlv(const QByteArray &buffer, const QSize &targetSize);
+ void doDrawNvg(const QByteArray &buffer, const QSize &size);
qint32 drawCsIcon(const QByteArray &buffer, const QSize &targetSize);
--- a/src/hbcore/svgext/hbnvgdecoder/hbnvgcsicon.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/svgext/hbnvgdecoder/hbnvgcsicon.cpp Fri May 14 16:09:54 2010 +0300
@@ -27,7 +27,6 @@
#include "hbnvgicondata_p.h"
#include "hbnvgfittoviewbox_p.h"
#include "hbnvgutil_p.h"
-#include "hbopenvghandlestore_p.h"
#include "hbnvgexception_p.h"
#include <QScopedPointer>
@@ -129,7 +128,6 @@
mPreserveAspectSetting(HbNvgEngine::NvgPreserveAspectRatioXmidYmid),
mSmilFitSetting(HbNvgEngine::NvgMeet),
mNvgIconData(0),
- mOpenVgHandles(0),
mLastFillPaintType(0),
mLastStrokePaintType(0),
mLastFillPaintColor(0),
@@ -144,7 +142,6 @@
{
mNvgIconData = new HbNvgIconData(buffer.size());
Q_CHECK_PTR(mNvgIconData);
- mOpenVgHandles = new HbOpenVgHandleStore();
Q_CHECK_PTR(mNvgIconData);
}
@@ -164,7 +161,6 @@
vgSetPaint(VG_INVALID_HANDLE, VG_STROKE_PATH);
delete mNvgIconData;
- delete mOpenVgHandles;
}
@@ -1179,7 +1175,6 @@
void HbNvgCsIcon::addDrawPathCommand(VGPath path, VGbitfield paintMode)
{
- mOpenVgHandles->addPath(path);
mNvgIconData->encodeUint32(NvgPath);
mNvgIconData->encodeUint32(path);
mNvgIconData->encodeUint32(paintMode);
@@ -1187,14 +1182,12 @@
void HbNvgCsIcon::addLinearGradientCommand(VGint count, VGfloat* gradientData, VGfloat* gradientMatrix, VGPaint paint)
{
- mOpenVgHandles->addPaint(paint);
mNvgIconData->encodeUint32(NvgPaint);
addLinearGradientCommandData(paint, count, gradientData, gradientMatrix);
}
void HbNvgCsIcon::addRadialGradientCommand(VGint count, VGfloat* gradientData, VGfloat* gradientMatrix, VGPaint paint)
{
- mOpenVgHandles->addPaint(paint);
mNvgIconData->encodeUint32(NvgPaint);
addRadialGradientCommandData(paint, count, gradientData, gradientMatrix);
}
@@ -1240,14 +1233,12 @@
void HbNvgCsIcon::addStrokeLinearGradientCommand(VGint count, VGfloat* gradientData, VGfloat* gradientMatrix, VGPaint paint)
{
- mOpenVgHandles->addPaint(paint);
mNvgIconData->encodeUint32(NvgStrokePaint);
addLinearGradientCommandData(paint, count, gradientData, gradientMatrix);
}
void HbNvgCsIcon::addStrokeRadialGradientCommand(VGint count, VGfloat* gradientData, VGfloat* gradientMatrix, VGPaint paint)
{
- mOpenVgHandles->addPaint(paint);
mNvgIconData->encodeUint32(NvgStrokePaint);
addRadialGradientCommandData(paint, count, gradientData, gradientMatrix);
}
--- a/src/hbcore/svgext/hbnvgdecoder/hbnvgcsicon_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/svgext/hbnvgdecoder/hbnvgcsicon_p.h Fri May 14 16:09:54 2010 +0300
@@ -202,10 +202,10 @@
VGboolean mDoFill;
VGboolean mDoStroke;
VGPaint mGradPaintFill;
- qint32 mFillAlpha;
- qint32 mStrokeAlpha;
+ qint32 mFillAlpha;
+ qint32 mStrokeAlpha;
VGPaint mGradPaintStroke;
- qint32 mCreatingNvgIcon;
+ qint32 mCreatingNvgIcon;
float mViewBoxX;
float mViewBoxY;
float mViewBoxW;
@@ -219,7 +219,6 @@
VGint mMatrixMode;
VGfloat mImageMatrix[9];
VGfloat mPathMatrix[9];
- HbOpenVgHandleStore* mOpenVgHandles;
quint32 mLastFillPaintType;
quint32 mLastStrokePaintType;
quint32 mLastFillPaintColor;
--- a/src/hbcore/svgext/hbnvgdecoder/hbnvgdecoder.pri Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/svgext/hbnvgdecoder/hbnvgdecoder.pri Fri May 14 16:09:54 2010 +0300
@@ -30,15 +30,11 @@
PRIVATE_HEADERS += $$PWD/hbnvg_p.h
PRIVATE_HEADERS += $$PWD/hbnvgicon_p.h
-PRIVATE_HEADERS += $$PWD/hbtlvcommon_p.h
PRIVATE_HEADERS += $$PWD/hbnvgfittoviewbox_p.h
PRIVATE_HEADERS += $$PWD/hbnvgimagebinder_p.h
-PRIVATE_HEADERS += $$PWD/hbtlviconcreator_p.h
-PRIVATE_HEADERS += $$PWD/hbtlvrenderer_p.h
-PRIVATE_HEADERS += $$PWD/hbtlviconrenderer_p.h
-PRIVATE_HEADERS += $$PWD/hbnvgtlvicon_p.h
+
PRIVATE_HEADERS += $$PWD/hbnvgicondata_p.h
-PRIVATE_HEADERS += $$PWD/hbopenvghandlestore_p.h
+
PRIVATE_HEADERS += $$PWD/hbnvgcsicon_p.h
PRIVATE_HEADERS += $$PWD/hbnvgiconfactory_p.h
PRIVATE_HEADERS += $$PWD/hbnvg_p_p.h
@@ -46,14 +42,8 @@
PRIVATE_HEADERS += $$PWD/hbnvgenginepool_p.h
SOURCES += $$PWD/hbnvgfittoviewbox.cpp
-#SOURCES += $$PWD/hbnvgfittoviewbox_p.inl
-SOURCES += $$PWD/hbnvgtlvicon.cpp
-SOURCES += $$PWD/hbtlviconcreator.cpp
-SOURCES += $$PWD/hbtlvrenderer.cpp
-SOURCES += $$PWD/hbtlviconrenderer.cpp
SOURCES += $$PWD/hbnvgicondata.cpp
-#SOURCES += $$PWD/hbnvgicondata_p.inl
-SOURCES += $$PWD/hbopenvghandlestore.cpp
+
SOURCES += $$PWD/hbnvgcsicon.cpp
SOURCES += $$PWD/hbnvgiconfactory.cpp
SOURCES += $$PWD/hbnvg.cpp
--- a/src/hbcore/svgext/hbnvgdecoder/hbnvgiconfactory.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/svgext/hbnvgdecoder/hbnvgiconfactory.cpp Fri May 14 16:09:54 2010 +0300
@@ -25,7 +25,6 @@
#include "hbnvgiconfactory_p.h"
#include "hbnvgcsicon_p.h"
-#include "hbnvgtlvicon_p.h"
#include "hbnvgexception_p.h"
HbNvgIcon * HbNvgIconFactory::create(HbNvgIconFactory::HbNvgIconType type)
@@ -34,8 +33,6 @@
if (type == NvgCs) {
icon = new HbNvgCsIcon();
- } else if (type == NvgTlv) {
- icon = new HbNvgTlvIcon();
} else {
throw HbNvgException(HbNvgEngine::NvgErrNotSupported);
}
--- a/src/hbcore/svgext/hbnvgdecoder/hbnvgiconfactory_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/svgext/hbnvgdecoder/hbnvgiconfactory_p.h Fri May 14 16:09:54 2010 +0300
@@ -32,8 +32,7 @@
{
public:
enum HbNvgIconType {
- NvgCs,
- NvgTlv
+ NvgCs
};
static HbNvgIcon * create(HbNvgIconType type);
--- a/src/hbcore/svgext/hbnvgdecoder/hbnvgtlvicon.cpp Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,204 +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 "hbnvgtlvicon_p.h"
-#include "hbnvgicondata_p.h"
-#include "hbnvgutil_p.h"
-#include "hbtlvrenderer_p.h"
-#include "hbtlviconcreator_p.h"
-#include "hbtlviconrenderer_p.h"
-#include "hbopenvghandlestore_p.h"
-
-HbNvgTlvIcon::HbNvgTlvIcon()
- : mNvgIconData(0),
- mVgImageBinder(0),
- mMirrored(false)
-{
- mNvgIconData = new HbNvgIconData();
- Q_CHECK_PTR(mNvgIconData);
- mOpenVgHandles = new HbOpenVgHandleStore();
- Q_CHECK_PTR(mNvgIconData);
-}
-
-HbNvgTlvIcon::~HbNvgTlvIcon()
-{
- delete mNvgIconData;
- delete mOpenVgHandles;
-}
-
-/*!
- set the aspectRatio \a preserveAspectSetting and \a smilFitSetting
- to be applied on the nvgicon.
-*/
-
-void HbNvgTlvIcon::setPreserveAspectRatio(HbNvgEngine::HbNvgAlignType /*preserveAspectSetting*/,
- HbNvgEngine::HbNvgMeetType /*smilFitSetting*/)
-{
-}
-
-/*!
- Set the \a angle for rotation of the nvgicon at the
- coordiantes \a x and \a y.
-*/
-
-void HbNvgTlvIcon::rotate(float /*angle*/, float /*x*/, float /*y*/)
-{
-}
-
-void HbNvgTlvIcon::enableMirroring(bool mirroringMode)
-{
- mMirrored = mirroringMode;
-}
-
-void HbNvgTlvIcon::directDraw(const QByteArray &buffer, const QSize &targetSize)
-{
- // Try to set user's matrix to path matrix
- VGfloat origMatrix[9];
- vgGetMatrix(origMatrix);
-
- vgSeti(VG_MATRIX_MODE, VG_MATRIX_PATH_USER_TO_SURFACE);
- vgLoadMatrix(origMatrix);
-
- if (mMirrored) {
- vgTranslate((VGfloat)(targetSize.width()), 0);
- vgScale(-1.0f, 1.0f);
- }
-
-
-#ifndef __MIRROR_
- vgScale(1.0f, -1.0f);
- vgTranslate(0, (VGfloat)(-targetSize.height()));
-#endif
- HbTlvRenderer *tlvRenderer = new HbTlvRenderer(buffer, targetSize.width(), targetSize.height());
- Q_CHECK_PTR(tlvRenderer);
- QScopedPointer<HbTlvRenderer> iconRenderer(tlvRenderer);
-
- iconRenderer->initialize();
-
- iconRenderer->setVgImageBinder(mVgImageBinder);
-
- iconRenderer->execute();
-}
-
-void HbNvgTlvIcon::create(const QByteArray &buffer, const QSize &targetSize)
-{
- HbTlvIconCreator *tlvIconCreator = new HbTlvIconCreator(buffer, targetSize.width(), targetSize.height(), this);
- Q_CHECK_PTR(tlvIconCreator);
- QScopedPointer<HbTlvIconCreator> iconCreater(tlvIconCreator);
-
- iconCreater->initialize();
-
- iconCreater->execute();
-}
-
-/*!
- Draw the nvgicon the nvgicon created of size \a size.
-*/
-HbNvgEngine::HbNvgErrorType HbNvgTlvIcon::draw(const QSize &size)
-{
- HbNvgEngine::HbNvgErrorType error = HbNvgEngine::NvgErrNone;
-
- updateClientMatrices();
-
- try {
- doDraw(size);
- } catch (const std::bad_alloc & e) {
- error = HbNvgEngine::NvgErrNoMemory;
- } catch (const HbNvgException & e) {
- error = (HbNvgEngine::HbNvgErrorType) e.errorID();
- }
-
- // restore everything as we may have changed matrix mode
- restoreClientMatrices();
-
- vgSeti(VG_SCISSORING, VG_FALSE);
-
- return error;
-}
-
-
-void HbNvgTlvIcon::doDraw(const QSize &size)
-{
- const char* bufPtr = mNvgIconData->buffer();
-
- HbTlvIconRenderer *tlvIconRenderer = new HbTlvIconRenderer(bufPtr, size.width(), size.height());
- Q_CHECK_PTR(tlvIconRenderer);
- QScopedPointer<HbTlvRenderer> iconRenderer(tlvIconRenderer);
-
- iconRenderer->setVgImageBinder(mVgImageBinder);
-
-#ifndef __MIRROR_
- vgScale(1.0f, -1.0f);
- vgTranslate(0, (VGfloat)(-size.height()));
-#endif
-
- iconRenderer->execute();
-}
-
-void HbNvgTlvIcon::addPathHandle(VGPath path)
-{
- if (path) {
- mOpenVgHandles->addPath(path);
- }
-}
-
-void HbNvgTlvIcon::addDrawPathCommand(VGPath path, VGPaintMode paintMode)
-{
- mOpenVgHandles->addPath(path);
- mNvgIconData->encodeUint8(TlvPath);
- mNvgIconData->encodeUint32(path);
- mNvgIconData->encodeUint32(paintMode);
-}
-
-void HbNvgTlvIcon::addCommand(const quint8 * commandBuffer, qint32 commandBufferLength)
-{
- mNvgIconData->encodeData(commandBuffer, commandBufferLength);
-}
-
-void HbNvgTlvIcon::addCommand(qint8 commandType, const quint8 * commandBuffer, qint32 commandBufferLength)
-{
- mNvgIconData->encodeUint8(commandType);
- mNvgIconData->encodeData(commandBuffer, commandBufferLength);
-}
-
-void HbNvgTlvIcon::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 HbNvgTlvIcon::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);
-}
-
--- a/src/hbcore/svgext/hbnvgdecoder/hbnvgtlvicon_p.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,100 +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_NVGTLVICON_P_H
-#define HB_NVGTLVICON_P_H
-
-#include <VG/openvg.h>
-#include "hbnvgicon_p.h"
-
-#include <QSize>
-#include <QByteArray>
-
-class HbNvgIconData;
-class HbVgImageBinder;
-class HbOpenVgHandleStore;
-
-class HbNvgTlvIcon : public HbNvgIcon
-{
-private:
-
-public:
- enum HbNvgTlvIconCommands {
- TlvPath = 0x50,
- TlvNone
- };
-
-public:
- HbNvgTlvIcon();
-
- virtual ~HbNvgTlvIcon();
-
- void setPreserveAspectRatio(HbNvgEngine::HbNvgAlignType preserveAspectSetting,
- HbNvgEngine::HbNvgMeetType smilFitSetting);
-
- void rotate(float angle, float x, float y) ;
-
- void enableMirroring(bool mirroringMode);
-
- virtual HbNvgEngine::HbNvgErrorType draw(const QSize &size);
-
-
- void directDraw(const QByteArray &buffer, const QSize &targetSize);
-
- void create(const QByteArray &buffer, const QSize& targetSize);
-
- void setVgImageBinder(HbVgImageBinder *imageBinder) {
- mVgImageBinder = imageBinder;
- }
-
- void addDrawPathCommand(VGPath path, VGPaintMode paintMode);
-
- void addCommand(const quint8 * commandBuffer, qint32 commandBufferLength);
-
- void addCommand(qint8 commandType, const quint8 * commandBuffer, qint32 commandBufferLength);
-
-
-private:
-
- void doDraw(const QSize &size);
-
- void addPathHandle(VGPath path);
-
- void updateClientMatrices();
-
- void restoreClientMatrices();
-
- VGint mMatrixMode;
- VGfloat mImageMatrix[9];
- VGfloat mPathMatrix[9];
-
- HbNvgIconData * mNvgIconData;
- HbVgImageBinder * mVgImageBinder;
- HbOpenVgHandleStore* mOpenVgHandles;
- bool mMirrored;
-};
-
-#endif
-
--- a/src/hbcore/svgext/hbnvgdecoder/hbopenvghandlestore.cpp Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +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 "hbopenvghandlestore_p.h"
-#include <QScopedPointer>
-
-QT_USE_NAMESPACE
-
-struct HbVgImageDeleter {
- static inline void cleanup(void *pointer) {
- if (pointer) vgDestroyImage(*(VGImage*)pointer);
- }
-};
-
-struct HbVgPaintDeleter {
- static inline void cleanup(void *pointer) {
- if (pointer) vgDestroyPaint(*(VGPaint*)pointer);
- }
-};
-
-struct HbVgPathDeleter {
- static inline void cleanup(void *pointer) {
- if (pointer) vgDestroyPath(*(VGPath*)pointer);
- }
-};
-
-HbOpenVgHandleStore::HbOpenVgHandleStore()
-{
-}
-
-HbOpenVgHandleStore::~HbOpenVgHandleStore()
-{
- qint32 handleListCount = mHandles.count();
- for (qint32 i = 0; i < handleListCount; i++) {
- if (mHandles[i].mVgHandle) {
- switch (mHandles[i].mHandleType) {
- case HbTlvVgHandlePair::VgPath:
- vgDestroyPath(mHandles[i].mVgHandle);
- break;
- case HbTlvVgHandlePair::VgPaint:
- vgDestroyPaint(mHandles[i].mVgHandle);
- break;
- case HbTlvVgHandlePair::VgImage:
- vgDestroyImage(mHandles[i].mVgHandle);
- break;
- }
- }
- }
-}
-
-
-void HbOpenVgHandleStore::addPath(VGPath handle)
-{
- QScopedPointer<VGPath, HbVgPathDeleter> scHandle(&handle);
- mHandles.append(HbTlvVgHandlePair(handle, HbTlvVgHandlePair::VgPath));
- scHandle.take();
-}
-
-void HbOpenVgHandleStore::addPaint(VGPaint handle)
-{
- QScopedPointer<VGPath, HbVgPaintDeleter> scHandle(&handle);
- mHandles.append(HbTlvVgHandlePair(handle, HbTlvVgHandlePair::VgPaint));
- scHandle.take();
-}
-
-void HbOpenVgHandleStore::addImage(VGImage handle)
-{
- QScopedPointer<VGPath, HbVgImageDeleter> scHandle(&handle);
- mHandles.append(HbTlvVgHandlePair(handle, HbTlvVgHandlePair::VgImage));
- scHandle.take();
-}
-
-
--- a/src/hbcore/svgext/hbnvgdecoder/hbopenvghandlestore_p.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +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_OPENVGHANDLESTORE_P_H
-#define HB_OPENVGHANDLESTORE_P_H
-
-#include <VG/openvg.h>
-#include <QList>
-
-class HbOpenVgHandleStore
-{
-public:
- struct HbTlvVgHandlePair {
- enum HbHandleType {
- VgPath,
- VgPaint,
- VgImage
- };
- VGHandle mVgHandle;
- HbHandleType mHandleType;
-
- explicit HbTlvVgHandlePair(VGHandle vgHandle, HbHandleType handleType = VgPath)
- : mVgHandle(vgHandle),
- mHandleType(handleType) {
- }
- };
-
- HbOpenVgHandleStore();
-
- ~HbOpenVgHandleStore();
-
- void addPath(VGPath handle);
-
- void addPaint(VGPaint handle);
-
- void addImage(VGImage handle);
-
-private:
-
- QList<HbTlvVgHandlePair> mHandles;
-};
-
-#endif
-
--- a/src/hbcore/svgext/hbnvgdecoder/hbtlvcommon_p.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +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_TLVCOMMON_P_H
-#define HB_TLVCOMMON_P_H
-
-#include <QtGlobal>
-
-static const qint16 NvgHeaderSize = 0x34;
-
-enum HbOpenVgApi {
- VgClear = 0,
- VgSeti,
- VgSetf,
- VgSetfv,
- VgSetParameteri,
- VgSetParameterf,
- VgSetParameterfv,
- VgSetColor,
- VgSetPaint,
- VgLoadMatrix,
- VgMultMatrix,
- VgLoadIdentity,
- VgScale,
- VgRotate,
- VgTranslate,
- VgAppendPathData,
- VgDrawPath,
- VgClearPath,
- VguRect,
- VguEllipse,
- VguRoundRect,
- VguLine,
- VgCreatePaint,
- VgCreatePath,
- VgGetPixels,
- VgDestroyImage,
- VgDestroyPaint,
- VgDestroyPath,
- VgSetiv,
- VgCreateImage,
- VgDrawImage,
- VgClearImage,
- VgImageSubData,
- VgPrepareToBindImage,
- VgBindImage,
- VgUnBindImage,
- VgFlush,
- VgApiCount
-};
-
-#endif
--- a/src/hbcore/svgext/hbnvgdecoder/hbtlviconcreator.cpp Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,431 +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 "hbtlviconcreator_p.h"
-#include "hbnvgimagebinder_p.h"
-#include "hbnvgutil_p.h"
-#include "hbnvgicondata_p.h"
-#include "hbnvgtlvicon_p.h"
-
-#include <QScopedArrayPointer>
-
-/*!
- Length of each encoded OpenVG API in bytes. -1 if not pre known.
- The order here and in the enum TOpenVGAPI should be same.
- */
-const qint32 apiCommandLength[] = {
- 16, //VgClear
- 4, //VgSeti
- 6, //VgSetf
- -1, //VgSetfv
- 5, //VgSetParameteri
- 7, //VgSetParameterf
- -1, //VgSetParameterfv
- 5, //VgSetColor
- 2, //VgSetPaint
- 36, //VgLoadMatrix
- 36, //VgMultMatrix
- 0, //VgLoadIdentity
- 8, //VgScale
- 4, //VgRotate
- 8, //VgTranslate
- -1, //VgAppendPathData
- 3, //VgDrawPath
- 3, //VgClearPath
- 17, //VguRect
- 17, //VguEllipse
- 25, //VguRoundRect
- 17, //VguLine
- 1, //VgCreatePaint
- 26, //VgCreatePath
- 0, //VgGetPixels
- 1, //VgDestroyImage
- 0, //VgDestroyPaint
- 0, //VgDestroyPath
- -1, //VgSetiv
- 14, //VgCreateImage
- 1, //VgDrawImage
- 17, //VgClearImage
- -1, //VgImageSubData
- 0, //VgPrepareToBindImage
- 4, //VgBindImage
- 0, //VgUnBindImage
- 0 //VgFlush
-};
-
-HbTlvIconCreator::HbTlvIconCreator(const QByteArray &ptr, qint32 width, qint32 height, HbNvgTlvIcon * nvgTlvIcon)
-{
- vgapi[VgSeti] = &HbTlvIconCreator::tlvVgAddCommand;
- vgapi[VgSetf] = &HbTlvIconCreator::tlvVgAddCommand;
- vgapi[VgSetParameteri] = &HbTlvIconCreator::tlvVgAddCommand;
- vgapi[VgSetParameterf] = &HbTlvIconCreator::tlvVgAddCommand;
- vgapi[VgSetParameterfv] = &HbTlvIconCreator::tlvVgSetParameterfv;
- vgapi[VgSetColor] = &HbTlvIconCreator::tlvVgAddCommand;
- vgapi[VgSetPaint] = &HbTlvIconCreator::tlvVgAddCommand;
- vgapi[VgLoadMatrix] = &HbTlvIconCreator::tlvVgAddCommand;
- vgapi[VgMultMatrix] = &HbTlvIconCreator::tlvVgAddCommand;
- vgapi[VgLoadIdentity] = &HbTlvIconCreator::tlvVgAddCommand;
- vgapi[VgScale] = &HbTlvIconCreator::tlvVgAddCommand;
- vgapi[VgTranslate] = &HbTlvIconCreator::tlvVgAddCommand;
- vgapi[VgAppendPathData] = &HbTlvIconCreator::tlvVgAppendPathData;
- vgapi[VgDrawPath] = &HbTlvIconCreator::tlvVgDrawPath;
- vgapi[VgClearPath] = &HbTlvIconCreator::tlvVgClearPath;
- vgapi[VguRect] = &HbTlvIconCreator::tlvVguRect;
- vgapi[VguEllipse] = &HbTlvIconCreator::tlvVguEllipse;
- vgapi[VguRoundRect] = &HbTlvIconCreator::tlvVguRoundRect;
- vgapi[VguLine] = &HbTlvIconCreator::tlvVguLine;
- vgapi[VgCreatePaint] = &HbTlvIconCreator::tlvVgAddCommand;
- vgapi[VgSetiv] = &HbTlvIconCreator::tlvVgSetiv;
- vgapi[VgClear] = &HbTlvIconCreator::tlvVgAddCommand;
- vgapi[VgSetfv] = &HbTlvIconCreator::tlvVgSetfv;
- vgapi[VgRotate] = &HbTlvIconCreator::tlvVgAddCommand;
- vgapi[VgCreatePath] = &HbTlvIconCreator::tlvVgCreatePath;
- vgapi[VgCreateImage] = &HbTlvIconCreator::tlvVgAddCommand;
- vgapi[VgGetPixels] = &HbTlvIconCreator::tlvVgGetPixels;
- vgapi[VgDrawImage] = &HbTlvIconCreator::tlvVgAddCommand;
- vgapi[VgClearImage] = &HbTlvIconCreator::tlvVgAddCommand;
- vgapi[VgImageSubData] = &HbTlvIconCreator::tlvVgImageSubData;
- vgapi[VgDestroyImage] = &HbTlvIconCreator::tlvVgAddCommand;
- vgapi[VgDestroyPaint] = &HbTlvIconCreator::tlvVgDestroyPaint;
- vgapi[VgDestroyPath] = &HbTlvIconCreator::tlvVgDestroyPath;
- vgapi[VgPrepareToBindImage] = &HbTlvIconCreator::tlvVgAddCommand;
- vgapi[VgBindImage] = &HbTlvIconCreator::tlvVgAddCommand;
- vgapi[VgUnBindImage] = &HbTlvIconCreator::tlvVgAddCommand;
- vgapi[VgFlush] = &HbTlvIconCreator::tlvVgAddCommand;
-
- mTargetWidth = width;
- mTargetHeight = height;
- mPrepareToBindImage = 0;
- mNvgTlvIcon = nvgTlvIcon;
- mLastVgPath = 0;
-
- vgGetMatrix(mUserMatrix);
-
- mNvgIconData = new HbNvgIconData(ptr);
- Q_CHECK_PTR(mNvgIconData);
- mDataLength = ptr.size();
-
- mCommandBuffer = (quint8 *)ptr.data();
-}
-
-void HbTlvIconCreator::initialize()
-{
- mNvgIconData->beginRead();
- mNvgIconData->read(mNvgHeader, sizeof(mNvgHeader));
- mNvgTlvIcon->addCommand(mNvgHeader, sizeof(mNvgHeader));
-}
-
-HbTlvIconCreator::~HbTlvIconCreator()
-{
- if (mLastVgPath) {
- vgDestroyPath(mLastVgPath);
- }
-
- delete mNvgIconData;
-}
-
-void HbTlvIconCreator::tlvVgAddCommand(qint32 length, qint32 pos)
-{
- mNvgTlvIcon->addCommand(mCurrentCommand, mCommandBuffer + pos, length);
-}
-
-void HbTlvIconCreator::tlvVgAddCommand()
-{
- mNvgTlvIcon->addCommand(mCurrentCommand, mCommandBuffer + mNvgIconData->readPos(),
- apiCommandLength[mCurrentCommand]);
- mNvgIconData->skip(apiCommandLength[mCurrentCommand]);
-}
-
-void HbTlvIconCreator::tlvVgSetParameterfv()
-{
- qint32 length = 0;
- qint32 cpos = mNvgIconData->readPos();
-
- mNvgIconData->readInt32();
- mNvgIconData->readInt16();
- quint32 countt = mNvgIconData->readInt32();
- length = length + sizeof(quint32) + sizeof(quint16) + sizeof(quint32) + countt * sizeof(float);
- mNvgIconData->skip(countt * sizeof(float));
-
- tlvVgAddCommand(length, cpos);
-}
-
-void HbTlvIconCreator::tlvVgSetiv()
-{
- qint32 length = 0;
- qint32 cpos = mNvgIconData->readPos();
- mNvgIconData->readInt16();
- quint16 count = mNvgIconData->readInt16();
-
- length = sizeof(qint16) + sizeof(qint16);
- length += count * sizeof(qint32);
-
- mNvgIconData->skip(count * sizeof(qint32));
-
- tlvVgAddCommand(length, cpos);
-}
-
-VGPath HbTlvIconCreator::createPath()
-{
- const float scale = 1.0f / 65536.0f;
-
- VGPath pathH = vgCreatePath(VG_PATH_FORMAT_STANDARD,
- VG_PATH_DATATYPE_S_32, scale, 0.0f, 0, 0,
- VG_PATH_CAPABILITY_APPEND_TO);
-
- if (pathH == VG_INVALID_HANDLE) {
- throw HbNvgException(openVgErrorToHbNvgError(vgGetError()));
- }
- return pathH;
-}
-
-void HbTlvIconCreator::tlvVgClearPath()
-{
- mNvgIconData->readInt8();
- mNvgIconData->readInt16();
-}
-
-void HbTlvIconCreator::tlvVgAppendPathData()
-{
- quint16 numSegments;
- quint16 coordinateCount;
-
- mNvgIconData->readInt32();
- numSegments = mNvgIconData->readInt16();
-
- VGubyte *pSegArry = new VGubyte[numSegments];
- Q_CHECK_PTR(pSegArry);
- QScopedArrayPointer<quint8> pathSegments(pSegArry);
-
- for (qint32 j = 0; j < numSegments; j++) {
- pathSegments[j] = mNvgIconData->readInt8();
- }
-
- coordinateCount = mNvgIconData->readInt16();
-
- qint32 *pDataArry = new qint32[coordinateCount];
- Q_CHECK_PTR(pDataArry);
- QScopedArrayPointer<qint32> pathData(pDataArry);
-
- for (qint32 i = 0; i < coordinateCount; i++) {
- pathData[i] = mNvgIconData->readInt32();
- }
-
- if (mLastVgPath) {
- vgDestroyPath(mLastVgPath);
- mLastVgPath = 0;
- }
- mLastVgPath = createPath();
-
- vgAppendPathData(mLastVgPath, numSegments, pathSegments.data(), pathData.data());
-}
-
-void HbTlvIconCreator::tlvVgDrawPath()
-{
- mNvgIconData->readInt32();
- quint16 value = mNvgIconData->readInt16();
-
- mNvgTlvIcon->addDrawPathCommand(mLastVgPath, (VGPaintMode)value);
- mLastVgPath = 0;
-}
-
-void HbTlvIconCreator::tlvVguRect()
-{
- mNvgIconData->readInt32();
-
- float x = mNvgIconData->readReal32();
- float y = mNvgIconData->readReal32();
-
- float width = mNvgIconData->readReal32();
- float height = mNvgIconData->readReal32();
-
- if (mLastVgPath) {
- vgDestroyPath(mLastVgPath);
- mLastVgPath = 0;
- }
- mLastVgPath = createPath();
-
- vguRect(mLastVgPath, x, y, width, height);
-
-}
-
-void HbTlvIconCreator::tlvVguEllipse()
-{
- float cx;
- float cy;
- float width;
- float height;
-
- mNvgIconData->readInt32();
-
- cx = mNvgIconData->readReal32();
- cy = mNvgIconData->readReal32();
-
- width = mNvgIconData->readReal32();
- height = mNvgIconData->readReal32();
-
- if (mLastVgPath) {
- vgDestroyPath(mLastVgPath);
- mLastVgPath = 0;
- }
- mLastVgPath = createPath();
-
- vguEllipse(mLastVgPath, cx, cy, width, height);
-}
-
-void HbTlvIconCreator::tlvVguRoundRect()
-{
- float x;
- float y;
- float width;
- float height;
- float arcWidth;
- float arcHeight;
-
- mNvgIconData->readInt32();
-
- x = mNvgIconData->readReal32();
- y = mNvgIconData->readReal32();
-
- width = mNvgIconData->readReal32();
- height = mNvgIconData->readReal32();
-
- arcWidth = mNvgIconData->readReal32();
- arcHeight = mNvgIconData->readReal32();
-
- if (mLastVgPath) {
- vgDestroyPath(mLastVgPath);
- mLastVgPath = 0;
- }
- mLastVgPath = createPath();
-
- vguRoundRect(mLastVgPath, x, y, width, height, arcWidth, arcHeight);
-}
-
-void HbTlvIconCreator::tlvVguLine()
-{
- float x0;
- float y0;
- float x1;
- float y1;
-
- mNvgIconData->readInt32();
-
- x0 = mNvgIconData->readReal32();
- y0 = mNvgIconData->readReal32();
-
- x1 = mNvgIconData->readReal32();
- y1 = mNvgIconData->readReal32();
-
- if (mLastVgPath) {
- vgDestroyPath(mLastVgPath);
- mLastVgPath = 0;
- }
- mLastVgPath = createPath();
-
- vguLine(mLastVgPath, x0, y0, x1, y1);
-}
-
-void HbTlvIconCreator::tlvVgSetfv()
-{
- qint32 length = 0;
- quint16 type;
- quint16 count;
- qint32 cpos = mNvgIconData->readPos();
-
- mNvgIconData->readInt16();
-
- count = mNvgIconData->readInt16();
-
- mNvgIconData->skip(sizeof(float) * count);
-
- length = length + 2 * sizeof(quint16) + count * sizeof(VGfloat);
-
- tlvVgAddCommand(length, cpos);
-}
-
-void HbTlvIconCreator::tlvVgCreatePath()
-{
- mNvgIconData->skip(apiCommandLength[VgCreatePath]);
-}
-
-void HbTlvIconCreator::tlvVgImageSubData()
-{
- qint32 cpos = mNvgIconData->readPos();
-
- mNvgIconData->readInt32();
- qint32 dataLength = 0;
-
- mNvgIconData->readInt32();
- mNvgIconData->readInt32();
- mNvgIconData->readInt32();
- mNvgIconData->readInt32();
- mNvgIconData->readInt32();
- mNvgIconData->readInt32();
- dataLength = mNvgIconData->readInt32();
- mNvgIconData->skip(dataLength);
-
- tlvVgAddCommand(mNvgIconData->readPos() - cpos, cpos);
-}
-
-void HbTlvIconCreator::tlvVgGetPixels()
-{
-}
-
-void HbTlvIconCreator::tlvVgDestroyPaint()
-{
-}
-
-void HbTlvIconCreator::tlvVgDestroyPath()
-{
-}
-
-void HbTlvIconCreator::tlvVgFlush()
-{
-}
-
-HbNvgEngine::HbNvgErrorType HbTlvIconCreator::execute(qint32 index)
-{
- HbNvgEngine::HbNvgErrorType ret = HbNvgEngine::NvgErrNone;
- mCurrentCommand = index;
- if ((0 <= index) && (index < VgFlush + 1)) {
- (this->*(vgapi[index]))();
- } else {
- throw HbNvgException(HbNvgEngine::NvgErrCorrupt);
- }
- return ret;
-}
-
-HbNvgEngine::HbNvgErrorType HbTlvIconCreator::execute()
-{
- HbNvgEngine::HbNvgErrorType error = HbNvgEngine::NvgErrNone;
-
- while (!mNvgIconData->eof()) {
- execute(mNvgIconData->readInt8());
- }
-
- return error;
-}
-
--- a/src/hbcore/svgext/hbnvgdecoder/hbtlviconcreator_p.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,125 +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_TLVICONCREATER_P_H
-#define HB_TLVICONCREATER_P_H
-
-#include <VG/openvg.h>
-#include <VG/vgu.h>
-#include "hbtlvcommon_p.h"
-#include "hbnvg_p.h"
-#include <QSize>
-
-class HbNvgTlvIcon;
-class HbNvgIconData;
-
-class HbTlvIconCreator
-{
-public:
-
- HbTlvIconCreator(const QByteArray &ptr, qint32 width, qint32 height, HbNvgTlvIcon * nvgTlvIcon);
-
- virtual ~HbTlvIconCreator();
-
- HbNvgEngine::HbNvgErrorType execute();
-
- void setTlvIcon(HbNvgTlvIcon * nvgTlvIcon) {
- mNvgTlvIcon = nvgTlvIcon;
- }
-
- void initialize();
-
-private:
-
- void tlvVgAddCommand(qint32 length, qint32 pos);
- void tlvVgAddCommand();
- void tlvVgSetParameterfv();
- void tlvVgSetPaint();
- void tlvVgAppendPathData();
- void tlvVgDrawPath();
- void tlvVgClearPath();
- void tlvVgCreatePaint();
- void tlvVgSetiv();
- void tlvVgClear();
- void tlvVgSetfv();
- void tlvVgCreatePath();
- void tlvVgCreateImage();
- void tlvVgGetPixels();
- void tlvVgClearImage();
- void tlvVgImageSubData();
- void tlvVgDrawImage();
- void tlvVgDestroyImage();
- void tlvVgDestroyPaint();
- void tlvVgDestroyPath();
- void tlvVguRect();
- void tlvVguEllipse();
- void tlvVguRoundRect();
- void tlvVguLine();
- void tlvVgPrepareToBindImage();
- void tlvVgBindImage();
- void tlvVgUnBindImage();
- void tlvVgFlush();
- HbNvgEngine::HbNvgErrorType execute(qint32 index);
-
-#ifdef HB_NVG_DEBUG
- //Command specific logging methods
- void logVgSeti(VGParamType type, VGint fvalue, qint32 cmdsize);
- void logVgSetf(VGParamType type, VGfloat fvalue, qint32 cmdsize);
- void logVgSetParameteri(VGHandle handle, VGint paramType, VGint pvalue, qint32 cmdsize, qint32 lpvalue);
- void logVgSetPaint(VGPaint paint, VGbitfield paintModes, qint32 cmdsize, qint32 lpvalue);
- void logVgDrawPath(VGbitfield paintModes, qint32 cmdsize);
- void logVgSetParameterfv(VGPaint handle, VGint paramtype, qint32 count, qint32 handlenum);
-#endif
-
-private:
-
- typedef void (HbTlvIconCreator::*VgApiCallBack)();
-
- VGPath createPath();
-
- VgApiCallBack vgapi[VgApiCount];
-
- HbNvgIconData * mNvgIconData;
- qint32 mDataLength;
- QSize mResizedCanvasSize;
-
- quint8 mNvgHeader[NvgHeaderSize];
- qint32 mTargetWidth;
- qint32 mTargetHeight;
- bool mScaled;
-
- VGfloat mUserMatrix[9];
- quint32 mPrepareToBindImage;
-
- HbNvgTlvIcon * mNvgTlvIcon;
-
- qint8 mCurrentCommand;
- quint8 * mCommandBuffer;
- VGPath mLastVgPath;
-
- friend class HbNvgTlvIcon;
-};
-
-#endif
--- a/src/hbcore/svgext/hbnvgdecoder/hbtlviconrenderer.cpp Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +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 "hbtlviconrenderer_p.h"
-#include "hbnvgimagebinder_p.h"
-#include "hbnvgutil_p.h"
-#include "hbnvgicondata_p.h"
-#include "hbnvgtlvicon_p.h"
-
-#include <VG/openvg.h>
-
-HbTlvIconRenderer::HbTlvIconRenderer(const QByteArray &buffer, qint32 width, qint32 height)
- : HbTlvRenderer(buffer, width, height)
-{
-}
-
-HbTlvIconRenderer::~HbTlvIconRenderer()
-{
-}
-
-void HbTlvIconRenderer::execute(qint32 index)
-{
- if (index == HbNvgTlvIcon::TlvPath) {
- drawPath();
- } else {
- HbTlvRenderer::execute(index);;
- }
-}
-
-void HbTlvIconRenderer::drawPath()
-{
- VGPath path = (VGPath)mNvgIconData->readInt32();
- VGPaintMode paintMode = (VGPaintMode)mNvgIconData->readInt32();
- vgDrawPath(path, paintMode);
-}
--- a/src/hbcore/svgext/hbnvgdecoder/hbtlviconrenderer_p.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +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_TLVICONRENDERER_P_H
-#define HB_TLVICONRENDERER_P_H
-
-#include "hbtlvrenderer_p.h"
-
-class HbTlvIconRenderer : public HbTlvRenderer
-{
-public:
-
- HbTlvIconRenderer(const QByteArray &buffer, qint32 width, qint32 height);
-
- virtual ~HbTlvIconRenderer();
-
-protected:
- void drawPath();
- virtual void execute(qint32 index);
-};
-
-#endif
--- a/src/hbcore/svgext/hbnvgdecoder/hbtlvrenderer.cpp Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1659 +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 "hbtlvrenderer_p.h"
-#include "hbnvgimagebinder_p.h"
-#include "hbnvgutil_p.h"
-#include "hbnvgicondata_p.h"
-#include "hbnvgtlvicon_p.h"
-#include "hbnvgexception_p.h"
-
-#include <QScopedArrayPointer>
-
-#include <QtDebug>
-
-HbTlvRenderer::HbTlvRenderer(const QByteArray &buffer, qint32 width, qint32 height)
- : mVgImageBinder(0)
-{
- vgapi[VgSeti] = &HbTlvRenderer::tlvVgSeti;
- vgapi[VgSetf] = &HbTlvRenderer::tlvVgSetf;
- vgapi[VgSetParameteri] = &HbTlvRenderer::tlvVgSetParameteri;
- vgapi[VgSetParameterf] = &HbTlvRenderer::tlvVgSetParameterf;
- vgapi[VgSetParameterfv] = &HbTlvRenderer::tlvVgSetParameterfv;
- vgapi[VgSetColor] = &HbTlvRenderer::tlvVgSetColor;
- vgapi[VgSetPaint] = &HbTlvRenderer::tlvVgSetPaint;
- vgapi[VgLoadMatrix] = &HbTlvRenderer::tlvVgLoadMatrix;
- vgapi[VgMultMatrix] = &HbTlvRenderer::tlvVgMultMatrix;
- vgapi[VgLoadIdentity] = &HbTlvRenderer::tlvVgLoadIdentity;
- vgapi[VgScale] = &HbTlvRenderer::tlvVgScale;
- vgapi[VgTranslate] = &HbTlvRenderer::tlvVgTranslate;
- vgapi[VgAppendPathData] = &HbTlvRenderer::tlvVgAppendPathData;
- vgapi[VgDrawPath] = &HbTlvRenderer::tlvVgDrawPath;
- vgapi[VgClearPath] = &HbTlvRenderer::tlvVgClearPath;
- vgapi[VguRect] = &HbTlvRenderer::tlvVguRect;
- vgapi[VguEllipse] = &HbTlvRenderer::tlvVguEllipse;
- vgapi[VguRoundRect] = &HbTlvRenderer::tlvVguRoundRect;
- vgapi[VguLine] = &HbTlvRenderer::tlvVguLine;
- vgapi[VgCreatePaint] = &HbTlvRenderer::tlvVgCreatePaint;
- vgapi[VgSetiv] = &HbTlvRenderer::tlvVgSetiv;
- vgapi[VgClear] = &HbTlvRenderer::tlvVgClear;
- vgapi[VgSetfv] = &HbTlvRenderer::tlvVgSetfv;
- vgapi[VgRotate] = &HbTlvRenderer::tlvVgRotate;
- vgapi[VgCreatePath] = &HbTlvRenderer::tlvVgCreatePath;
- vgapi[VgCreateImage] = &HbTlvRenderer::tlvVgCreateImage;
- vgapi[VgGetPixels] = &HbTlvRenderer::tlvVgGetPixels;
- vgapi[VgDrawImage] = &HbTlvRenderer::tlvVgDrawImage;
- vgapi[VgClearImage] = &HbTlvRenderer::tlvVgClearImage;
- vgapi[VgImageSubData] = &HbTlvRenderer::tlvVgImageSubData;
- vgapi[VgDestroyImage] = &HbTlvRenderer::tlvVgDestroyImage;
- vgapi[VgDestroyPaint] = &HbTlvRenderer::tlvVgDestroyPaint;
- vgapi[VgDestroyPath] = &HbTlvRenderer::tlvVgDestroyPath;
- vgapi[VgPrepareToBindImage] = &HbTlvRenderer::tlvVgPrepareToBindImage;
- vgapi[VgBindImage] = &HbTlvRenderer::tlvVgBindImage;
- vgapi[VgUnBindImage] = &HbTlvRenderer::tlvVgUnBindImage;
- vgapi[VgFlush] = &HbTlvRenderer::tlvVgFlush;
-
- mTargetWidth = width;
- mTargetHeight = height;
- mPrepareToBindImage = 0;
- mScaled = false;
-
- vgGetMatrix(mUserMatrix);
-
- mNvgIconData = new HbNvgIconData(buffer);
- Q_CHECK_PTR(mNvgIconData);
-
- mDataLength = buffer.size();
-
- INIT_HANDLECHECKER()
-}
-
-void HbTlvRenderer::initialize()
-{
- mNvgIconData->beginRead();
- mNvgIconData->read(mNvgHeader, sizeof(mNvgHeader));
-}
-
-HbTlvRenderer::~HbTlvRenderer()
-{
- if (mPathHandle != VG_INVALID_HANDLE) {
- VGDESTROYPATH(mPathHandle);
- }
-
- qint32 handleListCount = mTlvVgHandleList.count();
-
- if (handleListCount > 0) {
- vgSetPaint(VG_INVALID_HANDLE, VG_FILL_PATH);
- vgSetPaint(VG_INVALID_HANDLE, VG_STROKE_PATH);
- }
-
- for (qint32 i = 0; i < handleListCount; i++) {
- if (mTlvVgHandleList[i].mVgHandle) {
- switch (mTlvVgHandleList[i].mHandleType) {
- case HbTlvVgHandlePair::VgPath:
- VGDESTROYPATH(mTlvVgHandleList[i].mVgHandle);
- break;
- case HbTlvVgHandlePair::VgPaint:
- VGDESTROYPAINT(mTlvVgHandleList[i].mVgHandle);
- break;
- case HbTlvVgHandlePair::VgImage:
- VGDESTROYIMAGE(mTlvVgHandleList[i].mVgHandle);
- break;
- }
- }
- }
-
- mTlvVgHandleList.clear();
- if (mNvgIconData) {
- mNvgIconData->endRead();
- delete mNvgIconData;
- }
- ASSERT_HANDLE_COUNT()
-}
-
-void HbTlvRenderer::tlvVgSeti()
-{
- quint16 type;
- quint16 value;
- type = mNvgIconData->readInt16();
- value = mNvgIconData->readInt16();
-
- vgSeti((VGParamType)type, value);
-
- NVG_DEBUGSTMT(logVgSeti((VGParamType)type, value));
-}
-
-void HbTlvRenderer::tlvVgSetf()
-{
- quint16 type = mNvgIconData->readInt16();
- VGfloat value = mNvgIconData->readReal32();
-
- vgSetf((VGParamType)type, value);
-
- NVG_DEBUGSTMT(logVgSetf((VGParamType)type, value));
-}
-
-void HbTlvRenderer::tlvVgSetParameteri()
-{
- quint8 handle;
- quint16 type;
- quint16 value;
-
- handle = mNvgIconData->readInt32();
- type = mNvgIconData->readInt16();
- value = mNvgIconData->readInt16();
-
- vgSetParameteri(getHandle(handle), type, value);
-
- NVG_DEBUGSTMT(logVgSetParameteri(getHandle(handle), type, value, handle));
-}
-
-void HbTlvRenderer::tlvVgSetParameterf()
-{
- quint32 handle = mNvgIconData->readInt32();
- quint16 type = mNvgIconData->readInt16();
- quint32 value = mNvgIconData->readReal32();
-
- vgSetParameterf(getHandle(handle), type, value);
-
- NVG_DEBUGP4("vgSetParameterf(%d, %d, %d)\n", handle, type, value);
-}
-
-void HbTlvRenderer::tlvVgSetParameterfv()
-{
- quint32 handle = mNvgIconData->readInt32();
- quint16 type = mNvgIconData->readInt16();
- quint32 countt = mNvgIconData->readInt32();
-
- float *fArr = new float[countt];
- Q_CHECK_PTR(fArr);
- QScopedArrayPointer<float> value(fArr);
-
- for (quint32 i = 0; i < countt; i++) {
- value[i] = mNvgIconData->readReal32();
- }
-
- vgSetParameterfv(getHandle(handle), type, countt, value.data());
-
- NVG_DEBUGSTMT(logVgSetParameterfv(getHandle(handle), type, countt, value.data()));
-}
-
-void HbTlvRenderer::tlvVgSetColor()
-{
- quint32 paintvalue = mNvgIconData->readInt32();
- quint32 rgba = mNvgIconData->readInt32();
-
- vgSetColor(getHandle(paintvalue), rgba);
-
- NVG_DEBUGP6("vgSetColor(%d, ((%d << 24) | (%d << 16) | (%d << 8) | %d));\n", getHandle(paintvalue),
- (rgba & 0xFF000000) >> 24, (rgba & 0x00FF0000) >> 16, (rgba & 0x0000FF00) >> 8, (rgba & 0x000000FF));
-}
-
-void HbTlvRenderer::tlvVgSetPaint()
-{
- quint32 paintvalue = mNvgIconData->readInt32();
- quint8 value = mNvgIconData->readInt8();
-
- vgSetPaint(getHandle(paintvalue), value);
-
- NVG_DEBUGSTMT(logVgSetPaint(getHandle(paintvalue), value, paintvalue));
-}
-
-QPoint HbTlvRenderer::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 HbTlvRenderer::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 HbTlvRenderer::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;
-}
-
-void HbTlvRenderer::tlvVgSetiv()
-{
- quint16 type = mNvgIconData->readInt16();
- quint16 count = mNvgIconData->readInt16();
-
- VGint *intArr = new VGint[count];
- Q_CHECK_PTR(intArr);
- QScopedArrayPointer<VGint> value(intArr);
-
- for (qint32 i = 0; i < count; i++) {
- value[i] = mNvgIconData->readInt32();
- }
-
- if (type == VG_SCISSOR_RECTS) {
- VGfloat * matrix = mUserMatrix;
-
- // calculate the rectangle with respect to the transformation applied
- for (qint32 i = 0; i < count; i += 4) {
- qint32 sx = i + 0;
- qint32 sy = i + 1;
- qint32 sw = i + 2;
- qint32 sh = i + 3;
-
- QPoint leftBottom = getTranslatedPoint(matrix,
- QPoint(value[sx], value[sy]));
- QPoint leftTop = getTranslatedPoint(matrix,
- QPoint(value[sx], value[sy] + value[sh]));
- QPoint rightBottom = getTranslatedPoint(matrix,
- QPoint(value[sx] + value[sw], value[sy]));
- QPoint rightTop = getTranslatedPoint(matrix,
- QPoint(value[sx] + value[sw], value[sy] + value[sh]));
-
-
- 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());
-
- 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;
-
- value[sx] = minX;
- value[sy] = minY;
- value[sw] = newW;
- value[sh] = newH;
- }
- }
-
- if (type != VG_SCISSOR_RECTS)
- vgSetiv((VGParamType)type, count, value.data());
-
- NVG_DEBUGSTMT(logvgSetXv((VGParamType)type, count, 'i', value.data()));
-}
-
-void HbTlvRenderer::tlvVgLoadMatrix()
-{
- VGfloat matrix[9];
- for (qint32 i = 0; i < 9; i++) {
- matrix[i] = mNvgIconData->readReal32();
- }
-
- // keep the caller's matrix as base
- qint32 matrixMode = vgGeti(VG_MATRIX_MODE);
-
- if (matrixMode == VG_MATRIX_PATH_USER_TO_SURFACE ||
- matrixMode == VG_MATRIX_IMAGE_USER_TO_SURFACE /* need to check?*/) {
- vgLoadMatrix(mUserMatrix);
- vgMultMatrix(matrix);
- } else {
- vgLoadMatrix(matrix);
- }
-
-#ifdef HB_NVG_DEBUG
- qint32 matrixCount = clock() % 1000;
- NVG_DEBUGP2("VGfloat ldMatrix%d[] = {", matrixCount);
-
- NVG_DEBUGP4(" %f, %f, %f, ", matrix[0], matrix[1], matrix[2]);
- NVG_DEBUGP4(" %f, %f, %f, ", matrix[3], matrix[4], matrix[5]);
- NVG_DEBUGP4(" %f, %f, %f)", matrix[6], matrix[7], matrix[8]);
-
- NVG_DEBUGP2("vgLoadMatrix(ldMatrix%d);\n", matrixCount);
-#endif
-}
-
-void HbTlvRenderer::tlvVgMultMatrix()
-{
- VGfloat matrix[9];
- for (qint32 i = 0; i < 9; i++) {
- matrix[i] = mNvgIconData->readReal32();
- }
-
- vgMultMatrix(matrix);
-
-#ifdef HB_NVG_DEBUG
- qint32 matrixCount = clock() % 1000;
- NVG_DEBUGP2("VGfloat mlMatrix%d[] = {", ++matrixCount);
-
- NVG_DEBUGP4(" %f, %f, %f, ", matrix[0], matrix[1], matrix[2]);
- NVG_DEBUGP4(" %f, %f, %f, ", matrix[3], matrix[4], matrix[5]);
- NVG_DEBUGP4(" %f, %f, %f)", matrix[6], matrix[7], matrix[8]);
- NVG_DEBUGP2("vgMultMatrix(mlMatrix%d);\n", matrixCount);
-#endif
-}
-
-void HbTlvRenderer::tlvVgLoadIdentity()
-{
- if (vgGeti(VG_MATRIX_MODE) == (VGint)VG_MATRIX_PATH_USER_TO_SURFACE) {
- vgLoadMatrix(mUserMatrix);
- } else {
- vgLoadIdentity();
- }
- NVG_DEBUGP1("vgLoadIdentity();\n");
-}
-
-void HbTlvRenderer::tlvVgScale()
-{
- VGfloat sx = mNvgIconData->readReal32();
- VGfloat sy = mNvgIconData->readReal32();
- vgScale(sx, sy);
-
- NVG_DEBUGP3("vgScale(%f, %f)\n", sx, sy);
-}
-
-void HbTlvRenderer::tlvVgTranslate()
-{
- VGfloat tx = mNvgIconData->readReal32();
- VGfloat ty = mNvgIconData->readReal32();
-
- vgTranslate(tx, ty);
-
- NVG_DEBUGP3("vgTranslate(%f, %f)\n", tx, ty);
-}
-
-void HbTlvRenderer::tlvVgAppendPathData()
-{
- quint16 numSegments;
- quint16 coordinateCount;
-
- mNvgIconData->readInt32();
- numSegments = mNvgIconData->readInt16();
-
- VGubyte *pSegArr = new VGubyte[numSegments];
- Q_CHECK_PTR(pSegArr);
- QScopedArrayPointer<VGubyte>pathSegments(pSegArr);
-
- for (qint32 j = 0; j < numSegments; j++) {
- pathSegments[j] = mNvgIconData->readInt8();
- }
-
- coordinateCount = mNvgIconData->readInt16();
-
- qint32 *pDataArr = new qint32[coordinateCount];
- Q_CHECK_PTR(pDataArr);
- QScopedArrayPointer<qint32>pathData(pDataArr);
-
- for (qint32 i = 0; i < coordinateCount; i++) {
- pathData[i] = mNvgIconData->readInt32();
- }
-
- vgAppendPathData(mPathHandle, numSegments, pathSegments.data(), pathData.data());
-
- NVG_DEBUGP3("vgappendPathData((VGPath)%d, (SENGMENTS)%d)\n", mPathHandle, numSegments);
-}
-
-void HbTlvRenderer::tlvVgDrawPath()
-{
- quint16 value;
-
- mNvgIconData->readInt32();
- value = mNvgIconData->readInt16();
-
- vgDrawPath(mPathHandle, value);
-
- NVG_DEBUGSTMT(logVgDrawPath(mPathHandle, value));
-}
-
-void HbTlvRenderer::tlvVgClearPath()
-{
- quint16 value;
-
- mNvgIconData->readInt32();
- value = mNvgIconData->readInt16();
-
- vgClearPath(mPathHandle, value);
- NVG_DEBUGP1("vgClearPath()\n");
-}
-
-void HbTlvRenderer::tlvVgCreatePaint()
-{
- quint32 encodedHandle = mNvgIconData->readInt32();
-
- VGPaint paintH = VGCREATEPAINT();
- if (paintH == VG_INVALID_HANDLE) {
- throw HbNvgException(openVgErrorToHbNvgError(vgGetError()));
- }
-
- mTlvVgHandleList.append(HbTlvVgHandlePair(paintH, encodedHandle, HbTlvVgHandlePair::VgPaint));
-
- NVG_DEBUGP2("%d = vgCreatePaint()\n", getHandle(encodedHandle));
-}
-
-void HbTlvRenderer::tlvVguRect()
-{
- float x;
- float y;
- float width;
- float height;
-
- mNvgIconData->readInt32();
-
- x = mNvgIconData->readReal32();
- y = mNvgIconData->readReal32();
-
- width = mNvgIconData->readReal32();
- height = mNvgIconData->readReal32();
-
- vguRect(mPathHandle, x, y, width, height);
-
- NVG_DEBUGP6("vguRect(%d, %f, %f, %f, %f)\n", mPathHandle, x, y, width, height);
-}
-
-void HbTlvRenderer::tlvVguEllipse()
-{
- float cx;
- float cy;
- float width;
- float height;
-
- mNvgIconData->readInt32();
-
- cx = mNvgIconData->readReal32();
- cy = mNvgIconData->readReal32();
-
- width = mNvgIconData->readReal32();
- height = mNvgIconData->readReal32();
-
- vguEllipse(mPathHandle, cx, cy, width, height);
-
- NVG_DEBUGP6("vguEllipse( %d ,%f, %f, %f, %f)\n", mPathHandle, cx, cy, width, height);
-}
-
-void HbTlvRenderer::tlvVguRoundRect()
-{
- float x;
- float y;
- float width;
- float height;
- float arcWidth;
- float arcHeight;
-
- mNvgIconData->readInt32();
-
- x = mNvgIconData->readReal32();
- y = mNvgIconData->readReal32();
-
- width = mNvgIconData->readReal32();
- height = mNvgIconData->readReal32();
-
- arcWidth = mNvgIconData->readReal32();
- arcHeight = mNvgIconData->readReal32();
-
- //uncomment in qt
- vguRoundRect(mPathHandle, x, y, width, height, arcWidth, arcHeight);
-
- NVG_DEBUGP8("vguRoundRect(%d %f, %f, %f, %f, %f, %f )\n", mPathHandle, x, y, width, height, arcWidth, arcHeight);
-}
-
-void HbTlvRenderer::tlvVguLine()
-{
- float x0;
- float y0;
- float x1;
- float y1;
-
- mNvgIconData->readInt32();
-
- x0 = mNvgIconData->readReal32();
- y0 = mNvgIconData->readReal32();
-
- x1 = mNvgIconData->readReal32();
- y1 = mNvgIconData->readReal32();
-
- vguLine(mPathHandle, x0, y0, x1, y1);
-
- NVG_DEBUGP6("vguLine(%d, %f, %f, %f, %f)\n", mPathHandle, x0, y0, x1, y1);
-}
-
-void HbTlvRenderer::tlvVgClear()
-{
- float width;
- float height;
-
- mNvgIconData->readReal32();
- mNvgIconData->readReal32();
- width = mNvgIconData->readReal32();
- height = mNvgIconData->readReal32();
-
- if (!mScaled) {
- VGfloat scaleX = (VGfloat) mTargetWidth / width;
- VGfloat scaleY = (VGfloat) mTargetHeight / height;
- vgLoadMatrix(mUserMatrix);
- vgTranslate((VGfloat) mTargetWidth / 2, (VGfloat) mTargetHeight / 2);
- vgScale(scaleX, scaleY);
- vgTranslate(- width / 2.0, - height / 2.0);
-
- vgGetMatrix(mUserMatrix);
- mScaled = true;
- }
-
- NVG_DEBUGP1("vgClear()\n");
-}
-
-void HbTlvRenderer::tlvVgSetfv()
-{
- qint32 innerpos = 1;
- quint16 type;
- quint16 count;
-
- type = mNvgIconData->readInt16();
- count = mNvgIconData->readInt16();
-
- VGfloat * vgfArr = new VGfloat[count];
- Q_CHECK_PTR(vgfArr);
- QScopedArrayPointer<VGfloat> value(vgfArr);
-
- for (qint32 i = 0; i < count; i++) {
- value[i] = mNvgIconData->readReal32();
- }
-
- innerpos = innerpos + 2 * sizeof(quint16) + count * sizeof(VGfloat);
-
- vgSetfv((VGParamType)type, count, value.data());
-
- NVG_DEBUGSTMT(logvgSetXv((VGParamType)type, count, 'f', (VGint *)value.data()));
-}
-
-void HbTlvRenderer::tlvVgRotate()
-{
- float angle;
-
- angle = mNvgIconData->readReal32();
-
- vgRotate(angle);
-
- NVG_DEBUGP2("vgRotate(%f)\n", angle);
-}
-
-void HbTlvRenderer::tlvVgCreatePath()
-{
- quint32 pathFormat;
- quint8 datatype;
- float scale;
- float bias;
- quint32 segmentCapacityHint;
- quint32 coordCapacityHint;
- quint32 capabilities;
-
- pathFormat = mNvgIconData->readInt32();
- datatype = mNvgIconData->readInt8();
-
- scale = mNvgIconData->readReal32();
- bias = mNvgIconData->readReal32();
-
- segmentCapacityHint = mNvgIconData->readInt32();
- coordCapacityHint = mNvgIconData->readInt32();
- capabilities = mNvgIconData->readInt32();
- mNvgIconData->readInt32();
-
- mPathHandle = VGCREATEPATH(pathFormat, (VGPathDatatype)datatype, scale, bias, segmentCapacityHint, coordCapacityHint,
- (VGbitfield)capabilities);
- if (mPathHandle == VG_INVALID_HANDLE) {
- throw HbNvgException(openVgErrorToHbNvgError(vgGetError()));
- }
- NVG_DEBUGP9("%d = vgCreatePath(%d, (VGPathDatatype)%d, %f, %f, %d, %d,(VGPathDatatype)%d)\n",
- mPathHandle, pathFormat, datatype, scale, bias, segmentCapacityHint, coordCapacityHint, capabilities);
-}
-
-void HbTlvRenderer::tlvVgCreateImage()
-{
- qint32 format = (VGImageFormat)mNvgIconData->readInt32();
- qint32 width = (VGImageFormat)mNvgIconData->readInt32();
- qint32 height = (VGImageFormat)mNvgIconData->readInt32();
- quint8 allowedQuality = (VGImageFormat)mNvgIconData->readInt8();
-
- qint32 encodedHandle = mNvgIconData->readInt32();
- VGImage image = 0;
-
- if (mPrepareToBindImage) {
- QPoint leftBottom = getTranslatedPoint(mUserMatrix, QPoint(0, 0));
- QPoint rightBottom = getTranslatedPoint(mUserMatrix, QPoint(width, 0));
- QPoint leftTop = getTranslatedPoint(mUserMatrix, QPoint(0, height));
- QPoint rightTop = getTranslatedPoint(mUserMatrix, QPoint(width, height));
-
- VGfloat maxX = leftBottom.x();
- VGfloat maxY = leftBottom.y();
-
- maxX = maxVal4(leftBottom.x(), leftTop.x(), rightBottom.x(), rightTop.x());
- maxY = maxVal4(leftBottom.y(), leftTop.y(), rightBottom.y(), rightTop.y());
-
- width = maxX - 0;
- height = maxY - 0;
-
- mPrepareToBindImage = 0;
- }
-
- image = VGCREATEIMAGE((VGImageFormat)format,
- width, height, allowedQuality);
- if (image == VG_INVALID_HANDLE) {
- throw HbNvgException(openVgErrorToHbNvgError(vgGetError()));
- }
-
- mTlvVgHandleList.append(HbTlvVgHandlePair(image, encodedHandle, HbTlvVgHandlePair::VgImage, allowedQuality));
-
- NVG_DEBUGP6("%d = vgCreateImage(%d, %d, %d, %d)\n", getHandle(encodedHandle), format, width, height, (quint32)allowedQuality);
-}
-
-void HbTlvRenderer::tlvVgClearImage()
-{
- qint32 encodedImageHandle = mNvgIconData->readInt32();
- VGImage imageHandle = getHandle(encodedImageHandle);
-
- qint32 x = mNvgIconData->readInt32();
- qint32 y = mNvgIconData->readInt32();
- qint32 width = mNvgIconData->readInt32();
- qint32 height = mNvgIconData->readInt32();
- vgClearImage(imageHandle, x, y, width, height);
-
- NVG_DEBUGP6("vgClearImage(%d, %d, %d, %d, %d)\n", imageHandle, x, y, width, height);
-}
-
-void HbTlvRenderer::tlvVgDrawImage()
-{
- qint32 encodedImageHandle = mNvgIconData->readInt32();
- VGImage imageHandle = getHandle(encodedImageHandle);
-
- vgDrawImage(imageHandle);
- NVG_DEBUGP2("vgDrawImage(%d)\n", imageHandle);
-}
-
-void HbTlvRenderer::tlvVgImageSubData()
-{
- qint32 encodedImageHandle = mNvgIconData->readInt32();
- VGImage imageHandle = getHandle(encodedImageHandle);
- qint32 dataLength = 0;
-
- qint32 dataStride = mNvgIconData->readInt32();
- qint32 dataFormat = mNvgIconData->readInt32();
- qint32 x = mNvgIconData->readInt32();
- qint32 y = mNvgIconData->readInt32();
- qint32 width = mNvgIconData->readInt32();
- qint32 height = mNvgIconData->readInt32();
-
- dataLength = mNvgIconData->readInt32();
- if (dataLength) {
- quint8* uIntArry = new quint8[dataLength];
- Q_CHECK_PTR(uIntArry);
- QScopedArrayPointer<quint8> data(uIntArry);
- mNvgIconData->read(data.data(), dataLength);
- quint8 * dataPtr;
- if (dataStride < 0) {
- dataPtr = data.data() + (height - 1) * (-dataStride);
- } else {
- dataPtr = data.data();
- }
- vgImageSubData(imageHandle, dataPtr, dataStride, (VGImageFormat)dataFormat, x, y, width, height);
-
- NVG_DEBUGSTMT(logvgImageSubData(imageHandle, dataPtr, dataLength, dataStride,
- (VGImageFormat)dataFormat, x, y, width, height));
- } else {
- throw HbNvgException(HbNvgEngine::NvgErrCorrupt);
- }
-}
-
-void HbTlvRenderer::tlvVgGetPixels()
-{
- NVG_DEBUGP1("vgGetPixels()\n");
-}
-
-void HbTlvRenderer::tlvVgDestroyImage()
-{
- VGImage imageHandle = removeHandle(mNvgIconData->readInt32());
- VGDESTROYIMAGE(imageHandle);
- NVG_DEBUGP2("vgDestroyImage(%d)\n", imageHandle);
-}
-
-void HbTlvRenderer::tlvVgDestroyPaint()
-{
- qint32 paint = mNvgIconData->readInt32();
- VGDESTROYPAINT(removeHandle(paint));
- NVG_DEBUGP1("vgDestroyPaint()\n");
-}
-
-void HbTlvRenderer::tlvVgDestroyPath()
-{
- // only one path handle is maintained, which is a member variable
- NVG_DEBUGP2("vgDestroyPath(%d);\n", mPathHandle);
-}
-
-void HbTlvRenderer::tlvVgFlush()
-{
- //no need to implement?
- NVG_DEBUGP1("vgFlush()\n");
-}
-
-void HbTlvRenderer::execute(qint32 index)
-{
- if ((0 <= index) && (index < VgFlush + 1)) {
- (this->*(vgapi[index]))();
- } else {
- throw HbNvgException(HbNvgEngine::NvgErrCorrupt);
- }
-}
-
-void HbTlvRenderer::execute()
-{
- NVG_DEBUGP1("TLV rendering starts");
- while (!mNvgIconData->eof()) {
- execute(mNvgIconData->readInt8());
- }
-
- NVG_DEBUGP1("TLV rendering ends");
-}
-
-void HbTlvRenderer::getHandlePair(qint32 index, HbTlvVgHandlePair & pair)
-{
- qint32 handleListCount = mTlvVgHandleList.count();
-
- for (qint32 i = 0; i < handleListCount; i++) {
- if (mTlvVgHandleList[i].mTlvHandle == index) {
- pair = mTlvVgHandleList[i];
- break;
- }
- }
-}
-
-VGHandle HbTlvRenderer::removeHandle(qint32 index)
-{
- qint32 handleListCount = mTlvVgHandleList.count();
- VGHandle handle = 0;
-
- for (qint32 i = 0; i < handleListCount; i++) {
- if (mTlvVgHandleList[i].mTlvHandle == index) {
- handle = mTlvVgHandleList[i].mVgHandle;
- mTlvVgHandleList.removeAt(i);
- break;
- }
- }
-
- if (!handle) {
- throw HbNvgException(HbNvgEngine::NvgErrCorrupt);
- }
- return handle;
-}
-
-VGHandle HbTlvRenderer::getHandle(qint32 index)
-{
- qint32 handleListCount = mTlvVgHandleList.count();
- VGHandle handle = 0;
-
- for (qint32 i = 0; i < handleListCount; i++) {
- if (mTlvVgHandleList[i].mTlvHandle == index) {
- handle = mTlvVgHandleList[i].mVgHandle;
- break;
- }
- }
- if (!handle) {
- throw HbNvgException(HbNvgEngine::NvgErrCorrupt);
- }
- return handle;
-}
-
-void HbTlvRenderer::setHandle(qint32 index, VGHandle handle)
-{
- qint32 handleListCount = mTlvVgHandleList.count();
-
- for (qint32 i = 0; i < handleListCount; i++) {
- if (mTlvVgHandleList[i].mTlvHandle == index) {
- mTlvVgHandleList[i].mVgHandle = handle;
- break;
- }
- }
-}
-
-void HbTlvRenderer::tlvVgPrepareToBindImage()
-{
- mPrepareToBindImage = 1;
- NVG_DEBUGP1("vgPrepareToBindImage()\n");
-}
-
-void HbTlvRenderer::tlvVgBindImage()
-{
- mPrepareToBindImage = 0;
-
- qint32 imageHandle = mNvgIconData->readInt32();
-
- if (mVgImageBinder) {
- mVgImageBinder->bindClientBuffer((VGHandle)getHandle(imageHandle));
- }
- NVG_DEBUGP2("vgBindImage(%d)\n", imageHandle);
-}
-
-void HbTlvRenderer::tlvVgUnBindImage()
-{
- if (mVgImageBinder) {
- mVgImageBinder->unbindClientBuffer();
- }
- NVG_DEBUGP1("vgUnBindImage()\n");
-}
-
-#ifdef HB_NVG_DEBUG
-void HbTlvRenderer::logVgSetf(VGParamType type, VGfloat value)
-{
-
- QByteArray logptr;
-
- logptr.append("vgSetf(");
- switch (type) {
- case VG_STROKE_LINE_WIDTH: {
- logptr.append("VG_STROKE_LINE_WIDTH");
- }
- break;
- case VG_STROKE_MITER_LIMIT: {
- logptr.append("VG_STROKE_MITER_LIMIT");
- }
- break;
- case VG_STROKE_DASH_PHASE: {
- logptr.append("VG_STROKE_DASH_PHASE");
- }
- break;
-
- case VG_MATRIX_MODE: {
- logptr.append("VG_MATRIX_MODE");
- }
- break;
- case VG_FILL_RULE: {
- logptr.append("VG_FILL_RULE");
- }
- break;
- case VG_IMAGE_QUALITY: {
- logptr.append("VG_IMAGE_QUALITY");
- }
- break;
- case VG_IMAGE_MODE: {
- logptr.append("VG_IMAGE_MODE");
- }
- break;
- case VG_RENDERING_QUALITY: {
- logptr.append("VG_RENDERING_QUALITY");
- }
- break;
- case VG_BLEND_MODE: {
- logptr.append("VG_BLEND_MODE");
- }
- break;
- case VG_MASKING: {
- logptr.append("VG_MASKING");
- }
- break;
- case VG_SCISSORING: {
- logptr.append("VG_SCISSORING");
- }
- break;
- case VG_PIXEL_LAYOUT: {
- logptr.append("VG_PIXEL_LAYOUT");
- }
- break;
- case VG_FILTER_FORMAT_LINEAR: {
- logptr.append("VG_FILTER_FORMAT_LINEAR");
- }
- break;
- case VG_FILTER_FORMAT_PREMULTIPLIED: {
- logptr.append("VG_FILTER_FORMAT_PREMULTIPLIED");
- }
- break;
- case VG_FILTER_CHANNEL_MASK: {
- logptr.append("VG_FILTER_CHANNEL_MASK");
- }
- break;
- case VG_STROKE_CAP_STYLE: {
- logptr.append("VG_STROKE_CAP_STYLE");
- }
- break;
- case VG_STROKE_JOIN_STYLE: {
- logptr.append("VG_STROKE_JOIN_STYLE");
- }
- break;
- case VG_STROKE_DASH_PHASE_RESET: {
- logptr.append("VG_STROKE_DASH_PHASE_RESET");
- }
- break;
- /* Implementation limits (read-only) */
- case VG_SCREEN_LAYOUT: {
- logptr.append("VG_SCREEN_LAYOUT");
- }
- break;
- case VG_MAX_SCISSOR_RECTS: {
- logptr.append("VG_MAX_SCISSOR_RECTS");
- }
- break;
- case VG_MAX_DASH_COUNT: {
- logptr.append("VG_MAX_DASH_COUNT");
- }
- break;
- case VG_MAX_KERNEL_SIZE: {
- logptr.append("VG_MAX_KERNEL_SIZE");
- }
- break;
- case VG_MAX_SEPARABLE_KERNEL_SIZE: {
- logptr.append("VG_MAX_SEPARABLE_KERNEL_SIZE");
- }
- break;
- case VG_MAX_COLOR_RAMP_STOPS: {
- logptr.append("VG_MAX_COLOR_RAMP_STOPS");
- }
- break;
- case VG_MAX_IMAGE_WIDTH: {
- logptr.append("VG_MAX_IMAGE_WIDTH");
- }
- break;
- case VG_MAX_IMAGE_HEIGHT: {
- logptr.append("VG_MAX_IMAGE_HEIGHT");
- }
- break;
- case VG_MAX_IMAGE_PIXELS: {
- logptr.append("VG_MAX_IMAGE_PIXELS");
- }
- break;
- case VG_MAX_IMAGE_BYTES: {
- logptr.append("VG_MAX_IMAGE_BYTES");
- }
- break;
- case VG_MAX_FLOAT: {
- logptr.append("VG_MAX_FLOAT");
- }
- break;
- case VG_MAX_GAUSSIAN_STD_DEVIATION: {
- logptr.append("VG_MAX_GAUSSIAN_STD_DEVIATION");
- }
- break;
-
- default: {
- logptr.append("INVALID PARAMTYPE");
- }
- break;
- };
-
- logptr.append(", ");
- logptr.setNum((qint32)value, 10);
- logptr.append(")");
- qDebug() << logptr.data();
- return;
-}
-
-void HbTlvRenderer::logVgSeti(VGParamType type, VGint value)
-{
- QByteArray logptr;
- logptr.append("vgSeti(");
-
- switch (type) {
- case VG_STROKE_LINE_WIDTH: {
- logptr.append("VG_STROKE_LINE_WIDTH");
- }
- break;
- case VG_STROKE_MITER_LIMIT: {
- logptr.append("VG_STROKE_MITER_LIMIT");
- }
- break;
- case VG_STROKE_DASH_PHASE: {
- logptr.append("VG_STROKE_DASH_PHASE");
- }
- break;
-
- case VG_MATRIX_MODE: {
- logptr.append("VG_MATRIX_MODE");
- }
- break;
- case VG_FILL_RULE: {
- logptr.append("VG_FILL_RULE");
- }
- break;
- case VG_IMAGE_QUALITY: {
- logptr.append("VG_IMAGE_QUALITY");
- }
- break;
- case VG_IMAGE_MODE: {
- logptr.append("VG_IMAGE_MODE");
- }
- break;
- case VG_RENDERING_QUALITY: {
- logptr.append("VG_RENDERING_QUALITY");
- }
- break;
- case VG_BLEND_MODE: {
- logptr.append("VG_BLEND_MODE");
- }
- break;
- case VG_MASKING: {
- logptr.append("VG_MASKING");
- }
- break;
- case VG_SCISSORING: {
- logptr.append("VG_SCISSORING");
- }
- break;
- case VG_PIXEL_LAYOUT: {
- logptr.append("VG_PIXEL_LAYOUT");
- }
- break;
- case VG_FILTER_FORMAT_LINEAR: {
- logptr.append("VG_FILTER_FORMAT_LINEAR");
- }
- break;
- case VG_FILTER_FORMAT_PREMULTIPLIED: {
- logptr.append("VG_FILTER_FORMAT_PREMULTIPLIED");
- }
- break;
- case VG_FILTER_CHANNEL_MASK: {
- logptr.append("VG_FILTER_CHANNEL_MASK");
- }
- break;
- case VG_STROKE_CAP_STYLE: {
- logptr.append("VG_STROKE_CAP_STYLE");
- }
- break;
- case VG_STROKE_JOIN_STYLE: {
- logptr.append("VG_STROKE_JOIN_STYLE");
- }
- break;
- case VG_STROKE_DASH_PHASE_RESET: {
- logptr.append("VG_STROKE_DASH_PHASE_RESET");
- }
- break;
- /* Implementation limits (read-only) */
- case VG_SCREEN_LAYOUT: {
- logptr.append("VG_SCREEN_LAYOUT");
- }
- break;
- case VG_MAX_SCISSOR_RECTS: {
- logptr.append("VG_MAX_SCISSOR_RECTS");
- }
- break;
- case VG_MAX_DASH_COUNT: {
- logptr.append("VG_MAX_DASH_COUNT");
- }
- break;
- case VG_MAX_KERNEL_SIZE: {
- logptr.append("VG_MAX_KERNEL_SIZE");
- }
- break;
- case VG_MAX_SEPARABLE_KERNEL_SIZE: {
- logptr.append("VG_MAX_SEPARABLE_KERNEL_SIZE");
- }
- break;
- case VG_MAX_COLOR_RAMP_STOPS: {
- logptr.append("VG_MAX_COLOR_RAMP_STOPS");
- }
- break;
- case VG_MAX_IMAGE_WIDTH: {
- logptr.append("VG_MAX_IMAGE_WIDTH");
- }
- break;
- case VG_MAX_IMAGE_HEIGHT: {
- logptr.append("VG_MAX_IMAGE_HEIGHT");
- }
- break;
- case VG_MAX_IMAGE_PIXELS: {
- logptr.append("VG_MAX_IMAGE_PIXELS");
- }
- break;
- case VG_MAX_IMAGE_BYTES: {
- logptr.append("VG_MAX_IMAGE_BYTES");
- }
- break;
- case VG_MAX_FLOAT: {
- logptr.append("VG_MAX_FLOAT");
- }
- break;
- case VG_MAX_GAUSSIAN_STD_DEVIATION: {
- logptr.append("VG_MAX_GAUSSIAN_STD_DEVIATION");
- }
- break;
-
- default: {
- logptr.append("INVALID PARAMTYPE");
- }
- break;
- };
-
- logptr.append(", ");
- switch (value) {
- case VG_RENDERING_QUALITY_NONANTIALIASED: {
- logptr.append("VG_RENDERING_QUALITY_NONANTIALIASED");
- }
- break;
- case VG_RENDERING_QUALITY_FASTER: {
- logptr.append("VG_RENDERING_QUALITY_FASTER");
- }
- break;
- case VG_RENDERING_QUALITY_BETTER: {
- logptr.append("VG_RENDERING_QUALITY_BETTER");
- }
- break;
- case VG_MATRIX_PATH_USER_TO_SURFACE: {
- logptr.append("VG_MATRIX_PATH_USER_TO_SURFACE");
- }
- break;
- case VG_MATRIX_IMAGE_USER_TO_SURFACE: {
- logptr.append("VG_MATRIX_IMAGE_USER_TO_SURFACE");
- }
- break;
- case VG_MATRIX_FILL_PAINT_TO_USER : {
- logptr.append("VG_MATRIX_FILL_PAINT_TO_USER");
- }
- break;
- case VG_MATRIX_STROKE_PAINT_TO_USER: {
- logptr.append("VG_MATRIX_STROKE_PAINT_TO_USER");
- }
- break;
- case VG_CAP_BUTT: {
- logptr.append("VG_CAP_BUTT");
- }
- break;
- case VG_CAP_ROUND: {
- logptr.append("VG_CAP_ROUND");
- }
- break;
- case VG_CAP_SQUARE: {
- logptr.append("VG_CAP_SQUARE");
- }
- break;
- case VG_BLEND_SRC: {
- logptr.append("VG_BLEND_SRC");
- }
- break;
- case VG_BLEND_SRC_OVER: {
- logptr.append("VG_BLEND_SRC_OVER");
- }
- break;
- case VG_BLEND_DST_OVER: {
- logptr.append("VG_BLEND_DST_OVER");
- }
- break;
- case VG_BLEND_SRC_IN: {
- logptr.append("VG_BLEND_SRC_IN");
- }
- break;
- case VG_BLEND_DST_IN: {
- logptr.append("VG_BLEND_DST_IN");
- }
- break;
- case VG_BLEND_MULTIPLY: {
- logptr.append("VG_BLEND_MULTIPLY");
- }
- break;
- case VG_BLEND_SCREEN: {
- logptr.append("VG_BLEND_SCREEN");
- }
- break;
- case VG_BLEND_DARKEN: {
- logptr.append("VG_BLEND_DARKEN");
- }
- break;
- case VG_BLEND_LIGHTEN: {
- logptr.append("VG_BLEND_LIGHTEN");
- }
- break;
- case VG_BLEND_ADDITIVE: {
- logptr.append("VG_BLEND_ADDITIVE");
- }
- break;
- case VG_IMAGE_QUALITY_NONANTIALIASED: {
- logptr.append("1");
- }
- break;
- case VG_IMAGE_QUALITY_FASTER: {
- logptr.append("VG_IMAGE_QUALITY_FASTER");
- }
- break;
- case VG_IMAGE_QUALITY_BETTER: {
- logptr.append("VG_IMAGE_QUALITY_BETTER");
- }
- break;
- case VG_FALSE: {
- logptr.append("VG_FALSE");
- }
- break;
- case VG_RED: {
- logptr.append("VG_RED");
- }
- break;
-
- case VG_DRAW_IMAGE_NORMAL: {
- logptr.append("VG_DRAW_IMAGE_NORMAL");
- }
- break;
- case VG_DRAW_IMAGE_MULTIPLY: {
- logptr.append("VG_DRAW_IMAGE_MULTIPLY");
- }
- break;
- case VG_DRAW_IMAGE_STENCIL: {
- logptr.append("VG_DRAW_IMAGE_STENCIL");
- }
- break;
- case VG_JOIN_MITER: {
- logptr.append("VG_JOIN_MITER");
- }
- break;
- case VG_JOIN_ROUND: {
- logptr.append("VG_JOIN_ROUND");
- }
- break;
- case VG_JOIN_BEVEL: {
- logptr.append("VG_JOIN_BEVEL");
- }
- case VG_EVEN_ODD:
- logptr.append("VG_EVEN_ODD");
- break;
- case VG_NON_ZERO:
- logptr.append("VG_NON_ZERO");
- break;
- default: {
- logptr.append(value);
- }
- break;
- };
-
- logptr.append(")");
- qDebug() << logptr.data();
- return;
-}
-
-void HbTlvRenderer::logvgSetXv(VGParamType type, VGint count, qint8 vtype, VGint* /*data*/)
-{
- QByteArray logptr;
- logptr.append("vgSet");
- logptr.append(vtype);
- logptr.append("v(");
-
- switch (type) {
- case VG_STROKE_DASH_PATTERN:
- logptr.append("VG_STROKE_DASH_PATTERN");
- break;
- case VG_SCISSOR_RECTS:
- logptr.append("VG_SCISSOR_RECTS");
- break;
- case VG_CLEAR_COLOR:
- logptr.append("VG_CLEAR_COLOR");
- break;
- case VG_STROKE_LINE_WIDTH: {
- logptr.append("VG_STROKE_LINE_WIDTH");
- }
- break;
- case VG_STROKE_MITER_LIMIT: {
- logptr.append("VG_STROKE_MITER_LIMIT");
- }
- break;
- case VG_STROKE_DASH_PHASE: {
- logptr.append("VG_STROKE_DASH_PHASE");
- }
- break;
- case VG_MATRIX_MODE: {
- logptr.append("VG_MATRIX_MODE");
- }
- break;
- case VG_FILL_RULE: {
- logptr.append("VG_FILL_RULE");
- }
- break;
- case VG_IMAGE_QUALITY: {
- logptr.append("VG_IMAGE_QUALITY");
- }
- break;
- case VG_IMAGE_MODE: {
- logptr.append("VG_IMAGE_MODE");
- }
- break;
- case VG_RENDERING_QUALITY: {
- logptr.append("VG_RENDERING_QUALITY");
- }
- break;
- case VG_BLEND_MODE: {
- logptr.append("VG_BLEND_MODE");
- }
- break;
- case VG_MASKING: {
- logptr.append("VG_MASKING");
- }
- break;
- case VG_SCISSORING: {
- logptr.append("VG_SCISSORING");
- }
- break;
- case VG_PIXEL_LAYOUT: {
- logptr.append("VG_PIXEL_LAYOUT");
- }
- break;
- case VG_FILTER_FORMAT_LINEAR: {
- logptr.append("VG_FILTER_FORMAT_LINEAR");
- }
- break;
- case VG_FILTER_FORMAT_PREMULTIPLIED: {
- logptr.append("VG_FILTER_FORMAT_PREMULTIPLIED");
- }
- break;
- case VG_FILTER_CHANNEL_MASK: {
- logptr.append("VG_FILTER_CHANNEL_MASK");
- }
- break;
- case VG_STROKE_CAP_STYLE: {
- logptr.append("VG_STROKE_CAP_STYLE");
- }
- break;
- case VG_STROKE_JOIN_STYLE: {
- logptr.append("VG_STROKE_JOIN_STYLE");
- }
- break;
- case VG_STROKE_DASH_PHASE_RESET: {
- logptr.append("VG_STROKE_DASH_PHASE_RESET");
- }
- break;
- case VG_SCREEN_LAYOUT: {
- logptr.append("VG_SCREEN_LAYOUT");
- }
- break;
- case VG_MAX_SCISSOR_RECTS: {
- logptr.append("VG_MAX_SCISSOR_RECTS");
- }
- break;
- case VG_MAX_DASH_COUNT: {
- logptr.append("VG_MAX_DASH_COUNT");
- }
- break;
- case VG_MAX_KERNEL_SIZE: {
- logptr.append("VG_MAX_KERNEL_SIZE");
- }
- break;
- case VG_MAX_SEPARABLE_KERNEL_SIZE: {
- logptr.append("VG_MAX_SEPARABLE_KERNEL_SIZE");
- }
- break;
- case VG_MAX_COLOR_RAMP_STOPS: {
- logptr.append("VG_MAX_COLOR_RAMP_STOPS");
- }
- break;
- case VG_MAX_IMAGE_WIDTH: {
- logptr.append("VG_MAX_IMAGE_WIDTH");
- }
- break;
- case VG_MAX_IMAGE_HEIGHT: {
- logptr.append("VG_MAX_IMAGE_HEIGHT");
- }
- break;
- case VG_MAX_IMAGE_PIXELS: {
- logptr.append("VG_MAX_IMAGE_PIXELS");
- }
- break;
- case VG_MAX_IMAGE_BYTES: {
- logptr.append("VG_MAX_IMAGE_BYTES");
- }
- break;
- case VG_MAX_FLOAT: {
- logptr.append("VG_MAX_FLOAT");
- }
- break;
- case VG_MAX_GAUSSIAN_STD_DEVIATION: {
- logptr.append("VG_MAX_GAUSSIAN_STD_DEVIATION");
- }
- break;
- default: {
- logptr.append("INVALID PARAMTYPE");
- }
- break;
- };
-
- logptr.append(", ");
- logptr.setNum((qint32)count, (qint32)10);
- logptr.append(")");
- qDebug() << logptr.data();
- return;
-}
-
-void HbTlvRenderer::logVgSetParameteri(VGHandle handle, VGint paramType, VGint value, int /*lpvalue*/)
-{
- QByteArray logptr;
- logptr.append("vgsetparameteri(");
- logptr.append(handle);
- logptr.append(", ");
-
- switch (paramType) {
- case VG_PAINT_TYPE: {
- logptr.append("VG_STROKE_LINE_WIDTH");
- }
- break;
- case VG_PAINT_COLOR: {
- logptr.append("VG_STROKE_LINE_WIDTH");
- }
- break;
- case VG_PAINT_COLOR_RAMP_SPREAD_MODE: {
- logptr.append("VG_STROKE_LINE_WIDTH");
- }
- break;
- case VG_PAINT_COLOR_RAMP_PREMULTIPLIED: {
- logptr.append("VG_STROKE_LINE_WIDTH");
- }
- break;
- case VG_PAINT_COLOR_RAMP_STOPS: {
- logptr.append("VG_STROKE_LINE_WIDTH");
- }
- break;
-
- /* Linear gradient paint parameters */
- case VG_PAINT_LINEAR_GRADIENT: {
- logptr.append("VG_STROKE_LINE_WIDTH");
- }
- break;
- /* Radial gradient paint parameters */
- case VG_PAINT_RADIAL_GRADIENT: {
- logptr.append("VG_STROKE_LINE_WIDTH");
- }
- break;
- /* Pattern paint parameters */
- case VG_PAINT_PATTERN_TILING_MODE: {
- logptr.append("VG_STROKE_LINE_WIDTH");
- }
- break;
- default: {
- logptr.append(paramType);
- }
- break;
- };
- logptr.append(", ");
-
- switch (value) {
- case VG_PAINT_TYPE_COLOR: {
- logptr.append("VG_STROKE_LINE_WIDTH");
- }
- break;
- case VG_PAINT_TYPE_LINEAR_GRADIENT: {
- logptr.append("VG_STROKE_LINE_WIDTH");
- }
- break;
- case VG_PAINT_TYPE_RADIAL_GRADIENT: {
- logptr.append("VG_STROKE_LINE_WIDTH");
- }
- break;
- case VG_PAINT_TYPE_PATTERN: {
- logptr.append("VG_STROKE_LINE_WIDTH");
- }
- break;
- default: {
- logptr.setNum((qint32)value, 10);
- }
- break;
- };
- logptr.append(")");
- qDebug() << logptr.data();
- return;
-}
-
-void HbTlvRenderer::logVgSetPaint(VGPaint paint, VGbitfield paintModes, qint32 /*Lpvalue*/)
-{
- QByteArray logptr;
- logptr.append("vgSetPaint(");
- logptr.append(paint);
- logptr.append(", ");
-
- switch (paintModes) {
- case VG_STROKE_PATH: {
- logptr.append("VG_STROKE_PATH");
- }
- break;
- case VG_FILL_PATH: {
- logptr.append("VG_FILL_PATH");
- }
- break;
- default: {
- logptr.setNum((qint32)paintModes, 10);
- }
- break;
- };
- logptr.append(")");
- qDebug() << logptr.data();
- return;
-}
-
-void HbTlvRenderer::logVgDrawPath(VGuint path, VGbitfield paintModes)
-{
- QByteArray logptr;
- logptr.append("vgDrawPath(");
- logptr.setNum((qint32)path, 10);
- logptr.append(", ");
- switch (paintModes) {
- case VG_STROKE_PATH: {
- logptr.append("VG_STROKE_PATH");
- }
- break;
- case VG_FILL_PATH: {
- logptr.append("VG_FILL_PATH");
- }
- break;
- case VG_FILL_PATH | VG_STROKE_PATH: {
- logptr.append("FILL & STROKE");
- }
- break;
- default: {
- logptr.setNum((qint32)paintModes, 10);
- }
- break;
- };
- logptr.append(")");
- qDebug() << logptr.data();
- return;
-}
-
-void HbTlvRenderer::logVgSetParameterfv(VGPaint handle, VGint paramtype, qint32 count, float* handlenum)
-{
- QByteArray logptr;
- logptr.append("vgSetParameterfv(");
- logptr.setNum((qint32)handle, 10);
- logptr.append(", ");
- logptr.setNum((qint32)handlenum, 10);
- logptr.append(", ");
- switch (paramtype) {
- case VG_PAINT_TYPE: {
- logptr.append("VG_PAINT_TYPE");
- }
- break;
- case VG_PAINT_COLOR: {
- logptr.append("VG_PAINT_COLOR");
- }
- break;
- case VG_PAINT_COLOR_RAMP_SPREAD_MODE: {
- logptr.append("VG_PAINT_COLOR_RAMP_SPREAD_MODE");
- }
- break;
- case VG_PAINT_COLOR_RAMP_PREMULTIPLIED: {
- logptr.append("VG_PAINT_COLOR_RAMP_PREMULTIPLIED");
- }
- break;
- case VG_PAINT_COLOR_RAMP_STOPS: {
- logptr.append("VG_PAINT_COLOR_RAMP_STOPS");
- }
- break;
- case VG_PAINT_LINEAR_GRADIENT: {
- logptr.append("VG_PAINT_LINEAR_GRADIENT");
- }
- break;
- case VG_PAINT_RADIAL_GRADIENT: {
- logptr.append("VG_PAINT_RADIAL_GRADIENT");
- }
- break;
- case VG_PAINT_PATTERN_TILING_MODE: {
- logptr.append("VG_PAINT_PATTERN_TILING_MODE");
- }
- break;
- default: {
- logptr.setNum((qint32)paramtype, 10);
- }
- break;
- };
- logptr.append(", ");
- logptr.setNum((qint32)count, 10);
- logptr.append(")");
- qDebug() << logptr.data();
- return;
-}
-
-void HbTlvRenderer::logvgImageSubData(VGImage imageHandle, const void* /* dataPtr*/, qint32 dataLength, VGint dataStride,
- VGImageFormat dataFormat, VGint x, VGint y, VGint width, VGint height)
-{
- QByteArray logPtr;
- logPtr.append("vgImageSubData(");
- logPtr.append(imageHandle);
- logPtr.append(",");
- logPtr.append(dataLength);
- logPtr.append(dataStride);
- logPtr.append(dataFormat);
- logPtr.append(x);
- logPtr.append(y);
- logPtr.append(width);
- logPtr.append(height);
- logPtr.append(")");
- qDebug() << logPtr.data();
-}
-#endif
-
--- a/src/hbcore/svgext/hbnvgdecoder/hbtlvrenderer_p.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,178 +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_TLVRENDERER_P_H
-#define HB_TLVRENDERER_P_H
-
-
-#include <VG/openvg.h>
-#include <VG/vgu.h>
-
-#include <QByteArray>
-#include <QPoint>
-#include <QSize>
-#include <QtGlobal>
-#include <QList>
-
-#include "hbtlvcommon_p.h"
-#include "hbnvgutil_p.h"
-#include "hbnvg_p.h"
-
-class HbNvgTlvIcon;
-class HbNvgIconData;
-
-class HbVgImageBinder;
-
-class HbTlvRenderer
-{
-
-public:
-
- HbTlvRenderer(const QByteArray &ptr, qint32 width, qint32 height);
-
- virtual ~HbTlvRenderer();
-
- virtual void execute();
-
- void setVgImageBinder(HbVgImageBinder *imageBinder) {
- mVgImageBinder = imageBinder;
- }
-
- void initialize();
-
-protected:
-
- void tlvVgSeti();
- void tlvVgSetf();
- void tlvVgSetParameteri();
- void tlvVgSetParameterf();
- void tlvVgSetParameterfv();
- void tlvVgSetColor();
- void tlvVgSetPaint();
- void tlvVgLoadMatrix();
- void tlvVgMultMatrix();
- void tlvVgLoadIdentity();
- void tlvVgScale();
- void tlvVgTranslate();
- void tlvVgAppendPathData();
- void tlvVgDrawPath();
- void tlvVgClearPath();
- void tlvVguRect();
- void tlvVguEllipse();
- void tlvVguRoundRect();
- void tlvVguLine();
- void tlvVgCreatePaint();
- void tlvVgSetiv();
- void tlvVgClear();
- void tlvVgSetfv();
- void tlvVgRotate();
- void tlvVgCreatePath();
- void tlvVgCreateImage();
- void tlvVgGetPixels();
- void tlvVgClearImage();
- void tlvVgImageSubData();
- void tlvVgDrawImage();
- void tlvVgDestroyImage();
- void tlvVgDestroyPaint();
- void tlvVgDestroyPath();
- void tlvVgPrepareToBindImage();
- void tlvVgBindImage();
- void tlvVgUnBindImage();
- void tlvVgFlush();
-
- virtual void execute(qint32 index);
-
-#ifdef HB_NVG_DEBUG
- //Command specific logging methods
- void logVgSeti(VGParamType type, VGint fvalue);
- void logVgSetf(VGParamType type, VGfloat fvalue);
- void logvgSetXv(VGParamType type, VGint count, qint8 vtype, VGint * data);
- void logVgSetParameteri(VGHandle handle, VGint paramType, VGint pvalue, qint32 Lpvalue);
- void logVgSetPaint(VGPaint paint, VGbitfield paintModes, qint32 Lpvalue);
- void logVgDrawPath(VGuint path, VGbitfield paintModes);
- void logVgSetParameterfv(VGPaint handle, VGint paramtype, qint32 count, float* handlenum);
- void logvgImageSubData(VGImage imageHandle, const void * dataPtr, qint32 dataLength, VGint dataStride,
- VGImageFormat dataFormat, VGint x, VGint y, VGint width, VGint height);
-#endif
-
-protected:
-
- typedef void (HbTlvRenderer::*VgApiCallBack)();
- VgApiCallBack vgapi[VgApiCount];
-
- HbNvgIconData * mNvgIconData;
- qint32 mDataLength;
- QSize mResizedCanvasSize;
-
- struct HbTlvVgHandlePair {
- enum HbHandleType {
- VgPath,
- VgPaint,
- VgImage
- };
- VGHandle mVgHandle;
- qint32 mTlvHandle;
- HbHandleType mHandleType;
- qint32 mCustomData;
-
- explicit HbTlvVgHandlePair(VGHandle vgHandle = 0, qint32 tlvHandle = 0,
- HbHandleType handleType = VgPaint, qint32 customData = 0)
- : mVgHandle(vgHandle),
- mTlvHandle(tlvHandle),
- mHandleType(handleType),
- mCustomData(customData) {
- }
- };
-
- VGHandle getHandle(qint32 index);
- VGHandle removeHandle(qint32 index);
- void getHandlePair(qint32 index, HbTlvVgHandlePair & pair);
-
- void setHandle(qint32 index, VGHandle handle);
-
- QPoint getTranslatedPoint(VGfloat *matrix, const QPoint &point);
- VGfloat minVal4(VGfloat x1, VGfloat x2, VGfloat x3, VGfloat x4);
- VGfloat maxVal4(VGfloat x1, VGfloat x2, VGfloat x3, VGfloat x4);
-
- VGPath mPathHandle;
-
- quint8 mNvgHeader[NvgHeaderSize];
- qint32 mTargetWidth;
- qint32 mTargetHeight;
- bool mScaled;
-
- VGfloat mUserMatrix[9];
- HbVgImageBinder * mVgImageBinder;
- qint32 mPrepareToBindImage;
- QList<HbTlvVgHandlePair > mTlvVgHandleList;
-
- HbNvgTlvIcon * mNvgTlvIcon;
- friend class HbNvgTlvIcon;
-
- DECLARE_HANDLECHECKER()
-};
-
-#endif
-
--- a/src/hbcore/svgext/hbtlvwrapper/hbtlvwrapper.cpp Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,238 +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 <QFile>
-#include <QTextStream>
-#include <gdi.h>
-#include <SVGRendererId.h>
-#include <hbtlvwrapper_p.h>
-#include "hbtlvwrapper_p_p.h"
-
-/*!
- @proto
- @hbcore
- \class HbTlvWrapper
-
- \brief HbTlvWrapper provides the NVG-TLV data when run on s60 baseport.
- The TLV data is constructed using the TLV Encoder in s60 SVGEngine.
- HbTlvWrapper is a singleton class. The NVG-TLV is used in the scenarios where the svg
- file can not be converted to nvg, e.g.: svg file containging group-opacity. Since the
- TLV is vector data the rendering would be faster using the sgimage when compared to
- rendering via QPixmap or QPicture.
-
-*/
-
-/*!
- \fn QByteArray HbTlvWrapper::getTLVEncodedData(QString& filename,QSizeF& size, Qt::AspectRatioMode aspectRatioM)
-
- This function returns the NVG-TLV data in the form of a bytearray. it accepts the
- svg filename, rendersize, aspect ratio as a parameter. This data later can be rendered using the HbNvgEngine's
- drawNvg().
-*/
-
-/*!
- \fn QByteArray HbTlvWrapper::getTLVEncodedDataFromDom(quint32 domhandle,QSizeF& size, Qt::AspectRatioMode aspectRatioM)
-
- This function returns the NVG-TLV data in the form of a bytearray. it accepts the
- handle to dom prepared previously by calling contentDimensions(). Also takes in
- rendersize, aspect ratio as a parameter. This data later can be rendered using the HbNvgEngine's
- drawNvg().
-*/
-const QString unicodeFormat("fffe");
-
-HbTlvWrapper::HbTlvWrapper(): d_ptr(new HbTlvWrapperPrivate)
-{
-}
-
-HbTlvWrapper::~HbTlvWrapper()
-{
-}
-
-HbTlvWrapper *HbTlvWrapper::instance()
-{
- static HbTlvWrapper instance;
- return &instance;
-}
-
-const QByteArray HbTlvWrapper::getTlvEncodedData(const QString& filename, const QSizeF& size, Qt::AspectRatioMode aspectRatioMode)
-{
- return(d_ptr->getTlvEncodedData(filename, size, aspectRatioMode));
-}
-
-const QByteArray HbTlvWrapper::getTlvEncodedDataFromDom(const quint32& domhandle, QSizeF& size, Qt::AspectRatioMode aspectRatioMode)
-{
- return (d_ptr->getTlvEncodedDataFromDom(domhandle, size, aspectRatioMode));
-}
-
-const QSize HbTlvWrapper::contentDimensions(QString& filename, quint32& domhandle)
-{
- return(d_ptr->contentDimensions(filename, domhandle));
-}
-
-HbTlvWrapperPrivate::HbTlvWrapperPrivate()
-{
- // Dummy bitmap for s60 engine's constructl.
- bitmap = new CFbsBitmap;
- TFontSpec spec;
- TRAPD(err, s60SvgEngine = CSvgEngineInterfaceImpl::NewL(bitmap, 0, spec, ESVGRendererTLV));
-}
-HbTlvWrapperPrivate::~HbTlvWrapperPrivate()
-{
- delete bitmap;
- bitmap = 0;
-
- delete s60SvgEngine;
- s60SvgEngine = 0;
-}
-
-const QByteArray HbTlvWrapperPrivate::getTlvEncodedData(const QString& filename, const QSizeF& size, Qt::AspectRatioMode aspectRatioMode)
-{
-#ifdef __TLV_
- TInt domhandle;
- QFile file(filename);
- if (!file.open(QIODevice::NotOpen | QIODevice::ReadOnly)) {
- return QByteArray();
- }
-
- QByteArray isUniCoded = file.read(2).toHex();
- file.seek(0);
- QByteArray byteArray;
- if (isUniCoded == unicodeFormat) {
- QTextStream in(&file);
- QString data = in.readAll();
- byteArray = data.toUtf8();
- } else {
- byteArray = file.readAll();
- }
-
- file.close();
-
- TPtrC8 fileDataPtr8((TUint8 *)(byteArray.constData()));
- s60SvgEngine->PrepareDom(fileDataPtr8, domhandle);
-
- TSize bitmapsize(size.width(), size.height());
- s60SvgEngine->UseDom(domhandle, bitmap, 0, bitmapsize, ENone, ENone);
- // Aspect ratio setting
- TSvgPreserveAspectAlignType preserveAspectSetting = ESvgPreserveAspectRatio_XmidYmid;
- TSvgMeetOrSliceType smilFitSetting = ESvgMeetOrSlice_Meet;;
- switch (aspectRatioMode) {
-
- case Qt::IgnoreAspectRatio: {
- preserveAspectSetting = ESvgPreserveAspectRatio_None;
- break;
- }
- case Qt::KeepAspectRatio: {
- break;
- }
- case Qt::KeepAspectRatioByExpanding: {
- smilFitSetting = ESvgMeetOrSlice_Slice;
- break;
- }
- default: {
- break;
- }
- }
- s60SvgEngine->SetPreserveAspectRatio((CSvgDocumentImpl*)domhandle, preserveAspectSetting, smilFitSetting, ETrue);
- s60SvgEngine->Start();
- const TPtrC8 des = s60SvgEngine->TLVEncodedData();
-
- s60SvgEngine->DeleteDom(domhandle);
-
- return (QByteArray((const char *)des.Ptr(), des.Length()));
-#else
- return QByteArray();
-#endif
-}
-
-const QByteArray HbTlvWrapperPrivate::getTlvEncodedDataFromDom(const quint32& domhandle, QSizeF& size, Qt::AspectRatioMode aspectRatioMode)
-{
-#ifdef __TLV_
- TSize bitmapsize(size.width(), size.height());
- s60SvgEngine->UseDom(domhandle, bitmap, 0, bitmapsize, ENone, ENone);
- // Aspect ratio setting
- TSvgPreserveAspectAlignType preserveAspectSetting = ESvgPreserveAspectRatio_XmidYmid;
- TSvgMeetOrSliceType smilFitSetting = ESvgMeetOrSlice_Meet;
- switch (aspectRatioMode) {
-
- case Qt::IgnoreAspectRatio: {
- preserveAspectSetting = ESvgPreserveAspectRatio_None;
- break;
- }
- case Qt::KeepAspectRatio: {
- break;
- }
- case Qt::KeepAspectRatioByExpanding: {
- smilFitSetting = ESvgMeetOrSlice_Slice;
- break;
- }
- default: {
- break;
- }
- }
- s60SvgEngine->SetPreserveAspectRatio((CSvgDocumentImpl*)domhandle, preserveAspectSetting, smilFitSetting, EFalse);
- s60SvgEngine->Start();
- const TPtrC8 des = s60SvgEngine->TLVEncodedData();
-
- s60SvgEngine->DeleteDom(domhandle);
- return (QByteArray((const char *)des.Ptr(), des.Length()));
-#else
- return QByteArray();
-#endif
-}
-const QSize HbTlvWrapperPrivate::contentDimensions(QString& filename, quint32& domhandle)
-{
-#ifdef __TLV_
- TInt handle;
- QFile file(filename);
- if (!file.open(QIODevice::NotOpen | QIODevice::ReadOnly)) {
- return QSize();
- }
-
- QByteArray isUniCoded = file.read(2).toHex();
- file.seek(0);
- QByteArray byteArray;
- if (isUniCoded == unicodeFormat) {
- QTextStream in(&file);
- QString data = in.readAll();
- byteArray = data.toUtf8();
- } else {
- byteArray = file.readAll();
- }
-
- file.close();
-
- TPtrC8 ptr8((TUint8 *)(byteArray.constData()));
- s60SvgEngine->PrepareDom(ptr8, handle);
- TSize dummysize;
- s60SvgEngine->UseDom(handle, bitmap, 0, dummysize, ENone, ENone);
- s60SvgEngine->ChooseViewBoxIfNotSet(handle);
- contentsize = s60SvgEngine->ContentDimensions();
- domhandle = handle;
-
- return(QSize(contentsize.iWidth, contentsize.iHeight));
-#else
- return QSize();
-#endif
-}
-
--- a/src/hbcore/svgext/hbtlvwrapper/hbtlvwrapper.pri Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +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 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
-
-PRIVATE_HEADERS += $$PWD/hbtlvwrapper_p.h
-
-PRIVATE_HEADERS += $$PWD/hbtlvwrapper_p_p.h
-
-SOURCES += $$PWD/hbtlvwrapper.cpp
--- a/src/hbcore/svgext/hbtlvwrapper/hbtlvwrapper_p.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +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 HBTLVWRAPPER_P_H
-#define HBTLVWRAPPER_P_H
-
-#include <QByteArray>
-#include <QSizeF>
-#include <QObject>
-#include <hbglobal.h>
-
-class HbTlvWrapperPrivate;
-
-class HB_CORE_PRIVATE_EXPORT HbTlvWrapper
-{
-public:
- static HbTlvWrapper *instance();
- const QByteArray getTlvEncodedData(const QString& filename, const QSizeF& size, Qt::AspectRatioMode aspectRatioMode);
- const QByteArray getTlvEncodedDataFromDom(const quint32& domhandle, QSizeF& size, Qt::AspectRatioMode aspectRatioMode);
- const QSize contentDimensions(QString& filename, quint32& domhandle);
-private:
- HbTlvWrapper();
- ~HbTlvWrapper();
- Q_DISABLE_COPY(HbTlvWrapper)
-private:
- HbTlvWrapperPrivate *d_ptr;
-};
-
-#endif // HBTLVWRAPPER_P_H
-
--- a/src/hbcore/svgext/hbtlvwrapper/hbtlvwrapper_p_p.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbCore module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#ifndef HBTLVWRAPPER_P_P_H
-#define HBTLVWRAPPER_P_P_H
-
-#include <QByteArray>
-#include <QSizeF>
-#include <SVGEngineInterfaceImpl.h>
-#include <fbs.h>
-
-class HbTlvWrapperPrivate
-{
-public:
- HbTlvWrapperPrivate();
- ~HbTlvWrapperPrivate();
- const QByteArray getTlvEncodedData(const QString& filename, const QSizeF& size, Qt::AspectRatioMode aspectRatioMode);
- const QByteArray getTlvEncodedDataFromDom(const quint32& domhandle, QSizeF& size, Qt::AspectRatioMode aspectRatioMode);
- const QSize contentDimensions(QString& filename, quint32& domhandle);
-private:
- CSvgEngineInterfaceImpl *s60SvgEngine;
- CFbsBitmap *bitmap;
- TSize contentsize;
-};
-
-#endif
-
--- a/src/hbcore/svgext/svgext.pri Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/svgext/svgext.pri Fri May 14 16:09:54 2010 +0300
@@ -28,4 +28,3 @@
DEPENDPATH += $$PWD
include(hbnvgdecoder/hbnvgdecoder.pri)
-include(hbtlvwrapper/hbtlvwrapper.pri)
--- a/src/hbcore/theme/hbeffecttheme_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/theme/hbeffecttheme_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -26,11 +26,19 @@
#include <QDebug>
#include <QDir>
+#include "hbthemecommon_p.h"
#include "hbstandarddirs_p.h"
#include "hbinstance.h"
#include "hbeffecttheme_p.h"
#include "hbthemeutils_p.h"
#include "hbeffectinternal_p.h"
+#include "hbthemeindex_p.h"
+#include "hbtheme.h"
+#include "hbtheme_p.h"
+
+#ifdef Q_OS_SYMBIAN
+static const char *effectFileSuffix = ".fxml";
+#endif
class HB_AUTOTEST_EXPORT HbEffectThemePrivate
{
@@ -38,7 +46,7 @@
HbEffectThemePrivate();
~HbEffectThemePrivate();
- void initialise(const QString &dir);
+ void initialise(const QString &themeName);
QString mThemeName;
QStringList mDirList;
QStringList mListOfExistingFolders;
@@ -47,8 +55,9 @@
void HbEffectThemePrivate::initialise(const QString &themeName)
{
mThemeName = themeName;
+
QMap<int, QString> maplist = HbThemeUtils::constructHierarchyListWithPathInfo(
- QString(), mThemeName, Hb::EffectResource);
+ QString(), mThemeName, Hb::EffectResource);
mDirList.clear();
@@ -57,8 +66,7 @@
mDirList.append(list.at(i));
}
- mListOfExistingFolders = HbStandardDirs::findExistingFolderList(mDirList, mThemeName,
- Hb::EffectResource);
+ mListOfExistingFolders = HbStandardDirs::findExistingFolderList(mDirList, mThemeName, Hb::EffectResource);
}
HbEffectThemePrivate::HbEffectThemePrivate()
@@ -80,10 +88,28 @@
QString HbEffectTheme::getEffectXml(const QString &fileNameLogical, bool &fromTheme) const
{
- fromTheme = false;
+#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
+
foreach (const QString &dir, d_ptr->mListOfExistingFolders) {
QString candidateFullName = dir + fileNameLogical + ".fxml";
QFile resource(candidateFullName);
--- a/src/hbcore/theme/hbtheme.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/theme/hbtheme.cpp Fri May 14 16:09:54 2010 +0300
@@ -168,10 +168,6 @@
HbThemeUtils::updateThemeSetting(HbThemeUtils::CurrentThemeSetting, newTheme);
}
- // Clear the theme index table offsets as the theme has changed.
- // New offsets will be retrieved from server when the index is accessed.
- themeIndex.clear();
-
iconTheme.setCurrentTheme(newTheme);
HbColorTheme::instance()->setCurrentTheme(newTheme);
HbEffectTheme::instance()->setCurrentTheme(newTheme);
--- a/src/hbcore/theme/hbtheme.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/theme/hbtheme.h Fri May 14 16:09:54 2010 +0300
@@ -61,6 +61,8 @@
friend class HbWidgetLoader;
friend class HbEffectController;
friend class HbDeviceProfile;
+ friend class HbEffectTheme;
+ friend class HbThemeIndexResource;
Q_DECLARE_PRIVATE_D( d_ptr, HbTheme )
Q_DISABLE_COPY(HbTheme)
};
--- a/src/hbcore/theme/hbtheme_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/theme/hbtheme_p.h Fri May 14 16:09:54 2010 +0300
@@ -45,7 +45,6 @@
public:
QString currentTheme;
HbIconTheme iconTheme;
- ThemeIndexTables themeIndex;
HbTheme* q_ptr;
};
--- a/src/hbcore/theme/hbthemeclient_generic_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/theme/hbthemeclient_generic_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -40,7 +40,13 @@
#define WAIT_TIME_TO_CONNECT_TO_SERVER 500
#define WAIT_TIME_TO_START_SERVER 5000
-static const QString SERVERFILEPATH = QLatin1String(HB_BIN_DIR) + QDir::separator() + QLatin1String("hbthemeserver");
+#if defined(Q_OS_SYMBIAN) || defined(Q_OS_WIN)
+static const QString SERVERFILENAME = QLatin1String("hbthemeserver.exe");
+#else
+static const QString SERVERFILENAME = QLatin1String("hbthemeserver");
+#endif
+static const QString SERVERFILEPATH = QLatin1String(HB_BIN_DIR) + QDir::separator() + SERVERFILENAME;
+static const QStringList SERVERARGUMENTS = QStringList() << QLatin1String("-start");
/**
* Constructor
@@ -60,16 +66,22 @@
localSocket->connectToServer(THEME_SERVER_NAME);
// This logic needs to be improved
- bool success = localSocket->waitForConnected( WAIT_TIME_TO_CONNECT_TO_SERVER );
+ bool success = localSocket->waitForConnected(WAIT_TIME_TO_CONNECT_TO_SERVER);
#ifdef THEME_SERVER_TRACES
qDebug() << Q_FUNC_INFO << "Socket Connect status: " << success;
-#endif
+#endif
if(!success) {
QProcess *newProcess = new QProcess();
- newProcess->start(SERVERFILEPATH);
- success = newProcess->waitForStarted( WAIT_TIME_TO_START_SERVER );
+ if (QFile::exists(SERVERFILENAME)) {
+ newProcess->start(SERVERFILENAME, SERVERARGUMENTS);
+ success = newProcess->waitForStarted(WAIT_TIME_TO_START_SERVER);
+ }
+ if (!success) {
+ newProcess->start(SERVERFILEPATH, SERVERARGUMENTS);
+ success = newProcess->waitForStarted(WAIT_TIME_TO_START_SERVER);
+ }
#ifdef THEME_SERVER_TRACES
qDebug() << Q_FUNC_INFO << "Server Start Status: " << success << "Error = " << newProcess->error ();
#endif
@@ -120,7 +132,8 @@
QIcon::Mode mode,
bool mirrored,
HbIconLoader::IconLoaderOptions options,
- const QColor &color)
+ const QColor &color,
+ HbRenderingMode renderMode)
{
#ifdef THEME_SERVER_TRACES
qDebug() << Q_FUNC_INFO;
@@ -143,8 +156,9 @@
outputDataStream << mode;
outputDataStream << mirrored;
outputDataStream << options;
- outputDataStream << color;
-
+ outputDataStream << color;
+ outputDataStream << renderMode;
+
//@to do block the segment upto the connect
// changeTheme() slot should not be called for pixmap lookup case. So disconnecting.
disconnect(localSocket, SIGNAL(readyRead()), this, SLOT(changeTheme()));
@@ -160,8 +174,8 @@
int temp;
inputDataStream >> temp;
request = (HbThemeServerRequest)temp;
-
- // Need to handle the situation when both themechange
+
+ // Need to handle the situation when both themechange
// request and pixmap info comes at the same time
// Just posting the ThemeChnaged event so that it can be handled
// as next event and current pixmap load is not interrupted
@@ -188,7 +202,7 @@
}
}
}
-
+
// connecting again to handle theme change request from server
connect(localSocket, SIGNAL(readyRead()), this, SLOT(changeTheme()));
return iconInfo;
@@ -196,7 +210,7 @@
/*
* HbThemeClientPrivate::getSharedLayoutDefs()
- *
+ *
* Returns the layout definition for the given file name,layout name,section name
*/
@@ -282,7 +296,7 @@
outputDataStream << (int)requestType;
outputDataStream << fileName;
outputDataStream << priority;
-
+
disconnect(localSocket, SIGNAL(readyRead()), this, SLOT(changeTheme()));
localSocket->write(outputByteArray);
localSocket->flush();
@@ -294,14 +308,14 @@
QDataStream inputDataStream(inputByteArray);
HbThemeServerRequest request;
int temp;
-
+
//-1 represents invalid offset
int cssOffset = -1;
inputDataStream >> temp;
request = (HbThemeServerRequest)temp;
-
- // Need to handle the situation when both themechange
+
+ // Need to handle the situation when both themechange
// request and stylesheet lookup info comes at the same time
// Just posting the ThemeChanged event so that it can be handled
// as next event and current stylesheet load is not interrupted
@@ -328,10 +342,10 @@
}
}
}
-
+
// connecting again to handle theme change request from server
connect(localSocket, SIGNAL(readyRead()), this, SLOT(changeTheme()));
-
+
//if a valid offset is obtained from the server return this offset
if (cssOffset >= 0) {
return HbMemoryUtils::getAddress<HbCss::StyleSheet>(
@@ -343,7 +357,7 @@
/**
* HbThemeClientPrivate::deviceProfiles()
- */
+ */
HbDeviceProfileList *HbThemeClientPrivate::deviceProfiles()
{
#ifdef THEME_SERVER_TRACES
@@ -386,7 +400,7 @@
}
}
}else if (EThemeSelection==request){
- // Asked for DeviceProfiles Offset, got theme change request..
+ // Asked for DeviceProfiles Offset, got theme change request..
// clean theme name
QString themeName;
inputDataStream >> themeName;
@@ -413,64 +427,6 @@
}
/**
- * HbThemeClientPrivate::globalCacheOffset()
- */
-int HbThemeClientPrivate::globalCacheOffset()
-{
-#ifdef THEME_SERVER_TRACES
- qDebug() << Q_FUNC_INFO;
-#endif
-
- QByteArray outputByteArray;
- QDataStream outputDataStream(&outputByteArray, QIODevice::WriteOnly);
- HbThemeServerRequest requestType = ESecondaryCacheOffset;
-
- outputDataStream << (int)requestType;
-
- disconnect(localSocket, SIGNAL(readyRead()), this, SLOT(changeTheme()));
- localSocket->write(outputByteArray);
- localSocket->flush();
- localSocket->waitForReadyRead();
-
- QByteArray inputByteArray = localSocket->readAll();
- QDataStream inputDataStream(inputByteArray);
- HbThemeServerRequest request;
- int temp;
-
- //-1 represents invalid offset
- int sharedCacheOffset = -1;
-
- inputDataStream >> temp;
- request = (HbThemeServerRequest)temp;
-
- if (ESecondaryCacheOffset == request) {
- inputDataStream >> sharedCacheOffset;
- if (!inputDataStream.atEnd()) {
- inputDataStream >> temp;
- request = (HbThemeServerRequest)temp;
- if (EThemeSelection==request) {
- QCoreApplication::postEvent(this, new HbEvent(HbEvent::ThemeChanged));
- }
- }
- }else if (EThemeSelection == request){
- QString themeName;
- inputDataStream >> themeName;
- QCoreApplication::postEvent(this, new HbEvent(HbEvent::ThemeChanged));
- if (!inputDataStream.atEnd()) {
- inputDataStream >> temp;
- request = (HbThemeServerRequest)temp;
- if (ESecondaryCacheOffset== request) {
- inputDataStream >> sharedCacheOffset;
- }
- }
- }
- // connecting again to handle theme change request from server
- connect(localSocket, SIGNAL(readyRead()), this, SLOT(changeTheme()));
- return sharedCacheOffset;
-}
-
-
-/**
* HbThemeClientPrivate::getSharedEffect()
*/
HbEffectFxmlData *HbThemeClientPrivate::getSharedEffect(const QString &filePath)
@@ -489,7 +445,7 @@
outputDataStream << (int)requestType;
outputDataStream << filePath;
-
+
disconnect(localSocket, SIGNAL(readyRead()), this, SLOT(changeTheme()));
localSocket->write(outputByteArray);
localSocket->flush();
@@ -503,14 +459,14 @@
QDataStream inputDataStream(inputByteArray);
HbThemeServerRequest request;
int temp;
-
+
//-1 represents invalid offset
int effectOffset = -1;
inputDataStream >> temp;
request = (HbThemeServerRequest)temp;
-
- // Need to handle the situation when both themechange
+
+ // Need to handle the situation when both themechange
// request and effect lookup info comes at the same time
// Just posting the ThemeChanged event so that it can be handled
// as next event and current effect load is not interrupted
@@ -537,27 +493,20 @@
}
}
}
-
+
// connecting again to handle theme change request from server
connect(localSocket, SIGNAL(readyRead()), this, SLOT(changeTheme()));
-
+
//if a valid offset is obtained from the server return this offset
if (effectOffset >= 0) {
return HbMemoryUtils::getAddress<HbEffectFxmlData>(
HbMemoryManager::SharedMemory, effectOffset);
- }
+ }
else {
return 0;
}
}
-void HbThemeClientPrivate::getThemeIndexTables(ThemeIndexTables &tables)
-{
- Q_UNUSED(tables)
- // Not implemented here...
-}
-
-
/**
* HbThemeClientPrivate::addSharedEffect()
*/
@@ -576,7 +525,7 @@
outputDataStream << (int)requestType;
outputDataStream << filePath;
-
+
disconnect(localSocket, SIGNAL(readyRead()), this, SLOT(changeTheme()));
localSocket->write(outputByteArray);
localSocket->flush();
@@ -590,17 +539,17 @@
QDataStream inputDataStream(inputByteArray);
HbThemeServerRequest request;
int temp;
-
+
//-1 represents an error adding file to server
int effectAddReply = -1;
inputDataStream >> temp;
request = (HbThemeServerRequest)temp;
-
+
//TODO how to really handle situation when adding an effect when theme changes??
- // Need to handle the situation when both themechange
+ // Need to handle the situation when both themechange
// request and effect lookup info comes at the same time
// Just posting the ThemeChanged event so that it can be handled
// as next event and current effect load is not interrupted
@@ -627,7 +576,7 @@
}
}
}
-
+
// connecting again to handle theme change request from server
connect(localSocket, SIGNAL(readyRead()), this, SLOT(changeTheme()));
@@ -654,7 +603,7 @@
#ifdef THEME_SERVER_TRACES
qDebug() << Q_FUNC_INFO << "recognizer: "<<request;
#endif
-
+
if(EThemeSelection==request) {
QString themeName;
inputDataStream >> themeName;
@@ -680,7 +629,7 @@
int tempType;
dataStream >> tempType;
iconInfo.type = (HbIconFormatType)tempType;
-
+
if( iconInfo.type == OTHER_SUPPORTED_FORMATS || iconInfo.type == SVG ){
dataStream >> iconInfo.pixmapData.offset;
dataStream >> iconInfo.pixmapData.width;
@@ -695,7 +644,7 @@
dataStream >> iconInfo.picData.dataSize;
dataStream >> iconInfo.picData.defaultWidth;
dataStream >> iconInfo.picData.defaultHeight;
-
+
}
else if(iconInfo.type == NVG ){
dataStream >> iconInfo.nvgData.offset;
@@ -712,12 +661,10 @@
*/
void HbThemeClientPrivate::handleThemeChange(const QString &themeName)
{
- if(!(hbInstance->theme()->name() == themeName)) {
#ifdef THEME_SERVER_TRACES
- qDebug() << Q_FUNC_INFO <<"themeChanged(): called";
+ qDebug() << Q_FUNC_INFO <<"themeChanged(): called";
#endif
- hbInstance->theme()->d_ptr->handleThemeChange(themeName);
- }
+ hbInstance->theme()->d_ptr->handleThemeChange(themeName);
}
/**
@@ -740,12 +687,13 @@
Qt::AspectRatioMode aspectRatioMode,
QIcon::Mode mode,
bool mirrored,
- const QColor& color)
+ const QColor& color,
+ HbRenderingMode renderMode)
{
if ( !clientConnected ) {
return;
}
-
+
QByteArray outputByteArray;
QDataStream outputDataStream(&outputByteArray, QIODevice::WriteOnly);
HbThemeServerRequest requestType;
@@ -758,7 +706,8 @@
outputDataStream << mirrored;
//outputDataStream << options;
outputDataStream << color;
-
+ outputDataStream << renderMode;
+
//@to do block the segment upto the connect
// changeTheme() slot should not be called for pixmap lookup case. So disconnecting.
disconnect(localSocket, SIGNAL(readyRead()), this, SLOT(changeTheme()));
@@ -772,13 +721,13 @@
int temp;
inputDataStream >> temp;
request = (HbThemeServerRequest)temp;
-
- // Need to handle the situation when both themechange
+
+ // Need to handle the situation when both themechange
// request and Reference count decrement comes at the same time
// Just posting the ThemeChnaged event so that it can be handled
// as next event and current pixmap load is not interrupted
if (EUnloadIcon ==request) {
-
+
if (!inputDataStream.atEnd()) {
inputDataStream >> temp;
request = (HbThemeServerRequest)temp;
@@ -796,32 +745,33 @@
inputDataStream >> temp;
request = (HbThemeServerRequest)temp;
if (EUnloadIcon == request) {
-
+
}
}
}
-
+
// connecting again to handle theme change request from server
connect(localSocket, SIGNAL(readyRead()), this, SLOT(changeTheme()));
-
+
}
/**
* HbThemeClientPrivate::unLoadMultiIcon()
*
* unload multiple icons
-*/
-void HbThemeClientPrivate::unLoadMultiIcon(const QStringList& iconPathList,
+*/
+void HbThemeClientPrivate::unLoadMultiIcon(const QStringList& iconPathList,
const QVector<QSizeF> &sizeList,
Qt::AspectRatioMode aspectRatioMode,
QIcon::Mode mode,
bool mirrored,
- const QColor &color)
+ const QColor &color,
+ HbRenderingMode renderMode)
{
if ( !clientConnected ) {
return;
}
-
+
QByteArray outputByteArray;
QDataStream outputDataStream(&outputByteArray, QIODevice::WriteOnly);
HbThemeServerRequest requestType;
@@ -831,13 +781,14 @@
outputDataStream << iconPathList[i];
outputDataStream << sizeList[i];
}
-
+
outputDataStream << aspectRatioMode;
outputDataStream << mode;
outputDataStream << mirrored;
//outputDataStream << options;
outputDataStream << color;
-
+ outputDataStream << renderMode;
+
//@to do block the segment upto the connect
// changeTheme() slot should not be called for pixmap lookup case. So disconnecting.
disconnect(localSocket, SIGNAL(readyRead()), this, SLOT(changeTheme()));
@@ -851,13 +802,13 @@
int temp;
inputDataStream >> temp;
request = (HbThemeServerRequest)temp;
-
- // Need to handle the situation when both themechange
+
+ // Need to handle the situation when both themechange
// request and Reference count decrement comes at the same time
// Just posting the ThemeChnaged event so that it can be handled
// as next event and current pixmap load is not interrupted
if (EUnloadMultiIcon ==request) {
-
+
if (!inputDataStream.atEnd()) {
inputDataStream >> temp;
request = (HbThemeServerRequest)temp;
@@ -875,25 +826,26 @@
inputDataStream >> temp;
request = (HbThemeServerRequest)temp;
if (EUnloadIcon == request) {
-
+
}
}
}
-
+
// connecting again to handle theme change request from server
connect(localSocket, SIGNAL(readyRead()), this, SLOT(changeTheme()));
}
-HbSharedIconInfo HbThemeClientPrivate::getMultiPartIconInfo(const QStringList &multiPartIconList,
+HbSharedIconInfo HbThemeClientPrivate::getMultiPartIconInfo(const QStringList &multiPartIconList,
const HbMultiPartSizeData &multiPartIconData ,
const QSizeF &size,
Qt::AspectRatioMode aspectRatioMode,
QIcon::Mode mode,
bool mirrored,
HbIconLoader::IconLoaderOptions options,
- const QColor &color)
+ const QColor &color,
+ HbRenderingMode renderMode)
{
@@ -908,12 +860,12 @@
int noOfPieces = 1;
- if (multiPartIconData.multiPartIconId.contains("_3PV",Qt::CaseInsensitive)
+ if (multiPartIconData.multiPartIconId.contains("_3PV",Qt::CaseInsensitive)
|| multiPartIconData.multiPartIconId.contains("_3PH",Qt::CaseInsensitive)) {
noOfPieces = 3;
} else if (multiPartIconData.multiPartIconId.contains("_9P",Qt::CaseInsensitive)) {
noOfPieces = 9;
- }
+ }
QByteArray outputByteArray;
QDataStream outputDataStream(&outputByteArray, QIODevice::WriteOnly);
@@ -940,6 +892,7 @@
outputDataStream << mirrored;
outputDataStream << options;
outputDataStream << color;
+ outputDataStream << renderMode;
disconnect(localSocket, SIGNAL(readyRead()), this, SLOT(changeTheme()));
localSocket->write(outputByteArray);
localSocket->flush();
@@ -953,8 +906,8 @@
int temp;
inputDataStream >> temp;
request = (HbThemeServerRequest)temp;
-
- // Need to handle the situation when both themechange
+
+ // Need to handle the situation when both themechange
// request and pixmap info comes at the same time
// Just posting the ThemeChnaged event so that it can be handled
// as next event and current pixmap load is not interrupted
@@ -981,7 +934,7 @@
}
}
}
-
+
// connecting again to handle theme change request from server
connect(localSocket, SIGNAL(readyRead()), this, SLOT(changeTheme()));
return iconInfo;
@@ -991,16 +944,17 @@
* getMultiIconInfo function returns a list of HbSharedIconInfo
* for the given list of frameitems.
*/
-HbSharedIconInfoList HbThemeClientPrivate::getMultiIconInfo(const QStringList &multiPartIconList,
+HbSharedIconInfoList HbThemeClientPrivate::getMultiIconInfo(const QStringList &multiPartIconList,
const QVector<QSizeF> &sizeList,
Qt::AspectRatioMode aspectRatioMode,
QIcon::Mode mode,
bool mirrored,
HbIconLoader::IconLoaderOptions options,
- const QColor &color)
+ const QColor &color,
+ HbRenderingMode renderMode)
{
HbSharedIconInfoList sharedIconInfoList;
-
+
#ifdef THEME_SERVER_TRACES
qDebug() << Q_FUNC_INFO;
#endif
@@ -1022,6 +976,7 @@
outputDataStream << mirrored;
outputDataStream << options;
outputDataStream << color;
+ outputDataStream << renderMode;
disconnect(localSocket, SIGNAL(readyRead()), this, SLOT(changeTheme()));
localSocket->write(outputByteArray);
localSocket->flush();
@@ -1035,8 +990,8 @@
int temp;
inputDataStream >> temp;
request = (HbThemeServerRequest)temp;
-
- // Need to handle the situation when both themechange
+
+ // Need to handle the situation when both themechange
// request and pixmap info comes at the same time
// Just posting the ThemeChnaged event so that it can be handled
// as next event and current pixmap load is not interrupted
@@ -1067,10 +1022,10 @@
}
}
}
-
+
// connecting again to handle theme change request from server
connect(localSocket, SIGNAL(readyRead()), this, SLOT(changeTheme()));
-
+
return sharedIconInfoList;
}
@@ -1204,3 +1159,103 @@
// currently only supported in Symbian
return -1;
}
+
+/**
+ * HbThemeClientPrivate::switchRenderingMode()
+ */
+bool HbThemeClientPrivate::switchRenderingMode(HbRenderingMode renderMode)
+{
+ Q_UNUSED(renderMode);
+ return true;
+}
+
+#ifdef HB_THEME_SERVER_MEMORY_REPORT
+void HbThemeClientPrivate::createMemoryReport() const
+{
+ if ( !clientConnected ) {
+ return;
+ }
+
+ QByteArray outputByteArray;
+ QDataStream outputDataStream(&outputByteArray, QIODevice::WriteOnly);
+ HbThemeServerRequest requestType = ECreateMemoryReport;
+
+ outputDataStream << (int)requestType;
+
+ disconnect(localSocket, SIGNAL(readyRead()), this, SLOT(changeTheme()));
+ localSocket->write(outputByteArray);
+ localSocket->flush();
+}
+#endif
+
+
+/**
+ * HbThemeClientPrivate::typefaceInfo()
+ */
+HbTypefaceInfoVector *HbThemeClientPrivate::typefaceInfo()
+{
+#ifdef THEME_SERVER_TRACES
+ qDebug() << Q_FUNC_INFO;
+#endif
+
+ if ( !clientConnected ) {
+ return 0;
+ }
+
+ QByteArray outputByteArray;
+ QDataStream outputDataStream(&outputByteArray, QIODevice::WriteOnly);
+ HbThemeServerRequest requestType = ETypefaceOffset;
+
+ outputDataStream << (int)requestType;
+
+ disconnect(localSocket, SIGNAL(readyRead()), this, SLOT(changeTheme()));
+ localSocket->write(outputByteArray);
+ localSocket->flush();
+ localSocket->waitForReadyRead();
+
+ QByteArray inputByteArray = localSocket->readAll();
+ QDataStream inputDataStream(inputByteArray);
+ HbThemeServerRequest request;
+ int temp;
+
+ //-1 represents invalid offset
+ int typefaceOffset = -1;
+
+ inputDataStream >> temp;
+ request = (HbThemeServerRequest)temp;
+
+ if (ETypefaceOffset == request) {
+ inputDataStream >> typefaceOffset;
+ if (!inputDataStream.atEnd()) {
+ inputDataStream >> temp;
+ request = (HbThemeServerRequest)temp;
+ if (EThemeSelection==request) {
+ QCoreApplication::postEvent(this, new HbEvent(HbEvent::ThemeChanged));
+ }
+ }
+ }else if (EThemeSelection==request){
+ // Asked for Typeface Offset, got theme change request..
+ // clean theme name
+ QString themeName;
+ inputDataStream >> themeName;
+ QCoreApplication::postEvent(this, new HbEvent(HbEvent::ThemeChanged));
+ if (!inputDataStream.atEnd()) {
+ inputDataStream >> temp;
+ request = (HbThemeServerRequest)temp;
+ if (ETypefaceOffset== request) {
+ inputDataStream >> typefaceOffset;
+ }
+ }
+ }
+
+ // connecting again to handle theme change request from server
+ connect(localSocket, SIGNAL(readyRead()), this, SLOT(changeTheme()));
+
+ //if a valid offset is obtained from the server return this offset
+ if (typefaceOffset >= 0) {
+ return HbMemoryUtils::getAddress<HbTypefaceInfoVector>(
+ HbMemoryManager::SharedMemory, typefaceOffset);
+ } else {
+ return 0;
+ }
+}
--- a/src/hbcore/theme/hbthemeclient_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/theme/hbthemeclient_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -29,14 +29,13 @@
#include "hbmemoryutils_p.h"
static HbThemeClient *clientInst=0;
-static int sharedCacheOffset = -1;
/**
* Constructor
*/
HbThemeClient::HbThemeClient():d_ptr(new HbThemeClientPrivate)
{
-
+
}
/**
@@ -68,30 +67,32 @@
* \a options
* \a color
*
-
+
*/
-HbSharedIconInfo HbThemeClient::getSharedIconInfo(const QString& iconPath ,
+HbSharedIconInfo HbThemeClient::getSharedIconInfo(const QString& iconPath ,
const QSizeF &size,
Qt::AspectRatioMode aspectRatioMode,
QIcon::Mode mode,
bool mirrored,
HbIconLoader::IconLoaderOptions options,
- const QColor &color)
+ const QColor &color,
+ HbRenderingMode renderMode)
{
Q_D(HbThemeClient);
return d->getSharedIconInfo(iconPath,
size,
- aspectRatioMode,
- mode,
- mirrored,
+ aspectRatioMode,
+ mode,
+ mirrored,
options,
- color);
+ color,
+ renderMode);
}
/**
* HbThemeClient::getSharedBlob()
- *
- * \a name
+ *
+ * \a name
*/
QByteArray HbThemeClient::getSharedBlob(const QString &name)
{
@@ -102,7 +103,8 @@
QIcon::Normal,
false,
HbIconLoader::NoOptions,
- QColor());
+ QColor(),
+ ESWRendering);
return info.type == BLOB
? QByteArray::fromRawData(HbMemoryUtils::getAddress<char>(
HbMemoryManager::SharedMemory,
@@ -110,25 +112,20 @@
info.blobData.dataSize)
: QByteArray();
}
-
-
- HbSharedIconInfo HbThemeClient::getMultiPartIconInfo(const QStringList &multiPartIconList,
+
+
+ HbSharedIconInfo HbThemeClient::getMultiPartIconInfo(const QStringList &multiPartIconList,
const HbMultiPartSizeData &multiPartIconData ,
const QSizeF &size,
Qt::AspectRatioMode aspectRatioMode,
QIcon::Mode mode,
bool mirrored,
HbIconLoader::IconLoaderOptions options,
- const QColor &color)
+ const QColor &color,
+ HbRenderingMode renderMode)
{
Q_D(HbThemeClient);
- return d->getMultiPartIconInfo(multiPartIconList, multiPartIconData, size, aspectRatioMode, mode, mirrored, options, color);
-}
-
-void HbThemeClient::getThemeIndexTables(ThemeIndexTables &tables)
-{
- Q_D(HbThemeClient);
- d->getThemeIndexTables(tables);
+ return d->getMultiPartIconInfo(multiPartIconList, multiPartIconData, size, aspectRatioMode, mode, mirrored, options, color, renderMode);
}
/**
@@ -136,12 +133,12 @@
*
* \a fielName css filename
* \a priority layer priority
- */
+ */
HbCss::StyleSheet *HbThemeClient::getSharedStyleSheet(const QString &fileName, HbLayeredStyleLoader::LayerPriority priority)
{
int offset = -1;
if( HbLayeredStyleLoader::Priority_Core == priority ) {
- offset = sharedCacheItemOffset(fileName);
+ offset = sharedCacheItemOffset(HbSharedCache::Stylesheet, fileName);
}
if ( -1 != offset ) {
HbCss::StyleSheet *styleSheet = HbMemoryUtils::getAddress<HbCss::StyleSheet>(HbMemoryManager::SharedMemory,offset);
@@ -157,10 +154,10 @@
* \a fileName
* \a layout
* \a section
- */
+ */
HbWidgetLoader::LayoutDefinition *HbThemeClient::getSharedLayoutDefs(const QString &fileName,const QString &layout,const QString §ion)
{
- int offset = sharedCacheItemOffset(fileName + layout + section);
+ int offset = sharedCacheItemOffset(HbSharedCache::LayoutDefinition, fileName + layout + section);
if ( -1 != offset ) {
HbWidgetLoader::LayoutDefinition *layoutDefs =
HbMemoryUtils::getAddress<HbWidgetLoader::LayoutDefinition>(HbMemoryManager::SharedMemory,offset);
@@ -171,7 +168,7 @@
}
/**
* HbThemeClient::deviceProfiles()
- */
+ */
HbDeviceProfileList *HbThemeClient::deviceProfiles()
{
Q_D(HbThemeClient);
@@ -179,18 +176,15 @@
}
/**
- * HbThemeClient::globalCacheOffset()
- *
+ * HbThemeClient::typefaceInfo()
*/
-int HbThemeClient::globalCacheOffset()
+HbTypefaceInfoVector *HbThemeClient::typefaceInfo()
{
- if ( -1 == sharedCacheOffset ) {
- Q_D(HbThemeClient);
- sharedCacheOffset = d->globalCacheOffset();
- }
- return sharedCacheOffset;
+ Q_D(HbThemeClient);
+ return d->typefaceInfo();
}
+
/**
* HbThemeClient::notifyForegroundLostToServer()
*
@@ -205,10 +199,10 @@
* HbThemeClient::getSharedEffect()
*
* \a filePath
- */
+ */
HbEffectFxmlData *HbThemeClient::getSharedEffect(const QString &filePath)
{
- int offset = sharedCacheItemOffset(filePath);
+ int offset = sharedCacheItemOffset(HbSharedCache::Effect, filePath);
if ( -1 != offset ) {
HbEffectFxmlData *effectFxmlData = HbMemoryUtils::getAddress<HbEffectFxmlData>(HbMemoryManager::SharedMemory,offset);
return effectFxmlData;
@@ -221,10 +215,10 @@
* HbThemeClient::addSharedEffect()
*
* \a filePath
- */
+ */
bool HbThemeClient::addSharedEffect(const QString& filePath)
{
- int offset = sharedCacheItemOffset(filePath);
+ int offset = sharedCacheItemOffset(HbSharedCache::Effect, filePath);
if ( -1 != offset ) {
// effect already added.
return true;
@@ -243,22 +237,24 @@
* \a mirrored
* \a options
* \a color
-
+
*/
-void HbThemeClient::unloadIcon(const QString& iconPath ,
+void HbThemeClient::unloadIcon(const QString& iconPath ,
const QSizeF &size,
Qt::AspectRatioMode aspectRatioMode,
QIcon::Mode mode,
bool mirrored,
- const QColor &color)
+ const QColor &color,
+ HbRenderingMode renderMode)
{
Q_D(HbThemeClient);
return d->unloadIcon(iconPath,
size,
- aspectRatioMode,
- mode,
- mirrored,
- color);
+ aspectRatioMode,
+ mode,
+ mirrored,
+ color,
+ renderMode);
}
/**
@@ -271,20 +267,22 @@
* \a mirrored
* \a color
*/
-void HbThemeClient::unLoadMultiIcon(const QStringList& iconPathList,
+void HbThemeClient::unLoadMultiIcon(const QStringList& iconPathList,
const QVector<QSizeF> &sizeList,
Qt::AspectRatioMode aspectRatioMode,
QIcon::Mode mode,
bool mirrored,
- const QColor &color)
+ const QColor &color,
+ HbRenderingMode renderMode)
{
Q_D(HbThemeClient);
return d->unLoadMultiIcon(iconPathList,
sizeList,
- aspectRatioMode,
- mode,
- mirrored,
- color);
+ aspectRatioMode,
+ mode,
+ mirrored,
+ color,
+ renderMode);
}
/**
@@ -331,23 +329,10 @@
* \param key
*
*/
-int HbThemeClient::sharedCacheItemOffset(const QString & key)
+int HbThemeClient::sharedCacheItemOffset(HbSharedCache::ItemType type, const QString & key)
{
- if ( -1 == sharedCacheOffset ) {
- // No IPC call happened so far for the globalCacheOffset
- globalCacheOffset();
- }
- if ( -1 != sharedCacheOffset ) {
- HbSharedCache *sharedCache = HbMemoryUtils::getAddress<HbSharedCache>(HbMemoryManager::SharedMemory,sharedCacheOffset);
- int count = sharedCache->count();
- for(int i = 0; i < count ; i++ ) {
- if (sharedCache->at(i).key == key) {
- return sharedCache->at(i).offset;
- }
- }
- }
- // item not found in the secondary cache.
- return -1;
+ HbSharedCache *cache = HbSharedCache::instance();
+ return cache->offset(type, key);
}
#ifdef HB_THEME_SERVER_MEMORY_REPORT
@@ -372,10 +357,11 @@
QIcon::Mode mode,
bool mirrored,
HbIconLoader::IconLoaderOptions options,
- const QColor &color)
+ const QColor &color,
+ HbRenderingMode renderMode)
{
Q_D(HbThemeClient);
- return d->getMultiIconInfo(multiPartIconList, sizeList,aspectRatioMode, mode, mirrored, options, color);
+ return d->getMultiIconInfo(multiPartIconList, sizeList,aspectRatioMode, mode, mirrored, options, color, renderMode);
}
/**
@@ -408,3 +394,12 @@
return d->allocatedHeapMemory();
}
+/**
+ * switchRenderingMode IPC sent to themeserver
+ *
+ */
+bool HbThemeClient::switchRenderingMode(HbRenderingMode renderMode)
+{
+ Q_D(HbThemeClient);
+ return d->switchRenderingMode(renderMode);
+}
--- a/src/hbcore/theme/hbthemeclient_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/theme/hbthemeclient_p.h Fri May 14 16:09:54 2010 +0300
@@ -31,8 +31,10 @@
#include "hbwidgetloader_p.h"
#include "hbcssparser_p.h"
#include "hbdeviceprofiledatabase_p.h"
+#include "hbtypefaceinfodatabase_p.h"
#include "hblayeredstyleloader_p.h"
#include "hbthemeindex_p.h"
+#include "hbsharedcache_p.h"
#include <QByteArray>
class HbThemeClientPrivate;
@@ -47,62 +49,66 @@
QSizeF getSharedIconDefaultSize(const QString &iconPath);
- HbSharedIconInfo getSharedIconInfo(const QString& iconPath ,
+ HbSharedIconInfo getSharedIconInfo(const QString& iconPath ,
const QSizeF &size,
Qt::AspectRatioMode aspectRatioMode,
QIcon::Mode mode,
bool mirrored,
HbIconLoader::IconLoaderOptions options,
- const QColor &color);
+ const QColor &color,
+ HbRenderingMode renderMode );
QByteArray getSharedBlob(const QString &name);
HbWidgetLoader::LayoutDefinition *getSharedLayoutDefs(const QString &fileName,const QString &layout,const QString §ion);
HbCss::StyleSheet *getSharedStyleSheet(const QString &filepath, HbLayeredStyleLoader::LayerPriority priority);
-
+
HbEffectFxmlData *getSharedEffect(const QString &filePath);
-
+
bool addSharedEffect(const QString& filePath);
HbDeviceProfileList *deviceProfiles();
-
- int globalCacheOffset();
+ HbTypefaceInfoVector *typefaceInfo();
void notifyForegroundLostToServer();
- void unloadIcon(const QString& iconPath ,
+ void unloadIcon(const QString& iconPath ,
const QSizeF &size,
Qt::AspectRatioMode aspectRatioMode,
QIcon::Mode mode,
bool mirrored,
- const QColor &color);
-
- void unLoadMultiIcon(const QStringList& iconPathList,
+ const QColor &color,
+ HbRenderingMode renderMode);
+
+ void unLoadMultiIcon(const QStringList& iconPathList,
const QVector<QSizeF> &sizeList,
Qt::AspectRatioMode aspectRatioMode,
QIcon::Mode mode,
bool mirrored,
- const QColor &color);
+ const QColor &color,
+ HbRenderingMode renderMode);
- HbSharedIconInfo getMultiPartIconInfo(const QStringList &multiPartIconList,
+ HbSharedIconInfo getMultiPartIconInfo(const QStringList &multiPartIconList,
const HbMultiPartSizeData &multiPartIconData ,
const QSizeF &size,
Qt::AspectRatioMode aspectRatioMode,
QIcon::Mode mode,
bool mirrored,
HbIconLoader::IconLoaderOptions options,
- const QColor &color);
-
- HbSharedIconInfoList getMultiIconInfo(const QStringList &multiPartIconList,
+ const QColor &color,
+ HbRenderingMode renderMode);
+
+ HbSharedIconInfoList getMultiIconInfo(const QStringList &multiPartIconList,
const QVector<QSizeF> &sizeList ,
Qt::AspectRatioMode aspectRatioMode,
QIcon::Mode mode,
bool mirrored,
HbIconLoader::IconLoaderOptions options,
- const QColor &color);
-
- void getThemeIndexTables(ThemeIndexTables &tables);
+ const QColor &color,
+ HbRenderingMode renderMode);
+
+ bool switchRenderingMode(HbRenderingMode renderMode);
bool clientConnected() const;
@@ -120,7 +126,7 @@
~HbThemeClient();
private:
HbThemeClient();
- int sharedCacheItemOffset(const QString &key);
+ int sharedCacheItemOffset(HbSharedCache::ItemType type, const QString &key);
HbThemeClientPrivate *d_ptr;
Q_DECLARE_PRIVATE_D(d_ptr, HbThemeClient)
};
--- a/src/hbcore/theme/hbthemeclient_p_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/theme/hbthemeclient_p_p.h Fri May 14 16:09:54 2010 +0300
@@ -33,6 +33,7 @@
#include "hblayeredstyleloader_p.h"
#include "hbdeviceprofile_p.h"
#include "hbthemeindex_p.h"
+#include "hbtypefaceinfodatabase_p.h"
#ifdef Q_OS_SYMBIAN
#ifdef HB_SGIMAGE_ICON
@@ -49,7 +50,7 @@
class QLocalSocket;
#endif
-class HB_AUTOTEST_EXPORT HbThemeClientPrivate :
+class HB_AUTOTEST_EXPORT HbThemeClientPrivate :
#ifdef Q_OS_SYMBIAN
public RSessionBase
#else
@@ -73,65 +74,71 @@
QIcon::Mode mode,
bool mirrored,
HbIconLoader::IconLoaderOptions options,
- const QColor &color);
-
+ const QColor &color,
+ HbRenderingMode renderMode);
+
HbWidgetLoader::LayoutDefinition *getSharedLayoutDefs(const QString &fileName, const QString &layout, const QString §ion);
-
+
HbCss::StyleSheet *getSharedStyleSheet(const QString &filepath, HbLayeredStyleLoader::LayerPriority priority);
HbEffectFxmlData *getSharedEffect(const QString &filePath);
-
+
HbDeviceProfileList *deviceProfiles();
- int globalCacheOffset();
+ HbTypefaceInfoVector *typefaceInfo();
bool addSharedEffect(const QString& filePath);
-
- void unloadIcon(const QString& iconPath ,
+
+ void unloadIcon(const QString& iconPath ,
const QSizeF &size,
Qt::AspectRatioMode aspectRatioMode,
QIcon::Mode mode,
bool mirrored,
- const QColor &color);
+ const QColor &color,
+ HbRenderingMode renderMode);
- void unLoadMultiIcon(const QStringList& iconPathList,
+ void unLoadMultiIcon(const QStringList& iconPathList,
const QVector<QSizeF> &sizeList,
Qt::AspectRatioMode aspectRatioMode,
QIcon::Mode mode,
bool mirrored,
- const QColor &color);
- HbSharedIconInfo getMultiPartIconInfo(const QStringList &multiPartIconList,
+ const QColor &color,
+ HbRenderingMode renderMode);
+ HbSharedIconInfo getMultiPartIconInfo(const QStringList &multiPartIconList,
const HbMultiPartSizeData &multiPartIconData,
const QSizeF &size,
Qt::AspectRatioMode aspectRatioMode,
QIcon::Mode mode,
bool mirrored,
HbIconLoader::IconLoaderOptions options,
- const QColor &color);
-
- HbSharedIconInfoList getMultiIconInfo(const QStringList &multiPartIconList,
+ const QColor &color,
+ HbRenderingMode renderMode);
+
+ HbSharedIconInfoList getMultiIconInfo(const QStringList &multiPartIconList,
const QVector<QSizeF> &sizeList ,
Qt::AspectRatioMode aspectRatioMode,
QIcon::Mode mode,
bool mirrored,
HbIconLoader::IconLoaderOptions options,
- const QColor &color);
-
+ const QColor &color,
+ HbRenderingMode renderMode);
void notifyForegroundLostToServer();
-
- void getThemeIndexTables(ThemeIndexTables &tables);
-
+ bool switchRenderingMode(HbRenderingMode renderMode);
int freeSharedMemory();
int allocatedSharedMemory();
int allocatedHeapMemory();
~HbThemeClientPrivate();
bool event(QEvent *e);
-
-#ifndef Q_OS_SYMBIAN
+
+#ifdef HB_THEME_SERVER_MEMORY_REPORT
+ void createMemoryReport() const;
+#endif
+
+#ifndef Q_OS_SYMBIAN
public slots:
void changeTheme();
-#endif
+#endif
public:
bool clientConnected;
@@ -143,7 +150,7 @@
TInt CreateServerProcess();
#else
void readIconInfo(QDataStream &dataStream, HbSharedIconInfo &iconInfo);
-#endif
+#endif
private:
#ifdef Q_OS_SYMBIAN
@@ -156,7 +163,7 @@
#else
QLocalSocket* localSocket;
-#endif
+#endif
};
#endif // HBTHEMECLIENT_P_P_H
--- a/src/hbcore/theme/hbthemeclient_symbian_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/theme/hbthemeclient_symbian_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -40,8 +40,8 @@
/**
* constructor
*/
-HbThemeClientPrivate::HbThemeClientPrivate():
- clientConnected(false)
+HbThemeClientPrivate::HbThemeClientPrivate():
+ clientConnected(false)
{
if(THEME_SERVER_NAME != HbMemoryUtils::getCleanAppName()) {
themelistener = new CHbThemeListenerPrivate(this);
@@ -49,7 +49,7 @@
#ifdef HB_SGIMAGE_ICON
- sgDriverInit = false;
+ sgDriverInit = false;
#endif
}
@@ -88,14 +88,14 @@
#endif
return ( clientConnected = (KErrNone == error) );
}
-
-
+
+
/**
* HbThemeClientPrivate::Version()
*
* Returns the version number
-*/
+*/
TVersion HbThemeClientPrivate::Version(void) const
{
return(TVersion(KThemeServerMajorVersionNumber,
@@ -108,7 +108,7 @@
if (!clientConnected) {
return QSizeF();
}
-
+
QSizeF defaultSize;
TBuf<256> buffer(iconPath.utf16());
@@ -116,10 +116,10 @@
TIconParams params;
params.fileName = buffer;
-
+
TPckg<TIconParams> paramPckg(params);
TIpcArgs args(¶mPckg, &retPckg);
-
+
TInt err = SendReceive(EIconDefaultSize, args);
if (KErrNone != err) {
defaultSize = QSizeF();
@@ -131,14 +131,15 @@
* HbThemeClientPrivate::getSharedIconInfo()
*
* Returns the shared icon information
-*/
+*/
HbSharedIconInfo HbThemeClientPrivate::getSharedIconInfo(const QString& iconPath ,
const QSizeF &size,
Qt::AspectRatioMode aspectRatioMode,
QIcon::Mode mode,
bool mirrored,
HbIconLoader::IconLoaderOptions options,
- const QColor &color )
+ const QColor &color,
+ HbRenderingMode renderMode)
{
HbSharedIconInfo sharedIconInfo;
sharedIconInfo.type = INVALID_FORMAT;
@@ -146,7 +147,7 @@
if ( !clientConnected ) {
return sharedIconInfo;
}
-
+
TBuf<256> buffer(iconPath.utf16());
TPckg<HbSharedIconInfo> iconInfo(sharedIconInfo);
@@ -156,15 +157,16 @@
params.height = size.height();
params.aspectRatioMode = (TUint8)aspectRatioMode;
params.mode = (TUint8)mode;
- params.options = (TUint8)options;
+ params.options = (TUint8)options;
params.mirrored = (TBool)mirrored;
params.rgba = (TUint32) color.rgba();
params.colorflag = color.isValid();
-
+ params.renderMode = renderMode;
+
TPckg<TIconParams> paramPckg(params);
-
+
TIpcArgs args(¶mPckg,&iconInfo);
-
+
TInt err = SendReceive(EIconLookup, args);
if (KErrNone != err) {
sharedIconInfo.type = INVALID_FORMAT;
@@ -176,14 +178,15 @@
* getMultiPartIconInfo
*/
-HbSharedIconInfo HbThemeClientPrivate::getMultiPartIconInfo(const QStringList &multiPartIconList,
+HbSharedIconInfo HbThemeClientPrivate::getMultiPartIconInfo(const QStringList &multiPartIconList,
const HbMultiPartSizeData &multiPartIconData ,
const QSizeF &size,
Qt::AspectRatioMode aspectRatioMode,
QIcon::Mode mode,
bool mirrored,
HbIconLoader::IconLoaderOptions options,
- const QColor &color)
+ const QColor &color,
+ HbRenderingMode renderMode)
{
HbSharedIconInfo sharedIconInfo;
sharedIconInfo.type = INVALID_FORMAT;
@@ -194,20 +197,20 @@
TPckg<HbSharedIconInfo> iconInfo(sharedIconInfo);
TMultiIconSymbParams params;
-
+
TBuf<256> iconId(multiPartIconData.multiPartIconId.utf16());
params.multiPartIconId.Copy(iconId);
for (int i = 0; i < multiPartIconList.length(); i++) {
TBuf<256> pieceIconId(multiPartIconList[i].utf16());
params.multiPartIconList[i].Copy(pieceIconId);
}
- int noOfPieces = 1;
- if (multiPartIconData.multiPartIconId.contains("_3PV",Qt::CaseInsensitive)
+ int noOfPieces = 1;
+ if (multiPartIconData.multiPartIconId.contains("_3PV",Qt::CaseInsensitive)
|| multiPartIconData.multiPartIconId.contains("_3PH",Qt::CaseInsensitive)) {
noOfPieces = 3;
} else if (multiPartIconData.multiPartIconId.contains("_9P",Qt::CaseInsensitive)) {
noOfPieces = 9;
- }
+ }
for (int i = 0; i < noOfPieces; i++) {
params.sources[i] = (TRect &)multiPartIconData.sources[i];
@@ -222,10 +225,11 @@
params.size = size;
params.aspectRatioMode = (TUint8)aspectRatioMode;
params.mode = (TUint8)mode;
- params.options = (TUint8)options;
+ params.options = (TUint8)options;
params.mirrored = (TBool)mirrored;
params.rgba = (TUint32) color.rgba();
params.colorflag = color.isValid();
+ params.renderMode = (TUint8)renderMode;
TPckg<TMultiIconSymbParams> paramPckg(params);
TIpcArgs args(¶mPckg,&iconInfo);
@@ -242,21 +246,21 @@
* HbThemeClientPrivate::getSharedStyleSheet()
*
* Returns the shared css(stylesheet) information
-*/
+*/
HbCss::StyleSheet *HbThemeClientPrivate::getSharedStyleSheet(const QString &fileName, HbLayeredStyleLoader::LayerPriority priority)
{
if ( !clientConnected ) {
return 0;
}
HbCss::StyleSheet* styleSheet(0);
-
+
TBuf<256> fileDes(fileName.utf16());
TBuf<5> layerPriority;
layerPriority.AppendNum((TInt)priority);
-
+
HbSharedStyleSheetInfo stylesheetInfo;
TPckg<HbSharedStyleSheetInfo> sharedInfo(stylesheetInfo);
-
+
//TInt fileOffset = -1;
TIpcArgs args(&fileDes, &layerPriority, &sharedInfo);
@@ -268,7 +272,7 @@
#ifdef THEME_SERVER_TRACES
qDebug("Time elapsed in IPC is : %d ms", time.elapsed());
#endif
-
+
if (KErrNone == err) {
if (stylesheetInfo.offset >= 0) {
styleSheet = HbMemoryUtils::getAddress<HbCss::StyleSheet>(
@@ -282,10 +286,10 @@
* HbThemeClientPrivate::getSharedEffect()
*
* Returns the shared effect information
-*/
+*/
HbEffectFxmlData *HbThemeClientPrivate::getSharedEffect(const QString &filePath)
{
-#ifdef THEME_SERVER_TRACES
+#ifdef THEME_SERVER_TRACES
qDebug() << "HbThemeClientPrivate::getSharedEffect" << filePath;
#endif
if ( !clientConnected ) {
@@ -293,12 +297,12 @@
}
HbEffectFxmlData *fxmlData = 0;
-
+
TBuf<256> fileDes(filePath.utf16());
HbSharedEffectInfo effectInfo;
-
+
TPckg<HbSharedEffectInfo> sharedInfo(effectInfo);
-
+
TIpcArgs args(&fileDes, &sharedInfo);
#ifdef THEME_SERVER_TRACES
@@ -309,9 +313,9 @@
#ifdef THEME_SERVER_TRACES
qDebug() << "Time elapsed in EEffectLookupFilePath IPC is : %d ms" << time.elapsed();
#endif
-
+
if (KErrNone == err) {
-#ifdef THEME_SERVER_TRACES
+#ifdef THEME_SERVER_TRACES
qDebug() << "HbThemeClientPrivate::getSharedEffect effectInfo.offSet is:" << effectInfo.offset;
#endif
if (effectInfo.offset >= 0) {
@@ -325,15 +329,15 @@
}
return fxmlData;
}
-
+
/**
* HbThemeClientPrivate::addSharedEffect()
*
* Adds the shared effect information
-*/
+*/
bool HbThemeClientPrivate::addSharedEffect(const QString& filePath)
{
-#ifdef THEME_SERVER_TRACES
+#ifdef THEME_SERVER_TRACES
qDebug() << "HbThemeClientPrivate::addSharedEffect" << filePath;
#endif
if ( !clientConnected ) {
@@ -342,9 +346,9 @@
TBuf<256> fileDes(filePath.utf16());
TInt retVal = KErrGeneral;
-
+
TPckg<TInt> sharedInfo(retVal);
-
+
TIpcArgs args(&fileDes, &sharedInfo);
#ifdef THEME_SERVER_TRACES
@@ -355,15 +359,15 @@
#ifdef THEME_SERVER_TRACES
qDebug("Time elapsed in EEffectAdd IPC is : %d ms", time.elapsed());
#endif
-
+
if (KErrNone == err) {
TInt result = sharedInfo();
-#ifdef THEME_SERVER_TRACES
+#ifdef THEME_SERVER_TRACES
qDebug() << "TInt result (offset):" << result;
#endif
-
+
if (result >= 0) {
-#ifdef THEME_SERVER_TRACES
+#ifdef THEME_SERVER_TRACES
qDebug() << "add effect results returning TRUE";
#endif
return true;
@@ -379,31 +383,33 @@
* HbThemeClientPrivate::unloadIcon()
*
* unload icon
-*/
+*/
void HbThemeClientPrivate::unloadIcon(const QString& iconPath ,
const QSizeF &size,
Qt::AspectRatioMode aspectRatioMode,
QIcon::Mode mode,
bool mirrored,
- const QColor &color)
+ const QColor &color,
+ HbRenderingMode renderMode)
{
if ( !clientConnected ) {
return;
}
-
+
TBuf<256> buffer(iconPath.utf16());
-
+
TIconParams params;
params.fileName = buffer;
params.width = size.width();
params.height = size.height();
params.aspectRatioMode = (TUint8)aspectRatioMode;
params.mode = (TUint8)mode;
- params.options = (TUint8)0;
+ params.options = (TUint8)0;
params.mirrored = (TBool)mirrored;
params.rgba = (TUint32) color.rgba();
params.colorflag = color.isValid();
-
+ params.renderMode = (TUint8)renderMode;
+
TPckg<TIconParams> paramPckg(params);
TIpcArgs args(¶mPckg,0);
SendReceive(EUnloadIcon, args);
@@ -413,37 +419,39 @@
* HbThemeClientPrivate::unLoadMultiIcon()
*
* unload multiple icons
-*/
-void HbThemeClientPrivate::unLoadMultiIcon(const QStringList& iconPathList,
+*/
+void HbThemeClientPrivate::unLoadMultiIcon(const QStringList& iconPathList,
const QVector<QSizeF> &sizeList,
Qt::AspectRatioMode aspectRatioMode,
QIcon::Mode mode,
bool mirrored,
- const QColor &color)
+ const QColor &color,
+ HbRenderingMode renderMode)
{
if ( !clientConnected ) {
return;
}
-
+
TIconListParams params;
int noOfPieces = iconPathList.length();
-
+
for (int i = 0; i < noOfPieces; i++) {
-
+
TFileName pieceIconId(iconPathList[i].utf16());
- params.iconList[i].Copy(pieceIconId);
+ params.iconList[i].Copy(pieceIconId);
params.sizeList[i] = sizeList[i];
- }
+ }
params.aspectRatioMode = (TUint8)aspectRatioMode;
- params.mode = (TUint8)mode;
+ params.mode = (TUint8)mode;
params.mirrored = (TBool)mirrored;
params.rgba = (TUint32) color.rgba();
params.colorflag = color.isValid();
+ params.renderMode = (TUint8)renderMode;
params.iconCount = noOfPieces;
- TPckg<TIconListParams> paramPckg(params);
+ TPckg<TIconListParams> paramPckg(params);
TIpcArgs args(¶mPckg);
- TInt err = SendReceive(EUnloadMultiIcon, args);
+ TInt err = SendReceive(EUnloadMultiIcon, args);
}
/* HbThemeClientPrivate::getSharedLayoutDefs()
@@ -468,7 +476,7 @@
TIpcArgs args(&fileDes,&layoutDes,§ionDes,&wmlInfo);
TInt err = SendReceive(EWidgetMLLookup, args);
-
+
if (KErrNone == err) {
if( widgetmlInfo.offset >=0){
layoutDef = HbMemoryUtils::getAddress<HbWidgetLoader::LayoutDefinition>(
@@ -504,61 +512,15 @@
return deviceProfiles;
}
-int HbThemeClientPrivate::globalCacheOffset()
-{
- int offset = -1;
- if ( !clientConnected ) {
- qWarning()<<"Theme client unable to connect to server in HbThemeClientPrivate::globalCacheOffset";
- return offset;
- }
-
- HbSecondaryCacheInfo sharedCacheInfo;
- TPckg<HbSecondaryCacheInfo> cacheInfo(sharedCacheInfo);
- TIpcArgs args(&cacheInfo);
- TInt err = SendReceive(ESecondaryCacheOffset, args);
- if (KErrNone == err) {
- offset = sharedCacheInfo.offset;
- }
- return offset;
-}
-
/**
* HbThemeClientPrivate::handleThemeChange()
*/
void HbThemeClientPrivate::handleThemeChange(const QString &themeName)
{
- if(!(hbInstance->theme()->name() == themeName)) {
#ifdef THEME_SERVER_TRACES
qDebug() << Q_FUNC_INFO <<"themeChanged(): called";
#endif
hbInstance->theme()->d_ptr->handleThemeChange(themeName);
- }
-}
-
-void HbThemeClientPrivate::getThemeIndexTables(ThemeIndexTables &tables)
-{
- TPckg<ThemeIndexTables> pack(tables);
- TIpcArgs args(&pack);
- SendReceive(EThemeIndex, args);
-
- if (tables.tables[0] >= 0) {
- tables.tables[0] = reinterpret_cast<int>(HbMemoryUtils::getAddress<char>(
- HbMemoryManager::SharedMemory, tables.tables[0]));
- }
- if (tables.tables[1] >= 0) {
- tables.tables[1] = reinterpret_cast<int>(HbMemoryUtils::getAddress<char>(
- HbMemoryManager::SharedMemory, tables.tables[1]));
- }
-
- if (tables.tables[2] >= 0) {
- tables.tables[2] = reinterpret_cast<int>(HbMemoryUtils::getAddress<char>(
- HbMemoryManager::SharedMemory, tables.tables[2]));
- }
-
- if (tables.tables[3] >= 0) {
- tables.tables[3] = reinterpret_cast<int>(HbMemoryUtils::getAddress<char>(
- HbMemoryManager::SharedMemory, tables.tables[3]));
- }
}
/**
@@ -569,7 +531,7 @@
RSessionBase::Close();
#ifdef HB_SGIMAGE_ICON
if (sgDriverInit) {
- sgDriver.Close();
+ sgDriver.Close();
sgDriverInit = false;
}
#endif
@@ -600,11 +562,11 @@
const TUidType serverUid( KNullUid, KServerUid2, KServerUid3 );
RProcess server;
_LIT(KThemeServerExe,"hbthemeserver.exe");
-
+
result = server.Create( KThemeServerExe, KNullDesC, EOwnerProcess );
-
+
if (KErrNone != result) {
- return result;
+ return result;
}
TRequestStatus status;
server.Rendezvous(status);
@@ -623,24 +585,25 @@
* getMultiIconInfo function returns a list of HbSharedIconInfo
* for the given list of frameitems.
*/
-HbSharedIconInfoList HbThemeClientPrivate::getMultiIconInfo(const QStringList &multiPartIconList,
+HbSharedIconInfoList HbThemeClientPrivate::getMultiIconInfo(const QStringList &multiPartIconList,
const QVector<QSizeF> &sizeList ,
Qt::AspectRatioMode aspectRatioMode,
QIcon::Mode mode,
bool mirrored,
HbIconLoader::IconLoaderOptions options,
- const QColor &color)
+ const QColor &color,
+ HbRenderingMode renderMode)
{
Q_UNUSED(options)
HbSharedIconInfoList sharedIconInfoList;
-
+
if ( !clientConnected ) {
return sharedIconInfoList;
}
-
- TIconListParams params;
- params.iconCount = multiPartIconList.length();
+
+ TIconListParams params;
+ params.iconCount = multiPartIconList.length();
for (int i = 0; i < params.iconCount; i++) {
TFileName pieceIconId(multiPartIconList[i].utf16());
params.iconList[i].Copy(pieceIconId);
@@ -651,12 +614,13 @@
params.mirrored = (TBool)mirrored;
params.rgba = (TUint32) color.rgba();
params.colorflag = color.isValid();
+ params.renderMode = (TUint8)renderMode;
TPckg<TIconListParams> paramPckg(params);
- TPckg<HbSharedIconInfoList> iconInfoList(sharedIconInfoList);
+ TPckg<HbSharedIconInfoList> iconInfoList(sharedIconInfoList);
TIpcArgs args(¶mPckg,&iconInfoList);
TInt err = SendReceive(EMultiIcon, args);
-
+
return sharedIconInfoList;
}
@@ -667,7 +631,7 @@
{
#if defined(HB_SGIMAGE_ICON) || defined(HB_NVG_CS_ICON)
TInt err = SendReceive(ENotifyForegroundLost);
- if (KErrNone == err) {
+ if (KErrNone == err) {
//ForegroundLostToServer Event is sent to server Successfully.
}
#endif
@@ -724,3 +688,69 @@
TInt err = SendReceive(EAllocatedHeapMem, args);
return allocatedHeapMem;
}
+
+/**
+ * HbThemeClientPrivate::switchRenderingMode()
+ */
+bool HbThemeClientPrivate::switchRenderingMode(HbRenderingMode renderMode)
+{
+ TInt mode = (TInt)renderMode;
+
+#ifdef HB_SGIMAGE_ICON
+ if(renderMode == EHWRendering) {
+ TInt sgDriverOpenErrorCode = sgDriver.Open();
+ if(sgDriverOpenErrorCode != KErrNone) {
+ return false;
+ }
+ } else {
+ sgDriver.Close();
+ }
+#endif
+ TPckg<TInt> paramPckg(mode);
+ TIpcArgs args(¶mPckg);
+ TInt err = SendReceive(ERenderModeSwitch, args);
+
+ if(err == KErrNone) {
+ return true;
+ }
+ return false;
+}
+
+
+#ifdef HB_THEME_SERVER_MEMORY_REPORT
+void HbThemeClientPrivate::createMemoryReport() const
+{
+ if ( !clientConnected ) {
+ return;
+ }
+
+ TIpcArgs args(0, 0);
+ TInt err = SendReceive(ECreateMemoryReport, args);
+}
+#endif
+
+/*
+Returns the list of Typaface info.
+*/
+HbTypefaceInfoVector *HbThemeClientPrivate::typefaceInfo()
+{
+ if ( !clientConnected ) {
+ if(!connectToServer()) {
+ qWarning()<<"Theme client unable to connect to server in HbThemeClientPrivate::typefaceInfo";
+ return 0;
+ }
+ }
+
+ HbTypefaceInfoVector *typefaceVector(0);
+ HbTypefaceDataInfo typefaceDataInfo;
+ TPckg<HbTypefaceDataInfo> theTypefaceInfo(typefaceDataInfo);
+ TIpcArgs args(&theTypefaceInfo);
+ TInt err = SendReceive(ETypefaceOffset, args);
+ if (KErrNone == err) {
+ if( typefaceDataInfo.offset >= 0) {
+ typefaceVector = HbMemoryUtils::getAddress<HbTypefaceInfoVector>(
+ HbMemoryManager::SharedMemory, typefaceDataInfo.offset);
+ }
+ }
+ return typefaceVector;
+}
--- a/src/hbcore/theme/hbthemecommon_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/theme/hbthemecommon_p.h Fri May 14 16:09:54 2010 +0300
@@ -38,7 +38,13 @@
#endif
#define THEME_SERVER_NAME "hbthemeserver"
+#define BIN_CSS_APP "hbbincssmaker"
+#define BIN_CSS_APP_SYMBIAN "hbbincssmaker_symbian"
+#ifdef HB_BIN_CSS
+#define HB_THEME_SHARED_PIXMAP_CHUNK "themeserver_tool_chunk"
+#else
#define HB_THEME_SHARED_PIXMAP_CHUNK "themeserver_chunk"
+#endif
#define ORGANIZATION "Nokia"
#define THEME_COMPONENT "Hb Themes"
#define CURRENT_THEME_KEY "CurrentTheme"
@@ -50,23 +56,58 @@
// To enable/disable debug messages for theme index functionality
#undef THEME_INDEX_TRACES
+#undef CSSBIN_TRACES
+
// To enable memory report creation (memory usage, fragmentation etc.)
#undef HB_THEME_SERVER_MEMORY_REPORT
+// To enable full memory report including all allocs, frees and reallocs
+#undef HB_THEME_SERVER_FULL_MEMORY_REPORT
+
+#ifdef HB_THEME_SERVER_FULL_MEMORY_REPORT
+#define HB_THEME_SERVER_MEMORY_REPORT
+#endif
+
// If master trace macro is defined, define also other theme traces
#ifdef THEME_SERVER_TRACES
#define THEME_INDEX_TRACES
+#define CSSBIN_TRACES
#endif
-
// To enable fute testing for cache
//#define HB_ICON_CACHE_DEBUG
-const unsigned int INITIALIZED_CHUNK_IDENTIFIER = 0x54535256; //'TSRV'
+
+enum HbThemeType {
+ BaseTheme = 0,
+ OperatorC = 1,
+ OperatorROM = 2,
+ ActiveTheme = 3
+};
+
+const quint32 INITIALIZED_CHUNK_IDENTIFIER = 0x54535256; //'TSRV'
struct HbSharedChunkHeader
{
- unsigned int identifier;
- unsigned int mainAllocatorOffset;
- unsigned int subAllocatorOffset;
+ quint32 identifier;
+ quint32 mainAllocatorOffset;
+ quint32 subAllocatorOffset;
+ quint32 sharedCacheOffset;
+ // Base theme offsets
+ quint32 baseThemePathOffset;
+ quint32 baseThemeNameOffset;
+ quint32 baseThemeIndexOffset;
+ // Operator theme in C-drive offsets
+ quint32 operatorThemeDriveCPathOffset;
+ quint32 operatorThemeDriveCNameOffset;
+ quint32 operatorThemeDriveCIndexOffset;
+ // Operator theme in ROM offsets
+ quint32 operatorThemeRomPathOffset;
+ quint32 operatorThemeRomNameOffset;
+ quint32 operatorThemeRomIndexOffset;
+ // Active theme offsets
+ quint32 activeThemePathOffset;
+ quint32 activeThemeNameOffset;
+ quint32 activeThemeIndexOffset;
+
};
enum LayerPriority {
@@ -109,6 +150,7 @@
QColor color;
int rgba;
bool colorflag;
+ int renderMode;
};
@@ -117,7 +159,7 @@
NVG,
PIC,
SVG,
- SGIMAGE,
+ SGIMAGE,
BLOB,
OTHER_SUPPORTED_FORMATS
};
@@ -133,14 +175,14 @@
};
struct HbSharedNVGInfo
-{
+{
int offset;
int dataSize;
int width;
int height;
int defaultWidth;
int defaultHeight;
-
+
};
struct HbSharedPICInfo
@@ -157,7 +199,7 @@
{
unsigned long long id;
int width;
- int height;
+ int height;
int defaultWidth;
int defaultHeight;
};
@@ -171,18 +213,18 @@
struct HbSharedIconInfo
{
HbIconFormatType type;
-
- union
+
+ union
{
- HbSharedPixmapInfo pixmapData;
- HbSharedNVGInfo nvgData;
- HbSharedPICInfo picData;
- HbSharedSgimageInfo sgImageData;
+ HbSharedPixmapInfo pixmapData;
+ HbSharedNVGInfo nvgData;
+ HbSharedPICInfo picData;
+ HbSharedSgimageInfo sgImageData;
HbSharedBLOBInfo blobData;
- };
-
+ };
+
HbSharedIconInfo():type(INVALID_FORMAT){}
-
+
};
struct HbSharedIconInfoList
@@ -194,9 +236,9 @@
{
int offset;
int refCount;
- HbSharedStyleSheetInfo():
+ HbSharedStyleSheetInfo():
offset(-1),
- refCount(0)
+ refCount(0)
{}
};
@@ -223,23 +265,13 @@
HbSecondaryCacheInfo() : offset(-1) {}
};
-struct HbSharedCacheItem {
- HbString key;
+
+struct HbTypefaceDataInfo
+{
int offset;
- HbSharedCacheItem():key(HbMemoryManager::SharedMemory),offset(-1)
- {
- }
- HbSharedCacheItem(const QString &cacheKey,
- int cacheOffset):key(cacheKey,HbMemoryManager::SharedMemory),
- offset(cacheOffset)
- {
- }
+ HbTypefaceDataInfo() : offset(-1) {}
};
-// Currently HbVector is used. This one should be replaced with the Map/Hash
-// data structure.
-typedef HbVector<HbSharedCacheItem> HbSharedCache;
-
// Function codes (opcodes) used in message passing between client and server
enum HbThemeServerRequest
{
@@ -252,7 +284,6 @@
EMultiIcon,
EWidgetMLLookup,
EDeviceProfileOffset,
- ESecondaryCacheOffset,
ENotifyForegroundLost,
#ifdef HB_ICON_CACHE_DEBUG
EIconCleanUp,
@@ -284,20 +315,33 @@
ERefCount,
#endif
EThemeContentUpdate,
- EEffectLookupFilePath,
- EEffectAdd,
+ EEffectLookupFilePath,
+ EEffectAdd,
EUnloadIcon,
EUnloadMultiIcon,
EMemoryGood,
EFreeRam,
+ ERenderModeSwitch,
EThemeServerStop,
- EThemeIndex,
EFreeSharedMem,
EAllocatedSharedMem,
- EAllocatedHeapMem
+ EAllocatedHeapMem,
+ ETypefaceOffset
#ifdef HB_THEME_SERVER_MEMORY_REPORT
,ECreateMemoryReport
#endif
};
+//Rendering Modes
+enum HbRenderingMode
+{
+ ESWRendering,
+ EHWRendering
+};
+
+struct HbFreeRamNotificationData
+{
+ int bytesToFree;
+ bool useSwRendering;
+};
#endif /* HBTHEMECOMMON_P_H */
--- a/src/hbcore/theme/hbthemecommon_symbian_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/theme/hbthemecommon_symbian_p.h Fri May 14 16:09:54 2010 +0300
@@ -41,6 +41,7 @@
TBool mirrored;
TUint32 rgba;
TBool colorflag;
+ TInt renderMode;
};
struct TMultiIconSymbParams
@@ -57,6 +58,7 @@
TBool mirrored;
TInt rgba;
TBool colorflag;
+ TInt renderMode;
};
struct TIconListParams
@@ -68,6 +70,7 @@
TBool mirrored;
TInt rgba;
TBool colorflag;
+ TInt renderMode;
TInt iconCount;
};
@@ -89,5 +92,18 @@
ENonNumericString = 99
};
+/**
+ * KHbBaseThemeCenrepKey
+ * Define the base theme
+ */
+const TUint32 KHbBaseThemeCenrepKey = 0x1;
+
+/**
+ * KHbDefaultThemeCenrepKey
+ * Define the default theme
+ */
+const TUint32 KHbDefaultThemeCenrepKey = 0x2;
+
+
#endif // HBTHEMECOMMON_SYMBIAN_P_H
--- a/src/hbcore/theme/hbthemelistener_symbian_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/theme/hbthemelistener_symbian_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -28,6 +28,7 @@
#include <QDebug>
#include <hbinstance.h>
#include <hbtheme_p.h>
+#include <hbthemeutils_p.h>
#ifdef THEME_LISTENER_TRACES
#include <hbmemoryutils_p.h>
@@ -37,19 +38,15 @@
#include "hbthemelistener_symbian_p.h"
#include "hbthemecommon_symbian_p.h"
-// app uid of theme application
-const TInt KThemeName = 0;
-
/**
* Constructor
*/
CHbThemeListenerPrivate::CHbThemeListenerPrivate(HbThemeClientPrivate *themeClient)
: CActive(EPriorityNormal), themeClient(themeClient)
{
- User::LeaveIfError(themeState.Attach(KServerUid3,KThemeName));
+ mRepository = CRepository::NewL(KServerUid3);
+ mRepository->NotifyRequest(HbThemeUtils::CurrentThemeSetting, iStatus);
CActiveScheduler::Add(this);
- // initial subscription
- themeState.Subscribe(iStatus);
SetActive();
}
@@ -59,7 +56,7 @@
CHbThemeListenerPrivate::~CHbThemeListenerPrivate()
{
Cancel();
- themeState.Close();
+ delete mRepository;
}
/**
@@ -70,22 +67,13 @@
#ifdef THEME_LISTENER_TRACES
qDebug() << "CHbThemeListenerPrivate::RunL: start\n appname"<<HbMemoryUtils::getCleanAppName();
#endif
- themeState.Subscribe(iStatus);
+ mRepository->NotifyRequest(HbThemeUtils::CurrentThemeSetting, iStatus);
SetActive();
- // Added RProperty::Get() as workaround for QSettings bug on symbian
- // bug: QSettings does not get synched if values are changes fast at server side
- // @todo: XQsettingManager instead of QSetting for symbian
- TBuf<80> name;
- TInt r = themeState.Get(name);
- QString str((QChar*)name.Ptr(),name.Length());
-#ifdef THEME_LISTENER_TRACES
- if (r==KErrNone) {
- qDebug() << "CHbThemeListenerPrivate::RunL: Get() Themename" <<str;
- } else {
- qDebug() << "CHbThemeListenerPrivate::RunL: Get() Error!!!!!!!!";
+ TBuf<256> newTheme;
+ if (KErrNone == mRepository->Get(HbThemeUtils::CurrentThemeSetting, newTheme)) {
+ QString qnewTheme((QChar*)newTheme.Ptr(),newTheme.Length());
+ themeClient->handleThemeChange(qnewTheme);
}
-#endif
- themeClient->handleThemeChange(str);
}
@@ -94,6 +82,6 @@
*/
void CHbThemeListenerPrivate::DoCancel()
{
- themeState.Cancel();
+ mRepository->NotifyCancelAll();
}
--- a/src/hbcore/theme/hbthemelistener_symbian_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/theme/hbthemelistener_symbian_p.h Fri May 14 16:09:54 2010 +0300
@@ -28,6 +28,7 @@
#include <e32base.h>
#include <e32property.h>
+#include <centralrepository.h>
class CHbThemeListenerPrivate:public CActive
{
@@ -40,7 +41,7 @@
void DoCancel();
private:
HbThemeClientPrivate *themeClient;
- RProperty themeState;
+ CRepository *mRepository;
};
#endif /*HBTHEMELISTENER_P_H_ */
--- a/src/hbcore/theme/hbthemeutils_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/theme/hbthemeutils_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -43,6 +43,7 @@
#ifdef Q_OS_SYMBIAN
#include "hbthemecommon_symbian_p.h"
#include <e32std.h>
+#include <centralrepository.h>
#endif
// Standard folder names
@@ -55,15 +56,13 @@
const char *HbThemeUtils::appHierarchy = "apptheme";
const char *HbThemeUtils::platformHierarchy = "themes";
-const char *operatorBasePathKey = "OperatorBasePath";
+const char *operatorNameKey = "OperatorName";
static const char *themeSettingFile = "theme.theme";
static const char *baseThemeVariable = "BaseTheme";
static const char *defaultThemeVariable = "DefaultActiveTheme";
// These are the used setting names corresponding to HbThemeUtils::Setting enumeration.
-// Value 0 is not used to be able to change the implementation to use Symbian's Cenrep if needed.
-static const QString settingNames[6] = {"", "currenttheme", "defaulttheme", "defaultthemedir", "basetheme", "operatorbasepath"};
-
+static const QString settingNames[6] = {"", "basetheme", "defaulttheme", "defaultthemedir", "currenttheme", "operatorbasepath"};
static const char *getResourceFolderName(Hb::ResourceType resType)
{
switch(resType) {
@@ -106,13 +105,10 @@
<< HbHierarchy(HbThemeUtils::appHierarchy, HbLayeredStyleLoader::Priority_Application)
#endif
<< HbHierarchy(HbThemeUtils::platformHierarchy, HbLayeredStyleLoader::Priority_Theme);
- // @todo: The operator name has been hard-coded here. Will be removed once it is decided on how to
- // get the operator name.
- operatorName = "myoperator";
}
- QString constructOperatorPath(const QString &basePath, const QString &resourcePath, const QString &fileName) const
+ QString constructOperatorPath(const QString &operatorPath, const QString &fileName) const
{
- return basePath + resourcePath + '/' + operatorName + '/' + fileName;
+ return operatorPath + '/' + fileName;
}
void initSettings();
@@ -128,23 +124,26 @@
QString defaultTheme;
QString defaultThemeRootDir;
QString baseTheme;
- QString operatorBasePath;
+ QString operatorPath;
};
void HbThemeUtilsPrivate::initSettings()
{
- //server gets and stores the operator path to settings, clients only read it.
- if (HbMemoryUtils::getCleanAppName()== THEME_SERVER_NAME) {
- QStringList operatorPath;
- operatorPath << QLatin1String(HbThemeUtils::operatorHierarchy) + '/';
- operatorPath = HbStandardDirs::findExistingFolderList(operatorPath, QString(), Hb::IconResource);
- if (operatorPath.size() > 0) {
- operatorBasePath = operatorPath.at(0);
+ // read the operator name from settings
+ operatorName = HbThemeUtils::getThemeSetting(HbThemeUtils::OperatorNameSetting).trimmed();
+
+ // construct operator path
+ if (!operatorName.isEmpty()) {
+ QStringList operatorPaths;
+ operatorPaths << QLatin1String(HbThemeUtils::operatorHierarchy) + '/';
+ operatorPaths = HbStandardDirs::findExistingFolderList(operatorPaths, QString(), Hb::IconResource);
+ for (int i=0;i < operatorPaths.size();i++) {
+ if (operatorPaths[i] == operatorName) {
+ operatorPath = operatorPaths[i] + '/' + operatorName;
+ break;
+ }
}
- HbThemeUtils::setThemeSetting(HbThemeUtils::OperatorBasePathSetting, operatorBasePath);
- } else {
- operatorBasePath = HbThemeUtils::getThemeSetting(HbThemeUtils::OperatorBasePathSetting).trimmed();
- }
+ }
}
void HbThemeUtilsPrivate::readSettings()
@@ -155,14 +154,49 @@
// The only changing setting is currentThemeSetting and its value is updated in theme change event.
if (!settingsRetrieved) {
+#ifdef Q_OS_SYMBIAN
+ CRepository *repository = 0;
+ TRAP_IGNORE(repository = CRepository::NewL(KServerUid3));
+ if (repository) {
+ TBuf<256> value;
+ if (KErrNone == repository->Get(HbThemeUtils::CurrentThemeSetting,value)) {
+ QString qvalue((QChar*)value.Ptr(),value.Length());
+ currentTheme = qvalue.trimmed();
+ }
+ value.Zero();
+ if (KErrNone == repository->Get(HbThemeUtils::DefaultThemeSetting,value)) {
+ QString qvalue((QChar*)value.Ptr(),value.Length());
+ defaultTheme = qvalue.trimmed();
+ }
+ value.Zero();
+ if (KErrNone == repository->Get(HbThemeUtils::DefaultThemeRootDirSetting,value)) {
+ QString qvalue((QChar*)value.Ptr(),value.Length());
+ defaultThemeRootDir = qvalue.trimmed();
+ } else {
+ // Use the default value
+ defaultThemeRootDir = HbStandardDirs::themesDir();
+ }
+ value.Zero();
+ if (KErrNone == repository->Get(HbThemeUtils::BaseThemeSetting,value)) {
+ QString qvalue((QChar*)value.Ptr(),value.Length());
+ baseTheme = qvalue.trimmed();
+ }
+ value.Zero();
+ if (KErrNone == repository->Get(HbThemeUtils::OperatorNameSetting,value)) {
+ QString qvalue((QChar*)value.Ptr(),value.Length());
+ operatorName = qvalue.trimmed();
+ }
+ delete repository;
+ }
+#else
QSettings settings(QLatin1String(ORGANIZATION), QLatin1String(THEME_COMPONENT));
currentTheme = settings.value(settingNames[HbThemeUtils::CurrentThemeSetting]).toString();
defaultTheme = settings.value(settingNames[HbThemeUtils::DefaultThemeSetting]).toString();
defaultThemeRootDir = settings.value(settingNames[HbThemeUtils::DefaultThemeRootDirSetting]).toString();
baseTheme = settings.value(settingNames[HbThemeUtils::BaseThemeSetting]).toString();
- operatorBasePath = settings.value(settingNames[HbThemeUtils::OperatorBasePathSetting]).toString();
-
+ operatorName = settings.value(settingNames[HbThemeUtils::OperatorNameSetting]).toString();
+#endif
settingsRetrieved = true;
}
}
@@ -237,7 +271,7 @@
QString HbThemeUtils::operatorBasePath()
{
- return d.operatorBasePath;
+ return d.operatorPath;
}
/* @ret hierarchy of themes in priority.
*/
@@ -266,9 +300,9 @@
foreach (const HbHierarchy &hierarchy, d.hierarchies) {
switch(hierarchy.layerPriority) {
case HbLayeredStyleLoader::Priority_Operator:
- if (!d.operatorBasePath.isEmpty()) {
+ if (!d.operatorPath.isEmpty()) {
hierarchyListWithPathInfo.insert(HbLayeredStyleLoader::Priority_Operator,
- d.constructOperatorPath(d.operatorBasePath, resourcePath, fileName));
+ d.constructOperatorPath(operatorBasePath(), fileName));
}
break;
case HbLayeredStyleLoader::Priority_Application:
@@ -313,7 +347,7 @@
baseThemeInfo.name = getThemeSetting(BaseThemeSetting).trimmed();
if ( baseThemeInfo.name.isEmpty() ) {
// Settings not yet initialized
- // Check if Base theme in rom set
+ // Check if Base theme is defined in theme.theme
baseThemeInfo = getBaseThemeFromFile(HbStandardDirs::themesDir());
if (baseThemeInfo.name.isEmpty()) {
// Base theme does not exists in rom
@@ -333,12 +367,13 @@
*/
HbThemeInfo HbThemeUtils::defaultTheme()
{
+
// getting base theme makes sure that default theme was added in
// QSettings, if it was not already done
const HbThemeInfo &themeInfo = baseTheme();
// Assuming the path of default theme and base theme are same
- return HbThemeInfo(getThemeSetting(DefaultThemeSetting), themeInfo.rootDir);
+ return HbThemeInfo(getThemeSetting(DefaultThemeSetting), themeInfo.rootDir);
}
QString HbThemeUtils::getThemeSetting(Setting setting)
@@ -355,8 +390,8 @@
return d.defaultThemeRootDir;
case BaseThemeSetting:
return d.baseTheme;
- case OperatorBasePathSetting:
- return d.operatorBasePath;
+ case OperatorNameSetting:
+ return d.operatorName;
default:
return QString();
}
@@ -364,9 +399,22 @@
void HbThemeUtils::setThemeSetting(Setting setting, const QString &value)
{
+#ifdef Q_OS_SYMBIAN
+ CRepository *repository = 0;
+ TRAP_IGNORE(repository = CRepository::NewL(KServerUid3));
+ if (repository) {
+ TPtrC valueptr(reinterpret_cast<const TUint16 *>(value.constData()));
+ if (KErrNotFound == repository->Set(setting,valueptr)) {
+ repository->Create(setting,valueptr);
+ }
+
+ delete repository;
+ }
+#else
QSettings settings(QLatin1String(ORGANIZATION), QLatin1String(THEME_COMPONENT));
settings.setValue(settingNames[setting], QVariant(value));
// Destructor of QSettings flushes the changed setting in the INI file.
+#endif
}
/**
@@ -390,8 +438,8 @@
case BaseThemeSetting:
d.baseTheme = value;
break;
- case OperatorBasePathSetting:
- d.operatorBasePath = value;
+ case OperatorNameSetting:
+ d.operatorName = value;
break;
default:
break;
@@ -417,23 +465,31 @@
defaultTheme = themeInfo.name;
}
- // If there is any base theme
- if (!themeInfo.name.isEmpty() && isThemeValid(HbThemeInfo(themeInfo.name,rootDir))) {
- // Save these theme names in settings
- setThemeSetting(BaseThemeSetting, themeInfo.name);
- setThemeSetting(DefaultThemeRootDirSetting, rootDir);
-
- // Store default theme also in settings, only if it is valid
- if (themeInfo.name == defaultTheme || isThemeValid(HbThemeInfo(defaultTheme, rootDir))) {
- setThemeSetting(DefaultThemeSetting, defaultTheme);
- }
- themeInfo.rootDir = rootDir;
- d.settingsRetrieved = false;
- }
+ // Save theme names in settings
+ saveBaseThemeSettings(themeInfo, defaultTheme, rootDir);
}
return themeInfo;
}
+void HbThemeUtils::saveBaseThemeSettings(HbThemeInfo &baseThemeInfo,
+ const QString &defaultTheme,
+ const QString &rootDir)
+{
+ // If there is any base theme
+ if ((!baseThemeInfo.name.isEmpty()) && isThemeValid(HbThemeInfo(baseThemeInfo.name,rootDir))) {
+ // Save these theme names in settings
+ setThemeSetting(BaseThemeSetting, baseThemeInfo.name);
+ setThemeSetting(DefaultThemeRootDirSetting, rootDir);
+
+ // Store default theme also in settings, only if it is valid
+ if (baseThemeInfo.name == defaultTheme || isThemeValid(HbThemeInfo(defaultTheme, rootDir))) {
+ setThemeSetting(DefaultThemeSetting, defaultTheme);
+ }
+ baseThemeInfo.rootDir = rootDir;
+ d.settingsRetrieved = false;
+ }
+}
+
/* checks whether the theme is valid
*/
bool HbThemeUtils::isThemeValid(const HbThemeInfo &themeInfo)
@@ -443,3 +499,47 @@
QFile themeIndexFile(themeInfo.rootDir + '/' + platformHierarchy + '/' + iconsResourceFolder + "/" + themeInfo.name + "/index.theme");
return themeIndexFile.open(QIODevice::ReadOnly);
}
+
+const HbThemeIndexInfo HbThemeUtils::getThemeIndexInfo(const HbThemeType &type)
+{
+ 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;
+ }
+
+ return info;
+}
+
+
--- a/src/hbcore/theme/hbthemeutils_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/theme/hbthemeutils_p.h Fri May 14 16:09:54 2010 +0300
@@ -29,6 +29,7 @@
#include <QList>
#include <hbglobal.h>
#include <hbnamespace.h>
+#include <hbthemecommon_p.h>
#include <hblayeredstyleloader_p.h>
#include <QPair>
@@ -44,7 +45,6 @@
HbLayeredStyleLoader::LayerPriority layerPriority;
};
-
struct HbThemeInfo
{
HbThemeInfo()
@@ -55,7 +55,25 @@
}
QString name;
QString rootDir;
+};
+struct HbThemeIndexInfo
+{
+ HbThemeIndexInfo() :
+ name(QString("")),
+ path(QString("")),
+ themeIndexOffset(0)
+ {
+ }
+ HbThemeIndexInfo(const QString &themeName, const QString &path, quint32 themeIndexOffset) :
+ name(themeName),
+ path(path),
+ themeIndexOffset(themeIndexOffset)
+ {
+ }
+ QString name;
+ QString path;
+ quint32 themeIndexOffset;
};
@@ -77,11 +95,11 @@
enum Setting
{
- CurrentThemeSetting = 1,
- DefaultThemeSetting = 2,
- DefaultThemeRootDirSetting = 3,
- BaseThemeSetting = 4,
- OperatorBasePathSetting = 5
+ BaseThemeSetting = 0x1,
+ DefaultThemeSetting = 0x2,
+ DefaultThemeRootDirSetting = 0x3,
+ CurrentThemeSetting = 0x4,
+ OperatorNameSetting = 0x5
};
static QString getThemeSetting(Setting setting);
@@ -93,6 +111,8 @@
static HbThemeInfo defaultTheme();
static bool isThemeValid(const HbThemeInfo &themeInfo);
+ static const HbThemeIndexInfo getThemeIndexInfo(const HbThemeType& type);
+
// Standard folder names
static const char *iconsResourceFolder;
static const char *effectsResourceFolder;
@@ -104,6 +124,9 @@
private:
static HbThemeInfo getBaseThemeFromFile(const QString &rootDir);
+ static void saveBaseThemeSettings(HbThemeInfo &baseThemeInfo,
+ const QString &defaultTheme,
+ const QString &rootDir);
};
#endif //HBTHEMEUTILS_P_H
--- a/src/hbcore/utils/hbforegroundwatcher.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/utils/hbforegroundwatcher.cpp Fri May 14 16:09:54 2010 +0300
@@ -94,6 +94,7 @@
#endif
QApplication::instance()->installEventFilter(this);
HbSleepModeListener::instance(); // make sure the instance is created
+ connect(&mSleepModeTimer, SIGNAL(timeout()), this, SLOT(handleSensors()));
}
void HbForegroundWatcher::setSensorListener(HbSensorListener *sensorListener)
@@ -168,6 +169,19 @@
/*!
\internal
*/
+void HbForegroundWatcher::handleSensors()
+{
+ if (!mLights && mSensorListener && mSensorListener->isEnabled()) {
+ mSensorListener->enableSensors(false, true);
+ }
+ if (mLights && mSensorListener && !mSensorListener->isEnabled()) {
+ mSensorListener->enableSensors(true, true);
+ }
+}
+
+/*!
+ \internal
+*/
bool HbForegroundWatcher::eventFilter(QObject *obj, QEvent *event)
{
// Some of the events we get here are broadcast to all widgets so we must be
@@ -179,19 +193,16 @@
HbEffectInternal::stopEffects();
emit stopAnimation();
}
- if (mSensorListener && mSensorListener->isEnabled()) {
- mSensorListener->enableSensors(false, true);
- }
mLights = false;
+ mSleepModeTimer.start(2000);
} else if (event->type() == HbEvent::SleepModeExit && !mLights) {
if (mForeground) {
HbEffectInternal::resumeEffects();
emit resumeAnimation();
}
- if (mSensorListener && !mSensorListener->isEnabled()) {
- mSensorListener->enableSensors(true, true);
- }
+ mSleepModeTimer.stop();
mLights = true;
+ handleSensors();
} else if (event->type() == QEvent::ApplicationActivate && !mForeground) {
#ifndef Q_OS_SYMBIAN
HandleGainingForeground();
--- a/src/hbcore/utils/hbforegroundwatcher_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/utils/hbforegroundwatcher_p.h Fri May 14 16:09:54 2010 +0300
@@ -27,6 +27,7 @@
#define HBFOREGROUNDWATCHER_P_H
#include <QObject>
+#include <QTimer>
#include <hbglobal.h>
#ifdef Q_OS_SYMBIAN
@@ -61,6 +62,7 @@
private slots:
void handleAboutToQuit();
+ void handleSensors();
private:
HbForegroundWatcher(QObject *parent = 0);
@@ -68,6 +70,7 @@
bool mForeground;
bool mLights;
+ QTimer mSleepModeTimer;
HbSensorListener *mSensorListener;
CCoeEnv *mStaticEnv;
};
--- a/src/hbcore/utils/hboogmwatcher.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/utils/hboogmwatcher.cpp Fri May 14 16:09:54 2010 +0300
@@ -35,6 +35,7 @@
#include <hbvgeffect_p.h>
#endif
#include <QApplication>
+#include "hbiconloader_p.h"
/*!
\class HbOogmWatcher
@@ -71,6 +72,7 @@
{
Q_D(HbOogmWatcher);
d->q_ptr = this;
+ d->mRenderMode = EHWRendering;
}
HbOogmWatcher::~HbOogmWatcher()
@@ -94,6 +96,10 @@
void HbOogmWatcherPrivate::graphicsMemoryLow()
{
qWarning("HbOogmWatcher::graphicsMemoryLow()");
+ 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
@@ -112,7 +118,20 @@
}
}
emit q_ptr->iconCleanupDone(n);
- emit q_ptr->graphicsMemoryNeeded();
+ emit q_ptr->graphicsMemoryLow();
+}
+
+/*!
+ \internal
+*/
+void HbOogmWatcherPrivate::graphicsMemoryGood()
+{
+ qWarning("HbOogmWatcher::graphicsMemoryGood()");
+ if (mRenderMode == ESWRendering) {
+ mRenderMode = EHWRendering;
+ HbIconLoader::global()->switchRenderingMode(mRenderMode);
+ }
+ emit q_ptr->graphicsMemoryGood();
}
/*! Registers an HbIconItem instance. Whenever graphics memory is
@@ -136,12 +155,3 @@
Q_D(HbOogmWatcher);
d->mIconItems.removeOne(item);
}
-
-/*! To be called by the framework (HbInstance) when a mainwindow becomes
- available.
- */
-void HbOogmWatcher::mainWindowReady()
-{
- Q_D(HbOogmWatcher);
- d->mainWindowReady();
-}
--- a/src/hbcore/utils/hboogmwatcher_dummy_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/utils/hboogmwatcher_dummy_p.h Fri May 14 16:09:54 2010 +0300
@@ -28,6 +28,7 @@
#include <hbglobal.h>
#include <QList>
+#include "hbthemecommon_p.h"
class HbOogmWatcher;
class HbIconItem;
@@ -38,10 +39,11 @@
Q_DECLARE_PUBLIC(HbOogmWatcher)
void graphicsMemoryLow();
- void mainWindowReady() { }
+ void graphicsMemoryGood();
HbOogmWatcher *q_ptr;
QList<HbIconItem *> mIconItems;
+ HbRenderingMode mRenderMode;
};
#endif
--- a/src/hbcore/utils/hboogmwatcher_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/utils/hboogmwatcher_p.h Fri May 14 16:09:54 2010 +0300
@@ -40,12 +40,12 @@
static HbOogmWatcher *instance();
~HbOogmWatcher();
void notifyGraphicsMemoryLow();
- void mainWindowReady();
void registerIconItem(HbIconItem *item);
void unregisterIconItem(HbIconItem *item);
signals:
- void graphicsMemoryNeeded();
+ void graphicsMemoryLow();
+ void graphicsMemoryGood();
void iconCleanupDone(int count);
private:
--- a/src/hbcore/utils/hboogmwatcher_sym_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/utils/hboogmwatcher_sym_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -24,70 +24,53 @@
****************************************************************************/
#include "hboogmwatcher_sym_p.h"
-#include <hbinstance.h>
-#include <hbmainwindow.h>
-#include <coecntrl.h>
+#include "hbiconloader_p.h"
+#include <QApplication>
+#include <QSymbianEvent>
#include <e32debug.h>
-#include <QMetaObject>
+#include <w32std.h>
+
+// Constants copied from goommonitorplugin.hrh. Including the file is
+// not possible because older versions of the file do not have the
+// constants and thus would cause a build break with older Symbian
+// envs which is not desirable.
+#define KGoomMemoryLowEvent 0x10282DBF
+#define KGoomMemoryGoodEvent 0x20026790
+
+static QCoreApplication::EventFilter prevEventFilter;
+
+static bool goomEventFilter(void *message, long *result)
+{
+ QSymbianEvent *symEvent = static_cast<QSymbianEvent *>(message);
+ if (symEvent->type() == QSymbianEvent::WindowServerEvent) {
+ const TWsEvent *wsEvent = symEvent->windowServerEvent();
+ switch (wsEvent->Type()) {
+
+ case KGoomMemoryLowEvent:
+ RDebug::Printf("HbOogmWatcher: Goom memory low event");
+ HbOogmWatcherPrivate::d_ptr(HbOogmWatcher::instance())->graphicsMemoryLow();
+ break;
+
+ case KGoomMemoryGoodEvent:
+ RDebug::Printf("HbOogmWatcher: Goom memory good event");
+ HbOogmWatcherPrivate::d_ptr(HbOogmWatcher::instance())->graphicsMemoryGood();
+ break;
+
+ case EEventWindowVisibilityChanged:
+ if (wsEvent->VisibilityChanged()->iFlags & TWsVisibilityChangedEvent::ENotVisible) {
+ HbIconLoader::global()->handleForegroundLost();
+ }
+ break;
+ }
+ }
+ // If there was an event filter set previously then call it. Otherwise
+ // return false (let through any events, even the ones handled above).
+ return prevEventFilter ? prevEventFilter(message, result) : false;
+}
HbOogmWatcherPrivate::HbOogmWatcherPrivate()
{
-#ifdef HB_OOGM_ALF
- mInitialized = false;
- setupListener(); // there may be no mainwindow at this point but we must try anyway
-#endif
-}
-
-void HbOogmWatcherPrivate::mainWindowReady()
-{
- // This function is invoked by the framework when a mainwindow is registered to the
- // HbInstance. It has to invoke setupListener() asynchronously otherwise the creation
- // of the CAlfCompositionSource may fail.
- if (!mInitialized) {
- QMetaObject::invokeMethod(this, "setupListener", Qt::QueuedConnection);
- }
+ // Standard app event filtering is not suitable here, must use
+ // setEventFilter to catch the symbian events.
+ prevEventFilter = qApp->setEventFilter(goomEventFilter);
}
-
-void HbOogmWatcherPrivate::setupListener()
-{
-#ifdef HB_OOGM_ALF
- mCompositionSource = 0;
- QList<HbMainWindow *> mainWindows = hbInstance->allMainWindows();
- if (!mainWindows.isEmpty()) {
- RWindow *win = static_cast<RWindow *>(mainWindows.at(0)->effectiveWinId()->DrawableWindow());
- TInt err = win ? KErrNone : KErrNotFound;
- if (win)
- TRAP(err, mCompositionSource = CAlfCompositionSource::NewL(*win));
- if (err == KErrNone) {
- TRAP(err, mCompositionSource->AddCompositionObserverL(*this));
- if (err != KErrNone) {
- RDebug::Printf("HbOogmWatcher: Cannot add composition observer (%d)", err);
- delete mCompositionSource;
- mCompositionSource = 0;
- } else {
- mInitialized = true;
- RDebug::Printf("HbOogmWatcher: Initialized successfully");
- }
- } else {
- RDebug::Printf("HbOogmWatcher: Cannot create CAlfCompositionSource (%d, RWindow=%x)", err, (int) win);
- }
- } else {
- RDebug::Printf("HbOogmWatcher: No mainwindows available");
- }
-#endif
-}
-
-HbOogmWatcherPrivate::~HbOogmWatcherPrivate()
-{
-#ifdef HB_OOGM_ALF
- delete mCompositionSource;
-#endif
-}
-
-#ifdef HB_OOGM_ALF
-void HbOogmWatcherPrivate::RunningLowOnGraphicsMemory()
-{
- RDebug::Printf("HbOogmWatcher: RunningLowOnGraphicsMemory()");
- graphicsMemoryLow();
-}
-#endif
--- a/src/hbcore/utils/hboogmwatcher_sym_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/utils/hboogmwatcher_sym_p.h Fri May 14 16:09:54 2010 +0300
@@ -29,23 +29,12 @@
#include <hbglobal.h>
#include <QObject>
#include <QList>
-
-#include <bldvariant.hrh>
-#ifdef SYMBIAN_BUILD_GCE
-#define HB_OOGM_ALF
-#endif
+#include "hboogmwatcher_p.h"
+#include "hbthemecommon_p.h"
-#ifdef HB_OOGM_ALF
-#include <alf/alfcompositionutility.h>
-#endif
-
-class HbOogmWatcher;
class HbIconItem;
class HB_AUTOTEST_EXPORT HbOogmWatcherPrivate : public QObject
-#ifdef HB_OOGM_ALF
-, public MAlfCompositionObserver
-#endif
{
Q_OBJECT
@@ -53,30 +42,15 @@
Q_DECLARE_PUBLIC(HbOogmWatcher)
HbOogmWatcherPrivate();
- ~HbOogmWatcherPrivate();
-public slots:
- void setupListener();
+ void graphicsMemoryLow();
+ void graphicsMemoryGood();
-public:
- void graphicsMemoryLow();
- void mainWindowReady();
+ static HbOogmWatcherPrivate *d_ptr(HbOogmWatcher *w) { return w->d_ptr; }
HbOogmWatcher *q_ptr;
QList<HbIconItem *> mIconItems;
- bool mInitialized;
-
-#ifdef HB_OOGM_ALF
- CAlfCompositionSource *mCompositionSource;
-
- // from MAlfCompositionObserver
- void FrameReady(TInt) { }
- void CompositionTargetHidden() { }
- void CompositionTargetVisible() { }
- void GraphicsMemoryGood() { }
- void RunningLowOnGraphicsMemory();
-#endif
-
+ HbRenderingMode mRenderMode;
};
#endif
--- a/src/hbcore/utils/hbtextmeasurementutility_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/utils/hbtextmeasurementutility_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -112,17 +112,21 @@
if (rc1->mSize == rc2->mSize) {
return true;
} else {
- qDebug() << "HbTextMeasurementUtilityPrivate::recordFullCompare: Sizes don't match";
+ qDebug() << "HbTextMeasurementUtility::recordFullCompare: Sizes don't match";
}
} else {
- qDebug() << "HbTextMeasurementUtilityPrivate::recordFullCompare: Row counts don't match";
+ qDebug() << "HbTextMeasurementUtility::recordFullCompare: Row counts don't match";
}
} else {
- qDebug() << "HbTextMeasurementUtilityPrivate::recordFullCompare: Fonts don't match";
+ qDebug() << "HbTextMeasurementUtility::recordFullCompare: Fonts don't match";
}
} else {
- qDebug() << "HbTextMeasurementUtilityPrivate::recordFullCompare: Names don't match";
+ qDebug() << "HbTextMeasurementUtility::recordFullCompare: Names don't match";
}
+ qDebug() << "HbTextMeasurementUtility::recordFullCompare: -- record1:"
+ << rc1->mRecordName << rc1->mFontSpec.role() << rc1->mFontSpec.textHeight() << rc1->mRowCount << rc1->mSize;
+ qDebug() << "HbTextMeasurementUtility::recordFullCompare: -- record2:"
+ << rc2->mRecordName << rc2->mFontSpec.role() << rc2->mFontSpec.textHeight() << rc2->mRowCount << rc2->mSize;
return false;
}
@@ -189,7 +193,7 @@
bool HbTextMeasurementUtilityPrivate::validateRecords(HbDeviceProfile &profile)
{
if (records.isEmpty()){
- qDebug() << "HbTextMeasurementUtilityPrivate::validateRecords: No result entries";
+ qDebug() << "HbTextMeasurementUtility::validateRecords: No result entries";
return false;
}
QList<HbTextRecord*> temp;
@@ -204,18 +208,18 @@
if (!temp[i]->mRecordName.compare(record->mRecordName)) {
// duplicate with same data
if (HbTextRecord::recordFullCompare(temp[i], record)) {
- qDebug() << "HbTextMeasurementUtilityPrivate::validateRecords: Duplicate removed";
+ qDebug() << "HbTextMeasurementUtility::validateRecords: Duplicate removed";
notFound = false;
// duplicate with same id and correct data
} else if ( !temp[i]->fontLogicalName().compare(KUnknown) &&
record->fontLogicalName().compare(KUnknown)) {
- qDebug() << "HbTextMeasurementUtilityPrivate::validateRecords: Duplicate overwritten";
+ qDebug() << "HbTextMeasurementUtility::validateRecords: Duplicate overwritten";
notFound = false;
temp[i] = record;
// duplicates
} else {
- qDebug() << "HbTextMeasurementUtilityPrivate::validateRecords: Duplicate items found";
+ qDebug() << "HbTextMeasurementUtility::validateRecords: Duplicate items found";
ret = false;
}
break;
@@ -229,14 +233,14 @@
records = temp;
foreach (const HbTextRecord *record, records) {
if ( !record->fontLogicalName().compare(KUnknown) ) {
- qDebug() << "HbTextMeasurementUtilityPrivate::validateRecords: Result item" << record->mRecordName << "Fontspec is null";
+ qDebug() << "HbTextMeasurementUtility::validateRecords: Result item" << record->mRecordName << "Fontspec is null";
ret = false;
}
if ( record->mSize.width() > profile.logicalSize().width() ) {
- qDebug() << "HbTextMeasurementUtilityPrivate::validateRecords: Result item" << record->mRecordName << "width is too wide";
- qDebug() << "HbTextMeasurementUtilityPrivate::validateRecords: Profile width: " << profile.logicalSize().width();
- qDebug() << "HbTextMeasurementUtilityPrivate::validateRecords: Record width:" << record->mSize.width();
+ qDebug() << "HbTextMeasurementUtility::validateRecords: Result item" << record->mRecordName << "width is too wide";
+ qDebug() << "HbTextMeasurementUtility::validateRecords: Profile width: " << profile.logicalSize().width();
+ qDebug() << "HbTextMeasurementUtility::validateRecords: Record width:" << record->mSize.width();
ret = false;
}
}
--- a/src/hbcore/utils/hbthetestwidget_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/utils/hbthetestwidget_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -28,7 +28,7 @@
#include "hbnamespace_p.h"
#include <hbapplication.h>
#include "hbtoolbutton_p.h"
-#include "hbstyleoptiontoolbutton.h"
+#include "hbstyleoptiontoolbutton_p.h"
#include "hbcolorscheme.h"
#include "hbtextitem.h"
#include "hbpopup.h"
@@ -306,7 +306,13 @@
{
#ifdef HB_TEXT_MEASUREMENT_UTILITY
HbTextMeasurementUtility *measureUtility = HbTextMeasurementUtility::instance();
- measureUtility->measureItems();
+ if ( measureUtility->locTestMode() ) {
+ measureUtility->measureItems();
+ } else {
+ showWarning("Localization metrics run-time flag disabled!");
+ }
+#else
+ showWarning("Localization metrics compile-time flag disabled!");
#endif //HB_TEXT_MEASUREMENT_UTILITY
}
@@ -314,13 +320,19 @@
{
#ifdef HB_TEXT_MEASUREMENT_UTILITY
HbTextMeasurementUtility *measureUtility = HbTextMeasurementUtility::instance();
- HbDeviceProfile profile = HbDeviceProfile::profile(d->mMainWindow);
- if (!HbApplication::applicationName().isEmpty()) {
- measureUtility->writeReport(profile, HbApplication::applicationName());
+ if ( measureUtility->locTestMode() ) {
+ HbDeviceProfile profile = HbDeviceProfile::profile(d->mMainWindow);
+ if (!HbApplication::applicationName().isEmpty()) {
+ measureUtility->writeReport(profile, HbApplication::applicationName());
+ } else {
+ measureUtility->writeReport(profile, "unknown_application");
+ }
+ measureUtility->reset();
} else {
- measureUtility->writeReport(profile, "unknown_application");
+ showWarning("Localization metrics run-time flag disabled!");
}
- measureUtility->reset();
+#else
+ showWarning("Localization metrics compile-time flag disabled!");
#endif //HB_TEXT_MEASUREMENT_UTILITY
}
@@ -349,13 +361,14 @@
void HbTheTestWidget::showThemeServerMemoryInfo()
{
- HbDialog popup;
- popup.setTimeout(HbPopup::StandardTimeout);
- popup.setPreferredPos(QPointF(10,10));
-
- HbWidget widget;
- QGraphicsLinearLayout *layout = new QGraphicsLinearLayout(Qt::Vertical);
- widget.setLayout(layout);
+ HbDialog *dialog = new HbDialog();
+ dialog->setAttribute(Qt::WA_DeleteOnClose);
+
+ dialog->setModal(false);
+ dialog->setBackgroundFaded(false);
+ dialog->setDismissPolicy(HbPopup::NoDismiss);
+ dialog->setTimeout(HbPopup::StandardTimeout);
+ dialog->setPreferredPos(QPointF(10,10));
int freeSharedMemory = HbThemeClient::global()->freeSharedMemory();
int allocatedSharedMemory = HbThemeClient::global()->allocatedSharedMemory();
@@ -369,11 +382,21 @@
message += " kB \n";
HbTextItem *textItem = new HbTextItem(message);
textItem->setTextColor(HbColorScheme::color("qtc_default_main_pane_normal"));
- layout->addItem(textItem);
+
+ QSizeF popupSize(50,50);
+ dialog->setMinimumSize(popupSize); // needed
- popup.setContentsMargins(0,20,0,20);
- popup.setContentWidget(&widget);
- popup.exec();
+ dialog->setContentsMargins(5,15,5,15);
+ dialog->setContentWidget(textItem);
+
+ dialog->show();
+}
+
+void HbTheTestWidget::createSharedMemoryReport() const
+{
+#ifdef HB_THEME_SERVER_MEMORY_REPORT
+ HbThemeClient::global()->createMemoryReport();
+#endif
}
void HbTheTestWidget::screenCapture()
@@ -438,3 +461,18 @@
setVisible(true);
}
+void HbTheTestWidget::showWarning(QString text)
+{
+ HbTextItem *textItem = new HbTextItem(text);
+ textItem->setAlignment(Qt::AlignHCenter);
+ textItem->setFontSpec(HbFontSpec(HbFontSpec::Secondary));
+ textItem->setTextColor(HbColorScheme::color("qtc_popup_normal"));
+
+ HbDialog *dialog = new HbDialog();
+ dialog->setAttribute(Qt::WA_DeleteOnClose);
+ dialog->setContentWidget(textItem);
+ dialog->setContentsMargins(5,15,5,15);
+ dialog->show();
+}
+
+
--- a/src/hbcore/utils/hbthetestwidget_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/utils/hbthetestwidget_p.h Fri May 14 16:09:54 2010 +0300
@@ -81,6 +81,7 @@
void setApplicationBackground(); // only for S60
void showThemeServerMemoryInfo();
void screenCapture(); // not working on HW
+ void createSharedMemoryReport() const;
protected:
QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const;
@@ -90,6 +91,9 @@
void orientationChanged(Qt::Orientation newOrientation);
private:
+ void showWarning(QString text);
+
+private:
HbTheTestWidgetPrivate *d;
};
--- a/src/hbcore/utils/hbtypefaceinfo.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/utils/hbtypefaceinfo.cpp Fri May 14 16:09:54 2010 +0300
@@ -30,271 +30,13 @@
#include <QFontInfo>
#include <QRegExp>
+#include "hbtypefaceinfodatabase_p.h"
+#include "hbthemeclient_p.h"
-// use this only if you want to measure and output metrics
-//#define HBTYPEFACEINFO_MEASURE_METRICS
-//#define HBTYPEFACEINFO_OUTPUT_METRICS
#undef HBTYPEFACEINFO_DEBUG_ENABLE
//#define HBTYPEFACEINFO_DEBUG_ENABLE
-#ifdef HBTYPEFACEINFO_OUTPUT_METRICS
-#include <QXmlStreamWriter>
-#endif
-
-#ifdef HBTYPEFACEINFO_DEBUG_ENABLE
-#include <QtDebug>
-#endif
-
-
-
-// Recognized texts for values of role strings
-#define PRIMARY_STRING "primary"
-#define SECONDARY_STRING "secondary"
-#define PRIMARYSMALL_STRING "primarysmall"
-#define TITLE_STRING "title"
-#define DIGITAL_STRING "digital"
-#define UNDEFINED_STRING "undefined"
-
-#define TYPEFACE_METRICS_FILE_STEM ":typeface_metrics_"
-#define LARGEST_SIZE 100
-// Following must be greater than 0
-#define SMALLEST_SIZE 1
-
-class HbTypefaceVariant
-{
-public:
- HbTypefaceVariant(const QString& typeface, bool usedBold)
- :
- mTypefaceFamilyName(typeface),
- mUsedBold(usedBold)
- {
- };
- HbTypefaceVariant()
- :
- mTypefaceFamilyName(""),
- mUsedBold(false)
- {
- };
-public:
- QString mTypefaceFamilyName;
- bool mUsedBold;
-};
-
-class HbDownsizeInfo
-{
-public:
- class HbTypefaceMeasureInfo
- {
- public:
- HbTypefaceMeasureInfo();
- HbTypefaceMeasureInfo(const HbTypefaceMeasureInfo &);
- ~HbTypefaceMeasureInfo();
- public:
- int pixelSize;
- int measuredAscent;
- };
-
-public:
- HbDownsizeInfo(QString typefaceFamily);
- ~HbDownsizeInfo();
-
- bool readTypefaceMetricsFile();
- void autoGenerateMetrics();
-
-private:
- void outputMetrics() const;
-
-public: // data
- QString mTypefaceFamily;
- QMap<int, HbTypefaceMeasureInfo> mDownSizeTable;
- int mLowestExtent;
- int mHighestExtent;
-};
-
-
-HbDownsizeInfo::HbTypefaceMeasureInfo::HbTypefaceMeasureInfo()
-:
-pixelSize(0),
-measuredAscent(0)
-{
-}
-
-HbDownsizeInfo::HbTypefaceMeasureInfo::HbTypefaceMeasureInfo(const HbTypefaceMeasureInfo &other)
-:
-pixelSize(other.pixelSize),
-measuredAscent(other.measuredAscent)
-{
-}
-
-HbDownsizeInfo::HbTypefaceMeasureInfo::~HbTypefaceMeasureInfo()
-{
-}
-
-
-HbDownsizeInfo::HbDownsizeInfo(QString typefaceFamily)
- :
- mTypefaceFamily(typefaceFamily),
- mLowestExtent(LARGEST_SIZE+1),
- mHighestExtent(SMALLEST_SIZE-1)
-{
-#ifndef HBTYPEFACEINFO_MEASURE_METRICS
- if (!readTypefaceMetricsFile()) {
- autoGenerateMetrics();
- }
-#else
- autoGenerateMetrics();
-#endif // HBTYPEFACEINFO_MEASURE_METRICS
-
-#ifdef HBTYPEFACEINFO_OUTPUT_METRICS
- outputMetrics();
-#endif // HBTYPEFACEINFO_OUTPUT_METRICS
-}
-
-HbDownsizeInfo::~HbDownsizeInfo()
-{
-}
-
-void HbDownsizeInfo::outputMetrics() const
-{
-#ifdef HBTYPEFACEINFO_OUTPUT_METRICS
- QString filePath; // start with windows only
- filePath.append("c:\\temp\\");
- filePath.append("typeface_metrics_");
- filePath.append(mTypefaceFamily.toLower().replace(QRegExp("\\s+"), QString("_")));
- filePath.append(".xml");
-
- QFile file(filePath);
- if (!file.open(QFile::WriteOnly | QFile::Text)) {
- return;
- }
-
- QXmlStreamWriter xmlWriter(&file);
-
- xmlWriter.setAutoFormatting(true);
- xmlWriter.writeStartDocument();
- xmlWriter.writeComment("this file is automatically generated by HBTYPEFACEINFO_MEASURE_METRICS mode");
- xmlWriter.writeCharacters("\n"); // is this platform neutral?
-
- xmlWriter.writeStartElement("typeface_information");
-
- xmlWriter.writeStartElement("typeface_metrics");
- xmlWriter.writeAttribute("family", mTypefaceFamily);
-
- QMap<int, HbTypefaceMeasureInfo>::const_iterator iter;
-
- for(iter = mDownSizeTable.constBegin(); iter != mDownSizeTable.constEnd(); iter++) {
- int key = iter.key();
- HbTypefaceMeasureInfo value = iter.value();
-
- xmlWriter.writeStartElement("metric");
- xmlWriter.writeAttribute("textheight", QString::number(key));
- xmlWriter.writeAttribute("size", QString::number(value.pixelSize));
- xmlWriter.writeAttribute("baseline", QString::number(0));
-
- xmlWriter.writeEndElement();
- }
-
- xmlWriter.writeEndDocument();
- file.close();
-
-#endif // HBTYPEFACEINFO_OUTPUT_METRICS
-}
-
-bool HbDownsizeInfo::readTypefaceMetricsFile()
-{
- int numPoints(0);
-
- HbTypefaceXmlParser *parser = new HbTypefaceXmlParser();
-
- QString typefaceMetricsFileName(TYPEFACE_METRICS_FILE_STEM);
- // replace whitespace with underscores and append
- typefaceMetricsFileName.append(mTypefaceFamily.toLower().replace(QRegExp("\\s+"), QString("_")));
- typefaceMetricsFileName.append(".xml");
-
-#ifdef HBTYPEFACEINFO_DEBUG_ENABLE
- qDebug("HbDownsizeInfo::readTypefaceMetricsFile: typeface metric filename: %s", typefaceMetricsFileName.toAscii().constData());
-#endif
- parser->setFilePath(typefaceMetricsFileName);
-
- if (parser->init()){
-#ifdef HBTYPEFACEINFO_DEBUG_ENABLE
- qDebug( "HbDownsizeInfo::readTypefaceMetricsFile: parser init() ok");
-#endif
- QString family;
- HbTypefaceXmlParser::StartElement startEl(HbTypefaceXmlParser::Undefined);
- while ((startEl = parser->readToStartElement()) != HbTypefaceXmlParser::NoStartElement) {
- if (startEl == HbTypefaceXmlParser::TypefaceMetrics) {
-#ifdef HBTYPEFACEINFO_DEBUG_ENABLE
- qDebug( "HbDownsizeInfo::readTypefaceMetricsFile: start element: typeface metrics");
-#endif
- if (parser->metricsTypefaceFamily().toLower()==mTypefaceFamily.toLower()) {
- int textHeight(0);
- int baseline(0);
- HbTypefaceMeasureInfo readMetrics;
- while (parser->readMetric(textHeight, readMetrics.pixelSize, baseline)) {
- numPoints++;
- mDownSizeTable.insert(textHeight, readMetrics);
- mLowestExtent = qMin(mLowestExtent, textHeight); // Stored so that we can extrapolate from the lowest value
- mHighestExtent = qMax(mHighestExtent, textHeight); // Stored so that we can extrapolate from the highest value
-
-#ifdef HBTYPEFACEINFO_DEBUG_ENABLE
- qDebug( "HbDownsizeInfo::readTypefaceMetricsFile: metric %d: extent = %d size = %d baseline = %d", numPoints, textHeight, readMetrics.pixelSize, baseline);
-#endif
- }
- }
- }
- }
- }
-
- parser->close();
- delete parser;
-
- return numPoints > 0;
-}
-void HbDownsizeInfo::autoGenerateMetrics()
-{
-#ifdef HBTYPEFACEINFO_DEBUG_ENABLE
- qDebug( "HbDownsizeInfo::autoGenerateMetrics: WARNING: auto generating metrics, this is inefficient!");
-#endif
- QFont f(mTypefaceFamily);
-
- HbTypefaceMeasureInfo lastMetrics;
- HbTypefaceMeasureInfo measuredMetrics;
-
- int lastExtentFilled = 0;
- mDownSizeTable.insert(lastExtentFilled, lastMetrics);
-
-#ifdef HBTYPEFACEINFO_DEBUG_ENABLE
- qDebug( "HbDownsizeInfo::autoGenerateMetrics: extent = %d size = %d measured ascent = %d", lastExtentFilled, lastMetrics.pixelSize, lastMetrics.measuredAscent);
-#endif
-
- int size;
-
- for (size = SMALLEST_SIZE; size <= LARGEST_SIZE; size++) {
- measuredMetrics.pixelSize = size;
- f.setPixelSize(size);
- QFontMetrics fm(f);
- int thisExtent = fm.height();
- measuredMetrics.measuredAscent = fm.ascent(); // not actually measuring it, just taking it from the metrics for now
- for (int extent = lastExtentFilled+1; extent < thisExtent; extent++){
- mDownSizeTable.insert(extent, lastMetrics);
-#ifdef HBTYPEFACEINFO_DEBUG_ENABLE
- qDebug( "HbDownsizeInfo::autoGenerateMetrics: fill in: extent = %d size = %d measured ascent = %d", extent, lastMetrics.pixelSize, lastMetrics.measuredAscent);
-#endif
- }
- // fill in this one
- mDownSizeTable.insert(thisExtent, measuredMetrics);
-#ifdef HBTYPEFACEINFO_DEBUG_ENABLE
- qDebug( "HbDownsizeInfo::autoGenerateMetrics: extent = %d size = %d measured ascent = %d", thisExtent, measuredMetrics.pixelSize, measuredMetrics.measuredAscent);
-#endif
- lastExtentFilled = thisExtent;
- lastMetrics.pixelSize = measuredMetrics.pixelSize;
- lastMetrics.measuredAscent = measuredMetrics.measuredAscent;
- }
- mHighestExtent = lastExtentFilled; // Stored so that we can extrapolate from the last mapped value
-}
-
class HbTypefaceInfoPrivate : public QObject
{
Q_OBJECT
@@ -303,87 +45,46 @@
HbTypefaceInfoPrivate() : initialized(false) {}
~HbTypefaceInfoPrivate();
void initialize();
- static bool encodeRole(const QString &roleName, HbFontSpec::Role &role);
+ bool containsRole( HbFontSpec::Role role, int &index );
+ bool containsFamily( const QString& typefaceFamily, int &index );
public: // data
bool initialized;
- QMap<int,HbTypefaceVariant> mTypefaces;
- QMap<QString, HbDownsizeInfo*> mFontTable;
+
+ HbTypefaceInfoVector *mTypefaceVector;
};
HbTypefaceInfoPrivate::~HbTypefaceInfoPrivate()
{
- QMapIterator<QString, HbDownsizeInfo*> i(mFontTable);
- while (i.hasNext()) {
- i.next();
- delete(i.value());
- }
- mFontTable.clear();
}
-bool HbTypefaceInfoPrivate::encodeRole(const QString& roleName, HbFontSpec::Role &role)
-{
- bool encoded(true); // return value
-
- if (roleName.toLower() == PRIMARY_STRING) {
- role = HbFontSpec::Primary;
- }
- else if (roleName.toLower() == SECONDARY_STRING) {
- role = HbFontSpec::Secondary;
- }
- else if (roleName.toLower() == TITLE_STRING) {
- role = HbFontSpec::Title;
- }
- else if (roleName.toLower() == PRIMARYSMALL_STRING) {
- role = HbFontSpec::PrimarySmall;
- }
- else if (roleName.toLower() == DIGITAL_STRING) {
- role = HbFontSpec::Digital;
- }
- else if (roleName.toLower() == UNDEFINED_STRING) {
- role = HbFontSpec::Undefined; // Translated if someone passes the string
- }
- else { // Really undefined
- role = HbFontSpec::Undefined;
- encoded = false;
- }
-
- return encoded;
-}
void HbTypefaceInfoPrivate::initialize()
{
- bool success(true);
- HbTypefaceXmlParser *parser = new HbTypefaceXmlParser();
- if (!parser->init()){
- // ignore errors
- success = false;
- }
- else {
- QString role;
- QString family;
- bool isBold;
- while (parser->readMapping( role, family, isBold)) {
- HbFontSpec::Role roleEnum;
- if (encodeRole(role, roleEnum)){
- mTypefaces[roleEnum] = HbTypefaceVariant(family, isBold);
- }
- else {
- // role might be an alias. Not required functionality. Ignore
- }
+
+ mTypefaceVector = HbThemeClient::global()->typefaceInfo();
+
+ if( !mTypefaceVector ) {
+ qWarning() << "HbTypefaceInfo, no theme server connection - working in fallback mode";
+ HbTypefaceInfoDatabase *heapDatabase = HbTypefaceInfoDatabase::instance( HbMemoryManager::HeapMemory );
+ mTypefaceVector = HbMemoryUtils::getAddress<HbTypefaceInfoVector>(HbMemoryManager::HeapMemory,
+ heapDatabase->typefaceInfoVectorOffset());
+ if( heapDatabase && mTypefaceVector ) {
+#ifdef HBTYPEFACEINFO_DEBUG_ENABLE
+ qDebug() << "Read " << mTypefaceVector->size() << " typefaces in heap mode";
+#endif // HBTYPEFACEINFO_DEBUG_ENABLE
}
+ } else {
+#ifdef HBTYPEFACEINFO_DEBUG_ENABLE
+ qDebug() << "HbTypefaceInfoPrivate, server connection works! Read " << mTypefaceVector->size() << " typefaces";
+#endif // HBTYPEFACEINFO_DEBUG_ENABLE
}
- parser->close();
- delete parser;
-
- // Secondary chosen as default it not specified in the xml
- if (!mTypefaces.contains(HbFontSpec::Undefined) && mTypefaces.contains(HbFontSpec::Secondary)) {
- mTypefaces[HbFontSpec::Undefined] = mTypefaces[HbFontSpec::Secondary];
- }
-
- initialized = success;
- return;
+ if( !mTypefaceVector ) {
+ qWarning() << "HbTypefaceInfoPrivate, unable to allocate typeface vector";
+ return;
+ }
+ initialized = true;
}
@@ -402,15 +103,54 @@
delete d;
}
+bool HbTypefaceInfoPrivate::containsRole( HbFontSpec::Role role, int &index )
+{
+ if( ! initialized ) {
+ qWarning( "HbTypefaceInfoPrivate in not initialized, line %d", __LINE__ );
+ return false;
+ }
+ for( int i = 0; i < mTypefaceVector->size(); i++ ) {
+ if( mTypefaceVector->at(i).mRoleEnum == role ) {
+ index = i;
+ return true;
+ }
+ }
+ return false;
+}
+
+
+bool HbTypefaceInfoPrivate::containsFamily( const QString& typefaceFamily, int &index )
+{
+ if( ! initialized ) {
+ qWarning( "HbTypefaceInfoPrivate in not initialized, line %d", __LINE__ );
+ return false;
+ }
+ for( int i = 0; i < mTypefaceVector->size(); i++ ) {
+ if( mTypefaceVector->at(i).mFamily == typefaceFamily ) {
+ index = i;
+ return true;
+ }
+ }
+ return false;
+}
+
+
void HbTypefaceInfo::roleToTypeface(HbFontSpec::Role role, QString& typefaceFamily, int& weight) const
{
- bool validRole = d->mTypefaces.contains(role);
+ int index;
+
+ bool validRole = d->containsRole( role, index );
if (!validRole) {
role = HbFontSpec::Undefined;
+ validRole = d->containsRole( role, index );
}
- HbTypefaceVariant choice = d->mTypefaces.value(role);
- typefaceFamily = choice.mTypefaceFamilyName;
- weight = choice.mUsedBold ? QFont::Bold : QFont::Normal;
+ if( !validRole ) {
+ qWarning( "HbTypefaceInfo: cannot find corresponding font role, line %d", __LINE__ );
+ return;
+ }
+
+ typefaceFamily = d->mTypefaceVector->at( index ).mFamily;
+ weight = d->mTypefaceVector->at( index ).mIsBold ? QFont::Bold : QFont::Normal;
return;
}
@@ -421,48 +161,69 @@
qreal textHeight) const
{
Q_UNUSED(weight);
- HbDownsizeInfo *downsizeInfo;
+ int index;
+ int heightIndex;
- if (d->mFontTable.contains( typefaceFamily )) {
- downsizeInfo = d->mFontTable[typefaceFamily];
- } else {
- downsizeInfo = new HbDownsizeInfo(typefaceFamily);
- d->mFontTable.insert(typefaceFamily, downsizeInfo);
+ if (! d->containsFamily( typefaceFamily, index )) {
+ // need to generate on server size, not supported yet
+ qWarning( "HbTypefaceInfo:textHeightToSizeInPixels no font family %s, line %d", typefaceFamily.toLatin1().data(), __LINE__ );
+ return 1;
}
+ HbTypefaceInfoItem *item = &( d->mTypefaceVector->at( index ) );
+
int size(-1);
int flooredPaneHeight = qRound(textHeight-0.5);
- if (downsizeInfo->mDownSizeTable.contains(flooredPaneHeight)) {
- size = downsizeInfo->mDownSizeTable.value(flooredPaneHeight).pixelSize;
- } else if (textHeight<downsizeInfo->mLowestExtent) { // Assumed that downsize info goes quite low, below really usable fonts
- size = qRound(textHeight);
- } else if (textHeight<downsizeInfo->mHighestExtent) { // interpolate. May fail and leave size unset.
- QMap<int, HbDownsizeInfo::HbTypefaceMeasureInfo> &map = downsizeInfo->mDownSizeTable;
- QMap<int, HbDownsizeInfo::HbTypefaceMeasureInfo>::const_iterator lowerB = map.lowerBound(flooredPaneHeight);
- QMap<int, HbDownsizeInfo::HbTypefaceMeasureInfo>::const_iterator upperB = map.upperBound(flooredPaneHeight);
- if (lowerB != map.constEnd() && upperB != map.constEnd() ) {
- int k1 = lowerB.key();
- int v1 = lowerB.value().pixelSize;
- int k2 = upperB.key();
- int v2 = upperB.value().pixelSize;
- int diff = k2 - k1;
- if (diff > 0) {
- size = qRound(v1 + (flooredPaneHeight - k1)*(v2 - v1)/diff);
- }
- }
+ if ( item->tableContainsHeight( flooredPaneHeight, heightIndex ) ) {
+ size = item->mDownSizeTable.at( heightIndex ).pixelSize;
+ } else if ( textHeight < item->mLowestExtent ) { // Assumed that downsize info goes quite low, below really usable fonts
+ size = qRound( textHeight );
+ } else if ( textHeight < item->mHighestExtent ) { // interpolate. May fail and leave size unset.
+ int indexLowerB = -1;
+ int indexUpperB = -1;
+ int lowerBValue = 0xffffff;
+ int upperBValue = 0xffffff;
+ for( int i = 0; i < item->mDownSizeTable.size(); i++ ) {
+ int current = item->mDownSizeTable.at( i ).textHeight;
+ if( ( current < lowerBValue ) && ( current >= flooredPaneHeight ) ) {
+ lowerBValue = current;
+ indexLowerB = i;
+ }
+ if( ( current < upperBValue ) && ( current > flooredPaneHeight ) ) {
+ upperBValue = current;
+ indexUpperB = i;
+ }
+ }
+
+ if( ( indexUpperB != -1 ) && ( indexLowerB != -1 ) ) {
+ int k1 = lowerBValue;
+ int v1 = item->mDownSizeTable.at( indexLowerB ).pixelSize;
+ int k2 = upperBValue;
+ int v2 = item->mDownSizeTable.at( indexUpperB ).pixelSize;
+ int diff = k2 - k1;
+ if (diff > 0) {
+ size = qRound(v1 + (flooredPaneHeight - k1)*(v2 - v1)/diff);
+ }
+ }
}
// Come here for text heights that are too large for the table, or for failure of interpolation
if (size == -1) {
+ int highestExtentIndex;
+ if( ! item->tableContainsHeight( item->mHighestExtent, highestExtentIndex ) ) {
+ qWarning( "HbTypefaceInfo:textHeightToSizeInPixels something wrong with downsize table, line %d", __LINE__ );
+ return 1;
+ }
+
size = qRound( textHeight
- * downsizeInfo->mDownSizeTable.value(downsizeInfo->mHighestExtent).pixelSize
- / downsizeInfo->mHighestExtent);
+ * item->mDownSizeTable.at( highestExtentIndex ).pixelSize
+ / item->mHighestExtent);
}
- // If the caller intends non-zero size, and zero would be returned by downsizing, then return 1.
+ // If the caller intends non-zero size, and zero would be returned by downsizing, then return 1.
// This avoids QFont's special treatment of zero size.
if(textHeight > 0 && size <= 0) {
- size = 1;
+ size = 1;
}
return size;
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/utils/hbtypefaceinfodatabase_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,394 @@
+/****************************************************************************
+**
+** 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 "hbtypefaceinfodatabase_p.h"
+#include <QFontMetrics>
+#include <QDir>
+#include <QDebug>
+#include <QXmlStreamWriter>
+
+// internal debug
+#undef HBTYPEFACEINFO_DEBUG_ENABLE
+//#define HBTYPEFACEINFO_DEBUG_ENABLE
+
+
+#ifdef Q_OS_SYMBIAN
+ #define HB_FONTS_WRITABLE_PATH QString("c:\\hb\\fonts")
+#else
+ #ifndef Q_OS_UNIX
+ #define HB_FONTS_WRITABLE_PATH QString("c:\\Hb\\lib")
+ #endif
+#endif
+
+// Recognized texts for values of role strings
+#define PRIMARY_STRING "primary"
+#define SECONDARY_STRING "secondary"
+#define PRIMARYSMALL_STRING "primarysmall"
+#define TITLE_STRING "title"
+#define DIGITAL_STRING "digital"
+#define UNDEFINED_STRING "undefined"
+
+#define TYPEFACE_METRICS_FILE_STEM "typeface_metrics_"
+#define LARGEST_SIZE 100
+// Following must be greater than 0
+#define SMALLEST_SIZE 1
+
+
+
+
+static bool encodeRole(const QString& roleName, HbFontSpec::Role &role)
+{
+ bool encoded(true); // return value
+
+ QString name = roleName.toLower();
+
+ if (name == PRIMARY_STRING) {
+ role = HbFontSpec::Primary;
+ }
+ else if (name == SECONDARY_STRING) {
+ role = HbFontSpec::Secondary;
+ }
+ else if (name == TITLE_STRING) {
+ role = HbFontSpec::Title;
+ }
+ else if (name == PRIMARYSMALL_STRING) {
+ role = HbFontSpec::PrimarySmall;
+ }
+ else if (name == DIGITAL_STRING) {
+ role = HbFontSpec::Digital;
+ }
+ else if (name == UNDEFINED_STRING) {
+ role = HbFontSpec::Undefined; // Translated if someone passes the string
+ }
+ else { // Really undefined
+ role = HbFontSpec::Undefined;
+ encoded = false;
+ }
+
+ return encoded;
+}
+
+/*!
+Returns path to a writable location that should be used as a base storage folder for
+dynamic metric creation.
+*/
+static QString writablePath()
+{
+#ifdef Q_OS_SYMBIAN
+ return HB_FONTS_WRITABLE_PATH;
+#else
+ if (QString(HB_BUILD_DIR) == QString(HB_INSTALL_DIR)) {
+ // This is local build so also use local writable path.
+ return QString(HB_INSTALL_DIR) + QDir::separator() + QString(".hb")
+ + QDir::separator() + QString("fonts");
+ } else {
+#ifdef Q_OS_UNIX
+ return QDir::homePath() + QDir::separator() + QString(".hb")
+ + QDir::separator() + QString("fonts");
+#else
+ return HB_FONTS_WRITABLE_PATH ;
+#endif
+ }
+#endif
+}
+
+
+HbTypefaceInfoDatabase *HbTypefaceInfoDatabase::instance(HbMemoryManager::MemoryType type)
+{
+ static HbTypefaceInfoDatabase info(type);
+ return &info;
+}
+
+/*!
+ Constructor.
+*/
+HbTypefaceInfoDatabase::HbTypefaceInfoDatabase(HbMemoryManager::MemoryType type)
+ : mTypefaceInfoVector(0),mTypefaceInfoVectorOffset(-1),mType(type)
+{
+ GET_MEMORY_MANAGER(mType);
+ try {
+ mTypefaceInfoVectorOffset = manager->alloc(sizeof(HbTypefaceInfoVector));
+ mTypefaceInfoVector = new((char*)manager->base() + mTypefaceInfoVectorOffset)
+ HbTypefaceInfoVector(mType);
+ init();
+ } catch(std::exception &) {
+ if (mTypefaceInfoVectorOffset != -1) {
+ if (mTypefaceInfoVector) {
+ mTypefaceInfoVector->~HbTypefaceInfoVector();
+ mTypefaceInfoVector = 0;
+ }
+ manager->free(mTypefaceInfoVectorOffset);
+ mTypefaceInfoVectorOffset = -1;
+ }
+ }
+}
+
+int HbTypefaceInfoDatabase::typefaceInfoVectorOffset()
+{
+ return mTypefaceInfoVectorOffset;
+}
+
+
+/*!
+ Initialization method.
+*/
+void HbTypefaceInfoDatabase::init()
+{
+ HbTypefaceXmlParser *parser = new HbTypefaceXmlParser();
+
+ if (!(parser->init() && parser->readAndPositionTypefaceSet())){
+ qWarning( "HbTypefaceInfoDatabase: init failed, unable to initialize parser" );
+ return;
+ }
+ else {
+ QString role;
+ QString family;
+ bool isBold;
+ while (parser->readMapping( role, family, isBold)) {
+ HbTypefaceInfoItem item( mType );
+ HbFontSpec::Role roleEnum;
+ if (encodeRole(role, roleEnum)){
+ item.mRoleEnum = roleEnum;
+ item.mFamily = family;
+ item.mIsBold = isBold;
+ mTypefaceInfoVector->append( item );
+ }
+ else {
+ // role might be an alias. Not required functionality. Ignore
+ }
+ }
+
+ HbTypefaceInfoItem *undefinedFontspec = 0;
+ HbTypefaceInfoItem *secondaryFontspec = 0;
+
+ for( int i = 0; i < mTypefaceInfoVector->size(); i++ ) {
+ HbTypefaceInfoItem *item = &(mTypefaceInfoVector->at(i));
+ if( item->mRoleEnum == HbFontSpec::Secondary ) {
+ secondaryFontspec = item;
+ }
+ if( item->mRoleEnum == HbFontSpec::Undefined ) {
+ undefinedFontspec = item;
+ }
+ }
+
+ // Secondary chosen as default it not specified in the xml
+ if ( !undefinedFontspec && secondaryFontspec ) {
+ HbTypefaceInfoItem item( mType );
+ item.mRoleEnum = HbFontSpec::Undefined;
+ item.mFamily = secondaryFontspec->mFamily;
+ item.mIsBold = secondaryFontspec->mIsBold;
+ mTypefaceInfoVector->append( item );
+ }
+ }
+
+ parser->close();
+
+ /*
+ * here should be filling of downsize table.
+ */
+
+
+ for( int i = 0; i < mTypefaceInfoVector->size(); i++ ) {
+ HbTypefaceInfoItem *typeFaceInfoItem = &mTypefaceInfoVector->at(i);
+
+ if( !readTypefaceMetricsFile( parser, typeFaceInfoItem ) ) {
+ autoGenerateMetrics( typeFaceInfoItem );
+ outputMetrics( typeFaceInfoItem );
+ }
+ }
+
+ delete parser;
+}
+
+
+
+
+bool HbTypefaceInfoDatabase::readTypefaceMetricsFile( HbTypefaceXmlParser *parser, HbTypefaceInfoItem *typeFaceInfoItem )
+{
+ int numPoints(0);
+
+ parser->init();
+
+ QString typefaceMetricsFileName;
+
+ typefaceMetricsFileName.append(TYPEFACE_RESOURCE_FOLDER);
+ typefaceMetricsFileName.append(QDir::separator());
+ typefaceMetricsFileName.append(TYPEFACE_METRICS_FILE_STEM);
+ // replace whitespace with underscores and append
+ QString temp = typeFaceInfoItem->mFamily;
+ temp = temp.toLower().replace(QRegExp("\\s+"), QString("_"));
+ typefaceMetricsFileName.append( temp );
+ typefaceMetricsFileName.append(".xml");
+
+ QFile *file = new QFile(typefaceMetricsFileName);
+ if( !(file && file->exists()) ) {
+ typefaceMetricsFileName = writablePath();
+ typefaceMetricsFileName.append(QDir::separator());
+ typefaceMetricsFileName.append(TYPEFACE_METRICS_FILE_STEM);
+ typefaceMetricsFileName.append( temp );
+ typefaceMetricsFileName.append(".xml");
+ }
+ delete file;
+
+#ifdef HBTYPEFACEINFO_DEBUG_ENABLE
+ qDebug("HbDownsizeInfo::readTypefaceMetricsFile: typeface metric filename: %s", typefaceMetricsFileName.toAscii().constData());
+#endif
+ parser->setFilePath(typefaceMetricsFileName);
+
+ if (parser->init()){
+#ifdef HBTYPEFACEINFO_DEBUG_ENABLE
+ qDebug( "HbDownsizeInfo::readTypefaceMetricsFile: parser init() ok");
+#endif
+ QString family;
+ HbTypefaceXmlParser::StartElement startEl(HbTypefaceXmlParser::Undefined);
+ while ((startEl = parser->readToStartElement()) != HbTypefaceXmlParser::NoStartElement) {
+ if (startEl == HbTypefaceXmlParser::TypefaceMetrics) {
+#ifdef HBTYPEFACEINFO_DEBUG_ENABLE
+ qDebug( "HbDownsizeInfo::readTypefaceMetricsFile: start element: typeface metrics");
+#endif
+ if (parser->metricsTypefaceFamily().toLower()==typeFaceInfoItem->mFamily.toLower()) {
+ int textHeight(0);
+ int baseline(0);
+ HbTypefaceInfoItem::HbTypefaceMeasureInfoStruct readMetrics;
+ while (parser->readMetric(textHeight, readMetrics.pixelSize, baseline)) {
+ numPoints++;
+ readMetrics.textHeight = textHeight;
+ typeFaceInfoItem->mDownSizeTable.append( readMetrics );
+
+
+ typeFaceInfoItem->mLowestExtent = qMin(typeFaceInfoItem->mLowestExtent, textHeight); // Stored so that we can extrapolate from the lowest value
+ typeFaceInfoItem->mHighestExtent = qMax(typeFaceInfoItem->mHighestExtent, textHeight); // Stored so that we can extrapolate from the highest value
+
+#ifdef HBTYPEFACEINFO_DEBUG_ENABLE
+ qDebug( "HbDownsizeInfo::readTypefaceMetricsFile: metric %d: extent = %d size = %d baseline = %d", numPoints, textHeight, readMetrics.pixelSize, baseline);
+#endif
+ }
+ }
+ }
+ }
+ }
+
+ parser->close();
+ return numPoints > 0;
+}
+
+
+
+void HbTypefaceInfoDatabase::autoGenerateMetrics( HbTypefaceInfoItem *typeFaceInfoItem )
+{
+#ifdef HBTYPEFACEINFO_DEBUG_ENABLE
+ qDebug( "HbDownsizeInfo::autoGenerateMetrics: WARNING: auto generating metrics, this is inefficient!");
+#endif
+ QFont f(typeFaceInfoItem->mFamily);
+
+ HbTypefaceInfoItem::HbTypefaceMeasureInfoStruct lastMetrics;
+ HbTypefaceInfoItem::HbTypefaceMeasureInfoStruct measuredMetrics;
+
+ int lastExtentFilled = 0;
+ lastMetrics.textHeight = lastExtentFilled;
+ typeFaceInfoItem->mDownSizeTable.append(lastMetrics);
+
+#ifdef HBTYPEFACEINFO_DEBUG_ENABLE
+ qDebug( "HbDownsizeInfo::autoGenerateMetrics: extent = %d size = %d measured ascent = %d", lastExtentFilled, lastMetrics.pixelSize, lastMetrics.measuredAscent);
+#endif
+
+ int size;
+
+ for (size = SMALLEST_SIZE; size <= LARGEST_SIZE; size++) {
+ measuredMetrics.pixelSize = size;
+ f.setPixelSize(size);
+ QFontMetrics fm(f);
+ int thisExtent = fm.height();
+ measuredMetrics.measuredAscent = fm.ascent(); // not actually measuring it, just taking it from the metrics for now
+ for (int extent = lastExtentFilled+1; extent < thisExtent; extent++){
+ lastMetrics.textHeight = extent;
+ typeFaceInfoItem->mDownSizeTable.append( lastMetrics );
+#ifdef HBTYPEFACEINFO_DEBUG_ENABLE
+ qDebug( "HbDownsizeInfo::autoGenerateMetrics: fill in: extent = %d size = %d measured ascent = %d", extent, lastMetrics.pixelSize, lastMetrics.measuredAscent);
+#endif
+ }
+ // fill in this one
+ measuredMetrics.textHeight = thisExtent;
+ typeFaceInfoItem->mDownSizeTable.append(measuredMetrics);
+#ifdef HBTYPEFACEINFO_DEBUG_ENABLE
+ qDebug( "HbDownsizeInfo::autoGenerateMetrics: extent = %d size = %d measured ascent = %d", thisExtent, measuredMetrics.pixelSize, measuredMetrics.measuredAscent);
+#endif
+ lastExtentFilled = thisExtent;
+ lastMetrics.pixelSize = measuredMetrics.pixelSize;
+ lastMetrics.measuredAscent = measuredMetrics.measuredAscent;
+ }
+ typeFaceInfoItem->mHighestExtent = lastExtentFilled; // Stored so that we can extrapolate from the last mapped value
+}
+
+
+void HbTypefaceInfoDatabase::outputMetrics( HbTypefaceInfoItem *typeFaceInfoItem ) const
+{
+ QString filePath = writablePath();
+ QDir dir(filePath);
+ if(!dir.exists()) {
+ dir.mkpath(filePath + QDir::separator() );
+ }
+
+ filePath.append(QDir::separator());
+ filePath.append("typeface_metrics_");
+
+ QString temp = typeFaceInfoItem->mFamily;
+ temp = temp.toLower().replace(QRegExp("\\s+"), QString("_"));
+
+ filePath.append( temp );
+ filePath.append(".xml");
+
+ QFile file(filePath);
+ if (!file.open(QFile::WriteOnly | QFile::Text)) {
+ return;
+ }
+
+ QXmlStreamWriter xmlWriter(&file);
+
+ xmlWriter.setAutoFormatting(true);
+ xmlWriter.writeStartDocument();
+ xmlWriter.writeComment("this file is automatically generated by HBTYPEFACEINFO");
+ xmlWriter.writeCharacters("\n"); // is this platform neutral?
+
+ xmlWriter.writeStartElement("typeface_information");
+
+ xmlWriter.writeStartElement("typeface_metrics");
+ xmlWriter.writeAttribute("family", typeFaceInfoItem->mFamily );
+
+ for( int i = 0; i < typeFaceInfoItem->mDownSizeTable.size(); i++ ) {
+ xmlWriter.writeStartElement("metric");
+ xmlWriter.writeAttribute("textheight", QString::number( typeFaceInfoItem->mDownSizeTable.at(i).textHeight ));
+ xmlWriter.writeAttribute("size", QString::number( typeFaceInfoItem->mDownSizeTable.at(i).pixelSize) );
+ xmlWriter.writeAttribute("baseline", QString::number(0));
+
+ xmlWriter.writeEndElement();
+ }
+
+ xmlWriter.writeEndDocument();
+ file.close();
+
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbcore/utils/hbtypefaceinfodatabase_p.h Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,106 @@
+/****************************************************************************
+**
+** 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 HBTYPEFACEINFODATABASE_H
+#define HBTYPEFACEINFODATABASE_H
+
+#include "hbtypefaceinfo_p.h"
+#include "hbtypefacexmlparser_p.h"
+#include "hbvector_p.h"
+#include "hbstring_p.h"
+
+
+struct HbTypefaceInfoItem {
+ HbFontSpec::Role mRoleEnum;
+ HbString mFamily;
+ bool mIsBold;
+
+ struct HbTypefaceMeasureInfoStruct
+ {
+ int textHeight;
+ int pixelSize;
+ int measuredAscent;
+ };
+
+ HbVector<HbTypefaceMeasureInfoStruct> mDownSizeTable;
+ int mLowestExtent;
+ int mHighestExtent;
+
+ HbTypefaceInfoItem(HbMemoryManager::MemoryType type = HbMemoryManager::HeapMemory)
+ : mFamily(type), mDownSizeTable(type)
+ {
+ }
+
+ bool tableContainsHeight( int textHeight, int &index )
+ {
+ for( int i = 0; i < mDownSizeTable.size(); i++ ) {
+ if( mDownSizeTable.at(i).textHeight == textHeight ) {
+ index = i;
+ return true;
+ }
+ }
+ return false;
+ }
+};
+
+
+typedef HbVector<HbTypefaceInfoItem> HbTypefaceInfoVector;
+
+
+
+class HB_CORE_PRIVATE_EXPORT HbTypefaceInfoDatabase
+{
+public:
+ static HbTypefaceInfoDatabase *instance(HbMemoryManager::MemoryType type =
+ HbMemoryManager::HeapMemory);
+
+ int typefaceInfoVectorOffset();
+
+private:
+ HbTypefaceInfoDatabase(HbMemoryManager::MemoryType type =
+ HbMemoryManager::HeapMemory);
+ void init();
+ bool readTypefaceMetricsFile( HbTypefaceXmlParser *parser, HbTypefaceInfoItem *typeFaceInfoItem );
+ void autoGenerateMetrics( HbTypefaceInfoItem *typeFaceInfoItem );
+ void outputMetrics( HbTypefaceInfoItem *typeFaceInfoItem ) const;
+ Q_DISABLE_COPY(HbTypefaceInfoDatabase)
+
+private:
+ HbTypefaceInfoVector *mTypefaceInfoVector;
+ int mTypefaceInfoVectorOffset;
+ HbMemoryManager::MemoryType mType;
+};
+
+
+#endif // HBTYPEFACEINFODATABASE_H
+
+
+
+
+
+
+
+
+
--- a/src/hbcore/utils/hbtypefacexmlparser.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/utils/hbtypefacexmlparser.cpp Fri May 14 16:09:54 2010 +0300
@@ -42,6 +42,8 @@
#define TYPEFACE_TEXTHEIGHT_ATT "textheight"
#define TYPEFACE_SIZE_ATT "size"
#define TYPEFACE_BASELINE_ATT "baseline"
+#define TYPEFACE_LANGUAGE_ATT "language"
+#define TYPEFACE_COUNTRY_ATT "country"
#define TYPEFACE_ATT_VAL_BOLD "bold"
@@ -98,9 +100,22 @@
QString filePath(":typefaces.xml");
// If one has been set by API
- if (!mFilePath.isEmpty()) {
+ if ( !mFilePath.isEmpty() ) {
filePath = mFilePath;
}
+ else {
+ // Check if resource directory has got the typefaces.xml file.
+ // If yes, then use the one present in the resource directory
+ QString resourceFilePath(TYPEFACE_RESOURCE_FOLDER);
+ resourceFilePath.append(QDir::separator());
+ resourceFilePath.append("typefaces.xml");
+
+ QFile *file = new QFile(resourceFilePath);
+ if( file && file->exists() ) {
+ filePath = resourceFilePath;
+ }
+ delete file;
+ }
mFile = new QFile(filePath);
// Trying to see if the absolute path can be determined
@@ -138,6 +153,78 @@
}
/*!
+ Advances the read position of the parser to a point where it can read the <typeface_mapping> set.
+*/
+bool HbTypefaceXmlParser::readAndPositionTypefaceSet()
+{
+ Q_ASSERT(isStartElement() && name() == TYPEFACE_INFO);
+ bool positioned(false);
+ while (!atEnd() && !positioned) {
+ QXmlStreamReader::TokenType type = readNext();
+ if(type == QXmlStreamReader::Invalid)
+ break;
+
+ if (isStartElement()) {
+ if (name() == TYPEFACE_SET) {
+ // find the correct language and country
+ positioned = matchLanguageAndCountry();
+ }
+ }
+ }
+ return positioned;
+}
+
+/*
+ * Parses information inside one <typeface_set> field.
+ */
+bool HbTypefaceXmlParser::matchLanguageAndCountry() const
+{
+ Q_ASSERT(isStartElement() && name() == TYPEFACE_SET);
+ QString language, country;
+ bool positioned(false);
+
+ HbExtendedLocale systemLocale = HbExtendedLocale::system();
+ QString attrName, typefaceLocaleName, systemLocaleName;
+ QXmlStreamAttributes attrs = attributes();
+
+ foreach (const QXmlStreamAttribute &attr, attrs) {
+ attrName = attr.name().toString();
+
+ if (attrName == TYPEFACE_LANGUAGE_ATT) {
+ language = attr.value().toString().toLower();
+ }
+ else if (attrName == TYPEFACE_COUNTRY_ATT) {
+ country = attr.value().toString().toUpper();
+ }
+ else {
+ qDebug("Unrecognized attribute");
+ }
+ }
+
+
+ // Construct the locale with the typeface locale info
+ if (!language.isEmpty()) {
+ if (!country.isEmpty()) {
+ typefaceLocaleName = language + "_" + country;
+ systemLocaleName = systemLocale.name();
+ }
+ else {
+ typefaceLocaleName = language;
+ // Language is a lowercase, two-letter, ISO 639 language code
+ systemLocaleName = systemLocale.name().left(2);
+ }
+ }
+ else {
+ positioned = true;
+ }
+
+ if (!positioned && typefaceLocaleName.compare(systemLocaleName, Qt::CaseInsensitive) == 0) {
+ positioned = true;
+ }
+ return positioned;
+}
+
+/*!
Advances the read position of the parser to a point where it has just read a principal start element.
The start elements that are valid for this are enumerated in \c StartElement, and the enum value is returned.
If no relevant elements are encountered and the end of file is reached, then \c NoStartElement is returned.
--- a/src/hbcore/utils/hbtypefacexmlparser_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/utils/hbtypefacexmlparser_p.h Fri May 14 16:09:54 2010 +0300
@@ -30,11 +30,19 @@
#include <QXmlStreamReader>
#include <QFile>
+#include <QDir>
+#include <hbextendedlocale.h>
QT_BEGIN_NAMESPACE
class QIODevice;
QT_END_NAMESPACE
+#ifdef Q_OS_SYMBIAN
+ #define TYPEFACE_RESOURCE_FOLDER "z:\\resource\\fonts"
+#else
+ #define TYPEFACE_RESOURCE_FOLDER HB_RESOURCES_DIR
+#endif
+
class HB_AUTOTEST_EXPORT HbTypefaceXmlParser : public QXmlStreamReader
{
public:
@@ -57,11 +65,13 @@
bool readMapping(QString &role, QString &family, bool &isBold);
bool readMetric(int &textHeight, int &size, int &baseline);
const QString metricsTypefaceFamily() const;
+ bool readAndPositionTypefaceSet();
void close();
private:
bool readMapItem(QString &role, QString &family, bool &isBold);
bool readMetricItem(int &textHeight, int &size, int &baseline);
+ bool matchLanguageAndCountry() const;
private:
QString mFilePath;
--- a/src/hbcore/utils/hbxmlloaderbaseactions_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/utils/hbxmlloaderbaseactions_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -146,7 +146,7 @@
++it ) {
QObject *object = it.value().first.data();
- if (it.value().second == HbXml::WIDGET) {
+ if (object && it.value().second == HbXml::WIDGET) {
QGraphicsWidget *asWidget = static_cast<QGraphicsWidget *>(object);
if (!asWidget->parentItem() && !asWidget->parent()) {
mTopObjectMap.insert(it.key(), it.value());
--- a/src/hbcore/utils/utils.pri Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/utils/utils.pri Fri May 14 16:09:54 2010 +0300
@@ -33,6 +33,7 @@
PRIVATE_HEADERS += $$PWD/hbdeviceprofile_p.h
PRIVATE_HEADERS += $$PWD/hbtypefaceinfo_p.h
+PRIVATE_HEADERS += $$PWD/hbtypefaceinfodatabase_p.h
PRIVATE_HEADERS += $$PWD/hbdeviceprofiledatabase_p.h
PRIVATE_HEADERS += $$PWD/hbdeviceprofilemanager_p.h
PRIVATE_HEADERS += $$PWD/hbdeviceprofilereader_p.h
@@ -84,6 +85,7 @@
SOURCES += $$PWD/hbthetestutility_p.cpp
SOURCES += $$PWD/hbtextutils_p.cpp
SOURCES += $$PWD/hbtypefaceinfo.cpp
+SOURCES += $$PWD/hbtypefaceinfodatabase_p.cpp
SOURCES += $$PWD/hbtypefacexmlparser.cpp
SOURCES += $$PWD/hbscreenmode_p.cpp
SOURCES += $$PWD/hbdevicemodeinfo_p.cpp
--- a/src/hbcore/vkbhosts/hbabstractvkbhost.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/vkbhosts/hbabstractvkbhost.cpp Fri May 14 16:09:54 2010 +0300
@@ -149,6 +149,14 @@
// Check whether the cursor rectangle is inside visible area.
if (!visibleArea.contains(microFocus)) {
+ QRectF realEditorGeometry = editorGeometry;
+ realEditorGeometry.adjust(0.0, HbCursorLineMargin, 0.0, -HbCursorLineMargin);
+ if (!realEditorGeometry.contains(microFocus)) {
+ // A sanity check. If the microFocus rectangle is outside the editor
+ // bounding rect, don't do anything. The situation in editor widget is not
+ // up to date.
+ return false;
+ }
// The cursor is outside the visible area. Figure out how much and
// to which direction the container has to be moved.
if (microFocus.bottom() <= visibleArea.top()) {
@@ -343,7 +351,6 @@
mKeypadStatus = HbVkbHost::HbVkbStatusOpened;
mCallback->keyboardOpened(q_ptr);
- q_ptr->openFinished();
}
}
}
@@ -617,14 +624,6 @@
}
/*!
-\reimp
-*/
-int HbAbstractVkbHost::priority() const
-{
- return 0;
-}
-
-/*!
This slot is called every time an animation frame is drawn.
*/
void HbAbstractVkbHost::animValueChanged(qreal value)
@@ -643,46 +642,12 @@
}
}
- if (d->mCallback) {
+ if (d->mCallback && d->mKeypad) {
d->mCallback->keyboardAnimationFrame(HbVirtualKeyboard::HbVkbAnimOpen, value);
}
}
/*!
-\deprecated HbAbstractVkbHost::openAnimValueChanged(qreal)
- is deprecated.
-*/
-void HbAbstractVkbHost::openAnimValueChanged(qreal value)
-{
- Q_UNUSED(value);
-}
-
-/*!
-\deprecated HbAbstractVkbHost::closeAnimValueChanged(qreal)
- is deprecated.
-*/
-void HbAbstractVkbHost::closeAnimValueChanged(qreal value)
-{
- Q_UNUSED(value);
-}
-
-/*!
-\deprecated HbAbstractVkbHost::openFinished()
- is deprecated.
-*/
-void HbAbstractVkbHost::openFinished()
-{
-}
-
-/*!
-\deprecated HbAbstractVkbHost::closeFinished()
- is deprecated.
-*/
-void HbAbstractVkbHost::closeFinished()
-{
-}
-
-/*!
This slot is called when an animation sequence is completed.
*/
void HbAbstractVkbHost::animationFinished()
@@ -750,14 +715,6 @@
}
/*!
-\reimp
-*/
-void HbAbstractVkbHost::preferredSizeChanged(const QSizeF& newSize)
-{
- Q_UNUSED(newSize);
-}
-
-/*!
This slot is connected to orientation change warning signal from the framework
and notifies setting proxy. Notification will then be delivered through setting proxy to all the
interested parties.
--- a/src/hbcore/vkbhosts/hbabstractvkbhost.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/vkbhosts/hbabstractvkbhost.h Fri May 14 16:09:54 2010 +0300
@@ -49,11 +49,9 @@
void openMinimizedKeypad(HbVirtualKeyboard *vkb, HbInputMethod* owner);
void closeKeypad(bool animationAllowed = true);
void minimizeKeypad(bool animationAllowed = true);
- HbVkbStatus keypadStatus() const;
- int priority() const;
+ HbVkbStatus keypadStatus() const;
HbVirtualKeyboard *activeKeypad() const;
- QRectF applicationArea() const;
- void preferredSizeChanged(const QSizeF& newSize);
+ QRectF applicationArea() const;
QSizeF keyboardArea() const;
HbVkbStatus keypadStatusBeforeOrientationChange() const;
@@ -70,11 +68,7 @@
virtual void ensureCursorVisibility();
virtual void orientationAboutToChange();
virtual void orientationChanged(Qt::Orientation orientation);
- virtual void openAnimValueChanged(qreal aValue);
- virtual void closeAnimValueChanged(qreal aValue);
virtual void animValueChanged(qreal aValue);
- virtual void openFinished();
- virtual void closeFinished();
virtual void animationFinished();
virtual void currentViewChanged(HbView*);
virtual void stateTransitionCompleted();
--- a/src/hbcore/vkbhosts/hbstaticvkbhost.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/vkbhosts/hbstaticvkbhost.cpp Fri May 14 16:09:54 2010 +0300
@@ -88,13 +88,5 @@
{
}
-/*!
-\reimp
-*/
-int HbStaticVkbHost::priority() const
-{
- return 0;
-}
-
// End of file
--- a/src/hbcore/vkbhosts/hbstaticvkbhost.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbcore/vkbhosts/hbstaticvkbhost.h Fri May 14 16:09:54 2010 +0300
@@ -39,8 +39,6 @@
explicit HbStaticVkbHost(HbWidget *target);
~HbStaticVkbHost();
- int priority() const;
-
private:
Q_DECLARE_PRIVATE_D(d_ptr, HbStaticVkbHost)
Q_DISABLE_COPY(HbStaticVkbHost)
--- a/src/hbfeedback/hbfeedback.pro Mon May 03 12:48:33 2010 +0300
+++ b/src/hbfeedback/hbfeedback.pro Fri May 14 16:09:54 2010 +0300
@@ -69,6 +69,8 @@
LIBS += -ltacticon
INCLUDEPATH += $${EPOCROOT}epoc32/include/platform/mw
+ defFilePath = defs
+
TARGET.EPOCALLOWDLLDATA = 1
TARGET.CAPABILITY = CAP_GENERAL_DLL
TARGET.UID3=0x20022E9D
--- a/src/hbfeedback/player/hbabstractfeedback.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbfeedback/player/hbabstractfeedback.cpp Fri May 14 16:09:54 2010 +0300
@@ -115,13 +115,13 @@
Provides common methods for assigning the parent window and the feedback area for the feedback effect.
- \sa HbInstantFeedback, HbContinuousFeedback, HbTacticonFeedback
+ \sa HbInstantFeedback, HbContinuousFeedback
*/
/*!
\fn HbFeedback::Type HbAbstractFeedback::type() const
- Returns the haptic type of the feedback object. Every derived class has to define their a type.
+ Returns the haptic type of the feedback object. Each derived class has to define its type.
*/
/*!
@@ -149,7 +149,8 @@
/*!
\fn bool HbAbstractFeedback::isLocated() const
- Returns true if both the parent window and the feedback area rectange (in relation to the parent window) has been defined. Not all feedback objects have to be located.
+ Returns true if both the parent window and the feedback area rectange (in relation to the parent window)
+ has been defined. Not all feedback objects have to be located.
*/
@@ -161,7 +162,8 @@
/*!
\fn bool HbAbstractFeedback::isValid() const
- Whether or not all the necessary parameters have been defined for the feedback object. What constitutes as valid differs between different types of feedback.
+ Checks if all the necessary parameters have been defined for the feedback object. What is considered
+ valid differs between different types of feedback.
*/
/*!
@@ -178,7 +180,7 @@
/*!
\fn void HbAbstractFeedback::setRect(QRect rect)
- Sets the feedback area rect in relation of it's parent widget.
+ Sets the feedback area rect in relation of its parent widget.
*/
void HbAbstractFeedback::setRect(QRect rect)
@@ -203,7 +205,6 @@
/*!
Inherits feedback area rect from the given widget. Position is calculated relative to the parent window.
-
*/
void HbAbstractFeedback::setRect(const QWidget* widget)
{
@@ -213,7 +214,8 @@
}
/*!
- Inherits feedback area rect from the graphics item in relation to the parent graphics view. Position is calculated relative to the window.
+ Inherits feedback area rect from the graphics item in relation to the parent graphics view.
+ Position is calculated relative to the window.
*/
void HbAbstractFeedback::setRect(const QGraphicsItem* graphicsItem, const QGraphicsView* graphicsView)
{
@@ -254,8 +256,8 @@
}
/*!
- Returns true if this feedback has the same configuration as the feedback \a
- feedback; otherwise returns false.
+ Returns true if this feedback has the same parameters as the feedback
+ \a feedback, otherwise returns false.
*/
bool HbAbstractFeedback::operator==(const HbAbstractFeedback &feedback) const
{
@@ -265,8 +267,8 @@
}
/*!
- Returns true if this feedback has different configuration than the feedback \a
- feedback; otherwise returns false.
+ Returns true if this feedback has different parameters than the feedback
+ \a feedback; otherwise returns false.
*/
bool HbAbstractFeedback::operator!=(const HbAbstractFeedback &feedback) const
{
--- a/src/hbfeedback/player/hbcontinuousfeedback.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbfeedback/player/hbcontinuousfeedback.cpp Fri May 14 16:09:54 2010 +0300
@@ -24,7 +24,7 @@
****************************************************************************/
#include "hbcontinuousfeedback.h"
-#include "hbfeedbackplayer.h"
+#include "hbfeedbackplayer_p.h"
#include <QGraphicsItem>
#include <QGraphicsView>
@@ -55,35 +55,39 @@
\class HbContinuousFeedback
- \brief Tool class for continuous feedback effects.
+ \brief Class for continuous feedback effects.
- Continuous feedbacks are used to play sound and haptic effects that last as long as the user is touching the screen,
- for example when dragging an interface object, scrolling a list or a slider. Continuous feedback
- effects need to be started, updated and cancelled during the life time of the feedback using methods
- HbFeedbackPlayer::startContinuousFeedback(), HbFeedbackPlayer::updateContinuousFeedback() and
- HbFeedbackPlayer::cancelContinuousFeedback(). The effect intensity can be varied during the feedback.
+ Continuous feedbacks are feedback effects that last as long as the user is touching the screen,
+ for example when dragging a slider handle. Continuous feedback effects need to be started, updated
+ and stopped using methods HbFeedbackPlayer::startContinuousFeedback(), HbFeedbackPlayer::updateContinuousFeedback()
+ and HbFeedbackPlayer::cancelContinuousFeedback(). The effect intensity can be varied during the feedback.
*/
+#define UPDATE_IF_ONGOING \
+HbFeedbackPlayer *player = HbFeedbackPlayer::instance(); \
+if(player && player->continuousFeedbackOngoing(d->cFeedbackId)) { \
+ player->updateContinuousFeedback(d->cFeedbackId,*this); \
+}
+
/*!
\fn void HbContinuousFeedback::setContinuousEffect(HbFeedback::ContinuousEffect effect)
- Sets the continuous effect that determines what kind of continuous haptic and sound effects will
- be played when calling HbFeedbackPlayer::startContinuousFeedback(). The actual effects are
- defined in the device themes.
+ Sets the continuous feedback effect that determines what kind of continuous effects will
+ be played when calling HbFeedbackPlayer::startContinuousFeedback().
*/
void HbContinuousFeedback::setContinuousEffect(HbFeedback::ContinuousEffect effect)
{
d->cEffect = effect;
+ UPDATE_IF_ONGOING;
}
/*!
\fn void HbFeedback::ContinuousEffect HbContinuousFeedback::continuousEffect() const
- Returns the continuous effect of the continuous feedback object. Continuous effect is used to determine what kind of continuous
- haptic and sound effects will be played when calling HbFeedbackPlayer::startContinuousFeedback(). The actual effects are
- defined in the device themes.
+ Returns the continuous effect of the continuous feedback object. Continuous effect represents the continuous
+ feedback effect that will be played when calling HbFeedbackPlayer::startContinuousFeedback().
*/
HbFeedback::ContinuousEffect HbContinuousFeedback::continuousEffect() const
@@ -95,7 +99,7 @@
\fn int HbContinuousFeedback::timeout() const
The timeout value of the feedback in milliseconds. Continuous feedback is
- automatically cancelled if previously started continuous feedback hasn't been
+ automatically stopped if previously started continuous feedback has not been
updated within the timeout.
*/
@@ -106,8 +110,8 @@
/*!
\fn int HbContinuousFeedback::intensity() const
- The intensity of the continuous feedback effect. Intensity
- can be varied between values zero and HbFeedback::IntensityFull = 100.
+ The intensity of the continuous feedback effect. Intensity can be varied between
+ values HbFeedback::IntensityZero and HbFeedback::IntensityFull.
*/
int HbContinuousFeedback::intensity() const {
@@ -149,26 +153,29 @@
}
/*!
- Sets the timeout value in milliseconds. Continuous feedback is automatically cancelled
- if the continuous feedback hasn't been updated within the timeout.
+ Sets the timeout value in milliseconds. Continuous feedback is automatically stopped
+ if the continuous feedback has not been updated within the timeout.
*/
void HbContinuousFeedback::setTimeout(int msecTimeout)
{
if (msecTimeout > 0) {
d->cTimeout = msecTimeout;
+ UPDATE_IF_ONGOING;
}
}
/*!
- Sets the intensity of the continuous feedback effect. The intensity
- has to always be between HbFeedback::IntensityZero and HbFeedback::IntensityFull.
+ Sets the intensity of the continuous feedback effect. The intensity can be varied between
+ HbFeedback::IntensityZero and HbFeedback::IntensityFull.
*/
void HbContinuousFeedback::setIntensity(int intensity)
{
if (intensity >= 0 && intensity <= HbFeedback::IntensityFull) {
d->cIntensity = intensity;
+ UPDATE_IF_ONGOING;
}
}
+
/*!
Plays the continuous feedback.
*/
@@ -180,9 +187,10 @@
d->cFeedbackId = feedbackPlayer->startContinuousFeedback(*this);
}
}
+
/*!
Stops the continous feedback.
- */
+*/
void HbContinuousFeedback::stop()
{
HbFeedbackPlayer* feedbackPlayer = HbFeedbackPlayer::instance();
@@ -208,25 +216,17 @@
return feedbackOngoing;
}
+
/*!
- \deprecated HbContinuousFeedback::isValid() const
- is deprecated.
-
Continuous feedback is valid if the feedback effect is not set to HbFeedback::ContinuousNone
and if the owning window has been defined. There can only be one ongoing continuous feedback effect
per one application window.
*/
bool HbContinuousFeedback::isValid() const
{
- switch(d->cEffect) {
- case HbFeedback::NoContinuousOverride :
- return false;
- default:
- return d->cEffect != HbFeedback::ContinuousNone && window();
- }
+ return d->cEffect != HbFeedback::ContinuousNone && window();
};
-
/*!
Assigns a copy of the feedback \a feedback to this feedback, and returns a
reference to it.
--- a/src/hbfeedback/player/hbcontinuousfeedback.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbfeedback/player/hbcontinuousfeedback.h Fri May 14 16:09:54 2010 +0300
@@ -42,7 +42,7 @@
return HbFeedback::TypeContinuous;
}
- bool isValid() const; // deprecated
+ bool isValid() const;
HbFeedback::ContinuousEffect continuousEffect() const;
int intensity() const;
--- a/src/hbfeedback/player/hbfeedbackplayer.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbfeedback/player/hbfeedbackplayer.cpp Fri May 14 16:09:54 2010 +0300
@@ -23,13 +23,12 @@
**
****************************************************************************/
-#include "hbfeedbackplayer.h"
#include "hbfeedbackplayer_p.h"
+#include "hbfeedbackplayer_p_p.h"
-#include "hbinstantfeedback.h"
-#include "hbcontinuousfeedback.h"
-#include "hbtacticonfeedback.h"
-#include "hbhitareafeedback.h"
+#include <hbinstantfeedback.h>
+#include <hbcontinuousfeedback.h>
+#include <hbfeedbacksettings.h>
#include "hbfeedbackplayer_stub_p.h"
#ifdef FEEDBACK_TEST_EVENT
@@ -60,11 +59,9 @@
void HbFeedbackPlayerPrivate::init()
{
- feedbackSettings = new HbFeedbackSettings();
+ feedbackSettings = new HbFeedbackSettings(this);
connect(feedbackSettings, SIGNAL(feedbackDisabled()),
this, SLOT(feedbackDisabled()));
- connect(feedbackSettings, SIGNAL(feedbackTypeDisabled(HbFeedback::Type)),
- this, SLOT(feedbackTypeDisabled(HbFeedback::Type)));
basePlayer = new HbFeedbackBasePlayer();
}
@@ -73,60 +70,23 @@
{
if (basePlayer) {
basePlayer->cancelContinuousFeedbacks();
- basePlayer->removeHitAreas();
- }
-}
-
-void HbFeedbackPlayerPrivate::feedbackTypeDisabled(HbFeedback::Type type)
-{
- if (basePlayer) {
- switch (type) {
- case HbFeedback::TypeContinuous:
- basePlayer->cancelContinuousFeedbacks();
- break;
-
- case HbFeedback::TypeHitArea:
- basePlayer->removeHitAreas();
- break;
- case HbFeedback::TypeInstant:
- case HbFeedback::TypeTacticon:
- default:
- break;
- }
}
}
-/*!
- @beta
- @hbfeedback
- \class HbFeedbackPlayer
-
- \brief Feedback player is used to initiate various haptic and sound feedback effects for the device.
-
- Current player supports four kinds of effects: instant feedback, continuous feedback, tacticon feedback
- and hit area feedback effects. Separate HbFeedbackSettings interface is reserved for applications wanting
- to limit or disable feedback effects emitted by the interface. See \ref feedback "Feedback Player" for
- more information on the design of the player.
-
- \sa HbInstantFeedback, HbContinuousFeedback, HbTacticonFeedback, HbHitAreaFeedback, HbFeedbackSettings.
-
- \deprecated HbFeedbackPlayer
- is deprecated. Use HbInstantFeedback and HbContinuousFeedback classes instead.
-
- \sa HbInstantFeedback, HbContinuousFeedback
-*/
-
-
Q_GLOBAL_STATIC(HbFeedbackPlayer, feedbackPlayerGlobal);
-/*!
+/*!
+ \internal
+
Constructor.
-
- \deprecated HbFeedbackPlayer::HbFeedbackPlayer()
- is deprecated. Use HbInstantFeedback and HbContinuousFeedback classes instead.
-
- \sa HbInstantFeedback, HbContinuousFeedback
-
+
+ Feedback player is used to initiate various haptic and sound feedback effects for the device.
+
+ Current player supports instant feedback and continuous feedback effects. Separate HbFeedbackSettings
+ interface is reserved for applications wanting to limit or disable feedback effect playing.
+
+ \sa HbInstantFeedback, HbContinuousFeedback, HbFeedbackSettings
+
*/
HbFeedbackPlayer::HbFeedbackPlayer() : d(new HbFeedbackPlayerPrivate(this))
{
@@ -134,11 +94,9 @@
}
/*!
+ \internal
Destructor.
-
- \deprecated HbFeedbackPlayer::~HbFeedbackPlayer()
- is deprecated. Use HbInstantFeedback and HbContinuousFeedback classes instead.
-
+
\sa HbInstantFeedback, HbContinuousFeedback
*/
HbFeedbackPlayer::~HbFeedbackPlayer()
@@ -147,10 +105,8 @@
}
/*!
+ \internal
Returns the handle to the global instance.
-
- \deprecated HbFeedbackPlayer::instance()
- is deprecated. Use HbInstantFeedback and HbContinuousFeedback classes instead.
\sa HbInstantFeedback, HbContinuousFeedback
*/
@@ -160,33 +116,28 @@
}
/*!
+ \internal
Returns a reference to the feedback settings interface.
-
- \deprecated HbFeedbackPlayer::settings()
- is deprecated. Use HbFeedbackSettings::instance() to access feedback settings.
\sa HbFeedbackSettings
*/
-HbFeedbackSettings& HbFeedbackPlayer::settings()
+HbFeedbackSettings* HbFeedbackPlayer::settings()
{
- return *d->feedbackSettings;
+ return d->feedbackSettings;
}
/*!
+ \internal
Triggers instant feedback effects.
\param feedback instant feedback object
\sa HbInstantFeedback
-
- \deprecated HbFeedbackPlayer::playInstantFeedback(const HbInstantFeedback&)
- is deprecated. Use HbInstantFeedback::play() instead.
-
- \sa HbInstantFeedback
+
*/
void HbFeedbackPlayer::playInstantFeedback(const HbInstantFeedback& feedback)
{
- if (feedback.isValid() && d->feedbackSettings->isFeedbackAllowed(HbFeedback::TypeInstant)) {
+ if (feedback.isValid() && d->feedbackSettings->isFeedbackEnabled()) {
if (d->basePlayer) {
d->basePlayer->playInstantFeedback(feedback);
}
@@ -198,46 +149,18 @@
}
/*!
- Triggers tacticon feedback effects.
-
- \param feedback tacticon feedback object
- \sa HbTacticonFeedback
-
- \deprecated HbFeedbackPlayer::playTacticonFeedback(const HbTacticonFeedback&)
- is deprecated. Please use HbInstantFeedback instead.
-
- \sa HbInstantFeedback
-*/
-void HbFeedbackPlayer::playTacticonFeedback(const HbTacticonFeedback& feedback)
-{
- if (feedback.isValid() && d->feedbackSettings->isFeedbackAllowed(HbFeedback::TypeTacticon)) {
- if (d->basePlayer) {
- d->basePlayer->playTacticonFeedback(feedback);
-#ifdef FEEDBACK_TEST_EVENT
- HbFeedbackTestEvent te(feedback);
- qApp->sendEvent(this, &te);
-#endif
- }
- }
-}
-
-/*!
+ \internal
Starts a continuous feedback effect.
\param feedback continuous feedback object
\return identifier The identifier for the started effect.
\sa HbContinuousFeedback
-
- \deprecated HbFeedbackPlayer::startContinuousFeedback(const HbContinuousFeedback&)
- is deprecated. Use HbContinuousFeedback::play instead.
-
- \sa HbContinuousFeedback
*/
int HbFeedbackPlayer::startContinuousFeedback(const HbContinuousFeedback& feedback)
{
int identifier(-1);
- if (feedback.isValid() && d->feedbackSettings->isFeedbackAllowed(HbFeedback::TypeContinuous)) {
+ if (feedback.isValid() && d->feedbackSettings->isFeedbackEnabled()) {
if (d->basePlayer) {
identifier = d->basePlayer->startContinuousFeedback(feedback);
#ifdef FEEDBACK_TEST_EVENT
@@ -254,6 +177,7 @@
}
/*!
+ \internal
Updates an ongoing continuous feedback effect.
\param identifier The identifier for the ongoing effect.
@@ -261,14 +185,10 @@
\sa HbContinuousFeedback
- \deprecated HbFeedbackPlayer::updateContinuousFeedback(int, const HbContinuousFeedback&)
- is deprecated.
-
- \sa HbContinuousFeedback
*/
void HbFeedbackPlayer::updateContinuousFeedback(int identifier, const HbContinuousFeedback& feedback)
{
- if (feedback.isValid() && d->feedbackSettings->isFeedbackAllowed(HbFeedback::TypeContinuous)) {
+ if (feedback.isValid() && d->feedbackSettings->isFeedbackEnabled()) {
if (d->basePlayer) {
d->basePlayer->updateContinuousFeedback(identifier, feedback);
#ifdef FEEDBACK_TEST_EVENT
@@ -283,13 +203,11 @@
}
/*!
+ \internal
Cancels an ongoing continuous feedback effect.
\param identifier The identifier for the ongoing effect.
- \deprecated HbFeedbackPlayer::cancelContinuousFeedback(int)
- is deprecated. Use HbContinuousFeedback::stop() instead.
-
\sa HbContinuousFeedback
*/
void HbFeedbackPlayer::cancelContinuousFeedback(int identifier)
@@ -307,10 +225,8 @@
}
/*!
+ \internal
Cancels all ongoing continuous feedback effects.
-
- \deprecated HbFeedbackPlayer::cancelContinuousFeedbacks()
- is deprecated.
\sa HbContinuousFeedback
*/
@@ -322,15 +238,13 @@
}
/*!
+ \internal
Checks if the given continuous feedback effect is currently running.
\param identifier The identifier for the ongoing effect.
\return true, if the effect is ongoing.
- \deprecated HbFeedbackPlayer::continuousFeedbackOngoing(int)
- is deprecated. Use HbContinuousFeedback::isPlaying() instead.
-
\sa HbContinuousFeedback
*/
bool HbFeedbackPlayer::continuousFeedbackOngoing(int identifier)
@@ -341,123 +255,3 @@
}
return feedbackOngoing;
}
-
-/*!
- Inserts a hit area to the specified window.
-
- \param feedback hit area feedback object
- \return The identifier for the inserted hit area.
- \sa HbHitAreaFeedback
-
- \deprecated HbFeedbackPlayer::insertHitArea(const HbHitAreaFeedback&)
- is deprecated. Please use HbInstantFeedback instead.
-
- \sa HbInstantFeedback
-*/
-int HbFeedbackPlayer::insertHitArea(const HbHitAreaFeedback& feedback)
-{
- int identifier(-1);
-
- if (feedback.isValid() && d->feedbackSettings->isFeedbackAllowed(HbFeedback::TypeHitArea)) {
- if (d->basePlayer) {
- identifier = d->basePlayer->insertHitArea(feedback);
-#ifdef FEEDBACK_TEST_EVENT
- HbFeedbackTestEvent te(feedback, HbFeedbackTestEvent::Start, identifier);
- qApp->sendEvent(this, &te);
-#endif
- }
- } else if (!feedback.isLocated()) {
- qWarning("HbFeedbackPlayer::insertHitArea: Hit area missing required parameters parent window and/or rectangle.");
- }
-
- return identifier;
-}
-
-/*!
- Update the specified hit area.
-
- \param identifier Identifier for the hit area.
- \param feedback hit area feedback object
- \sa HbHitAreaFeedback
-
- \deprecated HbFeedbackPlayer::updateHitArea(int, const HbHitAreaFeedback&)
- is deprecated. Please use HbInstantFeedback instead.
-
- \sa HbInstantFeedback
-*/
-void HbFeedbackPlayer::updateHitArea(int identifier, const HbHitAreaFeedback& feedback)
-{
- if (feedback.isValid() && d->feedbackSettings->isFeedbackAllowed(HbFeedback::TypeHitArea)) {
- if (d->basePlayer) {
- d->basePlayer->updateHitArea(identifier, feedback);
-#ifdef FEEDBACK_TEST_EVENT
- HbFeedbackTestEvent te(feedback, HbFeedbackTestEvent::Update, identifier);
- qApp->sendEvent(this, &te);
-#endif
- }
- } else if (!feedback.isLocated()) {
- qWarning("HbFeedbackPlayer::updateHitArea: Hit area missing required parameters parent window and/or rectangle.");
- }
-}
-
-/*!
- Remove the specified hit area.
- \param identifier The identifer for the hit area to be removed.
- \sa HbHitAreaFeedback
-
- \deprecated HbFeedbackPlayer::removeHitArea(int)
- is deprecated. Please use HbInstantFeedback instead.
-
- \sa HbInstantFeedback
-*/
-void HbFeedbackPlayer::removeHitArea(int identifier)
-{
- if (d->basePlayer) {
- d->basePlayer->removeHitArea(identifier);
-#ifdef FEEDBACK_TEST_EVENT
- HbHitAreaFeedback feedback;
- HbFeedbackTestEvent te(feedback, HbFeedbackTestEvent::Stop, identifier);
- qApp->sendEvent(this, &te);
-#endif
- }
-}
-
-/*!
- Remove all registered hit areas.
-
- \deprecated HbFeedbackPlayer::removeHitAreas()
- is deprecated. Please use HbInstantFeedback instead.
-
- \sa HbInstantFeedback
-*/
-void HbFeedbackPlayer::removeHitAreas()
-{
- if (d->basePlayer) {
- d->basePlayer->removeHitAreas();
- }
-}
-
-/*!
- Check if the specified hit area still exists.
-
- \param identifier The identifier for the hit area.
- \return True, if the hit area exists.
-
- \deprecated HbFeedbackPlayer::hitAreaExists(int)
- is deprecated. Please use HbInstantFeedback instead.
-
- \sa HbInstantFeedback
-*/
-bool HbFeedbackPlayer::hitAreaExists(int identifier)
-{
- bool hitAreaExists = false;
-
- if (d->feedbackSettings->isFeedbackAllowed(HbFeedback::TypeHitArea)) {
- if (d->basePlayer) {
- hitAreaExists = d->basePlayer->hitAreaExists(identifier);
- }
- }
-
- return hitAreaExists;
-}
-
--- a/src/hbfeedback/player/hbfeedbackplayer.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +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 HbFeedback 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 HBFEEDBACKPLAYER_H
-#define HBFEEDBACKPLAYER_H
-
-#include <hbfeedbacknamespace.h>
-#include <hbfeedbacksettings.h>
-#include <QObject>
-
-class HbFeedbackSettings;
-class HbInstantFeedback;
-class HbContinuousFeedback;
-class HbTacticonFeedback;
-class HbHitAreaFeedback;
-class HbFeedbackPlayerPrivate;
-
-#define hbFeedbackPlayer HbFeedbackPlayer::instance()
-
-class HB_FEEDBACK_EXPORT HbFeedbackPlayer : public QObject
-{
- Q_OBJECT
-
-public:
- static HbFeedbackPlayer* instance();
- HbFeedbackPlayer();
- virtual ~HbFeedbackPlayer();
-
-public:
- HbFeedbackSettings& settings();
-
- void playInstantFeedback(const HbInstantFeedback& feedback);
- void playTacticonFeedback(const HbTacticonFeedback& feedback);
-
- int startContinuousFeedback(const HbContinuousFeedback& feedback);
- void updateContinuousFeedback(int identifier, const HbContinuousFeedback& feedback);
- void cancelContinuousFeedback(int identifier);
- bool continuousFeedbackOngoing(int identifier);
- void cancelContinuousFeedbacks();
-
- int insertHitArea(const HbHitAreaFeedback& feedback);
- void updateHitArea(int identifier, const HbHitAreaFeedback& feedback);
- void removeHitArea(int identifier);
- bool hitAreaExists(int identifier);
- void removeHitAreas();
-
-private:
- HbFeedbackPlayerPrivate* const d;
-};
-
-#endif // HBFEEDBACKPLAYER_H
--- a/src/hbfeedback/player/hbfeedbackplayer_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbfeedback/player/hbfeedbackplayer_p.h Fri May 14 16:09:54 2010 +0300
@@ -23,32 +23,41 @@
**
****************************************************************************/
-#ifndef HBFEEDBACKPLAYERPRIVATE_H
-#define HBFEEDBACKPLAYERPRIVATE_H
+#ifndef HBFEEDBACKPLAYER_H
+#define HBFEEDBACKPLAYER_H
-#include "hbfeedbackplayer.h"
+#include <hbfeedbacknamespace.h>
+#include <QObject>
-#include <QString>
+class HbFeedbackSettings;
+class HbInstantFeedback;
+class HbContinuousFeedback;
+class HbFeedbackPlayerPrivate;
-class HbFeedbackBasePlayer;
+#define hbFeedbackPlayer HbFeedbackPlayer::instance()
-class HbFeedbackPlayerPrivate : public QObject
+class HB_AUTOTEST_EXPORT HbFeedbackPlayer : public QObject
{
Q_OBJECT
public:
- HbFeedbackPlayerPrivate(HbFeedbackPlayer* parent);
- ~HbFeedbackPlayerPrivate();
- void init();
-
-protected slots:
- void feedbackDisabled();
- void feedbackTypeDisabled(HbFeedback::Type type);
+ static HbFeedbackPlayer* instance();
+ HbFeedbackPlayer();
+ virtual ~HbFeedbackPlayer();
public:
- HbFeedbackPlayer* parent;
- HbFeedbackBasePlayer* basePlayer;
- HbFeedbackSettings* feedbackSettings;
+ HbFeedbackSettings* settings();
+
+ void playInstantFeedback(const HbInstantFeedback& feedback);
+
+ int startContinuousFeedback(const HbContinuousFeedback& feedback);
+ void updateContinuousFeedback(int identifier, const HbContinuousFeedback& feedback);
+ void cancelContinuousFeedback(int identifier);
+ bool continuousFeedbackOngoing(int identifier);
+ void cancelContinuousFeedbacks();
+
+private:
+ HbFeedbackPlayerPrivate* const d;
};
-#endif // HBFEEDBACKPLAYERPRIVATE_H
+#endif // HBFEEDBACKPLAYER_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbfeedback/player/hbfeedbackplayer_p_p.h Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (developer.feedback@nokia.com)
+**
+** This file is part of the HbFeedback 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 HBFEEDBACKPLAYERPRIVATE_H
+#define HBFEEDBACKPLAYERPRIVATE_H
+
+#include "hbfeedbackplayer_p.h"
+
+#include <QString>
+
+class HbFeedbackBasePlayer;
+
+class HbFeedbackPlayerPrivate : public QObject
+{
+ Q_OBJECT
+
+public:
+ HbFeedbackPlayerPrivate(HbFeedbackPlayer* parent);
+ ~HbFeedbackPlayerPrivate();
+ void init();
+
+protected slots:
+ void feedbackDisabled();
+
+public:
+ HbFeedbackPlayer* parent;
+ HbFeedbackBasePlayer* basePlayer;
+ HbFeedbackSettings* feedbackSettings;
+};
+
+#endif // HBFEEDBACKPLAYERPRIVATE_H
--- a/src/hbfeedback/player/hbfeedbackplayer_stub.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbfeedback/player/hbfeedbackplayer_stub.cpp Fri May 14 16:09:54 2010 +0300
@@ -27,10 +27,8 @@
#include <QList>
#include "hbinstantfeedback.h"
#include "hbcontinuousfeedback.h"
-#include "hbtacticonfeedback.h"
-#include "hbhitareafeedback.h"
-/*!
+/*
Test player is used to display feedback effects in desktop environment.
*/
@@ -42,23 +40,19 @@
~HbFeedbackBasePlayerPrivate();
int getNewContinuousIdentifier();
- int getNewHitAreaIdentifier();
public:
QList<int> continuousIdentifiers;
- QList<int> hitAreaIdentifiers;
int slidingValueContinuous;
- int slidingValueHitArea;
};
-HbFeedbackBasePlayerPrivate::HbFeedbackBasePlayerPrivate() : slidingValueContinuous(0), slidingValueHitArea(0)
+HbFeedbackBasePlayerPrivate::HbFeedbackBasePlayerPrivate() : slidingValueContinuous(0)
{
}
HbFeedbackBasePlayerPrivate::~HbFeedbackBasePlayerPrivate()
{
continuousIdentifiers.clear();
- hitAreaIdentifiers.clear();
}
int HbFeedbackBasePlayerPrivate::getNewContinuousIdentifier()
@@ -67,12 +61,6 @@
return slidingValueContinuous;
}
-int HbFeedbackBasePlayerPrivate::getNewHitAreaIdentifier()
-{
- slidingValueHitArea++;
- return slidingValueHitArea;
-}
-
HbFeedbackBasePlayer::HbFeedbackBasePlayer()
: d(new HbFeedbackBasePlayerPrivate())
{
@@ -88,11 +76,6 @@
Q_UNUSED(feedback)
}
-void HbFeedbackBasePlayer::playTacticonFeedback(const HbTacticonFeedback& feedback)
-{
- Q_UNUSED(feedback)
-}
-
int HbFeedbackBasePlayer::startContinuousFeedback(const HbContinuousFeedback& feedback)
{
Q_UNUSED(feedback)
@@ -119,38 +102,7 @@
return d->continuousIdentifiers.contains(identifier);
}
-int HbFeedbackBasePlayer::insertHitArea(const HbHitAreaFeedback& feedback)
-{
- Q_UNUSED(feedback)
- int identifier = d->getNewHitAreaIdentifier();
- d->hitAreaIdentifiers.append(identifier);
- return identifier;
-}
-
-void HbFeedbackBasePlayer::updateHitArea(int identifier, const HbHitAreaFeedback& feedback)
-{
- Q_UNUSED(identifier)
- Q_UNUSED(feedback)
-}
-
-void HbFeedbackBasePlayer::removeHitArea(int identifier)
-{
- if (d->hitAreaIdentifiers.contains(identifier)) {
- d->hitAreaIdentifiers.removeAll(identifier);
- }
-}
-
-bool HbFeedbackBasePlayer::hitAreaExists(int identifier)
-{
- return d->hitAreaIdentifiers.contains(identifier);
-}
-
void HbFeedbackBasePlayer::cancelContinuousFeedbacks()
{
d->continuousIdentifiers.clear();
}
-
-void HbFeedbackBasePlayer::removeHitAreas()
-{
- d->hitAreaIdentifiers.clear();
-}
--- a/src/hbfeedback/player/hbfeedbackplayer_stub_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbfeedback/player/hbfeedbackplayer_stub_p.h Fri May 14 16:09:54 2010 +0300
@@ -30,8 +30,6 @@
class HbInstantFeedback;
class HbContinuousFeedback;
-class HbTacticonFeedback;
-class HbHitAreaFeedback;
class HbFeedbackBasePlayerPrivate;
class HbFeedbackBasePlayer
@@ -44,7 +42,6 @@
public:
void playInstantFeedback(const HbInstantFeedback& feedback);
- void playTacticonFeedback(const HbTacticonFeedback& feedback);
int startContinuousFeedback(const HbContinuousFeedback& feedback);
void updateContinuousFeedback(int identifier, const HbContinuousFeedback& feedback);
@@ -52,12 +49,6 @@
bool continuousFeedbackOngoing(int identifier);
void cancelContinuousFeedbacks();
- int insertHitArea(const HbHitAreaFeedback& feedback);
- void updateHitArea(int identifier, const HbHitAreaFeedback& feedback);
- void removeHitArea(int identifier);
- bool hitAreaExists(int identifier);
- void removeHitAreas();
-
private:
HbFeedbackBasePlayerPrivate* const d;
};
--- a/src/hbfeedback/player/hbfeedbackplayer_symbian.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbfeedback/player/hbfeedbackplayer_symbian.cpp Fri May 14 16:09:54 2010 +0300
@@ -37,10 +37,8 @@
#include "hbinstantfeedback.h"
#include "hbcontinuousfeedback.h"
-#include "hbtacticonfeedback.h"
-#include "hbhitareafeedback.h"
-/*!
+/*
Symbian-specific feedback class that wraps Symbian feedback APIs.
*/
@@ -58,16 +56,13 @@
inline CCoeControl* convertToSymbian(QWidget* window);
inline TTouchLogicalFeedback convertToSymbian(HbFeedback::InstantEffect effect);
inline TTacticonType convertTacticonToSymbian(HbFeedback::InstantEffect effect);
- inline TTacticonType convertTacticonToSymbian(HbFeedback::TacticonEffect effect);
inline TTouchContinuousFeedback convertToSymbian(HbFeedback::ContinuousEffect effect);
- inline TTouchEventType convertToSymbian(HbFeedback::HitAreaType hitAreaType);
inline TTouchFeedbackType convertToSymbian(HbFeedback::Modalities modalities);
public:
MTouchFeedback *iFeedback;
RTacticon iTacticon;
TBool iTacticonReady;
- QMap <int, QWidget*> registeredHitAreas;
QMap <int, QWidget*> ongoingContinuousFeedbacks;
int slidingValue;
};
@@ -79,7 +74,7 @@
HbFeedbackBasePlayerPrivate::~HbFeedbackBasePlayerPrivate() {
MTouchFeedback::DestroyInstance();
- registeredHitAreas.clear();
+
iTacticon.Close();
iTacticonReady = EFalse;
}
@@ -240,27 +235,6 @@
return type;
}
-TTacticonType HbFeedbackBasePlayerPrivate::convertTacticonToSymbian(HbFeedback::TacticonEffect effect) {
-
- TTacticonType type = ENoTacticon;
-
- switch (effect) {
-
- case HbFeedback::TacticonPositive:
- type = EPositiveTacticon;
- break;
- case HbFeedback::TacticonNeutral:
- type = ENeutralTacticon;
- break;
- case HbFeedback::TacticonNegative:
- type = ENegativeTacticon;
- break;
- default:
- break;
- }
- return type;
-}
-
TTouchContinuousFeedback HbFeedbackBasePlayerPrivate::convertToSymbian(HbFeedback::ContinuousEffect effect) {
TTouchContinuousFeedback continuousFeedbackSymbian = ETouchContinuousSmooth;
@@ -289,18 +263,6 @@
return continuousFeedbackSymbian;
}
-TTouchEventType HbFeedbackBasePlayerPrivate::convertToSymbian(HbFeedback::HitAreaType hitAreaType) {
-
- TTouchEventType touchEventType = ETouchEventStylusDown;
-
- if ( hitAreaType == HbFeedback::MouseButtonPress ) {
- touchEventType = ETouchEventStylusDown;
- } else if (hitAreaType == HbFeedback::MouseButtonRelease ) {
- // ETouchEventStylusUp not yet supported
- touchEventType = ETouchEventStylusDown;
- }
- return touchEventType;
-}
TTouchFeedbackType HbFeedbackBasePlayerPrivate::convertToSymbian(HbFeedback::Modalities modalities)
{
@@ -335,23 +297,11 @@
HbFeedbackBasePlayer::~HbFeedbackBasePlayer() {
- removeHitAreas();
cancelContinuousFeedbacks();
delete d;
}
-void HbFeedbackBasePlayer::removeHitAreas() {
- // remove hit areas
- QMapIterator<int, QWidget*> i(d->registeredHitAreas);
-
- while (i.hasNext()) {
- i.next();
- removeHitArea( i.key());
- }
-
- d->registeredHitAreas.clear();
-}
void HbFeedbackBasePlayer::cancelContinuousFeedbacks() {
@@ -389,13 +339,6 @@
}
}
-void HbFeedbackBasePlayer::playTacticonFeedback(const HbTacticonFeedback& feedback) {
-
- if (d->iTacticonReady) {
- d->iTacticon.PlayTacticon(d->convertTacticonToSymbian(feedback.tacticonEffect()));
- }
-}
-
int HbFeedbackBasePlayer::startContinuousFeedback(const HbContinuousFeedback& feedback) {
int identifier = -1;
@@ -453,52 +396,4 @@
return feedbackOngoing;
}
-int HbFeedbackBasePlayer::insertHitArea(const HbHitAreaFeedback& feedback) {
- int identifier = -1;
- CCoeControl* control = d->convertToSymbian(feedback.window());
- if (d->iFeedback && control) {
- identifier = d->getNewIdentifier();
- TTouchLogicalFeedback logicalFeedback = d->convertToSymbian(feedback.instantEffect());
- // current hit area implementation below does not yet support new logical feedbacks
- if (logicalFeedback > ETouchFeedbackSensitive) {
- logicalFeedback = ETouchFeedbackSensitive;
- }
-
- int errorValue = d->iFeedback->SetFeedbackArea(control, identifier,
- d->convertToSymbian(feedback.rect()),
- logicalFeedback,
- d->convertToSymbian(feedback.hitAreaType()));
- if (errorValue >= 0) {
- // no error
- d->registeredHitAreas.insert(identifier, feedback.window());
- }
- }
- return identifier;
-}
-
-void HbFeedbackBasePlayer::updateHitArea(int identifier, const HbHitAreaFeedback& feedback) {
-
- CCoeControl* control = d->convertToSymbian(feedback.window());
-
- if (d->iFeedback && control && d->registeredHitAreas.contains(identifier)) {
- CCoeControl* storedControl = d->convertToSymbian(d->registeredHitAreas[identifier]);
- if (storedControl == control) {
- d->iFeedback->ChangeFeedbackArea(storedControl, identifier, d->convertToSymbian(feedback.rect()));
- }
- }
-}
-
-void HbFeedbackBasePlayer::removeHitArea(int identifier) {
-
- if (d->iFeedback && d->registeredHitAreas.contains(identifier)) {
- CCoeControl* storedControl = d->convertToSymbian(d->registeredHitAreas[identifier]);
- d->iFeedback->RemoveFeedbackArea(storedControl, identifier);
- d->registeredHitAreas.remove(identifier);
- }
-}
-
-bool HbFeedbackBasePlayer::hitAreaExists(int identifier) {
-
- return d->registeredHitAreas.contains(identifier);
-}
--- a/src/hbfeedback/player/hbfeedbackplayer_symbian_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbfeedback/player/hbfeedbackplayer_symbian_p.h Fri May 14 16:09:54 2010 +0300
@@ -33,8 +33,6 @@
class HbInstantFeedback;
class HbContinuousFeedback;
-class HbTacticonFeedback;
-class HbHitAreaFeedback;
class HbFeedbackBasePlayerPrivate;
class HbFeedbackBasePlayer
@@ -44,7 +42,6 @@
~HbFeedbackBasePlayer();
void playInstantFeedback(const HbInstantFeedback& feedback);
- void playTacticonFeedback(const HbTacticonFeedback& feedback);
int startContinuousFeedback(const HbContinuousFeedback& feedback);
void updateContinuousFeedback(int identifier, const HbContinuousFeedback& feedback);
@@ -52,12 +49,6 @@
bool continuousFeedbackOngoing(int identifier);
void cancelContinuousFeedbacks();
- int insertHitArea(const HbHitAreaFeedback& feedback);
- void updateHitArea(int identifier, const HbHitAreaFeedback& feedback);
- void removeHitArea(int identifier);
- bool hitAreaExists(int identifier);
- void removeHitAreas();
-
void print(QString trace);
HbFeedbackBasePlayerPrivate* const d;
--- a/src/hbfeedback/player/hbfeedbacksettings.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbfeedback/player/hbfeedbacksettings.cpp Fri May 14 16:09:54 2010 +0300
@@ -35,33 +35,37 @@
\class HbFeedbackSettings
- \brief %Feedback Settings API for Qt application development.
-
- Application can choose to disable feedback effects for the application, for example
- phone application may want to disable vibration and sound feedback effects during a phone call.
+ \brief Feedback setting interface for controlling the feedback playing.
- Feedback effects can also be disabled based on the type of feedback. There are currently four
- supported types of feedback: instant fire&forget feedback, continuous feedback that needs to
- be started and ended separately, hit area feedback that uses pre-registered feedback areas and
- finally tacticon feedback.
+ Application can choose to disable feedback effects for the application, for example a phone
+ application may want to disable the haptic and audio feedback effects during a phone call.
*/
+
class HbFeedbackSettingsPrivate
{
public:
- HbFeedbackSettingsPrivate(HbFeedbackSettings* parent);
+ static HbFeedbackSettingsPrivate* instance();
+ HbFeedbackSettingsPrivate();
~HbFeedbackSettingsPrivate();
void init();
public:
bool feedbackEnabled;
HbFeedback::Types enabledTypes;
- HbFeedbackSettings* parent;
};
-HbFeedbackSettingsPrivate::HbFeedbackSettingsPrivate(HbFeedbackSettings* parent) : parent(parent)
+Q_GLOBAL_STATIC(HbFeedbackSettingsPrivate, feedbackSettingsPrivateGlobal);
+
+HbFeedbackSettingsPrivate* HbFeedbackSettingsPrivate::instance()
{
+ return feedbackSettingsPrivateGlobal();
+}
+
+HbFeedbackSettingsPrivate::HbFeedbackSettingsPrivate()
+{
+ init();
}
HbFeedbackSettingsPrivate::~HbFeedbackSettingsPrivate()
@@ -80,19 +84,17 @@
#endif
// all types are enabled by default
- enabledTypes = HbFeedback::TypeInstant
- | HbFeedback::TypeContinuous
- | HbFeedback::TypeHitArea
- | HbFeedback::TypeTacticon;
+ enabledTypes = HbFeedback::TypeInstant | HbFeedback::TypeContinuous;
}
+
+
/*!
Constructor.
*/
-HbFeedbackSettings::HbFeedbackSettings(QObject* parent) : QObject(parent),
- d(new HbFeedbackSettingsPrivate(this))
+HbFeedbackSettings::HbFeedbackSettings(QObject* parent) : QObject(parent)
{
- d->init();
+ d = HbFeedbackSettingsPrivate::instance();
}
/*!
@@ -100,7 +102,6 @@
*/
HbFeedbackSettings::~HbFeedbackSettings()
{
- delete d;
}
/*!
@@ -186,72 +187,3 @@
return d->feedbackEnabled;
}
-/*!
- \deprecated HbFeedbackSettings::enableType(HbFeedback::Type)
- is deprecated.
-
- Enables given type of feedback effects in the application.
- All feedback types are enabled by default.
- Emits signal typeEnabled(HbFeedback::Type type) if
- previously disabled feedback type has been enabled.
-*/
-void HbFeedbackSettings::enableType(HbFeedback::Type type)
-{
- if (!isTypeEnabled(type)) {
- d->enabledTypes |= type;
- emit feedbackTypeEnabled(type);
- }
-}
-
-/*!
- \deprecated HbFeedbackSettings::disableType(HbFeedback::Type)
- is deprecated.
-
- Disables given type of feedback effect mechanism in the application.
-
- Emits signal typeDisabled(HbFeedback::Type type) if
- previously enabled feedback type has been disabled.
-
- \param type type of feedback effect
-*/
-void HbFeedbackSettings::disableType(HbFeedback::Type type)
-{
- if (isTypeEnabled(type)) {
- d->enabledTypes &= ~type;
- emit feedbackTypeDisabled(type);
- }
-}
-
-/*!
- \deprecated HbFeedbackSettings::isTypeEnabled(HbFeedback::Type)
- is deprecated.
-
- Returns true if a particular type of feedback effect mechanism has been
- enabled for the application.
-*/
-bool HbFeedbackSettings::isTypeEnabled(HbFeedback::Type type)
-{
- return d->enabledTypes & type;
-}
-
-/*!
- \deprecated HbFeedbackSettings::isFeedbackAllowed(HbFeedback::Type)
- is deprecated.
-
- True if feedback effects and the particular feedback type of feedback
- effect mechanism is enabled, false if not.
-*/
-bool HbFeedbackSettings::isFeedbackAllowed(HbFeedback::Type type)
-{
- return d->feedbackEnabled && isTypeEnabled(type);
-}
-
-/*!
- \deprecated HbFeedbackSettings::feedbackTypeEnabled(HbFeedback::Type)
- is deprecated.
-
- \deprecated HbFeedbackSettings::feedbackTypeDisabled(HbFeedback::Type)
- is deprecated.
-*/
-
-
--- a/src/hbfeedback/player/hbfeedbacksettings.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbfeedback/player/hbfeedbacksettings.h Fri May 14 16:09:54 2010 +0300
@@ -47,20 +47,12 @@
void disableFeedback();
bool isFeedbackEnabled();
- void enableType(HbFeedback::Type type); // deprecated
- void disableType(HbFeedback::Type type); // deprecated
- bool isTypeEnabled(HbFeedback::Type type); // deprecated
-
- bool isFeedbackAllowed(HbFeedback::Type type); // deprecated
-
signals:
void feedbackEnabled();
void feedbackDisabled();
- void feedbackTypeEnabled(HbFeedback::Type type); // deprecated
- void feedbackTypeDisabled(HbFeedback::Type type); // deprecated
private:
- HbFeedbackSettingsPrivate* const d;
+ HbFeedbackSettingsPrivate* d;
};
#endif // HBFEEDBACKSETTINGS_H
--- a/src/hbfeedback/player/hbfeedbacktestevent_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbfeedback/player/hbfeedbacktestevent_p.h Fri May 14 16:09:54 2010 +0300
@@ -30,7 +30,7 @@
#include <QEvent>
-class HB_FEEDBACK_EXPORT HbFeedbackTestEvent : public QEvent
+class HB_AUTOTEST_EXPORT HbFeedbackTestEvent : public QEvent
{
public:
static int eventId();
--- a/src/hbfeedback/player/hbhitareafeedback.cpp Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,275 +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 HbFeedback 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 "hbhitareafeedback.h"
-
-#include <QGraphicsItem>
-#include <QGraphicsView>
-
-
-class HbHitAreaFeedbackPrivate
-{
-public:
- HbHitAreaFeedbackPrivate() : cHitAreaType(HbFeedback::MouseButtonPress), cZValue(0) {};
- ~HbHitAreaFeedbackPrivate() {};
-
-public:
- HbFeedback::HitAreaType cHitAreaType;
- qreal cZValue;
-};
-
-/*!
-
- \deprecated HbHitAreaFeedback
- is deprecated. Please use HbInstantFeedback instead.
-
- @hbfeedback
-
- \class HbHitAreaFeedback
-
- \brief Tool class for hit area-based feedback effects. [DEPRECATED]
-
- Hit area feedback is a special kind of instant feedback. Hit are feedbacks are rectangle areas registered for
- the application windows that react to touch events before the events are reach the actual application GUI.
- Although hit areas are in many ways more cumbersome than traditional instant feedback effects initiated from
- the application code, they provide lower latency in situations where round trip to application event loop is
- considered too slow. New hit areas can be registered, old hit areas can be moved or removed from the screen
- using methods HbFeedbackPlayer::insertHitArea(), HbFeedbackPlayer::updateHitArea() and HbFeedbackPlayer::removeHitArea().
-
- \sa HbInstantFeedback
-*/
-
-/*!
- \fn HbFeedback::Type HbHitAreaFeedback::type() const
-
- Returns HbFeedback::TypeHitArea.
-
- \deprecated HbHitAreaFeedback::type() const
- is deprecated. Please use HbInstantFeedback instead.
-
- \sa HbInstantFeedback
-*/
-
-/*!
- \fn void HbHitAreaFeedback::setHitAreaType(HbFeedback::HitAreaType hitAreaType)
-
- Sets the hit area type for the feedback. Hit area type defines whether feedback effect
- is initiated when user touches down the screen or when user lifts the finger
- from the screen.
-
- \deprecated HbHitAreaFeedback::setHitAreaType(HbFeedback::HitAreaType)
- is deprecated. Please use HbInstantFeedback instead.
-
- \sa HbInstantFeedback
-*/
-
-void HbHitAreaFeedback::setHitAreaType(HbFeedback::HitAreaType hitAreaType) {
-
- d->cHitAreaType = hitAreaType;
-}
-
-/*!
- \fn HbFeedback::HitAreaType HbHitAreaFeedback::hitAreaType() const
-
- The hit area type of the feedback. Hit area type defines whether feedback effect
- is initiated when user touches down the screen or when user lifts the finger
- from the screen.
-
- \deprecated HbHitAreaFeedback::hitAreaType() const
- is deprecated. Please use HbInstantFeedback instead.
-
- \sa HbInstantFeedback
-*/
-
-HbFeedback::HitAreaType HbHitAreaFeedback::hitAreaType() const {
-
- return d->cHitAreaType;
-};
-
-/*!
- \fn bool HbHitAreaFeedback::isValid() const
-
- Hit are feedback is valid if a proper instant effect (not HbFeedback::None), parent window
- and area rectangle (relative to the parent window) has been defined for
- the hit area feedback.
-
- \deprecated HbHitAreaFeedback::isValid() const
- is deprecated. Please use HbInstantFeedback instead.
-
- \sa HbInstantFeedback
-*/
-
-bool HbHitAreaFeedback::isValid() const {
- return isLocated() && instantEffect() != HbFeedback::None;
-}
-
-/*!
- \fn void HbHitAreaFeedback::setZValue(qreal zValue)
-
- Sets the z-position for the hit area. If there are multiple overlapping hit areas the feedback effect
- with highest z-position will be initiated.
-
- \deprecated HbHitAreaFeedback::setZValue(float)
- is deprecated. Please use HbInstantFeedback instead.
-
- \sa HbInstantFeedback
-*/
-
-void HbHitAreaFeedback::setZValue(qreal zValue)
-{
- d->cZValue = zValue;
-}
-
-/*!
- \fn qreal HbHitAreaFeedback::zValue() const
-
- The z-position for the hit area. If there are multiple overlapping hit areas the feedback effect
- with highest z-position will be initiated.
-
- \deprecated HbHitAreaFeedback::zValue() const
- is deprecated. Please use HbInstantFeedback instead.
-
- \sa HbInstantFeedback
-*/
-
-qreal HbHitAreaFeedback::zValue() const
-{
- return d->cZValue;
-}
-
-/*!
- Constructor.
-
- \deprecated HbHitAreaFeedback::HbHitAreaFeedback()
- is deprecated. Please use HbInstantFeedback instead.
-
- \sa HbInstantFeedback
-*/
-HbHitAreaFeedback::HbHitAreaFeedback() :
- d(new HbHitAreaFeedbackPrivate)
-{
-}
-
-/*!
- Constructor.
- \param effect instant feedback
- \param widget used to determine the window where hit area is registered.
- \param rect rectangle in relation to the window, if null uses the widget's bounding rectangle.
-
- \deprecated HbHitAreaFeedback::HbHitAreaFeedback(HbFeedback::InstantEffect, const QWidget*, QRect)
- is deprecated. Please use HbInstantFeedback instead.
-
- \sa HbInstantFeedback
-*/
-HbHitAreaFeedback::HbHitAreaFeedback(HbFeedback::InstantEffect effect, const QWidget* widget, QRect rect) :
- HbInstantFeedback(effect), d(new HbHitAreaFeedbackPrivate)
-{
- setOwningWindow(widget);
- if (!rect.isNull()) {
- setRect(rect);
- } else {
- setRect(widget);
- }
-}
-
-/*!
- Constructor.
- \param effect instant feedback effect to be played
- \param graphicsItem graphics item used to determine the hit area rectangle, won't be automatically updated if item's position changes
- \param graphicsView sed to determine the window where hit area is registered.
-
- \deprecated HbHitAreaFeedback::HbHitAreaFeedback(HbFeedback::InstantEffect, const QGraphicsView*, const QGraphicsItem*)
- is deprecated. Please use HbInstantFeedback instead.
-
- \sa HbInstantFeedback
-*/
-HbHitAreaFeedback::HbHitAreaFeedback(HbFeedback::InstantEffect effect, const QGraphicsView* graphicsView, const QGraphicsItem* graphicsItem) :
- HbInstantFeedback(effect), d(new HbHitAreaFeedbackPrivate)
-{
- setOwningWindow(graphicsView);
- setRect(graphicsItem, graphicsView);
-}
-
-/*!
- Destructor.
-
- \deprecated HbHitAreaFeedback::~HbHitAreaFeedback()
- is deprecated. Please use HbInstantFeedback instead.
-
- \sa HbInstantFeedback
-*/
-HbHitAreaFeedback::~HbHitAreaFeedback()
-{
- delete d;
-}
-
-/*!
- Assigns a copy of the feedback \a feedback to this feedback, and returns a
- reference to it.
-
- \deprecated HbHitAreaFeedback::operator =(const HbHitAreaFeedback&)
- is deprecated. Please use HbInstantFeedback instead.
-
- \sa HbInstantFeedback
-*/
-HbHitAreaFeedback &HbHitAreaFeedback::operator=(const HbHitAreaFeedback & feedback)
-{
- HbInstantFeedback::operator =(feedback);
- setHitAreaType(feedback.hitAreaType());
- setZValue(feedback.zValue());
- return *this;
-}
-
-/*!
- Returns true if this feedback has the same configuration as the feedback \a
- feedback; otherwise returns false.
-
- \deprecated HbHitAreaFeedback::operator ==(const HbHitAreaFeedback&)
- is deprecated. Please use HbInstantFeedback instead.
-
- \sa HbInstantFeedback
-*/
-bool HbHitAreaFeedback::operator==(const HbHitAreaFeedback &feedback) const
-{
- return (rect() == feedback.rect()
- && window() == feedback.window()
- && instantEffect() == feedback.instantEffect()
- && d->cHitAreaType == feedback.hitAreaType()
- && d->cZValue == feedback.zValue());
-}
-
-/*!
- Returns true if this feedback has different configuration than the feedback \a
- feedback; otherwise returns false.
-
- \deprecated HbHitAreaFeedback::operator !=(const HbHitAreaFeedback&)
- is deprecated. Please use HbInstantFeedback instead.
-
- \sa HbInstantFeedback
-*/
-bool HbHitAreaFeedback::operator!=(const HbHitAreaFeedback &feedback) const
-{
- return !(*this == feedback);
-}
--- a/src/hbfeedback/player/hbhitareafeedback.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +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 HbFeedback 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 HITAREAFEEDBACK_H
-#define HITAREAFEEDBACK_H
-
-#include "hbinstantfeedback.h"
-
-class HbHitAreaFeedbackPrivate;
-
-class HB_FEEDBACK_EXPORT HbHitAreaFeedback : public HbInstantFeedback
-{
-
-public:
- HbHitAreaFeedback();
- HbHitAreaFeedback(HbFeedback::InstantEffect effect, const QWidget* widget, QRect rect = QRect());
- HbHitAreaFeedback(HbFeedback::InstantEffect effect, const QGraphicsView* graphicsView, const QGraphicsItem* graphicsItem);
- ~HbHitAreaFeedback();
-
- HbFeedback::Type type() const {
- return HbFeedback::TypeHitArea;
- };
-
- bool isValid() const;
-
- HbFeedback::HitAreaType hitAreaType() const;
- qreal zValue() const;
-
- void setHitAreaType(HbFeedback::HitAreaType hitAreaType);
- void setZValue(qreal zValue);
-
- HbHitAreaFeedback &operator=(const HbHitAreaFeedback &);
- bool operator==(const HbHitAreaFeedback &c) const;
- bool operator!=(const HbHitAreaFeedback &c) const;
-
-private:
- HbHitAreaFeedbackPrivate *d;
-};
-
-#endif // HITAREAFEEDBACK_H
--- a/src/hbfeedback/player/hbinstantfeedback.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbfeedback/player/hbinstantfeedback.cpp Fri May 14 16:09:54 2010 +0300
@@ -24,7 +24,7 @@
****************************************************************************/
#include "hbinstantfeedback.h"
-#include "hbfeedbackplayer.h"
+#include "hbfeedbackplayer_p.h"
#include <QGraphicsItem>
#include <QGraphicsView>
@@ -46,20 +46,16 @@
\class HbInstantFeedback
- \brief Tool class for instant feedback effects.
+ \brief Class for instant feedback effects.
- Instant feedbacks are used to initiate fire&forget type of sound and haptic effects defined in the device themes.
- Effects are used as a feedback indication to the user when she/he is navigating and interacting
- with the device.
+ Instant feedbacks are used to initiate short, fire&forget type of feedback effects.
+ Effects are used as a feedback indication while the user is interacting with the device.
*/
/*!
\fn void HbInstantFeedback::setInstantEffect(HbFeedback::InstantEffect effect)
- Sets the instant effect that determines what kind of haptic and sound effects will
- be played when calling HbFeedbackPlayer::playInstantFeedback() or when user touches the screen
- over the hit area with the given instant effect. The actual effects are
- defined in the device themes.
+ Sets the instant effect to be be played when calling HbFeedbackPlayer::playInstantFeedback().
*/
void HbInstantFeedback::setInstantEffect(HbFeedback::InstantEffect effect)
@@ -70,10 +66,8 @@
/*!
\fn void HbFeedback::InstantEffect HbInstantFeedback::instantEffect() const
- Returns the instant effect of the instant feedback object. Instant effect is used to determine what kind of
- haptic and sound effects will be played when calling HbFeedbackPlayer::playInstantFeedback() or
- when user touches the screen over the hit area with the given instant effect. The actual effects
- are defined in the device themes.
+ Returns the instant effect of the instant feedback object. Instant effect represents the feedback
+ effect to be played when calling HbFeedbackPlayer::playInstantFeedback().
*/
HbFeedback::InstantEffect HbInstantFeedback::instantEffect() const
@@ -92,7 +86,6 @@
{
switch(d->cEffect) {
case HbFeedback::None:
- case HbFeedback::NoOverride:
return false;
default:
return true;
@@ -131,18 +124,18 @@
}
/*!
- Initiates the instant feedback effect.
+ Plays the instant feedback effect.
*/
void HbInstantFeedback::play()
{
- HbFeedbackPlayer* player = HbFeedbackPlayer::instance();
- if (player) {
- player->playInstantFeedback(d->cEffect);
+ HbFeedbackPlayer* feedbackPlayer = HbFeedbackPlayer::instance();
+ if (feedbackPlayer) {
+ feedbackPlayer->playInstantFeedback(*this);
}
}
/*!
- Initiates the given instant feedback effect.
+ Plays the given instant feedback effect.
*/
void HbInstantFeedback::play(HbFeedback::InstantEffect effect)
{
@@ -164,8 +157,8 @@
}
/*!
- Returns true if this feedback has the same configuration as the feedback \a
- feedback; otherwise returns false.
+ Returns true if this feedback has the same parameters as the feedback
+ \a feedback, otherwise returns false.
*/
bool HbInstantFeedback::operator==(const HbInstantFeedback &feedback) const
{
@@ -175,8 +168,8 @@
}
/*!
- Returns true if this feedback has different configuration than the feedback \a
- feedback; otherwise returns false.
+ Returns true if this feedback has different parameters than the feedback
+ \a feedback, otherwise returns false.
*/
bool HbInstantFeedback::operator!=(const HbInstantFeedback &feedback) const
{
--- a/src/hbfeedback/player/hbtacticonfeedback.cpp Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,241 +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 HbFeedback 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 "hbtacticonfeedback.h"
-#include "hbfeedbackplayer.h"
-
-#include <QGraphicsItem>
-#include <QGraphicsView>
-
-class HbTacticonFeedbackPrivate
-{
-public:
- HbTacticonFeedbackPrivate() : cEffect(HbFeedback::TacticonNeutral) {};
- ~HbTacticonFeedbackPrivate() {};
-
-public:
- HbFeedback::TacticonEffect cEffect;
-};
-
-/*!
- \deprecated HbTacticonFeedback
- is deprecated. Please use HbInstantFeedback instead.
-
- @hbfeedback
-
- \class HbTacticonFeedback
-
- \brief Tool class for tacticon effects. [DEPRECATED]
-
- Tacticon effect can be either positive, negative and neutral. Tacticons are normally used
- in conjuction with various warning, error and information dialogs. The actual effects are
- defined in the device themes.
-
- \sa HbInstantFeedback
-*/
-
-/*!
- Initiates the instant feedback effect.
-
- \deprecated HbTacticonFeedback::play()
- is deprecated. Please use HbInstantFeedback instead.
-
- \sa HbInstantFeedback
-*/
-void HbTacticonFeedback::play()
-{
- HbFeedbackPlayer* player = HbFeedbackPlayer::instance();
- if (player) {
- player->playTacticonFeedback(d->cEffect);
- }
-}
-
-/*!
- Initiates the given instant feedback effect.
-
- \param effect the tacticon effect to be played
-
- \deprecated HbTacticonFeedback::play(HbFeedback::TacticonEffect)
- is deprecated. Please use HbInstantFeedback instead.
-
- \sa HbInstantFeedback
-*/
-void HbTacticonFeedback::play(HbFeedback::TacticonEffect effect)
-{
- HbFeedbackPlayer* player = HbFeedbackPlayer::instance();
- if (player) {
- player->playTacticonFeedback(effect);
- }
-}
-
-/*!
- \fn void HbTacticonFeedback::setTacticonEffect(HbFeedback::TacticonEffect effect)
-
- Sets the tacticon effect that determines what kind of haptic and sound effects will
- be played when calling HbFeedbackPlayer::playTacticonFeedback(). The actual effects are
- defined in the device themes.
-
- \deprecated HbTacticonFeedback::setTacticonEffect(HbFeedback::TacticonEffect)
- is deprecated. Please use HbInstantFeedback instead.
-
- \sa HbInstantFeedback
-*/
-
-void HbTacticonFeedback::setTacticonEffect(HbFeedback::TacticonEffect effect)
-{
- d->cEffect = effect;
-}
-
-/*!
- \fn HbFeedback::TacticonEffect HbTacticonFeedback::tacticonEffect() const
-
- Returns the tacticon effect of the tacticon feedback object. Tacticon effect is used to determine what
- kind of haptic and sound effects will be played when calling HbFeedbackPlayer::playTacticonFeedback().
- The actual effects are defined in the device themes.
-
- \deprecated HbTacticonFeedback::tacticonEffect() const
- is deprecated. Please use HbInstantFeedback instead.
-
- \sa HbInstantFeedback
-*/
-
-HbFeedback::TacticonEffect HbTacticonFeedback::tacticonEffect() const
-{
- return d->cEffect;
-}
-
-/*!
- \fn bool HbTacticonFeedback::isValid() const
-
- Tacticon feedback is valid if a proper tacticon effect (not HbFeedback::TacticonNone) has beed
- defined for the feedback.
-
- \deprecated HbTacticonFeedback::isValid() const
- is deprecated. Please use HbInstantFeedback instead.
-
- \sa HbInstantFeedback
-*/
-
-bool HbTacticonFeedback::isValid() const
-{
- return d->cEffect != HbFeedback::TacticonNone;
-}
-
-/*!
- \fn HbFeedback::Type HbTacticonFeedback::type() const
-
- Returns HbFeedback::TypeTacticon.
-
- \deprecated HbTacticonFeedback::type() const
- is deprecated. Please use HbInstantFeedback instead.
-
- \sa HbInstantFeedback
-*/
-
-/*!
- Constructor.
-
- \deprecated HbTacticonFeedback::HbTacticonFeedback()
- is deprecated. Please use HbInstantFeedback instead.
-
- \sa HbInstantFeedback
-*/
-HbTacticonFeedback::HbTacticonFeedback() : d(new HbTacticonFeedbackPrivate)
-{
-}
-
-/*!
- Constructor.
-
- \param effect tacticon feedback to be played
-
- \deprecated HbTacticonFeedback::HbTacticonFeedback(HbFeedback::TacticonEffect)
- is deprecated. Please use HbInstantFeedback instead.
-
- \sa HbInstantFeedback
-*/
-HbTacticonFeedback::HbTacticonFeedback(HbFeedback::TacticonEffect effect) : d(new HbTacticonFeedbackPrivate)
-{
- d->cEffect = effect;
-}
-
-/*!
- Destructor.
-
- \deprecated HbTacticonFeedback::~HbTacticonFeedback()
- is deprecated. Please use HbInstantFeedback instead.
-
- \sa HbInstantFeedback
-*/
-HbTacticonFeedback::~HbTacticonFeedback()
-{
- delete d;
-}
-
-/*!
- Assigns a copy of the feedback \a feedback to this feedback, and returns a
- reference to it.
-
- \deprecated HbTacticonFeedback::operator =(const HbTacticonFeedback&)
- is deprecated. Please use HbInstantFeedback instead.
-
- \sa HbInstantFeedback
-*/
-HbTacticonFeedback &HbTacticonFeedback::operator=(const HbTacticonFeedback & feedback)
-{
- HbAbstractFeedback::operator =(feedback);
- setTacticonEffect(feedback.tacticonEffect());
- return *this;
-}
-
-/*!
- Returns true if this feedback has the same configuration as the feedback \a
- feedback; otherwise returns false.
-
- \deprecated HbTacticonFeedback::operator ==(const HbTacticonFeedback&) const
- is deprecated. Please use HbInstantFeedback instead.
-
- \sa HbInstantFeedback
-*/
-bool HbTacticonFeedback::operator==(const HbTacticonFeedback &feedback) const
-{
- return (rect() == feedback.rect()
- && window() == feedback.window()
- && d->cEffect == feedback.tacticonEffect());
-}
-
-/*!
- Returns true if this feedback has different configuration than the feedback \a
- feedback; otherwise returns false.
-
- \deprecated HbTacticonFeedback::operator !=(const HbTacticonFeedback&) const
- is deprecated. Please use HbInstantFeedback instead.
-
- \sa HbInstantFeedback
-*/
-bool HbTacticonFeedback::operator!=(const HbTacticonFeedback &feedback) const
-{
- return !(*this == feedback);
-}
--- a/src/hbfeedback/player/hbtacticonfeedback.h Mon May 03 12:48:33 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 HbFeedback 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 HBTACTICONFEEDBACK_H
-#define HBTACTICONFEEDBACK_H
-
-#include "hbabstractfeedback.h"
-
-class HbTacticonFeedbackPrivate;
-
-class HB_FEEDBACK_EXPORT HbTacticonFeedback : public HbAbstractFeedback
-{
-
-public:
- HbTacticonFeedback();
- HbTacticonFeedback(HbFeedback::TacticonEffect effect);
- ~HbTacticonFeedback();
-
- void play();
- static void play(HbFeedback::TacticonEffect effect);
-
- HbFeedback::Type type() const {
- return HbFeedback::TypeTacticon;
- }
-
- bool isValid() const;
-
- HbFeedback::TacticonEffect tacticonEffect() const;
- void setTacticonEffect(HbFeedback::TacticonEffect effect);
-
- HbTacticonFeedback &operator=(const HbTacticonFeedback &feedback);
- bool operator==(const HbTacticonFeedback &feedback) const;
- bool operator!=(const HbTacticonFeedback &feedback) const;
-
-private:
- HbTacticonFeedbackPrivate *d;
-};
-
-#endif // HBTACTICONFEEDBACK_H
--- a/src/hbfeedback/player/player.pri Mon May 03 12:48:33 2010 +0300
+++ b/src/hbfeedback/player/player.pri Fri May 14 16:09:54 2010 +0300
@@ -30,19 +30,15 @@
$$PWD/hbfeedbacksettings.cpp \
$$PWD/hbabstractfeedback.cpp \
$$PWD/hbinstantfeedback.cpp \
- $$PWD/hbcontinuousfeedback.cpp \
- $$PWD/hbhitareafeedback.cpp \
- $$PWD/hbtacticonfeedback.cpp
+ $$PWD/hbcontinuousfeedback.cpp
-PUBLIC_HEADERS += $$PWD/hbfeedbackplayer.h \
- $$PWD/hbfeedbacksettings.h \
+PUBLIC_HEADERS += $$PWD/hbfeedbacksettings.h \
$$PWD/hbabstractfeedback.h \
$$PWD/hbinstantfeedback.h \
- $$PWD/hbcontinuousfeedback.h \
- $$PWD/hbhitareafeedback.h \
- $$PWD/hbtacticonfeedback.h
+ $$PWD/hbcontinuousfeedback.h
-PRIVATE_HEADERS += $$PWD/hbfeedbackplayer_p.h
+PRIVATE_HEADERS += $$PWD/hbfeedbackplayer_p.h \
+ $$PWD/hbfeedbackplayer_p_p.h
symbian {
SOURCES += $$PWD/hbfeedbackplayer_symbian.cpp
@@ -51,10 +47,11 @@
else {
SOURCES += hbfeedbackplayer_stub.cpp
PRIVATE_HEADERS += hbfeedbackplayer_stub_p.h
+
+ developer|feedback_traces {
+ DEFINES += FEEDBACK_TEST_EVENT
+ SOURCES += $$PWD/hbfeedbacktestevent.cpp
+ PRIVATE_HEADERS += $$PWD/hbfeedbacktestevent_p.h
+ }
}
-developer|feedback_traces {
- DEFINES += FEEDBACK_TEST_EVENT
- SOURCES += $$PWD/hbfeedbacktestevent.cpp
- PRIVATE_HEADERS += $$PWD/hbfeedbacktestevent_p.h
-}
--- a/src/hbfunctions.prf Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,107 +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 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.
-##
-#############################################################################
-#
-
-defineReplace(hbLibraryTarget) {
- unset(LIBRARY_NAME)
- LIBRARY_NAME = $$1
- # the following leads to ugly vcproj names but had to be commented
- # out, because it broke vcproj generator dependency checks
- #!debug_and_release|build_pass { <--
- CONFIG(debug, debug|release) {
- mac:RET = $$member(LIBRARY_NAME, 0)_debug
- else:win32:RET = $$member(LIBRARY_NAME, 0)d
- }
- #}
- isEmpty(RET):RET = $$LIBRARY_NAME
- return($$RET)
-}
-
-# params: <collection/library>
-# eg. hbAddLibrary(hbcore/HbCore)
-defineTest(hbAddLibrary) {
- PARTS = $$split(1, "/")
- COLLECTION = $$lower($$first(PARTS))
- LIBRARY = $$last(PARTS)
-
- INCLUDEPATH *= $${HB_BUILD_DIR}/include/$${COLLECTION}
- INCLUDEPATH *= $${HB_BUILD_DIR}/include/$${COLLECTION}/private
- DEPENDPATH *= $${HB_BUILD_DIR}/include/$${COLLECTION}
- DEPENDPATH *= $${HB_BUILD_DIR}/include/$${COLLECTION}/private
-
- LIBS *= -L$${HB_BUILD_DIR}/lib
- LIBS *= -l$$hbLibraryTarget($$LIBRARY)
- QMAKE_RPATHDIR *= $${HB_BUILD_DIR}/lib
- unix:HB_COVERAGE_EXCLUDE += \"*/$$COLLECTION/*\"
-
- export(LIBS)
- export(INCLUDEPATH)
- export(DEPENDPATH)
- export(QMAKE_RPATHDIR)
- export(HB_COVERAGE_EXCLUDE)
- return(true)
-}
-
-# params: <collection>
-# NOTE: PUBLIC_HEADERS, INTERNAL_HEADERS, CONVENIENCE_HEADERS
-# eg. hbExportHeaders(hbcore)
-defineTest(hbExportHeaders) {
- for(PUBLIC_HEADER, PUBLIC_HEADERS) {
- PUBLIC_HEADER = $$section(PUBLIC_HEADER, ":", 1)
- 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(CONVENIENCE_HEADER, CONVENIENCE_HEADERS) {
- CONVENIENCE_HEADER = $$section(CONVENIENCE_HEADER, ":", 1)
- EXPORT_PATH = $$sprintf($$HB_EXPORT_DIR, $$1, $$basename(CONVENIENCE_HEADER))
- BLD_INF_RULES.prj_exports *= "$$CONVENIENCE_HEADER $$EXPORT_PATH"
- }
- export(BLD_INF_RULES.prj_exports)
- return(true)
-}
-
-# params: <path>
-# eg. features.path = $$hbNativePath($$[QMAKE_MKSPECS]/features)
-defineReplace(hbNativePath) {
- symbian|win32:!win32-g++ {
- unixstyle = false
- } else:win32-g++:isEmpty(QMAKE_SH) {
- unixstyle = false
- } else {
- unixstyle = true
- }
- $$unixstyle {
- return($$quote(\"$$replace(1, "\\", "/")\"))
- } else {
- return($$quote(\"$$replace(1, "/", "\\")\"))
- }
-}
--- a/src/hbinput/hbinput.pro Mon May 03 12:48:33 2010 +0300
+++ b/src/hbinput/hbinput.pro Fri May 14 16:09:54 2010 +0300
@@ -65,6 +65,8 @@
#QMAKE_DISTCLEAN += $$hbNativePath($${HB_BUILD_DIR}/include/hbinput/private/*)
symbian {
+ defFilePath = defs
+
TARGET.EPOCALLOWDLLDATA = 1
TARGET.CAPABILITY = CAP_GENERAL_DLL
TARGET.UID3 = 0x20022EA7
--- a/src/hbinput/inputwidgets/hbinput12keytouchkeypad.cpp Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,618 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbInput module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#include <QGraphicsGridLayout>
-#include <hbinputmethod.h>
-#include <hbinputkeymap.h>
-#include <hbinpututils.h>
-#include <hbframedrawer.h>
-#include <hbaction.h>
-#include "hbinputvkbwidget_p.h"
-#include "hbinput12keytouchkeypad.h"
-#include "hbinput12keytouchkeypad_p.h"
-#include "hbinputtouchkeypadbutton.h"
-
-const int HbVirtual12KeyNumberOfRows = 4;
-const int HbVirtual12KeyNumberOfColumn = 4;
-const int HbKey7Location = 6;
-const int HbKey9Location = 8;
-const qreal HbVirtual12KeyButtonPreferredHeight = 70.0;
-const QSizeF HbVirtual12KeyInitialLayoutDimensions(90.0, HbVirtual12KeyButtonPreferredHeight);
-const int HbButtonToKeyCodeTable[HbNum12KeypadBaseButtons] =
-{
- Qt::Key_1,
- Qt::Key_2,
- Qt::Key_3,
- Qt::Key_4,
- Qt::Key_5,
- Qt::Key_6,
- Qt::Key_7,
- Qt::Key_8,
- Qt::Key_9,
- Qt::Key_Asterisk,
- Qt::Key_0,
- Qt::Key_Shift,
- Qt::Key_Delete,
- Qt::Key_Control
-};
-
-const QString HbButtonObjName = "ITU ";
-const QString HbDelButtonObjName = "ITU delete";
-const QString HbCustomButtonObjName = "ITU custom button ";
-
-const QString Hb12KeyButtonTextLayout = "_hb_12key_button_text_layout";
-const QString Hb12KeyButtonIconLayout = "_hb_12key_button_icon_layout";
-const QString Hb12KeyButtonNumberLayout = "_hb_12key_button_number_layout";
-
-/*!
-@proto
-@hbinput
-\class Hb12KeyTouchKeypad
-\deprecated class Hb12KeyTouchKeypad
-\brief Touch keypad for 12 key ITU-T layout
-
-Implements touch key pad for 12 key ITU-T keypad. The key pad know how to operate
-in alphabet, numeric modes. it knows how to set up button titles according to
-given key map data object and it also supports editor specific custom buttons.
-
-\sa HbInputVkbWidget
-\sa HbTouchKeypadButton
-*/
-
-Hb12KeyTouchKeypadPrivate::Hb12KeyTouchKeypadPrivate()
-: mKeypadCreated(false),
-mKeymapChanged(false)
-{
-}
-
-int Hb12KeyTouchKeypadPrivate::keyCode(int buttonId)
-{
- return HbButtonToKeyCodeTable[buttonId];
-}
-
-Hb12KeyTouchKeypadPrivate::~Hb12KeyTouchKeypadPrivate()
-{
-}
-
-void Hb12KeyTouchKeypadPrivate::setKeyMappingTitle(int key, HbTouchKeypadButton* button, HbModifiers modifiers)
-{
- QString title;
-
- int numberOfCharacters = 3;
- if (key == HbKey7Location || key == HbKey9Location) {
- numberOfCharacters = 4;
- }
-
- QString keydata = mKeymap->keyboard(HbKeyboardVirtual12Key)->keys.at(key)->characters(modifiers);
-
- QChar numChr = findFirstNumberCharacterBoundToKey(key);
-
- if(mOwner && mOwner->focusObject()) {
- // First we filter all the data that is mapped to the button, then get the firt 3/4 allowed characters and set that string
- // as additionaltext to button.
- QString allowedData;
- mOwner->focusObject()->filterStringWithEditorFilter(keydata,allowedData);
- title.append(allowedData.left(numberOfCharacters));
- } else {
- title.append(keydata.left(numberOfCharacters));
- }
-
- button->setVisible(true);
- button->setText(QString(numChr));
- button->setAdditionalText(title);
- button->setProperty(HbStyleRulesCacheId::hbStyleRulesForNodeCache, Hb12KeyButtonTextLayout);
-}
-
-void Hb12KeyTouchKeypadPrivate::setKeyMappingTitleNumeric(int key, HbTouchKeypadButton* button, HbModifiers modifiers)
-{
- Q_UNUSED(modifiers);
- QChar numChr = findFirstNumberCharacterBoundToKey(key);
-
- if (numChr > 0) {
- button->setText(numChr);
- } else {
- button->setText(QString());
- }
- button->setAdditionalText(QString());
- button->setProperty(HbStyleRulesCacheId::hbStyleRulesForNodeCache, Hb12KeyButtonNumberLayout);
-}
-
-void Hb12KeyTouchKeypadPrivate::createKeypad()
-{
- Q_Q(Hb12KeyTouchKeypad);
- for (int i = 0; i < HbNum12KeypadBaseButtons; i++) {
- if (i == 13) {
- HbIcon icon("qtg_mono_sym_itut");
- mButtons[i] = new HbTouchKeypadButton(q, icon, textForKey(i), q);
- mButtons[i]->setProperty(HbStyleRulesCacheId::hbStyleRulesForNodeCache, Hb12KeyButtonIconLayout);
- } else if ( i == 12) {
- HbIcon icon("qtg_mono_backspace2");
- mButtons[i] = new HbTouchKeypadButton(q, icon, textForKey(i), q);
- mButtons[i]->setAutoRepeatDelay(HbRepeatTimeout);
- mButtons[i]->setAutoRepeatInterval(HbRepeatTimeoutShort);
- mButtons[i]->setAutoRepeat(true);
- mButtons[i]->setProperty(HbStyleRulesCacheId::hbStyleRulesForNodeCache, Hb12KeyButtonIconLayout);
- } else if (i == 11) {
- HbIcon icon("qtg_mono_shift");
- mButtons[i] = new HbTouchKeypadButton(q, icon, textForKey(i), q);
- } else {
- mButtons[i] = new HbTouchKeypadButton(q, textForKey(i), q);
- }
- mButtons[i]->setAdditionalText(additionalTextForKey(i));
- QObject::connect(mButtons[i], SIGNAL(pressed()), mPressMapper, SLOT(map()));
- QObject::connect(mButtons[i], SIGNAL(released()), mReleaseMapper, SLOT(map()));
- mPressMapper->setMapping(mButtons[i], i);
- mReleaseMapper->setMapping(mButtons[i], i);
- }
-
- QObject::connect(mPressMapper, SIGNAL(mapped(int)), q, SLOT(mappedKeyPress(int)));
- QObject::connect(mReleaseMapper, SIGNAL(mapped(int)), q, SLOT(mappedKeyRelease(int)));
-
- mKeypadCreated = true;
-}
-
-QString Hb12KeyTouchKeypadPrivate::textForKey(int key)
-{
- // Key 10 is 0-key on keypad, which is defined as the ninth key
- // Key nine is the star key, which has "+" mapped to it
- if (key == 10) {
- key = 9;
- } else if (key == 9) {
- return QString("+");
- } else if(key ==11) {
- return QString("#");
- }
- if (key >= mKeymap->keyboard(HbKeyboardVirtual12Key)->keys.count()) {
- return QString();
- }
- QChar numChr = findFirstNumberCharacterBoundToKey(key);
- if (!numChr.isNull()) {
- return QString(numChr);
- } else {
- return QString();
- }
-}
-
-QString Hb12KeyTouchKeypadPrivate::additionalTextForKey(int key)
-{
- // Key 10 is 0-key on keypad, which is defined as the ninth key
- // Key nine is the star key, "*" mapped to it
- if (key == 10) {
- key = 9;
- } else if (key == 9) {
- return QString("*");
- } else if (key == 11) {
- return QString();
- }
-
- if (key >= mKeymap->keyboard(HbKeyboardVirtual12Key)->keys.count()) {
- return QString();
- }
-
- if (mMode == EModeNumeric) {
- return QString();
- } else {
- QString title;
-
- int numberOfCharacters = 3;
- if (key == 6 || key == 8) {
- numberOfCharacters = 4;
- }
-
- QString keydata = mKeymap->keyboard(HbKeyboardVirtual12Key)->keys.at(key)->characters(mModifiers);
-
- title.append(keydata.left(numberOfCharacters));
-
- return title;
- }
-}
-
-int Hb12KeyTouchKeypadPrivate::keyCode(HbTouchKeypadButton *button)
-{
- int keycode = -1;
- for (int i = 0; i < HbNum12KeypadBaseButtons; i++) {
- if(button->text() == textForKey(i)) {
- keycode = i+1;
- break;
- }
- }
- return keycode;
-}
-
-void Hb12KeyTouchKeypadPrivate::createLayout()
-{
- Q_Q(Hb12KeyTouchKeypad);
-
- // The layout is already created. So just return.
- if ( mButtonLayout ) {
- return;
- }
-
- mButtonLayout = new QGraphicsGridLayout();
- q->setContentsMargins(0.0, 0.0, 0.0, 0.0);
- mButtonLayout->setContentsMargins(0.0, 0.0, 0.0, 0.0);
- mButtonLayout->setHorizontalSpacing(HorizontalSpacing);
- mButtonLayout->setVerticalSpacing(VerticalSpacing);
-
- mButtonLayout->addItem(mButtons[0], 0, 0); // key 1
- mButtonLayout->addItem(mButtons[1], 0, 1); // key 2
- mButtonLayout->addItem(mButtons[2], 0, 2); // key 3
- mButtonLayout->addItem(mButtons[12], 0, 3); // key delete
- mButtonLayout->addItem(mButtons[3], 1, 0); // key 4
- mButtonLayout->addItem(mButtons[4], 1, 1); // key 5
- mButtonLayout->addItem(mButtons[5], 1, 2); // key 6
- mButtonLayout->addItem(mButtons[6], 2, 0); // key 7
- mButtonLayout->addItem(mButtons[7], 2, 1); // key 8
- mButtonLayout->addItem(mButtons[8], 2, 2); // key 9
- mButtonLayout->addItem(mButtons[9], 3, 0); // key sym
- mButtonLayout->addItem(mButtons[10], 3, 1); // key 0
- mButtonLayout->addItem(mButtons[11], 3, 2); // key #
- mButtonLayout->addItem(mButtons[13], 1, 3); // key sym (second)
- mButtonLayout->addItem(mSettingsButton, 2, 3); // Settings key
- mButtonLayout->addItem(mApplicationButton, 3, 3); // Application specific key
-
- mButtons[0]->setObjectName(HbButtonObjName + "1,1");
- mButtons[1]->setObjectName(HbButtonObjName + "1,2");
- mButtons[2]->setObjectName(HbButtonObjName + "1,3");
- mButtons[3]->setObjectName(HbButtonObjName + "2,1");
- mButtons[4]->setObjectName(HbButtonObjName + "2,2");
- mButtons[5]->setObjectName(HbButtonObjName + "2,3");
- mButtons[6]->setObjectName(HbButtonObjName + "3,1");
- mButtons[7]->setObjectName(HbButtonObjName + "3,2");
- mButtons[8]->setObjectName(HbButtonObjName + "3,3");
- mButtons[9]->setObjectName(HbButtonObjName + "4,1");
- mButtons[10]->setObjectName(HbButtonObjName + "4,2");
- mButtons[11]->setObjectName(HbButtonObjName + "4,3");
- mButtons[12]->setObjectName(HbDelButtonObjName);
- mButtons[13]->setObjectName(HbCustomButtonObjName + QString::number(1));
- if (mSettingsButton) {
- mSettingsButton->setObjectName(HbCustomButtonObjName + QString::number(2));
- }
- if (mApplicationButton) {
- mApplicationButton->setObjectName(HbCustomButtonObjName + QString::number(3));
- }
-
- mButtons[12]->setButtonType(HbTouchKeypadButton::HbTouchButtonFunction);
- mButtons[11]->setButtonType(HbTouchKeypadButton::HbTouchButtonFunction);
- mButtons[9]->setButtonType(HbTouchKeypadButton::HbTouchButtonFunction);
- mButtons[13]->setButtonType(HbTouchKeypadButton::HbTouchButtonFunction);
- mButtons[12]->setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonReleased);
- mButtons[11]->setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonReleased);
- mButtons[9]->setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonReleased);
- mButtons[13]->setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonReleased);
-}
-
-/*!
-Apply editor constraints to the vkb
-*/
-void Hb12KeyTouchKeypadPrivate::applyEditorConstraints()
-{
- HbInputFocusObject *focusedObject = 0;
- if (mOwner) {
- focusedObject = mOwner->focusObject();
- }
-
- if(!focusedObject || isKeyboardDimmed()) {
- // dont need to apply constraints when keypad is dimmed.
- // applyEditorConstraints will be called from setKeyboardDimmed(false)
- return;
- }
-
- for (int i = 0; i < HbNum12KeypadBaseButtons ; i++) {
- if(Hb::ItemType_InputCharacterButton == mButtons[i]->type()) {
- bool disableButton = false;
- if(EModeNumeric == mMode){
- QString data = mButtons[i]->text();
- if (data.isEmpty() || !focusedObject->characterAllowedInEditor(data[0])) {
- disableButton = true;
- }
- } else if(EModeAbc == mMode) {
- if((mButtons[i]->additionalText()).isEmpty() ) {
- disableButton = true;
- }
- }
- mButtons[i]->setFade(disableButton);
- }
- }
-
- QString allowedSctCharacters;
- getAllowedSctCharcters(allowedSctCharacters);
- if (allowedSctCharacters.isNull() && (Qt::ImhDigitsOnly & focusedObject->inputMethodHints())) {
- mButtons[9]->setFade(true);
- mButtons[11]->setFade(true);
- mButtons[13]->setFade(true);
- }
- else if (Qt::ImhDialableCharactersOnly & focusedObject->inputMethodHints()) {
- mButtons[9]->setFade(false);
- mButtons[11]->setFade(false);
- mButtons[13]->setFade(true);
- }
- else {
- mButtons[9]->setFade(false);
- mButtons[11]->setFade(false);
- mButtons[13]->setFade(false);
- }
-}
-/*! returns first number character mapped bound to the key
-*/
-
-QChar Hb12KeyTouchKeypadPrivate::findFirstNumberCharacterBoundToKey(int key)
-{
- QChar numChr = 0;
- if (!mKeymap) {
- return numChr;
- }
-
- HbInputLanguage language = mKeymap->language();
- HbInputFocusObject *focusObject = 0;
-
- if (mOwner) {
- focusObject = mOwner->focusObject();
- }
- bool isNumericEditor = false;
-
- if (focusObject) {
- isNumericEditor = focusObject->editorInterface().isNumericEditor();
- }
-
- HbInputDigitType digitType = HbInputUtils::inputDigitType(language);
-
- if (language.language() != (QLocale::Language)0) {
- if (isNumericEditor) {
- QLocale::Language systemLanguage = QLocale::system().language();
- // show native digits only when the device language and writing language are same,
- // else show latin digits
- if (language.language() != systemLanguage) {
- digitType = HbDigitTypeLatin;
- }
- }
- numChr = HbInputUtils::findFirstNumberCharacterBoundToKey(mKeymap->keyboard(HbKeyboardVirtual12Key)->keys.at(key),
- language, digitType);
- }
- return numChr;
-}
-
-/*!
-Get the allowed sct Characters
-*/
-void Hb12KeyTouchKeypadPrivate::getAllowedSctCharcters(QString& allowedSctCharacters)
-{
- QString sctCharacters;
- if (mKeymap) {
- const HbKeyboardMap* keymap = mKeymap->keyboard(HbKeyboardSctPortrait);
- if (keymap == 0) {
- return;
- }
- foreach (const HbMappedKey* mappedKey, keymap->keys) {
- sctCharacters.append(mappedKey->characters(HbModifierNone));
- }
- }
- HbInputFocusObject* focusObject = mOwner->focusObject();
- QString tempAllowedSctCharacters;
- if (focusObject) {
- focusObject->filterStringWithEditorFilter(sctCharacters,tempAllowedSctCharacters);
- }
- allowedSctCharacters.clear();
- for(int i=0; i<tempAllowedSctCharacters.length() ;i++) {
- // dont add duplicates to the list
- if(!allowedSctCharacters.contains(tempAllowedSctCharacters[i])) {
- allowedSctCharacters.append(tempAllowedSctCharacters[i]);
- }
- }
-}
-
-/*!
-\deprecated Hb12KeyTouchKeypad::Hb12KeyTouchKeypad(HbInputMethod*, QGraphicsItem*)
- is deprecated.
-Constructs the object.
-*/
-Hb12KeyTouchKeypad::Hb12KeyTouchKeypad(HbInputMethod* aOwner,
- QGraphicsItem* aParent)
- : HbInputVkbWidget(*new Hb12KeyTouchKeypadPrivate, aParent)
-{
- if (0 == aOwner) {
- return;
- }
- Q_D(Hb12KeyTouchKeypad);
- d->q_ptr = this;
- d->mOwner = aOwner;
-}
-
-/*!
-\deprecated Hb12KeyTouchKeypad::keyboardType() const
- is deprecated.
-Returns keyboard type.
-*/
-HbKeyboardType Hb12KeyTouchKeypad::keyboardType() const
-{
- return HbKeyboardVirtual12Key;
-}
-
-/*!
-\deprecated Hb12KeyTouchKeypad::~Hb12KeyTouchKeypad()
- is deprecated.
-Destructs the object.
-*/
-Hb12KeyTouchKeypad::~Hb12KeyTouchKeypad()
-{
-}
-
-/*!
-\deprecated Hb12KeyTouchKeypad::mappedKeyPress(int)
- is deprecated.
-Handles virtual key press
-*/
-void Hb12KeyTouchKeypad::mappedKeyPress(int buttonid)
-{
- Q_D(Hb12KeyTouchKeypad);
- if(buttonid >= 0 && d->mButtons[buttonid] && !d->mButtons[buttonid]->isFaded()) {
- HbInputVkbWidget::mappedKeyPress(buttonid);
- }
-}
-
-/*!
-\deprecated Hb12KeyTouchKeypad::mappedKeyRelease(int)
- is deprecated.
-Handles virtual key release
-*/
-void Hb12KeyTouchKeypad::mappedKeyRelease(int buttonid)
-{
- Q_D(Hb12KeyTouchKeypad);
- if(buttonid >= 0 && d->mButtons[buttonid] && !d->mButtons[buttonid]->isFaded()) {
- HbInputVkbWidget::mappedKeyRelease(buttonid);
- }
-}
-/*!
-\deprecated Hb12KeyTouchKeypad::setMode(HbKeypadMode, QFlags<HbModifier>)
- is deprecated.
-Sets the keypad to given mode. Possible values are EModeAbc, EModeNumeric and EModeSct.
-*/
-void Hb12KeyTouchKeypad::setMode(HbKeypadMode mode, HbModifiers modifiers)
-{
- Q_D(Hb12KeyTouchKeypad);
- d->mModifiers = modifiers;
- d->mMode = mode;
-
- if (!d->mKeypadCreated) {
- d->createKeypad();
- setupToolCluster();
- d->createLayout();
- d->applyEditorConstraints();
- return;
- }
- setupToolCluster();
- if (mode == EModeNumeric) {
- d->setKeyMappingTitleNumeric(0, d->mButtons[0], 0);
- d->setKeyMappingTitleNumeric(1, d->mButtons[1], 0);
- d->setKeyMappingTitleNumeric(2, d->mButtons[2], 0);
- d->setKeyMappingTitleNumeric(3, d->mButtons[3], 0);
- d->setKeyMappingTitleNumeric(4, d->mButtons[4], 0);
- d->setKeyMappingTitleNumeric(5, d->mButtons[5], 0);
- d->setKeyMappingTitleNumeric(6, d->mButtons[6], 0);
- d->setKeyMappingTitleNumeric(7, d->mButtons[7], 0);
- d->setKeyMappingTitleNumeric(8, d->mButtons[8], 0);
- d->setKeyMappingTitleNumeric(9, d->mButtons[10], 0);
- } else {
- if (d->mKeymap) {
- d->setKeyMappingTitle(0, d->mButtons[0], d->mModifiers);
- d->setKeyMappingTitle(1, d->mButtons[1], d->mModifiers);
- d->setKeyMappingTitle(2, d->mButtons[2], d->mModifiers);
- d->setKeyMappingTitle(3, d->mButtons[3], d->mModifiers);
- d->setKeyMappingTitle(4, d->mButtons[4], d->mModifiers);
- d->setKeyMappingTitle(5, d->mButtons[5], d->mModifiers);
- d->setKeyMappingTitle(6, d->mButtons[6], d->mModifiers);
- d->setKeyMappingTitle(7, d->mButtons[7], d->mModifiers);
- d->setKeyMappingTitle(8, d->mButtons[8], d->mModifiers);
- d->setKeyMappingTitle(9, d->mButtons[10], d->mModifiers);
- } else {
- // Default fallback.
- d->mButtons[0]->setText(QString(".,!"));
- d->mButtons[1]->setText(QString("abc"));
- d->mButtons[2]->setText(QString("def"));
- d->mButtons[3]->setText(QString("ghi"));
- d->mButtons[4]->setText(QString("jkl"));
- d->mButtons[5]->setText(QString("mno"));
- d->mButtons[6]->setText(QString("pqrs"));
- d->mButtons[7]->setText(QString("tuv"));
- d->mButtons[8]->setText(QString("wxyz"));
- d->mButtons[10]->setText(QString("0_"));
- }
- }
-
- d->applyEditorConstraints();
-}
-
-/*!
-\reimp
-\deprecated Hb12KeyTouchKeypad::setKeymap(const HbKeymap*)
- is deprecated.
-*/
-void Hb12KeyTouchKeypad::setKeymap(const HbKeymap* keymap)
-{
- Q_D(Hb12KeyTouchKeypad);
- if (keymap) {
- d->mKeymap = keymap;
- d->mKeymapChanged = true;
- // let's change the button text depending on the new keymapping.
- HbInputState newState = d->mOwner->inputState();
- if (newState.textCase() == HbTextCaseUpper || newState.textCase() == HbTextCaseAutomatic) {
- setMode(d->mMode, HbModifierShiftPressed);
- } else {
- setMode(d->mMode, HbModifierNone);
- }
- d->mKeymapChanged = false;
- }
-}
-
-/*!
-\reimp
-\deprecated Hb12KeyTouchKeypad::aboutToOpen(HbVkbHost*)
- is deprecated.
-*/
-void Hb12KeyTouchKeypad::aboutToOpen(HbVkbHost *host)
-{
- Q_D(Hb12KeyTouchKeypad);
-
- HbInputVkbWidget::aboutToOpen(host);
-
- QSizeF keypadSize = keypadButtonAreaSize();
-
- keypadSize.setWidth(keypadSize.width() / (qreal)HbVirtual12KeyNumberOfColumn);
- keypadSize.setHeight(keypadSize.height() / (qreal)HbVirtual12KeyNumberOfRows);
-
- for (int i=0; i < 4 ;i++) {
- d->mButtonLayout->setColumnFixedWidth(i, keypadSize.width());
- d->mButtonLayout->setRowFixedHeight(i, keypadSize.height());
- }
-
- for (int i = 0; i < HbNum12KeypadBaseButtons; ++i) {
- d->mButtons[i]->setInitialSize(keypadSize);
- }
- if (d->mSettingsButton) {
- d->mSettingsButton->setInitialSize(keypadSize);
- }
- if (d->mApplicationButton) {
- d->mApplicationButton->setInitialSize(keypadSize);
- }
-
-}
-
-/*!
-\deprecated Hb12KeyTouchKeypad::initSctModeList()
- is deprecated. Sct mode list is not supported anymore.
-*/
-void Hb12KeyTouchKeypad::initSctModeList()
-{
-}
-
-/*!
-\deprecated Hb12KeyTouchKeypad::sctModeListClosed()
- is deprecated. Sct mode list is not supported anymore.
-*/
-void Hb12KeyTouchKeypad::sctModeListClosed()
-{
-}
-
-// End of file
--- a/src/hbinput/inputwidgets/hbinput12keytouchkeypad.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbInput module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#ifndef _HB_12KEY_TOUCH_KEYPAD_H
-#define _HB_12KEY_TOUCH_KEYPAD_H
-
-#include <hbinputdef.h>
-#include "hbinputvkbwidget.h"
-
-class QGraphicsItem;
-class Hb12KeyTouchKeypadPrivate;
-
-class HB_INPUT_EXPORT Hb12KeyTouchKeypad : public HbInputVkbWidget
-{
- Q_OBJECT
-
-public:
- Hb12KeyTouchKeypad(HbInputMethod* aOwner, QGraphicsItem* aParent = NULL);
- ~Hb12KeyTouchKeypad();
-
-public: // From HbVirtualKeyboard
- HbKeyboardType keyboardType() const;
- void aboutToOpen(HbVkbHost *host);
- void setMode(HbKeypadMode mode, HbModifiers modifiers);
- void setKeymap(const HbKeymap* keymap);
-
-protected: // From HbInputVkbWidget
- void initSctModeList();
-
-private:
- void applyEditorConstraints();
-
-public slots:
- void mappedKeyPress(int buttonid);
- void mappedKeyRelease(int buttonid);
-
-public slots:
- void sctModeListClosed();
-
-private:
- Q_DECLARE_PRIVATE_D(d_ptr, Hb12KeyTouchKeypad)
- Q_DISABLE_COPY(Hb12KeyTouchKeypad)
-};
-
-#endif // _HB_12KEY_TOUCH_KEYPAD_H
-
-// End of file
--- a/src/hbinput/inputwidgets/hbinput12keytouchkeypad_p.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbInput module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#ifndef HB_INPUT_12KEY_TOUCH_KEYPAD_PRIVATE_H
-#define HB_INPUT_12KEY_TOUCH_KEYPAD_PRIVATE_H
-
-//
-// W A R N I N G
-// -------------
-//
-// This file is not part of the Hb Inputs API. It exists purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <hbinput12keytouchkeypad.h>
-#include "hbinputvkbwidget_p.h"
-
-const int HbNum12KeypadBaseButtons = 14; // Normal ITU-T buttons + delete + sym
-
-class HB_INPUT_PRIVATE_EXPORT Hb12KeyTouchKeypadPrivate : public HbInputVkbWidgetPrivate
-{
- Q_DECLARE_PUBLIC(Hb12KeyTouchKeypad)
-
-public:
- Hb12KeyTouchKeypadPrivate();
- ~Hb12KeyTouchKeypadPrivate();
-
- int keyCode(int buttonId);
-
- void setKeyMappingTitle(int aKey, HbTouchKeypadButton* aButton, HbModifiers aModifiers);
- void setKeyMappingTitleNumeric(int aKey, HbTouchKeypadButton* aButton, HbModifiers aModifiers);
-
- void applyEditorConstraints();
- void getAllowedSctCharcters(QString& allowedSctCharacters);
-
- void createKeypad();
- void createLayout();
- QString textForKey(int key);
- QString additionalTextForKey(int key);
- int keyCode(HbTouchKeypadButton *button);
- QChar findFirstNumberCharacterBoundToKey(int key);
-public:
- HbTouchKeypadButton* mButtons[HbNum12KeypadBaseButtons];
- bool mKeypadCreated;
- bool mKeymapChanged;
-};
-
-#endif //HB_INPUT_12KEY_TOUCH_KEYPAD_PRIVATE_H
-
-// End of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbinput/inputwidgets/hbinputbutton.cpp Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,511 @@
+/****************************************************************************
+**
+** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (developer.feedback@nokia.com)
+**
+** This file is part of the HbInput module of the UI Extensions for Mobile.
+**
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at developer.feedback@nokia.com.
+**
+****************************************************************************/
+
+#include "hbinputbutton.h"
+
+/// @cond
+
+class HbInputButtonPrivate
+{
+public:
+ HbInputButtonPrivate();
+ HbInputButtonPrivate(int keyCode, const QPoint &position, const QSize &size);
+ HbInputButtonPrivate(HbInputButton::HbInputButtonType type, HbInputButton::HbInputButtonState state,
+ const QPoint &position, const QSize &size, int keyCode, bool autoRepeat,
+ const QList<QString> &texts, const QString &mappedCharacters, const QList<HbIcon> &icons);
+
+ void setDefaultGraphics(int keyCode);
+
+ HbInputButton::HbInputButtonType mType;
+ HbInputButton::HbInputButtonState mState;
+ QPoint mPosition;
+ QSize mSize;
+ int mKeyCode;
+ bool mAutoRepeat;
+ QList<QString> mTexts;
+ QString mMappedCharacters;
+ QList<HbIcon> mIcons;
+ QRectF mBoundingRect;
+};
+
+HbInputButtonPrivate::HbInputButtonPrivate()
+ : mType(HbInputButton::ButtonTypeNormal), mState(HbInputButton::ButtonStateReleased),
+ mPosition(0, 0), mSize(1, 1), mKeyCode(-1), mAutoRepeat(false)
+{
+ for (int i = 0; i < HbInputButton::ButtonTextIndexCount; ++i) {
+ mTexts.append("");
+ }
+
+ for (int i = 0; i < HbInputButton::ButtonIconIndexCount; ++i) {
+ mIcons.append(HbIcon());
+ }
+}
+
+HbInputButtonPrivate::HbInputButtonPrivate(int keyCode, const QPoint &position, const QSize &size)
+ : mType(HbInputButton::ButtonTypeNormal), mState(HbInputButton::ButtonStateReleased),
+ mPosition(position), mSize(size), mKeyCode(keyCode), mAutoRepeat(false)
+{
+ for (int i = 0; i < HbInputButton::ButtonTextIndexCount; ++i) {
+ mTexts.append("");
+ }
+
+ for (int i = 0; i < HbInputButton::ButtonIconIndexCount; ++i) {
+ mIcons.append(HbIcon());
+ }
+
+ if (keyCode != HbInputButton::ButtonKeyCodeCharacter) {
+ mType = HbInputButton::ButtonTypeFunction;
+ }
+
+ setDefaultGraphics(keyCode);
+
+ if (mSize.width() < 1) {
+ mSize.setWidth(1);
+ }
+ if (mSize.height() < 1) {
+ mSize.setHeight(1);
+ }
+
+ if (mKeyCode == HbInputButton::ButtonKeyCodeDelete || mKeyCode == HbInputButton::ButtonKeyCodeSpace) {
+ mAutoRepeat = true;
+ }
+}
+
+HbInputButtonPrivate::HbInputButtonPrivate(HbInputButton::HbInputButtonType type, HbInputButton::HbInputButtonState state,
+ const QPoint &position, const QSize &size, int keyCode, bool autoRepeat,
+ const QList<QString> &texts, const QString &mappedCharacters, const QList<HbIcon> &icons)
+ : mType(type), mState(state), mPosition(position), mSize(size), mKeyCode(keyCode), mAutoRepeat(autoRepeat),
+ mMappedCharacters(mappedCharacters)
+{
+ for (int i = 0; i < HbInputButton::ButtonTextIndexCount; ++i) {
+ if (i < texts.count()) {
+ mTexts.append(texts.at(i));
+ } else {
+ mTexts.append(QString());
+ }
+ }
+
+ for (int i = 0; i < HbInputButton::ButtonIconIndexCount; ++i) {
+ if (i < icons.count()) {
+ mIcons.append(icons.at(i));
+ } else {
+ mIcons.append(HbIcon());
+ }
+ }
+
+ if (mSize.width() < 1) {
+ mSize.setWidth(1);
+ }
+ if (mSize.height() < 1) {
+ mSize.setHeight(1);
+ }
+}
+
+void HbInputButtonPrivate::setDefaultGraphics(int keyCode)
+{
+ if (keyCode == HbInputButton::ButtonKeyCodeDelete) {
+ mIcons.replace(HbInputButton::ButtonTextIndexPrimary, HbIcon(HbInputButtonIconDelete));
+ } else if (keyCode == HbInputButton::ButtonKeyCodeShift) {
+ mIcons.replace(HbInputButton::ButtonTextIndexPrimary, HbIcon(HbInputButtonIconShift));
+ } else if (keyCode == HbInputButton::ButtonKeyCodeSymbol) {
+ mIcons.replace(HbInputButton::ButtonTextIndexPrimary, HbIcon(HbInputButtonIconSymbol));
+ } else if (keyCode == HbInputButton::ButtonKeyCodeEnter) {
+ mIcons.replace(HbInputButton::ButtonTextIndexPrimary, HbIcon(HbInputButtonIconEnter));
+ } else if (keyCode == HbInputButton::ButtonKeyCodeSpace) {
+ mIcons.replace(HbInputButton::ButtonTextIndexPrimary, HbIcon(HbInputButtonIconSpace));
+ } else if (keyCode == HbInputButton::ButtonKeyCodeAlphabet) {
+ mIcons.replace(HbInputButton::ButtonTextIndexPrimary, HbIcon(HbInputButtonIconAlphabet));
+ } else if (keyCode == HbInputButton::ButtonKeyCodePageChange) {
+ mIcons.replace(HbInputButton::ButtonTextIndexPrimary, HbIcon(HbInputButtonIconPageChange));
+ } else if (keyCode == HbInputButton::ButtonKeyCodeSmiley) {
+ mIcons.replace(HbInputButton::ButtonTextIndexPrimary, HbIcon(HbInputButtonIconSmiley));
+ }
+}
+
+/// @endcond
+
+/*!
+Constructor
+*/
+HbInputButton::HbInputButton()
+ : d_ptr(new HbInputButtonPrivate)
+{
+}
+
+/*!
+Constructor
+
+keyCode should usually be one of HbInputButtonKeyCode values, but it can also be any other
+integer value.
+position is button's position in grid cell units.
+size is button's size in grid cell units.
+*/
+HbInputButton::HbInputButton(int keyCode, const QPoint &position, const QSize &size)
+ : d_ptr(new HbInputButtonPrivate(keyCode, position, size))
+{
+}
+
+/*!
+Destructor
+*/
+HbInputButton::~HbInputButton()
+{
+ delete d_ptr;
+}
+
+/*!
+Updates buttons type.
+
+\sa type
+*/
+void HbInputButton::setType(HbInputButtonType type)
+{
+ Q_D(HbInputButton);
+
+ d->mType = type;
+}
+
+/*!
+Returns buttons type.
+
+\sa setType
+*/
+HbInputButton::HbInputButtonType HbInputButton::type() const
+{
+ Q_D(const HbInputButton);
+
+ return d->mType;
+}
+
+/*!
+Updates buttons state.
+
+\sa state
+*/
+void HbInputButton::setState(HbInputButtonState state)
+{
+ Q_D(HbInputButton);
+
+ d->mState = state;
+}
+
+/*!
+Returns buttons state.
+
+\sa setState
+*/
+HbInputButton::HbInputButtonState HbInputButton::state() const
+{
+ Q_D(const HbInputButton);
+
+ return d->mState;
+}
+
+/*!
+Updates buttons position.
+
+position is button's position in grid cell units.
+
+\sa position
+*/
+void HbInputButton::setPosition(const QPoint &position)
+{
+ Q_D(HbInputButton);
+
+ d->mPosition = position;
+}
+
+/*!
+Returns buttons position.
+
+\sa setPosition
+*/
+QPoint HbInputButton::position() const
+{
+ Q_D(const HbInputButton);
+
+ return d->mPosition;
+}
+
+/*!
+Updates buttons size.
+
+size is button's size in grid cell units.
+
+\sa size
+*/
+void HbInputButton::setSize(const QSize &size)
+{
+ Q_D(HbInputButton);
+
+ d->mSize = size;
+}
+
+/*!
+Returns buttons size.
+
+\sa setSize
+*/
+QSize HbInputButton::size() const
+{
+ Q_D(const HbInputButton);
+
+ return d->mSize;
+}
+
+/*!
+Updates buttons key code.
+
+\sa keyCode
+*/
+void HbInputButton::setKeyCode(int keyCode)
+{
+ Q_D(HbInputButton);
+
+ d->mKeyCode = keyCode;
+}
+
+/*!
+Returns buttons key code.
+
+\sa setKeyCode
+*/
+int HbInputButton::keyCode() const
+{
+ Q_D(const HbInputButton);
+
+ return d->mKeyCode;
+}
+
+/*!
+Updates buttons auto repeat status.
+
+\sa autoRepeat
+*/
+void HbInputButton::setAutoRepeat(bool autoRepeat)
+{
+ Q_D(HbInputButton);
+
+ d->mAutoRepeat = autoRepeat;
+}
+
+/*!
+Returns buttons auto repeat status.
+
+\sa setAutoRepeat
+*/
+bool HbInputButton::autoRepeat() const
+{
+ Q_D(const HbInputButton);
+
+ return d->mAutoRepeat;
+}
+
+/*!
+Updates specified button text.
+
+\sa setTexts
+\sa text
+\sa texts
+*/
+void HbInputButton::setText(const QString &text, HbInputButtonTextIndex index)
+{
+ Q_D(HbInputButton);
+
+ if (index >= 0 && index < ButtonTextIndexCount) {
+ d->mTexts.replace(index, text);
+ }
+}
+
+/*!
+Updates all button texts.
+Button can have three different texts. Text position and size
+will depend of other buttons texts and icons. If list contains
+more strings, then the rest will be ignored. Icon with same index
+than text will override the text.
+
+\sa text
+\sa texts
+*/
+void HbInputButton::setTexts(const QList<QString> &texts)
+{
+ Q_D(HbInputButton);
+
+ for (int i = 0; i < ButtonTextIndexCount; ++i) {
+ if (i < texts.count()) {
+ d->mTexts.replace(i, texts.at(i));
+ } else {
+ d->mTexts.replace(i, QString());
+ }
+ }
+}
+
+/*!
+Returns specified button text.
+
+\sa setText
+\sa setTexts
+*/
+QString HbInputButton::text(HbInputButtonTextIndex index) const
+{
+ Q_D(const HbInputButton);
+
+ if (index < 0 || index >= ButtonTextIndexCount) {
+ return QString();
+ }
+
+ return d->mTexts.at(index);
+}
+
+/*!
+Returns all button texts.
+
+\sa setText
+\sa setTexts
+*/
+QList<QString> HbInputButton::texts() const
+{
+ Q_D(const HbInputButton);
+
+ return d->mTexts;
+}
+
+/*!
+Updates characters that are mapped to this button.
+
+\sa mappedCharacters
+*/
+void HbInputButton::setMappedCharacters(const QString &mappedCharacters)
+{
+ Q_D(HbInputButton);
+
+ d->mMappedCharacters = mappedCharacters;
+}
+
+/*!
+Returns characters that are mapped to this button.
+
+\sa setMappedCharacters
+*/
+QString HbInputButton::mappedCharacters() const
+{
+ Q_D(const HbInputButton);
+
+ return d->mMappedCharacters;
+}
+
+/*!
+Updates specified button icon.
+
+\sa setIcons
+\sa icon
+\sa icons
+*/
+void HbInputButton::setIcon(const HbIcon &icon, HbInputButtonIconIndex index)
+{
+ Q_D(HbInputButton);
+
+ if (index >= 0 && index < ButtonIconIndexCount) {
+ d->mIcons.replace(index, icon);
+ }
+}
+
+/*!
+Updates all button icons.
+Button can have three different icons. Icon position
+will depend of other buttons icons and texts. If list contains
+more icons, then the rest will be ignored. Icon with same index
+than text will override the text.
+
+\sa icon
+\sa icons
+*/
+void HbInputButton::setIcons(const QList<HbIcon> &icons)
+{
+ Q_D(HbInputButton);
+
+ for (int i = 0; i < ButtonIconIndexCount; ++i) {
+ if (i < icons.count()) {
+ d->mIcons.replace(i, icons.at(i));
+ } else {
+ d->mIcons.replace(i, HbIcon());
+ }
+ }
+}
+
+/*!
+Returns specified button icon.
+
+\sa setIcon
+\sa setIcons
+*/
+HbIcon HbInputButton::icon(HbInputButtonIconIndex index) const
+{
+ Q_D(const HbInputButton);
+
+ if (index < 0 || index >= ButtonIconIndexCount) {
+ return HbIcon();
+ }
+ return d->mIcons.at(index);
+}
+
+/*!
+Returns all button icon.
+
+\sa setIcon
+\sa setIcons
+*/
+QList<HbIcon> HbInputButton::icons() const
+{
+ Q_D(const HbInputButton);
+
+ return d->mIcons;
+}
+
+/*!
+Updates buttons bounding rectangle.
+
+\sa boundingRect
+*/
+void HbInputButton::setBoundingRect(const QRectF &rect)
+{
+ Q_D(HbInputButton);
+
+ d->mBoundingRect = rect;
+}
+
+/*!
+Returns buttons bounding rectangle.
+
+\sa setBoundingRect
+*/
+QRectF HbInputButton::boundingRect() const
+{
+ Q_D(const HbInputButton);
+
+ return d->mBoundingRect;
+}
+
+// End of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbinput/inputwidgets/hbinputbutton.h Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,164 @@
+/****************************************************************************
+**
+** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (developer.feedback@nokia.com)
+**
+** This file is part of the HbInput module of the UI Extensions for Mobile.
+**
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at developer.feedback@nokia.com.
+**
+****************************************************************************/
+
+#ifndef HB_INPUT_BUTTON_H
+#define HB_INPUT_BUTTON_H
+
+#include <QObject>
+#include <QPoint>
+#include <QSize>
+#include <QString>
+
+#include <hbicon.h>
+#include <hbinputdef.h>
+
+class HbInputButtonPrivate;
+
+const QString HbInputButtonIconDelete("qtg_mono_backspace1");
+const QString HbInputButtonIconDelete2("qtg_mono_backspace2");
+const QString HbInputButtonIconShift("qtg_mono_shift");
+const QString HbInputButtonIconSymbol("qtg_mono_sym_qwerty");
+const QString HbInputButtonIconSymbol2("qtg_mono_sym_itut");
+const QString HbInputButtonIconEnter("qtg_mono_enter");
+const QString HbInputButtonIconSpace("qtg_mono_space_vkb");
+const QString HbInputButtonIconSpace2("qtg_mono_space_itut");
+const QString HbInputButtonIconAlphabet("qtg_mono_alpha_mode");
+const QString HbInputButtonIconPageChange("qtg_mono_special_characters_qwerty");
+const QString HbInputButtonIconPageChange2("qtg_mono_special_characters_itut");
+const QString HbInputButtonIconSmiley("qtg_mono_smiley");
+
+class HB_INPUT_EXPORT HbInputButton : public QObject
+{
+ Q_OBJECT
+
+ Q_ENUMS(HbInputButtonType ButtonType)
+ Q_ENUMS(HbInputButtonState ButtonState)
+ Q_PROPERTY(HbInputButton::HbInputButtonType buttonType READ type WRITE setType)
+ Q_PROPERTY(HbInputButton::HbInputButtonState buttonState READ state WRITE setState)
+ Q_PROPERTY(QPoint position READ position WRITE setPosition)
+ Q_PROPERTY(QSize size READ size WRITE setSize)
+ Q_PROPERTY(int keyCode READ keyCode WRITE setKeyCode)
+ Q_PROPERTY(bool autoRepeat READ autoRepeat WRITE setAutoRepeat)
+ Q_PROPERTY(QList<QString> texts READ texts WRITE setTexts)
+ Q_PROPERTY(QString mappedCharacters READ mappedCharacters WRITE setMappedCharacters)
+ Q_PROPERTY(QList<HbIcon> icons READ icons WRITE setIcons)
+ Q_PROPERTY(QRectF boundingRect READ boundingRect WRITE setBoundingRect)
+
+public:
+ enum HbInputButtonKeyCode {
+ ButtonKeyCodeDelete = Qt::Key_Delete,
+ ButtonKeyCodeSpace = Qt::Key_Space,
+ ButtonKeyCodeAsterisk = Qt::Key_Asterisk,
+ ButtonKeyCodeShift = Qt::Key_Shift,
+ ButtonKeyCodeControl = Qt::Key_Control,
+ ButtonKeyCodeEnter = Qt::Key_Enter,
+ ButtonKeyCodeCharacter = Qt::Key_unknown + 1,
+ ButtonKeyCodeSymbol,
+ ButtonKeyCodeAlphabet,
+ ButtonKeyCodeSmiley,
+ ButtonKeyCodePageChange,
+ ButtonKeyCodeSettings,
+ ButtonKeyCodeCustom
+ };
+
+ enum HbInputButtonType {
+ ButtonTypeNormal,
+ ButtonTypeFunction,
+ ButtonTypeLabel,
+ ButtonTypeCount
+ };
+
+ enum HbInputButtonState {
+ ButtonStateReleased,
+ ButtonStatePressed,
+ ButtonStateLatched,
+ ButtonStateDisabled,
+ ButtonStateCount
+ };
+
+ enum HbInputButtonTextIndex {
+ ButtonTextIndexPrimary,
+ ButtonTextIndexSecondaryFirstRow,
+ ButtonTextIndexSecondarySecondRow,
+ ButtonTextIndexCount
+ };
+
+ enum HbInputButtonIconIndex {
+ ButtonIconIndexPrimary,
+ ButtonIconIndexSecondaryFirstRow,
+ ButtonIconIndexSecondarySecondRow,
+ ButtonIconIndexCount
+ };
+
+ HbInputButton();
+ HbInputButton(int keyCode, const QPoint &position, const QSize &size = QSize(1, 1));
+
+ ~HbInputButton();
+
+ void setType(HbInputButtonType type);
+ HbInputButtonType type() const;
+
+ void setState(HbInputButtonState state);
+ HbInputButtonState state() const;
+
+ void setPosition(const QPoint &position);
+ QPoint position() const;
+
+ void setSize(const QSize &size);
+ QSize size() const;
+
+ void setKeyCode(int keyCode);
+ int keyCode() const;
+
+ void setAutoRepeat(bool autoRepeat);
+ bool autoRepeat() const;
+
+ void setText(const QString &text, HbInputButtonTextIndex index);
+ void setTexts(const QList<QString> &texts);
+ QString text(HbInputButtonTextIndex index) const;
+ QList<QString> texts() const;
+
+ void setMappedCharacters(const QString &mappedCharacters);
+ QString mappedCharacters() const;
+
+ void setIcon(const HbIcon &icon, HbInputButtonIconIndex index);
+ void setIcons(const QList<HbIcon> &icons);
+ HbIcon icon(HbInputButtonIconIndex index) const;
+ QList<HbIcon> icons() const;
+
+ void setBoundingRect(const QRectF &rect);
+ QRectF boundingRect() const;
+
+protected:
+ HbInputButtonPrivate * const d_ptr;
+
+private:
+ Q_DECLARE_PRIVATE_D(d_ptr, HbInputButton)
+ Q_DISABLE_COPY(HbInputButton)
+};
+
+#endif // HB_INPUT_BUTTON_H
+
+// End of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbinput/inputwidgets/hbinputbuttongroup.cpp Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,1764 @@
+/****************************************************************************
+**
+** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (developer.feedback@nokia.com)
+**
+** This file is part of the HbInput module of the UI Extensions for Mobile.
+**
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at developer.feedback@nokia.com.
+**
+****************************************************************************/
+
+#include <QPainter>
+#include <QTextLayout>
+#include <QGraphicsSceneMouseEvent>
+#include <QTouchEvent>
+#include <QTimer>
+#include <QGraphicsDropShadowEffect>
+
+#include <hbmainwindow.h>
+#include <hbaction.h>
+#include <hbevent.h>
+#include <hbcolorscheme.h>
+#include <hbdialog.h>
+#include <hbframeitem.h>
+#include <hbwidgetfeedback.h>
+#include <hbdeviceprofile.h>
+#include "hbframedrawerpool_p.h"
+
+#include "hbinputbuttongroup.h"
+#include "hbinputbuttongroup_p.h"
+#include "hbinputbutton.h"
+
+/// @cond
+
+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 HbFunctionInActiveBackground("qtg_fr_input_btn_function_disabled");
+const QString HbFunctionLatchedBackground("qtg_fr_input_btn_function_latched");
+
+const QString HbPreviewBackground("qtg_fr_character_preview");
+
+const QString HbNormalColor("qtc_input_button_normal");
+const QString HbNormalColorPressed("qtc_input_button_pressed");
+const QString HbNormalColorInActive("qtc_input_button_disabled");
+const QString HbNormalColorLatched("qtc_input_button_latched");
+
+const QString HbFunctionColor("qtc_input_function_normal");
+const QString HbFunctionColorPressed("qtc_input_function_pressed");
+const QString HbFunctionColorInActive("qtc_input_function_disabled");
+const QString HbFunctionColorLatched("qtc_input_function_latched");
+
+const QString HbButtonPreviewColor("qtc_input_preview_normal");
+const QString HbCharacterSelectionPreviewColor("qtc_input_button_accented_normal");
+
+const int HbLongPressTimeout = 600;
+const int HbAutoRepeatTimeout = 100;
+
+const int HbTextTypeCount = HbInputButton::ButtonTypeCount * HbInputButton::ButtonStateCount;
+const int HbTextLayoutCount = HbTextTypeCount * 3;
+
+const qreal HbTextSizeInUnits = 5.75;
+const qreal HbPrimaryTextSizeInUnits = 5.37;
+const qreal HbSecondaryTextSizeInUnits = 3.36;
+const qreal HbLabelTextSizeInUnits = 9;
+const qreal HbPrimaryIconSizeInUnits = 5;
+const qreal HbSecondaryIconSizeInUnits = 3.36;
+const qreal HbHorizontalMarginInUnits = 0.75;
+const qreal HbVerticalMarginInUnits = 1.14;
+const qreal HbPreviewWidthInUnits = 10;
+const qreal HbPreviewHeightInUnits = 16;
+const qreal HbPreviewMarginInUnits = 3;
+
+const qreal HbTouchAreaSizeInUnits = 8;
+
+HbInputButtonGroupPrivate::HbInputButtonGroupPrivate()
+ : mUnitValue(0), mGridSize(1, 1), mButtonBorderSize(1.0), mEnabled(true),
+ mButtonPreviewEnabled(false), mCharacterSelectionPreviewEnabled(false),
+ mMultiTouchEnabled(true), mCharacterSelectionPreview(0), mBackground(0)
+{
+ for (int i = 0; i < HbTextLayoutCount; ++i) {
+ mTextLayouts.append(0);
+ }
+
+ updateColorArray();
+}
+
+HbInputButtonGroupPrivate::~HbInputButtonGroupPrivate()
+{
+ foreach(HbFrameDrawer *drawer, mButtonDrawers) {
+ HbFrameDrawerPool::release(drawer);
+ }
+
+ foreach (HbInputButton *button, mButtonData) {
+ delete button;
+ }
+ mButtonData.clear();
+
+ foreach (QTextLayout *layout, mTextLayouts) {
+ delete layout;
+ }
+
+ foreach (QTimer *timer, mLongPressTimers) {
+ delete timer;
+ }
+
+ delete mCharacterSelectionPreview;
+
+ HbFrameDrawerPool::release(mBackground);
+}
+
+void HbInputButtonGroupPrivate::updateGraphics(const QSizeF &size)
+{
+ if (!size.width() && !size.height()) {
+ return;
+ }
+
+ qreal cellWidth = size.width() / mGridSize.width();
+ qreal cellHeight = size.height() / mGridSize.height();
+
+ for (int i = 0; i < mButtonData.count(); ++i) {
+ HbInputButton *item = mButtonData.at(i);
+
+ qreal width = cellWidth * item->size().width() - 2 * mButtonBorderSize;
+ qreal height = cellHeight * item->size().height() - 2 * mButtonBorderSize;
+ QSizeF frameSize = QSizeF(width, height);
+ HbFrameDrawer *drawer = 0;
+ QColor color;
+ if (mEnabled) {
+ drawer = HbFrameDrawerPool::get(buttonGraphics(item->type(), item->state()), HbFrameDrawer::NinePieces, frameSize);
+ color = mColors.at(item->type() * HbInputButton::ButtonStateCount + item->state());
+ } else {
+ drawer = HbFrameDrawerPool::get(buttonGraphics(item->type(), HbInputButton::ButtonStateDisabled), HbFrameDrawer::NinePieces, frameSize);
+ color = mColors.at(item->type() * HbInputButton::ButtonStateCount + HbInputButton::ButtonStateDisabled);
+ }
+
+ if (i < mButtonDrawers.count()) {
+ if (drawer != mButtonDrawers.at(i)) {
+ HbFrameDrawerPool::release(mButtonDrawers.at(i));
+ mButtonDrawers.replace(i, drawer);
+ }
+ } else {
+ mButtonDrawers.append(drawer);
+ }
+
+ QList<HbIcon> icons = item->icons();
+ for (int i = 0; i < icons.count(); ++i) {
+ if (!icons.at(i).isNull()) {
+ icons[i].setColor(color);
+ }
+ }
+ item->setIcons(icons);
+ }
+
+ for (int i = mButtonDrawers.count() - 1; i >= mButtonData.count(); --i) {
+ HbFrameDrawerPool::release(mButtonDrawers.at(i));
+ mButtonDrawers.removeAt(i);
+ }
+}
+
+void HbInputButtonGroupPrivate::updateTextLayouts(const QSizeF &size)
+{
+ if (!size.width() && !size.height()) {
+ return;
+ }
+
+ QHash<int, QString> textContent;
+ for (int i = 0; i < HbTextLayoutCount; ++i) {
+ delete mTextLayouts[i];
+ mTextLayouts[i] = 0;
+ }
+
+ // Sort different button texts to correct text content based on the
+ // button type and state
+ for (int i = 0; i < mButtonData.count(); ++i) {
+ HbInputButton *item = mButtonData.at(i);
+
+ int index = item->type() * HbInputButton::ButtonStateCount + item->state();
+ if (!mEnabled) {
+ index = item->type() * HbInputButton::ButtonStateCount + HbInputButton::ButtonStateDisabled;
+ }
+
+ if (!item->text(HbInputButton::ButtonTextIndexPrimary).isEmpty() &&
+ item->icon(HbInputButton::ButtonIconIndexPrimary).isNull()) {
+ int primaryIndex = index;
+ if (item->text(HbInputButton::ButtonTextIndexSecondaryFirstRow).isEmpty() &&
+ item->icon(HbInputButton::ButtonIconIndexSecondaryFirstRow).isNull() &&
+ item->text(HbInputButton::ButtonTextIndexSecondarySecondRow).isEmpty() &&
+ item->icon(HbInputButton::ButtonIconIndexSecondarySecondRow).isNull()) {
+ primaryIndex += HbTextTypeCount;
+ }
+ textContent[primaryIndex] += item->text(HbInputButton::ButtonTextIndexPrimary);
+ textContent[primaryIndex] += QChar(QChar::LineSeparator);
+ }
+
+ index += HbTextTypeCount * 2;
+
+ if (!item->text(HbInputButton::ButtonTextIndexSecondaryFirstRow).isEmpty() &&
+ item->icon(HbInputButton::ButtonIconIndexSecondaryFirstRow).isNull()) {
+ textContent[index] += item->text(HbInputButton::ButtonTextIndexSecondaryFirstRow);
+ textContent[index] += QChar(QChar::LineSeparator);
+ }
+
+ if (!item->text(HbInputButton::ButtonTextIndexSecondarySecondRow).isEmpty() &&
+ item->icon(HbInputButton::ButtonIconIndexSecondarySecondRow).isNull()) {
+ textContent[index] += item->text(HbInputButton::ButtonTextIndexSecondarySecondRow);
+ textContent[index] += QChar(QChar::LineSeparator);
+ }
+ }
+
+ // Create text layouts for each text content
+ for (int index = 0; index < HbTextLayoutCount; ++index) {
+ if (textContent.contains(index)) {
+ int textIndex = index / HbTextTypeCount;
+ if (textIndex == 0) {
+ createPrimaryTextLayout(index, textContent, size);
+ } else if (textIndex == 1) {
+ createPrimarySingleTextLayout(index, textContent, size);
+ } else {
+ createSecondaryTextLayout(index, textContent, size);
+ }
+ }
+ }
+}
+
+void HbInputButtonGroupPrivate::updateCustomActions()
+{
+ for (int i = 0; i < mUsedCustomButtons.count(); ++i) {
+ if (i < mButtonData.count()) {
+ HbInputButton *item = mButtonData.at(mUsedCustomButtons.at(i));
+
+ item->setIcon(HbIcon(), HbInputButton::ButtonIconIndexPrimary);
+ item->setText(QString(), HbInputButton::ButtonTextIndexPrimary);
+ item->setText(QString(), HbInputButton::ButtonTextIndexSecondaryFirstRow);
+ item->setText(QString(), HbInputButton::ButtonTextIndexSecondarySecondRow);
+ item->setState(HbInputButton::ButtonStateReleased);
+ }
+ }
+ mUsedCustomButtons.clear();
+
+ for (int i = 0; i < mButtonData.count(); ++i) {
+ HbInputButton *item = mButtonData.at(i);
+
+ int actionIndex = item->keyCode() - HbInputButton::ButtonKeyCodeCustom;
+
+ if (actionIndex >= 0 && actionIndex < mCustomActions.count()) {
+ item->setIcon(mCustomActions.at(actionIndex)->icon(), HbInputButton::ButtonIconIndexPrimary);
+ if (!mCustomActions.at(actionIndex)->isEnabled()) {
+ item->setState(HbInputButton::ButtonStateDisabled);
+ }
+ mUsedCustomButtons.append(i);
+ }
+ }
+}
+
+void HbInputButtonGroupPrivate::updateButtonGrid(const QSizeF &size)
+{
+ mButtonGridPositions.clear();
+
+ if (!size.width() && !size.height()) {
+ return;
+ }
+
+ qreal cellWidth = size.width() / mGridSize.width();
+ qreal cellHeight = size.height() / mGridSize.height();
+
+ for (int i = 0; i < mButtonData.count(); ++i) {
+ HbInputButton *item = mButtonData.at(i);
+
+ for (int y = 0; y < item->size().height(); ++y) {
+ for (int x = 0; x < item->size().width(); ++x) {
+ QPair<int, int> position = QPair<int, int>(item->position().x() + x, item->position().y() + y);
+ mButtonGridPositions.insert(position, i);
+ }
+ }
+ QRectF rect = QRectF(item->position().x() * cellWidth, item->position().y() * cellHeight,
+ item->size().width() * cellWidth, item->size().height() * cellHeight);
+ item->setBoundingRect(rect);
+ }
+}
+
+void HbInputButtonGroupPrivate::updateColorArray()
+{
+ mColors.clear();
+ for (int i = 0; i < HbTextTypeCount; ++i) {
+ HbInputButton::HbInputButtonType type = static_cast<HbInputButton::HbInputButtonType>(i / HbInputButton::ButtonStateCount);
+ HbInputButton::HbInputButtonState state = static_cast<HbInputButton::HbInputButtonState>(i % HbInputButton::ButtonStateCount);
+ mColors.append(HbColorScheme::color(buttonColor(type, state)));
+ }
+}
+
+void HbInputButtonGroupPrivate::showButtonPreview(HbInputButton * const item)
+{
+ Q_Q(HbInputButtonGroup);
+
+ int index = mButtonData.indexOf(item);
+ if (mButtonPreviewEnabled && item->type() != HbInputButton::ButtonTypeFunction &&
+ !mButtonPreview.contains(index)) {
+ HbInputButtonGroup *group = new HbInputButtonGroup(QSize(1, 1), q);
+ mButtonPreview.insert(index, group);
+
+ QList<HbInputButton*> buttons;
+ HbInputButton *previewItem = new HbInputButton(item->text(HbInputButton::ButtonTextIndexPrimary).at(0).unicode(), QPoint(0, 0));
+ previewItem->setType(HbInputButton::ButtonTypeLabel);
+ previewItem->setText(item->text(HbInputButton::ButtonTextIndexPrimary), HbInputButton::ButtonTextIndexPrimary);
+ buttons.append(previewItem);
+ group->setButtons(buttons);
+
+ qreal cellWidth = q->boundingRect().width() / mGridSize.width();
+ qreal cellHeight = q->boundingRect().height() / mGridSize.height();
+
+ QFont font = HbFontSpec(HbFontSpec::Primary).font();
+ font.setPixelSize(fontSize(ButtonTextTypeLabel));
+ QFontMetricsF fontMetrics(font);
+ qreal textWidth = fontMetrics.width(item->text(HbInputButton::ButtonTextIndexPrimary));
+
+ qreal width = textWidth + HbPreviewMarginInUnits * mUnitValue;
+ 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;
+ if (x < 0) {
+ x = 0;
+ } else if (x + width > q->boundingRect().width()) {
+ x = q->boundingRect().width() - width;
+ }
+ qreal y = item->position().y() * cellHeight - height;
+ group->setGeometry(QRectF(x, y, width, height));
+ if (q->parentItem()) {
+ group->setZValue(q->parentItem()->zValue() + 1);
+ }
+
+ QGraphicsDropShadowEffect *effect = new QGraphicsDropShadowEffect;
+ effect->setBlurRadius(8);
+ group->setGraphicsEffect(effect);
+
+ group->setButtonBorderSize(0);
+ HbFrameDrawer *drawer = HbFrameDrawerPool::get(HbPreviewBackground, HbFrameDrawer::ThreePiecesHorizontal, QSizeF(width, height));
+ drawer->setFillWholeRect(true);
+ group->setBackground(drawer);
+ q->mainWindow()->scene()->addItem(group);
+ }
+}
+
+void HbInputButtonGroupPrivate::hideButtonPreview(HbInputButton * const item)
+{
+ int index = mButtonData.indexOf(item);
+ if (mButtonPreview.contains(index)) {
+ delete mButtonPreview.take(index);
+ }
+}
+
+void HbInputButtonGroupPrivate::showCharacterSelectionPreview(HbInputButton * const item)
+{
+ Q_Q(HbInputButtonGroup);
+
+ if (mCharacterSelectionPreviewEnabled && item->type() != HbInputButton::ButtonTypeFunction &&
+ item->mappedCharacters().count() > 1) {
+
+ mProbabilities.clear();
+ q->cancelButtonPress();
+
+ if (!mCharacterSelectionPreview) {
+ mCharacterSelectionPreview = new HbDialog();
+ mCharacterSelectionPreview->setModal(true);
+ mCharacterSelectionPreview->setBackgroundFaded(false);
+ mCharacterSelectionPreview->setTimeout(HbPopup::NoTimeout);
+ mCharacterSelectionPreview->setDismissPolicy(HbPopup::TapAnywhere);
+ mCharacterSelectionPreview->setFlag(QGraphicsItem::ItemIsPanel, true);
+ mCharacterSelectionPreview->setActive(false);
+ qreal margin = HbPreviewMarginInUnits * mUnitValue * 0.5;
+ mCharacterSelectionPreview->setContentsMargins(margin, 0, margin, 0);
+ QGraphicsDropShadowEffect *effect = new QGraphicsDropShadowEffect;
+ effect->setBlurRadius(8);
+ mCharacterSelectionPreview->setGraphicsEffect(effect);
+ }
+
+ HbInputButtonGroup *group = new HbInputButtonGroup(QSize(item->mappedCharacters().count(), 1));
+ QObject::connect(group, SIGNAL(buttonPressed(const QKeyEvent&)), q, SLOT(emitButtonPressed(const QKeyEvent&)));
+ QObject::connect(group, SIGNAL(buttonDoublePressed(const QKeyEvent&)), q, SLOT(emitButtonDoublePressed(const QKeyEvent&)));
+ QObject::connect(group, SIGNAL(buttonReleased(const QKeyEvent&)), q, SLOT(emitButtonReleased(const QKeyEvent&)));
+ QObject::connect(group, SIGNAL(buttonLongPressed(const QKeyEvent&)), q, SLOT(emitButtonLongPressed(const QKeyEvent&)));
+ QObject::connect(group, SIGNAL(pressedButtonChanged(const QKeyEvent&, const QKeyEvent&)), q, SLOT(emitPressedButtonChanged(const QKeyEvent&, const QKeyEvent&)));
+
+ qreal cellWidth = q->boundingRect().width() / mGridSize.width();
+ qreal cellHeight = q->boundingRect().height() / mGridSize.height();
+
+ QFont font = HbFontSpec(HbFontSpec::Primary).font();
+ font.setPixelSize(fontSize(ButtonTextTypeLabel));
+ QFontMetricsF fontMetrics(font);
+ qreal textWidth = fontMetrics.width(item->mappedCharacters());
+
+ qreal width = textWidth + HbPreviewMarginInUnits * mUnitValue * item->mappedCharacters().count();
+ qreal height = HbPreviewHeightInUnits * mUnitValue;
+ qreal x = q->scenePos().x() + (item->position().x() + 0.5 * item->size().width()) * cellWidth;
+ qreal y = q->scenePos().y() + item->position().y() * cellHeight;
+
+ QList<HbInputButton*> buttons;
+ for (int i = 0; i < item->mappedCharacters().count(); ++i) {
+ HbInputButton *previewItem = new HbInputButton(item->keyCode(), QPoint(i, 0));
+ previewItem->setType(HbInputButton::ButtonTypeLabel);
+ previewItem->setText(item->mappedCharacters().at(i), HbInputButton::ButtonTextIndexPrimary);
+ buttons.append(previewItem);
+ }
+ group->setButtons(buttons);
+ group->setButtonBorderSize(0);
+
+ mCharacterSelectionPreview->setPreferredSize(QSizeF(width, height));
+ mCharacterSelectionPreview->setPreferredPos(QPointF(x, y), HbPopup::BottomEdgeCenter);
+ mCharacterSelectionPreview->setContentWidget(group);
+
+ HbFrameDrawer *drawer = HbFrameDrawerPool::get(HbPreviewBackground, HbFrameDrawer::ThreePiecesHorizontal, QSizeF(width, height));
+ drawer->setFillWholeRect(true);
+ mCharacterSelectionPreview->setBackgroundItem(new HbFrameItem(drawer));
+
+ mCharacterSelectionPreview->show();
+ }
+}
+
+void HbInputButtonGroupPrivate::pressEvent(const QPointF &position, bool emitSignal)
+{
+ Q_Q(HbInputButtonGroup);
+
+ if (!(position.x() >= 0 && position.x() < q->boundingRect().width() &&
+ position.y() >= 0 && position.y() < q->boundingRect().height())) {
+ return;
+ }
+
+ 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));
+
+ if (index >= 0 && index < mButtonData.count()) {
+ HbInputButton *item = mButtonData.at(index);
+
+ if ((item->state() != HbInputButton::ButtonStateReleased &&
+ item->state() != HbInputButton::ButtonStateLatched) ||
+ (mCharacterSelectionPreview && mCharacterSelectionPreview->isVisible())) {
+ if (item->state() == HbInputButton::ButtonStateDisabled) {
+ startLongPress(index);
+ }
+ return;
+ }
+
+ HbWidgetFeedback::triggered(q, Hb::InstantPressed);
+
+ item->setState(HbInputButton::ButtonStatePressed);
+ updateGraphics(QSizeF(q->boundingRect().width(), q->boundingRect().height()));
+ updateTextLayouts(QSizeF(q->boundingRect().width(), q->boundingRect().height()));
+ q->update();
+
+ showButtonPreview(item);
+
+ startLongPress(index);
+
+ if (!mUsedCustomButtons.contains(index)) {
+ if (emitSignal) {
+ QString text;
+ if (item->type() == HbInputButton::ButtonTypeLabel) {
+ text = item->text(HbInputButton::ButtonTextIndexPrimary);
+ }
+ QKeyEvent event(QEvent::KeyPress, item->keyCode(), Qt::NoModifier, text);
+ q->emitButtonPressed(event);
+ }
+ }
+ }
+}
+
+void HbInputButtonGroupPrivate::doublePressEvent(const QPointF &position, bool emitSignal)
+{
+ Q_Q(HbInputButtonGroup);
+
+ if (!(position.x() >= 0 && position.x() < q->boundingRect().width() &&
+ position.y() >= 0 && position.y() < q->boundingRect().height())) {
+ return;
+ }
+
+ 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));
+
+ if (index >= 0 && index < mButtonData.count()) {
+ HbInputButton *item = mButtonData.at(index);
+
+ if ((item->state() != HbInputButton::ButtonStateReleased &&
+ item->state() != HbInputButton::ButtonStateLatched) ||
+ (mCharacterSelectionPreview && mCharacterSelectionPreview->isVisible())) {
+ if (item->state() == HbInputButton::ButtonStateDisabled) {
+ startLongPress(index);
+ }
+ return;
+ }
+
+ HbWidgetFeedback::triggered(q, Hb::InstantPressed);
+
+ item->setState(HbInputButton::ButtonStatePressed);
+ updateGraphics(QSizeF(q->boundingRect().width(), q->boundingRect().height()));
+ updateTextLayouts(QSizeF(q->boundingRect().width(), q->boundingRect().height()));
+ q->update();
+
+ showButtonPreview(item);
+
+ startLongPress(index);
+
+ if (!mUsedCustomButtons.contains(index)) {
+ if (emitSignal) {
+ QString text;
+ if (item->type() == HbInputButton::ButtonTypeLabel) {
+ text = item->text(HbInputButton::ButtonTextIndexPrimary);
+ }
+ QKeyEvent event(QEvent::KeyPress, item->keyCode(), Qt::NoModifier, text);
+ q->emitButtonDoublePressed(event);
+ }
+ }
+ }
+}
+
+void HbInputButtonGroupPrivate::moveEvent(const QPointF &oldPosition, const QPointF &newPosition)
+{
+ Q_Q(HbInputButtonGroup);
+
+ int oldColumn = static_cast<int>(oldPosition.x() / (q->boundingRect().width() / mGridSize.width()));
+ int oldRow = static_cast<int>(oldPosition.y() / (q->boundingRect().height() / mGridSize.height()));
+ 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));
+
+ if (newPosition.x() >= 0 && newPosition.x() < q->boundingRect().width() &&
+ newPosition.y() >= 0 && newPosition.y() < q->boundingRect().height() &&
+ oldPosition.x() >= 0 && oldPosition.x() < q->boundingRect().width() &&
+ oldPosition.y() >= 0 && oldPosition.y() < q->boundingRect().height()) {
+
+ if (oldIndex != newIndex) {
+ releaseEvent(oldPosition, false);
+ pressEvent(newPosition, false);
+
+ QString text;
+ HbInputButton *oldItem = mButtonData.at(oldIndex);
+ if (oldItem->type() == HbInputButton::ButtonTypeLabel) {
+ text = oldItem->text(HbInputButton::ButtonTextIndexPrimary);
+ }
+ QKeyEvent releaseEvent(QEvent::KeyRelease, oldItem->keyCode(), Qt::NoModifier, text);
+
+ HbInputButton *newItem = mButtonData.at(newIndex);
+ if (newItem->type() == HbInputButton::ButtonTypeLabel) {
+ text = newItem->text(HbInputButton::ButtonTextIndexPrimary);
+ }
+ QKeyEvent pressEvent(QEvent::KeyPress, newItem->keyCode(), Qt::NoModifier, text);
+
+ q->emitPressedButtonChanged(releaseEvent, pressEvent);
+ }
+ } else {
+ releaseEvent(oldPosition, false);
+ pressEvent(newPosition);
+ }
+}
+
+void HbInputButtonGroupPrivate::releaseEvent(const QPointF &position, bool emitSignal)
+{
+ Q_Q(HbInputButtonGroup);
+
+ if (!(position.x() >= 0 && position.x() < q->boundingRect().width() &&
+ position.y() >= 0 && position.y() < q->boundingRect().height())) {
+ return;
+ }
+
+ 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));
+
+ if (index >= 0 && index < mButtonData.count()) {
+ HbInputButton *item = mButtonData.at(index);
+
+ cancelLongPress(index);
+
+ if (item->state() != HbInputButton::ButtonStatePressed) {
+ return;
+ }
+
+ HbWidgetFeedback::triggered(q, Hb::InstantReleased);
+
+ item->setState(HbInputButton::ButtonStateReleased);
+ updateGraphics(QSizeF(q->boundingRect().width(), q->boundingRect().height()));
+ updateTextLayouts(QSizeF(q->boundingRect().width(), q->boundingRect().height()));
+ q->update();
+
+ if (mCharacterSelectionPreview && mCharacterSelectionPreview->isVisible()) {
+ return;
+ }
+
+ hideButtonPreview(item);
+
+ if (emitSignal) {
+ HbWidgetFeedback::triggered(q, Hb::InstantClicked);
+ int actionIndex = item->keyCode() - HbInputButton::ButtonKeyCodeCustom;
+ if (actionIndex >= 0 && actionIndex < mCustomActions.count()) {
+ mCustomActions.at(actionIndex)->activate(QAction::Trigger);
+ } else {
+ calculateButtonProbabilities(position);
+
+ QString text;
+ if (item->type() == HbInputButton::ButtonTypeLabel) {
+ text = item->text(HbInputButton::ButtonTextIndexPrimary);
+ }
+ QKeyEvent event(QEvent::KeyRelease, item->keyCode(), Qt::NoModifier, text);
+ q->emitButtonReleased(event);
+ }
+ }
+ }
+}
+
+void HbInputButtonGroupPrivate::longPressEvent()
+{
+ Q_Q(HbInputButtonGroup);
+
+ int index = mLongPressButtons.at(0);
+ mLongPressButtons.removeAt(0);
+ QTimer *timer = mLongPressTimers.at(0);
+ mLongPressTimers.removeAt(0);
+
+ if (index >= 0 && index < mButtonData.count()) {
+ HbInputButton *item = mButtonData.at(index);
+
+ if (item->autoRepeat() &&
+ (item->state() == HbInputButton::ButtonStatePressed ||
+ item->state() == HbInputButton::ButtonStateLatched)) {
+ mLongPressButtons.append(index);
+ mLongPressTimers.append(timer);
+ timer->start(HbAutoRepeatTimeout);
+
+ HbWidgetFeedback::triggered(q, Hb::InstantKeyRepeated);
+
+ QString text;
+ if (item->type() == HbInputButton::ButtonTypeLabel) {
+ text = item->text(HbInputButton::ButtonTextIndexPrimary);
+ }
+ QKeyEvent releaeEvent(QEvent::KeyRelease, item->keyCode(), Qt::NoModifier, text, true);
+ q->emitButtonReleased(releaeEvent);
+ QKeyEvent pressEvent(QEvent::KeyPress, item->keyCode(), Qt::NoModifier, text, true);
+ q->emitButtonPressed(pressEvent);
+ } else {
+ if (mCharacterSelectionPreviewEnabled) {
+ showCharacterSelectionPreview(item);
+ }
+
+ HbWidgetFeedback::triggered(q, Hb::InstantLongPressed);
+
+ delete timer;
+
+ 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);
+ }
+ }
+}
+
+void HbInputButtonGroupPrivate::calculateButtonProbabilities(const QPointF &position)
+{
+ Q_Q(HbInputButtonGroup);
+
+ mProbabilities.clear();
+
+ qreal cellWidth = q->boundingRect().width() / mGridSize.width();
+ qreal cellHeight = q->boundingRect().height() / mGridSize.height();
+
+ QRectF touchArea = QRectF(position.x() - 0.5 * cellWidth, position.y() - 0.5 * cellHeight,
+ HbTouchAreaSizeInUnits * mUnitValue, HbTouchAreaSizeInUnits * mUnitValue);
+
+ qreal probabilities = 0;
+ foreach (HbInputButton *button, mButtonData) {
+ QRectF intersection = button->boundingRect().intersected(touchArea);
+
+ if (intersection.isValid()) {
+ qreal probability = intersection.width() * intersection.height() / (touchArea.width() * touchArea.height());
+ probabilities += probability;
+
+ HbKeyPressProbability probableKey;
+ probableKey.keycode = button->keyCode();
+ probableKey.probability = probability;
+ mProbabilities.append(probableKey);
+ }
+ }
+
+ // Normalize
+ for (int i = 0; i < mProbabilities.count(); ++i) {
+ mProbabilities[i].probability /= probabilities;
+ }
+}
+
+void HbInputButtonGroupPrivate::createPrimarySingleTextLayout(int index, const QHash<int, QString> &textContent, const QSizeF &size)
+{
+ qreal cellWidth = size.width() / mGridSize.width();
+ qreal cellHeight = size.height() / mGridSize.height();
+
+ QFont font = HbFontSpec(HbFontSpec::Primary).font();
+
+ int typeIndex = index % HbTextTypeCount / HbInputButton::ButtonStateCount;
+ if (typeIndex == HbInputButton::ButtonTypeLabel) {
+ font.setPixelSize(fontSize(ButtonTextTypeLabel));
+ } else {
+ font.setPixelSize(fontSize(ButtonTextTypeSingle));
+ }
+
+ mTextLayouts[index] = new QTextLayout(textContent.value(index), font);
+ QFontMetricsF fontMetrics(font);
+
+ // Create text line for each button with primary text and correct type and state. Layout it
+ // to correct position
+ mTextLayouts.at(index)->beginLayout();
+ foreach (HbInputButton *item, mButtonData) {
+ int layoutIndex = item->type() * HbInputButton::ButtonStateCount + item->state() + HbTextTypeCount;
+ if (!mEnabled) {
+ layoutIndex = item->type() * HbInputButton::ButtonStateCount + HbInputButton::ButtonStateDisabled + HbTextTypeCount;
+ }
+ if (index == layoutIndex && !item->text(HbInputButton::ButtonTextIndexPrimary).isEmpty() &&
+ item->icon(HbInputButton::ButtonIconIndexPrimary).isNull() &&
+ item->text(HbInputButton::ButtonTextIndexSecondaryFirstRow).isEmpty() &&
+ item->icon(HbInputButton::ButtonIconIndexSecondaryFirstRow).isNull() &&
+ item->text(HbInputButton::ButtonTextIndexSecondarySecondRow).isEmpty() &&
+ item->icon(HbInputButton::ButtonIconIndexSecondarySecondRow).isNull()) {
+ qreal textWidth = fontMetrics.width(item->text(HbInputButton::ButtonTextIndexPrimary));
+ qreal textHeight = fontMetrics.height();
+
+ QTextLine line = mTextLayouts.at(index)->createLine();
+ line.setNumColumns(1);
+
+ if (typeIndex == HbInputButton::ButtonTypeLabel) {
+ layoutTextLine(ButtonTextTypeLabel, item, QSizeF(cellWidth, cellHeight), line, QSizeF(textWidth, textHeight));
+ } else {
+ layoutTextLine(ButtonTextTypeSingle, item, QSizeF(cellWidth, cellHeight), line, QSizeF(textWidth, textHeight));
+ }
+ }
+ }
+ mTextLayouts.at(index)->endLayout();
+ mTextLayouts.at(index)->setCacheEnabled(true);
+}
+
+void HbInputButtonGroupPrivate::createPrimaryTextLayout(int index, const QHash<int, QString> &textContent, const QSizeF &size)
+{
+ qreal cellWidth = size.width() / mGridSize.width();
+ qreal cellHeight = size.height() / mGridSize.height();
+
+ QFont font = HbFontSpec(HbFontSpec::Primary).font();
+ font.setPixelSize(fontSize(ButtonTextTypePrimary));
+
+ mTextLayouts[index] = new QTextLayout(textContent.value(index), font);
+ QFontMetricsF fontMetrics(font);
+
+ // Create text line for each button with primary text and correct type and state. Layout it
+ // to correct position
+ mTextLayouts.at(index)->beginLayout();
+ foreach (HbInputButton *item, mButtonData) {
+ int layoutIndex = item->type() * HbInputButton::ButtonStateCount + item->state();
+ if (!mEnabled) {
+ layoutIndex = item->type() * HbInputButton::ButtonStateCount + HbInputButton::ButtonStateDisabled;
+ }
+ if (index == layoutIndex && !item->text(HbInputButton::ButtonTextIndexPrimary).isEmpty() &&
+ item->icon(HbInputButton::ButtonIconIndexPrimary).isNull() &&
+ !(item->text(HbInputButton::ButtonTextIndexSecondaryFirstRow).isEmpty() &&
+ item->icon(HbInputButton::ButtonIconIndexSecondaryFirstRow).isNull() &&
+ item->text(HbInputButton::ButtonTextIndexSecondarySecondRow).isEmpty() &&
+ item->icon(HbInputButton::ButtonIconIndexSecondarySecondRow).isNull())) {
+ qreal textWidth = fontMetrics.width(item->text(HbInputButton::ButtonTextIndexPrimary));
+ qreal textHeight = fontMetrics.height();
+
+ QTextLine line = mTextLayouts.at(index)->createLine();
+ line.setNumColumns(1);
+
+ layoutTextLine(ButtonTextTypePrimary, item, QSizeF(cellWidth, cellHeight), line, QSizeF(textWidth, textHeight));
+ }
+ }
+ mTextLayouts.at(index)->endLayout();
+ mTextLayouts.at(index)->setCacheEnabled(true);
+}
+
+void HbInputButtonGroupPrivate::createSecondaryTextLayout(int index, const QHash<int, QString> &textContent, const QSizeF &size)
+{
+ qreal cellWidth = size.width() / mGridSize.width();
+ qreal cellHeight = size.height() / mGridSize.height();
+
+ QFont font = HbFontSpec(HbFontSpec::Primary).font();
+ font.setPixelSize(fontSize(ButtonTextTypeSecondaryFirstRow));
+
+ mTextLayouts[index] = new QTextLayout(textContent.value(index), font);
+ QFontMetricsF fontMetrics(font);
+
+ // Create text line for each button with secondary first row or second row text and correct type and state.
+ // Layout it to correct position
+ mTextLayouts.at(index)->beginLayout();
+ foreach (HbInputButton *item, mButtonData) {
+ int layoutIndex = item->type() * HbInputButton::ButtonStateCount + item->state() + HbTextTypeCount * 2;
+ if (!mEnabled) {
+ layoutIndex = item->type() * HbInputButton::ButtonStateCount + HbInputButton::ButtonStateDisabled + HbTextTypeCount * 2;
+ }
+ if (index == layoutIndex) {
+ if (!item->text(HbInputButton::ButtonTextIndexSecondaryFirstRow).isEmpty() &&
+ item->icon(HbInputButton::ButtonIconIndexSecondaryFirstRow).isNull()) {
+ qreal textWidth = fontMetrics.width(item->text(HbInputButton::ButtonTextIndexSecondaryFirstRow));
+ qreal textHeight = fontMetrics.height();
+
+ QTextLine line = mTextLayouts.at(index)->createLine();
+ line.setNumColumns(1);
+
+ layoutTextLine(ButtonTextTypeSecondaryFirstRow, item, QSizeF(cellWidth, cellHeight), line, QSizeF(textWidth, textHeight));
+ }
+
+ if (!item->text(HbInputButton::ButtonTextIndexSecondarySecondRow).isEmpty() &&
+ item->icon(HbInputButton::ButtonIconIndexSecondarySecondRow).isNull()) {
+ qreal textWidth = fontMetrics.width(item->text(HbInputButton::ButtonTextIndexSecondarySecondRow));
+ qreal textHeight = fontMetrics.height();
+
+ QTextLine line = mTextLayouts.at(index)->createLine();
+ line.setNumColumns(1);
+
+ layoutTextLine(ButtonTextTypeSecondarySecondRow, item, QSizeF(cellWidth, cellHeight), line, QSizeF(textWidth, textHeight));
+ }
+ }
+ }
+ mTextLayouts.at(index)->endLayout();
+ mTextLayouts.at(index)->setCacheEnabled(true);
+}
+
+void HbInputButtonGroupPrivate::layoutTextLine(HbInputButtonTextType textType, const HbInputButton *button, const QSizeF &cellSize,
+ QTextLine &textLine, const QSizeF &textSize)
+{
+ qreal textPositionX = 0.0;
+ qreal textPositionY = 0.0;
+ if (textType == ButtonTextTypeSingle ||
+ textType == ButtonTextTypeLabel) {
+ textPositionX = (button->position().x() + 0.5 * button->size().width()) * cellSize.width() - 0.5 * textSize.width();
+ textPositionY = (button->position().y() + 0.5 * button->size().height()) * cellSize.height() - 0.5 * textSize.height();
+ } else if (textType == ButtonTextTypePrimary) {
+ textPositionX = button->position().x() * cellSize.width() + HbHorizontalMarginInUnits * mUnitValue + mButtonBorderSize;
+ textPositionY = (button->position().y() + 0.5 * button->size().height()) * cellSize.height() - 0.5 * textSize.height();
+ } else if (textType == ButtonTextTypeSecondaryFirstRow) {
+ textPositionX = (button->position().x() + button->size().width()) * cellSize.width() -
+ textSize.width() - HbHorizontalMarginInUnits * mUnitValue - mButtonBorderSize;
+ textPositionY = (button->position().y() + button->size().height()) * cellSize.height() -
+ textSize.height() - HbVerticalMarginInUnits * mUnitValue - mButtonBorderSize;
+ } else if (textType == ButtonTextTypeSecondarySecondRow) {
+ textPositionX = (button->position().x() + button->size().width()) * cellSize.width() -
+ textSize.width() - HbHorizontalMarginInUnits * mUnitValue - mButtonBorderSize;
+ textPositionY = button->position().y() * cellSize.height() + HbVerticalMarginInUnits * mUnitValue + mButtonBorderSize;
+ }
+ textLine.setPosition(QPointF(textPositionX, textPositionY));
+}
+
+QString HbInputButtonGroupPrivate::buttonGraphics(HbInputButton::HbInputButtonType type, HbInputButton::HbInputButtonState state)
+{
+ if (type == HbInputButton::ButtonTypeNormal) {
+ if (state == HbInputButton::ButtonStateReleased) {
+ return HbNormalBackground;
+ } else if (state == HbInputButton::ButtonStatePressed) {
+ return HbNormalPressedBackground;
+ } else if (state == HbInputButton::ButtonStateLatched) {
+ return HbNormalLatchedBackground;
+ } else if (state == HbInputButton::ButtonStateDisabled) {
+ return HbNormalInActiveBackground;
+ }
+ } else if (type == HbInputButton::ButtonTypeFunction) {
+ if (state == HbInputButton::ButtonStateReleased) {
+ return HbFunctionBackground;
+ } else if (state == HbInputButton::ButtonStatePressed) {
+ return HbFunctionPressedBackground;
+ } else if (state == HbInputButton::ButtonStateLatched) {
+ return HbFunctionLatchedBackground;
+ } else if (state == HbInputButton::ButtonStateDisabled) {
+ return HbFunctionInActiveBackground;
+ }
+ }
+ return QString("");
+}
+
+QString HbInputButtonGroupPrivate::buttonColor(HbInputButton::HbInputButtonType type, HbInputButton::HbInputButtonState state)
+{
+ if (type == HbInputButton::ButtonTypeNormal) {
+ if (state == HbInputButton::ButtonStateReleased) {
+ return HbNormalColor;
+ } else if (state == HbInputButton::ButtonStatePressed) {
+ return HbNormalColorPressed;
+ } else if (state == HbInputButton::ButtonStateLatched) {
+ return HbNormalColorLatched;
+ } else if (state == HbInputButton::ButtonStateDisabled) {
+ return HbNormalColorInActive;
+ }
+ } else if (type == HbInputButton::ButtonTypeFunction) {
+ if (state == HbInputButton::ButtonStateReleased) {
+ return HbFunctionColor;
+ } else if (state == HbInputButton::ButtonStatePressed) {
+ return HbFunctionColorPressed;
+ } else if (state == HbInputButton::ButtonStateLatched) {
+ return HbFunctionColorLatched;
+ } else if (state == HbInputButton::ButtonStateDisabled) {
+ return HbFunctionColorInActive;
+ }
+ } else if (type == HbInputButton::ButtonTypeLabel) {
+ if (mButtonData.count() == 1) {
+ return HbButtonPreviewColor;
+ } else {
+ return HbCharacterSelectionPreviewColor;
+ }
+ }
+ return QString("");
+}
+
+qreal HbInputButtonGroupPrivate::fontSize(HbInputButtonTextType textType)
+{
+ if (textType == ButtonTextTypeSingle) {
+ return HbTextSizeInUnits * mUnitValue;
+ } else if (textType == ButtonTextTypePrimary) {
+ return HbPrimaryTextSizeInUnits * mUnitValue;
+ } else if (textType == ButtonTextTypeSecondaryFirstRow ||
+ textType == ButtonTextTypeSecondarySecondRow) {
+ return HbSecondaryTextSizeInUnits * mUnitValue;
+ } else if (textType == ButtonTextTypeLabel) {
+ return HbLabelTextSizeInUnits * mUnitValue;
+ }
+ return 0;
+}
+
+void HbInputButtonGroupPrivate::startLongPress(int index)
+{
+ Q_Q(HbInputButtonGroup);
+ if (!mUsedCustomButtons.contains(index)) {
+ mLongPressButtons.append(index);
+ mLongPressTimers.append(new QTimer());
+ mLongPressTimers.back()->setSingleShot(true);
+ QObject::connect(mLongPressTimers.back(), SIGNAL(timeout()), q, SLOT(longPressEvent()));
+ mLongPressTimers.back()->start(HbLongPressTimeout);
+ }
+}
+
+void HbInputButtonGroupPrivate::cancelLongPress(int index)
+{
+ if (mLongPressButtons.contains(index)) {
+ int listIndex = mLongPressButtons.indexOf(index);
+ delete mLongPressTimers.at(listIndex);
+ mLongPressTimers.removeAt(listIndex);
+ mLongPressButtons.removeAt(listIndex);
+ }
+}
+
+/// @endcond
+
+/*!
+Constructor
+*/
+HbInputButtonGroup::HbInputButtonGroup(QGraphicsItem *parent)
+ : HbWidget(*new HbInputButtonGroupPrivate, parent)
+{
+ Q_D(HbInputButtonGroup);
+
+ d->mUnitValue = HbDeviceProfile::profile(mainWindow()).unitValue();
+
+ setAcceptedMouseButtons(Qt::LeftButton);
+}
+
+/*!
+Constructor
+*/
+HbInputButtonGroup::HbInputButtonGroup(HbInputButtonGroupPrivate &dd, QGraphicsItem *parent)
+ : HbWidget(dd, parent)
+{
+ Q_D(HbInputButtonGroup);
+
+ d->mUnitValue = HbDeviceProfile::profile(mainWindow()).unitValue();
+
+ setAcceptedMouseButtons(Qt::LeftButton);
+}
+
+/*!
+Constructor
+*/
+HbInputButtonGroup::HbInputButtonGroup(const QSize &size, QGraphicsItem *parent)
+ : HbWidget(*new HbInputButtonGroupPrivate, parent)
+{
+ Q_D(HbInputButtonGroup);
+
+ d->mUnitValue = HbDeviceProfile::profile(mainWindow()).unitValue();
+
+ setAcceptedMouseButtons(Qt::LeftButton);
+
+ setGridSize(size);
+}
+
+/*!
+Constructor
+*/
+HbInputButtonGroup::HbInputButtonGroup(HbInputButtonGroupPrivate &dd, const QSize &size, QGraphicsItem *parent)
+ : HbWidget(dd, parent)
+{
+ Q_D(HbInputButtonGroup);
+
+ d->mUnitValue = HbDeviceProfile::profile(mainWindow()).unitValue();
+
+ setAcceptedMouseButtons(Qt::LeftButton);
+
+ setGridSize(size);
+}
+
+/*!
+Destructor
+*/
+HbInputButtonGroup::~HbInputButtonGroup()
+{
+}
+
+/*!
+Sets new grid size and updates button group content based on the new grid size.
+
+\sa gridSize
+*/
+void HbInputButtonGroup::setGridSize(const QSize &size)
+{
+ Q_D(HbInputButtonGroup);
+
+ d->mGridSize = size;
+ if (d->mGridSize.width() < 1) {
+ d->mGridSize.setWidth(1);
+ }
+ if (d->mGridSize.height() < 1) {
+ d->mGridSize.setHeight(1);
+ }
+
+ setButtonBorderSize(d->mButtonBorderSize);
+ d->updateButtonGrid(QSizeF(boundingRect().width(), boundingRect().height()));
+ d->updateGraphics(QSizeF(boundingRect().width(), boundingRect().height()));
+ d->updateTextLayouts(QSizeF(boundingRect().width(), boundingRect().height()));
+ update();
+}
+
+/*!
+Returns current grid size.
+
+\sa setGridSize
+*/
+QSize HbInputButtonGroup::gridSize() const
+{
+ Q_D(const HbInputButtonGroup);
+
+ return d->mGridSize;
+}
+
+/*!
+Sets the button data and updates button group based on the new data.
+Takes ownership of the button items. Button items that are not in the new list
+will be destroyed.
+
+\sa buttons
+\sa button
+*/
+void HbInputButtonGroup::setButtons(const QList<HbInputButton*> &data)
+{
+ Q_D(HbInputButtonGroup);
+
+ foreach (HbInputButton *button, d->mButtonData) {
+ if (!data.contains(button)) {
+ delete button;
+ }
+ }
+ d->mButtonData = data;
+
+ d->updateButtonGrid(QSizeF(boundingRect().width(), boundingRect().height()));
+ d->updateCustomActions();
+ d->updateColorArray();
+ d->updateGraphics(QSizeF(boundingRect().width(), boundingRect().height()));
+ d->updateTextLayouts(QSizeF(boundingRect().width(), boundingRect().height()));
+ update();
+}
+
+/*!
+Sets the button item and updates button group based on the new data.
+Takes ownership of the button item. Old button item in the given index will be destroyed.
+If null item is passed then the item from the given index will be removed.
+If index is out of bounds then the item is inserted to the end of button list.
+
+\sa buttons
+\sa button
+*/
+void HbInputButtonGroup::setButton(HbInputButton *data, int index)
+{
+ Q_D(HbInputButtonGroup);
+
+ if (index >= 0 && index < d->mButtonData.count()) {
+ if (data != d->mButtonData.at(index)) {
+ delete d->mButtonData.at(index);
+ }
+ if (data) {
+ d->mButtonData.replace(index, data);
+ } else {
+ d->mButtonData.removeAt(index);
+ }
+ } else {
+ d->mButtonData.append(data);
+ }
+ setButtons(d->mButtonData);
+}
+
+/*!
+Sets the button item and updates button group based on the new data.
+Takes ownership of the button item. Old button item in the given position will be destroyed.
+If null item is passed then the item from the given position will be removed.
+If the given position doesn't contain a button then the item is inserted to the end of button list.
+
+\sa buttons
+\sa button
+*/
+void HbInputButtonGroup::setButton(HbInputButton *data, int column, int row)
+{
+ Q_D(HbInputButtonGroup);
+
+ int index = d->mButtonGridPositions.value(QPair<int, int>(column, row));
+ setButton(data, index);
+}
+
+/*!
+Sets the button item and updates button group based on the new data.
+Takes ownership of the button item. Old button item with given key code will be destroyed.
+If null item is passed then the item with given key code will be removed.
+If group contains multiple buttons with same key code then the first one will be replaced.
+If there isn't any button with given key code then the button will be added to the end of button list.
+
+\sa buttons
+\sa button
+*/
+void HbInputButtonGroup::setButton(HbInputButton *data, HbInputButton::HbInputButtonKeyCode keyCode)
+{
+ Q_D(HbInputButtonGroup);
+
+ int index = 0;
+ for (; index < d->mButtonData.count(); ++index) {
+ HbInputButton *item = d->mButtonData.at(index);
+ if (item->keyCode() == keyCode) {
+ break;
+ }
+ }
+
+ setButton(data, index);
+}
+
+/*!
+Returns button data.
+Ownership of the returned button items is not transferred.
+
+\sa setButtons
+\sa setButton
+*/
+QList<HbInputButton*> HbInputButtonGroup::buttons() const
+{
+ Q_D(const HbInputButtonGroup);
+
+ return d->mButtonData;
+}
+
+/*!
+Returns button item.
+Ownership of the returned button item is not transferred.
+
+\sa setButtons
+\sa setButton
+*/
+HbInputButton *HbInputButtonGroup::button(int index) const
+{
+ Q_D(const HbInputButtonGroup);
+
+ if (index >= 0 && index < d->mButtonData.count()) {
+ return d->mButtonData.at(index);
+ }
+ return 0;
+}
+
+/*!
+Returns button data.
+Ownership of the button items is not transferred.
+
+\sa setButtons
+\sa setButton
+*/
+HbInputButton *HbInputButtonGroup::button(int column, int row) const
+{
+ Q_D(const HbInputButtonGroup);
+
+ int index = d->mButtonGridPositions.value(QPair<int, int>(column, row));
+ return button(index);
+}
+
+/*!
+Returns button data.
+Ownership of the button items is not transferred.
+
+\sa setButtons
+\sa setButton
+*/
+HbInputButton *HbInputButtonGroup::button(HbInputButton::HbInputButtonKeyCode keyCode) const
+{
+ Q_D(const HbInputButtonGroup);
+
+ foreach (HbInputButton *button, d->mButtonData) {
+ if (button->keyCode() == keyCode) {
+ return button;
+ }
+ }
+ return 0;
+}
+
+/*!
+Sets custom actions and updates button group based on the new data. Custom actions
+are mapped to buttons which keycode is equal or bigger than HbInputButtonKeyCustom.
+Ownership of the actions is not transferred.
+
+\sa customButtonActions
+*/
+void HbInputButtonGroup::setCustomButtonActions(const QList<HbAction*> &actions)
+{
+ Q_D(HbInputButtonGroup);
+
+ disconnect(this, SLOT(updateCustomButtons()));
+
+ d->mCustomActions = actions;
+
+ foreach (HbAction *action, d->mCustomActions) {
+ connect(action, SIGNAL(changed()), this, SLOT(updateCustomButtons()));
+ }
+
+ d->updateCustomActions();
+ d->updateGraphics(QSizeF(boundingRect().width(), boundingRect().height()));
+ d->updateTextLayouts(QSizeF(boundingRect().width(), boundingRect().height()));
+ update();
+}
+
+/*!
+Returns current custom actions.
+Ownership of the actions is not transferred.
+
+\sa setCustomButtonActions
+*/
+QList<HbAction*> HbInputButtonGroup::customButtonActions() const
+{
+ Q_D(const HbInputButtonGroup);
+
+ return d->mCustomActions;
+}
+
+/*!
+Sets the border size for the buttons and updates button group based on the new value.
+Size must be in a range between 0 to half of button size.
+
+\sa buttonBorderSize
+*/
+void HbInputButtonGroup::setButtonBorderSize(qreal borderSize)
+{
+ Q_D(HbInputButtonGroup);
+
+ if (borderSize < 0.0) {
+ borderSize = 0.0;
+ } else if (boundingRect().width() != 0.0 && boundingRect().height() != 0.0) {
+ qreal maxSize = boundingRect().width() / d->mGridSize.width() * 0.5;
+ if (boundingRect().width() > boundingRect().height()) {
+ maxSize = boundingRect().height() / d->mGridSize.height() * 0.5;
+ }
+ if (borderSize > maxSize) {
+ borderSize = maxSize;
+ }
+ }
+ d->mButtonBorderSize = borderSize;
+
+ d->updateGraphics(QSizeF(boundingRect().width(), boundingRect().height()));
+ update();
+}
+
+/*!
+Returns the border size.
+
+\sa setButtonBorderSize
+*/
+qreal HbInputButtonGroup::buttonBorderSize() const
+{
+ Q_D(const HbInputButtonGroup);
+
+ return d->mButtonBorderSize;
+}
+
+/*!
+Sets button preview state.
+
+\sa isButtonPreviewEnabled
+*/
+void HbInputButtonGroup::setButtonPreviewEnabled(bool enabled)
+{
+ Q_D(HbInputButtonGroup);
+
+ d->mButtonPreviewEnabled = enabled;
+}
+
+/*!
+Returns preview state.
+
+\sa setButtonPreviewEnabled
+*/
+bool HbInputButtonGroup::isButtonPreviewEnabled() const
+{
+ Q_D(const HbInputButtonGroup);
+
+ return d->mButtonPreviewEnabled;
+}
+
+/*!
+Sets button specific character selection preview state.
+
+\sa isCharacterSelectionPreviewEnabled
+*/
+void HbInputButtonGroup::setCharacterSelectionPreviewEnabled(bool enabled)
+{
+ Q_D(HbInputButtonGroup);
+
+ d->mCharacterSelectionPreviewEnabled = enabled;
+}
+
+/*!
+Returns button specific character selection preview state.
+
+\sa setCharacterSelectionPreviewEnabled
+*/
+bool HbInputButtonGroup::isCharacterSelectionPreviewEnabled() const
+{
+ Q_D(const HbInputButtonGroup);
+
+ return d->mCharacterSelectionPreviewEnabled;
+}
+
+
+/*!
+Sets multi touch enabled or disabled.
+
+\sa isMultiTouchEnabled
+*/
+void HbInputButtonGroup::setMultiTouchEnabled(bool enabled)
+{
+ Q_D(HbInputButtonGroup);
+
+ d->mMultiTouchEnabled = enabled;
+ setAcceptTouchEvents(enabled);
+}
+
+/*!
+Returns multi touch state.
+
+\sa setMultiTouchEnabled
+*/
+bool HbInputButtonGroup::isMultiTouchEnabled() const
+{
+ Q_D(const HbInputButtonGroup);
+
+ return d->mMultiTouchEnabled;
+}
+
+/*!
+Sets button group background graphics.
+Takes ownership of the background object.
+*/
+void HbInputButtonGroup::setBackground(HbFrameDrawer *background)
+{
+ Q_D(HbInputButtonGroup);
+
+ HbFrameDrawerPool::release(d->mBackground);
+ d->mBackground = background;
+}
+
+/*!
+Returns all possible buttons the user could have intended to press
+for the last registered touch along with their corresponding probabilities.
+*/
+QList<HbKeyPressProbability> HbInputButtonGroup::buttonProbabilities() const
+{
+ Q_D(const HbInputButtonGroup);
+
+ return d->mProbabilities;
+}
+
+/*!
+Sets the button group enabled or disabled.
+
+\sa isEnabled
+*/
+void HbInputButtonGroup::setEnabled(bool enabled)
+{
+ Q_D(HbInputButtonGroup);
+
+ d->mEnabled = enabled;
+ d->updateGraphics(QSizeF(boundingRect().width(), boundingRect().height()));
+ d->updateTextLayouts(QSizeF(boundingRect().width(), boundingRect().height()));
+ update();
+}
+
+/*!
+Returns the button group state.
+
+\sa setEnabled
+*/
+bool HbInputButtonGroup::isEnabled() const
+{
+ Q_D(const HbInputButtonGroup);
+
+ return d->mEnabled;
+}
+
+/*!
+Draws the button group.
+*/
+void HbInputButtonGroup::paint(QPainter* painter, const QStyleOptionGraphicsItem *option, QWidget *widget)
+{
+ Q_UNUSED(option);
+ Q_UNUSED(widget);
+
+ Q_D(HbInputButtonGroup);
+
+ if (d->mBackground) {
+ d->mBackground->paint(painter, QRectF(0, 0, boundingRect().width(), boundingRect().height()));
+ }
+
+ qreal cellWidth = boundingRect().width() / d->mGridSize.width();
+ qreal cellHeight = boundingRect().height() / d->mGridSize.height();
+
+ for (int i = 0; i < d->mButtonData.count(); ++i) {
+ HbInputButton *item = d->mButtonData.at(i);
+
+ if (d->mButtonDrawers.at(i)) {
+ qreal x = item->position().x() * cellWidth + d->mButtonBorderSize;
+ qreal y = item->position().y() * cellHeight + d->mButtonBorderSize;
+ qreal width = item->size().width() * cellWidth - 2 * d->mButtonBorderSize;
+ qreal height = item->size().height() * cellHeight - 2 * d->mButtonBorderSize;
+
+ painter->save();
+ painter->translate(x, y);
+ d->mButtonDrawers.at(i)->paint(painter, QRectF(0, 0, width, height));
+ painter->restore();
+ }
+
+ if (!item->icon(HbInputButton::ButtonIconIndexPrimary).isNull()) {
+ qreal x = item->position().x() * cellWidth;
+ qreal y = item->position().y() * cellHeight;
+ qreal width = item->size().width() * cellWidth;
+ qreal height = item->size().height() * cellHeight;
+
+ if (!item->text(HbInputButton::ButtonTextIndexSecondaryFirstRow).isEmpty() ||
+ !item->text(HbInputButton::ButtonTextIndexSecondarySecondRow).isEmpty() ||
+ !item->icon(HbInputButton::ButtonIconIndexSecondaryFirstRow).isNull() ||
+ !item->icon(HbInputButton::ButtonIconIndexSecondarySecondRow).isNull()) {
+ x += HbHorizontalMarginInUnits * d->mUnitValue + d->mButtonBorderSize;
+ y += 0.5 * (item->size().height() * cellHeight - HbPrimaryIconSizeInUnits * d->mUnitValue);
+ width = HbPrimaryIconSizeInUnits * d->mUnitValue;
+ height = HbPrimaryIconSizeInUnits * d->mUnitValue;
+ }
+ item->icon(HbInputButton::ButtonIconIndexPrimary).paint(painter, QRectF(x, y, width, height));
+ }
+
+ if (!item->icon(HbInputButton::ButtonIconIndexSecondaryFirstRow).isNull()) {
+ qreal x = (item->position().x() + item->size().width()) * cellWidth -
+ HbSecondaryIconSizeInUnits * d->mUnitValue - HbHorizontalMarginInUnits * d->mUnitValue - d->mButtonBorderSize;
+ qreal y = (item->position().y() + item->size().height()) * cellHeight -
+ HbSecondaryIconSizeInUnits * d->mUnitValue - HbVerticalMarginInUnits * d->mUnitValue - d->mButtonBorderSize;
+ qreal width = HbSecondaryIconSizeInUnits * d->mUnitValue;
+ qreal height = HbSecondaryIconSizeInUnits * d->mUnitValue;
+
+ Qt::Alignment alignment = static_cast<Qt::Alignment>(Qt::AlignVCenter | Qt::AlignRight);
+ item->icon(HbInputButton::ButtonIconIndexSecondaryFirstRow).paint(painter, QRectF(x, y, width, height), Qt::KeepAspectRatio, alignment);
+ }
+
+ if (!item->icon(HbInputButton::ButtonIconIndexSecondarySecondRow).isNull()) {
+ qreal x = (item->position().x() + item->size().width()) * cellWidth -
+ HbSecondaryIconSizeInUnits * d->mUnitValue - HbHorizontalMarginInUnits * d->mUnitValue - d->mButtonBorderSize;
+ qreal y = item->position().y() * cellHeight + HbVerticalMarginInUnits * d->mUnitValue + d->mButtonBorderSize;
+ qreal width = HbSecondaryIconSizeInUnits * d->mUnitValue;
+ qreal height = HbSecondaryIconSizeInUnits * d->mUnitValue;
+
+ Qt::Alignment alignment = static_cast<Qt::Alignment>(Qt::AlignVCenter | Qt::AlignRight);
+ item->icon(HbInputButton::ButtonIconIndexSecondaryFirstRow).paint(painter, QRectF(x, y, width, height), Qt::KeepAspectRatio, alignment);
+ }
+
+ }
+
+ for (int i = 0; i < HbTextLayoutCount; ++i) {
+ painter->save();
+ painter->setPen(d->mColors.at(i % HbTextTypeCount));
+
+ if (d->mTextLayouts.at(i)) {
+ d->mTextLayouts.at(i)->draw(painter, QPointF(0, 0));
+ }
+ painter->restore();
+ }
+}
+
+/*!
+\reimp
+
+Handles touch events.
+*/
+bool HbInputButtonGroup::sceneEvent(QEvent *event)
+{
+ Q_D(HbInputButtonGroup);
+
+ if (!d->mEnabled) {
+ event->ignore();
+ return false;
+ }
+
+ if (event->type() == QEvent::TouchBegin) {
+ QTouchEvent *touchEvent = static_cast<QTouchEvent*>(event);
+ foreach (QTouchEvent::TouchPoint point, touchEvent->touchPoints()) {
+ if (!point.isPrimary() && d->mMultiTouchEnabled) {
+ d->pressEvent(point.pos());
+ }
+ }
+ } else if (event->type() == QEvent::TouchUpdate) {
+ QTouchEvent *touchEvent = static_cast<QTouchEvent*>(event);
+ foreach (QTouchEvent::TouchPoint point, touchEvent->touchPoints()) {
+ if (!point.isPrimary() && d->mMultiTouchEnabled) {
+ if (point.state() & Qt::TouchPointPressed) {
+ d->pressEvent(point.pos());
+ } else if (point.state() & Qt::TouchPointMoved) {
+ d->moveEvent(point.lastPos(), point.pos());
+ } else if (point.state() & Qt::TouchPointReleased) {
+ d->releaseEvent(point.pos());
+ }
+ }
+ }
+ } else if (event->type() == QEvent::TouchEnd) {
+ QTouchEvent *touchEvent = static_cast<QTouchEvent*>(event);
+ foreach (QTouchEvent::TouchPoint point, touchEvent->touchPoints()) {
+ if (!point.isPrimary() && d->mMultiTouchEnabled) {
+ d->releaseEvent(point.pos());
+ }
+ }
+ } else if (event->type() == QEvent::GraphicsSceneMousePress) {
+ QGraphicsSceneMouseEvent *mouseEvent = static_cast<QGraphicsSceneMouseEvent*>(event);
+ d->pressEvent(mouseEvent->pos());
+ } else if (event->type() == QEvent::GraphicsSceneMouseDoubleClick) {
+ QGraphicsSceneMouseEvent *mouseEvent = static_cast<QGraphicsSceneMouseEvent*>(event);
+ d->doublePressEvent(mouseEvent->pos());
+ } else if (event->type() == QEvent::GraphicsSceneMouseMove) {
+ QGraphicsSceneMouseEvent *mouseEvent = static_cast<QGraphicsSceneMouseEvent*>(event);
+ d->moveEvent(mouseEvent->lastPos(), mouseEvent->pos());
+ } else if (event->type() == QEvent::GraphicsSceneMouseRelease) {
+ QGraphicsSceneMouseEvent *mouseEvent = static_cast<QGraphicsSceneMouseEvent*>(event);
+ d->releaseEvent(mouseEvent->pos());
+ } else {
+ return HbWidget::event(event);
+ }
+ return true;
+}
+
+/*!
+\reimp
+
+Updates button group geometry.
+*/
+void HbInputButtonGroup::setGeometry(const QRectF &rect)
+{
+ Q_D(HbInputButtonGroup);
+
+ HbWidget::setGeometry(rect);
+
+ setButtonBorderSize(d->mButtonBorderSize);
+ d->updateButtonGrid(QSizeF(rect.width(), rect.height()));
+ d->updateGraphics(QSizeF(rect.width(), rect.height()));
+ d->updateTextLayouts(QSizeF(rect.width(), rect.height()));
+}
+
+/*!
+\reimp
+
+Updates theme graphics
+ */
+void HbInputButtonGroup::changeEvent(QEvent *event)
+{
+ Q_D(HbInputButtonGroup);
+
+ if (event->type() == HbEvent::ThemeChanged) {
+ if (d->mBackground) {
+ d->mBackground->themeChanged();
+ }
+
+ foreach (HbFrameDrawer *drawer, d->mButtonDrawers) {
+ drawer->themeChanged();
+ }
+
+ d->updateColorArray();
+
+ for (int i = 0; i < d->mButtonData.count(); ++i) {
+ HbInputButton *item = d->mButtonData.at(i);
+
+ QColor color;
+ if (d->mEnabled) {
+ color = d->mColors.at(item->type() * HbInputButton::ButtonStateCount + item->state());
+ } else {
+ color = d->mColors.at(item->type() * HbInputButton::ButtonStateCount + HbInputButton::ButtonStateDisabled);
+ }
+
+ if (!item->icon(HbInputButton::ButtonIconIndexPrimary).isNull()) {
+ HbIcon icon = item->icon(HbInputButton::ButtonIconIndexPrimary);
+ icon.setColor(color);
+ item->setIcon(icon, HbInputButton::ButtonIconIndexPrimary);
+ }
+ }
+ }
+ HbWidget::changeEvent(event);
+}
+
+/*!
+\reimp
+
+Enables touch events if multi touch is enabled.
+*/
+void HbInputButtonGroup::showEvent(QShowEvent *event)
+{
+ Q_D(HbInputButtonGroup);
+
+ setAcceptTouchEvents(d->mMultiTouchEnabled);
+
+ HbWidget::showEvent(event);
+}
+
+/*!
+\reimp
+
+Releases all pressed buttons when hidden.
+*/
+void HbInputButtonGroup::hideEvent(QHideEvent *event)
+{
+ cancelButtonPress();
+
+ HbWidget::hideEvent(event);
+}
+
+/*!
+Emits buttonPressed signal.
+*/
+void HbInputButtonGroup::emitButtonPressed(const QKeyEvent &event)
+{
+ emit buttonPressed(event);
+}
+
+/*!
+Emits buttonDoublePressed signal.
+*/
+void HbInputButtonGroup::emitButtonDoublePressed(const QKeyEvent &event)
+{
+ emit buttonDoublePressed(event);
+}
+
+/*!
+Emits buttonReleased signal.
+*/
+void HbInputButtonGroup::emitButtonReleased(const QKeyEvent &event)
+{
+ Q_D(HbInputButtonGroup);
+
+ if (d->mCharacterSelectionPreview) {
+ d->mCharacterSelectionPreview->hide();
+ }
+
+ emit buttonReleased(event);
+}
+
+/*!
+Emits buttonLongPressed signal.
+*/
+void HbInputButtonGroup::emitButtonLongPressed(const QKeyEvent &event)
+{
+ emit buttonLongPressed(event);
+}
+
+/*!
+Emits pressedButtonChanged signal.
+*/
+void HbInputButtonGroup::emitPressedButtonChanged(const QKeyEvent &releaseEvent, const QKeyEvent &pressEvent)
+{
+ emit pressedButtonChanged(releaseEvent, pressEvent);
+}
+
+/*!
+Cancels current button press and releases all buttons.
+*/
+void HbInputButtonGroup::cancelButtonPress()
+{
+ Q_D(HbInputButtonGroup);
+
+ ungrabMouse();
+
+ for (int i = 0; i < d->mButtonData.count(); ++i) {
+ if (d->mButtonData.at(i)->state() == HbInputButton::ButtonStatePressed) {
+ d->mButtonData.at(i)->setState(HbInputButton::ButtonStateReleased);
+ }
+ d->hideButtonPreview(d->mButtonData.at(i));
+
+ if (d->mLongPressButtons.contains(i)) {
+ int listIndex = d->mLongPressButtons.indexOf(i);
+ delete d->mLongPressTimers.at(listIndex);
+ d->mLongPressTimers.removeAt(listIndex);
+ d->mLongPressButtons.removeAt(listIndex);
+ }
+ }
+ if (d->mCharacterSelectionPreview) {
+ d->mCharacterSelectionPreview->hide();
+ }
+
+ d->updateGraphics(QSizeF(boundingRect().width(), boundingRect().height()));
+ d->updateTextLayouts(QSizeF(boundingRect().width(), boundingRect().height()));
+ update();
+}
+
+/*!
+Called when long press occurs.
+*/
+void HbInputButtonGroup::longPressEvent()
+{
+ Q_D(HbInputButtonGroup);
+
+ d->longPressEvent();
+}
+
+/*!
+Updates custom buttons with custom actions.
+
+\sa setCustomButtonActions
+*/
+void HbInputButtonGroup::updateCustomButtons()
+{
+ Q_D(HbInputButtonGroup);
+
+ d->updateCustomActions();
+ d->updateGraphics(QSizeF(boundingRect().width(), boundingRect().height()));
+ d->updateTextLayouts(QSizeF(boundingRect().width(), boundingRect().height()));
+ update();
+}
+
+// End of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbinput/inputwidgets/hbinputbuttongroup.h Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,123 @@
+/****************************************************************************
+**
+** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (developer.feedback@nokia.com)
+**
+** This file is part of the HbInput module of the UI Extensions for Mobile.
+**
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at developer.feedback@nokia.com.
+**
+****************************************************************************/
+
+#ifndef HB_INPUT_BUTTON_GROUP_H
+#define HB_INPUT_BUTTON_GROUP_H
+
+#include <hbwidget.h>
+
+#include <hbinputbutton.h>
+
+class HbInputButtonGroupPrivate;
+class HbAction;
+class HbFrameDrawer;
+
+class HB_INPUT_EXPORT HbInputButtonGroup : public HbWidget
+{
+ Q_OBJECT
+
+public:
+ explicit HbInputButtonGroup(QGraphicsItem *parent = 0);
+ explicit HbInputButtonGroup(const QSize &size, QGraphicsItem *parent = 0);
+ ~HbInputButtonGroup();
+
+ void setGridSize(const QSize &size);
+ QSize gridSize() const;
+
+ void setButtons(const QList<HbInputButton*> &data);
+ void setButton(HbInputButton *data, int index);
+ void setButton(HbInputButton *data, int column, int row);
+ void setButton(HbInputButton *data, HbInputButton::HbInputButtonKeyCode keyCode);
+ QList<HbInputButton*> buttons() const;
+ HbInputButton *button(int index) const;
+ HbInputButton *button(int column, int row) const;
+ HbInputButton *button(HbInputButton::HbInputButtonKeyCode keyCode) const;
+
+ void setCustomButtonActions(const QList<HbAction*> &actions);
+ QList<HbAction*> customButtonActions() const;
+
+ void setButtonBorderSize(qreal borderSize);
+ qreal buttonBorderSize() const;
+
+ void setButtonPreviewEnabled(bool enabled);
+ bool isButtonPreviewEnabled() const;
+ void setCharacterSelectionPreviewEnabled(bool enabled);
+ bool isCharacterSelectionPreviewEnabled() const;
+
+ void setMultiTouchEnabled(bool enabled);
+ bool isMultiTouchEnabled() const;
+
+ void setBackground(HbFrameDrawer *background);
+
+ QList<HbKeyPressProbability> buttonProbabilities() const;
+
+public: // From QGraphicsItem
+ void setEnabled(bool enabled);
+ bool isEnabled() const;
+
+public: // From QGraphicsLayoutItem
+ void setGeometry(const QRectF &rect);
+
+protected: // From QGraphicsItem
+ void paint(QPainter* painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+ bool sceneEvent(QEvent *event);
+ void changeEvent(QEvent *event);
+ void showEvent(QShowEvent *event);
+ void hideEvent(QHideEvent *event);
+ int type() const { return Hb::ItemType_InputButtonGroup; }
+
+protected:
+ HbInputButtonGroup(HbInputButtonGroupPrivate &dd, QGraphicsItem *parent = 0);
+ HbInputButtonGroup(HbInputButtonGroupPrivate &dd, const QSize &size, QGraphicsItem *parent = 0);
+
+public slots:
+ virtual void cancelButtonPress();
+
+protected slots:
+ virtual void emitButtonPressed(const QKeyEvent &event);
+ virtual void emitButtonDoublePressed(const QKeyEvent &event);
+ virtual void emitButtonReleased(const QKeyEvent &event);
+ virtual void emitButtonLongPressed(const QKeyEvent &event);
+ virtual void emitPressedButtonChanged(const QKeyEvent &releaseEvent, const QKeyEvent &pressEvent);
+
+signals:
+ void buttonPressed(const QKeyEvent &event);
+ void buttonDoublePressed(const QKeyEvent &event);
+ void buttonReleased(const QKeyEvent &event);
+ void buttonLongPressed(const QKeyEvent &event);
+ void pressedButtonChanged(const QKeyEvent &releaseEvent, const QKeyEvent &pressEvent);
+
+private slots:
+ void longPressEvent();
+ void updateCustomButtons();
+
+private:
+ Q_DECLARE_PRIVATE_D(d_ptr, HbInputButtonGroup)
+ Q_DISABLE_COPY(HbInputButtonGroup)
+};
+
+#endif // HB_INPUT_BUTTON_GROUP_H
+
+// End of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbinput/inputwidgets/hbinputbuttongroup_p.h Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,110 @@
+/****************************************************************************
+**
+** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (developer.feedback@nokia.com)
+**
+** This file is part of the HbInput module of the UI Extensions for Mobile.
+**
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at developer.feedback@nokia.com.
+**
+****************************************************************************/
+
+#ifndef HB_INPUT_BUTTON_GROUP_PRIVATE_H
+#define HB_INPUT_BUTTON_GROUP_PRIVATE_H
+
+#include "hbwidget_p.h"
+
+#include "hbinputbuttongroup.h"
+#include "hbinputbutton.h"
+
+class HB_INPUT_PRIVATE_EXPORT HbInputButtonGroupPrivate : public HbWidgetPrivate
+{
+ Q_DECLARE_PUBLIC(HbInputButtonGroup)
+
+public:
+
+ enum HbInputButtonTextType {
+ ButtonTextTypeSingle,
+ ButtonTextTypePrimary,
+ ButtonTextTypeSecondaryFirstRow,
+ ButtonTextTypeSecondarySecondRow,
+ ButtonTextTypeLabel
+ };
+
+ HbInputButtonGroupPrivate();
+ ~HbInputButtonGroupPrivate();
+
+ virtual void updateGraphics(const QSizeF &size);
+ virtual void updateTextLayouts(const QSizeF &size);
+ virtual void updateCustomActions();
+ virtual void updateButtonGrid(const QSizeF &size);
+ virtual void updateColorArray();
+
+ virtual void showButtonPreview(HbInputButton * const item);
+ virtual void hideButtonPreview(HbInputButton * const item);
+ virtual void showCharacterSelectionPreview(HbInputButton * const item);
+
+ virtual void pressEvent(const QPointF &position, bool emitSignal = true);
+ virtual void doublePressEvent(const QPointF &position, bool emitSignal = true);
+ virtual void moveEvent(const QPointF &oldPosition, const QPointF &newPosition);
+ virtual void releaseEvent(const QPointF &position, bool emitSignal = true);
+ virtual void longPressEvent();
+
+ virtual void calculateButtonProbabilities(const QPointF &position);
+
+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);
+ virtual void createSecondaryTextLayout(int index, const QHash<int, QString> &textContentt, const QSizeF &size);
+
+ virtual void layoutTextLine(HbInputButtonTextType textType, const HbInputButton *button, const QSizeF &cellSize,
+ QTextLine &textLine, const QSizeF &textSize);
+
+ virtual QString buttonGraphics(HbInputButton::HbInputButtonType type, HbInputButton::HbInputButtonState state);
+ virtual QString buttonColor(HbInputButton::HbInputButtonType type, HbInputButton::HbInputButtonState state);
+
+ virtual qreal fontSize(HbInputButtonTextType textType);
+
+ void startLongPress(int index);
+ void cancelLongPress(int index);
+
+public:
+ qreal mUnitValue;
+ QList<HbFrameDrawer*> mButtonDrawers;
+ QList<QTextLayout*> mTextLayouts;
+ QList<QColor> mColors;
+ QList<QTimer*> mLongPressTimers;
+ QList<int> mLongPressButtons;
+ QSize mGridSize;
+ QList<HbInputButton*> mButtonData;
+ QList<int> mUsedCustomButtons;
+ QList<HbAction*> mCustomActions;
+ QHash<QPair<int, int>, int> mButtonGridPositions;
+ qreal mButtonBorderSize;
+ bool mEnabled;
+ bool mButtonPreviewEnabled;
+ bool mCharacterSelectionPreviewEnabled;
+ bool mMultiTouchEnabled;
+ QHash<int, HbInputButtonGroup*> mButtonPreview;
+ HbDialog *mCharacterSelectionPreview;
+ HbFrameDrawer *mBackground;
+ QList<HbKeyPressProbability> mProbabilities;
+};
+
+#endif // HB_INPUT_BUTTON_GROUP_PRIVATE_H
+
+// End of file
--- a/src/hbinput/inputwidgets/hbinputcandidatelist.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputcandidatelist.cpp Fri May 14 16:09:54 2010 +0300
@@ -72,6 +72,7 @@
int numCandidates;
int longestStringWidth;
HbFrameItem *mFrameBackground;
+ bool mCandidateCommitted;
};
HbCandidateListPrivate::HbCandidateListPrivate(HbInputMethod* input)
@@ -79,7 +80,8 @@
numRows(HbCandListDefaultNumRows),
numCandidates(0),
longestStringWidth(0),
- mFrameBackground(0)
+ mFrameBackground(0),
+ mCandidateCommitted(false)
{
Q_Q(HbCandidateList);
@@ -164,7 +166,6 @@
d->setPriority(HbPopupPrivate::VirtualKeyboard + 1); // Should be shown on top of virtual keyboard.
d->initFrameIcon();
-#if QT_VERSION >= 0x040600
// Make sure the preview pane never steals focus.
setFlag(QGraphicsItem::ItemIsPanel, true);
setActive(false);
@@ -173,7 +174,6 @@
QGraphicsDropShadowEffect *effect = new QGraphicsDropShadowEffect;
effect->setBlurRadius(8);
setGraphicsEffect(effect);
-#endif
setTimeout(NoTimeout);
setAttribute(Qt::WA_InputMethodEnabled, false);
@@ -242,7 +242,10 @@
|| event->key() == Qt::Key_Return
|| event->key() == Qt::Key_Right
|| event->key() == Qt::Key_Left) {
- d->mInput->candidatePopupClosed(event->key());
+ if (!d->mCandidateCommitted) {
+ emit candidateSelected(event->key(), currentCandidate());
+ d->mCandidateCommitted = true;
+ }
hide();
}
}
@@ -263,8 +266,10 @@
{
Q_UNUSED(item);
Q_D(HbCandidateList);
-
- d->mInput->candidatePopupClosed();
+ if (!d->mCandidateCommitted) {
+ emit candidateSelected(0, currentCandidate());
+ d->mCandidateCommitted = true;
+ }
hide();
}
@@ -293,6 +298,8 @@
*/
void HbCandidateList::hideEvent(QHideEvent * event)
{
+ Q_D(HbCandidateList);
+ d->mCandidateCommitted = false;
HbDialog::hideEvent(event);
}
--- a/src/hbinput/inputwidgets/hbinputcandidatelist.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputcandidatelist.h Fri May 14 16:09:54 2010 +0300
@@ -51,6 +51,7 @@
signals:
void candidatePopupCancelled();
+ void candidateSelected(int key, const QString &candidate);
protected:
void closeEvent(QCloseEvent* event);
--- a/src/hbinput/inputwidgets/hbinputcharpreviewpane.cpp Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,408 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbInput module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-// Qt includes
-#include <QGraphicsLinearLayout>
-#include <QSignalMapper>
-#include <QPainter>
-#include <QSizePolicy>
-#include <QGraphicsDropShadowEffect>
-
-#include <hbeffect.h>
-#include <hbinputsettingproxy.h>
-#include <hbmainwindow.h>
-#include <hbcolorscheme.h>
-#include <hbframedrawer.h>
-#include <hbframeitem.h>
-#include <hbdeviceprofile.h>
-#include <private/hbdialog_p.h>
-#include <hbtextitem.h>
-#include <hbmainwindow.h>
-#include <hbinstance.h>
-
-#include "hbinputpreviewlabel.h"
-#include "hbinputcharpreviewpane.h"
-
-const int HbPreviewZoomDelta = 7;
-const qreal HbPreviewBoundaryDelta = 1.5;
-const qreal HbBoundaryLabelWidthFactor = 0.75;
-const qreal HbLabelwidthFactor = 0.50;
-
-/// @cond
-
-/*
-Character preview widget for Accented characters.
-Implements character preview for characters mapped in the preview Pane.
-*/
-class HbAccentedCharPreviewPane: public HbWidget
-{
-public:
- /*!
- Constructor.
- @param parent of the widget.
- */
- HbAccentedCharPreviewPane(QGraphicsItem *parent = 0)
- :HbWidget(parent),
- mTextItem(0)
- {
- HbFrameItem *n = new HbFrameItem(parent);
- n->frameDrawer().setFrameType(HbFrameDrawer::ThreePiecesHorizontal);
- n->frameDrawer().setFrameGraphicsName("qtg_fr_character_preview");
-
-
- setBackgroundItem( n );
- mTextItem = static_cast<HbTextItem*>(style()->createPrimitive(HbStyle::P_Label_text, this));
- }
- /*!
- update the text and frame primitives
- */
- void updatePrimitives()
- {
- HbWidget::updatePrimitives();
- if (mTextItem) {
- mTextItem->setFontSpec(HbFontSpec(HbFontSpec::Primary));
- mTextItem->setAlignment(Qt::AlignCenter);
- }
- }
- /*!
- Destroys the object.
- */
- ~HbAccentedCharPreviewPane() {
- }
-
-public:
- HbTextItem* mTextItem;
-};
-
-class HbCharPreviewPanePrivate: public HbDialogPrivate
-{
- Q_DECLARE_PUBLIC(HbCharPreviewPane)
-
-public:
- HbCharPreviewPanePrivate();
- ~HbCharPreviewPanePrivate();
- void clearCharacters();
- void updateCharacters();
- void init();
-
-// private slots
- void _q_showAccentedPreviewPane(QString character, QRectF sceneBoundingRect);
- void _q_hideAccentedPreviewPane();
- void _q_hidePreviewPanePopup();
-public:
- QStringList mCharacterList;
- QSignalMapper *mReleaseMapper;
- QGraphicsLinearLayout* mCandLayout;
- QSizeF mItemSize;
- HbAccentedCharPreviewPane* mAccentedPreviewPane;
-};
-
-void HbCharPreviewPanePrivate::init()
-{
- Q_Q(HbCharPreviewPane);
-
- HbFrameItem *n = new HbFrameItem( q );
- n->frameDrawer().setFrameType(HbFrameDrawer::ThreePiecesHorizontal);
- n->frameDrawer().setFrameGraphicsName("qtg_fr_character_preview");
-
- q->setBackgroundItem( n );
-}
-
-HbCharPreviewPanePrivate::HbCharPreviewPanePrivate()
- : mReleaseMapper(0),
- mCandLayout(0)
-{
- mAccentedPreviewPane = new HbAccentedCharPreviewPane();
-}
-
-HbCharPreviewPanePrivate::~HbCharPreviewPanePrivate()
-{
- if(mAccentedPreviewPane) {
- delete mAccentedPreviewPane;
- }
- if(mReleaseMapper) {
- delete mReleaseMapper;
- }
-}
-
-void HbCharPreviewPanePrivate::clearCharacters()
-{
- Q_Q(HbCharPreviewPane);
- for (int i = mCandLayout->count() - 1; i >= 0; i--) {
- QGraphicsLayoutItem* layoutitem = mCandLayout->itemAt(i);
- mCandLayout->removeAt(i);
- delete layoutitem;
- }
- mCandLayout->updateGeometry();
- q->adjustSize();
-}
-
-void HbCharPreviewPanePrivate::updateCharacters()
-{
- Q_Q(HbCharPreviewPane);
- // need to set the minimum size to an invalid value here in order to make sure that the size does not become 0
- mCandLayout->setMinimumSize(-1,-1);
- for (int i = 0; i < mCharacterList.count(); i++) {
- HbPreviewLabel* label = new HbPreviewLabel(mCharacterList[i]);
- label->setPreferredHeight(mItemSize.height() + HbPreviewZoomDelta);
- if (mCharacterList.count() > 1 && i != mCharacterList.count()-1) {
- label->setPreferredWidth(HbBoundaryLabelWidthFactor * mItemSize.width());
- label->setTextGeometry(mItemSize.width(), mItemSize.height());
- } else {
- label->setPreferredWidth(HbLabelwidthFactor * mItemSize.width());
- label->setTextGeometry(mItemSize.width(), mItemSize.height());
- }
-
- QObject::connect(label, SIGNAL(showAccentedPreview(QString,QRectF)), q, SLOT(_q_showAccentedPreviewPane(QString,QRectF)));
- QObject::connect(label, SIGNAL(selected()), mReleaseMapper, SLOT(map()));
- QObject::connect(label, SIGNAL(hideAccentedPreview()), q, SLOT(_q_hideAccentedPreviewPane()));
- QObject::connect(label, SIGNAL(hidePreview()), q, SLOT(_q_hidePreviewPanePopup()));
- mReleaseMapper->setMapping(label, mCharacterList[i]);
- mCandLayout->addItem(label);
- mCandLayout->setItemSpacing(i, 0.0);
- }
-
- mCandLayout->setContentsMargins(mItemSize.width() / 4, 0, mItemSize.width() / 4, 0);
- mCandLayout->updateGeometry();
- q->adjustSize();
-}
-
-/*!
-Sets the character for preview and shows in it's Pane.
-@param character The character for preview.
-@param itemSceneBoundingRect of the QGraphicsItem.
-*/
-void HbCharPreviewPanePrivate::_q_showAccentedPreviewPane(QString character, QRectF itemSceneBoundingRect)
-{
- Q_Q(HbCharPreviewPane);
- mAccentedPreviewPane->setZValue(q->zValue()+1);
- q->scene()->addItem(mAccentedPreviewPane);
- // let's validate.
- if (!itemSceneBoundingRect.isValid()) {
- return;
- }
- QColor color = HbColorScheme::color("qtc_editor_normal");
- // we need to show the accented char preview preview just above the
- // passed QRectF of the item which is passed.
- QPointF pos = itemSceneBoundingRect.topLeft();
- pos.setY(pos.y() - mItemSize.height() + HbPreviewZoomDelta + HbPreviewBoundaryDelta);
-
- // let's adjust x position of the character preview pane so that it
- // is aligned at the center of the items for which we want to show
- // the preview.
- pos.setX(itemSceneBoundingRect.x() - itemSceneBoundingRect.width()/4);
-
- // set final position for the character preview pane
- mAccentedPreviewPane->setPos(pos);
- mAccentedPreviewPane->mTextItem->setText(character);
- if (color.isValid()) {
- mAccentedPreviewPane->mTextItem->setTextColor(color);
- }
- mAccentedPreviewPane->updatePrimitives();
- QSizeF paneSize = itemSceneBoundingRect.size();
- QRectF rect;
- rect.setWidth(HbBoundaryLabelWidthFactor * mItemSize.width());
- rect.setHeight(mItemSize.height());
- rect.setY(paneSize.height()/2 - mItemSize.height()/2 - HbPreviewZoomDelta - HbPreviewBoundaryDelta);
- mAccentedPreviewPane->mTextItem->setGeometry(rect);
-
- // show it!
- mAccentedPreviewPane->show();
-}
-/*
-hides the accented single character preview pane whenever user tries to hover on it
-as the the character is inputed in the editor only when mouse is released from preview pane
-*/
-void HbCharPreviewPanePrivate::_q_hideAccentedPreviewPane()
-{
- mAccentedPreviewPane->hide();
-}
-
-/*
-hides the accented single character preview pane as well as charcters Preview Pane
-*/
-void HbCharPreviewPanePrivate::_q_hidePreviewPanePopup()
-{
- Q_Q(HbCharPreviewPane);
- mAccentedPreviewPane->hide();
- if (q->isVisible()) {
- q->hide();
- }
-}
-
-/// @endcond
-
-/*!
-@proto
-@hbinput
-\class HbCharPreviewPane
-\deprecated class HbCharPreviewPane
-\brief Character preview widget for virtual keyboards.
-
-
-Implements character preview for virtual keyboards. Shows a list of clickable
-characters and maps the clicks to owning keyboard's charFromPreviewSelected slot.
-For first level of preview popup we have a linear layout, we create a HbPreviewLabel
-and add the labels to this layout. For second level of preview popup as user clicks
-on the lebel of preview pane we display preview of the accented character on the preview pane.
-
-\sa HbInputVkbWidget
-\sa HbPreviewLabel
-*/
-
-/*!
-\deprecated HbCharPreviewPane::HbCharPreviewPane(QGraphicsItem*)
- is deprecated.
-*/
-HbCharPreviewPane::HbCharPreviewPane(QGraphicsItem* parent)
- : HbDialog(*new HbCharPreviewPanePrivate, parent)
-{
- Q_D(HbCharPreviewPane);
-
- d->q_ptr = this;
-
- d->mCandLayout = new QGraphicsLinearLayout(Qt::Horizontal);
- setLayout(d->mCandLayout);
-
- d->setPriority(HbPopupPrivate::VirtualKeyboard + 1); // Should be visible on top of VKB
-
- // set some properties
- setFocusPolicy(Qt::ClickFocus);
- setModal(false);
- setDismissPolicy(HbPopup::TapAnywhere);
- setBackgroundFaded(false);
-
-#if QT_VERSION >= 0x040600
- // Make sure the preview pane never steals focus.
- setFlag(QGraphicsItem::ItemIsPanel, true);
- setActive(false);
-
- // enable drop shadow for the preview pane
- QGraphicsDropShadowEffect *effect = new QGraphicsDropShadowEffect;
- effect->setBlurRadius(8);
- setGraphicsEffect(effect);
-#endif
-
- // signal mapper for getting events
- d->mReleaseMapper = new QSignalMapper(this);
-
- QObject::connect(d->mReleaseMapper, SIGNAL(mapped(QString)), this, SIGNAL(charFromPreviewSelected(QString)));
- setTimeout(NoTimeout);
- d->init();
-
- // This is important we need to switch off all the effects.
- // if we dont switch off the effect, and if there is a call to 'show' while a 'hide' animation is
- // in progress the hide call will be ignored.
- // this will lead to a problem where we will not able to see all the character
- // preview in case the user is typing very fast.
-#ifdef HB_EFFECTS
- HbEffect::disable(this);
-#endif // HB_EFFECTS
-}
-
-/*!
-\deprecated HbCharPreviewPane::~HbCharPreviewPane()
- is deprecated.
-*/
-HbCharPreviewPane::~HbCharPreviewPane()
-{
-}
-
-/*!
-\deprecated HbCharPreviewPane::showCharacters(const QStringList&, const QRectF &)
- is deprecated.
-*/
-void HbCharPreviewPane::showCharacters(const QStringList& characterList, const QRectF &itemSceneBoundingRect)
-{
- Q_D(HbCharPreviewPane);
- // let's validate.
- if (!itemSceneBoundingRect.isValid()) {
- return;
- }
-
- if (characterList.size() > 1) {
- setModal(true);
- } else {
- setModal(false);
- }
-
- d->mCharacterList = characterList;
- // let's store items size.
- d->mItemSize = itemSceneBoundingRect.size();
-
- // we need to clear previous character.
- d->clearCharacters();
-
- // update new candidates
- d->updateCharacters();
-
- updateGeometry();
-
- // we need to show the preview just above the
- // passed QRectF of the item which is passed.
- QPointF pos = itemSceneBoundingRect.topLeft();
- pos.setY(pos.y() - size().height());
-
- // let's adjust x position of the character preview pane so that it
- // is aligned at the center of the items for which we want to show
- // the preview.
- pos.setX(itemSceneBoundingRect.center().x() - size().width()/2);
-
- // We need to adjust the character preview pane's postion
- // such that it is visible in in the current screen.
- if (pos.x() < 0) {
- pos.setX(0);
- } else {
- const int screenWidth = HbDeviceProfile::profile(this).logicalSize().width();
- const qreal requiredWidth = pos.x() + (geometry().width());
- if ( requiredWidth > screenWidth) {
- pos.setX(screenWidth-(geometry().width()));
- }
- }
-
- // set final position for the character preview pane
- setPos(pos);
-
- // we need to reset mousePressLocation to None.
- // We are handling character preview pane a bit differently than a usual popup.
- // A HbDialog closes the popup on a mouse release. And there is a problem when we
- // have long pressed on a button and the preview pane is showing set of characters,
- // same time if we do a long press on another button preview will be shown on the next
- // button but as soon as we release the button HbDialog's internal logic closes the
- // preview pane. since popup closes on mouse release event. To aviod this situation we
- // need to reset mousePressLocation. Since this behaviour is very specific to preview pane
- // we need to fix it here.
- d->mousePressLocation = HbPopupPrivate::None;
-
- // set the background as a panel if the foreground is a panel to provide focus handling
- if ((flags() & QGraphicsItem::ItemIsPanel) && isModal()) {
- d->backgroundItem->setFlag(QGraphicsItem::ItemIsPanel);
- }
- // show it!
- show();
-}
-
-#include "moc_hbinputcharpreviewpane.cpp"
-// End Of File
-
--- a/src/hbinput/inputwidgets/hbinputcharpreviewpane.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbInput module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#ifndef HB_INPUT_CHAR_PREVIEW_PANE_H
-#define HB_INPUT_CHAR_PREVIEW_PANE_H
-
-
-#include <hbinputdef.h>
-#include <hbdialog.h>
-
-class HbCharPreviewPanePrivate;
-
-class HB_INPUT_EXPORT HbCharPreviewPane : public HbDialog
-{
- Q_OBJECT
-
-public:
- explicit HbCharPreviewPane(QGraphicsItem* parent = NULL);
- virtual ~HbCharPreviewPane();
-
- void showCharacters(const QStringList& characterList, const QRectF &itemSceneBoundingRect);
-
- enum { Type = Hb::ItemType_InputCharPreviewPane };
- int type() const { return Type; }
-
-signals:
- void charFromPreviewSelected(QString character);
-
-private:
- Q_DECLARE_PRIVATE_D(d_ptr, HbCharPreviewPane)
- Q_DISABLE_COPY(HbCharPreviewPane)
-
- Q_PRIVATE_SLOT(d_func(), void _q_showAccentedPreviewPane(QString, QRectF))
- Q_PRIVATE_SLOT(d_func(), void _q_hideAccentedPreviewPane())
- Q_PRIVATE_SLOT(d_func(), void _q_hidePreviewPanePopup())
-};
-
-#endif // HB_INPUT_CHAR_PREVIEW_PANE_H
--- a/src/hbinput/inputwidgets/hbinputcommondialogs.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputcommondialogs.cpp Fri May 14 16:09:54 2010 +0300
@@ -26,7 +26,7 @@
#include <QtAlgorithms>
#include <hbinputdef.h>
-#include <hblistdialog.h>
+#include <hbselectiondialog.h>
#include <hblistwidgetitem.h>
#include <hbinpututils.h>
#include <hbinputsettingproxy.h>
@@ -51,7 +51,7 @@
*/
HbInputLanguage HbInputCommonDialogs::showLanguageSelectionDialog(QLocale::Language selectedLanguage, const QList<HbInputLanguage> languageList)
{
- HbListDialog* langDialog = new HbListDialog();
+ HbSelectionDialog* langDialog = new HbSelectionDialog();
langDialog->setObjectName("Language dialog");
#if QT_VERSION >= 0x040600
@@ -80,7 +80,7 @@
item = new HbListWidgetItem();
item->setText(langName);
if (language == currentLang ) {
- QList<int> selected;
+ QList<QVariant> selected;
selected.append(listItems.count());
langDialog->setSelectedItems(selected);
}
@@ -96,11 +96,11 @@
langDialog->setSelectionMode(HbAbstractItemView::SingleSelection);
langDialog->setDismissPolicy(HbPopup::NoDismiss);
langDialog->setModal(true);
- langDialog->exec();
+ //langDialog->exec(); TODO
//TODO: needed to check from action which button was pressed (ok, cancel)
//HbAction* action = langDialog->exec();
if (langDialog->selectedItems().count()) {
- int selection = langDialog->selectedItems().at(0);
+ int selection = langDialog->selectedItems().at(0).toInt();
HbInputLanguage result;
if(languages.at(selection).language() == QLocale::Chinese) {
result = languages.at(selection);
@@ -122,7 +122,7 @@
{
Q_UNUSED(language);
- HbListDialog* methodDialog = new HbListDialog();
+ HbSelectionDialog* methodDialog = new HbSelectionDialog();
methodDialog->setObjectName("Input method dialog");
#if QT_VERSION >= 0x040600
@@ -153,13 +153,13 @@
methodDialog->setSelectionMode(HbAbstractItemView::SingleSelection);
methodDialog->setDismissPolicy(HbPopup::NoDismiss);
methodDialog->setModal(true);
- methodDialog->exec();
+ //methodDialog->exec(); TODO
//TODO: needed to check from action which button was pressed (ok, cancel)
//HbAction* action = langDialog->exec();
HbInputMethodDescriptor result;
if (methodDialog->selectedItems().count()) {
- int selection = methodDialog->selectedItems().first();
+ int selection = methodDialog->selectedItems().first().toInt();
if (selection == 0) {
result.setDefault();
} else {
--- a/src/hbinput/inputwidgets/hbinputcustombuttonlist.cpp Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,207 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbInput module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#include <QGraphicsLinearLayout>
-#if QT_VERSION >= 0x040600
-#include <QGraphicsDropShadowEffect>
-#endif
-
-#include <hbinputvkbwidget.h>
-#include <hbaction.h>
-#include "hbinputtouchkeypadbutton.h"
-#include "hbinputcustombuttonlist.h"
-#include "hbdialog_p.h"
-
-/// @cond
-
-
-class HbInputCustomButtonListPrivate : public HbDialogPrivate
-{
-public:
- HbInputCustomButtonListPrivate(HbInputVkbWidget* owner) : mOwner(owner) {};
- ~HbInputCustomButtonListPrivate() {};
-public:
- HbInputVkbWidget* mOwner;
- QList<HbTouchKeypadButton*> mButtonList;
-};
-
-
-
-/// @endcond
-
-/*!
-\deprecated HbInputCustomButtonList::HbInputCustomButtonList(QList<HbAction*>&, HbInputVkbWidget*, QGraphicsWidget*)
- is deprecated. HbInputCustomButtonList will be removed.
-*/
-HbInputCustomButtonList::HbInputCustomButtonList(QList<HbAction*>& actionList, HbInputVkbWidget* owner,
- QGraphicsWidget* parent)
- : HbDialog(*new HbInputCustomButtonListPrivate(owner), parent)
-{
- Q_D(HbInputCustomButtonList);
-
- d->setPriority(HbPopupPrivate::VirtualKeyboard + 1); // Should be shown on top of virtual keyboard.
-
- QGraphicsLinearLayout *linearLayout = new QGraphicsLinearLayout(Qt::Horizontal);
-
- QGraphicsWidget* contextWidget = new QGraphicsWidget;
- linearLayout->setContentsMargins(0.0, 0.0, 0.0, 0.0);
- linearLayout->setSpacing(0.0);
- contextWidget->setLayout(linearLayout);
-
-#if QT_VERSION >= 0x040600
- // Make sure the custom button list never steals focus.
- setFlag(QGraphicsItem::ItemIsPanel, true);
- setActive(false);
-
- // enable drop shadow for the preview pane
-// Effect deletion is crashing -> Effect temporarily removed
-// QGraphicsDropShadowEffect *effect = new QGraphicsDropShadowEffect;
-// effect->setBlurRadius(8);
-// setGraphicsEffect(effect);
-#endif
-
- setContentWidget(contextWidget);
-
- // set default values for popup
- setTimeout(HbDialog::NoTimeout);
- layout()->setContentsMargins(0.0, 0.0, 0.0, 0.0);
- setBackgroundFaded(false);
- setDismissPolicy(TapAnywhere);
- setModal(false);
-
- updateActions(actionList);
-}
-
-/*!
-\deprecated HbInputCustomButtonList::~HbInputCustomButtonList()
- is deprecated. HbInputCustomButtonList will be removed.
-*/
-HbInputCustomButtonList::~HbInputCustomButtonList()
-{
-}
-
-
-/*!
-\deprecated HbInputCustomButtonList::updateActions(QList<HbAction*>&)
- is deprecated. HbInputCustomButtonList will be removed.
-*/
-void HbInputCustomButtonList::updateActions(QList<HbAction*>& newActions)
-{
- Q_D(HbInputCustomButtonList);
-
- QGraphicsLinearLayout* layout = static_cast<QGraphicsLinearLayout*>(contentWidget()->layout());
- int j = 0;
-
- // create new buttons
- for(int i=0; i<newActions.count(); i++)
- {
- HbTouchKeypadButton* button = 0;
-
- if (newActions.at(i)->isVisible()) {
- if (j < d->mButtonList.count()){
- // update old button
- button = d->mButtonList.at(j);
- button->disconnect(SIGNAL(clicked()));
- button->setText(newActions.at(i)->text());
- button->setIcon(newActions.at(i)->icon());
- } else {
- // create new button
- if (!newActions.at(i)->icon().isNull()) {
- button = new HbTouchKeypadButton(d->mOwner, newActions.at(i)->icon(), newActions.at(i)->text(), this);
- } else {
- button = new HbTouchKeypadButton(d->mOwner, newActions.at(i)->text(), this);
- }
- d->mButtonList.append(button);
- layout->addItem(button);
- }
-
- button->setButtonType(HbTouchKeypadButton::HbTouchButtonNormal);
- button->setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonReleased);
- if (newActions.at(i)->text().isEmpty()) {
- button->setObjectName( "Custom button list button " + QString::number(i));
- } else {
- button->setObjectName( "Custom button list " + newActions.at(i)->text());
- }
- button->setToolTip(newActions.at(i)->toolTip());
- button->setEnabled(newActions.at(i)->isEnabled());
-
- // make click connection
- connect(button, SIGNAL(clicked()), newActions.at(i), SLOT(trigger()));
- ++j;
- }
- }
-
- // remove extra buttons from layout
- while(j < d->mButtonList.count()) {
- HbTouchKeypadButton* button = d->mButtonList.at(j);
- d->mButtonList.removeAt(j);
- layout->removeItem(button);
- button->disconnect(SIGNAL(clicked()));
- delete button;
- }
-}
-
-/*!
-\deprecated HbInputCustomButtonList::count()
- is deprecated. HbInputCustomButtonList will be removed.
-*/
-int HbInputCustomButtonList::count()
-{
- Q_D(HbInputCustomButtonList);
- return d->mButtonList.count();
-}
-
-/*!
-\deprecated HbInputCustomButtonList::orientation()
- is deprecated. HbInputCustomButtonList will be removed.
-*/
-Qt::Orientation HbInputCustomButtonList::orientation()
-{
- return static_cast<QGraphicsLinearLayout*>(contentWidget()->layout())->orientation();
-}
-
-/*!
-\deprecated HbInputCustomButtonList::setOrientation(Qt::Orientation)
- is deprecated. HbInputCustomButtonList will be removed.
-*/
-void HbInputCustomButtonList::setOrientation(Qt::Orientation orientation)
-{
- static_cast<QGraphicsLinearLayout*>(contentWidget()->layout())->setOrientation(orientation);
- updatePrimitives();
-}
-
-/*!
-\deprecated HbInputCustomButtonList::setGeometry(const QRectF&)
- is deprecated. HbInputCustomButtonList will be removed.
-
-\reimp
-*/
-void HbInputCustomButtonList::setGeometry(const QRectF & rect)
-{
- // Override HbDialog setGeometry, which would center the widget.
- QGraphicsWidget::setGeometry(rect);
-}
-
-// End of file
--- a/src/hbinput/inputwidgets/hbinputcustombuttonlist.h Mon May 03 12:48:33 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 HbInput module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#ifndef HB_INPUT_CUSTOM_BUTTON_LIST_H
-#define HB_INPUT_CUSTOM_BUTTON_LIST_H
-
-#include <hbdialog.h>
-
-class HbAction;
-class HbInputVkbWidget;
-class HbInputCustomButtonListPrivate;
-
-class HB_INPUT_EXPORT HbInputCustomButtonList : public HbDialog
-{
- Q_OBJECT
-
-public:
- HbInputCustomButtonList(QList<HbAction*>& actions, HbInputVkbWidget* owner, QGraphicsWidget* parent = 0);
- Qt::Orientation orientation();
- void setOrientation(Qt::Orientation orientation);
- void updateActions(QList<HbAction*>& newActions);
- int count();
- virtual ~HbInputCustomButtonList();
-
-public: // From QGraphicsWidget
- virtual void setGeometry(const QRectF & rect);
-
-signals:
- void customButtonPressed(int buttonId);
- void customButtonReleased(int buttonId);
-
-private:
- Q_DECLARE_PRIVATE_D(d_ptr, HbInputCustomButtonList)
- Q_DISABLE_COPY(HbInputCustomButtonList)
-};
-
-#endif // HB_INPUT_CUSTOM_BUTTON_LIST_H
-
-// End of file
--- a/src/hbinput/inputwidgets/hbinputexactwordpopup.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputexactwordpopup.cpp Fri May 14 16:09:54 2010 +0300
@@ -35,7 +35,7 @@
#include "hbdeviceprofile.h"
#include "hbdialog.h"
#include "hblabel.h"
-#include "hbstyleoptionlabel.h"
+#include "hbstyleoptionlabel_p.h"
#include "hbinputexactwordpopup.h"
#include "hbiconitem.h"
#include "hbinputsettingproxy.h"
--- a/src/hbinput/inputwidgets/hbinputhwtoolcluster.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputhwtoolcluster.cpp Fri May 14 16:09:54 2010 +0300
@@ -37,7 +37,6 @@
#include "hbinputvkbwidget_p.h"
#include "hbinputhwtoolcluster.h"
-#include "hbinputtouchkeypadbutton.h"
#include "hbinputmodeindicator.h"
const QString HbCustomButtonObjName = "Mini VKB custom button ";
@@ -67,14 +66,9 @@
HbHwToolClusterPrivate();
~HbHwToolClusterPrivate();
public:
- HbTouchKeypadButton *mLanguageButton;
- HbTouchKeypadButton *mInputMethodButton;
- HbTouchKeypadButton *mPredictionIndicatorButton;
};
-HbHwToolClusterPrivate::HbHwToolClusterPrivate() : mLanguageButton(0),
- mInputMethodButton(0),
- mPredictionIndicatorButton(0)
+HbHwToolClusterPrivate::HbHwToolClusterPrivate()
{
}
@@ -104,34 +98,6 @@
*/
void HbHwToolCluster::createLayout()
{
- setupToolCluster();
-
- Q_D(HbHwToolCluster);
- // The layout is already created. So just return.
- if ( d->mButtonLayout ) {
- return;
- }
-
- d->mButtonLayout = new QGraphicsGridLayout();
- setContentsMargins(0.0, 0.0, 0.0, 0.0);
- d->mButtonLayout->setContentsMargins(0.0, 0.0, 0.0, 0.0);
- d->mButtonLayout->setHorizontalSpacing(HorizontalSpacing);
- d->mButtonLayout->setVerticalSpacing(VerticalSpacing);
- d->mButtonLayout->addItem(d->mSettingsButton, 0, 0); // Settings key
- d->mButtonLayout->addItem(d->mLanguageButton, 0, 1); // language selection
- d->mButtonLayout->addItem(d->mPredictionIndicatorButton, 0, 2); // prediction indicator
- d->mButtonLayout->addItem(d->mInputMethodButton, 0, 3); //input method selection key
- d->mButtonLayout->addItem(d->mApplicationButton, 0, 4); // Application specific key
-
- d->mSettingsButton->setObjectName( HbCustomButtonObjName + QString::number(1));
- d->mApplicationButton->setObjectName( HbCustomButtonObjName + QString::number(2));
- d->mLanguageButton->setObjectName( HbCustomButtonObjName + QString::number(3));
- d->mInputMethodButton->setObjectName( HbCustomButtonObjName + QString::number(4));
- d->mPredictionIndicatorButton->setObjectName( HbCustomButtonObjName + QString::number(5));
-
- connect(d->mInputMethodButton, SIGNAL(clicked()), this, SLOT(showMethodDialog()));
- connect(d->mLanguageButton, SIGNAL(clicked()), this, SLOT(showLanguageDialog()));
- connect(d->mPredictionIndicatorButton, SIGNAL(clicked()), HbInputSettingProxy::instance(), SLOT(togglePrediction()));
}
@@ -140,83 +106,6 @@
*/
void HbHwToolCluster::setupToolCluster()
{
- Q_D(HbHwToolCluster);
- if(!d->mOwner || !d->mOwner->focusObject()) {
- return;
- }
-
- // Create buttons if they do not exist
- if (!d->mSettingsButton) {
- d->mSettingsButton = new HbTouchKeypadButton(this, QString(""));
- d->mSettingsButton->setIcon(HbIcon(settingsIcon));
- d->mSettingsButton->setButtonType(HbTouchKeypadButton::HbTouchButtonFunction);
- d->mSettingsButton->setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonReleased);
-
- connect(d->mSettingsButton, SIGNAL(clicked()), this, SLOT(showSettingList()));
- }
- if(!d->mLanguageButton) {
- d->mLanguageButton = new HbTouchKeypadButton(this, QString(""));
- d->mLanguageButton->setButtonType(HbTouchKeypadButton::HbTouchButtonFunction);
- d->mLanguageButton->setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonReleased);
- }
-
- if(!d->mInputMethodButton) {
- d->mInputMethodButton = new HbTouchKeypadButton(this, QString(""));
- d->mInputMethodButton->setIcon(HbIcon(inputMethodIcon));
- d->mInputMethodButton->setButtonType(HbTouchKeypadButton::HbTouchButtonFunction);
- d->mInputMethodButton->setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonReleased);
- }
-
- if(!d->mPredictionIndicatorButton) {
- d->mPredictionIndicatorButton = new HbTouchKeypadButton(this, QString(""));
- d->mPredictionIndicatorButton->setButtonType(HbTouchKeypadButton::HbTouchButtonFunction);
- d->mPredictionIndicatorButton->setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonReleased);
- d->mInputModeIndicator = new HbInputModeIndicator(*d->mPredictionIndicatorButton, this);
- } else {
- d->mInputModeIndicator->updateIndicator();
- }
-
- if(d->mLanguageButton) {
- // update language button text
- QString langName = HbInputSettingProxy::instance()->globalInputLanguage().localisedName();
- langName.truncate(3);
- d->mLanguageButton->setText(langName);
- }
-
- // update prediction button status
- if (HbInputSettingProxy::instance()->predictiveInputStatusForActiveKeyboard()) {
- d->mPredictionIndicatorButton->setIcon(HbIcon(predictionOffIcon));
- } else {
- d->mPredictionIndicatorButton->setIcon(HbIcon(predictionOnIcon));
- }
-
- // If there's a application specific button defined, create new button with the properties
- // or update the existing one. Otherwise create an empty button or clean the properties of an existing one.
- if (!d->mOwner->focusObject()->editorInterface().actions().isEmpty()) {
- QList<HbAction*> actions = d->mOwner->focusObject()->editorInterface().actions();
- if (d->mApplicationButton) {
- d->mApplicationButton->setText(actions.first()->text());
- d->mApplicationButton->disconnect(SIGNAL(clicked()));
- } else {
- d->mApplicationButton = new HbTouchKeypadButton(this, actions.first()->text());
- d->mApplicationButton->setButtonType(HbTouchKeypadButton::HbTouchButtonFunction);
- d->mApplicationButton->setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonReleased);
- }
- connect(d->mApplicationButton, SIGNAL(clicked()), actions.first(), SLOT(trigger()));
- d->mApplicationButton->setIcon(actions.first()->icon());
- d->mApplicationButton->setToolTip(actions.first()->toolTip());
- } else {
- if (d->mApplicationButton) {
- d->mApplicationButton->disconnect(SIGNAL(clicked()));
- d->mApplicationButton->setText(QString());
- d->mApplicationButton->setIcon(HbIcon());
- d->mApplicationButton->setToolTip(QString());
- } else {
- d->mApplicationButton = new HbTouchKeypadButton(this, QString());
- d->mApplicationButton->setButtonType(HbTouchKeypadButton::HbTouchButtonFunction);
- d->mApplicationButton->setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonReleased);
- }
- }
}
/*!
@@ -276,16 +165,6 @@
}
/*!
-\deprecated HbHwToolCluster::showSettingsDialog()
- is deprecated. Use showSettingsView instead.
-
-Shows the settings dialog
-*/
-void HbHwToolCluster::showSettingsDialog()
-{
-}
-
-/*!
Shows the input method selection dialog.
*/
void HbHwToolCluster::showMethodDialog()
--- a/src/hbinput/inputwidgets/hbinputhwtoolcluster.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputhwtoolcluster.h Fri May 14 16:09:54 2010 +0300
@@ -48,7 +48,6 @@
void setupToolCluster();
public slots:
- void showSettingsDialog();
void showMethodDialog();
void showLanguageDialog();
--- a/src/hbinput/inputwidgets/hbinputmodeindicator.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputmodeindicator.cpp Fri May 14 16:09:54 2010 +0300
@@ -36,19 +36,19 @@
class HbInputModeIndicatorPrivate
{
-public:
- HbInputModeIndicatorPrivate(HbTouchKeypadButton& button);
+public:
+ HbInputModeIndicatorPrivate(HbInputButton *button);
~HbInputModeIndicatorPrivate();
void updatePrediction();
-public:
- HbTouchKeypadButton& mButton;
+
+public:
+ HbInputButton *mButtonItem;
QPointer<HbInputFocusObject> mFocusObject;
};
-HbInputModeIndicatorPrivate::HbInputModeIndicatorPrivate(HbTouchKeypadButton& button)
- : mButton(button),
- mFocusObject(0)
+HbInputModeIndicatorPrivate::HbInputModeIndicatorPrivate(HbInputButton *button)
+ : mButtonItem(button), mFocusObject(0)
{
if (HbInputMethod::activeInputMethod()) {
mFocusObject = HbInputMethod::activeInputMethod()->focusObject();
@@ -64,13 +64,20 @@
const QString predictionOnIcon("qtg_mono_predictive_text_on");
const QString predictionOffIcon("qtg_mono_predictive_text_off");
- //Do not update the indicator if prediction is not allowed in the editor even though
- //prediction is active.
- if (HbInputSettingProxy::instance()->predictiveInputStatusForActiveKeyboard() && mFocusObject &&
- mFocusObject->editorInterface().isPredictionAllowed()) {
- mButton.setIcon(HbIcon(predictionOnIcon));
- } else {
- mButton.setIcon(HbIcon(predictionOffIcon));
+ QColor color;
+ if (mButtonItem && !mButtonItem->icon(HbInputButton::ButtonIconIndexPrimary).isNull()) {
+ color = mButtonItem->icon(HbInputButton::ButtonIconIndexPrimary).color();
+ }
+ HbIcon icon;
+ if (HbInputSettingProxy::instance()->predictiveInputStatusForActiveKeyboard() &&
+ mFocusObject && mFocusObject->editorInterface().isPredictionAllowed()) {
+ icon = HbIcon(predictionOnIcon);
+ } else {
+ icon = HbIcon(predictionOffIcon);
+ }
+ icon.setColor(color);
+ if (mButtonItem) {
+ mButtonItem->setIcon(icon, HbInputButton::ButtonIconIndexPrimary);
}
}
@@ -87,18 +94,15 @@
\sa HbEditorInterface
*/
-/*!
-\deprecated HbInputModeIndicator::HbInputModeIndicator(HbTouchKeypadButton&, QGraphicsWidget*)
- is deprecated. Use (upcoming) version without HbTouchKeypadButton parameter.
-*/
-HbInputModeIndicator::HbInputModeIndicator(HbTouchKeypadButton& button, QGraphicsWidget* parent)
+HbInputModeIndicator::HbInputModeIndicator(HbInputButton *button, QGraphicsWidget *parent)
: QObject(parent)
{
mPrivate = new HbInputModeIndicatorPrivate(button);
if (mPrivate->mFocusObject) {
- connect( &mPrivate->mFocusObject->editorInterface(), SIGNAL(modified()), this, SLOT(updateIndicator()));
+ connect (&mPrivate->mFocusObject->editorInterface(), SIGNAL(modified()), this, SLOT(updateIndicator()));
}
- connect(HbInputSettingProxy::instance(), SIGNAL(predictiveInputStateChanged(HbKeyboardSettingFlags, bool)), this, SLOT(updatePredictionStatus(HbKeyboardSettingFlags, bool)));
+ connect(HbInputSettingProxy::instance(), SIGNAL(predictiveInputStateChanged(HbKeyboardSettingFlags, bool)),
+ this, SLOT(updatePredictionStatus(HbKeyboardSettingFlags, bool)));
updateIndicator(); // check mode of current editor
}
@@ -132,17 +136,6 @@
}
/*!
-\deprecated HbInputModeIndicator::udpdatePredictionStatus(int)
- is deprecated. Use updatePredictionStatus(bool) instead.
-
-Updates prediction status.
-*/
-void HbInputModeIndicator::udpdatePredictionStatus(int newStatus)
-{
- Q_UNUSED(newStatus);
-}
-
-/*!
Updates prediction status.
*/
void HbInputModeIndicator::updatePredictionStatus(HbKeyboardSettingFlags keyboardType, bool newStatus)
--- a/src/hbinput/inputwidgets/hbinputmodeindicator.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputmodeindicator.h Fri May 14 16:09:54 2010 +0300
@@ -28,7 +28,7 @@
#include <hbwidget.h>
#include <hbinputdef.h>
-#include <hbinputtouchkeypadbutton.h>
+#include <hbinputbutton.h>
class HbInputModeIndicatorPrivate;
@@ -37,12 +37,11 @@
{
Q_OBJECT
public:
- HbInputModeIndicator(HbTouchKeypadButton& button, QGraphicsWidget* parent = 0);
+ HbInputModeIndicator(HbInputButton *button, QGraphicsWidget *parent = 0);
virtual ~HbInputModeIndicator();
public slots:
void updateIndicator();
- void udpdatePredictionStatus(int newStatus);
void updatePredictionStatus(HbKeyboardSettingFlags keyboardType, bool newStatus);
private:
--- a/src/hbinput/inputwidgets/hbinputpreviewlabel.cpp Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,147 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbInput module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-#include <QGraphicsScene>
-#include <QGraphicsSceneMouseEvent>
-#include <hbcolorscheme.h>
-#include "hbinputpreviewlabel.h"
-#include "hbfontspec.h"
-
-/*!
- \fn void HbPreviewLabel::selected()
-
- This signal is emitted when there is a mouse press event.
-*/
-
-/*!
-\deprecated class HbPreviewLabel
-*/
-
-/*!
-\deprecated HbPreviewLabel::HbPreviewLabel(QString, QGraphicsItem *)
- is deprecated.
-*/
-HbPreviewLabel::HbPreviewLabel(QString previewSymbols, QGraphicsItem *parent)
- :HbWidget(parent),
- mTextItem(0)
-{
- mTextItem = static_cast<HbTextItem*>(this->style()->createPrimitive(HbStyle::P_Label_text, this));
- mTextItem->setText(previewSymbols);
- mTextItem->setAlignment(Qt::AlignCenter);
- mTextItem->setFontSpec(HbFontSpec(HbFontSpec::Primary));
-}
-
-/*!
-\deprecated HbPreviewLabel::~HbPreviewLabel()
- is deprecated.
-*/
-HbPreviewLabel::~HbPreviewLabel()
-{
-}
-
-/*!
-\deprecated HbPreviewLabel::setTextGeometry(qreal, qreal)
- is deprecated.
-*/
-void HbPreviewLabel::setTextGeometry(qreal width, qreal height)
-{
- QColor color = HbColorScheme::color("qtc_editor_normal");
- QRectF rect;
- rect.setWidth(width/2);
- rect.setHeight(height);
- if (color.isValid()) {
- mTextItem->setTextColor(color);
- }
- mTextItem->setGeometry(rect);
-}
-
-/*!
-\deprecated HbPreviewLabel::mousePressEvent(QGraphicsSceneMouseEvent *)
- is deprecated.
-*/
-void HbPreviewLabel::mousePressEvent(QGraphicsSceneMouseEvent * event)
-{
- Q_UNUSED(event);
- emit showAccentedPreview(mTextItem->text(),sceneBoundingRect());
-}
-
-/*!
-\deprecated HbPreviewLabel::mouseMoveEvent(QGraphicsSceneMouseEvent *)
- is deprecated.
-*/
-void HbPreviewLabel::mouseMoveEvent(QGraphicsSceneMouseEvent * event)
-{
- bool transfered = false;
- if (!isUnderMouse()) {
- // get the list of item's at current mouse position
- QList<QGraphicsItem *> list = scene()->items(event->scenePos());
- for (int i =0; i < list.count(); i++) {
- // let's check if we have HbPreviewLabel
- HbPreviewLabel *label = hbpreviewlabel_cast(list.at(i));
- if (label && label->isEnabled() && (label->parent() == parent())) {
- // release old label
- ungrabMouse();
- event->setButton(Qt::LeftButton);
- // now call the mousepressEvent function of the Label under mouse
- QGraphicsSceneMouseEvent pressEvent;
- pressEvent.setButton(Qt::LeftButton);
- label->mousePressEvent(&pressEvent);
- // now to make label under cursor to get mouse events we have to manually make that Label
- // a mouse grabber item. after this Label will start recieving the press movements.
- label->grabMouse();
- transfered = true;
- break;
- }
- }
- QRectF rect = boundingRect();
- QPointF pos = event->pos();
- if (!transfered && (pos.y() < 0 ||pos.y() > rect.height() || pos.x() > rect.width() || pos.x() < 0) ) {
- emit hideAccentedPreview();
- }
- }
- if (!transfered) {
- if (isUnderMouse()) {
- QGraphicsSceneMouseEvent pressEvent;
- pressEvent.setButton(Qt::LeftButton);
- HbPreviewLabel::mousePressEvent(&pressEvent);
- }
- }
-}
-
-/*!
-\deprecated HbPreviewLabel::mouseReleaseEvent(QGraphicsSceneMouseEvent *)
- is deprecated.
-*/
-void HbPreviewLabel::mouseReleaseEvent(QGraphicsSceneMouseEvent * event)
-{
- Q_UNUSED(event);
- if (isUnderMouse()) {
- emit selected();
- }
- emit hidePreview();
- ungrabMouse();
-}
-
-// End Of File
-
--- a/src/hbinput/inputwidgets/hbinputpreviewlabel.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbInput module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#ifndef HB_PREVIEWLABEL_H
-#define HB_PREVIEWLABEL_H
-
-#include <hbwidget.h>
-#include <hbtextitem.h>
-#include "hbinputdef.h"
-
-class HB_INPUT_EXPORT HbPreviewLabel : public HbWidget
-{
- Q_OBJECT
-public:
- explicit HbPreviewLabel(QString previewSymbols, QGraphicsItem *parent = 0);
- ~HbPreviewLabel();
- void setTextGeometry(qreal width, qreal height);
-
-protected:
- void mousePressEvent(QGraphicsSceneMouseEvent *event);
- void mouseReleaseEvent(QGraphicsSceneMouseEvent * event);
- void mouseMoveEvent(QGraphicsSceneMouseEvent * event);
-
-signals:
- void selected();
- void hidePreview();
- void hideAccentedPreview();
- void showAccentedPreview(const QString &text, const QRectF &sceneBoundingRect);
-private:
- HbTextItem* mTextItem;
-};
-
-inline HbPreviewLabel* hbpreviewlabel_cast(QGraphicsItem *item)
-{
- if( item->isWidget() && qobject_cast<HbPreviewLabel *>(static_cast<QGraphicsWidget*>(item)) ) {
- return static_cast<HbPreviewLabel *>(item);
- }
- return 0;
-}
-#endif // HB_PREVIEWLABEL_H
--- a/src/hbinput/inputwidgets/hbinputqwertytouchkeyboard.cpp Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1168 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbInput module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#include <QGraphicsGridLayout>
-#include <hbinputmethod.h>
-#include <hbinputkeymap.h>
-#include <hbinputsettingproxy.h>
-#include <hbstyleoptionlabel.h>
-#include <hbaction.h>
-#include <hbtextitem.h>
-#include <hbframeitem.h>
-#include <hbcolorscheme.h>
-
-#include "hbinputcharpreviewpane.h"
-#include "hbinputtouchkeypadbutton.h"
-#include "hbinputqwertytouchkeyboard.h"
-#include "hbinputqwertytouchkeyboard_p.h"
-#include "hbinputvkbwidget_p.h"
-
-const int HbVirtualQwertyNumberOfColumns = 10;
-const int HbVirtualQwertyNumberOfRows = 4;
-const int HbVirtualQwerty4x10MaxKeysCount = 32;
-const int HbVirtualQwerty4x11MaxKeysCount = 36;
-const int HbVirtualQwertyFunctionButtonCount = 5;
-const int HbVirtualQwertyNumericKeypadButtonCount = 18;
-const qreal HbVirtualQwertyButtonPreferredHeight = 58.0;
-const QSizeF HbVirtualQwerty4x10LayoutDimensions(64.0, HbVirtualQwertyButtonPreferredHeight);
-const QSizeF HbVirtualQwerty4x11LayoutDimensions(58.18, HbVirtualQwertyButtonPreferredHeight);
-const int HbVirtualQwertyNumberOfRowsNumberMode = 2;
-
-const QString HbButtonObjName = "qwerty ";
-const QString HbCustomButtonObjName = "qwerty custom button ";
-const QString HbEnterObjName = "qwerty enter";
-const QString HbShiftObjName = "qwerty shift";
-const QString HbControlObjName = "qwerty control";
-const QString HbBackspaceObjName = "qwerty backspace";
-const QString HbSpaceObjName = "qwerty space";
-
-const QString HbQwertyButtonTextLayout = "_hb_qwerty_button_text_layout";
-const QString HbQwertyButtonIconLayout = "_hb_qwerty_button_icon_layout";
-
-/*!
-\deprecated class HbQwertyKeyboard
-*/
-
-HbQwertyKeyboardPrivate::HbQwertyKeyboardPrivate()
-:mCtrlBtnIndex(-1),
-mPressedButtonIndex(-1),
-mPreviewPane(0),
-mInStickyRegion(false),
-mLongKeyPressCharsShown(false),
-mKeypadCreated(false),
-mKeymapChanged(false),
-mKeyboardSize(HbQwerty4x10),
-mSize(QSizeF())
-{
-}
-
-void HbQwertyKeyboardPrivate::constructKeypad()
-{
- Q_Q(HbQwertyKeyboard);
-
- if (mMode == EModeAbc) {
- const HbKeyboardMap *keyboardmap = mKeymap->keyboard(HbKeyboardVirtualQwerty);
- for (int i = 0; i < HbVirtualQwerty4x11MaxKeysCount; i++) {
- HbTouchKeypadButton *button = new HbTouchKeypadButton(q, textForKey(i), q);
- if (keyboardmap && (i < keyboardmap->keys.count())) {
- button->setKeyCode(keyboardmap->keys.at(i)->keycode.unicode());
- }
- button->setProperty(HbStyleRulesCacheId::hbStyleRulesForNodeCache, HbQwertyButtonTextLayout);
- button->setAsStickyButton(true);
- q->connect(button, SIGNAL(pressed()), mPressMapper, SLOT(map()));
- q->connect(button, SIGNAL(released()), mReleaseMapper, SLOT(map()));
- q->connect(button, SIGNAL(enteredInNonStickyRegion()), q, SLOT(enteredInNonStickyRegion()));
- if (i >= HbVirtualQwerty4x10MaxKeysCount) {
- button->hide();
- }
- mButtons.append(button);
- }
- //Create the function buttons
- for (int i = 0; i < HbVirtualQwertyFunctionButtonCount; ++i) {
- HbTouchKeypadButton *button = 0;
- switch ( i ) {
- case 0: {
- HbIcon icon("qtg_mono_backspace1");
- button = new HbTouchKeypadButton(q, icon, QString(), q);
- button->setAutoRepeatDelay(HbRepeatTimeout);
- button->setAutoRepeatInterval(HbRepeatTimeoutShort);
- button->setAutoRepeat(true);
- button->setProperty(HbStyleRulesCacheId::hbStyleRulesForNodeCache, HbQwertyButtonIconLayout);
- break;
- }
- case 1: {
- HbIcon icon("qtg_mono_enter");
- button = new HbTouchKeypadButton(q, icon, QString(), q);
- button->setProperty(HbStyleRulesCacheId::hbStyleRulesForNodeCache, HbQwertyButtonIconLayout);
- break;
- }
- case 2: {
- HbIcon icon("qtg_mono_shift");
- button = new HbTouchKeypadButton(q, icon, QString(), q);
- button->setProperty(HbStyleRulesCacheId::hbStyleRulesForNodeCache, HbQwertyButtonIconLayout);
- break;
- }
- case 3: {
- HbIcon icon("qtg_mono_sym_qwerty");
- button = new HbTouchKeypadButton(q, icon, QString(), q);
- button->setProperty(HbStyleRulesCacheId::hbStyleRulesForNodeCache, HbQwertyButtonIconLayout);
- mCtrlBtnIndex = mButtons.count()-1;
- break;
- }
- case 4: {
- button = new HbTouchKeypadButton(q, QString(), q);
- button->setFrameIcon("qtg_mono_space");
- button->setAutoRepeatDelay(HbRepeatTimeout);
- button->setAutoRepeatInterval(HbRepeatTimeoutShort);
- button->setAutoRepeat(true);
- break;
- }
- default:
- break;
- }
- button->setButtonType(HbTouchKeypadButton::HbTouchButtonFunction);
- button->setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonReleased);
- button->setAsStickyButton(false);
- q->connect(button, SIGNAL(pressed()), mPressMapper, SLOT(map()));
- q->connect(button, SIGNAL(released()), mReleaseMapper, SLOT(map()));
- q->connect(button, SIGNAL(enteredInNonStickyRegion()), q, SLOT(enteredInNonStickyRegion()));
- mButtons.append(button);
- }
- } else {
- QString allowedSctCharacters;
- getAllowedSctCharcters(allowedSctCharacters);
- int sctIndex = 1;
- // Construct Numeric Keypad
- for(int jj = 0; jj < HbVirtualQwertyNumericKeypadButtonCount ; jj++) {
- HbTouchKeypadButton *button = 0;
- if (jj < 10) {
- button = new HbTouchKeypadButton(q, QString::number((jj+1)%10), q);
- button->setAsStickyButton(true);
- setButtonObjectName(*button, 0, jj, Qt::Key_unknown);
- } else if(jj>= 12 && jj<=16) {
- // One todo is what if their are more than 5 sct characters that are allowed
- // in to the editor. UI Concept is not clear for this. Need to revisit this.
- // But as of now, there are not numeric editors which have more than 5 sct
- // characters allowed in to them.
- QString buttonText;
- if(allowedSctCharacters.length() >= sctIndex) {
- buttonText = allowedSctCharacters[sctIndex-1];
- }
- button = new HbTouchKeypadButton(q, buttonText, q);
- button->setAsStickyButton(true);
- setButtonObjectName(*button, 1, jj%10 , Qt::Key_unknown);
- sctIndex++;
- } else {
- //construct the function button in numeric keypad
- switch(jj) {
- case 10: {
- HbIcon icon("qtg_mono_shift");
- button = new HbTouchKeypadButton(q, icon, QString(), q);
- setButtonObjectName(*button, 1, 0, Qt::Key_Shift);
- button->setButtonType(HbTouchKeypadButton::HbTouchButtonFunction);
- button->setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonReleased);
- button->setAsStickyButton(false);
- button->setEnabled(false);
- }
- break;
- case 11: {
- HbIcon icon("qtg_mono_sym_qwerty");
- button = new HbTouchKeypadButton(q, icon, QString(), q);
- setButtonObjectName(*button, 1, 1, Qt::Key_Control);
- button->setButtonType(HbTouchKeypadButton::HbTouchButtonFunction);
- button->setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonReleased);
- button->setAsStickyButton(false);
- button->setEnabled(false);
- }
- break;
- case 17: {
- HbIcon icon("qtg_mono_backspace1");
- button = new HbTouchKeypadButton(q, icon, QString(), q);
- setButtonObjectName(*button, 1, 7, Qt::Key_Backspace);
- button->setButtonType(HbTouchKeypadButton::HbTouchButtonFunction);
- button->setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonReleased);
- button->setAsStickyButton(false);
- button->setAutoRepeatDelay(HbRepeatTimeout);
- button->setAutoRepeatInterval(HbRepeatTimeoutShort);
- button->setAutoRepeat(true);
- }
- break;
- default:
- break;
- }
- }
-
- q->connect(button, SIGNAL(pressed()), mPressMapper, SLOT(map()));
- q->connect(button, SIGNAL(released()), mReleaseMapper, SLOT(map()));
- q->connect(button, SIGNAL(enteredInNonStickyRegion()), q, SLOT(enteredInNonStickyRegion()));
- mButtons.append(button);
- }
- }
-
-
- // intercepting signal before passing to mOwner
- q->connect(mPressMapper, SIGNAL(mapped(int)), q, SLOT(mappedKeyPress(int)));
- q->connect(mReleaseMapper, SIGNAL(mapped(int)), q, SLOT(mappedKeyRelease(int)));
-}
-
-void HbQwertyKeyboardPrivate::getAllowedSctCharcters(QString & allowedSctCharacters)
-{
- QString sctCharacters;
- if (mKeymap) {
- const HbKeyboardMap* keymap = mKeymap->keyboard(HbKeyboardSctLandscape);
- if (keymap == 0) {
- return;
- }
- foreach (const HbMappedKey* mappedKey, keymap->keys) {
- sctCharacters.append(mappedKey->characters(HbModifierNone));
- }
- }
-
- HbInputFocusObject *focusedObject = mOwner->focusObject();
- QString tempAllowedSctCharacters;
- if(focusedObject) {
- focusedObject->filterStringWithEditorFilter(sctCharacters,tempAllowedSctCharacters);
- }
-
- // Remove digits from it ( digits always come in the first row )
- allowedSctCharacters.clear();
- for(int i=0; i<tempAllowedSctCharacters.length() ;i++) {
- if(!(tempAllowedSctCharacters[i]>='0' && tempAllowedSctCharacters[i] <= '9' )) {
- // dont add duplicates to the list
- if(!allowedSctCharacters.contains(tempAllowedSctCharacters[i])) {
- allowedSctCharacters.append(tempAllowedSctCharacters[i]);
- }
- }
- }
-}
-
-void HbQwertyKeyboardPrivate::updateButtonsTextAndMappers()
-{
- if (mMode == EModeNumeric) {
- QString allowedSctCharacters;
- getAllowedSctCharcters(allowedSctCharacters);
- int sctIndex = 1;
- for (int jj = 0; jj < HbVirtualQwertyNumericKeypadButtonCount ; jj++) {
- if (jj>=12 && jj<=16) {
- QString buttonText;
- if (allowedSctCharacters.length() >= sctIndex) {
- buttonText = allowedSctCharacters[sctIndex-1];
- }
- mButtons[jj]->setText(buttonText);
- // Update press and release mapper.
- mReleaseMapper->removeMappings(mButtons.at(jj));
- mPressMapper->removeMappings(mButtons.at(jj));
- if(!mButtons.at(jj)->text().isEmpty()) {
- mReleaseMapper->setMapping(mButtons.at(jj), mButtons.at(jj)->text().at(0).unicode());
- mPressMapper->setMapping(mButtons.at(jj), mButtons.at(jj)->text().at(0).unicode());
- }
- sctIndex++;
- }
- }
- } else { // mMode == EModeAbc
- const HbKeyboardMap* keymap = mKeymap->keyboard(HbKeyboardVirtualQwerty);
- if (keymap == 0) {
- return;
- }
- int keymapCount = keymap->keys.count();
-
- for (int i = 0; i < mButtons.count(); i++) {
- if (i < keymapCount) {
- mButtons.at(i)->setText(textForKey(i));
- mButtons.at(i)->setKeyCode(keymap->keys.at(i)->keycode.unicode());
- if (mKeymapChanged) {
- HbTouchKeypadButton *button = mButtons.at(i);
- mReleaseMapper->removeMappings(button);
- mPressMapper->removeMappings(button);
- mReleaseMapper->setMapping(button, keymap->keys.at(i)->keycode.unicode());
- mPressMapper->setMapping(button, keymap->keys.at(i)->keycode.unicode());
- }
- }
- }
- }
-}
-
-HbQwertyKeyboardPrivate::~HbQwertyKeyboardPrivate()
-{
- delete mPreviewPane;
- mPreviewPane = 0;
-
- while (!mKeypadButtonOption.isEmpty()) {
- delete mKeypadButtonOption.takeFirst();
- }
-}
-
-void HbQwertyKeyboardPrivate::launchPreviewPane(const QStringList& list)
-{
- if (mPressedButtonIndex > -1 && mPressedButtonIndex < mButtons.size()) {
- mPreviewPane->showCharacters(list, mButtons.at(mPressedButtonIndex)->sceneBoundingRect());
- }
-}
-
-int HbQwertyKeyboardPrivate::indexForKeycode(int keycode)
-{
- int index = -1;
- if (mMode == EModeNumeric) {
- switch(keycode) {
- case Qt::Key_Control:
- index = 10; // First key of second row
- break;
- case Qt::Key_Shift:
- index = 11;
- break;
- case Qt::Key_Backspace:
- index = 17;
- break;
- case '0':
- index = 9;
- break;
- default:
- if (keycode >= '1' && keycode <= '9') {
- index = keycode - '1';
- } else {
- QString sctChars;
- getAllowedSctCharcters(sctChars);
- sctChars.truncate(5);
- if (sctChars.contains(QChar(keycode))) {
- index = sctChars.indexOf(QChar(keycode)) + 12;
- }
- }
- break;
- }
- } else {
- const HbKeyboardMap* keymap = mKeymap->keyboard(HbKeyboardVirtualQwerty);
- for (int i = 0; i < keymap->keys.count(); ++i) {
- if (keymap->keys.at(i)->keycode == keycode) {
- index = i;
- break;
- }
- }
- }
- return index;
-}
-
-int HbQwertyKeyboardPrivate::keyCode(int buttonId)
-{
- return buttonId;
-}
-
-int HbQwertyKeyboardPrivate::keyCode(HbTouchKeypadButton *button)
-{
- int code = -1;
- if(button) {
- code = button->keyCode();
- }
- return code;
-}
-
-void HbQwertyKeyboardPrivate::handleStandardButtonPress(int buttonId)
-{
- HbInputVkbWidgetPrivate::handleStandardButtonPress(buttonId);
-
- // A new button is pressed so we should close
- // preview pane on the previous button.
- if (mPreviewPane->isVisible()) {
- mPreviewPane->hide();
- }
- // a new button is pressed so we should reset the state of the
- // long press character preview pane.
- mLongKeyPressCharsShown = false;
-
- if (buttonId < 0) {
- return;
- }
-
- mPressedButtonIndex = indexForKeycode(buttonId);
-
- if (!(buttonId & 0xffff0000) && showPreview(buttonId)) {
- mInStickyRegion = false;
- // Show character preview only incase of setting proxy allows us to do.
- if (HbInputSettingProxy::instance()->isCharacterPreviewForQwertyEnabled()) {
- if (mPressedButtonIndex >= 0 && mPressedButtonIndex < mButtons.count()) {
- if(mButtons.at(mPressedButtonIndex)->isFaded()) {
- return; // if the button is inactive, dont show character preview popup.
- }
- const QString &text = mButtons.at(mPressedButtonIndex)->text();
- if (text.size()) {
- QStringList list;
- list.append(text);
- // let's show the character preview.
- launchPreviewPane(list);
- return;
- }
- }
- }
- }
-}
-
-void HbQwertyKeyboardPrivate::handleStandardButtonRelease(int buttonId)
-{
- // mLongKeyPressCharsShown will be true in case there is a long key press
- // detected and preview pane is showing some character(s) to be selected
- // by user. so when mLongKeyPressCharsShown is true we should not close
- // the preview pane.
- if (!mLongKeyPressCharsShown) {
- if (mPreviewPane->isVisible()) {
- mPreviewPane->hide();
- }
-
- /* Release Event is handled in Button Release as we do not get Click event from
- pushButton on longpress of the button
- */
-
- // handle keypress only if there was no flick
- if (mFlickDirection==HbInputVkbWidget::HbFlickDirectionNone && buttonId >= 0){
- QKeyEvent releaseEvent(QEvent::KeyRelease, buttonId, Qt::NoModifier);
- if (mOwner) {
- mOwner->filterEvent(&releaseEvent);
- }
- }
- }
-}
-
-void HbQwertyKeyboardPrivate::setLayoutDimensions(QSizeF dimensions)
-{
- // only update the dimensions if they are not previously set and buttons have been created
- if (mSize == dimensions || !mButtons.count()) {
- return;
- }
- mSize = dimensions;
-
- mButtonLayout->setContentsMargins(0.0, 0.0, 0.0, 0.0);
- int numberOfRows = HbVirtualQwertyNumberOfRows;
-
- foreach (HbTouchKeypadButton* button, mButtons) {
- button->setInitialSize(dimensions);
- }
- if (mSettingsButton && mApplicationButton) {
- mSettingsButton->setInitialSize(dimensions);
- mApplicationButton->setInitialSize(dimensions);
- }
-
- if ( EModeNumeric == mMode ) {
- numberOfRows = HbVirtualQwertyNumberOfRowsNumberMode;
- }
- if (mKeyboardSize == HbQwerty4x10) {
- for (int jj = 0; jj < HbVirtualQwertyNumberOfColumns; jj++) {
- mButtonLayout->setColumnFixedWidth(jj, dimensions.width() - HorizontalSpacing);
- }
- } else {
- for (int jj = 0; jj < HbVirtualQwertyNumberOfColumns + 1; jj++) {
- mButtonLayout->setColumnFixedWidth(jj, dimensions.width() - HorizontalSpacing);
- }
- }
- for (int jj = 0; jj < numberOfRows; jj++) {
- mButtonLayout->setRowFixedHeight(jj, dimensions.height() - VerticalSpacing);
- }
-
- mButtonLayout->setHorizontalSpacing(HorizontalSpacing);
- mButtonLayout->setVerticalSpacing(VerticalSpacing);
-}
-
-QSizeF HbQwertyKeyboardPrivate::calculateDimensions(QSizeF size)
-{
- QSizeF dimensions;
- if (mKeyboardSize == HbQwertyKeyboardPrivate::HbQwerty4x10) {
- dimensions.setWidth(size.width() / (qreal)HbVirtualQwertyNumberOfColumns);
- } else {
- dimensions.setWidth(size.width() / (qreal)(HbVirtualQwertyNumberOfColumns + 1));
- }
- if (mMode == EModeNumeric) {
- dimensions.setHeight(size.height() / (qreal)HbVirtualQwertyNumberOfRowsNumberMode);
- } else {
- dimensions.setHeight(size.height() / (qreal)HbVirtualQwertyNumberOfRows);
- }
- return dimensions;
-}
-
-QString HbQwertyKeyboardPrivate::textForKey(int key)
-{
- QString keydata;
- if (mKeymap->keyboard(HbKeyboardVirtualQwerty)->keys.count() <= key) {
- return QString();
- }
- if (mModifiers & HbModifierShiftPressed) {
- keydata = mKeymap->keyboard(HbKeyboardVirtualQwerty)->keys.at(key)->characters(HbModifierShiftPressed);
- } else {
- keydata = mKeymap->keyboard(HbKeyboardVirtualQwerty)->keys.at(key)->characters(HbModifierNone);
- }
- return keydata.left(1);
-}
-
-void HbQwertyKeyboardPrivate::initializeNumericKeyboard()
-{
- Q_Q(HbQwertyKeyboard);
- removeExistingSignalMappings();
- const HbKeyboardMap* keymap = mKeymap->keyboard(HbKeyboardVirtualQwerty);
- if (keymap == 0) {
- return;
- }
- for (int i = 0; i < HbVirtualQwertyNumericKeypadButtonCount; ++i) {
- if (i <= 9) {
- mButtonLayout->addItem(mButtons.at(i), 0, i);
- mReleaseMapper->setMapping(mButtons.at(i), mButtons.at(i)->text().at(0).unicode());
- mPressMapper->setMapping(mButtons.at(i), mButtons.at(i)->text().at(0).unicode());
- } else if(i>=12 && i<= 16) {
- mButtonLayout->addItem(mButtons.at(i), 1, i%10);
- if(!mButtons.at(i)->text().isEmpty()) {
- mReleaseMapper->setMapping(mButtons.at(i), mButtons.at(i)->text().at(0).unicode());
- mPressMapper->setMapping(mButtons.at(i), mButtons.at(i)->text().at(0).unicode());
- }
- } else {
- switch(i) {
- case 10: {
- mButtonLayout->addItem(mButtons.at(i), 1, 0);
- mReleaseMapper->setMapping(mButtons.at(i), Qt::Key_Shift);
- mPressMapper->setMapping(mButtons.at(i), Qt::Key_Shift);
- }
- break;
- case 11: {
- mButtonLayout->addItem(mButtons.at(i), 1, 1);
- mReleaseMapper->setMapping(mButtons.at(i), Qt::Key_Control);
- mPressMapper->setMapping(mButtons.at(i), Qt::Key_Control);
- }
- break;
- case 17: {
- mButtonLayout->addItem(mButtons.at(i), 1, 7);
- mReleaseMapper->setMapping(mButtons.at(i), Qt::Key_Backspace);
- mPressMapper->setMapping(mButtons.at(i), Qt::Key_Backspace);
- }
- break;
- default:
- break;
- }
- }
- }
-
- q->setupToolCluster();
- if (mSettingsButton) {
- mSettingsButton->setObjectName(HbCustomButtonObjName + QString::number(2));
- mButtonLayout->addItem(mSettingsButton, 1, 8);
- }
- if (mApplicationButton) {
- mApplicationButton->setObjectName(HbCustomButtonObjName + QString::number(3));
- mButtonLayout->addItem(mApplicationButton, 1, 9);
- }
-
- setLayoutDimensions(calculateDimensions(q->keypadButtonAreaSize()));
- mKeypadCreated = true;
-}
-
-void HbQwertyKeyboardPrivate::initializeKeyboard(bool refreshButtonText)
-{
- const HbKeyboardMap* keymap = mKeymap->keyboard(HbKeyboardVirtualQwerty);
- if (mKeymap == 0) {
- return;
- }
-
- int keymapCount = keymap->keys.count();
- if (mMode == EModeNumeric) {
- initializeNumericKeyboard();
- } else if (keymapCount <= HbVirtualQwerty4x10MaxKeysCount) {
- initialize4x10Keypad(refreshButtonText);
- } else {
- initialize4x11Keypad(refreshButtonText);
- }
- mKeypadCreated = true;
-}
-
-void HbQwertyKeyboardPrivate::setRockerPosition()
-{
- Q_Q(HbQwertyKeyboard);
-
- // Set rocker position.
- QSizeF padArea = q->keypadButtonAreaSize();
- QPointF point((padArea.width() * 0.5) - (mRocker->size().width() * 0.5),
- (padArea.height() * 0.5) - (mRocker->size().height() * 0.5));
- point.setY(point.y() + HbCloseHandleHeight);
-
- if (q->keypadLayout() && q->keypadLayout()->geometry().height()) {
- if(mKeyboardSize == HbQwerty4x10) {
- point.setX((padArea.width() * 0.5) - (mRocker->size().width() * 0.5));
- point.setY((q->keypadLayout()->geometry().height() * 0.5) - (mRocker->size().height() * 0.5) + HbCloseHandleHeight);
- } else {
- point.setX(((padArea.width() * 0.5) - (mRocker->size().width() * 0.5)) + HbVirtualQwerty4x11LayoutDimensions.width()/2);
- point.setY((q->keypadLayout()->geometry().height() * 0.5) - (mRocker->size().height() * 0.5) + HbCloseHandleHeight);
- }
- }
- mRocker->setPos(point);
-}
-
-void HbQwertyKeyboardPrivate::removeExistingSignalMappings()
-{
- // removes all mappings except settings button and application button
- if (mButtonLayout) {
- int count = mButtonLayout->count();
- for (int jj=0; jj < count-2 ; jj++) {
- HbTouchKeypadButton * button = mButtons.at(jj);
- mReleaseMapper->removeMappings(button);
- mPressMapper->removeMappings(button);
- }
- for (int i = mButtonLayout->count() - 1; i >= 0; i--) {
- mButtonLayout->removeAt(i);
- }
- }
-}
-
-void HbQwertyKeyboardPrivate::initialize4x10Keypad(bool refreshButtonText)
-{
- removeExistingSignalMappings();
- mKeyboardSize = HbQwerty4x10;
- Q_Q(HbQwertyKeyboard);
- const HbKeyboardMap* keymap = mKeymap->keyboard(HbKeyboardVirtualQwerty);
- if (keymap == 0) {
- return;
- }
-
- for (int i = 0; i < keymap->keys.count() && i < HbVirtualQwerty4x11MaxKeysCount; ++i) {
- if (refreshButtonText) {
- mButtons[i]->setText(textForKey(i));
- mButtons[i]->setKeyCode(keymap->keys.at(i)->keycode.unicode());
- }
- mReleaseMapper->setMapping(mButtons.at(i), keymap->keys.at(i)->keycode.unicode());
- mPressMapper->setMapping(mButtons.at(i), keymap->keys.at(i)->keycode.unicode());
- int row = 0;
- int column = 0;
- if (i < 10) {
- row = 0;
- column = i;
- } else if (i < 19) {
- row = 1;
- column = i-10;
- } else if (i < 28) {
- row = 2;
- column = i-19;
- } else {
- row = 3;
- column = i-28;
- if (column == 0) {
- column = 2;
- } else if (column == 1) {
- column = 3;
- } else if (column == 2) {
- column = 6;
- } else if (column == 3) {
- column = 7;
- }
- }
- mButtonLayout->addItem(mButtons.at(i), row, column);
- setButtonObjectName(*mButtons.at(i), row, column, Qt::Key_unknown);
- }
-
- for (int i = HbVirtualQwerty4x10MaxKeysCount; i < HbVirtualQwerty4x11MaxKeysCount; ++i) {
- mButtons[i]->hide();
- }
-
- for (int i = 0; i < 5; ++i) {
- switch ( i ) {
- case 0: {
- mButtonLayout->addItem(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), 1, 9);
- setButtonObjectName(*mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), 1, 9, Qt::Key_Backspace);
- mReleaseMapper->setMapping(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), Qt::Key_Backspace);
- mPressMapper->setMapping(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), Qt::Key_Backspace);
- break;
- }
- case 1: {
- mButtonLayout->addItem(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), 2, 9);
- setButtonObjectName(*mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), 2, 9, Qt::Key_Enter);
- mReleaseMapper->setMapping(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), Qt::Key_Enter);
- mPressMapper->setMapping(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), Qt::Key_Enter);
- break;
- }
- case 2: {
- mButtonLayout->addItem(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), 3, 0);
- setButtonObjectName(*mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), 3, 0, Qt::Key_Shift);
- mReleaseMapper->setMapping(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), Qt::Key_Shift);
- mPressMapper->setMapping(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), Qt::Key_Shift);
- break;
- }
- case 3: {
- mButtonLayout->addItem(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), 3, 1);
- setButtonObjectName(*mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), 3, 1, Qt::Key_Control);
- mReleaseMapper->setMapping(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), Qt::Key_Control);
- mPressMapper->setMapping(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), Qt::Key_Control);
- break;
- }
- case 4: {
- mButtonLayout->addItem(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), 3, 4, 1, 2);
- setButtonObjectName(*mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), 3, 4, Qt::Key_Space);
- mReleaseMapper->setMapping(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), Qt::Key_Space);
- mPressMapper->setMapping(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), Qt::Key_Space);
- break;
- }
- default:
- break;
- }
- }
- q->setupToolCluster();
- if (mSettingsButton) {
- mSettingsButton->setObjectName(HbCustomButtonObjName + QString::number(2));
- mButtonLayout->addItem(mSettingsButton, 3, 8);
- }
- if (mApplicationButton) {
- mApplicationButton->setObjectName(HbCustomButtonObjName + QString::number(3));
- mButtonLayout->addItem(mApplicationButton, 3, 9);
- }
-
- setLayoutDimensions(calculateDimensions(q->keypadButtonAreaSize()));
-}
-
-void HbQwertyKeyboardPrivate::initialize4x11Keypad(bool refreshButtonText)
-{
- removeExistingSignalMappings();
- mKeyboardSize = HbQwerty4x11;
- Q_Q(HbQwertyKeyboard);
- const HbKeyboardMap* keymap = mKeymap->keyboard(HbKeyboardVirtualQwerty);
- if (keymap == 0) {
- return;
- }
-
- for (int i = 0; i < keymap->keys.count() && i <= HbVirtualQwerty4x11MaxKeysCount; ++i) {
- if (refreshButtonText) {
- mButtons[i]->setText(textForKey(i));
- mButtons[i]->setKeyCode(keymap->keys.at(i)->keycode.unicode());
- }
- mReleaseMapper->setMapping(mButtons.at(i), keymap->keys.at(i)->keycode.unicode());
- mPressMapper->setMapping(mButtons.at(i), keymap->keys.at(i)->keycode.unicode());
- int row = 0;
- int column = 0;
- if (i < 11) {
- row = 0;
- column = i;
- } else if (i < 21) {
- row = 1;
- column = i-11;
- } else if (i < 31) {
- row = 2;
- column = i-21;
- } else {
- row = 3;
- column = i-31;
- if (column == 0) {
- column = 2;
- } else if (column == 1) {
- column = 3;
- } else if (column == 2) {
- column = 6;
- } else if (column == 3) {
- column = 7;
- } else if (column == 4) {
- column = 8;
- }
- }
- mButtonLayout->addItem(mButtons.at(i), row, column);
- setButtonObjectName(*mButtons.at(i), row, column, Qt::Key_unknown);
- if (i >= HbVirtualQwerty4x10MaxKeysCount) {
- mButtons[i]->show();
- }
- }
-
- for (int i = 0; i < 5; ++i) {
- switch ( i ) {
- case 0: {
- mButtonLayout->addItem(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), 1, 10);
- setButtonObjectName(*mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), 1, 10, Qt::Key_Backspace);
- mReleaseMapper->setMapping(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), Qt::Key_Backspace);
- mPressMapper->setMapping(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), Qt::Key_Backspace);
- break;
- }
- case 1: {
- mButtonLayout->addItem(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), 2, 10);
- setButtonObjectName(*mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), 2, 10, Qt::Key_Enter);
- mReleaseMapper->setMapping(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), Qt::Key_Enter);
- mPressMapper->setMapping(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), Qt::Key_Enter);
- break;
- }
- case 2: {
- mButtonLayout->addItem(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), 3, 0);
- setButtonObjectName(*mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), 3, 0, Qt::Key_Shift);
- mReleaseMapper->setMapping(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), Qt::Key_Shift);
- mPressMapper->setMapping(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), Qt::Key_Shift);
- break;
- }
- case 3: {
- mButtonLayout->addItem(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), 3, 1);
- setButtonObjectName(*mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), 3, 1, Qt::Key_Control);
- mReleaseMapper->setMapping(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), Qt::Key_Control);
- mPressMapper->setMapping(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), Qt::Key_Control);
- break;
- }
- case 4: {
- mButtonLayout->addItem(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), 3, 4, 1, 2);
- setButtonObjectName(*mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), 3, 4, Qt::Key_Space);
- mReleaseMapper->setMapping(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), Qt::Key_Space);
- mPressMapper->setMapping(mButtons.at(HbVirtualQwerty4x11MaxKeysCount+i), Qt::Key_Space);
- break;
- }
- default:
- break;
- }
- }
-
- q->setupToolCluster();
- if (mSettingsButton) {
- mSettingsButton->setObjectName(HbCustomButtonObjName + QString::number(2));
- mButtonLayout->addItem(mSettingsButton, 3, 9);
- }
- if (mApplicationButton) {
- mApplicationButton->setObjectName(HbCustomButtonObjName + QString::number(3));
- mButtonLayout->addItem(mApplicationButton, 3, 10);
- }
-
- setLayoutDimensions(calculateDimensions(q->keypadButtonAreaSize()));
-}
-
-bool HbQwertyKeyboardPrivate::showPreview(int keycode)
-{
- if (keycode == Qt::Key_Enter ||
- keycode == Qt::Key_Shift ||
- keycode == Qt::Key_Control ||
- keycode == Qt::Key_Backspace ||
- keycode == Qt::Key_Space) {
- return false;
- }
- return true;
-}
-
-void HbQwertyKeyboardPrivate::setButtonObjectName(HbTouchKeypadButton& button, int row, int column, Qt::Key specialKey)
-{
- // bs, enter, more, pred, .com, space, 123sym, shift
- QString objName;
- switch(specialKey) {
- case Qt::Key_Enter:
- objName = HbEnterObjName;
- break;
- case Qt::Key_Shift:
- objName = HbShiftObjName;
- break;
- case Qt::Key_Control:
- objName = HbControlObjName;
- break;
- case Qt::Key_Backspace:
- objName = HbBackspaceObjName;
- break;
- case Qt::Key_Space:
- objName = HbSpaceObjName;
- break;
- default:
- objName = (HbButtonObjName + QString::number(row+1) + "," + QString::number(column+1) );
- break;
- }
- button.setObjectName(objName);
-}
-
-/*!
-Apply editor constraints to the vkb
-*/
-void HbQwertyKeyboardPrivate::applyEditorConstraints()
-{
- HbInputFocusObject *focusedObject = 0;
- if (mOwner) {
- focusedObject = mOwner->focusObject();
- }
-
- if(!focusedObject || isKeyboardDimmed()) {
- // dont need to apply constraints when keypad is dimmed.
- // applyEditorConstraints will be called from setKeyboardDimmed(false)
- return;
- }
-
- for (int i = 0; i < mButtons.count(); i++) {
- if(Hb::ItemType_InputCharacterButton == mButtons.at(i)->type()) {
- QString buttonText = mButtons.at(i)->text();
- if (buttonText.isEmpty() || !focusedObject->characterAllowedInEditor(buttonText[0])) {
- mButtons.at(i)->setFade(true);
- } else {
- mButtons.at(i)->setFade(false);
- }
- }
- }
-}
-
-//
-// HbQwertyKeyboard
-//
-
-/*!
-\deprecated HbQwertyKeyboard::HbQwertyKeyboard(HbInputMethod*, const HbKeymap*, QGraphicsItem*, HbKeypadMode)
- is deprecated.
-*/
-HbQwertyKeyboard::HbQwertyKeyboard(HbInputMethod* owner,
- const HbKeymap* keymap,
- QGraphicsItem* aParent, HbKeypadMode mode)
- : HbInputVkbWidget(*new HbQwertyKeyboardPrivate, aParent)
-{
- Q_D(HbQwertyKeyboard);
- d->mKeymap = keymap;
- d->mClickMapper = new QSignalMapper(this);
- d->q_ptr = this;
- d->mOwner = owner;
-
- d->mButtonLayout = new QGraphicsGridLayout();
-
- // character preview pane
- d->mPreviewPane = new HbCharPreviewPane();
- connect(d->mPreviewPane, SIGNAL(charFromPreviewSelected(QString)), this, SIGNAL(charFromPreviewSelected(QString)));
- // A QGraphicsItem bydefault is shown so we need to hide it.
- d->mPreviewPane->hide();
-
- d->mMode = mode;
-}
-
-/*!
-\deprecated HbQwertyKeyboard::HbQwertyKeyboard(HbQwertyKeyboardPrivate&, QGraphicsItem*)
- is deprecated.
-*/
-HbQwertyKeyboard::HbQwertyKeyboard(HbQwertyKeyboardPrivate &dd, QGraphicsItem* parent)
-: HbInputVkbWidget(dd, parent)
-{
-}
-
-/*!
-\deprecated HbQwertyKeyboard::~HbQwertyKeyboard()
- is deprecated.
-*/
-HbQwertyKeyboard::~HbQwertyKeyboard()
-{
-}
-
-/*!
-\reimp
-\deprecated HbQwertyKeyboard::keyboardType() const
- is deprecated.
-*/
-HbKeyboardType HbQwertyKeyboard::keyboardType() const
-{
- return HbKeyboardVirtualQwerty;
-}
-
-/*!
-\reimp
-\deprecated HbQwertyKeyboard::setMode(HbKeypadMode, QFlags<HbModifier>)
- is deprecated.
-*/
-void HbQwertyKeyboard::setMode(HbKeypadMode mode, HbModifiers modifiers)
-{
- Q_D(HbQwertyKeyboard);
-
- if(d->mMode == EModeNumeric && d->mKeypadCreated) {
- // for numeric edito we need to update sct character button everytime
- // we move between editors. ( dialer editor, digits only, formatted editor ect)
- d->updateButtonsTextAndMappers();
- }
-
- setupToolCluster();
- if (d->mMode == mode && d->mModifiers == modifiers && d->mKeypadCreated && !d->mKeymapChanged) {
- d->applyEditorConstraints();
- return;
- }
-
- d->mMode = mode;
- d->mModifiers = modifiers;
-
- const HbKeyboardMap* keymap = d->mKeymap->keyboard(HbKeyboardVirtualQwerty);
- if (keymap == 0) {
- return;
- }
-
- int keymapCount = keymap->keys.count();
-
- if (!d->mKeypadCreated
- || (keymapCount == HbVirtualQwerty4x10MaxKeysCount && d->mKeyboardSize == HbQwertyKeyboardPrivate::HbQwerty4x11)
- || (keymapCount == HbVirtualQwerty4x11MaxKeysCount && d->mKeyboardSize == HbQwertyKeyboardPrivate::HbQwerty4x10)) {
- if (!d->mKeypadCreated) {
- d->constructKeypad();
- d->initializeKeyboard(false);
- } else {
- d->initializeKeyboard(true);
- }
- d->applyEditorConstraints();
- d->setRockerPosition();
- return;
- }
- if (d->mMode == EModeNumeric) {
- // Numeric keyboard does not change mode
- return;
- }
- d->updateButtonsTextAndMappers();
- d->applyEditorConstraints();
-}
-
-/*!
-\reimp
-\deprecated HbQwertyKeyboard::setKeymap(const HbKeymap*)
- is deprecated.
-*/
-void HbQwertyKeyboard::setKeymap(const HbKeymap* keymap)
-{
- Q_D(HbQwertyKeyboard);
- if (keymap) {
- d->mKeymap = keymap;
- d->mKeymapChanged = true;
- // let's change the button text depending on the new keymapping.
- HbInputState newState = d->mOwner->inputState();
- if (newState.textCase() == HbTextCaseUpper || newState.textCase() == HbTextCaseAutomatic) {
- setMode(d->mMode, HbModifierShiftPressed);
- } else {
- setMode(d->mMode, HbModifierNone);
- }
- d->mKeymapChanged = false;
- }
-}
-
-/*!
-\reimp
-\deprecated HbQwertyKeyboard::aboutToOpen(HbVkbHost*)
-*/
-void HbQwertyKeyboard::aboutToOpen(HbVkbHost *host)
-{
- Q_D(HbQwertyKeyboard);
-
- HbInputVkbWidget::aboutToOpen(host);
-
- d->setLayoutDimensions(d->calculateDimensions(keypadButtonAreaSize()));
-}
-
-/*!
-\reimp
-\deprecated HbQwertyKeyboard::preferredKeyboardSize()
-*/
-QSizeF HbQwertyKeyboard::preferredKeyboardSize()
-{
- Q_D(HbQwertyKeyboard);
-
- QSizeF result = HbInputVkbWidget::preferredKeyboardSize();
-
- if (d->mMode == EModeNumeric) {
- //We need to subtract the height of the close handle from prefered size of keypad
- //before calculating the height of each row.
- qreal height = (result.height() - HbCloseHandleHeight) / (qreal)HbVirtualQwertyNumberOfRows;
- result.setHeight(HbVirtualQwertyNumberOfRowsNumberMode * height + HbCloseHandleHeight);
- }
-
- return QSizeF(result);
-}
-
-/*!
-\deprecated HbQwertyKeyboard::previewCharacters(const QStringList&)
- is deprecated.
-*/
-bool HbQwertyKeyboard::previewCharacters(const QStringList& characters)
-{
- Q_D(HbQwertyKeyboard);
-
- // Don't do anything if the current button index is not in the range.
- if (d->mPressedButtonIndex < 0 || d->mPressedButtonIndex > d->mButtons.size()) {
- return false;
- }
-
- // let's set mLongKeyPressCharsShown. Since if the long press preview pane is On
- // we should not close the preview pane when the button is released.
- if (!d->mInStickyRegion) {
- if (characters.count()) {
- // we should not show the long press preview pane if the character size is 1 and matches with
- // the the button text.
- if (characters.count() == 1
- && (d->mButtons.at(d->mPressedButtonIndex)->text().compare(characters.at(0)) == 0)) {
- d->mLongKeyPressCharsShown = false;
- } else {
- d->launchPreviewPane(characters);
- d->mLongKeyPressCharsShown = true;
- }
- } else {
- d->mLongKeyPressCharsShown = false;
- }
- } else {
- // This situation is not likely to happen as we might have closed
- // the preview pane in enteredInNonStickyRegion function.
- if (d->mPreviewPane->isVisible()) {
- d->mPreviewPane->hide();
- }
- d->mLongKeyPressCharsShown = false;
- }
-
- // let's inform the caller that there preview is not possible with the
- // character set sent.
- return d->mLongKeyPressCharsShown;
-}
-
-/*!
-\reimp
-\deprecated HbQwertyKeyboard::aboutToClose(HbVkbHost*)
-*/
-void HbQwertyKeyboard::aboutToClose(HbVkbHost *host)
-{
- Q_UNUSED(host);
- Q_D(HbQwertyKeyboard);
- // Let's hide the preview pane.
- if (d->mPreviewPane->isVisible()) {
- d->mPreviewPane->hide();
- }
- // reset the states as the keypad is closing
- d->mLongKeyPressCharsShown = false;
- d->mInStickyRegion = true;
-
- HbInputVkbWidget::aboutToClose(host);
-}
-
-/*!
-\deprecated HbQwertyKeyboard::initSctModeList()
- is deprecated. Sct mode list is not supported anymore.
-*/
-void HbQwertyKeyboard::initSctModeList()
-{
-}
-
-/*!
-\deprecated HbQwertyKeyboard::sctModeListClosed()
- is deprecated. Sct mode list is not supported anymore.
-*/
-void HbQwertyKeyboard::sctModeListClosed()
-{
-}
-
-/*!
-\deprecated HbQwertyKeyboard::enteredInNonStickyRegion()
- is deprecated.
-*/
-void HbQwertyKeyboard::enteredInNonStickyRegion()
-{
- Q_D(HbQwertyKeyboard);
- if (d->mPreviewPane->isVisible()) {
- d->mPreviewPane->hide();
- }
- d->mInStickyRegion = true;
- d->mLongKeyPressCharsShown = false;
-}
-
-/*!
-\deprecated HbQwertyKeyboard::mappedKeyClick(int)
- is deprecated and will be removed.
-*/
-void HbQwertyKeyboard::mappedKeyClick(int buttonid)
-{
- Q_UNUSED(buttonid);
-}
-// End of file
--- a/src/hbinput/inputwidgets/hbinputqwertytouchkeyboard.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbInput module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#ifndef HB_INPUT_QWERTY_KEYBOARD_H
-#define HB_INPUT_QWERTY_KEYBOARD_H
-
-#include <hbinputdef.h>
-#include "hbinputvkbwidget.h"
-
-class HbKeymap;
-class HbQwertyKeyboardPrivate;
-class HbTouchKeypadButton;
-
-class HB_INPUT_EXPORT HbQwertyKeyboard : public HbInputVkbWidget
-{
- Q_OBJECT
-
-public:
- HbQwertyKeyboard(HbInputMethod* aOwner, const HbKeymap* keymap, QGraphicsItem* aParent = NULL,
- HbKeypadMode mode = EModeAbc);
- virtual ~HbQwertyKeyboard();
-
-public:
- bool previewCharacters(const QStringList& spellList);
-
-public: // from HbVirtualKeyboard
- HbKeyboardType keyboardType() const;
-
-public: // From HbInputVkbWidget
- void aboutToOpen(HbVkbHost *host);
- void aboutToClose(HbVkbHost *host);
- void setMode(HbKeypadMode mode, HbModifiers modifiers);
- void setKeymap(const HbKeymap* keymap);
- QSizeF preferredKeyboardSize();
-
-private slots:
- void enteredInNonStickyRegion();
- void mappedKeyClick(int buttonid);
-signals:
- void charFromPreviewSelected(QString character);
-
-protected:
- QSizeF proposedSize();
-
-protected: // From HbInputVkbWidget
- void initSctModeList();
-
-public slots:
- void sctModeListClosed();
-protected:
- HbQwertyKeyboard(HbQwertyKeyboardPrivate &dd, QGraphicsItem* parent);
-
-private:
- void applyEditorConstraints();
-
-private:
- Q_DECLARE_PRIVATE_D(d_ptr, HbQwertyKeyboard)
- Q_DISABLE_COPY(HbQwertyKeyboard)
-};
-
-#endif // HB_INPUT_QWERTY_KEYBOARD_H
-
-// End of file
--- a/src/hbinput/inputwidgets/hbinputscreenshotwidget.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputscreenshotwidget.cpp Fri May 14 16:09:54 2010 +0300
@@ -25,9 +25,9 @@
#include <QPixmap>
#include <QPainter>
-#include <hbframedrawer.h>
#include <hbeffect.h>
#include <hbwidget_p.h>
+#include "hbframedrawerpool_p.h"
#include "hbinputscreenshotwidget.h"
#include "hbinputvkbwidget.h"
@@ -58,17 +58,19 @@
QPixmap mPixmap;
HbFrameDrawer *mIconDrawer;
+ qreal mCloseHandleHeight;
+ qreal mCloseHandleWidth;
};
HbInputScreenshotWidgetPrivate::HbInputScreenshotWidgetPrivate()
+ : mIconDrawer(0), mCloseHandleHeight(0), mCloseHandleWidth(0)
{
- mIconDrawer = new HbFrameDrawer();
}
HbInputScreenshotWidgetPrivate::~HbInputScreenshotWidgetPrivate()
{
- delete mIconDrawer;
+ HbFrameDrawerPool::release(mIconDrawer);
}
@@ -107,6 +109,16 @@
{
Q_D(HbInputScreenshotWidget);
d->mPixmap = pixmap;
+
+ if (!d->mPixmap.isNull()) {
+ HbFrameDrawerPool::release(d->mIconDrawer);
+
+ qreal unitValue = HbDeviceProfile::profile(mainWindow()).unitValue();
+ d->mCloseHandleHeight = HbCloseHandleHeightInUnits * unitValue;
+ d->mCloseHandleWidth = HbCloseHandleWidthInUnits * unitValue;
+ QSizeF handleSize = QSizeF(d->mCloseHandleWidth, d->mCloseHandleHeight);
+ d->mIconDrawer = HbFrameDrawerPool::get(HbInputVkbHandleIcon, HbFrameDrawer::OnePiece, handleSize);
+ }
}
/*!
@@ -135,14 +147,19 @@
Q_D(HbInputScreenshotWidget);
if (!d->mPixmap.isNull()){
- d->mIconDrawer->setFrameType(HbFrameDrawer::OnePiece);
QRectF rect = boundingRect();
- rect.setLeft(rect.width()/2 - HbCloseHandleHeight*3);
- rect.setWidth(HbCloseHandleHeight*6);
- rect.setHeight(HbCloseHandleHeight);
- d->mIconDrawer->setFrameGraphicsName(HbInputVkbHandleIcon);
+
+ painter->save();
+ painter->translate(rect.width() / 2 - d->mCloseHandleWidth / 2, 0);
+ rect.setWidth(d->mCloseHandleWidth);
+ rect.setHeight(d->mCloseHandleHeight);
d->mIconDrawer->paint(painter, rect);
- painter->drawPixmap(0, (int)HbCloseHandleHeight, d->mPixmap);
+ painter->restore();
+
+ painter->save();
+ painter->translate(0, d->mCloseHandleHeight);
+ painter->drawPixmap(0, 0, d->mPixmap);
+ painter->restore();
}
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbinput/inputwidgets/hbinputsctkeyboard.cpp Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,494 @@
+/****************************************************************************
+**
+** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (developer.feedback@nokia.com)
+**
+** This file is part of the HbInput module of the UI Extensions for Mobile.
+**
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at developer.feedback@nokia.com.
+**
+****************************************************************************/
+
+#include <math.h>
+
+#include <hbdeviceprofile.h>
+
+#include <hbinputmethod.h>
+#include <hbinputkeymap.h>
+#include <hbinpututils.h>
+#include <hbframedrawer.h>
+#include <hbinputsettingproxy.h>
+
+#include "hbinputsctkeyboard.h"
+#include "hbinputsctkeyboard_p.h"
+#include "hbinputbuttongroup.h"
+#include "hbinputbutton.h"
+
+const qreal HbPortraitKeyboardHeightInUnits = 46.8;
+const qreal HbPortraitKeyboardWidthInUnits = 53.8;
+const qreal HbLandscapeKeyboardHeightInUnits = 34.6;
+const qreal HbLandscapeKeyboardWidthInUnits = 95.5;
+
+const int HbSctPortraitNumberOfRows = 5;
+const int HbSctPortraitNumberOfColumns = 5;
+const int HbPortraitButtonKeyCodeTable[HbSctPortraitNumberOfRows * HbSctPortraitNumberOfColumns] =
+{
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeDelete,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeAlphabet,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodePageChange,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeSmiley,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCustom
+};
+
+const int HbSctLandscapeNumberOfRows = 4;
+const int HbSctLandscapeNumberOfColumns = 10;
+const int HbLandscapeButtonKeyCodeTable[HbSctLandscapeNumberOfRows * HbSctLandscapeNumberOfColumns] =
+{
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeSmiley,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeDelete,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeEnter,
+ HbInputButton::ButtonKeyCodePageChange,
+ HbInputButton::ButtonKeyCodeAlphabet,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeSpace,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCustom
+};
+
+/*!
+@proto
+@hbinput
+\class HbSctKeyboard
+\brief Touch keyboard for special characters
+
+Implements special character keyboard. The keyboard knows how to set up button titles according to
+given key map data object and it also supports editor specific custom buttons.
+
+\sa HbInputVkbWidget
+*/
+
+HbSctKeyboardPrivate::HbSctKeyboardPrivate()
+ : mType(HbKeyboardSctPortrait), mColumns(0), mRows(0),
+ mCharacterButtons(0), mPages(0), mActivePage(0)
+{
+}
+
+HbSctKeyboardPrivate::~HbSctKeyboardPrivate()
+{
+}
+
+void HbSctKeyboardPrivate::init()
+{
+ Q_Q(HbSctKeyboard);
+
+ HbInputVkbWidgetPrivate::init();
+
+ if (HbInputSettingProxy::instance()->activeKeyboard() & HbQwertyKeyboardMask) {
+ mType = HbKeyboardSctLandscape;
+ }
+
+ HbInputButtonGroup *buttonGroup = static_cast<HbInputButtonGroup*>(q->contentItem());
+ if (buttonGroup) {
+ mColumns = HbSctPortraitNumberOfColumns;
+ mRows = HbSctPortraitNumberOfRows;
+ if (mType == HbKeyboardSctLandscape) {
+ mColumns = HbSctLandscapeNumberOfColumns;
+ mRows = HbSctLandscapeNumberOfRows;
+
+ buttonGroup->setButtonPreviewEnabled(HbInputSettingProxy::instance()->isCharacterPreviewForQwertyEnabled());
+ }
+
+ buttonGroup->setGridSize(QSize(mColumns, mRows));
+
+ int key = 0;
+ QList<HbInputButton*> buttons;
+ for (int i = 0; i < mColumns * mRows; ++i) {
+ HbInputButton *item = new HbInputButton(keyCode(i), QPoint(key % mColumns, key / mColumns));
+ buttons.append(item);
+
+ if (keyCode(i) == HbInputButton::ButtonKeyCodeCharacter) {
+ ++mCharacterButtons;
+ } else if (keyCode(i) == HbInputButton::ButtonKeyCodeSpace) {
+ item->setSize(QSize(2, 1));
+ ++key;
+ } else if (keyCode(i) == HbInputButton::ButtonKeyCodeDelete &&
+ mType == HbKeyboardSctPortrait) {
+ item->setIcon(HbIcon(HbInputButtonIconDelete2), HbInputButton::ButtonIconIndexPrimary);
+ } else if (keyCode(i) == HbInputButton::ButtonKeyCodePageChange &&
+ mType == HbKeyboardSctPortrait) {
+ item->setIcon(HbIcon(HbInputButtonIconPageChange2), HbInputButton::ButtonIconIndexPrimary);
+ }
+ ++key;
+ }
+ buttonGroup->setButtons(buttons);
+
+ QObject::connect(buttonGroup, SIGNAL(buttonPressed(const QKeyEvent&)), q, SLOT(sendKeyPressEvent(const QKeyEvent&)));
+ QObject::connect(buttonGroup, SIGNAL(buttonDoublePressed(const QKeyEvent&)), q, SLOT(sendKeyDoublePressEvent(const QKeyEvent&)));
+ QObject::connect(buttonGroup, SIGNAL(buttonReleased(const QKeyEvent&)), q, SLOT(sendKeyReleaseEvent(const QKeyEvent&)));
+ QObject::connect(buttonGroup, SIGNAL(buttonLongPressed(const QKeyEvent&)), q, SLOT(sendLongPressEvent(const QKeyEvent&)));
+ QObject::connect(buttonGroup, SIGNAL(pressedButtonChanged(const QKeyEvent&, const QKeyEvent&)), q, SLOT(sendKeyChangeEvent(const QKeyEvent&, const QKeyEvent&)));
+ }
+
+ QObject::connect(q, SIGNAL(flickEvent(HbInputVkbWidget::HbFlickDirection)), buttonGroup, SLOT(cancelButtonPress()));
+}
+
+int HbSctKeyboardPrivate::keyCode(int buttonId)
+{
+ if (mType == HbKeyboardSctPortrait) {
+ return HbPortraitButtonKeyCodeTable[buttonId];
+ } else {
+ return HbLandscapeButtonKeyCodeTable[buttonId];
+ }
+}
+
+void HbSctKeyboardPrivate::applyEditorConstraints()
+{
+ Q_Q(HbSctKeyboard);
+
+ HbInputFocusObject *focusedObject = mOwner->focusObject();
+ if (!focusedObject) {
+ return;
+ }
+
+ HbInputButtonGroup *buttonGroup = static_cast<HbInputButtonGroup*>(q->contentItem());
+ if (buttonGroup) {
+ QList<HbInputButton*> buttons = buttonGroup->buttons();
+ for (int i = 0; i < buttons.count(); ++i) {
+ HbInputButton *item = buttons.at(i);
+
+ HbInputButton::HbInputButtonState state = item->state();
+ if (keyCode(i) == HbInputButton::ButtonKeyCodeCharacter) {
+ QString data = item->text(HbInputButton::ButtonTextIndexPrimary);
+ if (data.isEmpty() || !focusedObject->characterAllowedInEditor(data.at(0))) {
+ state = HbInputButton::ButtonStateDisabled;
+ } else if (item->state() == HbInputButton::ButtonStateDisabled) {
+ state = HbInputButton::ButtonStateReleased;
+ }
+ } else if (keyCode(i) == HbInputButton::ButtonKeyCodeSmiley) {
+ if (focusedObject->editorInterface().isNumericEditor() ||
+ !focusedObject->editorInterface().editorClass() == HbInputEditorClassUnknown ||
+ !isSmileysEnabled()) {
+ state = HbInputButton::ButtonStateDisabled;
+ } else if (item->state() == HbInputButton::ButtonStateDisabled) {
+ state = HbInputButton::ButtonStateReleased;
+ }
+ }
+ item->setState(state);
+ }
+ buttonGroup->setButtons(buttons);
+ }
+}
+
+void HbSctKeyboardPrivate::updateKeyCodes()
+{
+ Q_Q(HbSctKeyboard);
+
+ mPages = 0;
+ const HbKeyboardMap *keyboardMap = mKeymap->keyboard(q->keyboardType());
+ if (keyboardMap) {
+ mPages = (int)ceil((float)(keyboardMap->keys.count() / mCharacterButtons));
+ }
+
+ if (mPages > 1) {
+ mFlickAnimation = true;
+ }
+
+ HbInputButtonGroup *buttonGroup = static_cast<HbInputButtonGroup*>(q->contentItem());
+ if (buttonGroup) {
+ int key = mActivePage * mCharacterButtons;
+ QList<HbInputButton*> buttons = buttonGroup->buttons();
+ for (int i = 0; i < buttons.count(); ++i) {
+ if (keyCode(i) == HbInputButton::ButtonKeyCodeCharacter) {
+ HbInputButton *item = buttons.at(i);
+
+ if (keyboardMap && key < keyboardMap->keys.count()) {
+ item->setKeyCode(keyboardMap->keys.at(key)->keycode.unicode());
+ } else {
+ item->setKeyCode(-1);
+ }
+ ++key;
+ }
+ }
+ }
+}
+
+void HbSctKeyboardPrivate::updateButtons()
+{
+ Q_Q(HbSctKeyboard);
+
+ HbInputButtonGroup *buttonGroup = static_cast<HbInputButtonGroup*>(q->contentItem());
+ if (buttonGroup) {
+ int key = mActivePage * mCharacterButtons;
+ QList<HbInputButton*> buttons = buttonGroup->buttons();
+ for (int i = 0; i < buttons.count(); ++i) {
+ if (keyCode(i) == HbInputButton::ButtonKeyCodeCharacter) {
+ HbInputButton *item = buttons.at(i);
+
+ const HbKeyboardMap *keyboardMap = mKeymap->keyboard(q->keyboardType());
+ if (keyboardMap && key < keyboardMap->keys.count()) {
+ QString keydata = keyboardMap->keys.at(key)->characters(HbModifierNone);
+ item->setText(keydata.at(0), HbInputButton::ButtonTextIndexPrimary);
+ } else {
+ item->setText("", HbInputButton::ButtonTextIndexPrimary);
+ }
+
+ ++key;
+ }
+ }
+ buttonGroup->setButtons(buttons);
+ }
+}
+
+/*!
+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
+changed later (for example when the input language changes) by calling
+setKeymap.
+*/
+HbSctKeyboard::HbSctKeyboard(HbInputMethod *owner, const HbKeymap *keymap, QGraphicsItem *parent)
+ : HbInputVkbWidget(*new HbSctKeyboardPrivate, parent)
+{
+ if (!owner) {
+ return;
+ }
+ Q_D(HbSctKeyboard);
+ d->mOwner = owner;
+ setKeymap(keymap);
+
+ const HbKeyboardMap *keyboardMap = keymap->keyboard(keyboardType());
+ if (keyboardMap) {
+ d->mPages = (int)ceil((float)(keyboardMap->keys.count() / d->mCharacterButtons));
+ }
+
+ if (d->mPages > 1) {
+ d->mFlickAnimation = true;
+ }
+
+ if (d->mType == HbKeyboardSctLandscape) {
+ connect(HbInputSettingProxy::instance(), SIGNAL(characterPreviewStateForQwertyChanged(bool)), this, SLOT(updateButtonPreviewStatus(bool)));
+ }
+ connect(this, SIGNAL(flickEvent(HbInputVkbWidget::HbFlickDirection)), this, SLOT(changePage(HbInputVkbWidget::HbFlickDirection)));
+}
+
+/*!
+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
+changed later (for example when the input language changes) by calling
+setKeymap.
+*/
+HbSctKeyboard::HbSctKeyboard(HbSctKeyboardPrivate &dd, HbInputMethod *owner,
+ const HbKeymap *keymap, QGraphicsItem* parent)
+ : HbInputVkbWidget(dd, parent)
+{
+ if (!owner) {
+ return;
+ }
+ Q_D(HbSctKeyboard);
+ d->mOwner = owner;
+ setKeymap(keymap);
+
+ const HbKeyboardMap *keyboardMap = keymap->keyboard(keyboardType());
+ if (keyboardMap) {
+ d->mPages = (int)ceil((float)(keyboardMap->keys.count() / d->mCharacterButtons));
+ }
+
+ if (d->mPages > 1) {
+ d->mFlickAnimation = true;
+ }
+
+ if (d->mType == HbKeyboardSctLandscape) {
+ connect(HbInputSettingProxy::instance(), SIGNAL(characterPreviewStateForQwertyChanged(bool)), this, SLOT(updateButtonPreviewStatus(bool)));
+ }
+ connect(this, SIGNAL(flickEvent(HbInputVkbWidget::HbFlickDirection)), this, SLOT(changePage(HbInputVkbWidget::HbFlickDirection)));
+}
+
+/*!
+Destructs the object.
+*/
+HbSctKeyboard::~HbSctKeyboard()
+{
+}
+
+/*!
+Returns keyboard type.
+*/
+HbKeyboardType HbSctKeyboard::keyboardType() const
+{
+ Q_D(const HbSctKeyboard);
+
+ return d->mType;
+}
+
+/*!
+Returns preferred keyboard size. HbVkbHost uses this information when it opens the keyboard.
+*/
+QSizeF HbSctKeyboard::preferredKeyboardSize()
+{
+ Q_D(HbSctKeyboard);
+
+ QSizeF result;
+ qreal unitValue = HbDeviceProfile::profile(mainWindow()).unitValue();
+
+ if (d->mType == HbKeyboardSctLandscape) {
+ result.setHeight(HbLandscapeKeyboardHeightInUnits * unitValue + d->mCloseHandleHeight);
+ result.setWidth(HbLandscapeKeyboardWidthInUnits * unitValue);
+ } else {
+ result.setHeight(HbPortraitKeyboardHeightInUnits * unitValue + d->mCloseHandleHeight);
+ result.setWidth(HbPortraitKeyboardWidthInUnits * unitValue);
+ }
+
+ return QSizeF(result);
+}
+
+/*!
+Sets the keypad to given mode. Possible values are EModeAbc, EModeNumeric and EModeSct.
+*/
+void HbSctKeyboard::setMode(HbKeypadMode mode, HbModifiers modifiers)
+{
+ Q_D(HbSctKeyboard);
+
+ d->mActivePage = 0;
+ d->updateKeyCodes();
+
+ HbInputVkbWidget::setMode(mode, modifiers);
+}
+
+/*!
+Updates button preview status.
+*/
+void HbSctKeyboard::updateButtonPreviewStatus(bool status)
+{
+ HbInputButtonGroup *buttonGroup = static_cast<HbInputButtonGroup*>(contentItem());
+ if (buttonGroup) {
+ buttonGroup->setButtonPreviewEnabled(status);
+ }
+}
+
+/*!
+Handles flick gesture
+*/
+void HbSctKeyboard::changePage(HbInputVkbWidget::HbFlickDirection flickDirection)
+{
+ Q_D(HbSctKeyboard);
+
+ if (flickDirection == HbInputVkbWidget::HbFlickDirectionRight ||
+ flickDirection == HbInputVkbWidget::HbFlickDirectionLeft) {
+ int direction = -1;
+ if (flickDirection == HbInputVkbWidget::HbFlickDirectionRight) {
+ direction = 1;
+ }
+
+ d->mActivePage = (d->mActivePage + direction) % d->mPages;
+ if (d->mActivePage < 0) {
+ d->mActivePage = d->mPages - 1;
+ }
+ d->updateKeyCodes();
+ d->updateButtons();
+ d->applyEditorConstraints();
+ }
+}
+
+/*!
+Sends key event to owning input method.
+*/
+void HbSctKeyboard::sendKeyPressEvent(const QKeyEvent &event)
+{
+ if (event.key() != HbInputButton::ButtonKeyCodePageChange &&
+ event.key() != HbInputButton::ButtonKeyCodeSmiley) {
+ HbInputVkbWidget::sendKeyPressEvent(event);
+ }
+}
+
+/*!
+Sends key event to owning input method.
+*/
+void HbSctKeyboard::sendKeyReleaseEvent(const QKeyEvent &event)
+{
+ Q_D(HbSctKeyboard);
+
+ if (event.key() == HbInputButton::ButtonKeyCodePageChange) {
+ changePage(HbInputVkbWidget::HbFlickDirectionRight);
+ } else if (event.key() == HbInputButton::ButtonKeyCodeSmiley) {
+ showSmileyPicker(d->mRows, d->mColumns);
+ } else {
+ HbInputVkbWidget::sendKeyReleaseEvent(event);
+ }
+}
+
+/*!
+Sends key event to owning input method.
+Release event is ignored.
+*/
+void HbSctKeyboard::sendKeyChangeEvent(const QKeyEvent &releaseEvent, const QKeyEvent &pressEvent)
+{
+ if (pressEvent.key() != HbInputButton::ButtonKeyCodePageChange &&
+ pressEvent.key() != HbInputButton::ButtonKeyCodeSmiley) {
+ HbInputVkbWidget::sendKeyChangeEvent(releaseEvent, pressEvent);
+ }
+}
+
+// End of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbinput/inputwidgets/hbinputsctkeyboard.h Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (developer.feedback@nokia.com)
+**
+** This file is part of the HbInput module of the UI Extensions for Mobile.
+**
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at developer.feedback@nokia.com.
+**
+****************************************************************************/
+
+#ifndef HB_INPUT_SCT_KEYBOARD_H
+#define HB_INPUT_SCT_KEYBOARD_H
+
+#include <hbinputdef.h>
+#include "hbinputvkbwidget.h"
+
+class QGraphicsItem;
+class HbSctKeyboardPrivate;
+
+class HB_INPUT_EXPORT HbSctKeyboard : public HbInputVkbWidget
+{
+ Q_OBJECT
+
+public:
+ HbSctKeyboard(HbInputMethod *owner, const HbKeymap *keymap, QGraphicsItem *parent = 0);
+ ~HbSctKeyboard();
+
+public: // From HbVirtualKeyboard
+ HbKeyboardType keyboardType() const;
+ void setMode(HbKeypadMode mode, HbModifiers modifiers);
+
+public: // From HbInputVkbWidget
+ QSizeF preferredKeyboardSize();
+
+public slots:
+ void sendKeyPressEvent(const QKeyEvent &event);
+ void sendKeyReleaseEvent(const QKeyEvent &event);
+ void sendKeyChangeEvent(const QKeyEvent &pressEvent, const QKeyEvent &releaseEvent);
+
+protected:
+ HbSctKeyboard(HbSctKeyboardPrivate &dd, HbInputMethod *owner, const HbKeymap *keymap, QGraphicsItem* parent);
+
+private slots:
+ void updateButtonPreviewStatus(bool status);
+ void changePage(HbInputVkbWidget::HbFlickDirection flickDirection);
+
+private:
+ Q_DECLARE_PRIVATE_D(d_ptr, HbSctKeyboard)
+ Q_DISABLE_COPY(HbSctKeyboard)
+};
+
+#endif // HB_INPUT_SCT_KEYBOARD_H
+
+// End of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbinput/inputwidgets/hbinputsctkeyboard_p.h Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,67 @@
+/****************************************************************************
+**
+** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (developer.feedback@nokia.com)
+**
+** This file is part of the HbInput module of the UI Extensions for Mobile.
+**
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at developer.feedback@nokia.com.
+**
+****************************************************************************/
+
+#ifndef HB_INPUT_SCT_KEYBOARD_PRIVATE_H
+#define HB_INPUT_SCT_KEYBOARD_PRIVATE_H
+
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the Hb Inputs API. It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "hbinputsctkeyboard.h"
+#include "hbinputvkbwidget_p.h"
+
+class HB_INPUT_PRIVATE_EXPORT HbSctKeyboardPrivate : public HbInputVkbWidgetPrivate
+{
+ Q_DECLARE_PUBLIC(HbSctKeyboard)
+
+public:
+ HbSctKeyboardPrivate();
+ ~HbSctKeyboardPrivate();
+
+ void init();
+ int keyCode(int buttonId);
+ void applyEditorConstraints();
+ void updateKeyCodes();
+ void updateButtons();
+
+ HbKeyboardType mType;
+ int mColumns;
+ int mRows;
+ int mCharacterButtons;
+ int mPages;
+ int mActivePage;
+};
+
+#endif // HB_INPUT_SCT_KEYBOARD_PRIVATE_H
+
+// End of file
--- a/src/hbinput/inputwidgets/hbinputsctlandscape.cpp Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,695 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbInput module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#include <QGraphicsGridLayout>
-#include <QSignalMapper>
-#include <QKeyEvent>
-#include <math.h>
-
-#include <hbinstance.h>
-#include <hbinputmethod.h>
-#include <hbinputkeymap.h>
-#include <hbinputsettingproxy.h>
-#include <hbabstractedit.h>
-
-#include "hbinputsctlandscape.h"
-#include "hbinputtouchkeypadbutton.h"
-#include "hbinputvkbwidget.h"
-#include "hbinputcharpreviewpane.h"
-
-// private includes
-#include "hbinputsctlandscape_p.h"
-#include "hbinputvkbwidget_p.h"
-
-/*!
- @proto
- @hbinput
- \class HbInputSctLandscape
- \deprecated class HbInputSctLandscape
- \brief A widget for displaying special character table in landscape mode.
-
- This widget displays special character table. Characters are organized in grid
- format and there is also separate are for displaying most frquently used special
- characters. The widget inherits from touch keypad base class. When a character
- is selected it will emit signal sctCharacterSelected.
-
- \sa HbInputVkbWidget
-*/
-
-/// @cond
-
-const int HbSctNumberOfColumns = 10;
-const int HbSctNumberOfRows = 4;
-const int HbNumberOfSctButtons = 39;
-// this includes space and other buttons which are not going to be part of the special characters
-const int HbNumberOfOtherButtons = 7;
-const qreal HbSctButtonPreferredHeight = 52.5;
-const QSizeF HbSctInitialDimensions(64.0, HbSctButtonPreferredHeight);
-
-const QString HbSctLandscapeButtonTextLayout = "_hb_sctl_button_text_layout";
-const QString HbSctLandscapeButtonIconLayout = "_hb_sctl_button_icon_layout";
-
-const int HbSmileyRangeButton = Qt::Key_F1;
-const int HbSpecialCharacterRangeButton = Qt::Key_F2;
-const QString HbSmileyButtonObjName = "SCT smiley";
-const int HbSmileyButtonIndex = 9;
-struct HbVirtualSctKey
-{
- int mKey;
- int mRow;
- int mColumn;
- int mRowSpan;
- int mColumnSpan;
-};
-
-// this is a template keymapping table which will be used to
-// layout buttons. Qt::Key_Question represnts a button which can
-// be mapped to a special character / Smiley.
-HbVirtualSctKey sctVkbTable[] =
-{
- // first row
- {Qt::Key_Question,0,0,1,1 },
- {Qt::Key_Question,0,1,1,1 },
- {Qt::Key_Question,0,2,1,1 },
- {Qt::Key_Question,0,3,1,1 },
- {Qt::Key_Question,0,4,1,1 },
- {Qt::Key_Question,0,5,1,1 },
- {Qt::Key_Question,0,6,1,1},
- {Qt::Key_Question,0,7,1,1},
- {Qt::Key_Question,0,8,1,1},
- // Smiley button
- {Qt::Key_F1,0,9,1,1},
-
- // seKey_Questioncond row
- {Qt::Key_Question,1,0,1,1 },
- {Qt::Key_Question,1,1,1,1 },
- {Qt::Key_Question,1,2,1,1 },
- {Qt::Key_Question,1,3,1,1 },
- {Qt::Key_Question,1,4,1,1 },
- {Qt::Key_Question,1,5,1,1 },
- {Qt::Key_Question,1,6,1,1 },
- {Qt::Key_Question ,1,7,1,1 },
- {Qt::Key_Question,1,8,1,1 },
- {Qt::Key_Backspace, 1, 9, 1, 1 },
-
- // third row
- {Qt::Key_Question,2,0,1,1 },
- {Qt::Key_Question,2,1,1,1 },
- {Qt::Key_Question,2,2,1,1 },
- {Qt::Key_Question,2,3,1,1 },
- {Qt::Key_Question,2,4,1,1 },
- {Qt::Key_Question,2,5,1,1 },
- {Qt::Key_Question,2,6,1,1 },
- {Qt::Key_Question,2,7,1,1 },
- {Qt::Key_Question,2,8,1,1 },
- {Qt::Key_Enter, 2, 9, 1, 1 },
-
- // fourth row
- // Character range button
- {Qt::Key_F2, 3, 0, 1, 1 },
- {Qt::Key_Control, 3, 1, 1, 1 },
- {Qt::Key_Question,3,2,1,1 },
- {Qt::Key_Question,3,3,1,1 },
- {Qt::Key_Space, 3, 4, 1, 2 },
- {Qt::Key_Question,3,6,1,1 },
- {Qt::Key_Question,3,7,1,1 },
- {Qt::Key_Question,3,8,1,1 },
- // application button
- {Qt::Key_F3,3,9,1,1 }
-};
-
-HbInputSctLandscapePrivate::HbInputSctLandscapePrivate()
-:mStartIndex(0),
-mCurrentPage(0),
-mActiveView(HbInputSctLandscape::HbSctViewSpecialCharacter),
-mPreviewPane(0),
-mClickMapper(0),
-mSize(QSizeF())
-{
- mFlickAnimation = true;
-}
-
-/*
-This function sets a keypad button as a function button with given parameters.
-*/
-void HbInputSctLandscapePrivate::setAsFunctionButton(int index, const HbIcon &icon, const QString &text)
-{
- mSctButtons.at(index)->setButtonType(HbTouchKeypadButton::HbTouchButtonFunction);
- mSctButtons.at(index)->setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonReleased);
- mSctButtons.at(index)->setIcon(icon);
- mSctButtons.at(index)->setText(text);
- mSctButtons.at(index)->setAsStickyButton(false);
-}
-
-/*
-This function latches keypad button with given index. Since there could be only one
-latch button. We need to reset others.
-*/
-void HbInputSctLandscapePrivate::latchRangeButton(int buttonId)
-{
- // we need to latch only one out of available range buttons.
- for (int i = HbNumberOfSctButtons - 2; ; i--) {
- // iterate till we get a character key. since character should not be latched.
- if (mSctButtons.at(i)->type() == Hb::ItemType_InputFunctionButton) {
- mSctButtons.at(i)->setLatch(buttonId == sctVkbTable[i].mKey);
- } else {
- break;
- }
- }
-}
-
-/*
-This function defines the layout porperties for sct.
-*/
-void HbInputSctLandscapePrivate::createSctButtons()
-{
- Q_Q(HbInputSctLandscape);
-
- q->setupToolCluster();
-
- for (int i = 0; i < HbNumberOfSctButtons-1; i++) {
- HbTouchKeypadButton *button = new HbTouchKeypadButton(q, QString(""), q);
- q->connect(button, SIGNAL(pressed()), mPressMapper, SLOT(map()));
- mPressMapper->setMapping(button, i);
- q->connect(button, SIGNAL(released()), mReleaseMapper, SLOT(map()));
- mReleaseMapper->setMapping(button, i);
- q->connect(button, SIGNAL(clicked()), mClickMapper, SLOT(map()));
- mClickMapper->setMapping(button, i);
-
- mSctButtons.append(button);
- mButtonLayout->addItem(button, sctVkbTable[i].mRow, sctVkbTable[i].mColumn,
- sctVkbTable[i].mRowSpan, sctVkbTable[i].mColumnSpan);
- if (sctVkbTable[i].mKey != Qt::Key_Question) {
- button->setButtonType(HbTouchKeypadButton::HbTouchButtonFunction);
- button->setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonReleased);
- } else {
- button->setAsStickyButton(true);
- q->connect(button, SIGNAL(enteredInNonStickyRegion()), q, SLOT(_q_enteredInNonStickyRegion()));
- button->setProperty(HbStyleRulesCacheId::hbStyleRulesForNodeCache, HbSctLandscapeButtonTextLayout);
- }
- HbIcon icon;
- switch (sctVkbTable[i].mKey) {
- case Qt::Key_Backspace:
- icon.setIconName("qtg_mono_backspace1");
- button->setIcon( icon );
- button->setAutoRepeatDelay(HbRepeatTimeout);
- button->setAutoRepeatInterval(HbRepeatTimeoutShort);
- button->setAutoRepeat(true);
- button->setProperty(HbStyleRulesCacheId::hbStyleRulesForNodeCache, HbSctLandscapeButtonIconLayout);
- break;
- case Qt::Key_Enter:
- icon.setIconName("qtg_mono_enter");
- button->setIcon( icon );
- button->setAutoRepeatDelay(HbRepeatTimeout);
- button->setAutoRepeatInterval(HbRepeatTimeoutShort);
- button->setAutoRepeat(true);
- button->setProperty(HbStyleRulesCacheId::hbStyleRulesForNodeCache, HbSctLandscapeButtonIconLayout);
- break;
- case Qt::Key_Space:
- button->setFrameIcon("qtg_mono_space");
- button->setAutoRepeatDelay(HbRepeatTimeout);
- button->setAutoRepeatInterval(HbRepeatTimeoutShort);
- button->setAutoRepeat(true);
- break;
- case Qt::Key_Shift:
- icon.setIconName("qtg_mono_shift");
- button->setIcon(icon);
- button->setProperty(HbStyleRulesCacheId::hbStyleRulesForNodeCache, HbSctLandscapeButtonIconLayout);
- break;
- case Qt::Key_Control:
- icon.setIconName("qtg_mono_alpha_mode");
- button->setIcon(icon);
- button->setProperty(HbStyleRulesCacheId::hbStyleRulesForNodeCache, HbSctLandscapeButtonIconLayout);
- break;
- case Qt::Key_F1:
- button->setIcon(HbIcon("qtg_mono_smiley"));
- button->setObjectName(HbSmileyButtonObjName);
- button->setProperty(HbStyleRulesCacheId::hbStyleRulesForNodeCache, HbSctLandscapeButtonIconLayout);
- break;
- case Qt::Key_F2:
- button->setIcon(HbIcon("qtg_mono_special_characters_qwerty"));
- button->setObjectName(HbSmileyButtonObjName);
- button->setProperty(HbStyleRulesCacheId::hbStyleRulesForNodeCache, HbSctLandscapeButtonIconLayout);
- break;
- default:
- break;
- }
- }
-
- mSctButtons.append(mApplicationButton);
- mButtonLayout->addItem(mApplicationButton,
- sctVkbTable[HbNumberOfSctButtons-1].mRow,
- sctVkbTable[HbNumberOfSctButtons-1].mColumn,
- sctVkbTable[HbNumberOfSctButtons-1].mRowSpan,
- sctVkbTable[HbNumberOfSctButtons-1].mColumnSpan);
-}
-
-/*
-This function defines the layout porperties for sct.
-*/
-void HbInputSctLandscapePrivate::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 < HbSctNumberOfColumns; i++) {
- mButtonLayout->setColumnFixedWidth(i, dimensions.width());
- }
-
- for (int i = 0; i < HbSctNumberOfRows; i++) {
- mButtonLayout->setRowFixedHeight(i, dimensions.height());
- }
-
- mButtonLayout->setHorizontalSpacing(0.0);
- mButtonLayout->setVerticalSpacing(0.0);
- foreach (HbTouchKeypadButton* button, mSctButtons) {
- if (button) {
- button->setInitialSize(dimensions);
- }
- }
-}
-
-/*
-Sets the sct button. Once sct character buttons are set it latches the active range
-button.
-*/
-void HbInputSctLandscapePrivate::setActiveView(HbInputVkbWidget::HbSctView view)
-{
- Q_Q(HbInputSctLandscape);
- mActiveView = view;
-
- switch (mActiveView) {
- case HbInputSctLandscape::HbSctViewSpecialCharacter:
- setSctButtons(mSpecialCharacterSet);
- latchRangeButton(HbSpecialCharacterRangeButton);
- break;
- case HbInputSctLandscape::HbSctViewSmiley:
- q->showSmileyPicker(HbSctNumberOfRows, HbSctNumberOfColumns);
- break;
- default:
- break;
- };
-}
-
-/*
-apply editor constraints on buttons
-*/
-void HbInputSctLandscapePrivate::applyEditorConstraints()
-{
- HbInputFocusObject *focusedObject = 0;
- if (mOwner) {
- focusedObject = mOwner->focusObject();
- }
-
- if(!focusedObject || isKeyboardDimmed()) {
- // dont need to apply constraints when keypad is dimmed.
- // applyEditorConstraints will be called from setKeyboardDimmed(false)
- return;
- }
-
- for (int i=0; i < mSctButtons.size(); i++) {
- if (sctVkbTable[i].mKey == Qt::Key_Question || sctVkbTable[i].mKey == Qt::Key_Space) {
- QString buttonText = (sctVkbTable[i].mKey == Qt::Key_Space) ? QString(" ") : mSctButtons.at(i)->text();
- if (buttonText.isEmpty() || !focusedObject->characterAllowedInEditor(buttonText[0])) {
- // if the data mapped to button is empty or the data mapped is not allowed to the editor
- mSctButtons.at(i)->setFade(true);
- } else {
- mSctButtons.at(i)->setFade(false);
- }
- }
- }
-
- // now set latch buttons
- switch (mActiveView) {
- case HbInputSctLandscape::HbSctViewSpecialCharacter:
- latchRangeButton(HbSpecialCharacterRangeButton);
- break;
- case HbInputSctLandscape::HbSctViewSmiley:
- latchRangeButton(HbSmileyRangeButton);
- break;
- default:
- break;
- };
-
- // we should disable smiley range button in case we have editor which is url/email/password etc editor.
- mSctButtons.at(HbSmileyButtonIndex)->setFade(focusedObject->editorInterface().editorClass() != HbInputEditorClassUnknown
- ||!isSmileysEnabled());
-}
-
-/*
-Sets passed characters on sct buttons.
-*/
-void HbInputSctLandscapePrivate::setSctButtons(const QString& aCharSet)
-{
- int i = 0;
- int j = 0;
-
- for (; i < mSctButtons.size() && (j + mStartIndex) < aCharSet.size(); i++) {
- // we need to map only on a character type button.
- if (sctVkbTable[i].mKey == Qt::Key_Question || sctVkbTable[i].mKey == Qt::Key_Space) {
- const QChar &character = (sctVkbTable[i].mKey == Qt::Key_Space) ? ' ' : aCharSet[(j++) + mStartIndex];
- mSctButtons.at(i)->setIcon(HbIcon());
- mSctButtons.at(i)->setText(character);
- }
- }
-
- for (; i < mSctButtons.size(); i++) {
- if (sctVkbTable[i].mKey == Qt::Key_Question) {
- mSctButtons.at(i)->setText(QString(""));
- }
- }
-
- mCurrentPage = mStartIndex/(HbNumberOfSctButtons-HbNumberOfOtherButtons);
- mStartIndex += j;
- if (mStartIndex == aCharSet.size()) {
- // We have reached end of special character list, reset the mStartIndex to 0
- // so that we show first set of special characters next time
- mStartIndex = 0;
- }
- applyEditorConstraints();
-}
-
-/*
-Gets the special character sets from set keymapping.
-*/
-void HbInputSctLandscapePrivate::getSpecialCharacters()
-{
- mSpecialCharacterSet.clear();
- if (mKeymap) {
- const HbKeyboardMap* keymap = mKeymap->keyboard(HbKeyboardSctLandscape);
- if (keymap == 0) {
- return;
- }
- foreach (const HbMappedKey* mappedKey, keymap->keys) {
- mSpecialCharacterSet.append(mappedKey->characters(HbModifierNone));
- }
- }
-}
-
-/*
-This function returns the keyCode for the given index.
-*/
-int HbInputSctLandscapePrivate::keyCode(int buttonId)
-{
- return sctVkbTable[buttonId].mKey;
-}
-
-/*
-Handles button press events.
-*/
-void HbInputSctLandscapePrivate::handleStandardButtonPress(int buttonId)
-{
- // A new button is pressed so we should close
- // preview pane on the previous button.
- if (mPreviewPane->isVisible()) {
- mPreviewPane->hide();
- }
-
- if (buttonId < 0) {
- return;
- }
-
- // if the button is not faded, then show character preview popup.
- if ((HbInputSettingProxy::instance()->isCharacterPreviewForQwertyEnabled()) && !(mSctButtons.at(buttonId)->isFaded())) {
- if (sctVkbTable[buttonId].mKey == Qt::Key_Question) {
- const QString &text = mSctButtons.at(buttonId)->text();
- if (text.size()) {
- QStringList list(text);
- mPreviewPane->showCharacters(list, mSctButtons.at(buttonId)->sceneBoundingRect());
- return;
- }
- }
- }
-
-}
-
-/*
-Handles button clicks.
-*/
-void HbInputSctLandscapePrivate::handleStandardButtonClick(int buttonId)
-{
- Q_Q(HbInputSctLandscape);
-
- switch (sctVkbTable[buttonId].mKey) {
- case Qt::Key_Question: {
- QString buttonText = mSctButtons.at(buttonId)->text();
- if (buttonText.length() > 0) {
- emit q->sctCharacterSelected(buttonText.at(0));
- }
- break;
- }
- case HbSpecialCharacterRangeButton:
- if(mActiveView != HbInputVkbWidget::HbSctViewSpecialCharacter) {
- //first time coming to special character view.
- mStartIndex = 0;
- }
- setActiveView(HbInputSctLandscape::HbSctViewSpecialCharacter);
- break;
- case HbSmileyRangeButton:
- if(mActiveView != HbInputVkbWidget::HbSctViewSmiley) {
- //first time coming to special character view.
- mStartIndex = 0;
- }
- // dont show the smiley picker if the button is inactive
- if (!mSctButtons[HbSmileyButtonIndex]->isFaded()) {
- setActiveView(HbInputSctLandscape::HbSctViewSmiley);
- }
- break;
- default:
- // left are enter, backspace and space buttons. they should be handled by plugins.
- // we should pass both the press and release event. As mode handlers work according to
- // the press and release event.
- QKeyEvent pressEvent(QEvent::KeyPress, sctVkbTable[buttonId].mKey, Qt::NoModifier);
- if (mOwner) {
- mOwner->filterEvent(&pressEvent);
- QKeyEvent releaseEvent(QEvent::KeyRelease, sctVkbTable[buttonId].mKey, Qt::NoModifier);
- mOwner->filterEvent(&releaseEvent);
- }
- };
-}
-
-/*
-Handles the sct keypad button releas. Internally it hides character preview pane
-if visible.
-*/
-void HbInputSctLandscapePrivate::handleStandardButtonRelease(int buttonId)
-{
- Q_UNUSED(buttonId);
- if (mPreviewPane->isVisible()) {
- mPreviewPane->hide();
- }
-}
-
-/*!
-This slot is called when we slide our fingures on top of the keypad buttons and
-while sliding our fingure comes on top of a non sticky button Or on a region outside
-the keypad area.
-*/
-void HbInputSctLandscapePrivate::_q_enteredInNonStickyRegion()
-{
- if (mPreviewPane->isVisible()) {
- mPreviewPane->hide();
- }
-}
-
-/*!
-Handles virtual key clicks
-*/
-void HbInputSctLandscapePrivate::_q_mappedKeyClick(int buttonid)
-{
- handleStandardButtonClick(buttonid);
-}
-
-/// @endcond
-
-/*!
-\deprecated HbInputSctLandscape::HbInputSctLandscape(HbInputMethod*, const HbKeymap*, QGraphicsItem*)
- is deprecated.
-*/
-HbInputSctLandscape::HbInputSctLandscape(HbInputMethod* owner, const HbKeymap *keymap, QGraphicsItem* parent)
- : HbInputVkbWidget(*new HbInputSctLandscapePrivate, parent)
-{
- Q_D(HbInputSctLandscape);
- d->q_ptr = this;
- d->mOwner = owner;
-
- d->mButtonLayout = new QGraphicsGridLayout();
-
- d->mClickMapper = new QSignalMapper(this);
-
- // create buttons.
- d->createSctButtons();
-
- // preview pane
- d->mPreviewPane = new HbCharPreviewPane();
- d->mPreviewPane->hide();
-
- // connect mappers.
- connect(d->mPressMapper, SIGNAL(mapped(int)), this, SLOT(mappedKeyPress(int)));
- connect(d->mReleaseMapper, SIGNAL(mapped(int)), this, SLOT(mappedKeyRelease(int)));
- connect(d->mClickMapper, SIGNAL(mapped(int)), this, SLOT(_q_mappedKeyClick(int)));
-
- connect(this, SIGNAL(flickEvent(HbInputVkbWidget::HbFlickDirection)), this, SLOT(flickTriggered(HbInputVkbWidget::HbFlickDirection)));
-
- // now set the keymap data.
- setKeymap(keymap);
-}
-
-/*!
-\deprecated HbInputSctLandscape::HbInputSctLandscape(HbInputSctLandscapePrivate&, QGraphicsItem*)
- is deprecated.
-*/
-HbInputSctLandscape::HbInputSctLandscape(HbInputSctLandscapePrivate &dd, QGraphicsItem* parent)
- : HbInputVkbWidget(dd, parent)
-{
-}
-
-/*!
-\deprecated HbInputSctLandscape::~HbInputSctLandscape()
- is deprecated.
-*/
-HbInputSctLandscape::~HbInputSctLandscape()
-{
-}
-
-/*!
-\reimp
-\deprecated HbInputSctLandscape::keyboardType() const
- is deprecated.
-*/
-HbKeyboardType HbInputSctLandscape::keyboardType() const
-{
- return HbKeyboardSctLandscape;
-}
-
-/*!
-\deprecated HbInputSctLandscape::setSct(HbSctView, bool)
- is deprecated.
-*/
-void HbInputSctLandscape::setSct(HbSctView view , bool enableMostUsedCharacterPane)
-{
- // for the time being disabling
- // most used character pane
- Q_UNUSED(enableMostUsedCharacterPane);
- Q_D(HbInputSctLandscape);
-
- d->mStartIndex = 0;
- setupToolCluster();
- d->mStartIndex = 0;
- d->setActiveView(view);
-}
-
-/*!
-\reimp
-\deprecated HbInputSctLandscape::setKeymap(const HbKeymap*)
- is deprecated.
-*/
-void HbInputSctLandscape::setKeymap(const HbKeymap* keymap)
-{
- Q_D(HbInputSctLandscape);
- HbInputVkbWidget::setKeymap(keymap);
- d->getSpecialCharacters();
-}
-
-/*!
-\reimp
-\deprecated HbInputSctLandscape::keypadLayout()
- is deprecated.
-*/
-QGraphicsLayout *HbInputSctLandscape::keypadLayout()
-{
- Q_D(HbInputSctLandscape);
- return d->mButtonLayout;
-}
-
-/*!
-\reimp
-\deprecated HbInputSctLandscape::aboutToOpen(HbVkbHost*)
- is deprecated.
-*/
-void HbInputSctLandscape::aboutToOpen(HbVkbHost *host)
-{
- Q_D(HbInputSctLandscape);
- HbInputVkbWidget::aboutToOpen(host);
-
- // calculate each button width and height
- QSizeF keypadSize = keypadButtonAreaSize();
-
- keypadSize.setWidth(keypadSize.width() / (qreal)HbSctNumberOfColumns);
- keypadSize.setHeight(keypadSize.height() / (qreal)HbSctNumberOfRows);
-
- d->setLayoutDimensions(keypadSize);
-}
-
-/*!
-\reimp
-\deprecated HbInputSctLandscape::aboutToClose(HbVkbHost*)
- is deprecated.
-*/
-void HbInputSctLandscape::aboutToClose(HbVkbHost *host)
-{
- Q_D(HbInputSctLandscape);
- HbInputVkbWidget::aboutToClose(host);
- if (d->mPreviewPane->isVisible()) {
- d->mPreviewPane->hide();
- }
-}
-
-/*!
-\deprecated HbInputSctLandscape::flickTriggered(HbInputVkbWidget::HbFlickDirection)
- is deprecated.
-*/
-void HbInputSctLandscape::flickTriggered(HbInputVkbWidget::HbFlickDirection direction)
-{
- Q_D(HbInputSctLandscape);
-
- // left/right flick event has occured, hence hide the preview pane
- if (d->mPreviewPane->isVisible()) {
- d->mPreviewPane->hide();
- }
-
- // total number of actual buttons available for displaying special characters
- int iNumSctButtons = HbNumberOfSctButtons-HbNumberOfOtherButtons;
- if(direction == HbInputVkbWidget::HbFlickDirectionLeft) {
- d->mCurrentPage--;
- if(d->mCurrentPage<0) {
- if (d->mSpecialCharacterSet.size()) {
- d->mCurrentPage = (int)ceil((float)d->mSpecialCharacterSet.size()/iNumSctButtons)-1;
- } else {
- d->mCurrentPage = 0;
- }
- }
- d->mStartIndex = d->mCurrentPage*iNumSctButtons;
- }
- d->setActiveView(HbInputSctLandscape::HbSctViewSpecialCharacter);
-}
-
-#include "moc_hbinputsctlandscape.cpp"
-// End of file
--- a/src/hbinput/inputwidgets/hbinputsctlandscape.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbInput module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#ifndef HB_INPUT_SCT_LANDSCAPE_HB_H
-#define HB_INPUT_SCT_LANDSCAPE_HB_H
-
-#include "hbinputvkbwidget.h"
-
-class HbInputSctLandscapePrivate;
-
-class HB_INPUT_EXPORT HbInputSctLandscape : public HbInputVkbWidget
-{
- Q_OBJECT
-
-public:
-
- HbInputSctLandscape(HbInputMethod* owner, const HbKeymap *keymap, QGraphicsItem* parent = 0);
- ~HbInputSctLandscape();
-
- void setSct(HbSctView view = HbSctViewSpecialCharacter, bool enableMostUsedCharacterPane = false);
-
- void setKeymap(const HbKeymap* keymap);
-
-public: // From HbVirtualKeyboard
- HbKeyboardType keyboardType() const;
- void aboutToOpen(HbVkbHost *host);
- void aboutToClose(HbVkbHost *host);
- QGraphicsLayout *keypadLayout();
-
-public slots:
- void flickTriggered(HbInputVkbWidget::HbFlickDirection direction);
-
-signals:
- void sctCharacterSelected(QString aChar);
-
-protected:
- HbInputSctLandscape(HbInputSctLandscapePrivate &dd, QGraphicsItem* parent);
-
-private:
- Q_DECLARE_PRIVATE_D(d_ptr, HbInputSctLandscape)
- Q_DISABLE_COPY(HbInputSctLandscape)
- Q_PRIVATE_SLOT(d_func(), void _q_enteredInNonStickyRegion())
- Q_PRIVATE_SLOT(d_func(), void _q_mappedKeyClick(int ))
-};
-
-#endif // HB_INPUT_SCT_LANDSCAPE_HB_H
-
-// End of file
--- a/src/hbinput/inputwidgets/hbinputsctportrait.cpp Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,512 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbInput module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#include <hbapplication.h>
-#include <QGraphicsSceneMouseEvent>
-#include <QGraphicsLinearLayout>
-#include <QGraphicsGridLayout>
-#include <QVector>
-#include <QSignalMapper>
-#include <QKeyEvent>
-#include <QPointer>
-#include <math.h>
-
-#include <hbinstance.h>
-#include <hbinputmethod.h>
-#include <hbinputkeymap.h>
-#include <hbinputvkbhost.h>
-#include <hbinputsettingproxy.h>
-#include <hbabstractedit.h>
-#include "hbinputsctportrait.h"
-#include "hbinputtouchkeypadbutton.h"
-#include "hbinputvkbwidget.h"
-
-#include "hbinputsctportrait_p.h"
-#include "hbinputvkbwidget_p.h"
-
-/*!
- @proto
- @hbinput
- \class HbInputSctPortrait
- \deprecated class HbInputSctPortrait
- \brief A widget for displaying special character table in portrait mode.
-
- This widget displays special character table. Characters are organized in grid
- format. The widget inherits from touch keypad base class. When a character
- is selected it will emit signal sctCharacterSelected.
-
- \sa HbInputVkbWidget
- \sa HbInputTopSctLine
-*/
-
-/// @cond
-
-const int HbSctGridColumns = 5;
-const int HbSctGridRows = 5;
-const int HbNumSctButtons = HbSctGridColumns*HbSctGridRows;
-const qreal HbSctButtonPreferredHeight = 56.0;
-const QSizeF HbSctInitialDimensions(90.0, HbSctButtonPreferredHeight);
-
-const int HbDelButtonId = HbSctGridColumns-1;
-const int HbAbcButtonId = 2*HbSctGridColumns-1;
-const int HbSpecialCharacterButtonId = 3*HbSctGridColumns-1;
-const int HbSmileyButtonId = 4*HbSctGridColumns-1;
-
-const QString HbDelButtonObjName = "SCT delete";
-const QString HbAbcButtonObjName = "SCT abc";
-const QString HbSpecialCharacterButtonObjName = "SCT special character";
-const QString HbSmileyButtonObjName = "SCT smiley";
-const QString HbCustomButtonObjName = "SCT custom button ";
-
-const QString HbSctPortraitButtonTextLayout = "_hb_sctp_button_text_layout";
-const QString HbSctPortraitButtonIconLayout = "_hb_sctp_button_icon_layout";
-
-HbInputSctPortraitPrivate::HbInputSctPortraitPrivate()
- : mActiveView(HbInputSctPortrait::HbSctViewSpecialCharacter),
- mClickMapper(0),
- mStartIndex(0),
- mCurrentPage(0),
- mSize(QSizeF())
-{
- mFlickAnimation = true;
-}
-
-/*
-This function defines the layout porperties for sct.
-*/
-void HbInputSctPortraitPrivate::createSctButtons()
-{
- Q_Q(HbInputSctPortrait);
-
- q->setupToolCluster();
-
- if (mSctButtons.size() == 0) {
- for (int i = 0; i < HbNumSctButtons-1; ++i) {
- HbTouchKeypadButton *button = new HbTouchKeypadButton(q, QString(""), q);
- q->connect(button, SIGNAL(pressed()),mPressMapper, SLOT(map()));
- mPressMapper->setMapping(button, i);
- q->connect(button, SIGNAL(released()),mReleaseMapper, SLOT(map()));
- mReleaseMapper->setMapping(button, i);
- q->connect(button, SIGNAL(clicked()), mClickMapper, SLOT(map()));
- mClickMapper->setMapping(button, i);
- mSctButtons.append(button);
- button->setProperty(HbStyleRulesCacheId::hbStyleRulesForNodeCache, HbSctPortraitButtonTextLayout);
- }
-
- mSctButtons.append(mApplicationButton);
-
- for (int i = 0; i < HbNumSctButtons; ++i) {
- mButtonLayout->addItem(mSctButtons.at(i), i/HbSctGridColumns, i%HbSctGridColumns);
- }
- }
-}
-
-/*
-This function defines the layout porperties for sct.
-*/
-void HbInputSctPortraitPrivate::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 < HbSctGridColumns; i++) {
- mButtonLayout->setColumnFixedWidth(i, dimensions.width());
- }
- for (int i = 0; i < HbSctGridRows; i++) {
- mButtonLayout->setRowFixedHeight(i, dimensions.height());
- }
-
- mButtonLayout->setHorizontalSpacing(0.0);
- mButtonLayout->setVerticalSpacing(0.0);
- foreach (HbTouchKeypadButton* button, mSctButtons) {
- if (button) {
- button->setInitialSize(dimensions);
- }
- }
-}
-
-
-void HbInputSctPortraitPrivate::initialize()
-{
- mSctButtons.at(HbDelButtonId)->setText("");
- mSctButtons.at(HbDelButtonId)->setIcon(HbIcon("qtg_mono_backspace2"));
- mSctButtons.at(HbDelButtonId)->setObjectName(HbDelButtonObjName);
- mSctButtons.at(HbDelButtonId)->setAutoRepeatDelay(HbRepeatTimeout);
- mSctButtons.at(HbDelButtonId)->setAutoRepeatInterval(HbRepeatTimeoutShort);
- mSctButtons.at(HbDelButtonId)->setAutoRepeat(true);
- mSctButtons.at(HbDelButtonId)->setProperty(HbStyleRulesCacheId::hbStyleRulesForNodeCache, HbSctPortraitButtonIconLayout);
-
- mSctButtons.at(HbAbcButtonId)->setIcon(HbIcon("qtg_mono_alpha_mode"));
- mSctButtons.at(HbAbcButtonId)->setObjectName(HbAbcButtonObjName);
- mSctButtons.at(HbAbcButtonId)->setObjectName(HbAbcButtonObjName);
- mSctButtons.at(HbAbcButtonId)->setProperty(HbStyleRulesCacheId::hbStyleRulesForNodeCache, HbSctPortraitButtonIconLayout);
-
- mSctButtons.at(HbSpecialCharacterButtonId)->setIcon(HbIcon("qtg_mono_special_characters_itut"));
- mSctButtons.at(HbSpecialCharacterButtonId)->setObjectName(HbSpecialCharacterButtonObjName);
- mSctButtons.at(HbSpecialCharacterButtonId)->setProperty(HbStyleRulesCacheId::hbStyleRulesForNodeCache, HbSctPortraitButtonIconLayout);
-
- mSctButtons.at(HbSmileyButtonId)->setIcon(HbIcon("qtg_mono_smiley"));
- mSctButtons.at(HbSmileyButtonId)->setObjectName(HbSmileyButtonObjName);
- mSctButtons.at(HbSmileyButtonId)->setProperty(HbStyleRulesCacheId::hbStyleRulesForNodeCache, HbSctPortraitButtonIconLayout);
-
- if (mApplicationButton) {
- mApplicationButton->setObjectName(HbCustomButtonObjName + QString::number(1));
- }
-
- for (int i = HbSctGridColumns-1; i < HbNumSctButtons-1; i+=HbSctGridColumns) {
- mSctButtons.at(i)->setButtonType(HbTouchKeypadButton::HbTouchButtonFunction);
- mSctButtons.at(i)->setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonReleased);
- }
-}
-
-/*
-apply editor constraints on buttons
-*/
-void HbInputSctPortraitPrivate::applyEditorConstraints()
-{
- HbInputFocusObject *focusedObject = 0;
- if (mOwner) {
- focusedObject = mOwner->focusObject();
- }
-
- if(!focusedObject || isKeyboardDimmed()) {
- // dont need to apply constraints when keypad is dimmed.
- // applyEditorConstraints will be called from setKeyboardDimmed(false)
- return;
- }
-
- for (int i=0; i < mSctButtons.size()-1; ++i) {
- if (i%HbSctGridColumns != HbSctGridColumns-1) {
- QString buttonText = mSctButtons.at(i)->text();
- if (buttonText.isEmpty() || !focusedObject->characterAllowedInEditor(buttonText[0])) {
- // if the data mapped to button is empty or the data mapped is not allowed to the editor
- mSctButtons.at(i)->setFade(true);
- } else {
- mSctButtons.at(i)->setFade(false);
- }
- }
- }
-
- mSctButtons.at(HbSmileyButtonId)->setFade(focusedObject->editorInterface().isNumericEditor()
- || !focusedObject->editorInterface().editorClass() == HbInputEditorClassUnknown
- || !isSmileysEnabled());
-}
-
-void HbInputSctPortraitPrivate::setSctButtons(const QString &aCharSet)
-{
- Q_Q(HbInputSctPortrait);
- q->setupToolCluster();
-
- int i = 0;
- int j = 0;
- for (; i < mSctButtons.size()-1 && (j+mStartIndex) < aCharSet.size(); ++i) {
- if (i%HbSctGridColumns != HbSctGridColumns-1) {
- const QChar &character = aCharSet[j+mStartIndex];
- mSctButtons.at(i)->setText(character);
- mSctButtons.at(i)->setObjectName("Sct portrait " + QString(character));
- j++;
- }
- }
-
- for (; i < mSctButtons.size()-1; ++i) {
- if (i%HbSctGridColumns != HbSctGridColumns-1) {
- mSctButtons.at(i)->setText("");
- }
- }
-
- mCurrentPage = mStartIndex/(HbNumSctButtons-HbSctGridRows);
- mStartIndex += j;
- if (mStartIndex == aCharSet.size()) {
- // We have reached end of special character list, reset the mStartIndex to 0
- // so that we show first set of special characters next time
- mStartIndex = 0;
- }
- applyEditorConstraints();
-}
-
-
-void HbInputSctPortraitPrivate::setActiveView(HbInputVkbWidget::HbSctView view)
-{
- Q_Q(HbInputSctPortrait);
- mActiveView = view;
-
- switch (view) {
- case HbInputSctPortrait::HbSctViewSpecialCharacter:
- setSctButtons(mSpecialCharacterSet);
- mSctButtons.at(HbSpecialCharacterButtonId)->setLatch(true);
- mSctButtons.at(HbSmileyButtonId)->setLatch(false);
- break;
-
- case HbInputSctPortrait::HbSctViewSmiley:
- q->showSmileyPicker(HbSctGridRows, HbSctGridColumns);
- break;
-
- default:
- break;
- };
-}
-
-/*
-Gets the special character sets from set keymapping.
-*/
-void HbInputSctPortraitPrivate::getSpecialCharacters()
-{
- mSpecialCharacterSet.clear();
- if (mKeymap) {
- const HbKeyboardMap* keyboardMap = mKeymap->keyboard(HbKeyboardSctPortrait);
- if (keyboardMap) {
- foreach (const HbMappedKey* mappedKey, keyboardMap->keys) {
- mSpecialCharacterSet.append(mappedKey->characters(HbModifierNone));
- }
- }
- }
-}
-
-
-
-int HbInputSctPortraitPrivate::keyCode(int buttonId)
-{
- int code = 0;
- if (buttonId == HbDelButtonId) {
- code = Qt::Key_Delete;
- } else if (buttonId == HbAbcButtonId) {
- code = Qt::Key_Control;
- } else if (buttonId == HbSpecialCharacterButtonId) {
- code = Qt::Key_F1;
- } else if (buttonId == HbSmileyButtonId) {
- code = Qt::Key_F2;
- }
- return code;
-}
-
-/*!
-
-*/
-void HbInputSctPortraitPrivate::handleStandardButtonPress(int buttonId)
-{
- Q_UNUSED(buttonId);
- //dont need to do anything here
-
-}
-
-/*
-Handles button clicks.
-*/
-void HbInputSctPortraitPrivate::handleStandardButtonClick(int buttonId)
-{
- Q_Q(HbInputSctPortrait);
-
- if (buttonId >= 0 && buttonId < HbNumSctButtons &&
- buttonId%HbSctGridColumns != HbSctGridColumns-1) {
- QString buttonText = mSctButtons.at(buttonId)->text();
- if (mSctButtons.at(buttonId) && !mSctButtons.at(buttonId)->isFaded()) {
- if (buttonText.length() > 0) {
- emit q->sctCharacterSelected(buttonText.at(0));
- }
- }
- } else if (keyCode(buttonId) == Qt::Key_F1) {
- if(mActiveView != HbInputVkbWidget::HbSctViewSpecialCharacter) {
- mStartIndex = 0;
- }
- setActiveView(HbInputVkbWidget::HbSctViewSpecialCharacter);
- } else if (keyCode(buttonId) == Qt::Key_F2) {
- if(mActiveView != HbInputVkbWidget::HbSctViewSmiley) {
- mStartIndex = 0;
- }
- // dont show the smiley picker, if the button is inactive
- if (!mSctButtons.at(HbSmileyButtonId)->isFaded()) {
- setActiveView(HbInputSctPortrait::HbSctViewSmiley);
- }
- } else {
- // we should pass both the press and release event. As mode handlers work according to
- // the press and release event.
- QKeyEvent pressEvent(QEvent::KeyPress, keyCode(buttonId), Qt::NoModifier);
- if (mOwner) {
- mOwner->filterEvent(&pressEvent);
- QKeyEvent releaseEvent(QEvent::KeyRelease, keyCode(buttonId), Qt::NoModifier);
- mOwner->filterEvent(&releaseEvent);
- }
- }
-}
-
-/*
-Handles the sct keypad button releas. Internally it hides character preview pane
-if visible.
-*/
-void HbInputSctPortraitPrivate::handleStandardButtonRelease(int buttonId)
-{
- Q_UNUSED(buttonId);
- //dont need to do anything here
-}
-
-/*!
-Handles virtual key clicks
-*/
-void HbInputSctPortraitPrivate::_q_mappedKeyClick(int buttonid)
-{
- handleStandardButtonClick(buttonid);
-}
-/// @endcond
-
-/*!
-\deprecated HbInputSctPortrait::HbInputSctPortrait(HbInputMethod*, const HbKeymap *, QGraphicsItem*)
- is deprecated.
-*/
-HbInputSctPortrait::HbInputSctPortrait(HbInputMethod* owner, const HbKeymap *keymap, QGraphicsItem* parent)
- : HbInputVkbWidget(*new HbInputSctPortraitPrivate, parent)
-{
- Q_D(HbInputSctPortrait);
- d->q_ptr = this;
- d->mOwner = owner;
-
- d->mButtonLayout = new QGraphicsGridLayout();
- d->mButtonLayout->setSpacing(0.0);
- d->mButtonLayout->setContentsMargins(0.0, 0.0, 0.0, 0.0);
-
- d->mClickMapper = new QSignalMapper(this);
-
- // create buttons.
- d->createSctButtons();
-
- // connect mappers.
- connect(d->mPressMapper, SIGNAL(mapped(int)), this, SLOT(mappedKeyPress(int)));
- connect(d->mReleaseMapper, SIGNAL(mapped(int)), this, SLOT(mappedKeyRelease(int)));
- connect(d->mClickMapper, SIGNAL(mapped(int)), this, SLOT(_q_mappedKeyClick(int)));
-
- connect(this, SIGNAL(flickEvent(HbInputVkbWidget::HbFlickDirection)), this, SLOT(flickTriggered(HbInputVkbWidget::HbFlickDirection)));
-
- // now set the keymap data.
- setKeymap(keymap);
-}
-
-/*!
-\deprecated HbInputSctPortrait::HbInputSctPortrait(HbInputSctPortraitPrivate &, QGraphicsItem*)
- is deprecated.
-*/
-HbInputSctPortrait::HbInputSctPortrait(HbInputSctPortraitPrivate &dd, QGraphicsItem* parent)
- : HbInputVkbWidget(dd, parent)
-{
-}
-
-/*!
-\deprecated HbInputSctPortrait::~HbInputSctPortrait()
- is deprecated.
-*/
-HbInputSctPortrait::~HbInputSctPortrait()
-{
-}
-
-/*!
-\deprecated HbInputSctPortrait::keyboardType() const
- is deprecated.
-*/
-HbKeyboardType HbInputSctPortrait::keyboardType() const
-{
- return HbKeyboardSctPortrait;
-}
-
-/*!
-\deprecated HbInputSctPortrait::setSct(HbSctView)
- is deprecated.
-*/
-void HbInputSctPortrait::setSct(HbSctView view)
-{
- Q_D(HbInputSctPortrait);
-
- d->initialize();
-
- d->mStartIndex = 0;
- d->setActiveView(view);
-}
-
-/*!
-\deprecated HbInputSctPortrait::setKeymap(const HbKeymap*)
- is deprecated.
-*/
-void HbInputSctPortrait::setKeymap(const HbKeymap* keymap)
-{
- Q_D(HbInputSctPortrait);
- HbInputVkbWidget::setKeymap(keymap);
- d->getSpecialCharacters();
-}
-
-/*!
-\deprecated HbInputSctPortrait::keypadLayout()
- is deprecated.
-*/
-QGraphicsLayout *HbInputSctPortrait::keypadLayout()
-{
- Q_D(HbInputSctPortrait);
- return d->mButtonLayout;
-}
-
-/*!
-\deprecated HbInputSctPortrait::aboutToOpen(HbVkbHost*)
- is deprecated.
-*/
-void HbInputSctPortrait::aboutToOpen(HbVkbHost *host)
-{
- Q_D(HbInputSctPortrait);
-
- HbInputVkbWidget::aboutToOpen(host);
-
- QSizeF keypadSize = keypadButtonAreaSize();
- keypadSize.setWidth(keypadSize.width() / (qreal)HbSctGridColumns);
- keypadSize.setHeight(keypadSize.height() / (qreal)HbSctGridRows);
- d->setLayoutDimensions(keypadSize);
-}
-
-/*!
-\deprecated HbInputSctPortrait::flickTriggered(HbInputVkbWidget::HbFlickDirection)
- is deprecated.
-*/
-void HbInputSctPortrait::flickTriggered(HbInputVkbWidget::HbFlickDirection direction)
-{
- Q_D(HbInputSctPortrait);
-
- d->initialize();
- int iNumSctButtons = HbNumSctButtons - HbSctGridRows;
- if(direction == HbInputVkbWidget::HbFlickDirectionLeft) {
- d->mCurrentPage--;
- if(d->mCurrentPage<0) {
- if (d->mSpecialCharacterSet.size()) {
- d->mCurrentPage = (int)ceil((float)d->mSpecialCharacterSet.size()/iNumSctButtons)-1;
- } else {
- d->mCurrentPage = 0;
- }
- }
- d->mStartIndex = d->mCurrentPage*iNumSctButtons;
- }
- d->setActiveView(HbInputSctPortrait::HbSctViewSpecialCharacter);
-}
-
-#include "moc_hbinputsctportrait.cpp"
-
-// End of file
--- a/src/hbinput/inputwidgets/hbinputsctportrait.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbInput module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#ifndef HB_INPUT_SCT_HB_H
-#define HB_INPUT_SCT_HB_H
-
-#include <hbinputdef.h>
-#include "hbinputvkbwidget.h"
-
-class HbInputSctPortraitPrivate;
-class HbAction;
-class HbInputFilter;
-
-class HB_INPUT_EXPORT HbInputSctPortrait : public HbInputVkbWidget
-{
- Q_OBJECT
-
-public:
- HbInputSctPortrait(HbInputMethod* owner, const HbKeymap *keymap, QGraphicsItem* parent = 0);
- ~HbInputSctPortrait();
-
- void setSct(HbSctView view = HbSctViewSpecialCharacter);
- void setKeymap(const HbKeymap* keymap);
- void setCharSet(const QString& aCharSet, HbInputFilter *filter = 0);
-
-public: // From HbVirtualKeyboard
- HbKeyboardType keyboardType() const;
- void aboutToOpen(HbVkbHost *host);
- QGraphicsLayout *keypadLayout();
-
-public slots:
- void flickTriggered(HbInputVkbWidget::HbFlickDirection direction);
-
-signals:
- void sctCharacterSelected(QString aChar);
-
-protected:
- HbInputSctPortrait(HbInputSctPortraitPrivate &dd, QGraphicsItem* parent);
-
-private:
- Q_DECLARE_PRIVATE_D(d_ptr, HbInputSctPortrait)
- Q_DISABLE_COPY(HbInputSctPortrait)
- Q_PRIVATE_SLOT(d_func(), void _q_mappedKeyClick(int ))
-};
-
-#endif // HB_INPUT_SCT_HB_H
-
-// End of file
--- a/src/hbinput/inputwidgets/hbinputsctportrait_p.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbInput module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#ifndef HB_INPUT_SCT_PORTRAIT_PRIVATE_H
-#define HB_INPUT_SCT_PORTRAIT_PRIVATE_H
-
-//
-// W A R N I N G
-// -------------
-//
-// This file is not part of the Hb Inputs API. It exists purely as an
-// implementation detail. This header file may change from version to
-// version without notice, or even be removed.
-//
-// We mean it.
-//
-
-#include <hbinputsctportrait.h>
-#include "hbinputvkbwidget_p.h"
-
-class HB_INPUT_PRIVATE_EXPORT HbInputSctPortraitPrivate : public HbInputVkbWidgetPrivate
-{
- Q_DECLARE_PUBLIC(HbInputSctPortrait)
-
-public:
- HbInputSctPortraitPrivate();
- void setSctButtons(const QString &aCharSet);
- void initialize();
- void getSpecialCharacters();
- void setLayoutDimensions(QSizeF dimensions);
- void createSctButtons();
-
- void handleStandardButtonPress(int aButtonId);
- void handleStandardButtonRelease(int aButtonId);
- void handleStandardButtonClick(int aButtonId);
-
- void _q_mappedKeyClick(int buttonid);
-
- int keyCode(int buttonId);
- void setActiveView(HbInputVkbWidget::HbSctView view);
-
- void applyEditorConstraints();
-
-public:
- QList<HbTouchKeypadButton *> mSctButtons;
- QString mAccentedCharacterSet;
- QString mSpecialCharacterSet;
- QList<HbIcon> mSmilies;
- HbInputSctPortrait::HbSctView mActiveView;
- QSignalMapper *mClickMapper;
- int mStartIndex;
- int mCurrentPage;
- QSizeF mSize;
-};
-
-#endif //HB_INPUT_SCT_PORTRAIT_PRIVATE_H
-
-// End of file
--- a/src/hbinput/inputwidgets/hbinputsettingdialog.cpp Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,393 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbInput module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-#include <QGraphicsLayout>
-#if QT_VERSION >= 0x040600
-#include <QGraphicsDropShadowEffect>
-#endif
-#include <QtAlgorithms>
-
-#include <hbdataform.h>
-#include <hbdataformmodel.h>
-#include <hbdataformmodelitem.h>
-#include <hbdataformviewitem.h>
-#include <hbaction.h>
-#include <hbcombobox.h>
-#include <hbpushbutton.h>
-#include <hbinputpredictionfactory.h>
-#include <hbdeviceprofile.h>
-
-#include <hbinputlanguage.h>
-#include <hbstringutil.h>
-#include <hbdialog_p.h>
-
-#include "hbinputsettingproxy.h"
-#include "hbinpututils.h"
-
-#include "hbinputsettingdialog.h"
-
-/// @cond
-
-class HbInputSettingDialogPrivate : public HbDialogPrivate
-{
-public:
- HbInputSettingDialogPrivate();
- ~HbInputSettingDialogPrivate();
- void createSecondaryLanguageList();
- void fillLanguageList(QStringList &list, QList<HbInputLanguage> &languageList, QString replace = QString(" "));
- int languageToIndex(HbInputLanguage &language, QList<HbInputLanguage> &languageList);
- HbInputLanguage indexToLanguage(int index, QList<HbInputLanguage> &languageList);
- static bool caseInsensitiveLessThan(const HbInputLanguage &s1, const HbInputLanguage &s2);
-
-public:
- HbDataForm *mForm;
- QList<HbInputLanguage> mPrimaryLanguages;
- QList<HbInputLanguage> mSecondaryLanguages;
- HbInputLanguage mPrimaryInputLanguage;
- HbInputLanguage mSecondaryInputLanguage;
- bool mPredictionStatus;
- HbPushButton *mPredictionButton;
- HbDataFormModelItem *mSecondaryLangComboBox;
-};
-
-HbInputSettingDialogPrivate::HbInputSettingDialogPrivate()
- : mPredictionButton(0), mSecondaryLangComboBox(0)
-{
- mForm = new HbDataForm();
-
- HbInputSettingProxy *settings = HbInputSettingProxy::instance();
- mPrimaryInputLanguage = settings->globalInputLanguage();
- mSecondaryInputLanguage = settings->globalSecondaryInputLanguage();
- mPredictionStatus = settings->predictiveInputStatusForActiveKeyboard();
-
- HbInputUtils::listSupportedInputLanguages(mPrimaryLanguages);
- qStableSort(mPrimaryLanguages.begin(), mPrimaryLanguages.end(), HbInputSettingDialogPrivate::caseInsensitiveLessThan);
- //No need to sort secondary language as primary language list is already sorted.
- createSecondaryLanguageList();
-}
-
-HbInputSettingDialogPrivate::~HbInputSettingDialogPrivate()
-{
-}
-
-void HbInputSettingDialogPrivate::createSecondaryLanguageList()
-{
- mSecondaryLanguages.clear();
-
- mSecondaryLanguages.append(HbInputLanguage());
-
- if (mPrimaryInputLanguage.language() != QLocale::Chinese) {
- for (int i = 0; i < mPrimaryLanguages.count(); ++i) {
- if (mPrimaryLanguages.at(i) != mPrimaryInputLanguage &&
- mPrimaryLanguages.at(i).language() != QLocale::Chinese) {
- mSecondaryLanguages.append(mPrimaryLanguages.at(i));
- }
- }
- }
-}
-
-void HbInputSettingDialogPrivate::fillLanguageList(QStringList &list, QList<HbInputLanguage> &languageList, QString replace)
-{
- for (int i = 0; i < languageList.count(); ++i) {
- QString langName = languageList[i].localisedName();
- if (langName.length() == 0) {
- langName = replace;
- }
- list<<langName;
- }
-}
-
-int HbInputSettingDialogPrivate::languageToIndex(HbInputLanguage &language, QList<HbInputLanguage> &languageList)
-{
- for (int i = 0; i < languageList.count(); ++i) {
- if (languageList.at(i) == language) {
- return i;
- }
- }
- return -1;
-}
-
-HbInputLanguage HbInputSettingDialogPrivate::indexToLanguage(int index, QList<HbInputLanguage> &languageList)
-{
- if (index >= 0 && index < languageList.count()) {
- return languageList.at(index);
- } else {
- return HbInputLanguage();
- }
-}
-
-bool HbInputSettingDialogPrivate::caseInsensitiveLessThan(const HbInputLanguage &s1, const HbInputLanguage &s2)
-{
- //Temporaries because localisedName() is a non-const function
- HbInputLanguage t1 = s1;
- HbInputLanguage t2 = s2;
- //Locale based comparison does not seem to be working perfectly.
- //return !HbStringUtil::compareC(s1.localisedName(),s2.localisedName());
- return t1.localisedName().toLower() < t2.localisedName().toLower();
-}
-
-
-/// @endcond
-
-/*!
-\deprecated HbInputSettingDialog::HbInputSettingDialog(HbSettingItems, QGraphicsWidget*)
- is deprecated. HbInputSettingDialog will be removed.
-
-*/
-HbInputSettingDialog::HbInputSettingDialog(HbSettingItems items, QGraphicsWidget *parent)
- : HbDialog(*new HbInputSettingDialogPrivate, parent)
-{
- Q_D(HbInputSettingDialog);
-
- d->setPriority(HbPopupPrivate::VirtualKeyboard + 1); // Should be shown on top of virtual keyboard.
-
- HbAction *ok = new HbAction(tr("Ok"), this);
- ok->setObjectName("Language selection popup ok");
- setPrimaryAction(ok);
-
- HbAction *cancel = new HbAction(tr("Cancel"), this);
- cancel->setObjectName("Language selection popup cancel");
- setSecondaryAction(cancel);
-
- connect(ok, SIGNAL(triggered()), this, SLOT(selected()));
-
- setObjectName("Language selection popup");
- setTimeout(HbPopup::NoTimeout);
- setDismissPolicy(HbPopup::NoDismiss);
- setModal(false);
- setBackgroundFaded(false);
-
-#if QT_VERSION >= 0x040600
- // Make sure the keypad never steals focus.
- setFlag(QGraphicsItem::ItemIsPanel, true);
- setActive(false);
-
- // enable drop shadow for the preview pane
-// Effect deletion is crashing -> Effect temporarily removed
-// QGraphicsDropShadowEffect *effect = new QGraphicsDropShadowEffect;
-// effect->setBlurRadius(8);
-// setGraphicsEffect(effect);
-#endif
-
- HbDataFormModel *model = new HbDataFormModel();
- d->mForm->setModel(model);
-
- // Create drop down list for writing language selection
- if(items & HbSettingItemWritingLang) {
- HbDataFormModelItem *writingLanguage =
- model->appendDataFormItem(HbDataFormModelItem::ComboBoxItem, tr("Primary Writing language"));
- QStringList writingLanguageItems;
- d->fillLanguageList(writingLanguageItems, d->mPrimaryLanguages);
- writingLanguage->setContentWidgetData(QString("items"),writingLanguageItems);
- writingLanguage->setContentWidgetData(QString("currentIndex"),d->languageToIndex(d->mPrimaryInputLanguage, d->mPrimaryLanguages));
- writingLanguage->setData(HbDataFormModelItem::KeyRole, QString("writing_language"));
- d->mForm->addConnection(writingLanguage, SIGNAL(currentIndexChanged(int)), this, SLOT(primaryLanguageChanged(int)));
- }
- // Create drop down list for secondary language selection
- if(items & HbSettingItemSecondaryLang) {
- d->mSecondaryLangComboBox = model->appendDataFormItem(HbDataFormModelItem::ComboBoxItem, tr("Secondary Writing language"));
- QStringList secondaryLanguageItems;
- d->fillLanguageList(secondaryLanguageItems, d->mSecondaryLanguages, tr("None"));
- d->mSecondaryLangComboBox->setContentWidgetData(QString("items"),secondaryLanguageItems);
- d->mSecondaryLangComboBox->setContentWidgetData(QString("currentIndex"),d->languageToIndex(d->mSecondaryInputLanguage, d->mSecondaryLanguages));
- d->mSecondaryLangComboBox->setData(HbDataFormModelItem::KeyRole, QString("secondary_language"));
- d->mForm->addConnection(d->mSecondaryLangComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(secondaryLanguageChanged(int)));
- }
- if(items & HbSettingItemPrediction) {
- QString statusOff = tr("Off");
- QString statusOn = tr("On");
-
- // Create toggle item for prediction mode
- HbDataFormModelItem *predictionStatus =
- model->appendDataFormItem(HbDataFormModelItem::ToggleValueItem, tr("Prediction"));
- if (d->mPredictionStatus) {
- predictionStatus->setContentWidgetData(QString("text"), statusOn);
- predictionStatus->setContentWidgetData(QString("additionalText"), statusOff);
- } else {
- predictionStatus->setContentWidgetData(QString("text"), statusOff);
- predictionStatus->setContentWidgetData(QString("additionalText"), statusOn);
- }
- predictionStatus->setData(HbDataFormModelItem::KeyRole, QString("prediction_status"));
- d->mForm->addConnection(predictionStatus, SIGNAL(clicked(bool)), this, SLOT(predictionStatusChanged()));
- QModelIndex predIndex = model->indexFromItem(predictionStatus);
- HbDataFormViewItem *item = d->mForm->dataFormViewItem(predIndex);
- HbWidget *contentWidget = item->dataItemContentWidget();
- d->mPredictionButton = static_cast<HbPushButton*>(contentWidget);
- }
-
- setContentWidget(d->mForm);
-}
-
-/*!
-\deprecated HbInputSettingDialog::~HbInputSettingDialog()
- is deprecated. HbInputSettingDialog will be removed.
-
-*/
-HbInputSettingDialog::~HbInputSettingDialog()
-{
-}
-
-/*!
-\deprecated HbInputSettingDialog::selected()
- is deprecated. HbInputSettingDialog will be removed.
-
-Called when new settings are accepted
-*/
-void HbInputSettingDialog::selected()
-{
- Q_D(HbInputSettingDialog);
-
- HbInputSettingProxy *settings = HbInputSettingProxy::instance();
- HbPredictionFactory *predFactory = HbPredictionFactory::instance();
-
- if (d->mPrimaryInputLanguage != settings->globalInputLanguage()) {
- settings->setGlobalInputLanguage(d->mPrimaryInputLanguage);
- }
-
- if (d->mSecondaryInputLanguage != settings->globalSecondaryInputLanguage()) {
- settings->setGlobalSecondaryInputLanguage(d->mSecondaryInputLanguage);
- }
- // the primary language supports prediction if there is a prediction engine for it.
- bool langSupportsPrediction = (predFactory->predictionEngineForLanguage(settings->globalInputLanguage()) != NULL);
- // if the primary language does not support prediction, set prediction status to false
- if (!langSupportsPrediction) {
- d->mPredictionStatus = false;
- }
- // synchronize the prediction status in settings to prediction status set through the settings dialog.
- if (d->mPredictionStatus != settings->predictiveInputStatusForActiveKeyboard()) {
- settings->setPredictiveInputStatusForActiveKeyboard(d->mPredictionStatus);
- }
-}
-
-/*!
-\deprecated HbInputSettingDialog::settingItemDisplayed(const QModelIndex&)
- is deprecated. HbInputSettingDialog will be removed.
-
-Called when setting items are shown
-*/
-void HbInputSettingDialog::settingItemDisplayed(const QModelIndex &index)
-{
- Q_UNUSED(index);
-}
-
-/*!
-\deprecated HbInputSettingDialog::primaryLanguageChanged(int index)
- is deprecated. HbInputSettingDialog will be removed.
-
-Called when user changes primary language
-*/
-void HbInputSettingDialog::primaryLanguageChanged(int index)
-{
- Q_D(HbInputSettingDialog);
-
- HbInputSettingProxy *settings = HbInputSettingProxy::instance();
- HbPredictionFactory *predFactory = HbPredictionFactory::instance();
- bool oldPLangSupportsPrediction = (predFactory->predictionEngineForLanguage(d->mPrimaryInputLanguage) != NULL);
- d->mPrimaryInputLanguage = d->indexToLanguage(index, d->mPrimaryLanguages);
- bool langSupportsPrediction = (predFactory->predictionEngineForLanguage(d->mPrimaryInputLanguage) != NULL);
- if( oldPLangSupportsPrediction != langSupportsPrediction ) {
- if(langSupportsPrediction) { // language supports prediction
- // first we need to enable the button then only we can click on it
- if (d->mPredictionButton && settings->predictiveInputStatusForActiveKeyboard() != d->mPredictionStatus) {
- d->mPredictionButton->click();
- } else if (!d->mPredictionButton && settings->predictiveInputStatusForActiveKeyboard() != d->mPredictionStatus) {
- // for numeric editors we dont have prediction button but we need to change the prediction status while changing language
- d->mPredictionStatus = settings->predictiveInputStatusForActiveKeyboard();
- }
- } else { // language does not supports prediction
- if(d->mPredictionButton && (d->mPredictionStatus)) {
- d->mPredictionButton->click();
- } else if (!d->mPredictionButton && langSupportsPrediction != d->mPredictionStatus) {
- // for numeric editors we dont have prediction button but we need to change the prediction status
- d->mPredictionStatus = langSupportsPrediction;
- }
- }
- if(d->mPredictionButton) {
- d->mPredictionButton->setEnabled(langSupportsPrediction);
- }
- }
-
- // refreshing the secondary language list
- // remove the current primary language selected from the secondary language items list
- if(d->mSecondaryLangComboBox) {
- d->createSecondaryLanguageList();
- QStringList secondaryLanguageItems;
- d->fillLanguageList(secondaryLanguageItems, d->mSecondaryLanguages, tr("None"));
- d->mSecondaryLangComboBox->setContentWidgetData(QString("items"),secondaryLanguageItems);
- }
-}
-
-/*!
-\deprecated HbInputSettingDialog::secondaryLanguageChanged(int)
- is deprecated. HbInputSettingDialog will be removed.
-
-Called when user changes secondary language
-*/
-void HbInputSettingDialog::secondaryLanguageChanged(int index)
-{
- Q_D(HbInputSettingDialog);
-
- d->mSecondaryInputLanguage = d->indexToLanguage(index, d->mSecondaryLanguages);
-}
-
-/*!
-\deprecated HbInputSettingDialog::predictionStatusChanged()
- is deprecated. HbInputSettingDialog will be removed.
-
-Called when user changes prediction status
-*/
-void HbInputSettingDialog::predictionStatusChanged()
-{
- Q_D(HbInputSettingDialog);
-
- d->mPredictionStatus = (d->mPredictionStatus + 1) % 2;
-}
-
-/*!
-\deprecated HbInputSettingDialog::showEvent(QShowEvent*)
- is deprecated. HbInputSettingDialog will be removed.
-
-\reimp
-*/
-void HbInputSettingDialog::showEvent(QShowEvent *event)
-{
- Q_D(HbInputSettingDialog);
- d->mForm->setPreferredWidth(HbDeviceProfile::profile(this).logicalSize().width() * 0.9);
- HbPredictionFactory *predFactory = HbPredictionFactory::instance();
- HbInputSettingProxy *settings = HbInputSettingProxy::instance();
- if (!predFactory->predictionEngineForLanguage(settings->globalInputLanguage())) {
- if(d->mPredictionButton && d->mPredictionButton->isEnabled()) {
- d->mPredictionButton->setEnabled(false);
- d->mPredictionStatus = false;
- }
- } else {
- if (d->mPredictionButton && !d->mPredictionButton->isEnabled()) {
- d->mPredictionButton->setEnabled(true);
- }
- d->mPredictionStatus = settings->predictiveInputStatus();
- }
- HbDialog::showEvent(event);
-}
-
-// End of file
--- a/src/hbinput/inputwidgets/hbinputsettingdialog.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbInput module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#ifndef HB_INPUT_SETTING_DIALOG_H
-#define HB_INPUT_SETTING_DIALOG_H
-
-#include <hbdialog.h>
-
-class HbInputSettingDialogPrivate;
-
-class HB_INPUT_EXPORT HbInputSettingDialog : public HbDialog
-{
- Q_OBJECT
-
-public:
- enum HbSettingItem
- {
- HbSettingItemNone = 0x00000000, //to create none
- HbSettingItemWritingLang = 0x00000001,
- HbSettingItemSecondaryLang = 0x00000002,
- HbSettingItemPrediction = 0x00000004,
- HbSettingItemAll = 0xFFFFFFFF //to create all
- };
- Q_DECLARE_FLAGS(HbSettingItems, HbSettingItem)
-
-public:
- HbInputSettingDialog(HbSettingItems items = HbSettingItemAll, QGraphicsWidget* parent = 0);
- virtual ~HbInputSettingDialog();
-
-public slots:
- void selected();
- void settingItemDisplayed(const QModelIndex &index); //deprecated
- void primaryLanguageChanged(int index);
- void secondaryLanguageChanged(int index);
- void predictionStatusChanged();
-
-protected:
- void showEvent(QShowEvent *event);
-
-private:
- Q_DECLARE_PRIVATE_D(d_ptr, HbInputSettingDialog)
- Q_DISABLE_COPY(HbInputSettingDialog)
-};
-
-#endif // HB_INPUT_SETTING_DIALOG_H
-
-// End of file
--- a/src/hbinput/inputwidgets/hbinputsettinglist.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputsettinglist.cpp Fri May 14 16:09:54 2010 +0300
@@ -71,7 +71,7 @@
qreal nameWidth(0);
QList<HbInputLanguage> languages;
HbInputUtils::listSupportedInputLanguages(languages);
- QFontMetrics fontMetrics(HbFontSpec(HbFontSpec::Primary).font());
+ QFontMetrics fontMetrics(mLanguageButton->font());
foreach (HbInputLanguage language, languages) {
qreal width = fontMetrics.width(language.localisedName());
@@ -113,6 +113,7 @@
d->mOptionList->setVerticalScrollBarPolicy(HbScrollArea::ScrollBarAlwaysOff);
d->mOptionList->setObjectName("Input options list");
d->mOptionList->addItem(HbIcon(settingsIcon), tr("Input settings"));
+ d->mOptionList->setPreferredWidth(300);
gridLayout->addItem(languageLabel, 0, 0);
gridLayout->addItem(d->mLanguageButton, 0, 1);
@@ -170,14 +171,6 @@
}
/*!
-\deprecated HbInputSettingList::showSettingList()
- is deprecated. Use updateSettingList and open functions instead.
-*/
-void HbInputSettingList::showSettingList()
-{
-}
-
-/*!
Updates settings list with current values
*/
void HbInputSettingList::updateSettingList()
@@ -231,19 +224,23 @@
{
Q_D(HbInputSettingList);
+ HbInputSettingProxy *settings = HbInputSettingProxy::instance();
+ HbPredictionFactory *predFactory = HbPredictionFactory::instance();
if (d->mSecondaryLanguage == HbInputLanguage()) {
emit inputSettingsButtonClicked();
} else {
- HbInputLanguage language = d->mPrimaryLanguage;
+ HbInputLanguage language = d->mPrimaryLanguage;
+ bool oldPLangSupportsPrediction = (predFactory->predictionEngineForLanguage(language) != NULL);
d->mPrimaryLanguage = d->mSecondaryLanguage;
d->mSecondaryLanguage = language;
HbInputSettingProxy::instance()->setGlobalInputLanguage(d->mPrimaryLanguage);
+ bool langSupportsPrediction = (predFactory->predictionEngineForLanguage(d->mPrimaryLanguage) != NULL);
HbInputSettingProxy::instance()->setGlobalSecondaryInputLanguage(d->mSecondaryLanguage);
- if (!HbPredictionFactory::instance()->predictionEngineForLanguage(d->mPrimaryLanguage)) {
- HbInputSettingProxy::instance()->setPredictiveInputStatus(false);
- }
+ if( oldPLangSupportsPrediction != langSupportsPrediction) {
+ settings->setPredictiveInputStatusForActiveKeyboard(langSupportsPrediction);
+ }
}
close();
@@ -297,17 +294,6 @@
}
/*!
-\deprecated HbInputSettingList::predictionStatusChanged(int)
- is deprecated. Use predictionStatusChanged(bool) instead.
-
-Updates prediction button text
-*/
-void HbInputSettingList::predictionStatusChanged(int newStatus)
-{
- Q_UNUSED(newStatus);
-}
-
-/*!
Updates prediction button text
*/
void HbInputSettingList::predictionStatusChanged(HbKeyboardSettingFlags keyboardType, bool newStatus)
@@ -320,12 +306,4 @@
d->mPredictionButton->setText(d->mPredictionValues.at(status));
}
-/*!
-\deprecated HbInputSettingList::saveSettings()
- is deprecated. Will be removed.
-*/
-void HbInputSettingList::saveSettings()
-{
-}
-
// End of file
--- a/src/hbinput/inputwidgets/hbinputsettinglist.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputsettinglist.h Fri May 14 16:09:54 2010 +0300
@@ -42,7 +42,6 @@
virtual ~HbInputSettingList();
public:
- void showSettingList();
void updateSettingList();
void setLanguageSelectionEnabled(bool disabled);
void setPredictionSelectionEnabled(bool disabled);
@@ -53,9 +52,7 @@
void listItemActivated(HbListWidgetItem *item);
void primaryLanguageChanged(const HbInputLanguage &newLanguage);
void secondaryLanguageChanged(const HbInputLanguage &newLanguage);
- void predictionStatusChanged(int newStatus);
void predictionStatusChanged(HbKeyboardSettingFlags keyboardType, bool newStatus);
- void saveSettings();
signals:
void inputMethodsButtonClicked();
--- a/src/hbinput/inputwidgets/hbinputtouchkeypadbutton.cpp Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,583 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbInput module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-#include <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"
-
-/*!
-@proto
-@hbinput
-\class HbTouchKeypadButton
-\deprecated 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.
-*/
-
-/// @cond
-
-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;
-};
-
-/// @endcond
-
-/*!
-\deprecated HbTouchKeypadButton::HbTouchKeypadButton(HbInputVkbWidget *, const QString &, QGraphicsWidget *)
- is deprecated.
-*/
-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");
-}
-
-/*!
-\deprecated HbTouchKeypadButton::HbTouchKeypadButton(HbInputVkbWidget *, const HbIcon &, const QString &, QGraphicsItem *)
-*/
-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");
-}
-
-/*!
-\deprecated HbTouchKeypadButton::~HbTouchKeypadButton()
-*/
-HbTouchKeypadButton::~HbTouchKeypadButton()
-{
- delete d_ptr;
-}
-
-/*!
-\reimp
-\deprecated HbTouchKeypadButton::mousePressEvent(QGraphicsSceneMouseEvent *)
- is deprecated.
-*/
-void HbTouchKeypadButton::mousePressEvent(QGraphicsSceneMouseEvent *event)
-{
- Q_UNUSED(event)
-}
-
-/*!
-\reimp
-\deprecated HbTouchKeypadButton::mouseReleaseEvent(QGraphicsSceneMouseEvent *)
- is deprecated.
-*/
-void HbTouchKeypadButton::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
-{
- Q_UNUSED(event)
-}
-
-/*!
-\reimp
-\deprecated HbTouchKeypadButton::mouseMoveEvent(QGraphicsSceneMouseEvent *)
- is deprecated.
-*/
-void HbTouchKeypadButton::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
-{
- Q_UNUSED(event)
-}
-
-/*!
-\reimp
-\deprecated HbTouchKeypadButton::gestureEvent(QGestureEvent *)
- is deprecated.
-*/
-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);
-}
-
-/*!
-\reimp
-\deprecated HbTouchKeypadButton::resizeEvent(QGraphicsSceneResizeEvent *)
- is deprecated.
-*/
-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 );
- }
-}
-
-/*!
-\deprecated HbTouchKeypadButton::isFaded()
- is deprecated.
-*/
-bool HbTouchKeypadButton::isFaded()
-{
- Q_D(HbTouchKeypadButton);
- return d->mFaded;
-}
-
-/*!
-\deprecated HbTouchKeypadButton::setFade(bool)
- is deprecated.
-*/
-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);
-}
-
-/*!
-\deprecated HbTouchKeypadButton::setButtonType(HbTouchButtonType)
- is deprecated.
-*/
-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");
- }
-}
-
-/*!
-\deprecated HbTouchKeypadButton::getButtonType()
- is deprecated.
-*/
-int HbTouchKeypadButton::getButtonType()
-{
- Q_D(HbTouchKeypadButton);
- return d->mButtonType;
-}
-
-/*!
-\deprecated HbTouchKeypadButton::getFrameIcon()
- is deprecated.
-*/
-HbFrameItem * HbTouchKeypadButton::getFrameIcon()
-{
- Q_D(HbTouchKeypadButton);
- return d->mFrameIcon;
-}
-
-/*!
-\deprecated HbTouchKeypadButton::setBackgroundAttributes(HbTouchButtonState)
- is deprecated.
-*/
-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);
- }
-}
-
-/*!
-\deprecated HbTouchKeypadButton::setBackground(const QString&)
- is deprecated.
-*/
-void HbTouchKeypadButton::setBackground(const QString& backgroundFrameFilename)
-{
- HbFrameDrawer* drawer = frameBackground();
- if (!drawer || drawer->frameGraphicsName() != backgroundFrameFilename) {
- setFrameBackground(HbFrameDrawerPool::get(backgroundFrameFilename, HbFrameDrawer::NinePieces, size()));
- update();
- }
-}
-
-/*!
-\deprecated HbTouchKeypadButton::setFrameIcon(const QString&)
- is deprecated.
-*/
-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);
- }
-}
-
-/*!
-\reimp
-\deprecated HbTouchKeypadButton::type() const
- is deprecated.
-*/
-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;
- }
-}
-
-/*!
-\deprecated HbTouchKeypadButton::setAsStickyButton(bool)
- is deprecated.
-*/
-void HbTouchKeypadButton::setAsStickyButton(bool isSticky)
-{
- Q_D(HbTouchKeypadButton);
- d->mStickyKey = isSticky;
-}
-
-/*!
-\deprecated HbTouchKeypadButton::isStickyButton() const
- is deprecated.
-*/
-bool HbTouchKeypadButton::isStickyButton() const
-{
- Q_D(const HbTouchKeypadButton);
- return d->mStickyKey;
-}
-
-/*!
-\deprecated HbTouchKeypadButton::setLatch(bool)
- is deprecated
-*/
-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);
- }
-}
-
-/*!
-\deprecated HbTouchKeypadButton::isLatched() const
- is deprecated.
-*/
-bool HbTouchKeypadButton::isLatched() const
-{
- Q_D(const HbTouchKeypadButton);
- return d->mLatch;
-}
-
-/*!
-\deprecated HbTouchKeypadButton::keyCode() const
- is deprecated.
-*/
-int HbTouchKeypadButton::keyCode() const
-{
- Q_D(const HbTouchKeypadButton);
- return d->mKeyCode;
-}
-
-/*!
-\deprecated HbTouchKeypadButton::setKeyCode(int)
- is deprecated.
-*/
-void HbTouchKeypadButton::setKeyCode(int code)
-{
- Q_D(HbTouchKeypadButton);
- d->mKeyCode = code;
-}
-
-/*!
-\reimp
-\deprecated HbTouchKeypadButton::setText(const QString &)
- is deprecated.
-*/
-void HbTouchKeypadButton::setText(const QString &text)
-{
- // Workaround for pushbutton feature
- if (!text.isNull()) {
- HbPushButton::setText(text);
- } else {
- HbPushButton::setText(QString(""));
- }
-}
-
-/*!
-\reimp
-\deprecated HbTouchKeypadButton::setAdditionalText(const QString &)
- is deprecated.
-*/
-void HbTouchKeypadButton::setAdditionalText(const QString &additionalText)
-{
- if (!additionalText.isNull()) {
- HbPushButton::setAdditionalText(additionalText);
- } else {
- HbPushButton::setAdditionalText(QString(""));
- }
-}
-
-/*!
-\reimp
-\deprecated HbTouchKeypadButton::changeEvent(QEvent *)
- is deprecated.
-*/
-void HbTouchKeypadButton::changeEvent( QEvent *event )
-{
- if ( event->type() == HbEvent::ThemeChanged ) {
- updatePrimitives();
- setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonReleased);
- }
- HbPushButton::changeEvent(event);
-}
-
-/*!
-\reimp
-\deprecated HbTouchKeypadButton::updatePrimitives()
- is deprecated.
-*/
-void HbTouchKeypadButton::updatePrimitives()
-{
- Q_D(HbTouchKeypadButton);
- HbPushButton::updatePrimitives();
-
- if (d->mFrameIcon && d->mFaded) {
- d->mFrameIcon->setOpacity(0.2);
- }
-}
-
-/*!
-\reimp
-\deprecated HbTouchKeypadButton::sizeHint(Qt::SizeHint, const QSizeF &) const
- is deprecated.
-*/
-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;
-}
-
-/*!
-\deprecated HbTouchKeypadButton::itemChange(GraphicsItemChange, const QVariant &)
- is deprecated.
-*/
-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);
-}
-
-/*!
-\deprecated HbTouchKeypadButton::setInitialSize(const QSizeF&)
- is deprecated.
-*/
-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);
- }
-}
-// End of file
--- a/src/hbinput/inputwidgets/hbinputtouchkeypadbutton.h Mon May 03 12:48:33 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 HbInput module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#ifndef HB_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 HB_INPUT_EXPORT 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/hbinput/inputwidgets/hbinputusedsymbolpane.cpp Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,237 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbInput module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#include <QGraphicsSceneMouseEvent>
-#include <QPainter>
-#include <QPointer>
-
-#include <hbinputsettingproxy.h>
-#include <hbfontspec.h>
-#include <hbinputfilter.h>
-#include <hbcolorscheme.h>
-
-#include "hbinputvkbwidget.h"
-#include "hbinputvkbwidget_p.h"
-#include "hbinputusedsymbolpane.h"
-
-/*!
- @proto
- @hbinput
- \class HbInputUsedSymbolPane
- \deprecated class HbInputUsedSymbolPane
- \brief A widget for displaying most frequently used special characters.
-
- This is a widget that knows how to display most frequently used special characters.
- It uses setting proxy for tracking top candidates. User is able to select one
- of the characters and when that happens, setting proxy frequency list is
- updated and the widget emits the signal sctCharacterSelected.
-
- \sa HbInputSettingProxy
-*/
-
-/// @cond
-
-const int HbMaxSctLineChars = 7;
-
-class HbInputUsedSymbolPanePrivate
-{
-public:
- HbInputUsedSymbolPanePrivate(HbInputVkbWidget* aOwner);
- qreal cellWidth(QGraphicsWidget* aParent);
- QChar mapClickedCharacter(QPointF aClickPoint, QGraphicsWidget* aParent);
-
-public:
- int mNumChrs;
- HbInputVkbWidget* mOwner;
- QPixmap mBackground;
- QString mCharSet;
- int mNumberOfCharsDisplayed;
- QPointer<HbInputFilter> mFilter;
-};
-
-HbInputUsedSymbolPanePrivate::HbInputUsedSymbolPanePrivate(HbInputVkbWidget* aOwner)
- : mNumChrs(HbMaxSctLineChars),
- mOwner(aOwner),mFilter(0)
-{
- mBackground = QPixmap(HbSctLineWidth, HbSctLineHeight);
- QColor color = HbColorScheme::color("inputmethod_color_usedsymbolpane_background");
- if (color.isValid()) {
- mBackground.fill(color);
- } else {
- mBackground.fill(QColor(Qt::gray));
- }
-}
-
-qreal HbInputUsedSymbolPanePrivate::cellWidth(QGraphicsWidget* aParent)
-{
- if (mNumChrs) {
- return aParent->size().width() / (qreal)mNumChrs;
- }
-
- return 0.0;
-}
-
-QChar HbInputUsedSymbolPanePrivate::mapClickedCharacter(QPointF aClickPoint, QGraphicsWidget* aParent)
-{
- qreal xstep = cellWidth(aParent);
-
- if (xstep > 0.0) {
- int chrIndex = (int)(aClickPoint.x() / xstep);
-
- QString characters;
-
- if((characters.count() > mNumberOfCharsDisplayed) && (characters.count() < HbMaxSctLineChars)) {
- mCharSet = characters;
- }
-
- if((mCharSet.compare(characters))) {
- characters = mCharSet;
- }
-
- if (chrIndex < characters.size()) {
- return characters[chrIndex];
- }
- }
-
- return 0;
-}
-
-/// @endcond
-
-/*!
-\deprecated HbInputUsedSymbolPane::HbInputUsedSymbolPane(HbInputVkbWidget*, QGraphicsWidget*)
- is deprecated.
-*/
-HbInputUsedSymbolPane::HbInputUsedSymbolPane(HbInputVkbWidget* aOwner, QGraphicsWidget* aParent)
- : QGraphicsWidget(aParent)
-{
- mPrivate = new HbInputUsedSymbolPanePrivate(aOwner);
- mPrivate->mNumberOfCharsDisplayed = mPrivate->mCharSet.count();
-}
-
-/*!
-\deprecated HbInputUsedSymbolPane::~HbInputUsedSymbolPane()
- is deprecated.
-*/
-HbInputUsedSymbolPane::~HbInputUsedSymbolPane()
-{
- delete mPrivate;
-}
-
-/*!
-\deprecated HbInputUsedSymbolPane::setNumberOfCharacters(int)
- is deprecated.
-*/
-void HbInputUsedSymbolPane::setNumberOfCharacters(int aNumChrs)
-{
- mPrivate->mNumChrs = aNumChrs;
-}
-
-/*!
-\deprecated HbInputUsedSymbolPane::mousePressEvent(QGraphicsSceneMouseEvent*)
- is deprecated.
-*/
-void HbInputUsedSymbolPane::mousePressEvent(QGraphicsSceneMouseEvent* aEvent)
-{
- mPrivate->mOwner->d_func()->redirectMousePressEvent(aEvent);
-
- QChar chr = mPrivate->mapClickedCharacter(aEvent->pos(), this);
- if (chr > 0) {
- emit sctCharacterSelected(chr);
- }
- aEvent->accept();
-}
-
-/*!
-\reimp
-\deprecated HbInputUsedSymbolPane::mouseReleaseEvent(QGraphicsSceneMouseEvent*)
- is deprecated.
-*/
-void HbInputUsedSymbolPane::mouseReleaseEvent(QGraphicsSceneMouseEvent* aEvent)
-{
- mPrivate->mOwner->d_func()->redirectMouseReleaseEvent(aEvent);
-}
-
-/*!
-\reimp
-\deprecated HbInputUsedSymbolPane::mouseDoubleClickEvent(QGraphicsSceneMouseEvent*)
- is deprecated.
-*/
-void HbInputUsedSymbolPane::mouseDoubleClickEvent(QGraphicsSceneMouseEvent* aEvent)
-{
- QChar chr = mPrivate->mapClickedCharacter(aEvent->pos(), this);
- if (chr > 0) {
- emit sctCharacterSelected(chr);
- }
-}
-
-/*!
-\deprecated HbInputUsedSymbolPane::paint(QPainter*, const QStyleOptionGraphicsItem*, QWidget*)
- is deprecated.
-*/
-void HbInputUsedSymbolPane::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget)
-{
- Q_UNUSED(option)
- Q_UNUSED(widget)
- painter->drawPixmap(boundingRect(), mPrivate->mBackground, boundingRect());
-
- painter->setPen(Qt::black);
- painter->drawRect(rect());
-
- qreal xstep = mPrivate->cellWidth(this);
- QRectF chrRect(QPointF(0.0, 0.0), QPointF(xstep, size().height()));
-
- QString characters;
-
- if((characters.count() <= HbMaxSctLineChars) && (characters.count() > mPrivate->mNumberOfCharsDisplayed)) {
- mPrivate->mNumberOfCharsDisplayed++;
- mPrivate->mCharSet = characters;
- }
-
- if((mPrivate->mCharSet.compare(characters))) {
- characters = mPrivate->mCharSet;
- }
-
- HbFontSpec spec(HbFontSpec::Primary);
- painter->setFont(spec.font());
- for (int i = 0; i < mPrivate->mNumChrs && i < characters.size(); i++) {
- painter->drawText(chrRect, Qt::AlignCenter, QString(characters[i]));
- chrRect.moveRight(chrRect.right() + xstep);
- }
-}
-
-/*!
-\deprecated HbInputUsedSymbolPane::restoreSctLine(HbInputFilter*)
- is deprecated.
-*/
-void HbInputUsedSymbolPane::restoreSctLine(HbInputFilter *aFilter)
-{
- if (aFilter != mPrivate->mFilter)
- mPrivate->mNumberOfCharsDisplayed = mPrivate->mCharSet.count();
- mPrivate->mFilter = aFilter;
-
- this->update();
-}
-// End of file
--- a/src/hbinput/inputwidgets/hbinputusedsymbolpane.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the HbInput module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#ifndef HB_INPUT_USED_SYMBOL_PANE_H
-#define HB_INPUT_USED_SYMBOL_PANE_H
-
-#include <QGraphicsWidget>
-
-#include "hbinputdef.h"
-
-const int HbSctLineWidth = 700;
-const int HbSctLineHeight = 50;
-
-class HbInputVkbWidget;
-class HbInputUsedSymbolPanePrivate;
-class HbInputFilter;
-
-class HB_INPUT_EXPORT HbInputUsedSymbolPane : public QGraphicsWidget
-{
- Q_OBJECT
-
-public:
- explicit HbInputUsedSymbolPane(HbInputVkbWidget* aOwner, QGraphicsWidget* aParent = NULL);
- virtual ~HbInputUsedSymbolPane();
-
- void setNumberOfCharacters(int aNumChrs);
- void restoreSctLine(HbInputFilter *aFilter);
-
-protected: // From QGraphicsItem
- void mousePressEvent(QGraphicsSceneMouseEvent* aEvent);
- void mouseReleaseEvent(QGraphicsSceneMouseEvent* aEvent);
- void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *aEvent);
- void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget);
-
-signals:
- void sctCharacterSelected(QChar aChar);
-
-private:
- Q_DISABLE_COPY(HbInputUsedSymbolPane)
- HbInputUsedSymbolPanePrivate* mPrivate;
-};
-
-#endif // HB_INPUT_USED_SYMBOL_PANE_H
-
-// End of file
--- a/src/hbinput/inputwidgets/hbinputvkbwidget.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputvkbwidget.cpp Fri May 14 16:09:54 2010 +0300
@@ -29,8 +29,8 @@
#include <QGraphicsSceneMouseEvent>
#include <QGraphicsProxyWidget>
#include <QTimeLine>
+#include <QGraphicsScene>
#include <QGraphicsGridLayout>
-#include <QGraphicsScene>
#include <QGraphicsLinearLayout>
#include <hbapplication.h>
@@ -38,11 +38,8 @@
#include <hbaction.h>
#include <hbview.h>
#include <hbwidget.h>
-#include <hbpushbutton.h>
-#include <hbinputsettingproxy.h>
#include <hbdialog.h>
#include <hbeffect.h>
-#include <hbstackedwidget.h>
#include <hbframedrawer.h>
#include <hbevent.h>
#include <hbdataform.h>
@@ -58,23 +55,21 @@
#include <hbinputkeymapfactory.h>
#include <hbwidgetfeedback.h>
#include <hbinputpredictionfactory.h>
+#include <hbinputbuttongroup.h>
+#include <hbinputbutton.h>
#include <HbSwipeGesture>
#include <HbTapGesture>
#include "hbinputvirtualrocker.h"
#include "hbinputvkbwidget.h"
#include "hbinputvkbwidget_p.h"
-#include "hbinputtouchkeypadbutton.h"
#include "hbinputsettinglist.h"
#include "hbinputmodeindicator.h"
#include <hbfeedbackmanager.h>
#include "hbinputsmileypicker.h"
#include "hbinputscreenshotwidget.h"
-const qreal HbMouseDragDelta = 0.4;
+
const qreal HbRockerWidth = 50.0;
-const int MaxSweepTime = 500;
-const int SweepLength = 150;
-
/*!
@proto
@@ -105,8 +100,6 @@
mKeymap(0),
mModifiers(0),
mInputModeIndicator(0),
-mApplicationButton(0),
-mSettingsButton(0),
mSettingList(0),
mButtonLayout(0),
mRocker(0),
@@ -148,6 +141,28 @@
delete mScreenshotWidget;
}
+void HbInputVkbWidgetPrivate::initLayout()
+{
+ Q_Q(HbInputVkbWidget);
+
+ mLayout = new QGraphicsLinearLayout(Qt::Vertical);
+ mLayout->setContentsMargins(0.0, 0.0, 0.0, 0.0);
+ mLayout->setSpacing(0.0);
+
+ qreal unitValue = HbDeviceProfile::profile(q->mainWindow()).unitValue();
+ mCloseHandleHeight = HbCloseHandleHeightInUnits * unitValue;
+ mCloseHandleWidth = HbCloseHandleWidthInUnits * unitValue;
+
+ mCloseHandle = new QGraphicsWidget();
+ mCloseHandle->setObjectName("vkbHandle");
+ mCloseHandle->setMinimumHeight(mCloseHandleHeight);
+ mCloseHandle->setMaximumHeight(mCloseHandleHeight);
+ mLayout->addItem(mCloseHandle);
+
+ q->setContentItem(new HbInputButtonGroup());
+ q->setLayout(mLayout);
+}
+
void HbInputVkbWidgetPrivate::init()
{
Q_Q(HbInputVkbWidget);
@@ -168,7 +183,7 @@
mBackgroundDrawer->setFrameGraphicsName(backgroundGraphics);
mBackgroundDrawer->setFrameType(HbFrameDrawer::ThreePiecesVertical);
mBackgroundDrawer->setFillWholeRect(true);
- mBackgroundDrawer->setBorderWidths(0.0, HbCloseHandleHeight, 0.0, HbCloseHandleHeight);
+ mBackgroundDrawer->setBorderWidths(0.0, mCloseHandleHeight, 0.0, mCloseHandleHeight);
mIconDrawer = new HbFrameDrawer();
mIconDrawer->setFrameType(HbFrameDrawer::OnePiece);
@@ -242,10 +257,87 @@
q_ptr->mouseReleaseEvent(aEvent);
}
-void HbInputVkbWidgetPrivate::applyEditorConstraints() {
+void HbInputVkbWidgetPrivate::applyEditorConstraints()
+{
// no default implementaiton as of now.
}
+void HbInputVkbWidgetPrivate::updateKeyCodes()
+{
+ Q_Q(HbInputVkbWidget);
+
+ HbInputButtonGroup *buttonGroup = static_cast<HbInputButtonGroup*>(q->contentItem());
+ if (buttonGroup) {
+ int key = 0;
+ QList<HbInputButton*> buttons = buttonGroup->buttons();
+ for (int i = 0; i < buttons.count(); ++i) {
+ if (keyCode(i) == HbInputButton::ButtonKeyCodeCharacter) {
+ HbInputButton *item = buttons.at(i);
+
+ const HbKeyboardMap *keyboardMap = mKeymap->keyboard(q->keyboardType());
+ if (keyboardMap && key < keyboardMap->keys.count()) {
+ item->setKeyCode(keyboardMap->keys.at(key)->keycode.unicode());
+ } else {
+ item->setKeyCode(-1);
+ }
+ ++key;
+ }
+ }
+ }
+}
+
+void HbInputVkbWidgetPrivate::updateButtons()
+{
+ Q_Q(HbInputVkbWidget);
+
+ HbInputButtonGroup *buttonGroup = static_cast<HbInputButtonGroup*>(q->contentItem());
+ if (buttonGroup) {
+ int key = 0;
+ QList<HbInputButton*> buttons = buttonGroup->buttons();
+ for (int i = 0; i < buttons.count(); ++i) {
+ if (keyCode(i) == HbInputButton::ButtonKeyCodeCharacter) {
+ HbInputButton *item = buttons.at(i);
+
+ const HbKeyboardMap *keyboardMap = mKeymap->keyboard(q->keyboardType());
+ if (keyboardMap && key < keyboardMap->keys.count()) {
+ QString keydata = keyboardMap->keys.at(key)->characters(mModifiers);
+ item->setText(keydata.at(0), HbInputButton::ButtonTextIndexPrimary);
+
+ QString mappedCharacters;
+ keydata.append(keyboardMap->keys.at(key)->characters(mModifiers | HbModifierFnPressed));
+ for (int i = 0; i < keydata.length(); ++i) {
+ if (mOwner->focusObject() &&
+ mOwner->focusObject()->characterAllowedInEditor(keydata.at(i))) {
+ mappedCharacters.append(keydata.at(i));
+ }
+ }
+ item->setMappedCharacters(mappedCharacters);
+ } else {
+ item->setText("", HbInputButton::ButtonTextIndexPrimary);
+ item->setMappedCharacters("");
+ }
+ ++key;
+ }
+ }
+ buttonGroup->setButtons(buttons);
+ }
+}
+
+void HbInputVkbWidgetPrivate::settingListPosition(QPointF &position, HbPopup::Placement &placement)
+{
+ Q_Q(HbInputVkbWidget);
+
+ HbInputButtonGroup *buttonGroup = static_cast<HbInputButtonGroup*>(q->contentItem());
+ if (buttonGroup) {
+ HbInputButton *item = buttonGroup->button(HbInputButton::ButtonKeyCodeSettings);
+ if (item) {
+ position.setX(buttonGroup->scenePos().x() + item->boundingRect().x() + item->boundingRect().width());
+ position.setY(buttonGroup->scenePos().y() + item->boundingRect().y());
+ placement = HbPopup::BottomRightCorner;
+ }
+ }
+}
+
void HbInputVkbWidgetPrivate::setRockerPosition()
{
Q_Q(HbInputVkbWidget);
@@ -256,10 +348,6 @@
(padArea.height() * 0.5) - (mRocker->size().height() * 0.5));
point.setY(point.y() + mCloseHandleHeight);
- if (q->keypadLayout() && q->keypadLayout()->geometry().height()) {
- point.setX(((padArea.width() * 0.5) - (mRocker->size().width() * 0.5)));
- point.setY(((q->keypadLayout()->geometry().height() * 0.5) - (mRocker->size().height() * 0.5) + mCloseHandleHeight));
- }
mRocker->setPos(point);
}
@@ -332,6 +420,7 @@
{
Q_D(HbInputVkbWidget);
d->q_ptr = this;
+ d->initLayout();
d->init();
setFocusPolicy(Qt::ClickFocus);
@@ -354,6 +443,7 @@
{
Q_D(HbInputVkbWidget);
d->q_ptr = this;
+ d->initLayout();
d->init();
setFocusPolicy(Qt::ClickFocus);
@@ -415,36 +505,6 @@
}
/*!
-\deprecated HbInputVkbWidget::mousePressEvent(QGraphicsSceneMouseEvent*)
- is deprecated.
-*/
-void HbInputVkbWidget::mousePressEvent(QGraphicsSceneMouseEvent* event)
-{
- Q_UNUSED(event);
-}
-
-/*!
-\deprecated HbInputVkbWidget::mappedKeyPress(int)
- is deprecated.
-*/
-void HbInputVkbWidget::mappedKeyPress(int buttonid)
-{
- Q_D(HbInputVkbWidget);
- d->handleStandardButtonPress(buttonid);
-}
-
-/*!
-\deprecated HbInputVkbWidget::mappedKeyRelease(int)
- is deprecated.
-*/
-void HbInputVkbWidget::mappedKeyRelease(int buttonid)
-{
- Q_D(HbInputVkbWidget);
- d->handleStandardButtonRelease(buttonid);
-}
-
-
-/*!
The paint method. Draws the widget.
*/
void HbInputVkbWidget::paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget)
@@ -459,10 +519,51 @@
d->mBackgroundDrawer->paint(painter, rect);
}
- rect.setLeft(rect.width()/2 - d->mCloseHandleHeight*3);
- rect.setWidth(d->mCloseHandleHeight*6);
+ painter->save();
+ painter->translate(rect.width() / 2 - d->mCloseHandleWidth / 2, 0);
+ rect.setWidth(d->mCloseHandleWidth);
rect.setHeight(d->mCloseHandleHeight);
d->mIconDrawer->paint(painter, rect);
+ painter->restore();
+}
+
+/*!
+Sets the content item which will fill the content area of this widget. Content item is
+a single input button group by default.
+If null is given then the old content item is deleted and content area is cleared.
+Takes ownership of the given item.
+
+\sa updateKeyCodes
+\sa updateButtons
+\sa setKeyboardDimmed
+\sa probableKeypresses
+*/
+void HbInputVkbWidget::setContentItem(QGraphicsLayoutItem *item)
+{
+ Q_D(HbInputVkbWidget);
+ if (d->mLayout->count() > 1) {
+ QGraphicsLayoutItem *oldItem = d->mLayout->itemAt(d->mLayout->count() - 1);
+ d->mLayout->removeItem(oldItem);
+ delete oldItem;
+ }
+ if (item) {
+ d->mLayout->addItem(item);
+ }
+}
+
+/*!
+Returns current content item or null if not set.
+Ownership is not transferred.
+*/
+QGraphicsLayoutItem *HbInputVkbWidget::contentItem() const
+{
+ Q_D(const HbInputVkbWidget);
+
+ QGraphicsLayoutItem *item(0);
+ if (d->mLayout->count() > 1) {
+ item = d->mLayout->itemAt(d->mLayout->count() - 1);
+ }
+ return item;
}
/*!
@@ -511,8 +612,20 @@
void HbInputVkbWidget::setMode(HbKeypadMode mode, HbModifiers modifiers)
{
Q_D(HbInputVkbWidget);
+ d->mMode = mode;
d->mModifiers = modifiers;
- d->mMode = mode;
+
+ d->updateButtons();
+ d->applyEditorConstraints();
+
+ HbInputButtonGroup *buttonGroup = static_cast<HbInputButtonGroup*>(contentItem());
+ if (buttonGroup && d->mOwner->focusObject()) {
+ buttonGroup->setCustomButtonActions(d->mOwner->focusObject()->editorInterface().actions());
+ }
+
+ if (d->mInputModeIndicator) {
+ d->mInputModeIndicator->updateIndicator();
+ }
}
/*!
@@ -524,6 +637,14 @@
Q_D(HbInputVkbWidget);
if (keymap) {
d->mKeymap = keymap;
+ d->updateKeyCodes();
+
+ HbInputState newState = d->mOwner->inputState();
+ if (newState.textCase() == HbTextCaseUpper || newState.textCase() == HbTextCaseAutomatic) {
+ setMode(d->mMode, HbModifierShiftPressed);
+ } else {
+ setMode(d->mMode, HbModifierNone);
+ }
}
}
@@ -536,32 +657,10 @@
d->mCurrentHost = host;
- if (!d->mLayout) {
- // get preferred size from vkbhost and set it to vkb.
- // Keypad buttons will flicker while vkb opening (when we open keypad for first time )
- // if we dont set size to vkb before seting layout to vkb.
- resize(preferredKeyboardSize());
- d->mLayout = new QGraphicsLinearLayout(Qt::Vertical);
- d->mLayout->setContentsMargins(0.0, 0.0, 0.0, 0.0);
- d->mLayout->setSpacing(0.0);
-
- setLayout(d->mLayout);
-
- d->mCloseHandle = new QGraphicsWidget();
- d->mCloseHandle->setObjectName("vkbHandle");
- d->mCloseHandleHeight = (int)HbCloseHandleHeight;
- d->mCloseHandle->setMinimumHeight(d->mCloseHandleHeight);
- d->mCloseHandle->setMaximumHeight(d->mCloseHandleHeight);
-
- d->mLayout->addItem(d->mCloseHandle);
- d->mLayout->addItem(keypadLayout());
- }
-
-
if (d->mOwner && d->mOwner->focusObject()) {
qreal vkbZValue = d->mOwner->focusObject()->findVkbZValue();
setZValue(vkbZValue);
- d->mRocker->setZValue(vkbZValue+0.5);
+ d->mRocker->setZValue(vkbZValue + 0.5);
}
show();
@@ -587,21 +686,10 @@
*/
void HbInputVkbWidget::setKeyboardDimmed(bool dimmed)
{
- Q_D(HbInputVkbWidget);
- d->mKeyboardDimmed = dimmed;
- if (keypadLayout()) {
- int itemCount = keypadLayout()->count();
- for (int i=0; i<itemCount; i++) {
- HbTouchKeypadButton* button = static_cast<HbTouchKeypadButton*>(keypadLayout()->itemAt(i));
- button->setFade(dimmed);
- }
+ HbInputButtonGroup *buttonGroup = static_cast<HbInputButtonGroup*>(contentItem());
+ if (buttonGroup) {
+ buttonGroup->setEnabled(!dimmed);
}
- if (!dimmed) {
- // when we undimmed the keyboard, all the buttons will be enabled by default.
- // we need to call applyEditorConstraints on the keyboard to apply constraints
- d->applyEditorConstraints();
- }
-
}
/*!
@@ -630,10 +718,19 @@
d->mSettingList->setPredictionSelectionEnabled(false);
}
- d->mSettingsButton->setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonLatched);
- qreal x = d->mSettingsButton->scenePos().x() + d->mSettingsButton->rect().width();
- qreal y = d->mSettingsButton->scenePos().y();
- d->mSettingList->setPreferredPos(QPointF(x, y), HbPopup::BottomRightCorner);
+ HbInputButtonGroup *buttonGroup = static_cast<HbInputButtonGroup*>(contentItem());
+ if (buttonGroup) {
+ HbInputButton *item = buttonGroup->button(HbInputButton::ButtonKeyCodeSettings);
+ if (item) {
+ item->setState(HbInputButton::ButtonStateLatched);
+ buttonGroup->setButton(item, HbInputButton::ButtonKeyCodeSettings);
+ }
+ }
+
+ QPointF position;
+ HbPopup::Placement placement;
+ d->settingListPosition(position, placement);
+ d->mSettingList->setPreferredPos(position, placement);
d->mSettingList->updateSettingList();
d->mSettingList->open(this, SLOT(settingsClosed()));
}
@@ -645,7 +742,14 @@
{
Q_D(HbInputVkbWidget);
- d->mSettingsButton->setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonReleased);
+ HbInputButtonGroup *buttonGroup = static_cast<HbInputButtonGroup*>(contentItem());
+ if (buttonGroup) {
+ HbInputButton *item = buttonGroup->button(HbInputButton::ButtonKeyCodeSettings);
+ if (item) {
+ item->setState(HbInputButton::ButtonStateReleased);
+ buttonGroup->setButton(item, HbInputButton::ButtonKeyCodeSettings);
+ }
+ }
d->mSettingsListOpen = false;
if ( d->mAnimateWhenDialogCloses ) {
@@ -663,26 +767,6 @@
{
Q_D(HbInputVkbWidget);
d->mSettingList->close();
- d->mSettingsButton->setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonReleased);
-}
-
-/*!
-\deprecated HbInputVkbWidget::togglePredictionStatus()
- is deprecated.
-*/
-void HbInputVkbWidget::togglePredictionStatus()
-{
- closeSettingList();
- HbInputSettingProxy::instance()->togglePrediction();
- update();
-}
-
-/*!
-\deprecated HbInputVkbWidget::executeSettingsDialog()
- is deprecated. Use showSettingsView instead.
-*/
-void HbInputVkbWidget::executeSettingsDialog()
-{
}
/*!
@@ -741,16 +825,6 @@
}
/*!
-\deprecated HbInputVkbWidget::keypadLayout()
- is deprecated.
-*/
-QGraphicsLayout *HbInputVkbWidget::keypadLayout()
-{
- Q_D(HbInputVkbWidget);
- return d->mButtonLayout;
-}
-
-/*!
\reimp
*/
QWidget* HbInputVkbWidget::asWidget()
@@ -820,163 +894,19 @@
d->mDrawbackground = backgroundEnabled;
}
+
/*!
Returns all possible keys those the user could have intended to press
for the last registered touch along with their corresponding probability.
-One issue of thecurrent API implementation is that it does not always
-sum up the probabilities to 1.0, but sometimes it returns.999999899 etc.
-Need to be careful about it!
*/
QList<HbKeyPressProbability> HbInputVkbWidget::probableKeypresses()
{
- Q_D(HbInputVkbWidget);
-
- QList<HbKeyPressProbability> probableKeys;
- int totalItems = d->mButtonLayout->count();
- QRectF buttonRect = d->mMostRecentlyAccessedButton->geometry();
- //The overlaying rectangle is the test rectangle that is used for finding
- //intersactions with other buttons.
- QRectF overlayingRect(d->mMostRecentlyClickedLocation.x()-buttonRect.width()/2,d->mMostRecentlyClickedLocation.y()-buttonRect.height()/2, buttonRect.width(), buttonRect.height());
- QPainterPath path(overlayingRect.topLeft());
- path.addRect(overlayingRect);
- for(int count=0; count < totalItems; count++) {
- QGraphicsItem *item = d->mButtonLayout->itemAt(count)->graphicsItem();
- QPainterPath testPath = item->mapFromScene(path);
- HbTouchKeypadButton *buttonItem = 0;
- if(item->isWidget()){
- buttonItem = qobject_cast<HbTouchKeypadButton *>(static_cast<QGraphicsWidget *>(item));
- }
- if(!buttonItem) {
- continue;
- }
-
- //Checkif the button collides with the path, if yes,it means that the colliding
- //key also could have been clicked by the user. The probability of the button being
- //clickedin that case willdependon the area of the intersaction rectangle.
- if(buttonItem->collidesWithPath(testPath)) {
- //Initiallylet the intersaction be same as the overlaying rectangle,later we will
- //shrink the rectangle and find the actual intersected rectangle.
- QRectF intersactionRect = overlayingRect;
- //The overlaying rectangle is in scene coordinates, map it to the item coordinates.
- intersactionRect.moveTopLeft(buttonItem->mapFromScene(overlayingRect.topLeft()));
- int width = (int)intersactionRect.width();
- int height = (int)intersactionRect.height();
- qreal probability = 0.0;
- //Shrink based on the size of the intersaction
- if (intersactionRect.topLeft().x() > 0) {
- width -= (int)intersactionRect.topLeft().x();
- } else {
- width += (int)intersactionRect.topLeft().x();
- }
- if (intersactionRect.topLeft().y() > 0) {
- height -= (int)intersactionRect.topLeft().y();
- } else {
- height += (int)intersactionRect.topLeft().y();
- }
- //The probabilty of the key is based on the intersaction area.
- probability = (height * width) / (intersactionRect.width()* intersactionRect.height());
- HbKeyPressProbability probablekey;
- probablekey.keycode = d->keyCode(buttonItem);
- probablekey.probability = probability;
-
- if(probablekey.keycode && (probablekey.probability>0)) {
- probableKeys.append(probablekey);
- }
- }
- }
- //Normalize makes sure that all probability summation is 1.0.
- d->normalizeProbabilities(probableKeys);
- return probableKeys;
-}
-
-/*!
-\deprecated HbInputVkbWidget::setupToolCluster()
- is deprecated.
-*/
-void HbInputVkbWidget::setupToolCluster()
-{
- Q_D(HbInputVkbWidget);
- if(!d->mOwner || !d->mOwner->focusObject()) {
- return;
+ QList<HbKeyPressProbability> probabilities;
+ HbInputButtonGroup *buttonGroup = static_cast<HbInputButtonGroup*>(contentItem());
+ if (buttonGroup) {
+ probabilities = buttonGroup->buttonProbabilities();
}
-
- // Create settings button if it does not exist
- if (!d->mSettingsButton) {
- d->mSettingsButton = new HbTouchKeypadButton(this, QString(""));
- d->mInputModeIndicator = new HbInputModeIndicator(*d->mSettingsButton, this);
- d->mSettingsButton->setButtonType(HbTouchKeypadButton::HbTouchButtonFunction);
- d->mSettingsButton->setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonReleased);
-
- connect(d->mSettingsButton, SIGNAL(clicked()), this, SLOT(showSettingList()));
-
- connect(d->mSettingsButton, SIGNAL(pressed()), d->mPressMapper, SLOT(map()));
- connect(d->mSettingsButton, SIGNAL(released()), d->mReleaseMapper, SLOT(map()));
- d->mPressMapper->setMapping(d->mSettingsButton, -1);
- d->mReleaseMapper->setMapping(d->mSettingsButton, -1);
- } else {
- d->mInputModeIndicator->updateIndicator();
- }
-
- // If there's a application specific button defined, create new button with the properties
- // or update the existing one. Otherwise create an empty button or clean the properties of an existing one.
- if (!d->mOwner->focusObject()->editorInterface().actions().isEmpty()) {
- QList<HbAction*> actions = d->mOwner->focusObject()->editorInterface().actions();
- if (d->mApplicationButtonAction != actions.first()) {
- if (d->mApplicationButton) {
- d->mApplicationButton->setText(actions.first()->text());
- d->mApplicationButton->setIcon(actions.first()->icon());
- d->mApplicationButton->disconnect(SIGNAL(clicked()));
- d->mApplicationButton->disconnect(SIGNAL(pressed()));
- d->mApplicationButton->disconnect(SIGNAL(released()));
-
- // disconnects old signal
- disconnect(d->mApplicationButtonAction, SIGNAL(changed()), this, SLOT(refreshApplicationButton()));
- disconnect(d->mApplicationButton, SIGNAL(clicked()), d->mApplicationButtonAction, SLOT(trigger()));
- } else {
- d->mApplicationButton = new HbTouchKeypadButton(this, actions.first()->icon(), actions.first()->text());
- }
- d->mApplicationButtonAction = actions.first();
- // Connect to enabling signal and check its value
- connect(actions.first(), SIGNAL(changed()), this, SLOT(refreshApplicationButton()));
-
- if (actions.first()->isEnabled()) {
- // action is enabled
- connect(d->mApplicationButton, SIGNAL(clicked()), d->mApplicationButtonAction, SLOT(trigger()));
-
- connect(d->mApplicationButton, SIGNAL(pressed()), d->mPressMapper, SLOT(map()));
- connect(d->mApplicationButton, SIGNAL(released()), d->mReleaseMapper, SLOT(map()));
- d->mPressMapper->setMapping(d->mApplicationButton, -1);
- d->mReleaseMapper->setMapping(d->mApplicationButton, -1);
-
- d->mApplicationButton->setToolTip(actions.first()->toolTip());
- d->mApplicationButton->setButtonType(HbTouchKeypadButton::HbTouchButtonFunction);
- d->mApplicationButton->setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonReleased);
- } else {
- // action is disabled
- d->mApplicationButton->setButtonType(HbTouchKeypadButton::HbTouchButtonFnInActive);
- d->mApplicationButton->setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonPressed);
- }
- d->mApplicationButton->setToolTip(actions.first()->toolTip());
- }
- } else {
- if (d->mApplicationButton) {
- if (d->mApplicationButtonAction) {
- disconnect(d->mApplicationButtonAction, SIGNAL(changed()), this, SLOT(refreshApplicationButton()));
- }
- d->mApplicationButton->disconnect(SIGNAL(clicked()));
- d->mApplicationButton->disconnect(SIGNAL(pressed()));
- d->mApplicationButton->disconnect(SIGNAL(released()));
- d->mApplicationButton->setText(QString());
- d->mApplicationButton->setIcon(HbIcon());
- d->mApplicationButton->setToolTip(QString());
- d->mApplicationButtonAction = 0;
- } else {
- d->mApplicationButton = new HbTouchKeypadButton(this, QString());
- d->mApplicationButton->setButtonType(HbTouchKeypadButton::HbTouchButtonFunction);
- d->mApplicationButton->setBackgroundAttributes(HbTouchKeypadButton::HbTouchButtonReleased);
- }
- d->mApplicationButtonAction = 0;
- }
+ return probabilities;
}
/*!
@@ -1034,13 +964,14 @@
d->mSmileyPicker->setGeometry(QRectF(0, pos().y(), geometry().width(),
geometry().height()));
d->mSmileyPicker->show();
+
+ HbInputButtonGroup *buttonGroup = static_cast<HbInputButtonGroup*>(contentItem());
+ if (buttonGroup) {
+ buttonGroup->cancelButtonPress();
+ }
}
}
-/*!
-\deprecated HbInputVkbWidget::flickDirection()
- is deprecated.
-*/
HbInputVkbWidget::HbFlickDirection HbInputVkbWidget::flickDirection()
{
Q_D(HbInputVkbWidget);
@@ -1048,27 +979,68 @@
}
/*!
-\deprecated HbInputVkbWidget::refreshApplicationButton()
- is deprecated.
+Sends key event to owning input method.
+*/
+void HbInputVkbWidget::sendKeyPressEvent(const QKeyEvent &event)
+{
+ Q_D(HbInputVkbWidget);
+
+ if (d->mOwner) {
+ d->mOwner->filterEvent(&event);
+ }
+}
+
+/*!
+Sends key event to owning input method.
*/
-void HbInputVkbWidget::refreshApplicationButton()
+void HbInputVkbWidget::sendKeyDoublePressEvent(const QKeyEvent &event)
+{
+ Q_D(HbInputVkbWidget);
+
+ if (d->mOwner) {
+ d->mOwner->filterEvent(&event);
+ }
+}
+
+/*!
+Sends key event to owning input method.
+*/
+void HbInputVkbWidget::sendKeyReleaseEvent(const QKeyEvent &event)
{
Q_D(HbInputVkbWidget);
- d->mApplicationButton->setText(d->mApplicationButtonAction->text());
- d->mApplicationButton->setIcon(d->mApplicationButtonAction->icon());
+ if (event.key() == HbInputButton::ButtonKeyCodeSettings) {
+ showSettingList();
+ } else {
+ if (d->mOwner) {
+ d->mOwner->filterEvent(&event);
+ }
+ }
+}
+
+/*!
+Sends key event to owning input method.
+*/
+void HbInputVkbWidget::sendLongPressEvent(const QKeyEvent &event)
+{
+ Q_D(HbInputVkbWidget);
- if (d->mApplicationButton->getButtonType() == HbTouchKeypadButton::HbTouchButtonFnInActive
- && d->mApplicationButtonAction->isEnabled()) {
- // action has been enabled
- connect(d->mApplicationButton, SIGNAL(clicked()), d->mApplicationButtonAction, SLOT(trigger()));
- d->mApplicationButton->setToolTip(d->mApplicationButtonAction->toolTip());
- d->mApplicationButton->setFade(false);
- } else if (d->mApplicationButton->getButtonType() == HbTouchKeypadButton::HbTouchButtonFunction
- && !d->mApplicationButtonAction->isEnabled()) {
- // action has been disabled
- d->mApplicationButton->disconnect(SIGNAL(clicked()));
- d->mApplicationButton->setFade(true);
+ if (d->mOwner) {
+ d->mOwner->filterEvent(&event);
+ }
+}
+
+/*!
+Sends key event to owning input method.
+Releae event is ignored.
+*/
+void HbInputVkbWidget::sendKeyChangeEvent(const QKeyEvent &releaseEvent, const QKeyEvent &pressEvent)
+{
+ Q_D(HbInputVkbWidget);
+ Q_UNUSED(releaseEvent);
+
+ if (d->mOwner) {
+ d->mOwner->filterEvent(&pressEvent);
}
}
@@ -1077,7 +1049,7 @@
Q_D(HbInputVkbWidget);
int direction = 1;
- if (flickDirection() == HbFlickDirectionLeft) {
+ if (d->mFlickDirection == HbFlickDirectionLeft) {
direction = -1;
}
@@ -1167,13 +1139,13 @@
if (gesture->state() == Qt::GestureFinished) {
HbWidgetFeedback::triggered(this, Hb::InstantFlicked);
// vertical swipes
- if (gesture->sceneSwipeAngle() > 250 && gesture->sceneSwipeAngle() < 290 &&
- gesture->sceneVerticalDirection() == QSwipeGesture::Down) {
+ if (gesture->sceneVerticalDirection() == QSwipeGesture::Down) {
d->mFlickDirection = HbFlickDirectionDown;
+ emit flickEvent(d->mFlickDirection);
emit keypadCloseEventDetected(HbVkbCloseMethodCloseGesture);
- } else if (gesture->sceneSwipeAngle() > 70 && gesture->sceneSwipeAngle() < 110 &&
- gesture->sceneVerticalDirection() == QSwipeGesture::Up) {
+ } else if (gesture->sceneVerticalDirection() == QSwipeGesture::Up) {
d->mFlickDirection = HbFlickDirectionUp;
+ emit flickEvent(d->mFlickDirection);
d->mCurrentHost->openKeypad(d->mCurrentHost->activeKeypad(), d->mOwner);
} else {
d->mFlickDirection = (HbInputVkbWidget::HbFlickDirection)gesture->sceneHorizontalDirection();
--- a/src/hbinput/inputwidgets/hbinputvkbwidget.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputvkbwidget.h Fri May 14 16:09:54 2010 +0300
@@ -36,10 +36,11 @@
const QString backgroundGraphics("qtg_fr_input_v_bg");
const QString HbInputVkbHandleIcon("qtg_graf_input_v_swipe");
-const qreal HbCloseHandleHeight = 20.0;
+const qreal HbCloseHandleHeight = 0;
+const qreal HbCloseHandleHeightInUnits = 2.23;
+const qreal HbCloseHandleWidthInUnits = 18.8;
class HbInputVkbWidgetPrivate;
-class HbAction;
class HbInputMethod;
class HbView;
class HbKeymap;
@@ -74,7 +75,6 @@
HbInputVkbWidget(QGraphicsItem *parent = 0);
virtual ~HbInputVkbWidget();
- virtual HbFlickDirection flickDirection();
public: // From HbVirtualKeyboard
QWidget* asWidget();
@@ -93,7 +93,9 @@
virtual void setMode(HbKeypadMode mode, HbModifiers modifiers);
virtual HbKeypadMode mode() const;
virtual HbModifiers modifiers() const;
- virtual void setupToolCluster();
+
+ virtual void setContentItem(QGraphicsLayoutItem *item);
+ virtual QGraphicsLayoutItem *contentItem() const;
virtual void setRockerVisible(bool visible);
virtual bool isRockerVisible() const;
@@ -103,10 +105,10 @@
virtual QList<HbKeyPressProbability> probableKeypresses();
virtual void animKeyboardChange();
+ HbFlickDirection flickDirection();
protected: // From QGraphicsItem
virtual QPainterPath shape () const;
- virtual void mousePressEvent(QGraphicsSceneMouseEvent* event);
virtual void changeEvent(QEvent *event);
virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget);
virtual int type() const {return Hb::ItemType_InputVkbWidget;}
@@ -115,26 +117,25 @@
protected:
// layout
- virtual QGraphicsLayout *keypadLayout();
QSizeF keypadButtonAreaSize();
public slots:
void showSettingList();
- void executeSettingsDialog();
void showSettingsView();
void closeSettingsView();
void executeMethodDialog();
void closeSettingList();
- void mappedKeyPress(int buttonId);
- void mappedKeyRelease(int buttonId);
void settingsClosed();
- void togglePredictionStatus();
void showSmileyPicker(int rows, int columns);
-
- void refreshApplicationButton();
void keypadLanguageChangeAnimationUpdate(qreal value);
void keypadLanguageChangeFinished();
+ virtual void sendKeyPressEvent(const QKeyEvent &event);
+ virtual void sendKeyDoublePressEvent(const QKeyEvent &event);
+ virtual void sendKeyReleaseEvent(const QKeyEvent &event);
+ virtual void sendLongPressEvent(const QKeyEvent &event);
+ virtual void sendKeyChangeEvent(const QKeyEvent &releaseEvent, const QKeyEvent &pressEvent);
+
signals:
void keypadCloseEventDetected(HbInputVkbWidget::HbVkbCloseMethod closeMethod);
void rockerDirection(int direction, HbInputVirtualRocker::RockerSelectionMode selectionMode);
--- a/src/hbinput/inputwidgets/hbinputvkbwidget_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputvkbwidget_p.h Fri May 14 16:09:54 2010 +0300
@@ -82,6 +82,8 @@
};
HbInputVkbWidgetPrivate();
virtual ~HbInputVkbWidgetPrivate();
+
+ virtual void initLayout();
virtual void init();
virtual int keyCode(int buttonId);
@@ -97,6 +99,9 @@
void redirectMouseReleaseEvent(QGraphicsSceneMouseEvent *aEvent);
virtual void applyEditorConstraints();
+ virtual void updateKeyCodes();
+ virtual void updateButtons();
+ virtual void settingListPosition(QPointF &position, HbPopup::Placement &placement);
virtual void setRockerPosition();
@@ -120,7 +125,7 @@
HbModifiers mModifiers;
- HbInputModeIndicator* mInputModeIndicator;
+ HbInputModeIndicator *mInputModeIndicator;
QPointer<HbTouchKeypadButton> mApplicationButton;
QPointer<HbAction> mApplicationButtonAction;
@@ -158,7 +163,8 @@
bool mAnimateWhenDialogCloses;
HbQwertyKeyboardSize mKeyboardSize;
int mCloseHandleHeight;
- QGraphicsWidget *mCloseHandle;
+ int mCloseHandleWidth;
+ QGraphicsWidget *mCloseHandle;
HbView *mSettingView;
HbView *mCurrentView;
bool mKeyboardDimmed;
--- a/src/hbinput/inputwidgets/inputwidgets.pri Mon May 03 12:48:33 2010 +0300
+++ b/src/hbinput/inputwidgets/inputwidgets.pri Fri May 14 16:09:54 2010 +0300
@@ -30,53 +30,38 @@
# hb input widget public headers
PUBLIC_HEADERS += $$PWD/hbinputvkbwidget.h
PUBLIC_HEADERS += $$PWD/hbinputvirtualrocker.h
-PUBLIC_HEADERS += $$PWD/hbinputtouchkeypadbutton.h
-PUBLIC_HEADERS += $$PWD/hbinput12keytouchkeypad.h
-PUBLIC_HEADERS += $$PWD/hbinputsctportrait.h
-PUBLIC_HEADERS += $$PWD/hbinputusedsymbolpane.h
PUBLIC_HEADERS += $$PWD/hbinputcandidatelist.h
-PUBLIC_HEADERS += $$PWD/hbinputqwertytouchkeyboard.h
-PUBLIC_HEADERS += $$PWD/hbinputpreviewlabel.h
-PUBLIC_HEADERS += $$PWD/hbinputcharpreviewpane.h
PUBLIC_HEADERS += $$PWD/hbinputmodeindicator.h
-PUBLIC_HEADERS += $$PWD/hbinputcustombuttonlist.h
PUBLIC_HEADERS += $$PWD/hbinputexactwordpopup.h
-PUBLIC_HEADERS += $$PWD/hbinputsctlandscape.h
PUBLIC_HEADERS += $$PWD/hbinputcommondialogs.h
-PUBLIC_HEADERS += $$PWD/hbinputsettingdialog.h
PUBLIC_HEADERS += $$PWD/hbinputhwtoolcluster.h
PUBLIC_HEADERS += $$PWD/hbinputsmileypicker.h
PUBLIC_HEADERS += $$PWD/hbinputscreenshotwidget.h
PUBLIC_HEADERS += $$PWD/hbinputsettinglist.h
PUBLIC_HEADERS += $$PWD/hbinputsettingwidget.h
+PUBLIC_HEADERS += $$PWD/hbinputbuttongroup.h
+PUBLIC_HEADERS += $$PWD/hbinputbutton.h
+PUBLIC_HEADERS += $$PWD/hbinputsctkeyboard.h
+
# hb input widget private headers
PRIVATE_HEADERS += $$PWD/hbinputvkbwidget_p.h
-PRIVATE_HEADERS += $$PWD/hbinput12keytouchkeypad_p.h
-PRIVATE_HEADERS += $$PWD/hbinputqwertytouchkeyboard_p.h
-PRIVATE_HEADERS += $$PWD/hbinputsctlandscape_p.h
-PRIVATE_HEADERS += $$PWD/hbinputsctportrait_p.h
PRIVATE_HEADERS += $$PWD/hbinputcheckboxlist_p.h
+PRIVATE_HEADERS += $$PWD/hbinputbuttongroup_p.h
+PRIVATE_HEADERS += $$PWD/hbinputsctkeyboard_p.h
# hb input widget sources
SOURCES += $$PWD/hbinputvkbwidget.cpp
SOURCES += $$PWD/hbinputvirtualrocker.cpp
-SOURCES += $$PWD/hbinputtouchkeypadbutton.cpp
-SOURCES += $$PWD/hbinput12keytouchkeypad.cpp
-SOURCES += $$PWD/hbinputsctportrait.cpp
-SOURCES += $$PWD/hbinputusedsymbolpane.cpp
SOURCES += $$PWD/hbinputcandidatelist.cpp
-SOURCES += $$PWD/hbinputqwertytouchkeyboard.cpp
-SOURCES += $$PWD/hbinputpreviewlabel.cpp
-SOURCES += $$PWD/hbinputcharpreviewpane.cpp
SOURCES += $$PWD/hbinputmodeindicator.cpp
-SOURCES += $$PWD/hbinputcustombuttonlist.cpp
SOURCES += $$PWD/hbinputexactwordpopup.cpp
-SOURCES += $$PWD/hbinputsctlandscape.cpp
SOURCES += $$PWD/hbinputcommondialogs.cpp
-SOURCES += $$PWD/hbinputsettingdialog.cpp
SOURCES += $$PWD/hbinputhwtoolcluster.cpp
SOURCES += $$PWD/hbinputsmileypicker.cpp
SOURCES += $$PWD/hbinputscreenshotwidget.cpp
SOURCES += $$PWD/hbinputsettinglist.cpp
SOURCES += $$PWD/hbinputsettingwidget.cpp
SOURCES += $$PWD/hbinputcheckboxlist.cpp
+SOURCES += $$PWD/hbinputbuttongroup.cpp
+SOURCES += $$PWD/hbinputbutton.cpp
+SOURCES += $$PWD/hbinputsctkeyboard.cpp
--- a/src/hbplugins/devicedialogs/devicemessageboxplugin/hbdevicemessageboxwidget.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbplugins/devicedialogs/devicemessageboxplugin/hbdevicemessageboxwidget.cpp Fri May 14 16:09:54 2010 +0300
@@ -30,6 +30,8 @@
#include "hbdevicemessageboxwidget_p.h"
#include "hbdevicemessageboxpluginerrors_p.h"
+static const char actionTextTag[] = "t:";
+
// Constructor
HbDeviceMessageBoxWidget::HbDeviceMessageBoxWidget(
HbMessageBox::MessageBoxType type, const QVariantMap ¶meters) : HbMessageBox(type)
@@ -37,33 +39,30 @@
TRACE_ENTRY
mLastError = NoError;
mShowEventReceived = false;
- mPrimaryAction = 0;
- mSecondaryAction = 0;
+ QList<QAction*> actList = actions();
+ for(int i = 0; i < NumActions; i++) {
+ mActions[i].mAction = 0;
+ mActions[i].mOwned = false; // we haven't created the action
+ mActions[i].mInDialog = false; // action has not been inserted to the dialog
+ if (i < actList.count()) {
+ mActions[i].mAction = actList[i];
+ mActions[i].mInDialog = true;
+ connect(mActions[i].mAction, SIGNAL(triggered()), SLOT(actionTriggered()));
+ }
+ }
resetProperties();
constructDialog(parameters);
- if (!mPrimaryAction) {
- // If default button provided by HbMessageBox is used, connect into its triggered signal.
- HbAction *action = primaryAction();
- if (action) {
- connect(action, SIGNAL(triggered()), SLOT(primaryActionTriggered()));
- }
- }
- if (!mSecondaryAction) {
- // If default button provided by HbMessageBox is used, connect into its triggered signal.
- HbAction *action = secondaryAction();
- if (action) {
- connect(action, SIGNAL(triggered()), SLOT(secondaryActionTriggered()));
- }
- }
-
TRACE_EXIT
}
// Destructor
HbDeviceMessageBoxWidget::~HbDeviceMessageBoxWidget()
{
- delete mPrimaryAction;
- delete mSecondaryAction;
+ for(int i = 0; i < NumActions; i++) {
+ if (mActions[i].mOwned) {
+ delete mActions[i].mAction;
+ }
+ }
}
// Set parameters
@@ -199,95 +198,27 @@
return;
}
-QString HbDeviceMessageBoxWidget::primaryActionText() const
+QString HbDeviceMessageBoxWidget::acceptAction() const
{
- HbAction *action = primaryAction();
- return action ? action->text() : QString();
+ return actionData(Accept);
}
-void HbDeviceMessageBoxWidget::setPrimaryActionText(QString &actionText)
+void HbDeviceMessageBoxWidget::setAcceptAction(QString &actionData)
{
TRACE_ENTRY
- HbAction *action = primaryAction();
- if (action) {
- action->setText(actionText);
- } else {
- if (!mPrimaryAction) {
- mPrimaryAction = new HbAction(actionText);
- connect(mPrimaryAction, SIGNAL(triggered()), this, SLOT(primaryActionTriggered()));
- } else {
- mPrimaryAction->setText(actionText);
- }
- setPrimaryAction(mPrimaryAction);
- }
+ setAction(Accept, actionData);
TRACE_EXIT
}
-QString HbDeviceMessageBoxWidget::secondaryActionText() const
+QString HbDeviceMessageBoxWidget::rejectAction() const
{
- HbAction *action = secondaryAction();
- return action ? action->text() : QString();
+ return actionData(Reject);
}
-void HbDeviceMessageBoxWidget::setSecondaryActionText(QString &actionText)
-{
- TRACE_ENTRY
- HbAction *action = secondaryAction();
- if (action) {
- action->setText(actionText);
- } else {
- if (!mSecondaryAction) {
- mSecondaryAction = new HbAction(actionText);
- connect(mSecondaryAction, SIGNAL(triggered()), this, SLOT(secondaryActionTriggered()));
- } else {
- mSecondaryAction->setText(actionText);
- }
- setSecondaryAction(mSecondaryAction);
- }
- TRACE_EXIT
-}
-
-bool HbDeviceMessageBoxWidget::primaryActionNull() const
-{
- return primaryAction() == 0;
-}
-
-void HbDeviceMessageBoxWidget::setPrimaryActionNull(bool isNull)
+void HbDeviceMessageBoxWidget::setRejectAction(QString &actionData)
{
TRACE_ENTRY
- if (isNull) {
- // If there is a message box's default action, disconnect from it.
- HbAction *action = primaryAction();
- if (action && mPrimaryAction == 0) {
- action->disconnect(SIGNAL(triggered()), this, SLOT(primaryActionTriggered()));
- }
- setPrimaryAction(0);
- } else {
- QString text = mPrimaryAction ? mPrimaryAction->text() : QString();
- setPrimaryActionText(text);
- }
- TRACE_EXIT
-}
-
-bool HbDeviceMessageBoxWidget::secondaryActionNull() const
-{
- return secondaryAction() == 0;
-}
-
-void HbDeviceMessageBoxWidget::setSecondaryActionNull(bool isNull)
-{
- TRACE_ENTRY
- if (isNull) {
- // If there is a message box's default action, disconnect from it.
- HbAction *action = secondaryAction();
- if (action && mSecondaryAction == 0) {
- action->disconnect(SIGNAL(triggered()), this, SLOT(secondaryActionTriggered()));
- }
- setSecondaryAction(0);
- } else {
- QString text = mSecondaryAction ? mSecondaryAction->text() : QString();
- setSecondaryActionText(text);
- }
+ setAction(Reject, actionData);
TRACE_EXIT
}
@@ -318,24 +249,71 @@
return mAnimationDefinition;
}
-// Primary action triggered
-void HbDeviceMessageBoxWidget::primaryActionTriggered()
+// Action (accept or reject) was triggered
+void HbDeviceMessageBoxWidget::actionTriggered()
{
TRACE_ENTRY
+ bool accepted = (sender() == mActions[Accept].mAction);
QVariantMap data;
- data.insert("act", "p");
+ data.insert("act", accepted ? "p" : "s");
emit deviceDialogData(data);
mSendAction = false;
TRACE_EXIT
}
-// Secondary action triggered
-void HbDeviceMessageBoxWidget::secondaryActionTriggered()
+// Parse action data and return button text
+void HbDeviceMessageBoxWidget::parseActionData(QString &data)
+{
+ const QString textTag(actionTextTag);
+ if (data.startsWith(textTag)) {
+ data.remove(0, textTag.length());
+ } else {
+ data.clear();
+ }
+}
+
+// Pack action into a string
+QString HbDeviceMessageBoxWidget::actionData(ActionIndex index) const
+{
+ QAction *act = mActions[index].mInDialog ? mActions[index].mAction : 0;
+ QString actionData;
+ if (act) {
+ actionData.append(actionTextTag);
+ actionData.append(act->text());
+ }
+ return actionData;
+}
+
+// Set action
+void HbDeviceMessageBoxWidget::setAction(ActionIndex index, QString &actionData)
{
- TRACE_ENTRY
- QVariantMap data;
- data.insert("act", "s");
- emit deviceDialogData(data);
- mSendAction = false;
- TRACE_EXIT
+ parseActionData(actionData); // parse data to get action text
+ if (!actionData.isNull()) {
+ // Setting action
+ QAction *act = mActions[index].mAction;
+ if (act) {
+ act->setText(actionData);
+ } else {
+ // Create action
+ mActions[index].mAction = new HbAction(actionData, 0);
+ mActions[index].mOwned = true;
+ //connect(mActions[index].mAction, SIGNAL(triggered()), this, SLOT(actionTriggered()));
+ }
+ // Add action to dialog if it's not there
+ if (!mActions[index].mInDialog) {
+ mActions[index].mInDialog = true;
+ QAction *before = 0;
+ if (index == Accept && mActions[Reject].mInDialog) {
+ before = mActions[Reject].mAction; // insert to table head
+ }
+ insertAction(before, mActions[index].mAction);
+ connect(mActions[index].mAction, SIGNAL(triggered()), this, SLOT(actionTriggered()));
+ }
+ } else { // Remove action
+ mActions[index].mInDialog = false;
+ if (mActions[index].mAction) {
+ removeAction(mActions[index].mAction);
+ mActions[index].mAction->disconnect(SIGNAL(triggered()), this, SLOT(actionTriggered()));
+ }
+ }
}
--- a/src/hbplugins/devicedialogs/devicemessageboxplugin/hbdevicemessageboxwidget_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbplugins/devicedialogs/devicemessageboxplugin/hbdevicemessageboxwidget_p.h Fri May 14 16:09:54 2010 +0300
@@ -35,16 +35,15 @@
class HbDialog;
class HbAction;
+class QAction;
class HbDeviceMessageBoxWidget :
public HbMessageBox, public HbDeviceDialogInterface
{
Q_OBJECT
Q_PROPERTY(QString iconName READ iconName WRITE setIconName)
- Q_PROPERTY(QString primaryActionText READ primaryActionText WRITE setPrimaryActionText)
- Q_PROPERTY(QString secondaryActionText READ secondaryActionText WRITE setSecondaryActionText)
- Q_PROPERTY(bool primaryActionNull READ primaryActionNull WRITE setPrimaryActionNull)
- Q_PROPERTY(bool secondaryActionNull READ secondaryActionNull WRITE setSecondaryActionNull)
+ Q_PROPERTY(QString acceptAction READ acceptAction WRITE setAcceptAction)
+ Q_PROPERTY(QString rejectAction READ rejectAction WRITE setRejectAction)
Q_PROPERTY(QString animationDefinition READ animationDefinition WRITE setAnimationDefinition)
public:
@@ -57,29 +56,39 @@
HbDialog *deviceDialogWidget() const;
public slots:
- void primaryActionTriggered();
- void secondaryActionTriggered();
+ void actionTriggered();
private:
+ enum ActionIndex{
+ Accept = 0,
+ Reject,
+ NumActions
+ };
+ struct Action {
+ QAction *mAction;
+ bool mOwned;
+ bool mInDialog;
+ };
+
bool constructDialog(const QVariantMap ¶meters);
bool checkProperties(const QVariantMap ¶meters);
void setProperties(const QVariantMap ¶meters);
void resetProperties();
QString iconName() const;
void setIconName(QString &iconName);
- QString primaryActionText() const;
- void setPrimaryActionText(QString &actionText);
- QString secondaryActionText() const;
- void setSecondaryActionText(QString &actionText);
- bool primaryActionNull() const;
- void setPrimaryActionNull(bool isNull);
- bool secondaryActionNull() const;
- void setSecondaryActionNull(bool isNull);
+ QString acceptAction() const;
+ void setAcceptAction(QString &actionData);
+ QString rejectAction() const;
+ void setRejectAction(QString &actionData);
void hideEvent(QHideEvent *event);
void showEvent(QShowEvent *event);
void setAnimationDefinition(QString &animationDefinition);
QString animationDefinition() const;
+ static void parseActionData(QString &data);
+ QString actionData(ActionIndex index) const;
+ void setAction(ActionIndex index, QString &actionData);
+
signals:
void deviceDialogClosed();
void deviceDialogData(QVariantMap data);
@@ -89,8 +98,7 @@
int mLastError;
QString mIconName;
- HbAction *mPrimaryAction;
- HbAction *mSecondaryAction;
+ Action mActions[NumActions];
int mSendAction;
bool mShowEventReceived;
QString mAnimationDefinition;
--- a/src/hbplugins/devicedialogs/deviceprogressdialogplugin/hbdeviceprogressdialogwidget.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbplugins/devicedialogs/deviceprogressdialogplugin/hbdeviceprogressdialogwidget.cpp Fri May 14 16:09:54 2010 +0300
@@ -31,6 +31,8 @@
#include "hbdeviceprogressdialogwidget_p.h"
#include "hbdeviceprogressdialogpluginerrors_p.h"
+static const char actionTextTag[] = "t:";
+
// Constructor
HbDeviceProgressDialogWidget::HbDeviceProgressDialogWidget(HbProgressDialog::ProgressDialogType progressDialogType,
const QVariantMap ¶meters) : HbProgressDialog(progressDialogType)
@@ -39,14 +41,14 @@
mLastError = NoError;
mProgressDialogType = progressDialogType;
mShowEventReceived = false;
- mPrimaryAction = 0;
+ mAction = 0;
resetProperties();
constructDialog(parameters);
- if (!mPrimaryAction) {
+ if (!mAction) {
// If HbProgressDialog default button is used, connect into its triggered signal.
- HbAction *action = primaryAction();
- if (action) {
- connect(action, SIGNAL(triggered()), SLOT(primaryActionTriggered()));
+ QAction *act = action(Cancel);
+ if (act) {
+ connect(act, SIGNAL(triggered()), SLOT(cancelTriggered()));
}
}
setBackgroundFaded(true);
@@ -56,7 +58,7 @@
// Destructor
HbDeviceProgressDialogWidget::~HbDeviceProgressDialogWidget()
{
- delete mPrimaryAction;
+ delete mAction;
}
// Set parameters
@@ -200,53 +202,66 @@
setIcon(HbIcon(mIconName));
}
TRACE_EXIT
- return;
}
-QString HbDeviceProgressDialogWidget::primaryActionText() const
+QString HbDeviceProgressDialogWidget::cancelAction() const
{
- HbAction *action = primaryAction();
- return action ? action->text() : QString();
+ TRACE_ENTRY
+ QAction *act = action(Cancel);
+ QString actionData;
+ if (act) {
+ actionData.append(actionTextTag);
+ actionData.append(act->text());
+ }
+ TRACE_EXIT
+ return actionData;
}
-void HbDeviceProgressDialogWidget::setPrimaryActionText(QString &actionText)
+void HbDeviceProgressDialogWidget::setCancelAction(QString &actionData)
{
TRACE_ENTRY
- HbAction *action = primaryAction();
- if (action) {
- action->setText(actionText);
- } else {
- if (!mPrimaryAction) {
- mPrimaryAction = new HbAction(actionText);
- connect(mPrimaryAction, SIGNAL(triggered()), this, SLOT(primaryActionTriggered()));
+ parseActionData(actionData); // parse data to get action text
+ if (!actionData.isNull()) {
+ // Setting action
+ QAction *act = action(Cancel);
+ if (act) {
+ act->setText(actionData);
} else {
- mPrimaryAction->setText(actionText);
+ if (!mAction) {
+ mAction = new HbAction(actionData, 0);
+ connect(mAction, SIGNAL(triggered()), this, SLOT(cancelTriggered()));
+ } else {
+ mAction->setText(actionData);
+ }
+ addAction(mAction);
}
- setPrimaryAction(mPrimaryAction);
+ } else { // Remove action
+ // If there is a message box's default action, disconnect from it.
+ QAction *act = action(Cancel);
+ if (act && mAction == 0) {
+ act->disconnect(SIGNAL(triggered()), this, SLOT(cancelTriggered()));
+ }
+ if (act) {
+ removeAction(act);
+ }
}
TRACE_EXIT
}
-bool HbDeviceProgressDialogWidget::primaryActionNull() const
+QAction *HbDeviceProgressDialogWidget::action(ActionIndex index) const
{
- return primaryAction() == 0;
+ QList<QAction*> actionList = actions();
+ return actionList.count() > index ? actionList[index] : 0;
}
-void HbDeviceProgressDialogWidget::setPrimaryActionNull(bool isNull)
+void HbDeviceProgressDialogWidget::parseActionData(QString &data)
{
- TRACE_ENTRY
- if (isNull) {
- // If there is a message box's default action, disconnect from it.
- HbAction *action = primaryAction();
- if (action && mPrimaryAction == 0) {
- action->disconnect(SIGNAL(triggered()), this, SLOT(primaryActionTriggered()));
- }
- setPrimaryAction(0);
+ const QString textTag(actionTextTag);
+ if (data.startsWith(textTag)) {
+ data.remove(0, textTag.length());
} else {
- QString text = mPrimaryAction ? mPrimaryAction->text() : QString();
- setPrimaryActionText(text);
+ data.clear();
}
- TRACE_EXIT
}
QString HbDeviceProgressDialogWidget::animationDefinition() const
@@ -277,11 +292,11 @@
}
// Primary action triggered
-void HbDeviceProgressDialogWidget::primaryActionTriggered()
+void HbDeviceProgressDialogWidget::cancelTriggered()
{
TRACE_ENTRY
QVariantMap data;
- data.insert("act", "p");
+ data.insert("act", "c");
emit deviceDialogData(data);
TRACE_EXIT
}
--- a/src/hbplugins/devicedialogs/deviceprogressdialogplugin/hbdeviceprogressdialogwidget_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbplugins/devicedialogs/deviceprogressdialogplugin/hbdeviceprogressdialogwidget_p.h Fri May 14 16:09:54 2010 +0300
@@ -40,9 +40,8 @@
{
Q_OBJECT
Q_PROPERTY(QString iconName READ iconName WRITE setIconName)
- Q_PROPERTY(QString primaryActionText READ primaryActionText WRITE setPrimaryActionText)
- Q_PROPERTY(bool primaryActionNull READ primaryActionNull WRITE setPrimaryActionNull)
Q_PROPERTY(QString animationDefinition READ animationDefinition WRITE setAnimationDefinition)
+ Q_PROPERTY(QString cancelAction READ cancelAction WRITE setCancelAction)
public:
HbDeviceProgressDialogWidget(HbProgressDialog::ProgressDialogType progressDialogType, const QVariantMap ¶meters);
@@ -55,24 +54,27 @@
static bool getDialogType(HbProgressDialog::ProgressDialogType &dialogType, QVariantMap ¶meters);
public slots:
- void primaryActionTriggered();
+ void cancelTriggered();
private:
+ enum ActionIndex{
+ Cancel = 0
+ };
bool constructDialog(const QVariantMap ¶meters);
bool checkProperties(const QVariantMap& parameters);
void setProperties(const QVariantMap& parameters);
void resetProperties();
QString iconName() const;
void setIconName(QString &iconName);
- QString primaryActionText() const;
- void setPrimaryActionText(QString &actionText);
- bool primaryActionNull() const;
- void setPrimaryActionNull(bool isNull);
+ QString cancelAction() const;
+ void setCancelAction(QString &actionData);
void hideEvent(QHideEvent *event);
void showEvent(QShowEvent *event);
void setAnimationDefinition(QString &animationDefinition);
QString animationDefinition() const;
+ QAction *action(ActionIndex index) const;
+ static void parseActionData(QString &data);
signals:
void deviceDialogClosed();
void deviceDialogData(QVariantMap data);
@@ -82,7 +84,7 @@
int mLastError;
QString mIconName;
- HbAction *mPrimaryAction;
+ HbAction *mAction;
HbProgressDialog::ProgressDialogType mProgressDialogType;
bool mShowEventReceived;
QString mAnimationDefinition;
--- a/src/hbplugins/devicedialogs/indicatormenuplugin/hbindicatormenu.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbplugins/devicedialogs/indicatormenuplugin/hbindicatormenu.cpp Fri May 14 16:09:54 2010 +0300
@@ -25,13 +25,11 @@
#include <QVariant>
#include <QTimer>
-#include <hbstyleoptionindicatormenu.h>
#include <hbmainwindow.h>
#include "hbindicatormenucontent_p.h"
#include "hbindicatormenu_p.h"
#include "hbindicatormenupluginerrors_p.h"
-
#include "hbdialog_p.h"
#ifdef HB_EFFECTS
@@ -193,6 +191,11 @@
&& style()->parameter("hb-param-margin-gene-middle-horizontal", xPos)){
setPreferredPos(QPointF(xPos, chromeHeight));
}
+ if (mShowEventReceived) {
+ HbIndicatorMenuContent *menuContent =
+ qobject_cast<HbIndicatorMenuContent*>(contentWidget());
+ menuContent->updatePrimitives();
+ }
}
void HbIndicatorMenu::userActivity()
--- a/src/hbplugins/devicedialogs/indicatormenuplugin/hbindicatormenuclock.cpp Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,177 +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 <QTime>
-#include <hbtextitem.h>
-
-#include "hbindicatormenuclock_p.h"
-
-void HbIndicatorMenuClock::localeInfo(LocaleInfo *info)
-{
- QString timeFormat(QLocale().timeFormat(QLocale::LongFormat));
-#if defined(Q_OS_SYMBIAN)
- //use extendedlocale
- HbExtendedLocale loc;
- info->useSpace = loc.amPmSpace();
- info->symbolPos = loc.amPmSymbolPosition();
-
- //qt returns wrong timeformat in QLocale().timeFormat(), fix it using hbextendedlocale
- //todo: remove these, when it works
- timeFormat.clear();
- QChar sep(loc.timeSeparator(0));
- if (!sep.isNull()) {
- timeFormat.append(sep);
- }
- timeFormat.append('h').append(loc.timeSeparator(1))
- .append("mm").append(loc.timeSeparator(2))
- .append("ss");
- sep = loc.timeSeparator(3);
- if (!sep.isNull()) {
- timeFormat.append(sep);
- }
-
- if (loc.timeStyle() == HbExtendedLocale::Time12) {
- timeFormat.append(" ap");
- }
- //todo: remove end
-#endif
- QString strippedTimeFormat(timeFormat); //removes am/pm-symbol from format string.
- strippedTimeFormat.remove(QChar('a'), Qt::CaseInsensitive)
- .remove(QChar('p'), Qt::CaseInsensitive);
-
- QString trimmedTimeFormat(timeFormat.trimmed());
- int index = trimmedTimeFormat.indexOf(QChar('A'));
- if (index >= 0) {
- info->amPmFormat = "AP";
- info->useAmPmSymbol = true;
- } else {
- index = trimmedTimeFormat.indexOf(QChar('a'));
- if (index >= 0) {
- info->amPmFormat = "ap";
- info->useAmPmSymbol = true;
- }
- }
-#if !defined(Q_OS_SYMBIAN)
- if (index == 0) {
- info->symbolPos = HbExtendedLocale::Before;
-
- //am/pm removed from strippedTimeFormat, only space is left at(0).
- info->useSpace = strippedTimeFormat.at(0).isSpace();
- } else {
- info->symbolPos = HbExtendedLocale::After;
- index--; //index to point to where space should be.
- if (index >= 0 && index < strippedTimeFormat.size()) {
- info->useSpace = strippedTimeFormat.at(index).isSpace();
- }
- }
-#endif
- if (info->useAmPmSymbol && info->useSpace) {
- if (info->symbolPos == HbExtendedLocale::Before) {
- info->amPmFormat.append(" ");
- } else {
- info->amPmFormat.prepend(" ");
- }
- }
- info->timeFormat = strippedTimeFormat.trimmed() + info->amPmFormat;
-}
-
-HbIndicatorMenuClock::HbIndicatorMenuClock(QGraphicsItem *parent) :
- HbWidget(parent), mTickTimerId(0),
- mTimeItem(0), mAmPmSymbol(0)
-{
- mTimeItem = new HbTextItem(this);
- HbStyle::setItemName(mTimeItem, "time");
- mTimeItem->setFontSpec(HbFontSpec(HbFontSpec::Primary));
- mTimeItem->setAlignment(Qt::AlignLeft | Qt::AlignVCenter);
- mTimeItem->setTextWrapping( Hb::TextNoWrap );
-
- localeInfo(&mInfo);
- if (mInfo.useAmPmSymbol) {
- mAmPmSymbol = new HbTextItem(this);
- mAmPmSymbol->setAlignment(Qt::AlignLeft | Qt::AlignVCenter);
- mTimeItem->setTextWrapping(Hb::TextNoWrap);
- mAmPmSymbol->setFontSpec(HbFontSpec(HbFontSpec::Primary));
- HbStyle::setItemName(mAmPmSymbol, "ampmSymbol");
- }
-}
-
-HbIndicatorMenuClock::~HbIndicatorMenuClock()
-{
- if (mTickTimerId != 0) {
- killTimer(mTickTimerId);
- mTickTimerId = 0;
- }
-}
-
-void HbIndicatorMenuClock::timerEvent(QTimerEvent *event)
-{
- if (event->timerId() == mTickTimerId) {
- updateClock();
- }
-}
-
-void HbIndicatorMenuClock::updateClock()
-{
- QTime current = QTime::currentTime();
- QString amPmSymbolText(current.toString(mInfo.amPmFormat));
- if (mAmPmSymbol) {
- mAmPmSymbol->setText(amPmSymbolText);
- }
-
- QString timeText(current.toString(mInfo.timeFormat));
- timeText = timeText.left(timeText.size()- amPmSymbolText.size());
- mTimeItem->setText(timeText);
-
- QDate date = QDate::currentDate();
- if (mDate != date) {
- mDate = date;
- emit dateChanged();
- }
-}
-
-void HbIndicatorMenuClock::polish(HbStyleParameters& params)
-{
- setProperty("amPmSymbolPos", (int) mInfo.symbolPos);
- HbWidget::polish(params);
-}
-
-void HbIndicatorMenuClock::showEvent(QShowEvent *event)
-{
- Q_UNUSED(event)
- updateClock();
- // Start a timer.
- if (mTickTimerId == 0) {
- mTickTimerId = startTimer(1000);
- }
-}
-
-void HbIndicatorMenuClock::hideEvent(QHideEvent *event)
-{
- Q_UNUSED(event)
- if (mTickTimerId != 0) {
- killTimer(mTickTimerId);
- mTickTimerId = 0;
- }
-}
-
--- a/src/hbplugins/devicedialogs/indicatormenuplugin/hbindicatormenuclock_p.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the 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 HBINDICATORMENUCLOCK_H
-#define HBINDICATORMENUCLOCK_H
-
-#include <QDate>
-
-#include <hbwidget.h>
-#include <hbextendedlocale.h>
-
-class HbTextItem;
-
-struct LocaleInfo
-{
- LocaleInfo() : useSpace(true), useAmPmSymbol(false), symbolPos(HbExtendedLocale::Before) {}
- bool useSpace;
- bool useAmPmSymbol;
- HbExtendedLocale::SymbolPos symbolPos;
- QString amPmFormat;
- QString timeFormat;
-};
-
-class HbIndicatorMenuClock : public HbWidget
-{
- Q_OBJECT
-public:
- HbIndicatorMenuClock(QGraphicsItem *parent = 0);
- ~HbIndicatorMenuClock();
-signals:
- void dateChanged();
-protected:
- void timerEvent(QTimerEvent *event);
- void updateClock();
- void polish(HbStyleParameters& params);
- static void localeInfo(LocaleInfo *info);
- void showEvent(QShowEvent *event);
- void hideEvent(QHideEvent *event);
-
-private:
- int mTickTimerId;
- QDate mDate;
- HbTextItem *mTimeItem;
- HbTextItem *mAmPmSymbol;
- LocaleInfo mInfo;
-};
-
-#endif // HBINDICATORMENUCLOCK_H
--- a/src/hbplugins/devicedialogs/indicatormenuplugin/hbindicatormenucontent.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbplugins/devicedialogs/indicatormenuplugin/hbindicatormenucontent.cpp Fri May 14 16:09:54 2010 +0300
@@ -23,11 +23,8 @@
**
****************************************************************************/
-#include <hbstyleoptionindicatormenu.h>
#include <hbindicatorinterface.h>
#include "hbindicatormenucontent_p.h"
-#include "hbindicatormenuclock_p.h"
-#include "hbindicatormenudate_p.h"
static const int ListWidgetItemIndicatorTypeRole = Hb::UserRole;
static const int DefaultItemsVisible = 6;
@@ -46,22 +43,8 @@
return item;
}
-void HbIndicatorListItem::updateChildItems()
-{
- QModelIndex index(modelIndex());
- bool itemContainsLink = false;
- HbIndicatorInterface *indicator =
- HbIndicatorMenuContent::indicatorFromIndex(index);
- if (indicator && indicator->interactionTypes().testFlag(
- HbIndicatorInterface::InteractionActivated)){
- itemContainsLink = true;
- }
- setProperty("link", itemContainsLink);
- HbListViewItem::updateChildItems();
-}
-
IndicatorList::IndicatorList(HbIndicatorMenuContent *content) :
- HbListView(content), mContent(content), mUpdateListSize(false)
+ HbListView(content), mUpdateListSize(false)
{
setItemRecycling(true);
setUniformItemSizes(true);
@@ -71,9 +54,9 @@
const QModelIndex &parent, int start, int end)
{
HbListView::rowsInserted(parent, start, end);
- if (static_cast<QGraphicsItem*>(this)->isVisible()) {
+ if (mUpdateListSize == false) {
+ mUpdateListSize = true;
updateGeometry();
- mUpdateListSize = true;
}
}
@@ -81,9 +64,9 @@
const QModelIndex &parent,int start,int end)
{
HbListView::rowsRemoved(parent, start, end);
- if (static_cast<QGraphicsItem*>(this)->isVisible()) {
+ if (mUpdateListSize == false) {
+ mUpdateListSize = true;
updateGeometry();
- mUpdateListSize = true;
}
}
@@ -91,9 +74,9 @@
const QModelIndex &bottomRight)
{
HbListView::dataChanged(topLeft, bottomRight);
- if (static_cast<QGraphicsItem*>(this)->isVisible()) {
+ if (mUpdateListSize == false) {
+ mUpdateListSize = true;
updateGeometry();
- mUpdateListSize = true;
}
}
@@ -131,8 +114,10 @@
void IndicatorList::showEvent(QShowEvent *event)
{
Q_UNUSED(event)
- updateGeometry();
- mUpdateListSize = true;
+ if (mUpdateListSize == false) {
+ mUpdateListSize = true;
+ updateGeometry();
+ }
}
/*!
@@ -145,12 +130,6 @@
mGroupTypeIndeces[i] = 0;
}
- mHeaderBackground = style()->createPrimitive(HbStyle::P_Popup_heading_frame, this);
-
- mClock = new HbIndicatorMenuClock(this);
- mDate = new HbIndicatorMenuDate(this);
- connect(mClock, SIGNAL(dateChanged()), mDate, SLOT(updateDate()));
-
mIndicatorList = new IndicatorList(this);
mIndicatorList->setItemPrototype(new HbIndicatorListItem(this));
mIndicatorList->setModel(&indicatorModel);
@@ -161,19 +140,13 @@
connect(mIndicatorList, SIGNAL(scrollingEnded()),
this, SLOT(indicatorlist_scrollingEnded()));
- HbStyle::setItemName(mHeaderBackground, "background");
- HbStyle::setItemName(mClock, "clock");
- HbStyle::setItemName(mDate, "date");
HbStyle::setItemName(mIndicatorList, "list");
-
- updatePrimitives();
}
HbIndicatorMenuContent::~HbIndicatorMenuContent()
{
}
-
int HbIndicatorMenuContent::indicatorCount() const
{
return indicatorModel.rowCount();
@@ -181,15 +154,7 @@
void HbIndicatorMenuContent::updatePrimitives()
{
- HbStyleOptionPopup option;
- if (mHeaderBackground->hasFocus()) {
- option.headingMode = QIcon::Selected;
- } else if (mHeaderBackground->isSelected()) {
- option.headingMode = QIcon::Active;
- } else {
- option.headingMode = QIcon::Normal;
- }
- style()->updatePrimitive(mHeaderBackground, HbStyle::P_Popup_heading_frame, &option);
+ repolish();
}
void HbIndicatorMenuContent::itemActivated(const QModelIndex &modelIndex)
@@ -203,16 +168,19 @@
}
void HbIndicatorMenuContent::indicatorsActivated(
- QList<HbIndicatorInterface*> activatedIndicators)
+ QList<HbIndicatorInterface*> activatedIndicators)
{
foreach(HbIndicatorInterface *indicator, activatedIndicators) {
indicatorActivated(indicator);
}
}
-void HbIndicatorMenuContent::indicatorActivated(
- HbIndicatorInterface *activatedIndicator)
+void HbIndicatorMenuContent::indicatorActivated(HbIndicatorInterface *activatedIndicator)
{
+ if (!hasMenuData(*activatedIndicator)) {
+ return;
+ }
+
QStandardItem *item = new QStandardItem();
HbIndicatorInterface::Category category = activatedIndicator->category();
@@ -238,9 +206,7 @@
repolish();
}
-void HbIndicatorMenuContent::setData(
- HbIndicatorInterface *source,
- const QModelIndex &modelIndex)
+void HbIndicatorMenuContent::setData(HbIndicatorInterface *source, const QModelIndex &modelIndex)
{
QString primaryText = source->indicatorData(
HbIndicatorInterface::PrimaryTextRole).toString();
@@ -262,8 +228,7 @@
}
}
-void HbIndicatorMenuContent::indicatorRemoved(
- HbIndicatorInterface *indicatorRemoved)
+void HbIndicatorMenuContent::indicatorRemoved(HbIndicatorInterface *indicatorRemoved)
{
int index = listIndexFromIndicator(indicatorRemoved);
if (index >= 0) {
@@ -276,12 +241,6 @@
repolish();
}
-void HbIndicatorMenuContent::initStyleOption(
- HbStyleOptionIndicatorMenu *option) const
-{
- HbWidget::initStyleOption(option);
-}
-
//data changed inside indicator.
void HbIndicatorMenuContent::indicatorUpdated()
{
@@ -293,6 +252,7 @@
setData(senderIndicator, indicatorModel.item(index)->index());
}
}
+ repolish();
}
void HbIndicatorMenuContent::indicatorlist_scrollingStarted()
@@ -305,17 +265,15 @@
emit userActivityEnded();
}
-HbIndicatorInterface *HbIndicatorMenuContent::indicatorFromIndex(
- const QModelIndex &modelIndex)
+HbIndicatorInterface *HbIndicatorMenuContent::indicatorFromIndex(const QModelIndex &modelIndex)
{
QObject *ind_ptr =
modelIndex.data(ListWidgetItemIndicatorTypeRole).value<QObject*>();
return qobject_cast<HbIndicatorInterface*>(ind_ptr);
}
-int HbIndicatorMenuContent::listIndexFromIndicator(
- HbIndicatorInterface *indicator) {
-
+int HbIndicatorMenuContent::listIndexFromIndicator(HbIndicatorInterface *indicator)
+{
int index = -1;
int rowCount = mIndicatorList->model()->rowCount();
for(int i = 0; i < rowCount; ++i) {
@@ -330,3 +288,14 @@
return index;
}
+bool HbIndicatorMenuContent::hasMenuData(const HbIndicatorInterface &indicator) const
+{
+ if (!indicator.indicatorData(HbIndicatorInterface::PrimaryTextRole).toString().isEmpty()
+ || !indicator.indicatorData(HbIndicatorInterface::SecondaryTextRole).toString().isEmpty()
+ || !indicator.indicatorData(HbIndicatorInterface::DecorationNameRole).toString().isEmpty()) {
+ return true;
+ }
+
+ return false;
+}
+
--- a/src/hbplugins/devicedialogs/indicatormenuplugin/hbindicatormenucontent_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbplugins/devicedialogs/indicatormenuplugin/hbindicatormenucontent_p.h Fri May 14 16:09:54 2010 +0300
@@ -32,27 +32,20 @@
#include <hbwidget.h>
#include <hblistview.h>
#include <hblistviewitem.h>
-
#include <hbglobal.h>
-#include <hbstyle.h>
class HbIconItem;
class HbTextItem;
class HbListView;
class HbIndicatorInterface;
class HbListWidgetItem;
-class HbStyleOptionIndicatorMenu;
class HbIndicatorMenuContent;
-class HbIndicatorMenuClock;
-class HbIndicatorMenuDate;
-
class HbIndicatorListItem : public HbListViewItem
{
Q_OBJECT
public:
explicit HbIndicatorListItem(QGraphicsItem *parent=0);
HbAbstractViewItem *createItem();
- void updateChildItems();
};
class IndicatorList : public HbListView
@@ -72,7 +65,6 @@
void showEvent(QShowEvent *event);
private:
- HbIndicatorMenuContent *mContent;
mutable bool mUpdateListSize;
mutable QSizeF mSize;
};
@@ -109,9 +101,6 @@
void indicatorActivated(HbIndicatorInterface *activatedIndicator);
void indicatorRemoved(HbIndicatorInterface *indicatorRemoved);
-protected:
- void initStyleOption(HbStyleOptionIndicatorMenu *option) const;
-
protected slots:
void indicatorUpdated();
void indicatorlist_scrollingStarted();
@@ -121,14 +110,12 @@
void setData(HbIndicatorInterface *source,
const QModelIndex &modelIndex);
int listIndexFromIndicator(HbIndicatorInterface *indicator);
+ bool hasMenuData(const HbIndicatorInterface &indicator) const;
private:
int mGroupTypeIndeces[IndicatorTypes]; //index with HbIndicatorInterface::GroupType
//to get the index to the list
//where the indicator should be added.
- HbIndicatorMenuClock *mClock;
- HbIndicatorMenuDate *mDate;
- QGraphicsItem *mHeaderBackground;
HbListView *mIndicatorList;
QStandardItemModel indicatorModel;
};
--- a/src/hbplugins/devicedialogs/indicatormenuplugin/hbindicatormenudate.cpp Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (developer.feedback@nokia.com)
-**
-** This file is part of the 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 <QDate>
-#include <hbtextitem.h>
-
-#include "hbindicatormenudate_p.h"
-
-HbIndicatorMenuDate::HbIndicatorMenuDate(QGraphicsItem *parent) :
- HbTextItem(parent)
-{
- //set defaults
- setFontSpec(HbFontSpec(HbFontSpec::Primary));
- setTextWrapping(Hb::TextNoWrap);
-}
-
-HbIndicatorMenuDate::~HbIndicatorMenuDate()
-{
-
-}
-
-void HbIndicatorMenuDate::updateDate()
-{
- QDate current = QDate::currentDate();
- QString dateText(current.toString(Qt::SystemLocaleShortDate));
- setText(dateText);
-}
-
--- a/src/hbplugins/devicedialogs/indicatormenuplugin/hbindicatormenudate_p.h Mon May 03 12:48:33 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 HBINDICATORMENUDATE_H
-#define HBINDICATORMENUDATE_H
-
-#include <hbtextitem.h>
-
-class HbTextItem;
-
-class HbIndicatorMenuDate : public HbTextItem
-{
- Q_OBJECT
-
-public:
- HbIndicatorMenuDate(QGraphicsItem *parent = 0);
- virtual ~HbIndicatorMenuDate();
-
-public slots:
- void updateDate();
-
-};
-
-#endif // HBINDICATORMENUDATE_H
--- a/src/hbplugins/devicedialogs/indicatormenuplugin/indicatormenuplugin.pro Mon May 03 12:48:33 2010 +0300
+++ b/src/hbplugins/devicedialogs/indicatormenuplugin/indicatormenuplugin.pro Fri May 14 16:09:54 2010 +0300
@@ -42,14 +42,10 @@
HEADERS += $$PWD/hbindicatormenucontent_p.h
HEADERS += $$PWD/hbindicatormenuplugin_p.h
HEADERS += $$PWD/hbindicatormenu_p.h
-HEADERS += $$PWD/hbindicatormenuclock_p.h
-HEADERS += $$PWD/hbindicatormenudate_p.h
SOURCES += $$PWD/hbindicatormenucontent.cpp
SOURCES += $$PWD/hbindicatormenuplugin.cpp
SOURCES += $$PWD/hbindicatormenu.cpp
-SOURCES += $$PWD/hbindicatormenuclock.cpp
-SOURCES += $$PWD/hbindicatormenudate.cpp
symbian {
TARGET.EPOCALLOWDLLDATA = 1
--- a/src/hbplugins/feedback/feedbackeffectplugin/hbfeedbackeffectengine.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbplugins/feedback/feedbackeffectplugin/hbfeedbackeffectengine.cpp Fri May 14 16:09:54 2010 +0300
@@ -26,7 +26,6 @@
#include "hbfeedbackeffectengine.h"
#include "hbfeedbackeffectutils.h"
-#include <hbfeedbackplayer.h>
#include <hbinstantfeedback.h>
#include <hbcontinuousfeedback.h>
@@ -42,24 +41,24 @@
#include "hbinputvirtualrocker.h"
#include <hbnamespace_p.h>
-/*!
+/*
Constructor
*/
HbFeedbackEffectEngine::HbFeedbackEffectEngine() : activelyScrollingItemView(0), previousCursorPosition(0)
{
- // initialize
- HbFeedbackPlayer::instance();
+ instantFeedback = new HbInstantFeedback(HbFeedback::None);
}
-/*!
+/*
Destructor
*/
HbFeedbackEffectEngine::~HbFeedbackEffectEngine()
{
- if (hbFeedbackPlayer) {
- foreach(int identifier, continuousFeedbacks) {
- hbFeedbackPlayer->cancelContinuousFeedback(identifier);
- }
+ if(instantFeedback)
+ delete instantFeedback;
+ foreach(HbContinuousFeedback *feedback, continuousFeedbacks) {
+ feedback->stop();
+ delete feedback;
}
continuousFeedbacks.clear();
@@ -230,7 +229,7 @@
}
-/*!
+/*
Called by the feedback manager when an interaction is triggered.
*/
void HbFeedbackEffectEngine::triggered(const HbWidget *widget, Hb::InstantInteraction interaction, Hb::InteractionModifiers modifiers)
@@ -265,7 +264,7 @@
}
}
-/*!
+/*
Called by the feedback manager when a widget is pressed.
*/
void HbFeedbackEffectEngine::pressed(const HbWidget *widget)
@@ -289,7 +288,7 @@
playInstantFeedback(widget, effect, modalities);
}
-/*!
+/*
Called by the feedback manager when a widget is released.
*/
void HbFeedbackEffectEngine::released(const HbWidget *widget)
@@ -343,7 +342,7 @@
// normally touch end feedback effect is initiated with a clicked signal
}
-/*!
+/*
Called by the feedback manager when a long press is detected for a widget.
*/
void HbFeedbackEffectEngine::longPressed(const HbWidget *widget)
@@ -356,7 +355,7 @@
effect = overrider.newInstantEffect;
} else {
effect = HbFeedback::None;
- if (widget->type() == Hb::ItemType_InputCharacterButton) {
+ if (widget->type() == Hb::ItemType_InputButtonGroup) {
effect = HbFeedback::SensitiveKeypad;
}
else {
@@ -374,7 +373,7 @@
}
-/*!
+/*
Called by the feedback manager when a widget is clicked.
*/
void HbFeedbackEffectEngine::clicked(const HbWidget *widget)
@@ -402,7 +401,7 @@
playInstantFeedback(widget, effect, modalities);
}
-/*!
+/*
Called by the feedback manager when keyrepeats are detected for a widget.
*/
void HbFeedbackEffectEngine::keyRepeated(const HbWidget *widget)
@@ -426,7 +425,7 @@
playInstantFeedback(widget, effect, modalities);
}
-/*!
+/*
Called by the feedback manager when a dragged over event is detected for a widget.
*/
void HbFeedbackEffectEngine::draggedOver(const HbWidget *widget)
@@ -476,7 +475,7 @@
playInstantFeedback(widget, effect, modalities);
}
-/*!
+/*
Called by the feedback manager when a widget is flicked.
*/
void HbFeedbackEffectEngine::flicked(const HbWidget *widget)
@@ -500,7 +499,7 @@
playInstantFeedback(widget, effect, modalities);
}
-/*!
+/*
Called by the feedback manager when a scroll area widget is flicked or dragged and the boundary reached.
*/
void HbFeedbackEffectEngine::boundaryReached(const HbWidget *widget)
@@ -508,7 +507,7 @@
boundaryWidgets.append(widget);
}
-/*!
+/*
Called by the feedback manager when a rotate gesture is recognized for a widget.
*/
void HbFeedbackEffectEngine::rotated90Degrees(const HbWidget *widget)
@@ -533,7 +532,7 @@
playInstantFeedback(widget, effect, modalities);
}
-/*!
+/*
Called by the feedback manager when a popup opens.
*/
void HbFeedbackEffectEngine::popupOpened(const HbWidget *widget)
@@ -556,7 +555,7 @@
}
}
-/*!
+/*
Called by the feedback manager when a popup closes.
*/
void HbFeedbackEffectEngine::popupClosed(const HbWidget *widget)
@@ -579,7 +578,7 @@
}
}
-/*!
+/*
Called by the feedback manager when an item view selection has changed.
*/
void HbFeedbackEffectEngine::selectionChanged(const HbWidget *widget)
@@ -603,7 +602,7 @@
playInstantFeedback(widget, effect, modalities);
}
-/*!
+/*
Called by the feedback manager when multitouch is activated.
*/
void HbFeedbackEffectEngine::multitouchActivated(const HbWidget *widget)
@@ -627,7 +626,7 @@
playInstantFeedback(widget, effect, modalities);
}
-/*!
+/*
Called by the feedback manager when a continuous interaction is triggered.
*/
void HbFeedbackEffectEngine::continuousTriggered(const HbWidget *widget, Hb::ContinuousInteraction interaction, QPointF delta)
@@ -706,6 +705,10 @@
activelyScrollingItemView = widget;
newItemFound = false;
}
+ // To prevent the uninitialized list to cause false new item detections
+ if (oldVisibleIndexes.empty()) {
+ newItemFound = false;
+ }
oldVisibleIndexes.clear();
oldVisibleIndexes = visibleIndexes;
@@ -750,7 +753,7 @@
}
}
-/*!
+/*
Called by the feedback manager when a continuous interaction is stopped.
*/
void HbFeedbackEffectEngine::continuousStopped(const HbWidget *widget, Hb::ContinuousInteraction interaction)
@@ -788,60 +791,71 @@
}
}
-/*!
+/*
Plays the instant feedback.
*/
void HbFeedbackEffectEngine::playInstantFeedback(const HbWidget* widget, HbFeedback::InstantEffect effect, HbFeedback::Modalities modalities)
{
const QGraphicsView* view = widget->mainWindow();
- if (view && HbFeedbackEffectUtils::isFeedbackAllowed(widget)) {
- HbInstantFeedback feedback(effect);
- feedback.setRect(widget, view);
- feedback.setOwningWindow(view);
- feedback.setModalities(modalities);
-
- if (hbFeedbackPlayer && feedback.isLocated()) {
- hbFeedbackPlayer->playInstantFeedback(feedback);
+ if (view && HbFeedbackEffectUtils::isFeedbackAllowed(widget) && instantFeedback) {
+ instantFeedback->setInstantEffect(effect);
+ instantFeedback->setRect(widget, view);
+ instantFeedback->setOwningWindow(view);
+ instantFeedback->setModalities(modalities);
+
+ if (instantFeedback->isLocated()) {
+ instantFeedback->play();
}
}
}
-/*!
+/*
Plays the continuous feedback.
*/
void HbFeedbackEffectEngine::playContinuousFeedback(const HbWidget* widget, HbFeedback::ContinuousEffect effect, int intensity, HbFeedback::Modalities modalities)
{
const QGraphicsView* view = widget->mainWindow();
+
+ // if feedback can be played
if (view && HbFeedbackEffectUtils::isFeedbackAllowed(widget)) {
- HbContinuousFeedback feedback(effect,view);
- feedback.setRect(widget, view);
- feedback.setIntensity(intensity);
- feedback.setModalities(modalities);
+
+ // if this widget has been playing
+ if (continuousFeedbacks.contains(widget)) {
+ HbContinuousFeedback* feedback = continuousFeedbacks.value(widget);
- if (hbFeedbackPlayer && feedback.isLocated()) {
- // if continuous feedback is still active and not stopped by continuous feedback timeout
- if (continuousFeedbacks.contains(widget)
- && hbFeedbackPlayer->continuousFeedbackOngoing(continuousFeedbacks.value(widget))) {
- hbFeedbackPlayer->updateContinuousFeedback(continuousFeedbacks.value(widget), feedback);
- } else {
- // if timeout has happened remove the item from the map storing continuous feedback identifiers
- if (continuousFeedbacks.contains(widget)) {
- continuousFeedbacks.remove(widget);
- }
- // create a new continuous feedback
- continuousFeedbacks.insert(widget, hbFeedbackPlayer->startContinuousFeedback(feedback));
+ // if this feedback is already playing then only its effect and intensity are updated
+ feedback->setModalities(modalities);
+ feedback->setOwningWindow(view);
+ feedback->setRect(widget, view);
+ feedback->setContinuousEffect(effect);
+ feedback->setIntensity(intensity);
+ // if this feedback is not being played, play it
+ if (!feedback->isPlaying()) {
+ feedback->play();
}
+ } else {
+ // this widget has not played anything before
+ HbContinuousFeedback *feedback = new HbContinuousFeedback();
+ feedback->setModalities(modalities);
+ feedback->setOwningWindow(view);
+ feedback->setRect(widget, view);
+ feedback->setContinuousEffect(effect);
+ feedback->setIntensity(intensity);
+ continuousFeedbacks.insert(widget, feedback);
+ feedback->play();
}
}
}
-/*!
+/*
Cancels the playing of a continuous feedback.
*/
void HbFeedbackEffectEngine::cancelContinuousFeedback(const HbWidget* widget)
{
- if (hbFeedbackPlayer && continuousFeedbacks.contains(widget)) {
- hbFeedbackPlayer->cancelContinuousFeedback(continuousFeedbacks.take(widget));
+ if (continuousFeedbacks.contains(widget)) {
+ HbContinuousFeedback *feedback = continuousFeedbacks.take(widget);
+ feedback->stop();
+ delete feedback;
}
}
--- a/src/hbplugins/feedback/feedbackeffectplugin/hbfeedbackeffectengine.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbplugins/feedback/feedbackeffectplugin/hbfeedbackeffectengine.h Fri May 14 16:09:54 2010 +0300
@@ -34,6 +34,8 @@
class QGraphicsItem;
class HbAbstractViewItem;
class HbWidget;
+class HbInstantFeedback;
+class HbContinuousFeedback;
class HbFeedbackEffectEngine : public HbFeedbackEngine
{
@@ -74,10 +76,13 @@
QString modalitiesOverrideProperty(Hb::ContinuousInteraction interaction);
private:
- QMap<const HbWidget*, int> continuousFeedbacks;
+ QMap<const HbWidget*, HbContinuousFeedback*> continuousFeedbacks;
QList<int> oldVisibleIndexes;
const HbWidget* activelyScrollingItemView;
QList<const HbWidget*> boundaryWidgets;
+ int previousCursorPosition;
+
+ HbInstantFeedback* instantFeedback;
struct Override {
const HbWidget* widget;
@@ -93,8 +98,6 @@
};
Override overrider;
-
- int previousCursorPosition;
};
#endif // HBFEEDBACKEFFECTENGINE_H
--- a/src/hbplugins/feedback/feedbackeffectplugin/hbfeedbackeffectutils.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbplugins/feedback/feedbackeffectplugin/hbfeedbackeffectutils.cpp Fri May 14 16:09:54 2010 +0300
@@ -92,7 +92,7 @@
case HbPrivate::ItemType_TitlePane:
- case Hb::ItemType_InputCharacterButton:
+ case Hb::ItemType_InputButtonGroup:
case Hb::ItemType_InputFunctionButton:
@@ -102,31 +102,19 @@
break;
case Hb::ItemType_MenuItem:
-
- case Hb::ItemType_FormViewItem:
-
- case Hb::ItemType_FormView:
-
- case Hb::ItemType_AbstractItemContainer:
-
+
case Hb::ItemType_AbstractItemView:
-
+
case Hb::ItemType_ListView:
- case Hb::ItemType_AbstractViewItem:
-
case Hb::ItemType_ListViewItem:
- case Hb::ItemType_ItemHighlight:
-
+ case Hb::ItemType_TreeViewItem:
+
case Hb::ItemType_ListWidgetItem:
- case Hb::ItemType_ListWidgetViewItem:
-
case Hb::ItemType_RadioButtonList:
- case Hb::ItemType_RoundRobinLabel:
-
case Hb::ItemType_CarouselView:
case HbPrivate::ItemType_MenuListView:
@@ -258,7 +246,7 @@
}
// input widget special case
- if (widget->type() == Hb::ItemType_InputCharacterButton) {
+ if (widget->type() == Hb::ItemType_InputButtonGroup) {
effect = HbFeedback::SensitiveKeypad;
}
else if (widget->type() == Hb::ItemType_InputFunctionButton) {
@@ -342,8 +330,7 @@
// checkable item is checked with a press
switch (itemView->selectionMode()) {
case HbAbstractItemView::SingleSelection:
- case HbAbstractItemView::MultiSelection:
- case HbAbstractItemView::ContiguousSelection: {
+ case HbAbstractItemView::MultiSelection: {
effect = HbFeedback::None;
break;
}
@@ -432,7 +419,7 @@
}
// input widget special case
- if (widget->type() == Hb::ItemType_InputCharacterButton
+ if (widget->type() == Hb::ItemType_InputButtonGroup
|| widget->type() == Hb::ItemType_InputFunctionButton) {
effect = HbFeedback::SensitiveKeypad;
} else if (widget->type() == Hb::ItemType_CheckBox) {
@@ -501,8 +488,7 @@
case HbAbstractItemView::SingleSelection:
effect = HbFeedback::Checkbox; // deferred from press
break;
- case HbAbstractItemView::MultiSelection:
- case HbAbstractItemView::ContiguousSelection: {
+ case HbAbstractItemView::MultiSelection: {
effect = HbFeedback::None;
break;
}
@@ -558,7 +544,7 @@
effect = HbFeedback::SensitiveButton;
// input widget special case
- if (widget->type() == Hb::ItemType_InputCharacterButton
+ if (widget->type() == Hb::ItemType_InputButtonGroup
|| widget->type() == Hb::ItemType_InputFunctionButton) {
effect = HbFeedback::SensitiveKeypad;
}
@@ -603,7 +589,7 @@
if (const HbAbstractViewItem * viewItem = qobject_cast<const HbAbstractViewItem *>(widget)) {
const HbAbstractItemView* itemView = viewItem->itemView();
if (itemView) {
- if (itemView->selectionMode() == HbAbstractItemView::ContiguousSelection) {
+ if (itemView->selectionMode() == HbAbstractItemView::MultiSelection) {
effect = HbFeedback::MultipleCheckbox;
}
else if (const HbListView * listView = qobject_cast<const HbListView *>(itemView)) {
@@ -730,10 +716,6 @@
break;
}
case HbAbstractItemView::MultiSelection: {
- effect = HbFeedback::Checkbox;
- break;
- }
- case HbAbstractItemView::ContiguousSelection: {
effect = HbFeedback::MultipleCheckbox;
break;
}
@@ -881,28 +863,62 @@
HbFeedback::Modalities modalities = 0;
switch( interaction ) {
- case Hb::InstantPressed :
- case Hb::InstantMultitouchActivated:
- modalities |= HbFeedback::Tactile;
- modalities |= HbFeedback::Audio;
+
+ case Hb::InstantPressed:
+ modalities = HbFeedback::Tactile | HbFeedback::Audio;
break;
+
case Hb::InstantReleased:
- case Hb::InstantLongPressed:
- case Hb::InstantKeyRepeated:
- case Hb::InstantDraggedOver:
- case Hb::InstantFlicked:
- case Hb::InstantRotated90Degrees:
- case Hb::InstantPopupOpened:
- case Hb::InstantPopupClosed:
- case Hb::InstantSelectionChanged:
modalities = HbFeedback::Tactile;
break;
+
case Hb::InstantClicked:
modalities = HbFeedback::Tactile;
if(widget->type() == Hb::ItemType_CheckBox) {
modalities |= HbFeedback::Audio;
}
break;
+
+ case Hb::InstantKeyRepeated:
+ modalities = HbFeedback::Tactile | HbFeedback::Audio;
+ break;
+
+ case Hb::InstantLongPressed:
+ modalities = HbFeedback::Tactile | HbFeedback::Audio;
+ break;
+
+ case Hb::InstantDraggedOver:
+ modalities = HbFeedback::Tactile | HbFeedback::Audio;
+ break;
+
+ case Hb::InstantFlicked:
+ modalities = HbFeedback::Tactile;
+ break;
+
+ case Hb::InstantPopupOpened:
+ modalities = HbFeedback::Tactile;
+ break;
+
+ case Hb::InstantPopupClosed:
+ modalities = HbFeedback::Tactile;
+ break;
+
+ case Hb::InstantBoundaryReached:
+ modalities = HbFeedback::Tactile;
+ break;
+
+ case Hb::InstantRotated90Degrees:
+ modalities = HbFeedback::Tactile | HbFeedback::Audio;
+ break;
+
+ case Hb::InstantSelectionChanged:
+ modalities = HbFeedback::Tactile;
+ break;
+
+ case Hb::InstantMultitouchActivated:
+ modalities = HbFeedback::Tactile | HbFeedback::Audio;
+ break;
+
default:
modalities = HbFeedback::Tactile;
break;
@@ -911,7 +927,7 @@
}
/*!
- Returns the default modalities to be used when playing feedback effect asociated with this \a widget, \a interaction, \a modifiers.
+ Returns the default modalities to be used when playing feedback effect asociated with this \a widget, continuous \a interaction, \a modifiers.
*/
HbFeedback::Modalities HbFeedbackEffectUtils::modalities(const HbWidget * widget, Hb::ContinuousInteraction interaction, Hb::InteractionModifiers modifiers )
{
--- a/src/hbplugins/inputmethods/common/hbinputabstractbase.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbplugins/inputmethods/common/hbinputabstractbase.cpp Fri May 14 16:09:54 2010 +0300
@@ -66,15 +66,6 @@
}
// ---------------------------------------------------------------------------
-// HbInputAbstractMethod::launchCharacterPreviewPane
-//
-// ---------------------------------------------------------------------------
-void HbInputAbstractMethod::launchCharacterPreviewPane(int key)
-{
- Q_UNUSED(key);
-}
-
-// ---------------------------------------------------------------------------
// HbInputAbstractMethod::switchSpecialCharacterTable
//
// ---------------------------------------------------------------------------
@@ -175,4 +166,8 @@
return false;
}
+HbKeyboardType HbInputAbstractMethod::currentKeyboardType() const
+{
+ return HbKeyboardNone;
+}
--- a/src/hbplugins/inputmethods/common/hbinputabstractbase.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbplugins/inputmethods/common/hbinputabstractbase.h Fri May 14 16:09:54 2010 +0300
@@ -42,7 +42,6 @@
public:
virtual void launchCandidatePopup(const QStringList &candidates);
virtual void closeKeypad();
- virtual void launchCharacterPreviewPane(int key);
virtual void switchSpecialCharacterTable();
virtual void selectSpecialCharacterTableMode();
virtual void closeExactWordPopup();
@@ -55,6 +54,7 @@
virtual void getCandidatePositionAndSize(HbCandidateList *candidatePopup,
HbInputVkbWidget *currentKeypad, QPointF & pos,QSizeF & size);
virtual bool isSctModeActive() const;
+ virtual HbKeyboardType currentKeyboardType() const;
private:
Q_DISABLE_COPY(HbInputAbstractMethod)
};
--- a/src/hbplugins/inputmethods/common/hbinputbasichandler.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbplugins/inputmethods/common/hbinputbasichandler.cpp Fri May 14 16:09:54 2010 +0300
@@ -25,6 +25,7 @@
#include <hbinputkeymap.h>
#include <hbinputpredictionfactory.h>
+#include <hbinputbutton.h>
#include "hbinputbasichandler_p.h"
#include "hbinputpredictionengine.h"
@@ -51,7 +52,7 @@
return;
}
// Check if this is auto completion field and set it up if it is.
- if (focusObject->editorInterface().constraints() & HbEditorConstraintAutoCompletingField) {
+ if (focusObject->editorInterface().inputConstraints() & HbEditorConstraintAutoCompletingField) {
if (!mAutoCompleter) {
mAutoCompleter = HbPredictionFactory::instance()->createEngine(HbAutoCompleteVendorIdString);
}
@@ -73,7 +74,7 @@
return;
}
- if (focusObject->editorInterface().constraints() & HbEditorConstraintAutoCompletingField &&
+ if (focusObject->editorInterface().inputConstraints() & HbEditorConstraintAutoCompletingField &&
mAutoCompleter) {
mAutoCompleter->setWord(focusObject->editorSurroundingText());
mInputMethod->launchAutoCompletionPopup(mAutoCompleter->candidateList());
@@ -103,7 +104,7 @@
return;
}
- if (focusObject->editorInterface().constraints() & HbEditorConstraintAutoCompletingField) {
+ if (focusObject->editorInterface().inputConstraints() & HbEditorConstraintAutoCompletingField) {
if (mAutoCompleter) {
int inputLength = mAutoCompleter->inputLength();
@@ -153,7 +154,7 @@
bool ret = true;
switch (event->key()) {
case Qt::Key_Backspace:
- case Qt::Key_Delete: {
+ case HbInputButton::ButtonKeyCodeDelete: {
QKeyEvent keyEvent(QEvent::KeyPress, Qt::Key_Backspace, Qt::NoModifier);
sendAndUpdate(keyEvent);
// pass event to auto completer.
@@ -162,9 +163,8 @@
ret = false;
break;
}
- case Qt::Key_Return:
- case Qt::Key_Enter:
- case Qt::Key_Space: {
+ case HbInputButton::ButtonKeyCodeEnter:
+ case HbInputButton::ButtonKeyCodeSpace: {
QChar qc(event->key());
if (qc == Qt::Key_Enter || qc == Qt::Key_Return) {
qc = QChar('\n'); // Editor expects normal line feed.
@@ -172,23 +172,6 @@
commitAndUpdate(qc);
}
break;
- case Qt::Key_Period:
- case Qt::Key_Comma: {
- QString qc(event->key());
- HbModifier modifier = HbModifierNone;
- int currentTextCase = focusObject->editorInterface().textCase();
- if ( HbTextCaseUpper == currentTextCase || HbTextCaseAutomatic == currentTextCase ) {
- modifier = HbModifierShiftPressed;
- }
- // If shift is pressed, the shifted characters should
- // be input.
- const HbMappedKey* mappedKey = d->mKeymap->keyForKeycode(d->mInputMethod->inputState().keyboard(), event->key());
- if (mappedKey) {
- qc = mappedKey->characters(modifier).left(1);
- }
- commitAndUpdate(qc);
- break;
- }
default:
ret = HbInputModeHandler::filterEvent(event);
break;
--- a/src/hbplugins/inputmethods/common/hbinputmodehandler.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbplugins/inputmethods/common/hbinputmodehandler.cpp Fri May 14 16:09:54 2010 +0300
@@ -101,24 +101,6 @@
spellList.append(mappedKey->characters(modifiers).at(i));
}
}
-
- // filter characters.
- /* if (key < 0x0ff) {
- QString charSet = mKeyData->specialCharacterData(mInputMethod->inputState().iKeyboardType);
- if (charSet.contains(key, Qt::CaseSensitive)) {
- QString mostUsedCharacters;
- HbInputSettingProxy::instance()->mostUsedSpecialCharacters(HbMaxSctLineChars, mostUsedCharacters,
- mInputMethod->focusObject()->editorInterface().filter());
- spellList.clear();
- if (!mostUsedCharacters.isNull()) {
- for (int i=0; i<mostUsedCharacters.count(); i++){
- QChar char1 = mostUsedCharacters[i];
- spellList.append(char1);
- }
- }
- }
- }*/
- return;
}
@@ -273,7 +255,7 @@
/*!
this function commits the first number found in the key.
*/
-void HbInputModeHandler::commitFirstMappedNumber(int key)
+void HbInputModeHandler::commitFirstMappedNumber(int key, HbKeyboardType type)
{
Q_D(HbInputModeHandler);
@@ -291,7 +273,7 @@
}
}
QChar numChr = HbInputUtils::findFirstNumberCharacterBoundToKey(
- d->mKeymap->keyForKeycode(d->mInputMethod->inputState().keyboard(), key),language, digitType);
+ d->mKeymap->keyForKeycode(type, key), language, digitType);
// when a number is to be entered, it should commit
// the previous string and then append the number to the string
if (numChr != 0) {
@@ -303,12 +285,12 @@
Gets the character at index in a key and incriments the index by 1. Returns the Zeroth character if
this function finds the index to be out of range and incriments index to 1.
*/
-QChar HbInputModeHandler::getNthCharacterInKey(int &index, int key)
+QChar HbInputModeHandler::getNthCharacterInKey(int &index, int key, HbKeyboardType type)
{
Q_D(HbInputModeHandler);
HbModifiers modifiers = 0;
int textCase = d->mInputMethod->inputState().textCase();
- if (textCase == HbTextCaseUpper || textCase == HbTextCaseAutomatic) {
+ if (type != HbKeyboardSctPortrait && (textCase == HbTextCaseUpper || textCase == HbTextCaseAutomatic)) {
modifiers |= HbModifierShiftPressed;
}
HbInputLanguage language = d->mInputMethod->inputState().language();
@@ -316,7 +298,7 @@
if (!d->mKeymap) {
d->mKeymap = HbKeymapFactory::instance()->keymap(language);
}
- const HbMappedKey* mappedKey = d->mKeymap->keyForKeycode(d->mInputMethod->inputState().keyboard(), key);
+ const HbMappedKey* mappedKey = d->mKeymap->keyForKeycode(type, key);
if (!mappedKey) {
return 0;
}
@@ -433,25 +415,20 @@
d->mKeymap = keymap;
}
-void HbInputModeHandler::characterPreviewAvailable(bool available)
-{
- Q_UNUSED(available);
-}
-
/*!
Toggles prediction after doing a check if the editor allows it.
*/
void HbInputModeHandler::togglePrediction()
{
Q_D(HbInputModeHandler);
- int currentStatus = HbInputSettingProxy::instance()->predictiveInputStatus();
+ bool currentStatus = HbInputSettingProxy::instance()->predictiveInputStatusForActiveKeyboard();
HbInputFocusObject* focusedObject = 0;
focusedObject = d->mInputMethod->focusObject();
bool isPredictionAllowed = focusedObject->editorInterface().isPredictionAllowed();
if (currentStatus) {
- HbInputSettingProxy::instance()->setPredictiveInputStatus(0);
+ HbInputSettingProxy::instance()->setPredictiveInputStatusForActiveKeyboard(false);
} else if (isPredictionAllowed) {
- HbInputSettingProxy::instance()->setPredictiveInputStatus(1);
+ HbInputSettingProxy::instance()->setPredictiveInputStatusForActiveKeyboard(true);
}
}
--- a/src/hbplugins/inputmethods/common/hbinputmodehandler.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbplugins/inputmethods/common/hbinputmodehandler.h Fri May 14 16:09:54 2010 +0300
@@ -83,14 +83,13 @@
virtual bool filterEvent(const QEvent * event);
// Utility functions.
- void commitFirstMappedNumber(int key);
+ void commitFirstMappedNumber(int key, HbKeyboardType type);
void getAndFilterCharactersBoundToKey(QStringList &list, Qt::Key key);
- QChar getNthCharacterInKey(int &index, int key);
+ 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);
virtual void setKeymap(const HbKeymap* keymap);
- virtual void characterPreviewAvailable(bool available);
void togglePrediction();
signals:
@@ -117,8 +116,6 @@
Q_PRIVATE_SLOT(d_func(), virtual void _q_timeout())
};
-// long press constant.
-const int HbLongPressTimerTimeout = 600;
// multi tap constant
const int HbMultiTapTimerTimeout = 600;
--- a/src/hbplugins/inputmethods/common/hbinputnumerichandler.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbplugins/inputmethods/common/hbinputnumerichandler.cpp Fri May 14 16:09:54 2010 +0300
@@ -22,6 +22,8 @@
** Nokia at developer.feedback@nokia.com.
**
****************************************************************************/
+#include <hbinputbutton.h>
+
#include "hbinputnumerichandler_p.h"
#include "hbinputabstractbase.h"
@@ -53,16 +55,15 @@
bool ret = true;
switch (event->key()) {
case Qt::Key_Backspace:
- case Qt::Key_Delete: {
+ case HbInputButton::ButtonKeyCodeDelete: {
QKeyEvent keyEvent(QEvent::KeyPress, Qt::Key_Backspace, Qt::NoModifier);
sendAndUpdate(keyEvent);
// return false since the event is sent forward
ret = false;
break;
}
- case Qt::Key_Return:
- case Qt::Key_Enter:
- case Qt::Key_Space:
+ case HbInputButton::ButtonKeyCodeEnter:
+ case HbInputButton::ButtonKeyCodeSpace:
case Qt::Key_Period:
case Qt::Key_Comma: {
QChar qc(event->key());
--- a/src/hbplugins/inputmethods/common/hbinputpredictionhandler.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbplugins/inputmethods/common/hbinputpredictionhandler.cpp Fri May 14 16:09:54 2010 +0300
@@ -33,6 +33,7 @@
#include <hbinputvkbhost.h>
#include <hbcolorscheme.h>
#include <hbinpututils.h>
+#include <hbinputbutton.h>
#include "../touchinput/virtualqwerty.h"
#include "hbinputpredictionhandler_p.h"
@@ -150,9 +151,9 @@
}
QString commitString = activatedText;
- if (closingKey == Qt::Key_0 || closingKey == Qt::Key_Space) {
+ if (closingKey == Qt::Key_0 || closingKey == HbInputButton::ButtonKeyCodeSpace) {
commitString = activatedText+' ';
- } else if (closingKey == Qt::Key_Enter || closingKey == Qt::Key_Return) {
+ } else if (closingKey == HbInputButton::ButtonKeyCodeEnter) {
commitString = activatedText;
commit(commitString);
commitString = '\n';
@@ -265,7 +266,7 @@
mCanContinuePrediction = true;
switch (event->key()) {
case Qt::Key_Backspace:
- case Qt::Key_Delete:
+ case HbInputButton::ButtonKeyCodeDelete:
{
QString currentSelection = focusObject->inputMethodQuery(Qt::ImCurrentSelection).toString();
if(currentSelection.length()) {
@@ -322,9 +323,8 @@
ret = true;
}
break;
- case Qt::Key_Return:
- case Qt::Key_Enter:
- case Qt::Key_Space:
+ case HbInputButton::ButtonKeyCodeEnter:
+ case HbInputButton::ButtonKeyCodeSpace:
case Qt::Key_0: {//Space
// A space means we have to commit the candidates when we are in predictive mode.
QChar qc(event->key());
@@ -353,7 +353,11 @@
if ( HbTextCaseUpper == currentTextCase || HbTextCaseAutomatic == currentTextCase ) {
mModifiers |= Qt::ShiftModifier;
}
- mEngine->appendKeyPress(event->key(), mModifiers, mInputMethod->inputState().textCase(), this);
+ if (event->text().isEmpty()) {
+ mEngine->appendKeyPress(event->key(), mModifiers, mInputMethod->inputState().textCase(), this);
+ } else {
+ mEngine->appendCharacter(event->text().at(0), mInputMethod->inputState().textCase(), this);
+ }
bool isCustomWord = false;
mEngine->updateCandidates(mBestGuessLocation, isCustomWord);
//The engine can not predict the word, it is a custom word. Now engine returns a
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbplugins/inputmethods/touchinput/hbinput12keytouchkeyboard.cpp Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,335 @@
+/****************************************************************************
+**
+** 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 <hbdeviceprofile.h>
+
+#include <hbinputmethod.h>
+#include <hbinputkeymap.h>
+#include <hbinpututils.h>
+#include <hbframedrawer.h>
+
+#include "hbinput12keytouchkeyboard.h"
+#include "hbinput12keytouchkeyboard_p.h"
+#include "hbinputbuttongroup.h"
+#include "hbinputbutton.h"
+#include "hbinputmodeindicator.h"
+
+const qreal HbKeyboardHeightInUnits = 37.8;
+const qreal HbKeyboardWidthInUnits = 53.8;
+
+const int HbVirtual12KeyNumberOfRows = 4;
+const int HbVirtual12KeyNumberOfColumns = 4;
+const int HbButtonKeyCodeTable[HbVirtual12KeyNumberOfRows * HbVirtual12KeyNumberOfColumns] =
+{
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeDelete,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeSymbol,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeSettings,
+ HbInputButton::ButtonKeyCodeAsterisk,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeShift,
+ HbInputButton::ButtonKeyCodeCustom
+};
+
+Hb12KeyTouchKeyboardPrivate::Hb12KeyTouchKeyboardPrivate()
+{
+}
+
+Hb12KeyTouchKeyboardPrivate::~Hb12KeyTouchKeyboardPrivate()
+{
+}
+
+void Hb12KeyTouchKeyboardPrivate::init()
+{
+ Q_Q(Hb12KeyTouchKeyboard);
+
+ HbInputVkbWidgetPrivate::init();
+
+ HbInputButtonGroup *buttonGroup = static_cast<HbInputButtonGroup*>(q->contentItem());
+ if (buttonGroup) {
+ buttonGroup->setGridSize(QSize(HbVirtual12KeyNumberOfColumns, HbVirtual12KeyNumberOfRows));
+
+ QList<HbInputButton*> buttons;
+ for (int i = 0; i < HbVirtual12KeyNumberOfColumns * HbVirtual12KeyNumberOfRows; ++i) {
+ HbInputButton *item = new HbInputButton(HbButtonKeyCodeTable[i], QPoint(i % HbVirtual12KeyNumberOfColumns, i / HbVirtual12KeyNumberOfColumns));
+ buttons.append(item);
+
+ if (HbButtonKeyCodeTable[i] == HbInputButton::ButtonKeyCodeSettings) {
+ mInputModeIndicator = new HbInputModeIndicator(item, q);
+ } else if (HbButtonKeyCodeTable[i] == HbInputButton::ButtonKeyCodeDelete) {
+ item->setIcon(HbIcon(HbInputButtonIconDelete2), HbInputButton::ButtonIconIndexPrimary);
+ } else if (HbButtonKeyCodeTable[i] == HbInputButton::ButtonKeyCodeSymbol) {
+ item->setIcon(HbIcon(HbInputButtonIconSymbol2), HbInputButton::ButtonIconIndexPrimary);
+ } else if (HbButtonKeyCodeTable[i] == HbInputButton::ButtonKeyCodeAsterisk) {
+ item->setText(QString("*"), HbInputButton::ButtonTextIndexPrimary);
+ item->setText(QString("+"), HbInputButton::ButtonTextIndexSecondaryFirstRow);
+ item->setType(HbInputButton::ButtonTypeNormal);
+ } else if (HbButtonKeyCodeTable[i] == HbInputButton::ButtonKeyCodeShift) {
+ item->setText(QString(" "), HbInputButton::ButtonTextIndexSecondaryFirstRow);
+ item->setType(HbInputButton::ButtonTypeNormal);
+ }
+ }
+ buttonGroup->setButtons(buttons);
+
+ QObject::connect(buttonGroup, SIGNAL(buttonPressed(const QKeyEvent&)), q, SLOT(sendKeyPressEvent(const QKeyEvent&)));
+ QObject::connect(buttonGroup, SIGNAL(buttonDoublePressed(const QKeyEvent&)), q, SLOT(sendKeyDoublePressEvent(const QKeyEvent&)));
+ QObject::connect(buttonGroup, SIGNAL(buttonReleased(const QKeyEvent&)), q, SLOT(sendKeyReleaseEvent(const QKeyEvent&)));
+ QObject::connect(buttonGroup, SIGNAL(buttonLongPressed(const QKeyEvent&)), q, SLOT(sendLongPressEvent(const QKeyEvent&)));
+ QObject::connect(buttonGroup, SIGNAL(pressedButtonChanged(const QKeyEvent&, const QKeyEvent&)), q, SLOT(sendKeyChangeEvent(const QKeyEvent&, const QKeyEvent&)));
+ }
+
+ QObject::connect(q, SIGNAL(flickEvent(HbInputVkbWidget::HbFlickDirection)), buttonGroup, SLOT(cancelButtonPress()));
+}
+
+int Hb12KeyTouchKeyboardPrivate::keyCode(int buttonId)
+{
+ return HbButtonKeyCodeTable[buttonId];
+}
+
+void Hb12KeyTouchKeyboardPrivate::applyEditorConstraints()
+{
+ Q_Q(Hb12KeyTouchKeyboard);
+
+ HbInputFocusObject *focusedObject = mOwner->focusObject();
+ if (!focusedObject) {
+ return;
+ }
+
+ HbInputButtonGroup *buttonGroup = static_cast<HbInputButtonGroup*>(q->contentItem());
+ if (buttonGroup) {
+ QList<HbInputButton*> buttons = buttonGroup->buttons();
+ for (int i = 0; i < buttons.count(); ++i) {
+ HbInputButton *item = buttons.at(i);
+
+ HbInputButton::HbInputButtonState state = item->state();
+ if (keyCode(i) == HbInputButton::ButtonKeyCodeCharacter) {
+ if (mMode == EModeNumeric) {
+ QString data = item->text(HbInputButton::ButtonTextIndexPrimary);
+ if (data.isEmpty() || !focusedObject->characterAllowedInEditor(data.at(0))) {
+ state = HbInputButton::ButtonStateDisabled;
+ } else if (item->state() == HbInputButton::ButtonStateDisabled) {
+ state = HbInputButton::ButtonStateReleased;
+ }
+ } else if (mMode == EModeAbc) {
+ if (item->text(HbInputButton::ButtonTextIndexSecondaryFirstRow).isEmpty() &&
+ item->icon(HbInputButton::ButtonIconIndexSecondaryFirstRow).isNull()) {
+ state = HbInputButton::ButtonStateDisabled;
+ } else if (item->state() == HbInputButton::ButtonStateDisabled) {
+ state = HbInputButton::ButtonStateReleased;
+ }
+ }
+ } else if (keyCode(i) == HbInputButton::ButtonKeyCodeSymbol) {
+ if (mMode == EModeNumeric && focusedObject->editorInterface().isNumericEditor()) {
+ state = HbInputButton::ButtonStateDisabled;
+ } else if (item->state() == HbInputButton::ButtonStateDisabled) {
+ state = HbInputButton::ButtonStateReleased;
+ }
+ } else if (keyCode(i) == HbInputButton::ButtonKeyCodeAsterisk ||
+ keyCode(i) == HbInputButton::ButtonKeyCodeShift) {
+ QString sctCharacters;
+ const HbKeyboardMap *keyboardMap = mKeymap->keyboard(HbKeyboardSctPortrait);
+ if (keyboardMap) {
+ foreach (const HbMappedKey* mappedKey, keyboardMap->keys) {
+ focusedObject->filterStringWithEditorFilter(mappedKey->characters(HbModifierNone), sctCharacters);
+ if (sctCharacters.count()) {
+ break;
+ }
+ }
+ }
+
+ if (!sctCharacters.count() && mMode == EModeNumeric && focusedObject->editorInterface().isNumericEditor()) {
+ state = HbInputButton::ButtonStateDisabled;
+ } else if (item->state() == HbInputButton::ButtonStateDisabled) {
+ state = HbInputButton::ButtonStateReleased;
+ }
+ }
+ item->setState(state);
+ }
+ buttonGroup->setButtons(buttons);
+ }
+}
+
+void Hb12KeyTouchKeyboardPrivate::updateButtons()
+{
+ Q_Q(Hb12KeyTouchKeyboard);
+
+ HbInputButtonGroup *buttonGroup = static_cast<HbInputButtonGroup*>(q->contentItem());
+ if (buttonGroup) {
+ int key = 0;
+ QList<HbInputButton*> buttons = buttonGroup->buttons();
+ for (int i = 0; i < buttons.count(); ++i) {
+ HbInputButton *item = buttons.at(i);
+ if (keyCode(i) == HbInputButton::ButtonKeyCodeCharacter) {
+
+ if (mMode == EModeNumeric) {
+ QChar numChr;
+ const HbKeyboardMap *keyboardMap = mKeymap->keyboard(HbKeyboardVirtual12Key);
+ if (keyboardMap && key < keyboardMap->keys.count()) {
+ numChr = HbInputUtils::findFirstNumberCharacterBoundToKey(keyboardMap->keys.at(key), mKeymap->language());
+ }
+
+ if (numChr > 0) {
+ item->setText(numChr, HbInputButton::ButtonTextIndexPrimary);
+ } else {
+ item->setText(QString(), HbInputButton::ButtonTextIndexPrimary);
+ }
+ item->setText(QString(), HbInputButton::ButtonTextIndexSecondaryFirstRow);
+ item->setText(QString(), HbInputButton::ButtonTextIndexSecondarySecondRow);
+ item->setIcon(HbIcon(), HbInputButton::ButtonIconIndexPrimary);
+ item->setIcon(HbIcon(), HbInputButton::ButtonIconIndexSecondaryFirstRow);
+ item->setIcon(HbIcon(), HbInputButton::ButtonIconIndexSecondarySecondRow);
+ } else if (mMode == EModeAbc) {
+ QString keydata;
+ QChar numChr;
+ 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());
+ }
+
+ QString title("");
+ if (mOwner->focusObject()) {
+ QString allowedData;
+ mOwner->focusObject()->filterStringWithEditorFilter(keydata, allowedData);
+ title.append(allowedData.left(numberOfCharactersToShow(key)));
+ } else {
+ title.append(keydata.left(numberOfCharactersToShow(key)));
+ }
+
+ if (numChr == QChar('0')) {
+ 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
+ // new space graphics are included in the main line.
+ item->setText(QString(" "), HbInputButton::ButtonTextIndexSecondaryFirstRow);
+ } else {
+ item->setText(title, HbInputButton::ButtonTextIndexSecondaryFirstRow);
+ item->setText(numChr, HbInputButton::ButtonTextIndexPrimary);
+ }
+ }
+
+ ++key;
+ } else if (keyCode(i) == HbInputButton::ButtonKeyCodeShift) {
+ if (mMode == EModeNumeric) {
+ item->setText(QString("#"), HbInputButton::ButtonTextIndexSecondaryFirstRow);
+ } else if (mMode == EModeAbc) {
+ item->setText(QString(" "), HbInputButton::ButtonTextIndexSecondaryFirstRow);
+ }
+ }
+ }
+ buttonGroup->setButtons(buttons);
+ }
+}
+
+int Hb12KeyTouchKeyboardPrivate::numberOfCharactersToShow(int key)
+{
+ QChar keyCode;
+ const HbKeyboardMap *keyboardMap = mKeymap->keyboard(HbKeyboardVirtual12Key);
+ if (keyboardMap && key < keyboardMap->keys.count()) {
+ keyCode = keyboardMap->keys.at(key)->keycode;
+ }
+
+ if (keyCode == QChar('7') || keyCode == QChar('9')) {
+ return 4;
+ } else {
+ return 3;
+ }
+}
+
+/*!
+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
+changed later (for example when the input language changes) by calling
+setKeymap.
+*/
+Hb12KeyTouchKeyboard::Hb12KeyTouchKeyboard(HbInputMethod *owner, const HbKeymap *keymap, QGraphicsItem *parent)
+ : HbInputVkbWidget(*new Hb12KeyTouchKeyboardPrivate, parent)
+{
+ if (!owner) {
+ return;
+ }
+ Q_D(Hb12KeyTouchKeyboard);
+ d->mOwner = owner;
+ setKeymap(keymap);
+}
+
+/*!
+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
+changed later (for example when the input language changes) by calling
+setKeymap.
+*/
+Hb12KeyTouchKeyboard::Hb12KeyTouchKeyboard(Hb12KeyTouchKeyboardPrivate &dd, HbInputMethod *owner,
+ const HbKeymap *keymap, QGraphicsItem *parent)
+ : HbInputVkbWidget(dd, parent)
+{
+ if (!owner) {
+ return;
+ }
+ Q_D(Hb12KeyTouchKeyboard);
+ d->mOwner = owner;
+ setKeymap(keymap);
+}
+
+/*!
+Destructs the object.
+*/
+Hb12KeyTouchKeyboard::~Hb12KeyTouchKeyboard()
+{
+}
+
+/*!
+Returns keyboard type.
+*/
+HbKeyboardType Hb12KeyTouchKeyboard::keyboardType() const
+{
+ return HbKeyboardVirtual12Key;
+}
+
+/*!
+Returns preferred keyboard size. HbVkbHost uses this information when it opens the keyboard.
+*/
+QSizeF Hb12KeyTouchKeyboard::preferredKeyboardSize()
+{
+ Q_D(Hb12KeyTouchKeyboard);
+
+ QSizeF result;
+ qreal unitValue = HbDeviceProfile::profile(mainWindow()).unitValue();
+
+ result.setHeight(HbKeyboardHeightInUnits * unitValue + d->mCloseHandleHeight);
+ result.setWidth(HbKeyboardWidthInUnits * unitValue);
+
+ return QSizeF(result);
+}
+
+// End of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbplugins/inputmethods/touchinput/hbinput12keytouchkeyboard.h Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,59 @@
+/****************************************************************************
+**
+** 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_12KEY_TOUCH_KEYBOARD_H
+#define HB_INPUT_12KEY_TOUCH_KEYBOARD_H
+
+#include <hbinputdef.h>
+#include "hbinputvkbwidget.h"
+
+class QGraphicsItem;
+class Hb12KeyTouchKeyboardPrivate;
+
+class Hb12KeyTouchKeyboard : public HbInputVkbWidget
+{
+ Q_OBJECT
+
+public:
+ Hb12KeyTouchKeyboard(HbInputMethod *owner, const HbKeymap *keymap, QGraphicsItem *parent = 0);
+ ~Hb12KeyTouchKeyboard();
+
+public: // From HbVirtualKeyboard
+ HbKeyboardType keyboardType() const;
+
+public: // From HbInputVkbWidget
+ QSizeF preferredKeyboardSize();
+
+protected:
+ Hb12KeyTouchKeyboard(Hb12KeyTouchKeyboardPrivate &dd, HbInputMethod *owner, const HbKeymap *keymap, QGraphicsItem* parent);
+
+private:
+ Q_DECLARE_PRIVATE_D(d_ptr, Hb12KeyTouchKeyboard)
+ Q_DISABLE_COPY(Hb12KeyTouchKeyboard)
+};
+
+#endif // HB_INPUT_12KEY_TOUCH_KEYBOARD_H
+
+// End of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbplugins/inputmethods/touchinput/hbinput12keytouchkeyboard_p.h Fri May 14 16:09:54 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 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_12KEY_TOUCH_KEYBOARD_PRIVATE_H
+#define HB_INPUT_12KEY_TOUCH_KEYBOARD_PRIVATE_H
+
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the Hb Inputs API. It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "hbinput12keytouchkeyboard.h"
+#include "hbinputvkbwidget_p.h"
+
+class Hb12KeyTouchKeyboardPrivate : public HbInputVkbWidgetPrivate
+{
+ Q_DECLARE_PUBLIC(Hb12KeyTouchKeyboard)
+
+public:
+ Hb12KeyTouchKeyboardPrivate();
+ ~Hb12KeyTouchKeyboardPrivate();
+
+ void init();
+ int keyCode(int buttonId);
+ void applyEditorConstraints();
+ void updateButtons();
+ int numberOfCharactersToShow(int key);
+};
+
+#endif // HB_INPUT_12KEY_TOUCH_KEYBOARD_PRIVATE_H
+
+// End of file
--- a/src/hbplugins/inputmethods/touchinput/hbinputbasic12keyhandler.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/hbinputbasic12keyhandler.cpp Fri May 14 16:09:54 2010 +0300
@@ -30,6 +30,7 @@
#include <hbinputpredictionengine.h>
#include <hbinputsettingproxy.h>
#include <hbinputpredictionfactory.h>
+#include <hbinputbutton.h>
#include "hbinputabstractbase.h"
#include "hbinputbasic12keyhandler.h"
#include "hbinputbasic12keyhandler_p.h"
@@ -40,8 +41,8 @@
mNumChr(0),
mDownKey(0),
mCurrentlyFocused(0),
- mLongPressHappened(false),
- mShiftKeyDoubleTapped(false)
+ mLongPressHappened(false),
+ mShiftKeyDoubleTapped(false)
{
}
@@ -50,50 +51,88 @@
}
// handles the key press events.
-void HbInputBasic12KeyHandlerPrivate::handleAlphaEvent(int buttonId)
+bool HbInputBasic12KeyHandlerPrivate::handleAlphaEvent(int buttonId, HbKeyboardType type)
{
Q_Q(HbInputBasic12KeyHandler);
- HbInputFocusObject *focusObject = 0;
- focusObject = mInputMethod->focusObject();
+ HbInputFocusObject *focusObject = mInputMethod->focusObject();
if (!focusObject) {
- return;
+ return false;
}
- //This condition is to avoid get the characters mapped to Asterisk
- //Especially for Thai language we have mapped character to Asterisk
- if(buttonId != Qt::Key_Asterisk) {
- mCurrentChar = q->getNthCharacterInKey(mNumChr, buttonId);
- }
+
+ int index = mNumChr;
+ do {
+ //This condition is to avoid get the characters mapped to Asterisk
+ //Especially for Thai language we have mapped character to Asterisk
+ if (buttonId != HbInputButton::ButtonKeyCodeAsterisk ||
+ mInputMethod->currentKeyboardType() == HbKeyboardSctPortrait) {
+ mCurrentChar = q->getNthCharacterInKey(mNumChr, buttonId, type);
+ }
- if (mCurrentChar != 0) {
- QString str;
- str += mCurrentChar;
-
- QList<QInputMethodEvent::Attribute> list;
- QInputMethodEvent event(str, list);
- focusObject->sendEvent(event);
- }
+ if (mCurrentChar != 0) {
+ if (focusObject->characterAllowedInEditor(mCurrentChar)) {
+ QString str;
+ str += mCurrentChar;
+
+ //If the keypad is SCT, we can commit the character immidiately
+ if (mInputMethod->currentKeyboardType() == HbKeyboardSctPortrait) {
+ focusObject->filterAndCommitCharacter(mCurrentChar);
+ mCurrentChar = 0;
+ } else {
+ QList<QInputMethodEvent::Attribute> list;
+ QInputMethodEvent event(str, list);
+ focusObject->sendEvent(event);
+ }
+ return true;
+ }
+ } else {
+ break;
+ }
+ } while (index != mNumChr);
+ return false;
}
bool HbInputBasic12KeyHandlerPrivate::buttonPressed(const QKeyEvent *keyEvent)
{
- Q_UNUSED(keyEvent);
+ Q_Q(HbInputBasic12KeyHandler);
mLongPressHappened = false;
- HbInputFocusObject *focusObject = 0;
- focusObject = mInputMethod->focusObject();
+ HbInputFocusObject *focusObject = mInputMethod->focusObject();
if (!focusObject) {
return false;
}
- int buttonId = keyEvent->key();
- // mark a shift key double tap. This would be handled when the release event is received.
- if ( (buttonId == Qt::Key_Shift) && (mLastKey == buttonId) && mTimer->isActive() ) {
- mShiftKeyDoubleTapped = true;
- }
+ int buttonId = keyEvent->key();
+
+ if (keyEvent->isAutoRepeat() && mDownKey == buttonId) {
+ mTimer->stop();
+ if (mDownKey == HbInputButton::ButtonKeyCodeShift) {
+ mLongPressHappened = true;
+ mInputMethod->switchMode(HbInputButton::ButtonKeyCodeShift);
+ } else if (mDownKey == HbInputButton::ButtonKeyCodeSymbol ||
+ (mDownKey == HbInputButton::ButtonKeyCodeAsterisk &&
+ mInputMethod->currentKeyboardType() != HbKeyboardSctPortrait)) {
+ mLongPressHappened = true;
+ mInputMethod->selectSpecialCharacterTableMode();
+ } else if (mDownKey != HbInputButton::ButtonKeyCodeDelete &&
+ mInputMethod->currentKeyboardType() != HbKeyboardSctPortrait) {
+ mLongPressHappened = true;
+ q->commitFirstMappedNumber(mDownKey, mInputMethod->currentKeyboardType());
+ }
+ if (mLongPressHappened) {
+ mDownKey = 0;
+ return true;
+ }
+ }
+
+ // mark a shift key double tap. This would be handled when the release event is received.
+ if ((buttonId == HbInputButton::ButtonKeyCodeShift) && (mLastKey == buttonId) && mTimer->isActive()) {
+ mShiftKeyDoubleTapped = true;
+ }
+
if (mInputMethod) {
- if (mLastKey != buttonId)
+ if (mLastKey != buttonId || mInputMethod->currentKeyboardType() == HbKeyboardSctPortrait)
{
- if(mCurrentChar != 0) {
+ if (mCurrentChar != 0) {
if (!focusObject->characterAllowedInEditor(mCurrentChar)) {
- focusObject->sendCommitString(QString());
+ focusObject->sendCommitString(QString());
} else {
if (isEnterCharacter(mCurrentChar)) {
focusObject->sendPreEditString(QString("")); // Make sure the enter character is cleared.
@@ -101,15 +140,18 @@
}
QChar commitChar(mCurrentChar);
mCurrentChar = 0;
+ mNumChr = 0;
focusObject->filterAndCommitCharacter(commitChar);
- }
- }
+ }
+ }
}
- mDownKey = buttonId;
+ mDownKey = buttonId;
mTimer->stop();
- mTimer->start(HbMultiTapTimerTimeout);
- }
+ if (mInputMethod->currentKeyboardType() == HbKeyboardVirtual12Key) {
+ mTimer->start(HbMultiTapTimerTimeout);
+ }
+ }
return false;
}
@@ -120,57 +162,57 @@
bool HbInputBasic12KeyHandlerPrivate::buttonReleased(const QKeyEvent *keyEvent)
{
HbInputVkbWidget::HbFlickDirection flickDir = static_cast<HbVirtual12Key*>(mInputMethod)->flickDirection();
- if (mInputMethod && flickDir!=HbInputVkbWidget::HbFlickDirectionDown) {
- Q_Q(HbInputBasic12KeyHandler);
- int buttonId = keyEvent->key();
- HbInputFocusObject *focusObject = 0;
- focusObject = mInputMethod->focusObject();
- if (!focusObject || !mDownKey) {
- return false;
- }
- mDownKey = 0;
- if ( mLongPressHappened ){
- return false;
- }
- if(mTimer->isActive() && mLastKey != buttonId) {
- mNumChr = 0;
+ if (mInputMethod && flickDir!=HbInputVkbWidget::HbFlickDirectionDown) {
+ Q_Q(HbInputBasic12KeyHandler);
+ int buttonId = keyEvent->key();
+ HbInputFocusObject *focusObject = mInputMethod->focusObject();
+ if (!focusObject || !mDownKey) {
+ return false;
+ }
+ mDownKey = 0;
+ if (mLongPressHappened){
+ mLongPressHappened = false;
+ return false;
+ }
+ if (mTimer->isActive() && mLastKey != buttonId) {
+ mNumChr = 0;
- // For QLineEdit it works fine. For HbLineEdit, need to set the state
- // to lower by calling activateState().
- // This is needed for the scenario - When automatic text case is true
- // click a button and before the multitap timer expires click on
- // another button.
- // Need to check for shift key : In empty editor, click on editor
- // press shift, multitap on a button. The char is entered in upper case.
- // It should be entered in lower case.
- if (mLastKey && (Qt::Key_Shift != mLastKey)) {
- mInputMethod->updateState();
+ // For QLineEdit it works fine. For HbLineEdit, need to set the state
+ // to lower by calling activateState().
+ // This is needed for the scenario - When automatic text case is true
+ // click a button and before the multitap timer expires click on
+ // another button.
+ // Need to check for shift key : In empty editor, click on editor
+ // press shift, multitap on a button. The char is entered in upper case.
+ // It should be entered in lower case.
+ if (mLastKey && (HbInputButton::ButtonKeyCodeShift != mLastKey)) {
+ mInputMethod->updateState();
}
- refreshAutoCompleter();
- }
+ refreshAutoCompleter();
+ }
- if (buttonId == Qt::Key_Return) {
- mInputMethod->closeKeypad();
- mLastKey = buttonId;
- return true;
- } else if (buttonId == Qt::Key_Shift) {
+ if (buttonId == HbInputButton::ButtonKeyCodeEnter) {
+ mInputMethod->closeKeypad();
+ mLastKey = buttonId;
+ 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
if (!HbInputSettingProxy::instance()->globalInputLanguage().isCaseSensitiveLanguage() &&
- ((HbEditorConstraintLatinAlphabetOnly | HbEditorConstraintAutoCompletingField)!=focusObject->editorInterface().constraints()) &&
+ ((HbEditorConstraintLatinAlphabetOnly | HbEditorConstraintAutoCompletingField)!=focusObject->editorInterface().inputConstraints()) &&
// when the language does not support prediction in that case we should not update the state and prediction
HbPredictionFactory::instance()->predictionEngineForLanguage(mInputMethod->inputState().language())) {
HbInputSettingProxy::instance()->togglePrediction();
} else {
// For single key press, change the text input case. If the second shift key press is
- // received within long key press time out interval, then activate the next state
+ // received within long key press time out interval, then activate the next state
if (mShiftKeyDoubleTapped){
mShiftKeyDoubleTapped = false;
mTimer->stop();
if( HbInputSettingProxy::instance()->globalInputLanguage() == mInputMethod->inputState().language() ||
HbInputSettingProxy::instance()->globalSecondaryInputLanguage() == mInputMethod->inputState().language() ||
- ((HbEditorConstraintLatinAlphabetOnly | HbEditorConstraintAutoCompletingField)==focusObject->editorInterface().constraints())){
+ ((HbEditorConstraintLatinAlphabetOnly | HbEditorConstraintAutoCompletingField)==focusObject->editorInterface().inputConstraints())){
// 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)
@@ -180,54 +222,55 @@
q->togglePrediction();
}
} else {
- // if the global language is different from the input mode language, we should
+ // if the global language is different from the input mode language, we should
// go back to the root state
// e.g. double tap of hash/shift key is used to change
// to chinese input mode from latin input mode
HbInputState rootState;
mInputMethod->editorRootState(rootState);
- mInputMethod->activateState(rootState);
+ mInputMethod->activateState(rootState);
}
} else {
updateTextCase();
- mTimer->start(HbLongPressTimerTimeout);
+ mTimer->start(HbMultiTapTimerTimeout);
}
- }
- mLastKey = buttonId;
- mCurrentChar = 0;
+ }
+ mLastKey = buttonId;
+ mCurrentChar = 0;
return true;
- }
+ }
- // Let's see if we can get the handler for this button in the base class.
- if (q->HbInputBasicHandler::filterEvent(keyEvent)) {
- mCurrentChar = 0;
- return true;
- }
- mLastKey = buttonId;
- handleAlphaEvent(buttonId);
+ // Let's see if we can get the handler for this button in the base class.
+ if (q->HbInputBasicHandler::filterEvent(keyEvent)) {
+ mCurrentChar = 0;
+ return true;
+ }
+ mLastKey = buttonId;
+ if (handleAlphaEvent(buttonId, mInputMethod->currentKeyboardType())) {
+ return true;
+ }
- // it was a long press on sct swith button. so just return form here.
- if (!mTimer->isActive() && buttonId == Qt::Key_Control) {
- return true;
- }
- if (buttonId == Qt::Key_Asterisk || buttonId == Qt::Key_Control) {
- //Same asterisk key is used for launching candidate list (long key press)
- //and also for SCT. So, do not launch SCT if candidate list is already launched.
- mInputMethod->switchMode(buttonId);
- return true;
- }
- }
- return false;
+ // it was a long press on sct swith button. so just return form here.
+ if (!mTimer->isActive() && buttonId == HbInputButton::ButtonKeyCodeSymbol) {
+ return true;
+ }
+ if (buttonId == HbInputButton::ButtonKeyCodeAsterisk || buttonId == HbInputButton::ButtonKeyCodeSymbol ||
+ buttonId == HbInputButton::ButtonKeyCodeAlphabet) {
+ //Same asterisk key is used for launching candidate list (long key press)
+ //and also for SCT. So, do not launch SCT if candidate list is already launched.
+ mInputMethod->switchMode(buttonId);
+ return true;
+ }
+ }
+ return false;
}
void HbInputBasic12KeyHandlerPrivate::_q_timeout()
{
- Q_Q(HbInputBasic12KeyHandler);
mTimer->stop();
mNumChr = 0;
- HbInputFocusObject *focusedObject = 0;
- focusedObject = mInputMethod->focusObject();
+ HbInputFocusObject *focusedObject = mInputMethod->focusObject();
if (!focusedObject) {
qDebug("HbInputBasic12KeyHandler::timeout focusObject == 0");
return;
@@ -238,23 +281,7 @@
mCurrentChar = QChar('\n'); // Convert enter character to line feed.
}
- //Long key press number key is applicable to all keys
- if (mDownKey ) {
- //switch to numeric mode for long key press of Hash key
- if (mDownKey == Qt::Key_Shift) {
- mInputMethod->switchMode(Qt::Key_Shift);
- } else if (mDownKey == Qt::Key_Control ) {
- mInputMethod->selectSpecialCharacterTableMode();
- mLongPressHappened = true;
- } else if (mDownKey == Qt::Key_Asterisk) {
- //switch to sct mode for long tap of * key
- mInputMethod->switchMode(mDownKey);
- } else if (mDownKey != Qt::Key_Delete) {
- q->commitFirstMappedNumber(mDownKey);
- mLongPressHappened = true;
- }
- mDownKey = 0;
- } else if(mLastKey != Qt::Key_Shift){
+ if (!mDownKey && mLastKey != HbInputButton::ButtonKeyCodeShift) {
if (!focusedObject->characterAllowedInEditor(mCurrentChar)) {
focusedObject->sendCommitString(QString());
} else {
@@ -268,7 +295,7 @@
}
mCurrentChar = 0;
- return;
+ return;
}
bool HbInputBasic12KeyHandlerPrivate::actionHandler(HbInputModeHandler::HbInputModeAction action)
@@ -292,7 +319,7 @@
mDownKey = 0;
mShiftKeyDoubleTapped = false;
break;
- case HbInputModeHandler::HbInputModeActionCancelButtonPress:
+ case HbInputModeHandler::HbInputModeActionCancelButtonPress:
mLastKey = 0;
mNumChr = 0;
mDownKey = 0;
@@ -313,8 +340,8 @@
QInputMethodEvent event(QString(), list);
event.setCommitString(empty, -1, 1);
focusObject->sendEvent(event);
- mInputMethod->updateState();
- }
+ mInputMethod->updateState();
+ }
} else {
// Close event was originated from a button press, remove the uncommitted character.
focusObject->sendCommitString(empty);
@@ -343,15 +370,15 @@
mNumChr = 0;
mInputMethod->updateState();
}
- // We should add the commit autocompleting text when focus lost happens
- if(HbInputModeHandler::HbInputModeActionFocusLost == action){
- if (mCurrentlyFocused != focusObject) {
- mCurrentlyFocused = focusObject;
- if (mAutoCompleter) {
- mAutoCompleter->commit();
- }
- }
- }
+ // We should add the commit autocompleting text when focus lost happens
+ if(HbInputModeHandler::HbInputModeActionFocusLost == action){
+ if (mCurrentlyFocused != focusObject) {
+ mCurrentlyFocused = focusObject;
+ if (mAutoCompleter) {
+ mAutoCompleter->commit();
+ }
+ }
+ }
break;
default: {
ret = false;
@@ -371,7 +398,7 @@
}
HbInputBasic12KeyHandler::HbInputBasic12KeyHandler(HbInputBasic12KeyHandlerPrivate &dd, HbInputAbstractMethod* inputMethod)
-:HbInputBasicHandler(dd, inputMethod)
+ : HbInputBasicHandler(dd, inputMethod)
{
Q_D(HbInputBasic12KeyHandler);
d->q_ptr = this;
--- a/src/hbplugins/inputmethods/touchinput/hbinputbasic12keyhandler_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/hbinputbasic12keyhandler_p.h Fri May 14 16:09:54 2010 +0300
@@ -33,7 +33,7 @@
HbInputBasic12KeyHandlerPrivate();
~HbInputBasic12KeyHandlerPrivate();
- void handleAlphaEvent(int buttonId);
+ bool handleAlphaEvent(int buttonId, HbKeyboardType type);
bool buttonPressed(const QKeyEvent *keyEvent);
bool buttonReleased(const QKeyEvent *keyEvent);
bool actionHandler(HbInputModeHandler::HbInputModeAction action);
--- a/src/hbplugins/inputmethods/touchinput/hbinputbasic12keythaihandler.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/hbinputbasic12keythaihandler.cpp Fri May 14 16:09:54 2010 +0300
@@ -25,6 +25,7 @@
#include "virtual12key.h"
#include <QTimer>
+#include <hbinputbutton.h>
#include "hbinputbasic12keythaihandler.h"
#include "hbinputbasic12keyhandler_p.h"
@@ -37,9 +38,8 @@
~HbInputBasic12KeyThaiHandlerPrivate();
void showThaiSpecialCharacters();
+ bool buttonPressed(const QKeyEvent *keyEvent);
bool buttonReleased(const QKeyEvent *keyEvent);
- void _q_timeout();
-
};
HbInputBasic12KeyThaiHandlerPrivate::HbInputBasic12KeyThaiHandlerPrivate()
@@ -52,6 +52,24 @@
}
+/*!
+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
@@ -68,7 +86,8 @@
if (!focusObject || !mDownKey) {
return false;
}
- if ( mLongPressHappened ){
+ 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
@@ -92,31 +111,6 @@
}
return false;
}
-/*!
-Launches Thai special popup with long key press event of asterisk
-*/
-void HbInputBasic12KeyThaiHandlerPrivate::_q_timeout()
-{
- mTimer->stop();
- mNumChr = 0;
-
- HbInputFocusObject *focusedObject = 0;
- focusedObject = mInputMethod->focusObject();
- if (!focusedObject) {
- return;
- }
-
- //Long key press number key is applicable to all keys except Asterisk
- if (mDownKey && mDownKey == Qt::Key_Asterisk) {
- //For Thai Language Launch Special Characters popup
- mInputMethod->showThaiSpecialCharacters(mDownKey);
- } else {
- HbInputBasic12KeyHandlerPrivate::_q_timeout();
- }
- mDownKey = 0;
- mCurrentChar = 0;
- return;
-}
HbInputBasic12KeyThaiHandler::HbInputBasic12KeyThaiHandler(HbInputAbstractMethod* inputMethod)
:HbInputBasic12KeyHandler(*new HbInputBasic12KeyThaiHandlerPrivate, inputMethod)
--- a/src/hbplugins/inputmethods/touchinput/hbinputbasicqwertyhandler.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/hbinputbasicqwertyhandler.cpp Fri May 14 16:09:54 2010 +0300
@@ -23,11 +23,11 @@
**
****************************************************************************/
-#include <QTimer>
#include <hbinputpredictionengine.h>
#include <hbinputmethod.h>
#include <hbinputkeymap.h>
#include <hbinputkeymapfactory.h>
+#include <hbinputbutton.h>
#include "hbinputabstractbase.h"
#include "hbinputbasicqwertyhandler.h"
@@ -45,12 +45,11 @@
// button related operations.
bool buttonPressed(const QKeyEvent *event);
bool buttonReleased(const QKeyEvent *event);
- void _q_timeout();
public:
HbFnState mFnState;
int mButton;
- bool mPreviewAvailable;
+ bool mLongPressHappened;
QChar mPrevDeadKey;
HbInputFocusObject *mCurrentlyFocused;
};
@@ -58,7 +57,7 @@
HbInputBasicQwertyHandlerPrivate::HbInputBasicQwertyHandlerPrivate()
:mFnState(HbFnOff),
mButton(0),
-mPreviewAvailable(false),
+mLongPressHappened(0),
mPrevDeadKey(0),
mCurrentlyFocused(0)
{
@@ -75,9 +74,17 @@
bool HbInputBasicQwertyHandlerPrivate::buttonPressed(const QKeyEvent * event)
{
if (!mKeymap->isDeadKey(event->key())) {
+ if (event->isAutoRepeat() && mButton == event->key()) {
+ if (mButton == HbInputButton::ButtonKeyCodeSymbol) {
+ mInputMethod->selectSpecialCharacterTableMode();
+ mLongPressHappened = true;
+ }
+ if (mLongPressHappened) {
+ mButton = 0;
+ return true;
+ }
+ }
mButton = event->key();
- mTimer->start(HbLongPressTimerTimeout);
- mPreviewAvailable = false;
}
return false;
}
@@ -85,17 +92,18 @@
bool HbInputBasicQwertyHandlerPrivate::buttonReleased(const QKeyEvent *event)
{
Q_Q(HbInputBasicQwertyHandler);
+ mButton = 0;
+
int buttonId = event->key();
+ if (!event->text().isEmpty()) {
+ buttonId = event->text().at(0).unicode();
+ }
+
QChar firstChar = 0;
QChar secondChar = 0;
- // If the timer is not active and it is alpha mode, it is a long press
- // and handled in another function. So just return.
- if (mTimer->isActive()) {
- mTimer->stop();
- } else if (buttonId == Qt::Key_Control) {
- return false;
- } else if (!(buttonId & 0xffff0000) && mPreviewAvailable) {
+ if (mLongPressHappened) {
+ mLongPressHappened = false;
return false;
}
@@ -106,7 +114,7 @@
return false;
}
int currentTextCase = focusObject->editorInterface().textCase();
- const HbMappedKey *mappedKey = mKeymap->keyForKeycode(HbKeyboardVirtualQwerty, event->key());
+ const HbMappedKey *mappedKey = mKeymap->keyForKeycode(mInputMethod->currentKeyboardType(), buttonId);
QChar newChar;
if (mFnState == HbFnNext) {
newChar = (mappedKey->characters(HbModifierFnPressed)).at(0);
@@ -127,21 +135,25 @@
}
}
- if (!mPrevDeadKey.isNull()) {
- if (event->key() != Qt::Key_Shift && event->key() != Qt::Key_Alt) {
- mKeymap->combineCharacter(mPrevDeadKey, newChar, firstChar, secondChar );
- mPrevDeadKey = 0;
- if (firstChar.isNull() && secondChar.isNull()) {
+ if (mInputMethod->currentKeyboardType() != HbKeyboardSctLandscape) {
+ if (!mPrevDeadKey.isNull()) {
+ if (buttonId != HbInputButton::ButtonKeyCodeShift && buttonId != Qt::Key_Alt) {
+ mKeymap->combineCharacter(mPrevDeadKey, newChar, firstChar, secondChar );
+ mPrevDeadKey = 0;
+ if (firstChar.isNull() && secondChar.isNull()) {
+ return true;
+ }
+ }
+ } else {
+ if (mKeymap->isDeadKey(newChar.unicode())) {
+ mPrevDeadKey = newChar.unicode();
return true;
+ } else {
+ firstChar = newChar;
}
}
} else {
- if (mKeymap->isDeadKey(newChar.unicode())) {
- mPrevDeadKey = newChar.unicode();
- return true;
- } else {
- firstChar = newChar;
- }
+ firstChar = newChar;
}
bool ret = false;
@@ -156,7 +168,7 @@
}
ret = true;
break;
- case Qt::Key_Shift: {
+ case HbInputButton::ButtonKeyCodeShift: {
HbTextCase currentTextCase = focusObject->editorInterface().textCase();
HbInputLanguage language = mInputMethod->inputState().language();
@@ -186,7 +198,8 @@
ret = true;
}
break;
- case Qt::Key_Control: // Ctrl/Chr
+ case HbInputButton::ButtonKeyCodeSymbol: // Ctrl/Chr
+ case HbInputButton::ButtonKeyCodeAlphabet:
mInputMethod->switchSpecialCharacterTable();
ret = true;
break;
@@ -197,7 +210,7 @@
return true;
}
- if (event->key() == Qt::Key_Delete || event->key() == Qt::Key_Backspace) {
+ if (event->key() == HbInputButton::ButtonKeyCodeDelete || event->key() == Qt::Key_Backspace) {
return false;
}
@@ -234,25 +247,6 @@
return ret;
}
-void HbInputBasicQwertyHandlerPrivate::_q_timeout()
-{
- mTimer->stop();
-
- //If long key press of shift key is received, just return
- if (mButton == Qt::Key_Shift) {
- return;
- } else if (mButton == Qt::Key_Control) {
- mInputMethod->selectSpecialCharacterTableMode();
- }
- QStringList spellList;
- //If long key press of shift key, space key and enter key is received, don't
- if (mButton) {
- mInputMethod->launchCharacterPreviewPane(mButton);
- }
-
- return;
-}
-
HbInputBasicQwertyHandler::HbInputBasicQwertyHandler(HbInputAbstractMethod* inputMethod)
:HbInputBasicHandler(* new HbInputBasicQwertyHandlerPrivate, inputMethod)
{
@@ -285,8 +279,7 @@
*/
bool HbInputBasicQwertyHandler::isComposing() const
{
- Q_D(const HbInputBasicQwertyHandler);
- return d->mTimer->isActive();
+ return false;
}
/*!
@@ -301,22 +294,15 @@
switch (action) {
case HbInputModeActionCancelButtonPress:
case HbInputModeActionReset:
- if (d->mTimer->isActive()) {
- d->mTimer->stop();
- }
+ d->mButton = 0;
break;
case HbInputModeActionFocusRecieved:
- if (d->mTimer->isActive()) {
- d->mTimer->stop();
- }
+ d->mButton = 0;
// set up auto completer
setUpAutoCompleter();
break;
case HbInputModeActionFocusLost:
- // We should add the commit autocompleting text when focus lost happens
- if (d->mTimer->isActive()) {
- d->mTimer->stop();
- }
+ d->mButton = 0;
if (d->mCurrentlyFocused != focusObject) {
d->mCurrentlyFocused = focusObject;
addWordInAutoCompleter();
@@ -329,25 +315,8 @@
return ret;
}
-/*!
-this SLOT is called by input plugin when there is a character selected from character preview pane.
-*/
-void HbInputBasicQwertyHandler::charFromPreviewSelected(QString characters)
-{
- Q_D(HbInputBasicQwertyHandler);
- if(characters.size() > 0) {
- sctCharacterSelected(characters.at(0));
- d->mInputMethod->updateState();
- }
-}
-
void HbInputBasicQwertyHandler::sctCharacterSelected(QString character)
{
HbInputModeHandler::sctCharacterSelected(character);
}
-void HbInputBasicQwertyHandler::characterPreviewAvailable(bool available)
-{
- Q_D(HbInputBasicQwertyHandler);
- d->mPreviewAvailable = available;
-}
--- a/src/hbplugins/inputmethods/touchinput/hbinputbasicqwertyhandler.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/hbinputbasicqwertyhandler.h Fri May 14 16:09:54 2010 +0300
@@ -38,10 +38,6 @@
bool actionHandler(HbInputModeAction action);
bool filterEvent(const QKeyEvent * event);
void sctCharacterSelected(QString character);
- void characterPreviewAvailable(bool available);
-
-public slots:
- void charFromPreviewSelected(QString character);
private:
Q_DECLARE_PRIVATE_D(d_ptr, HbInputBasicQwertyHandler)
--- a/src/hbplugins/inputmethods/touchinput/hbinputnumeric12keyhandler.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/hbinputnumeric12keyhandler.cpp Fri May 14 16:09:54 2010 +0300
@@ -26,6 +26,7 @@
#include <QTimer>
#include <hbinputmethod.h>
#include <hbinputkeymapfactory.h>
+#include <hbinputbutton.h>
#include "hbinputnumeric12keyhandler.h"
#include "hbinputnumerichandler_p.h"
@@ -41,19 +42,21 @@
~HbInputNumeric12KeyHandlerPrivate();
void handleMultitapStarKey();
+ bool handleAlphaEvent(int buttonId, HbKeyboardType type);
bool buttonPressed(const QKeyEvent *keyEvent);
bool buttonReleased(const QKeyEvent *keyEvent);
void _q_timeout();
public:
int mLastKey;
+ bool mLongPressHappened;
int mButtonDown;
int mMultiTapNum;
QChar mCurrentMultitapChar;
};
HbInputNumeric12KeyHandlerPrivate::HbInputNumeric12KeyHandlerPrivate():
- mLastKey(0),
- mButtonDown(0),
+ mLastKey(0), mLongPressHappened(false),
+ mButtonDown(false),
mMultiTapNum(0),
mCurrentMultitapChar(0)
{
@@ -65,58 +68,111 @@
void HbInputNumeric12KeyHandlerPrivate::handleMultitapStarKey()
{
- HbInputFocusObject *focusObject = 0;
- focusObject = mInputMethod->focusObject();
+ HbInputFocusObject *focusObject = mInputMethod->focusObject();
if (!focusObject) {
return;
}
- QChar MultitapStarKeyArray[] = {'+','*','p','w','\0'};
- mCurrentMultitapChar = MultitapStarKeyArray[mMultiTapNum];
+ QChar MultitapStarKeyArray[] = {'*','+','p','w','\0'};
- mMultiTapNum = (++mMultiTapNum)%4;
- if (mCurrentMultitapChar != 0) {
- QString str;
- str += mCurrentMultitapChar;
+ int index = mMultiTapNum;
+ do {
+ mCurrentMultitapChar = MultitapStarKeyArray[mMultiTapNum];
+ mMultiTapNum = (++mMultiTapNum)%4;
+ if (mCurrentMultitapChar != 0) {
+ if (focusObject->characterAllowedInEditor(mCurrentMultitapChar)) {
+ QString str;
+ str += mCurrentMultitapChar;
+
+ QList<QInputMethodEvent::Attribute> list;
+ QInputMethodEvent event(str,list);
+ focusObject->sendEvent(event);
+ return;
+ }
+ }
+ } while (index != mMultiTapNum);
+}
+
+bool HbInputNumeric12KeyHandlerPrivate::handleAlphaEvent(int buttonId, HbKeyboardType type)
+{
+ Q_Q(HbInputNumeric12KeyHandler);
- QList<QInputMethodEvent::Attribute> list;
- QInputMethodEvent event(str,list);
- focusObject->sendEvent(event);
+ HbInputFocusObject *focusObject = 0;
+ focusObject = mInputMethod->focusObject();
+ if (!focusObject) {
+ return false;
+ }
+
+ QChar character = 0;
+ //This condition is to avoid get the characters mapped to Asterisk
+ //Especially for Thai language we have mapped character to Asterisk
+ if (buttonId != HbInputButton::ButtonKeyCodeAsterisk ||
+ mInputMethod->currentKeyboardType() == HbKeyboardSctPortrait) {
+ int index = 0;
+ character = q->getNthCharacterInKey(index, buttonId, type);
}
+
+ if (character != 0) {
+ q->commitAndUpdate(character);
+ return true;
+ }
+ return false;
}
+
bool HbInputNumeric12KeyHandlerPrivate::buttonPressed(const QKeyEvent *keyEvent)
{
- Q_Q(HbInputNumeric12KeyHandler);
+ Q_Q(HbInputNumeric12KeyHandler);
HbInputFocusObject *focusObject = 0;
focusObject = mInputMethod->focusObject();
if (!focusObject) {
return false;
}
- int buttonId = keyEvent->key();
+ int buttonId = keyEvent->key();
mButtonDown = buttonId;
-
- if (buttonId == Qt::Key_Shift) {
- mTimer->start(HbLongPressTimerTimeout);
- mLastKey = buttonId;
- return true;
+ if (keyEvent->isAutoRepeat() && mLastKey == buttonId) {
+ if (buttonId == HbInputButton::ButtonKeyCodeShift) {
+ // If the editor is not a number only editor, then activate the alphanumeric keypad
+ if (!focusObject->editorInterface().isNumericEditor()) {
+ mInputMethod->switchMode(buttonId);
+ mLongPressHappened = true;
+ }
+ } else if (buttonId == HbInputButton::ButtonKeyCodeSymbol) {
+ mInputMethod->selectSpecialCharacterTableMode();
+ mLongPressHappened = true;
+ } else if (buttonId == HbInputButton::ButtonKeyCodeAsterisk &&
+ mInputMethod->currentKeyboardType() != HbKeyboardSctPortrait) {
+ mLongPressHappened = true;
+ mCurrentMultitapChar = QChar(HbInputButton::ButtonKeyCodeAsterisk);
+ HbInputFocusObject *focusedObject = mInputMethod->focusObject();
+ if (focusedObject) {
+ focusedObject->filterAndCommitCharacter(mCurrentMultitapChar);
+ }
+ mCurrentMultitapChar = 0;
+ }
+ if (mLongPressHappened) {
+ mLastKey = 0;
+ return true;
+ }
}
+
if (mInputMethod) {
if (mLastKey != buttonId) {
if (mCurrentMultitapChar !=0) {
- if (!focusObject->characterAllowedInEditor(mCurrentMultitapChar))
+ if (!focusObject->characterAllowedInEditor(mCurrentMultitapChar)) {
focusObject->sendCommitString(QString());
- else {
+ } else {
QChar commitChar(mCurrentMultitapChar);
mCurrentMultitapChar = 0;
q->commitAndUpdate(commitChar);
}
}
}
- if (buttonId == Qt::Key_Asterisk) {
+ if (buttonId == HbInputButton::ButtonKeyCodeAsterisk) {
mTimer->stop();
mTimer->start(HbMultiTapTimerTimeout);
}
- return false;
- }
+ }
+
+ mLastKey = buttonId;
return false;
}
@@ -133,44 +189,56 @@
qDebug("HbInputModeHandler::buttonReleased no focusObject ... failed!!");
return false;
}
- int buttonId = keyEvent->key();
- if(mTimer->isActive() && buttonId == Qt::Key_Shift) {
- mTimer->stop();
- }
+
+ int buttonId = keyEvent->key();
- if (mLastKey != buttonId)
+ if (mLongPressHappened) {
+ mLongPressHappened = false;
+ return false;
+ }
+
+ if (mTimer->isActive() && buttonId == Qt::Key_Shift) {
+ mTimer->stop();
+ }
+ if (mLastKey != buttonId) {
mMultiTapNum = 0;
+ }
mButtonDown = 0;
- if (buttonId == Qt::Key_Asterisk) {
+ if (buttonId == HbInputButton::ButtonKeyCodeAsterisk &&
+ mInputMethod->currentKeyboardType() != HbKeyboardSctPortrait) {
//Asterisk Key will multitap bettween *,+,p,w
//mInputMethod->switchMode(buttonId);
mLastKey = buttonId;
handleMultitapStarKey();
return true;
- } else if (buttonId == Qt::Key_Control){
+ } else if (buttonId == HbInputButton::ButtonKeyCodeSymbol) {
+ mInputMethod->switchMode(buttonId);
+ } else if (buttonId == HbInputButton::ButtonKeyCodeAlphabet) {
mInputMethod->switchMode(buttonId);
mLastKey = buttonId;
return true;
- }
- else if (buttonId == Qt::Key_Return) {
+ } else if (buttonId == Qt::Key_Return) {
mInputMethod->closeKeypad();
return true;
- } else if ( buttonId == Qt::Key_Shift ) {
- //Let's commit character "#" on single tap and double tap of shift Key
+ } else if (buttonId == HbInputButton::ButtonKeyCodeShift) {
+ //Let's commit character "#" on single tap and double tap of shift Key
mLastKey = buttonId;
- QChar qc(keyEvent->key());
- qc = QChar('#');
- q->commitAndUpdate(qc);
- return true;
+ QChar qc = QChar('#');
+ q->commitAndUpdate(qc);
+ return true;
} else if (buttonId >= 0) {
// Let's see if we can get the handler for this button in the base class.
if (q->HbInputNumericHandler::filterEvent(keyEvent)) {
return true;
}
mLastKey = buttonId;
- q->commitFirstMappedNumber(buttonId);
+ if (mInputMethod->currentKeyboardType() == HbKeyboardSctPortrait &&
+ handleAlphaEvent(buttonId, mInputMethod->currentKeyboardType())) {
+ return true;
+ }
+ q->commitFirstMappedNumber(buttonId, mInputMethod->currentKeyboardType());
return true;
}
return false;
@@ -178,39 +246,19 @@
void HbInputNumeric12KeyHandlerPrivate::_q_timeout()
{
- Q_Q(HbInputNumeric12KeyHandler);
mTimer->stop();
mMultiTapNum = 0;
- HbInputFocusObject *focusedObject = 0;
- focusedObject = mInputMethod->focusObject();
+ HbInputFocusObject *focusedObject = mInputMethod->focusObject();
if (!focusedObject) {
qDebug("HbInputNumeric12KeyHandler::timeout focusObject == 0");
return;
}
- //switch to Alpha mode when Long key press of Shift key is received
- if (mButtonDown)
- {
- if (mButtonDown == Qt::Key_Shift) {
- // If the editor is not a number only editor, then activate the alphanumeric keypad
- if( !focusedObject->editorInterface().isNumericEditor() ) {
- mInputMethod->switchMode(mLastKey);
- mLastKey = 0;
- }
- else
- {
- q->commitAndUpdate(QChar('#'));
- }
+
+ if (!mButtonDown) {
+ if (mCurrentMultitapChar != 0) {
+ focusedObject->filterAndCommitCharacter(mCurrentMultitapChar);
}
- else if (mButtonDown == Qt::Key_Asterisk)
- {
- q->commitAndUpdate(QChar('*'));
- }
- mButtonDown = 0;
- }
- else {
- if (mCurrentMultitapChar != 0)
- focusedObject->filterAndCommitCharacter(mCurrentMultitapChar);
}
mCurrentMultitapChar = 0;
}
@@ -247,15 +295,14 @@
*/
bool HbInputNumeric12KeyHandler::actionHandler(HbInputModeAction action)
{
- Q_D(HbInputNumeric12KeyHandler);
+ Q_D(HbInputNumeric12KeyHandler);
bool ret = false;
switch (action) {
- case HbInputModeHandler::HbInputModeActionCancelButtonPress:
+ case HbInputModeHandler::HbInputModeActionCancelButtonPress:
case HbInputModeHandler::HbInputModeActionReset:
- d->mLastKey = 0;
- d->mButtonDown = 0;
- d->mTimer->stop();
- break;
+ d->mLastKey = 0;
+ d->mButtonDown = false;
+ break;
//In case of the numeric editor the character is already committed.
//Need to remove the committed character.
case HbInputModeHandler::HbInputModeActionDeleteAndCommit: {
@@ -265,7 +312,6 @@
if (!focusObject) {
return false;
}
- d->mTimer->stop();
if (focusObject->editorCursorPosition()) {
QString empty;
QList<QInputMethodEvent::Attribute> list;
--- a/src/hbplugins/inputmethods/touchinput/hbinputnumericqwertyhandler.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/hbinputnumericqwertyhandler.cpp Fri May 14 16:09:54 2010 +0300
@@ -24,6 +24,7 @@
****************************************************************************/
#include <hbinputmethod.h>
#include <hbinputkeymapfactory.h>
+#include <hbinputbutton.h>
#include "hbinputnumericqwertyhandler.h"
#include "hbinputnumerichandler_p.h"
@@ -67,14 +68,18 @@
}
int buttonId = event->key();
+ if (!event->text().isEmpty()) {
+ buttonId = event->text().at(0).unicode();
+ }
+
// currently we shift and control key are not clear as concept. So just ignoring
// these buttons.
- if (buttonId == Qt::Key_Shift || buttonId == Qt::Key_Control) {
+ if (buttonId == HbInputButton::ButtonKeyCodeShift || buttonId == HbInputButton::ButtonKeyCodeSymbol) {
return false;
}
// Don't handle this
- if (buttonId == Qt::Key_Backspace || buttonId == Qt::Key_Delete) {
+ if (buttonId == Qt::Key_Backspace || buttonId == HbInputButton::ButtonKeyCodeDelete) {
return false;
}
--- a/src/hbplugins/inputmethods/touchinput/hbinputprediction12keyhandler.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/hbinputprediction12keyhandler.cpp Fri May 14 16:09:54 2010 +0300
@@ -35,6 +35,7 @@
#include <hbmainwindow.h>
#include <hbinstance.h>
#include <hbeffect.h>
+#include <hbinputbutton.h>
#include "virtual12key.h"
@@ -114,8 +115,8 @@
// action is null when input query is closed externally , for example by calling
// HbDialog::close() function.
if (action) {
- isOk = (action->text() == primaryAction()->text())? true : false;
- isCancel = (action->text() == secondaryAction()->text())? true:false;
+ isOk = (action->text() == actions().at(0)->text())? true : false;
+ isCancel = (action->text() == actions().at(1)->text())? true:false;
} else {
isExternalClose = true;
}
@@ -214,27 +215,36 @@
}
}
-void HbInputPrediction12KeyHandlerPrivate::_q_timeout()
+bool HbInputPrediction12KeyHandlerPrivate::buttonPressed(const QKeyEvent *keyEvent)
{
- qDebug("HbInputPrediction12KeyHandlerPrivate::_q_timeout()");
Q_Q(HbInputPrediction12KeyHandler);
+ mLongPressHappened = false;
+ HbInputFocusObject *focusObject = 0;
+ focusObject = mInputMethod->focusObject();
+ if (!focusObject) {
+ return false;
+ }
- // let's stop the timer first.
- mTimer->stop();
+ int buttonId = keyEvent->key();
- //Long key press number key is applicable to all keys
- if (mButtonDown) {
- if (mLastKey == Qt::Key_Asterisk) {
- //Remove the "?" mark if present
- chopQMarkAndUpdateEditor();
- mInputMethod->switchMode(mLastKey);
- } else if (mLastKey == Qt::Key_Shift) {
- mInputMethod->switchMode(Qt::Key_Shift);
+ if (keyEvent->isAutoRepeat() && mLastKey == buttonId) {
+ if (buttonId == HbInputButton::ButtonKeyCodeAsterisk) {
+ if (!mCanContinuePrediction) {
+ mInputMethod->switchMode(buttonId);
+ } else {
+ //Remove the "?" mark if present
+ chopQMarkAndUpdateEditor();
+ mInputMethod->selectSpecialCharacterTableMode();
+ }
mLongPressHappened = true;
- } else if (mLastKey == Qt::Key_Control) {
+ } else if (buttonId == HbInputButton::ButtonKeyCodeShift) {
+ mInputMethod->switchMode(HbInputButton::ButtonKeyCodeShift);
+ mLongPressHappened = true;
+ } else if (buttonId == HbInputButton::ButtonKeyCodeSymbol) {
//Remove the "?" mark if present
chopQMarkAndUpdateEditor();
mInputMethod->selectSpecialCharacterTableMode();
+ mLongPressHappened = true;
} else {
//With a long key press of a key, numbers are supposed to be entered.
//When the existing input (along with the short key press input of the
@@ -244,53 +254,31 @@
// Delete "?" entered
if (!mCanContinuePrediction) {
deleteOneCharacter();
+ mLongPressHappened = true;
}
- if (mLastKey != Qt::Key_Delete) {
- q->commitFirstMappedNumber(mLastKey);
+ if (buttonId != HbInputButton::ButtonKeyCodeDelete) {
+ q->commitFirstMappedNumber(buttonId, mInputMethod->currentKeyboardType());
+ mLongPressHappened = true;
}
- mLongPressHappened = true;
+ }
+
+ if (mLongPressHappened) {
+ mLastKey = 0;
+ return true;
}
}
-}
-bool HbInputPrediction12KeyHandlerPrivate::buttonPressed(const QKeyEvent *keyEvent)
-{
- mLongPressHappened = false;
- HbInputFocusObject *focusObject = 0;
- focusObject = mInputMethod->focusObject();
- if (!focusObject) {
- return false;
- }
-
- int buttonId = keyEvent->key();
-
-
- if (buttonId == Qt::Key_Control) {
- mLastKey = buttonId;
- mButtonDown = true;
- mTimer->start(HbLongPressTimerTimeout);
- return true;
- } else if (buttonId == Qt::Key_Shift) {
- // if we get a second consequtive shift key press,
- // we want to handle it in buttonRelease
+ 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)){
mShiftKeyDoubleTap = true;
}
- if (!mTimer->isActive()) {
- mTimer->start(HbLongPressTimerTimeout);
- }
- mLastKey = buttonId;
- mButtonDown = true;
- return true;
}
mLastKey = buttonId;
mButtonDown = true;
- // custom button should not start timer.
- if ((buttonId & CUSTOM_INPUT_MASK) != CUSTOM_INPUT_MASK) {
- mTimer->start(HbLongPressTimerTimeout);
- }
return false;
}
@@ -309,14 +297,11 @@
// since button is released we can set buttonDown back to false.
mButtonDown = false;
int buttonId = keyEvent->key();
- // it was a long press on sct swith button. so just return form here.
- if (!mTimer->isActive() && buttonId == Qt::Key_Control) {
- return true;
- }
// Sym key is handled in this class it self, so not passing it to
// the base mode handlers.
- if ( buttonId == Qt::Key_Control) {
+ if (buttonId == HbInputButton::ButtonKeyCodeSymbol ||
+ buttonId == HbInputButton::ButtonKeyCodeAlphabet) {
//Remove the "?" mark if present
chopQMarkAndUpdateEditor();
mInputMethod->switchMode(buttonId);
@@ -328,7 +313,7 @@
- Behavior of Short Press of Asterisk Key when not in inline editing state
- Should launch SCT
*/
- else if (buttonId == Qt::Key_Asterisk ) {
+ else if (buttonId == HbInputButton::ButtonKeyCodeAsterisk ) {
if(!mCanContinuePrediction && (*mCandidates)[mBestGuessLocation].endsWith('?')) {
//Remove the "?" mark
(*mCandidates)[mBestGuessLocation].chop(1);
@@ -340,11 +325,11 @@
mInputMethod->starKeySelected();
return true;
}
- else if (buttonId == Qt::Key_Return) {
+ else if (buttonId == HbInputButton::ButtonKeyCodeEnter) {
mInputMethod->closeKeypad();
return true;
}
- if (buttonId == Qt::Key_Shift) {
+ if (buttonId == HbInputButton::ButtonKeyCodeShift) {
// single tap of shift key toggles prediction status in case insensitive languages
if (!HbInputSettingProxy::instance()->globalInputLanguage().isCaseSensitiveLanguage()) {
HbInputSettingProxy::instance()->togglePrediction();
@@ -371,13 +356,19 @@
} else {
updateTextCase();
if( !mTimer->isActive()){
- mTimer->start();
+ mTimer->start(HbMultiTapTimerTimeout);
}
}
}
return true;
}
+ if (buttonId != HbInputButton::ButtonKeyCodeDelete &&
+ mInputMethod->currentKeyboardType() == HbKeyboardSctPortrait) {
+ q->sctCharacterSelected(QChar(buttonId));
+ return true;
+ }
+
// text input happens on button release
if (q->HbInputPredictionHandler::filterEvent(keyEvent)) {
return true;
@@ -428,7 +419,7 @@
int eventKey = event->key();
switch(eventKey) {
case Qt::Key_0:
- case Qt::Key_Space: {
+ case HbInputButton::ButtonKeyCodeSpace: {
if(d->mCandidates->size() && focusObject) {
//Remove the "?" mark
(*d->mCandidates)[d->mBestGuessLocation].chop(1);
@@ -437,7 +428,7 @@
}
}
break;
- case Qt::Key_Shift: {
+ case HbInputButton::ButtonKeyCodeShift: {
if(event->type() == QEvent::KeyRelease && d->mShiftKeyDoubleTap) {
//Remove the "?" mark
deleteOneCharacter();
@@ -445,11 +436,10 @@
}
//For the following set of keys, it does not matter.
case Qt::Key_Backspace:
- case Qt::Key_Delete:
- case Qt::Key_Return:
- case Qt::Key_Enter:
- case Qt::Key_Asterisk:
- case Qt::Key_Control:
+ case HbInputButton::ButtonKeyCodeDelete:
+ case HbInputButton::ButtonKeyCodeEnter:
+ 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 */
@@ -467,8 +457,6 @@
} else {
d->mButtonDown = true;
d->mLastKey = event->key();
- // start Long Press timer as corresponding number mapped to a key should be allowed to enter
- d->mTimer->start(HbLongPressTimerTimeout);
}
return true;
}
--- a/src/hbplugins/inputmethods/touchinput/hbinputprediction12keyhandler_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/hbinputprediction12keyhandler_p.h Fri May 14 16:09:54 2010 +0300
@@ -44,7 +44,6 @@
bool buttonReleased(const QKeyEvent *keyEvent);
bool buttonPressed(const QKeyEvent *keyEvent);
- void _q_timeout();
void cancelButtonPress();
void chopQMarkAndUpdateEditor();
public:
--- a/src/hbplugins/inputmethods/touchinput/hbinputprediction12keythaihandler.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/hbinputprediction12keythaihandler.cpp Fri May 14 16:09:54 2010 +0300
@@ -27,6 +27,7 @@
#include <hbinputsettingproxy.h>
#include <hbinputkeymapfactory.h>
#include <hbinputpredictionengine.h>
+#include <hbinputbutton.h>
#include "virtual12key.h"
@@ -43,7 +44,6 @@
bool buttonReleased(const QKeyEvent *keyEvent);
bool buttonPressed(const QKeyEvent *keyEvent);
- void _q_timeout();
};
HbInputPrediction12KeyThaiHandlerPrivate::HbInputPrediction12KeyThaiHandlerPrivate()
@@ -55,45 +55,40 @@
}
-void HbInputPrediction12KeyThaiHandlerPrivate::_q_timeout()
-{
- Q_Q(HbInputPrediction12KeyHandler);
- // let's stop the timer first.
- mTimer->stop();
-
- if (mButtonDown) {
- if(mLastKey == Qt::Key_0){
- q->actionHandler(HbInputModeHandler::HbInputModeActionCommit);
- q->commitFirstMappedNumber(mLastKey);
- } else if(mLastKey != Qt::Key_Asterisk) {
- //Long key press number key is applicable to all keys so pass it to Base class
- HbInputPrediction12KeyHandlerPrivate::_q_timeout();
- }
- }
-}
-
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 ) {
+ if (buttonId == Qt::Key_Shift) {
mLastKey = buttonId;
mButtonDown = true;
} else {
- HbInputPrediction12KeyHandlerPrivate::buttonPressed(keyEvent);
+ return HbInputPrediction12KeyHandlerPrivate::buttonPressed(keyEvent);
}
- // custom button should not start timer.
- if ((buttonId & CUSTOM_INPUT_MASK) != CUSTOM_INPUT_MASK) {
- mTimer->start(HbLongPressTimerTimeout);
- }
return false;
}
@@ -106,22 +101,19 @@
Q_Q(HbInputPrediction12KeyHandler);
if(!mButtonDown || mLongPressHappened){
+ mLongPressHappened = false;
return false;
}
int buttonId = keyEvent->key();
- // it was a long press on sct swith button. so just return form here.
- if (!mTimer->isActive() && buttonId == Qt::Key_Control) {
- return true;
- }
- if (buttonId == Qt::Key_Asterisk && !mInputMethod->isSctModeActive()) {
+ 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 == Qt::Key_Shift ) {
+ } 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);
@@ -185,8 +177,6 @@
if (event->key() == Qt::Key_0 && d->mEngine->inputLength() >= 1 ) {
if(event->type() == QEvent::KeyPress) {
d->mButtonDown = true;
- // start Long Press timer as zero key should be allowed to enter
- d->mTimer->start(HbLongPressTimerTimeout);
} else if(event->type() == QEvent::KeyRelease) {
d->mTimer->stop();
d->mButtonDown = false;
--- a/src/hbplugins/inputmethods/touchinput/hbinputpredictionqwertyhandler.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/hbinputpredictionqwertyhandler.cpp Fri May 14 16:09:54 2010 +0300
@@ -26,6 +26,7 @@
#include <hbinputmethod.h>
#include <hbinputkeymapfactory.h>
#include <hbinputpredictionengine.h>
+#include <hbinputbutton.h>
#include "hbinputpredictionqwertyhandler.h"
#include "hbinputpredictionhandler_p.h"
@@ -43,20 +44,19 @@
bool buttonPressed(const QKeyEvent *event);
bool buttonReleased(const QKeyEvent *event);
void init();
- void _q_timeout();
public:
int mButton;
HbFnState mFnState;
bool mExactPopupLaunched;
- bool mPreviewAvailable;
+ bool mLongPressHappened;
};
HbInputPredictionQwertyHandlerPrivate::HbInputPredictionQwertyHandlerPrivate()
:mButton(0),
mFnState(HbFnOff),
mExactPopupLaunched(false),
- mPreviewAvailable(false)
+ mLongPressHappened(false)
{
}
@@ -68,27 +68,6 @@
{
}
-void HbInputPredictionQwertyHandlerPrivate::_q_timeout()
-{
- qDebug("HbInputPredictionQwertyHandler::timeout called");
- mTimer->stop();
- QStringList spellList;
-
- //If long key press of shift key is received, just return
- if (mButton == Qt::Key_Shift) {
- return;
- }
- else if (mButton == Qt::Key_Control) {
- mInputMethod->selectSpecialCharacterTableMode();
- }
-
- //If long key press of shift key, space key and enter key is received, don't
- if (mButton) {
- mInputMethod->launchCharacterPreviewPane(mButton);
- }
-}
-
-
bool HbInputPredictionQwertyHandlerPrivate::buttonReleased(const QKeyEvent *event)
{
Q_Q(HbInputPredictionQwertyHandler);
@@ -99,18 +78,13 @@
return false;
}
- int key = event->key();
-
- // If the timer is not active and it is alpha mode, it is a long press
- // and handled in another function. So just return.
- if (mTimer->isActive()) {
- mTimer->stop();
- } else if (key == Qt::Key_Control) {
- return true;
- } else if (!(key & 0xffff0000) && mPreviewAvailable) {
+ if (mLongPressHappened) {
+ mLongPressHappened = false;
return false;
}
+ int key = event->key();
+
bool ret = true;
switch(key) {
case Qt::Key_Alt: //Fn
@@ -122,7 +96,7 @@
mFnState = HbFnOff;
}
break;
- case Qt::Key_Shift: {
+ case HbInputButton::ButtonKeyCodeShift: {
HbTextCase currentTextCase = (HbTextCase)focusObject->editorInterface().textCase();
HbInputLanguage language = mInputMethod->inputState().language();
@@ -151,7 +125,8 @@
mInputMethod->activateState(state);
}
break;
- case Qt::Key_Control: { // Ctrl/Chr
+ case HbInputButton::ButtonKeyCodeSymbol: { // Ctrl/Chr
+ case HbInputButton::ButtonKeyCodeAlphabet:
mInputMethod->switchSpecialCharacterTable();
}
break;
@@ -169,6 +144,13 @@
modifiers |= Qt::ShiftModifier;
}
+ if (key != HbInputButton::ButtonKeyCodeDelete &&
+ key != HbInputButton::ButtonKeyCodeEnter &&
+ mInputMethod->currentKeyboardType() == HbKeyboardSctLandscape) {
+ q->sctCharacterSelected(QChar(key));
+ return true;
+ }
+
// let's pass it to the base class.
ret = q->HbInputPredictionHandler::filterEvent(event);
@@ -181,9 +163,18 @@
bool HbInputPredictionQwertyHandlerPrivate::buttonPressed(const QKeyEvent *event)
{
+ if (event->isAutoRepeat() && mButton == event->key()) {
+ if (mButton == HbInputButton::ButtonKeyCodeSymbol) {
+ mInputMethod->selectSpecialCharacterTableMode();
+ mLongPressHappened = true;
+ }
+ if (mLongPressHappened) {
+ mButton = 0;
+ return true;
+ }
+ }
+
mButton = event->key();
- mTimer->start(HbLongPressTimerTimeout);
- mPreviewAvailable = false;
return false;
}
@@ -210,14 +201,10 @@
switch (action) {
case HbInputModeActionCancelButtonPress:
case HbInputModeActionReset:
- if (d->mTimer->isActive()) {
- d->mTimer->stop();
- }
break;
case HbInputModeActionFocusRecieved:
HbInputPredictionHandler::actionHandler(HbInputModeActionSetCandidateList);
HbInputPredictionHandler::actionHandler(HbInputModeActionSetKeypad);
- d->mTimer->stop();
break;
case HbInputModeActionFocusLost:
HbInputPredictionHandler::actionHandler(HbInputModeActionFocusLost);
@@ -277,18 +264,6 @@
}
/*!
-this SLOT is called when a character on character previe pane is selected.
-*/
-void HbInputPredictionQwertyHandler::charFromPreviewSelected(QString character)
-{
- Q_D(HbInputPredictionQwertyHandler);
- if(character.size() > 0) {
- appendUnicodeCharacter(character[0]);
- d->mInputMethod->updateState();
- }
-}
-
-/*!
this function is called by HbPredictionHandler when HbPredictionHandler encounters a exact word.
*/
void HbInputPredictionQwertyHandler::processExactWord(QString exactWord)
@@ -320,11 +295,6 @@
{
HbInputPredictionHandler::smileySelected(smiley);
}
-void HbInputPredictionQwertyHandler::characterPreviewAvailable(bool available)
-{
- Q_D(HbInputPredictionQwertyHandler);
- d->mPreviewAvailable = available;
-}
/*!
Returns true if preidciton engine is available and initialized.
--- a/src/hbplugins/inputmethods/touchinput/hbinputpredictionqwertyhandler.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/hbinputpredictionqwertyhandler.h Fri May 14 16:09:54 2010 +0300
@@ -39,14 +39,12 @@
bool actionHandler(HbInputModeAction action);
void processExactWord(QString exactWord);
void sctCharacterSelected(QString character);
- void characterPreviewAvailable(bool available);
bool isActive() const;
void commitAndUpdate(const QString& string, int replaceFrom = 0, int replaceLength = 0);
void deleteOneCharacter();
void smileySelected(QString smiley);
public slots:
void exactWordPopupClosed();
- void charFromPreviewSelected(QString character);
private:
Q_DECLARE_PRIVATE_D(d_ptr, HbInputPredictionQwertyHandler)
Q_DISABLE_COPY(HbInputPredictionQwertyHandler)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbplugins/inputmethods/touchinput/hbinputqwerty10x4touchkeyboard.cpp Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,262 @@
+/****************************************************************************
+**
+** 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 <hbdeviceprofile.h>
+
+#include <hbinputmethod.h>
+#include <hbinputkeymap.h>
+#include <hbinputsettingproxy.h>
+
+#include "hbinputqwerty10x4touchkeyboard.h"
+#include "hbinputqwerty10x4touchkeyboard_p.h"
+#include "hbinputvkbwidget_p.h"
+#include "hbinputbuttongroup.h"
+#include "hbinputbutton.h"
+#include "hbinputmodeindicator.h"
+
+const qreal HbKeyboardHeightInUnits = 34.6;
+const qreal HbKeyboardWidthInUnits = 95.5;
+
+const int HbVirtualQwertyNumberOfRows = 4;
+const int HbVirtualQwertyNumberOfColumns = 10;
+const int HbButtonKeyCodeTable[HbVirtualQwertyNumberOfRows * HbVirtualQwertyNumberOfColumns - 1] =
+{
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeDelete,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeEnter,
+ HbInputButton::ButtonKeyCodeShift,
+ HbInputButton::ButtonKeyCodeSymbol,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeSpace,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeSettings,
+ HbInputButton::ButtonKeyCodeCustom
+};
+
+HbQwerty10x4KeyboardPrivate::HbQwerty10x4KeyboardPrivate()
+{
+}
+
+HbQwerty10x4KeyboardPrivate::~HbQwerty10x4KeyboardPrivate()
+{
+}
+
+void HbQwerty10x4KeyboardPrivate::init()
+{
+ Q_Q(HbQwerty10x4Keyboard);
+
+ HbInputVkbWidgetPrivate::init();
+
+ HbInputButtonGroup *buttonGroup = static_cast<HbInputButtonGroup*>(q->contentItem());
+ if (buttonGroup) {
+ buttonGroup->setGridSize(QSize(HbVirtualQwertyNumberOfColumns, HbVirtualQwertyNumberOfRows));
+
+ int key = 0;
+ QList<HbInputButton*> buttons;
+ for (int i = 0; i < HbVirtualQwertyNumberOfColumns * HbVirtualQwertyNumberOfRows - 1; ++i) {
+ HbInputButton *item = new HbInputButton(HbButtonKeyCodeTable[i], QPoint(key % HbVirtualQwertyNumberOfColumns, key / HbVirtualQwertyNumberOfColumns));
+ buttons.append(item);
+
+ if (HbButtonKeyCodeTable[i] == HbInputButton::ButtonKeyCodeSettings) {
+ mInputModeIndicator = new HbInputModeIndicator(item, q);
+ } else if (HbButtonKeyCodeTable[i] == HbInputButton::ButtonKeyCodeSpace) {
+ item->setSize(QSize(2, 1));
+ ++key;
+ }
+ ++key;
+ }
+ buttonGroup->setButtons(buttons);
+ buttonGroup->setButtonPreviewEnabled(HbInputSettingProxy::instance()->isCharacterPreviewForQwertyEnabled());
+ buttonGroup->setCharacterSelectionPreviewEnabled(true);
+
+ QObject::connect(buttonGroup, SIGNAL(buttonPressed(const QKeyEvent&)), q, SLOT(sendKeyPressEvent(const QKeyEvent&)));
+ QObject::connect(buttonGroup, SIGNAL(buttonDoublePressed(const QKeyEvent&)), q, SLOT(sendKeyDoublePressEvent(const QKeyEvent&)));
+ QObject::connect(buttonGroup, SIGNAL(buttonReleased(const QKeyEvent&)), q, SLOT(sendKeyReleaseEvent(const QKeyEvent&)));
+ QObject::connect(buttonGroup, SIGNAL(buttonLongPressed(const QKeyEvent&)), q, SLOT(sendLongPressEvent(const QKeyEvent&)));
+ QObject::connect(buttonGroup, SIGNAL(pressedButtonChanged(const QKeyEvent&, const QKeyEvent&)), q, SLOT(sendKeyChangeEvent(const QKeyEvent&, const QKeyEvent&)));
+ }
+
+ QObject::connect(q, SIGNAL(flickEvent(HbInputVkbWidget::HbFlickDirection)), buttonGroup, SLOT(cancelButtonPress()));
+}
+
+int HbQwerty10x4KeyboardPrivate::keyCode(int buttonId)
+{
+ return HbButtonKeyCodeTable[buttonId];
+}
+
+void HbQwerty10x4KeyboardPrivate::applyEditorConstraints()
+{
+ Q_Q(HbQwerty10x4Keyboard);
+
+ HbInputFocusObject *focusedObject = mOwner->focusObject();
+ if (!focusedObject) {
+ return;
+ }
+
+ HbInputButtonGroup *buttonGroup = static_cast<HbInputButtonGroup*>(q->contentItem());
+ if (buttonGroup) {
+ QList<HbInputButton*> buttons = buttonGroup->buttons();
+ for (int i = 0; i < buttons.count(); ++i) {
+ if (keyCode(i) == HbInputButton::ButtonKeyCodeCharacter) {
+ HbInputButton *item = buttons.at(i);
+
+ HbInputButton::HbInputButtonState state = item->state();
+ QString data = item->text(HbInputButton::ButtonTextIndexPrimary);
+ if (data.isEmpty() || !focusedObject->characterAllowedInEditor(data.at(0))) {
+ state = HbInputButton::ButtonStateDisabled;
+ } else if (item->state() == HbInputButton::ButtonStateDisabled) {
+ state = HbInputButton::ButtonStateReleased;
+ }
+ item->setState(state);
+ }
+ }
+ buttonGroup->setButtons(buttons);
+ }
+}
+
+void HbQwerty10x4KeyboardPrivate::updateButtons()
+{
+ Q_Q(HbQwerty10x4Keyboard);
+
+ HbInputButtonGroup *buttonGroup = static_cast<HbInputButtonGroup*>(q->contentItem());
+ if (buttonGroup) {
+ HbInputButton *item = buttonGroup->button(HbInputButton::ButtonKeyCodeShift);
+ if (item && item->state() != HbInputButton::ButtonStateDisabled) {
+ if (mModifiers & HbModifierShiftPressed) {
+ item->setState(HbInputButton::ButtonStateLatched);
+ } else {
+ item->setState(HbInputButton::ButtonStateReleased);
+ }
+ }
+ }
+
+ HbInputVkbWidgetPrivate::updateButtons();
+}
+
+/*!
+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
+changed later (for example when the input language changes) by calling
+setKeymap.
+*/
+HbQwerty10x4Keyboard::HbQwerty10x4Keyboard(HbInputMethod *owner, const HbKeymap *keymap, QGraphicsItem *parent)
+ : HbInputVkbWidget(*new HbQwerty10x4KeyboardPrivate, parent)
+{
+ Q_D(HbQwerty10x4Keyboard);
+ d->mOwner = owner;
+ setKeymap(keymap);
+
+ QObject::connect(HbInputSettingProxy::instance(), SIGNAL(characterPreviewStateForQwertyChanged(bool)), this, SLOT(updateButtonPreviewStatus(bool)));
+}
+
+/*!
+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
+changed later (for example when the input language changes) by calling
+setKeymap.
+*/
+HbQwerty10x4Keyboard::HbQwerty10x4Keyboard(HbQwerty10x4KeyboardPrivate &dd, HbInputMethod *owner,
+ const HbKeymap *keymap, QGraphicsItem *parent)
+ : HbInputVkbWidget(dd, parent)
+{
+ Q_D(HbQwerty10x4Keyboard);
+ d->mOwner = owner;
+ setKeymap(keymap);
+
+ QObject::connect(HbInputSettingProxy::instance(), SIGNAL(characterPreviewStateForQwertyChanged(bool)), this, SLOT(updateButtonPreviewStatus(bool)));
+}
+
+/*!
+Destructs the object.
+*/
+HbQwerty10x4Keyboard::~HbQwerty10x4Keyboard()
+{
+}
+
+/*!
+Returns keyboard type.
+*/
+HbKeyboardType HbQwerty10x4Keyboard::keyboardType() const
+{
+ return HbKeyboardVirtualQwerty;
+}
+
+/*!
+Returns preferred keyboard size. HbVkbHost uses this information when it opens the keyboard.
+*/
+QSizeF HbQwerty10x4Keyboard::preferredKeyboardSize()
+{
+ Q_D(HbQwerty10x4Keyboard);
+
+ QSizeF result;
+ qreal unitValue = HbDeviceProfile::profile(mainWindow()).unitValue();
+
+ result.setHeight(HbKeyboardHeightInUnits * unitValue + d->mCloseHandleHeight);
+ result.setWidth(HbKeyboardWidthInUnits * unitValue);
+
+ return QSizeF(result);
+}
+
+/*!
+Updates button preview status.
+*/
+void HbQwerty10x4Keyboard::updateButtonPreviewStatus(bool status)
+{
+ HbInputButtonGroup *buttonGroup = static_cast<HbInputButtonGroup*>(contentItem());
+ if (buttonGroup) {
+ buttonGroup->setButtonPreviewEnabled(status);
+ }
+}
+
+// End of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbplugins/inputmethods/touchinput/hbinputqwerty10x4touchkeyboard.h Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,62 @@
+/****************************************************************************
+**
+** 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_QWERTY_10x4_KEYBOARD_H
+#define HB_INPUT_QWERTY_10x4_KEYBOARD_H
+
+#include <hbinputdef.h>
+#include "hbinputvkbwidget.h"
+
+class HbKeymap;
+class HbQwerty10x4KeyboardPrivate;
+
+class HbQwerty10x4Keyboard : public HbInputVkbWidget
+{
+ Q_OBJECT
+
+public:
+ HbQwerty10x4Keyboard(HbInputMethod *owner, const HbKeymap *keymap, QGraphicsItem *parent = 0);
+ virtual ~HbQwerty10x4Keyboard();
+
+public: // from HbVirtualKeyboard
+ HbKeyboardType keyboardType() const;
+
+public: // From HbInputVkbWidget
+ QSizeF preferredKeyboardSize();
+
+protected:
+ HbQwerty10x4Keyboard(HbQwerty10x4KeyboardPrivate &dd, HbInputMethod *owner, const HbKeymap *keymap, QGraphicsItem* parent);
+
+private slots:
+ void updateButtonPreviewStatus(bool status);
+
+private:
+ Q_DECLARE_PRIVATE_D(d_ptr, HbQwerty10x4Keyboard)
+ Q_DISABLE_COPY(HbQwerty10x4Keyboard)
+};
+
+#endif // HB_INPUT_QWERTY_10x4_KEYBOARD_H
+
+// End of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbplugins/inputmethods/touchinput/hbinputqwerty10x4touchkeyboard_p.h Fri May 14 16:09:54 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 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_QWERTY_10x4_TOUCH_KEYBOARD_PRIVATE_H
+#define HB_INPUT_QWERTY_10x4_TOUCH_KEYBOARD_PRIVATE_H
+
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the Hb Inputs API. It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "hbinputqwerty10x4touchkeyboard.h"
+#include "hbinputvkbwidget_p.h"
+
+class HbQwerty10x4KeyboardPrivate : public HbInputVkbWidgetPrivate
+{
+ Q_DECLARE_PUBLIC(HbQwerty10x4Keyboard)
+
+public:
+
+ HbQwerty10x4KeyboardPrivate();
+ ~HbQwerty10x4KeyboardPrivate();
+
+ void init();
+ int keyCode(int buttonId);
+ void applyEditorConstraints();
+ void updateButtons();
+};
+
+#endif // HB_INPUT_QWERTY_10x4_TOUCH_KEYBOARD_PRIVATE_H
+
+// End of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbplugins/inputmethods/touchinput/hbinputqwerty11x4touchkeyboard.cpp Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,197 @@
+/****************************************************************************
+**
+** 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 <hbdeviceprofile.h>
+
+#include <hbinputmethod.h>
+#include <hbinputkeymap.h>
+#include <hbinputsettingproxy.h>
+
+#include "hbinputqwerty11x4touchkeyboard.h"
+#include "hbinputqwerty11x4touchkeyboard_p.h"
+#include "hbinputvkbwidget_p.h"
+#include "hbinputbuttongroup.h"
+#include "hbinputbutton.h"
+#include "hbinputmodeindicator.h"
+
+const qreal HbKeyboardHeightInUnits = 34.6;
+const qreal HbKeyboardWidthInUnits = 95.5;
+
+const int HbVirtualQwertyNumberOfRows = 4;
+const int HbVirtualQwertyNumberOfColumns = 11;
+const int HbButtonKeyCodeTable[HbVirtualQwertyNumberOfRows * HbVirtualQwertyNumberOfColumns - 1] =
+{
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeDelete,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeEnter,
+ HbInputButton::ButtonKeyCodeShift,
+ HbInputButton::ButtonKeyCodeSymbol,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeSpace,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeSettings,
+ HbInputButton::ButtonKeyCodeCustom
+};
+
+HbQwerty11x4KeyboardPrivate::HbQwerty11x4KeyboardPrivate()
+{
+}
+
+HbQwerty11x4KeyboardPrivate::~HbQwerty11x4KeyboardPrivate()
+{
+}
+
+void HbQwerty11x4KeyboardPrivate::init()
+{
+ Q_Q(HbQwerty11x4Keyboard);
+
+ HbInputVkbWidgetPrivate::init();
+
+ HbInputButtonGroup *buttonGroup = static_cast<HbInputButtonGroup*>(q->contentItem());
+ if (buttonGroup) {
+ buttonGroup->setGridSize(QSize(HbVirtualQwertyNumberOfColumns, HbVirtualQwertyNumberOfRows));
+
+ int key = 0;
+ QList<HbInputButton*> buttons;
+ for (int i = 0; i < HbVirtualQwertyNumberOfColumns * HbVirtualQwertyNumberOfRows - 1; ++i) {
+ HbInputButton *item = new HbInputButton(HbButtonKeyCodeTable[i], QPoint(key % HbVirtualQwertyNumberOfColumns, key / HbVirtualQwertyNumberOfColumns));
+ buttons.append(item);
+
+ if (HbButtonKeyCodeTable[i] == HbInputButton::ButtonKeyCodeSettings) {
+ mInputModeIndicator = new HbInputModeIndicator(item, q);
+ } else if (HbButtonKeyCodeTable[i] == HbInputButton::ButtonKeyCodeSpace) {
+ item->setSize(QSize(2, 1));
+ ++key;
+ }
+ ++key;
+ }
+ buttonGroup->setButtons(buttons);
+ buttonGroup->setButtonPreviewEnabled(HbInputSettingProxy::instance()->isCharacterPreviewForQwertyEnabled());
+ buttonGroup->setCharacterSelectionPreviewEnabled(true);
+
+ QObject::connect(buttonGroup, SIGNAL(buttonPressed(const QKeyEvent&)), q, SLOT(sendKeyPressEvent(const QKeyEvent&)));
+ QObject::connect(buttonGroup, SIGNAL(buttonDoublePressed(const QKeyEvent&)), q, SLOT(sendKeyDoublePressEvent(const QKeyEvent&)));
+ QObject::connect(buttonGroup, SIGNAL(buttonReleased(const QKeyEvent&)), q, SLOT(sendKeyReleaseEvent(const QKeyEvent&)));
+ QObject::connect(buttonGroup, SIGNAL(buttonLongPressed(const QKeyEvent&)), q, SLOT(sendLongPressEvent(const QKeyEvent&)));
+ QObject::connect(buttonGroup, SIGNAL(pressedButtonChanged(const QKeyEvent&, const QKeyEvent&)), q, SLOT(sendKeyChangeEvent(const QKeyEvent&, const QKeyEvent&)));
+ }
+
+ QObject::connect(q, SIGNAL(flickEvent(HbInputVkbWidget::HbFlickDirection)), buttonGroup, SLOT(cancelButtonPress()));
+}
+
+int HbQwerty11x4KeyboardPrivate::keyCode(int buttonId)
+{
+ return HbButtonKeyCodeTable[buttonId];
+}
+
+void HbQwerty11x4KeyboardPrivate::setRockerPosition()
+{
+ Q_Q(HbQwerty11x4Keyboard);
+
+ HbInputVkbWidgetPrivate::setRockerPosition();
+
+ HbInputButtonGroup *buttonGroup = static_cast<HbInputButtonGroup*>(q->contentItem());
+ if (buttonGroup) {
+ QPointF position = mRocker->pos();
+ position.setX(position.x() + 0.5 * buttonGroup->size().width() / HbVirtualQwertyNumberOfColumns);
+
+ mRocker->setPos(position);
+ }
+}
+
+/*!
+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
+changed later (for example when the input language changes) by calling
+setKeymap.
+*/
+HbQwerty11x4Keyboard::HbQwerty11x4Keyboard(HbInputMethod *owner, const HbKeymap *keymap, QGraphicsItem *parent)
+ : HbQwerty10x4Keyboard(*new HbQwerty11x4KeyboardPrivate, owner, keymap, parent)
+{
+ Q_D(HbQwerty11x4Keyboard);
+ d->mOwner = owner;
+ setKeymap(keymap);
+
+ QObject::connect(HbInputSettingProxy::instance(), SIGNAL(characterPreviewStateForQwertyChanged(bool)), this, SLOT(updateButtonPreviewStatus(bool)));
+}
+
+/*!
+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
+changed later (for example when the input language changes) by calling
+setKeymap.
+*/
+HbQwerty11x4Keyboard::HbQwerty11x4Keyboard(HbQwerty11x4KeyboardPrivate &dd, HbInputMethod *owner,
+ const HbKeymap *keymap, QGraphicsItem *parent)
+ : HbQwerty10x4Keyboard(dd, owner, keymap, parent)
+{
+ Q_D(HbQwerty11x4Keyboard);
+ d->mOwner = owner;
+ setKeymap(keymap);
+
+ QObject::connect(HbInputSettingProxy::instance(), SIGNAL(characterPreviewStateForQwertyChanged(bool)), this, SLOT(updateButtonPreviewStatus(bool)));
+}
+
+/*!
+Destructs the object.
+*/
+HbQwerty11x4Keyboard::~HbQwerty11x4Keyboard()
+{
+}
+
+// End of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbplugins/inputmethods/touchinput/hbinputqwerty11x4touchkeyboard.h Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (developer.feedback@nokia.com)
+**
+** This file is part of the 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_QWERTY_11x4_KEYBOARD_H
+#define HB_INPUT_QWERTY_11x4_KEYBOARD_H
+
+#include <hbinputdef.h>
+#include "hbinputqwerty10x4touchkeyboard.h"
+
+class HbKeymap;
+class HbQwerty11x4KeyboardPrivate;
+
+class HbQwerty11x4Keyboard : public HbQwerty10x4Keyboard
+{
+ Q_OBJECT
+
+public:
+ HbQwerty11x4Keyboard(HbInputMethod *owner, const HbKeymap *keymap, QGraphicsItem *parent = 0);
+ virtual ~HbQwerty11x4Keyboard();
+
+protected:
+ HbQwerty11x4Keyboard(HbQwerty11x4KeyboardPrivate &dd, HbInputMethod *owner, const HbKeymap *keymap, QGraphicsItem* parent);
+
+private:
+ Q_DECLARE_PRIVATE_D(d_ptr, HbQwerty11x4Keyboard)
+ Q_DISABLE_COPY(HbQwerty11x4Keyboard)
+};
+
+#endif // HB_INPUT_QWERTY_11x4_KEYBOARD_H
+
+// End of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbplugins/inputmethods/touchinput/hbinputqwerty11x4touchkeyboard_p.h Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,59 @@
+/****************************************************************************
+**
+** 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_QWERTY_11x4_TOUCH_KEYBOARD_PRIVATE_H
+#define HB_INPUT_QWERTY_11x4_TOUCH_KEYBOARD_PRIVATE_H
+
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the Hb Inputs API. It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "hbinputqwerty11x4touchkeyboard.h"
+#include "hbinputqwerty10x4touchkeyboard_p.h"
+
+class HbQwerty11x4KeyboardPrivate : public HbQwerty10x4KeyboardPrivate
+{
+ Q_DECLARE_PUBLIC(HbQwerty11x4Keyboard)
+
+public:
+
+ HbQwerty11x4KeyboardPrivate();
+ ~HbQwerty11x4KeyboardPrivate();
+
+ void init();
+ int keyCode(int buttonId);
+ void setRockerPosition();
+};
+
+#endif // HB_INPUT_QWERTY_11x4_TOUCH_KEYBOARD_PRIVATE_H
+
+// End of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbplugins/inputmethods/touchinput/hbinputqwertynumerictouchkeyboard.cpp Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,299 @@
+/****************************************************************************
+**
+** 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 <hbdeviceprofile.h>
+
+#include <hbinputmethod.h>
+#include <hbinputkeymap.h>
+#include <hbinputsettingproxy.h>
+
+#include "hbinputqwertynumerictouchkeyboard.h"
+#include "hbinputqwertynumerictouchkeyboard_p.h"
+#include "hbinputvkbwidget_p.h"
+#include "hbinputbuttongroup.h"
+#include "hbinputbutton.h"
+#include "hbinputmodeindicator.h"
+
+const qreal HbKeyboardHeightInUnits = 17.3;
+const qreal HbKeyboardWidthInUnits = 95.5;
+
+const int HbVirtualQwertyNumberOfRows = 2;
+const int HbVirtualQwertyNumberOfColumns = 10;
+const int HbButtonKeyCodeTable[HbVirtualQwertyNumberOfRows * HbVirtualQwertyNumberOfColumns] =
+{
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeShift,
+ HbInputButton::ButtonKeyCodeSymbol,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeCharacter,
+ HbInputButton::ButtonKeyCodeDelete,
+ HbInputButton::ButtonKeyCodeSettings,
+ HbInputButton::ButtonKeyCodeCustom
+};
+
+HbQwertyNumericKeyboardPrivate::HbQwertyNumericKeyboardPrivate()
+{
+}
+
+HbQwertyNumericKeyboardPrivate::~HbQwertyNumericKeyboardPrivate()
+{
+}
+
+void HbQwertyNumericKeyboardPrivate::init()
+{
+ Q_Q(HbQwertyNumericKeyboard);
+
+ HbInputVkbWidgetPrivate::init();
+
+ HbInputButtonGroup *buttonGroup = static_cast<HbInputButtonGroup*>(q->contentItem());
+ if (buttonGroup) {
+ buttonGroup->setGridSize(QSize(HbVirtualQwertyNumberOfColumns, HbVirtualQwertyNumberOfRows));
+
+ QList<HbInputButton*> buttons;
+ for (int i = 0; i < HbVirtualQwertyNumberOfColumns * HbVirtualQwertyNumberOfRows; ++i) {
+ HbInputButton *item = new HbInputButton(HbButtonKeyCodeTable[i], QPoint(i % HbVirtualQwertyNumberOfColumns, i / HbVirtualQwertyNumberOfColumns));
+ buttons.append(item);
+
+ if (HbButtonKeyCodeTable[i] == HbInputButton::ButtonKeyCodeSettings) {
+ mInputModeIndicator = new HbInputModeIndicator(item, q);
+ } else if (HbButtonKeyCodeTable[i] == HbInputButton::ButtonKeyCodeShift ||
+ HbButtonKeyCodeTable[i] == HbInputButton::ButtonKeyCodeSymbol) {
+ item->setState(HbInputButton::ButtonStateDisabled);
+ }
+ }
+ buttonGroup->setButtons(buttons);
+ buttonGroup->setButtonPreviewEnabled(HbInputSettingProxy::instance()->isCharacterPreviewForQwertyEnabled());
+
+ QObject::connect(buttonGroup, SIGNAL(buttonPressed(const QKeyEvent&)), q, SLOT(sendKeyPressEvent(const QKeyEvent&)));
+ QObject::connect(buttonGroup, SIGNAL(buttonDoublePressed(const QKeyEvent&)), q, SLOT(sendKeyDoublePressEvent(const QKeyEvent&)));
+ QObject::connect(buttonGroup, SIGNAL(buttonReleased(const QKeyEvent&)), q, SLOT(sendKeyReleaseEvent(const QKeyEvent&)));
+ QObject::connect(buttonGroup, SIGNAL(buttonLongPressed(const QKeyEvent&)), q, SLOT(sendLongPressEvent(const QKeyEvent&)));
+ QObject::connect(buttonGroup, SIGNAL(pressedButtonChanged(const QKeyEvent&, const QKeyEvent&)), q, SLOT(sendKeyChangeEvent(const QKeyEvent&, const QKeyEvent&)));
+ }
+ QObject::connect(q, SIGNAL(flickEvent(HbInputVkbWidget::HbFlickDirection)), buttonGroup, SLOT(cancelButtonPress()));
+}
+
+int HbQwertyNumericKeyboardPrivate::keyCode(int buttonId)
+{
+ return HbButtonKeyCodeTable[buttonId];
+}
+
+void HbQwertyNumericKeyboardPrivate::applyEditorConstraints()
+{
+ Q_Q(HbQwertyNumericKeyboard);
+
+ HbInputFocusObject *focusedObject = mOwner->focusObject();
+ if (!focusedObject) {
+ return;
+ }
+
+ HbInputButtonGroup *buttonGroup = static_cast<HbInputButtonGroup*>(q->contentItem());
+ if (buttonGroup) {
+ QList<HbInputButton*> buttons = buttonGroup->buttons();
+ for (int i = 0; i < buttons.count(); ++i) {
+ if (keyCode(i) == HbInputButton::ButtonKeyCodeCharacter) {
+ HbInputButton *item = buttons.at(i);
+
+ HbInputButton::HbInputButtonState state = item->state();
+ QString data = item->text(HbInputButton::ButtonTextIndexPrimary);
+ if (data.isEmpty() || !focusedObject->characterAllowedInEditor(data.at(0))) {
+ state = HbInputButton::ButtonStateDisabled;
+ } else if (item->state() == HbInputButton::ButtonStateDisabled) {
+ state = HbInputButton::ButtonStateReleased;
+ }
+ item->setState(state);
+ }
+ }
+ buttonGroup->setButtons(buttons);
+ }
+}
+
+void HbQwertyNumericKeyboardPrivate::updateKeyCodes()
+{
+ Q_Q(HbQwertyNumericKeyboard);
+
+ QString characters;
+ getCharacters(characters);
+
+ HbInputButtonGroup *buttonGroup = static_cast<HbInputButtonGroup*>(q->contentItem());
+ if (buttonGroup) {
+ int key = 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->setKeyCode(characters.at(key).unicode());
+ }
+ ++key;
+ }
+ }
+ }
+}
+
+void HbQwertyNumericKeyboardPrivate::updateButtons()
+{
+ Q_Q(HbQwertyNumericKeyboard);
+
+ QString characters;
+ getCharacters(characters);
+
+ HbInputButtonGroup *buttonGroup = static_cast<HbInputButtonGroup*>(q->contentItem());
+ if (buttonGroup) {
+ int key = 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);
+ } else {
+ item->setText(QString(), HbInputButton::ButtonTextIndexPrimary);
+ }
+ ++key;
+ }
+ }
+ buttonGroup->setButtons(buttons);
+ }
+}
+
+void HbQwertyNumericKeyboardPrivate::getCharacters(QString &characters)
+{
+ characters = QString("1234567890");
+
+ if (mKeymap) {
+ const HbKeyboardMap* keyboardMap = mKeymap->keyboard(HbKeyboardSctLandscape);
+ if (!keyboardMap) {
+ return;
+ }
+
+ foreach (const HbMappedKey* mappedKey, keyboardMap->keys) {
+ QString chars = mappedKey->characters(HbModifierNone);
+
+ HbInputFocusObject *focusedObject = mOwner->focusObject();
+ QString allowedChars;
+ if (focusedObject) {
+ focusedObject->filterStringWithEditorFilter(chars, allowedChars);
+ }
+
+ 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
+changed later (for example when the input language changes) by calling
+setKeymap.
+*/
+HbQwertyNumericKeyboard::HbQwertyNumericKeyboard(HbInputMethod *owner, const HbKeymap *keymap, QGraphicsItem *parent)
+ : HbInputVkbWidget(*new HbQwertyNumericKeyboardPrivate, parent)
+{
+ Q_D(HbQwertyNumericKeyboard);
+ d->mOwner = owner;
+ setKeymap(keymap);
+
+ QObject::connect(HbInputSettingProxy::instance(), SIGNAL(characterPreviewStateForQwertyChanged(bool)), this, SLOT(updateButtonPreviewStatus(bool)));
+}
+
+/*!
+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
+changed later (for example when the input language changes) by calling
+setKeymap.
+*/
+HbQwertyNumericKeyboard::HbQwertyNumericKeyboard(HbQwertyNumericKeyboardPrivate &dd, HbInputMethod *owner,
+ const HbKeymap *keymap, QGraphicsItem* parent)
+ : HbInputVkbWidget(dd, parent)
+{
+ Q_D(HbQwertyNumericKeyboard);
+ d->mOwner = owner;
+ setKeymap(keymap);
+
+ QObject::connect(HbInputSettingProxy::instance(), SIGNAL(characterPreviewStateForQwertyChanged(bool)), this, SLOT(updateButtonPreviewStatus(bool)));
+}
+
+/*!
+Destructs the object.
+*/
+HbQwertyNumericKeyboard::~HbQwertyNumericKeyboard()
+{
+}
+
+/*!
+Returns keyboard type.
+*/
+HbKeyboardType HbQwertyNumericKeyboard::keyboardType() const
+{
+ return HbKeyboardVirtualQwerty;
+}
+
+/*!
+Returns preferred keyboard size. HbVkbHost uses this information when it opens the keyboard.
+*/
+QSizeF HbQwertyNumericKeyboard::preferredKeyboardSize()
+{
+ Q_D(HbQwertyNumericKeyboard);
+
+ QSizeF result;
+ qreal unitValue = HbDeviceProfile::profile(mainWindow()).unitValue();
+
+ result.setHeight(HbKeyboardHeightInUnits * unitValue + d->mCloseHandleHeight);
+ result.setWidth(HbKeyboardWidthInUnits * unitValue);
+
+ return QSizeF(result);
+}
+
+/*!
+Updates button preview status.
+*/
+void HbQwertyNumericKeyboard::updateButtonPreviewStatus(bool status)
+{
+ HbInputButtonGroup *buttonGroup = static_cast<HbInputButtonGroup*>(contentItem());
+ if (buttonGroup) {
+ buttonGroup->setButtonPreviewEnabled(status);
+ }
+}
+
+// End of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbplugins/inputmethods/touchinput/hbinputqwertynumerictouchkeyboard.h Fri May 14 16:09:54 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 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_QWERTY_NUMERIC_KEYBOARD_H
+#define HB_INPUT_QWERTY_NUMERIC_KEYBOARD_H
+
+#include <hbinputdef.h>
+#include "hbinputvkbwidget.h"
+
+class HbKeymap;
+class HbQwertyNumericKeyboardPrivate;
+
+class HbQwertyNumericKeyboard : public HbInputVkbWidget
+{
+ Q_OBJECT
+
+public:
+ HbQwertyNumericKeyboard(HbInputMethod *owner, const HbKeymap *keymap, QGraphicsItem *parent = 0);
+ virtual ~HbQwertyNumericKeyboard();
+
+public: // from HbVirtualKeyboard
+ HbKeyboardType keyboardType() const;
+ QSizeF preferredKeyboardSize();
+
+protected:
+ HbQwertyNumericKeyboard(HbQwertyNumericKeyboardPrivate &dd, HbInputMethod *owner, const HbKeymap *keymap, QGraphicsItem* parent);
+
+private slots:
+ void updateButtonPreviewStatus(bool status);
+
+private:
+ Q_DECLARE_PRIVATE_D(d_ptr, HbQwertyNumericKeyboard)
+ Q_DISABLE_COPY(HbQwertyNumericKeyboard)
+};
+
+#endif // HB_INPUT_QWERTY_NUMERIC_KEYBOARD_H
+
+// End of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbplugins/inputmethods/touchinput/hbinputqwertynumerictouchkeyboard_p.h Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,62 @@
+/****************************************************************************
+**
+** 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_QWERTY_NUMERIC_TOUCH_KEYBOARD_PRIVATE_H
+#define HB_INPUT_QWERTY_NUMERIC_TOUCH_KEYBOARD_PRIVATE_H
+
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the Hb Inputs API. It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "hbinputqwertynumerictouchkeyboard.h"
+#include "hbinputvkbwidget_p.h"
+
+class HbQwertyNumericKeyboardPrivate : public HbInputVkbWidgetPrivate
+{
+ Q_DECLARE_PUBLIC(HbQwertyNumericKeyboard)
+
+public:
+
+ HbQwertyNumericKeyboardPrivate();
+ ~HbQwertyNumericKeyboardPrivate();
+
+ void init();
+ int keyCode(int buttonId);
+ void applyEditorConstraints();
+ void updateKeyCodes();
+ void updateButtons();
+ void getCharacters(QString &characters);
+};
+
+#endif // HB_INPUT_QWERTY_NUMERIC_TOUCH_KEYBOARD_PRIVATE_H
+
+// End of file
--- a/src/hbplugins/inputmethods/touchinput/hbinputthaispecialpopup.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/hbinputthaispecialpopup.cpp Fri May 14 16:09:54 2010 +0300
@@ -29,12 +29,12 @@
#include <QSignalMapper>
#include <HbMainWindow>
-#include <hbinputtouchkeypadbutton.h>
#include <hbgridview.h>
#include <hbwidget.h>
#include <hbdialog_p.h>
#include <HbPopup>
+#include "hbinputtouchkeypadbutton.h"
#include "hbinputthaispecialpopup.h"
const QString HbAbcButtonObjName = "Popup abc";
@@ -71,7 +71,7 @@
public:
//Character classes
enum ThaiGlyphTypes {
- HbThaiCharNon = 0, //Not a Thai letter
+ HbThaiCharNon = 0, //Not a Thai letter
HbThaiCharCons, //Thai consonant
HbThaiCharLV, //Leading vowel
HbThaiCharFV1, //Following vowel, type 1
@@ -92,7 +92,7 @@
QGraphicsGridLayout* mButtonLayout;
QGraphicsWidget* mButtonWidget;
QList<HbTouchKeypadButton *> mPopupButtons;
- QSignalMapper *mActionMapper;
+ QSignalMapper *mActionMapper;
QSignalMapper *mClickMapper;
QString mSpecialCharacterSet;
const HbKeymap *mKeymap;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbplugins/inputmethods/touchinput/hbinputtouchkeypadbutton.cpp Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,454 @@
+/****************************************************************************
+**
+** 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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbplugins/inputmethods/touchinput/hbinputtouchkeypadbutton.h Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,105 @@
+/****************************************************************************
+**
+** 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 Mon May 03 12:48:33 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/touchinput.pro Fri May 14 16:09:54 2010 +0300
@@ -57,7 +57,15 @@
HEADERS += hbinputbasic12keythaihandler.h
HEADERS += hbinputprediction12keythaihandler.h
HEADERS += hbinputthaispecialpopup.h
-
+HEADERS += hbinput12keytouchkeyboard.h
+HEADERS += hbinput12keytouchkeyboard_p.h
+HEADERS += hbinputqwerty10x4touchkeyboard.h
+HEADERS += hbinputqwerty10x4touchkeyboard_p.h
+HEADERS += hbinputqwerty11x4touchkeyboard.h
+HEADERS += hbinputqwerty11x4touchkeyboard_p.h
+HEADERS += hbinputqwertynumerictouchkeyboard.h
+HEADERS += hbinputqwertynumerictouchkeyboard_p.h
+HEADERS += hbinputtouchkeypadbutton.h
SOURCES = virtual12key.cpp
SOURCES += virtualqwerty.cpp
@@ -76,6 +84,12 @@
SOURCES += hbinputbasic12keythaihandler.cpp
SOURCES += hbinputprediction12keythaihandler.cpp
SOURCES += hbinputthaispecialpopup.cpp
+SOURCES += hbinput12keytouchkeyboard.cpp
+SOURCES += hbinputqwerty10x4touchkeyboard.cpp
+SOURCES += hbinputqwerty11x4touchkeyboard.cpp
+SOURCES += hbinputqwertynumerictouchkeyboard.cpp
+SOURCES += hbinputtouchkeypadbutton.cpp
+
symbian {
TARGET.EPOCALLOWDLLDATA = 1
TARGET.CAPABILITY = CAP_GENERAL_DLL
--- a/src/hbplugins/inputmethods/touchinput/virtual12key.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/virtual12key.cpp Fri May 14 16:09:54 2010 +0300
@@ -29,22 +29,24 @@
//Required Hb headers
#include <hbinputkeymapfactory.h>
#include <hbinputkeymap.h>
-#include <hbinput12keytouchkeypad.h>
#include <hbinputsettingproxy.h>
#include <hbinpututils.h>
-#include <hbinputsctportrait.h>
+#include <hbinputsctkeyboard.h>
#include <hbinputeditorinterface.h>
#include <hbinputcandidatelist.h>
#include <hbinputpredictionfactory.h>
#include <hbinputpredictionengine.h>
+#include <hbinputsettingproxy.h>
#include <hbmainwindow.h>
#include <hbaction.h>
#include <hbview.h>
#include <hbinputvkbhost.h>
#include <hbinputcommondialogs.h>
+#include <hbinputbutton.h>
#include <hbdeviceprofile.h>
//User includes
+#include "hbinput12keytouchkeyboard.h"
#include "hbinputthaispecialpopup.h"
#include "hbinputbasic12keyhandler.h"
#include "hbinputprediction12keyhandler.h"
@@ -69,9 +71,8 @@
: mCurrentKeypad(0),
mItutKeypad(0),
mSctKeypad(0),
- mThaiSpecialChar(0),
+ mThaiSpecialChar(0),
mKeymap(0),
- mSctMode(HbInputVkbWidget::HbSctViewSpecialCharacter),
mOrientationAboutToChange(false),
mCandidatePopup(0),
mCurrentlyFocused(0),
@@ -86,22 +87,27 @@
mBasicModeHandler = new HbInputBasic12KeyHandler(this);
mPredictionModeHandler = new HbInputPrediction12KeyHandler(this);
mNumericModeHandler = new HbInputNumeric12KeyHandler(this);
- mBasic12keyThaiHandler = new HbInputBasic12KeyThaiHandler(this);
- mPrediction12keyThaiHandler = new HbInputPrediction12KeyThaiHandler(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);
+ 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
- connect(mPredictionModeHandler, SIGNAL(passFilterEvent(const QKeyEvent *)), 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(mPredictionModeHandler, SIGNAL(passFilterEvent(const QKeyEvent *)),
+ 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)));
}
bool HbVirtual12Key::isSctModeActive() const
@@ -122,8 +128,8 @@
mSctKeypad = 0;
delete mCandidatePopup;
mCandidatePopup = 0;
- delete mThaiSpecialChar;
- mThaiSpecialChar = 0;
+ delete mThaiSpecialChar;
+ mThaiSpecialChar = 0;
// free mode handlers
delete mBasicModeHandler;
@@ -132,10 +138,10 @@
mPredictionModeHandler = 0;
delete mNumericModeHandler;
mNumericModeHandler = 0;
- delete mBasic12keyThaiHandler;
- mBasic12keyThaiHandler = 0;
- delete mPrediction12keyThaiHandler;
- mPrediction12keyThaiHandler = 0;
+ delete mBasic12keyThaiHandler;
+ mBasic12keyThaiHandler = 0;
+ delete mPrediction12keyThaiHandler;
+ mPrediction12keyThaiHandler = 0;
}
/*!
@@ -179,20 +185,17 @@
mOrientationAboutToChange = false;
}
-/*!
-Construct 12key touchkeypad and make the necessary connections.
-*/
-Hb12KeyTouchKeypad * HbVirtual12Key::construct12Keypad()
+Hb12KeyTouchKeyboard *HbVirtual12Key::construct12Keyboard()
{
- Hb12KeyTouchKeypad * tempKeypad = 0;
- tempKeypad = new Hb12KeyTouchKeypad(this, 0);
- connect(tempKeypad, SIGNAL(keypadCloseEventDetected(HbInputVkbWidget::HbVkbCloseMethod)), this, SLOT(keypadCloseEventDetected(HbInputVkbWidget::HbVkbCloseMethod)));
+ Hb12KeyTouchKeyboard *tempKeypad = new Hb12KeyTouchKeyboard(this, mKeymap);
+ connect(tempKeypad, SIGNAL(keypadCloseEventDetected(HbInputVkbWidget::HbVkbCloseMethod)),
+ this, SLOT(keypadCloseEventDetected(HbInputVkbWidget::HbVkbCloseMethod)));
connect(tempKeypad, SIGNAL(rockerDirection(int, HbInputVirtualRocker::RockerSelectionMode)),
- this, SLOT(rockerDirection(int, HbInputVirtualRocker::RockerSelectionMode)));
+ this, SLOT(rockerDirection(int, HbInputVirtualRocker::RockerSelectionMode)));
//FLICKDISABLED connect(tempKeypad, SIGNAL(flickEvent(HbInputVkbWidget::FlickDirection)), this, SLOT(flickEvent(HbInputVkbWidget::FlickDirection)));
connect(tempKeypad, SIGNAL(smileySelected(QString)), this, SLOT(smileySelected(QString)));
connect(tempKeypad, SIGNAL(mouseMovedOutOfButton()), this, SLOT(mouseMovedOutOfButton()));
- connect(tempKeypad, SIGNAL(chrSelected(QString)), this, SLOT(thaiSctCharacterSelected(QString)));
+ connect(tempKeypad, SIGNAL(chrSelected(QString)), this, SLOT(thaiSctCharacterSelected(QString)));
tempKeypad->setRockerVisible(true);
return tempKeypad;
}
@@ -207,6 +210,8 @@
*/
void HbVirtual12Key::focusReceived()
{
+ /* Update the text case */
+ updateState();
// load the new keymappings to all keypads and all mode handlers
loadKeymap(inputState().language());
// After loadKeyMapData call, mKeyData should have keymappings data of the current language
@@ -218,8 +223,7 @@
mVkbHost = focusObject()->editorInterface().vkbHost();
if(!mItutKeypad){
- mItutKeypad = construct12Keypad();
- mItutKeypad->setKeymap(mKeymap);
+ mItutKeypad = construct12Keyboard();
}
if (!mItutKeypad) {
@@ -238,31 +242,18 @@
}
}
- // We need to check if this focusRecieved call is due to a orientation
- // switch. If yes we should get the keypad status prior to the orientation
- // switch and open the keypad in that state only.
- // For example we have minimized the keypad in Qwerty mode and change the
- // orientation to portrait then in Itu-T mode also keypad should be in minimized state.
- if (orientationContextSwitchInProgress()) {
- HbVkbHost *host = focusObject()->editorInterface().vkbHost();
- if (host) {
- // We can get the keypad status prior to the orientation switch from vkbHost it self.
- HbVkbHost::HbVkbStatus vkbStatus = host->keypadStatusBeforeOrientationChange();
- if (vkbStatus != HbVkbHost::HbVkbStatusClosed) {
- openKeypad(mItutKeypad,vkbStatus == HbVkbHost::HbVkbStatusMinimized);
- }
- }
- } else {
- openKeypad(mItutKeypad);
- }
+ openKeypad(mItutKeypad);
if (focusObject() && mVkbHost) {
- connect(&(focusObject()->editorInterface()), SIGNAL(cursorPositionChanged(int, int)), mVkbHost, SLOT(ensureCursorVisibility()));
+ connect(&(focusObject()->editorInterface()), SIGNAL(cursorPositionChanged(int, int)),
+ mVkbHost, SLOT(ensureCursorVisibility()));
}
if (focusObject()) {
- disconnect(&(focusObject()->editorInterface()), SIGNAL(cursorPositionChanged(int, int)), mActiveModeHandler, SLOT(cursorPositionChanged(int, int)));
- connect(&(focusObject()->editorInterface()), SIGNAL(cursorPositionChanged(int, int)), mActiveModeHandler, SLOT(cursorPositionChanged(int, int)));
+ disconnect(&(focusObject()->editorInterface()), SIGNAL(cursorPositionChanged(int, int)),
+ mActiveModeHandler, SLOT(cursorPositionChanged(int, int)));
+ connect(&(focusObject()->editorInterface()), SIGNAL(cursorPositionChanged(int, int)),
+ mActiveModeHandler, SLOT(cursorPositionChanged(int, int)));
}
}
@@ -275,7 +266,8 @@
mActiveModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionFocusLost);
if (focusObject()) {
- disconnect(&(focusObject()->editorInterface()), SIGNAL(cursorPositionChanged(int, int)), mActiveModeHandler, SLOT(cursorPositionChanged(int, int)));
+ disconnect(&(focusObject()->editorInterface()), SIGNAL(cursorPositionChanged(int, int)),
+ mActiveModeHandler, SLOT(cursorPositionChanged(int, int)));
}
if (!focusSwitch && mVkbHost && mVkbHost->keypadStatus() != HbVkbHost::HbVkbStatusClosed) {
@@ -297,9 +289,9 @@
mVkbHost->closeKeypad(!stateChangeInProgress());
// set mCurrentKeypad to null.
mCurrentKeypad = 0;
- if(mThaiSpecialChar) {
- mThaiSpecialChar->hide();
- }
+ if (mThaiSpecialChar) {
+ mThaiSpecialChar->hide();
+ }
if (mCandidatePopup) {
mCandidatePopup->hide();
}
@@ -348,7 +340,8 @@
} else {
mVkbHost->openKeypad(mCurrentKeypad, this, (!stateChangeInProgress() && !wasKeypadOpen));
}
- connect(&(focusObject()->editorInterface()), SIGNAL(cursorPositionChanged(int, int)), mVkbHost, SLOT(ensureCursorVisibility()));
+ connect(&(focusObject()->editorInterface()), SIGNAL(cursorPositionChanged(int, int)),
+ mVkbHost, SLOT(ensureCursorVisibility()));
}
}
@@ -362,15 +355,6 @@
}
/*!
-\deprecated HbVirtual12Key::predictiveInputStatusChanged(int newStatus)
- is deprecated. Use predictiveInputStateChanged instead.
-*/
-void HbVirtual12Key::predictiveInputStatusChanged(int newStatus)
-{
- predictiveInputStateChanged(HbKeyboardSetting12key, newStatus);
-}
-
-/*!
The framework calls this method when the predictive input status changes.
*/
void HbVirtual12Key::predictiveInputStateChanged(HbKeyboardSettingFlags keyboardType, bool newStatus)
@@ -440,14 +424,14 @@
switch (aDirection) {
case HbInputVirtualRocker::HbRockerDirectionLeft:
- if(inputlang.isRightToLeftLanguage()) {
+ if (inputlang.isRightToLeftLanguage()) {
focusObject()->cursorRight(modifiers);
} else {
focusObject()->cursorLeft(modifiers);
}
break;
case HbInputVirtualRocker::HbRockerDirectionRight:
- if(inputlang.isRightToLeftLanguage()) {
+ if (inputlang.isRightToLeftLanguage()) {
focusObject()->cursorLeft(modifiers);
} else {
focusObject()->cursorRight(modifiers);
@@ -477,13 +461,13 @@
// inform all the mode handler about the language change.
mPredictionModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionCommit);
// move keypad off screen
- if (mCurrentKeypad){
+ if (mCurrentKeypad) {
mCurrentKeypad->keypadLanguageChangeAnimationUpdate(0);
}
loadKeymap(newLanguage);
// inform all the mode handler about the language change.
mPredictionModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionPrimaryLanguageChanged);
- if (mCurrentKeypad){
+ if (mCurrentKeypad) {
mCurrentKeypad->animKeyboardChange();
}
}
@@ -511,8 +495,7 @@
*/
void HbVirtual12Key::inputStateActivated(const HbInputState& newState)
{
- if (!isActiveMethod()
- || mKeyboardChangeAlreadyInprogress) {
+ if (!isActiveMethod() || mKeyboardChangeAlreadyInprogress) {
return; // Just to be sure...
}
@@ -530,16 +513,18 @@
}
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
+ 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().constraints())) {
- mActiveModeHandler = mBasic12keyThaiHandler;
- // by passing HbInputModeActionFocusRecieved we will be setting the candidate list and keypad
+ } 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()) {
+ } else if (newState.inputMode() == HbInputModeDefault && usePrediction()) {
mActiveModeHandler = mPredictionModeHandler;
// by passing HbInputModeActionFocusRecieved we will be setting the candidate list and keypad
mActiveModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionFocusRecieved);
@@ -552,8 +537,10 @@
}
if (focusObject()) {
- disconnect(&(focusObject()->editorInterface()), SIGNAL(cursorPositionChanged(int, int)), previousModeHandler, SLOT(cursorPositionChanged(int, int)));
- connect(&(focusObject()->editorInterface()), SIGNAL(cursorPositionChanged(int, int)), mActiveModeHandler, SLOT(cursorPositionChanged(int, int)));
+ disconnect(&(focusObject()->editorInterface()), SIGNAL(cursorPositionChanged(int, int)),
+ previousModeHandler, SLOT(cursorPositionChanged(int, int)));
+ connect(&(focusObject()->editorInterface()), SIGNAL(cursorPositionChanged(int, int)),
+ mActiveModeHandler, SLOT(cursorPositionChanged(int, int)));
}
// load the new keymappings to all keypads and all mode handlers
@@ -564,7 +551,8 @@
// Auto Completion part needs to be committed as well on mode change.
previousModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionCommit);
- if (mActiveModeHandler == mPredictionModeHandler || mActiveModeHandler == mPrediction12keyThaiHandler) {
+ if (mActiveModeHandler == mPredictionModeHandler ||
+ mActiveModeHandler == mPrediction12keyThaiHandler) {
// lets set candidate list and keypad type to the engine.
mActiveModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionSetCandidateList);
mActiveModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionSetKeypad);
@@ -580,33 +568,33 @@
void HbVirtual12Key::loadKeymap(const HbInputLanguage &newLanguage)
{
//dont try to get the keymappings if we ( mKeyData) already have keymappings for newLanguage
- if(!mKeymap || mKeymap->language().language() != newLanguage.language()){
+ if (!mKeymap || mKeymap->language().language() != newLanguage.language()) {
const HbKeymap* keymap = HbKeymapFactory::instance()->keymap(newLanguage);
- if(keymap){
+ if(keymap) {
mKeymap = keymap;
- if(mItutKeypad) {
+ if (mItutKeypad) {
mItutKeypad->setKeymap(mKeymap);
}
- if(mSctKeypad) {
+ if (mSctKeypad) {
mSctKeypad->setKeymap(mKeymap);
}
// inform mode handlers about the language change.
- if(mBasicModeHandler) {
+ if (mBasicModeHandler) {
mBasicModeHandler->setKeymap(mKeymap);
}
- if(mPredictionModeHandler) {
+ if (mPredictionModeHandler) {
mPredictionModeHandler->setKeymap(mKeymap);
}
- if(mNumericModeHandler) {
+ if (mNumericModeHandler) {
mNumericModeHandler->setKeymap(mKeymap);
}
- if(mBasic12keyThaiHandler) {
- mBasic12keyThaiHandler->setKeymap(mKeymap);
- }
- if (mPrediction12keyThaiHandler) {
- mPrediction12keyThaiHandler->setKeymap(mKeymap);
- }
+ if (mBasic12keyThaiHandler) {
+ mBasic12keyThaiHandler->setKeymap(mKeymap);
+ }
+ if (mPrediction12keyThaiHandler) {
+ mPrediction12keyThaiHandler->setKeymap(mKeymap);
+ }
}
}
}
@@ -622,19 +610,29 @@
// launch Candidate List
bool ret = mPredictionModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionLaunchCandidatePopup);
// In case when candidate list is not launched i.e. when the word is not in inlline editing state, launch SCT
- if (!ret){
- mSctMode = HbInputVkbWidget::HbSctViewSpecialCharacter;
+ if (!ret) {
displaySpecialCharacterTable(this);
}
}
}
+HbKeyboardType HbVirtual12Key::currentKeyboardType() const
+{
+ HbKeyboardType type = HbKeyboardNone;
+ if (mCurrentKeypad) {
+ type = mCurrentKeypad->keyboardType();
+ }
+ return type;
+}
+
/*!
this slot is called by the mode handlers when there is sym key or long press of Asterisk key.
*/
void HbVirtual12Key::switchMode(int keyCode)
{
- if (keyCode == Qt::Key_Asterisk || keyCode == Qt::Key_Control){
+ if (keyCode == HbInputButton::ButtonKeyCodeAsterisk ||
+ keyCode == HbInputButton::ButtonKeyCodeSymbol ||
+ keyCode == HbInputButton::ButtonKeyCodeAlphabet) {
if (mCandidatePopup && mCandidatePopup->isVisible()) {
return;
}
@@ -644,13 +642,12 @@
switchToAlphaMode();
} else {
// launch special character keypad
- mSctMode = HbInputVkbWidget::HbSctViewSpecialCharacter;
displaySpecialCharacterTable(this);
}
- } else if ( keyCode == Qt::Key_Shift) {
+ } else if (keyCode == HbInputButton::ButtonKeyCodeShift) {
HbInputState nextState = inputState();
- if (nextState.inputMode() != HbInputModeNumeric ) {
- nextState.setInputMode( HbInputModeNumeric );
+ if (nextState.inputMode() != HbInputModeNumeric) {
+ nextState.setInputMode(HbInputModeNumeric);
} else {
editorRootState(nextState);
}
@@ -663,39 +660,40 @@
*/
uint HbVirtual12Key::previousChar()
{
- if(focusObject()) {
- int cursorPosition = focusObject()->editorCursorPosition();
- if(cursorPosition) {
- QString editorText = focusObject()->editorSurroundingText();
- return((editorText.at(cursorPosition-1)).unicode());
- }
- }
- return 0;
+ 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();
- }
+ 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();
+ }
}
/*!
@@ -705,15 +703,15 @@
{
Q_UNUSED(receiver);
- if(!mSctKeypad) {
- mSctKeypad = new HbInputSctPortrait(this,mKeymap,0);
- connect(mSctKeypad, SIGNAL(keypadCloseEventDetected(HbInputVkbWidget::HbVkbCloseMethod)), this, SLOT(keypadCloseEventDetected(HbInputVkbWidget::HbVkbCloseMethod)));
- connect(mSctKeypad, SIGNAL(sctCharacterSelected(QString)), this, SLOT(sctCharacterSelected(QString)));
- connect(mSctKeypad, SIGNAL(smileySelected(QString)), this, SLOT(smileySelected(QString)));
+ if (!mSctKeypad) {
+ mSctKeypad = new HbSctKeyboard(this, mKeymap, 0);
+ connect(mSctKeypad, SIGNAL(keypadCloseEventDetected(HbInputVkbWidget::HbVkbCloseMethod)),
+ this, SLOT(keypadCloseEventDetected(HbInputVkbWidget::HbVkbCloseMethod)));
+ connect(mSctKeypad, SIGNAL(smileySelected(QString)),
+ this, SLOT(smileySelected(QString)));
mSctKeypad->setRockerVisible(false);
}
-
- mSctKeypad->setSct(mSctMode);
+ mSctKeypad->setMode(EModeAbc, HbModifierNone);
//Open the keypad
openKeypad(mSctKeypad);
@@ -752,13 +750,14 @@
{
if (!mCandidatePopup) {
mCandidatePopup = new HbCandidateList(this);
+ connect(mCandidatePopup, SIGNAL(candidateSelected(int,QString)), this, SLOT(candidatePopupClosed(int,QString)));
}
mCandidatePopup->populateList(candidates);
mCandidatePopup->setModal(true);
QSizeF candListSize = mCandidatePopup->size();
QPointF candListPos = mCandidatePopup->pos();
- getCandidatePositionAndSize(mCandidatePopup, mCurrentKeypad, candListPos,candListSize);
+ getCandidatePositionAndSize(mCandidatePopup, mCurrentKeypad, candListPos, candListSize);
QRectF geom = mCandidatePopup->geometry();
geom.setHeight(candListSize.height());
@@ -773,16 +772,13 @@
/*!
this slot is called when the candidate popup is closed
*/
-void HbVirtual12Key::candidatePopupClosed(int closingKey)
+void HbVirtual12Key::candidatePopupClosed(int closingKey, const QString &candidate)
{
- if (mCandidatePopup) {
- QString currentCandidate = mCandidatePopup->currentCandidate();
- if (currentCandidate.size() > 0) {
- if ((focusObject()->editorInterface().constraints() & HbEditorConstraintAutoCompletingField)) {
- mBasicModeHandler->autoCompletionPopupClosed(currentCandidate, closingKey);
- } else {
- mPredictionModeHandler->candidatePopupClosed(currentCandidate, closingKey);
- }
+ if (candidate.size() > 0) {
+ if ((focusObject()->editorInterface().inputConstraints() & HbEditorConstraintAutoCompletingField)) {
+ mBasicModeHandler->autoCompletionPopupClosed(candidate, closingKey);
+ } else {
+ mPredictionModeHandler->candidatePopupClosed(candidate, closingKey);
}
}
}
@@ -801,16 +797,6 @@
mPredictionModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionSecondaryLanguageChanged);
}
-/*!
- this slot is called by sct when a character is selected from sct.
-*/
-void HbVirtual12Key::sctCharacterSelected(QString character)
-{
- mActiveModeHandler->sctCharacterSelected(character);
- /* Update the text case */
- updateState();
-}
-
void HbVirtual12Key::smileySelected(QString smiley)
{
mActiveModeHandler->smileySelected(smiley);
@@ -818,7 +804,9 @@
void HbVirtual12Key::thaiSctCharacterSelected(QString sctChar)
{
- mActiveModeHandler->sctCharacterSelected(sctChar);
+ mActiveModeHandler->sctCharacterSelected(sctChar);
+ /* Update the text case */
+ updateState();
}
@@ -854,6 +842,7 @@
{
if (!mCandidatePopup) {
mCandidatePopup = new HbCandidateList(this);
+ connect(mCandidatePopup, SIGNAL(candidateSelected(int,QString)), this, SLOT(candidatePopupClosed(int,QString)));
}
if (candidates.count() > 0) {
@@ -877,11 +866,10 @@
{
HbInputFocusObject *fo = focusObject();
if (HbInputSettingProxy::instance()->predictiveInputStatus(HbKeyboardSetting12key) &&
- fo &&
- fo->editorInterface().isPredictionAllowed() &&
+ fo && fo->editorInterface().isPredictionAllowed() &&
mPredictionModeHandler->isActive() &&
HbPredictionFactory::instance()->predictionEngineForLanguage(inputState().language())) {
- return true;
+ return true;
}
return false;
@@ -892,9 +880,9 @@
*/
HbInputVkbWidget::HbFlickDirection HbVirtual12Key::flickDirection() const
{
- if ( mCurrentKeypad ) {
+ if (mCurrentKeypad) {
return mCurrentKeypad->flickDirection();
- }else{
+ } else {
return HbInputVkbWidget::HbFlickDirectionNone;
}
}
--- a/src/hbplugins/inputmethods/touchinput/virtual12key.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/virtual12key.h Fri May 14 16:09:54 2010 +0300
@@ -34,8 +34,8 @@
class HbKeymap;
class QTimer;
class HbInputVkbWidget;
-class Hb12KeyTouchKeypad;
-class HbInputSctPortrait;
+class Hb12KeyTouchKeyboard;
+class HbSctKeyboard;
class HbInputThaiSpecialPopup;
class HbCandidateList;
class HbPredictionEngine;
@@ -92,19 +92,16 @@
void launchAutoCompletionPopup(const QStringList &candidates);
void closeAutoCompletionPopup();
void switchMode(int keyCode);
- void showThaiSpecialCharacters(uint buttonId);
+ void showThaiSpecialCharacters(uint buttonId);
void starKeySelected();
- uint previousChar();
-
-protected:
- void predictiveInputStatusChanged(int newStatus);
+ uint previousChar();
+ HbKeyboardType currentKeyboardType() const;
private:
void openKeypad(HbInputVkbWidget * keypadToOpen,bool inMinimizedMode = false);
void switchToAlphaMode(bool openAlphaInMinimizedMode = false);
void setSpecialCharacters();
void loadKeymap(const HbInputLanguage &newLanguage);
- Hb12KeyTouchKeypad * construct12Keypad();
- HbInputSctPortrait * constructSctKeypad();
+ Hb12KeyTouchKeyboard *construct12Keyboard();
bool usePrediction() const;
public slots:
@@ -112,29 +109,27 @@
void keypadOpened();
void keypadCloseEventDetected(HbInputVkbWidget::HbVkbCloseMethod vkbCloseMethod);
void rockerDirection(int direction, HbInputVirtualRocker::RockerSelectionMode selectionMode);
- void sctCharacterSelected(QString character);
void orientationAboutToChange();
- void candidatePopupClosed(int closingKey);
+ void candidatePopupClosed(int closingKey, const QString &candidate);
void flickEvent(HbInputVkbWidget::HbFlickDirection direction);
void mouseMovedOutOfButton();
void smileySelected(QString smiley);
void predictiveInputStateChanged(HbKeyboardSettingFlags keyboardType, bool newState);
- void thaiSctCharacterSelected(QString sctChar);
+ void thaiSctCharacterSelected(QString sctChar);
private:
// mCurrentKeypad contains currently active keypad, we dont need to have
// anyother variables to tell us which is current keypad
QPointer<HbInputVkbWidget> mCurrentKeypad;
// contains itut keypad
- QPointer<Hb12KeyTouchKeypad> mItutKeypad;
+ QPointer<Hb12KeyTouchKeyboard> mItutKeypad;
// contains sct keypad
- QPointer<HbInputSctPortrait> mSctKeypad;
- // contains Thai special characters
- QPointer<HbInputThaiSpecialPopup> mThaiSpecialChar;
+ QPointer<HbSctKeyboard> mSctKeypad;
+ // contains Thai special characters
+ QPointer<HbInputThaiSpecialPopup> mThaiSpecialChar;
//Owned by the keymap factory
const HbKeymap* mKeymap;
- HbInputVkbWidget::HbSctView mSctMode;
bool mOrientationAboutToChange;
// Owned
@@ -146,8 +141,8 @@
HbInputPrediction12KeyHandler *mPredictionModeHandler;
HbInputBasic12KeyHandler *mBasicModeHandler;
HbInputNumeric12KeyHandler *mNumericModeHandler;
- HbInputBasic12KeyThaiHandler *mBasic12keyThaiHandler;
- HbInputPrediction12KeyThaiHandler *mPrediction12keyThaiHandler;
+ HbInputBasic12KeyThaiHandler *mBasic12keyThaiHandler;
+ HbInputPrediction12KeyThaiHandler *mPrediction12keyThaiHandler;
QPointer<HbVkbHost> mVkbHost;
bool mKeyboardChangeAlreadyInprogress;
--- a/src/hbplugins/inputmethods/touchinput/virtualqwerty.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/virtualqwerty.cpp Fri May 14 16:09:54 2010 +0300
@@ -24,6 +24,9 @@
****************************************************************************/
#include "virtualqwerty.h"
#include <hbapplication.h>
+#include <hbaction.h>
+#include <hbview.h>
+#include <hbmainwindow.h>
#include <QLocale>
#include <hbinputexactwordpopup.h>
@@ -33,31 +36,32 @@
#include <hbinputsettingproxy.h>
#include <hbinpututils.h>
#include <hbinputvirtualrocker.h>
-#include <hbinputsctlandscape.h>
-#include <hbinputqwertytouchkeyboard.h>
+#include <hbinputsctkeyboard.h>
#include <hbinputeditorinterface.h>
#include <hbinputdef.h>
#include <hbinputvkbhost.h>
#include <hbinputcommondialogs.h>
-
-#include <hbmainwindow.h>
+#include <hbinputpredictionfactory.h>
#include "hbinputbasicqwertyhandler.h"
#include "hbinputpredictionqwertyhandler.h"
#include "hbinputnumericqwertyhandler.h"
-#include <hbaction.h>
-#include <hbview.h>
-#include <hbinputpredictionfactory.h>
+#include "hbinputqwerty10x4touchkeyboard.h"
+#include "hbinputqwerty11x4touchkeyboard.h"
+#include "hbinputqwertynumerictouchkeyboard.h"
+
+const int HbVirtualQwerty4x10MaxKeysCount = 32;
HbVirtualQwerty::HbVirtualQwerty() : mCurrentKeypad(0),
mQwertyAlphaKeypad(0),
+ mQwerty10x4Keypad(0),
+ mQwerty11x4Keypad(0),
mQwertyNumericKeypad(0),
mSctKeypad(0),
mKeymap(0),
mExactWordPopup(0),
mCandidatePopup(0),
mOrientationAboutToChange(false),
- mSctMode(HbInputVkbWidget::HbSctViewSpecialCharacter),
mShiftKeyState(0),
mVkbHost(0)
{
@@ -80,6 +84,8 @@
// autocompleter connection
connect(this, SIGNAL(autoCompletionPopupClosed(QString, int)), mBasicModeHandler, SLOT(autoCompletionPopupClosed(QString, int)));
+
+ connect(HbInputSettingProxy::instance(), SIGNAL(predictiveInputStateChanged(HbKeyboardSettingFlags,bool)), this, SLOT(predictiveInputStateChanged(HbKeyboardSettingFlags,bool)));
}
// ---------------------------------------------------------------------------
@@ -95,6 +101,9 @@
delete mQwertyAlphaKeypad;
mQwertyAlphaKeypad = 0;
+ delete mQwerty10x4Keypad;
+ delete mQwerty11x4Keypad;
+
delete mQwertyNumericKeypad;
mQwertyNumericKeypad = 0;
@@ -135,6 +144,8 @@
void HbVirtualQwerty::focusReceived()
{
+ /* Update the text case */
+ updateState();
// set input mode to default ABC
HbInputLanguage language = inputState().language();
if ((!focusObject()->editorInterface().isNumericEditor() && inputState().inputMode() == HbInputModeNumeric) || !language.isCaseSensitiveLanguage()) {
@@ -167,17 +178,13 @@
currentInputType = EModeNumeric;
}
- HbInputVkbWidget * keypadToOpen = 0;
+ HbInputVkbWidget* keypadToOpen = 0;
if (currentInputType == EModeAbc) {
- if(!mQwertyAlphaKeypad) {
- mQwertyAlphaKeypad = constructKeypad(EModeAbc);
- connect(mQwertyAlphaKeypad, SIGNAL(smileySelected(QString)), this, SLOT(smileySelected(QString)));
- //FLICKDISABLED connect(mQwertyAlphaKeypad, SIGNAL(flickEvent(HbInputVkbWidget::FlickDirection)), this, SLOT(flickEvent(HbInputVkbWidget::FlickDirection)));
- }
+ mQwertyAlphaKeypad = constructKeyboard(EModeAbc);
keypadToOpen = mQwertyAlphaKeypad;
} else if(currentInputType == EModeNumeric) {
if(!mQwertyNumericKeypad) {
- mQwertyNumericKeypad = constructKeypad(EModeNumeric);
+ mQwertyNumericKeypad = static_cast<HbQwertyNumericKeyboard*>(constructKeyboard(EModeNumeric));
mQwertyNumericKeypad->setBackgroundDrawing(true);
}
keypadToOpen = mQwertyNumericKeypad;
@@ -190,23 +197,7 @@
// inform active mode handler about the focusrecieve event.
mActiveModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionFocusRecieved);
- // We need to check if this focusRecieved call is due to a orientation
- // switch. If yes we should get the keypad status prior to the orientation
- // switch and open the keypad in that state only.
- // For example we have minimized the keypad in Qwerty mode and change the
- // orientation to portrait then in Itu-T mode also keypad should be in minimized state.
- HbVkbHost *host = focusObject()->editorInterface().vkbHost();
- if (orientationContextSwitchInProgress()) {
- if (host) {
- // We can get the keypad status prior to the orientation switch from vkbHost it self.
- HbVkbHost::HbVkbStatus vkbStatus = host->keypadStatusBeforeOrientationChange();
- if (vkbStatus != HbVkbHost::HbVkbStatusClosed) {
- openKeypad(keypadToOpen,vkbStatus == HbVkbHost::HbVkbStatusMinimized);
- }
- }
- } else {
- openKeypad(keypadToOpen);
- }
+ openKeypad(keypadToOpen);
if (mVkbHost) {
connect(&(focusObject()->editorInterface()), SIGNAL(cursorPositionChanged(int, int)), mVkbHost, SLOT(ensureCursorVisibility()));
@@ -298,17 +289,37 @@
}
}
-HbQwertyKeyboard* HbVirtualQwerty::constructKeypad(HbKeypadMode currentInputType)
+HbInputVkbWidget* HbVirtualQwerty::constructKeyboard(HbKeypadMode currentInputType)
{
- HbQwertyKeyboard* keypad = new HbQwertyKeyboard(this, mKeymap, 0, currentInputType);
- connect(keypad, SIGNAL(keypadCloseEventDetected(HbInputVkbWidget::HbVkbCloseMethod)),
+ HbInputVkbWidget *keyboard = 0;
+ if (currentInputType == EModeAbc) {
+ const HbKeyboardMap *keyboardMap = mKeymap->keyboard(HbKeyboardVirtualQwerty);
+ if (keyboardMap && keyboardMap->keys.count() > HbVirtualQwerty4x10MaxKeysCount) {
+ if (mQwerty11x4Keypad) {
+ return mQwerty11x4Keypad;
+ }
+ mQwerty11x4Keypad = new HbQwerty11x4Keyboard(this, mKeymap);
+ keyboard = mQwerty11x4Keypad;
+ } else {
+ if (mQwerty10x4Keypad) {
+ return mQwerty10x4Keypad;
+ }
+ mQwerty10x4Keypad = new HbQwerty10x4Keyboard(this, mKeymap);
+ keyboard = mQwerty10x4Keypad;
+ }
+ connect(keyboard, SIGNAL(smileySelected(QString)), this, SLOT(smileySelected(QString)));
+ //FLICKDISABLED connect(keyboard, SIGNAL(flickEvent(HbInputVkbWidget::FlickDirection)), this, SLOT(flickEvent(HbInputVkbWidget::FlickDirection)));
+ } else {
+ keyboard = new HbQwertyNumericKeyboard(this, mKeymap);
+ }
+ connect(keyboard, SIGNAL(keypadCloseEventDetected(HbInputVkbWidget::HbVkbCloseMethod)),
this, SLOT(keypadCloseEventDetected(HbInputVkbWidget::HbVkbCloseMethod)));
- connect(keypad, SIGNAL(rockerDirection(int, HbInputVirtualRocker::RockerSelectionMode)),
+ connect(keyboard, SIGNAL(rockerDirection(int, HbInputVirtualRocker::RockerSelectionMode)),
this, SLOT(rockerDirection(int, HbInputVirtualRocker::RockerSelectionMode)));
- connect(keypad, SIGNAL(mouseMovedOutOfButton()), this, SLOT(mouseMovedOutOfButton()));
- keypad->setRockerVisible(true);
+ connect(keyboard, SIGNAL(mouseMovedOutOfButton()), this, SLOT(mouseMovedOutOfButton()));
+ keyboard->setRockerVisible(true);
- return keypad;
+ return keyboard;
}
void HbVirtualQwerty::mouseHandler(int x, QMouseEvent* event)
@@ -349,6 +360,13 @@
}
// load the new key keymappings for newLanguage to all keypads and all mode handlers
loadKeymap(aNewLanguage);
+
+ if (mCurrentKeypad && mCurrentKeypad != mQwertyAlphaKeypad
+ && mCurrentKeypad != mQwertyNumericKeypad) {
+ mCurrentKeypad->animKeyboardChange();
+ openKeypad(mQwertyAlphaKeypad);
+ }
+
mPredictionModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionPrimaryLanguageChanged);
if (mCurrentKeypad){
mCurrentKeypad->animKeyboardChange();
@@ -365,7 +383,7 @@
if (newState.inputMode() == HbInputModeNumeric && mQwertyNumericKeypad) {
mQwertyNumericKeypad->setMode(EModeNumeric, HbModifierNone);
- } else if(mQwertyAlphaKeypad) {
+ } else if (mQwertyAlphaKeypad) {
if (newState.textCase() == HbTextCaseUpper || newState.textCase() == HbTextCaseAutomatic) {
mQwertyAlphaKeypad->setMode(EModeAbc, HbModifierShiftPressed);
} else {
@@ -378,18 +396,10 @@
mActiveModeHandler = mNumericModeHandler;
} else if (newState.inputMode() == HbInputModeDefault && usePrediction()) {
mActiveModeHandler = mPredictionModeHandler;
- if (mQwertyAlphaKeypad) {
- mQwertyAlphaKeypad->disconnect(SIGNAL(charFromPreviewSelected(QString)));
- connect(mQwertyAlphaKeypad, SIGNAL(charFromPreviewSelected(QString)), mActiveModeHandler, SLOT(charFromPreviewSelected(QString)));
- }
} else if (newState.inputMode() == HbInputModeDefault) {
mActiveModeHandler = mBasicModeHandler;
// Auto completer setup needs following line.
mActiveModeHandler->actionHandler(HbInputModeHandler::HbInputModeActionFocusRecieved);
- if (mQwertyAlphaKeypad) {
- mQwertyAlphaKeypad->disconnect(SIGNAL(charFromPreviewSelected(QString)));
- connect(mQwertyAlphaKeypad, SIGNAL(charFromPreviewSelected(QString)), mActiveModeHandler, SLOT(charFromPreviewSelected(QString)));
- }
}
if (focusObject()) {
@@ -431,22 +441,21 @@
mQwertyNumericKeypad->setKeymap(mKeymap);
}
- if (mQwertyAlphaKeypad) {
- mQwertyAlphaKeypad->setKeymap(mKeymap);
- }
+ mQwertyAlphaKeypad = constructKeyboard(EModeAbc);
+ mQwertyAlphaKeypad->setKeymap(mKeymap);
if (mSctKeypad) {
mSctKeypad->setKeymap(mKeymap);
}
// inform mode handlers about the language change.
- if(mBasicModeHandler) {
+ if (mBasicModeHandler) {
mBasicModeHandler->setKeymap(mKeymap);
}
- if(mPredictionModeHandler) {
+ if (mPredictionModeHandler) {
mPredictionModeHandler->setKeymap(mKeymap);
}
- if(mNumericModeHandler) {
+ if (mNumericModeHandler) {
mNumericModeHandler->setKeymap(mKeymap);
}
}
@@ -456,11 +465,10 @@
void HbVirtualQwerty::switchSpecialCharacterTable()
{
if (mCurrentKeypad != mSctKeypad) {
- mSctMode = HbInputVkbWidget::HbSctViewSpecialCharacter;
displaySpecialCharacterTable(this);
} else {
// we always go back to alpha qwerty mode after coming back from sct
- openKeypad(mQwertyAlphaKeypad);
+ openKeypad(constructKeyboard(EModeAbc));
}
}
@@ -475,33 +483,20 @@
Q_UNUSED(aReceiver);
if (!mSctKeypad) {
- mSctKeypad = new HbInputSctLandscape(this, mKeymap);
- connect(mSctKeypad, SIGNAL(sctCharacterSelected(QString)), this, SLOT(sctCharacterSelected(QString)));
+ mSctKeypad = new HbSctKeyboard(this, mKeymap);
connect(mSctKeypad, SIGNAL(smileySelected(QString)), this, SLOT(smileySelected(QString)));
connect(mSctKeypad, SIGNAL(keypadCloseEventDetected(HbInputVkbWidget::HbVkbCloseMethod)), this, SLOT(keypadCloseEventDetected(HbInputVkbWidget::HbVkbCloseMethod)));
connect(mSctKeypad, SIGNAL(rockerDirection(int, HbInputVirtualRocker::RockerSelectionMode)),
this, SLOT(rockerDirection(int, HbInputVirtualRocker::RockerSelectionMode)));
mSctKeypad->setRockerVisible(true);
}
-
- // set up sct!
- mSctKeypad->setSct(mSctMode);
+ mSctKeypad->setMode(EModeAbc, HbModifierNone);
//open the keypad
openKeypad(mSctKeypad);
return 0;
}
-/*!
-Call-back implementation to indicate that a character was selected from the SCT. With this, the character is committed to the
-editor and editor is again made to focus.
-*/
-void HbVirtualQwerty::sctCharacterSelected(QString character)
-{
- mActiveModeHandler->sctCharacterSelected(character);
- /* Update the text case */
- updateState();
-}
void HbVirtualQwerty::smileySelected(QString smiley)
{
mActiveModeHandler->smileySelected(smiley);
@@ -509,9 +504,8 @@
void HbVirtualQwerty::selectSpecialCharacterTableMode()
{
- if (mQwertyAlphaKeypad) {
- mQwertyAlphaKeypad->showSmileyPicker(4, 10);
- }
+ mQwertyAlphaKeypad = constructKeyboard(EModeAbc);
+ mQwertyAlphaKeypad->showSmileyPicker(4, 10);
}
/*!
@@ -532,6 +526,7 @@
if (!mCandidatePopup) {
mCandidatePopup = new HbCandidateList(this);
connect(mCandidatePopup, SIGNAL(candidatePopupCancelled()), this, SLOT(candidatePopupCancelled()));
+ connect(mCandidatePopup, SIGNAL(candidateSelected(int,const QString&)), this, SLOT(candidatePopupClosed(int, const QString&)));
}
if (candidates.count() > 0) {
@@ -548,6 +543,15 @@
}
}
+HbKeyboardType HbVirtualQwerty::currentKeyboardType() const
+{
+ HbKeyboardType type = HbKeyboardNone;
+ if (mCurrentKeypad) {
+ type = mCurrentKeypad->keyboardType();
+ }
+ return type;
+}
+
/*!
Launches the candidate list.
*/
@@ -565,6 +569,7 @@
if (!mCandidatePopup) {
mCandidatePopup = new HbCandidateList(this);
connect(mCandidatePopup, SIGNAL(candidatePopupCancelled()), this, SLOT(candidatePopupCancelled()));
+ connect(mCandidatePopup, SIGNAL(candidateSelected(int,const QString&)), this, SLOT(candidatePopupClosed(int, const QString&)));
}
mCandidatePopup->populateList(candidates);
mCandidatePopup->setModal(true);
@@ -586,16 +591,13 @@
/*!
Commits the candidate upon closing of the candidate list.
*/
-void HbVirtualQwerty::candidatePopupClosed(int closingKey)
-{
- if (mCandidatePopup) {
- QString currentCandidate = mCandidatePopup->currentCandidate();
- if (currentCandidate.size() > 0) {
- if ((focusObject()->editorInterface().constraints() & HbEditorConstraintAutoCompletingField)) {
- emit autoCompletionPopupClosed(currentCandidate, closingKey);
- } else {
- mPredictionModeHandler->candidatePopupClosed(currentCandidate, closingKey);
- }
+void HbVirtualQwerty::candidatePopupClosed(int closingKey, const QString& candidate)
+{
+ if (candidate.size() > 0) {
+ if ((focusObject()->editorInterface().inputConstraints() & HbEditorConstraintAutoCompletingField)) {
+ emit autoCompletionPopupClosed(candidate, closingKey);
+ } else {
+ mPredictionModeHandler->candidatePopupClosed(candidate, closingKey);
}
}
}
@@ -617,39 +619,6 @@
}
/*!
-This function is called during a long key press
-for a long time.
-*/
-void HbVirtualQwerty::launchCharacterPreviewPane(int key)
-{
- // In alpha keyboard, when the keypad is closed by
- // dragging it, long key press event is generated.
- // Character preview must not be shown in this case.
- if (mVkbHost && mVkbHost->keypadStatus() != HbVkbHost::HbVkbStatusOpened) {
- return;
- }
-
- // get the characters bound to the key.
- QStringList spellList;
- mActiveModeHandler->getAndFilterCharactersBoundToKey(spellList, static_cast<Qt::Key>(key));
-
- bool previewAvailable = false;
- if (spellList.size()) {
- // preview pane should show the correct case.
- int currentTextCase = focusObject()->editorInterface().textCase();
- for(int i = 0; i < spellList.size(); i++) {
- if (currentTextCase == HbTextCaseLower) {
- spellList[i] = spellList.at(i).toLower();
- } else {
- spellList[i] = spellList.at(i).toUpper();
- }
- }
- previewAvailable = mQwertyAlphaKeypad->previewCharacters(spellList);
- }
- mActiveModeHandler->characterPreviewAvailable(previewAvailable);
-}
-
-/*!
Slot used by virtual rocker to move cursor.
*/
void HbVirtualQwerty::rockerDirection(int aDirection, HbInputVirtualRocker::RockerSelectionMode aSelectionMode)
@@ -693,15 +662,6 @@
}
/*!
-\deprecated HbVirtualQwerty::predictiveInputStatusChanged(int newStatus)
- is deprecated. Use predictiveInputStateChanged instead.
-*/
-void HbVirtualQwerty::predictiveInputStatusChanged(int newStatus)
-{
- predictiveInputStateChanged(HbKeyboardSettingQwerty, newStatus);
-}
-
-/*!
The framework calls this method when the predictive input status changes.
*/
void HbVirtualQwerty::predictiveInputStateChanged(HbKeyboardSettingFlags keyboardType, bool newStatus)
--- a/src/hbplugins/inputmethods/touchinput/virtualqwerty.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbplugins/inputmethods/touchinput/virtualqwerty.h Fri May 14 16:09:54 2010 +0300
@@ -33,12 +33,14 @@
#include <hbinputvkbwidget.h>
class QTimer;
-class HbQwertyKeyboard;
+class HbQwertyNumericKeyboard;
+class HbQwerty10x4Keyboard;
+class HbQwerty11x4Keyboard;
class HbKeyMapData;
class HbPredictionEngine;
class HbCandidateList;
class HbExactWordPopup;
-class HbInputSctLandscape;
+class HbSctKeyboard;
class HbInputModeHandler;
class HbInputBasicQwertyHandler;
@@ -62,7 +64,6 @@
bool filterEvent(const QEvent* event);
public slots:
- void sctCharacterSelected(QString aChar);
void orientationAboutToChange();
void rockerDirection(int aDirection, HbInputVirtualRocker::RockerSelectionMode aSelectionMode);
// keypad related slots
@@ -72,12 +73,12 @@
void mouseMovedOutOfButton();
void smileySelected(QString smiley);
void predictiveInputStateChanged(HbKeyboardSettingFlags keyboardType, bool newState);
+ void candidatePopupClosed(int closingKey, const QString& candidate);
public: // From HbInputMethod
void focusReceived();
void focusLost(bool focusSwitch);
- void inputStateActivated(const HbInputState& aNewState);
- void candidatePopupClosed(int closingKey);
+ void inputStateActivated(const HbInputState& aNewState);
void inputLanguageChanged(const HbInputLanguage &aNewLanguage);
void secondaryInputLanguageChanged(const HbInputLanguage &newLanguage);
int displaySpecialCharacterTable(QObject* aReceiver);
@@ -92,16 +93,13 @@
void launchCandidatePopup(const QStringList &candidates);
void closeKeypad();
- void launchCharacterPreviewPane(int key);
void switchSpecialCharacterTable();
void selectSpecialCharacterTableMode();
void closeExactWordPopup();
void launchExactWordPopup(QString exactWord);
void closeAutoCompletionPopup();
void launchAutoCompletionPopup(const QStringList &candidates);
-
-protected:
- void predictiveInputStatusChanged(int newStatus);
+ HbKeyboardType currentKeyboardType() const;
private slots:
void candidatePopupCancelled();
@@ -116,18 +114,20 @@
private:
void openKeypad(HbInputVkbWidget * keypadToOpen, bool inMinimizedMode = false);
- HbQwertyKeyboard* constructKeypad(HbKeypadMode currentInputType);
+ HbInputVkbWidget *constructKeyboard(HbKeypadMode currentInputType);
private:
// mCurrentKeypad contains currently active keypad, we dont need to have
// anyother variables to tell us which is current keypad
QPointer<HbInputVkbWidget> mCurrentKeypad;
// contains qwerty alpha keypad
- QPointer<HbQwertyKeyboard> mQwertyAlphaKeypad;
+ QPointer<HbInputVkbWidget> mQwertyAlphaKeypad;
+ QPointer<HbQwerty10x4Keyboard> mQwerty10x4Keypad;
+ QPointer<HbQwerty11x4Keyboard> mQwerty11x4Keypad;
// contains qwerty numeric keypad
- QPointer<HbQwertyKeyboard> mQwertyNumericKeypad;
+ QPointer<HbQwertyNumericKeyboard> mQwertyNumericKeypad;
// contains sct keypad
- QPointer<HbInputSctLandscape> mSctKeypad;
+ QPointer<HbSctKeyboard> mSctKeypad;
const HbKeymap *mKeymap;
HbFnState mFnState;
@@ -136,7 +136,6 @@
HbExactWordPopup *mExactWordPopup;
HbCandidateList *mCandidatePopup;
bool mOrientationAboutToChange;
- HbInputVkbWidget::HbSctView mSctMode;
int mShiftKeyState;
// mode handlers
HbInputModeHandler *mActiveModeHandler;
--- a/src/hbservers/hbiconpreloader/hbiconpreloader.pro Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-TEMPLATE = app
-TARGET =
-DEPENDPATH += .
-INCLUDEPATH += .
-
-SOURCES += main.cpp
-
-symbian {
- TARGET.CAPABILITY = CAP_APPLICATION
- TARGET.EPOCALLOWDLLDATA = 1
-
- LIBS += -lcone
- LIBS += -lavkon
- LIBS += -leikcore
-
- myrssrules = \
- "hidden = KAppIsHidden;" \
- "launch = KAppLaunchInBackground;"
-
- RSS_RULES += myrssrules
-}
-
-hbAddLibrary(hbcore/HbCore)
-hbAddLibrary(hbwidgets/HbWidgets)
-hbAddLibrary(hbutils/HbUtils)
--- a/src/hbservers/hbiconpreloader/main.cpp Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +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 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 <hbapplication.h>
-#include <hbmainwindow.h>
-#include <QMainWindow>
-#include <QDebug>
-
-#ifdef Q_OS_SYMBIAN
-#include <coemain.h>
-#endif
-
-/*
-* This application exists temporarily to preload some time-consuming graphics
-* when theme server is started in order to simulate the real scenario where
-* such graphics get loaded in the boot when first app is shown.
-* It creates more realistic results for the performance tests.
-*/
-int main(int argc, char *argv[])
-{
- HbApplication app(argc, argv, Hb::NoSplash);
- // Create a mainwindow so its graphics get cached and next app startup is faster
- HbMainWindow window;
- window.show();
-
- qDebug() << "HB: HbIconPreloader started";
-
- // Render the window in a pixmap painter, it does not get drawn and icons do not get loaded
- // otherwise because the application runs in background.
- QImage image(1, 1, QImage::Format_ARGB32);
- QPainter painter(&image);
-
- window.render(&painter);
-
-#ifdef Q_OS_SYMBIAN
- // To avoid crash in app exit
- CCoeEnv::Static()->DisableExitChecks(true);
-#endif
-
- QApplication::processEvents(); // to prevent mysterious deadlocks when destroying the mainwindow
-
- // Exit the application
- return 0;
-}
--- a/src/hbservers/hbservers.pro Mon May 03 12:48:33 2010 +0300
+++ b/src/hbservers/hbservers.pro Fri May 14 16:09:54 2010 +0300
@@ -27,10 +27,9 @@
TEMPLATE = subdirs
-SUBDIRS += hbdevicedialogappserver hbthemeserver themechanger hbsplashgenerator themeindexer
+SUBDIRS += hbdevicedialogappserver hbthemeserver hbsplashgenerator
symbian {
- SUBDIRS += hbiconpreloader
SUBDIRS += hbthemeserveroogmplugin
}
--- a/src/hbservers/hbsplashgenerator/hbsplashgen_server_symbian.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbservers/hbsplashgenerator/hbsplashgen_server_symbian.cpp Fri May 14 16:09:54 2010 +0300
@@ -64,12 +64,14 @@
void setSplashScreenDir(const QString &dir) { mSplashScreenDir = dir; }
void setSplashScreenDirContents(const QStringList &entries) { mSplashScreenDirEntries = entries; }
+ bool startupSuccess() const { return mStartupSuccess; }
bool processGetSplash(const RMessage2 &message);
private:
bool transferHandle(const RMessage2 &message, const QString &fileName);
+ bool mStartupSuccess;
RFs mFs;
QString mSplashScreenDir;
QStringList mSplashScreenDirEntries;
@@ -106,24 +108,31 @@
mServer->setSplashScreenDirContents(entries);
}
+bool HbSplashGenServer::startupSuccess() const
+{
+ return mServer->startupSuccess();
+}
+
HbSplashGenServerSymbian::HbSplashGenServerSymbian()
: CServer2(CActive::EPriorityHigh)
{
- if (mFs.Connect() == KErrNone) {
+ TInt err = mFs.Connect();
+ if (err == KErrNone) {
mFs.ShareProtected();
+ TRAP(err, StartL(hbsplash_server_name));
+ if (err == KErrNone) {
+ qDebug() << PRE << "server started";
+ } else {
+ qWarning() << PRE << "server start failed" << err;
+ }
} else {
qWarning() << PRE << "cannot connect to file server";
}
- TRAPD(err, StartL(hbsplash_server_name));
- if (err == KErrNone) {
- qDebug() << PRE << "server started";
- } else {
- qWarning() << PRE << "server start failed" << err;
- }
+ mStartupSuccess = (err == KErrNone);
// Now it is the right time to do the rendezvous. By default it would be
// done too early so the custom appui disables FrameworkCallsRendezvous and
// it is done here instead.
- RProcess::Rendezvous(KErrNone);
+ RProcess::Rendezvous(err);
}
HbSplashGenServerSymbian::~HbSplashGenServerSymbian()
--- a/src/hbservers/hbsplashgenerator/hbsplashgen_server_symbian_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbservers/hbsplashgenerator/hbsplashgen_server_symbian_p.h Fri May 14 16:09:54 2010 +0300
@@ -42,6 +42,7 @@
public:
HbSplashGenServer(HbSplashGenerator *generator);
~HbSplashGenServer();
+ bool startupSuccess() const;
private slots:
void onOutputDirContentsUpdated(const QString &dir, const QStringList &entries);
--- a/src/hbservers/hbsplashgenerator/hbsplashgenerator.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbservers/hbsplashgenerator/hbsplashgenerator.cpp Fri May 14 16:09:54 2010 +0300
@@ -43,6 +43,7 @@
#include <QPainter>
#include <QDir>
#include <QFile>
+#include <QFileInfo>
#include <QSet>
#include <QTranslator>
#include <QLocale>
@@ -54,7 +55,7 @@
const char *last_output_dir_key = "lastoutdir";
HbSplashGenerator::HbSplashGenerator()
- : mBusy(false), mMainWindow(0), mFirstRegenerate(true),
+ : mBusy(false), mForceRegen(false), mMainWindow(0), mFirstRegenerate(true),
mSettings("Nokia", "HbSplash")
{
// Effects on decorators (started when they are shown) would ruin
@@ -73,9 +74,9 @@
{
switch (orientation) {
case Qt::Horizontal:
- return QString("lsc");
+ return QLatin1String("lsc");
case Qt::Vertical:
- return QString("prt");
+ return QLatin1String("prt");
default:
return QString();
}
@@ -102,6 +103,13 @@
void HbSplashGenerator::start(bool forceRegen)
{
+ mForceRegen = forceRegen;
+ QTimer::singleShot(5000, this, SLOT(doStart()));
+}
+
+void HbSplashGenerator::doStart()
+{
+ qDebug() << PRE << "accessing theme";
// Start listening to the theme-change-finished signal.
HbTheme *theme = hbInstance->theme();
connect(theme, SIGNAL(changeFinished()), SLOT(regenerate()));
@@ -131,7 +139,7 @@
int currentFileCount = updateOutputDirContents(currentOutputDir);
qDebug() << PRE << "last regen:" << lastTheme << lastLang << lastFileCount << lastOutputDir
<< "current:" << currentTheme << currentLang << currentFileCount << currentOutputDir;
- if (forceRegen
+ if (mForceRegen
|| currentTheme != lastTheme
|| currentLang != lastLang
|| currentFileCount != lastFileCount
@@ -141,6 +149,14 @@
}
}
+void HbSplashGenerator::uncachedRegenerate()
+{
+ // Same as regenerate() but no caching is used so every file is
+ // parsed again.
+ mParsedSplashmls.clear();
+ regenerate();
+}
+
void HbSplashGenerator::regenerate()
{
QString themeName = hbInstance->theme()->name();
@@ -186,6 +202,19 @@
}
}
+void HbSplashGenerator::regenerateOne(const QString &splashmlFileName)
+{
+ mQueue.clear();
+ QueueItem item(hbInstance->theme()->name(), Qt::Vertical);
+ item.mWorkDirForSingleFileRegen = QFileInfo(splashmlFileName).path(); // e.g. for translations
+ parseSplashml(splashmlFileName, item);
+ item.mDocmlFileName = QDir(item.mWorkDirForSingleFileRegen).filePath(item.mDocmlFileName);
+ mQueue.enqueue(item); // generate it regardless of the fixed orientation setting
+ item.mOrientation = Qt::Horizontal;
+ mQueue.enqueue(item);
+ QMetaObject::invokeMethod(this, "processQueue", Qt::QueuedConnection);
+}
+
QImage HbSplashGenerator::renderView()
{
log("renderView()", mItem.mThemeName, mItem.mOrientation);
@@ -221,6 +250,7 @@
QString outDir = hbsplash_output_dir();
mSettings.setValue(last_file_count_key, updateOutputDirContents(outDir));
mSettings.setValue(last_output_dir_key, outDir);
+ emit finished();
qDebug() << PRE << "processQueue() over";
return;
}
@@ -436,27 +466,7 @@
continue;
}
QueueItem item(themeName, orientation);
- QFile f(fullName);
- bool ok = f.open(QIODevice::ReadOnly);
- if (ok) {
- QXmlStreamReader xml(&f);
- bool docOk = false;
- while (!xml.atEnd()) {
- QXmlStreamReader::TokenType token = xml.readNext();
- if (token == QXmlStreamReader::Invalid) {
- qWarning() << PRE << fullName << xml.errorString();
- ok = false;
- break;
- } else if (token == QXmlStreamReader::StartElement
- && xml.name() == QLatin1String("hbsplash"))
- {
- docOk = true;
- } else if (docOk) {
- processSplashml(xml, item);
- }
- }
- f.close();
- }
+ bool ok = parseSplashml(fullName, item);
if (ok
&& !item.mAppId.isEmpty()
&& !item.mDocmlWidgetName.isEmpty()
@@ -469,19 +479,53 @@
addSplashmlItemToQueue(item);
mParsedSplashmls.insert(fullName, item);
} else {
- qWarning() << PRE << "Unable to parse" << fullName;
+ qWarning() << PRE << "unable to parse" << fullName;
}
}
}
}
+inline void reportSplashmlError(const QString &fullFileName, int lineNumber, const QString &msg)
+{
+ qWarning("%s", qPrintable(QString(QLatin1String("%1 \"%2\":%3: %4"))
+ .arg(PRE).arg(fullFileName).arg(lineNumber).arg(msg)));
+}
+
+bool HbSplashGenerator::parseSplashml(const QString &fullFileName, QueueItem &item)
+{
+ QFile f(fullFileName);
+ bool ok = f.open(QIODevice::ReadOnly);
+ if (ok) {
+ QXmlStreamReader xml(&f);
+ bool docOk = false;
+ while (!xml.atEnd()) {
+ QXmlStreamReader::TokenType token = xml.readNext();
+ if (token == QXmlStreamReader::Invalid) {
+ reportSplashmlError(fullFileName, xml.lineNumber(), xml.errorString());
+ ok = false;
+ break;
+ } else if (token == QXmlStreamReader::StartElement
+ && xml.name() == QLatin1String("hbsplash"))
+ {
+ docOk = true;
+ } else if (docOk) {
+ parseSplashmlElements(xml, item, fullFileName);
+ }
+ }
+ f.close();
+ }
+ return ok;
+}
+
inline bool readBool(QXmlStreamReader &xml)
{
QString text = xml.readElementText().trimmed();
return text == QLatin1String("true") || text == QLatin1String("1");
}
-void HbSplashGenerator::processSplashml(QXmlStreamReader &xml, QueueItem &item)
+void HbSplashGenerator::parseSplashmlElements(QXmlStreamReader &xml,
+ QueueItem &item,
+ const QString &fullFileName)
{
if (xml.isStartElement()) {
QStringRef name = xml.name();
@@ -558,7 +602,8 @@
item.mItemBgGraphics.append(req);
}
} else {
- qWarning() << PRE << "unknown element" << name;
+ reportSplashmlError(fullFileName, xml.lineNumber(),
+ QLatin1String("unknown element: ") + name.toString());
}
}
}
@@ -645,7 +690,7 @@
qWarning() << PRE << "widget creation failed from" << mItem;
}
} else {
- qWarning() << PRE << "Unable to parse" << mItem.mDocmlFileName;
+ qWarning() << PRE << "unable to parse" << mItem.mDocmlFileName;
}
}
@@ -769,6 +814,9 @@
QTranslator *translator = new QTranslator;
bool ok = false;
QStringList dirNames(hbsplash_translation_dirs());
+ if (!mItem.mWorkDirForSingleFileRegen.isEmpty()) {
+ dirNames.append(mItem.mWorkDirForSingleFileRegen);
+ }
foreach (const QString &dirName, dirNames) {
QDir dir(dirName);
QString fullName = dir.filePath(name + '_' + lang);
@@ -776,7 +824,7 @@
// may still pick up another suitable file based on this name.
if (translator->load(fullName)) {
QCoreApplication::installTranslator(translator);
- qDebug() << PRE << "Translator installed:" << fullName;
+ qDebug() << PRE << "translator installed:" << fullName;
ok = true;
break;
}
@@ -784,7 +832,7 @@
if (ok) {
mTranslators.append(translator);
} else {
- qWarning() << PRE << "Unable to find translations based on name" << name;
+ qWarning() << PRE << "unable to find translations based on name" << name;
delete translator;
}
}
--- a/src/hbservers/hbsplashgenerator/hbsplashgenerator_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbservers/hbsplashgenerator/hbsplashgenerator_p.h Fri May 14 16:09:54 2010 +0300
@@ -58,11 +58,15 @@
signals:
void outputDirContentsUpdated(const QString &dir, const QStringList &entries);
+ void finished();
public slots:
void regenerate();
+ void uncachedRegenerate();
+ void regenerateOne(const QString &splashmlFileName);
private slots:
+ void doStart();
void processQueue();
void processWindow();
void onDirectoryChanged(const QString &path);
@@ -96,6 +100,7 @@
QString mOrientation;
};
QList<ItemBgGraphicsRequest> mItemBgGraphics;
+ QString mWorkDirForSingleFileRegen;
};
private:
@@ -106,7 +111,8 @@
bool saveSpl(const QString &nameWithoutExt, const QImage &image);
void addSplashmlItemToQueue(const QueueItem &item);
void queueAppSpecificItems(const QString &themeName, Qt::Orientation orientation);
- void processSplashml(QXmlStreamReader &xml, QueueItem &item);
+ bool parseSplashml(const QString &fullFileName, QueueItem &item);
+ void parseSplashmlElements(QXmlStreamReader &xml, QueueItem &item, const QString &fullFileName);
void setupAppSpecificWindow();
void setupNameBasedWidgetProps(HbDocumentLoader &loader);
void finishWindow();
@@ -115,6 +121,7 @@
int updateOutputDirContents(const QString &outDir);
bool mBusy;
+ bool mForceRegen;
HbMainWindow *mMainWindow;
QQueue<QueueItem> mQueue;
QueueItem mItem;
--- a/src/hbservers/hbsplashgenerator/main.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbservers/hbsplashgenerator/main.cpp Fri May 14 16:09:54 2010 +0300
@@ -31,6 +31,7 @@
#if defined(Q_OS_SYMBIAN)
#include "hbsplashgen_server_symbian_p.h"
+#include "hbsplashdefs_p.h"
#include <e32std.h>
#include <eikenv.h>
#include <apgwgnam.h>
@@ -40,7 +41,7 @@
}
#endif
-int main(int argc, char **argv)
+int runMain(int argc, char **argv, void *mutexToSignal)
{
#if defined(Q_OS_SYMBIAN)
HbApplication app(appFactory, argc, argv, Hb::NoSplash);
@@ -57,6 +58,7 @@
RThread::RenameMe(hbsplash_server_name);
}
#else
+ Q_UNUSED(mutexToSignal);
HbApplication app(argc, argv, Hb::NoSplash);
#endif
@@ -77,7 +79,7 @@
qDebug("[hbsplashgenerator] initializing ui");
QMainWindow mw;
QPushButton *btnRegen = new QPushButton("Regenerate");
- gen.connect(btnRegen, SIGNAL(clicked()), SLOT(regenerate()));
+ gen.connect(btnRegen, SIGNAL(clicked()), SLOT(uncachedRegenerate()));
mw.setCentralWidget(btnRegen);
mw.show();
#endif
@@ -86,14 +88,77 @@
#ifdef Q_OS_SYMBIAN
qDebug("[hbsplashgenerator] starting server");
HbSplashGenServer server(&gen);
+ // If there was an error (or an instance is already running (it is
+ // possible in certain race conditions)) then exit right away.
+ if (!server.startupSuccess()) {
+ qDebug("[hbsplashgenerator] exiting due to failed server startup");
+ return 0;
+ }
#endif
qDebug("[hbsplashgenerator] starting generator");
gen.start(forceRegen);
+#if defined(Q_OS_SYMBIAN)
+ if (mutexToSignal) {
+ qDebug("[hbsplashgenerator] signaling mutex");
+ static_cast<RMutex *>(mutexToSignal)->Signal();
+ }
+#endif
+
qDebug("[hbsplashgenerator] entering event loop");
int ret = app.exec();
qDebug("[hbsplashgenerator] exiting");
return ret;
}
+
+int main(int argc, char **argv)
+{
+ bool canStart = true;
+ void *mutexToSignal = 0;
+#if defined(Q_OS_SYMBIAN)
+ RMutex mutex;
+ _LIT(KGlobalLockName, "hbsplgen");
+ bool mutexOk = mutex.OpenGlobal(KGlobalLockName) == KErrNone;
+ if (!mutexOk) {
+ mutexOk = mutex.CreateGlobal(KGlobalLockName) == KErrNone;
+ }
+ if (mutexOk) {
+ mutex.Wait();
+ mutexToSignal = &mutex;
+ } else {
+ qDebug("[hbsplashgenerator] failed to open/create mutex");
+ }
+ // Due to the mutex-based synchronization we should now be able to
+ // use TFindServer to safely check if there is another instance
+ // already running.
+ TFindServer findServer(hbsplash_server_name);
+ TFullName serverName;
+ if (findServer.Next(serverName) == KErrNone) {
+ qDebug("[hbsplashgenerator] found another instance, exiting");
+ canStart = false;
+ RProcess::Rendezvous(KErrAlreadyExists);
+ }
+#endif
+
+ int result = 0;
+ if (canStart) {
+ try {
+ result = runMain(argc, argv, mutexToSignal);
+ } catch (...) {
+ qDebug("[hbsplashgenerator] exiting due to exception in main()");
+ }
+ }
+
+#if defined(Q_OS_SYMBIAN)
+ if (mutexOk) {
+ if (mutex.IsHeld()) {
+ mutex.Signal();
+ }
+ mutex.Close();
+ }
+#endif
+
+ return result;
+}
--- a/src/hbservers/hbthemeserver/hbiconcacheitemcreator_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbiconcacheitemcreator_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -82,31 +82,40 @@
\a key denotes the unique identifier for the cache item
\a options indicate different ways of loading icons
\a format indicates the icon format e.g. svg/nvg etc.\
- \a gpuMemoryStatus indicates the global GPU memory status (GoodMemory state or FreeRAM state)
+ \a currentRenderingMode ThemeServer's current rendering mode state.
*/
HbIconCacheItem* HbIconCacheItemCreator::createCacheItem(const HbIconKey &key,
HbIconLoader::IconLoaderOptions options,
const QString &format,
+ HbRenderingMode currentRenderingMode,
bool isMultiPiece)
{
#ifndef Q_OS_SYMBIAN
Q_UNUSED(isMultiPiece)
+ Q_UNUSED(currentRenderingMode)
#endif
QScopedPointer <HbIconCacheItem> tempIconCacheItem(new HbIconCacheItem);
HbIconCacheItem* item = tempIconCacheItem.data();
QScopedPointer <HbIconProcessor> rasterIcon;
QScopedPointer <HbIconProcessor> vectorIcon;
+
+ // Set the render mode to EHWRendering, only if the client is requesting a HW rendered icon
+ // and ThemeServer is in HW rendering mode
+ HbRenderingMode renderMode = ESWRendering;
+#ifndef Q_OS_SYMBIAN
+ Q_UNUSED(renderMode)
+#endif
+
+#if defined(HB_SGIMAGE_ICON) || defined(HB_NVG_CS_ICON)
+ if((key.renderMode == EHWRendering) && (currentRenderingMode == EHWRendering)) {
+ renderMode = EHWRendering;
+ }
+#endif
bool isIconCreated = false;
if ((format == KSvg) || (format == KPic)) {
-
-#ifdef HB_NVG_TLV_ICON
- rasterIcon.reset(new HbNvgIconProcessor(key, options, format));
- vectorIcon.reset(new HbNvgIconProcessor(key, options, format));
-#else
rasterIcon.reset(new HbPixmapIconProcessor(key, options, format));
-#endif
-
+
#ifdef SVG_INTERMEDIATE_PIC
vectorIcon.reset(new HbPicIconProcessor(key, options, format));
#endif
@@ -114,15 +123,34 @@
#ifdef HB_NVG_CS_ICON
if (!isMultiPiece) {
#ifdef HB_SGIMAGE_ICON
- if (HbThemeServerPrivate::gpuMemoryState()) {
- rasterIcon.reset(new HbSgimageIconProcessor(key, options, format));
+ if(renderMode == ESWRendering){
+ rasterIcon.reset(new HbPixmapIconProcessor( key, options, format));
+ }else {
+ if (HbThemeServerPrivate::gpuMemoryState()) {
+ rasterIcon.reset(new HbSgimageIconProcessor( key, options, format));
+ }
+ vectorIcon.reset(new HbNvgIconProcessor( key, options, format ));
}
#endif
- vectorIcon.reset(new HbNvgIconProcessor(key, options, format));
- } else {
- // multipieceIcon So make nvgiconimpl for .nvg files
- // No raster icon data is created
- vectorIcon.reset(new HbNvgIconProcessor(key, options, format));
+
+// if sgImage support is enabled by default remove this block
+#ifndef HB_SGIMAGE_ICON
+ if(renderMode == ESWRendering){
+ rasterIcon.reset(new HbPixmapIconProcessor( key, options, format));
+ } else {
+ vectorIcon.reset(new HbNvgIconProcessor( key, options, format ));
+ }
+#endif
+// block end
+ }
+ else {
+ if(renderMode == ESWRendering){
+ rasterIcon.reset(new HbPixmapIconProcessor( key, options, format));
+ } else {
+ // multipieceIcon So make nvgiconimpl for .nvg files
+ // No raster icon data is created
+ vectorIcon.reset(new HbNvgIconProcessor( key, options, format ));
+ }
}
#endif
} else if (format == KBlob) {
@@ -186,13 +214,31 @@
created with some parameters either on the Gpu or the Cpu
\a iconCacheItem denotes the cacheItem to be populated
\a key unique identifier to identify the cache item
+ \a currentRenderingMode ThemeServer's current rendering mode state
*/
void HbIconCacheItemCreator::createCacheItem(HbIconCacheItem& iconCacheItem,
- const HbIconKey &key)
+ const HbIconKey &key,
+ HbRenderingMode currentRenderingMode)
{
+#ifndef Q_OS_SYMBIAN
+ Q_UNUSED(currentRenderingMode)
+#endif
QScopedPointer <HbIconProcessor> rasterIcon;
QScopedPointer <HbIconProcessor> vectorIcon;
+
+ // Set the render mode to EHWRendering, only if the client is requesting a HW rendered icon
+ // and ThemeServer is in HW rendering mode
+ HbRenderingMode renderMode = ESWRendering;
+#ifndef Q_OS_SYMBIAN
+ Q_UNUSED(renderMode)
+#endif
+
+#if defined(HB_SGIMAGE_ICON) || defined(HB_NVG_CS_ICON)
+ if((key.renderMode == EHWRendering) && (currentRenderingMode == EHWRendering)) {
+ renderMode = EHWRendering;
+ }
+#endif
bool isIconCreated = false;
QString format = HbThemeServerUtils::formatFromPath(key.filename);
@@ -204,8 +250,12 @@
}
if (format == KNvg) {
#ifdef HB_SGIMAGE_ICON
- if (HbThemeServerPrivate::gpuMemoryState()) {
- rasterIcon.reset(new HbSgimageIconProcessor(key, iconCacheItem.iconOptions, format));
+ if(renderMode == EHWRendering){
+ if (HbThemeServerPrivate::gpuMemoryState()){
+ rasterIcon.reset(new HbSgimageIconProcessor( key, iconCacheItem.iconOptions, format));
+ }
+ }else {
+ rasterIcon.reset(new HbPixmapIconProcessor( key, iconCacheItem.iconOptions, format));
}
#endif
#ifdef NVG_ICON
@@ -250,21 +300,46 @@
const QString &format,
const QVector<HbSharedIconInfo> &multiPieceIconInfo,
HbMultiIconParams &multiPieceIconParams,
- bool allNvg)
+ bool allNvg,
+ HbRenderingMode currentRenderingMode)
{
+#ifndef Q_OS_SYMBIAN
+ Q_UNUSED(currentRenderingMode)
+#endif
+
HbIconCacheItem* item = 0;
QScopedPointer <HbIconCacheItem> tempIconCacheItem;
bool isIconCreated = false;
QScopedPointer<HbIconProcessor> rasterIcon;
+
+ // Set the render mode to EHWRendering, only if the client is requesting a HW rendered icon
+ // and ThemeServer is in HW rendering mode
+ HbRenderingMode renderMode = ESWRendering;
+#ifndef Q_OS_SYMBIAN
+ Q_UNUSED(renderMode)
+#endif
+#if defined(HB_SGIMAGE_ICON) || defined(HB_NVG_CS_ICON)
+ if((finalIconKey.renderMode == EHWRendering) && (currentRenderingMode == EHWRendering)) {
+ renderMode = EHWRendering;
+ }
+#endif
if (allNvg) {
#ifdef HB_SGIMAGE_ICON
- if (HbThemeServerPrivate::gpuMemoryState()) {
- rasterIcon.reset(new HbSgimageIconProcessor(
- finalIconKey,
- (HbIconLoader::IconLoaderOptions)multiPieceIconParams.options,
- KSgimage));
+ if(renderMode == EHWRendering){
+ if (HbThemeServerPrivate::gpuMemoryState()) {
+ rasterIcon.reset(new HbSgimageIconProcessor(
+ finalIconKey,
+ (HbIconLoader::IconLoaderOptions)multiPieceIconParams.options,
+ KSgimage));
+ }
+
+ } else {
+ rasterIcon.reset(new HbPixmapIconProcessor(
+ finalIconKey,
+ (HbIconLoader::IconLoaderOptions)multiPieceIconParams.options,
+ KNvg));
}
#else
return item;
--- a/src/hbservers/hbthemeserver/hbiconcacheitemcreator_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbiconcacheitemcreator_p.h Fri May 14 16:09:54 2010 +0300
@@ -67,16 +67,19 @@
static HbIconCacheItem* createCacheItem(const HbIconKey &key,
HbIconLoader::IconLoaderOptions options,
const QString &format,
+ HbRenderingMode currentRenderingMode,
bool isMultiPiece = false);
static void createCacheItem(HbIconCacheItem& iconCacheItem,
- const HbIconKey &key);
+ const HbIconKey &key,
+ HbRenderingMode currentRenderingMode);
static HbIconCacheItem * createMultiPieceCacheItem(const HbIconKey &key,
HbIconLoader::IconLoaderOptions options,
const QString &format,
const QVector<HbSharedIconInfo> &multiPieceIconInfo,
HbMultiIconParams &multiPieceIconParams,
- bool allNvg);
+ bool allNvg,
+ HbRenderingMode currentRenderingMode);
--- a/src/hbservers/hbthemeserver/hbicondatacache_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbicondatacache_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -207,6 +207,7 @@
*/
HbIconCacheItem* HbIconDataCache::getCacheItem(const HbIconKey &key ,
+ HbRenderingMode currentRenderingMode,
bool isMultiIconPiece)
{
HbIconCacheItem* item = 0;
@@ -248,7 +249,7 @@
(goodMemory && !isMultiIconPiece)) {
if (item->vectorIconData.type == NVG) {
- HbIconCacheItemCreator::createCacheItem(*item, key);
+ HbIconCacheItemCreator::createCacheItem(*item, key, currentRenderingMode);
if (item->rasterIconData.type != INVALID_FORMAT) {
currentGpuCacheSize += item->rasterIconDataCost;
}
@@ -290,7 +291,7 @@
(item->rasterIconData.type == SGIMAGE)) {
if ((item->vectorIconDataCost < (maxCpuCacheLimit - currentCpuCacheSize))) {
- HbIconCacheItemCreator::createCacheItem(*item, key);
+ HbIconCacheItemCreator::createCacheItem(*item, key, currentRenderingMode);
if (item->vectorIconData.type != INVALID_FORMAT) {
currentCpuCacheSize += item->vectorIconDataCost;
}
@@ -792,6 +793,36 @@
} else {
createGpuCacheSpace(gpuLruListSize);
}
+
+ // Iterate through the cache and remove any active SgImages, before the context
+ // is destroyed.
+ QHash<HbIconKey, HbIconCacheItem*>::const_iterator itEnd(cache->constEnd());
+ for (QHash < HbIconKey,
+ HbIconCacheItem* >::const_iterator iter = cache->constBegin();
+ iter != itEnd;
+ ++iter) {
+ HbIconCacheItem* temp = iter.value();
+ if( temp->rasterIconData.type == SGIMAGE ){
+#ifdef HB_SGIMAGE_ICON
+ HbSgImageRenderer::removeSgImageFromHash(temp->rasterIconData.sgImageData.id);
+#endif
+ temp->rasterIconData.type = INVALID_FORMAT;
+ temp->gpuLink.setNext(0);
+ temp->gpuLink.setPrev(0);
+ currentGpuCacheSize -= temp->rasterIconDataCost;
+ }
+ }
+
+}
+
+/*!
+ \fn HbIconDataCache::freeUnusedGpuResources()
+ This function internally calls createGpuCacheSpace() which will free up
+ all the unused sgImage icons.
+ */
+void HbIconDataCache::freeUnusedGpuResources()
+{
+ createGpuCacheSpace(gpuLruListSize);
}
QVector<const HbIconKey *> HbIconDataCache::getKeys(const QString &filename) const
--- a/src/hbservers/hbthemeserver/hbicondatacache_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbicondatacache_p.h Fri May 14 16:09:54 2010 +0300
@@ -38,6 +38,7 @@
~HbIconDataCache();
void clear();
HbIconCacheItem* getCacheItem(const HbIconKey &key ,
+ HbRenderingMode currentRenderingMode,
bool isMultiIconPiece = false);
bool insert(const HbIconKey &key, HbIconCacheItem* item);
bool remove(const HbIconKey& key, bool keepInCache = true);
@@ -49,6 +50,7 @@
bool isItemCachableInCpu(const HbIconCacheItem* item)const;
void memoryGood();
void freeGpuRam(int bytes);
+ void freeUnusedGpuResources();
QVector<const HbIconKey *> getKeys(const QString &filename) const;
//Debug Code for Test Purpose
--- a/src/hbservers/hbthemeserver/hbiconprocessor_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbiconprocessor_p.h Fri May 14 16:09:54 2010 +0300
@@ -43,13 +43,14 @@
Qt::AspectRatioMode aspectRatioM,
QIcon::Mode m,
bool mir,
- const QColor &clr):
+ const QColor &clr, HbRenderingMode rMode):
filename(file),
size(s),
aspectRatioMode(aspectRatioM),
mode(m),
mirrored(mir),
- color(clr)
+ color(clr),
+ renderMode(rMode)
{
}
@@ -57,7 +58,8 @@
{
// compare filename in the last when everything else is matching
// to avoid unnecessary string comparisons
- return qFuzzyCompare(size.width(), other.size.width())
+ return (renderMode == other.renderMode)
+ && qFuzzyCompare(size.width(), other.size.width())
&& qFuzzyCompare(size.height(), other.size.height())
&& (aspectRatioMode == other.aspectRatioMode)
&& (mode == other.mode)
@@ -75,6 +77,7 @@
mirrored = other.mirrored;
filename = other.filename;
color = other.color;
+ renderMode = other.renderMode;
}
return *this;
}
@@ -85,6 +88,7 @@
QIcon::Mode mode;
bool mirrored;
QColor color;
+ HbRenderingMode renderMode;
};
inline uint qHash(const HbIconKey &key)
--- a/src/hbservers/hbthemeserver/hbnvgiconprocessor_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbnvgiconprocessor_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -28,7 +28,6 @@
#include <QFile>
#include "hbiconsource_p.h"
#include "hbmemoryutils_p.h"
-#include <hbtlvwrapper_p.h>
#include "hbthemeserverutils_p.h"
@@ -81,31 +80,20 @@
return false;
}
bool isDefaultSize = iconKey.size.isNull();
- if (iconType == "SVG") {
- quint32 domhandle = 0;
- defaultSize = (HbTlvWrapper::instance())->contentDimensions((QString&)iconPath, domhandle);
- QSizeF renderSize = QSizeF(defaultSize);
- if (!isDefaultSize) {
- renderSize.scale(iconKey.size, iconKey.aspectRatioMode);
- }
- if (domhandle) {
- byteArray = (HbTlvWrapper::instance())->getTlvEncodedDataFromDom(domhandle, renderSize, iconKey.aspectRatioMode);
- size = renderSize.toSize();
- }
- } else {
- HbIconSource *source = HbThemeServerUtils::getIconSource(iconPath);
- QByteArray *sourceByteArray = source->byteArray();
- if( !sourceByteArray ) {
- return false;
- }
- byteArray = *sourceByteArray;
- QSizeF renderSize = source->defaultSize();
- defaultSize = renderSize.toSize();
- if (!isDefaultSize) {
- renderSize.scale(iconKey.size, iconKey.aspectRatioMode);
- }
- size = renderSize.toSize();
+
+ HbIconSource *source = HbThemeServerUtils::getIconSource(iconPath);
+ QByteArray *sourceByteArray = source->byteArray();
+ if( !sourceByteArray ) {
+ return false;
}
+ byteArray = *sourceByteArray;
+ QSizeF renderSize = source->defaultSize();
+ defaultSize = renderSize.toSize();
+ if (!isDefaultSize) {
+ renderSize.scale(iconKey.size, iconKey.aspectRatioMode);
+ }
+ size = renderSize.toSize();
+
return true;
}
--- a/src/hbservers/hbthemeserver/hbsgimageiconprocessor_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbsgimageiconprocessor_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -36,7 +36,6 @@
-static HbNvgEngine nvgEngine;
HbSgImageRenderer* HbSgimageIconProcessor::sgImageRenderer = HbSgImageRenderer::global();
struct HbSgImageClosure
@@ -327,10 +326,10 @@
}
NvgAspectRatioSettings settings = mapKeyAspectRatioToNvgAspectRatio(aspectRatioMode);
- nvgEngine.setPreserveAspectRatio(settings.nvgAlignStatusAndAspectRatio, settings.type);
- nvgEngine.enableMirroring(mirrored);
+ sgImageRenderer->nvgEngine()->setPreserveAspectRatio(settings.nvgAlignStatusAndAspectRatio, settings.type);
+ sgImageRenderer->nvgEngine()->enableMirroring(mirrored);
- HbNvgEngine::HbNvgErrorType errorType = nvgEngine.drawNvg(byteArray, size);
+ HbNvgEngine::HbNvgErrorType errorType = sgImageRenderer->nvgEngine()->drawNvg(byteArray, size);
return errorType == HbNvgEngine::NvgErrNone;
}
--- a/src/hbservers/hbthemeserver/hbsgimagerenderer.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbsgimagerenderer.cpp Fri May 14 16:09:54 2010 +0300
@@ -24,6 +24,8 @@
****************************************************************************/
#include "hbsgimagerenderer_p.h"
+#include "hbnvg_p.h"
+
#include <QDebug>
QHash<unsigned long long, RSgImage*> HbSgImageRenderer::sgImageHash;
@@ -39,7 +41,8 @@
currentSurface(EGL_NO_SURFACE),
eglContext(EGL_NO_CONTEXT),
eglConfig(0),
- init(false)
+ init(false),
+ engine(0)
{
#ifdef HB_ICON_CACHE_DEBUG
eglQueryProfilingData = 0;
@@ -74,6 +77,7 @@
if (error != KErrNone) {
return false;
}
+ engine = new HbNvgEngine;
}
init = true;
@@ -83,6 +87,7 @@
void HbSgImageRenderer::terminate()
{
if (init) {
+ eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
if (eglContext != EGL_NO_CONTEXT) {
eglDestroyContext(display, eglContext);
eglContext = EGL_NO_CONTEXT;
@@ -91,8 +96,10 @@
sgDriver.Close();
eglTerminate(display);
+ eglReleaseThread();
display = EGL_NO_DISPLAY;
-
+ delete engine;
+ engine = 0;
init = false;
}
}
@@ -117,7 +124,7 @@
eglContext = eglCreateContext(display, eglConfig, EGL_NO_CONTEXT, 0);
- return true;
+ return eglContext != EGL_NO_CONTEXT;
}
bool HbSgImageRenderer::beginRendering(RSgImage * sgImage)
--- a/src/hbservers/hbthemeserver/hbsgimagerenderer_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbsgimagerenderer_p.h Fri May 14 16:09:54 2010 +0300
@@ -31,6 +31,8 @@
#include <sgresource/sgimage.h>
#include <hbthemecommon_symbian_p.h>
+class HbNvgEngine;
+
#ifdef HB_ICON_CACHE_DEBUG
typedef EGLBoolean (*NOK_resource_profiling)(EGLDisplay, EGLint, EGLint*, EGLint, EGLint*);
#endif
@@ -41,12 +43,14 @@
HbSgImageRenderer();
~HbSgImageRenderer();
+ HbNvgEngine * nvgEngine() { return engine;}
bool initialize();
bool beginRendering(RSgImage * sgImage);
void endRendering();
static HbSgImageRenderer *global();
static void addSgImageToHash(unsigned long long id, RSgImage* sgImage);
static void removeSgImageFromHash(unsigned long long id);
+ void terminate();
#ifdef HB_ICON_CACHE_DEBUG
unsigned long totalGPUMemory();
@@ -54,8 +58,7 @@
#endif
private:
-
- void terminate();
+
bool createContext(RSgImage * sgImage);
#ifdef HB_ICON_CACHE_DEBUG
@@ -72,6 +75,7 @@
bool init;
RSgDriver sgDriver;
static QHash<unsigned long long, RSgImage*> sgImageHash;
+ HbNvgEngine *engine;
};
#endif
--- a/src/hbservers/hbthemeserver/hbthemeserver.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbthemeserver.cpp Fri May 14 16:09:54 2010 +0300
@@ -43,13 +43,15 @@
* Constructor
*/
+HbThemeServer::HbThemeServer(QWidget *parent) :
+#ifndef Q_OS_SYMBIAN
+ QMainWindow(parent),
+#endif
+ themeServer(0)
+{
#ifdef Q_OS_SYMBIAN
-HbThemeServer::HbThemeServer(): themeServer(0)
+ Q_UNUSED(parent);
#else
-HbThemeServer::HbThemeServer(QWidget *parent): QMainWindow(parent), themeServer(0)
-#endif
-{
-#ifndef Q_OS_SYMBIAN
statusLabel = new QLabel;
statusLabel->setText("Theme Server Started");
setCentralWidget(statusLabel);
@@ -100,10 +102,18 @@
// Parses the device profiles and device modes and stores in the
// shared memory.
HbThemeServerUtils::createDeviceProfileDatabase();
+ return success;
+}
- //Creates the secondary Cache.
- HbThemeServerUtils::createSharedCache();
- return success;
+/**
+ * stopServer
+ */
+void HbThemeServer::stopServer()
+{
+#ifndef Q_OS_SYMBIAN
+ delete themeServer;
+ themeServer = 0;
+#endif // Q_OS_SYMBIAN
}
/**
@@ -111,7 +121,7 @@
*/
HbThemeServer::~HbThemeServer()
{
- delete themeServer;
+ stopServer();
GET_MEMORY_MANAGER(HbMemoryManager::SharedMemory)
if (manager) {
manager->releaseInstance(HbMemoryManager::SharedMemory);
--- a/src/hbservers/hbthemeserver/hbthemeserver.pro Mon May 03 12:48:33 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbthemeserver.pro Fri May 14 16:09:54 2010 +0300
@@ -37,6 +37,7 @@
# Input
SOURCES += $$PWD/main.cpp
SOURCES += $$PWD/hbthemeserver.cpp
+SOURCES += $$PWD/hbthemeserverapplication.cpp
SOURCES += $$PWD/hbthemeserverutils.cpp
SOURCES += $$PWD/hbiconcacheitemcreator_p.cpp
SOURCES += $$PWD/hbpixmapiconprocessor_p.cpp
@@ -45,6 +46,7 @@
SOURCES += $$PWD/hbcache_p.cpp
HEADERS += $$PWD/hbthemeserver_p.h
+HEADERS += $$PWD/hbthemeserverapplication_p.h
HEADERS += $$PWD/hbthemeserverutils_p.h
HEADERS += $$PWD/hbiconcacheitemcreator_p.h
HEADERS += $$PWD/hbiconprocessor_p.h
@@ -58,30 +60,30 @@
symbian:CONFIG += nvg
symbian {
- SOURCES += $$PWD/hbthemeserver_symbian.cpp
- HEADERS += $$PWD/hbthemeserver_symbian_p_p.h
-
- nvg:DEFINES += HB_NVG_CS_ICON
- sgimage:DEFINES += HB_SGIMAGE_ICON
+ SOURCES += $$PWD/hbthemeserver_symbian.cpp
+ HEADERS += $$PWD/hbthemeserver_symbian_p_p.h
+ LIBS += -lapgrfx -lws32 -lavkon -lcone -leikcore -lNVGDecoder_SW -llibvgi -lfbscli -lefsrv
+
+ nvg {
+ DEFINES += HB_NVG_CS_ICON
+ SOURCES += $$PWD/hbnvgiconprocessor_p.cpp
+ HEADERS += $$PWD/hbnvgiconprocessor_p.h
+ LIBS += -llibopenvg -llibopenvgu -llibegl
+ }
- nvg {
- SOURCES += $$PWD/hbnvgiconprocessor_p.cpp
- HEADERS += $$PWD/hbnvgiconprocessor_p.h
- LIBS += -llibopenvg -llibopenvgu -llibegl
- }
- LIBS += -lapgrfx -lws32 -lavkon -lcone -leikcore -lNVGDecoder_SW -llibvgi -lfbscli
- sgimage {
- HEADERS += $$PWD/hbsgimageiconprocessor_p.h
- HEADERS += $$PWD/hbsgimagerenderer_p.h
- SOURCES += $$PWD/hbsgimageiconprocessor_p.cpp
- SOURCES += $$PWD/hbsgimagerenderer.cpp
- INCLUDEPATH += $${EPOCROOT}epoc32/include/platform #For SGImage Support
- LIBS += -lsgresource #For SGImage Support
- LIBS += -llibopenvg #For SGImage Support
- LIBS += -llibopenvgu #For SGImage Support
- LIBS += -llibegl #For SGImage Support
- }
-
+ sgimage {
+ DEFINES += HB_SGIMAGE_ICON
+ HEADERS += $$PWD/hbsgimageiconprocessor_p.h
+ HEADERS += $$PWD/hbsgimagerenderer_p.h
+ SOURCES += $$PWD/hbsgimageiconprocessor_p.cpp
+ SOURCES += $$PWD/hbsgimagerenderer.cpp
+ INCLUDEPATH += $${EPOCROOT}epoc32/include/platform #For SGImage Support
+ LIBS += -lsgresource #For SGImage Support
+ LIBS += -llibopenvg #For SGImage Support
+ LIBS += -llibopenvgu #For SGImage Support
+ LIBS += -llibegl #For SGImage Support
+ }
+
myrssrules = \
"hidden = KAppIsHidden;"
RSS_RULES += myrssrules
@@ -90,7 +92,7 @@
MMP_RULES += "SYSTEMINCLUDE $${EPOCROOT}epoc32/include/mw"
TARGET.UID3 = 0x20022E82
TARGET.EPOCHEAPSIZE = 0x20000 0xA00000
-
+
# AllFiles is needed to be able to access icon and effect files in
# an application's private folder for example.
TARGET.CAPABILITY = CAP_SERVER AllFiles
--- a/src/hbservers/hbthemeserver/hbthemeserver_generic.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbthemeserver_generic.cpp Fri May 14 16:09:54 2010 +0300
@@ -24,6 +24,7 @@
****************************************************************************/
#include "hbthemeserver_generic_p_p.h"
+#include "hbthemeserverapplication_p.h"
#include <QLabel>
#include <QLocalServer>
@@ -38,6 +39,7 @@
#include <QPainter>
#include <QStringList>
#include <QPixmap>
+#include <QTimer>
#include <hbinstance.h>
@@ -53,6 +55,9 @@
#include "hblayeredstyleloader_p.h"
#include "hbthemesystemeffect_p.h"
#include "hbsharedmemorymanager_p.h"
+#include "hbtypefaceinfodatabase_p.h"
+
+static const int CLOSE_TIMEOUT = 3000;
/*!
@hbserver
@@ -83,7 +88,10 @@
sessionList.clear();
#ifdef QT_DEBUG
setWindowTitle("Theme Server");
+ setCentralWidget(&statusLabel);
#endif
+ // renderMode set to SW mode by default
+ renderMode = ESWRendering;
// Using QScopedPointer so that it deallocates memory
// when std::badalloc exception occurs.
QScopedPointer <HbIconDataCache> tempIconCache(new HbIconDataCache());
@@ -92,6 +100,8 @@
cssCache = tempCssCache.take();
setMaxGpuCacheSize(GPU_CACHE_SIZE);
setMaxCpuCacheSize(CPU_CACHE_SIZE);
+
+ connect(server, SIGNAL(newConnection()), this, SLOT(newClientConnected()));
}
/*!
@@ -112,25 +122,43 @@
*/
bool HbThemeServerPrivate::start()
{
- bool success = false;
- if (!server->listen(THEME_SERVER_NAME)) {
- qWarning("Unable to start the server: %s.", server->errorString().toLatin1().data());
-#if defined(Q_OS_LINUX) || defined(Q_OS_MAC)
- if (server->serverError() == QAbstractSocket::AddressInUseError) {
- qDebug() << "Trying to delete temporary file hbthemeserver";
- QFile::remove("/tmp/hbthemeserver");
- success = start();
- }
+ // try max 2 times
+ bool success = listen() || listen();
+ if (!success) {
+ qWarning() << "HbThemeServer: unable to start the server.";
+ } else {
+#ifdef QT_DEBUG
+ statusLabel.setText("Theme Server Started");
#endif
- return success;
+ }
+ return success;
+}
+
+bool HbThemeServerPrivate::listen()
+{
+ bool success = server->listen(THEME_SERVER_NAME);
+ if (!success) {
+ qWarning() << "HbThemeServer:" << server->errorString();
+ if (server->serverError() == QAbstractSocket::AddressInUseError) {
+ stop();
+ }
}
+ return success;
+}
+
+/*!
+ \fn HbThemeServerPrivate::stop()
+ stop the themeserver
+*/
+void HbThemeServerPrivate::stop()
+{
+ if (server) {
+ server->close();
+ }
+ QLocalServer::removeServer(THEME_SERVER_NAME);
#ifdef QT_DEBUG
- statusLabel.setText("Theme Server Started");
- setCentralWidget(&statusLabel);
+ statusLabel.setText("Theme Server Stopped");
#endif
- connect(server, SIGNAL(newConnection()), this, SLOT(newClientConnected()));
- success = true;
- return success;
}
/*!
@@ -162,7 +190,7 @@
*/
HbIconCacheItem *HbThemeServerPrivate::iconCacheItem(const HbIconKey &key)
{
- return(iconCache->getCacheItem(key, false));
+ return(iconCache->getCacheItem(key, renderMode, false));
}
/*!
@@ -247,11 +275,7 @@
#endif
// Modify the QSettings to store the applied theme
QSettings settings(QLatin1String(ORGANIZATION), QLatin1String(THEME_COMPONENT));
- QString prevTheme = settings.value(CURRENT_THEME_KEY).toString();
- if (prevTheme == newTheme) {
- // Theme did not change, return.
- return;
- }
+
// Clear cached icons and session data
clearIconCache();
HbThemeServerSession *session;
@@ -402,7 +426,44 @@
break;
}
}
- qDebug() << "Total No of Connection after deletion = " << sessionList.count();
+
+ QTimer::singleShot(CLOSE_TIMEOUT, this, SLOT(clienDisconnected()));
+}
+
+void HbThemeServerPrivate::clienDisconnected()
+{
+#ifdef THEME_SERVER_TRACES
+ qDebug()<<"Total No of Connection after deletion = "<<sessionList.count();
+#endif
+
+ // Quit the server if no more clients connected
+ if (!HbThemeServerApplication::Options::persistent && sessionList.isEmpty()) {
+#ifdef THEME_SERVER_TRACES
+ qDebug() << "HbThemeServerQt: last application quit, so do we!";
+#endif
+ stop();
+ QCoreApplication::quit();
+ }
+}
+
+/**
+ * HbThemeServerPrivate::currentRenderingMode
+ * This function returns ThemeServer's current rendering mode
+ *
+ */
+HbRenderingMode HbThemeServerPrivate::currentRenderingMode() const
+{
+ return renderMode;
+}
+
+/**
+ * HbThemeServerPrivate::setCurrentRenderingMode
+ * This function sets ThemeServer's current rendering mode
+ *
+ */
+void HbThemeServerPrivate::setCurrentRenderingMode(HbRenderingMode currentMode)
+{
+ renderMode = currentMode;
}
//Debug Code for Test Purpose
@@ -626,15 +687,6 @@
((QLocalSocket *)sender())->write(outputByteArray);
break;
}
- case ESecondaryCacheOffset: {
- int offset = HbThemeServerUtils::sharedCacheOffset();
- QByteArray outputByteArray;
- QDataStream outputDataStream(&outputByteArray, QIODevice::WriteOnly);
- outputDataStream << requestType;
- outputDataStream << offset;
- ((QLocalSocket *)sender())->write(outputByteArray);
- break;
- }
case EEffectLookupFilePath:
case EEffectAdd: {
QString fileName;
@@ -698,7 +750,7 @@
#ifdef THEME_SERVER_TRACES
qDebug() << "image req at server: " << filename;
#endif
- HbIconKey key(filename, size, (Qt::AspectRatioMode)aspectRatioMode, (QIcon::Mode)mode, mirrored, color);
+ HbIconKey key(filename, size, (Qt::AspectRatioMode)aspectRatioMode, (QIcon::Mode)mode, mirrored, color, iServer->currentRenderingMode());
QByteArray output = handleIconLookup(key, data, options);
((QLocalSocket *)sender())->write(output);
break;
@@ -749,7 +801,7 @@
HbIconKey finalIconKey(iconId, frameItemParams.size,
(Qt::AspectRatioMode)frameItemParams.aspectRatioMode,
(QIcon::Mode)frameItemParams.mode, frameItemParams.mirrored,
- frameItemParams.color);
+ frameItemParams.color, (HbRenderingMode)frameItemParams.renderMode);
stitchedData.type = INVALID_FORMAT;
@@ -804,7 +856,7 @@
for (int i = 0; i < fileList.count(); i++) {
HbIconKey key(fileList[i], sizeList[i],
static_cast<Qt::AspectRatioMode>(aspectRatioMode),
- static_cast<QIcon::Mode>(mode), mirrored, color);
+ static_cast<QIcon::Mode>(mode), mirrored, color, iServer->currentRenderingMode());
output.append(handleIconLookup(key, data, options));
}
@@ -915,6 +967,13 @@
case EServerHeap: {
}
#endif
+#ifdef HB_THEME_SERVER_MEMORY_REPORT
+ case ECreateMemoryReport: {
+ GET_MEMORY_MANAGER(HbMemoryManager::SharedMemory);
+ static_cast<HbSharedMemoryManager *>(manager)->createReport();
+ break;
+ }
+#endif
case EUnloadIcon: {
QString filename;
QSizeF size;
@@ -932,7 +991,7 @@
inputDataStream >> color;
HbIconKey key(filename, size, (Qt::AspectRatioMode)aspectRatioMode,
- (QIcon::Mode)mode, mirrored, color);
+ (QIcon::Mode)mode, mirrored, color, iServer->currentRenderingMode());
iServer->removeIconCacheItem(key);
sessionIconData.removeOne(key);
QByteArray outputByteArray;
@@ -960,6 +1019,24 @@
break;
}
+ case ETypefaceOffset: {
+ int offset = -1;
+ HbTypefaceInfoDatabase *typefaceDatabase =
+ HbTypefaceInfoDatabase::instance(HbMemoryManager::SharedMemory);
+
+ if (typefaceDatabase) {
+ offset = typefaceDatabase->typefaceInfoVectorOffset();
+ }
+ // offset will be -1 if the typefaceDatabase is NULL.
+ QByteArray outputByteArray;
+ QDataStream outputDataStream(&outputByteArray, QIODevice::WriteOnly);
+ outputDataStream << requestType;
+ outputDataStream << offset;
+ ((QLocalSocket *)sender())->write(outputByteArray);
+ break;
+ }
+
+
default:
break;
}
@@ -1003,6 +1080,7 @@
tempIconCacheItem.reset(HbIconCacheItemCreator::createCacheItem(key,
(HbIconLoader::IconLoaderOptions)options,
format,
+ iServer->currentRenderingMode(),
false));
cacheItemOfPiece = tempIconCacheItem.data();
if (cacheItemOfPiece) {
@@ -1042,7 +1120,7 @@
QScopedPointer <HbIconCacheItem> tempIconCacheItem;
tempIconCacheItem.reset(HbIconCacheItemCreator::createCacheItem(finalIconKey,
- static_cast<HbIconLoader::IconLoaderOptions>(params.options), format, false));
+ static_cast<HbIconLoader::IconLoaderOptions>(params.options), format, iServer->currentRenderingMode(),false));
cacheItem = tempIconCacheItem.data();
cacheItem->rasterIconData = rasterIcon->sharedIconData();
@@ -1082,7 +1160,7 @@
bool iconPieceMirrored = false;
HbIconKey key(params.multiPartIconList.at(i), params.multiPartIconData.pixmapSizes[i],
static_cast<Qt::AspectRatioMode>(stichedKey.aspectRatioMode),
- static_cast<QIcon::Mode>(stichedKey.mode), iconPieceMirrored, stichedKey.color);
+ static_cast<QIcon::Mode>(stichedKey.mode), iconPieceMirrored, stichedKey.color,stichedKey.renderMode );
insertKeyIntoSessionList = iconInfoFromSingleIcon(key, data);
if (!insertKeyIntoSessionList) {
insertKeyIntoSessionList = createCacheItemData(key, params.options, data);
@@ -1289,25 +1367,28 @@
} else {
bool tryAgain = false;
do {
- offset = HbThemeServerUtils::getSharedStylesheet(fileName, priority);
- if (offset >= 0) {
- HbCacheItem *cssItem = new HbCacheItem(offset, 0, fileName);
- insertKeyIntoSessionList = iServer->insertCssCacheItem(fileName, cssItem);
- if (priority == HbLayeredStyleLoader::Priority_Core && cssItem->refCount == 1) {
- // This will make sure the requested stylesheet will always remain
- // in the primary and secondary cache.
- cssItem->incrementRefCount();
+ bool inSharedCache = false;
+ offset = HbThemeServerUtils::getSharedStylesheet(fileName, priority, &inSharedCache);
+ if (!inSharedCache) {
+ if (offset >= 0) {
+ HbCacheItem *cssItem = new HbCacheItem(offset, 0, fileName);
+ insertKeyIntoSessionList = iServer->insertCssCacheItem(fileName, cssItem);
+ if (priority == HbLayeredStyleLoader::Priority_Core && cssItem->refCount == 1) {
+ // This will make sure the requested stylesheet will always remain
+ // in the primary and secondary cache.
+ cssItem->incrementRefCount();
+ }
+ if (priority == HbLayeredStyleLoader::Priority_Theme && cssItem->refCount == 1) {
+ iServer->themePriorityItems.insert(fileName,cssItem);
+ }
+ break;
+ } else if (offset == OUT_OF_MEMORY_ERROR && tryAgain == false) {
+ iServer->doCleanup();
+ tryAgain = true;
+ } else if (offset == OUT_OF_MEMORY_ERROR && tryAgain == true) {
+ //try only once to free up memory.
+ tryAgain = false;
}
- if (priority == HbLayeredStyleLoader::Priority_Theme && cssItem->refCount == 1) {
- iServer->themePriorityItems.insert(fileName,cssItem);
- }
- break;
- } else if (offset == OUT_OF_MEMORY_ERROR && tryAgain == false) {
- iServer->doCleanup();
- tryAgain = true;
- } else if (offset == OUT_OF_MEMORY_ERROR && tryAgain == true) {
- //try only once to free up memory, else offset remains -2
- tryAgain = false;
}
} while (tryAgain);
}
@@ -1355,6 +1436,7 @@
tempIconCacheItem.reset(HbIconCacheItemCreator::createCacheItem(key,
(HbIconLoader::IconLoaderOptions)options,
format,
+ iServer->currentRenderingMode(),
false));
cacheItem = tempIconCacheItem.data();
if (cacheItem) {
--- a/src/hbservers/hbthemeserver/hbthemeserver_generic_p_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbthemeserver_generic_p_p.h Fri May 14 16:09:54 2010 +0300
@@ -55,6 +55,7 @@
~HbThemeServerPrivate();
bool start();
+ void stop();
bool insertIconCacheItem(const HbIconKey &key, HbIconCacheItem *item);
HbIconCacheItem* iconCacheItem(const HbIconKey &key);
@@ -81,6 +82,9 @@
int freeSharedMemory() const;
int allocatedSharedMemory() const;
+ HbRenderingMode currentRenderingMode() const;
+ void setCurrentRenderingMode(HbRenderingMode currentMode);
+
//Debug Code for Test Purpose
#ifdef HB_ICON_CACHE_DEBUG
int cacheIconCount() const;
@@ -103,7 +107,9 @@
private slots:
void newClientConnected();
+ void clienDisconnected();
void removeFromList();
+ bool listen();
public:
QHash<QString, HbCacheItem*> themePriorityItems;
@@ -117,6 +123,7 @@
QList<HbThemeServerSession*> sessionList;
HbIconDataCache *iconCache;
HbCache *cssCache;
+ HbRenderingMode renderMode;
};
class HbThemeServerSession : public QObject
--- a/src/hbservers/hbthemeserver/hbthemeserver_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbthemeserver_p.h Fri May 14 16:09:54 2010 +0300
@@ -38,13 +38,11 @@
#endif
{
public:
-#ifdef Q_OS_SYMBIAN
- HbThemeServer();
-#else
HbThemeServer(QWidget *parent = 0);
-#endif
~HbThemeServer();
bool startServer();
+ void stopServer();
+
private:
#ifndef Q_OS_SYMBIAN
QLabel *statusLabel;
--- a/src/hbservers/hbthemeserver/hbthemeserver_symbian.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbthemeserver_symbian.cpp Fri May 14 16:09:54 2010 +0300
@@ -30,6 +30,8 @@
#include "hbthemeindex_p.h"
#include "hbthemeutils_p.h"
#include "hbsharedmemorymanager_p.h"
+#include "hbtypefaceinfodatabase_p.h"
+
#include <QHash>
#include <QImage>
@@ -43,6 +45,7 @@
#include <e32property.h>
#include <e32base.h>
#include <e32svr.h>
+#include <centralrepository.h>
#include "hbpixmapiconprocessor_p.h"
#include "hbpixmapiconimpl_p.h"
#include "hblayeredstyleloader_p.h"
@@ -65,10 +68,12 @@
static _LIT_SECURITY_POLICY_C1(KThemeChangerPolicy,ECapabilityWriteDeviceData);
+const QString operatorCPath = "C:/resource/hb/operatorTheme/icons/";
+const QString operatorZPath = "Z:/resource/hb/operatorTheme/icons/";
+
static HbThemeServerPrivate *TheServer = 0;
bool HbThemeServerPrivate::gpuGoodMemoryState = true;
// This is used as parent theme always regardless of the active theme
-const int themeIndexFailed = -2; // error code to indicate failure in processing theme index
//**********************************
//HbThemeServerPrivate
@@ -103,24 +108,28 @@
}
TInt error = iThemeProperty.Attach(KServerUid3, KThemeName );
User::LeaveIfError(error);
-
+
// Store the active theme name in a member string
- iCurrentThemeName = HbThemeUtils::getThemeSetting(HbThemeUtils::CurrentThemeSetting);
-
+ iCurrentThemeName = HbThemeUtils::getThemeSetting(HbThemeUtils::CurrentThemeSetting);
+
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);
}
- // Register theme system effects in construction
- HbThemeSystemEffect::handleThemeChange(iCurrentThemeName);
-
- // Set the current theme also in the pubsub key that is used to notify clients.
- TPtrC currentThemePtr(reinterpret_cast<const TUint16 *>(iCurrentThemeName.constData()));
- iThemeProperty.Set(currentThemePtr);
+ // 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);
+
+ // Register theme system effects in construction
+ // TODO: fix parameter
+ HbThemeSystemEffect::handleThemeChange(iCurrentThemeName);
- // Resolve the drive letter of the current theme
- resolveCurrentThemeDrive();
// Open index file to prevent uninstallation of the active theme
openCurrentIndexFile();
cache = 0;
@@ -138,11 +147,31 @@
}
setMaxGpuCacheSize(GPU_CACHE_SIZE);
setMaxCpuCacheSize(CPU_CACHE_SIZE);
-
- const QString &baseThemeName = HbThemeUtils::baseTheme().name;
+#if defined(HB_SGIMAGE_ICON) || defined(HB_NVG_CS_ICON)
+ renderMode = EHWRendering;
+#else
+ renderMode = ESWRendering;
+#endif
+
// Process base theme index, it is used as parent index also when the current theme is something else
- processThemeIndex(baseThemeName, QChar('Z'));
- baseThemeIndexKey = themeIndexKey(baseThemeName, QChar('Z'));
+ QString basePath;
+ resolveThemePath(HbThemeUtils::getThemeSetting(HbThemeUtils::BaseThemeSetting), basePath);
+ createThemeIndex(basePath, BaseTheme);
+ // Process operator Drive C theme index
+ QString operatorName = HbThemeUtils::getThemeSetting(HbThemeUtils::OperatorNameSetting);
+ if (!operatorName.isEmpty()) {
+ QString operatorPath;
+ operatorPath.append(operatorCPath);
+ operatorPath.append(operatorName);
+ createThemeIndex(operatorPath, OperatorC);
+ // Process operator Drive Z theme index
+ QString operatorROMPath;
+ operatorROMPath.append(operatorZPath);
+ operatorROMPath.append(operatorName);
+ createThemeIndex(operatorROMPath, OperatorROM);
+ }
+ // Process current theme index
+ createThemeIndex(iCurrentThemePath, ActiveTheme);
// 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.)
@@ -150,11 +179,6 @@
QProcess::startDetached("hbiconpreloader.exe");
#endif
- // Cache ROM theme(name)s
- QString romPath = "Z:\\resource\\hb\\themes\\icons\\";
- QDir dir(romPath);
- romThemeNames = dir.entryList(QDir::Dirs);
-
// Start the splash screen generator app.
//QProcess::startDetached("hbsplashgenerator.exe");
}
@@ -170,12 +194,11 @@
so no second parameter is passed to the CServer2 constructor.
*/
HbThemeServerPrivate::HbThemeServerPrivate(CActive::TPriority aActiveObjectPriority)
- : CServer2( aActiveObjectPriority ),
- currentThemeDrive('Z') // Assume default theme is in ROM
+ : CServer2( aActiveObjectPriority )
{
// Set server pointer in static variable
TheServer = this;
-
+
// Set up the listener to listen for Publish events
TRAPD(err, iListener = CHbThemeChangeNotificationListener::NewL(*this));
if (err) {
@@ -213,11 +236,9 @@
void HbThemeServerPrivate::openCurrentIndexFile()
{
// Open index file to prevent uninstallation of the active theme
- if (!iCurrentThemeName.isEmpty() && currentThemeDrive != 'Z') {
+ if (!iCurrentThemePath.isEmpty() && iCurrentThemePath[0] != 'Z') {
QString indexFileName;
- indexFileName.append(currentThemeDrive);
- indexFileName.append(":\\resource\\hb\\themes\\icons\\");
- indexFileName.append(iCurrentThemeName);
+ indexFileName.append(iCurrentThemePath);
indexFileName.append("\\index.theme");
currentIndexfile.setFileName(indexFileName);
@@ -227,50 +248,59 @@
}
}
-void HbThemeServerPrivate::resolveCurrentThemeDrive()
+bool HbThemeServerPrivate::resolveThemePath(const QString &themeName, QString &themePath)
{
- if (!iCurrentThemeName.isEmpty()) {
+ if(themeName == "hbdefault") {
+ themePath = ":\\themes\\icons\\hbdefault";
+ return true;
+ }
+
+ if (!themeName.isEmpty()) {
// Check for the theme's icon directory in different drives.
// ROM is checked first and then phone memory and memory card drives.
+
+ QString themeLookupPath = "Z:\\resource\\hb\\themes\\icons\\";
- // ROM theme names can't change after they have been cached in server
- // construction time, so first check from there
- if (romThemeNames.contains(iCurrentThemeName)) {
- currentThemeDrive = 'Z';
- return;
+ if (romThemeNames.contains(themeName)) {
+ themeLookupPath.append(themeName);
+ themePath = themeLookupPath;
+ return true;
}
- QString filename = "C:\\resource\\hb\\themes\\icons\\";
- filename.append(iCurrentThemeName);
+ themeLookupPath.append(themeName);
+ QString filename(themeLookupPath);
filename.append("\\index.theme");
QFile file;
-
+
+ filename[0] = 'C';
file.setFileName(filename);
if (file.open(QIODevice::ReadOnly)) {
- currentThemeDrive = 'C';
+ themeLookupPath[0] = 'C';
+ themePath = themeLookupPath;
file.close();
- return;
+ return true;
}
filename[0] = 'E';
- file.setFileName(filename);
+ file.setFileName(filename);
if (file.open(QIODevice::ReadOnly)) {
- currentThemeDrive = 'E';
+ themeLookupPath[0] = 'E';
+ themePath = themeLookupPath;
file.close();
- return;
+ return true;
}
filename[0] = 'F';
file.setFileName(filename);
if (file.open(QIODevice::ReadOnly)) {
- currentThemeDrive = 'F';
+ themeLookupPath[0] = 'F';
+ themePath = themeLookupPath;
file.close();
- return;
- }
+ return true;
+ }
- // Default to 'Z' if not found in any drive
- currentThemeDrive = 'Z';
}
+ return false;
}
/**
@@ -281,27 +311,36 @@
//Make a copy for ourselves
- QString cleanThemeName = themeName.trimmed();
+ QString cleanThemeName = themeName.trimmed();
+
+ iCurrentThemeName = cleanThemeName;
+
+ QDir path(cleanThemeName);
+ if (!path.isAbsolute()) {
+ // Resolve the path of the current theme
+ resolveThemePath(iCurrentThemeName, iCurrentThemePath);
+ }
- if (cleanThemeName == iCurrentThemeName) {
- // Theme did not change, return.
- return;
- }
- // ToDo: Validate the theme name somehow
-
#ifdef THEME_INDEX_TRACES
qDebug() << "ThemeIndex: theme change request, new theme =" << cleanThemeName.toUtf8();
#endif
- iCurrentThemeName = cleanThemeName;
- // Resolve the drive letter of the current theme
- resolveCurrentThemeDrive();
-
currentIndexfile.close();
// Open index file to prevent uninstallation of the active theme
openCurrentIndexFile();
+ // Process operator Drive C theme index
+ QString operatorName = HbThemeUtils::getThemeSetting(HbThemeUtils::OperatorNameSetting);
+ if (!operatorName.isEmpty()) {
+ QString operatorPath;
+ operatorPath.append(operatorCPath);
+ operatorPath.append(operatorName);
+ createThemeIndex(operatorPath, OperatorC);
+ }
+ // Process current theme index
+ createThemeIndex(iCurrentThemePath, ActiveTheme);
+
// Clear cached icons and session data
clearIconCache();
iSessionIter.SetToFirst();
@@ -311,14 +350,11 @@
iSessionIter++;
}
+ // TODO: fix parameter
HbThemeSystemEffect::handleThemeChange(cleanThemeName);
- QSettings settings(QLatin1String(ORGANIZATION), QLatin1String(THEME_COMPONENT));
- settings.setValue(CURRENT_THEME_KEY, cleanThemeName);
- settings.sync();
- TPtrC name(reinterpret_cast<const TUint16 *>(cleanThemeName.constData()));
- TInt err = iThemeProperty.Set(name);
- User::LeaveIfError(err);
+ // Update settings and notify clients
+ HbThemeUtils::setThemeSetting(HbThemeUtils::CurrentThemeSetting,iCurrentThemeName);
}
/**
@@ -374,7 +410,7 @@
*/
HbIconCacheItem * HbThemeServerPrivate::iconCacheItem(const HbIconKey &key , bool isMultiIconPiece)
{
- return(cache->getCacheItem(key, isMultiIconPiece));
+ return(cache->getCacheItem(key, renderMode, isMultiIconPiece));
}
/**
@@ -440,16 +476,16 @@
* else returns INVALID_FORMAT
*/
HbIconFormatType HbThemeServerPrivate::IconTypeInCache( const HbIconKey &key ) const
-{
+{
if ( key.filename.isEmpty() || !cache->contains(key) ) {
return INVALID_FORMAT;
}
- HbIconCacheItem* item = cache->value(key);
+ HbIconCacheItem* item = cache->value(key);
if ( item->rasterIconData.type != INVALID_FORMAT ) {
return item->rasterIconData.type;
} else {
return item->vectorIconData.type;
- }
+ }
}
/**
@@ -494,8 +530,30 @@
{
gpuGoodMemoryState = false;
cache->freeGpuRam(bytes);
+#ifdef HB_SGIMAGE_ICON
+ HbSgImageRenderer::global()->terminate();
+#endif
}
+/**
+ * HbThemeServerPrivate::freeUnusedGpuResources
+ * This function frees all unused SgImage icons
+ *
+ */
+
+void HbThemeServerPrivate::freeUnusedGpuResources()
+{
+#if defined(HB_SGIMAGE_ICON) || defined(HB_NVG_CS_ICON)
+#ifdef HB_ICON_CACHE_DEBUG
+ HbSgImageRenderer *sgImg = HbSgImageRenderer::global();
+ qDebug() << "Free GPU Memory Before clearing GPU LRU list = " << sgImg->freeGPUMemory();
+#endif
+ cache->freeUnusedGpuResources();
+#ifdef HB_ICON_CACHE_DEBUG
+ qDebug() << "Free GPU Memory After clearing GPU LRU list = " << sgImg->freeGPUMemory();
+#endif
+#endif
+}
bool HbThemeServerPrivate::gpuMemoryState()
{
return gpuGoodMemoryState;
@@ -519,6 +577,25 @@
User::AllocSize(heapSize);
return heapSize;
}
+/**
+ * HbThemeServerPrivate::currentRenderingMode
+ * This function returns ThemeServer's current rendering mode
+ *
+ */
+HbRenderingMode HbThemeServerPrivate::currentRenderingMode() const
+{
+ return renderMode;
+}
+
+/**
+ * HbThemeServerPrivate::setCurrentRenderingMode
+ * This function sets ThemeServer's current rendering mode
+ *
+ */
+void HbThemeServerPrivate::setCurrentRenderingMode(HbRenderingMode currentMode)
+{
+ renderMode = currentMode;
+}
//Debug Code for Test Purpose
#ifdef HB_ICON_CACHE_DEBUG
@@ -638,20 +715,27 @@
HbThemeServerUtils::cleanupUnusedCss(cssCache);
}
-QString HbThemeServerPrivate::themeIndexKey(const QString &theme, const QChar drive)
+void HbThemeServerPrivate::createThemeIndex(const QString &themePath, const HbThemeType &themetype)
{
- QString key(drive);
- key.append(':');
- key.append(theme);
- return key;
-}
+ #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");
-void HbThemeServerPrivate::processThemeIndex(const QString &theme, const QChar drive)
-{
- QString filename(drive);
- filename.append(":\\resource\\hb\\themes\\");
- filename.append(theme);
- filename.append(".themeindex");
+ if (themePath == ":\\themes\\icons\\hbdefault") {
+ themeBasePath.setPath(":/themes");
+ filename = ":/themes/hbdefault.themeindex";
+ themeName = "hbdefault";
+ }
QFile indexFile(filename);
@@ -663,17 +747,23 @@
GET_MEMORY_MANAGER(HbMemoryManager::SharedMemory);
- qint64 byteSize = indexFile.size();
+ HbSharedChunkHeader *chunkHeader = (HbSharedChunkHeader*) manager->base();
+ qint64 byteSize = indexFile.size();
+
+ #ifdef THEME_INDEX_TRACES
+ qDebug() << "ThemeIndex: " << theme.toUtf8() << " index file size:" << byteSize;
+ #endif
+
int offset = manager->alloc(byteSize);
- if (offset >= 0) {
+ if (offset >= 0) {
+ #ifdef THEME_INDEX_TRACES
+ qDebug() << "ThemeIndex: memory allocated for theme: " << theme.toUtf8();
+ #endif
+
// Read the theme index in the shared chunk
char *address = HbMemoryUtils::getAddress<char>(HbMemoryManager::SharedMemory, offset);
- #ifdef THEME_INDEX_TRACES
- qDebug() << "ThemeIndex: Reading themeindex for theme" << theme.toUtf8();
- #endif
-
indexFile.read(address, byteSize);
indexFile.close();
@@ -684,116 +774,92 @@
// 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 (drive != 'Z') {
+
+ if (themePath[0] != 'Z') {
#ifdef THEME_INDEX_TRACES
qDebug() << "ThemeIndex: Validating themeindex for theme" << theme.toUtf8();
#endif
HbThemeIndex index(address);
- int count = index.itemCount();
- if (count * sizeof(HbThemeIndexItem) >= byteSize) {
- indexOK = false;
- } else {
- const HbThemeIndexItem *itemArray = index.itemArray();
- int stringAreaStart = reinterpret_cast<int>(index.stringAreaStart()) - reinterpret_cast<int>(address);
-
- for (int i = 0; i<count; i++) {
- const HbThemeIndexItem *item = itemArray++;
- if (item->iconnameOffset < stringAreaStart || item->iconnameOffset >= byteSize ||
- item->folderOffset < stringAreaStart || item->folderOffset >= byteSize ||
- item->extOffset < stringAreaStart || item->extOffset >= byteSize ||
- item->mirroredExtOffset != -1 &&
- (item->mirroredExtOffset < stringAreaStart || item->mirroredExtOffset >= byteSize)) {
-
- indexOK = false;
- break;
- }
- }
-
- }
+ indexOK = index.validateItems(byteSize);
#ifdef THEME_INDEX_TRACES
- qDebug() << "ThemeIndex: Validating themeindex for theme" << theme.toUtf8() << "... Done!";
+ qDebug() << "ThemeIndex: Validating themeindex for theme" << theme.toUtf8() << " done! Result: " << indexOK;
#endif
}
if (indexOK) {
- // Clear some old indexes so the chunk does not get filled completely if
- // the user switches themes a lot.
- removeOldThemeIndexes();
+ // 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
- lastThemeIndexKey = themeIndexKey(theme, drive);
- themeIndexes.insert(lastThemeIndexKey, offset);
+ 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);
}
}
}
-
-
- if (!indexOK) {
- // If there was a problem with the index, store error code so the index loading is not retried.
- themeIndexes.insert(themeIndexKey(theme, drive), themeIndexFailed);
- }
}
-
-void HbThemeServerPrivate::removeOldThemeIndexes()
-{
- // This function removes the previously used theme indexes from the shared chunk.
- // The last index is not removed, because some clients might be still using it.
- // Also the base theme index is never removed.
-/*
- QMap<QString, int>::iterator i = themeIndexes.begin();
-
- GET_MEMORY_MANAGER(HbMemoryManager::SharedMemory);
-
- while (i != themeIndexes.end()) {
- if (i.value() != themeIndexFailed && i.key() != baseThemeIndexKey && i.key() != lastThemeIndexKey) {
- // Remove the theme index table from the shared chunk and offset map
- manager->free(i.value());
- i = themeIndexes.erase(i); // Moves iterator to the next item in the map
- } else {
- i++;
- }
- }
-*/
-
-}
-
-void HbThemeServerPrivate::getThemeIndexTables(ThemeIndexTables &tables)
-{
- #ifdef THEME_INDEX_TRACES
- qDebug() << "ThemeIndex: Server request for theme index tables. Current theme =" << iCurrentThemeName.toUtf8();
- #endif
-
- QString key = themeIndexKey(iCurrentThemeName, currentThemeDrive);
- int offset = themeIndexes.value(key, -1);
-
- // If the index has failed earlier, do not retry
- if (offset == themeIndexFailed) {
- return;
- }
-
- if (offset == -1) {
- processThemeIndex(iCurrentThemeName, currentThemeDrive);
- }
-
- tables.tables[0] = themeIndexes.value(key, -1);
- tables.drives[0] = currentThemeDrive;
-
- const QString &baseThemeName = HbThemeUtils::baseTheme().name;
- // Set base theme table as parent table if the current theme is not the base theme
- if (tables.tables[0] >= 0 && iCurrentThemeName != baseThemeName) {
- QString base(baseThemeName);
- tables.tables[1] = themeIndexes.value(themeIndexKey(base, 'Z'), -1);
- tables.drives[1] = 'Z';
- }
-}
-
-
//**********************************
//HbThemeServerSession
//**********************************
@@ -887,9 +953,6 @@
case EDeviceProfileOffset:
HandleDeviceProfilesReqL(aMessage);
break;
- case ESecondaryCacheOffset:
- HandleSecondaryCacheOffsetReqL(aMessage);
- break;
case EEffectAdd: // FALLTHROUGH
case EEffectLookupFilePath:
HandleEffectAddAndFileLookupL(aMessage);
@@ -1080,28 +1143,38 @@
break;
}
#endif
+#ifdef HB_THEME_SERVER_MEMORY_REPORT
+ case ECreateMemoryReport: {
+ GET_MEMORY_MANAGER(HbMemoryManager::SharedMemory);
+ static_cast<HbSharedMemoryManager *>(manager)->createReport();
+ break;
+ }
+#endif
case EMemoryGood: {
+ if(iServer->currentRenderingMode() == ESWRendering){
+ iServer->setCurrentRenderingMode(EHWRendering);
+ }
iServer->MemoryGood();
break;
}
case EFreeRam: {
- TInt params = 0;
- TPckg<TInt> paramPckg(params);
+ HbFreeRamNotificationData params;
+ TPckg<HbFreeRamNotificationData> paramPckg(params);
aMessage.ReadL(0, paramPckg, 0);
-
- iServer->FreeGpuRam(params);
+ if(params.useSwRendering){
+ iServer->setCurrentRenderingMode(ESWRendering );
+ }
+ iServer->FreeGpuRam(params.bytesToFree);
break;
}
- case EThemeIndex: {
- // Using leave here because this function does not return a value
- ThemeIndexTables tables;
- iServer->getThemeIndexTables(tables);
- TPckg<ThemeIndexTables> out(tables);
- aMessage.WriteL(0, out);
+ case ERenderModeSwitch: {
+ TInt mode = 0;
+ TPckg<TInt> paramPckg(mode);
+ aMessage.ReadL(0, paramPckg, 0);
+ SwitchRenderingMode((HbRenderingMode)mode);
break;
}
-
case EFreeSharedMem: {
int freeSharedMem = iServer->freeSharedMemory();
TPckg<int> out(freeSharedMem);
@@ -1121,6 +1194,12 @@
break;
}
+ case ETypefaceOffset: {
+ HandleTypefaceReqL(aMessage);
+ break;
+ }
+
+
// This is an example of a request that we know about, but don't support.
// We cause KErrNotSupported to be returned to the client.
@@ -1131,9 +1210,24 @@
#ifdef THEME_SERVER_TRACES
qDebug() << "Leave HbThemeServerSession::DispatchMessageL";
#endif
-
}
+void HbThemeServerSession::SwitchRenderingMode(HbRenderingMode aRenderMode)
+{
+#if defined(HB_SGIMAGE_ICON) || defined(HB_NVG_CS_ICON)
+ if(ESWRendering == aRenderMode) {
+ //hw to sw
+#ifdef HB_ICON_CACHE_DEBUG
+ HbSgImageRenderer *sgImg = HbSgImageRenderer::global();
+ qDebug()<< "HbThemeServerSession::SwitchRenderingMode:GPU Memory Before Switching to Software:" << sgImg->freeGPUMemory();
+#endif //HB_ICON_CACHE_DEBUG
+ freeGpuResources();
+#ifdef HB_ICON_CACHE_DEBUG
+ qDebug()<< "HbThemeServerSession::SwitchRenderingMode:GPU Memory After Switching to Software:" << sgImg->freeGPUMemory();
+#endif //HB_ICON_CACHE_DEBUG
+ }
+#endif
+}
/**
* HandleStyleSheetLookupL
*/
@@ -1241,17 +1335,6 @@
}
/**
- * Handle SecondaryCacheOffset Request.
- */
-void HbThemeServerSession::HandleSecondaryCacheOffsetReqL(const RMessage2& aMessage)
-{
- HbSecondaryCacheInfo offsetInfo;
- offsetInfo.offset = HbThemeServerUtils::sharedCacheOffset();
- TPckg<HbSecondaryCacheInfo> data(offsetInfo);
- aMessage.WriteL(0, data);
-}
-
-/**
* HandleEffectAddAndFileLookupL
*/
void HbThemeServerSession::HandleEffectAddAndFileLookupL(const RMessage2& aMessage)
@@ -1276,12 +1359,12 @@
// 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());
@@ -1290,12 +1373,12 @@
iServer->insertIconDefaultSizeCacheItem(*filenamePtr.data(), defSize);
}
}
-
+
// Return the default size back to the client if it was resolved
- if (defSize.isValid()) {
+ if (defSize.isValid()) {
TPckg<QSizeF> returnData(defSize);
aMessage.WriteL(1, returnData);
-#ifdef THEME_SERVER_TRACES
+#ifdef THEME_SERVER_TRACES
qDebug() << "Completed aMessage.WriteL";
#endif
}
@@ -1331,7 +1414,8 @@
QColor color = GetColorFromRgba(params.rgba, params.colorflag);
HbIconKey key(filename, QSizeF(params.width, params.height),
(Qt::AspectRatioMode)params.aspectRatioMode,
- (QIcon::Mode)params.mode, params.mirrored, color);
+ (QIcon::Mode)params.mode, params.mirrored, color,
+ (HbRenderingMode)params.renderMode);
HbIconCacheItem* cacheItem = iServer->iconCacheItem(key);
bool insertKeyIntoSessionList = false;
@@ -1349,7 +1433,10 @@
} else {
QT_TRY {
QString format = HbThemeServerUtils::formatFromPath(key.filename);
- QScopedPointer <HbIconCacheItem> tempIconCacheItem(HbIconCacheItemCreator::createCacheItem(key, (HbIconLoader::IconLoaderOptions)params.options, format));
+ QScopedPointer <HbIconCacheItem> tempIconCacheItem(HbIconCacheItemCreator::createCacheItem( key,
+ (HbIconLoader::IconLoaderOptions)params.options,
+ format,
+ iServer->currentRenderingMode()));
cacheItem = tempIconCacheItem.data();
if (cacheItem) {
if (cacheItem->rasterIconData.type != INVALID_FORMAT) {
@@ -1412,7 +1499,7 @@
CleanupStack::PopAndDestroy(); // close the buffer
QString cleanThemeName = newTheme.trimmed();
-
+
if (cleanThemeName != iServer->iCurrentThemeName) {
iServer->HandleThemeSelection(cleanThemeName);
sessionData.clear();
@@ -1461,7 +1548,8 @@
(Qt::AspectRatioMode)params.aspectRatioMode,
(QIcon::Mode)params.mode,
(bool)params.mirrored,
- color);
+ color,
+ (HbRenderingMode)params.renderMode);
if (!IconInfoFromSingleIcon(finalIconKey, stitchedData)) {
HbMultiIconParams frameItemParams;
@@ -1481,6 +1569,7 @@
frameItemParams.mode = (QIcon::Mode)params.mode;
frameItemParams.size = (QSizeF)params.size;
frameItemParams.color = color;
+ frameItemParams.renderMode = params.renderMode;
QT_TRY {
for (int i = 0; i < noOfPieces; i++) {
frameItemParams.multiPartIconData.pixmapSizes[i] = (QSize &)params.pixmapSizes[i];
@@ -1537,6 +1626,7 @@
cacheItemOfPiece = HbIconCacheItemCreator::createCacheItem(key,
(HbIconLoader::IconLoaderOptions)options,
format,
+ iServer->currentRenderingMode(),
isMultiIcon);
if (cacheItemOfPiece) {
GetDataFromCacheItem(cacheItemOfPiece, data);
@@ -1569,7 +1659,10 @@
stitchedData.type = INVALID_FORMAT;
QString format = HbThemeServerUtils::formatFromPath(params.multiPartIconList[0]);
- QScopedPointer<HbIconCacheItem> tempCacheItem(HbIconCacheItemCreator::createMultiPieceCacheItem(finalIconKey, (HbIconLoader::IconLoaderOptions)params.options, format, dataForParts, params, allNvg));
+ QScopedPointer<HbIconCacheItem> tempCacheItem(HbIconCacheItemCreator::createMultiPieceCacheItem(finalIconKey,
+ (HbIconLoader::IconLoaderOptions)params.options,
+ format, dataForParts, params, allNvg,
+ iServer->currentRenderingMode()));
HbIconCacheItem * cacheItem = tempCacheItem.data();
if (cacheItem) {
if (cacheItem->rasterIconData.type == INVALID_FORMAT) {
@@ -1619,7 +1712,9 @@
for (int i = 0; i < noOfPieces; i++) {
HbSharedIconInfo data;
bool iconPieceMirrored = false;
- HbIconKey key(frameItemParams.multiPartIconList.at(i), frameItemParams.multiPartIconData.pixmapSizes[i], (Qt::AspectRatioMode)stichedKey.aspectRatioMode, (QIcon::Mode)stichedKey.mode, iconPieceMirrored, stichedKey.color);
+ HbIconKey key(frameItemParams.multiPartIconList.at(i), frameItemParams.multiPartIconData.pixmapSizes[i],
+ (Qt::AspectRatioMode)stichedKey.aspectRatioMode, (QIcon::Mode)stichedKey.mode, iconPieceMirrored,
+ stichedKey.color,(HbRenderingMode)frameItemParams.renderMode);
insertKeyIntoSessionList = IconInfoFromSingleIcon(key, data);
if (!insertKeyIntoSessionList) {
insertKeyIntoSessionList = CreateCacheItemData(key, frameItemParams.options, data, true);
@@ -1631,7 +1726,7 @@
if (data.type == NVG) {
++nvgPiecesCount;
}
-
+
//The session will only keep track of icons that were either successfully found or were
//successfully inserted in the cache.
keysInserted.append(key);
@@ -1813,7 +1908,7 @@
QString pieceName((QChar*)frameItemParams.iconList[i].Ptr(), frameItemParams.iconList[i].Length());
HbIconKey key(pieceName, frameItemParams.sizeList[i],
(Qt::AspectRatioMode)frameItemParams.aspectRatioMode, (QIcon::Mode)frameItemParams.mode,
- (bool)frameItemParams.mirrored, color);
+ (bool)frameItemParams.mirrored, color, (HbRenderingMode)frameItemParams.renderMode);
insertKeyIntoSessionList = IconInfoFromSingleIcon(key, data);
if (!insertKeyIntoSessionList) {
insertKeyIntoSessionList = CreateCacheItemData(key, 0, data, false);
@@ -1836,6 +1931,24 @@
}
}
+
+/**
+ * Handle Typeface data Request.
+ */
+void HbThemeServerSession::HandleTypefaceReqL(const RMessage2& aMessage)
+{
+ HbTypefaceDataInfo offsetInfo;
+ HbTypefaceInfoDatabase *typefaceDatabase = HbTypefaceInfoDatabase::instance(HbMemoryManager::SharedMemory);
+ if (typefaceDatabase) {
+ offsetInfo.offset = typefaceDatabase->typefaceInfoVectorOffset();
+ } else {
+ offsetInfo.offset = -1;
+ }
+ TPckg<HbTypefaceDataInfo> data(offsetInfo);
+ aMessage.WriteL(0, data);
+}
+
+
void HbThemeServerSession::unLoadIcon(const RMessage2& aMessage)
{
TIconParams params = ReadMessageAndRetrieveParams(aMessage);
@@ -1843,7 +1956,7 @@
QColor color = GetColorFromRgba(params.rgba, params.colorflag);
HbIconKey key(filename, QSizeF(params.width, params.height),
(Qt::AspectRatioMode)params.aspectRatioMode,
- (QIcon::Mode)params.mode, params.mirrored, color);
+ (QIcon::Mode)params.mode, params.mirrored, color, (HbRenderingMode)params.renderMode);
iServer->CleanupSessionIconItem(key);
sessionData.removeOne(key);
}
@@ -1865,7 +1978,8 @@
TInt iconCount = params.iconCount;
for (int i = 0; i < iconCount; i++) {
QString filename((QChar*)params.iconList[i].Ptr(), params.iconList[i].Length());
- HbIconKey key(filename, params.sizeList[i], aspectRatioMode, mode, mirrored, color);
+ HbIconKey key(filename, params.sizeList[i], aspectRatioMode, mode, mirrored, color,
+ (HbRenderingMode)params.renderMode);
iServer->CleanupSessionIconItem(key);
sessionData.removeOne(key);
}
@@ -1874,8 +1988,8 @@
/**
freeClientGpuResources - unloads all the GPU resources in the session
-Iterates all the keys in sessionData and if the Icon Format Type is SGIMage
-or NVG then CleanUpSessionIConItem is called on that item, which will do the
+Iterates all the keys in sessionData and if the Icon Format Type is SGIMage
+or NVG then CleanUpSessionIConItem is called on that item, which will do the
cleanup based on the reference count.
*/
void HbThemeServerSession::freeClientGpuResources()
@@ -1886,7 +2000,7 @@
for ( QList<HbIconKey>::const_iterator iter = tempSessionData.constBegin();
iter != itEnd;
++iter ) {
- if ( iServer->IconTypeInCache(*iter) == SGIMAGE
+ if ( iServer->IconTypeInCache(*iter) == SGIMAGE
|| iServer->IconTypeInCache(*iter) == NVG ) {
iServer->CleanupSessionIconItem(*iter);
// remove the item in the session data.
@@ -1906,6 +2020,23 @@
sessionData.clear();
}
+/**
+freeGpuResources - unloads all the GPU resources in the session
+
+Iterates all the keys in sessionData and if the Icon Format Type is SGIMage
+or NVG then CleanUpSessionIConItem is called on that item, which will do the
+cleanup based on the reference count. Also closes the SgDriver
+*/
+void HbThemeServerSession::freeGpuResources()
+{
+#if defined(HB_SGIMAGE_ICON) || defined(HB_NVG_CS_ICON)
+ freeClientGpuResources();
+#if defined(HB_SGIMAGE_ICON)
+ iServer->freeUnusedGpuResources();
+#endif
+#endif
+}
+
#ifdef HB_ICON_CACHE_DEBUG
/**
* iconRefCount
@@ -1925,10 +2056,10 @@
if (params.colorflag) {
color.setRgba((QRgb)params.rgba);
}
-
+
HbIconKey key(filename, QSizeF(params.width, params.height),
(Qt::AspectRatioMode)params.aspectRatioMode,
- (QIcon::Mode)params.mode, params.mirrored, color);
+ (QIcon::Mode)params.mode, params.mirrored, color, (HbRenderingMode)params.renderMode);
HbIconCacheItem* cacheItem = cache->value(key);//iconCacheItem(key);
if(cacheItem)
@@ -1947,13 +2078,13 @@
CleanupStack::PushL(self);
self->ConstructL();
CleanupStack::Pop();
- return self;
+ return self;
}
CHbThemeChangeNotificationListener::CHbThemeChangeNotificationListener(HbThemeServerPrivate& aObserver)
:CActive(EPriorityStandard),iObserver(aObserver)
{
-
+
}
void CHbThemeChangeNotificationListener::ConstructL()
@@ -1964,15 +2095,13 @@
}
err = themeRequestProp.Attach(KServerUid3, KNewThemeForThemeChanger );
User::LeaveIfError(err);
-
+
CActiveScheduler::Add(this);
}
CHbThemeChangeNotificationListener::~CHbThemeChangeNotificationListener()
{
- // Close the handle since it is not needed anymore
- themeRequestProp.Close();
- Cancel();
+ stopListening();
}
void CHbThemeChangeNotificationListener::startListening()
@@ -1984,14 +2113,14 @@
User::LeaveIfError(themeRequestProp.Attach(KServerUid3,KNewThemeForThemeChanger));
//Subscribe for updates
themeRequestProp.Subscribe(iStatus);
-
+
SetActive();
-
+
}
void CHbThemeChangeNotificationListener::stopListening()
{
- Cancel(); // cancel
+ Cancel(); // cancel
if(IsActive()) { // only if already listening
themeRequestProp.Close(); // Close the handle since it is not needed anymore
}
@@ -2006,7 +2135,7 @@
const TChar delimiter = ':';
// initialize return value as failed
bool bSuccess = false;
-
+
result = requestData.Locate( delimiter );
if( KErrNotFound != result ) {
TInt len = requestData.Length();
@@ -2020,7 +2149,7 @@
} else {
bSuccess = false;
}
-
+
return bSuccess;
}
@@ -2028,10 +2157,10 @@
{
// Subscribe first to make sure we don't miss any
// when handling this one.
- themeRequestProp.Subscribe(iStatus);
-
+ themeRequestProp.Subscribe(iStatus);
+
SetActive();
-
+
TBuf<256> requestData;
TInt ret = themeRequestProp.Get(requestData);
switch (ret) {
@@ -2046,7 +2175,7 @@
QString str((QChar*)data.Ptr(),data.Length());
str = str.trimmed();
iObserver.HandleThemeSelection( str );
- }
+ }
}
break;
case KErrPermissionDenied:
@@ -2070,3 +2199,4 @@
}
+
--- a/src/hbservers/hbthemeserver/hbthemeserver_symbian_p_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbthemeserver_symbian_p_p.h Fri May 14 16:09:54 2010 +0300
@@ -44,7 +44,6 @@
class HbThemeServerSession;
struct HbIconKey;
class HbIconSource;
-class ThemeIndexTables;
class CHbThemeChangeNotificationListener;
// reasons for server panic
@@ -97,16 +96,18 @@
void clearCssCache();
void MemoryGood();
void FreeGpuRam(int bytes);
-
+ void freeUnusedGpuResources();
+
void insertIconDefaultSizeCacheItem(const QString &key, const QSizeF &item);
QSizeF iconDefaultSizeCacheItem(const QString &key);
void doCleanup();
static bool gpuMemoryState();
- void getThemeIndexTables(ThemeIndexTables &tables);
void openCurrentIndexFile();
- void resolveCurrentThemeDrive();
+ bool resolveThemePath(const QString &themeName, QString &themePath);
+ HbRenderingMode currentRenderingMode() const;
+ void setCurrentRenderingMode(HbRenderingMode currentMode);
void HandleThemeSelection( const QString& themeName);
int freeSharedMemory();
@@ -141,28 +142,21 @@
#endif
private:
- void processThemeIndex(const QString &theme, const QChar drive);
- QString themeIndexKey(const QString &theme, const QChar drive);
- void removeOldThemeIndexes();
+ void createThemeIndex(const QString &themePath, const HbThemeType &themetype);
public:
RProperty iThemeProperty;
QString iCurrentThemeName;
- QChar currentThemeDrive;
+ QString iCurrentThemePath;
QFile currentIndexfile;
private:
void ConstructL();
HbIconDataCache * cache;
HbCache* cssCache;
QHash<QString, QSizeF> iconDefaultSizes;
- // String key is in format "<drive_capitalized>:<themename>"
- // E.g. "Z:hbdefault"
- QMap<QString, int> themeIndexes;
- QString baseThemeIndexKey;
- QString lastThemeIndexKey;
-
- static bool gpuGoodMemoryState;
-
+
+ static bool gpuGoodMemoryState;
+ HbRenderingMode renderMode;
QStringList romThemeNames;
CHbThemeChangeNotificationListener * iListener;
};
@@ -187,7 +181,6 @@
void HandleStyleSheetLookupL(const RMessage2 & aMessage);
void HandleWidgetMLLookupL(const RMessage2& aMessage);
void HandleDeviceProfilesReqL(const RMessage2& aMessage);
- void HandleSecondaryCacheOffsetReqL(const RMessage2& aMessage);
void HandleEffectAddAndFileLookupL(const RMessage2 &aMessage);
void HandleThemeSelectionL(const RMessage2 & aMessage);
QColor GetColorFromRgba(TUint32 aRgba, bool aColorFlag);
@@ -210,11 +203,13 @@
void IconInfoL(const TIconListParams &frameItemParams,
const int noOfPieces,
HbSharedIconInfoList &iconInfoList);
+ void HandleTypefaceReqL(const RMessage2& aMessage);
void unLoadIcon(const RMessage2& aMessage);
void unloadMultiIcon(const RMessage2& aMessage);
void freeClientGpuResources();
void ClearSessionData();
-
+ void freeGpuResources();
+ void SwitchRenderingMode(HbRenderingMode aRenderMode);
protected:
TIconParams ReadMessageAndRetrieveParams(const RMessage2 & aMessage);
void PanicClient(const RMessage2 & aMessage, TInt aPanic) const;
@@ -243,18 +238,18 @@
protected: // From CActive
void RunL();
void DoCancel();
-
+
private:
CHbThemeChangeNotificationListener(HbThemeServerPrivate& aObserver);
void ConstructL();
bool parseData( TDesC& requestData, HbThemeServerRequest& etype, TDes& data);
-
-
+
+
private: // data
RProperty themeRequestProp;
HbThemeServerPrivate& iObserver;
};
-#endif // HBTHEMESERVER_SYMBIAN_P_H
+#endif // HBTHEMESERVER_SYMBIAN_P_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbservers/hbthemeserver/hbthemeserverapplication.cpp Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,268 @@
+/****************************************************************************
+**
+** 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 "hbthemeserverapplication_p.h"
+#include "hbthemeserver_p.h"
+#include "hbthemecommon_p.h"
+#include "hbtheme.h"
+
+#include <QWindowsStyle>
+#include <QLibrary>
+#include <QDebug>
+
+#if defined (Q_OS_SYMBIAN)
+#include "hbthemecommon_symbian_p.h"
+#include <eikenv.h>
+#include <apgwgnam.h>
+#endif
+
+static const QLatin1String APP_NAME("HbThemeServer");
+static const QLatin1String RESOURCE_LIB_NAME("HbCore");
+static const QLatin1String TEST_RESOURCE_LIB_NAME("HbTestResources");
+static const QLatin1String WIN32_DEBUG_SUFFIX("d");
+static const QLatin1String MAC_DEBUG_SUFFIX("_debug");
+static const QLatin1String STOP_MESSAGE("stop");
+
+bool HbThemeServerApplication::Options::help = false;
+bool HbThemeServerApplication::Options::start = false;
+bool HbThemeServerApplication::Options::stop = false;
+bool HbThemeServerApplication::Options::persistent = false;
+QString HbThemeServerApplication::Options::error = QString();
+
+HbThemeServerApplication::HbThemeServerApplication(int &argc, char *argv[]) :
+ QtSingleApplication(argc, argv), server(0)
+{
+ setApplicationName(APP_NAME);
+
+#ifdef QT_DEBUG
+ //temporary solution until Hb specific style is ready
+ setStyle(new QWindowsStyle);
+#endif // QT_DEBUG
+
+#if QT_VERSION >= 0x040601
+ setAttribute(Qt::AA_S60DontConstructApplicationPanes);
+#endif // QT_VERSION
+
+ // ignore command line arguments on Symbian
+#ifdef Q_OS_SYMBIAN
+ Options::start = true;
+ Options::persistent = true;
+#else
+ QStringList args = arguments();
+ args.removeFirst(); // ignore argv0
+ const bool wasEmpty = args.isEmpty();
+ const bool restart = args.removeAll(QLatin1String("-restart"));
+ Options::start = args.removeAll(QLatin1String("-start")) || restart;
+ Options::stop = args.removeAll(QLatin1String("-stop")) || restart;
+ Options::persistent = args.removeAll(QLatin1String("-persistent"));
+ Options::help = args.removeAll(QLatin1String("-help")) || args.removeAll(QLatin1String("-h")) || !args.isEmpty() || wasEmpty;
+ if (!args.isEmpty()) {
+ Options::error = tr("Unknown option(s): '%1'").arg(args.join(QLatin1String(" ")));
+ }
+#endif // Q_OS_SYMBIAN
+}
+
+HbThemeServerApplication::~HbThemeServerApplication()
+{
+ delete server;
+}
+
+bool HbThemeServerApplication::initialize()
+{
+#if defined (Q_OS_SYMBIAN)
+ CEikonEnv * env = CEikonEnv::Static();
+ if ( env ) {
+ CApaWindowGroupName* wgName = CApaWindowGroupName::NewLC(env->WsSession());
+ env->RootWin().SetOrdinalPosition(0, ECoeWinPriorityNeverAtFront); // avoid coming to foreground
+ wgName->SetHidden(ETrue); // hides us from FSW and protects us from OOM FW etc.
+ wgName->SetSystem(ETrue); // Allow only application with PowerManagement cap to shut us down
+ wgName->SetCaptionL(_L("HbThemeServer")); // TODO: use QCoreApplication::applicationName()
+ wgName->SetAppUid(KNullUid);
+ wgName->SetWindowGroupName(env->RootWin());
+ CleanupStack::PopAndDestroy();
+ RThread::RenameMe(_L("HbThemeServer")); // TODO: use QCoreApplication::applicationName()
+ }
+#endif
+
+ // as for theme initialization, an instance needs to be created before starting the server
+ HbTheme::instance();
+
+ // load resource libraries in order to make binary resources accessible
+ bool result = loadLibrary(RESOURCE_LIB_NAME);
+#ifdef HB_DEVELOPER
+ loadLibrary(TEST_RESOURCE_LIB_NAME);
+#endif
+ return result;
+}
+
+int HbThemeServerApplication::exec()
+{
+ if (!server) {
+ server = new HbThemeServer;
+ }
+
+ if (server->startServer()) {
+#if !defined(Q_OS_SYMBIAN) && defined(QT_DEBUG)
+ server->showMinimized();
+#endif
+ return QtSingleApplication::exec();
+ }
+
+ return EXIT_FAILURE;
+}
+
+void HbThemeServerApplication::stop()
+{
+#ifndef Q_OS_SYMBIAN
+ sendMessage(STOP_MESSAGE);
+#endif // Q_OS_SYMBIAN
+}
+
+bool HbThemeServerApplication::loadLibrary(const QString &name)
+{
+ // To load resources embedded in hb library
+ QLibrary library(name);
+ bool result = library.load();
+
+ if (!result) {
+ // Library may not be loaded, if it was built in debug mode and the name in debug mode is
+ // different, change the name to debug version in that scenario
+ QString alternateName = name;
+#ifdef Q_OS_WIN32
+ alternateName += WIN32_DEBUG_SUFFIX;
+#elif defined(Q_OS_MAC)
+ alternateName += MAC_DEBUG_SUFFIX;
+#endif
+ // On symbian library name in debug mode is same as that in release mode,
+ // so no need to do anything for that
+ library.setFileName(alternateName);
+ result = library.load();
+ }
+#ifdef THEME_SERVER_TRACES
+ if (result) {
+ qDebug() << "HbThemeServerApplication::loadLibrary(): loaded library " << name;
+ }
+ else {
+ qDebug() << "HbThemeServerApplication::loadLibrary(): could not load library " << name;
+ }
+#endif // THEME_SERVER_TRACES
+
+ return result;
+}
+
+void HbThemeServerApplication::receiveMessage(const QString &message)
+{
+ if (!server)
+ return;
+
+ if (message == STOP_MESSAGE) {
+ server->stopServer();
+ quit();
+ }
+}
+
+bool HbThemeServerApplication::acquireLock() {
+#ifdef Q_OS_SYMBIAN
+ // Guard against starting multiple copies of the server
+ Lock lock;
+ Lock::State lockState;
+ for(;;) {
+ lockState = lock.acquire();
+ if (lockState == Lock::Acquired) {
+ break;
+ } else if (lockState == Lock::Reserved) {
+ // Process may be starting, wait for server object to be created
+ if (Lock::serverExists()) {
+#ifdef THEME_SERVER_TRACES
+ qDebug() << "HbThemeServer::main: serverExists!!!";
+#endif
+ break;
+ } else {
+ const TInt KTimeout = 100000; // 100 ms
+ User::After(KTimeout);
+ }
+ } else {
+ break;
+ }
+ }
+
+ if (lockState != Lock::Acquired) {
+ // With KErrAlreadyExists client should try to connect, otherwise bail out.
+#ifdef THEME_SERVER_TRACES
+ qDebug() << "HbThemeServer::main: Lock not acquired!!!";
+#endif
+ RProcess::Rendezvous(lockState == Lock::Reserved ? KErrAlreadyExists : KErrGeneral);
+ }
+
+ return (lockState == Lock::Acquired);
+#else
+ return true;
+#endif
+
+
+}
+
+
+#ifdef Q_OS_SYMBIAN
+Lock::Lock()
+{
+ // Using a file for interprocess lock
+ const int NumMessageSlots = 1;
+ if (mFs.Connect(NumMessageSlots) == KErrNone) {
+ mFs.CreatePrivatePath(EDriveC);
+ if (mFs.SetSessionToPrivate(EDriveC) == KErrNone) {
+ _LIT(KFileName, "lockFile");
+ const TUint mode = EFileShareReadersOrWriters;
+ if (mFile.Create(mFs, KFileName, mode) == KErrAlreadyExists) {
+ mFile.Open(mFs, KFileName, mode);
+ }
+ }
+ }
+}
+
+// Try to acquire lock
+Lock::State Lock::acquire()
+{
+ State state = Error;
+ // If process holding the lock crashes, file server releases the lock
+ if (mFile.SubSessionHandle()) {
+ TInt error = mFile.Lock(0, 1);
+ if (error == KErrNone) {
+ state = Acquired;
+ } else if (error == KErrLocked) {
+ state = Reserved;
+ }
+ }
+ return state;
+}
+
+// Check if Symbian server exists
+bool Lock::serverExists()
+{
+ TFindServer findHbServer(KThemeServerName);
+ TFullName name;
+ return findHbServer.Next(name) == KErrNone;
+}
+
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbservers/hbthemeserver/hbthemeserverapplication_p.h Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,87 @@
+/****************************************************************************
+**
+** 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 HBTHEMESERVERAPPLICATION_P_H
+#define HBTHEMESERVERAPPLICATION_P_H
+
+#include <QtSingleApplication>
+
+class HbThemeServer;
+
+class HbThemeServerApplication : public QtSingleApplication
+{
+ Q_OBJECT
+
+public:
+ HbThemeServerApplication(int &argc, char *argv[]);
+ ~HbThemeServerApplication();
+
+ struct Options {
+ static bool help;
+ static bool start;
+ static bool stop;
+ static bool persistent;
+ static QString error;
+ };
+
+ bool initialize();
+ int exec();
+
+ static bool acquireLock();
+
+public slots:
+ void stop();
+
+private slots:
+ void receiveMessage(const QString &message);
+
+private:
+ bool loadLibrary(const QString &name);
+
+ HbThemeServer *server;
+};
+
+#ifdef Q_OS_SYMBIAN
+#include <f32file.h>
+class Lock
+{
+public:
+ enum State {
+ Reserved,
+ Acquired,
+ Error
+ };
+ Lock();
+ ~Lock(){close();}
+ void close(){mFile.Close(); mFs.Close();}
+ State acquire();
+ static bool serverExists();
+
+private:
+ RFs mFs;
+ RFile mFile;
+};
+#endif
+
+#endif // HBTHEMESERVERAPPLICATION_P_H
--- a/src/hbservers/hbthemeserver/hbthemeserverutils.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbthemeserverutils.cpp Fri May 14 16:09:54 2010 +0300
@@ -51,10 +51,6 @@
typedef QHash<QString, int> ServerHashForLayoutDefs;
Q_GLOBAL_STATIC(ServerHashForLayoutDefs, layoutDefsCache)
-HbSharedCache *sharedCache = 0;
-int HbThemeServerUtils::serverSecondaryCacheOffset = -1;
-static const int NumberOfSharedCacheItems = 50;
-
static const int ICON_SOURCES_MAX_SIZE = 8;
static QList<HbIconSource *> iconSources; // cache of recently used icon sources
@@ -107,31 +103,37 @@
* \return offset of the shared style sheet in the shared memory, -1 if error
*
*/
-int HbThemeServerUtils::getSharedStylesheet(const QString & fileName, HbLayeredStyleLoader::LayerPriority priority)
+int HbThemeServerUtils::getSharedStylesheet(const QString &fileName,
+ HbLayeredStyleLoader::LayerPriority priority,
+ bool *inSharedCache)
{
+ int cssOffset = -1;
+ HbSharedCache *sharedCache = 0;
+ if (priority == HbLayeredStyleLoader::Priority_Core) {
+ sharedCache = HbSharedCache::instance();
+ cssOffset = sharedCache->offset(HbSharedCache::Stylesheet, fileName);
+ if (inSharedCache) {
+ *inSharedCache = (cssOffset >= 0) ? true : false;
+ }
+ } else if (inSharedCache) {
+ *inSharedCache = false;
+ }
+
#ifdef THEME_SERVER_TRACES
qDebug() << "In " << Q_FUNC_INFO;
#endif // THEME_SERVER_TRACES
- int cssOffset = -1;
- if (QFile::exists(fileName)) {
- HbCss::Parser parser;
- if (!parseCssFile(parser, fileName, cssOffset)) {
- if (parser.errorCode == HbCss::Parser::OutOfMemoryError) {
- return OUT_OF_MEMORY_ERROR;
+ if (cssOffset < 0) {
+ if (QFile::exists(fileName)) {
+ HbCss::Parser parser;
+ if (!parseCssFile(parser, fileName, cssOffset)) {
+ if (parser.errorCode == HbCss::Parser::OutOfMemoryError) {
+ return OUT_OF_MEMORY_ERROR;
+ }
}
}
- }
- // add the filename and css offset to the secondary cache.
- if ((priority == HbLayeredStyleLoader::Priority_Core) && sharedCache && cssOffset != -1) {
- // 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.
- try {
- HbSharedCacheItem cacheItem(fileName, cssOffset);
- sharedCache->append(cacheItem);
- } catch (std::exception &) {
+ if (sharedCache) { //sharedCache valid only when priority is Priority_Core
+ sharedCache->add(HbSharedCache::Stylesheet, fileName, cssOffset);
}
-
}
return cssOffset;
}
@@ -220,19 +222,11 @@
if (loader.loadLayoutDefinition(layoutDef, &file, layout, section)) {
layoutDefsCache()->insert(key, layoutDefOffset);
- // add the filename and css offset to the secondary cache.
- if (sharedCache) {
- // 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.
- try {
- HbSharedCacheItem cacheItem(key, layoutDefOffset);
- sharedCache->append(cacheItem);
- } catch (std::bad_alloc &badAlloc) {
- // item is not appended.
- Q_UNUSED(badAlloc)
- }
- }
+ // add the filename and css offset to the shared cache.
+ // 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);
} else {
// load failed
layoutDef->~LayoutDefinition();
@@ -252,44 +246,6 @@
}
/**
- * Creates/Returns the Shared Cache.
- *
- */
-HbSharedCache *HbThemeServerUtils::createSharedCache()
-{
- if (!sharedCache) {
- // secondary cache is not created. Create it.
- GET_MEMORY_MANAGER(HbMemoryManager::SharedMemory)
- try {
- serverSecondaryCacheOffset = manager->alloc(sizeof(HbSharedCache));
- sharedCache = new((char*)manager->base() + serverSecondaryCacheOffset)
- HbSharedCache(HbMemoryManager::SharedMemory);
- // reserving memory so that realloc calls will be minimized in future.
- sharedCache->reserve(NumberOfSharedCacheItems);
- } catch (std::exception &) {
- if (serverSecondaryCacheOffset != -1) {
- if (sharedCache) {
- sharedCache->~HbSharedCache();
- sharedCache = 0;
- }
- manager->free(serverSecondaryCacheOffset);
- serverSecondaryCacheOffset = -1;
- }
- }
- }
- return sharedCache;
-}
-
-/**
- * Returns the Secondary Cache Offset.
- *
- */
-int HbThemeServerUtils::sharedCacheOffset()
-{
- return serverSecondaryCacheOffset;
-}
-
-/**
* Removes fxml document from the shared memory and effects cache
*
* \param fileName of the removed fxml file
@@ -299,17 +255,7 @@
{
if (effCache()->contains(fileName)) {
effCache()->remove(fileName);
-
- if (sharedCache) {
- int count = sharedCache->count();
- for (int i = 0; i < count ; i++) {
- QString cacheKey = sharedCache->at(i).key;
- if (fileName == cacheKey) {
- sharedCache->remove(i,1);
- break;
- }
- }
- }
+ HbSharedCache::instance()->remove(HbSharedCache::Effect, fileName);
return true;
}
return false;
@@ -321,20 +267,10 @@
*/
void HbThemeServerUtils::clearSharedEffects()
{
+ HbSharedCache *cache = HbSharedCache::instance();
HbServerCache::const_iterator iterEnd(effCache()->constEnd());
- for (HbServerCache::const_iterator iter = effCache()->constBegin();
- iter != iterEnd;
- ++iter) {
- if (sharedCache) {
- int count = sharedCache->count();
- for (int i = 0; i < count ; i++) {
- QString cacheKey = sharedCache->at(i).key;
- if (cacheKey == iter.key()) {
- sharedCache->remove(i,1);
- break;
- }
- }
- }
+ for (HbServerCache::const_iterator iter = effCache()->constBegin();iter != iterEnd;++iter) {
+ cache->remove(HbSharedCache::Effect, iter.key());
}
effCache()->clear();
}
@@ -411,16 +347,10 @@
}
// add the filename and css offset to the secondary cache.
- if (sharedCache) {
- // 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.
- try {
- HbSharedCacheItem cacheItem(fileName, effOffset);
- sharedCache->append(cacheItem);
- } catch (std::exception &) {
- }
- }
+ // 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::Effect, fileName, effOffset);
}
#ifdef THEME_SERVER_TRACES
@@ -454,21 +384,3 @@
}
}
-/**
- * sharedCacheItemOffset function returns the offset of the cache item
- * for the given key
- * \param key
- *
- */
-int HbThemeServerUtils::sharedCacheItemOffset(const QString & key)
-{
- if (sharedCache) {
- int count = sharedCache->count();
- for (int i = 0; i < count ; i++) {
- if (key == sharedCache->at(i).key) {
- return sharedCache->at(i).offset;
- }
- }
- }
- return -1;
-}
--- a/src/hbservers/hbthemeserver/hbthemeserverutils_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbthemeserverutils_p.h Fri May 14 16:09:54 2010 +0300
@@ -32,6 +32,7 @@
#include "hblayeredstyleloader_p.h"
#include "hbthemecommon_p.h"
+#include "hbsharedcache_p.h"
#include "hbiconloader_p.h"
#include "hbcssparser_p.h"
#include "hbcache_p.h"
@@ -44,20 +45,17 @@
public:
static HbIconSource *getIconSource(const QString &filename);
static QString formatFromPath(const QString &iconPath);
- static int getSharedStylesheet(const QString &fileName, HbLayeredStyleLoader::LayerPriority priority);
+ static int getSharedStylesheet(const QString &fileName, HbLayeredStyleLoader::LayerPriority priority,
+ bool *inSharedCache = 0);
static bool parseCssFile(HbCss::Parser &parser, const QString &fileName, int &cssOffset);
static void cleanupUnusedCss(HbCache *cache);
static int getSharedEffect(const QString &fileName);
static int getSharedLayoutDefinition(const QString & fileName, const QString &layout, const QString §ion);
static void createDeviceProfileDatabase();
- static HbSharedCache *createSharedCache();
- static int sharedCacheOffset();
static bool removeSharedEffect(const QString &fileName);
static void clearSharedEffects();
private:
- static int sharedCacheItemOffset(const QString &key);
- static int serverSecondaryCacheOffset;
};
#endif // HBTHEMESERVERUTILS_P_H
--- a/src/hbservers/hbthemeserver/main.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbservers/hbthemeserver/main.cpp Fri May 14 16:09:54 2010 +0300
@@ -23,226 +23,51 @@
**
****************************************************************************/
-#include <QApplication>
-#include <QLibrary>
-#include <QDebug>
-
-#include "hbthemeserver_p.h"
-#include "hbthemecommon_p.h"
-#include "hbtheme.h"
-#if defined (Q_OS_SYMBIAN)
-#include "hbthemecommon_symbian_p.h"
-#include <eikenv.h>
-#include <apgwgnam.h>
-#endif
-#include <qtsingleapplication.h>
-#include <QWindowsStyle>
-
-static const QLatin1String RESOURCE_LIB_NAME("HbCore");
-static const QLatin1String TEST_RESOURCE_LIB_NAME("HbTestResources");
-static const QLatin1String WIN32_DEBUG_SUFFIX("d");
-static const QLatin1String MAC_DEBUG_SUFFIX("_debug");
-
-#ifdef Q_OS_SYMBIAN
-class Lock
-{
-public:
- enum State {
- Reserved,
- Acquired,
- Error
- };
- Lock();
- ~Lock(){close();}
- void close(){mFile.Close(); mFs.Close();}
- State acquire();
- static bool serverExists();
-
-private:
- RFs mFs;
- RFile mFile;
-};
-
-Lock::Lock()
-{
- // Using a file for interprocess lock
- const int NumMessageSlots = 1;
- if (mFs.Connect(NumMessageSlots) == KErrNone) {
- mFs.CreatePrivatePath(EDriveC);
- if (mFs.SetSessionToPrivate(EDriveC) == KErrNone) {
- _LIT(KFileName, "lockFile");
- const TUint mode = EFileShareReadersOrWriters;
- if (mFile.Create(mFs, KFileName, mode) == KErrAlreadyExists) {
- mFile.Open(mFs, KFileName, mode);
- }
- }
- }
-}
+#include "hbthemeserverapplication_p.h"
+#include <QTextStream>
+#include <cstdlib>
-// Try to acquire lock
-Lock::State Lock::acquire()
-{
- State state = Error;
- // If process holding the lock crashes, file server releases the lock
- if (mFile.SubSessionHandle()) {
- TInt error = mFile.Lock(0, 1);
- if (error == KErrNone) {
- state = Acquired;
- } else if (error == KErrLocked) {
- state = Reserved;
- }
- }
- return state;
-}
-
-// Check if Symbian server exists
-bool Lock::serverExists()
+void showHelp(const QString &argv0, const QString &error = QString())
{
- TFindServer findHbServer(KThemeServerName);
- TFullName name;
- return findHbServer.Next(name) == KErrNone;
-}
-
-#endif
-/*
- This function loads library which keeps resources of default theme
-*/
-bool loadResourceLibrary(QString resourceLibName)
-{
- bool loadSuccess;
- // To load resources embedded in hb library
- QLibrary hbLib(resourceLibName);
- loadSuccess = hbLib.load();
-
- if ( !loadSuccess ) {
- // Library may not be loaded, if it was built in debug mode and the name in debug mode is
- // different, change the name to debug version in that scenario
-#ifdef Q_OS_WIN32
- resourceLibName += WIN32_DEBUG_SUFFIX;
-#elif defined(Q_OS_MAC)
- resourceLibName += MAC_DEBUG_SUFFIX;
-#endif
- // On symbian library name in debug mode is same as that in release mode,
- // so no need to do anything for that
- hbLib.setFileName(resourceLibName);
- loadSuccess = hbLib.load();
+ QTextStream qerr(stderr);
+ qerr << "Hb Theme Server" << endl;
+ if (!error.isEmpty()) {
+ qerr << argv0 << ": " << error << endl;
}
-#ifdef THEME_SERVER_TRACES
- if (loadSuccess) {
- qDebug() << "Loaded library " << resourceLibName;
- }
- else {
- qDebug() << "Could not load library " << resourceLibName;
- }
-#endif // THEME_SERVER_TRACES
-
- return loadSuccess;
+ qerr << "Usage: " << argv0 << " [options]" << endl;
+ qerr << endl;
+ qerr << "Options:" << endl;
+ qerr << " -start start a new server" << endl;
+ qerr << " -restart same as -stop -start" << endl;
+ qerr << " -stop stop an existing server instance" << endl;
+ qerr << " -persistent keep server running when the last client disconnects" << endl;
+ qerr << " -h, -help display this information" << endl;
}
int main(int argc, char *argv[])
{
-#ifdef QT_DEBUG
- //temporary solution until Hb specific style is ready
- QApplication::setStyle( new QWindowsStyle );
-#endif // QT_DEBUG
-#if QT_VERSION >= 0x040601
- QApplication::setAttribute(Qt::AA_S60DontConstructApplicationPanes);
-#endif // QT_VERSION
-#ifdef THEME_SERVER_TRACES
- qDebug() << "HbThemeServer::main: START!!!";
-#endif
-#ifdef Q_OS_SYMBIAN
- // Guard against starting multiple copies of the server
- Lock lock;
- Lock::State lockState;
- for(;;) {
- lockState = lock.acquire();
- if (lockState == Lock::Acquired) {
- break;
- } else if (lockState == Lock::Reserved) {
- // Process may be starting, wait for server object to be created
- if (Lock::serverExists()) {
-#ifdef THEME_SERVER_TRACES
- qDebug() << "HbThemeServer::main: serverExists!!!";
-#endif
- break;
- } else {
- const TInt KTimeout = 100000; // 100 ms
- User::After(KTimeout);
- }
- } else {
- break;
- }
- }
- if (lockState != Lock::Acquired) {
- // With KErrAlreadyExists client should try to connect, otherwise bail out.
-#ifdef THEME_SERVER_TRACES
- qDebug() << "HbThemeServer::main: Lock not acquired!!!";
-#endif
- RProcess::Rendezvous(lockState == Lock::Reserved ? KErrAlreadyExists:KErrGeneral);
- return KErrNone;
- }
-#endif // Q_OS_SYMBIAN
-#ifdef THEME_SERVER_TRACES
- qDebug() << "HbThemeServer::main: start construction QtSingleApplication!!!";
-#endif
- QtSingleApplication app(argc, argv );
-
- if (app.isRunning()) {
-#ifdef THEME_SERVER_TRACES
- qDebug() << "HbThemeServer::main: first instance already running!!!";
-#endif
+ if(!HbThemeServerApplication::acquireLock()) {
return 0;
}
+
+ HbThemeServerApplication app(argc, argv);
-#ifdef THEME_SERVER_TRACES
- qDebug() << "HbThemeServer::main: I'm first instance!!!";
-#endif
-
-#if defined (Q_OS_SYMBIAN)
- CEikonEnv * env = CEikonEnv::Static();
- if ( env ) {
- CApaWindowGroupName* wgName = CApaWindowGroupName::NewLC(env->WsSession());
- env->RootWin().SetOrdinalPosition(0, ECoeWinPriorityNeverAtFront); // avoid coming to foreground
- wgName->SetHidden(ETrue); // hides us from FSW and protects us from OOM FW etc.
- wgName->SetSystem(ETrue); // Allow only application with PowerManagement cap to shut us down
- wgName->SetCaptionL(_L("HbThemeServer"));
- wgName->SetAppUid(KNullUid);
- wgName->SetWindowGroupName(env->RootWin());
- CleanupStack::PopAndDestroy();
- RThread::RenameMe(_L("HbThemeServer"));
+ if (HbThemeServerApplication::Options::help) {
+ showHelp(argv[0], HbThemeServerApplication::Options::error);
+ return EXIT_SUCCESS;
}
-#endif
- HbTheme::instance(); //for theme initialization, instance needs to be created before starting the server.
- loadResourceLibrary(RESOURCE_LIB_NAME);
-#ifdef HB_DEVELOPER
- loadResourceLibrary(TEST_RESOURCE_LIB_NAME);
-#endif
- HbThemeServer server;
+ if (HbThemeServerApplication::Options::stop) {
+ app.stop();
+ }
- bool success = server.startServer();
-
- if ( !success ) {
-#ifdef THEME_SERVER_TRACES
- qDebug() << "HbThemeServer::main: server not started!!!";
-#endif
- return -1;
+ if (app.isRunning() || !HbThemeServerApplication::Options::start) {
+ return EXIT_SUCCESS;
}
-
-#ifdef THEME_SERVER_TRACES
- qDebug() << "HbThemeServer::main: server started!!!";
-#endif
-#ifndef Q_OS_SYMBIAN
-#ifdef QT_DEBUG
- server.showMinimized();
-#endif
-#endif // Q_OS_SYMBIAN
+ if (app.initialize()) {
+ return app.exec();
+ }
- int result = app.exec();
-#ifdef THEME_SERVER_TRACES
- qDebug() << "HbThemeServer::main: out from exec, with result code: " << result;
-#endif
- return result;
+ return EXIT_FAILURE;
}
--- a/src/hbservers/hbthemeserveroogmplugin/hbthemeclientoogm.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbservers/hbthemeserveroogmplugin/hbthemeclientoogm.cpp Fri May 14 16:09:54 2010 +0300
@@ -76,7 +76,7 @@
* see goomconfig.xml as what is the threshold that triggers a call to this API.
*/
-void HbThemeClientOogm::FreeRam(int bytes)
+void HbThemeClientOogm::FreeRam(TInt bytes)
{
if (!connected) {
ConnectToServer();
@@ -112,3 +112,49 @@
}
}
+/*!
+* Sends FreeRam request to HbThemeserver.
+* see goomconfig.xml as what is the threshold that triggers a call to this API.
+*/
+
+void HbThemeClientOogm::FreeRam(TInt bytes, TBool aUseSwRendering)
+{
+ if (!connected) {
+ ConnectToServer();
+ }
+
+ if (connected) {
+ HbFreeRamNotificationData freeRamData;
+ freeRamData.bytesToFree = bytes;
+ freeRamData.useSwRendering = aUseSwRendering;
+
+ TPckg<HbFreeRamNotificationData> data(freeRamData);
+ TIpcArgs args(&data, 0);
+
+ TInt err = SendReceive(EFreeRam, args);
+ if (KErrNone != err) {
+ RDebug::Print(_L("ThemeServerPlugin: Free RAM notification sent to ThemeServer"));
+ }
+ }
+}
+
+/*!
+* Sends MemoryGood request to HbThemeserver.
+* see goomconfig.xml as what is the threshold that triggers a call to this API.
+*/
+
+void HbThemeClientOogm::GoodMemory(TBool isUsingSwRendering)
+{
+ if (!connected) {
+ ConnectToServer();
+ }
+
+ if (connected) {
+ TPckg<TBool> usingSwRendering(isUsingSwRendering);
+ TIpcArgs args(&usingSwRendering, 0);
+ TInt err = SendReceive(EMemoryGood, args);
+ if (KErrNone != err) {
+ RDebug::Print(_L("ThemeServerPlugin: Good Memory notification sent to ThemeServer"));
+ }
+ }
+}
--- a/src/hbservers/hbthemeserveroogmplugin/hbthemeclientoogm_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbservers/hbthemeserveroogmplugin/hbthemeclientoogm_p.h Fri May 14 16:09:54 2010 +0300
@@ -38,9 +38,12 @@
HbThemeClientOogm();
TVersion Version() const;
void Close();
- void FreeRam(int bytes);
+ void FreeRam(TInt bytes);
void GoodMemory();
+ void FreeRam(TInt bytes, TBool aUseSwRendering);
+ void GoodMemory(TBool isUsingSwRendering);
+
private:
bool ConnectToServer();
--- a/src/hbservers/hbthemeserveroogmplugin/hbthemeserveroogmplugin.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbservers/hbthemeserveroogmplugin/hbthemeserveroogmplugin.cpp Fri May 14 16:09:54 2010 +0300
@@ -72,10 +72,9 @@
}
}
-void CThemeSrvOogmPlugin::FreeRam(TInt aBytesToFree, TBool)
+void CThemeSrvOogmPlugin::FreeRam(TInt aBytesToFree, TBool aUseSwRendering)
{
- //TODO: support for renderer switch
- FreeRam(aBytesToFree);
+ oogmClient->FreeRam(aBytesToFree, aUseSwRendering);
}
// -----------------------------------------------------------------------------
@@ -87,11 +86,11 @@
oogmClient->GoodMemory();
}
-void CThemeSrvOogmPlugin::MemoryGood(TBool)
+void CThemeSrvOogmPlugin::MemoryGood(TBool aUsingSwRendering)
{
- //TODO: support for renderer switch
- MemoryGood();
+ oogmClient->GoodMemory(aUsingSwRendering);
}
+
// -----------------------------------------------------------------------------
// Creates plugin.
// -----------------------------------------------------------------------------
--- a/src/hbservers/hbthemeserveroogmplugin/hbthemeserveroogmplugin_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbservers/hbthemeserveroogmplugin/hbthemeserveroogmplugin_p.h Fri May 14 16:09:54 2010 +0300
@@ -52,7 +52,7 @@
void MemoryGood();
virtual void FreeRam(TInt aBytesToFree, TBool aUseSwRendering);
- virtual void MemoryGood(TBool aUseSwRendering);
+ virtual void MemoryGood(TBool aUsingSwRendering);
private: //data members
HbThemeClientOogm* oogmClient;
--- a/src/hbservers/themechanger/themechanger.pro Mon May 03 12:48:33 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 UI Extensions for Mobile.
-##
-## GNU Lesser General Public License Usage
-## This file may be used under the terms of the GNU Lesser General Public
-## License version 2.1 as published by the Free Software Foundation and
-## appearing in the file LICENSE.LGPL included in the packaging of this file.
-## Please review the following information to ensure the GNU Lesser General
-## Public License version 2.1 requirements will be met:
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## In addition, as a special exception, Nokia gives you certain additional
-## rights. These rights are described in the Nokia Qt LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## If you have questions regarding the use of this file, please contact
-## Nokia at developer.feedback@nokia.com.
-##
-#############################################################################
-
-TEMPLATE = app
-TARGET = themechanger
-
-TARGET.EPOCHEAPSIZE = 0x20000 0x1000000
-QT += network
-DEFINES += HB_RESOURCES_DIR=\"\\\"$${HB_RESOURCES_DIR}\\\"\"
-
-# directories
-DESTDIR = $${HB_BUILD_DIR}/bin
-
-# dependencies
-hbAddLibrary(hbcore/HbCore)
-hbAddLibrary(hbwidgets/HbWidgets)
-
-# Input
-HEADERS += themechangerdefs.h
-HEADERS += themeselectionlist.h
-SOURCES += themeselectionlist.cpp
-SOURCES += themechangermain.cpp
-
-symbian {
- TARGET.CAPABILITY += WriteDeviceData
- HEADERS += themeclientsymbian.h
- SOURCES += themeclientsymbian.cpp
-} else {
- HEADERS += themeclientqt.h
- SOURCES += themeclientqt.cpp
-}
-
-# installation
-!local {
- target.path = $${HB_BIN_DIR}
- INSTALLS += target
-}
-
-include($${HB_SOURCE_DIR}/src/hbcommon.pri)
--- a/src/hbservers/themechanger/themechangerdefs.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +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 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 THEMECHANGERDEFS_H
-#define THEMECHANGERDEFS_H
-
-#ifdef Q_OS_SYMBIAN
-// Enable theme change timing logging
-#define THEME_CHANGER_TIMER_LOG
-#endif
-#undef THEME_CHANGER_TRACES
-
-#endif //THEMECHANGERDEFS_H
--- a/src/hbservers/themechanger/themechangermain.cpp Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +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 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 <hbapplication.h>
-#include <hbmainwindow.h>
-#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)
- {
- QFile file("c:/data/logs/themechanger.txt");
-
- if (!file.open(QIODevice::Append))
- return;
- QTextStream out(&file);
-
- switch (type)
- {
- case QtDebugMsg:
- out << msg << QChar::LineSeparator;
- break;
- case QtWarningMsg:
- break;
- case QtCriticalMsg:
- break;
- case QtFatalMsg:
- break;
- }
- }
-#endif //THEME_CHANGER_TIMER_LOG
-
-int main(int argc, char *argv[])
-{
-#ifdef THEME_CHANGER_TIMER_LOG
- qInstallMsgHandler(debugOutput);
-#endif
- // Initialization
- HbApplication app(argc, argv);
- app.setApplicationName("ThemeChanger");
- // Main window widget.
- // 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);
- themelist->displayThemes();
-
- mainWindow.addView( themelist );
-
- // Show widget
- mainWindow.show();
- // Enter event loop
- return app.exec();
-}
-
--- a/src/hbservers/themechanger/themeclientqt.cpp Mon May 03 12:48:33 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 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 <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/hbservers/themechanger/themeclientqt.h Mon May 03 12:48:33 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 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 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/hbservers/themechanger/themeclientsymbian.cpp Mon May 03 12:48:33 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 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 "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/hbservers/themechanger/themeclientsymbian.h Mon May 03 12:48:33 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 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 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/hbservers/themechanger/themeselectionlist.cpp Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,289 +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 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 <QSettings>
-#include <QStringList>
-#include <QDir>
-#include <QTimer>
-#include <hbinstance.h>
-#include <hbmenu.h>
-#include <hbaction.h>
-#include <hbicon.h>
-#include <hblistwidgetitem.h>
-#include <QDebug>
-#include <QTime>
-
-#include "themeselectionlist.h"
-#include "themechangerdefs.h"
-
-/**
- * Constructor
- */
-ThemeSelectionList::ThemeSelectionList(
-#ifdef Q_OS_SYMBIAN
- ThemeClientSymbian* client
-#else
- ThemeClientQt* client
-#endif
- ):
- oldItemIndex(-1),
- themelist(new HbListWidget(this)),
- rightMark(new HbIcon(QString("qtg_small_tick"))),
- noMark(new HbIcon(QString(""))),
- client(client)
-{
- connect(themelist, SIGNAL(activated(HbListWidgetItem *)),this, SLOT(setChosen(HbListWidgetItem *)));
- setWidget(themelist);
-
- // Automatic updation of the themelist when some theme is installed or uninstalled
- // when the themechanger app is open
- watcher=new QFileSystemWatcher();
- foreach(const QString &KThemeRootPath, rootPaths()) {
- if(!KThemeRootPath.contains("/romthemes")){
- watcher->addPath(KThemeRootPath+"/themes/icons/");
- }
- }
- connect(watcher,SIGNAL(directoryChanged(const QString &)),this,SLOT(updateThemeList(const QString &)));
- QObject::connect(this,SIGNAL(newThemeSelected(QString)),this,SLOT(sendThemeName(QString)));
-#ifdef THEME_CHANGER_TIMER_LOG
- idleTimer = new QTimer(this);
- connect(idleTimer, SIGNAL(timeout()), this, SLOT(processWhenIdle()));
- connect(hbInstance->theme(),SIGNAL(changeFinished()), this, SLOT(themeChanged()));
- idleTimer->start(0); // to make a connection to server
-#endif
-}
-
-/**
- * Destructor
- */
-ThemeSelectionList::~ThemeSelectionList()
-{
- // Set the theme to the applied theme before exiting.
- setChosen(themelist->item(oldItemIndex));
- delete noMark;
-
- noMark=NULL;
- delete rightMark;
- rightMark=NULL;
-
- // Reset the item view
- themelist->reset();
- delete themelist;
- themelist=NULL;
-}
-
-
-/**
- * displayThemes
- */
-void ThemeSelectionList::displayThemes()
-{
- bool entryAdded = false;
- bool themePresent = false;
- foreach(const QString &KThemeRootPath, rootPaths()){
- dir.setPath(KThemeRootPath) ;
- QStringList list = dir.entryList(QDir::AllDirs|QDir::NoDotAndDotDot,QDir::Name);
- if(list.contains("themes",Qt::CaseInsensitive )) {
- themePresent = true;
- QDir root = KThemeRootPath;
- dir.setPath(root.path()+"/themes/icons/") ;
- QStringList iconthemeslist=dir.entryList(QDir::AllDirs|QDir::NoDotAndDotDot,QDir::Name);
- foreach(QString themefolder, iconthemeslist) {
- QDir iconThemePath(root.path()+"/themes/icons/"+themefolder);
- if(iconThemePath.exists("index.theme")) {
- 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) ) {
- iconthemeslist.removeOne(themefolder);
- }
- }
- else {
- iconthemeslist.removeOne(themefolder);
- }
-
- }
- if(!entryAdded){
- iconthemeslist.insert(0,"hbdefault"); //adding one default entry
- 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));
- oldItemIndex=themelist->count()-1;
- themelist->setCurrentRow(oldItemIndex);
- }
- else {
- themelist->addItem(*noMark,list.at(i));
- }
- }
- }
- }
- // else{//add a case for no theme ,make hbdefault entry
- if(!themePresent) {
- QStringList defaultList;
- defaultList.insert(0,"hbdefault"); //adding one default entry
- themelist->addItem(*rightMark,defaultList.at(0));
- 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");
- }
- }
-
- }
-}
-
-/**
- * setChosen
- */
-void ThemeSelectionList::setChosen(HbListWidgetItem *item)
-{
- QString str=item->text();
-
-#ifdef THEME_CHANGER_TRACES
- qDebug() << "ThemeSelectionList::Setchosen with ThemeName: "<<str;
-#endif
- if(iCurrentTheme != str ) {
-#ifdef THEME_CHANGER_TIMER_LOG
- timer.start();
- qDebug() << "Selected theme: " << str;
-#endif
- iCurrentTheme = str;
- if (!client->isConnected()) {
- bool success = client->connectToServer();
- if (success) {
- emit newThemeSelected(str);
- }
- }
- else {
- emit newThemeSelected(str);
- }
- }
- else
- {
- applySelection(); //double tap //put a tick
- }
-}
-
-
-/**
- * applySelection
- */
-void ThemeSelectionList::applySelection()
-{
- if(oldItemIndex!=themelist->currentRow()) {
- themelist->setIcon(themelist->currentRow(),*rightMark);
- if(oldItemIndex >= 0) {
- themelist->setIcon(oldItemIndex,*noMark);
- }
- oldItemIndex = themelist->currentRow();
- }
-}
-
-
-/**
- * event
- */
-bool ThemeSelectionList::event(QEvent *e)
-{
- if((e->type()==QEvent::ShortcutOverride)||(e->type()==QEvent::WindowDeactivate)) {
- // save old applied theme
- themelist->setCurrentRow(oldItemIndex);
- themelist->setFocus();
- setChosen(themelist->item(oldItemIndex));
- return true;
- }
- return (HbView::event(e));
-}
-
-/**
- * updateThemeList
- */
-void ThemeSelectionList::updateThemeList(const QString &path)
-{
- Q_UNUSED(path);
- themelist->clear();
- this->displayThemes();
-}
-
-
-/**
- * sendThemeName
- */
-void ThemeSelectionList::sendThemeName(const QString& name)
-{
- client->changeTheme(name);
-}
-
-/**
- * \internal
- */
-QStringList ThemeSelectionList::rootPaths()
-{
- QStringList rootDirs;
-#if defined(Q_OS_SYMBIAN)
- rootDirs << "c:/resource/hb"
- << "z:/resource/hb"
- << "e:/resource/hb"
- << "f:/resource/hb";
-#else
- QString envDir = qgetenv("HB_THEMES_DIR");
- if (!envDir.isEmpty())
- rootDirs << envDir;
-#endif
-#if defined(Q_OS_MAC)
- rootDirs << QDir::homePath() + "/Library/UI Extensions for Mobile";
-#elif !defined(Q_OS_SYMBIAN)
- rootDirs << HB_RESOURCES_DIR;
-#endif
- return rootDirs;
-}
-
-#ifdef THEME_CHANGER_TIMER_LOG
-void ThemeSelectionList::processWhenIdle()
-{
- qDebug() << "Theme changed applied in " << timer.elapsed() << " msec";
- idleTimer->stop();
- if (!client->isConnected()) {
- client->connectToServer();
- }
-}
-
-void ThemeSelectionList::themeChanged()
-{
- idleTimer->start(0);
-}
-#endif //THEME_CHANGER_TIMER_LOG
--- a/src/hbservers/themechanger/themeselectionlist.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,94 +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 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 THEMESELECTIONLIST_H
-#define THEMESELECTIONLIST_H
-
-#include <QDir>
-#include <QModelIndex>
-#include <QStandardItemModel>
-#include <QFileSystemWatcher>
-#include <QTime>
-#include <hbview.h>
-#include <hblistwidget.h>
-
-#ifdef Q_OS_SYMBIAN
-#include "themeclientsymbian.h"
-#else
-#include "themeclientqt.h"
-#endif
-#include "themechangerdefs.h"
-
-class HbIcon;
-
-class ThemeSelectionList:public HbView
-{
-Q_OBJECT
-public:
-
-#ifdef Q_OS_SYMBIAN
- ThemeSelectionList(ThemeClientSymbian* client);
-#else
- ThemeSelectionList(ThemeClientQt* client);
-#endif
-
- ~ThemeSelectionList();
-signals:
- void newThemeSelected(const QString &newthemepath);
-public slots:
- void displayThemes();
- void setChosen(HbListWidgetItem *item);
- void applySelection();
- void updateThemeList(const QString &path);
- void sendThemeName(const QString& name);
-#ifdef THEME_CHANGER_TIMER_LOG
- void processWhenIdle();
- void themeChanged();
-#endif
-
-protected:
- bool event(QEvent *e);
- void resizeEvent(QResizeEvent* event);
-private:
- static QStringList rootPaths();
- QDir dir;
- int oldItemIndex;
- HbListWidget *themelist;
- HbIcon* rightMark;
- HbIcon* noMark;
- HbAction *action;
-#ifdef Q_OS_SYMBIAN
- ThemeClientSymbian* client;
-#else
- ThemeClientQt* client;
-#endif
-
- QFileSystemWatcher *watcher;
- QString iCurrentTheme;
-#ifdef THEME_CHANGER_TIMER_LOG
- QTime timer;
- QTimer *idleTimer;
-#endif
-};
-#endif //THEMESELECTIONLIST_H
--- a/src/hbservers/themeindexer/main.cpp Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,415 +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 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 <hbiconsource_p.h>
-#include <hbthemeindex_p.h>
-#include <assert.h>
-#include <iostream>
-#include <QApplication>
-#include <QStringList>
-#include <QTextStream>
-#include <QFileInfo>
-#include <QLibrary>
-#include <QString>
-#include <QFile>
-#include <QMap>
-#include <QDir>
-
-#define RESOURCE_LIB_NAME "HbCore"
-#define WIN32_DEBUG_SUFFIX "d"
-#define MAC_DEBUG_SUFFIX "_debug"
-
-// For being able to sort the index items based on the iconname
-class IndexItemInfo
-{
-public:
- QString iconname;
- HbThemeIndexItem item;
-};
-
-bool operator<(const IndexItemInfo &left, const IndexItemInfo &right)
-{
- return left.iconname < right.iconname;
-}
-
-// Global variables
-
-static int counter = 0;
-static bool verboseOn = false;
-
-static int version = 1; // Current theme index format version
-
-QList<IndexItemInfo> IndexItems;
-
-QMap<QString, int> Strings;
-QByteArray StringBuffer;
-
-// ------
-
-QSize getDefaultSize(const QString &filename)
-{
- HbIconSource source(filename);
- return source.defaultSize().toSize();
-}
-
-int getStringOffset(const QString &string)
-{
- int offset = Strings.value(string, -1);
- if (offset < 0) {
- // Allocate new string in the string buffer
- offset = StringBuffer.size();
- StringBuffer.append(string.toLatin1());
- StringBuffer.append('\0');
- // Add offset to the target paths list
- Strings.insert(string, offset);
- }
- return offset;
-}
-
-void processFile(const QFileInfo &info, const QString &themename)
-{
- QString fullFilename = info.absoluteFilePath();
- QString filename = info.fileName();
-
- if (filename.endsWith(".svg") ||
- filename.endsWith(".png") ||
- filename.endsWith(".mng") ||
- filename.endsWith(".gif") ||
- filename.endsWith(".xpm") ||
- filename.endsWith(".jpg") ||
- filename.endsWith(".nvg") ||
- filename.endsWith(".svgz") ||
- filename.endsWith(".qpic")) {
-
- IndexItemInfo itemInfo;
-
- QString targetPath;
-
- // If not "hbdefault", which is in resource file, resolve target path for the icon
- if (!fullFilename.startsWith(':') &&
- !fullFilename.contains("icons/hbdefault") &&
- !fullFilename.contains("icons\\hbdefault")) {
-
- if (fullFilename.contains("scalable")) {
- targetPath = "/resource/hb/themes/icons/" + themename + "/scalable/";
- } else {
- targetPath = "/resource/hb/themes/icons/" + themename + "/pixmap/";
- }
- } else {
- // Resource file target path, used with "hbdefault" theme
- if (fullFilename.contains("scalable")) {
- targetPath = ":/themes/icons/hbdefault/scalable/";
- } else {
- targetPath = ":/themes/icons/hbdefault/pixmap/";
- }
- }
-
- itemInfo.item.folderOffset = getStringOffset(targetPath);
- itemInfo.item.extOffset = getStringOffset(filename.mid(filename.lastIndexOf('.')));
-
- // Define iconname (remove file extension)
- QString iconname;
-
- int extIndex = filename.lastIndexOf('.');
- if (extIndex > 0) {
- iconname = filename.left(extIndex);
- } else {
- iconname = filename;
- }
-
- itemInfo.item.iconnameOffset = getStringOffset(iconname);
- itemInfo.iconname = iconname;
-
- // Define default size
- itemInfo.item.defaultSize = getDefaultSize(fullFilename);
-
- QString mirroredFilepath = fullFilename;
-
- // Define mirrored filename if there is a separate mirrored version of the
- // icon in 'mirrored' folder and in that case get also its default size
-
- int index1 = mirroredFilepath.lastIndexOf('/');
- int index2 = mirroredFilepath.lastIndexOf('\\');
-
- int index = index1 < index2 ? index2 : index1;
-
- if (index>0) {
- mirroredFilepath = mirroredFilepath.left(index);
- mirroredFilepath.append(QString("/mirrored/"));
-
- QStringList extList;
- extList << ".svg" << ".png" << ".mng" << ".gif" << ".xpm" << ".jpg" << ".nvg" << ".svgz" << ".qpic";
-
- foreach(QString ext, extList) {
- QString mirroredFilenameCandidate = mirroredFilepath + iconname + ext;
-
- if (QFile::exists(mirroredFilenameCandidate)) {
- itemInfo.item.mirroredExtOffset = getStringOffset(ext);
- itemInfo.item.mirroredDefaultSize = getDefaultSize(mirroredFilenameCandidate);
- break;
- }
- }
- }
-
- bool alreadyExists = false;
-
- // Check if there is already an item with the same iconname in the index
- foreach(const IndexItemInfo &info, IndexItems) {
- if (info.iconname == itemInfo.iconname) {
- alreadyExists = true;
- break;
- }
- }
-
- if (!alreadyExists) {
- IndexItems.append(itemInfo);
-
- if (verboseOn) {
- std::cout << "----------------------------------------------------------------\n";
- std::cout << "Added item" << counter << "\n";
- std::cout << "Iconname:" << &StringBuffer.data()[itemInfo.item.iconnameOffset] << "\n";
- std::cout << "Folder:" << &StringBuffer.data()[itemInfo.item.folderOffset] << "\n";
- std::cout << "Extension:" << &StringBuffer.data()[itemInfo.item.extOffset] << "\n";
- std::cout << "Default size: width: " << itemInfo.item.defaultSize.width() << " height: " << itemInfo.item.defaultSize.height() << "\n";
- if (itemInfo.item.mirroredExtOffset >= 0) {
- std::cout << "Mirrored extension:" << &StringBuffer.data()[itemInfo.item.mirroredExtOffset] << "\n";
- } else {
- std::cout << "Mirrored extension: <empty>\n";
- }
- std::cout << "Mirrored default size: width:" << itemInfo.item.mirroredDefaultSize.width() << " height: " << itemInfo.item.mirroredDefaultSize.height() << "\n";
- }
- counter++;
- } else { // Icon already added in index with some other extension, do not add duplicates
- if (verboseOn) {
- std::cout << "----------------------------------------------------------------\n";
- std::cout << "WARNING! Skipped already existing icon:" << fullFilename.toStdString() << "\n";
- }
- }
- }
-}
-
-void adjustOffsets() {
- int adjustment = sizeof(HbThemeIndexHeaderV1) + IndexItems.count() * sizeof(HbThemeIndexItem);
-
- for (int i = 0; i<IndexItems.count(); ++i) {
- IndexItems[i].item.iconnameOffset += adjustment;
- IndexItems[i].item.folderOffset += adjustment;
- IndexItems[i].item.extOffset += adjustment;
-
- if (IndexItems[i].item.mirroredExtOffset >= 0) {
- IndexItems[i].item.mirroredExtOffset += adjustment;
- }
- }
-}
-
-void processDir(const QDir &dir, const QString &themename, const QString targetName, bool subDir = false)
-{
- if (!subDir) {
- IndexItems.clear();
- Strings.clear();
- StringBuffer.clear();
- }
-
- QFileInfoList entries = dir.entryInfoList(QDir::AllEntries | QDir::NoDotAndDotDot);
- for (int i=0; i<entries.count(); i++) {
- QFileInfo info = entries.at(i);
- QString file = info.absoluteFilePath();
- if (info.isDir()) {
- // Process subdirs recursively
- QDir subDir(file);
- processDir(subDir, themename, targetName, true);
- }
- // Process file
- processFile(info, themename);
- }
-
- if (!subDir) {
- QDir targetDir(targetName);
- if (!targetDir.exists()) {
- targetDir.mkpath(targetName);
- }
- QString filename = targetName + themename + ".themeindex";
-
- QFile::remove(filename);
- QFile indexFile(filename);
- if (!indexFile.open(QIODevice::ReadWrite)) {
- std::cout << "ERROR: could not open index file!\n";
- return;
- }
-
- // Write the header in the beginning of the file
- HbThemeIndexHeaderV1 header;
- header.version = version;
- header.count = IndexItems.count();
-
- qint64 ret = indexFile.write(reinterpret_cast<const char *>(&header), sizeof(HbThemeIndexHeaderV1));
- assert(ret == sizeof(HbThemeIndexHeaderV1));
-
- // Sort the list
- qSort(IndexItems);
-
- // Fix offsets in the items to be based on the beginning of the theme index instead of
- // the beginning of the string buffer area.
- adjustOffsets();
-
- // Write the items in the file stream
- foreach(const IndexItemInfo &itemInfo, IndexItems) {
- ret = indexFile.write(reinterpret_cast<const char *>(&itemInfo.item), sizeof(HbThemeIndexItem));
- assert(ret == sizeof(HbThemeIndexItem));
- }
-
- // Write the string buffer in the stream
- ret = indexFile.write(StringBuffer.constData(), StringBuffer.size());
- assert(ret == StringBuffer.size());
- indexFile.close();
- }
-}
-
-void showHelp() {
- std::cout << "Themeindexer.exe usage:\n\n";
- std::cout << "themeindexer [-v] -f filename OR -n themename -s theme icons source directory -t theme index file target directory\n\n";
-
- std::cout << "-n \t\tname of index file (\"<themename>.themeindex\").\n";
- std::cout << "-s \t\ticons source directory is scanned recursively and all the";
- std::cout << "\t\t\trecognized icon files are aded in the theme index.\n";
- std::cout << "-t \t\ttarget directory for the index file.\n";
-
- std::cout << "-f <filename>\tfile which contains multiple themes to be indexed. Each in its own row.\n";
- std::cout << "-v \t\tverbose output\n\n";
-
- std::cout << "Example 1:\n";
- std::cout << "Themeindexer.exe -n theme1 -s c:/themes/icons/theme1/ -t c:/temp/\n\n";
- std::cout << "Example 2:\n";
- std::cout << "Themeindexer.exe -f c:/mythemes/themes.txt\n\n";
-}
-
-void loadHbResource()
-{
- bool loadSuccess;
- // To load resources embedded in hb library
- QString resourceLibName(RESOURCE_LIB_NAME);
- QLibrary hbLib(resourceLibName);
- loadSuccess = hbLib.load();
-
- if ( !loadSuccess ) {
- // Library may not be loaded, if it was built in debug mode and the name in debug mode is
- // different, change the name to debug version in that scenario
-#ifdef Q_OS_WIN32
- resourceLibName += WIN32_DEBUG_SUFFIX;
-#elif defined(Q_OS_MAC)
- resourceLibName += MAC_DEBUG_SUFFIX;
-#endif
- // On symbian library name in debug mode is same as that in release mode,
- // so no need to do anything for that
- hbLib.setFileName(resourceLibName);
- loadSuccess = hbLib.load();
- }
-}
-
-int main(int argc, char *argv[])
-{
- QApplication app(argc, argv, false); // GUIenabled=false
-
- if (argc <= 2) {
- showHelp();
- } else {
- // Load HbCore resource to be able to index hbdefault theme
- loadHbResource();
-
- QString filename;
- QString themename;
- QDir basedir;
- QString targetname;
- QStringList args(app.arguments());
-
- for (int n = 0; n < args.count(); n++) {
- if (args[n].toLower() == "-n") {
- themename = args[n+1];
- n++;
- } else if (args[n].toLower() == "-s") {
- basedir = QDir(args[n+1]);
- n++;
- } else if (args[n].toLower() == "-t") {
- targetname = args[n+1];
- n++;
- } else if (args[n].toLower() == "-v") {
- verboseOn = true;
- } else if (args[n].toLower() == "-f") {
- filename = args[n+1];
- }
- }
-
-
- if (filename.length() > 0) {
- if (!QFile::exists(filename)) {
- std::cout << "Error: file " << filename.toStdString() << " does not exist.\n";
- } else {
- // Open file and parse lines. Each line should have three value separated with:
- QFile themesToBeIndexed(filename);
- if (themesToBeIndexed.open(QIODevice::ReadOnly | QIODevice::Text)) {
- QTextStream in(&themesToBeIndexed);
-
- while(!in.atEnd()) {
- QString line = in.readLine();
-
- QStringList values = line.split(' ');
- if (values.count() == 3) {
- themename = values[0];
- basedir = values[1];
- targetname = values[2];
-
- targetname.replace('\\', '/');
- // Check that targetname has / at the end
- if (!targetname.endsWith('/')) {
- targetname.append('/');
- }
- processDir(basedir, themename, targetname);
- }
- }
-
- themesToBeIndexed.close();
-
- // Loop through themes string list and call processDir
- } else {
- std::cout << "Error: file " << filename.toStdString() << " could not be opened.\n";
- }
- }
- } else {
- // Index only given theme
-
- targetname.replace('\\', '/');
- // Check that targetname has / at the end
- if (!targetname.endsWith('/')) {
- targetname.append('/');
- }
-
- processDir(basedir, themename, targetname);
-
- }
- }
-
- return 0;
-}
-
--- a/src/hbservers/themeindexer/themeindexer.pro Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +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 UI Extensions for Mobile.
-##
-## GNU Lesser General Public License Usage
-## This file may be used under the terms of the GNU Lesser General Public
-## License version 2.1 as published by the Free Software Foundation and
-## appearing in the file LICENSE.LGPL included in the packaging of this file.
-## Please review the following information to ensure the GNU Lesser General
-## Public License version 2.1 requirements will be met:
-## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-##
-## In addition, as a special exception, Nokia gives you certain additional
-## rights. These rights are described in the Nokia Qt LGPL Exception
-## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-##
-## If you have questions regarding the use of this file, please contact
-## Nokia at developer.feedback@nokia.com.
-##
-#############################################################################
-
-TEMPLATE = app
-TARGET = themeindexer
-DEPENDPATH += .
-DEPENDPATH += $${HB_SOURCE_DIR}/src/hbcore/core
-DEPENDPATH += $${HB_SOURCE_DIR}/src/hbcore/image
-INCLUDEPATH += .
-INCLUDEPATH += $${HB_SOURCE_DIR}/src/hbcore/core
-INCLUDEPATH += $${HB_SOURCE_DIR}/src/hbcore/image
-DEFINES += HB_BOOTSTRAPPED
-QT = core gui svg
-CONFIG += console
-CONFIG -= app_bundle
-
-# directories
-DESTDIR = $${HB_BUILD_DIR}/bin
-
-# dependencies
-HEADERS += $${HB_SOURCE_DIR}/src/hbcore/core/hbthemeindex_p.h
-SOURCES += $${HB_SOURCE_DIR}/src/hbcore/core/hbthemeindex.cpp
-
-HEADERS += $${HB_SOURCE_DIR}/src/hbcore/image/hbiconsource_p.h
-SOURCES += $${HB_SOURCE_DIR}/src/hbcore/image/hbiconsource.cpp
-
-# Input
-SOURCES += main.cpp
-
-# installation
-!local {
- target.path = $${HB_BIN_DIR}
- INSTALLS += target
-}
-
-include($${HB_SOURCE_DIR}/src/hbcommon.pri)
--- a/src/hbtools/docml2bin/main.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbtools/docml2bin/main.cpp Fri May 14 16:09:54 2010 +0300
@@ -55,7 +55,9 @@
if (argc <= 2) {
showHelp();
} else {
+ //bool backup = false;
QString source, target;
+ //QStringList restore;
QStringList args(app.arguments());
for (int n = 0; n < args.count(); n++) {
@@ -65,10 +67,45 @@
} else if (args[n].toLower() == "-t") {
target = args[n+1];
n++;
- }
+ /*
+ } else if (args[n].toLower() == "--backup-and-replace") {
+ backup = true;
+ } else if (args[n].toLower() == "-restore") {
+ n++;
+ while (n < args.count()) {
+ restore.append( args[n] );
+ n++;
+ }
+ */
+ }
}
+ /*
+ if (restore.count()) {
+ for (int i = 0; i < restore.count(); i++) {
+ QString orig = restore.at(i) + ".orig";
+ if ( QFile::exists(orig) ) {
+ QFile::remove(restore.at(i));
+ QFile origFile(orig);
+ origFile.rename(restore.at(i));
+ }
+ }
+ return 0;
+ }
+ */
if (source.length() > 0) {
+ /*
+ if (backup) {
+ QString orig = source + ".orig";
+ if ( QFile::exists(orig) ) {
+ QFile::remove(orig);
+ }
+ QFile origFile(source);
+ origFile.rename(orig);
+ target = source;
+ source = orig;
+ }
+ */
if (!QFile::exists(source)) {
std::cout << "Error: file " << source.toStdString() << " does not exist.\n";
} else {
@@ -78,15 +115,11 @@
if (!target.length()) {
target = source + ".bin";
}
- if (QFile::exists(target)) {
- std::cout << "Error: target file already exists.\n";
- } else {
- QFile targetFile(target);
- if (targetFile.open(QIODevice::WriteOnly)) {
- HbDocumentLoader loader;
- loader.createBinary( &sourceFile, &targetFile );
- targetFile.close();
- }
+ QFile targetFile(target);
+ if (targetFile.open(QIODevice::WriteOnly)) {
+ HbDocumentLoader loader;
+ loader.createBinary( &sourceFile, &targetFile );
+ targetFile.close();
}
sourceFile.close();
}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbtools/hbbincssmaker/hbbincssmaker.pro Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,113 @@
+#############################################################################
+##
+## Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+## All rights reserved.
+## Contact: Nokia Corporation (developer.feedback@nokia.com)
+##
+## This file is part of the UI Extensions for Mobile.
+##
+## GNU Lesser General Public License Usage
+## This file may be used under the terms of the GNU Lesser General Public
+## License version 2.1 as published by the Free Software Foundation and
+## appearing in the file LICENSE.LGPL included in the packaging of this file.
+## Please review the following information to ensure the GNU Lesser General
+## Public License version 2.1 requirements will be met:
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Nokia gives you certain additional
+## rights. These rights are described in the Nokia Qt LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## If you have questions regarding the use of this file, please contact
+## Nokia at developer.feedback@nokia.com.
+##
+#############################################################################
+
+TEMPLATE = app
+TARGET = hbbincssmaker
+
+# dependencies
+# hbAddLibrary(hbcore/HbCore)
+
+DEPENDPATH += .
+
+DEPENDPATH += $${HB_SOURCE_DIR}/src/hbcore/core
+DEPENDPATH += $${HB_SOURCE_DIR}/src/hbcore/theme
+DEPENDPATH += $${HB_SOURCE_DIR}/src/hbcore/cssparser
+DEPENDPATH += $${HB_SOURCE_DIR}/src/hbcore/utils
+DEPENDPATH += $${HB_SOURCE_DIR}/src/hbcore/gui
+DEPENDPATH += $${HB_SOURCE_DIR}/src/hbcore/image
+DEPENDPATH += $${HB_SOURCE_DIR}/src/hbcore/style
+DEPENDPATH += $${HB_SOURCE_DIR}/src/hbcore/feedback
+
+INCLUDEPATH += .
+INCLUDEPATH += $${HB_SOURCE_DIR}/src/hbcore/core
+INCLUDEPATH += $${HB_SOURCE_DIR}/src/hbcore/theme
+INCLUDEPATH += $${HB_SOURCE_DIR}/src/hbcore/cssparser
+INCLUDEPATH += $${HB_SOURCE_DIR}/src/hbcore/utils
+INCLUDEPATH += $${HB_SOURCE_DIR}/src/hbcore/gui
+INCLUDEPATH += $${HB_SOURCE_DIR}/src/hbcore/image
+INCLUDEPATH += $${HB_SOURCE_DIR}/src/hbcore/style
+INCLUDEPATH += $${HB_SOURCE_DIR}/src/hbcore/feedback
+QT = core gui svg
+QT += network
+
+CONFIG += console
+
+# directories
+DESTDIR = $${HB_BUILD_DIR}/bin
+
+# headers and sources from hbcore
+HEADERS += $${HB_SOURCE_DIR}/src/hbcore/core/hbmemorymanager_p.h
+HEADERS += $${HB_SOURCE_DIR}/src/hbcore/core/hbsharedmemorymanager_p.h
+HEADERS += $${HB_SOURCE_DIR}/src/hbcore/core/hbvector_p.h
+HEADERS += $${HB_SOURCE_DIR}/src/hbcore/core/hbvariant_p.h
+HEADERS += $${HB_SOURCE_DIR}/src/hbcore/core/hbstring_p.h
+HEADERS += $${HB_SOURCE_DIR}/src/hbcore/core/hbstringdata_p.h
+HEADERS += $${HB_SOURCE_DIR}/src/hbcore/core/hbstringvector_p.h
+HEADERS += $${HB_SOURCE_DIR}/src/hbcore/core/hbsmartpointer_p.h
+HEADERS += $${HB_SOURCE_DIR}/src/hbcore/core/hbsmartoffset_p.h
+HEADERS += $${HB_SOURCE_DIR}/src/hbcore/core/hbsharedcache_p.h
+HEADERS += $${HB_SOURCE_DIR}/src/hbcore/core/hbmemoryutils_p.h
+HEADERS += $${HB_SOURCE_DIR}/src/hbcore/core/hbthemeperf_p.h
+HEADERS += $${HB_SOURCE_DIR}/src/hbcore/theme/hbthemecommon_p.h
+HEADERS += $${HB_SOURCE_DIR}/src/hbcore/cssparser/hbcssparser_p.h
+
+#memory manager source dependencies
+SOURCES += $${HB_SOURCE_DIR}/src/hbcore/core/hbmemorymanager_p.cpp
+SOURCES += $${HB_SOURCE_DIR}/src/hbcore/core/hbsharedmemorymanager_p.cpp
+SOURCES += $${HB_SOURCE_DIR}/src/hbcore/core/hbsplaytreeallocator_p.cpp
+SOURCES += $${HB_SOURCE_DIR}/src/hbcore/core/hbmultisegmentallocator_p.cpp
+
+#shared memory container sources
+SOURCES += $${HB_SOURCE_DIR}/src/hbcore/core/hbvariant_p.cpp
+SOURCES += $${HB_SOURCE_DIR}/src/hbcore/core/hbstring_p.cpp
+
+SOURCES += $${HB_SOURCE_DIR}/src/hbcore/core/hbsharedcache.cpp
+
+# css parser source dependencies
+SOURCES += $${HB_SOURCE_DIR}/src/hbcore/cssparser/hbcssparser_p.cpp
+SOURCES += $${HB_SOURCE_DIR}/src/hbcore/cssparser/hblayeredstyleloader_p.cpp
+SOURCES += $${HB_SOURCE_DIR}/src/hbcore/cssparser/hbwidgetstyleloader_p.cpp
+SOURCES += $${HB_SOURCE_DIR}/src/hbcore/cssparser/hbstyleselector_p.cpp
+
+DEFINES += HB_BOOTSTRAPPED
+DEFINES += HB_BIN_CSS
+DEFINES -= HB_GESTURE_FW
+DEFINES -= HB_CSS_INSPECTOR
+DEFINES += HB_BUILD_DIR=\"\\\"$${HB_BUILD_DIR}\\\"\"
+DEFINES += HB_BIN_DIR=\"\\\"$${HB_BIN_DIR}\\\"\"
+DEFINES += HB_PLUGINS_DIR=\"\\\"$${HB_PLUGINS_DIR}\\\"\"
+
+# Input
+SOURCES += main.cpp
+HEADERS += hbcssconverterutils_p.h
+SOURCES += hbcssconverterutils.cpp
+
+# installation
+!local {
+ target.path = $${HB_BIN_DIR}
+ INSTALLS += target
+}
+
+include($${HB_SOURCE_DIR}/src/hbcommon.pri)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbtools/hbbincssmaker/hbcssconverterutils.cpp Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,204 @@
+/****************************************************************************
+**
+** 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 <QMap>
+#include "hbcssconverterutils_p.h"
+#include "hbsharedmemorymanager_p.h"
+#include "hbsharedmemoryallocators_p.h"
+
+// Global list that stores pointers to the member variables where shared container instances
+// store offsets returned my memory allocator.
+// CSS converter utilizes it to automatically adjust the offsets if allocated cells are moved.
+
+// Map is used only to get faster lookups, item's value is obsolete
+static QMap<int *, int> registered;
+
+
+// Shared chunk allocation information for css data
+static int totalAllocated = 0;
+// Using map instead of hash to guarantee that the items are in order
+// so the cell with offset 0 which is the HbCss::StyleSheet structure
+// is always first in the cell list, so its offset does not get changed
+// when the chunk is defragmented.
+static QMap<int, int> cells;
+
+
+void HbCssConverterUtils::registerOffsetHolder(int *offset)
+{
+ registered.insert(offset, 1);
+}
+
+void HbCssConverterUtils::unregisterOffsetHolder(int *offset)
+{
+ registered.remove(offset);
+}
+
+
+QList<int *> HbCssConverterUtils::registeredOffsetHolders()
+{
+ return registered.keys();
+}
+
+void HbCssConverterUtils::unregisterAll()
+{
+ registered.clear();
+}
+
+
+void HbCssConverterUtils::cellAllocated(int offset, int size)
+{
+ cells.insert(offset, ALIGN(size));
+ totalAllocated += ALIGN(size);
+}
+
+void HbCssConverterUtils::cellFreed(int offset)
+{
+ int size = cells.value(offset, 0);
+ totalAllocated -= size;
+ cells.remove(offset);
+
+ if (size > 0) {
+ // Make sure there are no registered offset holders in the freed cell any more
+ GET_MEMORY_MANAGER(HbMemoryManager::SharedMemory);
+ HbSharedMemoryManager *shared = static_cast<HbSharedMemoryManager*>(manager);
+ const char *chunkBase = static_cast<const char *>(shared->base());
+
+ 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);
+ }
+ }
+ }
+}
+
+void HbCssConverterUtils::cellMoved(int offset, int newOffset)
+{
+ int size = cells.value(offset, 0);
+
+ 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));
+ }
+ }
+ }
+}
+
+/**
+* Defragments the shared chunk contents and places defragmented buffer in the beginning of the chunk.
+* Registered chunk offset holders are updated during the process.
+* Returns the next free offset in the chunk.
+*/
+int HbCssConverterUtils::defragmentChunk()
+{
+ 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));
+
+ QList<int *> offsetHolders = HbCssConverterUtils::registeredOffsetHolders();
+
+ // Create new buffer where the current chunk contents are defragmented
+ void *buffer = ::malloc(shared->size());
+ int newCurrentOffset = 0;
+
+ // Create new cell order and update offset holders
+ QMap<int,int>::const_iterator i = cells.constBegin();
+
+ while (i != cells.constEnd()) {
+ // 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);
+ }
+ }
+
+ newCurrentOffset += size;
+ i++;
+ }
+
+ i = cells.constBegin();
+ newCurrentOffset = 0;
+
+ // Move allocated cells to a linear buffer
+ while (i != cells.constEnd()) {
+ // 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);
+
+ 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();
+ QList<int> keys = cells.keys();
+
+ for (int j=0; j<keys.count(); ++j) {
+ shared->free(keys.at(j));
+ }
+
+ // CSS binary data is placed after the chunk header.
+ int cssBinaryOffset = sizeof(HbSharedChunkHeader);
+ char *address = HbMemoryUtils::getAddress<char>(HbMemoryManager::SharedMemory, cssBinaryOffset);
+ memcpy(address, buffer, newCurrentOffset);
+
+ cells.clear();
+ totalAllocated = 0;
+
+ // Free the temp buffer
+ ::free(buffer);
+
+ // Return the next free address in the chunk
+ return cssBinaryOffset + newCurrentOffset;
+}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbtools/hbbincssmaker/hbcssconverterutils_p.h Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (developer.feedback@nokia.com)
+**
+** This file is part of the 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 HBCSSCONVERTERUTILS_P_H
+#define HBCSSCONVERTERUTILS_P_H
+
+#include <QList>
+
+class HbCssConverterUtils
+{
+public:
+ // Shared chunk offset management
+ static void registerOffsetHolder(int *offset);
+ static void unregisterOffsetHolder(int *offset);
+ static QList<int *> registeredOffsetHolders();
+ static void unregisterAll();
+
+ // Shared chunk allocation management
+ static void cellAllocated(int offset, int size);
+ static void cellFreed(int offset);
+ static void cellMoved(int offset, int newOffset);
+ static int defragmentChunk();
+
+private:
+
+ HbCssConverterUtils();
+ ~HbCssConverterUtils();
+};
+
+#endif // HBCSSCONVERTERUTILS_P_H
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbtools/hbbincssmaker/main.cpp Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,349 @@
+/****************************************************************************
+**
+** 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 <QCoreApplication>
+#include <QFile>
+#include <QDir>
+#include <QDataStream>
+
+#include <hbmemoryutils_p.h>
+#include <hbcssparser_p.h>
+#include <hbsharedmemorymanager_p.h>
+#include <hbsharedcache_p.h>
+#include <hbcssconverterutils_p.h>
+
+// Global variables
+QString AppName("hbbincssmaker");
+static bool verboseOn = false;
+QTextStream out(stdout);
+QTextStream verboseOut(stderr);
+QTextStream err(stderr);
+
+#define VERBOSE(statement) if(verboseOn) { verboseOut << statement; }
+#define VERBOSEIF(test, statement) if(verboseOn && test) { verboseOut << statement; }
+#define VERBOSELN(statement) if(verboseOn) { verboseOut << statement << endl; }
+
+
+void testDeclarations(const HbVector<HbCss::Declaration> &decls)
+{
+ VERBOSE("declarations count: ");
+ VERBOSELN(decls.count());
+ foreach(const HbCss::Declaration &decl, decls) {
+ QString prop = decl.property;
+ VERBOSELN(prop);
+ VERBOSE("declarations values: ");
+ VERBOSELN(decl.values.count());
+ foreach(const HbCss::Value &value, decl.values) {
+ QString declVal = value.variant.toString();
+ VERBOSELN(declVal);
+ }
+ }
+}
+
+void testStyleRules(const HbVector<HbCss::StyleRule> &styleRules)
+{
+ foreach(const HbCss::StyleRule &rule,styleRules) {
+ int sels = rule.selectors.count();
+ VERBOSE("rule selectors count: ");
+ VERBOSELN(sels);
+ foreach(const HbCss::Selector &sel, rule.selectors) {
+ int basicSel = sel.basicSelectors.count();
+ VERBOSE("Basic Selectors: ");
+ VERBOSELN(basicSel);
+ foreach(const HbCss::BasicSelector &bSel, sel.basicSelectors) {
+ QString name = bSel.elementName;
+ VERBOSELN(name);
+ int pseudos = bSel.pseudos.count();
+ VERBOSE("Basic Selectors pseudos: ");
+ VERBOSELN(pseudos);
+ foreach(const HbCss::Pseudo &pseudo, bSel.pseudos) {
+ quint64 pseudoType = (quint64)pseudo.type; Q_UNUSED(pseudoType);
+ QString name = pseudo.name;
+ QString function = pseudo.function;
+ VERBOSE(name);
+ VERBOSELN(function);
+ }
+ int selectors = bSel.attributeSelectors.count();
+ VERBOSE("Basic Selectors attribute selectors: ");
+ VERBOSELN(selectors);
+ foreach(const HbCss::AttributeSelector &aSel, bSel.attributeSelectors) {
+ QString sel = aSel.name;
+ VERBOSELN(sel);
+ }
+ }
+ }
+ testDeclarations(rule.declarations);
+ }
+}
+
+void testStyleSheet(HbCss::StyleSheet *styleSheet)
+{
+ int ruleCount = styleSheet->variableRules.count();
+ VERBOSE("rules count: ");
+ VERBOSELN(ruleCount);
+ foreach(const HbCss::VariableRule &rule, styleSheet->variableRules) {
+ testDeclarations(rule.declarations);
+ }
+ int widgetRules = styleSheet->widgetRules.count();
+ VERBOSE("widget rules count: ");
+ VERBOSELN(widgetRules);
+ foreach(const HbCss::WidgetStyleRules &rule, styleSheet->widgetRules) {
+ testStyleRules(rule.styleRules);
+ testStyleRules(rule.portraitRules);
+ testStyleRules(rule.landscapeRules);
+ }
+}
+
+class CssMap
+{
+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;
+ }
+ }
+
+ void registerOffsetHolders() {
+ foreach(const HbOffsetItem &mapItem, _mapItems) {
+ HbCssConverterUtils::registerOffsetHolder(const_cast<int *>(&mapItem.offset));
+ }
+ }
+
+ 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(); }
+
+private:
+ QMap<QString, HbOffsetItem> _mapItems;
+ QByteArray _cssNameBuffer;
+};
+
+struct InputFile
+{
+ InputFile(const QString &cacheName, const QFileInfo &file) : cacheName(cacheName), file(file)
+ {
+ }
+
+ QString cacheName;
+ QFileInfo file;
+};
+typedef QList<InputFile> InputFileList;
+
+struct InputFileInfo
+{
+ 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();
+}
+
+void printHelp()
+{
+ out << AppName << " usage:\n\n";
+ out << AppName << " [-v] -i <css filename or directory> -o <target binary file>";
+ out << "-v \t\tverbose output\n\n";
+}
+
+QFileInfoList collectFiles(const QFileInfoList &inputFiles, const QStringList &filters)
+{
+ QFileInfoList collected;
+ Q_FOREACH(const QFileInfo &inputFile, inputFiles) {
+ if (inputFile.isDir()) {
+ QDir dir(inputFile.absoluteFilePath());
+ QFileInfoList entries = dir.entryInfoList(filters,
+ QDir::AllDirs | QDir::Readable | QDir::Files | QDir::NoDotAndDotDot);
+ collected += collectFiles(entries, filters);
+ } else {
+ collected << inputFile;
+ }
+ }
+ return collected;
+}
+
+InputFileList collectCssFiles(const QStringList &inputFilePaths)
+{
+ QStringList filters;
+ filters << "*.css";
+
+ InputFileList inputFiles;
+ 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));
+ }
+ }
+ return inputFiles;
+}
+
+bool writeCssBinary(const QStringList &inputFiles, const QString &targetFile)
+{
+ if (inputFiles.isEmpty()) return false;
+ InputFileList cssFiles = collectCssFiles(inputFiles);
+ if (cssFiles.isEmpty()) return false;
+ qSort(cssFiles);
+
+ 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 << "...");
+ }
+ if (success) {
+ VERBOSELN("ok");
+ } else {
+ VERBOSELN("failed");
+ err << "Failed to parse: " << file.absoluteFilePath() << endl;
+ break;
+ }
+ }
+ 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())) {
+
+ // 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));
+
+ VERBOSE("Cssmap item ");
+ VERBOSE(k);
+ VERBOSE("- name: \"");
+ VERBOSE(name);
+ VERBOSELN("\"");
+
+ // 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("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;
+ }
+ }
+ return success;
+}
+
+int main(int argc, char **argv)
+{
+ QCoreApplication app(argc, argv);
+
+ if(argc < 3) {
+ printHelp();
+ } else {
+ QStringList inputFiles;
+ QString targetFile;
+ QStringList args(app.arguments());
+
+ for(int count(0) ; count < args.count(); count++) {
+ if (args[count].toLower() == "-i") {
+ QString filePath = args.value(count + 1);
+ if (!filePath.isEmpty()) {
+ inputFiles.append(QDir::fromNativeSeparators(filePath));
+ }
+ count++;
+ } else if (args[count].toLower() == "-o") {
+ targetFile = QDir::fromNativeSeparators(args.value(count+1));
+ count++;
+ } else if (args[count].toLower() == "-v") {
+ verboseOn = true;
+ }
+ }
+ if (targetFile.isEmpty()) {
+ err << "target filename needed" << endl << endl;
+ printHelp();
+ } else {
+ QString parentDir(QFileInfo(targetFile).absolutePath());
+ if (QDir::current().mkpath(parentDir)) {
+ writeCssBinary(inputFiles, targetFile);
+ } else {
+ err << "failed to create path: " << parentDir << endl;
+ }
+ }
+ }
+ return 0;
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbtools/hbthemeindexer/hbthemeindexer.pro Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,59 @@
+#############################################################################
+##
+## Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+## All rights reserved.
+## Contact: Nokia Corporation (developer.feedback@nokia.com)
+##
+## This file is part of the UI Extensions for Mobile.
+##
+## GNU Lesser General Public License Usage
+## This file may be used under the terms of the GNU Lesser General Public
+## License version 2.1 as published by the Free Software Foundation and
+## appearing in the file LICENSE.LGPL included in the packaging of this file.
+## Please review the following information to ensure the GNU Lesser General
+## Public License version 2.1 requirements will be met:
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Nokia gives you certain additional
+## rights. These rights are described in the Nokia Qt LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## If you have questions regarding the use of this file, please contact
+## Nokia at developer.feedback@nokia.com.
+##
+#############################################################################
+
+TEMPLATE = app
+TARGET = hbthemeindexer
+DEPENDPATH += .
+DEPENDPATH += $${HB_SOURCE_DIR}/src/hbcore/core
+DEPENDPATH += $${HB_SOURCE_DIR}/src/hbcore/image
+INCLUDEPATH += .
+INCLUDEPATH += $${HB_SOURCE_DIR}/src/hbcore/core
+INCLUDEPATH += $${HB_SOURCE_DIR}/src/hbcore/image
+INCLUDEPATH += $${HB_SOURCE_DIR}/src/hbcore/theme
+DEFINES += HB_BOOTSTRAPPED
+QT = core gui svg
+CONFIG += console
+CONFIG -= app_bundle
+
+# directories
+DESTDIR = $${HB_BUILD_DIR}/bin
+
+# dependencies
+HEADERS += $${HB_SOURCE_DIR}/src/hbcore/core/hbthemeindex_p.h
+SOURCES += $${HB_SOURCE_DIR}/src/hbcore/core/hbthemeindex.cpp
+
+HEADERS += $${HB_SOURCE_DIR}/src/hbcore/image/hbiconsource_p.h
+SOURCES += $${HB_SOURCE_DIR}/src/hbcore/image/hbiconsource.cpp
+
+# Input
+SOURCES += main.cpp
+
+# installation
+!local {
+ target.path = $${HB_BIN_DIR}
+ INSTALLS += target
+}
+
+include($${HB_SOURCE_DIR}/src/hbcommon.pri)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbtools/hbthemeindexer/main.cpp Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,506 @@
+/****************************************************************************
+**
+** 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 <hbiconsource_p.h>
+#include <hbthemeindex_p.h>
+#include <assert.h>
+#include <iostream>
+#include <QApplication>
+#include <QStringList>
+#include <QTextStream>
+#include <QFileInfo>
+#include <QLibrary>
+#include <QString>
+#include <QFile>
+#include <QMap>
+#include <QDir>
+
+#define RESOURCE_LIB_NAME "HbCore"
+#define WIN32_DEBUG_SUFFIX "d"
+#define MAC_DEBUG_SUFFIX "_debug"
+
+
+// Global variables
+static bool verboseOn = false;
+static quint32 version = 1; // Current theme index format version
+
+QList<HbThemeIndexItemData> IndexItems;
+QMap<quint32, QString> AddedItems;
+
+// Lists that hold icons to be automatically mirrored or icons that are locked
+QStringList MirroredList;
+QStringList LockedList;
+
+
+// ------
+
+
+void createMirroredList(const QString &fullThemePath)
+{
+ std::cout << "Parsing mirrored list for theme " << fullThemePath.toStdString() << "\n";
+ // Find mirrored.txt file
+ QString filename = fullThemePath + "/mirrored.txt";
+ // Try to read file
+ QFile file(filename);
+ if (file.open(QIODevice::ReadOnly)) {
+ QString line;
+
+ while(!file.atEnd()) {
+ QByteArray dirtyLine = file.readLine();
+ line = QString(dirtyLine).trimmed();
+ // Skip empty lines and comment lines
+ if (line.isEmpty() || line.at(0) == '#') {
+ continue;
+ }
+ MirroredList.append(line);
+ }
+ }
+}
+
+void createLockedList(const QString &fullThemePath)
+{
+ std::cout << "Parsing locked list for theme " << fullThemePath.toStdString() << "\n";
+ // Find locked.txt file
+ QString filename = fullThemePath + "/locked.txt";
+ // Try to read file
+ QFile file(filename);
+ if (file.open(QIODevice::ReadOnly)) {
+ QString line;
+
+ while(!file.atEnd()) {
+ QByteArray dirtyLine = file.readLine();
+ line = QString(dirtyLine).trimmed();
+ // Skip empty lines and comment lines
+ if (line.isEmpty() || line.at(0) == '#') {
+ continue;
+ }
+ LockedList.append(line);
+ }
+ }
+}
+
+QSize getDefaultSize(const QString &filename)
+{
+ HbIconSource source(filename);
+ return source.defaultSize().toSize();
+}
+
+void appendItem(HbThemeIndexItemData &itemData, const QString &itemName)
+{
+ bool alreadyExists = false;
+
+ if (AddedItems.contains(itemData.itemNameHash)) {
+ // If there already is item with same hash, it means either:
+ // - same icon is in both scalable and pixmap folder and then we won't append it again
+ // - hashing has failed, it generated same hash for 2 different strings -> TODO: do we care? We could e.g. save hash seed in index...
+ if (AddedItems.value(itemData.itemNameHash) == itemName) {
+ alreadyExists = true;
+ } else {
+ // Two different strings have same hash!!!
+ std::cout << "ERROR: Two different strings (" << AddedItems.value(itemData.itemNameHash).toStdString() << ", " << itemName.toStdString() << ") have same hash\n";
+ alreadyExists = true;
+ }
+ }
+
+ if (!alreadyExists) {
+ IndexItems.append(itemData);
+ AddedItems.insert(itemData.itemNameHash, itemName);
+ }
+
+ if (verboseOn) {
+ if (!alreadyExists) {
+ std::cout << "----------------------------------------------------------------\n";
+ std::cout << "Added item" << IndexItems.count() << "\n";
+ std::cout << "Item name: " << itemName.toStdString() << " hash: " << itemData.itemNameHash << "\n";
+ std::cout << "Item type: " << itemData.itemType << "\n";
+ if (itemData.itemType == HbThemeIndexItemData::SvgItem ||
+ itemData.itemType == HbThemeIndexItemData::PngItem ||
+ itemData.itemType == HbThemeIndexItemData::MngItem ||
+ itemData.itemType == HbThemeIndexItemData::GifItem ||
+ itemData.itemType == HbThemeIndexItemData::XpmItem ||
+ itemData.itemType == HbThemeIndexItemData::JpgItem ||
+ itemData.itemType == HbThemeIndexItemData::NvgItem ||
+ itemData.itemType == HbThemeIndexItemData::SvgzItem ||
+ itemData.itemType == HbThemeIndexItemData::QpicItem) {
+
+ std::cout << "Default size: width: " << itemData.defaultWidth << " height: " << itemData.defaultHeight << "\n";
+
+ if (itemData.mirroredItemType != HbThemeIndexItemData::NotDefined) {
+ std::cout << "Mirrored default size: width:" << itemData.mirroredWidth << " height: " << itemData.mirroredHeight << "\n";
+ }
+
+ if (itemData.flags & HbThemeIndexItemData::Mirrorable) {
+ std::cout << "Icon is automatically mirrored\n";
+ }
+ }
+ if (itemData.flags & HbThemeIndexItemData::Locked) {
+ std::cout << "Item is locked\n";
+ }
+ std::cout << "----------------------------------------------------------------\n\n";
+ } else { // Item already added in index with some other extension, do not add duplicates
+ std::cout << "----------------------------------------------------------------\n";
+ std::cout << "WARNING! Skipped already existing item:" << itemName.toStdString() << "\n";
+ }
+ }
+}
+
+HbThemeIndexItemData::Type getItemType(const QString &itemName)
+{
+ if (itemName.endsWith(".svg")) {
+ return HbThemeIndexItemData::SvgItem;
+ } else if (itemName.endsWith(".png")) {
+ return HbThemeIndexItemData::PngItem;
+ } else if (itemName.endsWith(".mng")) {
+ return HbThemeIndexItemData::MngItem;
+ } else if (itemName.endsWith(".gif")) {
+ return HbThemeIndexItemData::GifItem;
+ } else if (itemName.endsWith(".xpm")) {
+ return HbThemeIndexItemData::XpmItem;
+ } else if (itemName.endsWith(".jpg")) {
+ return HbThemeIndexItemData::JpgItem;
+ } else if (itemName.endsWith(".nvg")) {
+ return HbThemeIndexItemData::NvgItem;
+ } else if (itemName.endsWith(".svgz")) {
+ return HbThemeIndexItemData::SvgzItem;
+ } else if (itemName.endsWith(".qpic")) {
+ return HbThemeIndexItemData::QpicItem;
+ } else if (itemName.endsWith(".fxml")) {
+ return HbThemeIndexItemData::FxmlItem;
+ } else if (itemName.endsWith(".axml")) {
+ return HbThemeIndexItemData::AxmlItem;
+ }
+
+ return HbThemeIndexItemData::NotDefined;
+}
+
+void processFile(const QFileInfo &info) //, const QString &themename)
+{
+ QString fullFilename = info.absoluteFilePath();
+ QString filename = info.fileName();
+
+ HbThemeIndexItemData itemData;
+
+ // First get correct item type
+ itemData.itemType = getItemType(filename);
+
+ switch (itemData.itemType) {
+ case HbThemeIndexItemData::SvgItem: // fallback all icon types
+ case HbThemeIndexItemData::PngItem:
+ case HbThemeIndexItemData::MngItem:
+ case HbThemeIndexItemData::GifItem:
+ case HbThemeIndexItemData::XpmItem:
+ case HbThemeIndexItemData::JpgItem:
+ case HbThemeIndexItemData::NvgItem:
+ case HbThemeIndexItemData::SvgzItem:
+ case HbThemeIndexItemData::QpicItem:
+ {
+ // Define fileName (remove file extension)
+ QString iconname;
+ // If we come here, the filename must end with .* (e.g. .svg)
+ iconname = filename.left(filename.lastIndexOf('.'));
+
+ itemData.itemNameHash = HbThemeIndex::hash(iconname);
+
+ // Define default size
+ QSize defaultSize = getDefaultSize(fullFilename);
+ itemData.defaultWidth = static_cast<quint32>(defaultSize.width());
+ itemData.defaultHeight = static_cast<quint32>(defaultSize.height());
+
+ QString mirroredFilepath = fullFilename;
+
+ // Define mirrored filename if there is a separate mirrored version of the
+ // icon in 'mirrored' folder and in that case get also its default size
+
+ int index1 = mirroredFilepath.lastIndexOf('/');
+ int index2 = mirroredFilepath.lastIndexOf('\\');
+
+ int index = index1 < index2 ? index2 : index1;
+
+ if (index>0) {
+ mirroredFilepath = mirroredFilepath.left(index);
+ mirroredFilepath.append(QString("/mirrored/"));
+
+ QStringList extList;
+ extList << ".svg" << ".png" << ".mng" << ".gif" << ".xpm" << ".jpg" << ".nvg" << ".svgz" << ".qpic";
+
+ foreach(QString ext, extList) {
+ QString mirroredFilenameCandidate = mirroredFilepath + iconname + ext;
+
+ if (QFile::exists(mirroredFilenameCandidate)) {
+ itemData.mirroredItemType = getItemType(mirroredFilenameCandidate);
+ // Define mirrored icon size
+ QSize mirroredSize = getDefaultSize(mirroredFilenameCandidate);
+ itemData.mirroredWidth = static_cast<quint32>(mirroredSize.width());
+ itemData.mirroredHeight = static_cast<quint32>(mirroredSize.height());
+ break;
+ }
+ }
+ }
+
+ if (MirroredList.contains(iconname)) {
+ itemData.flags |= HbThemeIndexItemData::Mirrorable;
+ // Remove all found items from the list so that in the end we can handle with missing items.
+ MirroredList.removeOne(iconname);
+ }
+
+ if (LockedList.contains(iconname)) {
+ itemData.flags |= HbThemeIndexItemData::Locked;
+ // Remove all found items from the list so that in the end we can handle with missing items.
+ LockedList.removeOne(iconname);
+ }
+ appendItem(itemData, iconname);
+ break;
+ }
+
+ case HbThemeIndexItemData::AxmlItem: // fallback, these are handled same way
+ case HbThemeIndexItemData::FxmlItem:
+ {
+ // Define fileName (file extension not removed)
+ itemData.itemNameHash = HbThemeIndex::hash(filename);
+
+ if (LockedList.contains(filename)) {
+ itemData.flags |= HbThemeIndexItemData::Locked;
+ // Remove all found items from the list so that in the end we can handle with missing items.
+ LockedList.removeOne(filename);
+ }
+ appendItem(itemData, filename);
+ break;
+ }
+
+ default:
+ {
+ // Don't append unknown items to the index.
+ break;
+ }
+ } // end switch
+}
+
+bool themeIndexItemDataLessThan(const HbThemeIndexItemData &d1, const HbThemeIndexItemData &d2)
+{
+ return d1.itemNameHash < d2.itemNameHash;
+}
+
+void processDir(const QDir &dir, const QString &themename, const QString targetName, bool subDir = false)
+{
+ if (!subDir) {
+ IndexItems.clear();
+ AddedItems.clear();
+ MirroredList.clear();
+ LockedList.clear();
+ createMirroredList(dir.absolutePath()+"/icons/"+themename);
+ createLockedList(dir.absolutePath()+"/icons/"+themename);
+ }
+
+ QFileInfoList entries = dir.entryInfoList(QDir::AllEntries | QDir::NoDotAndDotDot);
+ for (int i=0; i<entries.count(); i++) {
+ QFileInfo info = entries.at(i);
+ QString file = info.absoluteFilePath();
+ if (info.isDir()) {
+ // Process subdirs recursively
+ QDir subDir(file);
+ processDir(subDir, themename, targetName, true);
+ }
+ // Process file
+ if (file.contains("/" + themename + "/", Qt::CaseInsensitive)) {
+ processFile(info);
+ }
+ }
+
+ if (!subDir) {
+ // There might still be items in mirrored list (e.g. frames are not actual items, but they are still mirrored)
+ // So just create empty items for the rest of mirrored items in list
+ foreach (QString mirrored, MirroredList) {
+ HbThemeIndexItemData itemData;
+ itemData.itemNameHash = HbThemeIndex::hash(mirrored);
+ itemData.flags |= HbThemeIndexItemData::Mirrorable;
+ appendItem(itemData, mirrored);
+ }
+ QDir targetDir(targetName);
+ if (!targetDir.exists()) {
+ targetDir.mkpath(targetName);
+ }
+ QString filename = targetName + themename + ".themeindex";
+
+ QFile::remove(filename);
+ QFile indexFile(filename);
+ if (!indexFile.open(QIODevice::ReadWrite)) {
+ std::cout << "ERROR: could not open index file!\n";
+ return;
+ }
+
+ // Write the header in the beginning of the file
+ HbThemeIndexHeaderV1 header;
+ header.version = version;
+ header.itemCount = IndexItems.count();
+
+ if (verboseOn) {
+ std::cout << "============================TOTALS==============================\n";
+ std::cout << "Added " << header.itemCount << " items.\n";
+ std::cout << "================================================================\n";
+ }
+
+ // Sort the list
+ qStableSort(IndexItems.begin(), IndexItems.end(), themeIndexItemDataLessThan);
+
+ // Write header info into the file stream
+ qint64 ret = indexFile.write(reinterpret_cast<const char *>(&header), sizeof(HbThemeIndexHeaderV1));
+ assert(ret == sizeof(HbThemeIndexHeaderV1));
+
+ // Write items into the file stream
+ foreach(const HbThemeIndexItemData &itemData, IndexItems) {
+ ret = indexFile.write(reinterpret_cast<const char *>(&itemData), sizeof(HbThemeIndexItemData));
+ assert(ret == sizeof(HbThemeIndexItemData));
+ }
+
+ indexFile.close();
+ }
+}
+
+void showHelp() {
+ std::cout << "Themeindexer.exe usage:\n\n";
+ std::cout << "hbthemeindexer [-v] -f filename OR -n themename -s themes source directory -t theme index file target directory\n\n";
+
+ std::cout << "-n \t\ttheme to be indexed (\"<themename>.themeindex\").\n";
+ std::cout << "-s \t\tthemes source directory is scanned recursively and all the";
+ std::cout << "\t\t\trecognized resource files for given theme are aded in the theme index.\n";
+ std::cout << "-t \t\ttarget directory for the index file.\n";
+
+ std::cout << "-f <filename>\tfile which contains multiple themes to be indexed. Each in its own row.\n";
+ std::cout << "-v \t\tverbose output\n\n";
+
+ std::cout << "Example 1:\n";
+ std::cout << "Themeindexer.exe -n mytheme -s c:/mythemes -t c:/mythemes\n";
+ std::cout << "Example 2:\n";
+ std::cout << "Themeindexer.exe -f c:/mythemes/themes.txt\n\n";
+}
+
+void loadHbResource()
+{
+ bool loadSuccess;
+ // To load resources embedded in hb library
+ QString resourceLibName(RESOURCE_LIB_NAME);
+ QLibrary hbLib(resourceLibName);
+ loadSuccess = hbLib.load();
+
+ if ( !loadSuccess ) {
+ // Library may not be loaded, if it was built in debug mode and the name in debug mode is
+ // different, change the name to debug version in that scenario
+#ifdef Q_OS_WIN32
+ resourceLibName += WIN32_DEBUG_SUFFIX;
+#elif defined(Q_OS_MAC)
+ resourceLibName += MAC_DEBUG_SUFFIX;
+#endif
+ // On symbian library name in debug mode is same as that in release mode,
+ // so no need to do anything for that
+ hbLib.setFileName(resourceLibName);
+ loadSuccess = hbLib.load();
+ }
+}
+
+int main(int argc, char *argv[])
+{
+ QApplication app(argc, argv, false); // GUIenabled=false
+
+ if (argc <= 2) {
+ showHelp();
+ } else {
+ // Load HbCore resource to be able to index hbdefault theme
+ loadHbResource();
+
+ QString filename;
+ QString themename;
+ QDir basedir;
+ QString targetname;
+ QStringList args(app.arguments());
+
+ for (int n = 0; n < args.count(); n++) {
+ if (args[n].toLower() == "-n") {
+ themename = args[n+1];
+ n++;
+ } else if (args[n].toLower() == "-s") {
+ basedir = QDir(args[n+1]);
+ n++;
+ } else if (args[n].toLower() == "-t") {
+ targetname = args[n+1];
+ n++;
+ } else if (args[n].toLower() == "-v") {
+ verboseOn = true;
+ } else if (args[n].toLower() == "-f") {
+ filename = args[n+1];
+ }
+ }
+
+ if (filename.length() > 0) {
+ if (!QFile::exists(filename)) {
+ std::cout << "Error: file " << filename.toStdString() << " does not exist.\n";
+ } else {
+ // Open file and parse lines. Each line should have three value separated with:
+ QFile themesToBeIndexed(filename);
+ if (themesToBeIndexed.open(QIODevice::ReadOnly | QIODevice::Text)) {
+ QTextStream in(&themesToBeIndexed);
+
+ while(!in.atEnd()) {
+ QString line = in.readLine();
+
+ QStringList values = line.split(' ');
+ if (values.count() == 3) {
+ themename = values[0];
+ basedir = values[1];
+ targetname = values[2];
+
+ targetname.replace('\\', '/');
+ // Check that targetname has / at the end
+ if (!targetname.endsWith('/')) {
+ targetname.append('/');
+ }
+ processDir(basedir, themename, targetname);
+ }
+ }
+
+ themesToBeIndexed.close();
+
+ // Loop through themes string list and call processDir
+ } else {
+ std::cout << "Error: file " << filename.toStdString() << " could not be opened.\n";
+ }
+ }
+ } else {
+ // Index only given theme
+
+ targetname.replace('\\', '/');
+ // Check that targetname has / at the end
+ if (!targetname.endsWith('/')) {
+ targetname.append('/');
+ }
+
+ processDir(basedir, themename, targetname);
+
+ }
+ }
+
+ IndexItems.clear();
+ return 0;
+}
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbtools/hbtools.pro Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,33 @@
+#
+#############################################################################
+##
+## Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+## All rights reserved.
+## Contact: Nokia Corporation (developer.feedback@nokia.com)
+##
+## This file is part of the UI Extensions for Mobile.
+##
+## GNU Lesser General Public License Usage
+## This file may be used under the terms of the GNU Lesser General Public
+## License version 2.1 as published by the Free Software Foundation and
+## appearing in the file LICENSE.LGPL included in the packaging of this file.
+## Please review the following information to ensure the GNU Lesser General
+## Public License version 2.1 requirements will be met:
+## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Nokia gives you certain additional
+## rights. These rights are described in the Nokia Qt LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## If you have questions regarding the use of this file, please contact
+## Nokia at developer.feedback@nokia.com.
+##
+#############################################################################
+#
+
+TEMPLATE = subdirs
+
+SUBDIRS += hbthemeindexer hbbincssmaker
+
+include($${HB_SOURCE_DIR}/src/hbcommon.pri)
+
--- a/src/hbutils/document/hbdocumentloader_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbutils/document/hbdocumentloader_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -281,14 +281,14 @@
QString HbDocumentLoaderPluginManager::pluginFileNameFilter() const
{
-#if defined(Q_OS_LINUX)
- return QString("*.so");
-#elif defined(Q_OS_MAC)
+#if defined(Q_OS_MAC)
return QString("*.dylib");
#elif defined(Q_OS_WIN32)
return QString("*plugin.dll");
+#elif defined(Q_OS_SYMBIAN)
+ return QString("*.qtplugin");
#else
- return QString("*.qtplugin");
+ return QString("*.so");
#endif
}
@@ -337,7 +337,7 @@
foreach( QPluginLoader *loader, mPlugins ) {
const QFileInfo fileInfo( loader->fileName() );
QString compareName;
-#ifdef Q_OS_LINUX
+#if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN)
compareName.append( "lib" );
#endif
compareName.append( plugin );
@@ -349,7 +349,7 @@
// not found -> try to find it.
const QStringList pathList = pluginPathList();
QString fileNameFilter;
-#ifdef Q_OS_LINUX
+#if defined(Q_OS_UNIX) && !defined(Q_OS_SYMBIAN)
fileNameFilter.append( "lib" );
#endif
fileNameFilter.append( plugin );
--- a/src/hbutils/document/hbdocumentloaderactions_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbutils/document/hbdocumentloaderactions_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -32,6 +32,7 @@
#include <QMetaObject>
#include <QMetaEnum>
+#include <QDebug>
#include <hbanchorlayout.h>
#include <hbstackedlayout.h>
@@ -283,7 +284,10 @@
QVariant value;
bool ok = variableToQVariant(variable, value);
if (ok) {
- current->setProperty( propertyName, value );
+ bool isQProperty = current->setProperty( propertyName, value );
+ if ( !isQProperty ) {
+ qWarning() << "DOCML warning: Dynamic property" << propertyName << "set. Property may have been removed from" << current->metaObject()->className();
+ }
}
return ok;
}
--- a/src/hbutils/document/hbdocumentloaderfactory_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbutils/document/hbdocumentloaderfactory_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -64,7 +64,7 @@
#include <hbprogressslider.h>
#include <hbinputdialog.h>
#include <hbcolordialog.h>
-#include <hblistdialog.h>
+#include <hbselectiondialog.h>
#include <hbcombobox.h>
#include <hbgroupbox.h>
#include <hbtreeview.h>
@@ -223,8 +223,8 @@
CHECK_OBJECT_0(HbTextEdit)
CHECK_OBJECT_0(HbCheckBox)
CHECK_OBJECT_0(HbProgressSlider)
- CHECK_OBJECT_0(HbListDialog)
CHECK_OBJECT_0(HbColorDialog)
+ CHECK_OBJECT_0(HbSelectionDialog)
CHECK_OBJECT_0(HbRatingSlider)
CHECK_OBJECT_0(HbInputDialog)
CHECK_OBJECT_0(HbMessageBox)
--- a/src/hbutils/hbutils.pro Mon May 03 12:48:33 2010 +0300
+++ b/src/hbutils/hbutils.pro Fri May 14 16:09:54 2010 +0300
@@ -72,6 +72,8 @@
#QMAKE_DISTCLEAN += $$hbNativePath($${HB_BUILD_DIR}/include/hbutils/private/*)
symbian {
+ defFilePath = defs
+
TARGET.EPOCALLOWDLLDATA = 1
TARGET.CAPABILITY = CAP_GENERAL_DLL
TARGET.UID3=0x20022F34
--- a/src/hbwidgets/dataform/hbdataform.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/dataform/hbdataform.cpp Fri May 14 16:09:54 2010 +0300
@@ -36,9 +36,6 @@
#include "hbdataformmodelitem_p.h"
#include "hbtreemodeliterator_p.h"
-// For QMAP_INT__ITEM_STATE_DEPRECATED's sake. Removed when QMap<int,QVariant> based state item system is removed
-#include <hbabstractviewitem_p.h>
-
#include <QGraphicsSceneMouseEvent>
#include <QCoreApplication>
@@ -207,133 +204,6 @@
HbAbstractItemView::scrollTo(index, hint);
}
-/*!
- \deprecated HbDataForm::indexCount() const
- is deprecated. Use \a HbModelIterator::indexCount() const
-
- \reimp
- Returns the number of children visible in the hierarchy. Children of collapsed parents are
- not taken into account.
-*/
-int HbDataForm::indexCount() const
-{
- qWarning("HbDataForm::indexCount() is deprecated! Use HbModelIterator::indexCount() const.");
-
- Q_D(const HbDataForm);
- int bufferSize = 0;
- if (model()) {
- QModelIndex root = rootIndex();
- int rowCount = d->treeModelIterator()->childCount(root);
- for (int row = 0; row < rowCount; ++row) {
- bufferSize += d->childCount(d->treeModelIterator()->child(row, root));
- }
- bufferSize += rowCount;
- }
- return bufferSize;
-}
-
-/*!
- \deprecated HbDataForm::nextIndex(const QModelIndex&) const
- is deprecated. Use \a HbModelIterator::nextIndex(const QModelIndex&) const
-
- \reimp
-
- Next index for valid index is determined in following way:
-
- - 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
-*/
-QModelIndex HbDataForm::nextIndex(const QModelIndex &index) const
-{
- qWarning("HbDataForm::nextIndex(const QModelIndex&) const is deprecated! Use HbModelIterator::nextIndex(const QModelIndex&).");
-
- Q_D(const HbDataForm);
- if (index.isValid() && index.column() == 0) {
- QModelIndex result;
- if (isExpanded(index)) {
- result = index.child(0, 0);
- }
-
- if (!result.isValid()) {
- result = index.sibling(index.row() + 1, 0);
- }
-
- if (!result.isValid()) {
- QModelIndex parentIndex(index.parent());
- while (!result.isValid()) {
- if (parentIndex == rootIndex()) {
- break;
- }
- result = parentIndex.sibling(parentIndex.row() + 1, 0);
- parentIndex = parentIndex.parent();
- }
- }
- return result;
- } else {
- return d->treeModelIterator()->child(0, rootIndex());
- }
-}
-
-
-/*!
- \deprecated HbDataForm::previousIndex(const QModelIndex&) const
- is deprecated. Use \a HbTreeModelIterator::previousIndex(const QModelIndex&) const
-
- \reimp
-
- Previous index for valid index is determined in following way:
-
- - If index has previous sibling last child from it is returned
- - Otherwise previous sibling is returned
- - Otherwise parent index is returned
- - Otherwise QModelIndex is returned
-*/
-QModelIndex HbDataForm::previousIndex(const QModelIndex &index) const
-{
- qWarning("HbDataForm::previousIndex(const QModelIndex&) const is deprecated! Use HbModelIterator::previousIndex(const QModelIndex&) const.");
-
- Q_D(const HbDataForm);
- if (index.isValid() && index.column() == 0) {
- QModelIndex result(index.sibling(index.row() - 1, 0));
- if (result.isValid()) {
- bool checkChild = true;
- while (checkChild) {
- if (isExpanded(result)) {
- result = result.child(model()->rowCount(result) - 1, 0);
- } else {
- checkChild = false;
- }
- }
- }
- if (!result.isValid()) {
- result = index.parent();
- if (result == rootIndex()) {
- result = QModelIndex();
- }
- }
- return result;
- } else {
- QModelIndex result(
- d->treeModelIterator()->child(
- d->treeModelIterator()->childCount(rootIndex())-1,
- rootIndex()));
- QModelIndex childIndex;
- bool checkChild = true;
- while (checkChild) {
- if (!isExpanded(result)) {
- checkChild = false;
- } else {
- childIndex = d->treeModelIterator()->child(d->treeModelIterator()->childCount(result) - 1, result);
- if (childIndex.isValid()) {
- result = childIndex;
- }
- }
- }
- return result;
- }
-}
/*!
@beta
@@ -357,9 +227,6 @@
item->setExpanded(expanded);
}
-#ifndef QMAP_INT__ITEM_STATE_DEPRECATED
- d->mContainer->setItemStateValue(index, HbDataFormViewItem::ExpansionKey, expanded);
-#endif
d->mContainer->setItemTransientStateValue(index, "expanded", expanded);
d->mContainer->setModelIndexes();
}
@@ -415,7 +282,7 @@
if(d->mHeadingWidget->mPageCombo || !d->mHeadingWidget->mDescription.isEmpty() ||
!d->mHeadingWidget->mHeading.isEmpty()) {
- static_cast<HbDataItemContainer*>(container())->setFormHeading(d->mHeadingWidget);
+ static_cast<HbDataItemContainer*>(d->mContainer)->setFormHeading(d->mHeadingWidget);
}
d->mHeadingWidget->callPolish();
}
@@ -469,7 +336,7 @@
if(d->mHeadingWidget->mPageCombo || !d->mHeadingWidget->mDescription.isEmpty() ||
!d->mHeadingWidget->mHeading.isEmpty()) {
- static_cast<HbDataItemContainer*>(container())->setFormHeading(d->mHeadingWidget);
+ static_cast<HbDataItemContainer*>(d->mContainer)->setFormHeading(d->mHeadingWidget);
}
d->mHeadingWidget->callPolish();
}
@@ -517,27 +384,6 @@
}
/*!
-
- \deprecated HbDataForm::dataFormViewItem(const QModelIndex&) const
- is deprecated. Please use HbAbstractItemView::itemByIndex instead.
-
- Returns HbDataFormViewItem for the correspoding \a index passed. Returns
- NULL is index passed is invalid. If \a index passed is not visible then NULL is returned.
- Ideally user should call this API when activate is called for \a index.
-
-*/
-HbDataFormViewItem* HbDataForm::dataFormViewItem(const QModelIndex &index) const
-{
- Q_D(const HbDataForm);
- if(index.isValid()) {
- return static_cast<HbDataFormViewItem*>(d->mContainer->itemByIndex(index));
- } else {
- return 0;
- }
-}
-
-
-/*!
\reimp
If \a model passed is NULL then all values of data form are reset. Calls the
@@ -562,44 +408,7 @@
HbAbstractItemView::setModel(model, prototype);
}
-/*!
- \deprecated HbDataForm::loadSettings()
- is deprecated. Please use HbDataFormViewItem::restore API instead..
-
- Updates the values on each HbDataItem's stored in central repository.
- This function will be invoked when DataForm is shown .
- \sa storeSettings
-*/
-void HbDataForm::loadSettings()
-{
- //Q_D(HbDataForm);
-
- /*QList<HbAbstractViewItem *> items = d->mContainer->items();
- foreach(HbAbstractViewItem* item, items) {
- static_cast<HbDataFormViewItem*>(item)->load();
- }*/
-}
-
-/*!
- \deprecated HbDataForm::storeSettings()
- is deprecated. Please use HbDataFormViewItem::save instead.
-
- Stores the values of each HbDataItem's in to the repository. This function invoked
- when DataForm is exited.
-
- \sa loadSettings
-*/
-void HbDataForm::storeSettings()
-{
- Q_D(HbDataForm);
-
- QList<HbAbstractViewItem *> items = d->mContainer->items();
- foreach(HbAbstractViewItem* item, items) {
- static_cast<HbDataFormViewItem*>(item)->store();
- }
-
-}
/*!
\reimp
*/
@@ -609,22 +418,21 @@
Q_UNUSED(bottomRight);
if(topLeft.isValid()) {
- HbDataFormViewItem* item = static_cast<HbDataFormViewItem*>(dataFormViewItem(topLeft));
+ HbDataFormViewItem* item = static_cast<HbDataFormViewItem*>(itemByIndex(topLeft));
HbDataFormModelItem *modelItem =
static_cast<HbDataFormModel *>(model())->itemFromIndex(topLeft);
HbDataFormModelItemPrivate *modelItem_priv = HbDataFormModelItemPrivate::d_ptr(modelItem);
if(item){
+ HbDataFormViewItemPrivate::d_ptr(item)->setEnabled( modelItem->isEnabled() );
if( modelItem_priv->dirtyProperty() == "LabelRole" ||
modelItem_priv->dirtyProperty() == "DecorationRole" ||
modelItem_priv->dirtyProperty() == "DescriptionRole" ) {
- HbDataFormViewItemPrivate::d_ptr(item)->updateData();
- return;
+ HbDataFormViewItemPrivate::d_ptr(item)->updateData();
+ return;
}
-
- item->load();
- HbDataFormViewItemPrivate::d_ptr(item)->setEnabled( modelItem->isEnabled() );
+ item->restore();
}
}
}
@@ -645,21 +453,7 @@
*/
void HbDataForm::rowsInserted(const QModelIndex &parent, int start, int end)
{
- Q_D(HbDataForm);
HbAbstractItemView::rowsInserted(parent, start, end);
- HbDataFormModelItem::DataItemType itemType = static_cast<HbDataFormModelItem::DataItemType>(
- parent.data(HbDataFormModelItem::ItemTypeRole).toInt());
- if(itemType == HbDataFormModelItem::GroupItem ||
- itemType == HbDataFormModelItem::GroupPageItem ||
- itemType == HbDataFormModelItem::FormPageItem ) {
- HbDataGroup *item = static_cast<HbDataGroup*>(itemByIndex(parent));
- if((item && item->isExpanded()) || parent == d->mModelIterator->rootIndex()) {
- container()->setModelIndexes(parent);
- }
-
- }else {
- container()->setModelIndexes();
- }
}
/*!
--- a/src/hbwidgets/dataform/hbdataform.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/dataform/hbdataform.h Fri May 14 16:09:54 2010 +0300
@@ -52,10 +52,6 @@
virtual void scrollTo(const QModelIndex &index, ScrollHint hint = EnsureVisible);
- virtual int indexCount() const;
- virtual QModelIndex nextIndex(const QModelIndex &index) const;
- virtual QModelIndex previousIndex(const QModelIndex &index) const;
-
void setExpanded(const QModelIndex &index, bool expanded);
bool isExpanded(const QModelIndex &index) const;
@@ -67,8 +63,6 @@
QGraphicsItem* primitive(HbStyle::Primitive primitive) const;
- HbDataFormViewItem* dataFormViewItem(const QModelIndex &index) const;
-
virtual void setModel(QAbstractItemModel *model, HbAbstractViewItem *prototype = 0);
void addConnection(HbDataFormModelItem *item, const char* signal,
@@ -78,10 +72,6 @@
void removeAllConnection();
void removeAllConnection(HbDataFormModelItem *item);
-public slots:
- void loadSettings();
- void storeSettings();
-
signals:
void itemShown(const QModelIndex &index);
--- a/src/hbwidgets/dataform/hbdataform_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/dataform/hbdataform_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -74,7 +74,7 @@
protos.append(new HbDataGroup());
q->setItemPrototypes(protos);
q->setClampingStyle(HbScrollArea::BounceBackClamping);
- q->setItemRecycling(true);
+ q->setItemRecycling(false);
treeModelIterator()->setItemContainer(mContainer);
}
@@ -120,7 +120,7 @@
// Create combobox if not created
if(!mHeadingWidget) {
mHeadingWidget = new HbDataFormHeadingWidget();
- static_cast<HbDataItemContainer*>(q->container())->setFormHeading(mHeadingWidget);
+ static_cast<HbDataItemContainer*>(mContainer)->setFormHeading(mHeadingWidget);
QEvent polishEvent(QEvent::Polish);
QCoreApplication::sendEvent(mHeadingWidget, &polishEvent);
}
@@ -134,7 +134,7 @@
// setFormHeading to the layout
if(mHeadingWidget->mPageCombo || !mHeadingWidget->mDescription.isEmpty() ||
!mHeadingWidget->mHeading.isEmpty()) {
- static_cast<HbDataItemContainer*>(q->container())->setFormHeading(mHeadingWidget);
+ static_cast<HbDataItemContainer*>(mContainer)->setFormHeading(mHeadingWidget);
}
QObject::connect(mHeadingWidget->mPageCombo,SIGNAL(currentIndexChanged(int)),
q,SLOT(_q_page_changed(int)));
@@ -205,7 +205,7 @@
if(modelItem){
QList<ItemSignal> signalList = mConnectionList.values(modelItem);
if(signalList.count() > 0){
- HbDataFormViewItem *viewItem = q->dataFormViewItem(index);
+ HbDataFormViewItem *viewItem = static_cast<HbDataFormViewItem*>(q->itemByIndex(index));
if(viewItem){
HbWidget *contentWidget = viewItem->dataItemContentWidget();
if(contentWidget){
@@ -239,8 +239,8 @@
mConnectionList.remove(modelItem);
if(signalList.count() > 0){
QModelIndex index =
- static_cast<HbDataFormModel*>(modelItem->model())->indexFromItem(modelItem);
- HbDataFormViewItem *viewItem = q->dataFormViewItem(index);
+ static_cast<HbDataFormModel*>(q->model())->indexFromItem(modelItem);
+ HbDataFormViewItem *viewItem = static_cast<HbDataFormViewItem*>(q->itemByIndex(index));
if(viewItem){
HbWidget *contentWidget = viewItem->dataItemContentWidget();
if(contentWidget){
@@ -272,12 +272,12 @@
QObject *reciever,
QString slot)
{
- Q_Q( HbDataForm);
- QModelIndex index = static_cast<HbDataFormModel*>(modelItem->model())->indexFromItem(modelItem);
- Q_UNUSED(index);
+ Q_Q( HbDataForm);
+
if(q->model()) {
+ QModelIndex index = static_cast<HbDataFormModel*>(q->model())->indexFromItem(modelItem);
if(modelItem){
- HbDataFormViewItem *viewItem = q->dataFormViewItem(index);
+ HbDataFormViewItem *viewItem =static_cast<HbDataFormViewItem*>( q->itemByIndex(index) );
if(viewItem){
HbWidget *contentWidget = viewItem->dataItemContentWidget();
// Make connection
@@ -300,8 +300,8 @@
QList<ItemSignal> signalList = mConnectionList.values(item);
mConnectionList.remove(item);
if(signalList.count() > 0){
- QModelIndex index = static_cast<HbDataFormModel*>(item->model())->indexFromItem(item);
- HbDataFormViewItem *viewItem = q->dataFormViewItem(index);
+ QModelIndex index = static_cast<HbDataFormModel*>(q->model())->indexFromItem(item);
+ HbDataFormViewItem *viewItem = static_cast<HbDataFormViewItem*> (q->itemByIndex(index));
if(viewItem){
HbWidget *contentWidget = viewItem->dataItemContentWidget();
// disconnect signal and remove signal from list
@@ -327,8 +327,8 @@
QList<ItemSignal> signalList = mConnectionList.values(modelItem);
mConnectionList.remove(modelItem);
if(signalList.count() > 0){
- QModelIndex index = static_cast<HbDataFormModel*>(modelItem->model())->indexFromItem(modelItem);
- HbDataFormViewItem *viewItem = q->dataFormViewItem(index);
+ QModelIndex index = static_cast<HbDataFormModel*>(q->model())->indexFromItem(modelItem);
+ HbDataFormViewItem *viewItem =static_cast<HbDataFormViewItem*>( q->itemByIndex(index));
if(viewItem){
HbWidget *contentWidget = viewItem->dataItemContentWidget();
// disconnect signal and remove signal from list
--- a/src/hbwidgets/dataform/hbdataformheadingwidget_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/dataform/hbdataformheadingwidget_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -26,7 +26,7 @@
#include "hbdataformheadingwidget_p.h"
#include <hbcombobox.h>
-#include <hbstyleoptiondataform.h>
+#include <hbstyleoptiondataform_p.h>
#include <QGraphicsItem>
--- a/src/hbwidgets/dataform/hbdataformmodel.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/dataform/hbdataformmodel.cpp Fri May 14 16:09:54 2010 +0300
@@ -27,6 +27,7 @@
#include <hbdataformmodel.h>
#include "hbdataformmodel_p.h"
+#include "hbdataformmodelitem_p.h"
/*
\internal
@@ -138,7 +139,7 @@
{
Q_D(HbDataFormModel);
d->q_ptr = this;
- d->mRoot->setModel(this);
+ HbDataFormModelItemPrivate::d_ptr(d->mRoot)->setModel(this);
}
HbDataFormModel::~HbDataFormModel()
@@ -369,27 +370,6 @@
/*!
- \deprecated HbDataFormModel::insertRows(int, int, const QModelIndex&)
- is deprecated. Please use other insert and additem API's in HbDataFormModel instead.
-*/
-bool HbDataFormModel::insertRows(int row, int count, const QModelIndex &index)
-{
- Q_D(HbDataFormModel);
- HbDataFormModelItem *item = index.isValid() ? itemFromIndex(index) : d->mRoot;
- if (item == 0) {
- return false;
- }
-
- QList<HbDataFormModelItem*> items;
- for(int i =0 ; i < count ; i ++) {
- items.append(new HbDataFormModelItem());
- }
- item->insertChildren(row,count,items);
- return true;
-}
-
-
-/*!
@beta
Removes and deletes the model item from the model at the given \a index. The visualization
@@ -419,7 +399,7 @@
return false;
}
HbDataFormModelItem* parent = const_cast<HbDataFormModelItem*>(item->parent());
- if ( item->model() != this ) {
+ if ( HbDataFormModelItemPrivate::d_ptr(item)->model() != this ) {
return false;
}
@@ -591,7 +571,8 @@
Q_D(HbDataFormModel);
removeItem(invisibleRootItem());
d->mRoot = new HbDataFormModelItem();
- d->mRoot->setModel(this);
+ HbDataFormModelItemPrivate::d_ptr(d->mRoot)->setModel(this);
+
reset();
}
--- a/src/hbwidgets/dataform/hbdataformmodel.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/dataform/hbdataformmodel.h Fri May 14 16:09:54 2010 +0300
@@ -73,7 +73,6 @@
HbDataFormModelItem* invisibleRootItem() const;
void clear();
- virtual bool insertRows(int row, int count, const QModelIndex &index = QModelIndex());
virtual bool removeRows(int row, int count, const QModelIndex &index);
virtual QModelIndex parent(const QModelIndex &index) const;
--- a/src/hbwidgets/dataform/hbdataformmodelitem.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/dataform/hbdataformmodelitem.cpp Fri May 14 16:09:54 2010 +0300
@@ -49,6 +49,26 @@
{
return mDirtyProperty;
}
+
+
+void HbDataFormModelItemPrivate::setModel(const QAbstractItemModel *model)
+{
+ Q_Q(HbDataFormModelItem);
+
+ mModel = const_cast<QAbstractItemModel*>(model);
+ int count = q->childCount();
+ for (int index = 0; index < count ; index++) {
+ HbDataFormModelItem* item = mChildItems.at(index);
+ HbDataFormModelItemPrivate::d_ptr(item)->setModel(model);
+ }
+
+}
+
+QAbstractItemModel* HbDataFormModelItemPrivate::model() const
+{
+ return mModel;
+}
+
/*!
@beta
@hbwidgets
@@ -89,15 +109,6 @@
*/
/*!
- \deprecated HbDataFormModelItem::KeyRole
- is deprecated.Please remove the reference to this Role.
-
- \var HbDataFormModelItem::KeyRole
- KeyRole: This Role is used for the key string for the data item. This will be used
- for storing and loading the data from central repository.
- */
-
-/*!
\var HbDataFormModelItem::LabelRole
LabelRole: This Role is used for data label of the DataFormViewItem
@@ -367,7 +378,7 @@
if(child){
child->setParent(this);
if(d->mModel) {
- child->setModel(d->mModel);
+ HbDataFormModelItemPrivate::d_ptr(child)->setModel(d->mModel);
HbDataFormModel* model = static_cast<HbDataFormModel*>(d->mModel);
model->d_func()->rowsAboutToBeInserted(this, d->mChildItems.count(), d->mChildItems.count());
d->mChildItems.append(child);
@@ -391,8 +402,8 @@
if(child) {
child->setParent(this);
- if(d->mModel) {
- child->setModel(model());
+ if(d->mModel) {
+ HbDataFormModelItemPrivate::d_ptr(child)->setModel(d->mModel);
HbDataFormModel* model = static_cast<HbDataFormModel*>(d->mModel);
model->d_func()->rowsAboutToBeInserted(this, index, index);
d->mChildItems.insert(index,child);
@@ -415,11 +426,18 @@
Q_D(HbDataFormModelItem);
HbDataFormModel* model = static_cast<HbDataFormModel*>(d->mModel);
- model->d_func()->rowsAboutToBeInserted(this, row, row + count - 1);
- for(int index = 0; index < count; index++) {
+ if(model) {
+ model->d_func()->rowsAboutToBeInserted(this, row, row + count - 1);
+ for(int index = 0; index < count; index++) {
d->mChildItems.insert(row + index, items.at(index));
+ }
+ model->d_func()->rowsInserted();
}
- model->d_func()->rowsInserted();
+ else {
+ for(int index = 0; index < count; index++) {
+ d->mChildItems.insert(row + index, items.at(index));
+ }
+ }
}
@@ -435,13 +453,23 @@
Q_D(HbDataFormModelItem);
HbDataFormModel* model = static_cast<HbDataFormModel*>(d->mModel);
- model->d_func()->rowsAboutToBeRemoved(this, index, index);
- HbDataFormModelItem *item = d->mChildItems.takeAt(index);
- if ( item ) {
- delete item;
- item = 0;
+ if(model) {
+ model->d_func()->rowsAboutToBeRemoved(this, index, index);
+ HbDataFormModelItem *item = d->mChildItems.takeAt(index);
+ if ( item ) {
+ delete item;
+ item = 0;
+ }
+ model->d_func()->rowsRemoved();
}
- model->d_func()->rowsRemoved();
+ else {
+ HbDataFormModelItem *item = d->mChildItems.takeAt(index);
+ if ( item ) {
+ delete item;
+ item = 0;
+ }
+ }
+
}
/*!
@@ -514,9 +542,7 @@
QVariant HbDataFormModelItem::data(int role ) const
{
Q_D(const HbDataFormModelItem);
- if(role == KeyRole) {
- return d->mKey;
- } else if (role == LabelRole) {
+ if (role == LabelRole) {
return d->mLabel;
} else if (role == ItemTypeRole) {
return d->mItemType;
@@ -544,9 +570,7 @@
void HbDataFormModelItem::setData(int role ,const QVariant &value)
{
Q_D(HbDataFormModelItem);
- if(role == KeyRole) {
- d->mKey = value.toString();
- } else if (role == LabelRole) {
+ if (role == LabelRole) {
d->mLabel = value.toString();
d->mDirtyProperty = "LabelRole";
} else if (role == ItemTypeRole) {
@@ -569,7 +593,7 @@
d->mItemData.insert(role,value);
}
- HbDataFormModel* data_model = static_cast<HbDataFormModel*>(model());
+ HbDataFormModel* data_model = static_cast<HbDataFormModel*>(d->mModel);
if(data_model){
QModelIndex index = data_model->indexFromItem(this);
emit data_model->dataChanged(index, index);
@@ -600,7 +624,7 @@
d->mProperties.insert(propertyName,value);
d->mDirtyProperty = propertyName;
- HbDataFormModel *data_model = static_cast<HbDataFormModel*>(model());
+ HbDataFormModel *data_model = static_cast<HbDataFormModel*>(d->mModel);
if(data_model) {
QModelIndex index = data_model->indexFromItem(this);
emit data_model->dataChanged(index, index);
@@ -703,35 +727,6 @@
return data(Qt::DecorationRole).toString();
}
-
-/*!
- \deprecated HbDataFormModelItem::setModel(const QAbstractItemModel*)
- is deprecated. Please remove all refernces to this API.
-
- Sets the given \a model to the item's model. Also sets the Model to Child Items.
-*/
-void HbDataFormModelItem::setModel(const QAbstractItemModel *model)
-{
- Q_D(HbDataFormModelItem);
- d->mModel = const_cast<QAbstractItemModel*>(model);
- int count = childCount();
- for (int index = 0; index < count ; index++) {
- d->mChildItems.at(index)->setModel(model);
- }
-
-}
-
-/*!
- \deprecated HbDataFormModelItem::model() const
- is deprecated. Please remove all refernces to this API.
-
- Returns the model of the item.
-*/
-QAbstractItemModel* HbDataFormModelItem::model() const
-{
- Q_D(const HbDataFormModelItem);
- return d->mModel;
-}
/*
QHash<QString, QVariant> HbDataFormModelItem::getContentWidgetValues()
{
@@ -755,7 +750,7 @@
} else {
d->mFlags &= ~Qt::ItemIsEnabled;
}
- HbDataFormModel* data_model = static_cast<HbDataFormModel*>(model());
+ HbDataFormModel* data_model = static_cast<HbDataFormModel*>(d->mModel);
if(data_model){
QModelIndex index = data_model->indexFromItem(this);
emit data_model->dataChanged(index, index);
--- a/src/hbwidgets/dataform/hbdataformmodelitem.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/dataform/hbdataformmodelitem.h Fri May 14 16:09:54 2010 +0300
@@ -42,9 +42,8 @@
public:
- enum Roles {
- KeyRole = Qt::UserRole + 1,
- LabelRole,
+ enum Roles {
+ LabelRole = Qt::UserRole + 1,
ItemTypeRole,
PropertyRole,
DescriptionRole
@@ -80,10 +79,7 @@
HbDataFormModelItem* childAt(int index) const;
int indexOf(const HbDataFormModelItem* child) const;
- int childCount() const;
-
- void setModel(const QAbstractItemModel *model);
- QAbstractItemModel* model() const;
+ int childCount() const;
QVariant data(int role) const;
void setData(int role, const QVariant &value);
--- a/src/hbwidgets/dataform/hbdataformmodelitem_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/dataform/hbdataformmodelitem_p.h Fri May 14 16:09:54 2010 +0300
@@ -38,11 +38,14 @@
HbDataFormModelItemPrivate();
~HbDataFormModelItemPrivate();
QString dirtyProperty();
+
+ void setModel(const QAbstractItemModel *model);
+ QAbstractItemModel* model() const;
+
public:
QList<HbDataFormModelItem*> mChildItems;
- HbDataFormModelItem* mParentItem;
- QString mKey;
+ HbDataFormModelItem* mParentItem;
QString mLabel;
QString mIcon;
QString mDescription;
--- a/src/hbwidgets/dataform/hbdataformviewitem.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/dataform/hbdataformviewitem.cpp Fri May 14 16:09:54 2010 +0300
@@ -25,7 +25,7 @@
#include <hbdataformviewitem.h>
-#include <hbstyleoptiondataformviewitem.h>
+#include <hbstyleoptiondataformviewitem_p.h>
#include "hbdataformmodelitem_p.h"
#include "hbdataformviewitem_p.h"
@@ -133,39 +133,13 @@
The signals emitted by this class are:
\li itemShown(const QModelIndex&) This signal is emitted when ever this item becomes visible.
- \deprecated HbDataFormViewItem::itemDestroyed(QPersistentModelIndex)
- This signal is deprecated.
-
- \deprecated HbDataFormViewItem::itemModified(QPersistentModelIndex, QVariant)
- This signal is deprecated . Use dataChanged(QModelIndex,QModelIndex) signal of model instead
- and fetch the new value from corresponding modelItem.
-
+
Refer HbDataForm documentation for sample code.
\sa HbDataForm, HbDataFormModel, HbDataFormModelItem
*/
/*!
- \deprecated HbDataFormViewItem::StateKey
- is deprecated. Please use string based state keys.
-
- \enum HbDataFormViewItem::StateKey
-
- HbDataFormViewItem's user defined state keys.
-
- \sa HbAbstractViewItem::transientState()
-*/
-
-/*!
- \deprecated HbDataFormViewItem::ExpansionKey
- is deprecated. Please use string based state keys. This key is replaced by "expanded".
-
- \var HbDataFormViewItem::ExpansionKey
- Predefined key for expansion/collapsion state of a view item. Default state is collapsed.
-*/
-
-
-/*!
Constructs HbDataFormViewItem with given \a parent.
\param parent parent .
*/
@@ -260,7 +234,7 @@
//HbEffect::start( settingItem, HB_DATAFORMVIEWITEM_TYPE, "expanded" );
#endif
- load( );
+ restore( );
// Establish Signal Connections set in HbDataFormModel to th contentWidget of this item
HbDataFormPrivate::d_ptr(
@@ -302,36 +276,6 @@
}
/*!
- \deprecated HbDataFormViewItem::load()
- is deprecated. Please use HbDataFormViewItem::restore() instead.
-
- Loads the data from the central repository and assign to the widget.
- The property for loading and storing the data need to be initialized when the
- DataItem is created.
-
- \sa store restore
-*/
-void HbDataFormViewItem::load()
-{
- restore();
-}
-
-/*!
- \deprecated HbDataFormViewItem::store()
- is deprecated. Please use HbDataFormViewItem::save() instead.
-
- Store the current data to the central repository .
- The property for loading and storing the data need to be initialized when the
- DataItem is created
-
- \sa load save
-*/
-void HbDataFormViewItem::store()
-{
- save();
-}
-
-/*!
@alpha
Restores the data from the model and assign to the widget.
The property for restoring and saving the data need to be initialized when the
@@ -403,8 +347,7 @@
d->mSharedData->mItemView, SLOT( dataChanged( QModelIndex,QModelIndex ) ) );
d->mModelItem->setContentWidgetData(
- d->mProperty, d->mContentWidget->property(d->mProperty.toAscii( ).data( ) ) );
- emit itemModified(d->mIndex, d->mContentWidget->property(d->mProperty.toAscii( ).data( )));
+ d->mProperty, d->mContentWidget->property(d->mProperty.toAscii( ).data( ) ) );
connect( d->mModel, SIGNAL( dataChanged( QModelIndex,QModelIndex ) ),
d->mSharedData->mItemView, SLOT( dataChanged( QModelIndex,QModelIndex ) ) );
@@ -463,39 +406,6 @@
}
/*!
- \deprecated HbDataFormViewItem::state()
- is deprecated.
-
- \reimp
-*/
-QMap<int,QVariant> HbDataFormViewItem::state() const
-{
- return HbAbstractViewItem::state();
-}
-
-/*!
- \deprecated HbDataFormViewItem::setState(const QMap<int, QVariant>&)
- is deprecated.
-
- \reimp
-*/
-void HbDataFormViewItem::setState(const QMap<int,QVariant> &state)
-{
- HbAbstractViewItem::setState(state);
-}
-
-/*!
- \deprecated HbDataFormViewItem::contentWidget() const
- is deprecated. Use dataItemContentWidget() instead
-
- Return the content widget of HbDataFormViewItem.
- \sa dataItemContentWidget
-*/
-HbWidget* HbDataFormViewItem::contentWidget()const
-{
- return 0;
-}
-/*!
This API is valid only if HbDataFormViewItem represents a data item. Returns the
content widget of data item. For example if data item is of type SliderItem then
this API will return the instance of HbSlider.
--- a/src/hbwidgets/dataform/hbdataformviewitem.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/dataform/hbdataformviewitem.h Fri May 14 16:09:54 2010 +0300
@@ -41,10 +41,6 @@
public:
- enum StateKey {
- ExpansionKey = 10
- };
-
explicit HbDataFormViewItem(QGraphicsItem *parent = 0);
virtual ~HbDataFormViewItem();
@@ -60,24 +56,16 @@
void setExpanded(bool expanded);
bool isExpanded() const;
- void setState(const QMap<int,QVariant> &state);
- QMap<int,QVariant> state() const;
-
- HbWidget* contentWidget() const;
HbWidget* dataItemContentWidget()const;
public slots:
- virtual void load();
- virtual void store();
virtual void restore();
virtual void save();
signals:
- void itemShown(const QModelIndex&);
- void itemDestroyed(QPersistentModelIndex);
- void itemModified(QPersistentModelIndex, QVariant);
-
+ void itemShown(const QModelIndex&);
+
protected:
HbDataFormViewItem(HbDataFormViewItemPrivate &dd, QGraphicsItem *parent = 0);
HbDataFormViewItem(const HbDataFormViewItem &source);
--- a/src/hbwidgets/dataform/hbdataformviewitem_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/dataform/hbdataformviewitem_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -39,7 +39,7 @@
#include <hblineedit.h>
#include <hbradiobuttonlist.h>
#include <hbcombobox.h>
-#include <hbstyleoptiondataformviewitem.h>
+#include <hbstyleoptiondataformviewitem_p.h>
#include <hbselectiondialog.h>
#include <hbpushbutton.h>
#include <hbaction.h>
@@ -59,6 +59,7 @@
mButton = new HbPushButton( );
QGraphicsLinearLayout* layout = new QGraphicsLinearLayout( Qt::Horizontal );
+ layout->setContentsMargins(0, 0, 0, 0);
layout->addItem( mButton );
setLayout( layout );
@@ -149,6 +150,7 @@
SIGNAL(itemModified(QPersistentModelIndex, QVariant)));
if(!layout) {
layout = new QGraphicsLinearLayout( Qt::Vertical );
+ layout->setContentsMargins(0, 0, 0, 0);
}
setLayout( layout );
}
@@ -354,7 +356,7 @@
void HbRadioItem::dialogClosed(HbAction* action)
{
- if(action->text() == "Ok") {
+ if(( action ) && ( action->text() == "Ok" )) {
// store the selected item to model
updateModel(mRadioButtonList->selected());
}
@@ -373,6 +375,7 @@
// when clicked on the item
mViewItem = static_cast<HbDataFormViewItem*>(parent);
layout = new QGraphicsLinearLayout(Qt::Horizontal);
+ layout->setContentsMargins(0, 0, 0, 0);
setLayout(layout);
mModel = static_cast<HbDataFormModel*>(
@@ -470,7 +473,7 @@
mButton->setTextAlignment(Qt::AlignLeft);
layout->addItem(mButton);
}
- QObject::connect(mButton, SIGNAL(released()), this, SLOT(launchMultiSelectionList()));
+ QObject::connect(mButton, SIGNAL(clicked()), this, SLOT(launchMultiSelectionList()));
}
void HbMultiSelectionItem::changeMode()
@@ -558,7 +561,7 @@
void HbMultiSelectionItem::dialogClosed(HbAction* action)
{
- if( action->text() == "Ok") {
+ if(( action ) && ( action->text() == "Ok" )) {
//fetch the selected items
mSelectedItems = mSelectionDialog->selectedItems();
QString newValue("");
@@ -923,7 +926,7 @@
case HbDataFormModelItem::SliderItem:
case HbDataFormModelItem::VolumeSliderItem: {
mContentWidget = new HbSlider( Qt::Horizontal, q );
- mProperty.append( "sliderPosition" );
+ mProperty.append( "value" );
QObject::connect( mContentWidget, SIGNAL(valueChanged(int)), q,SLOT(save()) );
HbStyle::setItemName( mContentWidget, "dataItem_ContentWidget" );
}
@@ -983,9 +986,19 @@
}
break;
}
- //background primitive should get created.
+ //background primitive should get created because if none of the other primitives are created
+ //then createPrimitive and updatePrimitive will never get called and hence background
+ //will not be visible
createPrimitives();
- updatePrimitives();
+
+ //update only the background primitive
+ HbStyleOptionDataFormViewItem options;
+ q->initStyleOption(&options);
+ if( mBackgroundItem ) {
+ q->style()->updatePrimitive(
+ mBackgroundItem, HbStyle::P_DataItem_background, &options );
+ }
+
if ( mContentWidget ) {
QEvent polishEvent( QEvent::Polish );
QCoreApplication::sendEvent( mContentWidget, &polishEvent );
--- a/src/hbwidgets/dataform/hbdatagroup_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/dataform/hbdatagroup_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -28,12 +28,10 @@
#include "hbdatagroupheadingwidget_p.h"
#include "hbstyleoptiondatagroup_p.h"
-#include "hbabstractitemcontainer_p.h"
+#include "hbabstractitemcontainer_p_p.h"
#include "hbdataform_p.h"
#include "hbdatagroup_p_p.h"
-// For QMAP_INT__ITEM_STATE_DEPRECATED's sake. Removed when QMap<int,QVariant> based state item system is removed
-#include <hbabstractviewitem_p.h>
#include <QStringListModel>
#include <QCoreApplication>
@@ -118,9 +116,6 @@
//get the group page index
QModelIndex groupPageIndex = mIndex.child(activePage,0);
if(groupPageIndex.isValid()) {
-#ifndef QMAP_INT__ITEM_STATE_DEPRECATED
- container->setItemStateValue(groupPageIndex, HbDataFormViewItem::ExpansionKey, true);
-#endif
container->setItemTransientStateValue(groupPageIndex, "expanded", true);
}
}
@@ -130,9 +125,6 @@
}
}
-#ifndef QMAP_INT__ITEM_STATE_DEPRECATED
- container->setItemStateValue(mIndex.operator const QModelIndex & (), HbDataFormViewItem::ExpansionKey, expanded);
-#endif
container->setItemTransientStateValue(mIndex, "expanded", expanded);
}
@@ -324,10 +316,22 @@
bool HbDataGroup::isExpanded() const
{
Q_D(const HbDataGroup);
- if(d->mGroupHeading) {
- return d->mGroupHeading->mExpanded;
- }
+ HbDataFormModelItem::DataItemType contentWidgetType =
+ static_cast<HbDataFormModelItem::DataItemType>(
+ (d->mIndex.data(HbDataFormModelItem::ItemTypeRole)).toInt());
+ if( contentWidgetType == HbDataFormModelItem::GroupItem ) {
+ if(d->mGroupHeading) {
+ return d->mGroupHeading->mExpanded;
+ }
+ } else if ( contentWidgetType == HbDataFormModelItem::GroupPageItem ) {
+ HbAbstractItemContainer *container = qobject_cast<HbAbstractItemContainer *>(
+ static_cast<QGraphicsWidget *>(d->mSharedData->mItemView->contentWidget()));
+ if(container) {
+ return container->itemTransientState(d->mIndex).value("expanded").toBool();
+ }
+ }
return false;
+
}
void HbDataGroup::updateGroupPageName(int index , const QString &page)
--- a/src/hbwidgets/dataform/hbdataitemcontainer_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/dataform/hbdataitemcontainer_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -24,12 +24,13 @@
****************************************************************************/
#include "hbdataitemcontainer_p.h"
-#include <hbabstractitemcontainer_p.h>
+#include <hbabstractitemcontainer_p_p.h>
#include <hbdataformviewitem.h>
#include <hbdataformmodelitem.h>
#include "hbdatagroup_p.h"
#include <hbdataform.h>
#include "hblistlayout_p.h"
+#include "hbmodeliterator.h"
#include <QCoreApplication>
#include <QGraphicsScene>
@@ -145,27 +146,6 @@
mLayout->activate();
}
-/*!
- Assigns new model \a index to the given \a item. Item's current state is saved
- and state for \a index is restored to item.
-*/
-void HbDataItemContainer::setItemModelIndex(HbAbstractViewItem *item, const QModelIndex &index)
-{
- if (item && item->modelIndex() != index) {
- HbAbstractItemContainer::setItemModelIndex(item, index);
- int level = 0;
- if (itemView()) {
- QModelIndex parentIndex = item->modelIndex().parent();
- QModelIndex rootIndex = itemView()->rootIndex();
-
- while (parentIndex != rootIndex && parentIndex.isValid()) {
- level++;
- parentIndex = parentIndex.parent();
- }
- }
- }
-}
-
void HbDataItemContainer::setModelIndexes(const QModelIndex &startIndex )
{
Q_D(HbAbstractItemContainer);
@@ -184,7 +164,7 @@
if (d->mItems.count() < targetCount) {
// New items needs to be added.
while (d->mItems.count() < targetCount) {
- index = d->mItemView->nextIndex(index);
+ index = d->mItemView->modelIterator()->nextIndex(index);
if (!index.isValid()) {
break;
}
@@ -206,28 +186,51 @@
}
}
-/*!
- Inserts item for \a index to \a pos.
-*/
-void HbDataItemContainer::insertItem(int pos, const QModelIndex &index, bool animate)
-{
- Q_D(HbDataItemContainer);
- HbAbstractViewItem *item = d->createItem(index);
- HbDataFormModelItem::DataItemType itemType =
- static_cast<HbDataFormModelItem::DataItemType>(
- index.data(HbDataFormModelItem::ItemTypeRole).toInt());
- if (item) {
- d->mItems.insert(pos, item);
- itemAdded(pos, item, animate);
- setItemModelIndex(item, index);
- if (itemType == HbDataFormModelItem::GroupPageItem) {
- item->setVisible(false);
- }
- }
-}
-
HbAbstractViewItem *HbDataItemContainer::createDefaultPrototype() const
{
return new HbDataFormViewItem();
}
+/*!
+ \reimp
+
+ All other sizehints are taken from list layout except preferred sizehint. List container preferred sizeHint
+ width is maximum width and height is average item height times index count.
+*/
+QSizeF HbDataItemContainer::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
+{
+ Q_D(const HbDataItemContainer);
+
+ if (which == Qt::PreferredSize) {
+ HbModelIterator *modelIterator = d->modelIterator();
+ if (modelIterator) {
+ qreal averageItemHeight = 0;
+ if (!d->mItems.isEmpty() && layout() ) {
+ averageItemHeight = layout()->effectiveSizeHint(Qt::PreferredSize).height() / d->mItems.count();
+ }
+
+ return QSizeF(layout()->effectiveSizeHint(Qt::PreferredSize).width(),
+ averageItemHeight * modelIterator->indexCount());
+ }
+ }
+
+ return HbAbstractItemContainer::sizeHint(which, constraint);
+}
+
+/*!
+ \reimp
+
+ Resizes the container to use view width (if present; otherwise 0)
+ and layout preferred height.
+*/
+void HbDataItemContainer::resizeContainer()
+{
+ Q_D(HbDataItemContainer);
+
+ if (d->mItemView) {
+ resize(d->mItemView->size().width(), layout()->preferredHeight());
+ } else {
+ resize(0, layout()->preferredHeight());
+ }
+}
+
--- a/src/hbwidgets/dataform/hbdataitemcontainer_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/dataform/hbdataitemcontainer_p.h Fri May 14 16:09:54 2010 +0300
@@ -25,7 +25,7 @@
#ifndef HBDATAITEMCONTAINER_P_H
#define HBDATAITEMCONTAINER_P_H
-#include <hbabstractitemcontainer.h>
+#include <hbabstractitemcontainer_p.h>
class HbDataItemContainerPrivate;
class HbListLayout;
@@ -44,17 +44,16 @@
enum { Type = Hb::ItemType_DataItemContainer};
int type() const { return Type; }
+ virtual void resizeContainer();
+
protected:
virtual void itemAdded(int index, HbAbstractViewItem *item, bool animate = false);
virtual void itemRemoved(HbAbstractViewItem *item, bool animate = false);
virtual void viewResized(const QSizeF &size);
- virtual void setItemModelIndex(HbAbstractViewItem *item, const QModelIndex &index);
virtual void setModelIndexes(const QModelIndex &startIndex = QModelIndex());
- void insertItem(int pos, const QModelIndex &index, bool animate = false);
-
-
virtual HbAbstractViewItem *createDefaultPrototype() const;
+ virtual QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const;
private:
Q_DECLARE_PRIVATE_D(d_ptr, HbDataItemContainer)
Q_DISABLE_COPY(HbDataItemContainer)
--- a/src/hbwidgets/devicedialogs/hbdevicemessagebox.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/devicedialogs/hbdevicemessagebox.cpp Fri May 14 16:09:54 2010 +0300
@@ -90,7 +90,6 @@
QString text;
q_ptr->setText(text);
q_ptr->setIconName(text);
- q_ptr->setIconAlignment(Qt::AlignCenter);
q_ptr->setIconVisible(true);
q_ptr->setAnimationDefinition(text);
@@ -155,7 +154,6 @@
"type",
"text",
"iconName",
- "iconAlignment",
"iconVisible",
"timeout",
"dismissPolicy",
@@ -171,24 +169,18 @@
}
}
}
-
static const char * const actionNames[] = {
- "primaryActionText",
- "secondaryActionText"
+ "acceptAction",
+ "rejectAction"
};
- static const char * const nullActionNames[] = {
- "primaryActionNull",
- "secondaryActionNull"
- };
-
for(int i = 0; i < NumActions; i++) {
if (mActions[i].mFlags & Modified) {
if (show || !(mActions[i].mFlags & SentToServer)) {
+ QString actionData; // empty removes action at the plugin
if (mActions[i].mAction) {
- parameters.insert(actionNames[i], mActions[i].mAction->text());
- } else {
- parameters.insert(nullActionNames[i], true);
+ actionData.append("t:").append(mActions[i].mAction->text());
}
+ parameters.insert(actionNames[i], actionData);
mActions[i].mFlags |= SentToServer;
}
}
@@ -342,42 +334,26 @@
}
}
-// Temporary until HbAction is deprecated out from device message box API
-// Tbd. remove when deprecation period ends
-HbAction *HbDeviceMessageBoxPrivate::toHbAction(QAction *action)
-{
- // Upcast to HbAction
- HbAction *hbAction = qobject_cast<HbAction*>(action);
- // Warn if user has mixed HbAction and QAction APis
- if (action != hbAction) {
- //qWarning("HbDeviceMessageBox: HbAction API:s deprecated! Returning QAction instead of HbAction");
- // Best option is to return QAction and hope caller doesn't use HbAction parts
- hbAction = reinterpret_cast<HbAction*>(action);
- }
- return hbAction;
-}
+/*!
+ @stable
+ @hbwidgets
+ \class HbDeviceMessageBox
+ \brief HbDeviceMessageBox displays a message to the user, on top of any running applications, which the user must acknowledge to dismiss.
-/*!
- \class HbDeviceMessageBox
- \brief HbDeviceMessageBox is a device dialog version of HbMessageBox.
-
- It displays a message box with text, icon or animation and optional reply button(s).
+ HbDeviceMessageBox is a device dialog version of HbMessageBox. It displays a message box with text, icon or animation and optional reply button(s).
+ It differs from HbMessageBox by excluding functions which handle concrete UI-component related information.
Device dialogs are shown on top of any running applications and are always modal by nature.
- HbDeviceMessageBox provides a similar kind of interface as HbMessageBox,
- excluding functions which handle concrete UI-component related information.
-
- A device message box is launched when exec() for synchronous dialog or show() for asynchronous
- dialog is called. Launched dialog can be updated by setters. Because updating a dialog
- requires interprocess communication, it's advisable to fully construct the device message box before
- calling show(). Device message box is closed when user dismisses it with pressing a button, when
- client calls close() or the dialog reaches timeout. If the system must close the device message
- box while it is executing, it will have the same effect than having message box's secondary action
- activated.
+ A device message box is launched when exec() is called for an synchronous dialog or show() is called for an asynchronous
+ dialog. The launched dialog can be updated by the setter metods. Because updating a dialog
+ requires interprocess communication, it is advisable to fully construct the device message box before
+ calling show(). The device message box is closed when the user dismisses it by pressing a button, when
+ the client calls close(), or when the dialog timeout expires. If the system must close the device message
+ box while it is executing, it will have the same effect as having the message box's secondary action
Static convenience functions are provided for launching message boxes.
- Dialogs created by them contain a default property values appropriate for
+ Dialogs created by them contain default property values appropriate for
the message box type and their contents cannot be updated. Information and
warning convenience methods return immediately. Question waits for a message box
to close.
@@ -385,7 +361,7 @@
Supported icon animation formats are following:
- GIF (.gif)
- MNG (.mng)
- - Frame animations
+ - Frame animations (.axml)
Sample code:
@@ -408,8 +384,6 @@
messageBox.setText("End game?");
QString fileName("note_warning");
messageBox.setIconName(fileName);
- Qt::Alignment align(Qt::AlignLeft|Qt::AlignTop);
- messageBox.setIconAlignment(align);
QAction acceptAction("Ok", 0);
messageBox.setAction(&acceptAction, HbDeviceMessageBox::AcceptButtonRole);
@@ -451,9 +425,6 @@
\endcode
\sa HbMessageBox, HbDialog, HbDeviceDialog
-
- @proto
- @hbwidgets
*/
/*!
@@ -559,46 +530,6 @@
Executes the dialog synchronously.
Returns a pointer to the action that was activated by the user, i.e. dialog's
- primary or secondary action.
-
- This functions starts a new event loop. Consider following caveats before using it
- Stack usage increases. Depending on application program flow, several event
- loops may get instantiated on top of each other. Application event processing continues while
- exec() executes. When it returns application state may have changed. For example some
- objects may have been deleted or application may have exited.
-
- \sa primaryAction(), setPrimaryAction(), secondaryAction(), setSecondaryAction()
-
- <b>Note that starting an event loop isn't compatible with gestures.</b> Therefore if an application
- has an user interface, please don't use this function. Instead connect to signals and use
- asynchronous show().
-
- \deprecated HbDeviceMessageBox::exec()
- is deprecated. Replaced by const QAction *HbDeviceMessageBox::exec() const.
-
-*/
-HbAction *HbDeviceMessageBox::exec()
-{
- TRACE_ENTRY
- HbDeviceMessageBox &box = const_cast<HbDeviceMessageBox&>(*this);
- QAction *action;
- QPointer<HbDeviceMessageBoxPrivate> guard = d_ptr;
- box.d_ptr->exec();
- if (guard.isNull()) {
- action = 0;
- } else if (box.d_ptr->mActions[HbDeviceMessageBoxPrivate::AcceptButton].mTriggered) {
- action = box.d_ptr->mActions[HbDeviceMessageBoxPrivate::AcceptButton].mAction;
- } else {
- action = box.d_ptr->mActions[HbDeviceMessageBoxPrivate::RejectButton].mAction;
- }
- TRACE_EXIT
- return HbDeviceMessageBoxPrivate::toHbAction(action);
-}
-
-/*!
- Executes the dialog synchronously.
-
- Returns a pointer to the action that was activated by the user, i.e. dialog's
accept or reject action. Return 0 if object was deleted during a call.
This functions starts a new event loop. Consider following caveats before using it
@@ -613,7 +544,7 @@
\sa action(), setAction()
*/
-const QAction *HbDeviceMessageBox::exec() const
+const QAction *HbDeviceMessageBox::exec()
{
TRACE_ENTRY
const QAction *action;
@@ -722,10 +653,7 @@
if (!rejectButtonText.isNull()) {
messageBox.setAction(new QAction(rejectButtonText, &messageBox), RejectButtonRole);
}
-
- // Tbd. Temporary until deprecated HbAction *HbDeviceMessageBox::exec() is removed.
- const HbDeviceMessageBox &tmp = const_cast<const HbDeviceMessageBox&>(messageBox);
- tmp.exec();
+ messageBox.exec();
TRACE_EXIT
// Return true if accept action was triggered
return messageBox.isAcceptAction(messageBox.triggeredAction());
@@ -758,94 +686,6 @@
}
/*!
- Returns device message box primary action.
-
- \sa setPrimaryAction()
-
- \deprecated HbDeviceMessageBox::primaryAction() const
- is deprecated. Replaced by HbDeviceMessageBox::action(ActionRole role) const.
-
-*/
-HbAction* HbDeviceMessageBox::primaryAction() const
-{
- //qWarning("HbDeviceMessageBox: HbAction API:s deprecated! Use action()");
- return HbDeviceMessageBoxPrivate::toHbAction(
- d_ptr->mActions[HbDeviceMessageBoxPrivate::AcceptButton].mAction);
-}
-
-/*!
- Sets the given action to the device message box.
- Action is added to the left side of the dialog if the layout direction of the
- application is left-to-right and in the vice-versa if the layout direction
- of the application is right-to-left. Action can be set to null which means
- that action and a button related to this action are removed from the dialog.
- Only the text of the action is shown in the message box. Icon of the action
- is not used. The message box does not take ownership of the given QAction.
-
- HbDeviceMessageBox constructor sets a default action into the message box.
-
- \param action Action or null. Ownership doesn't transfer.
-
- \sa primaryAction()
-
- \deprecated HbDeviceMessageBox::setPrimaryAction(HbAction*)
- is deprecated. HbDeviceMessageBox::setAction(QAction *action, ActionRole role).
-
-*/
-void HbDeviceMessageBox::setPrimaryAction(HbAction *action)
-{
- TRACE_ENTRY
- //qWarning("HbDeviceMessageBox: HbAction API:s deprecated! Use setAction()");
- d_ptr->setAction(HbDeviceMessageBoxPrivate::AcceptButton, action);
- d_ptr->scheduleUpdateEvent();
- TRACE_EXIT
-}
-
-/*!
- Returns device message box secondary action.
-
- \sa setSecondaryAction()
-
- \deprecated HbDeviceMessageBox::secondaryAction() const
- is deprecated. Replaced by HbDeviceMessageBox::action(ActionRole role) const.
-
-*/
-HbAction* HbDeviceMessageBox::secondaryAction() const
-{
- //qWarning("HbDeviceMessageBox: HbAction API:s deprecated! Use action()");
- return HbDeviceMessageBoxPrivate::toHbAction(
- d_ptr->mActions[HbDeviceMessageBoxPrivate::RejectButton].mAction);
-}
-
-/*!
- Adds the given action to the device message box.
- Action is added to the right side of the dialog if the layout direction of the
- application is left-to-right and in the vice-versa if the layout direction
- of the application is right-to-left. Action can be set to null which means
- that action and a button related to this action are removed from the dialog.
- Only the text of the action is shown in the message box. Icon of the action
- is not used. The message box does not take ownership of given QAction.
-
- HbDeviceMessageBox constructor sets a default action into question message
- box. Information and warning message boxes don't have a default secondary action.
-
- \param action Action or null.
-
- \sa secondaryAction()
-
- \deprecated HbDeviceMessageBox::setSecondaryAction(HbAction*)
- is deprecated. HbDeviceMessageBox::setAction(QAction *action, ActionRole role).
-*/
-void HbDeviceMessageBox::setSecondaryAction(HbAction *action)
-{
- TRACE_ENTRY
- //qWarning("HbDeviceMessageBox: HbAction API:s deprecated! Use setAction()");
- d_ptr->setAction(HbDeviceMessageBoxPrivate::RejectButton, action);
- d_ptr->scheduleUpdateEvent();
- TRACE_EXIT
-}
-
-/*!
Returns device message box action. The action returned may be a default
action that message box has set at constructor or one set by setAction().
@@ -940,33 +780,6 @@
}
/*!
- Sets the icon's alignment in the icon area of the dialog.
-
- \param align Qt defined alignment options can used.
-
- \sa iconAlignment()
-*/
-void HbDeviceMessageBox::setIconAlignment(Qt::Alignment align)
-{
- TRACE_ENTRY
- d_ptr->setProperty(HbDeviceMessageBoxPrivate::IconAlignment, align);
- TRACE_EXIT
-}
-
-/*!
- Returns the icon alignment in the icon area of the dialog.
-
- The default value is \c Qt::AlignCenter.
-
- \sa setIconAlignment()
-*/
-Qt::Alignment HbDeviceMessageBox::iconAlignment() const
-{
- return static_cast<Qt::Alignment>
- (d_ptr->mProperties[HbDeviceMessageBoxPrivate::IconAlignment].mValue.toInt());
-}
-
-/*!
Enables/disables icon visibility.
\param visible Enables icon visibility.
--- a/src/hbwidgets/devicedialogs/hbdevicemessagebox.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/devicedialogs/hbdevicemessagebox.h Fri May 14 16:09:54 2010 +0300
@@ -38,9 +38,9 @@
{
Q_OBJECT
+ Q_PROPERTY(HbMessageBox::MessageBoxType messageBoxType READ messageBoxType WRITE setMessageBoxType)
Q_PROPERTY(QString text READ text WRITE setText)
Q_PROPERTY(QString iconName READ iconName WRITE setIconName)
- Q_PROPERTY(Qt::Alignment iconAlignment READ iconAlignment WRITE setIconAlignment)
Q_PROPERTY(bool iconVisible READ iconVisible WRITE setIconVisible)
Q_PROPERTY(int timeout READ timeout WRITE setTimeout)
Q_PROPERTY(QString animationDefinition READ animationDefinition WRITE setAnimationDefinition)
@@ -72,10 +72,10 @@
void show();
void update();
void close();
- HbAction *exec(); // deprecated
- const QAction *exec() const; // tbd. remove const when HbAction *exec() is removed
+ const QAction *exec();
const QAction *triggeredAction() const;
bool isAcceptAction(const QAction *action) const;
+
void setMessageBoxType(HbMessageBox::MessageBoxType type);
HbMessageBox::MessageBoxType messageBoxType() const;
@@ -85,9 +85,6 @@
void setIconName(const QString &iconName);
QString iconName() const;
- void setIconAlignment(Qt::Alignment align);
- Qt::Alignment iconAlignment() const;
-
void setIconVisible(bool visible);
bool iconVisible() const;
@@ -101,12 +98,6 @@
void setDismissPolicy(HbPopup::DismissPolicy dismissPolicy);
HbPopup::DismissPolicy dismissPolicy() const;
- HbAction *primaryAction() const; // deprecated
- void setPrimaryAction(HbAction *action); // deprecated
-
- HbAction *secondaryAction() const; // deprecated
- void setSecondaryAction(HbAction *action); // deprecated
-
void setAction(QAction *action, ActionRole role);
QAction *action(ActionRole role) const;
--- a/src/hbwidgets/devicedialogs/hbdevicemessagebox_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/devicedialogs/hbdevicemessagebox_p.h Fri May 14 16:09:54 2010 +0300
@@ -40,7 +40,6 @@
Type,
Text,
IconName,
- IconAlignment,
IconVisible,
Timeout,
DismissPolicy,
@@ -88,7 +87,6 @@
static int timeoutValue(HbPopup::DefaultTimeout timeout);
static ActionSelector actionSelector(HbDeviceMessageBox::ActionRole role);
- static HbAction *toHbAction(QAction *action);
void scheduleUpdateEvent();
void timerEvent(QTimerEvent *event);
--- a/src/hbwidgets/devicedialogs/hbdevicemessageboxsymbian.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/devicedialogs/hbdevicemessageboxsymbian.cpp Fri May 14 16:09:54 2010 +0300
@@ -55,6 +55,8 @@
void SetModified(bool aModified){mFlags.mModified = aModified;}
bool Valid() const{return mFlags.mValid;}
void SetValid(bool aValid){mFlags.mValid = aValid;}
+ bool IsNullAction() const{return mFlags.mNullAction;}
+ void SetNullAction(bool aNull){mFlags.mNullAction = aNull;}
TType Type() const{return mType;}
void SetType(TType aType){mType = aType;}
private:
@@ -64,6 +66,7 @@
HBufC *mString;
} mValue;
struct {
+ bool mNullAction:1; // marks action (button) null
bool mValid:1; // property value has has been set
bool mModified:1; // property has been modified
} mFlags;
@@ -75,13 +78,10 @@
enum TPropertyId {
EFirstIntProperty,
EType = EFirstIntProperty,
- EIconAlignment,
EIconVisible,
ETimeout,
EDismissPolicy,
- EAcceptNull,
- ERejectNull,
- ELastIntProperty = ERejectNull,
+ ELastIntProperty = EDismissPolicy,
EFirstStringProperty,
EText = EFirstStringProperty,
EIconName,
@@ -91,7 +91,6 @@
ELastStringProperty = EAnimationDefinition,
ENumProperties
};
-
void ConstructL(CHbDeviceMessageBoxSymbian::TType aType,
MHbDeviceMessageBoxObserver *aObserver);
~CHbDeviceMessageBoxPrivate();
@@ -106,6 +105,7 @@
bool WaitForClosed();
static const TPtrC PropertyName(TPropertyId aId);
static TPropertyId ButtonPropertyId(TPropertyId aId, CHbDeviceMessageBoxSymbian::TButtonId aButtonId);
+ static HBufC *CreateActionDataLC(TBool aNull, const TDesC &text);
public: // MHbDeviceDialogObserver
void DataReceived(CHbSymbianVariantMap& aData);
@@ -141,6 +141,7 @@
mValue.mInt = 0;
}
mType = aType;
+ mFlags.mNullAction = false;
mFlags.mValid = false;
mFlags.mModified = false;
}
@@ -246,8 +247,6 @@
// Set properties to default values
mProperties[EType].Set(aType);
- const TInt alignCenter = 0x0080 | 0x0004; // Qt::AlignCenter
- mProperties[EIconAlignment].Set(alignCenter);
mProperties[EIconVisible].Set(ETrue);
switch(aType) {
@@ -258,10 +257,8 @@
const TInt KTapAnywhere = 0x03; // HbPopup::TapAnywhere
mProperties[EDismissPolicy].Set(KTapAnywhere);
- // Plugin sets accept button by default
- mProperties[ERejectNull].Set(true);
- mProperties[ERejectNull].SetModified(false);
- mProperties[ERejectNull].SetValid(false);
+ // Plugin has accept button by default
+ mProperties[ERejectText].SetNullAction(true);
break;
}
case CHbDeviceMessageBoxSymbian::EQuestion: {
@@ -303,8 +300,10 @@
void CHbDeviceMessageBoxPrivate::SetButtonNull(CHbDeviceMessageBoxSymbian::TButtonId aButtonId,
bool aValue)
{
- TPropertyId id = ButtonPropertyId(EAcceptNull, aButtonId);
- mProperties[id].Set(aValue);
+ TPropertyId id = ButtonPropertyId(EAcceptText, aButtonId);
+ mProperties[id].SetNullAction(aValue);
+ mProperties[id].SetValid(true);
+ mProperties[id].SetModified(true);
}
// Set button text property
@@ -323,14 +322,8 @@
return;
}
- // Accept and reject button exists property gates sending button text.
- // If button exists but button text is not sent, the plugin uses a default
- // button.
- int ignoreMask = mProperties[EAcceptNull].IntValue() ? (1 << EAcceptText) : 0;
- ignoreMask |= mProperties[ERejectNull].IntValue() ? (1 << ERejectText) : 0;
-
-
// If this is update but no properties have been mofified, return
+ const TInt ignoreMask = 0;
if (!aShow && !PropertiesModified(ignoreMask)) {
return;
}
@@ -342,9 +335,13 @@
TMessageBoxProperty &property = mProperties[i];
// ShowL() send all valid properties. Update only sends modified properties.
bool sendProperty = aShow ? property.Valid() : property.Modified();
- if (sendProperty && (ignoreMask & 1) == 0) {
+ if (sendProperty) {
CHbSymbianVariant* parameter;
- if (property.Type() == TMessageBoxProperty::EIntProperty) {
+ if (i == EAcceptText || i == ERejectText) {
+ HBufC *actionData = CreateActionDataLC(property.IsNullAction(), property.StringValue());
+ parameter = CHbSymbianVariant::NewL(actionData, CHbSymbianVariant::EDes);
+ CleanupStack::PopAndDestroy(); // actionData
+ } else if (property.Type() == TMessageBoxProperty::EIntProperty) {
TInt value = property.IntValue();
parameter = CHbSymbianVariant::NewL(&value, CHbSymbianVariant::EInt);
} else {
@@ -357,7 +354,6 @@
CleanupStack::Pop(); // parameter
property.SetModified(false);
}
- ignoreMask >>= 1;
}
_LIT(KDeviceDialogType, "com.nokia.hb.devicemessagebox/1.0");
@@ -398,16 +394,13 @@
{
static const wchar_t * const names[] = {
L"type",
- L"iconAlignment",
L"iconVisible",
L"timeout",
L"dismissPolicy",
- L"primaryActionNull",
- L"secondaryActionNull",
L"text",
L"iconName",
- L"primaryActionText",
- L"secondaryActionText",
+ L"acceptAction",
+ L"rejectAction",
L"animationDefinition"
};
__ASSERT_DEBUG(aId >= 0 && aId < sizeof(names)/sizeof(names[0]), Panic(EPropertyPanic));
@@ -422,8 +415,6 @@
__ASSERT_DEBUG(aButtonId == CHbDeviceMessageBoxSymbian::EAcceptButton ||
aButtonId == CHbDeviceMessageBoxSymbian::ERejectButton, Panic(EButtonIdPanic));
switch(aId) {
- case EAcceptNull:
- return aButtonId == CHbDeviceMessageBoxSymbian::EAcceptButton ? EAcceptNull : ERejectNull;
case EAcceptText:
return aButtonId == CHbDeviceMessageBoxSymbian::EAcceptButton ? EAcceptText : ERejectText;
default:
@@ -432,6 +423,23 @@
}
}
+// Pack into a string a data for a button
+HBufC *CHbDeviceMessageBoxPrivate::CreateActionDataLC(TBool aNull, const TDesC &text)
+{
+ HBufC *actionData;
+ if (aNull) {
+ actionData = HBufC::NewL(0);
+ } else {
+ _LIT(KtextTag, "t:");
+ actionData = HBufC::NewL(text.Length() + KtextTag().Length());
+ TPtr ptr = actionData->Des();
+ ptr.Append(KtextTag);
+ ptr.Append(text);
+ }
+ CleanupStack::PushL(actionData);
+ return actionData;
+}
+
// Observer, data received from device message box
void CHbDeviceMessageBoxPrivate::DataReceived(CHbSymbianVariantMap& aData)
{
@@ -561,9 +569,6 @@
iMessageBox->SetTextL(KText);
_LIT(KIconName, "qtg_small_smiley_wondering");
iMessageBox->SetIconNameL(KIconName);
- const TInt KAlignLeft = 0x0001; // Qt::AlignLeft
- const TInt KAlignTop = 0x0020; // Qt::AlignTop;
- iMessageBox->SetIconAlignment(KAlignLeft | KAlignTop);
_LIT(KAcceptText, "Yes");
iMessageBox->SetButtonTextL(CHbDeviceMessageBoxSymbian::EAcceptButton, KAcceptText);
@@ -600,7 +605,7 @@
\sa HbDeviceMessageBox, HbMessageBox, MHbDeviceMessageBoxObserver
- @proto
+ @stable
@hbwidgets
*/
@@ -905,47 +910,6 @@
}
/*!
- Sets message box icon alignment. The message box gets updated next time ShowL() or UpdateL()
- is called.
-
- \param aQtAlignment Icon alignment. Values are Qt::Alignment flags.
-
- \sa Qt::Alignment, IconAlignment()
-*/
-/*!
- \deprecated CHbDeviceMessageBoxSymbian::SetIconAlignmentL(int)
- is deprecated. Replaced by CHbDeviceMessageBoxSymbian::SetIconAlignment(TInt aQtAlignment).
-
-*/
-EXPORT_C void CHbDeviceMessageBoxSymbian::SetIconAlignmentL(TInt aQtAlignment)
-{
- d->SetPropertyValue(CHbDeviceMessageBoxPrivate::EIconAlignment, aQtAlignment);
-}
-
-/*!
- Sets message box icon alignment. The message box gets updated next time ShowL() or UpdateL()
- is called.
-
- \param aQtAlignment Icon alignment. Values are Qt::Alignment flags.
-
- \sa Qt::Alignment, IconAlignment()
-*/
-EXPORT_C void CHbDeviceMessageBoxSymbian::SetIconAlignment(TInt aQtAlignment)
-{
- d->SetPropertyValue(CHbDeviceMessageBoxPrivate::EIconAlignment, aQtAlignment);
-}
-
-/*!
- Returns message box icon alignment. Returned values are Qt::Alignment flags.
-
- \sa Qt::Alignment, SetIconAlignment()
-*/
-EXPORT_C TInt CHbDeviceMessageBoxSymbian::IconAlignment() const
-{
- return d->mProperties[CHbDeviceMessageBoxPrivate::EIconAlignment].IntValue();
-}
-
-/*!
Sets message box icon visibility. The message box gets updated next time ShowL() or UpdateL()
is called.
@@ -976,24 +940,6 @@
\sa Timeout()
*/
-/*!
- \deprecated CHbDeviceMessageBoxSymbian::SetTimeoutL(int)
- is deprecated. Replaced by CHbDeviceMessageBoxSymbian::SetTimeout(TInt aTimeout).
-
-*/
-EXPORT_C void CHbDeviceMessageBoxSymbian::SetTimeoutL(TInt aTimeout)
-{
- d->SetPropertyValue(CHbDeviceMessageBoxPrivate::ETimeout, aTimeout);
-}
-
-/*!
- Sets message box timeout. The message box gets updated next time ShowL() or UpdateL()
- is called.
-
- \param aTimeout Timeout in milliseconds. Zero denotes no timeout.
-
- \sa Timeout()
-*/
EXPORT_C void CHbDeviceMessageBoxSymbian::SetTimeout(TInt aTimeout)
{
d->SetPropertyValue(CHbDeviceMessageBoxPrivate::ETimeout, aTimeout);
@@ -1017,25 +963,6 @@
\sa HbPopup::DismissPolicy, DismissPolicy()
*/
-/*!
- \deprecated CHbDeviceMessageBoxSymbian::SetDismissPolicyL(int)
- is deprecated. Replaced by CHbDeviceMessageBoxSymbian::SetDismissPolicy(TInt aHbPopupDismissPolicy).
-
-*/
-EXPORT_C void CHbDeviceMessageBoxSymbian::SetDismissPolicyL(TInt aHbPopupDismissPolicy)
-{
- d->SetPropertyValue(CHbDeviceMessageBoxPrivate::EDismissPolicy,
- aHbPopupDismissPolicy);
-}
-
-/*!
- Sets message box dismiss policy. The message box gets updated next time ShowL() or UpdateL()
- is called.
-
- \param aHbPopupDismissPolicy Dismiss policy. Values are HbPopup::DismissPolicy flags.
-
- \sa HbPopup::DismissPolicy, DismissPolicy()
-*/
EXPORT_C void CHbDeviceMessageBoxSymbian::SetDismissPolicy(TInt aHbPopupDismissPolicy)
{
d->SetPropertyValue(CHbDeviceMessageBoxPrivate::EDismissPolicy,
@@ -1090,25 +1017,6 @@
\sa HasButton()
*/
-/*!
- \deprecated CHbDeviceMessageBoxSymbian::SetButtonL(CHbDeviceMessageBoxSymbian::TButtonId, int)
- is deprecated. Replaced by CHbDeviceMessageBoxSymbian::SetButton(TButtonId aButton, TBool aEnable).
-
-*/
-EXPORT_C void CHbDeviceMessageBoxSymbian::SetButtonL(TButtonId aButton, TBool aEnable)
-{
- d->SetButtonNull(aButton, !aEnable);
-}
-
-/*!
- Sets message box button presence. The message box gets updated next time ShowL() or UpdateL()
- is called.
-
- \param aButton Selects the button.
- \param aEnable True enables (makes visible) message box button.
-
- \sa HasButton()
-*/
EXPORT_C void CHbDeviceMessageBoxSymbian::SetButton(TButtonId aButton, TBool aEnable)
{
d->SetButtonNull(aButton, !aEnable);
@@ -1125,8 +1033,8 @@
{
CHbDeviceMessageBoxPrivate::TPropertyId id =
CHbDeviceMessageBoxPrivate::ButtonPropertyId(
- CHbDeviceMessageBoxPrivate::EAcceptNull, aButton);
- return !d->mProperties[id].IntValue();
+ CHbDeviceMessageBoxPrivate::EAcceptText, aButton);
+ return !d->mProperties[id].IsNullAction();
}
/*!
--- a/src/hbwidgets/devicedialogs/hbdevicemessageboxsymbian.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/devicedialogs/hbdevicemessageboxsymbian.h Fri May 14 16:09:54 2010 +0300
@@ -76,25 +76,18 @@
IMPORT_C void SetAnimationDefinitionL(const TDesC& aAnimationDefinition);
IMPORT_C TPtrC AnimationDefinition() const;
- IMPORT_C void SetIconAlignmentL(TInt aQtAlignment); // deprecated
- IMPORT_C void SetIconAlignment(TInt aQtAlignment);
- IMPORT_C TInt IconAlignment() const;
-
void SetIconVisible(TBool aVisible);
TBool IconVisible() const;
- IMPORT_C void SetTimeoutL(TInt aTimeout); // deprecated
IMPORT_C void SetTimeout(TInt aTimeout);
IMPORT_C TInt Timeout() const;
- IMPORT_C void SetDismissPolicyL(TInt aHbPopupDismissPolicy); // deprecated
IMPORT_C void SetDismissPolicy(TInt aHbPopupDismissPolicy);
IMPORT_C TInt DismissPolicy() const;
IMPORT_C void SetButtonTextL(TButtonId aButton, const TDesC& aText);
IMPORT_C const TPtrC ButtonText(TButtonId aButton) const;
- IMPORT_C void SetButtonL(TButtonId aButton, TBool aEnable); // deprecated
IMPORT_C void SetButton(TButtonId aButton, TBool aEnable);
IMPORT_C TBool HasButton(TButtonId aButton) const;
--- a/src/hbwidgets/devicedialogs/hbdevicenotificationdialog.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/devicedialogs/hbdevicenotificationdialog.cpp Fri May 14 16:09:54 2010 +0300
@@ -32,6 +32,8 @@
#include <QTimerEvent>
/*!
+ @stable
+ @hbwidgets
\class HbDeviceNotificationDialog
\brief HbDeviceNotificationDialog is a non-modal dialog displayed on the top of
running applications. Functionality is based on HbNotificationDialog and it uses
@@ -46,9 +48,18 @@
Main use of HbDeviceNotificationDialog is to show information to user without user input.
+ \section _usecases HbDeviceNotificationDialog use cases
+
+ Use cases in this section:
+ - \ref _uc2
+ - \ref _uc2_001
+ - \ref _uc2_002
+
+ \subsection _uc2 Creating a device notification dialog
+
+ The following code snippet creates a device notification dialog containing title, text and icon.
+
\code
- Following code snippet creates a device notification dialog containing title, text and icon.
-
QString iconName("C:/xxxx.png");
HbDeviceNotificationDialog notificationDialog;
@@ -66,8 +77,10 @@
When using convenience methods, it is not possible to receive user interaction events,
because the HbDeviceNotificationDialog instance is destroyed when the call returns. Ownership
- and handling of the dialog is transferred to HbDeviceDialog framework. Also dialog can not
- be closed nor updated.
+ and handling of the dialog is transferred to HbDeviceDialog framework. In this case the dialog
+ can neither be closed nor updated programmatically.
+
+ \subsection _uc2_001 Receiving user interactions events
Below is an example of receiving user interaction events from device notification dialog. With
following example user is able to receive activated and close events. Note that
@@ -83,45 +96,43 @@
mNotificationDialog->show();
\endcode
- HbDeviceNotificationDialog supports animations.
+ \subsection _uc2_002 Using animations in a device notification dialog
+
+ HbDeviceNotificationDialog supports animations.
Supported formats are the following.
- GIF (.gif)
- MNG (.mng)
- - Frame animations
-
- There is a built-in support for GIF and MNG animations.
-
- Frame animations can be created by following way:
+ - Frame animations (.axml)
- \code
- Create an animation definition file.
+ There is a built-in support for GIF and MNG animations.
- <animations>
- <icon name="frame_anim_looping" playmode="loop">
- <frame duration="100">c:\icon1.svg</frame>
- <frame duration="200">c:\icon2.svg</frame>
- <frame duration="300">c:\icon3.svg</frame>
- </icon>
- </animations>
+ Frame animations can be used by first creating an animation definition file:
- Create HbDeviceNotificationDialog in a way described before and
- set definition file and animation's logical name.
-
- QString animationDefinitionXML("c:\animation.axml");
- QString logicalIconName("frame_anim_looping");
-
- mNotificationDialog->setAnimationDefinition(animationDefinitionXML);
- mNotificationDialog->setIconName(logicalIconName);
+ \code
+ <animations>
+ <icon name="frame_anim_looping" playmode="loop">
+ <frame duration="100">c:\icon1.svg</frame>
+ <frame duration="200">c:\icon2.svg</frame>
+ <frame duration="300">c:\icon3.svg</frame>
+ </icon>
+ </animations>
+ \endcode
- \endcode
- \sa HbIconAnimationManager::addDefinitionFile
- \note Animation definition files must be stored to a place where they
- can be accessed.
+ After this, create a HbDeviceNotificationDialog as described above and
+ set the definition file and the logical name of the animation:
+
+ \code
+ QString animationDefinitionXML("c:\animation.axml");
+ QString logicalIconName("frame_anim_looping");
- \beta
- \hbwidgets
+ mNotificationDialog->setAnimationDefinition(animationDefinitionXML);
+ mNotificationDialog->setIconName(logicalIconName);
+ \endcode
+ \sa HbIconAnimationManager::addDefinitionFile
+ \note Animation definition files must be stored in a place where they can
+ be accessed.
*/
/*!
@@ -507,10 +518,12 @@
}
/*!
- Get title text wrapping setting.
+ Returns the style of text wrapping for the title.
- \sa setTitleTextWrapping()
-*/
+ The default is Hb::TextWordWrap.
+
+ \sa setTitleTextWrapping()
+ */
Hb::TextWrapping HbDeviceNotificationDialog::titleTextWrapping() const
{
TRACE_ENTRY
@@ -520,7 +533,7 @@
}
/*!
- Get title animation definition file name.
+ Returns the animation definition file name.
\sa setAnimationDefinition()
*/
--- a/src/hbwidgets/devicedialogs/hbdevicenotificationdialogsymbian.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/devicedialogs/hbdevicenotificationdialogsymbian.cpp Fri May 14 16:09:54 2010 +0300
@@ -277,7 +277,7 @@
\note Animation definition files must be stored to a place where they
can be accessed.
- \proto
+ \stable
\hbwidgets
*/
@@ -449,15 +449,6 @@
}
/*!
- \deprecated CHbDeviceNotificationDialogSymbian::EnableTouchActivationL(int)
- is deprecated. Use CHbDeviceNotificationDialogSymbian::EnableTouchActivation(TBool aEnable) instead.
-*/
-EXPORT_C void CHbDeviceNotificationDialogSymbian::EnableTouchActivationL(TBool aEnable)
- {
- EnableTouchActivation(aEnable);
- }
-
-/*!
Enable user interaction on dialog. Setting is not set, if Show() or Update()
is not called.
\param aEnable - When enabled, activation event is notified via observer interface.
@@ -481,15 +472,6 @@
}
/*!
- \deprecated CHbDeviceNotificationDialogSymbian::SetTimeoutL(int)
- is deprecated. Use CHbDeviceNotificationDialogSymbian::SetTimeout(TInt aTimeout) instead.
-*/
-EXPORT_C void CHbDeviceNotificationDialogSymbian::SetTimeoutL(TInt aTimeout)
- {
- SetTimeout(aTimeout);
- }
-
-/*!
Set dialog timeout. Timeout is not set, if Show() or Update()
is not called.
\param aTimeout - Set timeout for dialog.
@@ -513,17 +495,6 @@
}
/*!
- \deprecated CHbDeviceNotificationDialogSymbian::SetTitleTextWrappingL(CHbDeviceNotificationDialogSymbian::TextWrapping)
- is deprecated. Use CHbDeviceNotificationDialogSymbian::SetTitleTextWrapping(TextWrapping aWrapping) instead.
-
-*/
-EXPORT_C void CHbDeviceNotificationDialogSymbian::SetTitleTextWrappingL(
- TextWrapping aWrapping)
- {
- SetTitleTextWrapping(aWrapping);
- }
-
-/*!
Set dialog title text wrapping. Text wrapping is not set, if Show() or Update()
is not called.
\param aWrapping - Defines title text wrapping.
--- a/src/hbwidgets/devicedialogs/hbdevicenotificationdialogsymbian.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/devicedialogs/hbdevicenotificationdialogsymbian.h Fri May 14 16:09:54 2010 +0300
@@ -75,15 +75,12 @@
IMPORT_C void SetTitleL(const TDesC& aTitle);
IMPORT_C const TPtrC Title() const;
- IMPORT_C void EnableTouchActivationL(TBool aEnable); // deprecated
IMPORT_C void EnableTouchActivation(TBool aEnable);
IMPORT_C TBool IsTouchActivating() const;
- IMPORT_C void SetTimeoutL(TInt aTimeout); // deprecated
IMPORT_C void SetTimeout(TInt aTimeout);
IMPORT_C TInt Timeout() const;
- IMPORT_C void SetTitleTextWrappingL(TextWrapping aWrapping); // deprecated
IMPORT_C void SetTitleTextWrapping(TextWrapping aWrapping);
IMPORT_C TextWrapping TitleTextWrapping() const;
--- a/src/hbwidgets/devicedialogs/hbdeviceprogressdialog.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/devicedialogs/hbdeviceprogressdialog.cpp Fri May 14 16:09:54 2010 +0300
@@ -76,9 +76,7 @@
}
q->setProgressValue(0);
q->setText(text);
- q->setTextAlignment(Qt::AlignLeft|Qt::AlignVCenter);
q->setIconName(text);
- q->setIconAlignment(Qt::AlignCenter);
q->setAnimationDefinition(text);
}
@@ -105,9 +103,7 @@
"value",
"autoClose",
"text",
- "textAlignment",
"iconName",
- "iconAlignment",
"animationDefinition"
};
@@ -122,20 +118,17 @@
}
static const char * const actionNames[] = {
- "primaryActionText"
- };
- static const char * const nullActionNames[] = {
- "primaryActionNull"
+ "cancelAction"
};
for(int i = 0; i < NumActions; i++) {
if (mActions[i].mFlags & Modified) {
if (show || !(mActions[i].mFlags & SentToServer)) {
+ QString actionData; // empty removes action at the plugin
if (mActions[i].mAction) {
- parameters.insert(actionNames[i], mActions[i].mAction->text());
- } else {
- parameters.insert(nullActionNames[i], true);
+ actionData.append("t:").append(mActions[i].mAction->text());
}
+ parameters.insert(actionNames[i], actionData);
mActions[i].mFlags |= SentToServer;
}
}
@@ -270,7 +263,7 @@
const char *key = "act";
QVariantMap::const_iterator i = data.find(key);
if (i != data.constEnd()) {
- if (i.value().toString() == "p") {
+ if (i.value().toString() == "c") {
// Client has pressed button. Signal action if one is set. Otherwise emit
// cancelled() signal.
mActions[CancelButton].mTriggered = true;
@@ -360,7 +353,7 @@
\endcode
\sa HbProgressDialog, HbDialog, HbDeviceDialog
- \alpha
+ \stable
\hbwidgets
*/
@@ -457,20 +450,6 @@
/*!
Closes the dialog.
-
- \deprecated HbDeviceProgressDialog::cancel()
- is deprecated. Replaced by HbDeviceProgressDialog::close().
-
-*/
-void HbDeviceProgressDialog::cancel()
-{
- TRACE_ENTRY
- return d->cancel();
- TRACE_EXIT
-}
-
-/*!
- Closes the dialog.
*/
void HbDeviceProgressDialog::close()
{
@@ -658,64 +637,6 @@
}
/*!
- Sets the text alignment.
-
- \param align Qt defined alignment options can used.
-
- \sa textAlignment()
-*/
-void HbDeviceProgressDialog::setTextAlignment(Qt::Alignment align)
-{
- TRACE_ENTRY
- d->setProperty(HbDeviceProgressDialogPrivate::TextAlignment, align);
- TRACE_EXIT
-}
-
-/*!
- Returns the text alignment.
-
- The default value is Qt::AlignLeft|Qt::AlignVCenter
-
- \sa setTextAlignment()
-*/
-Qt::Alignment HbDeviceProgressDialog::textAlignment() const
-{
- return static_cast<Qt::Alignment>
- (d->mProperties[HbDeviceProgressDialogPrivate::TextAlignment].mValue.toInt());
-}
-
-/*!
- Sets the text wrapping.
-
- \param wrap When set, the text is drawn with Qt::TextWordWrap enabled meaning that
- lines breaks are at appropriate point, e.g. at word boundaries.
-
- \sa textWrapping()
-
- \deprecated HbDeviceProgressDialog::setTextWrapping(bool)
- is deprecated. Will be removed.
-*/
-void HbDeviceProgressDialog::setTextWrapping(bool wrap)
-{
- TRACE_ENTRY
- Q_UNUSED(wrap)
- TRACE_EXIT
-}
-
-/*!
- Returns the text wrapping setting. Default value is true.
-
- \sa setTextWrapping()
-
- \deprecated HbDeviceProgressDialog::textWrapping() const
- is deprecated. Will be removed.
-*/
-bool HbDeviceProgressDialog::textWrapping() const
-{
- return true;
-}
-
-/*!
Sets message box icon name or animation logical name.
\param aIconName Icon name. Icon can be from Hb resources or themes. Or can be a file in
@@ -741,31 +662,6 @@
}
/*!
- Sets the icon alignment.
-
- \param align Qt defined alignment options can used.
-
- \sa iconAlignment()
-*/
-void HbDeviceProgressDialog::setIconAlignment(Qt::Alignment align)
-{
- TRACE_ENTRY
- d->setProperty(HbDeviceProgressDialogPrivate::IconAlignment, align);
- TRACE_EXIT
-}
-
-/*!
- Returns the icon alignment. Default value is Qt::AlignCenter.
-
- \sa setIconAlignment()
-*/
-Qt::Alignment HbDeviceProgressDialog::iconAlignment() const
-{
- return static_cast<Qt::Alignment>
- (d->mProperties[HbDeviceProgressDialogPrivate::IconAlignment].mValue.toInt());
-}
-
-/*!
Sets animation definition to a dialog. Animation's logical name has to be set
using setIcon(). Animation definition files must be stored to a place where they
can be accessed by device dialog service.
--- a/src/hbwidgets/devicedialogs/hbdeviceprogressdialog.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/devicedialogs/hbdeviceprogressdialog.h Fri May 14 16:09:54 2010 +0300
@@ -43,10 +43,7 @@
Q_PROPERTY(HbProgressDialog::ProgressDialogType progressType
READ progressType WRITE setProgressType)
Q_PROPERTY(QString text READ text WRITE setText)
- Q_PROPERTY(Qt::Alignment textAlignment READ textAlignment WRITE setTextAlignment)
- Q_PROPERTY(bool textWrapping READ textWrapping WRITE setTextWrapping) // deprecated
Q_PROPERTY(QString iconName READ iconName WRITE setIconName)
- Q_PROPERTY(Qt::Alignment iconAlignment READ iconAlignment WRITE setIconAlignment)
Q_PROPERTY(QString animationDefinition READ animationDefinition WRITE setAnimationDefinition)
public:
@@ -61,7 +58,6 @@
void show();
void update();
- void cancel(); // deprecated
void close();
const QAction *triggeredAction() const;
@@ -83,18 +79,9 @@
void setText(const QString &text);
QString text() const;
- void setTextAlignment(Qt::Alignment align);
- Qt::Alignment textAlignment() const;
-
- void setTextWrapping(bool wrap); // deprecated
- bool textWrapping() const; // deprecated
-
void setIconName(const QString &iconName);
QString iconName() const;
- void setIconAlignment(Qt::Alignment align);
- Qt::Alignment iconAlignment() const;
-
void setAnimationDefinition(QString &animationDefinition);
QString animationDefinition() const;
--- a/src/hbwidgets/devicedialogs/hbdeviceprogressdialog_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/devicedialogs/hbdeviceprogressdialog_p.h Fri May 14 16:09:54 2010 +0300
@@ -47,9 +47,7 @@
Value,
AutoClose,
Text,
- TextAlignment,
IconName,
- IconAlignment,
AnimationDefinition,
NumProperties
};
--- a/src/hbwidgets/devicedialogs/hbdeviceprogressdialogsymbian.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/devicedialogs/hbdeviceprogressdialogsymbian.cpp Fri May 14 16:09:54 2010 +0300
@@ -35,16 +35,10 @@
_LIT(KDialogAutoClose, "autoClose");
_LIT(KDialogText, "text");
_LIT(KDialogIconName, "iconName");
-_LIT(KDialogTextAlign, "textAlignment");
-_LIT(KDialogIconAlign, "iconAlignment");
-_LIT(KPrimaryActionText, "primaryActionText");
-_LIT(KPrimaryActionNull, "primaryActionNull");
+_LIT(KCancelAction, "cancelAction");
_LIT(KPluginIdentifier, "com.nokia.hb.deviceprogressdialog/1.0");
_LIT(KAnimationDefinition, "animationDefinition");
-const TInt KAlignCenterLeft = 0x0080 | 0x0001; //Qt::AlignVCenter | Qt::AlignLeft
-const TInt KAlignCenter = 0x0080 | 0x0004; //Qt::AlignCenter
-
NONSHARABLE_CLASS(CHbDeviceProgressDialogSymbianPrivate) : public CBase,
public MHbDeviceDialogObserver
{
@@ -61,6 +55,7 @@
void AddVariantL(const TDesC& aKey, const TAny* aData,
CHbSymbianVariant::TType aDataType, CHbSymbianVariantMap* map);
const CHbSymbianVariant* Variant(const TDesC& aKey) const;
+ static HBufC *CreateActionDataLC(TBool aNull, const TDesC &text);
public: // MHbDeviceDialogObserver
void DataReceived(CHbSymbianVariantMap& aData);
@@ -82,9 +77,6 @@
TBool iAutoClose;
TInt iType;
TInt iProgressValue;
- TInt iTextAlign;
- TInt iIconAlign;
- TBool iWrap;
RBuf iText;
RBuf iIconName;
RBuf iAnimationDefinition;
@@ -142,8 +134,6 @@
AddVariantL(KDialogMinimum, &iMinimum, CHbSymbianVariant::EInt, iVariantMap);
AddVariantL(KDialogAutoClose, &iAutoClose, CHbSymbianVariant::EBool, iVariantMap);
AddVariantL(KDialogValue, &iProgressValue, CHbSymbianVariant::EInt, iVariantMap);
- AddVariantL(KDialogTextAlign, &iTextAlign, CHbSymbianVariant::EInt, iVariantMap);
- AddVariantL(KDialogIconAlign, &iIconAlign, CHbSymbianVariant::EInt, iVariantMap);
if (iText.Length() > 0)
{
@@ -161,15 +151,9 @@
{
iButton.iFlags.iTextModified = false;
iButton.iFlags.iIsNullModified = false;
- TBool isNull = iButton.iFlags.iIsNull;
- if (isNull)
- {
- AddVariantL(KPrimaryActionNull, &isNull, CHbSymbianVariant::EBool, iVariantMap);
- }
- else
- {
- AddVariantL(KPrimaryActionText, &iButton.iText, CHbSymbianVariant::EDes, iVariantMap);
- }
+ HBufC *actionData = CreateActionDataLC(iButton.iFlags.iIsNull, iButton.iText);
+ AddVariantL(KCancelAction, actionData, CHbSymbianVariant::EDes, iVariantMap);
+ CleanupStack::PopAndDestroy(); // actionData
}
iButton.iFlags.iPressed = false;
User::LeaveIfError(iDeviceDialog->Show(KPluginIdentifier, *iVariantMap, this));
@@ -221,20 +205,6 @@
AddVariantL(KDialogValue, &iProgressValue, CHbSymbianVariant::EInt, map);
}
- variant = Variant(KDialogTextAlign);
- if (variant && *variant->Value<TInt>() != iTextAlign)
- {
- AddVariantL(KDialogTextAlign, &iTextAlign, CHbSymbianVariant::EInt, iVariantMap);
- AddVariantL(KDialogTextAlign, &iTextAlign, CHbSymbianVariant::EInt, map);
- }
-
- variant = Variant(KDialogIconAlign);
- if (variant && *variant->Value<TInt>() != iIconAlign)
- {
- AddVariantL(KDialogIconAlign, &iIconAlign, CHbSymbianVariant::EInt, iVariantMap);
- AddVariantL(KDialogIconAlign, &iIconAlign, CHbSymbianVariant::EInt, map);
- }
-
variant = Variant(KDialogText);
if (variant && iText == *variant->Value<TDesC>())
{
@@ -260,15 +230,9 @@
{
iButton.iFlags.iTextModified = false;
iButton.iFlags.iIsNullModified = false;
- TBool isNull = iButton.iFlags.iIsNull;
- if (isNull)
- {
- AddVariantL(KPrimaryActionNull, &isNull, CHbSymbianVariant::EBool, iVariantMap);
- }
- else
- {
- AddVariantL(KPrimaryActionText, &iButton.iText, CHbSymbianVariant::EDes, iVariantMap);
- }
+ HBufC *actionData = CreateActionDataLC(iButton.iFlags.iIsNull, iButton.iText);
+ AddVariantL(KCancelAction, actionData, CHbSymbianVariant::EDes, iVariantMap);
+ CleanupStack::PopAndDestroy(); // actionData
}
User::LeaveIfError(iDeviceDialog->Update(*map));
@@ -283,8 +247,8 @@
if (variant)
{
const TDesC *value = variant->Value<const TDesC>();
- _LIT(KPrimary, "p");
- if (value && *value == KPrimary)
+ _LIT(KCancel, "c");
+ if (value && *value == KCancel)
{
iButton.iFlags.iPressed = true;
if (iObserver)
@@ -329,6 +293,26 @@
return iVariantMap->Get(aKey);
}
+// Pack into a string a data for cancel button
+HBufC *CHbDeviceProgressDialogSymbianPrivate::CreateActionDataLC(TBool aNull, const TDesC &text)
+{
+ HBufC *actionData;
+ if (aNull)
+ {
+ actionData = HBufC::NewL(0);
+ }
+ else
+ {
+ _LIT(KtextTag, "t:");
+ actionData = HBufC::NewL(text.Length() + KtextTag().Length());
+ TPtr ptr = actionData->Des();
+ ptr.Append(KtextTag);
+ ptr.Append(text);
+ }
+ CleanupStack::PushL(actionData);
+ return actionData;
+}
+
/*!
\class MHbDeviceProgressDialogObserver
\brief MHbDeviceProgressDialogObserver is an observer interface for observing CHbDeviceProgressDialogSymbian.
@@ -444,7 +428,7 @@
can be accessed.
\sa HbDeviceProgressDialog, HbDeviceDialog
- \proto
+ \stable
\hbwidgets
*/
/*!
@@ -504,18 +488,6 @@
}
/*!
- Cancels and closes the dialog.
-
- \deprecated CHbDeviceProgressDialogSymbian::Cancel()
- is deprecated. Replaced by CHbDeviceProgressDialogSymbian::Close().
-
-*/
-EXPORT_C void CHbDeviceProgressDialogSymbian::Cancel()
- {
- d->Close();
- }
-
-/*!
Closes the dialog.
*/
EXPORT_C void CHbDeviceProgressDialogSymbian::Close()
@@ -738,77 +710,6 @@
}
/*!
- Sets the text alignment.
- \param aAlign Qt defined alignment options can used.
- \sa TextAlignment()
-*/
-EXPORT_C void CHbDeviceProgressDialogSymbian::SetTextAlignment(TInt aAlign)
- {
- d->iTextAlign = aAlign;
- }
-
-/*!
- Returns the text alignment.
-
- The default value is Qt::AlignLeft|Qt::AlignVCenter.
- \sa SetTextAlignment()
-*/
-EXPORT_C TInt CHbDeviceProgressDialogSymbian::TextAlignment() const
- {
- return d->iTextAlign;
- }
-
-/*!
- Sets the icon alignment.
- \param aAlign Qt defined alignment options can used.
- \sa IconAlignment()
-*/
-EXPORT_C void CHbDeviceProgressDialogSymbian::SetIconAlignment(TInt aAlign)
- {
- d->iIconAlign = aAlign;
- }
-
-/*!
- Returns the icon alignment.
-
- The default value is Qt::AlignCenter.
- \sa SetIconAlignment()
-*/
-EXPORT_C TInt CHbDeviceProgressDialogSymbian::IconAlignment() const
- {
- return d->iIconAlign;
- }
-
-/*!
- Sets the text wrapping.
- \param aWrap When set, the text is drawn with Qt::TextWordWrap enabled meaning that
- lines breaks are at appropriate point, e.g. at word boundaries.
- \sa TextWrapping()
-
- \deprecated CHbDeviceProgressDialogSymbian::SetTextWrapping(int)
- is deprecated. Will be removed.
-
-*/
-EXPORT_C void CHbDeviceProgressDialogSymbian::SetTextWrapping(TBool aWrap)
- {
- d->iWrap = aWrap;
- }
-
-/*!
- Returns the text wrapping setting.
-
- The default value is true.
- \sa SetTextWrapping()
-
- \deprecated CHbDeviceProgressDialogSymbian::TextWrapping() const
- is deprecated. Will be removed.
-*/
-EXPORT_C TBool CHbDeviceProgressDialogSymbian::TextWrapping() const
- {
- return d->iWrap;
- }
-
-/*!
Sets progress dialog box button text. The dialog gets updated next time ShowL() or UpdateL()
is called.
@@ -891,7 +792,4 @@
d->ConstructL(this);
SetProgressType(aType);
SetProgressValue(0);
- SetTextAlignment(KAlignCenterLeft);
- SetIconAlignment(KAlignCenter);
- SetTextWrapping(ETrue);
}
--- a/src/hbwidgets/devicedialogs/hbdeviceprogressdialogsymbian.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/devicedialogs/hbdeviceprogressdialogsymbian.h Fri May 14 16:09:54 2010 +0300
@@ -48,7 +48,6 @@
IMPORT_C void ShowL();
IMPORT_C void UpdateL();
- IMPORT_C void Cancel(); // deprecated
IMPORT_C void Close();
IMPORT_C void SetRange(TInt aMin, TInt aMax);
@@ -77,15 +76,6 @@
IMPORT_C void SetAnimationDefinitionL(const TDesC& aAnimationDefinition);
IMPORT_C TPtrC AnimationDefinition() const;
- IMPORT_C void SetTextAlignment(TInt aAlign);
- IMPORT_C TInt TextAlignment() const;
-
- IMPORT_C void SetIconAlignment(TInt aAlign);
- IMPORT_C TInt IconAlignment() const;
-
- IMPORT_C void SetTextWrapping(TBool aWrap); // deprecated
- IMPORT_C TBool TextWrapping() const; // deprecated
-
IMPORT_C void SetButtonTextL(const TDesC& aText);
IMPORT_C const TPtrC ButtonText() const;
--- a/src/hbwidgets/editors/hbabstractedit.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/editors/hbabstractedit.cpp Fri May 14 16:09:54 2010 +0300
@@ -28,7 +28,7 @@
#include "hbvalidator.h"
#include "hbstyle.h"
-#include "hbstyleoption.h"
+#include "hbstyleoption_p.h"
#include "hbwidget.h"
#include "hbscrollarea.h"
#include "hbevent.h"
@@ -1012,18 +1012,18 @@
#ifndef QT_NO_TEXTHTMLPARSER
if (source->hasFormat(QLatin1String("application/x-qrichtext"))) {
QString richtext = QString::fromUtf8(source->data(QLatin1String("application/x-qrichtext")));
- richtext.prepend(QLatin1String("<meta name=\"qrichtext\" content=\"1\" />"));
- fragment = QTextDocumentFragment::fromHtml(richtext, d->doc);
+ richtext.prepend(QLatin1String("<meta name=\"qrichtext\" content=\"1\" />"));
+ fragment = QTextDocumentFragment::fromHtml(filterInputText(richtext), d->doc);
hasData = true;
} else if (source->hasHtml()) {
- fragment = QTextDocumentFragment::fromHtml(source->html(), d->doc);
+ fragment = QTextDocumentFragment::fromHtml(filterInputText(source->html()), d->doc);
hasData = true;
} else
#endif //QT_NO_TEXTHTMLPARSER
{
QString text = source->text();
if (!text.isNull()) {
- fragment = QTextDocumentFragment::fromPlainText(text);
+ fragment = QTextDocumentFragment::fromPlainText(filterInputText(text));
hasData = true;
}
}
@@ -1327,9 +1327,8 @@
emit aboutToShowContextMenu(menu, d->tapPosition);
- d->minimizeInputPanel();
-
if(menu->actions().count() > 0){
+ d->minimizeInputPanel();
menu->setPreferredPos(position);
menu->show();
}
@@ -1711,3 +1710,22 @@
event->ignore();
}
}
+
+/*!
+ Returns the filtered text, or \a text if no input filter attached to editor.
+*/
+QString HbAbstractEdit::filterInputText(const QString &text)
+{
+ HbEditorInterface editorInterface(this);
+ HbInputFilter *inputFilter = editorInterface.filter();
+ if (!text.isEmpty() && inputFilter) {
+ QString filteredText;
+ foreach(QChar c, text) {
+ if (inputFilter->filter(c)) {
+ filteredText.append(c);
+ }
+ }
+ return filteredText;
+ }
+ return text;
+}
--- a/src/hbwidgets/editors/hbabstractedit.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/editors/hbabstractedit.h Fri May 14 16:09:54 2010 +0300
@@ -163,6 +163,7 @@
virtual HbMenu* createContextMenu();
void showContextMenu(QPointF position = QPointF(0,0));
virtual QMimeData *createMimeDataFromSelection() const;
+ QString filterInputText(const QString &text);
virtual bool canInsertFromMimeData(const QMimeData *source) const;
virtual void insertFromMimeData(const QMimeData *source);
--- a/src/hbwidgets/editors/hbabstractedit_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/editors/hbabstractedit_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -36,7 +36,7 @@
#include "hbabstractedit_p.h"
#include "hbabstractedit.h"
-#include "hbstyleoption.h"
+#include "hbstyleoption_p.h"
#include "hbscrollarea.h"
#include "hbvalidator.h"
#include "hbmeshlayout_p.h"
--- a/src/hbwidgets/editors/hbformatdialog.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/editors/hbformatdialog.cpp Fri May 14 16:09:54 2010 +0300
@@ -311,29 +311,29 @@
{
Q_D(HbFormatDialog);
- QTextCursor cursor = d->editor->textCursor();
+ int indent;
QTextListFormat::Style style;
+ QTextCursor cursor = d->editor->textCursor();
+
+ cursor.beginEditBlock();
if (toggled) {
+ indent = 1;
style = QTextListFormat::ListDisc;
} else {
+ indent = 0;
style = QTextListFormat::ListStyleUndefined;
}
- QTextBlockFormat blockFmt;
- cursor.beginEditBlock();
- blockFmt = cursor.blockFormat();
QTextListFormat listFmt;
- int indent = blockFmt.indent() + 1;
if (cursor.currentList()) {
listFmt = cursor.currentList()->format();
- if (!toggled)
- indent = 0;
- } else {
- blockFmt.setIndent(0);
- cursor.setBlockFormat(blockFmt);
}
listFmt.setIndent(indent);
listFmt.setStyle(style);
- cursor.createList(listFmt);
+ if (!cursor.currentList()) {
+ cursor.createList(listFmt);
+ } else {
+ cursor.currentList()->setFormat(listFmt);
+ }
cursor.endEditBlock();
}
--- a/src/hbwidgets/editors/hbformatdialog.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/editors/hbformatdialog.h Fri May 14 16:09:54 2010 +0300
@@ -71,6 +71,7 @@
Q_DECLARE_PRIVATE_D(d_ptr, HbFormatDialog)
Q_PRIVATE_SLOT(d_func(), void _q_setColor())
Q_PRIVATE_SLOT(d_func(), void _q_setAlignment(bool))
+ Q_PRIVATE_SLOT(d_func(), void _q_colorSelected(QColor))
};
typedef QPointer <HbFormatDialog> HbFormatDialogPointer;
--- a/src/hbwidgets/editors/hbformatdialog_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/editors/hbformatdialog_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -40,13 +40,13 @@
#include <hbabstractedit.h>
#include <hbpushbutton.h>
#include <hbcolordialog.h>
+#include <hbcolorscheme.h>
#include <QSharedData>
#include <QTextCursor>
#include <QPainter>
-HbFormatDialogPrivate::HbFormatDialogPrivate() :
- editor(0)
+HbFormatDialogPrivate::HbFormatDialogPrivate() : editor(0)
{}
HbFormatDialogPrivate::~HbFormatDialogPrivate()
@@ -78,9 +78,15 @@
QTextCursor cursor = editor->textCursor();
QTextCharFormat fmt = cursor.charFormat();
QColor color = fmt.foreground().color();
- HbColorDialog dialog;
- dialog.setInitialColor(color);
- color = dialog.getColor();
+ QList<QColor> defaultColors;
+ HbColorDialog::getColor(defaultColors, color, q, SLOT(_q_colorSelected(const QColor &)));
+}
+
+void HbFormatDialogPrivate::_q_colorSelected(const QColor &color)
+{
+ Q_Q(HbFormatDialog);
+ QTextCursor cursor = editor->textCursor();
+ QTextCharFormat fmt = cursor.charFormat();
if (!color.isValid())
return;
fmt.setForeground(color);
@@ -91,9 +97,11 @@
void HbFormatDialogPrivate::colorChanged(const QColor &color)
{
HbIcon icon("qtg_graf_colorpicker_filled");
+ icon.setFlags(HbIcon::Colorized);
+ icon.setColor(HbColorScheme::color("qtc_button_normal"));
HbIcon maskIcon("qtg_graf_colorpicker_mask");
QPixmap maskPixmap = maskIcon.pixmap();
- QPainter mp(&maskPixmap);
+ QPainter mp(&maskPixmap);
mp.setCompositionMode(QPainter::CompositionMode_SourceIn);
mp.fillRect(maskPixmap.rect(),color);
mp.setCompositionMode(QPainter::CompositionMode_DestinationOver);
--- a/src/hbwidgets/editors/hbformatdialog_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/editors/hbformatdialog_p.h Fri May 14 16:09:54 2010 +0300
@@ -58,6 +58,7 @@
void colorChanged(const QColor &);
void setAlignment(Qt::Alignment);
void _q_setAlignment(bool);
+ void _q_colorSelected(const QColor &);
HbAbstractEdit *editor;
QGraphicsGridLayout* layout;
--- a/src/hbwidgets/editors/hblineedit.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/editors/hblineedit.cpp Fri May 14 16:09:54 2010 +0300
@@ -26,7 +26,7 @@
#include "hblineedit.h"
#include "hblineedit_p.h"
-#include "hbstyleoption.h"
+#include "hbstyleoption_p.h"
#include "hbscrollarea.h"
#ifdef HB_TEXT_MEASUREMENT_UTILITY
#include "hbtextmeasurementutility_p.h"
@@ -606,7 +606,9 @@
if (!(d->interactionFlags & Qt::TextEditable) || !source)
return;
- QString txt = source->text().replace(QString("\n"),QString(" "));
+ QString text = source->text().replace(QString("\n"),QString(" "));
+
+ QString txt = filterInputText(text);
if (!txt.isNull()) {
--- a/src/hbwidgets/editors/hbselectioncontrol_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/editors/hbselectioncontrol_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -35,7 +35,7 @@
//
#include "hbselectioncontrol_p.h"
-#include "hbstyleoption.h"
+#include "hbstyleoption_p.h"
#include "hbeffect.h"
#include "hbdialog_p.h"
#include "hbabstractedit.h"
@@ -96,7 +96,6 @@
HbAbstractEdit *mEdit;
QGraphicsItem *mTopLevelAncestor;
- QPointF mMouseOffset;
QGraphicsItem *mSelectionStartHandle;
QGraphicsItem *mSelectionEndHandle;
@@ -300,7 +299,6 @@
// Find out which handle is being moved
if (mSelectionStartTouchArea->contains(q->mapToItem(mSelectionStartTouchArea, point))) {
mPressed = HbSelectionControl::SelectionStartHandle;
- mMouseOffset = mSelectionStartHandle->pos() - point;
}
if (mSelectionEndTouchArea->contains(q->mapToItem(mSelectionEndTouchArea, point))) {
bool useArea = true;
@@ -322,7 +320,6 @@
}
if (useArea) {
mPressed = HbSelectionControl::SelectionEndHandle;
- mMouseOffset = mSelectionEndHandle->pos() - point;
}
}
@@ -379,11 +376,23 @@
{
Q_Q(HbSelectionControl);
+ QRectF docRect = QRectF(mEdit->mapFromItem(HbAbstractEditPrivate::d_ptr(mEdit)->canvas->parentItem(),
+ HbAbstractEditPrivate::d_ptr(mEdit)->canvas->pos()),
+ HbAbstractEditPrivate::d_ptr(mEdit)->doc->size());
+
QPointF editPos = mEdit->mapFromScene(gesture->sceneStartPos() + gesture->sceneOffset());
+ QPointF origEditPos = editPos;
+ bool outsideCanvas = !docRect.contains(origEditPos);
+
+ // Constrain editPos within docRect
+ editPos = QPointF(qMin(qMax(editPos.x(),docRect.left()),docRect.right()),
+ qMin(qMax(editPos.y(),docRect.top()),docRect.bottom()));
QRectF handleRect = mSelectionStartHandle->boundingRect();
- handleRect.moveTopLeft(editPos + mMouseOffset);
+ handleRect.moveCenter(editPos);
+
+ // Set hitTestPos based on which handle was grabbed
QPointF hitTestPos = handleRect.center();
if (mPressed == HbSelectionControl::SelectionStartHandle) {
@@ -392,14 +401,25 @@
hitTestPos.setY(handleRect.top()-1);
}
- QTextCursor cursor = mEdit->textCursor();
+ // Override hitTestPos if origEditPos was outside the canvas
+ if (outsideCanvas) {
+ if (origEditPos.y() < docRect.top()) {
+ hitTestPos.setY(handleRect.bottom()+1);
+ } else if (docRect.bottom() < origEditPos.y()) {
+ hitTestPos.setY(handleRect.top()-1);
+ }
+ }
+
+ QTextCursor cursor;
+ cursor = mEdit->textCursor();
// Hit test for the center of current selection touch area
int hitPos = HbAbstractEditPrivate::d_ptr(mEdit)->hitTest(hitTestPos,Qt::FuzzyHit);
+
+ // if no valid hit pos or empty selection return
if (hitPos == -1 || hitPos == cursor.anchor()) {
return;
}
-
bool handlesMoved(false);
if (hitPos != cursor.position()) {
handlesMoved = true;
--- a/src/hbwidgets/editors/hbvalidator.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/editors/hbvalidator.cpp Fri May 14 16:09:54 2010 +0300
@@ -305,41 +305,3 @@
{
Q_UNUSED(cursor);
}
-
-/*!
- \deprecated HbValidator::addSeparator(const QString&)
- is deprecated. You can use addDefaultSeparator or addField with separator parameter instead of this.
-
- */
-void HbValidator::addSeparator(const QString &str)
-{
- qWarning() << "call of DEPRECATED method HbValidator::addSeparator";
- setDefaultSeparator(str);
-}
-
-/*!
- \deprecated HbValidator::setMasterValidator(QValidator*)
- is deprecated. Master validator is not needed anymore. Use only addField.
-
- */
-void HbValidator::setMasterValidator(QValidator *validator)
-{
- qWarning() << "call of DEPRECATED method HbValidator::setMasterValidator";
-
- // ownership was taken over, but muster validator is not needed
- delete validator; // DEPRECATED
-}
-
-/*!
- \deprecated HbValidator::masterValidator() const
- is deprecated. Master validator is not needed anymore. Use only addField.
-
- */
-const QValidator *HbValidator::masterValidator() const
-{
- qWarning() << "call of DEPRECATED method HbValidator::masterValidator";
-
- // ownership was taken over, but muster validator is not needed
- return NULL;
-}
-
--- a/src/hbwidgets/editors/hbvalidator.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/editors/hbvalidator.h Fri May 14 16:09:54 2010 +0300
@@ -65,10 +65,6 @@
virtual void updateTextCursor(QTextCursor &cursor);
- void addSeparator(const QString &str); // DEPRECATED
- void setMasterValidator(QValidator *validator); // DEPRECATED
- const QValidator *masterValidator() const; // DEPRECATED
-
protected:
HbValidatorPrivate *const d_ptr;
HbValidator(HbValidatorPrivate &dd, QObject *parent);
--- a/src/hbwidgets/hbwidgets.pro Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/hbwidgets.pro Fri May 14 16:09:54 2010 +0300
@@ -69,6 +69,8 @@
#QMAKE_DISTCLEAN += $$hbNativePath($${HB_BUILD_DIR}/include/hbwidgets/private/*)
symbian {
+ defFilePath = defs
+
TARGET.EPOCALLOWDLLDATA = 1
TARGET.CAPABILITY = CAP_GENERAL_DLL
TARGET.UID3 = 0x20022FCC
--- a/src/hbwidgets/itemviews/hbabstractitemcontainer.cpp Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1439 +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 HbWidgets module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-#include "hbabstractitemcontainer.h"
-#include "hbabstractitemcontainer_p.h"
-
-#include "hbabstractviewitem.h"
-#include "hbabstractitemview.h"
-#include "hbabstractitemview_p.h"
-#include "hbmodeliterator.h"
-#include <hbapplication.h>
-
-#include <QGraphicsLayout>
-#include <QGraphicsSceneResizeEvent>
-#include <QEvent>
-#include <QDebug>
-
-
-// For QMAP_INT__ITEM_STATE_DEPRECATED's sake. Removed when QMap<int,QVariant> based state item system is removed
-#include <hbabstractviewitem_p.h>
-
-#ifdef QMAP_INT__ITEM_STATE_DEPRECATED
-#define HB_ITEM_STATE_ASSERT Q_ASSERT_X(0, "", "QMap<int,QVariant> based view item state system is deprecated. Use QHash<QString, QVariant> based instead" )
-#else
-#define HB_ITEM_STATE_ASSERT
-#endif
-
-/*!
- @alpha
- @hbwidgets
- \class HbAbstractItemContainer
- \deprecated HbAbstractItemContainer
- is deprecated from public API. This class will be made private.
- \brief HbAbstractItemContainer represents container for HbAbstractViewItem derived items.
-
-
- HbAbstractItemContainer is used in HbAbstractItemView to hold the layout and view items.
- Container should have a layout, otherwise its size is zero always.
- HbAbstractItemContainer can have any kind of layout as it child.
-*/
-
-/*!
- \fn void HbAbstractItemContainer::itemAdded(int index, HbAbstractViewItem *item)
- \deprecated HbAbstractItemContainer::itemAdded(int, HbAbstractViewItem *)
- is deprecated from public API. Class HbAbstractItemContainer will be made private.
-
- Function is called after new \a item was added into \a index position into
- container.
-*/
-
-/*!
- \fn void HbAbstractItemContainer::itemRemoved(HbAbstractViewItem *item)
- \deprecated HbAbstractItemContainer::itemRemoved(HbAbstractViewItem *)
- is deprecated from public API. Class HbAbstractItemContainer will be made private.
-
- Function is called after the \a item was removed from the container.
-*/
-
-/*!
- \fn void HbAbstractItemContainer::viewResized(const QSizeF &size)
- \deprecated HbAbstractItemContainer::viewResized(const QSizeF &)
- is deprecated from public API. Class HbAbstractItemContainer will be made private.
-
- Function is called when container needs to be resized.
-*/
-
-/*!
- \fn HbAbstractViewItem *createDefaultPrototype() const
- \deprecated HbAbstractItemContainer::createDefaultPrototype() const
- is deprecated from public API. Class HbAbstractItemContainer will be made private.
-
- Returns the default prototype.
-
- Subclasses of this class must implement this function to introduce their own default prototype.
- Default prototype is used to create view items unless the class user excplicitly sets prototype with setItemPrototype method.
- Implementation of this method must construct and return a new view item widget.
-*/
-
-const int HB_DEFAULT_BUFFERSIZE = 4;
-const int UpdateItemBufferEvent = QEvent::registerEventType();
-
-HbAbstractItemContainerPrivate::HbAbstractItemContainerPrivate() :
- HbWidgetPrivate(),
- mItemView(0),
- mBufferSize(HB_DEFAULT_BUFFERSIZE),
- mItemRecycling(false),
- mUniformItemSizes(false)
-{
-}
-
-HbAbstractItemContainerPrivate::~HbAbstractItemContainerPrivate()
-{
-}
-
-/*!
- Returns given item's bounding rectangle in scene coordinates.
- */
-QRectF HbAbstractItemContainerPrivate::itemBoundingRect(const QGraphicsItem *item) const
-{
- Q_Q(const HbAbstractItemContainer);
- if (q->layout()) {
- q->layout()->activate();
- }
- return item->mapToItem(mItemView, item->boundingRect()).boundingRect();
-}
-
-void HbAbstractItemContainerPrivate::firstAndLastVisibleBufferIndex(
- int& firstVisibleBufferIndex,
- int& lastVisibleBufferIndex,
- const QRectF &viewRect,
- bool fullyVisible) const
-{
- Q_Q(const HbAbstractItemContainer);
-
- if (q->layout() && !q->layout()->isActivated()) {
- q->layout()->activate();
- }
-
- firstVisibleBufferIndex = -1;
- lastVisibleBufferIndex = -1;
-
- int count = mItems.count();
- for (int i = 0; i < count; ++i) {
- if (visible(mItems.at(i), viewRect, fullyVisible)) {
- if (firstVisibleBufferIndex == -1) {
- firstVisibleBufferIndex = i;
- }
- lastVisibleBufferIndex = i;
- } else if ( lastVisibleBufferIndex != -1 ) {
- // no need to check the remaining ones.
- break;
- }
- }
-}
-
-/*!
- \private
-
- Returns true if given item is located within viewport (i.e. view), otherwise
- returns false. If fullyVisible parameter is true method will return true only
- for item that is shown fully. In this case for partially visible items false is returned.
-*/
-bool HbAbstractItemContainerPrivate::visible(HbAbstractViewItem* item, const QRectF &viewRect, bool fullyVisible) const
-{
- if (item) {
- QRectF itemRect(itemBoundingRect(item));
- if (fullyVisible) {
- if (viewRect.contains(itemRect)) {
- return true;
- }
- } else {
- if (viewRect.intersects(itemRect)) {
- return true;
- }
- }
- }
-
- return false;
-}
-
-/*!
- Clears the prototype list and deletes the prototypes.
-*/
-void HbAbstractItemContainerPrivate::deletePrototypes()
-{
- qDeleteAll(mPrototypes);
- mPrototypes.clear();
-}
-
-int HbAbstractItemContainerPrivate::findStateItem(const QModelIndex &index) const
-{
- for (int current = 0; current < mItemStateList.count(); ++current) {
- if (mItemStateList.at(current).index == index) {
- return current;
- }
- }
- return -1;
-}
-
-void HbAbstractItemContainerPrivate::initPrototype(HbAbstractViewItem *prototype) const
-{
- prototype->setParentItem(mItemView);
- prototype->setItemView(mItemView);
- prototype->resize(QSizeF(0, 0));
- prototype->hide();
-}
-
-HbAbstractViewItem* HbAbstractItemContainerPrivate::createItem(const QModelIndex& index)
-{
- Q_Q(HbAbstractItemContainer);
-
- HbAbstractViewItem *result = 0;
- HbAbstractViewItem *prototype = itemPrototype(index);
- if (prototype) {
- result = prototype->createItem();
- Q_ASSERT_X(result && result->prototype() == prototype, "HbAbstractItemContainerPrivate::createItem", "Copy constructor must be used for creating concrete view items in createItem(). Create your custom view item with 'new YourCustomViewItem(*this)' instead of 'new YourCustomViewItem(this)'");
- result->setParentItem(q);
-
- emit q->itemCreated(result);
- }
- return result;
-}
-
-HbAbstractViewItem* HbAbstractItemContainerPrivate::itemPrototype(const QModelIndex& index) const
-{
- Q_Q(const HbAbstractItemContainer);
-
- if (mPrototypes.isEmpty()) {
- HbAbstractViewItem *defaultPrototype = q->createDefaultPrototype();
- if (defaultPrototype) {
- initPrototype(defaultPrototype);
-
- mPrototypes.append(defaultPrototype);
- }
- }
-
- HbAbstractViewItem *result = 0;
- int count = mPrototypes.count() - 1;
- for (int i = count; i >= 0; i--) {
- if (mPrototypes[i]->canSetModelIndex(index)) {
- result = mPrototypes[i];
- break;
- }
- }
- return result;
-}
-
-
-/*!
- \private
-
- Updates item buffer to contain correct amount of items for the current situation.
-*/
-void HbAbstractItemContainerPrivate::updateItemBuffer()
-{
- Q_Q(HbAbstractItemContainer);
-
- if (!mItemView) {
- return;
- }
-
- int targetCount = q->maxItemCount();
- int itemCount = mItems.count();
-
- if (itemCount == targetCount) {
- return;
- }
-
- // Store the first item position related to view.
- QPointer<HbAbstractViewItem> firstItem = mItems.value(qMax(0, itemCount - targetCount));
- QPointF firstItemPos;
- if (firstItem) {
- firstItemPos = itemBoundingRect(firstItem).topLeft();
- }
-
- // Perform the incresing/decreasing
- if (itemCount < targetCount) {
- increaseBufferSize(targetCount - itemCount);
- } else {
- decreaseBufferSize(itemCount - targetCount);
- }
-
- restoreItemPosition(firstItem, firstItemPos);
-}
-
-/*!
- Increases the item buffer size with given \a amount.
-
- First tries to add as many items after the last item with valid
- index as it can. If there is not enough valid indexes then inserts items
- before the first item with valid index.
-*/
-void HbAbstractItemContainerPrivate::increaseBufferSize(int amount)
-{
- Q_Q(HbAbstractItemContainer);
-
- // Append new items.
- QModelIndex index;
- for (int i = mItems.count() - 1; i >= 0; --i) {
- index = mItems.at(i)->modelIndex();
- if (index.isValid()) {
- break;
- }
- }
-
- int itemsAdded = 0;
- // in practise following conditions must apply: itemview is empty and scrollTo() has been called.
- // Starts populating items from given mFirstItemIndex
- if ( !index.isValid()
- && mFirstItemIndex.isValid()) {
- index = mFirstItemIndex;
- q->insertItem(mItems.count(), index);
- itemsAdded++;
-
- mFirstItemIndex = QModelIndex();
- }
-
- while (itemsAdded < amount) {
- index = mItemView->modelIterator()->nextIndex(index);
- if (!index.isValid()) {
- break;
- }
-
- q->insertItem(mItems.count(), index);
- itemsAdded++;
- }
-
- if (itemsAdded == amount) {
- return;
- }
-
- // Prepend new items.
- for (int i = 0; i < mItems.count(); ++i) {
- index = mItems.at(i)->modelIndex();
- if (index.isValid()) {
- break;
- }
- }
-
- while (itemsAdded < amount) {
- index = mItemView->modelIterator()->previousIndex(index);
- if (!index.isValid()) {
- break;
- }
-
- q->insertItem(0, index);
- itemsAdded++;
- }
-}
-
-/*!
- Decreases the item buffer size with given \a amount.
-
- Tries to avoid deleting visible items and keep the buffer balanced.
-*/
-void HbAbstractItemContainerPrivate::decreaseBufferSize(int amount)
-{
- Q_UNUSED(amount)
-
- int firstVisible = 0;
- int lastVisible = 0;
- firstAndLastVisibleBufferIndex(firstVisible, lastVisible, mItemView->geometry(), false);
-
- int deletableItemsOnTop = firstVisible - 1;
- int deletableItemsOnBottom = mItems.count() - lastVisible - 1;
- int itemsDeleted = 0;
- HbAbstractViewItem* item = 0;
-
- // in decreasing the buffer we try to keep it balanced
- while (itemsDeleted < amount ) {
- if (deletableItemsOnTop > deletableItemsOnBottom) {
- item = mItems.takeFirst();
- deletableItemsOnTop--;
- } else {
- item = mItems.takeLast();
- deletableItemsOnBottom--;
- }
- deleteItem(item);
- ++itemsDeleted;
- }
-
-}
-
-/*!
- \private
-*/
-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.
-
- /*
- 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) {
- return item;
- }
- }
- }
- }
- */
-
- return 0;
-}
-
-/*!
- \private
-
- Removes \a item with model index \a index.
-*/
-void HbAbstractItemContainerPrivate::doRemoveItem(HbAbstractViewItem *item, const QModelIndex &index, bool animate)
-{
- if (item) {
- deleteItem(item, animate);
-#ifndef QMAP_INT__ITEM_STATE_DEPRECATED
- Q_Q(HbAbstractItemContainer);
- q->setItemState(index, QMap<int, QVariant>());
-#endif
- if (!index.isValid()) {
- mItemStates.remove(index);
- }
- }
-}
-
-
-/*!
- \private
-
- Deletes \a item.
-*/
-void HbAbstractItemContainerPrivate::deleteItem(HbAbstractViewItem *item, bool animate)
-{
- Q_Q(HbAbstractItemContainer);
-
-#ifndef QMAP_INT__ITEM_STATE_DEPRECATED
- q->setItemState(item->modelIndex(), item->state());
-#endif
- q->setItemTransientState(item->modelIndex(), item->transientState());
- mItems.removeOne(item);
- q->itemRemoved(item, animate);
-
-#ifndef HB_EFFECTS
- delete item;
-#else
- if (!HbEffect::effectRunning(item, "disappear")
- && !HbEffect::effectRunning(item, "collapse")) {
- delete item;
- }
-#endif
-}
-
-/*
- \private
- The previous or the next index must be in the buffer. We cannot assume in this base class
- that the container is a list we just have to loop through the items and find if the previous
- or next exist in the buffer. Next index should not be the first one in the buffer and the
- previous index should not be the last one in the buffer in order this index to the buffer.
-*/
-bool HbAbstractItemContainerPrivate::intoContainerBuffer(const QModelIndex &index) const
-{
- QModelIndex nextIndex = mItemView->modelIterator()->nextIndex(index);
- QModelIndex previousIndex = mItemView->modelIterator()->previousIndex(index);
-
- int itemCount = mItems.count();
- for (int i = 0; i < itemCount; ++i) {
- QModelIndex currentIndex = mItems.at(i)->modelIndex();
- if (currentIndex == nextIndex && i != 0){
- return true;
- } else if (currentIndex == previousIndex && i != (itemCount - 1)) {
- return true;
- }
- }
- return false;
-}
-
-int HbAbstractItemContainerPrivate::containerBufferIndexForModelIndex(const QModelIndex &index) const
-{
- int bufferIndex = 0;
- QModelIndex nextIndex = mItemView->modelIterator()->nextIndex(index);
- QModelIndex previousIndex = mItemView->modelIterator()->previousIndex(index);
-
- while (bufferIndex < mItems.count()) {
- QModelIndex currentIndex = mItems.at(bufferIndex)->modelIndex();
- if (currentIndex == nextIndex) {
- break;
- }
-
- ++bufferIndex;
-
- if (currentIndex == previousIndex) {
- break;
- }
- }
- return bufferIndex;
-}
-
-void HbAbstractItemContainerPrivate::restoreItemPosition(HbAbstractViewItem *item, const QPointF &position)
-{
- Q_Q(HbAbstractItemContainer);
-
- if (item) {
- QPointF delta = itemBoundingRect(item).topLeft() - position;
- if (!delta.isNull()) {
- q->setPos(q->pos() - delta);
-
- if (mItemView) {
- // this will force the HbScrollArea to adjust the content correctly. Adjustment
- // is not done in the setPos generated event handling by default to speed up scrolling.
- HbAbstractItemViewPrivate::d_ptr(mItemView)->adjustContent();
- }
- }
- }
-}
-
-void HbAbstractItemContainerPrivate::insertItem(HbAbstractViewItem *item, int pos, const QModelIndex &index, bool animate)
-{
- Q_Q(HbAbstractItemContainer);
-
- if (item) {
- mItems.insert(pos, item);
- q->itemAdded(pos, item, animate);
-
- q->setItemModelIndex(item, index);
- }
-}
-
-qreal HbAbstractItemContainerPrivate::getDiffWithoutScrollareaCompensation(const QPointF &delta) const
-{
- Q_Q( const HbAbstractItemContainer);
- const QSizeF containerSize(q->size());
- const QPointF containerPos(q->pos());
- qreal diff = 0.0;
- qreal invisibleArea = 0.0;
- if (delta.y() > 0) {
- // space at the bottom
- QSizeF viewSize = mItemView->size();
- invisibleArea = containerSize.height() - viewSize.height() + containerPos.y();
- if (invisibleArea < delta.y()) {
- diff = delta.y() - invisibleArea;
- }
- } else {
- // space at the top
- invisibleArea = -containerPos.y();
- if (containerPos.y() > delta.y()) {
- diff = delta.y() + invisibleArea;
- }
- }
-
- return diff;
-}
-
-/*!
- \deprecated HbAbstractItemContainer::HbAbstractItemContainer__sub_object(QGraphicsItem*)
- is deprecated from public API. Class HbAbstractItemContainer will be made private.
-
- Constructs a new HbAbstractItemContainer with \a parent.
-*/
-HbAbstractItemContainer::HbAbstractItemContainer(QGraphicsItem *parent) :
- HbWidget(*new HbAbstractItemContainerPrivate(), parent)
-{
- Q_D(HbAbstractItemContainer);
- d->q_ptr = this;
-}
-
-/*!
- \deprecated HbAbstractItemContainer::HbAbstractItemContainer__sub_object(HbAbstractItemContainerPrivate&, QGraphicsItem*)
- is deprecated from public API. Class HbAbstractItemContainer will be made private.
-
- Constructs an item with private class object \a dd and \a parent.
-*/
-HbAbstractItemContainer::HbAbstractItemContainer(HbAbstractItemContainerPrivate &dd, QGraphicsItem *parent) :
- HbWidget(dd, parent)
-{
- Q_D(HbAbstractItemContainer);
-
- d->q_ptr = this;
-}
-
-/*!
- \deprecated HbAbstractItemContainer::~HbAbstractItemContainer()
- is deprecated from public API. Class HbAbstractItemContainer will be made private.
-
- Destroys the container.
-*/
-HbAbstractItemContainer::~HbAbstractItemContainer()
-{
-}
-
-/*!
- \deprecated HbAbstractItemContainer::event(QEvent*)
- is deprecated from public API. Class HbAbstractItemContainer will be made private.
-
- \reimp
-*/
-bool HbAbstractItemContainer::event(QEvent *e)
-{
- if (e->type() == QEvent::LayoutRequest) {
- QGraphicsWidget *parentWid = parentWidget();
- if (!parentLayoutItem()
- && parentWid) {
- HbApplication::postEvent(parentWid, new QEvent(QEvent::LayoutRequest));
- }
- Q_D(HbAbstractItemContainer);
- d->updateItemBuffer();
- } else if (e->type() == UpdateItemBufferEvent) {
- Q_D(HbAbstractItemContainer);
- d->updateItemBuffer();
- }
-
- return HbWidget::event(e);
-}
-
-/*!
- \deprecated HbAbstractItemContainer::itemByIndex(const QModelIndex&) const
- is deprecated from public API. Class HbAbstractItemContainer will be made private.
-
- Returns view item object corresponding given model \a index. This might be 0 pointer if
- there is no view item representing given index or given \a index is invalid.
-*/
-HbAbstractViewItem* HbAbstractItemContainer::itemByIndex(const QModelIndex &index) const
-{
- Q_D(const HbAbstractItemContainer);
-
- if (!index.isValid()) {
- return 0;
- }
- return d->item(index);
-}
-
-/*!
- \deprecated HbAbstractItemContainer::removeItems()
- is deprecated from public API. Class HbAbstractItemContainer will be made private.
-
- This function is provided for convenience.
-
- It removes all the items from the container and clears the internal state model.
-*/
-void HbAbstractItemContainer::removeItems()
-{
- Q_D(HbAbstractItemContainer);
-
- qDeleteAll(d->mItems);
- d->mItems.clear();
- d->mItemStateList.clear();
- d->mItemStates.clear();
-}
-
-/*!
- \deprecated HbAbstractItemContainer::itemView() const
- is deprecated from public API. Class HbAbstractItemContainer will be made private.
-
- Returns the item view that container is connected.
-*/
-HbAbstractItemView *HbAbstractItemContainer::itemView() const
-{
- Q_D(const HbAbstractItemContainer);
- return d->mItemView;
-}
-
-/*!
- \deprecated HbAbstractItemContainer::setItemView(HbAbstractItemView*)
- is deprecated from public API. Class HbAbstractItemContainer will be made private.
-
- Sets item \a view that container is connected.
-*/
-void HbAbstractItemContainer::setItemView(HbAbstractItemView *view)
-{
- Q_D(HbAbstractItemContainer);
-
- if (view != d->mItemView) {
- if (d->mItemView) {
- d->mItemView->removeEventFilter(this);
- }
-
- d->mItemView = view;
-
- foreach (HbAbstractViewItem *prototype, d->mPrototypes) {
- d->initPrototype(prototype);
- }
-
- if (d->mItemView) {
- setParentItem(view);
- d->mItemView->installEventFilter(this);
- }
- }
-}
-
-/*!
- \deprecated HbAbstractItemContainer::setItemModelIndex(HbAbstractViewItem*, const QModelIndex&)
- is deprecated from public API. Class HbAbstractItemContainer will be made private.
-
- Assigns new model \a index to the given \a item. Item's current state is saved
- and state for \a index is restored to item.
-*/
-void HbAbstractItemContainer::setItemModelIndex(HbAbstractViewItem *item, const QModelIndex &index)
-{
-
- if (item && item->modelIndex() != index) {
-
-#ifndef QMAP_INT__ITEM_STATE_DEPRECATED
- setItemState(item->modelIndex(), item->state());
-#endif
- setItemTransientState(item->modelIndex(), item->transientState());
-
- // Transfer the state from item currently representing index to new item, if such exists.
- HbAbstractViewItem *oldItem = itemByIndex(index);
-
- if (oldItem) {
- item->setTransientState(oldItem->transientState());
- } else {
- item->setTransientState(itemTransientState(index));
- }
-
-
- item->setModelIndex(index);
- }
-}
-
-/*!
- \deprecated HbAbstractItemContainer::setModelIndexes(const QModelIndex&)
- is deprecated from public API. Class HbAbstractItemContainer will be made private.
-
- Sets item's model indexes starting from given \a startIndex. If \a startIndex is
- QModelIndex() then startIndex is taken from the first item.
-
- \note If there are not enough model indexes from \a startIndex to last model index
- for all the items then QModelIndex() is assigned to rest of the view items.
-*/
-void HbAbstractItemContainer::setModelIndexes(const QModelIndex &startIndex)
-{
- Q_D(HbAbstractItemContainer);
-
- if (!d->mItemView || !d->mItemView->model()) {
- return;
- }
-
- QModelIndex index = startIndex;
- if (!index.isValid()) {
- if (!d->mItems.isEmpty()) {
- index = d->mItems.first()->modelIndex();
- }
-
- if (!index.isValid()) {
- index = d->mItemView->modelIterator()->nextIndex(index);
- }
- }
-
- QModelIndexList indexList;
-
- int itemCount(d->mItems.count());
-
- if (itemCount != 0 && index.isValid()) {
- indexList.append(index);
- }
-
- for (int i = indexList.count(); i < itemCount; ++i) {
- index = d->mItemView->modelIterator()->nextIndex(indexList.last());
-
- if (index.isValid()) {
- indexList.append(index);
- } else {
- break;
- }
- }
-
- for (int i = indexList.count(); i < itemCount; ++i) {
- index = d->mItemView->modelIterator()->previousIndex(indexList.first());
-
- if (index.isValid()) {
- indexList.prepend(index);
- } else {
- break;
- }
- }
-
- // if items have been added/removed in the middle of the buffer, there might be items
- // that can be reused at the end of the buffer. The following block will scan for
- // those items and move them in correct position
- int lastUsedItem = -1;
- for (int indexCounter = 0; indexCounter < indexList.count(); ++indexCounter) {
- HbAbstractViewItem *item = d->mItems.at(indexCounter);
- if (item && item->modelIndex() == indexList.at(indexCounter)) {
- lastUsedItem = indexCounter;
- } else {
- for (int itemCounter = lastUsedItem + 1; itemCounter < d->mItems.count(); itemCounter++) {
- HbAbstractViewItem *item2 = d->mItems.at(itemCounter);
- if (item2->modelIndex() == indexList.at(indexCounter)) {
- d->mItems.swap(indexCounter, itemCounter);
- itemRemoved(d->mItems.at(indexCounter), false);
- itemRemoved(d->mItems.at(itemCounter), false);
- itemAdded(qMin(indexCounter, itemCounter), d->mItems.at(qMin(indexCounter, itemCounter)), false);
- itemAdded(qMax(indexCounter, itemCounter), d->mItems.at(qMax(indexCounter, itemCounter)), false);
- lastUsedItem = itemCounter;
- break;
- }
- }
- }
- }
-
- int indexCount(indexList.count());
- for (int i = 0; i < itemCount; ++i) {
- HbAbstractViewItem *item = d->mItems.at(i);
- HbAbstractViewItem *prototype = 0;
- // setItemModelIndex() is considered recycling. It is called only, if recycling is permitted
- if (i < indexCount) {
- prototype = d->itemPrototype(indexList.at(i));
- }
- if (prototype) {
- if ( prototype == item->prototype()
- && d->mItemRecycling) {
- setItemModelIndex(item, indexList.at(i));
- } else if ( d->mItemRecycling
- || ( !d->mItemRecycling
- && item->modelIndex() != indexList.at(i))) {
- d->deleteItem(item);
- insertItem(i, indexList.at(i));
- } // else: !d->mItemRecycling && item->modelIndex().isValid() == indexList.at(i))
- } else {
- d->deleteItem(item);
- itemCount--;
- i--;
- }
- }
-}
-
-/*!
- \deprecated HbAbstractItemContainer::firstItemIndex() const
- is deprecated.
-
- This function is provided for convenience.
-
- Returns model index of first item inside item buffer.
-*/
-QModelIndex HbAbstractItemContainer::firstItemIndex() const
-{
- qWarning("HbAbstractItemContainer::firstItemIndex() is deprecated!");
-
- Q_D(const HbAbstractItemContainer);
- if (!d->mItems.isEmpty()){
- return d->mItems.first()->modelIndex();
- } else {
- return QModelIndex();
- }
-}
-
-/*!
- \deprecated HbAbstractItemContainer::lastItemIndex() const
- is deprecated.
-
- This function is provided for convenience.
-
- Returns model index of last item inside item buffer.
-*/
-QModelIndex HbAbstractItemContainer::lastItemIndex() const
-{
- qWarning("HbAbstractItemContainer::lastItemIndex() is deprecated!");
-
- Q_D(const HbAbstractItemContainer);
- if (!d->mItems.isEmpty()){
- return d->mItems.last()->modelIndex();
- } else {
- return QModelIndex();
- }
-}
-
-/*!
- \deprecated HbAbstractItemContainer::items() const
- is deprecated from public API. Class HbAbstractItemContainer will be made private.
-
- Returns list of items inside item buffer.
-*/
-QList<HbAbstractViewItem *> HbAbstractItemContainer::items() const
-{
- Q_D(const HbAbstractItemContainer);
- return d->mItems;
-}
-
-/*!
- \deprecated HbAbstractItemContainer::addItem(const QModelIndex&, bool)
- is deprecated from public API. Class HbAbstractItemContainer will be made private.
-
- Adds item for model \a index to container.
-*/
-void HbAbstractItemContainer::addItem(const QModelIndex &index, bool animate)
-{
- Q_D(HbAbstractItemContainer);
-
- // Add new item if maximum item count allows it or item falls within the range of
- // item buffer items.
- if (d->intoContainerBuffer(index)) {
- int bufferIndex = d->containerBufferIndexForModelIndex(index);
-
- if (bufferIndex >= d->mItems.count()
- || d->mItems.at(bufferIndex)->modelIndex() != index) {
- // Store the second item position related to view.
- HbAbstractViewItem *referenceItem = d->mItems.value(1);
- QPointF referenceItemPos;
- if (referenceItem) {
- referenceItemPos = d->itemBoundingRect(referenceItem).topLeft();
- }
-
- HbAbstractViewItem *recycledItem = 0;
- QRectF viewRect = d->itemBoundingRect(d->mItemView);
-
- if (d->mItemRecycling && !viewRect.isEmpty()) {
- // Recycling allowed. Try recycling the items from buffer.
- int firstVisible = 0;
- int lastVisible = 0;
- d->firstAndLastVisibleBufferIndex(firstVisible, lastVisible, viewRect, false);
-
- int itemsOnTop = firstVisible - 1;
- int itemsOnBottom = d->mItems.count() - lastVisible - 1;
-
- if (itemsOnBottom > 0) {
- recycledItem = d->mItems.takeLast();
- } else if (itemsOnTop > 0) {
- recycledItem = d->mItems.takeFirst();
- bufferIndex--;
- bufferIndex = qMax(0, bufferIndex);
- }
-
- if (recycledItem) {
- itemRemoved(recycledItem, false);
- d->insertItem(recycledItem, bufferIndex, index, animate);
- }
- }
-
- if (!recycledItem) {
- // No recycling has happened. Insert completely new item.
- insertItem(bufferIndex, index, animate);
- }
-
- // Restore second item position.
- d->restoreItemPosition(referenceItem, referenceItemPos);
-
- if (!recycledItem && d->mItemRecycling) {
- // Resize the buffer.
- d->updateItemBuffer();
- }
- }
- } else if (d->mItems.count() < maxItemCount()) {
- d->updateItemBuffer();
- }
-}
-
-/*!
- \deprecated HbAbstractItemContainer::removeItem(const QModelIndex&, bool)
- is deprecated from public API. Class HbAbstractItemContainer will be made private.
-
- Removes item representing \a index from container.
-*/
-void HbAbstractItemContainer::removeItem(const QModelIndex &index, bool animate)
-{
- Q_D(HbAbstractItemContainer);
-
- HbAbstractViewItem *item = d->item(index);
- d->doRemoveItem(item, index, animate);
-}
-
-/*!
- \deprecated HbAbstractItemContainer::removeItem(int, bool)
- is deprecated from public API. Class HbAbstractItemContainer will be made private.
-
- Removes item from \a pos.
-*/
-void HbAbstractItemContainer::removeItem(int pos, bool animate)
-{
- Q_D(HbAbstractItemContainer);
-
- Q_ASSERT(pos >= 0 && pos < d->mItems.count());
-
- HbAbstractViewItem *item = d->mItems.at(pos);
- QModelIndex index = item->modelIndex();
- d->doRemoveItem(item, index, animate);
-}
-
-/*!
- \deprecated HbAbstractItemContainer::recycleItems(const QPointF&)
- is deprecated from public API. Class HbAbstractItemContainer will be made private.
-
- Derived class should implement this function to perform item recycling based on container \a delta.
- Given \a delta is the distance between container's current position and desired new position. Recycling
- should be done based on the new position and function should return the actual delta. Actual delta could
- be modified value from \a delta. Delta modification can be useful e.g. to compensate the item changes
- that are caused by relayouting of items after changing the item position within layout.
-
- Default implementation does not recycle items and returns the \a delta unchanged.
-*/
-QPointF HbAbstractItemContainer::recycleItems(const QPointF &delta)
-{
- return delta;
-}
-
-/*!
- \deprecated HbAbstractItemContainer::eventFilter(QObject*, QEvent*)
- is deprecated from public API. Class HbAbstractItemContainer will be made private.
-
- \reimp
-*/
-bool HbAbstractItemContainer::eventFilter(QObject *obj, QEvent *event)
-{
- Q_D(HbAbstractItemContainer);
-
- if (obj == d->mItemView) {
- switch (event->type()){
- case QEvent::GraphicsSceneResize: {
- viewResized(d->mItemView->size());
- d->updateItemBuffer();
- break;
- }
- default:
- break;
- }
- }
-
- return HbWidget::eventFilter(obj, event);
-}
-
-/*!
- \deprecated HbAbstractItemContainer::maxItemCount() const
- is deprecated from public API. Class HbAbstractItemContainer will be made private.
-
- Returns maximum amount of items that item buffer can hold.
-
- Default implementation returns the total number of indexes that can
- be accessed on current view.
-
- Derived class that supports item recycling should define their own implementation
- for this function.
-
- \note Return value should not be more than HbAbstractItemView::indexCount()
-*/
-int HbAbstractItemContainer::maxItemCount() const
-{
- Q_D(const HbAbstractItemContainer);
-
- if (d->mItemView) {
- return d->mItemView->modelIterator()->indexCount();
- } else {
- return 0;
- }
-}
-
-/*!
- \deprecated HbAbstractItemContainer::setItemPrototype(HbAbstractViewItem*)
- is deprecated from public API. Class HbAbstractItemContainer will be made private.
-
- Deletes other prototypes and sets \a prototype as only prototype.
-
- Returns true if the prototype list was changed; otherwise returns false.
-*/
-bool HbAbstractItemContainer::setItemPrototype(HbAbstractViewItem *prototype)
-{
- QList<HbAbstractViewItem *> prototypeList;
- prototypeList.append(prototype);
- return setItemPrototypes(prototypeList);
-}
-
-/*!
- \deprecated HbAbstractItemContainer::itemPrototypes() const
- is deprecated from public API. Class HbAbstractItemContainer will be made private.
-
- Returns the list of item prototypes.
-*/
-QList<HbAbstractViewItem *> HbAbstractItemContainer::itemPrototypes() const
-{
- Q_D(const HbAbstractItemContainer);
-
- if (d->mPrototypes.isEmpty()) {
- HbAbstractViewItem *defaultPrototype = createDefaultPrototype();
- if (defaultPrototype) {
- d->initPrototype(defaultPrototype);
-
- d->mPrototypes.append(defaultPrototype);
- }
- }
-
- return d->mPrototypes;
-}
-
-/*!
- \deprecated HbAbstractItemContainer::setItemPrototypes(const QList<HbAbstractViewItem*>&)
- is deprecated from public API. Class HbAbstractItemContainer will be made private.
-
- Sets the list of prototypes.
-
- Returns true if the prototype list was changed; otherwise returns false.
-*/
-bool HbAbstractItemContainer::setItemPrototypes(const QList<HbAbstractViewItem *> &prototypes)
-{
- Q_D(HbAbstractItemContainer);
-
- bool changed = false;
-
- if (prototypes.count() > 0) {
- if (d->mPrototypes != prototypes) {
- foreach (HbAbstractViewItem *prototype, d->mPrototypes) {
- if (!prototypes.contains(prototype)) {
- delete prototype;
- }
- }
-
- foreach (HbAbstractViewItem *prototype, prototypes) {
- if (!d->mPrototypes.contains(prototype)) {
- d->initPrototype(prototype);
- }
- }
- changed = true;
- }
-
- d->mPrototypes = prototypes;
- }
-
- return changed;
-
-}
-
-/*!
- \deprecated HbAbstractItemContainer::itemState(const QModelIndex&) const
- is deprecated. Please use HbAbstractItemContainer::itemTransientState() instead.
-
- Returns state of view item with \a index.
-*/
-QMap<int,QVariant> HbAbstractItemContainer::itemState(const QModelIndex &index) const
-{
- qWarning("HbAbstractViewItem::itemState(const QModelIndex &index) const is deprecated");
- HB_ITEM_STATE_ASSERT;
- Q_D(const HbAbstractItemContainer);
- QMap<int,QVariant> result;
-
- if (index.isValid()) {
- int listIndex = d->findStateItem(index);
- if (listIndex != -1) {
- result = d->mItemStateList.at(listIndex).state;
- }
- }
-
- return result;
-}
-
-/*!
- \deprecated HbAbstractItemContainer::itemTransientState(const QModelIndex &) const
- is deprecated from public API. Class HbAbstractItemContainer will be made private.
-
- Returns transient state of view item with \a index.
-*/
-QHash<QString, QVariant> HbAbstractItemContainer::itemTransientState(const QModelIndex &index) const
-{
- Q_D(const HbAbstractItemContainer);
- return d->mItemStates.value(index);
-}
-
-/*!
- \deprecated HbAbstractItemContainer::setItemStateValue(const QModelIndex&, int, QVariant)
- is deprecated. Please use HbAbstractItemContainer::setItemTransientStateValue(const QModelIndex &index, const QString &key, const QVariant &value) instead.
-
- This is an overloaded member function, provided for convenience.
-
- Sets single state \a key to \a value for a view item with \a index.
-*/
-void HbAbstractItemContainer::setItemStateValue(const QModelIndex &index, int key, QVariant value)
-{
- qWarning("HbAbstractViewItem::setItemStateValue(const QModelIndex &index, int key, QVariant value) const is deprecated");
- HB_ITEM_STATE_ASSERT;
- Q_D(HbAbstractItemContainer);
- if (index.isValid()) {
- int listIndex = d->findStateItem(index);
- if (listIndex != -1) {
- d->mItemStateList[listIndex].state.insert(key,value);
- } else {
- HbAbstractItemContainerPrivate::StateItem stateItem;
- stateItem.index = index;
- stateItem.state.insert(key,value);
-
- d->mItemStateList.append(stateItem);
- }
- }
-}
-/*!
- \deprecated HbAbstractItemContainer::setItemTransientStateValue(const QModelIndex &, const QString &, const QVariant &)
- is deprecated from public API. Class HbAbstractItemContainer will be made private.
-
- This is an overloaded member function, provided for convenience.
-
- Stores \a key with \a value of a view item with \a index into state model.
- \a key is usually name of a Qt property. If \a value is invalid, state item with the \a key is removed.
-
- Default values of properties should not be added.
-*/
-void HbAbstractItemContainer::setItemTransientStateValue(const QModelIndex &index, const QString &key, const QVariant &value)
-{
- Q_D(HbAbstractItemContainer);
- if (index.isValid()) {
- QHash<QString, QVariant> stateItem = d->mItemStates.value(index);
- if (!value.isValid()) {
- stateItem.remove(key);
- } else {
- stateItem.insert(key, value);
- }
- if (stateItem.count()) {
- d->mItemStates.insert(index, stateItem);
- } else {
- d->mItemStates.remove(index);
- }
- } else {
- d->mItemStates.remove(index);
- }
-}
-
-
-/*!
- \deprecated HbAbstractItemContainer::setItemState(const QModelIndex&, QMap<int, QVariant>)
- is deprecated from public API. Class HbAbstractItemContainer will be made private.
-
- Sets state of a view item with \a index.
-*/
-void HbAbstractItemContainer::setItemState(const QModelIndex &index, QMap<int,QVariant> state)
-{
- qWarning("HbAbstractViewItem::setItemState(const QModelIndex &index, QMap<int,QVariant> state) is deprecated");
- HB_ITEM_STATE_ASSERT;
- Q_D(HbAbstractItemContainer);
- if (index.isValid() && !state.isEmpty()) {
- int listIndex = d->findStateItem(index);
- if (listIndex != -1) {
- d->mItemStateList[listIndex].state = state;
- } else {
- HbAbstractItemContainerPrivate::StateItem stateItem;
- stateItem.index = index;
- stateItem.state = state;
-
- d->mItemStateList.append(stateItem);
- }
- }
-}
-
-/*!
- \deprecated HbAbstractItemContainer::setItemTransientState(const QModelIndex &, QHash<QString,QVariant>)
- is deprecated from public API. Class HbAbstractItemContainer will be made private.
-
- Stores state of a view item with \a index into item state model. State of the view item is usually
- retrieved by calling HbAbstractViewItem::transientState().
-
- Existing state is replaced. If \a state is empty, existing state is removed.
- Default values of state items should not be added into \a state.
-
- \sa HbAbstractViewItem::transientState()
-*/
-void HbAbstractItemContainer::setItemTransientState(const QModelIndex &index, QHash<QString,QVariant> state)
-{
- Q_D(HbAbstractItemContainer);
- if (index.isValid() && state.count()) {
- d->mItemStates.insert(index, state);
- } else {
- d->mItemStates.remove(index);
- }
-}
-
-/*!
- \deprecated HbAbstractItemContainer::itemChange(QGraphicsItem::GraphicsItemChange, const QVariant&)
- is deprecated from public API. Class HbAbstractItemContainer will be made private.
-
- \reimp
-*/
-QVariant HbAbstractItemContainer::itemChange(GraphicsItemChange change, const QVariant & value)
-{
- return HbWidget::itemChange(change, value);
-}
-
-/*!
- \deprecated HbAbstractItemContainer::firstAndLastVisibleModelIndex(QModelIndex&, QModelIndex&, bool) const
- is deprecated from public API. Class HbAbstractItemContainer will be made private.
-
- Returns the model indexes of items that are located on top left and bottom right corners
- of visible area.
-*/
-void HbAbstractItemContainer::firstAndLastVisibleModelIndex(
- QModelIndex& firstVisibleModelIndex,
- QModelIndex& lastVisibleModelIndex,
- bool fullyVisible) const
-{
- Q_D(const HbAbstractItemContainer);
-
- QRectF viewRect(d->itemBoundingRect(d->mItemView));
-
- int firstVisibleBufferIndex( -1 );
- int lastVisibleBufferIndex( -1 );
- d->firstAndLastVisibleBufferIndex( firstVisibleBufferIndex, lastVisibleBufferIndex, viewRect, fullyVisible );
- if (firstVisibleBufferIndex != -1) {
- firstVisibleModelIndex = d->mItems.at(firstVisibleBufferIndex)->modelIndex();
- }
- if (lastVisibleBufferIndex != -1) {
- lastVisibleModelIndex = d->mItems.at(lastVisibleBufferIndex)->modelIndex();
- }
-}
-
-/*!
- \deprecated HbAbstractItemContainer::removeItemTransientStates()
- is deprecated from public API. Class HbAbstractItemContainer will be made private.
-
- Clears the state model.
-*/
-void HbAbstractItemContainer::removeItemTransientStates()
-{
- Q_D(HbAbstractItemContainer);
- d->mItemStateList.clear();
- d->mItemStates.clear();
-}
-
-/*!
- \deprecated HbAbstractItemContainer::removeItemStates()
- is deprecated. Please use HbAbstractItemContainer::removeTransientItemStates() instead.
-
- Clears the state model.
-*/
-void HbAbstractItemContainer::removeItemStates()
-{
- qWarning("HbAbstractItemContainer::removeItemStates is deprecated");
- Q_D(HbAbstractItemContainer);
- d->mItemStateList.clear();
- d->mItemStates.clear();
-}
-
-/*!
- \deprecated HbAbstractItemContainer::setItemRecycling(bool)
- is deprecated from public API. Class HbAbstractItemContainer will be made private.
-
- Sets item recycling to \a enabled.
- By default recycling is off.
- */
-void HbAbstractItemContainer::setItemRecycling(bool enabled)
-{
- Q_D(HbAbstractItemContainer);
- if (d->mItemRecycling != enabled) {
- d->mItemRecycling = enabled;
- if (!enabled) {
- removeItemTransientStates();
- }
-
- d->updateItemBuffer();
- }
-}
-
-/*!
- \deprecated HbAbstractItemContainer::itemRecycling() const
- is deprecated from public API. Class HbAbstractItemContainer will be made private.
-
- Returns whether item recycling feature is in use.
- */
-bool HbAbstractItemContainer::itemRecycling() const
-{
- Q_D(const HbAbstractItemContainer);
- return d->mItemRecycling;
-}
-
-/*!
- \deprecated HbAbstractItemContainer::setUniformItemSizes(bool)
- is deprecated from public API. Class HbAbstractItemContainer will be made private.
-
- Sets the feature informing whether all items in the item view have the same size.
- In case all the items have the same size, the item view can do some
- optimizations for performance purposes.
-*/
-void HbAbstractItemContainer::setUniformItemSizes(bool enable)
-{
- Q_D(HbAbstractItemContainer);
- d->mUniformItemSizes = enable;
-}
-
-/*!
- \deprecated HbAbstractItemContainer::uniformItemSizes() const
- is deprecated from public API. Class HbAbstractItemContainer will be made private.
-
- Returns whether the uniform item sizes feature is in use.
- */
-bool HbAbstractItemContainer::uniformItemSizes() const
-{
- Q_D(const HbAbstractItemContainer);
- return d->mUniformItemSizes;
-}
-
-/*!
- \deprecated HbAbstractItemContainer::insertItem(int, const QModelIndex&, bool)
- is deprecated from public API. Class HbAbstractItemContainer will be made private.
-
- Inserts item for \a index to \a pos.
-*/
-void HbAbstractItemContainer::insertItem(int pos, const QModelIndex &index, bool animate)
-{
- Q_D(HbAbstractItemContainer);
- HbAbstractViewItem *item = d->createItem(index);
- d->insertItem(item, pos, index, animate);
-}
-
-/*!
- \deprecated HbAbstractItemContainer::reset()
- is deprecated from public API. Class HbAbstractItemContainer will be made private.
-
- Reset the internal state of the container.
-*/
-void HbAbstractItemContainer::reset()
-{
- // position need to be reseted while changing model
- setPos(0.0, 0.0);
- removeItems();
- QCoreApplication::postEvent(this, new QEvent((QEvent::Type)UpdateItemBufferEvent));
-}
-
-/*!
- \deprecated HbAbstractItemContainer::type() const
- is deprecated.
-
- \reimp
-*/
-int HbAbstractItemContainer::type() const
-{
- qWarning("HbAbstractItemContainer::type() const is deprecated!");
-
- return Type;
-}
-
-#include "moc_hbabstractitemcontainer.cpp"
-
--- a/src/hbwidgets/itemviews/hbabstractitemcontainer.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,129 +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 HbWidgets module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#ifndef HBABSTRACTITEMCONTAINER_H
-#define HBABSTRACTITEMCONTAINER_H
-
-#include <hbwidget.h>
-
-class HbAbstractItemContainerPrivate;
-class QModelIndex;
-class HbAbstractViewItem;
-class HbAbstractItemView;
-
-class HB_WIDGETS_EXPORT HbAbstractItemContainer : public HbWidget
-{
- Q_OBJECT
-
-public:
- explicit HbAbstractItemContainer(QGraphicsItem *parent = 0);
- virtual ~HbAbstractItemContainer();
-
- virtual void addItem(const QModelIndex &index, bool animate = false);
- virtual void removeItem(const QModelIndex &index, bool animate = false);
- virtual void removeItem(int pos, bool animate = false);
- void removeItems();
-
- HbAbstractViewItem* itemByIndex(const QModelIndex &index) const;
- QList<HbAbstractViewItem *> items() const;
-
- virtual void reset();
-
- HbAbstractItemView *itemView() const;
- void setItemView(HbAbstractItemView *view);
-
- virtual void setModelIndexes(const QModelIndex &startIndex = QModelIndex());
-
- QModelIndex firstItemIndex() const;
- QModelIndex lastItemIndex() const;
-
- void firstAndLastVisibleModelIndex(
- QModelIndex& firstVisibleModelIndex,
- QModelIndex& lastVisibleModelIndex,
- bool fullyVisible = true) const;
-
- QList<HbAbstractViewItem *> itemPrototypes() const;
- bool setItemPrototype(HbAbstractViewItem *prototype);
- bool setItemPrototypes(const QList<HbAbstractViewItem *> &prototypes);
-
- void setItemTransientState(const QModelIndex &index, QHash<QString,QVariant> state);
- void setItemTransientStateValue(const QModelIndex &index, const QString &key, const QVariant &value);
-
- void setItemState(const QModelIndex &index, QMap<int,QVariant> state);
- void setItemStateValue(const QModelIndex &index, int key, QVariant value);
-
- QMap<int,QVariant> itemState(const QModelIndex &index) const;
- QHash<QString, QVariant> itemTransientState(const QModelIndex &index) const;
-
- void removeItemStates();
- void removeItemTransientStates();
-
- void setItemRecycling(bool enabled);
- bool itemRecycling() const;
-
- virtual void setUniformItemSizes(bool enable);
- bool uniformItemSizes() const;
-
- virtual bool eventFilter(QObject *obj, QEvent *event);
-
- enum { Type = Hb::ItemType_AbstractItemContainer };
- int type() const;
-
-signals:
-
- void itemCreated(HbAbstractViewItem *item);
-
-protected:
-
- HbAbstractItemContainer(HbAbstractItemContainerPrivate &dd, QGraphicsItem *parent);
-
- virtual void itemAdded(int index, HbAbstractViewItem *item, bool animate) = 0;
- virtual void itemRemoved(HbAbstractViewItem *item, bool animate) = 0;
-
- virtual void viewResized(const QSizeF &size) = 0;
-
- virtual void setItemModelIndex(HbAbstractViewItem *item, const QModelIndex &index);
-
- QVariant itemChange(GraphicsItemChange change, const QVariant & value) ;
-
- virtual QPointF recycleItems(const QPointF &delta);
-
- void insertItem(int pos, const QModelIndex &index, bool animate = false);
-
- virtual int maxItemCount() const;
-
- virtual bool event(QEvent *e);
-
- virtual HbAbstractViewItem *createDefaultPrototype() const = 0;
-
-private:
-
- Q_DECLARE_PRIVATE_D(d_ptr, HbAbstractItemContainer)
- Q_DISABLE_COPY(HbAbstractItemContainer)
-
- friend class HbAbstractItemView;
-};
-
-#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbwidgets/itemviews/hbabstractitemcontainer_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,1192 @@
+/****************************************************************************
+**
+** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (developer.feedback@nokia.com)
+**
+** This file is part of the HbWidgets module of the UI Extensions for Mobile.
+**
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at developer.feedback@nokia.com.
+**
+****************************************************************************/
+#include "hbabstractitemcontainer_p.h"
+#include "hbabstractitemcontainer_p_p.h"
+
+#include "hbabstractviewitem.h"
+#include "hbabstractitemview.h"
+#include "hbabstractitemview_p.h"
+#include "hbmodeliterator.h"
+#include <hbapplication.h>
+
+#include <QGraphicsLayout>
+#include <QGraphicsSceneResizeEvent>
+#include <QEvent>
+#include <QDebug>
+
+
+/*!
+ HbAbstractItemContainer is used in HbAbstractItemView to hold the layout and view items.
+ Container should have a layout, otherwise its size is zero always.
+ HbAbstractItemContainer can have any kind of layout as it child.
+*/
+
+/*!
+ Function is called after new \a item was added into \a index position into
+ container.
+*/
+
+/*!
+ Function is called after the \a item was removed from the container.
+*/
+
+/*!
+ Function is called when container needs to be resized.
+*/
+
+/*!
+ Returns the default prototype.
+
+ Subclasses of this class must implement this function to introduce their own default prototype.
+ Default prototype is used to create view items unless the class user excplicitly sets prototype with setItemPrototype method.
+ Implementation of this method must construct and return a new view item widget.
+*/
+
+const int HB_DEFAULT_BUFFERSIZE = 4;
+const int UpdateItemBufferEvent = QEvent::registerEventType();
+
+HbAbstractItemContainerPrivate::HbAbstractItemContainerPrivate() :
+ HbWidgetPrivate(),
+ mItemView(0),
+ mBufferSize(HB_DEFAULT_BUFFERSIZE),
+ mItemRecycling(false),
+ mUniformItemSizes(false)
+{
+}
+
+HbAbstractItemContainerPrivate::~HbAbstractItemContainerPrivate()
+{
+}
+
+
+void HbAbstractItemContainerPrivate::init()
+{
+ Q_Q(HbAbstractItemContainer);
+ q->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Ignored);
+}
+
+/*!
+ Returns given item's bounding rectangle in scene coordinates.
+ */
+QRectF HbAbstractItemContainerPrivate::itemBoundingRect(const QGraphicsItem *item) const
+{
+ Q_Q(const HbAbstractItemContainer);
+ if (q->layout()) {
+ q->layout()->activate();
+ }
+ return item->mapToItem(mItemView, item->boundingRect()).boundingRect();
+}
+
+void HbAbstractItemContainerPrivate::firstAndLastVisibleBufferIndex(
+ int& firstVisibleBufferIndex,
+ int& lastVisibleBufferIndex,
+ const QRectF &viewRect,
+ bool fullyVisible) const
+{
+ Q_Q(const HbAbstractItemContainer);
+
+ if (q->layout() && !q->layout()->isActivated()) {
+ q->layout()->activate();
+ }
+
+ firstVisibleBufferIndex = -1;
+ lastVisibleBufferIndex = -1;
+
+ int count = mItems.count();
+ for (int i = 0; i < count; ++i) {
+ if (visible(mItems.at(i), viewRect, fullyVisible)) {
+ if (firstVisibleBufferIndex == -1) {
+ firstVisibleBufferIndex = i;
+ }
+ lastVisibleBufferIndex = i;
+ } else if ( lastVisibleBufferIndex != -1 ) {
+ // no need to check the remaining ones.
+ break;
+ }
+ }
+}
+
+/*!
+ \private
+
+ Returns true if given item is located within viewport (i.e. view), otherwise
+ returns false. If fullyVisible parameter is true method will return true only
+ for item that is shown fully. In this case for partially visible items false is returned.
+*/
+bool HbAbstractItemContainerPrivate::visible(HbAbstractViewItem* item, const QRectF &viewRect, bool fullyVisible) const
+{
+ if (item) {
+ QRectF itemRect(itemBoundingRect(item));
+ if (fullyVisible) {
+ if (viewRect.contains(itemRect)) {
+ return true;
+ }
+ } else {
+ if (viewRect.intersects(itemRect)) {
+ return true;
+ }
+ }
+ }
+
+ return false;
+}
+
+/*!
+ Clears the prototype list and deletes the prototypes.
+*/
+void HbAbstractItemContainerPrivate::deletePrototypes()
+{
+ qDeleteAll(mPrototypes);
+ mPrototypes.clear();
+}
+
+int HbAbstractItemContainerPrivate::findStateItem(const QModelIndex &index) const
+{
+ for (int current = 0; current < mItemStateList.count(); ++current) {
+ if (mItemStateList.at(current).index == index) {
+ return current;
+ }
+ }
+ return -1;
+}
+
+void HbAbstractItemContainerPrivate::initPrototype(HbAbstractViewItem *prototype) const
+{
+ prototype->setParentItem(mItemView);
+ prototype->setItemView(mItemView);
+ prototype->resize(QSizeF(0, 0));
+ prototype->hide();
+}
+
+HbAbstractViewItem* HbAbstractItemContainerPrivate::createItem(const QModelIndex& index)
+{
+ Q_Q(HbAbstractItemContainer);
+
+ HbAbstractViewItem *result = 0;
+ HbAbstractViewItem *prototype = itemPrototype(index);
+ if (prototype) {
+ result = q_check_ptr(prototype->createItem());
+ Q_ASSERT_X(result->prototype() == prototype, "HbAbstractItemContainerPrivate::createItem", "Copy constructor must be used for creating concrete view items in createItem(). Create your custom view item with 'new YourCustomViewItem(*this)' instead of 'new YourCustomViewItem(this)'");
+ result->setParentItem(q);
+
+ emit q->itemCreated(result);
+ }
+ return result;
+}
+
+HbAbstractViewItem* HbAbstractItemContainerPrivate::itemPrototype(const QModelIndex& index) const
+{
+ Q_Q(const HbAbstractItemContainer);
+
+ if (mPrototypes.isEmpty()) {
+ HbAbstractViewItem *defaultPrototype = q->createDefaultPrototype();
+ if (defaultPrototype) {
+ initPrototype(defaultPrototype);
+
+ mPrototypes.append(defaultPrototype);
+ }
+ }
+
+ HbAbstractViewItem *result = 0;
+ int count = mPrototypes.count() - 1;
+ for (int i = count; i >= 0; i--) {
+ if (mPrototypes[i]->canSetModelIndex(index)) {
+ result = mPrototypes[i];
+ break;
+ }
+ }
+ return result;
+}
+
+
+/*!
+ \private
+
+ Updates item buffer to contain correct amount of items for the current situation.
+*/
+void HbAbstractItemContainerPrivate::updateItemBuffer()
+{
+ Q_Q(HbAbstractItemContainer);
+
+ if (!mItemView) {
+ return;
+ }
+
+ int targetCount = q->maxItemCount();
+ int itemCount = mItems.count();
+
+ if (itemCount == targetCount) {
+ return;
+ }
+
+ // Store the first item position related to view.
+ QPointer<HbAbstractViewItem> firstItem = mItems.value(qMax(0, itemCount - targetCount));
+ QPointF firstItemPos;
+ if (firstItem) {
+ firstItemPos = itemBoundingRect(firstItem).topLeft();
+ }
+
+ // Perform the incresing/decreasing
+ if (itemCount < targetCount) {
+ increaseBufferSize(targetCount - itemCount);
+ } else {
+ decreaseBufferSize(itemCount - targetCount);
+ }
+
+ restoreItemPosition(firstItem, firstItemPos);
+}
+
+/*!
+ Increases the item buffer size with given \a amount.
+
+ First tries to add as many items after the last item with valid
+ index as it can. If there is not enough valid indexes then inserts items
+ before the first item with valid index.
+*/
+void HbAbstractItemContainerPrivate::increaseBufferSize(int amount)
+{
+ Q_Q(HbAbstractItemContainer);
+
+ // Append new items.
+ QModelIndex index;
+ for (int i = mItems.count() - 1; i >= 0; --i) {
+ index = mItems.at(i)->modelIndex();
+ if (index.isValid()) {
+ break;
+ }
+ }
+
+ int itemsAdded = 0;
+ // in practise following conditions must apply: itemview is empty and scrollTo() has been called.
+ // Starts populating items from given mFirstItemIndex
+ if ( !index.isValid()
+ && mFirstItemIndex.isValid()) {
+ index = mFirstItemIndex;
+ q->insertItem(mItems.count(), index);
+ itemsAdded++;
+
+ mFirstItemIndex = QModelIndex();
+ }
+
+ while (itemsAdded < amount) {
+ index = mItemView->modelIterator()->nextIndex(index);
+ if (!index.isValid()) {
+ break;
+ }
+
+ q->insertItem(mItems.count(), index);
+ itemsAdded++;
+ }
+
+ if (itemsAdded == amount) {
+ return;
+ }
+
+ // Prepend new items.
+ for (int i = 0; i < mItems.count(); ++i) {
+ index = mItems.at(i)->modelIndex();
+ if (index.isValid()) {
+ break;
+ }
+ }
+
+ while (itemsAdded < amount) {
+ index = mItemView->modelIterator()->previousIndex(index);
+ if (!index.isValid()) {
+ break;
+ }
+
+ q->insertItem(0, index);
+ itemsAdded++;
+ }
+}
+
+/*!
+ Decreases the item buffer size with given \a amount.
+
+ Tries to avoid deleting visible items and keep the buffer balanced.
+*/
+void HbAbstractItemContainerPrivate::decreaseBufferSize(int amount)
+{
+ Q_UNUSED(amount)
+
+ int firstVisible = 0;
+ int lastVisible = 0;
+ firstAndLastVisibleBufferIndex(firstVisible, lastVisible, mItemView->geometry(), false);
+
+ int deletableItemsOnTop = firstVisible - 1;
+ int deletableItemsOnBottom = mItems.count() - lastVisible - 1;
+ int itemsDeleted = 0;
+ HbAbstractViewItem* item = 0;
+
+ // in decreasing the buffer we try to keep it balanced
+ while (itemsDeleted < amount ) {
+ if (deletableItemsOnTop > deletableItemsOnBottom) {
+ item = mItems.takeFirst();
+ deletableItemsOnTop--;
+ } else {
+ item = mItems.takeLast();
+ deletableItemsOnBottom--;
+ }
+ deleteItem(item);
+ ++itemsDeleted;
+ }
+
+}
+
+/*!
+ \private
+*/
+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.
+
+ /*
+ 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) {
+ return item;
+ }
+ }
+ }
+ }
+ */
+
+ return 0;
+}
+
+/*!
+ \private
+
+ Removes \a item with model index \a index.
+*/
+void HbAbstractItemContainerPrivate::doRemoveItem(HbAbstractViewItem *item, const QModelIndex &index, bool animate)
+{
+ if (item) {
+ deleteItem(item, animate);
+ if (!index.isValid()) {
+ mItemStates.remove(index);
+ }
+ }
+}
+
+
+/*!
+ \private
+
+ Deletes \a item.
+*/
+void HbAbstractItemContainerPrivate::deleteItem(HbAbstractViewItem *item, bool animate)
+{
+ Q_Q(HbAbstractItemContainer);
+
+ q->setItemTransientState(item->modelIndex(), item->transientState());
+ mItems.removeOne(item);
+ q->itemRemoved(item, animate);
+
+#ifndef HB_EFFECTS
+ delete item;
+#else
+ if (!HbEffect::effectRunning(item, "disappear")
+ && !HbEffect::effectRunning(item, "collapse")) {
+ delete item;
+ }
+#endif
+}
+
+/*
+ \private
+ The previous or the next index must be in the buffer. We cannot assume in this base class
+ that the container is a list we just have to loop through the items and find if the previous
+ or next exist in the buffer. Next index should not be the first one in the buffer and the
+ previous index should not be the last one in the buffer in order this index to the buffer.
+*/
+bool HbAbstractItemContainerPrivate::intoContainerBuffer(const QModelIndex &index) const
+{
+ QModelIndex nextIndex = mItemView->modelIterator()->nextIndex(index);
+ QModelIndex previousIndex = mItemView->modelIterator()->previousIndex(index);
+
+ int itemCount = mItems.count();
+ for (int i = 0; i < itemCount; ++i) {
+ QModelIndex currentIndex = mItems.at(i)->modelIndex();
+ if (currentIndex == nextIndex && i != 0){
+ return true;
+ } else if (currentIndex == previousIndex && i != (itemCount - 1)) {
+ return true;
+ }
+ }
+ return false;
+}
+
+int HbAbstractItemContainerPrivate::containerBufferIndexForModelIndex(const QModelIndex &index) const
+{
+ int bufferIndex = 0;
+ QModelIndex nextIndex = mItemView->modelIterator()->nextIndex(index);
+ QModelIndex previousIndex = mItemView->modelIterator()->previousIndex(index);
+
+ while (bufferIndex < mItems.count()) {
+ QModelIndex currentIndex = mItems.at(bufferIndex)->modelIndex();
+ if (currentIndex == nextIndex) {
+ break;
+ }
+
+ ++bufferIndex;
+
+ if (currentIndex == previousIndex) {
+ break;
+ }
+ }
+ return bufferIndex;
+}
+
+void HbAbstractItemContainerPrivate::restoreItemPosition(HbAbstractViewItem *item, const QPointF &position)
+{
+ Q_Q(HbAbstractItemContainer);
+
+ if (item) {
+ QPointF delta = itemBoundingRect(item).topLeft() - position;
+ if (!delta.isNull()) {
+ q->setPos(q->pos() - delta);
+
+ if (mItemView) {
+ // this will force the HbScrollArea to adjust the content correctly. Adjustment
+ // is not done in the setPos generated event handling by default to speed up scrolling.
+ HbAbstractItemViewPrivate::d_ptr(mItemView)->adjustContent();
+ }
+ }
+ }
+}
+
+void HbAbstractItemContainerPrivate::insertItem(HbAbstractViewItem *item, int pos, const QModelIndex &index, bool animate)
+{
+ Q_Q(HbAbstractItemContainer);
+
+ if (item) {
+ mItems.insert(pos, item);
+ q->itemAdded(pos, item, animate);
+
+ q->setItemModelIndex(item, index);
+ }
+}
+
+qreal HbAbstractItemContainerPrivate::getDiffWithoutScrollareaCompensation(const QPointF &delta) const
+{
+ Q_Q( const HbAbstractItemContainer);
+ const QSizeF containerSize(q->size());
+ const QPointF containerPos(q->pos());
+ qreal diff = 0.0;
+ qreal invisibleArea = 0.0;
+ if (delta.y() > 0) {
+ // space at the bottom
+ QSizeF viewSize = mItemView->size();
+ invisibleArea = containerSize.height() - viewSize.height() + containerPos.y();
+ if (invisibleArea < delta.y()) {
+ diff = delta.y() - invisibleArea;
+ }
+ } else {
+ // space at the top
+ invisibleArea = -containerPos.y();
+ if (containerPos.y() > delta.y()) {
+ diff = delta.y() + invisibleArea;
+ }
+ }
+
+ return diff;
+}
+
+/*!
+ Constructs a new HbAbstractItemContainer with \a parent.
+*/
+HbAbstractItemContainer::HbAbstractItemContainer(QGraphicsItem *parent) :
+ HbWidget(*new HbAbstractItemContainerPrivate(), parent)
+{
+ Q_D(HbAbstractItemContainer);
+
+ d->q_ptr = this;
+ d->init();
+}
+
+/*!
+ Constructs an item with private class object \a dd and \a parent.
+*/
+HbAbstractItemContainer::HbAbstractItemContainer(HbAbstractItemContainerPrivate &dd, QGraphicsItem *parent) :
+ HbWidget(dd, parent)
+{
+ Q_D(HbAbstractItemContainer);
+
+ d->q_ptr = this;
+ d->init();
+}
+
+/*!
+ Destroys the container.
+*/
+HbAbstractItemContainer::~HbAbstractItemContainer()
+{
+}
+
+/*!
+ \reimp
+*/
+bool HbAbstractItemContainer::event(QEvent *e)
+{
+ if (e->type() == QEvent::LayoutRequest) {
+ QGraphicsWidget *parentWid = parentWidget();
+ if (!parentLayoutItem()
+ && parentWid) {
+ HbApplication::postEvent(parentWid, new QEvent(QEvent::LayoutRequest));
+ }
+ Q_D(HbAbstractItemContainer);
+ d->updateItemBuffer();
+ } else if (e->type() == UpdateItemBufferEvent) {
+ Q_D(HbAbstractItemContainer);
+ d->updateItemBuffer();
+ }
+
+ return HbWidget::event(e);
+}
+
+/*!
+ Returns view item object corresponding given model \a index. This might be 0 pointer if
+ there is no view item representing given index or given \a index is invalid.
+*/
+HbAbstractViewItem* HbAbstractItemContainer::itemByIndex(const QModelIndex &index) const
+{
+ Q_D(const HbAbstractItemContainer);
+
+ if (!index.isValid()) {
+ return 0;
+ }
+ return d->item(index);
+}
+
+/*!
+ This function is provided for convenience.
+
+ It removes all the items from the container and clears the internal state model.
+*/
+void HbAbstractItemContainer::removeItems()
+{
+ Q_D(HbAbstractItemContainer);
+
+ qDeleteAll(d->mItems);
+ d->mItems.clear();
+ d->mItemStateList.clear();
+ d->mItemStates.clear();
+}
+
+/*!
+ Returns the item view that container is connected.
+*/
+HbAbstractItemView *HbAbstractItemContainer::itemView() const
+{
+ Q_D(const HbAbstractItemContainer);
+ return d->mItemView;
+}
+
+/*!
+ Sets item \a view that container is connected.
+*/
+void HbAbstractItemContainer::setItemView(HbAbstractItemView *view)
+{
+ Q_D(HbAbstractItemContainer);
+
+ if (view != d->mItemView) {
+ if (d->mItemView) {
+ d->mItemView->removeEventFilter(this);
+ }
+
+ d->mItemView = view;
+
+ foreach (HbAbstractViewItem *prototype, d->mPrototypes) {
+ d->initPrototype(prototype);
+ }
+
+ if (d->mItemView) {
+ setParentItem(view);
+ d->mItemView->installEventFilter(this);
+ }
+ }
+}
+
+/*!
+ Assigns new model \a index to the given \a item. Item's current state is saved
+ and state for \a index is restored to item.
+*/
+void HbAbstractItemContainer::setItemModelIndex(HbAbstractViewItem *item, const QModelIndex &index)
+{
+
+ if (item && item->modelIndex() != index) {
+
+ setItemTransientState(item->modelIndex(), item->transientState());
+
+ // Transfer the state from item currently representing index to new item, if such exists.
+ HbAbstractViewItem *oldItem = itemByIndex(index);
+
+ if (oldItem) {
+ item->setTransientState(oldItem->transientState());
+ } else {
+ item->setTransientState(itemTransientState(index));
+ }
+
+
+ item->setModelIndex(index);
+ }
+}
+
+/*!
+ Sets item's model indexes starting from given \a startIndex. If \a startIndex is
+ QModelIndex() then startIndex is taken from the first item.
+
+ \note If there are not enough model indexes from \a startIndex to last model index
+ for all the items then QModelIndex() is assigned to rest of the view items.
+*/
+void HbAbstractItemContainer::setModelIndexes(const QModelIndex &startIndex)
+{
+ Q_D(HbAbstractItemContainer);
+
+ if (!d->mItemView || !d->mItemView->model()) {
+ return;
+ }
+
+ QModelIndex index = startIndex;
+ if (!index.isValid()) {
+ if (!d->mItems.isEmpty()) {
+ index = d->mItems.first()->modelIndex();
+ }
+
+ if (!index.isValid()) {
+ index = d->mItemView->modelIterator()->nextIndex(index);
+ }
+ }
+
+ QModelIndexList indexList;
+
+ int itemCount(d->mItems.count());
+
+ if (itemCount != 0 && index.isValid()) {
+ indexList.append(index);
+ }
+
+ for (int i = indexList.count(); i < itemCount; ++i) {
+ index = d->mItemView->modelIterator()->nextIndex(indexList.last());
+
+ if (index.isValid()) {
+ indexList.append(index);
+ } else {
+ break;
+ }
+ }
+
+ for (int i = indexList.count(); i < itemCount; ++i) {
+ index = d->mItemView->modelIterator()->previousIndex(indexList.first());
+
+ if (index.isValid()) {
+ indexList.prepend(index);
+ } else {
+ break;
+ }
+ }
+
+ // if items have been added/removed in the middle of the buffer, there might be items
+ // that can be reused at the end of the buffer. The following block will scan for
+ // those items and move them in correct position
+ int lastUsedItem = -1;
+ for (int indexCounter = 0; indexCounter < indexList.count(); ++indexCounter) {
+ HbAbstractViewItem *item = d->mItems.at(indexCounter);
+ if (item && item->modelIndex() == indexList.at(indexCounter)) {
+ lastUsedItem = indexCounter;
+ } else {
+ for (int itemCounter = lastUsedItem + 1; itemCounter < d->mItems.count(); itemCounter++) {
+ HbAbstractViewItem *item2 = d->mItems.at(itemCounter);
+ if (item2->modelIndex() == indexList.at(indexCounter)) {
+ d->mItems.swap(indexCounter, itemCounter);
+ itemRemoved(d->mItems.at(indexCounter), false);
+ itemRemoved(d->mItems.at(itemCounter), false);
+ itemAdded(qMin(indexCounter, itemCounter), d->mItems.at(qMin(indexCounter, itemCounter)), false);
+ itemAdded(qMax(indexCounter, itemCounter), d->mItems.at(qMax(indexCounter, itemCounter)), false);
+ lastUsedItem = itemCounter;
+ break;
+ }
+ }
+ }
+ }
+
+ int indexCount(indexList.count());
+ for (int i = 0; i < itemCount; ++i) {
+ HbAbstractViewItem *item = d->mItems.at(i);
+ HbAbstractViewItem *prototype = 0;
+ // setItemModelIndex() is considered recycling. It is called only, if recycling is permitted
+ if (i < indexCount) {
+ prototype = d->itemPrototype(indexList.at(i));
+ }
+ if (prototype) {
+ if ( prototype == item->prototype()
+ && d->mItemRecycling) {
+ setItemModelIndex(item, indexList.at(i));
+ } else if ( d->mItemRecycling
+ || ( !d->mItemRecycling
+ && item->modelIndex() != indexList.at(i))) {
+ d->deleteItem(item);
+ insertItem(i, indexList.at(i));
+ } // else: !d->mItemRecycling && item->modelIndex().isValid() == indexList.at(i))
+ } else {
+ d->deleteItem(item);
+ itemCount--;
+ i--;
+ }
+ }
+}
+
+/*!
+ Returns list of items inside item buffer.
+*/
+QList<HbAbstractViewItem *> HbAbstractItemContainer::items() const
+{
+ Q_D(const HbAbstractItemContainer);
+ return d->mItems;
+}
+
+/*!
+ Adds item for model \a index to container.
+*/
+void HbAbstractItemContainer::addItem(const QModelIndex &index, bool animate)
+{
+ Q_D(HbAbstractItemContainer);
+
+ // Add new item if maximum item count allows it or item falls within the range of
+ // item buffer items.
+ if (d->intoContainerBuffer(index)) {
+ int bufferIndex = d->containerBufferIndexForModelIndex(index);
+
+ if (bufferIndex >= d->mItems.count()
+ || d->mItems.at(bufferIndex)->modelIndex() != index) {
+ // Store the second item position related to view.
+ HbAbstractViewItem *referenceItem = d->mItems.value(1);
+ QPointF referenceItemPos;
+ if (referenceItem) {
+ referenceItemPos = d->itemBoundingRect(referenceItem).topLeft();
+ }
+
+ HbAbstractViewItem *recycledItem = 0;
+ QRectF viewRect = d->itemBoundingRect(d->mItemView);
+
+ if (d->mItemRecycling && !viewRect.isEmpty()) {
+ // Recycling allowed. Try recycling the items from buffer.
+ int firstVisible = 0;
+ int lastVisible = 0;
+ d->firstAndLastVisibleBufferIndex(firstVisible, lastVisible, viewRect, false);
+
+ int itemsOnTop = firstVisible - 1;
+ int itemsOnBottom = d->mItems.count() - lastVisible - 1;
+
+ if (itemsOnBottom > 0) {
+ recycledItem = d->mItems.takeLast();
+ } else if (itemsOnTop > 0) {
+ recycledItem = d->mItems.takeFirst();
+ bufferIndex--;
+ bufferIndex = qMax(0, bufferIndex);
+ }
+
+ if (recycledItem) {
+ itemRemoved(recycledItem, false);
+ d->insertItem(recycledItem, bufferIndex, index, animate);
+ }
+ }
+
+ if (!recycledItem) {
+ // No recycling has happened. Insert completely new item.
+ insertItem(bufferIndex, index, animate);
+ }
+
+ // Restore second item position.
+ d->restoreItemPosition(referenceItem, referenceItemPos);
+
+ if (!recycledItem && d->mItemRecycling) {
+ // Resize the buffer.
+ d->updateItemBuffer();
+ }
+ }
+ } else if (d->mItems.count() < maxItemCount()) {
+ d->updateItemBuffer();
+ }
+}
+
+/*!
+ Removes item representing \a index from container.
+*/
+void HbAbstractItemContainer::removeItem(const QModelIndex &index, bool animate)
+{
+ Q_D(HbAbstractItemContainer);
+
+ HbAbstractViewItem *item = d->item(index);
+ d->doRemoveItem(item, index, animate);
+}
+
+/*!
+ Removes item from \a pos.
+*/
+void HbAbstractItemContainer::removeItem(int pos, bool animate)
+{
+ Q_D(HbAbstractItemContainer);
+
+ Q_ASSERT(pos >= 0 && pos < d->mItems.count());
+
+ HbAbstractViewItem *item = d->mItems.at(pos);
+ QModelIndex index = item->modelIndex();
+ d->doRemoveItem(item, index, animate);
+}
+
+/*!
+ Derived class should implement this function to perform item recycling based on container \a delta.
+ Given \a delta is the distance between container's current position and desired new position. Recycling
+ should be done based on the new position and function should return the actual delta. Actual delta could
+ be modified value from \a delta. Delta modification can be useful e.g. to compensate the item changes
+ that are caused by relayouting of items after changing the item position within layout.
+
+ Default implementation does not recycle items and returns the \a delta unchanged.
+*/
+QPointF HbAbstractItemContainer::recycleItems(const QPointF &delta)
+{
+ return delta;
+}
+
+/*!
+ \reimp
+*/
+bool HbAbstractItemContainer::eventFilter(QObject *obj, QEvent *event)
+{
+ Q_D(HbAbstractItemContainer);
+
+ if (obj == d->mItemView) {
+ switch (event->type()){
+ case QEvent::GraphicsSceneResize: {
+ viewResized(d->mItemView->size());
+ d->updateItemBuffer();
+ break;
+ }
+ default:
+ break;
+ }
+ }
+
+ return HbWidget::eventFilter(obj, event);
+}
+
+/*!
+ Returns maximum amount of items that item buffer can hold.
+
+ Default implementation returns the total number of indexes that can
+ be accessed on current view.
+
+ Derived class that supports item recycling should define their own implementation
+ for this function.
+
+ \note Return value should not be more than HbAbstractItemView::indexCount()
+*/
+int HbAbstractItemContainer::maxItemCount() const
+{
+ Q_D(const HbAbstractItemContainer);
+
+ if (d->mItemView) {
+ return d->mItemView->modelIterator()->indexCount();
+ } else {
+ return 0;
+ }
+}
+
+/*!
+ Deletes other prototypes and sets \a prototype as only prototype.
+
+ Returns true if the prototype list was changed; otherwise returns false.
+*/
+bool HbAbstractItemContainer::setItemPrototype(HbAbstractViewItem *prototype)
+{
+ QList<HbAbstractViewItem *> prototypeList;
+ prototypeList.append(prototype);
+ return setItemPrototypes(prototypeList);
+}
+
+/*!
+ Returns the list of item prototypes.
+*/
+QList<HbAbstractViewItem *> HbAbstractItemContainer::itemPrototypes() const
+{
+ Q_D(const HbAbstractItemContainer);
+
+ if (d->mPrototypes.isEmpty()) {
+ HbAbstractViewItem *defaultPrototype = createDefaultPrototype();
+ if (defaultPrototype) {
+ d->initPrototype(defaultPrototype);
+
+ d->mPrototypes.append(defaultPrototype);
+ }
+ }
+
+ return d->mPrototypes;
+}
+
+/*!
+ Sets the list of prototypes.
+
+ Returns true if the prototype list was changed; otherwise returns false.
+*/
+bool HbAbstractItemContainer::setItemPrototypes(const QList<HbAbstractViewItem *> &prototypes)
+{
+ Q_D(HbAbstractItemContainer);
+
+ bool changed = false;
+
+ if (prototypes.count() > 0) {
+ if (d->mPrototypes != prototypes) {
+ foreach (HbAbstractViewItem *prototype, d->mPrototypes) {
+ if (!prototypes.contains(prototype)) {
+ delete prototype;
+ }
+ }
+
+ foreach (HbAbstractViewItem *prototype, prototypes) {
+ if (!d->mPrototypes.contains(prototype)) {
+ d->initPrototype(prototype);
+ }
+ }
+ changed = true;
+ }
+
+ d->mPrototypes = prototypes;
+ }
+
+ return changed;
+
+}
+
+/*!
+ Returns transient state of view item with \a index.
+*/
+QHash<QString, QVariant> HbAbstractItemContainer::itemTransientState(const QModelIndex &index) const
+{
+ Q_D(const HbAbstractItemContainer);
+ return d->mItemStates.value(index);
+}
+
+/*!
+ This is an overloaded member function, provided for convenience.
+
+ Stores \a key with \a value of a view item with \a index into state model.
+ \a key is usually name of a Qt property. If \a value is invalid, state item with the \a key is removed.
+
+ Default values of properties should not be added.
+*/
+void HbAbstractItemContainer::setItemTransientStateValue(const QModelIndex &index, const QString &key, const QVariant &value)
+{
+ Q_D(HbAbstractItemContainer);
+ if (index.isValid()) {
+ QHash<QString, QVariant> stateItem = d->mItemStates.value(index);
+ if (!value.isValid()) {
+ stateItem.remove(key);
+ } else {
+ stateItem.insert(key, value);
+ }
+ if (stateItem.count()) {
+ d->mItemStates.insert(index, stateItem);
+ } else {
+ d->mItemStates.remove(index);
+ }
+ } else {
+ d->mItemStates.remove(index);
+ }
+}
+
+
+/*!
+ Stores state of a view item with \a index into item state model. State of the view item is usually
+ retrieved by calling HbAbstractViewItem::transientState().
+
+ Existing state is replaced. If \a state is empty, existing state is removed.
+ Default values of state items should not be added into \a state.
+
+ \sa HbAbstractViewItem::transientState()
+*/
+void HbAbstractItemContainer::setItemTransientState(const QModelIndex &index, QHash<QString,QVariant> state)
+{
+ Q_D(HbAbstractItemContainer);
+ if (index.isValid() && state.count()) {
+ d->mItemStates.insert(index, state);
+ } else {
+ d->mItemStates.remove(index);
+ }
+}
+
+/*!
+ \reimp
+*/
+QVariant HbAbstractItemContainer::itemChange(GraphicsItemChange change, const QVariant & value)
+{
+ return HbWidget::itemChange(change, value);
+}
+
+/*!
+ Returns the model indexes of items that are located on top left and bottom right corners
+ of visible area.
+*/
+void HbAbstractItemContainer::firstAndLastVisibleModelIndex(
+ QModelIndex& firstVisibleModelIndex,
+ QModelIndex& lastVisibleModelIndex,
+ bool fullyVisible) const
+{
+ Q_D(const HbAbstractItemContainer);
+
+ QRectF viewRect(d->itemBoundingRect(d->mItemView));
+
+ int firstVisibleBufferIndex( -1 );
+ int lastVisibleBufferIndex( -1 );
+ d->firstAndLastVisibleBufferIndex( firstVisibleBufferIndex, lastVisibleBufferIndex, viewRect, fullyVisible );
+ if (firstVisibleBufferIndex != -1) {
+ firstVisibleModelIndex = d->mItems.at(firstVisibleBufferIndex)->modelIndex();
+ }
+ if (lastVisibleBufferIndex != -1) {
+ lastVisibleModelIndex = d->mItems.at(lastVisibleBufferIndex)->modelIndex();
+ }
+}
+
+/*!
+ Clears the state model.
+*/
+void HbAbstractItemContainer::removeItemTransientStates()
+{
+ Q_D(HbAbstractItemContainer);
+ d->mItemStateList.clear();
+ d->mItemStates.clear();
+}
+
+/*!
+ Sets item recycling to \a enabled.
+ By default recycling is off.
+ */
+void HbAbstractItemContainer::setItemRecycling(bool enabled)
+{
+ Q_D(HbAbstractItemContainer);
+ if (d->mItemRecycling != enabled) {
+ d->mItemRecycling = enabled;
+ if (!enabled) {
+ removeItemTransientStates();
+ }
+
+ d->updateItemBuffer();
+ }
+}
+
+/*!
+ Returns whether item recycling feature is in use.
+ */
+bool HbAbstractItemContainer::itemRecycling() const
+{
+ Q_D(const HbAbstractItemContainer);
+ return d->mItemRecycling;
+}
+
+/*!
+ Sets the feature informing whether all items in the item view have the same size.
+ In case all the items have the same size, the item view can do some
+ optimizations for performance purposes.
+*/
+void HbAbstractItemContainer::setUniformItemSizes(bool enable)
+{
+ Q_D(HbAbstractItemContainer);
+ d->mUniformItemSizes = enable;
+}
+
+/*!
+ Returns whether the uniform item sizes feature is in use.
+ */
+bool HbAbstractItemContainer::uniformItemSizes() const
+{
+ Q_D(const HbAbstractItemContainer);
+ return d->mUniformItemSizes;
+}
+
+/*!
+ Inserts item for \a index to \a pos.
+*/
+void HbAbstractItemContainer::insertItem(int pos, const QModelIndex &index, bool animate)
+{
+ Q_D(HbAbstractItemContainer);
+ HbAbstractViewItem *item = d->createItem(index);
+ d->insertItem(item, pos, index, animate);
+}
+
+/*!
+ Reset the internal state of the container.
+*/
+void HbAbstractItemContainer::reset()
+{
+ // position need to be reseted while changing model
+ setPos(0.0, 0.0);
+ removeItems();
+ QCoreApplication::postEvent(this, new QEvent((QEvent::Type)UpdateItemBufferEvent));
+}
+
+/*!
+*/
+void HbAbstractItemContainer::resizeContainer()
+{
+ Q_D(HbAbstractItemContainer);
+
+ QSizeF newSize = effectiveSizeHint(Qt::PreferredSize);
+
+ if (d->mItemView) {
+ Qt::Orientations scrollingDirections = d->mItemView->scrollDirections();
+
+ if (!scrollingDirections.testFlag(Qt::Vertical)) {
+ newSize.setHeight(d->mItemView->size().height());
+ }
+
+ if (!scrollingDirections.testFlag(Qt::Horizontal)) {
+ newSize.setWidth(d->mItemView->size().width());
+ }
+ }
+
+ resize(newSize);
+}
+
+#include "moc_hbabstractitemcontainer_p.cpp"
+
--- a/src/hbwidgets/itemviews/hbabstractitemcontainer_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/itemviews/hbabstractitemcontainer_p.h Fri May 14 16:09:54 2010 +0300
@@ -23,87 +23,99 @@
**
****************************************************************************/
-#ifndef HBABSTRACTITEMCONTAINERPRIVATE_H
-#define HBABSTRACTITEMCONTAINERPRIVATE_H
+#ifndef HBABSTRACTITEMCONTAINER_P_H
+#define HBABSTRACTITEMCONTAINER_P_H
-#include "hbwidget_p.h"
-#include "hbabstractitemcontainer.h"
-#include "hbabstractviewitem.h"
+#include <hbwidget.h>
-#include <QPersistentModelIndex>
-
+class HbAbstractItemContainerPrivate;
+class QModelIndex;
class HbAbstractViewItem;
class HbAbstractItemView;
-#include <QHash>
-
-class HbAbstractItemContainerPrivate : public HbWidgetPrivate
+class HB_AUTOTEST_EXPORT HbAbstractItemContainer : public HbWidget
{
- Q_DECLARE_PUBLIC(HbAbstractItemContainer)
+ Q_OBJECT
public:
+ explicit HbAbstractItemContainer(QGraphicsItem *parent = 0);
+ virtual ~HbAbstractItemContainer();
- struct StateItem
- {
- QPersistentModelIndex index;
- QMap<int,QVariant> state;
- };
+ virtual void addItem(const QModelIndex &index, bool animate = false);
+ virtual void removeItem(const QModelIndex &index, bool animate = false);
+ virtual void removeItem(int pos, bool animate = false);
+ void removeItems();
+
+ HbAbstractViewItem* itemByIndex(const QModelIndex &index) const;
+ QList<HbAbstractViewItem *> items() const;
- HbAbstractItemContainerPrivate();
- virtual ~HbAbstractItemContainerPrivate();
+ virtual void reset();
+
+ HbAbstractItemView *itemView() const;
+ void setItemView(HbAbstractItemView *view);
- QRectF itemBoundingRect(const QGraphicsItem *item) const;
+ virtual void setModelIndexes(const QModelIndex &startIndex = QModelIndex());
- void firstAndLastVisibleBufferIndex(int& firstVisibleBufferIndex,
- int& lastVisibleBufferIndex,
- const QRectF &viewRect,
+ void firstAndLastVisibleModelIndex(
+ QModelIndex& firstVisibleModelIndex,
+ QModelIndex& lastVisibleModelIndex,
bool fullyVisible = true) const;
- bool visible(HbAbstractViewItem* item, const QRectF &viewRect, bool fullyVisible = true) const;
-
- void deletePrototypes();
+ QList<HbAbstractViewItem *> itemPrototypes() const;
+ bool setItemPrototype(HbAbstractViewItem *prototype);
+ bool setItemPrototypes(const QList<HbAbstractViewItem *> &prototypes);
- int findStateItem(const QModelIndex &index) const;
+ void setItemTransientState(const QModelIndex &index, QHash<QString,QVariant> state);
+ void setItemTransientStateValue(const QModelIndex &index, const QString &key, const QVariant &value);
- void initPrototype(HbAbstractViewItem *prototype) const;
+ QMap<int,QVariant> itemState(const QModelIndex &index) const;
+ QHash<QString, QVariant> itemTransientState(const QModelIndex &index) const;
+
+ void removeItemTransientStates();
- HbAbstractViewItem *createItem(const QModelIndex &index);
- HbAbstractViewItem *itemPrototype(const QModelIndex& index) const;
+ void setItemRecycling(bool enabled);
+ bool itemRecycling() const;
+
+ virtual void setUniformItemSizes(bool enable);
+ bool uniformItemSizes() const;
+
+ virtual bool eventFilter(QObject *obj, QEvent *event);
- virtual void updateItemBuffer();
- void increaseBufferSize(int amount);
- void decreaseBufferSize(int amount);
+ virtual void resizeContainer();
+
+signals:
- HbAbstractViewItem* item(const QModelIndex &index) const;
+ void itemCreated(HbAbstractViewItem *item);
- void doRemoveItem(HbAbstractViewItem *item, const QModelIndex &index, bool animate = false);
-
- void deleteItem(HbAbstractViewItem *item, bool animate = false);
+protected:
- virtual bool intoContainerBuffer(const QModelIndex &index) const;
- virtual int containerBufferIndexForModelIndex(const QModelIndex &index) const;
+ HbAbstractItemContainer(HbAbstractItemContainerPrivate &dd, QGraphicsItem *parent);
+
+ virtual void itemAdded(int index, HbAbstractViewItem *item, bool animate) = 0;
+ virtual void itemRemoved(HbAbstractViewItem *item, bool animate) = 0;
- virtual qreal getDiffWithoutScrollareaCompensation(const QPointF &delta) const;
+ virtual void viewResized(const QSizeF &size) = 0;
+
+ virtual void setItemModelIndex(HbAbstractViewItem *item, const QModelIndex &index);
- void restoreItemPosition(HbAbstractViewItem *item, const QPointF &position);
+ QVariant itemChange(GraphicsItemChange change, const QVariant & value) ;
- void insertItem(HbAbstractViewItem *item, int pos, const QModelIndex &index, bool animate);
+ virtual QPointF recycleItems(const QPointF &delta);
- mutable QList<HbAbstractViewItem*> mPrototypes;
- QList<StateItem> mItemStateList;
- QHash<QPersistentModelIndex, QHash<QString, QVariant> > mItemStates;
+ void insertItem(int pos, const QModelIndex &index, bool animate = false);
- QList<HbAbstractViewItem*> mItems;
- HbAbstractItemView *mItemView;
+ virtual int maxItemCount() const;
+
+ virtual bool event(QEvent *e);
- int mBufferSize;
- bool mItemRecycling;
+ virtual HbAbstractViewItem *createDefaultPrototype() const = 0;
- bool mUniformItemSizes;
- QPersistentModelIndex mFirstItemIndex;
- static const int UpdateItemBufferEvent;
+private:
+
+ Q_DECLARE_PRIVATE_D(d_ptr, HbAbstractItemContainer)
+ Q_DISABLE_COPY(HbAbstractItemContainer)
+
+ friend class HbAbstractItemView;
};
-Q_DECLARE_METATYPE(HbAbstractItemContainerPrivate::StateItem)
-
-#endif /* HBABSTRACTITEMCONTAINERPRIVATE_H */
+#endif
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/hbwidgets/itemviews/hbabstractitemcontainer_p_p.h Fri May 14 16:09:54 2010 +0300
@@ -0,0 +1,124 @@
+/****************************************************************************
+**
+** Copyright (C) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (developer.feedback@nokia.com)
+**
+** This file is part of the HbWidgets module of the UI Extensions for Mobile.
+**
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this file.
+** Please review the following information to ensure the GNU Lesser General
+** Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at developer.feedback@nokia.com.
+**
+****************************************************************************/
+
+#ifndef HBABSTRACTITEMCONTAINER_P_P_H
+#define HBABSTRACTITEMCONTAINER_P_P_H
+
+#include "hbwidget_p.h"
+#include "hbabstractitemcontainer_p.h"
+#include "hbabstractviewitem.h"
+#include "hbabstractitemview.h"
+#include "hbmodeliterator.h"
+
+#include <QPersistentModelIndex>
+
+class HbAbstractViewItem;
+class HbAbstractItemView;
+
+#include <QHash>
+
+class HbAbstractItemContainerPrivate : public HbWidgetPrivate
+{
+ Q_DECLARE_PUBLIC(HbAbstractItemContainer)
+
+public:
+
+ struct StateItem
+ {
+ QPersistentModelIndex index;
+ QMap<int,QVariant> state;
+ };
+
+ HbAbstractItemContainerPrivate();
+ virtual ~HbAbstractItemContainerPrivate();
+
+ void init();
+
+ QRectF itemBoundingRect(const QGraphicsItem *item) const;
+
+ void firstAndLastVisibleBufferIndex(int& firstVisibleBufferIndex,
+ int& lastVisibleBufferIndex,
+ const QRectF &viewRect,
+ bool fullyVisible = true) const;
+
+ bool visible(HbAbstractViewItem* item, const QRectF &viewRect, bool fullyVisible = true) const;
+
+ void deletePrototypes();
+
+ int findStateItem(const QModelIndex &index) const;
+
+ void initPrototype(HbAbstractViewItem *prototype) const;
+
+ HbAbstractViewItem *createItem(const QModelIndex &index);
+ HbAbstractViewItem *itemPrototype(const QModelIndex& index) const;
+
+ virtual void updateItemBuffer();
+ void increaseBufferSize(int amount);
+ void decreaseBufferSize(int amount);
+
+ HbAbstractViewItem* item(const QModelIndex &index) const;
+
+ void doRemoveItem(HbAbstractViewItem *item, const QModelIndex &index, bool animate = false);
+
+ void deleteItem(HbAbstractViewItem *item, bool animate = false);
+
+ virtual bool intoContainerBuffer(const QModelIndex &index) const;
+ virtual int containerBufferIndexForModelIndex(const QModelIndex &index) const;
+
+ virtual qreal getDiffWithoutScrollareaCompensation(const QPointF &delta) const;
+
+ void restoreItemPosition(HbAbstractViewItem *item, const QPointF &position);
+
+ void insertItem(HbAbstractViewItem *item, int pos, const QModelIndex &index, bool animate);
+
+ inline HbModelIterator *modelIterator() const;
+
+ mutable QList<HbAbstractViewItem*> mPrototypes;
+ QList<StateItem> mItemStateList;
+ QHash<QPersistentModelIndex, QHash<QString, QVariant> > mItemStates;
+
+ QList<HbAbstractViewItem*> mItems;
+ HbAbstractItemView *mItemView;
+
+ int mBufferSize;
+ bool mItemRecycling;
+
+ bool mUniformItemSizes;
+ QPersistentModelIndex mFirstItemIndex;
+ static const int UpdateItemBufferEvent;
+};
+
+HbModelIterator *HbAbstractItemContainerPrivate::modelIterator() const
+{
+ if (mItemView) {
+ return mItemView->modelIterator();
+ } else {
+ return 0;
+ }
+}
+
+Q_DECLARE_METATYPE(HbAbstractItemContainerPrivate::StateItem)
+
+#endif /* HBABSTRACTITEMCONTAINERPRIVATE_H */
--- a/src/hbwidgets/itemviews/hbabstractitemview.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/itemviews/hbabstractitemview.cpp Fri May 14 16:09:54 2010 +0300
@@ -24,12 +24,12 @@
****************************************************************************/
#include "hbabstractitemview_p.h"
-#include "hbabstractitemcontainer_p.h"
+#include "hbabstractitemcontainer_p_p.h"
#include <hbabstractitemview.h>
#include <hbabstractviewitem.h>
#include <hbevent.h>
-#include <hbabstractitemcontainer.h>
+#include <hbabstractitemcontainer_p.h>
#include <hbwidgetfeedback.h>
#include <hbinstance.h>
#include <hbscrollbar.h>
@@ -38,8 +38,6 @@
#include <QGraphicsSceneMouseEvent>
#include <QGraphicsScene>
#include <QDebug>
-// For QMAP_INT__ITEM_STATE_DEPRECATED's sake. Removed when QMap<int,QVariant> based state item system is removed
-#include <hbabstractviewitem_p.h>
#include <QGesture>
#include <QGestureEvent>
@@ -139,16 +137,6 @@
*/
/*!
- \var HbAbstractItemView::ContiguousSelection
- \deprecated HbAbstractItemView::ContiguousSelection
- is deprecated.
-
- When the user selects an item in the usual way, the selection is cleared and the new item selected.
- However, if the user presses an item, moves the selection and releases it, all the items between
- are selected or unselected, depending on the state of the first item.
-*/
-
-/*!
\enum HbAbstractItemView::ItemAnimation
animations in HbAbstractItemView that can be disabled. By default all animations are enabled.
@@ -203,7 +191,7 @@
HbAbstractItemView::ScrollHint hint = EnsureVisible)
Scrolls the view if necessary to ensure that the item at \a index is visible
- according to hint. Default value just guarantees, that item will be fully visible.
+ in a position according to \a hint. Default value just guarantees, that item will be fully visible.
*/
@@ -213,25 +201,6 @@
*/
/*!
- \deprecated HbAbstractItemView::HbAbstractItemView(HbAbstractItemViewPrivate &, HbAbstractItemContainer *, QGraphicsItem *)
- is deprecated. Use \a HbAbstractItemView::HbAbstractItemView(HbAbstractItemViewPrivate &, HbAbstractItemContainer *, HbModelIterator *, QGraphicsItem *).
-
- Constructs a new HbAbstractItemView with \a parent.
-*/
-HbAbstractItemView::HbAbstractItemView(HbAbstractItemViewPrivate &dd,
- HbAbstractItemContainer *container,
- QGraphicsItem *parent)
- : HbScrollArea(dd, parent)
-{
- qWarning("HbAbstractItemView::HbAbstractItemView(HbAbstractItemViewPrivate &, HbAbstractItemContainer *, QGraphicsItem *) is deprecated! Use HbAbstractItemView::HbAbstractItemView(HbAbstractItemViewPrivate &, HbAbstractItemContainer *, HbModelIterator *, QGraphicsItem *).");
- Q_D(HbAbstractItemView);
- Q_ASSERT_X(container, "HbAbstractItemView constructor", "Container is null");
-
- d->q_ptr = this;
- d->init(container, new HbModelIterator());
-}
-
-/*!
Constructs a new HbAbstractItemView with \a parent.
*/
HbAbstractItemView::HbAbstractItemView(HbAbstractItemViewPrivate &dd,
@@ -360,30 +329,6 @@
}
/*!
- \deprecated HbAbstractItemView::setSelectionMode(HbAbstractItemView::SelectionMode, bool)
- is deprecated. Use \a HbAbstractItemView::setSelectionMode(HbAbstractItemView::SelectionMode newMode)
-
- If \a newMode is not same as current selection mode of view,
- updates selection mode and all viewitems.
- If \a resetSelection is true, it clears all existing selections. By default this value is true.
- */
-void HbAbstractItemView::setSelectionMode(SelectionMode newMode, bool resetSelection)
-{
- qWarning("HbAbstractItemView::setSelectionMode(HbAbstractItemView::SelectionMode, bool) is deprecated! Use HbAbstractItemView::setSelectionMode(HbAbstractItemView::SelectionMode).");
-
- Q_D(HbAbstractItemView);
- if (d->mSelectionMode != newMode) {
- d->mSelectionMode = newMode;
-
- if (resetSelection) {
- clearSelection();
- }
-
- d->updateItems();
- }
-}
-
-/*!
If \a newMode is not same as current selection mode of view,
updates selection mode, all viewitems and clears all existing selections.
*/
@@ -407,8 +352,7 @@
Q_D(HbAbstractItemView);
if (d->mModelIterator->model()
&& d->mSelectionModel
- && (d->mSelectionMode == MultiSelection
- || d->mSelectionMode == ContiguousSelection)) {
+ && d->mSelectionMode == MultiSelection) {
QModelIndex firstIndex = d->mModelIterator->nextIndex(QModelIndex());
QModelIndex lastIndex = d->mModelIterator->previousIndex(QModelIndex());
d->mSelectionModel->select(QItemSelection(firstIndex, lastIndex), QItemSelectionModel::Select);
@@ -447,7 +391,7 @@
}
/*!
- Sets Currentindex to \a index. The item is selected depending on the \a selectionFlag.
+ Sets current index to \a index. The item is selected depending on the \a selectionFlag.
By default item is not selected. If current selection mode is NoSelection,
item is not selected irrespective of the selection flag.
*/
@@ -539,7 +483,7 @@
}
result = true;
} else if (e->type() == QEvent::LayoutRequest) {
- d->refreshContainerGeometry();
+ d->mContainer->resizeContainer();
if (d->mPostponedScrollIndex.isValid()) {
d->scrollTo(d->mPostponedScrollIndex, d->mPostponedScrollHint);
}
@@ -566,7 +510,7 @@
//Setting the uniform ites sizes to container again resets size caches.
d->mContainer->setUniformItemSizes(d->mContainer->uniformItemSizes());
d->mContainer->setPos(0,0);
- d->refreshContainerGeometry();
+ d->mContainer->resizeContainer();
d->updateScrollMetrics();
@@ -636,21 +580,6 @@
}
/*!
- \deprecated HbAbstractItemView::isVisible(HbAbstractViewItem*) const
- is deprecated. Use isVisible \a HbAbstractItemView::isVisible(const QModelIndex&) const.
-
- This is an overloaded member function, provided for convenience.
- Returns true if item is fully or partially visible in view.
- */
-bool HbAbstractItemView::isVisible(HbAbstractViewItem *item) const
-{
- qWarning("HbAbstractItemView::isVisible(HbAbstractViewItem*) const is deprecated! Use isVisible \a HbAbstractItemView::isVisible(const QModelIndex&) const");
-
- Q_D(const HbAbstractItemView);
- return d->visible(item, false);
-}
-
-/*!
Base class implemmentation. Take care about scrollTo when it was
called before view was visible (first scrollTo can be done after
first layoutRequest).
@@ -697,20 +626,6 @@
}
/*!
- \deprecated HbAbstractItemView::itemAtPosition(const QPointF&) const
- is deprecated.
-
- Returns a pointer to item at the coordinates.
- */
-HbAbstractViewItem *HbAbstractItemView::itemAtPosition(const QPointF& position) const
-{
- qWarning("HbAbstractItemView::itemAtPosition(const QPointF&) const is deprecated!");
-
- Q_D(const HbAbstractItemView);
- return d->itemAt(position);
-}
-
-/*!
Returns SelectionFlags to be used when updating selection of a item.
The event is a user input event, such as a mouse or keyboard event.
contiguousArea is true, if selectiontype is not single or no selection and
@@ -796,29 +711,12 @@
if (current != d->mCurrentIndex) {
d->mCurrentIndex = current;
-
- HbAbstractViewItem* oldItem = d->mContainer->itemByIndex(previous);
- HbAbstractViewItem* newItem = d->mContainer->itemByIndex(current);
-
- if (oldItem) {
- oldItem->lostFocus();
- }
-
+
if (previous.isValid()) {
-#ifndef QMAP_INT__ITEM_STATE_DEPRECATED
- d->mContainer->setItemStateValue(previous, HbAbstractViewItem::FocusKey, false);
-#endif
d->mContainer->setItemTransientStateValue(previous, "focused", false);
}
-
- if (newItem) {
- newItem->receivedFocus();
- }
if (d->mCurrentIndex.isValid()) {
-#ifndef QMAP_INT__ITEM_STATE_DEPRECATED
- d->mContainer->setItemStateValue(d->mCurrentIndex, HbAbstractViewItem::FocusKey, true);
-#endif
d->mContainer->setItemTransientStateValue(d->mCurrentIndex, "focused", true);
}
@@ -848,11 +746,6 @@
HbWidgetFeedback::triggered(item, Hb::InstantSelectionChanged, modifiers);
}
}
-#ifndef QMAP_INT__ITEM_STATE_DEPRECATED
- d->mContainer->setItemStateValue(selectedIndexes.at(i),
- HbAbstractViewItem::CheckStateKey,
- Qt::Checked);
-#endif
d->mContainer->setItemTransientStateValue(selectedIndexes.at(i),
"checkState",
Qt::Checked);
@@ -868,11 +761,6 @@
HbWidgetFeedback::triggered(item, Hb::InstantSelectionChanged);
}
}
-#ifndef QMAP_INT__ITEM_STATE_DEPRECATED
- d->mContainer->setItemStateValue(deselectedIndexes.at(i),
- HbAbstractViewItem::CheckStateKey,
- Qt::Unchecked);
-#endif
d->mContainer->setItemTransientStateValue(deselectedIndexes.at(i),
"checkState",
Qt::Unchecked);
@@ -1024,68 +912,6 @@
}
/*!
- \deprecated HbAbstractItemView::indexCount() const
- is deprecated. Use \a HbModelIterator::indexCount()
-
- Returns the total model index count that can be traversed with nextIndex and previousIndex functions.
-*/
-int HbAbstractItemView::indexCount() const
-{
- qWarning("HbAbstractItemView::indexCount() is deprecated! Use HbModelIterator::indexCount().");
-
- Q_D(const HbAbstractItemView);
- return d->mModelIterator->indexCount();
-}
-
-/*!
- \deprecated HbAbstractItemView::indexPosition(const QModelIndex &) const
- is deprecated. Use \a HbModelIterator::indexPosition(const QModelIndex &) const
-
- Returns the position of \a index from the first index.
-*/
-int HbAbstractItemView::indexPosition(const QModelIndex &index) const
-{
- qWarning("HbAbstractItemView::indexPosition(const QModelIndex &) is deprecated! Use HbModelIterator::indexPosition(const QModelIndex &).");
-
- Q_D(const HbAbstractItemView);
- return d->mModelIterator->indexPosition(index);
-}
-
-/*!
- \deprecated HbAbstractItemView::nextIndex(const QModelIndex&) const
- is deprecated. Use \a HbModelIterator::nextIndex(const QModelIndex&) const
-
- Returns the next model index from \a index. If QModelIndex() is given as a parameter
- this should return the first model index.
-
- \note Returned QModelIndex() is interpret so that there is no next index from given one.
-*/
-QModelIndex HbAbstractItemView::nextIndex(const QModelIndex &index) const
-{
- qWarning("HbAbstractItemView::nextIndex(const QModelIndex&) is deprecated! Use HbModelIterator::nextIndex(const QModelIndex&).");
-
- Q_D(const HbAbstractItemView);
- return d->mModelIterator->nextIndex(index);
-}
-
-/*!
- \deprecated HbAbstractItemView::previousIndex(const QModelIndex&) const
- is deprecated. Use \a HbModelIterator::previousIndex(const QModelIndex&) const
-
- Returns the previous model index from \a index. If QModelIndex() is given as a parameter
- this should return the last model index.
-
- \note Returned QModelIndex() is interpret so that there is no previous index from given one.
-*/
-QModelIndex HbAbstractItemView::previousIndex(const QModelIndex &index) const
-{
- qWarning("HbAbstractItemView::previousIndex(const QModelIndex&) is deprecated! Use HbModelIterator::previousIndex(const QModelIndex&).");
-
- Q_D(const HbAbstractItemView);
- return d->mModelIterator->previousIndex(index);
-}
-
-/*!
\reimp
*/
bool HbAbstractItemView::scrollByAmount(const QPointF &delta)
@@ -1098,26 +924,13 @@
&& !d->mContainer->items().isEmpty()) {
newDelta = d->mContainer->recycleItems(delta);
d->mAnimationInitialPosition = d->mAnimationInitialPosition + newDelta - delta;
- d->refreshContainerGeometry();
+ d->mContainer->resizeContainer();
}
return HbScrollArea::scrollByAmount(newDelta);
}
/*!
- \deprecated HbAbstractItemView::container() const
- is deprecated, because class HbAbstractItemContainer will be made private.
-
- Returns the container widget.
-*/
-HbAbstractItemContainer *HbAbstractItemView::container() const
-{
- qWarning("HbAbstractItemView::container() const is deprecated, because class HbAbstractItemContainer will be made private.");
- Q_D(const HbAbstractItemView);
- return d->mContainer;
-}
-
-/*!
\reimp
*/
QVariant HbAbstractItemView::itemChange(GraphicsItemChange change, const QVariant &value)
@@ -1155,19 +968,6 @@
}
/*!
- \deprecated HbAbstractItemView::type() const
- is deprecated.
-
- \reimp
-*/
-int HbAbstractItemView::type() const
-{
- qWarning("HbAbstractItemView::type() const is deprecated!");
-
- return Type;
-}
-
-/*!
Returns the current name of layout definition of view items of this view
\sa setLayoutName()
@@ -1271,6 +1071,13 @@
}
}
+/*!
+ This slot is called when touch down event occurs. Default implementation handles selection
+ and calls emitPressed().
+
+ \sa HbAbstractViewItem::pressed(const QPointF &position)
+ \sa emitPressed()
+*/
void HbAbstractItemView::itemPressed(const QPointF &pos)
{
Q_D(HbAbstractItemView);
@@ -1293,6 +1100,13 @@
emitPressed(item->modelIndex());
}
+/*!
+ This slot is called when touch release event occurs for view item.
+ Default implementation calls emitReleased().
+
+ \sa HbAbstractViewItem::released(const QPointF &position)
+ \sa emitReleased()
+*/
void HbAbstractItemView::itemReleased(const QPointF &pos)
{
Q_UNUSED(pos);
@@ -1301,6 +1115,13 @@
emitReleased(item->modelIndex());
}
+/*!
+ This slot is called when view item is activated.
+ Default implementation handles selection and calls emitActivated().
+
+ \sa HbAbstractViewItem::itemActivated(const QPointF &position)
+ \sa emitActivated()
+*/
void HbAbstractItemView::itemActivated(const QPointF &pos)
{
Q_D(HbAbstractItemView);
@@ -1319,12 +1140,39 @@
emitActivated(index);
}
+/*!
+ This slot is called when view item is long pressed and long press is enabled in itemview.
+ Default implementation calls longPressed().
+
+ \sa HbAbstractViewItem::longPressed(const QPointF &position)
+ \sa longPressEnabled()
+ \sa longPressed()
+*/
void HbAbstractItemView::itemLongPressed(const QPointF &pos)
{
+ Q_D(HbAbstractItemView);
+
HbAbstractViewItem *item = qobject_cast<HbAbstractViewItem *>(sender());
+ QModelIndex index = item->modelIndex();
+
+ d->mSelectionModel->setCurrentIndex(index, QItemSelectionModel::NoUpdate);
+
emit longPressed(item, item->mapToScene(pos));
}
+/*!
+ This slot is called when concrete view item has been created. Default implementation connects
+ touch event releated signals of HbAbstractViewItem to respective slots in this class.
+
+ \sa HbAbstractViewItem::pressed(const QPointF &position)
+ \sa HbAbstractViewItem::released(const QPointF &position)
+ \sa HbAbstractViewItem::itemActivated(const QPointF &position)
+ \sa HbAbstractViewItem::longPressed(const QPointF &position)
+ \sa itemPressed()
+ \sa itemReleased()
+ \sa itemActivated()
+ \sa itemLongPressed()
+*/
void HbAbstractItemView::itemCreated(HbAbstractViewItem *item)
{
QObject::connect(item, SIGNAL(pressed(QPointF)), this, SLOT(itemPressed(QPointF)));
--- a/src/hbwidgets/itemviews/hbabstractitemview.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/itemviews/hbabstractitemview.h Fri May 14 16:09:54 2010 +0300
@@ -58,8 +58,7 @@
{
NoSelection,
SingleSelection,
- MultiSelection,
- ContiguousSelection
+ MultiSelection
};
enum ScrollHint
@@ -87,9 +86,6 @@
public:
virtual ~HbAbstractItemView();
- enum { Type = Hb::ItemType_AbstractItemView };
- int type() const;
-
virtual void setModel(QAbstractItemModel *model, HbAbstractViewItem *prototype = 0);
QAbstractItemModel *model() const;
@@ -105,7 +101,6 @@
QModelIndex rootIndex() const;
- void setSelectionMode(SelectionMode newMode, bool resetSelection);
void setSelectionMode(SelectionMode newMode);
SelectionMode selectionMode() const;
@@ -114,7 +109,6 @@
using HbScrollArea::isVisible;
bool isVisible(const QModelIndex &index) const;
- bool isVisible(HbAbstractViewItem *item) const;
HbAbstractViewItem *currentViewItem() const;
@@ -123,14 +117,6 @@
virtual void scrollTo(const QModelIndex &index, ScrollHint hint = EnsureVisible) = 0;
QList<HbAbstractViewItem *> visibleItems() const;
- HbAbstractViewItem *itemAtPosition(const QPointF& position) const;
-
- virtual int indexCount() const;
- virtual int indexPosition(const QModelIndex &index) const;
-
- virtual QModelIndex nextIndex(const QModelIndex &index) const;
- virtual QModelIndex previousIndex(const QModelIndex &index) const;
-
QString layoutName() const;
void setLayoutName(const QString &layoutName);
@@ -163,10 +149,6 @@
protected:
HbAbstractItemView(HbAbstractItemViewPrivate &dd,
HbAbstractItemContainer *container,
- QGraphicsItem *parent = 0);
-
- HbAbstractItemView(HbAbstractItemViewPrivate &dd,
- HbAbstractItemContainer *container,
HbModelIterator *modelIterator,
QGraphicsItem *parent = 0);
virtual QItemSelectionModel::SelectionFlags selectionCommand(
@@ -181,8 +163,6 @@
virtual bool scrollByAmount(const QPointF &delta);
- HbAbstractItemContainer *container() const;
-
QVariant itemChange(GraphicsItemChange change, const QVariant &value);
bool sceneEventFilter(QGraphicsItem *watched, QEvent *event);
--- a/src/hbwidgets/itemviews/hbabstractitemview_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/itemviews/hbabstractitemview_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -26,7 +26,7 @@
#include "hbabstractitemview_p.h"
#include "hbabstractitemview.h"
#include "hbabstractviewitem.h"
-#include "hbabstractitemcontainer.h"
+#include "hbabstractitemcontainer_p.h"
#include "hbmodeliterator.h"
#include <hbinstance.h>
@@ -34,6 +34,7 @@
#include <hbapplication.h>
#include <hbeffect.h>
#include <hbpangesture.h>
+#include <hbwidgetfeedback.h>
#include <QGraphicsSceneMouseEvent>
#include <QEvent>
@@ -427,6 +428,9 @@
}
return retVal;
}
+ else if (!mDoingContiguousSelection){
+ HbWidgetFeedback::continuousTriggered(q, Hb::ContinuousScrolled);
+ }
break;
}
case Qt::GestureFinished:
@@ -436,7 +440,10 @@
stopAnimating();
mDoingContiguousSelection = false;
return true;
- }
+ }
+ else {
+ HbWidgetFeedback::continuousStopped(q, Hb::ContinuousScrolled);
+ }
break;
}
default:
@@ -527,7 +534,7 @@
QPointF result(0,0);
if (item) {
- refreshContainerGeometry();
+ mContainer->resizeContainer();
QRectF itemRect = itemBoundingRect(item);
QRectF viewRect = q->boundingRect();
@@ -724,33 +731,6 @@
return hitItem;
}
-/*!
-
-*/
-void HbAbstractItemViewPrivate::refreshContainerGeometry()
-{
- Q_Q(const HbAbstractItemView);
-
- if (mContainer->layout()) {
- if (!mContainer->layout()->isActivated()) {
- // Make sure that the layout process has stopped.
- mContainer->layout()->activate();
- }
- }
-
- QSizeF newSize = mContainer->effectiveSizeHint(Qt::PreferredSize);
-
- if (!mScrollDirections.testFlag(Qt::Vertical)) {
- newSize.setHeight(q->size().height());
- }
-
- if (!mScrollDirections.testFlag(Qt::Horizontal)) {
- newSize.setWidth(q->size().width());
- }
-
- mContainer->resize( newSize );
-}
-
QRectF HbAbstractItemViewPrivate::itemBoundingRect(const QGraphicsItem *item) const
{
@@ -1001,8 +981,7 @@
case HbAbstractItemView::SingleSelection:
flags = singleSelectionCommand(item, event);
break;
- case HbAbstractItemView::MultiSelection:
- case HbAbstractItemView::ContiguousSelection: {
+ case HbAbstractItemView::MultiSelection: {
flags = multiSelectionCommand(item, event);
break;
}
@@ -1038,7 +1017,10 @@
}
}
- refreshContainerGeometry();
+
+ if (mContainer->layout()) {
+ mContainer->layout()->activate();
+ }
HbEffect::start(items, itemType, effectEvent, q, "_q_animationFinished");
}
--- a/src/hbwidgets/itemviews/hbabstractitemview_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/itemviews/hbabstractitemview_p.h Fri May 14 16:09:54 2010 +0300
@@ -103,8 +103,6 @@
HbAbstractViewItem* viewItem(QGraphicsItem *item) const;
- void refreshContainerGeometry();
-
QRectF itemBoundingRect(const QGraphicsItem *item) const;
void updateItems();
--- a/src/hbwidgets/itemviews/hbabstractviewitem.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/itemviews/hbabstractviewitem.cpp Fri May 14 16:09:54 2010 +0300
@@ -28,7 +28,7 @@
#include <hbabstractviewitem.h>
#include <hbabstractitemview.h>
#include <hbnamespace.h>
-#include <hbstyleoptionabstractviewitem.h>
+#include <hbstyleoptionabstractviewitem_p.h>
#include <hbstyle.h>
#include <hbiconitem.h>
#include <hbframebackground.h>
@@ -46,12 +46,6 @@
#include <QGesture>
#include <QGestureEvent>
-#ifdef QMAP_INT__ITEM_STATE_DEPRECATED
-#define HB_ITEM_STATE_ASSERT Q_ASSERT_X(0, "", "QMap<int,QVariant> based view item state system is deprecated. Use QHash<QString, QVariant> based instead" )
-#else
-#define HB_ITEM_STATE_ASSERT
-#endif
-
const QString KDefaultLayoutOption = "default";
const int HbAbstractViewItemShared::ViewItemDeferredDeleteEvent = QEvent::registerEventType();
@@ -62,59 +56,22 @@
\brief The HbAbstractViewItem class represents a single item in a AbstractItemView.
The HbAbstractViewItem class provides an item that is used by HbAbstractItemView class to
- visualize content within single model index. By default HbAbstractViewItem supports QString
- that is stored into Qt::DisplayRole role and QIcon or HbIcon that is stored into
- Qt::DecoratorRole role within the index.
+ visualize content within single model index. By default HbAbstractViewItem supports QString and QStringList
+ stored into Qt::DisplayRole role and QIcon, HbIcon or list of them in QVariantList stored into
+ Qt::DecoratorRole role.
This class is provided mainly for customization purposes but it also acts as a default
item prototype inside HbAbstractItemView. See HbAbstractItemView how to set customized class as a item prototype.
\b Subclassing
- When subclassing HbAbstractViewItem, childclass must provide implementations of createItem() and updateChildItems() functions.
+ When subclassing HbAbstractViewItem, child class must provide implementations of createItem() and updateChildItems() functions.
To support multiple Abstractview items within single AbstractItemview, you must also provide an implementation of canSetModelIndex().
If derived abstract view item has transient state information that is not meaningful to store within model index (child item cursor
- position selection areas etc.) view item can use abstract views internal state model to store this information. This feature can
- be taken into use by implementing transientState() and setTransientState() functions in derived class.
-*/
-
-/*!
- \deprecated HbAbstractViewItem::StateKey
- is deprecated. Please use string based state keys.
-
- \enum HbAbstractViewItem::StateKey
-
- HbAbstractViewItem's predefined set of state keys.
-
- This enum describes state keys for HbAbstractViewItem state values. State value can be accessed using this key.
-
- \sa HbAbstractViewItem::transientState()
-*/
-
-/*!
- \deprecated HbAbstractViewItem::FocusKey
- is deprecated. Please use string based state keys. This key is replaced by "focused".
-
- \var HbAbstractViewItem::FocusKey
- Predefined key for focus state value.
-*/
-
-/*!
- \deprecated HbAbstractViewItem::CheckStateKey
- is deprecated. Please use string based state keys. This key is replaced by "checkState".
-
- \var HbAbstractViewItem::CheckStateKey
- Predefined key for check state value. Default value is Qt::Unchecked.
-*/
-
-/*!
- \deprecated HbAbstractViewItem::UserKey
- is deprecated. Please use string based state keys.
-
- \var HbAbstractViewItem::UserKey
- First key that can be used by the derived class for it's own purposes.
+ position selection areas etc.) this information can be supplied to transient state model. Transient state model is maintained
+ internally by abstract item view.
*/
/*!
@@ -131,6 +88,7 @@
\fn void HbAbstractViewItem::released(const QPointF &position)
This signal is emitted when a touch release event is received for this view item.
+ Released signal is emitted also when user starts panning or flicks the view.
\a position is position of touch event in view item coordinates.
\sa HbAbstractViewItem::pressed(const QPointF &position)
@@ -247,18 +205,20 @@
switch (gesture->state()) {
case Qt::GestureStarted: {
HbWidgetFeedback::triggered(q, Hb::InstantPressed, 0);
- q->setPressed(true);
+ setPressed(true, true);
emit q->pressed(position);
-
break;
}
case Qt::GestureUpdated: {
if (gesture->tapStyleHint() == HbTapGesture::TapAndHold
&& mSharedData->mItemView
&& mSharedData->mItemView->longPressEnabled()) {
- q->setPressed(false);
- emit q->longPressed(position);
- revealItem();
+ setPressed(false, true);
+ QPointer<HbAbstractViewItem> item = q;
+ emit item->longPressed(position);
+ if (item) {
+ revealItem();
+ }
}
break;
}
@@ -266,14 +226,21 @@
HbWidgetFeedback::triggered(q, Hb::InstantReleased, 0);
if (gesture->tapStyleHint() == HbTapGesture::Tap
- || (mSharedData->mItemView
+ || (mSharedData->mItemView
&& !mSharedData->mItemView->longPressEnabled())) {
- q->setPressed(false);
+ setPressed(false, true);
HbWidgetFeedback::triggered(q, Hb::InstantClicked);
- emit q->activated(position);
- emit q->released(position);
- revealItem();
+ QPointer<HbAbstractViewItem> item = q;
+ emit item->activated(position);
+ // this viewItem may be deleted in the signal handling, so guarded pointer is used to
+ // to ensure that the item still exists when item is used
+ if (item) {
+ emit item->released(position);
+ if (item) {
+ revealItem();
+ }
+ }
} else {
emit q->released(position);
}
@@ -281,10 +248,9 @@
break;
}
case Qt::GestureCanceled: {
- HbWidgetFeedback::triggered(q, Hb::InstantReleased, 0);
// hides focus immediately
- q->setPressed(false, false);
+ setPressed(false, false);
emit q->released(position);
break;
@@ -305,6 +271,22 @@
}
}
+void HbAbstractViewItemPrivate::setPressed(bool pressed, bool animate)
+{
+ Q_Q(HbAbstractViewItem);
+
+ if (pressed != mPressed) {
+ mPressed = pressed;
+ q->pressStateChanged(mPressed, animate);
+ if (mPressed) {
+ q->setProperty("state", "pressed");
+ } else {
+ q->setProperty("state", "normal");
+ }
+ }
+}
+
+
/*!
Constructs an abstract view item with the given parent.
*/
@@ -392,20 +374,6 @@
}
/*!
- \deprecated HbAbstractViewItem::type() const
- is deprecated.
-
- \reimp
-*/
-int HbAbstractViewItem::type() const
-{
- qWarning("HbAbstractViewItem::type() const is deprecated");
-
- return Hb::ItemType_AbstractViewItem;
-}
-
-
-/*!
Sets model \a index where this Abstract view item should retrieve it's content.
*/
void HbAbstractViewItem::setModelIndex(const QModelIndex &index)
@@ -419,48 +387,6 @@
}
/*!
- \deprecated HbAbstractViewItem::receivedFocus()
- is deprecated.
-
- Called when item has received focus.
-*/
-void HbAbstractViewItem::receivedFocus()
-{
- qWarning("HbAbstractViewItem::receivedFocus() is deprecated!");
-
- Q_D( HbAbstractViewItem );
- d->mFocused = true;
-}
-
-/*!
- \deprecated HbAbstractViewItem::lostFocus()
- is deprecated.
-
- Called when item has lost focus.
-*/
-void HbAbstractViewItem::lostFocus()
-{
- qWarning("HbAbstractViewItem::lostFocus() is deprecated!");
-
- Q_D( HbAbstractViewItem );
- d->mFocused = false;
-}
-
-/*!
- \deprecated HbAbstractViewItem::isFocused() const
- is deprecated.
-
- Retuns true if item is currently focused, otherwise return false.
-*/
-bool HbAbstractViewItem::isFocused() const
-{
- qWarning("HbAbstractViewItem::isFocused() is deprecated!");
-
- Q_D( const HbAbstractViewItem );
- return d->mFocused;
-}
-
-/*!
Returns the saved item's transient state. Transient state can be seen as a state data that is
wanted to be preserved but it not meaningful to be stored inside model index because of it's
momentary nature. States will be saved inside AbstractItemview and restored when current model index is
@@ -497,53 +423,6 @@
d->mCheckState = (Qt::CheckState)state.value("checkState").toInt();
}
-
-/*!
- \deprecated HbAbstractViewItem::state() const
- is deprecated. Please use HbAbstractViewItem::transientState() instead.
-
- Returns the saved item's transient state. Transient state can be seen as a state data that is
- wanted to be preserved but it not meaningful to be stored inside model index because of it's
- momentary nature. States will be saved inside AbstractItemview and restored when current model index is
- assigned to certain Abstract view item.
-*/
-QMap<int,QVariant> HbAbstractViewItem::state() const
-{
- qWarning("HbAbstractViewItem::state() const is deprecated");
- HB_ITEM_STATE_ASSERT;
- Q_D( const HbAbstractViewItem );
- QMap<int,QVariant> state;
-
- state.insert(FocusKey, d->mFocused);
- state.insert(CheckStateKey, d->mCheckState);
-
- return state;
-}
-
-/*!
- \deprecated HbAbstractViewItem::setState(const QMap<int,QVariant> &)
- is deprecated. Please use HbAbstractViewItem::setTransientState(const QHash<QString, QVariant> &state) instead.
-
- Restores the item's transient state using given \a state data.
-*/
-void HbAbstractViewItem::setState(const QMap<int,QVariant> &state)
-{
- qWarning("HbAbstractViewItem::setState(const QMap<int,QVariant> &state) is deprecated");
- HB_ITEM_STATE_ASSERT;
- Q_D( HbAbstractViewItem );
- if (state.contains(FocusKey)) {
- d->mFocused = state.value(FocusKey).toBool();
- } else {
- d->mFocused = false;
- }
-
- if (state.contains(CheckStateKey)) {
- d->mCheckState = (Qt::CheckState)state.value(CheckStateKey).toInt();
- } else {
- d->mCheckState = Qt::Unchecked;
- }
-}
-
/*!
Returns a pointer to HbAbstractViewItem prototype that was used to create this
view item.
@@ -611,7 +490,6 @@
Default selection areas are for
\li HbAbstractViewItem::SingleSelection mode: whole item
\li HbAbstractViewItem::MultiSelection mode: whole item.
- \li HbAbstractItemView::ContiguousSelection mode: whole item. (Note: HbAbstractItemView::ContiguousSelection is deprecated.)
\li HbAbstractItemView::NoSelection mode: none
The \a selectionAreaType tells what kind of selection area is requested. The parameter value ContiguousSelection returns
@@ -716,38 +594,6 @@
}
/*!
-
- \deprecated HbAbstractViewItem::primitive(HbStyle::Primitive)
- is deprecated.
-
- Provides access to primitives of HbAbstractViewItem.
- \param primitive is the type of the requested primitive. The available primitives are
- \c P_ItemViewItem_background
- \c P_ItemViewItem_frame
- \c P_ItemViewItem_selection
- \c P_ItemViewItem_focus
- \c P_ItemViewItem_touchmultiselection.
- */
-QGraphicsItem *HbAbstractViewItem::primitive(HbStyle::Primitive primitive) const
-{
- Q_D(const HbAbstractViewItem);
-
- if (primitive == HbStyle::P_ItemViewItem_background) {
- return d->mBackgroundItem;
- } else if (primitive == HbStyle::P_ItemViewItem_frame) {
- return d->mFrame;
- } else if (primitive == HbStyle::P_ItemViewItem_selection) {
- return d->mSelectionItem;
- } else if (primitive == HbStyle::P_ItemViewItem_focus) {
- return d->mFocusItem;
- } else if (primitive == HbStyle::P_ItemViewItem_touchmultiselection) {
- return d->mMultiSelectionTouchArea;
- }
-
- return HbWidget::primitive(primitive);
-}
-
-/*!
\reimp
To optimise loading css/xml definitions to take place only once, this function should be
@@ -908,14 +754,14 @@
itemFlags |= QGraphicsItem::ItemIsFocusable;
setFocusPolicy(sd->mPrototype->focusPolicy());
setProperty("state", "normal");
- grabGesture(Qt::TapGesture);
+ grabGesture(Qt::TapGesture);
}
} else {
if (itemFlags & QGraphicsItem::ItemIsFocusable) {
itemFlags &= ~QGraphicsItem::ItemIsFocusable;
setFocusPolicy(Qt::NoFocus);
setProperty("state", "disabled");
- ungrabGesture(Qt::TapGesture);
+ ungrabGesture(Qt::TapGesture);
}
}
@@ -954,8 +800,7 @@
// multiselection area
if ( itemSelectable
- && ( selectionMode == HbAbstractItemView::MultiSelection
- || selectionMode == HbAbstractItemView::ContiguousSelection)) {
+ && selectionMode == HbAbstractItemView::MultiSelection) {
if (!d->mMultiSelectionTouchArea) {
d->mItemsChanged = true;
d->mMultiSelectionTouchArea = style()->createPrimitive(HbStyle::P_ItemViewItem_touchmultiselection, this);
@@ -1004,33 +849,6 @@
}
/*!
- \deprecated HbAbstractViewItem::setPressed(bool, bool)
- is deprecated.
-
- Sets the item press state to \a pressed. Animation is allowed
- if \a animate is set as true; otherwise animation should not
- be triggered.
-
- \sa isPressed, pressStateChanged
-*/
-void HbAbstractViewItem::setPressed(bool pressed, bool animate)
-{
- qWarning("HbAbstractViewItem::setPressed(bool pressed, bool animate) is deprecated!");
-
- Q_D(HbAbstractViewItem);
-
- if (pressed != d->mPressed) {
- d->mPressed = pressed;
- pressStateChanged(d->mPressed, animate);
- if (d->mPressed) {
- setProperty("state", "pressed");
- } else {
- setProperty("state", "normal");
- }
- }
-}
-
-/*!
This function is called whenever item press state changes. \a pressed is new state.
Animation is allowed if \a animate is set as true; otherwise animation should not
@@ -1058,7 +876,9 @@
HbStyleOptionAbstractViewItem styleOption;
initStyleOption(&styleOption);
- style()->updatePrimitive(d->mFocusItem, HbStyle::P_ItemViewItem_focus, &styleOption);
+ if (d->mFocusItem) {
+ style()->updatePrimitive(d->mFocusItem, HbStyle::P_ItemViewItem_focus, &styleOption);
+ }
if (doAnimate) {
HbEffect::cancel(this, "released");
@@ -1087,22 +907,6 @@
}
/*!
- \deprecated HbAbstractViewItem::isPressed() const
- is deprecated.
-
- Returns true if the item is pressed; otherwise returns false
-
- \sa setPressed
-*/
-bool HbAbstractViewItem::isPressed() const
-{
- qWarning("HbAbstractViewItem::isPressed() const is deprecated!");
-
- Q_D(const HbAbstractViewItem);
- return d->mPressed;
-}
-
-/*!
Returns the model item type that is retrieved from model index.
*/
Hb::ModelItemType HbAbstractViewItem::modelItemType() const
@@ -1147,21 +951,6 @@
}
}
-void HbAbstractViewItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
-{
- HbWidget::mousePressEvent(event);
-}
-
-void HbAbstractViewItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
-{
- HbWidget::mouseMoveEvent(event);
-}
-
-void HbAbstractViewItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
-{
- HbWidget::mouseReleaseEvent(event);
-}
-
/*!
\reimp
*/
--- a/src/hbwidgets/itemviews/hbabstractviewitem.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/itemviews/hbabstractviewitem.h Fri May 14 16:09:54 2010 +0300
@@ -57,20 +57,10 @@
MultiSelection,
ContiguousSelection
};
-
- enum StateKey
- {
- FocusKey,
- CheckStateKey,
- UserKey = 100
- };
-
+
explicit HbAbstractViewItem(QGraphicsItem *parent=0);
virtual ~HbAbstractViewItem();
- enum { Type = Hb::ItemType_AbstractViewItem };
- int type() const;
-
virtual HbAbstractViewItem *createItem() = 0;
virtual void updateChildItems();
@@ -82,29 +72,18 @@
HbAbstractItemView *itemView() const;
void setItemView(HbAbstractItemView *itemView);
-
- bool isFocused() const;
- virtual void receivedFocus();
- virtual void lostFocus();
virtual QHash<QString, QVariant> transientState() const;
virtual void setTransientState(const QHash<QString, QVariant> &state);
- virtual QMap<int,QVariant> state() const;
- virtual void setState(const QMap<int,QVariant> &state);
virtual bool selectionAreaContains(const QPointF &position, SelectionAreaType selectionAreaType) const;
- virtual QGraphicsItem *primitive(HbStyle::Primitive primitive) const;
-
void setCheckState(Qt::CheckState state);
Qt::CheckState checkState() const;
void setDefaultFrame(const HbFrameBackground &frame);
HbFrameBackground defaultFrame() const;
- void setPressed(bool pressed, bool animate=true);
- bool isPressed() const;
-
Hb::ModelItemType modelItemType() const;
public slots:
@@ -128,10 +107,6 @@
virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value);
virtual bool event(QEvent *e);
- virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);
- virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
- virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
-
virtual QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const;
virtual void pressStateChanged(bool value, bool animate);
--- a/src/hbwidgets/itemviews/hbabstractviewitem_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/itemviews/hbabstractviewitem_p.h Fri May 14 16:09:54 2010 +0300
@@ -67,9 +67,7 @@
static const int ViewItemDeferredDeleteEvent;
};
-// Note! Temporary HB_AUTOTEST_EXPORT. Removed when QMAP_INT__ITEM_STATE_DEPRECATED when QMap<int,QVariant> based state item system is removed
-//#define QMAP_INT__ITEM_STATE_DEPRECATED
-class HB_AUTOTEST_EXPORT HbAbstractViewItemPrivate : public HbWidgetPrivate
+class HbAbstractViewItemPrivate : public HbWidgetPrivate
{
Q_DECLARE_PUBLIC( HbAbstractViewItem )
@@ -161,6 +159,9 @@
virtual void tapTriggered(QGestureEvent *event);
void revealItem();
+
+ void setPressed(bool pressed, bool animate);
+
public:
QPersistentModelIndex mIndex;
bool mFocused;
--- a/src/hbwidgets/itemviews/hbgriditemcontainer_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/itemviews/hbgriditemcontainer_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -536,5 +536,49 @@
// d->mUniformItemSizes - allways true
}
+/*!
+ \reimp
+
+ All other sizehints are taken from grid layout except preferred sizehint. Preferred sizeHint for grid container
+ is maximum height & width.
+*/
+QSizeF HbGridItemContainer::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
+{
+ if (which == Qt::PreferredSize) {
+ return QSizeF(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
+ } else {
+ return HbAbstractItemContainer::sizeHint(which, constraint);
+ }
+}
+
+/*!
+ \reimp
+
+ Resizes the container.
+
+ If vertical scrolling is used view width and layout preferred height are used.
+
+ If horizontal scrolling is used view height and layout preferred width are used.
+*/
+void HbGridItemContainer::resizeContainer()
+{
+ Q_D(HbGridItemContainer);
+
+ qreal width = 0;
+ qreal height = 0;
+
+ if (d->mItemView) {
+ if (d->mScrollDirection == Qt::Vertical) {
+ width = d->mItemView->size().width();
+ height = layout()->preferredHeight();
+ } else {
+ width = layout()->preferredWidth();
+ height = d->mItemView->size().height();
+ }
+ }
+
+ resize(width, height);
+}
+
#include "moc_hbgriditemcontainer_p.cpp"
--- a/src/hbwidgets/itemviews/hbgriditemcontainer_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/itemviews/hbgriditemcontainer_p.h Fri May 14 16:09:54 2010 +0300
@@ -26,7 +26,7 @@
#define HBGRIDITEMCONTAINER_P_H
#include <QObject>
-#include <hbabstractitemcontainer.h>
+#include <hbabstractitemcontainer_p.h>
#include <hbabstractitemview.h>
#include <hbgridlayout_p.h>
@@ -61,6 +61,8 @@
QModelIndex lastValidItemIndex() const;
void setUniformItemSizes(bool enable);
+ virtual void resizeContainer();
+
protected:
HbGridItemContainer( HbGridItemContainerPrivate &dd, QGraphicsItem *parent = 0 );
virtual QPointF recycleItems(const QPointF &delta);
@@ -72,6 +74,8 @@
virtual HbAbstractViewItem *createDefaultPrototype() const;
+ QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const;
+
protected slots:
void animationFinished(const HbEffect::EffectStatus &status);
--- a/src/hbwidgets/itemviews/hbgriditemcontainer_p_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/itemviews/hbgriditemcontainer_p_p.h Fri May 14 16:09:54 2010 +0300
@@ -25,7 +25,7 @@
#ifndef HBGRIDITEMCONTAINER_P_P_H
#define HBGRIDITEMCONTAINER_P_P_H
-#include <hbabstractitemcontainer_p.h>
+#include <hbabstractitemcontainer_p_p.h>
#include <hbgriditemcontainer_p.h>
#include <hbapplication.h>
--- a/src/hbwidgets/itemviews/hbgridview.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/itemviews/hbgridview.cpp Fri May 14 16:09:54 2010 +0300
@@ -81,6 +81,10 @@
d->init();
}
+/*!
+ Constructs a grid view with a private class object \a dd,
+ \a container and \a parent.
+ */
HbGridView::HbGridView(HbGridViewPrivate &dd, HbAbstractItemContainer *container, QGraphicsItem *parent) :
HbAbstractItemView(dd, container, new HbModelIterator(), parent)
{
@@ -89,14 +93,17 @@
d->init();
}
+/*!
+ \reimp
+*/
HbGridView::~HbGridView()
{
}
/*!
- \property HbGridView::rowCount()
- \brief Returns the total number of rows in the view.
- \sa HbGridView::setRowCount()
+ Returns the total number of rows in the view.
+
+ \sa setRowCount()
*/
int HbGridView::rowCount() const
{
@@ -105,9 +112,9 @@
}
/*!
- \property HbGridView::setRowCount()
- \brief Sets the total number of rows to \a rowCount.
- \sa HbGridView::rowCount()
+ Sets the total number of rows to \a rowCount.
+
+ \sa HbGridView::rowCount()
*/
void HbGridView::setRowCount(int rowCount)
{
@@ -121,9 +128,9 @@
}
/*!
- \property HbGridView::columnCount
- \brief Returns the total number of columns in the view.
- \sa HbGridView::setColumnCount()
+ Returns the total number of columns in the view.
+
+ \sa setColumnCount()
*/
int HbGridView::columnCount() const
{
@@ -132,9 +139,9 @@
}
/*!
- \property HbGridView::setColumnCount
- \brief Sets the total number of columns to \a columnCount.
- \sa HbGridView::columnCount()
+ Sets the total number of columns to \a columnCount.
+
+ \sa columnCount()
*/
void HbGridView::setColumnCount(int columnCount)
{
@@ -149,9 +156,9 @@
/*!
- \property HbGridView::iconVisible()
- \brief Returns true if icons are currently displayed in GridView.
- \sa HbGridView::setIconVisible()
+ Returns true if icons are currently displayed in GridView.
+
+ \sa setIconVisible()
*/
bool HbGridView::iconVisible() const
{
@@ -160,10 +167,11 @@
}
/*!
- \property HbGridView::setIconVisible()
- \brief Set visibility of icons in GridView to \a visible.
- All view items are updated automatically.
- \sa HbGridView::iconVisible()
+ Set visibility of icons in grid view to \a visible. All view items are updated.
+
+ By default icons are visible.
+
+ \sa iconVisible()
*/
void HbGridView::setIconVisible(bool visible)
{
@@ -172,9 +180,9 @@
}
/*!
- \property HbGridView::textVisible()
- \brief Returns visibility of labels in GridView.
- \sa HbGridView::setTextVisible()
+ Returns visibility of text in grid view.
+
+ \sa setTextVisible()
*/
bool HbGridView::textVisible() const
{
@@ -183,10 +191,11 @@
}
/*!
- \property HbGridView::setTextVisible()
- \brief Sets visibility of labels in GridView to \a visible.
- All view items are updated automatically.
- \sa HbGridView::textVisible()
+ Sets visibility of text in grid view to \a visible. All view items are updated.
+
+ By default text is visible.
+
+ \sa HbGridView::textVisible()
*/
void HbGridView::setTextVisible(bool visible)
{
@@ -195,7 +204,7 @@
}
/*!
- Returns item at \a row and \a column.
+ Returns item at \a row and \a column.
*/
HbAbstractViewItem *HbGridView::itemAt(int row, int column) const
{
@@ -211,26 +220,6 @@
}
/*!
- Returns item at \a index.
- Ownership of the item is not transferred.
-
- \deprecated HbGridView::itemAt(int) const
- is deprecated. Please use HbAbstractItemView::itemByIndex(const QModelIndex &index) instead.
-
- \sa HbAbstractItemView::itemByIndex(const QModelIndex &index)
-
- */
-HbAbstractViewItem *HbGridView::itemAt(int index) const
-{
- Q_D(const HbGridView);
-
- if (d->mModelIterator->model()) {
- return d->itemContainer()->itemByIndex(d->mModelIterator->index(index));
- }
- return 0;
-}
-
-/*!
\reimp
*/
void HbGridView::scrollTo(const QModelIndex &index, ScrollHint hint)
@@ -258,7 +247,7 @@
}
/*!
- \reimp
+ \reimp
*/
void HbGridView::orientationAboutToBeChanged()
{
@@ -267,7 +256,7 @@
}
/*!
- \reimp
+ \reimp
*/
void HbGridView::orientationChanged(Qt::Orientation newOrientation)
{
--- a/src/hbwidgets/itemviews/hbgridview.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/itemviews/hbgridview.h Fri May 14 16:09:54 2010 +0300
@@ -42,7 +42,6 @@
explicit HbGridView(QGraphicsItem *parent = 0);
virtual ~HbGridView();
HbAbstractViewItem *itemAt(int row, int column) const;
- HbAbstractViewItem *itemAt(int index) const;
void scrollTo(const QModelIndex &index, ScrollHint hint = EnsureVisible);
void setRowCount(int rowCount);
--- a/src/hbwidgets/itemviews/hbgridview_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/itemviews/hbgridview_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -26,7 +26,6 @@
#include <hbgridlayout_p.h>
#include <hbgriditemcontainer_p.h>
-#include <hbgesturefilter.h>
#include <hbgridviewitem.h>
#include <hbscrollbar.h>
--- a/src/hbwidgets/itemviews/hbgridviewitem.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/itemviews/hbgridviewitem.cpp Fri May 14 16:09:54 2010 +0300
@@ -26,7 +26,7 @@
#include "hbgridviewitem_p.h"
#include <hbgridviewitem.h>
#include "hbgridview_p.h"
-#include <hbstyleoptiongridviewitem.h>
+#include <hbstyleoptiongridviewitem_p.h>
#include <QDebug>
/*!
@@ -178,43 +178,6 @@
}
/*!
-
- \deprecated HbGridViewItem::primitive(HbStyle::Primitive)
- is deprecated.
-
- Provides access to primitives of HbGridViewItem.
- \param primitive is the type of the requested primitive. The available primitives are
- \c P_GridViewItem_text, \c P_GridViewItem_icon, \c P_ItemViewItem_checkbox and
- \c P_GridViewItem_background.
- */
-QGraphicsItem * HbGridViewItem::primitive(HbStyle::Primitive primitive) const
-{
- Q_D( const HbGridViewItem );
-
- if (primitive == HbStyle::P_GridViewItem_text) {
- return d->mTextItem;
- }
- else if (primitive == HbStyle::P_GridViewItem_icon) {
- return d->mIconItem;
- }
-
- return HbAbstractViewItem::primitive(primitive);
-}
-
-/*!
- \deprecated HbGridViewItem::contiguousSelectionArea() const
- is deprecated.
-
- \reimp
- */
-QRectF HbGridViewItem::contiguousSelectionArea() const
-{
- qWarning("QRectF HbGridViewItem::contiguousSelectionArea() const is deprecated!");
-
- return QRect();
-}
-
-/*!
\reimp
*/
bool HbGridViewItem::selectionAreaContains(const QPointF &position,
--- a/src/hbwidgets/itemviews/hbgridviewitem.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/itemviews/hbgridviewitem.h Fri May 14 16:09:54 2010 +0300
@@ -50,9 +50,7 @@
HbAbstractViewItem *createItem();
void updateChildItems();
- QGraphicsItem *primitive(HbStyle::Primitive primitive) const;
- virtual QRectF contiguousSelectionArea() const;
virtual bool selectionAreaContains(const QPointF &position, SelectionAreaType selectionAreaType) const;
public slots:
--- a/src/hbwidgets/itemviews/hbindexfeedback.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/itemviews/hbindexfeedback.cpp Fri May 14 16:09:54 2010 +0300
@@ -29,7 +29,7 @@
#include "hbabstractitemview.h"
#include <hbscrollbar.h>
-#include <hbstyleoptionindexfeedback.h>
+#include <hbstyleoptionindexfeedback_p.h>
#include <hbstyleparameters.h>
#include <hbstyle.h>
#include <hbdeviceprofile.h>
@@ -236,41 +236,6 @@
return d->mItemView;
}
-/*!
-
- \deprecated HbIndexFeedback::primitive(HbStyle::Primitive)
- is deprecated.
-
- Returns the primitives used in HbIndexFeedback.
-
- \param primitive The primitive type requested.
-
- \return A pointer for the primitive requested.
-*/
-QGraphicsItem* HbIndexFeedback::primitive(HbStyle::Primitive primitive) const
-{
- Q_D( const HbIndexFeedback );
-
- QGraphicsItem* retVal = HbWidget::primitive(primitive);
-
- switch (primitive) {
- case HbStyle::P_IndexFeedback_popup_text:
- retVal = d->mTextItem;
- break;
-
- case HbStyle::P_IndexFeedback_popup_background:
- retVal = d->mPopupItem;
- break;
-
- default:
- qt_noop();
- break;
- }
-
- return retVal;
-}
-
-
/*
A scene event filter. It's purpose is to call calculatePopupRects on
a resize event for the item view.
--- a/src/hbwidgets/itemviews/hbindexfeedback.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/itemviews/hbindexfeedback.h Fri May 14 16:09:54 2010 +0300
@@ -68,8 +68,6 @@
void setItemView(HbAbstractItemView *itemView);
HbAbstractItemView* itemView() const;
- virtual QGraphicsItem *primitive(HbStyle::Primitive primitive) const;
-
protected:
virtual void polish( HbStyleParameters& params);
virtual bool sceneEventFilter(QGraphicsItem* watched, QEvent* event);
--- a/src/hbwidgets/itemviews/hbindexfeedback_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/itemviews/hbindexfeedback_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -30,13 +30,13 @@
#include <hbabstractitemview.h>
#include <hbabstractviewitem.h>
#include <hbstyle.h>
-#include <hbabstractitemcontainer.h>
+#include <hbabstractitemcontainer_p.h>
#include <hbapplication.h>
#include <hbeffect.h>
#include <hbeffectinternal_p.h>
-#include <hbstyleoptionindexfeedback.h>
+#include <hbstyleoptionindexfeedback_p.h>
#include <QTimer>
#include <QSize>
--- a/src/hbwidgets/itemviews/hblistitemcontainer_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/itemviews/hblistitemcontainer_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -27,7 +27,7 @@
#include "hblistitemcontainer_p_p.h"
#include "hblistlayout_p.h"
-#include "hbabstractitemcontainer.h"
+#include "hbabstractitemcontainer_p.h"
#include "hbabstractitemview.h"
#include "hblistviewitem.h"
#include "hbmodeliterator.h"
@@ -146,7 +146,7 @@
{
qreal minHeight = 0.0;
if (mItems.count() > 0) {
- minHeight = mLayout->sizeHint(Qt::PreferredSize).height() / mItems.count();
+ minHeight = mLayout->effectiveSizeHint(Qt::PreferredSize).height() / mItems.count();
}
if (minHeight == 0.0) {
@@ -511,6 +511,43 @@
}
}
+/*!
+ \reimp
+
+ All other sizehints are taken from list layout except preferred sizehint. List container preferred sizeHint
+ width is maximum width and height is average item height times index count.
+*/
+QSizeF HbListItemContainer::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
+{
+ Q_D(const HbListItemContainer);
+
+ if (which == Qt::PreferredSize) {
+ HbModelIterator *modelIterator = d->modelIterator();
+ if (modelIterator) {
+ return QSizeF(QWIDGETSIZE_MAX, d->itemHeight() * modelIterator->indexCount());
+ }
+ }
+
+ return HbAbstractItemContainer::sizeHint(which, constraint);
+}
+
+/*!
+ \reimp
+
+ Resizes the container to use view width (if present; otherwise 0)
+ and layout preferred height.
+*/
+void HbListItemContainer::resizeContainer()
+{
+ Q_D(HbListItemContainer);
+
+ if (d->mItemView) {
+ resize(d->mItemView->size().width(), layout()->preferredHeight());
+ } else {
+ resize(0, layout()->preferredHeight());
+ }
+}
+
#include "moc_hblistitemcontainer_p.cpp"
--- a/src/hbwidgets/itemviews/hblistitemcontainer_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/itemviews/hblistitemcontainer_p.h Fri May 14 16:09:54 2010 +0300
@@ -26,7 +26,7 @@
#define HBLISTITEMCONTAINER_P_H
#include <hbeffect.h>
-#include <hbabstractitemcontainer.h>
+#include <hbabstractitemcontainer_p.h>
class HbListItemContainerPrivate;
@@ -54,10 +54,14 @@
virtual HbAbstractViewItem *createDefaultPrototype() const;
+ virtual void resizeContainer();
+
protected slots:
void animationFinished(const HbEffect::EffectStatus &status);
+ QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const;
+
private:
Q_DECLARE_PRIVATE_D(d_ptr, HbListItemContainer)
Q_DISABLE_COPY(HbListItemContainer)
--- a/src/hbwidgets/itemviews/hblistitemcontainer_p_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/itemviews/hblistitemcontainer_p_p.h Fri May 14 16:09:54 2010 +0300
@@ -25,7 +25,7 @@
#ifndef HBLISTITEMCONTAINER_P_P_H
#define HBLISTITEMCONTAINER_P_P_H
-#include "hbabstractitemcontainer_p.h"
+#include "hbabstractitemcontainer_p_p.h"
class HbListLayout;
class HbListItemContainer;
--- a/src/hbwidgets/itemviews/hblistlayout_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/itemviews/hblistlayout_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -28,7 +28,7 @@
#include "hblayoututils_p.h"
#include "hbwidgetbase.h"
-#include "hbabstractitemcontainer.h"
+#include "hbabstractitemcontainer_p.h"
#include <QWidget> // for QWIDGETSIZE_MAX
#include <QDebug>
--- a/src/hbwidgets/itemviews/hblistlayout_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/itemviews/hblistlayout_p.h Fri May 14 16:09:54 2010 +0300
@@ -52,9 +52,12 @@
virtual void removeAt(int index);
virtual void setGeometry( const QRectF &rect );
- virtual QSizeF sizeHint ( Qt::SizeHint which, const QSizeF &constraint = QSizeF( ) ) const;
+ virtual void invalidate();
- virtual void invalidate();
+protected:
+
+ virtual QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const;
+
private:
HbListLayoutPrivate *d;
};
--- a/src/hbwidgets/itemviews/hblistview.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/itemviews/hblistview.cpp Fri May 14 16:09:54 2010 +0300
@@ -107,7 +107,7 @@
{
}
-/*
+/*!
Returns the first item prototype from the list of item prototypes
after trying to convert it as HbListViewItem.
@@ -120,8 +120,8 @@
}
-/*
- Scrolls the view if necessary to ensure that the item at \a index is visible.
+/*!
+ \reimp
*/
void HbListView::scrollTo(const QModelIndex &index, ScrollHint hint)
{
@@ -201,7 +201,7 @@
}
/*!
- Returns the current arrange mode
+ Returns true if view is in arrange mode. False otherwise.
*/
bool HbListView::arrangeMode() const
{
@@ -220,7 +220,7 @@
}
/*!
- Tries to change the arrageMode. ArrangeMode is the mode where drag and drop
+ Tries to set the view to arrange mode. Arrange mode is the mode where drag and drop
for arranging the items inside the list is supported instead of the normal
mouse event handling.
Setting the arrange mode to true will fail if lists selection mode is set. Selection
@@ -353,6 +353,9 @@
}
}
+/*!
+ \reimp
+*/
void HbListView::rowsRemoved(const QModelIndex &parent, int start, int end)
{
Q_D(HbListView);
@@ -394,6 +397,7 @@
/*!
\reimp
+
Handles change concerning multiline support of secondary texts at orientation switch
*/
void HbListView::orientationChanged(Qt::Orientation newOrientation)
--- a/src/hbwidgets/itemviews/hblistview_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/itemviews/hblistview_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -27,7 +27,7 @@
#include "hblistview.h"
#include "hblistviewitem.h"
-#include "hbabstractitemcontainer.h"
+#include "hbabstractitemcontainer_p.h"
#include <hbwidgetfeedback.h>
#include "hbmodeliterator.h"
#include <hbpangesture.h>
@@ -110,7 +110,7 @@
}
if (targetIndex.isValid()) {
- // now drop
+ // reached a droppable spot
HbWidgetFeedback::triggered(mDraggedItem,Hb::InstantDraggedOver);
QPointF itemPos = itemBoundingRect(mDraggedItem).topLeft();
@@ -237,6 +237,8 @@
case Qt::GestureFinished:
case Qt::GestureCanceled: {
if (arrangeModeEnabled && mDraggedItem) {
+ // drop dragged item
+ HbWidgetFeedback::triggered(mDraggedItem,Hb::InstantReleased);
QObject::disconnect(q, SIGNAL(scrollPositionChanged(QPointF)), q, SLOT(scrolling(QPointF)));
if (q->isScrolling()) {
--- a/src/hbwidgets/itemviews/hblistview_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/itemviews/hblistview_p.h Fri May 14 16:09:54 2010 +0300
@@ -52,9 +52,7 @@
class HbListViewItem;
class HbScrollBar;
class HbListLayout;
-class HbGestureSceneFilter;
class HbListHighlight;
-class HbGesture;
class HbListViewPrivate : public HbAbstractItemViewPrivate
{
--- a/src/hbwidgets/itemviews/hblistviewitem.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/itemviews/hblistviewitem.cpp Fri May 14 16:09:54 2010 +0300
@@ -33,7 +33,7 @@
#include <hbtextitem.h>
#include <hbrichtextitem.h>
#include <hbstyle.h>
-#include <hbstyleoptionlistviewitem.h>
+#include <hbstyleoptionlistviewitem_p.h>
#include <QPersistentModelIndex>
#include <QVariant>
@@ -416,20 +416,13 @@
if (item) {
styleOption.index = i;
styleOption.content = d->mStringList.at(i);
+ styleOption.multilineSecondaryTextSupported = d->isMultilineSupported();
- int minimumLines = 1;
- int maximumLines = 1;
- if ( i == 1
- && d->isMultilineSupported()) {
+ if (i == 1) {
// criteria of secondary text in middle column is fullfilled
- minimumLines = sd->mMinimumSecondaryTextRowCount;
- maximumLines = sd->mMaximumSecondaryTextRowCount;
- }
- // must always set some value to limit count of lines,
- // because by default HbTextItem gives text as much as space it wants
- styleOption.minimumLines = minimumLines;
- styleOption.maximumLines = maximumLines;
-
+ styleOption.minimumLines = sd->mMinimumSecondaryTextRowCount;
+ styleOption.maximumLines = sd->mMaximumSecondaryTextRowCount;
+ }
style()->updatePrimitive(item, d->displayPrimitive(), &styleOption);
}
}
@@ -518,7 +511,7 @@
HB_SDD(HbListViewItem);
if (style != sd->mStretchingStyle) {
sd->mStretchingStyle = style;
- if (d->isLandscape()) {
+ if (d->isLandscape()) {
// secondary text multiline change!
d->updateCloneItems(false);
d->repolishCloneItems();
@@ -543,7 +536,8 @@
Sets the graphics size as a \a size.
This method will change the used graphics size for all view items.
- \note When graphics size HbListViewItem::Thumbnail is set, multiline secondary texts are not supported.
+ \note When graphics size HbListViewItem::Thumbnail or HbListViewItem::WideThumbnail is set,
+ multiline secondary texts are not supported.
\sa graphicsSize
\sa setSecondaryTextRowCount
@@ -552,7 +546,8 @@
{
HB_SDD(HbListViewItem);
if (size != sd->mGraphicsSize) {
- bool thumbnailChange = (size == Thumbnail) | (sd->mGraphicsSize == Thumbnail);
+ bool thumbnailChange = (size == Thumbnail) | (sd->mGraphicsSize == Thumbnail)
+ | (size == WideThumbnail) | (sd->mGraphicsSize == WideThumbnail);
sd->mGraphicsSize = size;
if ( thumbnailChange
&& !d->isStretching()) {
@@ -564,30 +559,38 @@
}
/*!
- Returns the secondary text item maximum and minimum row counts.
+ Returns secondary text item maximum and minimum row counts.
+ The default maximum row count is 1 and minimum row count is 1.
- The default maximum row count is 1 and minimum row count is 1.
+ \note This function does not return values from .css although they were effective.
\sa setSecondaryTextRowCount
*/
void HbListViewItem::getSecondaryTextRowCount(int &minimum, int &maximum) const
{
HB_SDD(const HbListViewItem);
- minimum = sd->mMinimumSecondaryTextRowCount;
- maximum = sd->mMaximumSecondaryTextRowCount;
+ minimum = 1;
+ maximum = 1;
+ if (sd->mMinimumSecondaryTextRowCount != -1) {
+ minimum = sd->mMinimumSecondaryTextRowCount;
+ maximum = sd->mMaximumSecondaryTextRowCount;
+ }
}
/*!
Sets the secondary text item \a maximum row count and \a minimum row count.
-
This method will change these values for all view items.
- \note If HbListViewItem::GraphicsSize is HbListViewItem::Thumbnail or HbListViewItem::StretchingStyle
- is HbListViewItem::StretchLandscape in landscape mode only one row secondary text is supported. \a minimum and
- \a maximum are applied only when graphics size is not HbListViewItem::Thumbnail and
- stretching style is not HbListViewItem::StretchLandscape in landscape mode.
+ Default value is 1 for both minimum and maximum line counts.
+ If default values are used wrapping mode, minimum and maximum line counts are read from .css file.
+ When non default value are set by this function, wrapping mode of text item is
+ automatically set to Hb::TextWordWrap.
- \note If Qt::TextFormat is Qt::RichText, multiline secondary texts are note supported.
+ \note \a minimum and \a maximum are applied only when graphics size is not HbListViewItem::Thumbnail or
+ HbListViewItem::WideThumbnail and
+ stretching style is not HbListViewItem::StretchLandscape in landscape mode. Otherwise only one row secondary text is used.
+
+ \note If Qt::TextFormat is Qt::RichText, multiline secondary texts are not supported.
\sa setTextFormat
\sa secondaryTextRowCount
@@ -624,8 +627,7 @@
*/
void HbListViewItem::polish(HbStyleParameters& params)
{
- HB_SDD(HbListViewItem);
-
+ Q_D( HbListViewItem );
setProperty("icon-1", (bool)d->mDecorationRoleItems.value(0));
setProperty("icon-2", (bool)d->mDecorationRoleItems.value(1));
@@ -633,7 +635,6 @@
setProperty("text-2", (bool)d->mDisplayRoleTextItems.value(1));
setProperty("text-3", (bool)d->mDisplayRoleTextItems.value(2));
- setProperty("maximumSecondaryTextRowCount", sd->mMaximumSecondaryTextRowCount);
if (itemView() && itemView()->selectionMode() != HbListView::NoSelection) {
setProperty("selectionMode", true);
} else {
--- a/src/hbwidgets/itemviews/hblistviewitem_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/itemviews/hblistviewitem_p.h Fri May 14 16:09:54 2010 +0300
@@ -45,8 +45,8 @@
mTextFormat(Qt::PlainText),
mStretchingStyle(HbListViewItem::NoStretching),
mGraphicsSize(HbListViewItem::MediumIcon),
- mMinimumSecondaryTextRowCount(1),
- mMaximumSecondaryTextRowCount(1)
+ mMinimumSecondaryTextRowCount(-1),
+ mMaximumSecondaryTextRowCount(-1)
{
}
--- a/src/hbwidgets/itemviews/hblistwidget.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/itemviews/hblistwidget.cpp Fri May 14 16:09:54 2010 +0300
@@ -33,7 +33,6 @@
#include "hbmodeliterator.h"
#include <QModelIndex>
-#include <hbgesture.h>
#include <hbicon.h>
#include <hbframedrawer.h>
#include <hbscrollbar.h>
@@ -143,7 +142,8 @@
}
/*!
- Sets current \a row
+ Sets current \a row. This function sets current index into selection model.
+ Selection is never changed.
*/
void HbListWidget::setCurrentRow(int row)
{
--- a/src/hbwidgets/itemviews/hblistwidgetitem.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/itemviews/hblistwidgetitem.cpp Fri May 14 16:09:54 2010 +0300
@@ -38,17 +38,14 @@
\brief HbListWidgetItem represents a list item. It is part of convenience list API together with HbListWidget.
As this is a convenience API it is supposed to be easy to use. For that reason complicated list items are not possible
- to be created.
-
- A list item consists of three columns.
-
- - First column has only one row and it may contain one icon or a text label.
+ to be created. HbListWidgetItem supports at maximum two text items and two icon items.
+ Either primary text or primary icon must always be provided. Icons are shown only in default size.
- - Middle column can have two rows and both rows can contain text.
-
- - The last column has only one row and it may contain one icon or a text label.
-
- - Any column may be left empty.
+ A view item created from this item consists of three columns at maximum.
+ - First column contains primary icon
+ - Middle column has one or two rows to show text(s)
+ - Last column contains secondary icon
+ - Any column can be empty
The following code snippet presents how to create an list item with icons in the left
and right columns and two rows of text in the middle column.
@@ -117,8 +114,14 @@
/*!
Sets the item's data for the given role to the specified value.
Can be used to store application-specific data in an item.
- This function cannot be used to set anything visible data.
- */
+
+ Specialised functions in section 'see also' are recommended setting user data.
+
+ \sa setText()
+ \sa setSecondaryText()
+ \sa setIcon()
+ \sa setSecondaryIcon()
+*/
void HbListWidgetItem::setData(const QVariant &value, int role)
{
d->setData(value,role);
--- a/src/hbwidgets/itemviews/hbradiobuttonlist.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/itemviews/hbradiobuttonlist.cpp Fri May 14 16:09:54 2010 +0300
@@ -323,7 +323,7 @@
return d->mPreviewMode;
}
-/*
+/*!
\reimp
*/
int HbRadioButtonList::type() const
@@ -424,6 +424,9 @@
}
}
+/*!
+ \reimp
+*/
void HbRadioButtonList::rowsInserted(const QModelIndex &parent, int start, int end)
{
Q_D(HbRadioButtonList);
@@ -435,12 +438,18 @@
updateGeometry();
}
+/*!
+ \reimp
+*/
void HbRadioButtonList::rowsRemoved(const QModelIndex &parent, int start, int end)
{
HbListView::rowsRemoved(parent,start,end);
updateGeometry();
}
+/*!
+ \reimp
+*/
void HbRadioButtonList::reset()
{
HbListView::reset();
--- a/src/hbwidgets/itemviews/hbradiobuttonlistviewitem_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/itemviews/hbradiobuttonlistviewitem_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -25,7 +25,7 @@
#include "hbradiobuttonlistviewitem_p.h"
#include "hblistviewitem_p.h"
-#include <hbstyleoptionlistviewitem.h>
+#include <hbstyleoptionlistviewitem_p.h>
#include <hbeffect.h>
HbRadioButtonListViewItem::HbRadioButtonListViewItem(QGraphicsItem *parent) :
--- a/src/hbwidgets/itemviews/hbtreeitemcontainer_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/itemviews/hbtreeitemcontainer_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -26,15 +26,12 @@
#include "hbtreeitemcontainer_p.h"
#include "hbtreeitemcontainer_p_p.h"
#include "hbtreelayout_p.h"
-#include "hbabstractitemcontainer_p.h"
+#include "hbabstractitemcontainer_p_p.h"
#include "hbabstractitemview.h"
#include "hbtreeviewitem.h"
#include "hbapplication.h"
#include "hbmodeliterator.h"
-// For QMAP_INT__ITEM_STATE_DEPRECATED's sake. Removed when QMap<int,QVariant> based state item system is removed
-#include <hbabstractviewitem_p.h>
-
#include <qmath.h>
#include <QDebug>
@@ -168,7 +165,7 @@
{
qreal minHeight = 0.0;
if (mItems.count() > 0) {
- minHeight = mLayout->sizeHint(Qt::PreferredSize).height() / mItems.count();
+ minHeight = mLayout->effectiveSizeHint(Qt::PreferredSize).height() / mItems.count();
}
if (minHeight == 0.0) {
@@ -574,5 +571,35 @@
}
}
+/*!
+ \reimp
+
+ All other sizehints are taken from list layout except preferred sizehint. List container preferred sizeHint
+ width is maximum width and height is average item height times index count.
+*/
+QSizeF HbTreeItemContainer::sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
+{
+ Q_D(const HbTreeItemContainer);
+
+ if (which == Qt::PreferredSize) {
+ HbModelIterator *modelIterator = d->modelIterator();
+ if (modelIterator) {
+ return QSizeF(QWIDGETSIZE_MAX, d->itemHeight() * modelIterator->indexCount());
+ }
+ }
+
+ return HbAbstractItemContainer::sizeHint(which, constraint);
+}
+
+/*!
+ \reimp
+
+ Resizes the container to use layout preferred size.
+*/
+void HbTreeItemContainer::resizeContainer()
+{
+ resize(layout()->preferredSize());
+}
+
#include "moc_hbtreeitemcontainer_p.cpp"
--- a/src/hbwidgets/itemviews/hbtreeitemcontainer_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/itemviews/hbtreeitemcontainer_p.h Fri May 14 16:09:54 2010 +0300
@@ -48,6 +48,8 @@
QPointF recycleItems(const QPointF &delta);
int maxItemCount() const;
+ virtual void resizeContainer();
+
protected:
HbTreeItemContainer(HbTreeItemContainerPrivate &dd, QGraphicsItem *parent);
@@ -62,6 +64,8 @@
virtual HbAbstractViewItem *createDefaultPrototype() const;
+ virtual QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const;
+
protected slots:
void animationFinished(const HbEffect::EffectStatus &status);
--- a/src/hbwidgets/itemviews/hbtreeitemcontainer_p_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/itemviews/hbtreeitemcontainer_p_p.h Fri May 14 16:09:54 2010 +0300
@@ -25,7 +25,7 @@
#ifndef HBTREEITEMCONTAINER_P_H
#define HBTREEITEMCONTAINER_P_H
-#include "hbabstractitemcontainer_p.h"
+#include "hbabstractitemcontainer_p_p.h"
class HbTreeLayout;
class HbTreeItemContainer;
--- a/src/hbwidgets/itemviews/hbtreeitemselectionmodel_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/itemviews/hbtreeitemselectionmodel_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -27,7 +27,7 @@
#include "hbabstractitemview_p.h"
#include "hbtreeviewitem.h"
-#include "hbabstractitemcontainer.h"
+#include "hbabstractitemcontainer_p.h"
#include "hbmodeliterator.h"
#include <QAbstractItemModel>
@@ -36,9 +36,6 @@
#include <QDebug>
-// For QMAP_INT__ITEM_STATE_DEPRECATED's sake. Removed when QMap<int,QVariant> based state item system is removed
-#include <hbabstractviewitem_p.h>
-
HbTreeItemSelectionModel::HbTreeItemSelectionModel( QAbstractItemModel *model,
HbAbstractItemViewPrivate *viewPrivate,
QObject *parent) :
@@ -120,9 +117,6 @@
if (item) {
item->setCheckState(Qt::PartiallyChecked);
}
-#ifndef QMAP_INT__ITEM_STATE_DEPRECATED
- mViewPrivate->mContainer->setItemStateValue(parentIndex, HbAbstractViewItem::CheckStateKey, Qt::PartiallyChecked);
-#endif
mViewPrivate->mContainer->setItemTransientStateValue(parentIndex, "checkState", Qt::PartiallyChecked);
}
parentIndex = parentIndex.parent();
--- a/src/hbwidgets/itemviews/hbtreelayout_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/itemviews/hbtreelayout_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -27,7 +27,7 @@
#include "hbtreelayout_p_p.h"
#include "hblayoututils_p.h"
-#include "hbabstractitemcontainer.h"
+#include "hbabstractitemcontainer_p.h"
#include <hbapplication.h>
#include <QDebug>
--- a/src/hbwidgets/itemviews/hbtreelayout_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/itemviews/hbtreelayout_p.h Fri May 14 16:09:54 2010 +0300
@@ -55,8 +55,11 @@
virtual void removeAt(int index);
virtual void setGeometry( const QRectF &rect );
+ virtual void invalidate();
+
+protected:
+
virtual QSizeF sizeHint ( Qt::SizeHint which, const QSizeF &constraint = QSizeF( ) ) const;
- virtual void invalidate();
private:
HbTreeLayoutPrivate *d;
--- a/src/hbwidgets/itemviews/hbtreelayout_p_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/itemviews/hbtreelayout_p_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -25,7 +25,7 @@
#include "hbtreelayout_p.h"
#include "hbtreelayout_p_p.h"
-#include "hbabstractitemcontainer.h"
+#include "hbabstractitemcontainer_p.h"
#include <hblayoututils_p.h>
#include <hbabstractviewitem.h>
--- a/src/hbwidgets/itemviews/hbtreemodeliterator_p_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/itemviews/hbtreemodeliterator_p_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -24,7 +24,7 @@
****************************************************************************/
#include "hbtreemodeliterator_p_p.h"
-#include "hbabstractitemcontainer_p.h"
+#include "hbabstractitemcontainer_p_p.h"
#include <QAbstractItemModel>
HbTreeModelIteratorPrivate::HbTreeModelIteratorPrivate()
--- a/src/hbwidgets/itemviews/hbtreeview.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/itemviews/hbtreeview.cpp Fri May 14 16:09:54 2010 +0300
@@ -28,15 +28,11 @@
#include "hbtreeitemcontainer_p.h"
#include "hbtreeviewitem.h"
#include "hbtreeitemselectionmodel_p.h"
-#include <hbwidgetfeedback.h>
#include "hbtreemodeliterator_p.h"
#include <QItemSelection>
#include <QGraphicsSceneMouseEvent>
-// for QMAP_INT__ITEM_STATE_DEPRECATED's sake
-#include <hbabstractviewitem.h>
-
/*!
@alpha
@hbwidgets
@@ -170,74 +166,6 @@
}
/*!
- \deprecated HbTreeView::indexCount() const
- is deprecated. Use \a HbModelIterator::indexCount() const
-
- \reimp
-
- Children of collapsed parents are not taken into account.
-*/
-int HbTreeView::indexCount() const
-{
- qWarning("HbTreeView::indexCount() const is deprecated! Use HbModelIterator::indexCount() const.");
-
- return modelIterator()->indexCount();
-}
-
-/*!
- \deprecated HbTreeView::indexPosition(const QModelIndex&) const
- is deprecated. Use \a HbModelIterator::indexPosition(const QModelIndex&) const
-
- \reimp
-*/
-int HbTreeView::indexPosition(const QModelIndex &index) const
-{
- qWarning("HbTreeView::indexPosition(const QModelIndex&) const is deprecated! Use HbModelIterator::indexPosition(const QModelIndex&) const.");
-
- return modelIterator()->indexPosition(index);
-}
-
-/*!
- \deprecated HbTreeView::nextIndex(const QModelIndex&) const
- is deprecated. Use \a HbModelIterator::nextIndex(const QModelIndex&) const
-
- \reimp
-
- Next index for valid index is determined in following way:
-
- - 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
-*/
-QModelIndex HbTreeView::nextIndex(const QModelIndex &index) const
-{
- qWarning("HbTreeView::nextIndex(const QModelIndex&) const is deprecated! Use HbModelIterator::nextIndex(const QModelIndex&) const.");
-
- return modelIterator()->nextIndex(index);
-}
-
-/*!
- \deprecated HbTreeView::previousIndex(const QModelIndex&) const
- is deprecated. Use \a HbModelIterator::previousIndex(const QModelIndex&) const
-
- \reimp
-
- Previous index for valid index is determined in following way:
-
- - If index has previous sibling last child from it is returned
- - Otherwise previous sibling is returned
- - Otherwise parent index is returned
- - Otherwise QModelIndex is returned
-*/
-QModelIndex HbTreeView::previousIndex(const QModelIndex &index) const
-{
- qWarning("HbTreeView::previousIndex(const QModelIndex&) const is deprecated! Use HbModelIterator::previousIndex(const QModelIndex&) const.");
-
- return modelIterator()->previousIndex(index);
-}
-
-/*!
\reimp
*/
void HbTreeView::rowsInserted(const QModelIndex &parent, int start, int end)
@@ -532,9 +460,6 @@
item->setCheckState(iterator.value());
}
-#ifndef QMAP_INT__ITEM_STATE_DEPRECATED
- d->mContainer->setItemStateValue(iterator.key(), HbAbstractViewItem::CheckStateKey, iterator.value());
-#endif
d->mContainer->setItemTransientStateValue(iterator.key(), "checkState", iterator.value());
iterator++;
}
@@ -546,7 +471,7 @@
/*!
Sets the item referred to by \a index to either collapse or expanded, depending on the value of \a expanded.
- \sa isExpanded
+ \sa isExpanded()
*/
void HbTreeView::setExpanded(const QModelIndex &index, bool expanded)
{
@@ -556,9 +481,6 @@
d->mInSetExpanded = true;
d->treeModelIterator()->itemExpansionChanged(index);
-#ifndef QMAP_INT__ITEM_STATE_DEPRECATED
- d->mContainer->setItemStateValue(index, HbTreeViewItem::ExpansionKey, expanded);
-#endif
d->mContainer->setItemTransientStateValue(index, "expanded", expanded);
int childCount = d->treeModelIterator()->childCount(index) - 1;
@@ -583,7 +505,7 @@
/*!
Returns true if the model item \a index is expanded; otherwise returns false.
- \sa setExpanded
+ \sa setExpanded()
*/
bool HbTreeView::isExpanded(const QModelIndex &index) const
{
@@ -604,12 +526,13 @@
If negative value is set, then indentation from style sheet is used.
- \sa indentation
+ \sa indentation()
*/
void HbTreeView::setIndentation(qreal indentation)
{
- Q_ASSERT_X(qobject_cast<HbTreeItemContainer*>(container()), "HbTreeView::setIndentation", "wrong container type");
- qobject_cast<HbTreeItemContainer*>(container())->setIndentation(indentation);
+ Q_D(HbTreeView);
+ Q_ASSERT_X(qobject_cast<HbTreeItemContainer*>(d->mContainer), "HbTreeView::setIndentation", "wrong container type");
+ qobject_cast<HbTreeItemContainer*>(d->mContainer)->setIndentation(indentation);
}
/*!
@@ -618,12 +541,13 @@
Default value is -1. In this case indentation from style sheet is used.
- \sa setIndentation
+ \sa setIndentation()
*/
qreal HbTreeView::indentation() const
{
- Q_ASSERT_X(qobject_cast<HbTreeItemContainer*>(container()), "HbTreeView::indentation", "wrong container type");
- return qobject_cast<HbTreeItemContainer*>(container())->indentation();
+ Q_D(const HbTreeView);
+ Q_ASSERT_X(qobject_cast<HbTreeItemContainer*>(d->mContainer), "HbTreeView::indentation", "wrong container type");
+ return qobject_cast<HbTreeItemContainer*>(d->mContainer)->indentation();
}
/*!
--- a/src/hbwidgets/itemviews/hbtreeview.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/itemviews/hbtreeview.h Fri May 14 16:09:54 2010 +0300
@@ -55,11 +55,6 @@
virtual void scrollTo(const QModelIndex &index, ScrollHint hint = EnsureVisible);
- virtual int indexCount() const;
- virtual int indexPosition(const QModelIndex &index) const;
- virtual QModelIndex nextIndex(const QModelIndex &index) const;
- virtual QModelIndex previousIndex(const QModelIndex &index) const;
-
void setExpanded(const QModelIndex &index, bool expanded);
bool isExpanded(const QModelIndex &index) const;
--- a/src/hbwidgets/itemviews/hbtreeview_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/itemviews/hbtreeview_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -26,7 +26,7 @@
#include "hbtreeview_p.h"
#include "hbtreeview.h"
-#include "hbabstractitemcontainer.h"
+#include "hbabstractitemcontainer_p.h"
const QString KDefaultLayoutOption = "default";
--- a/src/hbwidgets/itemviews/hbtreeviewitem.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/itemviews/hbtreeviewitem.cpp Fri May 14 16:09:54 2010 +0300
@@ -27,11 +27,11 @@
#include "hbtreeviewitem.h"
#include "hbtreeview.h"
#include "hbabstractitemview.h"
-#include "hbabstractitemcontainer.h"
+#include "hbabstractitemcontainer_p.h"
#include <hbnamespace.h>
#include <hbstyle.h>
-#include <hbstyleoptiontreeviewitem.h>
+#include <hbstyleoptiontreeviewitem_p.h>
#include <hbwidgetfeedback.h>
#include <hbtapgesture.h>
#include <hbeffect.h>
@@ -58,26 +58,6 @@
*/
-/*!
- \deprecated HbTreeViewItem::StateKey
- is deprecated. Please use string based state keys.
-
- \enum HbTreeViewItem::StateKey
-
- HbTreeViewItem's user defined state keys.
-
- \sa HbAbstractViewItem::transientState()
-*/
-
-/*!
- \deprecated HbTreeViewItem::ExpansionKey
- is deprecated. Please use string based state keys. This key is replaced by "expanded".
-
- \var HbTreeViewItem::ExpansionKey
- Predefined key for expansion/collapsion state of a view item. Default state is collapsed.
-*/
-
-
HbTreeViewItemPrivate::HbTreeViewItemPrivate(HbTreeViewItem *prototype) :
HbListViewItemPrivate(prototype, new HbTreeViewItemShared),
@@ -150,8 +130,7 @@
bool inSelectionArea = false;
if (mSharedData->mItemView->selectionMode() == HbAbstractItemView::SingleSelection) {
inSelectionArea = q->selectionAreaContains(position, HbAbstractViewItem::SingleSelection);
- } else if ( mSharedData->mItemView->selectionMode() == HbAbstractItemView::MultiSelection
- || mSharedData->mItemView->selectionMode() == HbAbstractItemView::ContiguousSelection) {
+ } else if (mSharedData->mItemView->selectionMode() == HbAbstractItemView::MultiSelection) {
inSelectionArea = q->selectionAreaContains(position, HbAbstractViewItem::MultiSelection);
}
@@ -169,8 +148,8 @@
}
}
- HbWidgetFeedback::triggered(q, Hb::InstantReleased, modifiers);
- q->setPressed(false);
+ HbWidgetFeedback::triggered(q, Hb::InstantClicked, modifiers);
+ setPressed(false, true);
emit q->activated(position);
emit q->released(position);
@@ -329,22 +308,6 @@
}
/*!
- \deprecated HbTreeViewItem::state() const
- is deprecated. Please use HbTreeViewItem::transientState() instead.
-
- \reimp
-*/
-QMap<int,QVariant> HbTreeViewItem::state() const
-{
- Q_D(const HbTreeViewItem);
- QMap<int,QVariant> state = HbListViewItem::state();
-
- state.insert(ExpansionKey, d->mExpanded);
-
- return state;
-}
-
-/*!
\reimp
*/
QHash<QString, QVariant> HbTreeViewItem::transientState() const
@@ -370,25 +333,6 @@
}
/*!
- \deprecated HbTreeViewItem::setState(const QMap<int,QVariant> &)
- is deprecated. Please use HbTreeViewItem::setState(const QHash<QString, QVariant> &state) instead.
-
- \reimp
-*/
-void HbTreeViewItem::setState(const QMap<int,QVariant> &state)
-{
- Q_D(HbTreeViewItem);
-
- HbListViewItem::setState(state);
-
- if (state.contains(ExpansionKey)) {
- d->mExpanded = state.value(ExpansionKey).toBool();
- } else {
- d->mExpanded = false;
- }
-}
-
-/*!
Initialize option with the values from this HbTreeViewItem.
This method is useful for subclasses when they need a HbStyleOptionTreeViewItem,
@@ -404,25 +348,6 @@
}
/*!
-
- \deprecated HbTreeViewItem::primitive(HbStyle::Primitive)
- is deprecated.
-
- Provides access to primitives of HbTreeViewItem.
- \param primitive is the type of the requested primitive. The available primitives are
- \c P_TreeViewItem_expandicon
- */
-QGraphicsItem *HbTreeViewItem::primitive(HbStyle::Primitive primitive) const
-{
- Q_D(const HbTreeViewItem);
- if (primitive == HbStyle::P_TreeViewItem_expandicon) {
- return d->mExpandItem;
- } else {
- return HbListViewItem::primitive(primitive);
- }
-}
-
-/*!
Sets items either expandable or non-expandable by the user, depending on the value of \a expandable.
This method will change the user expandable value for all view items.
--- a/src/hbwidgets/itemviews/hbtreeviewitem.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/itemviews/hbtreeviewitem.h Fri May 14 16:09:54 2010 +0300
@@ -48,11 +48,6 @@
public:
- enum StateKey
- {
- ExpansionKey = 10
- };
-
explicit HbTreeViewItem(QGraphicsItem *parent=0);
virtual ~HbTreeViewItem();
@@ -66,14 +61,9 @@
virtual QHash<QString, QVariant> transientState() const;
virtual void setTransientState(const QHash<QString, QVariant> &state);
- virtual QMap<int,QVariant> state() const;
- virtual void setState(const QMap<int,QVariant> &state);
-
void setExpanded(bool expanded);
bool isExpanded() const;
- virtual QGraphicsItem *primitive(HbStyle::Primitive primitive) const;
-
void setUserExpandable(bool expandable);
bool isUserExpandable() const;
--- a/src/hbwidgets/itemviews/hbtumbleview.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/itemviews/hbtumbleview.cpp Fri May 14 16:09:54 2010 +0300
@@ -31,7 +31,7 @@
#include <hbtumbleview.h>
#include <hbtumbleviewitem.h>
#include <hbevent.h>
-#include <hbstyleoption.h>
+#include <hbstyleoption_p.h>
#include <QGraphicsSceneMouseEvent>
#include <QStringListModel>
--- a/src/hbwidgets/itemviews/hbtumbleviewitem.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/itemviews/hbtumbleviewitem.cpp Fri May 14 16:09:54 2010 +0300
@@ -25,7 +25,7 @@
#include "hbtumbleviewitem.h"
#include "hblistviewitem_p.h"
-#include <hbstyleoptionlistviewitem.h>
+#include <hbstyleoptionlistviewitem_p.h>
HbTumbleViewItem::HbTumbleViewItem(QGraphicsItem *parent) :
HbListViewItem(parent)
--- a/src/hbwidgets/itemviews/itemviews.pri Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/itemviews/itemviews.pri Fri May 14 16:09:54 2010 +0300
@@ -28,7 +28,6 @@
DEPENDPATH += $$PWD
PUBLIC_HEADERS += $$PWD/hbabstractitemview.h
-PUBLIC_HEADERS += $$PWD/hbabstractitemcontainer.h
PUBLIC_HEADERS += $$PWD/hbabstractviewitem.h
PUBLIC_HEADERS += $$PWD/hbgridview.h
PUBLIC_HEADERS += $$PWD/hbgridviewitem.h
@@ -46,6 +45,7 @@
PRIVATE_HEADERS += $$PWD/hbabstractitemview_p.h
PRIVATE_HEADERS += $$PWD/hbabstractitemcontainer_p.h
+PRIVATE_HEADERS += $$PWD/hbabstractitemcontainer_p_p.h
PRIVATE_HEADERS += $$PWD/hbabstractviewitem_p.h
PRIVATE_HEADERS += $$PWD/hbgriditemcontainer_p.h
PRIVATE_HEADERS += $$PWD/hbgriditemcontainer_p_p.h
@@ -74,7 +74,7 @@
PRIVATE_HEADERS += $$PWD/hbmodeliterator_p.h
PRIVATE_HEADERS += $$PWD/hbtreemodeliterator_p.h
PRIVATE_HEADERS += $$PWD/hbtreemodeliterator_p_p.h
-SOURCES += $$PWD/hbabstractitemcontainer.cpp
+SOURCES += $$PWD/hbabstractitemcontainer_p.cpp
SOURCES += $$PWD/hbabstractitemview.cpp
SOURCES += $$PWD/hbabstractitemview_p.cpp
SOURCES += $$PWD/hbabstractviewitem.cpp
--- a/src/hbwidgets/popups/hbcolordialog.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/popups/hbcolordialog.cpp Fri May 14 16:09:54 2010 +0300
@@ -63,8 +63,9 @@
if ( receiver ) {
QObject::connect(mGridView, SIGNAL(activated(QModelIndex)), receiver, method);
}
-
+ mGridView->setClampingStyle(HbScrollArea::StrictClamping);
return mGridView;
+
}
};
@@ -101,6 +102,7 @@
q->setBackgroundFaded(false);
q->setFlag(QGraphicsItem::ItemClipsChildrenToShape);
mColorModel=new QStandardItemModel();
+ mGridView->setModel(mColorModel);
}
void HbColorDialogPrivate::_q_setCurrentSelectedColor(const QModelIndex &index)
@@ -408,76 +410,6 @@
}
/*!
- \deprecated HbColorDialog::getColor(const QList<QColor>&, const QColor&, bool, bool*, QGraphicsScene*, QGraphicsItem*)
- is deprecated. Please use void HbColorDialog::getColor( const QList<QColor> &colorList,
- const QColor &initialColor, QObject* receiver, const char* member, bool isNoneBlockVisible,
- QGraphicsScene *scene, QGraphicsItem *parent ) instead.
-
-
- Launches color dialog to allow the user to choose a color.
-
- The \a colorList is list of colors specified by application to be shown in dialog.
-
- If \a initialColor is the default color to be highlighted on dialog's launch.By default first color in dialog is highlighted.
-
-
- If \a isNoneBlockVisible is specified by application for NoneBlock visibility.
-
- \a isNoneSelected is out parameter, indicates whether none is selected or not.
-
- \a parent is the parent of the dialog.
-
-*/
-QColor HbColorDialog::getColor(const QList<QColor> &colorList, const QColor &initialColor,
- bool isNoneBlockVisible, bool *isNoneSelected, QGraphicsScene *scene, QGraphicsItem *parent)
-{
- HbColorDialog dlg(parent);
-
- if (scene && !parent) {
- scene->addItem(&dlg);
- }
-
- dlg.addColors(colorList);
- dlg.setInitialColor(initialColor);
- dlg.setNoneBlockVisible(isNoneBlockVisible);
- dlg.exec();
-
- if(isNoneSelected) {
- *isNoneSelected=dlg.isNoneSelected();
- }
- return dlg.currentColor();
-
-}
-
-/*!
- \deprecated HbColorDialog::getColor(bool, bool*, QGraphicsScene*, QGraphicsItem*)
- is deprecated. Please use
-
- void HbColorDialog::getColor( const QList<QColor> &colorList,
- const QColor &initialColor,
- QObject* receiver,
- const char* member,
- bool isNoneBlockVisible,
- QGraphicsScene *scene,
- QGraphicsItem *parent )
- instead.
-
- Launches color dialog to allow the user to choose a color.
- It shows default set of colors provided by graphics team and first color is highlighted.
-
- If \a isNoneBlockVisible is specified by application for NoneBlock visibility.
-
- \a isNoneSelected is out parameter, indicates whether none is selected or not.
-
- \a parent is the parent of the dialog.
-
-*/
-QColor HbColorDialog::getColor(bool isNoneBlockVisible, bool *isNoneSelected, QGraphicsScene *scene, QGraphicsItem *parent)
-{
- return getColor(QList<QColor> (), QString(), isNoneBlockVisible, isNoneSelected, scene, parent);
-}
-
-/*!
@beta
reimplements the showEvent.
Its required to indicate the highlighted item.
@@ -550,6 +482,7 @@
d->mCurrentItem = qgraphicsitem_cast<HbColorGridViewItem*>(d->mGridView->itemByIndex(currentIndex));
}
+
#include "moc_hbcolordialog.cpp"
#include "hbcolordialog.moc"
--- a/src/hbwidgets/popups/hbcolordialog.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/popups/hbcolordialog.h Fri May 14 16:09:54 2010 +0300
@@ -53,13 +53,6 @@
bool isNoneSelected() const;
- static QColor getColor(bool isNoneBlockVisible = false, bool *isNoneSelected = 0,
- QGraphicsScene *scene = 0, QGraphicsItem *parent = 0);
-
- static QColor getColor(const QList<QColor> &colorList, const QColor &initialColor,
- bool isNoneBlockVisible = false, bool *isNoneSelected = 0,
- QGraphicsScene *scene = 0, QGraphicsItem *parent = 0);
-
static void getColor( const QList<QColor> &colorList,
const QColor &initialColor,
QObject* receiver,
--- a/src/hbwidgets/popups/hbcolorgridviewitem.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/popups/hbcolorgridviewitem.cpp Fri May 14 16:09:54 2010 +0300
@@ -23,10 +23,11 @@
**
****************************************************************************/
#include "hbcolorgridviewitem_p.h"
-#include <hbstyleoptioncolorgridviewitem.h>
+#include <hbstyleoptioncolorgridviewitem_p.h>
#include <hbgridviewitem_p.h>
#include <hbcolorscheme.h>
#include <hbiconitem.h>
+#include <hbevent.h>
class HbColorGridViewItemPrivate: public HbGridViewItemPrivate
{
@@ -99,8 +100,8 @@
q->style()->setItemName( mColorItem, "cg-color-icon" );
}
if(!mCheckMarkItem) {
- mCheckMarkItem = q->style()->createPrimitive(HbStyle::P_ColorGridViewItem_checkIcon, q);
- q->style()->setItemName( mCheckMarkItem, "cg-selection-icon" );
+ mCheckMarkItem = q->style()->createPrimitive(HbStyle::P_ColorGridViewItem_checkIcon, q);
+ q->style()->setItemName( mCheckMarkItem, "cg-selection-icon" );
}
if (!mFrameBackGround) {
@@ -134,7 +135,6 @@
mCheckMarkItem->hide();
}
}
-
}
void HbColorGridViewItemPrivate::updateChildItems()
@@ -148,6 +148,12 @@
{
Q_D( HbColorGridViewItem );
d->q_ptr = this;
+ /* HbWidget::polish() will eventually call
+ HbStylePrivate::updateThemedItems() which will overwrite our
+ carefully set colors. Fortunately, call is behind flag.
+ */
+ d->themingPending = false;
+
}
@@ -156,6 +162,12 @@
{
Q_D( HbColorGridViewItem );
d->q_ptr = this;
+ /* HbWidget::polish() will eventually call
+ HbStylePrivate::updateThemedItems() which will overwrite our
+ carefully set colors. Fortunately, call is behind flag.
+ */
+ d->themingPending = false;
+
}
/*!
@@ -167,6 +179,12 @@
{
Q_D( HbColorGridViewItem );
d->q_ptr = this;
+ /* HbWidget::polish() will eventually call
+ HbStylePrivate::updateThemedItems() which will overwrite our
+ carefully set colors. Fortunately, call is behind flag.
+ */
+ d->themingPending = false;
+
}
@@ -226,7 +244,6 @@
option->color = d->mIndex.data(HbColorGridViewItem::ColorRole).value<QColor>();
option->borderColor = HbColorScheme::color("qtc_popup_grid_normal");
- // option->background = ;
}
void HbColorGridViewItem::resizeEvent ( QGraphicsSceneResizeEvent * event )
--- a/src/hbwidgets/popups/hbinputdialog.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/popups/hbinputdialog.cpp Fri May 14 16:09:54 2010 +0300
@@ -23,14 +23,13 @@
**
****************************************************************************/
-
#include <hbinputdialog.h>
#include "hbinputdialog_p.h"
#include "hbglobal_p.h"
#include <hblineedit.h>
#include <hbaction.h>
#include "hbinputdialogcontent_p.h"
-#include <hbstyleoptioninputdialog.h>
+#include <hbstyleoptioninputdialog_p.h>
#include <hbvalidator.h>
#include <QGraphicsScene>
@@ -45,9 +44,12 @@
@hbwidgets
\class HbInputDialog
- \brief A class used to get information from the user.
+ \brief HbInputDialog creates a modal dialog for the user to get some information in the form of text or numbers.
- the input value can be a text, int, double or ip address.
+ Based on the \InputMode user can enter text, int, double or an IP address. InputDialog can have one or two line edit input fields.
+
+ HbInputDialog by default will have a label to display a descriptive text for the line edit input field and,
+ OK and Cancel buttons.
example code example:
\code
@@ -57,11 +59,26 @@
Four static convenience API's are provided: getText(), getInteger(), getDouble(), and getIp()
static API's can be used to quickly get an input from user.
+
+ \enum HbInputDialog::InputMode
+
+ \value \b TextInput When this value is set as Input mode, input dialog accepts text input in its
+ correspoinding line edit field.
+
+ \value \b IntInput When this value is set as Input mode, input dialog accepts Integer input in its
+ correspoinding line edit field.
+
+ \value \b RealInput When this value is set as Input mode, input dialog accepts double or float input in its
+ correspoinding line edit field.
+
+ \value \b IpInput When this value is set as Input mode, input dialog accepts Ip address as input in its
+ correspoinding line edit field.
+
*/
/*!
- Constructor of HbInputDialog
+ Constructor of HbInputDialog with a \a parent.
\param parent. Parent widget
*/
HbInputDialog::HbInputDialog(QGraphicsItem* parent) :
@@ -89,29 +106,29 @@
{
}
+/*!
+ Sets the input mode of the primary(Top/default)line edit in the query widget.
-/*!
- @beta
- Sets the input mode of the primary(Top/default)line edit in the query widget.
+ The default InputMode is TextInput
\param mode. InputMode can be TextMode, IntMode, RealMode and Ip address mode.
- each mode will affect how the line edit filters its input.
+ each mode will affect how the line edit filters its input.
\param row. value 0 or 1
\sa inputMode()
-*/
+*/
void HbInputDialog::setInputMode(InputMode mode ,int row)
{
Q_D(HbInputDialog);
d->setInputMode(mode,row);
}
+/*!
+ Returns input mode for top/default line edit.
-/*!
- @beta
- Returns input mode for top/default line edit.
The default InputMode is TextInput
+
\param row. value 0 or 1
\sa setInputMode()
@@ -130,12 +147,10 @@
}
}
-
/*!
- @beta
Sets the prompt \a text for top/default line edit.
- \param text. user defined text
+ \param text. Text for the label which describes the purpose of the corresponding input line edit field.
\param row. value 0 or 1
\sa promtText()
@@ -146,9 +161,7 @@
d->setPromptText(text, row);
}
-
/*!
- @beta
Returns prompt text for top/default line edit.
the default is null string.
\param row. value 0 or 1
@@ -162,10 +175,9 @@
}
/*!
- @beta
Sets the top/default line edit value in \a text format.
- \param value. user defined value
+ \param value. user defined value for the default line edit.
\param row. value 0 or 1
\sa value()
@@ -177,7 +189,6 @@
}
/*!
- @beta
Returns top/default line edit value as QVariant object.
\param row. value 0 or 1
@@ -191,7 +202,6 @@
}
/*!
- @beta
Sets the visibility of bottom line edit and prompt text.
\param visible true or false.
@@ -205,7 +215,6 @@
}
/*!
- @beta
Returns the visibility of secondary row(bottom line edit and prompt text).
the default is false
\sa setAdditionalRowVisible()
@@ -216,9 +225,7 @@
return d->isAdditionalRowVisible();
}
-
/*!
- @beta
Validator is used to validate the content and cursor movements.
\param validator. Validator uses undo stack to back out invalid changes. Therefore undo
@@ -236,10 +243,8 @@
}
}
-
/*!
- @beta
- returns the validator of the inputDialog's line edit.
+ Returns the validator of the inputDialog's line edit.
\param row. A value 0 or 1
@@ -256,9 +261,7 @@
return NULL;
}
-
/*!
- @beta
returns the lineEdit pointer. will return NULL if row is greater than 2.
\param row. A value 0 or 1
@@ -275,7 +278,6 @@
}
/*!
- @beta
sets the echo mode for the given row.
\param echoMode
@@ -296,9 +298,7 @@
}
};
-
/*!
-
\deprecated HbInputDialog::primitive(HbStyle::Primitive)
is deprecated.
@@ -321,7 +321,6 @@
}
/*!
- @beta
\reimp
Initializes \a option with the values from this HbInputDialog.
*/
@@ -333,9 +332,8 @@
option->additionalText = d->mPromptAdditionalText;
}
-
/*!
- @beta
+ \reimp
updatePrimitives.
*/
void HbInputDialog::updatePrimitives()
@@ -353,10 +351,8 @@
}
}
-
/*!
- @beta
- returns the echoMode of line edit. returns -1 if row is more than 2.
+ Returns the echoMode of line edit. returns -1 if row is more than 2.
\param row. A value 0 or 1
@@ -373,11 +369,9 @@
return HbLineEdit::EchoMode(-1);//
}
-
/*!
- @beta
- Static convenience function to get a string from the user. \a
- label is the text which is shown to the user (it should
+ Static convenience function for creating an input dialog to get a string from the user.
+ \a label is the text which is shown to the user (it should
say what should be entered). \a text is the default text which is
placed in the line edit. If \a ok is non-null \e *\a ok will be
set to true if the user pressed \gui OK and to false if the user pressed
@@ -401,60 +395,13 @@
}
dlg->setPromptText(label);
dlg->setInputMode(TextInput);
- dlg->setValue(text);
+ dlg->setValue(text);
dlg->setAttribute(Qt::WA_DeleteOnClose);
dlg->open(receiver,member);
}
-/*!
- \deprecated HbInputDialog::getText(const QString&,const QString&,bool*,QGraphicsScene*,QGraphicsItem*)
- is deprecated. Please use the other available getText API.
-
- Static convenience function to get a string from the user. \a
- label is the text which is shown to the user (it should
- say what should be entered). \a text is the default text which is
- placed in the line edit. If \a ok is non-null \e *\a ok will be
- set to true if the user pressed \gui OK and to false if the user pressed
- \gui Cancel. The dialog's parent is \a parent. The dialog will be
- modal.
-
- This function returns the text which has been entered in the line
- edit. It will not return an empty string.
-
- \sa getInteger(), getDouble(), getIp()
-*/
-QString HbInputDialog::getText(const QString &label,const QString &text,
- bool *ok, QGraphicsScene *scene, QGraphicsItem *parent)
-{
- HB_DEPRECATED("HbInputDialog::getText is deprecated. Please use HbInputDialog::getText((const QString&, QObject*, const char*, const QString&, QGraphicsScene*, QGraphicsItem*) instead.");
- Q_UNUSED(parent);//this is a bug in popup framework, cannot set parent will affect fading
-
- HbInputDialog *dlg = new HbInputDialog();
- if (scene) {
- scene->addItem(dlg);
- }
- QString result;
- dlg->setPromptText(label);
- dlg->setInputMode(TextInput);
- dlg->setValue(text);
- HbAction* action = dlg->exec();
- if(action == dlg->secondaryAction()) { //Cancel was pressed
- if(ok) {
- *ok = false;
- }
- } else { //OK was pressed
- if(ok) {
- *ok = true;
- }
- result = dlg->value().toString();
- }
- delete dlg;
- return result;
-}
-
/*!
- @beta
Static convenience function to get an integer input from the
user.\a label is the text which is shown to the user
(it should say what should be entered). \a value is the default
@@ -485,56 +432,6 @@
dlg->open(receiver,member);
}
/*!
- \deprecated HbInputDialog::getInteger(const QString&,int,bool*,QGraphicsScene*,QGraphicsItem*)
- is deprecated. Please use the other available HbInputDialog::getInteger API.
-
- Static convenience function to get an integer input from the
- user.\a label is the text which is shown to the user
- (it should say what should be entered). \a value is the default
- integer which the spinbox will be set to.
- If \a ok is non-null *\a ok will be set to true if the user
- pressed \gui OK and to false if the user pressed \gui Cancel. The
- dialog's parent is \a parent. The dialog will be modal.
-
- This function returns the integer which has been entered by the user.
-
- \sa getText(), getDouble(), getIp()
-*/
-int HbInputDialog::getInteger(const QString &label, int value,
- bool *ok,QGraphicsScene *scene,QGraphicsItem *parent)
-{
- HB_DEPRECATED("HbInputDialog::getInteger is deprecated. Please use HbInputDialog::getInteger(const QString&, QObject*, const char*,int,QGraphicsScene*,QGraphicsItem *) instead.");
-
- Q_UNUSED(parent)
-
- HbInputDialog *dlg = new HbInputDialog();
- QString result;
- dlg->setPromptText(label);
- dlg->setInputMode(IntInput);
- dlg->setValue(QString::number(value));
- if(scene) {
- scene->addItem(dlg);
- }
- HbAction* action = dlg->exec();
- if(action == dlg->secondaryAction()) { //Cancel was pressed
- if(ok) {
- *ok = false;
- }
- } else { //OK was pressed
- if(ok) {
- *ok = true;
- }
- result = dlg->value().toString();
- }
- delete dlg;
-#ifdef HBINPUTDIALOG_DEBUG
- qDebug()<<"Value:"<<result;
-#endif
- return result.toInt();
-}
-
-
-/*!
Static convenience function to get a floating point number from
the user.\a label is the text which is shown to the user
(it should say what should be entered). \a value is the default
@@ -557,7 +454,7 @@
{
HbInputDialog *dlg = new HbInputDialog(parent);
if(scene && !parent) {
- scene->addItem(dlg);
+ scene->addItem(dlg);
}
dlg->setPromptText(label);
dlg->setInputMode(RealInput);
@@ -567,59 +464,7 @@
/*!
- \deprecated HbInputDialog::getDouble(const QString &,double,bool*,QGraphicsScene*,QGraphicsItem*)
- is deprecated. Please use the other available HbInputDialog::getDouble(...) API.
-
- Static convenience function to get a floating point number from
- the user.\a label is the text which is shown to the user
- (it should say what should be entered). \a value is the default
- floating point number that the line edit will be set to.
-
- If \a ok is non-null, *\a ok will be set to true if the user
- pressed \gui OK and to false if the user pressed \gui Cancel. The
- dialog's parent is \a parent. The dialog will be modal.
-
- This function returns the floating point number which has been
- entered by the user.
-
- \sa getText(), getInteger(), getIp()
-*/
-double HbInputDialog::getDouble(const QString &label, double value,
- bool *ok, QGraphicsScene *scene, QGraphicsItem *parent)
-{
- HB_DEPRECATED("HbInputDialog::getDouble is deprecated.Please use HbInputDialog::getDouble(const QString&, QObject*,const char*,double, QGraphicsItem*) instead.");
-
- Q_UNUSED(parent)
-
- HbInputDialog *dlg = new HbInputDialog();
- QString result;
- dlg->setPromptText(label);
- dlg->setInputMode(RealInput);
- dlg->setValue(QString::number(value));
- if(scene) {
- scene->addItem(dlg);
- }
- HbAction* action = dlg->exec();
- if(action == dlg->secondaryAction()){ //Cancel was pressed
- if(ok) {
- *ok = false;
- }
- } else { //OK was pressed
- if(ok) {
- *ok = true;
- }
- result = dlg->value().toString();
- }
- delete dlg;
-#ifdef HBINPUTDIALOG_DEBUG
- qDebug()<<"Value:"<<result;
-#endif
- return result.toDouble();
-}
-
-/*!
- @beta
- Static convenience function to get a ip address from
+ Static convenience function to get an ip address from
the user.\a label is the text which is shown to the user
(it should say what should be entered). \a address is the default
QHostAddress that the line edit will be set to.
@@ -641,64 +486,12 @@
{
HbInputDialog *dlg = new HbInputDialog(parent);
if(scene && !parent) {
- scene->addItem(dlg);
+ scene->addItem(dlg);
}
dlg->setPromptText(label);
- dlg->setInputMode(IpInput);
- dlg->setValue(ipaddress);
+ dlg->setValue(ipaddress);
+ dlg->setInputMode(IpInput);
dlg->open(receiver,member);
}
-
-/*!
- \deprecated HbInputDialog::getIp(const QString &,const QString&, bool *,QGraphicsScene*,QGraphicsItem*)
- is deprecated. Please use the other available HbInputDialog::getIp API.
-
- Static convenience function to get a ip address from
- the user.\a label is the text which is shown to the user
- (it should say what should be entered). \a address is the default
- QHostAddress that the line edit will be set to.
-
- If \a ok is non-null, *\a ok will be set to true if the user
- pressed \gui OK and to false if the user pressed \gui Cancel. The
- dialog's parent is \a parent. The dialog will be modal.
-
- This function returns the ip address number which has been
- entered by the user.
-
- \sa getText(), getInteger(), getDouble()
-*/
-QString HbInputDialog::getIp(const QString &label, const QString &ipaddress, bool *ok, QGraphicsScene *scene,
- QGraphicsItem *parent)
-{
- HB_DEPRECATED("HbInputDialog::getIp is deprecated. Please use HbInputDialog::getIp(const QString &,QObject *,const char *,const QString &, QGraphicsScene *, QGraphicsItem *)");
-
- Q_UNUSED(parent)
-
- HbInputDialog *dlg = new HbInputDialog();
- QString result;
- dlg->setPromptText(label);
- dlg->setInputMode(IpInput);
- dlg->setValue(ipaddress);
- if(scene) {
- scene->addItem(dlg);
- }
- HbAction* action = dlg->exec();
- if(action == dlg->secondaryAction()){ //Cancel was pressed
- if(ok) {
- *ok = false;
- }
- } else { //OK was pressed
- if(ok) {
- *ok = true;
- }
- result = dlg->value().toString();
- }
- delete dlg;
-#ifdef HBINPUTDIALOG_DEBUG
- qDebug()<<"Value:"<<result;
-#endif
- return result;
-}
#include "moc_hbinputdialog.cpp"
-
--- a/src/hbwidgets/popups/hbinputdialog.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/popups/hbinputdialog.h Fri May 14 16:09:54 2010 +0300
@@ -72,27 +72,27 @@
public:
static void getText(const QString &heading
- ,QObject *receiver
- ,const char *member
- ,const QString &text=QString()
- ,QGraphicsScene *scene=0
- ,QGraphicsItem *parent=0);
- static void getInteger(const QString &label
- ,QObject *receiver
- ,const char *member
+ ,QObject *receiver = 0
+ ,const char *member = 0
+ ,const QString &text = QString()
+ ,QGraphicsScene *scene = 0
+ ,QGraphicsItem *parent = 0);
+ static void getInteger(const QString &label
+ ,QObject *receiver = 0
+ ,const char *member = 0
,int value = 0
,QGraphicsScene *scene = 0
,QGraphicsItem *parent = 0);
static void getDouble(const QString &label
- ,QObject *receiver
- ,const char *member
+ ,QObject *receiver = 0
+ ,const char *member = 0
,double value = 0
, QGraphicsScene *scene = 0
, QGraphicsItem *parent = 0);
static void getIp(const QString &label
- ,QObject *receiver
- ,const char *member
+ ,QObject *receiver = 0
+ ,const char *member = 0
, const QString &ipaddress = QString()
, QGraphicsScene *scene = 0
, QGraphicsItem *parent = 0);
@@ -102,13 +102,6 @@
enum { Type = Hb::ItemType_InputDialog };
int type() const { return Type; }
-public:
- static QString getText(const QString &label,const QString &text = QString(),bool *ok = 0, QGraphicsScene *scene = 0, QGraphicsItem *parent = 0);
- static int getInteger(const QString &label, int value = 0,bool *ok = 0, QGraphicsScene *scene = 0, QGraphicsItem *parent = 0);
-
- static double getDouble(const QString &label, double value = 0,bool *ok = 0, QGraphicsScene *scene = 0, QGraphicsItem *parent = 0);
- static QString getIp(const QString &label, const QString &ipaddress = QString(),bool *ok = 0, QGraphicsScene *scene = 0, QGraphicsItem *parent = 0);
-
public slots:
void updatePrimitives();
--- a/src/hbwidgets/popups/hbinputdialog_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/popups/hbinputdialog_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -25,7 +25,7 @@
#include "hbinputdialog_p.h"
#include "hbinputdialogcontent_p.h"
-#include "hbstyleoptioninputdialog.h"
+#include "hbstyleoptioninputdialog_p.h"
#include <hblineedit.h>
#include <hbaction.h>
@@ -101,12 +101,6 @@
HbInputDialogPrivate::~HbInputDialogPrivate()
{
- if(primaryAction){
- delete primaryAction;
- }
- if(secondaryAction){
- delete secondaryAction;
- }
}
@@ -123,11 +117,9 @@
mContentWidget = new HbInputDialogContentWidget(this);
q->setContentWidget(mContentWidget);
- primaryAction = new HbAction(QString(q->tr("Ok")));
- q->setPrimaryAction(primaryAction);
+ q->addAction(new HbAction(q->tr("Ok"), q));
- secondaryAction = new HbAction(QString(q->tr("Cancel")));
- q->setSecondaryAction(secondaryAction);
+ q->addAction(new HbAction(q->tr("Cancel"), q));
q->setTimeout(HbPopup::NoTimeout);
q->setModal(true); // Dialog is modal
@@ -183,13 +175,25 @@
}
case HbInputDialog::IpInput:
{
+ QString text = pEdit->text();
mValid = new HbValidator;
mValid->setDefaultSeparator(".");
- mValid->addField(new QIntValidator(0, 255, 0), "127");
- mValid->addField(new QIntValidator(0, 255, 0), "0");
- mValid->addField(new QIntValidator(0, 255, 0), "0");
- mValid->addField(new QIntValidator(0, 255, 0), "1");
+ QStringList list = text.split(".");
+ if (list.count() != 4 ) {
+ mValid->setDefaultSeparator(".");
+ mValid->addField(new QIntValidator(0, 255, 0), "127");
+ mValid->addField(new QIntValidator(0, 255, 0), "0");
+ mValid->addField(new QIntValidator(0, 255, 0), "0");
+ mValid->addField(new QIntValidator(0, 255, 0), "1");
+ }
+ else {
+
+ mValid->addField(new QIntValidator(0, 255, 0),list[0]);
+ mValid->addField(new QIntValidator(0, 255, 0),list[1]);
+ mValid->addField(new QIntValidator(0, 255, 0),list[2]);
+ mValid->addField(new QIntValidator(0, 255, 0),list[3]);
+ }
pEdit->setValidator(mValid);
pEdit->setInputMethodHints(Qt::ImhDigitsOnly);
@@ -208,7 +212,7 @@
}
if(row == 0) {
mPrimaryMode = mode;
- setInputMode(mContentWidget->mEdit1, mode);
+ setInputMode(mContentWidget->mEdit1, mode);
} else {
mSecondaryMode = mode;
if(mContentWidget->mAdditionalRowVisible) {
@@ -222,7 +226,7 @@
{
Q_Q(HbInputDialog);
if(row > 1) {
- return;
+ return;
}
HbStyleOptionInputDialog option;
if(row == 0) {
@@ -245,7 +249,7 @@
return QString();
}
if(row == 0) {
- return mPromptText;
+ return mPromptText;
} else {
return mPromptAdditionalText;
}
@@ -258,7 +262,7 @@
return;
}
if(row == 0) {
- mContentWidget->mEdit1->setText(text);
+ mContentWidget->mEdit1->setText(text);
} else {
mText = text;
if(mContentWidget->mAdditionalRowVisible) {
--- a/src/hbwidgets/popups/hblistdialog.cpp Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,487 +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 HbWidgets module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-#include "hblistdialog.h"
-#include "hbwidget_p.h"
-#include "hblistdialog_p.h"
-#include "hblabel.h"
-#include "hbaction.h"
-#include "hbabstractviewitem.h"
-#include <hbinstance.h>
-#include "hbglobal_p.h"
-
-#include <QtDebug>
-#include <QGraphicsScene>
-#include <hblistwidgetitem.h>
-#include <hblistwidget.h>
-#include <hbradiobuttonlist.h>
-/*!
- \this class is deprecated. Use HbSelectionDialog.
-*/
-
-/*!
- \deprecated HbListDialog(QGraphicsItem*)
- is deprecated. \this is deprecated, use HbSelectionDialog.
-
- Constructor
-*/
-
-HbListDialog::HbListDialog(QGraphicsItem* parent):
- HbDialog(*new HbListDialogPrivate, parent)
-{
- HB_DEPRECATED("HbListDialog class is deprecated. Use HbSelectionDialog");
-
- Q_D(HbListDialog);
- d->init();
- setDismissPolicy(NoDismiss);
-}
-
-/*!
- @beta
- Destructor
- */
-HbListDialog::~HbListDialog()
-{
-}
-
-/*!
- @beta
- Protected.
- */
-void HbListDialog::showEvent(QShowEvent *event)
-{
- HbDialog::showEvent(event);
-}
-
-/*!
- @beta
- Sets the \a SelectionMode of the list. It can be
- \a SingleSelection or \a MultiSelection or \a NoSelection.
- If \a ListMode is \a RadioButtonListInput, \a MultiSelection mode will not
- work. Default value is \a NoSelection.
- \sa selectionMode.
- */
-void HbListDialog::setSelectionMode(HbAbstractItemView::SelectionMode mode)
-{
- Q_D(HbListDialog);
-
- d->setSelectionMode(mode);
-}
-
-/*!
- @beta
- Returns current \a SelectionMode of the list. It can be set
- by \a setSelectionMode(). Default value is \a NoSelection.
-*/
-HbAbstractItemView::SelectionMode HbListDialog::selectionMode() const
-{
- Q_D(const HbListDialog);
- return d->mSelectionMode;
-}
-
-/*!
- @beta
- Sets the string list items to be displayed.\a items is the
- list of strings and \a current is the index of default selection.
- \sa stringItems()
-*/
-void HbListDialog::setStringItems(const QStringList &items,int current)
-{
- Q_D(HbListDialog);
- d->setStringItems(items,current);
-}
-
-/*!
- @beta
- Returns list of string list items earlier set by \a setStringItems().
-*/
-QStringList HbListDialog::stringItems() const
-{
- Q_D(const HbListDialog);
- return d->stringItems();
-}
-
-/*!
- @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.
- \sa setSelectionMode(), \sa selectionMode()
- */
-QList<int> HbListDialog::selectedItems() const
-{
- Q_D(const HbListDialog);
- return d->selectedItems();
-}
-
-/*!
- @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.
-*/
-void HbListDialog::setSelectedItems(QList<int> items)
-{
- Q_D(HbListDialog);
- d->setSelectedItems(items);
-}
-
-/*!
- @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.
- \sa setSelectionMode(), \sa selectionMode()
- */
-QModelIndexList HbListDialog::selectedModelIndexes() const
-{
- Q_D(const HbListDialog);
- return d->selectedModelIndexes();
-}
-
-/*!
- @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.
- \sa widgetItems();
-*/
-void HbListDialog::setWidgetItems(QList<HbListWidgetItem*> &items,bool bTransferOwnership,int current)
-{
- Q_D(HbListDialog);
- d->setWidgetItems(items,bTransferOwnership,current);
-}
-
-/*!
- @beta
- Returns list of custom list items earlier set by \a setWidgetItems().
-*/
-QList<HbListWidgetItem*> HbListDialog::widgetItems() const
-{
- Q_D(const HbListDialog);
- return d->widgetItems();
-}
-
-/*!
- @beta
- Sets the Model containing data for the list items.
-*/
-void HbListDialog::setModel(QAbstractItemModel* model)
-{
- Q_D(HbListDialog);
- d->setModel(model);
-}
-
-/*!
- @beta
- Returns Model stored by list.
-*/
-QAbstractItemModel* HbListDialog::model() const
-{
- Q_D(const HbListDialog);
- return d->model();
-}
-/*!
- Static convenience function to let the user select item(s) from a
- string list. \a label is the text which is shown to the user (it
- should say what should be entered). \a list is the string list which
- is inserted into the list and \a current is
- the number of the item which should be the current item.
-
- If \a ok is non-null \e *\a ok will be set to true if the user
- pressed \gui OK and to false if the user pressed \gui Cancel. \a mode
- defines the selection mode of the list. It can be either of \NoSelection,
- \SingleSelection and \MultiSelection. The dialog's parent is \a parent.
- The dialog will be modal.
-
- this functions connects to the receiverd slot with signature finished(HbAction*).
- there the selectedItems has to be queried.
-*/
-void HbListDialog::getStringItems(const QString &label,
- const QStringList &list,
- QObject *receiver,
- const char *member,
- int current,
- HbAbstractItemView::SelectionMode mode,
- QGraphicsScene *scene,
- QGraphicsItem *parent)
-{
- HbListDialog *dlg = new HbListDialog(parent);
- if (scene && !parent) {
- scene->addItem(dlg);
- }
- QStringList result;
- QList<int> selIndexes;
- selIndexes << current;
- if(!label.isNull()) {
- dlg->setHeadingWidget(new HbLabel(label));
- }
- dlg->setStringItems(list,current);
- dlg->setSelectionMode(mode);
- dlg->setSelectedItems(selIndexes);
- dlg->setAttribute(Qt::WA_DeleteOnClose);
- dlg->open(receiver,member);
-}
-
-/*!
- Static convenience function to let the user select item(s) from a
- list of user defined items. \a label is the text which is shown to the
- user (it should say what should be entered). \a list is the list
- of user defined items shown to the user.Ownership is not transferred.
- \a current is the number of the item which should be the current item.
-
- If \a ok is non-null \e *\a ok will be set to true if the user
- pressed \gui OK and to false if the user pressed \gui Cancel. \a mode
- defines the selection mode of the list. It can be either of \NoSelection,
- \SingleSelection and \MultiSelection. The dialog's parent is \a parent.
- The dialog will be modal.
-
- this functions connects to the receiverd slot with signature finished(HbAction*).
- there the selectedItems has to be queried.
-*/
-void HbListDialog::getWidgetItems(const QString &label,
- QList<HbListWidgetItem*> &list,
- QObject *receiver,
- const char *member,
- int current,
- HbAbstractItemView::SelectionMode mode,
- QGraphicsScene *scene,
- QGraphicsItem *parent)
-{
- HbListDialog *dlg = new HbListDialog(parent);
- if (scene && !parent) {
- scene->addItem(dlg);
- }
- QList<HbListWidgetItem*> result;
- QList<int> selIndexes;
- selIndexes << current;
- if(!label.isNull()) {
- dlg->setHeadingWidget(new HbLabel(label));
- }
- dlg->setWidgetItems(list,false,current);
- dlg->setSelectionMode(mode);
- dlg->setSelectedItems(selIndexes);
- dlg->setAttribute(Qt::WA_DeleteOnClose);
- dlg->open(receiver,member);
-}
-
-/*!
- Static convenience function to let the user select item(s) from a
- list of items defined by a user set model.\a label is the text which
- is shown to the user (it should say what should be entered). \a model
- is user defined model which list will use to render the items.
- Ownership is not transferred.
- If \a ok is non-null \e *\a ok will be set to true if the user
- pressed \gui OK and to false if the user pressed \gui Cancel. \a mode
- defines the selection mode of the list. It can be either of \NoSelection,
- \SingleSelection and \MultiSelection.
- The dialog's parent is \a parent. The dialog will be modal.
-
- this functions connects to the receiverd slot with signature finished(HbAction*).
- there the selectedItems has to be queried.
-*/
-void HbListDialog::getModelIndexes(const QString &label, QAbstractItemModel* model,
- QObject *receiver,
- const char *member,
- HbAbstractItemView::SelectionMode mode, QGraphicsScene *scene, QGraphicsItem *parent)
-{
- HbListDialog *dlg = new HbListDialog(parent);
- if (scene && !parent) {
- scene->addItem(dlg);
- }
- QModelIndexList result;
- if(!label.isNull()) {
- dlg->setHeadingWidget(new HbLabel(label));
- }
- dlg->setModel(model);
- dlg->setSelectionMode(mode);
- dlg->setAttribute(Qt::WA_DeleteOnClose);
- dlg->open(receiver,member);
-}
-
-
-/*!
- \deprecated HbListDialog::getStringItems(const QString&,const QStringList,int,bool*,HbAbstractItemView::SelectionMode,QGraphicsScene*,QGraphicsItem*)
- is deprecated. Please use the other available HbListDialog::getStringItems(...) API.
-
- Static convenience function to let the user select item(s) from a
- string list. \a label is the text which is shown to the user (it
- should say what should be entered). \a list is the string list which
- is inserted into the list and \a current is
- the number of the item which should be the current item.
-
- If \a ok is non-null \e *\a ok will be set to true if the user
- pressed \gui OK and to false if the user pressed \gui Cancel. \a mode
- defines the selection mode of the list. It can be either of \NoSelection,
- \SingleSelection and \MultiSelection. The dialog's parent is \a parent.
- The dialog will be modal.
-
- This function returns the list of selected string items.
- List will contain only one item if \a SelectionMode is \a NoSelection or \a SingleSelection
- and may contain more items in case of \a MultiSelection.
-*/
-QStringList HbListDialog::getStringItems(const QString &label, const QStringList &list,int current,
- bool *ok,HbAbstractItemView::SelectionMode mode, QGraphicsScene *scene, QGraphicsItem *parent)
-{
- HB_DEPRECATED("HbListDialog::getStringItems is deprecated. Use HbListDialog::getStringItems(const QString &,const QStringList &,QObject *receiver,const char *,int,HbAbstractItemView::SelectionMode, QGraphicsScene *, QGraphicsItem *)");
-
- Q_UNUSED(parent)
-
- HbListDialog *dlg = new HbListDialog();
- if (scene) {
- scene->addItem(dlg);
- }
- QStringList result;
- QList<int> selIndexes;
- selIndexes << current;
- if(!label.isNull())
- dlg->setHeadingWidget(new HbLabel(label));
- dlg->setStringItems(list,current);
- dlg->setSelectionMode(mode);
- dlg->setSelectedItems(selIndexes);
- HbAction* action = dlg->exec();
- if(action == dlg->secondaryAction()){ //Cancel was pressed
- if(ok)
- *ok = false;
- }
- else{ //OK was pressed
- if(ok)
- *ok = true;
- selIndexes = dlg->selectedItems();
- }
- delete dlg;
- for(int i = 0; i < selIndexes.count(); i++ ){
- result += list[selIndexes[i]];
- }
- return result;
-}
-
-/*!
- \deprecated HbListDialog::getWidgetItems(const QString &, QList<HbListWidgetItem*> &,int,bool *,HbAbstractItemView::SelectionMode, QGraphicsScene *, QGraphicsItem *)
- is deprecated. Use the other available HbListDialog::getWidgetItems(...) API.
-
- Static convenience function to let the user select item(s) from a
- list of user defined items. \a label is the text which is shown to the
- user (it should say what should be entered). \a list is the list
- of user defined items shown to the user.Ownership is not transferred.
- \a current is the number of the item which should be the current item.
-
- If \a ok is non-null \e *\a ok will be set to true if the user
- pressed \gui OK and to false if the user pressed \gui Cancel. \a mode
- defines the selection mode of the list. It can be either of \NoSelection,
- \SingleSelection and \MultiSelection. The dialog's parent is \a parent.
- The dialog will be modal.
-
- This function returns the list of selected widget items.
- List will contain only one item if \a SelectionMode is \a NoSelection or
- \SingleSelection and may contain more items in case of \a MultipleSelection.
-*/
-QList<HbListWidgetItem*> HbListDialog::getWidgetItems(const QString &label, QList<HbListWidgetItem*> &list,int current,
- bool *ok,HbAbstractItemView::SelectionMode mode, QGraphicsScene *scene, QGraphicsItem *parent)
-{
- HB_DEPRECATED("HbListDialog::getWidgetItems is deprecated. Use HbListDialog::getWidgetItems(const QString &, QList<HbListWidgetItem*> &list,QObject *,const char *,int,HbAbstractItemView::SelectionMode, QGraphicsScene *, QGraphicsItem *)");
-
- Q_UNUSED(parent)
- HbListDialog *dlg = new HbListDialog();
- if (scene) {
- scene->addItem(dlg);
- }
- QList<HbListWidgetItem*> result;
- QList<int> selIndexes;
- selIndexes << current;
- if(!label.isNull())
- dlg->setHeadingWidget(new HbLabel(label));
- dlg->setWidgetItems(list,false,current);
- dlg->setSelectionMode(mode);
- dlg->setSelectedItems(selIndexes);
- HbAction* action = dlg->exec();
- if(action == dlg->secondaryAction()){ //Cancel was pressed
- if(ok)
- *ok = false;
- }
- else{ //OK was pressed
- if(ok)
- *ok = true;
- selIndexes = dlg->selectedItems();
- }
- for(int i = 0; i < selIndexes.count(); i++ ){
- result.append(list.at(selIndexes[i]));
- }
-
- delete dlg;
-
- return result;
-}
-
-/*!
- \deprecated HbListDialog::getModelIndexes(const QString &, QAbstractItemModel* ,bool *,HbAbstractItemView::SelectionMode , QGraphicsScene *, QGraphicsItem *)
- is deprecated. Use the other available HbListDialog::getModexIndexes(...) API.
-
- Static convenience function to let the user select item(s) from a
- list of items defined by a user set model.\a label is the text which
- is shown to the user (it should say what should be entered). \a model
- is user defined model which list will use to render the items.
- Ownership is not transferred.
- If \a ok is non-null \e *\a ok will be set to true if the user
- pressed \gui OK and to false if the user pressed \gui Cancel. \a mode
- defines the selection mode of the list. It can be either of \NoSelection,
- \SingleSelection and \MultiSelection.
- The dialog's parent is \a parent. The dialog will be modal.
-
- This function returns the model indexes selcted items in the list.
- List will contain only one item if \a SelectionMode is \a SingleSelection or
- \NoSelection and may contain more items in case of \a MultipleSelection.
-*/
-QModelIndexList HbListDialog::getModelIndexes(const QString &label, QAbstractItemModel* model,bool *ok,HbAbstractItemView::SelectionMode mode, QGraphicsScene *scene, QGraphicsItem *parent)
-{
- HB_DEPRECATED("HbListDialog::getModelIndexes is deprecated. Use HbListDialog::getModelIndexes(const QString &, QAbstractItemModel*,QObject *,const char *,HbAbstractItemView::SelectionMode, QGraphicsScene *, QGraphicsItem *)");
-
- Q_UNUSED(parent)
- HbListDialog *dlg = new HbListDialog();
- if (scene) {
- scene->addItem(dlg);
- }
- QModelIndexList result;
- if(!label.isNull())
- dlg->setHeadingWidget(new HbLabel(label));
- dlg->setModel(model);
- dlg->setSelectionMode(mode);
- HbAction* action = dlg->exec();
- if(action == dlg->secondaryAction()){ //Cancel was pressed
- if(ok)
- *ok = false;
- }
- else{ //OK was pressed
- if(ok)
- *ok = true;
- result = dlg->selectedModelIndexes();
- }
- dlg->setModel(0);
- delete dlg;
- return result;
-}
-
-#include "moc_hblistdialog.cpp"
--- a/src/hbwidgets/popups/hblistdialog.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,115 +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 HbWidgets module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#ifndef HBLISTDIALOG_H
-#define HBLISTDIALOG_H
-
-#include <QAbstractItemView>
-#include <hbdialog.h>
-#include <hbabstractitemview.h>
-
-class HbListDialogPrivate;
-class HbListWidgetItem;
-
-QT_BEGIN_NAMESPACE
-
-class QAbstractItemModel;
-
-QT_END_NAMESPACE
-
-class HB_WIDGETS_EXPORT HbListDialog : public HbDialog
-{
- Q_OBJECT
- Q_PROPERTY(HbAbstractItemView::SelectionMode selectionMode READ selectionMode WRITE setSelectionMode)
- Q_PROPERTY(QStringList items READ stringItems WRITE setStringItems)
- Q_PROPERTY(QList<int> selectedItems READ selectedItems WRITE setSelectedItems)
-
-public:
- enum { Type = Hb::ItemType_ListDialog };
- int type() const { return Type; }
-
- explicit HbListDialog(QGraphicsItem* parent=0);
- ~HbListDialog();
-
- void setSelectionMode(HbAbstractItemView::SelectionMode mode);
- HbAbstractItemView::SelectionMode selectionMode() const;
-
- void setStringItems(const QStringList &items,int current = 0);
- QStringList stringItems() const;
-
- void setWidgetItems(QList<HbListWidgetItem*> &items,bool bTransferOwnership = false,int current = 0);
- QList<HbListWidgetItem*> widgetItems() const;
-
- void setModel(QAbstractItemModel* model);
- QAbstractItemModel* model() const;
-
- QList<int> selectedItems() const;
- void setSelectedItems(QList<int> items);
-
- QModelIndexList selectedModelIndexes() const;
-
- static void getStringItems(const QString &label,
- const QStringList &list,
- QObject *receiver,
- const char *member,
- int current = 0,
- HbAbstractItemView::SelectionMode mode = HbAbstractItemView::NoSelection,
- QGraphicsScene *scene = 0,
- QGraphicsItem *parent = 0);
-
- static void getWidgetItems(const QString &label,
- QList<HbListWidgetItem*> &list,
- QObject *receiver,
- const char *member,
- int current = 0,
- HbAbstractItemView::SelectionMode mode = HbAbstractItemView::NoSelection,
- QGraphicsScene *scene = 0,
- QGraphicsItem *parent = 0);
- static void getModelIndexes(const QString &label,
- QAbstractItemModel* model,
- QObject *receiver,
- const char *member,
- HbAbstractItemView::SelectionMode mode = HbAbstractItemView::NoSelection,
- QGraphicsScene * scene = 0,
- QGraphicsItem *parent = 0);
-
- static QStringList getStringItems(const QString &label, const QStringList &list,int current = 0, bool *ok = 0,
- HbAbstractItemView::SelectionMode mode = HbAbstractItemView::NoSelection, QGraphicsScene *scene = 0, QGraphicsItem *parent = 0);
-
- static QList<HbListWidgetItem*> getWidgetItems(const QString &label, QList<HbListWidgetItem*> &list,int current = 0,
- bool *ok = 0,HbAbstractItemView::SelectionMode mode = HbAbstractItemView::NoSelection, QGraphicsScene *scene = 0, QGraphicsItem *parent = 0);
-
- static QModelIndexList getModelIndexes(const QString &label, QAbstractItemModel* model,bool *ok = 0,
- HbAbstractItemView::SelectionMode mode = HbAbstractItemView::NoSelection, QGraphicsScene * scene = 0, QGraphicsItem *parent = 0);
-
-protected:
- void showEvent(QShowEvent *event);
-
-private:
- Q_DISABLE_COPY(HbListDialog)
- Q_DECLARE_PRIVATE_D(d_ptr, HbListDialog)
-};
-
-#endif //HBLISTDIALOG_H
--- a/src/hbwidgets/popups/hblistdialog_p.cpp Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,386 +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 HbWidgets module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#include <QGraphicsGridLayout>
-#include <qglobal.h>
-#include "hbabstractviewitem.h"
-#include "hblistdialog_p.h"
-#include <hblabel.h>
-#include <hbaction.h>
-#include <hblistwidget.h>
-#include <hblistwidgetitem.h>
-#include <QtDebug>
-
-HbListDialogContentWidget::HbListDialogContentWidget(HbListDialogPrivate *priv):HbWidget(),
- mListView(0),d(priv)
-{
- mListView = new HbListWidget(this);
- HbStyle::setItemName(mListView, "list");
- HbStyle::setItemName(this, "this");
- HbAbstractItemView *view = qobject_cast<HbListWidget*>(mListView);
- if(view)
- QObject::connect(view,SIGNAL(activated(const QModelIndex&)),this,SLOT(_q_listItemSelected(QModelIndex)));
-
- HbListWidget* widget = qobject_cast<HbListWidget*>(mListView);
-
- if(widget){
- QObject::connect(widget,SIGNAL(activated(HbListWidgetItem *)),this,SLOT(_q_listWidgetItemSelected(HbListWidgetItem *)));
- widget->installEventFilter(this);
- }
-}
-
-
-void HbListDialogContentWidget::_q_listWidgetItemSelected(HbListWidgetItem *item)
-{
- if(item){
- HbListWidget* widget = qobject_cast<HbListWidget*>(mListView);
- if(widget){
- d->mSelectedIndex = widget->row(item);
- }
- }
-}
-
-
-void HbListDialogContentWidget::_q_listItemSelected(QModelIndex index)
-{
- if(mListView->selectionMode()== HbAbstractItemView::NoSelection){
- d->mSelectedModelIndex = index;
- d->mSelectedIndex = index.row();
- }
- if(mListView->selectionMode()== HbAbstractItemView::SingleSelection ||
- mListView->selectionMode()== HbAbstractItemView::NoSelection){
- d->close();
- }
-}
-
-bool HbListDialogContentWidget::eventFilter(QObject *obj, QEvent *event)
-{
- bool accepted = false;
- if (obj == mListView) {
- switch(event->type()){
- case QEvent::LayoutRequest: {
- qreal minHeight = minimumHeight();
- qreal maxHeight = preferredHeight();
- qreal height = 0;
- int count = 0;
- QAbstractItemModel* itemModel = mListView->model();
- if(itemModel)
- count = itemModel->rowCount();
- for(int i = 0 ; i < count ; i++){
- HbAbstractViewItem *row = mListView->viewItem(i);
- if(row)
- height += row->size().rheight();
- }
- if(height > minHeight && height < maxHeight){
- setPreferredHeight(height);
- parentWidget()->resize(parentWidget()->preferredSize());
- }
- break;
- }
- default:
- break;
- }
- }
- return accepted;
-}
-
-HbListDialogPrivate::HbListDialogPrivate()
- :HbDialogPrivate()
-{
- bOwnItems = false;
- mSelectedIndex = -1;
-}
-
-
-HbListDialogPrivate::~HbListDialogPrivate()
-{
- if(!bOwnItems){
- Q_Q(HbListDialog);
- HbListDialogContentWidget* cWidget = qobject_cast<HbListDialogContentWidget*>(q->contentWidget());
- if(cWidget){
- HbListWidget* widget = qobject_cast<HbListWidget*>(cWidget->mListView);
- if(widget){
- int nRows = 0;
- QAbstractItemModel* itemModel = widget->model();
- if(itemModel){
- nRows = itemModel->rowCount();
- while(nRows){
- widget->takeItem(0);
- nRows = itemModel->rowCount();
- }
- }
- }
- }
- }
-}
-void HbListDialogPrivate::init()
-{
- qDebug()<<" Entering init()";
- Q_Q(HbListDialog);
-
- bOwnItems = false;
-
- HbListDialogContentWidget* contentWidget = new HbListDialogContentWidget(this);
- q->setContentWidget(contentWidget);
-
- mPrimaryAction = new HbAction(QString(q->tr("Ok")));
- q->setPrimaryAction(mPrimaryAction);
-
- mSecondaryAction = new HbAction(QString(q->tr("Cancel")));
- q->setSecondaryAction(mSecondaryAction);
- q->setTimeout(0);
- q->setModal(true);
-
-}
-
-
-void HbListDialogPrivate::setSelectionMode(HbAbstractItemView::SelectionMode mode)
-{
- Q_Q(HbListDialog);
-
- mSelectionMode = mode;
- switch(mode)
- {
- case HbAbstractItemView::SingleSelection:
- case HbAbstractItemView::MultiSelection:
- case HbAbstractItemView::NoSelection:
- {
- HbListDialogContentWidget* cWidget = qobject_cast<HbListDialogContentWidget*>(q->contentWidget());
- if(cWidget){
- cWidget->mListView->setSelectionMode(mode);
- }
- }
- break;
- case HbAbstractItemView::ContiguousSelection:
- break;
- }
-}
-
-QList<HbListWidgetItem*> HbListDialogPrivate::widgetItems() const
-{
- Q_Q(const HbListDialog);
-
- QList<HbListWidgetItem*> rows;
- HbListDialogContentWidget* cWidget = qobject_cast<HbListDialogContentWidget*>(q->contentWidget());
- if(cWidget){
- HbListWidget* widget = qobject_cast<HbListWidget*>(cWidget->mListView);
- if(widget){
- int count = 0;
- QAbstractItemModel* itemModel = widget->model();
- if(itemModel)
- count = itemModel->rowCount();
- for(int i = 0; i < count; i++){
- rows.append(widget->item(i));
- }
- }
- }
- return rows;
-}
-
-void HbListDialogPrivate::setCurrentRow(int row)
-{
- Q_Q(HbListDialog);
-
- HbListDialogContentWidget* cWidget = qobject_cast<HbListDialogContentWidget*>(q->contentWidget());
- if(cWidget){
- HbListWidget* widget = qobject_cast<HbListWidget*>(cWidget->mListView);
- if(widget){
- QAbstractItemModel* itemModel = widget->model();
- QModelIndex index;
- if(itemModel){
- index = itemModel->index(row,0);
- }
- QItemSelectionModel* selectionModel = widget->selectionModel();
- if(selectionModel){
- selectionModel->select(index,QItemSelectionModel::Select);
- }
- }
- }
-}
-
-void HbListDialogPrivate::setStringItems(const QStringList &items, int current)
-{
- Q_Q(HbListDialog);
-
- HbListDialogContentWidget* cWidget = qobject_cast<HbListDialogContentWidget*>(q->contentWidget());
- if(!cWidget) return;
-
- HbListWidget* widget = qobject_cast<HbListWidget*>(cWidget->mListView);
- int nRows = 0;
-
- if(widget){
- int count = items.size();
- for (int i = 0; i < count; ++i) {
- HbListWidgetItem* modelItem = new HbListWidgetItem();
- QString str = items.at(i);
- modelItem->setText(str);
- widget->addItem(modelItem);
-
- QAbstractItemModel* itemModel = widget->model();
- if(itemModel)
- nRows = itemModel->rowCount();
- }
- if(nRows > 0){ //if addition of rows was correct.
- QList<int> currentRow;
- currentRow.append(current);
- setSelectedItems(currentRow);
- }
-
- }
-}
-
-QStringList HbListDialogPrivate::stringItems() const
-{
- QStringList list;
- QList<HbListWidgetItem*> items = widgetItems();
- int count = items.count();
- for(int i = 0; i < count; i++){
- QString text = items[i]->text();
- if(!text.isEmpty()){
- list += text;
- }
- }
- return list;
-}
-
-int HbListDialogPrivate::currentRow()
-{
- Q_Q(HbListDialog);
-
- int nCurrentRow = -1;
-
- HbListDialogContentWidget* cWidget = qobject_cast<HbListDialogContentWidget*>(q->contentWidget());
- if(!cWidget) return nCurrentRow;
-
- HbListWidget* widget = qobject_cast<HbListWidget*>(cWidget->mListView);
- if(widget){
- QItemSelectionModel* selectionModel = widget->selectionModel();
- if(selectionModel){
- QModelIndexList selectdList = selectionModel->selectedIndexes();
- if(selectdList.count() > 0)
- nCurrentRow = selectdList[0].row();
- }
- }
- return nCurrentRow;
-}
-
-void HbListDialogPrivate::setModel(QAbstractItemModel* model)
-{
- Q_Q(HbListDialog);
-
- HbListDialogContentWidget* cWidget = qobject_cast<HbListDialogContentWidget*>(q->contentWidget());
- if(cWidget){
- cWidget->mListView->HbListView::setModel(model); //HbListView's implementation of setModel()
- }
-}
-
-void HbListDialogPrivate::setWidgetItems(QList<HbListWidgetItem*> &items,bool bTransferOwnership,int current)
-{
- Q_Q(HbListDialog);
-
- HbListDialogContentWidget* cWidget = qobject_cast<HbListDialogContentWidget*>(q->contentWidget());
- if(cWidget){
- HbListWidget* widget = qobject_cast<HbListWidget*>(cWidget->mListView);
- if(widget){
- int count = items.count();
- for(int i = 0; i < count; i++){
- widget->addItem(items[i]);
- }
- widget->setCurrentRow(current);
-
- }
- bOwnItems = bTransferOwnership;
- }
-}
-
-QAbstractItemModel* HbListDialogPrivate::model() const
-{
- Q_Q(const HbListDialog);
-
- HbListDialogContentWidget* cWidget = qobject_cast<HbListDialogContentWidget*>(q->contentWidget());
- if(cWidget){
- return cWidget->mListView->HbListView::model(); //HbListView's implementation of model()
- }
- return 0;
-}
-
-QItemSelectionModel* HbListDialogPrivate::selectionModel() const
-{
- Q_Q(const HbListDialog);
-
- HbListDialogContentWidget* cWidget = qobject_cast<HbListDialogContentWidget*>(q->contentWidget());
- if(cWidget){
- return cWidget->mListView->selectionModel();
- }
- return 0;
-}
-
-void HbListDialogPrivate::setSelectedItems(QList<int> items)
-{
- QItemSelectionModel *model = 0;
- model = selectionModel();
- if(model){
- Q_FOREACH(int i,items) {
- model->select(model->model()->index(i,0),
- QItemSelectionModel::Select);
- }
- }
-}
-
-QList<int> HbListDialogPrivate::selectedItems() const
-{
- QItemSelectionModel *model = 0;
- QList<int> selIndexes;
- model = selectionModel();
- if(model){
- QModelIndexList indexes = model->selectedIndexes();
- int count = indexes.count();
- QModelIndex index;
- for(int i = 0 ; i < count ; i++){
- index = indexes[i];
- selIndexes.append(index.row());
- }
- }
- return selIndexes;
-
-}
-
-QModelIndexList HbListDialogPrivate::selectedModelIndexes() const
-{
- QItemSelectionModel *model = 0;
- QModelIndexList selIndexes;
- model = selectionModel();
- if(model){
- selIndexes = model->selectedIndexes();
- }
- return selIndexes;
-}
-
-void HbListDialogPrivate::close()
-{
- Q_Q(HbListDialog);
- q->close();
-}
-
--- a/src/hbwidgets/popups/hblistdialog_p.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +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 HbWidgets module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#ifndef HBLISTDIALOGPRIVATE_H
-#define HBLISTDIALOGPRIVATE_H
-
-#include <QGraphicsGridLayout>
-#include <QGraphicsWidget>
-
-#include <hblistdialog.h>
-#include "hbdialog_p.h"
-#include <hbabstractitemview.h>
-
-#include <hbglobal.h>
-
-class HbLabel;
-class HbAction;
-class HbListWidget;
-class HbRadioButtonList;
-class HbListWidgetItem;
-class HbListView;
-class HbListDialogPrivate : public HbDialogPrivate
-{
- Q_DECLARE_PUBLIC(HbListDialog)
-public:
- HbListDialogPrivate();
- ~HbListDialogPrivate();
-private:
- void init();
- void setSelectionMode(HbAbstractItemView::SelectionMode mode);
- QList<HbListWidgetItem*> widgetItems() const;
- void setCurrentRow(int row);
- int currentRow();
- void setStringItems(const QStringList &items,int current);
- QStringList stringItems() const;
- void setModel(QAbstractItemModel* model);
- void setWidgetItems(QList<HbListWidgetItem*> &items,bool bTransferOwnership,int current);
- QAbstractItemModel* model() const;
- QItemSelectionModel* selectionModel() const;
- void setSelectedItems(QList<int> items);
- QList<int> selectedItems() const;
- QModelIndexList selectedModelIndexes() const;
-public:
- HbAction *mPrimaryAction;
- HbAction *mSecondaryAction;
- bool bOwnItems;
- HbAbstractItemView::SelectionMode mSelectionMode;
- int mSelectedIndex; //for noselection mode
- QModelIndex mSelectedModelIndex;
- void close();
-};
-
-class HB_AUTOTEST_EXPORT HbListDialogContentWidget :public HbWidget
-{
- Q_OBJECT
-public:
- HbListView* mListView;
- HbListDialogPrivate* d;
- HbListDialogContentWidget(HbListDialogPrivate *priv);
- enum { Type = Hb::ItemType_ListDialogContentWidget };
- int type() const { return Type; }
- bool eventFilter(QObject *obj, QEvent *event);
-private slots:
- void _q_listWidgetItemSelected(HbListWidgetItem *item);
- void _q_listItemSelected(QModelIndex index);
-};
-
-#endif //HBLISTDIALOGPRIVATE_H
--- a/src/hbwidgets/popups/hbmessagebox.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/popups/hbmessagebox.cpp Fri May 14 16:09:54 2010 +0300
@@ -26,7 +26,7 @@
#include "hbnamespace_p.h"
#include <hbmessagebox.h>
#include "hbmessagebox_p.h"
-#include <hbstyleoptionmessagebox.h>
+#include <hbstyleoptionmessagebox_p.h>
#include <hbmainwindow.h>
#include <hbaction.h>
#include <hblineedit.h>
@@ -43,38 +43,52 @@
class HbMessageBoxEditor : public HbLineEdit
{
public:
- HbMessageBoxEditor(QGraphicsItem* parent =0) : HbLineEdit(parent)
- {
+ HbMessageBoxEditor(QGraphicsItem* parent =0) : HbLineEdit(parent),mText()
+ {
setReadOnly(true);
setCursorVisibility(Hb::TextCursorHidden);
- 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);
- }
+ 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();
+ }
- HbScrollBar * getScrollBar() const
- {
- HbScrollArea *scroll = scrollArea();
- return scroll->verticalScrollBar();
- }
+ void focusInEvent(QFocusEvent * event)
+ {
+ Q_UNUSED(event);
+ }
+ void focusOutEvent(QFocusEvent * event)
+ {
+ Q_UNUSED(event);
+ }
- void focusInEvent(QFocusEvent * event)
- {
- Q_UNUSED(event);
- }
- void focusOutEvent(QFocusEvent * event)
- {
- Q_UNUSED(event);
- }
+ void setHtmlText(const QString &text)
+ {
+ mText = text;
+ setHtml(text);
+ }
+
+ QString htmlText() const
+ {
+ return mText;
+ }
+private:
+ QString mText;
};
class HbMessageBoxContentWidget : public HbWidget
{
Q_OBJECT
+
public:
HbMessageBoxPrivate *d;
HbMessageBoxEditor *mTextEdit;
@@ -101,10 +115,9 @@
HbMessageBoxPrivate::HbMessageBoxPrivate() :
HbDialogPrivate(),
mIcon(),
- mIconAlignment(Qt::AlignCenter),
- mMessageBoxContentWidget(0),
- mMessageBoxType(HbMessageBox::MessageTypeInformation),
- mIconVisible(true)
+ mMessageBoxContentWidget(0),
+ mMessageBoxType(HbMessageBox::MessageTypeInformation),
+ mIconVisible(true)
{
}
@@ -128,68 +141,93 @@
switch(mMessageBoxType) {
case HbMessageBox::MessageTypeInformation:
- case HbMessageBox::MessageTypeWarning:
- mMessageBoxContentWidget = new HbMessageBoxContentWidget( this );
+ case HbMessageBox::MessageTypeWarning:
+ mMessageBoxContentWidget = new HbMessageBoxContentWidget( this );
q->setContentWidget( mMessageBoxContentWidget );
- q->setDismissPolicy(HbPopup::NoDismiss);
- q->setTimeout(HbPopup::NoTimeout);
- q->setPrimaryAction(new HbAction(q->tr("OK"), q));
+ q->setDismissPolicy(HbPopup::NoDismiss);
+ q->setTimeout(HbPopup::NoTimeout);
+ q->addAction(new HbAction(q->tr("OK"),q));
break;
case HbMessageBox::MessageTypeQuestion:
- mMessageBoxContentWidget = new HbMessageBoxContentWidget( this );
+ mMessageBoxContentWidget = new HbMessageBoxContentWidget( this );
q->setContentWidget( mMessageBoxContentWidget );
- q->setDismissPolicy(HbPopup::NoDismiss);
- q->setTimeout(HbPopup::NoTimeout);
- q->setPrimaryAction(new HbAction(q->tr("Yes"), q));
- q->setSecondaryAction(new HbAction(q->tr("No"), q));
+ q->setDismissPolicy(HbPopup::NoDismiss);
+ q->setTimeout(HbPopup::NoTimeout);
+ q->addAction(new HbAction(q->tr("Yes"),q));
+ q->addAction(new HbAction(q->tr("No"),q));
break;
}
}
-
/*!
@beta
\class HbMessageBox
- \brief HbMessageBox is a graphics widget which shows text message and an icon.
+ \brief HbMessageBox is a convenience modal dialog class, using which a simple information, a question, or a simple warning can be shown to the user.
+
+ Using HbMessageBox, the following dialogs can be created:
- HbMessageBox is derived from HbDialog that provides most of functionality such as
- modality, and timeouts.
+ <b>Information:</b> a statement to the user to which they may respond by 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>
+
+ By default, Message box launches an information dialog which contains a description text and user actions visualized as command buttons.
+
+ Default properties for the MessageBox (warning, information and question dialogs) are:
- HbMessageBox can used to show dialogs which contains a question ,information and warning.
- By default HbMessageBox launches a information dialog.
+ 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.
+ 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 dismiss policy of NoDismiss, timeout policy of NoTimeout, and with a BackgroundFade property on.
+
+ Example code for launching MessageBox using static convenience functions:
- example code to show a information messagebox:
\code
- HbMessageBox *box = new HbMessageBox("This is a information note");
- box->setAttribute(Qt::WA_DeleteOnClose);
- box->open();
+ //Information MessageBox
+ HbMessageBox::information(informationText, this, SLOT(onDialogClose(HbAction*)), headWidget, scene, parent);
+
+ //Warning MessageBox
+ HbMessageBox::warning(warningText, this, SLOT(onDialogClose(HbAction*)), headWidget, scene, parent);
+
+ //Question MessageBox
+ HbMessageBox::question(questionText, this, SLOT(onDialogClose(HbAction*)), primaryButtonText, secondaryButtonText, headWidget, scene, parent);
\endcode
- example code to show a information messagebox with two action keys:
+ Example code to show an information messagebox:
+
\code
- HbMessageBox *box = new HbMessageBox("This will delete XX . Continue ? ");
- box->setSecondaryAction(new HbAction("Cancel"));
- box->setAttribute(Qt::WA_DeleteOnClose);
- box->open();
+ HbMessageBox *box = new HbMessageBox("This is an information dialog.");
+ box->setAttribute(Qt::WA_DeleteOnClose);
+ box->open();
\endcode
- example code to show a qustion messagebox with a return value based action
+ Example code to show an information messagebox with two action buttons:
+ \code
+ HbMessageBox *box = new HbMessageBox("XX will be deleted. Do you want to Continue ? ");
+
+ //Add new action.
+ box->addAction(new HbAction(HbWidget::tr("Cancel"), q));
+
+ box->setAttribute(Qt::WA_DeleteOnClose);
+
+ box->open();
+ \endcode
+
+ Example code to show a question messagebox with a return value based action
\code
HbMessageBox *box = new HbMessageBox(" Delete file IC0002 ? ",HbMessageBox::MessageTypeQuestion);
- box->setAttribute(Qt::WA_DeleteOnClose);
- box->open(this,SLOT(dialogClosed(HbAction*)));
- \endcode
+ box->setAttribute(Qt::WA_DeleteOnClose);
+ box->open(this,SLOT(dialogClosed(HbAction*)));
- The declaration of SLOT is as shown below
-
- \code
- void dialogClosed(HbAction *action)
+ //Slot implementation
+ void dialogClosed(HbAction *action)
{
HbMessageBox *dlg = static_cast<HbMessageBox*>(sender());
- if(action == dlg->primaryAction())
+ if(action == dlg->actions().at(0))
{
// Delete file
}
@@ -198,29 +236,25 @@
// Cancellation is done.Dont delete the file
}
}
- \endcode
+ \endcode
\enum HbMessageBox::MessageBoxType
- \value \b MessageTypeInformation creates a dialog which will have some information for the user.
- MessageBox will have Ok button and will not be auto dissmissed. The user need to press
- Ok to dismiss.
+ \value \b MessageTypeInformation creates a modal information dialog, which by default will have one OK button
+ for the user to dismiss the dialog.
- \value \b MessageTypeWarning is a simple message dialog with warning icon. The user needs to press Ok
- to dismiss.
+ \value \b MessageTypeWarning creates a simple modal dialog with a warning icon and a description text.
+ Dialog by default will have one OK button, for the user to dismiss the dialog.
- \value \b MessageTypeQuestion Shows a message dialog with question icon. The user can either confirm or
- reject the dialog.
+ \value \b MessageTypeQuestion Shows a modal dialog with question icon and a description text. The user can either confirm or
+ reject the dialog. By default dialog supports two buttons, using which user can dismiss the dialog.
*/
-
-
/*!
- @beta
- Constructor.
- \param type An optional parameter.The type of messagebox.information/warning/question
- \param parent An optional parameter.
+ Constructs a MessageBox with \a type and a \a parent.
+ \param type User can create information/warning/question dialogs by passing appropriate MessageBoxType.
+ \param parent parent item to MessageBox
*/
HbMessageBox::HbMessageBox(MessageBoxType type,QGraphicsItem *parent) :
@@ -232,13 +266,11 @@
d->init();
}
-
/*!
- @beta
- Constructs a new HbMessageBox with \a text and \a parent.
- \param text The text for the MessageBox.
- \param type An optional parameter.The type of messagebox.information/warning/question
- \param parent An optional parameter.
+ Constructs a new MessageBox with \a text and \a parent.
+ \param text The descriptive text for the MessageBox.
+ \param type Messagebox type can be MessageTypeInformation, MessageTypeQuestion, MessageTypeWarning
+ \param parent parent item to MessageBox.
*/
HbMessageBox::HbMessageBox(const QString &text,MessageBoxType type, QGraphicsItem *parent)
: HbDialog(*new HbMessageBoxPrivate, parent)
@@ -246,22 +278,18 @@
Q_D(HbMessageBox);
d->mMessageBoxType = type;
d->q_ptr = this;
- d->init();
- d->mMessageBoxContentWidget->mTextEdit->setText(text);
+ d->init();
+ d->mMessageBoxContentWidget->mTextEdit->setHtmlText(text);
}
-
/*!
- @beta
destructor
-
*/
HbMessageBox::~HbMessageBox()
{
}
-
/*!
\internal
*/
@@ -273,9 +301,7 @@
d->init();
}
-
/*!
-
\deprecated HbMessageBox::primitive(HbStyle::Primitive)
is deprecated.
@@ -295,27 +321,19 @@
}
}
-
/*!
- @beta
\reimp
- Initializes \a option with the values from this HbMessageBox.
*/
void HbMessageBox::initStyleOption(HbStyleOptionMessageBox *option) const
{
Q_D(const HbMessageBox);
HbDialog::initStyleOption(option);
option->icon = d->mIcon;
- option->iconAlignment = d->mIconAlignment;
option->messageBoxType = d->mMessageBoxType;
}
-
-
/*!
- @beta
- updatePrimitives.
-
+ \reimp
*/
void HbMessageBox::updatePrimitives()
{
@@ -329,39 +347,33 @@
}
-
/*!
- @beta
- Sets text of the messagebox.
- \param text This is the text for the MessageBox
- \sa text()
+ Sets the descriptive text for the messagebox.
+ \param text Descriptive text for the MessageBox
+ \sa text()
*/
void HbMessageBox::setText(const QString &text)
{
Q_D(HbMessageBox);
- if ( text != d->mMessageBoxContentWidget->mTextEdit->text() ) {
- d->mMessageBoxContentWidget->mTextEdit->setText(text);
+ if ( text != d->mMessageBoxContentWidget->mTextEdit->htmlText() ) {
+ d->mMessageBoxContentWidget->mTextEdit->setHtmlText(text);
}
}
/*!
- @beta
- Returns text of the messagebox.
+ Returns descriptive text from the messagebox.
\sa setText()
*/
-
QString HbMessageBox::text() const
{
Q_D(const HbMessageBox);
- return d->mMessageBoxContentWidget->mTextEdit->text();
+ return d->mMessageBoxContentWidget->mTextEdit->htmlText();
}
-
/*!
- @beta
- Sets a custon Icon for the MessageBox. Not recommended to change the icon unless there is a real use case.
+ Sets a custom Icon for the MessageBox. Not recommended to change the icon unless there is a real use case.
\icon An icon instance
- \sa icon()
+ \sa icon()
*/
void HbMessageBox::setIcon(const HbIcon &icon)
{
@@ -373,12 +385,10 @@
initStyleOption(&option);
style()->updatePrimitive(d->mMessageBoxContentWidget->mIconItem, HbStyle::P_MessageBox_icon, &option);
}
- }
+ }
}
-
/*!
- @beta
Returns icon of the messagebox.
\sa setIcon()
*/
@@ -387,204 +397,58 @@
Q_D(const HbMessageBox);
return d->mIcon;
}
-/*!
- \deprecated HbMessageBox::setIconAlignment(Qt::Alignment)
- is deprecated.
- There is no icon alignment support
-*/
-void HbMessageBox::setIconAlignment( Qt::Alignment align )
-{
- Q_D(HbMessageBox);
- HB_DEPRECATED("HbMessageBox::setIconAlignment is deprecated.");
- if (align != d->mIconAlignment){
- d->mIconAlignment = align;
- if (d->mMessageBoxContentWidget->mIconItem) {
- HbStyleOptionMessageBox option;
- initStyleOption(&option);
- style()->updatePrimitive(d->mMessageBoxContentWidget->mIconItem, HbStyle::P_MessageBox_icon, &option);
- }
- }
-}
/*!
- @beta
- Sets wheather icon is visible or not.By default the icon is visible.
+ sets the icon \a visible property to true or false.
\param visible the visibility flag
- \sa iconVisible()
+ \sa iconVisible()
*/
void HbMessageBox::setIconVisible(bool visible)
{
- Q_D(HbMessageBox);
- if(visible != d->mIconVisible) {
- if(visible) {
- d->mMessageBoxContentWidget->mIconItem->show();
- d->mMessageBoxContentWidget->setProperty("hasIcon",true);
- }
- else {
- d->mMessageBoxContentWidget->mIconItem->hide();
- d->mMessageBoxContentWidget->setProperty("hasIcon",false);
- }
+ Q_D(HbMessageBox);
+ if(visible != d->mIconVisible) {
+ if(visible) {
+ d->mMessageBoxContentWidget->mIconItem->show();
+ d->mMessageBoxContentWidget->setProperty("hasIcon",true);
+ }
+ else {
+ d->mMessageBoxContentWidget->mIconItem->hide();
+ d->mMessageBoxContentWidget->setProperty("hasIcon",false);
+ }
- d->mIconVisible = visible;
- repolish();
- }
+ d->mIconVisible = visible;
+ repolish();
+ }
}
+
/*!
- @beta
- Returns the icon visibilty flag
- \sa setIconVisible()
+ Returns the icon visibilty flag. Icon visibility is true by default.
+ \sa setIconVisible()
*/
bool HbMessageBox::iconVisible() const
{
- Q_D(const HbMessageBox);
- return d->mIconVisible;
-
-}
-
-/*!
-
- \deprecated HbMessageBox::iconAlignment() const
- is deprecated.
-
- There is no icon alignment support
-*/
+ Q_D(const HbMessageBox);
+ return d->mIconVisible;
-Qt::Alignment HbMessageBox::iconAlignment() const
-{
- Q_D(const HbMessageBox);
- HB_DEPRECATED("HbMessageBox::iconAlignment is deprecated.");
- return d->mIconAlignment;
-}
-/*!
- \deprecated HbMessageBox::mousePressEvent(QGraphicsSceneMouseEvent *)
- is deprecated.
-
-*/
-void HbMessageBox::mousePressEvent(QGraphicsSceneMouseEvent *event )
-{
- HB_DEPRECATED("HbMessageBox::mousePressEvent is deprecated.");
- HbDialog::mousePressEvent(event);
- event->accept();
}
/*!
- \deprecated HbMessageBox::question(const QString &,const QString &,const QString &,QGraphicsWidget *,QGraphicsScene *,QGraphicsItem*)
- is deprecated. Deprecating due to migration from exec() to open call. Please use the other available question API.
-
- This is a convenient function to show a default message box with the question and buttons specified.
- this will return true when first button is clicked. false on the second.
- a heading widget can be set ex:
- \code
- HbMessageBox::question("are you sure?","yes","no",new HbLabel("Delete Confirm"));
- \endcode
+ This is a convenience function for showing a question dialog with \a questionText and buttons with specified \a primaryButtonText and
+ \a secondaryButtonText.
+ \param questionText descriptive text for the messagebox
+ \param receiver Object which has the slot, which acts as a handler once the dialog closes.
+ \param member the slot, where the control will come, once the dialog is closed.
+ \param primaryButtonText text for the primary button.
+ \param secondaryButtonText text for the secondary button.
+ \param headWidget the heading widget, where the user can set a title, Null by default.
+ \param scene the scene for the MessageBox. Null by default.
+ \param parent the parent widget. Null by default.
*/
-bool HbMessageBox::question(const QString &questionText,
- const QString &primaryButtonText,
- const QString &secondaryButtonText,
- QGraphicsWidget *headWidget,
- QGraphicsScene *scene,
- QGraphicsItem *parent)
-{
- HB_DEPRECATED("HbMessageBox::question is deprecated. Please use HbMessageBox::question(const QString&,const QString&,QGraphicsWidget*,QGraphicsScene*,QGraphicsItem*) instead");
-
- HbMessageBox *messageBox = new HbMessageBox(HbMessageBox::MessageTypeQuestion, parent);
- if (scene) {
- scene->addItem(messageBox);
- }
- messageBox->setText(questionText);
-
- HbAction *primaryAction = new HbAction(primaryButtonText);
- messageBox->setPrimaryAction(primaryAction);
-
- HbAction *secondaryAction = new HbAction(secondaryButtonText);
- messageBox->setSecondaryAction(secondaryAction);
- if(headWidget) {
- messageBox->setHeadingWidget(headWidget);
- }
- HbAction *action = messageBox->exec();
-
- if (action == messageBox->primaryAction() ){
- return true;
- }
- else {
- return false;
- }
-}
-
-/*!
- \deprecated HbMessageBox::information(const QString &,QGraphicsWidget*,QGraphicsScene*,QGraphicsItem*)
- is deprecated. Please use the other available HbMessageBox::information(...) API.
-
- This is a convenient function to show a default message box with the with informationText.
- optionally a heading widget can be set ex:
- \code
- HbMessageBox::information("new message received",new HbLabel("incoming message"));
- \endcode
-*/
-void HbMessageBox::information(const QString &informationText,
- QGraphicsWidget *headWidget,
- QGraphicsScene *scene,
- QGraphicsItem *parent)
-{
- HB_DEPRECATED("HbMessageBox::information is deprecated. Please use HbMessageBox::information(const QString&, QObject*, const char*, QGraphicsWidget*,QGraphicsScene*, QGraphicsItem*) instead.");
-
- HbMessageBox *messageBox = new HbMessageBox(HbMessageBox::MessageTypeInformation, parent);
- if (scene) {
- scene->addItem(messageBox);
- }
- messageBox->setText(informationText);
- if(headWidget) {
- messageBox->setHeadingWidget(headWidget);
- }
- messageBox->exec();
-}
-
-/*!
- \deprecated HbMessageBox::warning(const QString &,QGraphicsWidget *,QGraphicsScene*,QGraphicsItem*)
- is deprecated. Deprecated as part of moving exec to open call. Please use the other warning API.
-
- This is a convenient function to show a warning message box.
- optionally a heading widget can be set ex:
- \code
- HbMessageBox::warning("charge the phone",new HbLabel("battery low!"));
- \endcode
-*/
-void HbMessageBox::warning(const QString &warningText,
- QGraphicsWidget *headWidget,
- QGraphicsScene *scene,
- QGraphicsItem *parent)
-{
- HB_DEPRECATED("HbMessageBox::warning is deprecated. Use HbMessageBox::warning(const QString&, QObject*, const char*,QGraphicsWidget*, QGraphicsScene*, QGraphicsItem *) ");
-
- HbMessageBox *messageBox = new HbMessageBox(HbMessageBox::MessageTypeWarning, parent);
- if (scene) {
- scene->addItem(messageBox);
- }
- messageBox->setText(warningText);
- if(headWidget) {
- messageBox->setHeadingWidget(headWidget);
- }
- messageBox->exec();
-}
-/*!
- @beta
- This is a convenient function to show a default message box with the question and buttons specified.
- this will return true when first button is clicked. false on the second.
- \param questionText the text for the messagebox
- \param receiver the reciever of the slot
- \param member the slot
- \param primaryButtonText string for the primary button text
- \param secondaryButtonText string for the secondary button text
- \param headWidget the heading widget
- \param scene the scene
- \param parent the parent widget
-*/
-
void HbMessageBox::question(const QString &questionText,
QObject *receiver,
const char *member,
@@ -593,18 +457,21 @@
QGraphicsWidget *headWidget,
QGraphicsScene *scene,
QGraphicsItem *parent)
-{
+{
HbMessageBox *messageBox = new HbMessageBox(HbMessageBox::MessageTypeQuestion, parent);
if (scene && !parent) {
scene->addItem(messageBox);
}
messageBox->setText(questionText);
-
- HbAction *primaryAction = new HbAction(primaryButtonText,messageBox);
- messageBox->setPrimaryAction(primaryAction);
+
+ if((messageBox->actions().count() > 0) && messageBox->actions().at(0)){
+ messageBox->actions().at(0)->setText(primaryButtonText);
+ }
- HbAction *secondaryAction = new HbAction(secondaryButtonText,messageBox);
- messageBox->setSecondaryAction(secondaryAction);
+ if((messageBox->actions().count() > 1) && messageBox->actions().at(1)){
+ messageBox->actions().at(1)->setText(secondaryButtonText);
+ }
+
if(headWidget) {
messageBox->setHeadingWidget(headWidget);
}
@@ -613,17 +480,14 @@
}
/*!
- @beta
- This is a convenient function to show a default message box with the information and buttons specified.
- this will return true when first button is clicked. false on the second.
- \param informationText the text for the messagebox
- \param receiver the reciever of the slot
- \param member the slot
- \param headWidget the heading widget
- \param scene the scene
- \param parent the parent widget
+ This is a convenience function for showing an information dialog with a descriptive text and a default OK button.
+ \param informationText Descriptive text for the information dialog.
+ \param receiver Which has the slot, which acts as a handler once the dialog closes.
+ \param member the slot, where the control will come, once the dialog is closed.
+ \param headWidget This can used by the user to set a title widget. Null by default.
+ \param scene the scene for the MessageBox, Null by default.
+ \param parent the parent widget. Null by default
*/
-
void HbMessageBox::information(const QString &informationText,
QObject *receiver,
const char *member,
@@ -644,17 +508,14 @@
}
/*!
- @beta
- This is a convenient function to show a default message box with the information and buttons specified.
- this will return true when first button is clicked. false on the second.
- \param warningText the text for the messagebox
- \param receiver the reciever of the slot
- \param member the slot
- \param headWidget the heading widget
- \param scene the scene
- \param parent the parent widget
+ This is a convenience function for showing a warning dialog with a descriptive text and an OK button.
+ \param warningText Descriptive text for the warning dialog.
+ \param receiver Which has the slot, which acts as a handler once the dialog closes.
+ \param member the slot, where the control will come, once the dialog is closed.
+ \param headWidget This can used by the user to set a title widget, Null by default.
+ \param scene the scene for the messagebox, Null by default.
+ \param parent the parent widget, Null by default.
*/
-
void HbMessageBox::warning(const QString &warningText,
QObject *receiver,
const char *member,
--- a/src/hbwidgets/popups/hbmessagebox.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/popups/hbmessagebox.h Fri May 14 16:09:54 2010 +0300
@@ -38,8 +38,7 @@
Q_OBJECT
Q_PROPERTY( QString text READ text WRITE setText )
Q_PROPERTY( HbIcon icon READ icon WRITE setIcon )
- Q_PROPERTY( Qt::Alignment iconAlignment READ iconAlignment WRITE setIconAlignment )
- Q_PROPERTY( bool iconVisible READ iconVisible WRITE setIconVisible )
+ Q_PROPERTY( bool iconVisible READ iconVisible WRITE setIconVisible )
public:
enum MessageBoxType {
MessageTypeInformation,
@@ -56,10 +55,7 @@
void setIcon(const HbIcon &icon);
HbIcon icon() const;
- void setIconAlignment(Qt::Alignment align);
- Qt::Alignment iconAlignment() const;
-
- void setIconVisible(bool visible);
+ void setIconVisible(bool visible);
bool iconVisible() const;
QGraphicsItem *primitive(HbStyle::Primitive primitive) const;
@@ -67,26 +63,9 @@
int type() const { return Type; }
public:
- static bool question(const QString &questionText,
- const QString &primaryButtonText = tr("Yes"),
- const QString &secondaryButtonText = tr("No"),
- QGraphicsWidget *headWidget = 0,
- QGraphicsScene *scene = 0,
- QGraphicsItem *parent = 0 );
-
- static void information(const QString &informationText,
- QGraphicsWidget *headWidget = 0,
- QGraphicsScene *scene = 0,
- QGraphicsItem *parent = 0 );
-
- static void warning(const QString &warningText,
- QGraphicsWidget *headWidget = 0,
- QGraphicsScene *scene = 0,
- QGraphicsItem *parent = 0 );
-
- static void question(const QString &questionText,
- QObject *receiver,
- const char *member,
+ static void question(const QString &questionText,
+ QObject *receiver = 0,
+ const char *member = 0,
const QString &primaryButtonText = tr("Yes"),
const QString &secondaryButtonText = tr("No"),
QGraphicsWidget *headWidget = 0,
@@ -94,15 +73,15 @@
QGraphicsItem *parent = 0 );
static void information(const QString &informationText,
- QObject *receiver,
- const char *member,
+ QObject *receiver = 0,
+ const char *member = 0,
QGraphicsWidget *headWidget = 0,
QGraphicsScene *scene = 0,
QGraphicsItem *parent = 0 );
static void warning(const QString &warningText,
- QObject *receiver,
- const char *member,
+ QObject *receiver = 0,
+ const char *member = 0,
QGraphicsWidget *headWidget = 0,
QGraphicsScene *scene = 0,
QGraphicsItem *parent = 0 );
@@ -113,9 +92,9 @@
protected:
HbMessageBox(HbMessageBoxPrivate &dd, QGraphicsItem *parent);
void initStyleOption(HbStyleOptionMessageBox *option) const;
- void mousePressEvent(QGraphicsSceneMouseEvent *event );
+
private:
- Q_PRIVATE_SLOT(d_func(), void _q_closeOnGesture())
+ Q_PRIVATE_SLOT(d_func(), void _q_closeOnGesture())
Q_DECLARE_PRIVATE_D(d_ptr, HbMessageBox)
Q_DISABLE_COPY(HbMessageBox)
--- a/src/hbwidgets/popups/hbmessagebox_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/popups/hbmessagebox_p.h Fri May 14 16:09:54 2010 +0300
@@ -28,11 +28,7 @@
#include <hbmessagebox.h>
#include "hbdialog_p.h"
-#include <hbgesture.h>
-#include <hbgesturefilter.h>
-class HbGesture;
-class HbGestureSceneFilter;
class HbMessageBoxContentWidget;
class HbMessageBoxPrivate : public HbDialogPrivate
@@ -45,7 +41,6 @@
void init();
HbIcon mIcon;
- Qt::Alignment mIconAlignment;
HbMessageBoxContentWidget *mMessageBoxContentWidget;
HbMessageBox::MessageBoxType mMessageBoxType;
bool mIconVisible;
--- a/src/hbwidgets/popups/hbnotificationdialog.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/popups/hbnotificationdialog.cpp Fri May 14 16:09:54 2010 +0300
@@ -44,7 +44,7 @@
#include "hbeffectinternal_p.h"
#endif
-#include <hbstyleoptionnotificationdialog.h>
+#include <hbstyleoptionnotificationdialog_p.h>
#include "hbnotificationdialogcontent_p.h"
#define H_MARGIN QString("hb-param-margin-gene-middle-horizontal")
@@ -86,48 +86,46 @@
}
/*!
+ @beta
+ @hbwidgets
\class HbNotificationDialog
- \brief HbNotificationDialog is a non-modal dialog displayed on top of applications.
- Notification dialog is a dialog that can be used for notifying users of the system
- generated or user activated events in the UI. These notifications do not require
+ \brief HbNotificationDialog can be used to notify users of system
+ generated or user activated events in the UI.
+
+ HbNotificationDialog is a non-modal dialog displayed on top of applications.
+ These notifications do not require
user input.
- If wanted, some action can be activated with a tap to the notification dialog. The user
- of notification dialog can do this by first enabling the touch activation with
+ Optionally, an action can be activated with a tap to the notification dialog. This is enabled
+ by first enabling the touch activation with
enableTouchActivation() and then starting the action with the signal
- HbNotificationDialog::activated()
+ HbNotificationDialog::activated().
HbNotificationDialog is a concrete class. For the content, you can use the default content
- widgets which provides two rows of text (title only, or title and text) and optionally an icon.
+ widgets which provides two rows of text (title spanning both lines, or title and text) and optionally an icon.
You can use the default content widget by invoking the HbNotificationDialog with its
- static launch-methods or by using the methods setText, setTitle, setIcon.
+ static launch-methods or by using the methods setText(), setTitle() and setIcon().
- Alternatively, you can create a separate widget, and set it to the dialog with inherited method
+ Alternatively, you can create a separate widget, and set it to the dialog with the inherited method
HbNotificationDialog::setContentWidget().
- To display a notification dialog, show() or exec() has to be called. By default, notifications
- are synchronized with device dialogs. Showing of notification dialogs are delayed until there
+ To display a notification dialog, show() or open() must be called. By default, notifications
+ are synchronized with device dialogs. The display of notification dialogs is delayed until there
are no device dialogs on display. Notifications are also synchronized with each other.
- If several notifications are shown at the same time with show() function, they are shown
- sequentially instead of on top of each other. Sequential show and device dialog
- synchronization can be disabled by setSequentialShow() function.
-
- \beta
- \hbwidgets
+ If several notifications are shown at the same time with the show() function, they are shown
+ sequentially instead of on top of each other. The synchronization of dialogs and sequential display of dialogs
+ can be disabled using the setSequentialShow() function.
*/
/*!
\fn void HbNotificationDialog::activated();
- This signal is emitted when the dialog is closed with a pointer tap
+ This signal is emitted when the dialog is closed with a pointer tap.
*/
/*!
- \enum HbNotificationDialog::WrapMode
- \deprecated HbNotificationDialog::WrapMode
- is deprecated and will be removed in future.
-*/
-
+ Constructor.
+ */
HbNotificationDialog::HbNotificationDialog() : HbDialog(*new HbNotificationDialogPrivate, 0)
{
Q_D(HbNotificationDialog);
@@ -143,8 +141,7 @@
setPreferredPos(QPointF(hMargin, vMargin));
}
- // todo: priority
- d->setPriority(1);
+ //d->setPriority(1);
setModal(false);
@@ -162,6 +159,9 @@
#endif
}
+/*!
+ Destructor.
+ */
HbNotificationDialog::~HbNotificationDialog()
{
Q_D(HbNotificationDialog);
@@ -172,7 +172,8 @@
/*!
Enable user interaction on dialog.
- \param enable - When enabled, activated() signal is emitted on user action.
+ \param enabled - When enabled, the activated() signal is emitted on user action.
+
\sa isTouchActivating()
*/
void HbNotificationDialog::enableTouchActivation(bool enabled)
@@ -185,7 +186,8 @@
}
/*!
- returns true if the use interaction is enabled.
+ Returns true if user interaction is enabled.
+
\sa enableTouchActivation()
*/
bool HbNotificationDialog::isTouchActivating() const
@@ -195,8 +197,8 @@
}
/*!
- Convenience method for using HbNotificationDialog. Shows a notification dialog with
- the given parameters. The dialog is owned by HbNotificationDialog.
+ Convenience method for using HbNotificationDialog. Shows a notification dialog with
+ the given parameters. The dialog is owned by HbNotificationDialog.
*/
void HbNotificationDialog::launchDialog(const QString &title, const QString &text, QGraphicsScene* scene)
{
@@ -211,26 +213,8 @@
}
/*!
- Convenience method for using HbNotificationDialog. Shows a notification dialog with
- the given parameters. The dialog is owned by NotificationDialog.
-
- \deprecated HbNotificationDialog::launchDialog(const HbIcon&, QGraphicsScene*)
- is deprecated. Showing only icon is not supported by the layout. Use other launchDialog-methods instead.
-*/
-void HbNotificationDialog::launchDialog(const HbIcon &icon, QGraphicsScene* scene)
-{
- HbNotificationDialog *self = new HbNotificationDialog();
- if (scene) {
- scene->addItem(self);
- }
- self->setAttribute(Qt::WA_DeleteOnClose, true);
- self->setIcon(icon);
- self->show();
-}
-
-/*!
- Convenience method for using HbNotificationDialog. Shows a notification dialog with
- the given parameters. The dialog is owned by NotificationDialog.
+ Convenience method for using HbNotificationDialog. Shows a notification dialog with
+ the given parameters. The dialog is owned by NotificationDialog.
*/
void HbNotificationDialog::launchDialog(const QString &title, QGraphicsScene* scene)
{
@@ -244,8 +228,8 @@
}
/*!
- Convenience method for using HbNotificationDialog. Shows a notification dialog with
- the given parameters. The dialog is owned by HbNotificationDialog.
+ Convenience method for using HbNotificationDialog. Shows a notification dialog with
+ the given parameters. The dialog is owned by HbNotificationDialog.
*/
void HbNotificationDialog::launchDialog(const HbIcon &icon, const QString &title,
const QString &text, QGraphicsScene* scene)
@@ -262,14 +246,11 @@
}
/*!
- \property HbNotificationDialog::title
- \brief title text
+ Returns the title text.
If a default content widget doesn't exist, it is created.
-*/
-/*!
- returns title text.
- \sa setTitle()
+
+ \sa setTitle()
*/
QString HbNotificationDialog::title() const
{
@@ -282,26 +263,24 @@
}
/*!
- set title text
- \sa title()
+ Set the dialog title text.
+
+ \sa title()
*/
void HbNotificationDialog::setTitle(const QString& title)
{
Q_D(HbNotificationDialog);
d->checkAndCreateContentWidget();
- d->content->setTitle( title );
+ d->content->setTitle(title);
d->setNotificationDialogContent();
}
/*!
- \property HbNotificationDialog::text
- \brief text for the dialog
+ Returns the text for the dialog.
If a default content widget doesn't exist, it is created.
-*/
-/*!
- returns text for the dialog.
- \sa setText()
+
+ \sa setText()
*/
QString HbNotificationDialog::text() const
{
@@ -314,8 +293,9 @@
}
/*!
- set text for the dialog.
- \sa text()
+ Set the text for the dialog.
+
+ \sa text()
*/
void HbNotificationDialog::setText(const QString& text)
{
@@ -326,14 +306,11 @@
}
/*!
- \property HbNotificationDialog::icon
- \brief icon
+ Returns the icon for the dialog.
If a default content widget doesn't exist, it is created.
-*/
-/*!
- returns the icon.
- \sa setIcon()
+
+ \sa setIcon()
*/
HbIcon HbNotificationDialog::icon() const
{
@@ -346,8 +323,9 @@
}
/*!
- set the icon.
- \sa icon()
+ Set the icon.
+
+ \sa icon()
*/
void HbNotificationDialog::setIcon(const HbIcon& icon)
{
@@ -358,28 +336,12 @@
}
/*!
-\deprecated HbNotificationDialog::setWrapMode(int)
- is deprecated. Please use setTitleTextWrapping(Hb::TextWrapping wrapping) instead.
-*/
-void HbNotificationDialog::setWrapMode(int mode)
-{
- if (mode == NoWrap) {
- setTitleTextWrapping(Hb::TextNoWrap);
- } else {
- setTitleTextWrapping(Hb::TextWordWrap);
- }
-}
+ Returns the style of text wrapping for the title.
+
+ The title can wrap only if there is no other text for the dialog. The title can wrap to a maximum of two lines.
+ The default is Hb::TextWordWrap.
-/*!
- \property HbNotificationDialog::titleTextWrapping
- \brief sets the wrapping for title.
-
- The title can wrap to two lines only if the text is empty.
- \sa HbNotificationDialog::title, HbNotificationDialog::text
-*/
-/*!
- Returns the wrapping mode. The title can wrap to two lines only if the text is empty.
- \sa setTitleTextWrapping()
+ \sa setTitleTextWrapping(), HbNotificationDialog::title, HbNotificationDialog::text
*/
Hb::TextWrapping HbNotificationDialog::titleTextWrapping() const
{
@@ -388,9 +350,9 @@
}
/*!
- \brief sets the wrapping for title.
+ Sets whether the text for the title is wrapped.
- The title can wrap to two lines only if the text is empty.
+ The title can wrap only if there is no text for the dialog. The title can wrap to a maximum of two lines.
\sa titleTextWrapping()
*/
void HbNotificationDialog::setTitleTextWrapping(Hb::TextWrapping wrapping)
@@ -406,13 +368,17 @@
}
/*!
- Enables or disables sequential showing of Notification Dialog. Notification dialogs are by
- default shown sequentially. Several dialogs displayed by show() at the same time are shown
- one after another instead of on top of each other. Showing of the dialogs are also synchronized
- with device dialogs by delaying until none of them are shown. With sequential show disabled,
+ Enables or disables sequential display of the Notification Dialog.
+
+ When enabled, notification dialogs are shown sequentially. If multiple calls to show() occur at the same time then the dialogs are displayed
+ in sequence instead of on top of each other. The display of the dialogs is also synchronized
+ with the device dialogs such that the notification dialogs do not appear until there are no device dialogs being displayed.
+
+ With sequential show disabled,
HbNotificationDialog behaves like other popups. While a dialog is waiting to be shown,
- setVisible(), hide() or show() has no effect. setSequentialShow(false) removes a dialog from the
- wait queue.
+ setVisible(), hide() and show() have no effect. To remove a dialog from the wait queue, call setSequentialShow(false).
+
+ This setting is enabled by default.
\sa isSequentialShow()
*/
@@ -426,7 +392,7 @@
}
/*!
- Returns sequential show setting.
+ Returns the sequential show setting.
\sa setSequentialShow()
*/
@@ -437,15 +403,6 @@
}
/*!
-\deprecated HbNotificationDialog::wrapMode() const
- is deprecated. Please use titleTextWrapping() const instead.
-*/
-int HbNotificationDialog::wrapMode() const
-{
- return NoWrap;
-}
-
-/*!
Constructor required by the shared d-pointer paradigm.
*/
HbNotificationDialog::HbNotificationDialog(HbNotificationDialogPrivate &dd, QGraphicsItem *parent) :
@@ -453,6 +410,24 @@
{
}
+/*!
+ \reimp
+*/
+QGraphicsItem *HbNotificationDialog::primitive(const QString &itemName) const
+{
+ Q_D(const HbNotificationDialog);
+
+ if (itemName == "") {
+ return 0;
+ } else {
+ if(d->content) {
+ return d->content->primitive(itemName);
+ } else {
+ return HbWidget::primitive(itemName);
+ }
+ }
+}
+
void HbNotificationDialog::gestureEvent(QGestureEvent *event)
{
Q_D(HbNotificationDialog);
--- a/src/hbwidgets/popups/hbnotificationdialog.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/popups/hbnotificationdialog.h Fri May 14 16:09:54 2010 +0300
@@ -37,28 +37,15 @@
Q_OBJECT
Q_PROPERTY(QString text READ text WRITE setText)
Q_PROPERTY(QString title READ title WRITE setTitle)
- Q_PROPERTY(int wrapMode READ wrapMode WRITE setWrapMode) //deprecated
Q_PROPERTY(HbIcon icon READ icon WRITE setIcon)
Q_PROPERTY(Hb::TextWrapping titleTextWrapping READ titleTextWrapping WRITE setTitleTextWrapping)
Q_PROPERTY(bool sequentialShow READ isSequentialShow WRITE setSequentialShow)
public:
-
- //deprecated
- enum WrapMode
- {
- NoWrap = 0,
- TitleWrapsTwoLines
- };
-
-public:
HbNotificationDialog();
~HbNotificationDialog();
static void launchDialog(const QString &title, QGraphicsScene *scene = 0);
-
- //deprecated.
- static void launchDialog(const HbIcon &icon, QGraphicsScene *scene = 0);
static void launchDialog(const QString &title, const QString &text, QGraphicsScene *scene = 0);
static void launchDialog(const HbIcon &icon, const QString &title, const QString &text, QGraphicsScene *scene = 0);
@@ -74,12 +61,6 @@
QString text() const;
HbIcon icon() const;
- //deprecated
- int wrapMode() const;
-
- //deprecated
- void setWrapMode(int mode);
-
void setTitleTextWrapping(Hb::TextWrapping wrapping);
Hb::TextWrapping titleTextWrapping() const;
@@ -88,6 +69,7 @@
enum { Type = Hb::ItemType_NotificationDialog };
int type() const { return Type; }
+ QGraphicsItem *primitive(const QString &itemName) const;
signals:
void activated();
--- a/src/hbwidgets/popups/hbnotificationdialogcontent.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/popups/hbnotificationdialogcontent.cpp Fri May 14 16:09:54 2010 +0300
@@ -23,7 +23,7 @@
**
****************************************************************************/
-#include <hbstyleoptionnotificationdialog.h>
+#include <hbstyleoptionnotificationdialog_p.h>
#include <hbdeviceprofile.h>
#include "hbnotificationdialogcontent_p.h"
@@ -43,7 +43,9 @@
}
mIcon = icon;
updatePrimitives();
- polishEvent();
+ if (isVisible()) {
+ polishEvent();
+ }
}
void HbNotificationDialogContent::setText(const QString &text)
@@ -55,7 +57,9 @@
}
mText = text;
updatePrimitives();
- polishEvent();
+ if (isVisible()) {
+ polishEvent();
+ }
}
void HbNotificationDialogContent::setTitle(const QString &title)
@@ -68,7 +72,9 @@
mTitle = title;
updatePrimitives();
- polishEvent();
+ if (isVisible()) {
+ polishEvent();
+ }
}
void HbNotificationDialogContent::setTitleTextWrapping(Hb::TextWrapping wrapping)
@@ -76,7 +82,9 @@
if (mTitleWrapping != wrapping) {
mTitleWrapping = wrapping;
updatePrimitives();
- polishEvent();
+ if (isVisible()) {
+ polishEvent();
+ }
}
}
@@ -181,3 +189,25 @@
HbStyle::P_NotificationDialog_icon, &option);
}
}
+
+/*!
+ \reimp
+*/
+QGraphicsItem *HbNotificationDialogContent::primitive(const QString &itemName) const
+{
+ if (itemName == "") {
+ return 0;
+ } else {
+ if (itemName == "text") {
+ return mTextItem;
+ }
+ else if (itemName == "title") {
+ return mTitleItem;
+ }
+ else if (itemName == "icon") {
+ return mIconItem;
+ } else {
+ return 0;
+ }
+ }
+}
--- a/src/hbwidgets/popups/hbnotificationdialogcontent_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/popups/hbnotificationdialogcontent_p.h Fri May 14 16:09:54 2010 +0300
@@ -52,6 +52,7 @@
int type() const { return Type; }
void enableTouchActivation(bool enabled);
bool isTouchActivating() const;
+ QGraphicsItem *primitive(const QString &itemName) const;
public slots:
virtual void updatePrimitives();
--- a/src/hbwidgets/popups/hbprogressdialog.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/popups/hbprogressdialog.cpp Fri May 14 16:09:54 2010 +0300
@@ -25,7 +25,7 @@
#include <hbprogressdialog.h>
#include <hbprogressdialog_p.h>
-#include <hbstyleoptionprogressdialog.h>
+#include <hbstyleoptionprogressdialog_p.h>
#include <hbnamespace_p.h>
#include <hbaction.h>
@@ -34,7 +34,7 @@
#include <QGraphicsItem>
/*
- internal
+ \internal
HbProgressDialogContentWidget class
HbProgressDialogContentWidget is internal to HbProgressDialog and is the content widget to progressDialog
@@ -70,18 +70,18 @@
};
/*!
- internal
+ \internal
HbProgressDialogPrivate class constructor
*/
-HbProgressDialogPrivate::HbProgressDialogPrivate() :mAction(0),mTimer(0),mIcon(0),mContentWidget(0),
+HbProgressDialogPrivate::HbProgressDialogPrivate() :mTimer(0),mIcon(0),mContentWidget(0),
mMinDuration(0),mDelayTime(0),mTextString(QString()),
mAlign(Qt::AlignTop|Qt::AlignLeft)
{
}
/*!
- internal
+ \internal
HbProgressDialogPrivate class destructor
*/
@@ -90,9 +90,9 @@
}
/*!
- internal
+ \internal
- initialises HbProgressDialogPrivate class
+ Initializes HbProgressDialogPrivate class
*/
void HbProgressDialogPrivate::init(HbProgressDialog::ProgressDialogType type)
{
@@ -111,9 +111,9 @@
mContentWidget->mProgressBar->setRange(0,100);
}
- mAction = new HbAction(q->tr("Cancel"));
- QObject::connect(mAction, SIGNAL(triggered()), q, SLOT(_q_userCancel()));
- q->setPrimaryAction(mAction);
+ HbAction *action = new HbAction(q->tr("Cancel"), q);
+ QObject::connect(action, SIGNAL(triggered()), q, SLOT(_q_userCancel()));
+ q->addAction(action);
mMinDuration = 1500;
mDelayTime = 1000;
@@ -124,12 +124,11 @@
q->setTimeout(HbPopup::NoTimeout);
q->setDismissPolicy(HbPopup::NoDismiss);
- q->setModal(false);
q->hide();
}
/*
- internal
+ \internal
createPrimitives.
*/
@@ -138,7 +137,7 @@
Q_Q(HbProgressDialog);
if( !mContentWidget->mProgressBar ){
- mContentWidget->mProgressBar = new HbProgressBar(HbProgressBar::SimpleProgressBar,mContentWidget);
+ mContentWidget->mProgressBar = new HbProgressBar(mContentWidget);
HbStyle::setItemName(mContentWidget->mProgressBar, "pbar");
}
@@ -161,10 +160,10 @@
}
/*!
- internal
+ \internal
- private slot which stops the timer and
- dismisses the dialog
+ Private slot for, when user clicks on cancel button. This stops the timer and
+ dismisses the dialog.
*/
void HbProgressDialogPrivate::_q_userCancel()
{
@@ -176,9 +175,9 @@
}
/*!
- internal
+ \internal
- private slot which stops the timer and
+ Private slot which stops the timer and
dismisses the dialog
*/
void HbProgressDialogPrivate::_q_finished()
@@ -203,10 +202,9 @@
}
/*!
- internal
+ \internal
- private slot which stops the timer and
- dismisses the dialog
+ Private slot, for when progress value changes. When maximum value, stop the timer and close the dialog.
*/
void HbProgressDialogPrivate::_q_progressValueChanged(int value)
{
@@ -233,7 +231,7 @@
\class HbProgressDialog
\brief HbProgressDialog provides feedback on the progress of a slow operation.
- \image html hbprogressnote.png A progress dialog.
+ \image html hbprogressdialog.png A progress dialog.
ProgressDialog widget displays that a process is active and also the completion level of the process to the user.
@@ -444,7 +442,7 @@
/*!
@beta
- Returns the value of the progressbar within the note.
+ Returns the value of the progressbar within the dialog.
This value is constrained as follows:
\b minimum <= \c value <= \b maximum.
@@ -460,7 +458,7 @@
/*!
@beta
- Sets the value of the progressbar within the progress dialog.
+ Sets the value for the progressbar within the progress dialog.
After the timeline has been started the value is updated automatically.
Use this function only if the timer is not used.
@@ -482,7 +480,7 @@
/*!
@beta
Closes the dialog while emitting the cancelled() signal. This function is called when
- user presses the Cancel button or then the timer expires.
+ user presses the Cancel button or when the timer expires.
*/
void HbProgressDialog::cancel()
{
@@ -519,6 +517,9 @@
The type of the progress dialog can be specified with one of the values:
\li HbProgressDialog::ProgressDialog
\li HbProgressDialog::WaitDialog
+
+ \param type type for the progress dialog.
+
\sa progressDialogType()
*/
void HbProgressDialog::setProgressDialogType(HbProgressDialog::ProgressDialogType type)
@@ -550,8 +551,8 @@
/*!
@beta
- Shows the progress dialog after a delay(say 1sec). This is a convenient slot.
- if user cancels progress dialog before delay getting expired, then progress dialog wont be shown at all
+ Shows the progress dialog after a delay, say 1sec. This is a convenient slot for the user.
+ if user cancels progress dialog before delay getting expired, then progress dialog wont be shown at all.
*/
void HbProgressDialog::delayedShow()
{
@@ -565,6 +566,7 @@
/*!
@beta
Returns the auto close flag.
+ \return autoclose flag.
\sa setAutoClose()
*/
bool HbProgressDialog::autoClose () const
@@ -577,6 +579,7 @@
/*!
@beta
Sets the auto close flag.
+ \param close based on which autoclose flag is set or reset.
\sa autoClose()
*/
void HbProgressDialog::setAutoClose ( bool close )
@@ -588,9 +591,7 @@
}
/*!
- Initializes \a option with the values from this HbProgressDialog.
- This method is useful for subclasses when they need a HbStyleOptionProgressDialog,
- but don't want to fill in all the information themselves.
+ \reimp
*/
void HbProgressDialog::initStyleOption(HbStyleOptionProgressDialog *option) const
{
@@ -621,9 +622,8 @@
*/
void HbProgressDialog::closeEvent ( QCloseEvent * event )
{
- Q_D(HbProgressDialog);
-
- d->mAction->setToolTip("");
+ Q_D(HbProgressDialog);
+
if(d->flags.testFlag(HbProgressDialogPrivate::Closetimer)){
d->flags |= HbProgressDialogPrivate::Closepending;
event->setAccepted(false);
@@ -721,88 +721,5 @@
}
-/*!
- \deprecated HbProgressDialog::setTextAlignment( Qt::Alignment )
- is deprecated.
-
- Sets the text alignment.
- \param align Qt defined alignment options can used.
-
- The default value is Qt::AlignLeft|Qt::AlignVCenter
-
- \sa mTextAlignment()
-*/
-void HbProgressDialog::setTextAlignment( Qt::Alignment align )
-{
- Q_D(HbProgressDialog);
-
- if (align != d->mAlign ){
- d->mAlign = align;
- if(d->mContentWidget->mTextItem)
- {
- HbStyleOptionProgressDialog progressDialogOption;
- initStyleOption(&progressDialogOption);
- style()->updatePrimitive(d->mContentWidget->mTextItem, HbStyle::P_ProgressDialog_text, &progressDialogOption);
- }
- }
-}
-
-/*!
- \deprecated HbProgressDialog::textAlignment() const
- is deprecated.
-
- Returns the text alignment.
-
- \sa setTextAlignment()
-*/
-Qt::Alignment HbProgressDialog::textAlignment() const
-{
- Q_D(const HbProgressDialog);
-
- return d->mAlign;
-}
-
-/*!
- \deprecated HbProgressDialog::setIconAlignment( Qt::Alignment )
- is deprecated.
-
- Sets the icon alignment.
-
- \param align Qt defined alignment options can used.
-
- The default value is Qt::AlignCenter.
-
- \sa mIconAlignment()
-*/
-void HbProgressDialog::setIconAlignment( Qt::Alignment align )
-{
- Q_D(HbProgressDialog);
-
- if (align != d->mIconAlignment){
- d->mIconAlignment = align;
- if (d->mContentWidget->mIconItem) {
- HbStyleOptionProgressDialog progressDialogOption;
- initStyleOption(&progressDialogOption);
- style()->updatePrimitive(d->mContentWidget->mIconItem, HbStyle::P_ProgressDialog_icon, &progressDialogOption);
- }
- }
-}
-
-
-/*!
- \deprecated HbProgressDialog::iconAlignment() const
- is deprecated.
-
- Returns the icon alignment.
-
- \sa setIconAlignment()
-*/
-Qt::Alignment HbProgressDialog::iconAlignment() const
-{
- Q_D(const HbProgressDialog);
-
- return d->mIconAlignment;
-}
-
#include "moc_hbprogressdialog.cpp"
#include "hbprogressdialog.moc"
--- a/src/hbwidgets/popups/hbprogressdialog.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/popups/hbprogressdialog.h Fri May 14 16:09:54 2010 +0300
@@ -43,11 +43,6 @@
Q_PROPERTY( HbIcon icon READ icon WRITE setIcon )
Q_PROPERTY( ProgressDialogType progressDialogType READ progressDialogType WRITE setProgressDialogType )
- /* Deprecated */
- Q_PROPERTY( Qt::Alignment textAlignment READ textAlignment WRITE setTextAlignment )
- /* Deprecated */
- Q_PROPERTY( Qt::Alignment iconAlignment READ iconAlignment WRITE setIconAlignment )
-
public:
enum ProgressDialogType { ProgressDialog, WaitDialog };
@@ -79,16 +74,6 @@
QGraphicsItem* primitive(HbStyle::Primitive primitive) const;
- /* Deprecated */
- void setTextAlignment(Qt::Alignment align);
- /* Deprecated */
- Qt::Alignment textAlignment() const;
-
- /* Deprecated */
- void setIconAlignment(Qt::Alignment align);
- /* Deprecated */
- Qt::Alignment iconAlignment() const;
-
signals:
void cancelled();
--- a/src/hbwidgets/popups/hbprogressdialog_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/popups/hbprogressdialog_p.h Fri May 14 16:09:54 2010 +0300
@@ -64,7 +64,6 @@
Q_ASSERT(note);
return note->d_func();
}
- HbAction *mAction;
QTimeLine *mTimer;
HbIcon mIcon;
HbProgressDialogContentWidget* mContentWidget;
--- a/src/hbwidgets/popups/hbselectiondialog.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/popups/hbselectiondialog.cpp Fri May 14 16:09:54 2010 +0300
@@ -98,9 +98,9 @@
*/
void HbSelectionDialog::setSelectionMode(HbAbstractItemView::SelectionMode mode)
{
- Q_D(HbSelectionDialog);
-
- d->setSelectionMode(mode);
+ Q_D(HbSelectionDialog);
+
+ d->setSelectionMode(mode);
}
/*!
@@ -108,11 +108,11 @@
Returns current SelectionMode of the list.Default value is \a NoSelection.
\sa setSelectionMode()
-*/
+*/
HbAbstractItemView::SelectionMode HbSelectionDialog::selectionMode() const
{
- Q_D(const HbSelectionDialog);
- return d->mSelectionMode;
+ Q_D(const HbSelectionDialog);
+ return d->mSelectionMode;
}
/*!
@@ -123,11 +123,11 @@
\param currentIndex. A currentIndex is the index of default selection
\sa stringItems()
-*/
+*/
void HbSelectionDialog::setStringItems(const QStringList &items,int currentIndex)
{
- Q_D(HbSelectionDialog);
- d->setStringItems(items,currentIndex);
+ Q_D(HbSelectionDialog);
+ d->setStringItems(items,currentIndex);
}
/*!
@@ -135,11 +135,11 @@
Returns list of string list items earlier set by setStringItems().
\sa setStringItems()
-*/
+*/
QStringList HbSelectionDialog::stringItems() const
{
- Q_D(const HbSelectionDialog);
- return d->stringItems();
+ Q_D(const HbSelectionDialog);
+ return d->stringItems();
}
/*!
@@ -153,8 +153,8 @@
*/
QList<QVariant> HbSelectionDialog::selectedItems() const
{
- Q_D(const HbSelectionDialog);
- return d->selectedItems();
+ Q_D(const HbSelectionDialog);
+ return d->selectedItems();
}
/*!
@@ -169,8 +169,8 @@
*/
void HbSelectionDialog::setSelectedItems(const QList<QVariant> items)
{
- Q_D(HbSelectionDialog);
- d->setSelectedItems(items);
+ Q_D(HbSelectionDialog);
+ d->setSelectedItems(items);
}
/*!
@@ -184,8 +184,8 @@
*/
QModelIndexList HbSelectionDialog::selectedModelIndexes() const
{
- Q_D(const HbSelectionDialog);
- return d->selectedModelIndexes();
+ Q_D(const HbSelectionDialog);
+ return d->selectedModelIndexes();
}
/*!
@@ -201,11 +201,11 @@
\param currentIndex
\sa widgetItems();
-*/
+*/
void HbSelectionDialog::setWidgetItems(const QList<HbListWidgetItem*> &items,bool transferOwnership,int currentIndex)
{
- Q_D(HbSelectionDialog);
- d->setWidgetItems(items,transferOwnership,currentIndex);
+ Q_D(HbSelectionDialog);
+ d->setWidgetItems(items,transferOwnership,currentIndex);
}
/*!
@@ -213,11 +213,11 @@
Returns list of custom list items earlier set by setWidgetItems().
\sa setWidgetItems().
-*/
+*/
QList<HbListWidgetItem*> HbSelectionDialog::widgetItems() const
{
- Q_D(const HbSelectionDialog);
- return d->widgetItems();
+ Q_D(const HbSelectionDialog);
+ return d->widgetItems();
}
/*!
@@ -227,11 +227,11 @@
\param model.
\sa model()
-*/
+*/
void HbSelectionDialog::setModel(QAbstractItemModel* model)
{
- Q_D(HbSelectionDialog);
- d->setModel(model);
+ Q_D(HbSelectionDialog);
+ d->setModel(model);
}
/*!
@@ -239,11 +239,11 @@
Returns model eariler set by setModel().
\sa setModel()
-*/
+*/
QAbstractItemModel* HbSelectionDialog::model() const
{
- Q_D(const HbSelectionDialog);
- return d->model();
+ Q_D(const HbSelectionDialog);
+ return d->model();
}
--- a/src/hbwidgets/popups/hbselectiondialog_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/popups/hbselectiondialog_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -34,133 +34,128 @@
#include <hbcheckbox.h>
#include <hbaction.h>
-
HbSelectionDialogContentWidget::HbSelectionDialogContentWidget(HbSelectionDialogPrivate *priv):HbWidget(),
- mListWidget(0),d(priv),chkMark(0),lbCounter(0)
+ mListWidget(0),d(priv),chkMark(0),lbCounter(0)
{
mListWidget = new HbListWidget(this);
- HbStyle::setItemName(mListWidget, "list");
+ HbStyle::setItemName(mListWidget, "list");
QObject::connect(mListWidget,SIGNAL(activated(const QModelIndex&)),this,SLOT(_q_listItemSelected(QModelIndex)));
QObject::connect(mListWidget,SIGNAL(activated(HbListWidgetItem *)),this,SLOT(_q_listWidgetItemSelected(HbListWidgetItem *)));
}
-
void HbSelectionDialogContentWidget::_q_listWidgetItemSelected(HbListWidgetItem *item)
{
- if(item){
- updateCounter();
- }
+ if(item){
+ updateCounter();
+ }
}
-
void HbSelectionDialogContentWidget::_q_listItemSelected(QModelIndex index)
{
- Q_UNUSED(index)
- if(mListWidget->selectionMode()== HbAbstractItemView::SingleSelection ||
- mListWidget->selectionMode()== HbAbstractItemView::NoSelection){
- d->close();
- }
- updateCounter();
+ Q_UNUSED(index)
+ if(mListWidget->selectionMode()== HbAbstractItemView::SingleSelection ||
+ mListWidget->selectionMode()== HbAbstractItemView::NoSelection){
+ d->close();
+ }
+ updateCounter();
}
int HbSelectionDialogContentWidget::selectedItemCount() const
{
- int selectedItems = 0;
- QItemSelectionModel* selectionModel = mListWidget->selectionModel();
- if(selectionModel){
- selectedItems = selectionModel->selectedRows().count();
- }
- return selectedItems;
+ int selectedItems = 0;
+ QItemSelectionModel* selectionModel = mListWidget->selectionModel();
+ if(selectionModel){
+ selectedItems = selectionModel->selectedRows().count();
+ }
+ return selectedItems;
}
int HbSelectionDialogContentWidget::totalItemCount() const
{
- return mListWidget->count();
+ return mListWidget->count();
}
void HbSelectionDialogContentWidget::updateCounter()
{
- if(mListWidget->selectionMode()!= HbAbstractItemView::MultiSelection) return;
- if(chkMark && lbCounter){
- int totalItems = totalItemCount();
- int selectedItems = selectedItemCount();
+ if(mListWidget->selectionMode()!= HbAbstractItemView::MultiSelection) return;
+ if(chkMark && lbCounter){
+ int totalItems = totalItemCount();
+ int selectedItems = selectedItemCount();
- lbCounter->setText(QString(QString::number(selectedItems) + "/" + QString::number(totalItems)));
- //update checked state of "MarkAll" checkbox
- if (selectedItems == totalItems){
- chkMark->blockSignals(true); //should not call _q_checkboxclicked()
- chkMark->setChecked(true);
- chkMark->blockSignals(false);
- }
- else{
- chkMark->blockSignals(true); //should not call _q_checkboxclicked()
- chkMark->setChecked(false);
- chkMark->blockSignals(false);
- }
- }
+ lbCounter->setText(QString(QString::number(selectedItems) + "/" + QString::number(totalItems)));
+ //update checked state of "MarkAll" checkbox
+ if (selectedItems == totalItems){
+ chkMark->blockSignals(true); //should not call _q_checkboxclicked()
+ chkMark->setChecked(true);
+ chkMark->blockSignals(false);
+ }
+ else{
+ chkMark->blockSignals(true); //should not call _q_checkboxclicked()
+ chkMark->setChecked(false);
+ chkMark->blockSignals(false);
+ }
+ }
}
void HbSelectionDialogContentWidget::_q_checkboxclicked(int value)
{
- int totalItems = 0;
- int selectedItems = 0;
- QAbstractItemModel* itemModel = mListWidget->model();
- QModelIndex indexStart,indexEnd;
- if(itemModel){
- indexStart = itemModel->index(0,0);
- indexEnd = itemModel->index(itemModel->rowCount()-1,0);
- totalItems = itemModel->rowCount();
- }
+ int totalItems = 0;
+ int selectedItems = 0;
+ QAbstractItemModel* itemModel = mListWidget->model();
+ QModelIndex indexStart,indexEnd;
+ if(itemModel){
+ indexStart = itemModel->index(0,0);
+ indexEnd = itemModel->index(itemModel->rowCount()-1,0);
+ totalItems = itemModel->rowCount();
+ }
- QItemSelectionModel* selectionModel = mListWidget->selectionModel();
- if(selectionModel){
- selectedItems = selectionModel->selectedRows().count();
- if(value){ //Select All
- selectionModel->select(QItemSelection(indexStart,indexEnd),QItemSelectionModel::Select);
- }
- else{ //Select None
- selectionModel->clear();
- }
- }
- updateCounter();
+ QItemSelectionModel* selectionModel = mListWidget->selectionModel();
+ if(selectionModel){
+ selectedItems = selectionModel->selectedRows().count();
+ if(value){ //Select All
+ selectionModel->select(QItemSelection(indexStart,indexEnd),QItemSelectionModel::Select);
+ }
+ else{ //Select None
+ selectionModel->clear();
+ }
+ }
+ updateCounter();
}
-
void HbSelectionDialogContentWidget::showMarkWidget(bool bShow)
{
- if(bShow){
- chkMark = new HbCheckBox(this);
- chkMark->setText("Mark All");
- lbCounter = new HbTextItem(this);
- HbStyle::setItemName(chkMark,"checkbox");
- HbStyle::setItemName(lbCounter,"counter");
- setProperty("multiSelection",true);
- connect(chkMark,SIGNAL(stateChanged ( int )),this,SLOT(_q_checkboxclicked(int)));
- updateCounter();
- }
- else{
- delete chkMark;chkMark=0;
- delete lbCounter;lbCounter=0;
- HbStyle::setItemName(chkMark,"");
- HbStyle::setItemName(lbCounter,"");
- setProperty("multiSelection",false);
- }
+ if(bShow){
+ chkMark = new HbCheckBox(this);
+ chkMark->setText("Mark All");
+ lbCounter = new HbTextItem(this);
+ HbStyle::setItemName(chkMark,"checkbox");
+ HbStyle::setItemName(lbCounter,"counter");
+ setProperty("multiSelection",true);
+ connect(chkMark,SIGNAL(stateChanged ( int )),this,SLOT(_q_checkboxclicked(int)));
+ updateCounter();
+ }
+ else{
+ delete chkMark;chkMark=0;
+ delete lbCounter;lbCounter=0;
+ HbStyle::setItemName(chkMark,"");
+ HbStyle::setItemName(lbCounter,"");
+ setProperty("multiSelection",false);
+ }
}
HbSelectionDialogPrivate::HbSelectionDialogPrivate()
:HbDialogPrivate()
{
- bOwnItems = false;
+ bOwnItems = false;
}
-
HbSelectionDialogPrivate::~HbSelectionDialogPrivate()
{
- if(!bOwnItems){
- Q_Q(HbSelectionDialog);
- HbSelectionDialogContentWidget* cWidget = qobject_cast<HbSelectionDialogContentWidget*>(q->contentWidget());
- if(cWidget){
- if(cWidget->mListWidget){
+ if(!bOwnItems){
+ Q_Q(HbSelectionDialog);
+ HbSelectionDialogContentWidget* cWidget = qobject_cast<HbSelectionDialogContentWidget*>(q->contentWidget());
+ if(cWidget){
+ if(cWidget->mListWidget){
int nRows = 0;
QAbstractItemModel* itemModel = cWidget->mListWidget->model();
if(itemModel){
@@ -170,10 +165,11 @@
nRows = itemModel->rowCount();
}
}
- }
- }
- }
+ }
+ }
+ }
}
+
void HbSelectionDialogPrivate::init()
{
qDebug()<<" Entering init()";
@@ -184,161 +180,155 @@
HbSelectionDialogContentWidget* contentWidget = new HbSelectionDialogContentWidget(this);
q->setContentWidget(contentWidget);
- q->setPrimaryAction(new HbAction(QString(q->tr("Ok"))));
+ q->addAction(new HbAction(q->tr("Ok"), q));
- q->setSecondaryAction(new HbAction(QString(q->tr("Cancel"))));
+ q->addAction(new HbAction(q->tr("Cancel"), q));
q->setTimeout(0);
q->setModal(true);
-
-
}
-
-
void HbSelectionDialogPrivate::setSelectionMode(HbAbstractItemView::SelectionMode mode)
{
- Q_Q(HbSelectionDialog);
+ Q_Q(HbSelectionDialog);
- mSelectionMode = mode;
- switch(mode)
- {
- case HbAbstractItemView::SingleSelection:
- case HbAbstractItemView::MultiSelection:
- case HbAbstractItemView::NoSelection:
- {
- HbSelectionDialogContentWidget* cWidget = qobject_cast<HbSelectionDialogContentWidget*>(q->contentWidget());
- if(cWidget){
- cWidget->mListWidget->setSelectionMode(mode);
- }
- if(mode == HbAbstractItemView::MultiSelection)
- cWidget->showMarkWidget(true);
- else
- cWidget->showMarkWidget(false);
- }
- break;
- case HbAbstractItemView::ContiguousSelection:
- break;
- }
+ mSelectionMode = mode;
+ switch(mode)
+ {
+ case HbAbstractItemView::SingleSelection:
+ case HbAbstractItemView::MultiSelection:
+ case HbAbstractItemView::NoSelection:
+ {
+ HbSelectionDialogContentWidget* cWidget = qobject_cast<HbSelectionDialogContentWidget*>(q->contentWidget());
+ if(cWidget){
+ cWidget->mListWidget->setSelectionMode(mode);
+ }
+ if(mode == HbAbstractItemView::MultiSelection)
+ cWidget->showMarkWidget(true);
+ else
+ cWidget->showMarkWidget(false);
+ }
+ break;
+ }
}
QList<HbListWidgetItem*> HbSelectionDialogPrivate::widgetItems() const
{
- Q_Q(const HbSelectionDialog);
+ Q_Q(const HbSelectionDialog);
- QList<HbListWidgetItem*> rows;
- HbSelectionDialogContentWidget* cWidget = qobject_cast<HbSelectionDialogContentWidget*>(q->contentWidget());
- if(cWidget){
- HbListWidget* widget = qobject_cast<HbListWidget*>(cWidget->mListWidget);
- if(widget){
+ QList<HbListWidgetItem*> rows;
+ HbSelectionDialogContentWidget* cWidget = qobject_cast<HbSelectionDialogContentWidget*>(q->contentWidget());
+ if(cWidget){
+ HbListWidget* widget = qobject_cast<HbListWidget*>(cWidget->mListWidget);
+ if(widget){
int count = 0;
QAbstractItemModel* itemModel = widget->model();
if(itemModel)
count = itemModel->rowCount();
- for(int i = 0; i < count; i++){
- rows.append(widget->item(i));
- }
- }
- }
- return rows;
+ for(int i = 0; i < count; i++){
+ rows.append(widget->item(i));
+ }
+ }
+ }
+ return rows;
}
void HbSelectionDialogPrivate::setStringItems(const QStringList &items, int currentIndex)
{
- Q_Q(HbSelectionDialog);
+ Q_Q(HbSelectionDialog);
- HbSelectionDialogContentWidget* cWidget = qobject_cast<HbSelectionDialogContentWidget*>(q->contentWidget());
- if(!cWidget) return;
-
+ HbSelectionDialogContentWidget* cWidget = qobject_cast<HbSelectionDialogContentWidget*>(q->contentWidget());
+ if(!cWidget) return;
+
int nRows = 0;
- if(cWidget->mListWidget){
- int count = items.size();
- for (int i = 0; i < count; ++i) {
- HbListWidgetItem* modelItem = new HbListWidgetItem();
- QString str = items.at(i);
- modelItem->setText(str);
- cWidget->mListWidget->addItem(modelItem);
-
+ if(cWidget->mListWidget){
+ int count = items.size();
+ for (int i = 0; i < count; ++i) {
+ HbListWidgetItem* modelItem = new HbListWidgetItem();
+ QString str = items.at(i);
+ modelItem->setText(str);
+ cWidget->mListWidget->addItem(modelItem);
+
QAbstractItemModel* itemModel = cWidget->mListWidget->model();
if(itemModel)
nRows = itemModel->rowCount();
- }
- if(nRows > 0){ //if addition of rows was correct.
+ }
+ if(nRows > 0){ //if addition of rows was correct.
QList<QVariant> currentRow;
currentRow.append(QVariant(currentIndex));
setSelectedItems(currentRow);
- }
-
- }
+ }
+
+ }
}
QStringList HbSelectionDialogPrivate::stringItems() const
{
- QStringList list;
- QList<HbListWidgetItem*> items = widgetItems();
- int count = items.count();
- for(int i = 0; i < count; i++){
+ QStringList list;
+ QList<HbListWidgetItem*> items = widgetItems();
+ int count = items.count();
+ for(int i = 0; i < count; i++){
QString text = items[i]->text();
if(!text.isEmpty()){
- list += text;
- }
- }
- return list;
+ list += text;
+ }
+ }
+ return list;
}
void HbSelectionDialogPrivate::setModel(QAbstractItemModel* model)
{
- Q_Q(HbSelectionDialog);
+ Q_Q(HbSelectionDialog);
- HbSelectionDialogContentWidget* cWidget = qobject_cast<HbSelectionDialogContentWidget*>(q->contentWidget());
- if(cWidget){
- cWidget->mListWidget->HbListView::setModel(model); //HbListView's implementation of setModel()
- }
+ HbSelectionDialogContentWidget* cWidget = qobject_cast<HbSelectionDialogContentWidget*>(q->contentWidget());
+ if(cWidget){
+ cWidget->mListWidget->HbListView::setModel(model); //HbListView's implementation of setModel()
+ }
}
void HbSelectionDialogPrivate::setWidgetItems(const QList<HbListWidgetItem*> &items,bool transferOwnership,int currentIndex)
{
- Q_Q(HbSelectionDialog);
+ Q_Q(HbSelectionDialog);
- HbSelectionDialogContentWidget* cWidget = qobject_cast<HbSelectionDialogContentWidget*>(q->contentWidget());
- if(cWidget){
- if(cWidget->mListWidget){
- int count = items.count();
- for(int i = 0; i < count; i++){
- cWidget->mListWidget->addItem(items[i]);
- }
- cWidget->mListWidget->setCurrentRow(currentIndex);
-
- }
- bOwnItems = transferOwnership;
- }
+ HbSelectionDialogContentWidget* cWidget = qobject_cast<HbSelectionDialogContentWidget*>(q->contentWidget());
+ if(cWidget){
+ if(cWidget->mListWidget){
+ int count = items.count();
+ for(int i = 0; i < count; i++){
+ cWidget->mListWidget->addItem(items[i]);
+ }
+ cWidget->mListWidget->setCurrentRow(currentIndex);
+
+ }
+ bOwnItems = transferOwnership;
+ }
}
QAbstractItemModel* HbSelectionDialogPrivate::model() const
{
- Q_Q(const HbSelectionDialog);
-
- HbSelectionDialogContentWidget* cWidget = qobject_cast<HbSelectionDialogContentWidget*>(q->contentWidget());
- if(cWidget){
- return cWidget->mListWidget->HbListView::model(); //HbListView's implementation of model()
- }
- return 0;
+ Q_Q(const HbSelectionDialog);
+
+ HbSelectionDialogContentWidget* cWidget = qobject_cast<HbSelectionDialogContentWidget*>(q->contentWidget());
+ if(cWidget){
+ return cWidget->mListWidget->HbListView::model(); //HbListView's implementation of model()
+ }
+ return 0;
}
QItemSelectionModel* HbSelectionDialogPrivate::selectionModel() const
{
- Q_Q(const HbSelectionDialog);
-
- HbSelectionDialogContentWidget* cWidget = qobject_cast<HbSelectionDialogContentWidget*>(q->contentWidget());
- if(cWidget){
- return cWidget->mListWidget->selectionModel();
- }
- return 0;
+ Q_Q(const HbSelectionDialog);
+
+ HbSelectionDialogContentWidget* cWidget = qobject_cast<HbSelectionDialogContentWidget*>(q->contentWidget());
+ if(cWidget){
+ return cWidget->mListWidget->selectionModel();
+ }
+ return 0;
}
void HbSelectionDialogPrivate::setSelectedItems(const QList<QVariant> items)
{
- Q_Q(const HbSelectionDialog);
+ Q_Q(const HbSelectionDialog);
QItemSelectionModel *model = 0;
model = selectionModel();
if(model){
@@ -347,10 +337,10 @@
QItemSelectionModel::Select);
}
}
- HbSelectionDialogContentWidget* cWidget = qobject_cast<HbSelectionDialogContentWidget*>(q->contentWidget());
- if(cWidget){
- cWidget->updateCounter();
- }
+ HbSelectionDialogContentWidget* cWidget = qobject_cast<HbSelectionDialogContentWidget*>(q->contentWidget());
+ if(cWidget){
+ cWidget->updateCounter();
+ }
}
QList<QVariant> HbSelectionDialogPrivate::selectedItems() const
@@ -384,7 +374,6 @@
void HbSelectionDialogPrivate::close()
{
- Q_Q(HbSelectionDialog);
- q->close();
+ Q_Q(HbSelectionDialog);
+ q->close();
}
-
--- a/src/hbwidgets/popups/hbsliderpopup.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/popups/hbsliderpopup.cpp Fri May 14 16:09:54 2010 +0300
@@ -464,45 +464,6 @@
}
/*!
- \deprecated HbSliderPopup::icon(HbSlider::SliderElement)
- is deprecated.Please use elementIcons() instead.
-
- Returns the icon of the \a element.
-
- returns NULL if element does not exist or icon was not set for this element
-
- \sa setIcon()
-*/
-HbIcon HbSliderPopup::icon(HbSlider::SliderElement element) const
-{
- qDebug("HbSliderPopup::icon() is deprecated. Use elementIcons() instead.");
- Q_D(const HbSliderPopup);
- return(d->mSliderPopupContentWidget->slider->icon(element));
-}
-
-/*!
- \deprecated HbSliderPopup::setIcon(HbSlider::SliderElement, const HbIcon&)
- is deprecated.Please use setElementIcons() instead.
-
- Sets the \a icon if the \a element.
-
- Supported elements:
- \li HbSlider::IncreaseElement
- \li HbSlider::DecreaseElement
- \li HbSlider::IconElement
-
- \warning Setting icon to a non-existing element has no effect.
-
- \sa icon() setElements()
-*/
-void HbSliderPopup::setIcon(HbSlider::SliderElement element, const HbIcon &icon)
-{
- qDebug("HbSliderPopup::setIcon() is deprecated. Use setElementIcons() instead.");
- Q_D( HbSliderPopup);
- d->mSliderPopupContentWidget->slider->setIcon(element,icon);
-}
-
-/*!
@beta
Returns the icon of the \a element.
@@ -513,7 +474,7 @@
HbIcon HbSliderPopup::elementIcon(HbSlider::SliderElement element) const
{
Q_D(const HbSliderPopup);
- return(d->mSliderPopupContentWidget->slider->icon(element));
+ return(d->mSliderPopupContentWidget->slider->elementIcon(element));
}
/*!
@@ -532,7 +493,7 @@
void HbSliderPopup::setElementIcon(HbSlider::SliderElement element, const HbIcon &icon)
{
Q_D( HbSliderPopup);
- d->mSliderPopupContentWidget->slider->setIcon(element,icon);
+ d->mSliderPopupContentWidget->slider->setElementIcon(element,icon);
}
@@ -611,43 +572,6 @@
}
/*!
- \deprecated HbSliderPopup::elements() const
- is deprecated.Please use sliderElements() instead.
-
- Returns the elements of the slider.
-
- The slider contains only track element by default.
-
- \sa setElements()
-*/
-QList<HbSlider::SliderElement> HbSliderPopup::elements() const
-{
- qDebug("HbSliderPopup::elements() is deprecated. Use sliderElements() instead.");
- Q_D(const HbSliderPopup);
- return (d->mSliderPopupContentWidget->slider->elements());
-}
-
-/*!
- \deprecated HbSliderPopup::setElements(const QList<HbSlider::SliderElement>&)
- is deprecated.Please use setSliderElements instead.
-
- Sets the elements of the slider.
-
- \note Duplicate elements will be ignored.
-
- \note element order cant be changed
-
- \sa elements()
-*/
-void HbSliderPopup::setElements(const QList<HbSlider::SliderElement> &elements)
-{
- qDebug("HbSliderPopup::setElements is deprecated. Use setSliderElements instead.");
- Q_D(HbSliderPopup);
- d->mSliderPopupContentWidget->slider->setElements(elements);
-
-}
-
-/*!
Returns the list of slider elements as QVariant ( can be type-casted to HbSlider::SliderElement ).
The slider contains only track element by default.
--- a/src/hbwidgets/popups/popups.pri Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/popups/popups.pri Fri May 14 16:09:54 2010 +0300
@@ -29,7 +29,6 @@
PUBLIC_HEADERS += $$PWD/hbcolordialog.h
PUBLIC_HEADERS += $$PWD/hbnotificationdialog.h
PUBLIC_HEADERS += $$PWD/hbinputdialog.h
-PUBLIC_HEADERS += $$PWD/hblistdialog.h
PUBLIC_HEADERS += $$PWD/hbprogressdialog.h
PUBLIC_HEADERS += $$PWD/hbsliderpopup.h
PUBLIC_HEADERS += $$PWD/hbvolumesliderpopup.h
@@ -44,7 +43,6 @@
PRIVATE_HEADERS += $$PWD/hbnotificationdialogcontent_p.h
PRIVATE_HEADERS += $$PWD/hbinputdialog_p.h
PRIVATE_HEADERS += $$PWD/hbinputdialogcontent_p.h
-PRIVATE_HEADERS += $$PWD/hblistdialog_p.h
PRIVATE_HEADERS += $$PWD/hbprogressdialog_p.h
PRIVATE_HEADERS += $$PWD/hbsliderpopup_p.h
PRIVATE_HEADERS += $$PWD/hbmessagebox_p.h
@@ -57,8 +55,6 @@
SOURCES += $$PWD/hbnotificationdialogcontent.cpp
SOURCES += $$PWD/hbinputdialog_p.cpp
SOURCES += $$PWD/hbinputdialog.cpp
-SOURCES += $$PWD/hblistdialog.cpp
-SOURCES += $$PWD/hblistdialog_p.cpp
SOURCES += $$PWD/hbprogressdialog.cpp
SOURCES += $$PWD/hbsliderpopup.cpp
SOURCES += $$PWD/hbvolumesliderpopup.cpp
--- a/src/hbwidgets/sliders/hbprogressbar.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/sliders/hbprogressbar.cpp Fri May 14 16:09:54 2010 +0300
@@ -23,9 +23,8 @@
**
****************************************************************************/
-
#include <hbprogressbar.h>
-#include <hbstyleoptionprogressbar.h>
+#include <hbstyleoptionprogressbar_p.h>
#include "hbprogressbar_p.h"
#include "hbglobal_p.h"
@@ -35,7 +34,6 @@
#define HB_PRGRESSBAR_ITEM_TYPE "HB_PROGRESSBAR"
#endif
-
/*!
@beta
@hbwidgets
@@ -161,6 +159,7 @@
mMinTextItem = q->style()->createPrimitive(HbStyle::P_ProgressBar_mintext,q);
mMaxTextItem = q->style()->createPrimitive(HbStyle::P_ProgressBar_maxtext,q);
}
+
void HbProgressBarPrivate::setProgressValue(int value)
{
Q_Q(HbProgressBar);
@@ -189,6 +188,7 @@
emit q->valueChanged(value);
}
+
/*
\internal
Sets the progressbar enabling/disabling
@@ -201,6 +201,7 @@
}
}
+
/*
\internal
Sets the progressbar range
@@ -222,7 +223,7 @@
mProgressValue = mMaximum;
}
- if( (mMinimum == 0) && (mMaximum == 0) && (mType != HbProgressBar::RatingProgressBar) ) {
+ if( (mMinimum == 0) && (mMaximum == 0) ) {
mWaitTrack->setVisible(true);
mTrack->setVisible(false);
} else {
@@ -230,7 +231,7 @@
mTrack->setVisible(true);
}
q->updatePrimitives();
-}
+}
/*!
\internal
@@ -273,24 +274,6 @@
#endif
/*!
- Constructs a progressbar of a given \a type and \a parent. The default type is SimpleProgressBar.
-
- \deprecated HbProgressBar::HbProgressBar(HbProgressBar::ProgressBarType, QGraphicsItem*)
- is deprecated. Please use HbProgressBar::HbProgressBar(QGraphicsItem *parent) instead.
-
-*/
-HbProgressBar::HbProgressBar(ProgressBarType type, QGraphicsItem *parent) :
- HbWidget(*new HbProgressBarPrivate, parent)
-{
- HB_DEPRECATED("HbProgressBar::HbProgressBar(HbProgressBar::ProgressBarType, QGraphicsItem*) is deprecated. Use HbProgressBar::HbProgressBar(QGraphicsItem *parent) instead.");
-
- Q_D( HbProgressBar );
- d->q_ptr = this;
- d->init();
- d->mType = type;
-}
-
-/*!
@beta
Constructor of Progressbar.
\param parent. Parent widget
@@ -304,22 +287,6 @@
d->init();
}
-/*!
- \deprecated HbProgressBar::HbProgressBar(HbProgressBarPrivate&, HbProgressBar::ProgressBarType, QGraphicsItem*)
- is deprecated. Please use HbProgressBar::HbProgressBar(HbProgressBarPrivate &dd, QGraphicsItem *parent) instead.
-
-*/
-HbProgressBar::HbProgressBar(HbProgressBarPrivate &dd, ProgressBarType type, QGraphicsItem *parent) :
- HbWidget( dd, parent)
-{
- HB_DEPRECATED("HbProgressBar::HbProgressBar(HbProgressBarPrivate&, HbProgressBar::ProgressBarType, QGraphicsItem*) is deprecated. Use HbProgressBar::HbProgressBar(HbProgressBarPrivate &dd, QGraphicsItem *parent) instead.");
-
- Q_D( HbProgressBar );
- d->init();
- d->mType = type;
-}
-
-
HbProgressBar::HbProgressBar(HbProgressBarPrivate &dd, QGraphicsItem *parent) :
HbWidget( dd, parent)
{
@@ -327,7 +294,6 @@
d->init();
}
-
/*!
@beta
Destructor for the progressbar.
@@ -473,7 +439,7 @@
if (d->mMinText != text) {
d->mMinText = text;
HbStyleOptionProgressBar progressBarOption;
- initStyleOption(&progressBarOption);
+ progressBarOption.minText = d->mMinText;
style()->updatePrimitive(d->mMinTextItem,HbStyle::P_ProgressBar_mintext,&progressBarOption);
}
}
@@ -503,7 +469,7 @@
if (d->mMaxText != text) {
d->mMaxText = text;
HbStyleOptionProgressBar progressBarOption;
- initStyleOption(&progressBarOption);
+ progressBarOption.maxText = d->mMaxText;
style()->updatePrimitive(d->mMaxTextItem,HbStyle::P_ProgressBar_maxtext,&progressBarOption);
}
}
@@ -704,7 +670,6 @@
option->minText = d->mMinText;
option->maxText = d->mMaxText;
option->orientation = d->mOrientation;
- option->isSlider=d->mType == HbProgressBar::RatingProgressBar;
option->inverted = d->mInvertedAppearance;
option->stopWaitAnimation = false;
option->minMaxTextAlignment = d->mMinMaxTextAlignment;
@@ -797,4 +762,3 @@
}
#include "moc_hbprogressbar.cpp"
-
--- a/src/hbwidgets/sliders/hbprogressbar.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/sliders/hbprogressbar.h Fri May 14 16:09:54 2010 +0300
@@ -35,7 +35,6 @@
class HB_WIDGETS_EXPORT HbProgressBar : public HbWidget
{
Q_OBJECT
- Q_ENUMS(ProgressBarType)
Q_PROPERTY(int progressValue READ progressValue WRITE setProgressValue)
Q_PROPERTY(bool invertedAppearance READ invertedAppearance WRITE setInvertedAppearance)
Q_PROPERTY(int maximum READ maximum WRITE setMaximum)
@@ -47,10 +46,8 @@
Q_PROPERTY(Qt::Alignment minMaxTextAlignment READ minMaxTextAlignment WRITE setMinMaxTextAlignment)
public:
- enum ProgressBarType {SimpleProgressBar, RatingProgressBar };
- explicit HbProgressBar(ProgressBarType type = SimpleProgressBar, QGraphicsItem *parent = 0);
- explicit HbProgressBar(QGraphicsItem *parent);
+ explicit HbProgressBar(QGraphicsItem *parent= 0);
~HbProgressBar();
bool invertedAppearance() const;
@@ -92,8 +89,7 @@
void valueChanged(int value);
protected:
- HbProgressBar(HbProgressBarPrivate &dd, ProgressBarType type=SimpleProgressBar, QGraphicsItem *parent = 0);
- HbProgressBar(HbProgressBarPrivate &dd, QGraphicsItem *parent);
+ HbProgressBar(HbProgressBarPrivate &dd, QGraphicsItem *parent = 0);
void initStyleOption(HbStyleOptionProgressBar *option) const;
void closeEvent ( QCloseEvent * event );
QVariant itemChange(GraphicsItemChange change, const QVariant &value);
--- a/src/hbwidgets/sliders/hbprogressbar_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/sliders/hbprogressbar_p.h Fri May 14 16:09:54 2010 +0300
@@ -59,10 +59,9 @@
QGraphicsItem *mFrame;
QGraphicsItem *mTrack;
QGraphicsItem *mWaitTrack;
- // QGraphicsItem *mTextItem;
QGraphicsItem *mMinTextItem;
QGraphicsItem *mMaxTextItem;
- QGraphicsItem *mTouchAreaItem;
+ QGraphicsItem *mTouchAreaItem;
uint mMinMaxTextVisible : 1;
@@ -70,9 +69,7 @@
int mMinimum;
int mProgressValue;
uint mInvertedAppearance : 1;
- HbProgressBar::ProgressBarType mType;
uint mTextVisible : 1;
- // QString mText;
Qt::Alignment mMinMaxTextAlignment;
QString mMinText;
--- a/src/hbwidgets/sliders/hbprogressiveslider.cpp Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,298 +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 HbWidgets module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#include "hbprogressiveslider.h"
-#include "hbprogressiveslider_p.h"
-#include "hbprogressslidercontrol_p.h"
-#include "hbstyleoption.h"
-#include "hbglobal_p.h"
-
-HbProgressiveSliderPrivate::HbProgressiveSliderPrivate()
- :mControl(0)
-{
-}
-
-
-HbProgressiveSliderPrivate::~HbProgressiveSliderPrivate()
-{
-}
-
-
-void HbProgressiveSliderPrivate::init()
-{
-}
-
-void HbProgressiveSliderPrivate::setOrientation(Qt::Orientation orientation)
-{
- mControl->setOrientation(orientation);
- HbProgressBarPrivate::setOrientation(orientation);
-}
-
-/*!
- \deprecated
-
- This class is deprecated and please use HbProgressSlider instead.
-
-*/
-
-/*!
- \deprecated HbProgressiveSlider::HbProgressiveSlider(QGraphicsItem *)
- is deprecated.
-
- Constructs a progressslider of a given \a parent.
-
- \sa HbRatingSlider
-*/
-HbProgressiveSlider::HbProgressiveSlider(QGraphicsItem *parent) :
- HbProgressBar(*new HbProgressiveSliderPrivate,HbProgressBar::SimpleProgressBar,parent)
-{
- HB_DEPRECATED("HbProgressiveSlider(QGraphicsItem *parent) is deprecated.");
- Q_D( HbProgressiveSlider );
- d->q_ptr = this;
- d->init();
-}
-
-/*!
- \deprecated HbProgressiveSlider::HbProgressiveSlider(HbProgressiveSliderPrivate &,QGraphicsItem *)
- is deprecated.
-
- Constructs a progressslider of a given \a parent.
-
- \sa HbRatingSlider
-*/
-HbProgressiveSlider::HbProgressiveSlider(HbProgressiveSliderPrivate &dd,QGraphicsItem *parent) :
- HbProgressBar( dd,HbProgressBar::SimpleProgressBar,parent)
-{
- HB_DEPRECATED("HbProgressiveSlider(HbProgressiveSliderPrivate &,QGraphicsItem *) is deprecated.");
- Q_D( HbProgressiveSlider );
- d->init();
-}
-
-
-/*!
- Destructor for the progressslider.
-*/
-HbProgressiveSlider::~HbProgressiveSlider()
-{
-}
-
-
-void HbProgressiveSlider::resizeEvent ( QGraphicsSceneResizeEvent * event )
-{
- HbProgressBar::resizeEvent(event);
-}
-
-
-/*!
- Sets the current value of the progress slider.
-
- The progress slider forces the value to be within the legal range: \b
- minimum <= \c value <= \b maximum.
-
- \sa value()
-*/
-void HbProgressiveSlider::setSliderValue(int value)
-{
- Q_D( HbProgressiveSlider );
- d->mControl->setValue(value);
-}
-
-/*!
- Returns the current slider value .
-
- The default value is \c 0.
-
- \sa setSliderValue()
-*/
-int HbProgressiveSlider::sliderValue() const
-{
- Q_D(const HbProgressiveSlider );
- return d->mControl->value();
-}
-
-
-/*!
- Returns \c true whether the slider is pressed down.
-*/
-
-bool HbProgressiveSlider::isSliderDown() const
-{
- return true; //TODO:do sometheing here
-}
-
-
-/*!
- set the tooltip text .
- \sa handleToolTip()
-*/
-void HbProgressiveSlider::setHandleToolTip(const QString &text)
-{
- Q_D(HbProgressiveSlider);
- d->mControl->setToolTip(text);
-}
-
-
-/*!
- Returns the current tooltip text value .
- \sa setHandleToolTip()
-*/
-QString HbProgressiveSlider::handleToolTip() const
-{
- Q_D(const HbProgressiveSlider);
- return d->mControl->toolTip();
-}
-
-
-void HbProgressiveSlider::setInvertedAppearance(bool inverted)
-{
- Q_D( HbProgressiveSlider );
- if(d->mControl->invertedAppearance() != inverted) {
- d->mControl->setInvertedAppearance(inverted);
- }
- HbProgressBar::setInvertedAppearance(inverted);
-}
-
-
-/*!
- Sets the Icon for the progressslider thumb.
-*/
-void HbProgressiveSlider::setThumbIcon(const HbIcon &icon)
-{
- Q_D( HbProgressiveSlider );
- d->mControl->setHandleIcon(icon.iconName());
-}
-
-HbIcon HbProgressiveSlider::thumbIcon() const
-{
- Q_D( const HbProgressiveSlider );
- return HbIcon(d->mControl->handleIcon());
-}
-
-/*!
- Returns \c true whether slider tracking is enabled.
-
- The default value is \c true.
-
- If tracking is enabled, the slider emits the
- valueChanged( ) signal while the slider is being dragged. If
- tracking is disabled, the slider emits the valueChanged( ) signal
- only when the user releases the slider.
-
- \sa HbSlider::setTracking( )
-*/
-bool HbProgressiveSlider::hasTracking( ) const
-{
- Q_D( const HbProgressiveSlider );
- return d->mControl->hasTracking( );
-}
-
-/*!
- Sets whether the slider tracking is enabled.
-
- \sa HbSlider::hasTracking( )
-*/
-void HbProgressiveSlider::setTracking( bool enable )
-{
- Q_D( HbProgressiveSlider );
- d->mControl->setTracking( enable );
-}
-
-void HbProgressiveSlider::mousePressEvent(QGraphicsSceneMouseEvent *event)
-{
- Q_UNUSED(event);//TODO:check this
-}
-
-
-void HbProgressiveSlider::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
-{
- Q_UNUSED(event);
-}
-
-void HbProgressiveSlider::setGeometry(const QRectF & rect)
-{
- Q_D(HbProgressiveSlider);
- HbProgressBar::setGeometry(rect);
- d->mControl->setGeometry(QRectF(0,0,rect.width(),rect.height()));
-}
-
-
-/*void HbProgressiveSlider::initStyleOption(HbStyleOption *hboption) const
-{
- HbProgressBar::initStyleOption(hboption);
-}*/
-
-
-void HbProgressiveSlider::updatePrimitives()
-{
- HbProgressBar::updatePrimitives();
-
- Q_D(HbProgressiveSlider);
- d->mControl->updatePrimitives();
-
-
-}
-
-/*!
- Sets the Thumbwidget for the progressslider.If passes NULL it uses previously set thumbwidget
- \a Pointer to the widget to set as thumbitem.Ownership is transferred to slider.
- The thumb item can be hidden by setting QGraphicsItem::ItemIsFocusable flag to false.
-
- \sa thumbItem()
-*/
-void HbProgressiveSlider::setThumbItem(QGraphicsWidget* thumbItem)
-{
- Q_D(HbProgressiveSlider);
-
- if (HbWidget *widget = qobject_cast<HbWidget *>(thumbItem)) {
- widget->setAttribute(Hb::InteractionDisabled, true);
- }
- d->mControl->setHandleItem(thumbItem);
- if(!flags().testFlag(ItemIsFocusable)) {
- d->mControl->setHandleVisible(false);
- }
-}
-
-/*!
- Returns the Thumbwidget set as the thumbItem.Returns 0 if no thumb item set by user.
- \sa setThumbItem()
-*/
-QGraphicsWidget* HbProgressiveSlider::thumbItem() const
-{
- Q_D(const HbProgressiveSlider);
-
- return static_cast<QGraphicsWidget*>(d->mControl->handleItem());
-}
-
-
-void HbProgressiveSlider::showEvent( QShowEvent * event )
-{
- HbProgressBar::showEvent(event);
-}
-
-QVariant HbProgressiveSlider::itemChange(GraphicsItemChange change,const QVariant & value)
-{
- return HbProgressBar::itemChange(change, value);
-}
-
--- a/src/hbwidgets/sliders/hbprogressiveslider.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +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 HbWidgets module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#ifndef HBPROGRESSIVESLIDER_H
-#define HBPROGRESSIVESLIDER_H
-
-#include <hbprogressbar.h>
-#include <hbicon.h>
-
-class HbProgressiveSliderPrivate;
-
-QT_BEGIN_NAMESPACE
-class QGraphicsLayoutItem;
-QT_END_NAMESPACE
-
-class HB_WIDGETS_EXPORT HbProgressiveSlider : public HbProgressBar
-{
- Q_OBJECT
- Q_PROPERTY(int sliderValue READ sliderValue WRITE setSliderValue)
- Q_PROPERTY(QString handleToolTip READ handleToolTip WRITE setHandleToolTip)
- Q_PROPERTY(HbIcon thumbIcon READ thumbIcon WRITE setThumbIcon)
-public:
-
- HbProgressiveSlider(QGraphicsItem *parent = 0);
- ~HbProgressiveSlider();
-
- void setThumbIcon(const HbIcon &icon);
- HbIcon thumbIcon() const;
-
- void setThumbItem(QGraphicsWidget* thumbItem);
- QGraphicsWidget* thumbItem() const;
-
- enum { Type = Hb::ItemType_ProgressiveSlider };
- int type() const { return Type; }
-
- virtual void setInvertedAppearance(bool inverted);
-
- virtual void setGeometry(const QRectF & rect);
-
- int sliderValue() const;
- bool isSliderDown() const;
-
- void setHandleToolTip(const QString &text);
- QString handleToolTip() const;
-
- void setTracking( bool enable );
- bool hasTracking( ) const;
-
-signals:
- void sliderValueChanged(int value);
- void sliderPressed();
- void sliderReleased();
- void sliderMoved(int value);
-
-public slots :
- void setSliderValue(int value);
- void updatePrimitives();
-
-protected:
- HbProgressiveSlider(HbProgressiveSliderPrivate &dd,QGraphicsItem *parent = 0);
- virtual void resizeEvent(QGraphicsSceneResizeEvent *event);
- void mousePressEvent(QGraphicsSceneMouseEvent *event);
- void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
- void showEvent( QShowEvent * event );
- //virtual void initStyleOption(HbStyleOption *option) const;//progbar initStyleOption is called, that's fine
- QVariant itemChange(GraphicsItemChange change,const QVariant & value);
-
-private:
- Q_DECLARE_PRIVATE_D( d_ptr, HbProgressiveSlider)
- Q_DISABLE_COPY( HbProgressiveSlider )
-};
-
-#endif // HBPROGRESSIVESLIDER_H
-
--- a/src/hbwidgets/sliders/hbprogressiveslider_p.h Mon May 03 12:48:33 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 HbWidgets module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#ifndef HBPROGRESSIVESLIDER_P_H
-#define HBPROGRESSIVESLIDER_P_H
-
-#include "hbprogressbar_p.h"
-
-class HbProgressSliderControl;
-
-class HB_AUTOTEST_EXPORT HbProgressiveSliderPrivate :public HbProgressBarPrivate
-{
- Q_DECLARE_PUBLIC( HbProgressiveSlider )
-public:
- HbProgressiveSliderPrivate();
- ~HbProgressiveSliderPrivate();
- void init();
-
- void setOrientation(Qt::Orientation orientation);
-
-private:
- HbProgressSliderControl *mControl;
-};
-
-#endif //HBPROGRESSIVESLIDER_P_H
-
--- a/src/hbwidgets/sliders/hbprogressslider.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/sliders/hbprogressslider.cpp Fri May 14 16:09:54 2010 +0300
@@ -26,7 +26,7 @@
#include <hbprogressslider.h>
#include "hbprogressslider_p.h"
-#include <hbstyleoptionprogressslider.h>
+#include <hbstyleoptionprogressslider_p.h>
#include <hbtooltip.h>
#include <hbwidgetfeedback.h>
#include "hbglobal_p.h"
@@ -45,8 +45,6 @@
mDownState=false;
handle = 0;
mSliderValue = 0;
- thumbIcon = HbIcon();
- state = HbProgressSlider::SliderStatePlayNormal;
mHandlePath = QString();
}
@@ -88,10 +86,17 @@
void HbProgressSliderPrivate::setEnableFlag(bool flag)
{
Q_Q(HbProgressSlider);
- if(!flag) {
+
+ HbStyleOptionProgressSlider option;
+ q->initStyleOption(&option);
+
+ if(!flag) {
q->setProgressValue(q->minimum());
q->setSliderValue(q->minimum());
}
+ if (mFrame) {
+ q->style()->updatePrimitive(mFrame, HbStyle::P_ProgressSlider_frame, &option);
+ }
}
void HbProgressSliderPrivate::init()
@@ -243,7 +248,7 @@
*/
HbProgressSlider::HbProgressSlider(QGraphicsItem *parent) :
- HbProgressBar(*new HbProgressSliderPrivate,HbProgressBar::SimpleProgressBar,parent)
+ HbProgressBar(*new HbProgressSliderPrivate,parent)
{
Q_D( HbProgressSlider );
d->q_ptr = this;
@@ -273,7 +278,7 @@
Constructs a progressslider with a parent.
*/
HbProgressSlider::HbProgressSlider(HbProgressSliderPrivate &dd,QGraphicsItem *parent) :
- HbProgressBar( dd,HbProgressBar::SimpleProgressBar,parent)
+ HbProgressBar( dd,parent)
{
Q_D( HbProgressSlider );
d->init();
@@ -382,34 +387,6 @@
}
-/*!
- \deprecated HbProgressSlider::setThumbIcon(const HbIcon&)
- is deprecated. Use setHandleIcon instead of this
-
- Sets the Icon for the progressslider thumb.
-*/
-void HbProgressSlider::setThumbIcon(const HbIcon &icon)
-{
- HB_DEPRECATED("HbProgressSlider::setThumbIcon is deprecated.");
-
- Q_D( HbProgressSlider );
- d->handle->setHandleIcon(icon);
-}
-
-/*!
- \deprecated HbProgressSlider::thumbIcon() const
- is deprecated.
-
- Returns the Icon for the progressslider thumb.
-*/
-HbIcon HbProgressSlider::thumbIcon() const
-{
- HB_DEPRECATED("HbProgressSlider::thumbIcon is deprecated.");
-
- Q_D( const HbProgressSlider );
- return d->handle->thumbIcon();
-}
-
void HbProgressSlider::mousePressEvent(QGraphicsSceneMouseEvent *event)
{
Q_D(HbProgressSlider);
@@ -484,6 +461,12 @@
option->secondaryType = true;
option->progressSliderValue = d->mSliderValue;
option->pressedState = d->mDownState;
+ if(isEnabled()) {
+ option->disableState = false;
+ }
+ else {
+ option->disableState = true;
+ }
}
void HbProgressSlider::updatePrimitives()
@@ -568,64 +551,6 @@
return false;
}
-/*!
- \deprecated HbProgressSlider::setHandleToolTip(const QString&)
- is deprecated. Please use HbProgressSlider::setSliderToolTip(const QString &text) instead.
-
- set the tooltip text .
-
- \sa handleToolTip()
-*/
-void HbProgressSlider::setHandleToolTip(const QString &text)
-{
- HB_DEPRECATED("HbProgressSlider::setHandleToolTip is deprecated. Use HbProgressSlider::setSliderToolTip(const QString &text) instead.");
-
- setSliderToolTip(text);
-}
-
-
-/*!
- \deprecated HbProgressSlider::handleToolTip() const
- is deprecated. Please use HbProgressSlider::sliderToolTip() const instead.
-
- Returns the current tooltip text value.
-
- \sa setHandleToolTip()
-*/
-QString HbProgressSlider::handleToolTip() const
-{
- HB_DEPRECATED("HbProgressSlider::handleToolTip is deprecated. Use HbProgressSlider::sliderToolTip() instead.");
-
- return sliderToolTip();
-}
-
-/*!
- \deprecated HbProgressSlider::setHandleState(HbProgressSlider::HandleState)
- is deprecated. Please use HbProgressSlider::setSliderState(HbProgressSlider::SliderState state) instead.
-
- Sets the state of the handle as normal play,pressed play,normal pause,pressed pause etc.
-*/
-void HbProgressSlider::setHandleState(HbProgressSlider::HandleState state)
-{
- HB_DEPRECATED("HbProgressSlider::setHandleState is deprecated. Use HbProgressSlider::setSliderState instead.");
-
- setSliderState((HbProgressSlider::SliderState)state);
-}
-
-/*!
-
- \deprecated HbProgressSlider::handleState() const
- is deprecated. Please use HbProgressSlider::sliderState() const instead.
-
- Returns the state of the handle.
-*/
-HbProgressSlider::HandleState HbProgressSlider::handleState() const
-{
- HB_DEPRECATED("HbProgressSlider::handleState is deprecated. Use HbProgressSlider::handleState() instead.");
-
- return (HbProgressSlider::HandleState)sliderState();
-}
-
/*!
@beta
@@ -656,53 +581,7 @@
return d->mTooltipText;
}
-/*!
- \deprecated HbProgressSlider::setSliderState(HbProgressSlider::SliderState)
- is deprecated.
- Sets the state of the handle as normal play,pressed play,normal pause,pressed pause etc.
-*/
-void HbProgressSlider::setSliderState(HbProgressSlider::SliderState state)
-{
- Q_D(HbProgressSlider);
- if(d->state != state) {
- d->state = state;
- if (d->handle) {
- d->handle->mSliderHandleState = state;
-
- switch(d->handle->mSliderHandleState) {
- case HbProgressSlider::SliderStatePlayNormal:
- d->handle->setProperty("state","normal");
- break;
- case HbProgressSlider::SliderStatePlayPressed:
- d->handle->setProperty("state","pressed");
- break;
- case HbProgressSlider::SliderStatePauseNormal:
- d->handle->setProperty("state","normal");
- break;
- case HbProgressSlider::SliderStatePausePressed:
- d->handle->setProperty("state","pressed");
- break;
- default:
- break;
- }
-
- d->handle->updatePrimitives();
-
- }
- }
-}
-/*!
- \deprecated HbProgressSlider::sliderState() const
- is deprecated.
-
- Sets the state of the handle as normal play,pressed play,normal pause,pressed pause etc.
-*/
-HbProgressSlider::SliderState HbProgressSlider::sliderState() const
-{
- Q_D(const HbProgressSlider);
- return d->state;
-}
/*!
@beta
--- a/src/hbwidgets/sliders/hbprogressslider.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/sliders/hbprogressslider.h Fri May 14 16:09:54 2010 +0300
@@ -36,45 +36,14 @@
{
Q_OBJECT
Q_PROPERTY(int sliderValue READ sliderValue WRITE setSliderValue)
- /* Deprecated */
- Q_PROPERTY(HbIcon thumbIcon READ thumbIcon WRITE setThumbIcon)
Q_PROPERTY(QString sliderToolTip READ sliderToolTip WRITE setSliderToolTip)
- Q_PROPERTY(SliderState state READ sliderState WRITE setSliderState)
Q_PROPERTY(QString handleIcon READ handleIcon WRITE setHandleIcon)
- Q_ENUMS(SliderState)
-
- /* Deprecated */
- Q_PROPERTY(QString handleToolTip READ handleToolTip WRITE setHandleToolTip)
- Q_PROPERTY(HandleState state READ handleState WRITE setHandleState)
public:
- /* Deprecated */
- enum HandleState
- {
- PlayNormal,
- PlayPressed,
- PauseNormal,
- PausePressed
- };
-
- /* Deprecated */
- enum SliderState
- {
- SliderStatePlayNormal,
- SliderStatePlayPressed,
- SliderStatePauseNormal,
- SliderStatePausePressed
- };
-
HbProgressSlider(QGraphicsItem *parent = 0);
~HbProgressSlider();
- /* Deprecated */
- void setThumbIcon(const HbIcon &icon);
- /* Deprecated */
- HbIcon thumbIcon() const;
-
enum { Type = Hb::ItemType_ProgressSlider };
int type() const { return Type; }
@@ -85,22 +54,9 @@
int sliderValue() const;
bool isSliderDown() const;
- /* Deprecated*/
- void setHandleToolTip(const QString &text);
- /* Deprecated*/
- QString handleToolTip() const;
-
- /* Deprecated*/
- void setHandleState(HbProgressSlider::HandleState state);
- /* Deprecated*/
- HbProgressSlider::HandleState handleState() const;
-
void setSliderToolTip(const QString &text);
QString sliderToolTip() const;
- void setSliderState(HbProgressSlider::SliderState state);
- HbProgressSlider::SliderState sliderState() const;
-
void setHandleIcon(const QString& handlePath );
QString handleIcon() const;
--- a/src/hbwidgets/sliders/hbprogressslider_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/sliders/hbprogressslider_p.h Fri May 14 16:09:54 2010 +0300
@@ -44,7 +44,7 @@
void emitSliderReleased();
void setProgressValue(int value);
void emitSliderMoved(int newValue);
- void setEnableFlag(bool flag);
+ void setEnableFlag(bool flag);
QRectF boundingRect() const;
HbStyle* style() const;
QGraphicsItem* parentGraphicsItem() const;
@@ -63,9 +63,7 @@
QGraphicsItem *mSliderGraphicItem;
int mSliderValue;
bool mDownState;
- HbIcon thumbIcon;
QString mTooltipText;
- HbProgressSlider::SliderState state;
QString mHandlePath;
};
--- a/src/hbwidgets/sliders/hbprogressslidercontrol.cpp Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,103 +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 HbWidgets module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#include "hbprogressslidercontrol_p.h"
-#include "hbslidercontrol_p.h"
-#include "hbslidercontrol_p_p.h"
-#include "hbglobal_p.h"
-//#include "hbstyleoptionslider.h"
-
-
-class HbProgressSliderControlPrivate : public HbSliderControlPrivate
-{
- Q_DECLARE_PUBLIC(HbProgressSliderControl)
-
- public:
- HbProgressSliderControlPrivate();
- ~HbProgressSliderControlPrivate();
-
- QGraphicsItem *createGroove();
-};
-
-/*!
- private class
-*/
-HbProgressSliderControlPrivate::HbProgressSliderControlPrivate() :
- HbSliderControlPrivate()
-{
-}
-
-/*!
-
-*/
-HbProgressSliderControlPrivate::~HbProgressSliderControlPrivate()
-{
-
-}
-
-QGraphicsItem *HbProgressSliderControlPrivate::createGroove()
-{
- return NULL;
-}
-
-/*!
- \this is a deprecated class.
- \class HbProgressSliderControl
-*/
-/*!
- \deprecated HbProgressSliderControl::HbProgressSliderControl(QGraphicsItem *)
- is deprecated.
-
- Constructor for HbProgressSliderControl.
-*/
-HbProgressSliderControl::HbProgressSliderControl(QGraphicsItem *parent)
- :HbSliderControl(*new HbProgressSliderControlPrivate,parent)
-{
- HB_DEPRECATED("HbProgressSliderControl::HbProgressSliderControl(QGraphicsItem *) is deprecated as part of HbProgressSliderControl class deprecation.");
- Q_D(HbProgressSliderControl);
- d->q_ptr = this;
- d->init();
-}
-
-/*!
- \deprecated HbProgressSliderControl::HbProgressSliderControl(Qt::Orientation, QGraphicsItem *)
- is deprecated.
-
- Constructor for HbProgressSliderControl.
-*/
-HbProgressSliderControl::HbProgressSliderControl(Qt::Orientation orientation, QGraphicsItem *parent)
- :HbSliderControl(*new HbProgressSliderControlPrivate,parent)
-{
- HB_DEPRECATED("HbProgressSliderControl::HbProgressSliderControl(Qt::Orientation,QGraphicsItem *) is deprecated as part of HbProgressSliderControl class deprecation.");
- Q_D(HbProgressSliderControl);
- d->q_ptr = this;
- d->init();
- setOrientation(orientation);
-}
-
-HbProgressSliderControl::~HbProgressSliderControl()
-{
-}
-
--- a/src/hbwidgets/sliders/hbprogressslidercontrol_p.h Mon May 03 12:48:33 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +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 HbWidgets module of the UI Extensions for Mobile.
-**
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this file.
-** Please review the following information to ensure the GNU Lesser General
-** Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at developer.feedback@nokia.com.
-**
-****************************************************************************/
-
-#ifndef HBPROGRESSSLIDERCONTROL_H
-#define HBPROGRESSSLIDERCONTROL_H
-
-#include "hbglobal.h"
-#include "hbnamespace_p.h"
-#include "hbslidercontrol_p.h"
-
-class HbStyleOptionSlider;
-class HbProgressSliderControlPrivate;
-
-QT_BEGIN_NAMESPACE
-class QStyleOptionSlider;
-QT_END_NAMESPACE
-
-class HB_AUTOTEST_EXPORT HbProgressSliderControl : public HbSliderControl
-{
- Q_OBJECT
-
-public:
- explicit HbProgressSliderControl(QGraphicsItem *parent = 0);
- explicit HbProgressSliderControl(Qt::Orientation orientation, QGraphicsItem *parent = 0);
- virtual ~HbProgressSliderControl();
-
- enum { Type = HbPrivate::ItemType_ProgressSliderControl };
- int type() const { return Type; }
-
-private:
- Q_DECLARE_PRIVATE_D(d_ptr, HbProgressSliderControl)
- Q_DISABLE_COPY(HbProgressSliderControl)
- friend class HbProgressSliderHandle;
-};
-
-#endif // HBPROGRESSSLIDERCONTROL_H
--- a/src/hbwidgets/sliders/hbprogresssliderhandle_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/sliders/hbprogresssliderhandle_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -57,15 +57,11 @@
HbProgressSliderHandle::HbProgressSliderHandle(HbHandleParent *parent)
:HbWidget(parent->parentGraphicsItem()),
q(parent),
- mHandleIcon(),
- mPlayThumb(true),
- mThumbEnabled(false)
+ mHandleIcon()
{
mFlags = 0;
mFlags |= TextVisible;
- mHandleSize = QSizeF(0,0);
- mSliderHandleState = HbProgressSlider::SliderStatePlayNormal;
HbStyle *style = static_cast<HbStyle*>(q->style());
mHandleIconItem = style->createPrimitive(HbStyle::P_ProgressSliderHandle_icon,this);
@@ -108,13 +104,8 @@
initStyleOption(&option);
style->updatePrimitive(mHandleIconItem, HbStyle::P_ProgressSliderHandle_icon, &option);
- mThumbEnabled = true;
}
-HbIcon HbProgressSliderHandle::thumbIcon() const
-{
- return mHandleIcon;
-}
void HbProgressSliderHandle::gestureEvent(QGestureEvent *event)
{
@@ -132,7 +123,7 @@
mFlags |= HbProgressSliderHandle::MousePressed;
HbStyleOptionProgressSliderHandle option;
- initStyleOption(&option);
+ initStyleOption(&option);
option.pressedState = true;
if (mHandleIconItem) {
style()->updatePrimitive(mHandleIconItem, HbStyle::P_ProgressSliderHandle_icon, &option);
@@ -143,10 +134,10 @@
if(q->textVisible()) {
HbToolTip::showText(q->toolTipText(),this, QRectF(mItemPosAtPress,QSize(0,0)),q->textAlignment());
}
- else {
- HbExtendedLocale locale;
- HbToolTip::showText(locale.toString(q->progressValue()),this, QRectF(mItemCurPos,QSize(0,0)),q->textAlignment());
- }
+ else {
+ HbExtendedLocale locale;
+ HbToolTip::showText(locale.toString(q->progressValue()),this, QRectF(mItemCurPos,QSize(0,0)),q->textAlignment());
+ }
HbWidgetFeedback::triggered(q->parentGraphicsWidget(), Hb::InstantPressed, Hb::ModifierSliderHandle);
@@ -159,7 +150,7 @@
HbWidget::mouseReleaseEvent(event);
HbStyleOptionProgressSliderHandle option;
- initStyleOption(&option);
+ initStyleOption(&option);
option.pressedState = false;
if (mHandleIconItem) {
style()->updatePrimitive(mHandleIconItem, HbStyle::P_ProgressSliderHandle_icon, &option);
@@ -176,7 +167,7 @@
mFlags &= ~HbProgressSliderHandle::MousePressed;
mFlags &=~HandleMoving;
event->accept();
- setHandlePosForValue(q->progressValue());
+ setHandlePosForValue(q->progressValue());
q->emitSliderReleased();
}
@@ -230,9 +221,9 @@
HbToolTip::showText(q->toolTipText(),this, QRectF(mItemCurPos,QSize(0,0)),q->textAlignment());
}
else {
- HbExtendedLocale locale;
- HbToolTip::showText(locale.toString(q->progressValue()),this, QRectF(mItemCurPos,QSize(0,0)),q->textAlignment());
- }
+ HbExtendedLocale locale;
+ HbToolTip::showText(locale.toString(q->progressValue()),this, QRectF(mItemCurPos,QSize(0,0)),q->textAlignment());
+ }
event->accept();
q->emitSliderMoved(pointToValue(mItemCurPos));
@@ -418,6 +409,5 @@
HbWidget::initStyleOption(option);
option->handleIcon = mHandleIcon;
option->pressedState = false;
- option->sliderHandleState = (HbStyleOptionProgressSliderHandle::SliderState) mSliderHandleState;
}
--- a/src/hbwidgets/sliders/hbprogresssliderhandle_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/sliders/hbprogresssliderhandle_p.h Fri May 14 16:09:54 2010 +0300
@@ -77,7 +77,6 @@
enum { Type = HbPrivate::ItemType_ProgressSliderHandle };
int type() const { return Type; }
void setHandleIcon(const HbIcon &icon);
- HbIcon thumbIcon() const;
void handleTrackRelease(QGraphicsSceneMouseEvent * event);
void handleTrackPress(QGraphicsSceneMouseEvent * event);
QVariant processItemChange(const QVariant &value);
@@ -85,7 +84,6 @@
QPointF normalizedPos(const QPointF& pos,bool inverted) const;
bool isHandlePressed() const;
bool isHandleMoving() const;
- HbProgressSlider::SliderState mSliderHandleState;
QGraphicsItem* primitive(HbStyle::Primitive primitive) const;
@@ -105,12 +103,9 @@
QPointF mMousePressPos;
QPointF mItemPosAtPress;
QPointF mItemCurPos;
- QSizeF mHandleSize;
QGraphicsItem *mHandleIconItem;
QGraphicsItem *mTouchItem;
HbIcon mHandleIcon;
- uint mPlayThumb : 1;
- uint mThumbEnabled;
};
#endif //HBPROGRESSSLIDERHANDLE_P_H
--- a/src/hbwidgets/sliders/hbratingslider.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/sliders/hbratingslider.cpp Fri May 14 16:09:54 2010 +0300
@@ -27,7 +27,7 @@
#include <hbratingslider.h>
#include "hbratingslider_p.h"
#include <hbtooltip.h>
-#include <hbstyleoptionratingslider.h>
+#include <hbstyleoptionratingslider_p.h>
#include <QGraphicsItem>
#include <QGraphicsSceneMouseEvent>
#include <hbtoucharea.h>
@@ -46,40 +46,40 @@
#define MAX_NUMBER_OF_ICONS 10
HbRatingSliderPrivate::HbRatingSliderPrivate():
- mMousePressed(false),
- mLookupValues(0),
- mReadOnly(false),
- mNumberOfIcons(5),
- mStepCount(5),
- mCurrentValue(0),
- mFrame(0),
- mTrack(0),
- mLayoutItem(0),
- mUnratedIconName(""),
- mTouchArea(0),
- mRatedIconName("")
-{
+ mMousePressed(false),
+ mLookupValues(0),
+ mReadOnly(false),
+ mNumberOfIcons(5),
+ mStepCount(5),
+ mCurrentValue(0),
+ mFrame(0),
+ mTrack(0),
+ mLayoutItem(0),
+ mUnratedIconName(""),
+ mTouchArea(0),
+ mRatedIconName("")
+{
}
HbRatingSliderPrivate::~HbRatingSliderPrivate()
{
- if(mLookupValues) {
- delete [] mLookupValues;
- }
+ if(mLookupValues) {
+ delete [] mLookupValues;
+ }
}
void HbRatingSliderPrivate::init()
{
- Q_Q(HbRatingSlider);
- mLayoutItem = q->style()->createPrimitive(HbStyle::P_RatingSlider_layout,q);
+ Q_Q(HbRatingSlider);
+ mLayoutItem = q->style()->createPrimitive(HbStyle::P_RatingSlider_layout,q);
mFrame = q->style()->createPrimitive(HbStyle::P_RatingSlider_frame,mLayoutItem);
mTrack = q->style()->createPrimitive(HbStyle::P_RatingSlider_track,mFrame);
mTouchArea = q->style()->createPrimitive(HbStyle::P_RatingSlider_toucharea, q);
- q->updatePrimitives();
+ q->updatePrimitives();
- #ifdef HB_EFFECTS
+ #ifdef HB_EFFECTS
HbEffectInternal::add(HB_RATINGSLIDER_ITEM_TYPE,"ratingslider_appear", "ratingslider_appear");
HbEffectInternal::add(HB_RATINGSLIDER_ITEM_TYPE,"ratingslider_disappear", "ratingslider_disappear");
#endif
@@ -98,44 +98,44 @@
void HbRatingSliderPrivate::createLookupTable()
{
- if(mLookupValues) {
- delete [] mLookupValues;
- mLookupValues=0;
- }
-
- mLookupValues = new int[mStepCount];
- qreal width = mFrame->boundingRect().width();
- int bandWidth =(int) (width/mStepCount);
-
- for(int i=0;i < mStepCount;i++) {
- mLookupValues[i] = bandWidth*(i+1);
- }
+ if(mLookupValues) {
+ delete [] mLookupValues;
+ mLookupValues=0;
+ }
+
+ mLookupValues = new int[mStepCount];
+ qreal width = mFrame->boundingRect().width();
+ int bandWidth =(int) (width/mStepCount);
+
+ for(int i=0;i < mStepCount;i++) {
+ mLookupValues[i] = bandWidth*(i+1);
+ }
}
int HbRatingSliderPrivate::calculateProgressValue(qreal pos)
{
- Q_Q(HbRatingSlider);
-
- int count=0;
- for(count=0;count< mStepCount ;count++) {
- if(pos <= mLookupValues[count])
- break;
- }
- if(q->layoutDirection() == Qt::RightToLeft) {
-
- count = mStepCount -count;
- }
- else {
+ Q_Q(HbRatingSlider);
+
+ int count=0;
+ for(count=0;count< mStepCount ;count++) {
+ if(pos <= mLookupValues[count])
+ break;
+ }
+ if(q->layoutDirection() == Qt::RightToLeft) {
- count++;
- }
+ count = mStepCount -count;
+ }
+ else {
+
+ count++;
+ }
- if (pos > mLookupValues[mStepCount-1]) {
- return -1;
- }
-
- return count;
-
+ if (pos > mLookupValues[mStepCount-1]) {
+ return -1;
+ }
+
+ return count;
+
}
/*!
@@ -143,12 +143,12 @@
\brief A control for user to do rating.
This is a general rating widget where user will be able to do different
- ratings for things like Music ,Video etc.
+ ratings for things like Music ,Video etc.
- By default there are 5 ratings ( 5 stars ). This can be configured also.
- The interval , number of icons etc can be configured.
+ By default there are 5 ratings ( 5 stars ). This can be configured also.
+ The interval , number of icons etc can be configured.
- Apart from rating the this can used for showing cumulative rating also.
+ Apart from rating the this can used for showing cumulative rating also.
example code example:
\code
@@ -156,30 +156,30 @@
\endcode
The below code can be used to show some rating e.g. 2.5/5
- by default the stepcount =5
+ by default the stepcount =5
- \code
- HbRatingSlider *slider = new HbRatingSlider();
- slider->setStepCount(100); //5 *20//
- slider->setCurrentRating(50); //2.5*20 it shows 50 / 100 which is same as 2.5/5
+ \code
+ HbRatingSlider *slider = new HbRatingSlider();
+ slider->setStepCount(100); //5 *20//
+ slider->setCurrentRating(50); //2.5*20 it shows 50 / 100 which is same as 2.5/5
\endcode
-
- This will show as 2.5/5. Now if one the same ratingslider
- if the Application wants to configure a rating slider with range 1-5
- on emitting the signal rating changed it can set to
- slider->setStepCount(5);
- slider->setCurrentRating(0)
-
- When the rating is done it emits a signal called ratingDone and when rating is
- changed by the user by draging the pointer ratingChanged signal is emitted.
-
+
+ This will show as 2.5/5. Now if one the same ratingslider
+ if the Application wants to configure a rating slider with range 1-5
+ on emitting the signal rating changed it can set to
+ slider->setStepCount(5);
+ slider->setCurrentRating(0)
+
+ When the rating is done it emits a signal called ratingDone and when rating is
+ changed by the user by draging the pointer ratingChanged signal is emitted.
+
*/
/*!
@beta
- Constructor of RatingSlider.
+ Constructor of RatingSlider.
\param parent. Parent widget
*/
@@ -195,7 +195,7 @@
/*!
@beta
- Constructor of RatingSlider.
+ Constructor of RatingSlider.
\param parent. Parent widget
*/
HbRatingSlider::HbRatingSlider(HbRatingSliderPrivate &dd,QGraphicsItem *parent) :
@@ -225,16 +225,16 @@
void HbRatingSlider::setReadOnly(bool value)
{
- Q_D(HbRatingSlider);
- d->mReadOnly = value;
+ Q_D(HbRatingSlider);
+ d->mReadOnly = value;
}
-/*!
-
- @beta
+/*!
+
+ @beta
Sets the number of icons. In a Rating scenario you may have number of repeated icons. This API can be used to set
- the number of icons required. For Example the default image is "*" and you have 5 stars. You can set the number of
- stars using this. By default this value is 5.
+ the number of icons required. For Example the default image is "*" and you have 5 stars. You can set the number of
+ stars using this. By default this value is 5.
\param number. A value between 1 and 10
@@ -243,18 +243,18 @@
void HbRatingSlider::setNumberOfIcons(int number)
{
- Q_D(HbRatingSlider);
- if ( (number <= 0) || (number > MAX_NUMBER_OF_ICONS) ){
- return;
- }
- d->mNumberOfIcons = number;
- updatePrimitives();
- d->createLookupTable();
+ Q_D(HbRatingSlider);
+ if ( (number <= 0) || (number > MAX_NUMBER_OF_ICONS) ){
+ return;
+ }
+ d->mNumberOfIcons = number;
+ updatePrimitives();
+ d->createLookupTable();
}
-/*!
- @beta
+/*!
+ @beta
Returns the number of icons set.
\sa setNumberOfIcons()
@@ -262,33 +262,33 @@
int HbRatingSlider::numberOfIcons() const
{
- Q_D(const HbRatingSlider);
- return d->mNumberOfIcons;
+ Q_D(const HbRatingSlider);
+ return d->mNumberOfIcons;
}
/*!
@beta
Sets the step count for the rating slider. If the number of icons is 5 and step count is 10 then it is possible to have 10 ratings.
- one rating will be half star (by default). If the number of icons is 5 and step count is 5 then 5 ratings are possible. In this
- case one rating will be one complete star. By default this value is 5.
-
- \param count. A value between 1 and 100. This can be considerd as the maximum rating possible.
+ one rating will be half star (by default). If the number of icons is 5 and step count is 5 then 5 ratings are possible. In this
+ case one rating will be one complete star. By default this value is 5.
+
+ \param count. A value between 1 and 100. This can be considerd as the maximum rating possible.
\sa numberOfIcons()
*/
void HbRatingSlider::setStepCount(int count)
{
- Q_D(HbRatingSlider);
- if( (count <= 0) || (count > 100) ) {
- return;
- }
- d->mStepCount = count;
- d->createLookupTable();
-
- HbStyleOptionRatingSlider option;
+ Q_D(HbRatingSlider);
+ if( (count <= 0) || (count > 100) ) {
+ return;
+ }
+ d->mStepCount = count;
+ d->createLookupTable();
+
+ HbStyleOptionRatingSlider option;
initStyleOption(&option);
- if (d->mTrack) {
+ if (d->mTrack) {
style()->updatePrimitive(d->mTrack, HbStyle::P_RatingSlider_track, &option);
}
@@ -298,11 +298,11 @@
@beta
Returns the step count.
-*/
+*/
int HbRatingSlider::stepCount() const
{
- Q_D(const HbRatingSlider);
- return d->mStepCount;
+ Q_D(const HbRatingSlider);
+ return d->mStepCount;
}
/*!
@@ -311,32 +311,32 @@
*/
bool HbRatingSlider::isReadOnly() const
{
- Q_D(const HbRatingSlider);
- return d->mReadOnly;
+ Q_D(const HbRatingSlider);
+ return d->mReadOnly;
}
/*!
@beta
It sets the current rating value.
- \param count. A value between 1 and stepcount.
- \sa currentRating()
+ \param count. A value between 1 and stepcount.
+ \sa currentRating()
*/
void HbRatingSlider::setCurrentRating(int rating)
{
- Q_D(HbRatingSlider);
- if( rating >d->mStepCount ) {
- rating = d->mStepCount;
- }
- if( (rating == d->mCurrentValue) || (rating < 0) ) {
- return;
- }
+ Q_D(HbRatingSlider);
+ if( rating >d->mStepCount ) {
+ rating = d->mStepCount;
+ }
+ if( (rating == d->mCurrentValue) || (rating < 0) ) {
+ return;
+ }
- d->mCurrentValue = rating;
-
- HbStyleOptionRatingSlider option;
+ d->mCurrentValue = rating;
+
+ HbStyleOptionRatingSlider option;
initStyleOption(&option);
- if (d->mTrack) {
+ if (d->mTrack) {
style()->updatePrimitive(d->mTrack, HbStyle::P_RatingSlider_track, &option);
}
}
@@ -347,31 +347,31 @@
*/
int HbRatingSlider::currentRating() const
{
- Q_D(const HbRatingSlider);
- return d->mCurrentValue;
+ Q_D(const HbRatingSlider);
+ return d->mCurrentValue;
}
/*!
@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
- setting number of stars.
-
- \param name. The graphics name along with the path.
- \sa unRatedIconName()
+ 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
+ setting number of stars.
+
+ \param name. The graphics name along with the path.
+ \sa unRatedIconName()
*/
void HbRatingSlider::setUnRatedIconName(const QString name)
{
- Q_D(HbRatingSlider);
- if(d->mUnratedIconName != name) {
- d->mUnratedIconName =name;
+ Q_D(HbRatingSlider);
+ if(d->mUnratedIconName != name) {
+ d->mUnratedIconName =name;
- HbStyleOptionRatingSlider option;
- initStyleOption(&option);
- updatePrimitives();
- }
-
+ HbStyleOptionRatingSlider option;
+ initStyleOption(&option);
+ updatePrimitives();
+ }
+
}
/*!
@@ -380,30 +380,30 @@
*/
QString HbRatingSlider::unRatedIconName() const
{
- Q_D(const HbRatingSlider);
- return d->mUnratedIconName;
+ Q_D(const HbRatingSlider);
+ return d->mUnratedIconName;
}
/*!
@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
- setting number of stars.
-
- \param name. The graphics name along with the path.
- \sa unRatedIconName()
+ 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
+ setting number of stars.
+
+ \param name. The graphics name along with the path.
+ \sa unRatedIconName()
*/
void HbRatingSlider::setRatedIconName(const QString name)
{
- Q_D(HbRatingSlider);
- if(d->mRatedIconName != name) {
- d->mRatedIconName = name;
- HbStyleOptionRatingSlider option;
- initStyleOption(&option);
- updatePrimitives();
- }
+ Q_D(HbRatingSlider);
+ if(d->mRatedIconName != name) {
+ d->mRatedIconName = name;
+ HbStyleOptionRatingSlider option;
+ initStyleOption(&option);
+ updatePrimitives();
+ }
}
/*!
@@ -412,8 +412,8 @@
*/
QString HbRatingSlider::ratedIconName() const
{
- Q_D(const HbRatingSlider);
- return d->mRatedIconName;
+ Q_D(const HbRatingSlider);
+ return d->mRatedIconName;
}
#ifndef HB_GESTURE_FW
@@ -422,18 +422,18 @@
*/
void HbRatingSlider::mousePressEvent(QGraphicsSceneMouseEvent *event)
{
-
+
Q_D(HbRatingSlider);
- if(d->mTouchArea->isUnderMouse()) {
+ if(d->mTouchArea->isUnderMouse()) {
- if(d->mReadOnly) {
- event->ignore();
- return;
- }
- d->mMousePressed = true;
- event->accept();
+ if(d->mReadOnly) {
+ event->ignore();
+ return;
+ }
+ d->mMousePressed = true;
+ event->accept();
- }
+ }
}
/*!
@@ -443,41 +443,41 @@
{
Q_D(HbRatingSlider);
- if(!d->mMousePressed) {
- return;
- }
- QPointF layoutItemPos = d->mLayoutItem->pos();
+ if(!d->mMousePressed) {
+ return;
+ }
+ QPointF layoutItemPos = d->mLayoutItem->pos();
QPointF frameItemPos = d->mFrame->pos();
- qreal xVal = event->pos().x() - layoutItemPos.x()+ frameItemPos.x();
- if(d->mTouchArea->isUnderMouse()) {
-
- if(d->mReadOnly) {
- event->ignore();
- return;
- }
-
- if(xVal <0) {
- setCurrentRating(0);
- return;
- }
-
- QRectF rect = d->mTouchArea->boundingRect();
- int rating=0;
- if(rect.contains(xVal,0 )) {
- rating = d->calculateProgressValue(xVal);
- if(toolTip() != QString()) {
- HbToolTip::showText(toolTip(),this);
- }
- setCurrentRating(rating);
- emit ratingChanged (d->mCurrentValue);
- event->accept();
- }
-
+ qreal xVal = event->pos().x() - layoutItemPos.x()+ frameItemPos.x();
+ if(d->mTouchArea->isUnderMouse()) {
+
+ if(d->mReadOnly) {
+ event->ignore();
+ return;
+ }
+
+ if(xVal <0) {
+ setCurrentRating(0);
+ return;
+ }
+
+ QRectF rect = d->mTouchArea->boundingRect();
+ int rating=0;
+ if(rect.contains(xVal,0 )) {
+ rating = d->calculateProgressValue(xVal);
+ if(toolTip() != QString()) {
+ HbToolTip::showText(toolTip(),this);
+ }
+ setCurrentRating(rating);
+ emit ratingChanged (d->mCurrentValue);
+ event->accept();
+ }
+
- }
- else {
- setCurrentRating(0);
- }
+ }
+ else {
+ setCurrentRating(0);
+ }
}
/*!
@@ -487,38 +487,38 @@
{
Q_D(HbRatingSlider);
- QPointF layoutItemPos = d->mLayoutItem->pos();
+ QPointF layoutItemPos = d->mLayoutItem->pos();
QPointF frameItemPos = d->mFrame->pos();
qreal xVal = event->pos().x() - layoutItemPos.x()+ frameItemPos.x();
- if(d->mTouchArea->isUnderMouse()) {
-
- if(d->mReadOnly) {
- event->ignore();
- return;
- }
-
- if(xVal <0) {
- setCurrentRating(0);
- return;
- }
-
- QRectF rect = d->mTouchArea->boundingRect();
- int rating=0;
- if(rect.contains(xVal,0 )) {
- rating = d->calculateProgressValue(xVal);
- if(toolTip() != QString()) {
- HbToolTip::showText(toolTip(),this);
- }
- setCurrentRating(rating);
- if(d->mCurrentValue) {
- emit ratingDone (d->mCurrentValue);
- }
- event->accept();
- d->mMousePressed = false;
- }
-
- }
+ if(d->mTouchArea->isUnderMouse()) {
+
+ if(d->mReadOnly) {
+ event->ignore();
+ return;
+ }
+
+ if(xVal <0) {
+ setCurrentRating(0);
+ return;
+ }
+
+ QRectF rect = d->mTouchArea->boundingRect();
+ int rating=0;
+ if(rect.contains(xVal,0 )) {
+ rating = d->calculateProgressValue(xVal);
+ if(toolTip() != QString()) {
+ HbToolTip::showText(toolTip(),this);
+ }
+ setCurrentRating(rating);
+ if(d->mCurrentValue) {
+ emit ratingDone (d->mCurrentValue);
+ }
+ event->accept();
+ d->mMousePressed = false;
+ }
+
+ }
}
#else
void HbRatingSlider::mousePressEvent(QGraphicsSceneMouseEvent *event)
@@ -535,20 +535,20 @@
HbTapGesture *tap = qobject_cast<HbTapGesture *>(event->gesture(Qt::TapGesture));
switch(tap->state()) {
case Qt::GestureStarted:
- {
- qreal xVal = mapFromScene(event->mapToGraphicsScene(tap->position( ))).x();
- int rating = d->calculateProgressValue(xVal);
- if(rating == -1) {
- return;
- }
- if(d->mReadOnly) {
+ {
+ qreal xVal = mapFromScene(event->mapToGraphicsScene(tap->position( ))).x();
+ int rating = d->calculateProgressValue(xVal);
+ if(rating == -1) {
+ return;
+ }
+ if(d->mReadOnly) {
event->ignore();
return;
}
d->mMousePressed = true;
event->accept();
- }
+ }
break;
case Qt::GestureFinished: // Reset state
@@ -562,21 +562,21 @@
return;
}
- if(!d->mMousePressed){
- return;
- }
+ if(!d->mMousePressed){
+ return;
+ }
- if(xVal <0) {
+ if(xVal <0) {
setCurrentRating(0);
- emit ratingDone (d->mCurrentValue);
+ emit ratingDone (d->mCurrentValue);
return;
}
rating = d->calculateProgressValue(xVal);
-
- if(toolTip() != QString()) {
+
+ if(toolTip() != QString()) {
HbToolTip::showText(toolTip(),this);
- }
+ }
setCurrentRating(rating);
if(d->mCurrentValue) {
emit ratingDone (d->mCurrentValue);
@@ -594,39 +594,39 @@
case Qt::GestureUpdated:
{
if(!d->mMousePressed) {
- return;
- }
+ return;
+ }
qreal xVal = mapFromScene(event->mapToGraphicsScene( pan->startPos()+pan->offset())).x();
- QRectF rect = d->mTouchArea->boundingRect();
- int rating=0;
- if(rect.contains(xVal,0 )) {
+ QRectF rect = d->mTouchArea->boundingRect();
+ int rating=0;
+ if(rect.contains(xVal,0 )) {
if(d->mReadOnly) {
- event->ignore();
- return;
- }
-
- if(xVal <0) {
- setCurrentRating(0);
- return;
- }
+ event->ignore();
+ return;
+ }
+
+ if(xVal <0) {
+ setCurrentRating(0);
+ return;
+ }
- rating = d->calculateProgressValue(xVal);
-
- if(toolTip() != QString()) {
- HbToolTip::showText(toolTip(),this);
- }
- setCurrentRating(rating);
- emit ratingChanged (d->mCurrentValue);
- event->accept();
- }
- else {
- setCurrentRating(0);
- }
+ rating = d->calculateProgressValue(xVal);
+
+ if(toolTip() != QString()) {
+ HbToolTip::showText(toolTip(),this);
+ }
+ setCurrentRating(rating);
+ emit ratingChanged (d->mCurrentValue);
+ event->accept();
+ }
+ else {
+ setCurrentRating(0);
+ }
}
break;
- case Qt::GestureFinished: // Reset state
- {
- qreal xVal = mapFromScene(event->mapToGraphicsScene( pan->startPos()+pan->offset())).x();
+ case Qt::GestureFinished: // Reset state
+ {
+ qreal xVal = mapFromScene(event->mapToGraphicsScene( pan->startPos()+pan->offset())).x();
QRectF rect = d->mTouchArea->boundingRect();
int rating=0;
if(rect.contains(xVal,0 )) {
@@ -634,26 +634,26 @@
event->ignore();
return;
}
- }
+ }
- if(!d->mMousePressed) {
- return;
- }
+ if(!d->mMousePressed) {
+ return;
+ }
- if(xVal <0) {
+ if(xVal <0) {
setCurrentRating(0);
- emit ratingDone (d->mCurrentValue);
+ emit ratingDone (d->mCurrentValue);
return;
}
rating = d->calculateProgressValue(xVal);
- setCurrentRating(rating);
+ setCurrentRating(rating);
if(d->mCurrentValue) {
emit ratingDone (d->mCurrentValue);
}
- d->mMousePressed = false;
+ d->mMousePressed = false;
event->accept();
- }
+ }
default:
break;
}
@@ -666,24 +666,24 @@
*/
void HbRatingSlider::setGeometry(const QRectF & rect)
{
- Q_D(HbRatingSlider);
- HbWidget::setGeometry(rect);
- updatePrimitives();
- d->createLookupTable();
+ Q_D(HbRatingSlider);
+ HbWidget::setGeometry(rect);
+ updatePrimitives();
+ d->createLookupTable();
}
void HbRatingSlider::initStyleOption(HbStyleOption *hboption) const
{
- Q_D( const HbRatingSlider );
- HbWidget::initStyleOption(hboption);
+ Q_D( const HbRatingSlider );
+ HbWidget::initStyleOption(hboption);
HbStyleOptionRatingSlider *option = 0;
if ((option = qstyleoption_cast< HbStyleOptionRatingSlider *>(hboption)) != 0) {
- option->noOfStars = d->mNumberOfIcons;
- option->noOfIntervals = d->mStepCount;
- option->unRatedGraphicsName = d->mUnratedIconName;
- option->ratedGraphicsName = d->mRatedIconName;
- option->progressValue = d->mCurrentValue;
- }
+ option->noOfStars = d->mNumberOfIcons;
+ option->noOfIntervals = d->mStepCount;
+ option->unRatedGraphicsName = d->mUnratedIconName;
+ option->ratedGraphicsName = d->mRatedIconName;
+ option->progressValue = d->mCurrentValue;
+ }
}
/*!
@@ -698,14 +698,14 @@
*/
QGraphicsItem* HbRatingSlider::primitive(HbStyle::Primitive primitive) const
{
- Q_D(const HbRatingSlider);
+ Q_D(const HbRatingSlider);
switch (primitive) {
case HbStyle::P_RatingSlider_frame:
return d->mFrame;
case HbStyle::P_RatingSlider_track:
return d->mTrack;
- case HbStyle::P_RatingSlider_layout:
- return d->mLayoutItem;
+ case HbStyle::P_RatingSlider_layout:
+ return d->mLayoutItem;
default:
return 0;
}
@@ -716,7 +716,7 @@
HbWidget::changeEvent(event);
switch (event->type()) {
case QEvent::LayoutDirectionChange:
- updatePrimitives();
+ updatePrimitives();
break;
default:
break;
@@ -724,10 +724,10 @@
}
void HbRatingSlider::updatePrimitives()
{
- Q_D(HbRatingSlider);
- HbStyleOptionRatingSlider option;
+ Q_D(HbRatingSlider);
+ HbStyleOptionRatingSlider option;
initStyleOption(&option);
- if (d->mFrame) {
+ if (d->mFrame) {
style()->updatePrimitive(d->mFrame, HbStyle::P_RatingSlider_frame, &option);
}
@@ -735,10 +735,10 @@
style()->updatePrimitive(d->mTrack, HbStyle::P_RatingSlider_track, &option);
}
- if (d->mTouchArea) {
+ if (d->mTouchArea) {
style()->updatePrimitive(d->mTouchArea, HbStyle::P_CheckBox_toucharea, &option);
}
-
+
}
QVariant HbRatingSlider::itemChange(GraphicsItemChange change, const QVariant &value)
@@ -752,11 +752,11 @@
HbEffect::start(this, HB_RATINGSLIDER_ITEM_TYPE, "ratingslider_appear");
}
- else
- {
- HbEffect::start(this, HB_RATINGSLIDER_ITEM_TYPE, "ratingslider_disappear");
- }
- }
+ else
+ {
+ HbEffect::start(this, HB_RATINGSLIDER_ITEM_TYPE, "ratingslider_disappear");
+ }
+ }
#endif//HB_EFFECTS
--- a/src/hbwidgets/sliders/hbslider.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/sliders/hbslider.cpp Fri May 14 16:09:54 2010 +0300
@@ -30,7 +30,7 @@
#include "hbnamespace_p.h"
#include "hbsliderhandle_p.h"
-#include "hbstyleoptionslider.h"
+#include "hbstyleoptionslider_p.h"
#include "hbslidertickmarkslabel_p.h"
#include "hbabstractbutton.h"
#include <hbwidgetfeedback.h>
@@ -551,56 +551,6 @@
}
/*!
- \deprecated HbSlider::elements() const
- is deprecated. Please use sliderElements() instead
- Returns the elements of the slider.
-
- The slider contains only track element by default.
-
- \sa setElements( )
-*/
-QList<HbSlider::SliderElement> HbSlider::elements( ) const
-{
- qDebug("HbSlider::elements() is deprecated. Use sliderElements() instead.");
- Q_D( const HbSlider );
- return d->elements;
-}
-
-/*!
- \deprecated HbSlider::setElements(const QList<HbSlider::SliderElement>&)
- is deprecated. Please use setSliderElements instead.
- Sets the elements of the slider.
-
- \note Duplicate elements will be ignored.
-
- \note element order cant be changed
-
- \sa elements( )
-*/
-void HbSlider::setElements( const QList<SliderElement> &elements )
-{
- qDebug("HbSlider::setElements is deprecated. Use setSliderElements instead.");
- Q_D( HbSlider );
- bool oldElementRemoved = false;
- foreach(HbSlider::SliderElement element,d->elements){
- if(!elements.contains(element)&&d->elementItemMap.contains(element)) {
- delete d->elementItemMap[element].item;
- delete d->elementItemMap[element].touchItem;
- d->elementItemMap.remove(element);
- oldElementRemoved = true;
- }
- }
- if(oldElementRemoved) {
- repolish( );
- }
- d->elements = elements;
- // this will delete unwanted element and create new element
- d->updateElements( );
- // repolish call is required because new elements might be added
-}
-
-
-/*!
@proto
Returns the list of slider elements as QVariant
@@ -785,56 +735,6 @@
}
/*!
- \deprecated HbSlider::icon(HbSlider::SliderElement) const
- is deprecated. Please use elementIcons() instead.
-
- Returns the icon of the \a element.
-
- returns NULL if element does not exist or icon was not set for this element
-
- \sa setIcon( )
-*/
-HbIcon HbSlider::icon( SliderElement element ) const
-{
- qDebug("HbSlider::icon() is deprecated. Use elementIcons() instead.");
- Q_D( const HbSlider );
- return d->icons.value( element );
-}
-
-/*!
- \deprecated HbSlider::setIcon(HbSlider::SliderElement, const HbIcon&)
- is deprecated. Please use setElementIcons() instead.
-
- Sets the \a icon if the \a element.
-
- Supported elements:
- \li HbSlider::IncreaseElement
- \li HbSlider::DecreaseElement
- \li HbSlider::IconElement
-
- \warning Setting icon to a non-existing element has no effect.
-
- \sa icon( ) setElements( )
-*/
-void HbSlider::setIcon( SliderElement element, const HbIcon &icon )
-{
- qDebug("HbSlider::setIcon() is deprecated. Use setElementIcons() instead.");
- Q_D( HbSlider );
- if ( element != TextElement &&!icon.isNull()) {
- d->icons[element] = icon;
- if ( d->elements.contains( element ) ) {
- // create icon element if it was not existing
- d->elementWidget( element );
- // update icon primitive
-
- }
-
- } else {
- qWarning( "HbSlider::setIcon: non-supported element or null icon passed" );
- }
-}
-
-/*!
@beta
Returns the icon of the \a element.
--- a/src/hbwidgets/sliders/hbslider.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/sliders/hbslider.h Fri May 14 16:09:54 2010 +0300
@@ -139,12 +139,6 @@
void setTickPosition(Hb::SliderTickPositions position);
Hb::SliderTickPositions tickPosition() const;
- void setElements(const QList<SliderElement> &elements);
- QList<SliderElement> elements() const;
-
- void setIcon(SliderElement element, const HbIcon &icon);
- HbIcon icon(SliderElement element) const;
-
void setElementIcon(SliderElement element, const HbIcon &icon);
HbIcon elementIcon(SliderElement element) const;
--- a/src/hbwidgets/sliders/hbslidercontrol.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/sliders/hbslidercontrol.cpp Fri May 14 16:09:54 2010 +0300
@@ -27,7 +27,7 @@
#include "hbslidercontrol_p_p.h"
#include "hbabstractslidercontrol_p.h"
#include "hbsliderhandle_p.h"
-#include "hbstyleoptionslider.h"
+#include "hbstyleoptionslider_p.h"
#include "hbslidertickmarkslabel_p.h"
#include "hbslidertickmarkslabel_p.h"
#include <hbstyle.h>
@@ -1104,7 +1104,7 @@
case Qt::GestureStarted:
case Qt::GestureUpdated:{
QPointF startPoint = event->mapToGraphicsScene(panGesture->offset()+panGesture->startPos( ) );
- if( d->onHandle( startPoint)||isSliderDown( ) ) {
+ if( ( d->onHandle( startPoint) && d->grooveTouchArea->sceneBoundingRect( ).contains( startPoint))||isSliderDown( ) ) {
qreal handlePos = 0;
qreal span = 0;
QRectF bounds = boundingRect( );
@@ -1145,7 +1145,7 @@
HbWidgetFeedback::triggered( this, Hb::InstantPressed );
event->ignore();
break;
- }
+ }
}
case Qt::GestureFinished:
case Qt::GestureCanceled: {
@@ -1155,6 +1155,7 @@
d->handle->updatePrimitives();
d->handleMoving = false;
event->ignore();
+ HbAbstractSliderControl::gestureEvent(event);
}
default:
break;
--- a/src/hbwidgets/sliders/hbsliderhandle.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/sliders/hbsliderhandle.cpp Fri May 14 16:09:54 2010 +0300
@@ -28,7 +28,7 @@
#include "hbslidercontrol_p_p.h"
#include <hbwidgetfeedback.h>
#include <hbstyle.h>
-#include <hbstyleoptionslider.h>
+#include <hbstyleoptionslider_p.h>
#include <QGraphicsSceneMouseEvent>
#include <QGraphicsScene>
--- a/src/hbwidgets/sliders/hbslidertickmarks.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/sliders/hbslidertickmarks.cpp Fri May 14 16:09:54 2010 +0300
@@ -28,7 +28,7 @@
#include "hbslidercontrol_p.h"
#include "hbsliderhandle_p.h"
#include <hbstyle.h>
-#include <hbstyleoptionslider.h>
+#include <hbstyleoptionslider_p.h>
#include <hbstyle.h>
#include <hbapplication.h>
#include <hbiconitem.h>
--- a/src/hbwidgets/sliders/hbslidertickmarkslabel.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/sliders/hbslidertickmarkslabel.cpp Fri May 14 16:09:54 2010 +0300
@@ -29,7 +29,7 @@
#include "hbwidget_p.h"
#include <hbinstance.h>
#include <hbstyle.h>
-#include <hbstyleoptionslider.h>
+#include <hbstyleoptionslider_p.h>
#include <hbapplication.h>
#include <hbtextitem.h>
#include <QList>
--- a/src/hbwidgets/sliders/hbslidertickmarkslabel_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/sliders/hbslidertickmarkslabel_p.h Fri May 14 16:09:54 2010 +0300
@@ -29,7 +29,7 @@
#include "hbnamespace_p.h"
#include <hbwidget.h>
#include <hbnamespace.h>
-#include "hbstyleoptionslider.h"
+#include "hbstyleoptionslider_p.h"
class QStyleOption;
class HbSliderTickmarksLabelPrivate;
--- a/src/hbwidgets/sliders/hbvolumeslider_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/sliders/hbvolumeslider_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -30,15 +30,12 @@
#include "hbinstance.h"
#include "hbabstractbutton.h"
#include "hbslidercontrol_p.h"
-#include "hbstyleoptionslider.h"
+#include "hbstyleoptionslider_p.h"
#include <QGraphicsSceneEvent>
#include <QGraphicsScene>
#include <hbwidgetfeedback.h>
/*!
- \deprecated
- This class will be deprecated
- Use HbSlider instead
Example usage:
\code
HbSlider *slider = new HbSlider(Qt::Horizontal);
@@ -252,9 +249,6 @@
/*!
- \deprecated HbVolumeSlider::HbVolumeSlider(bool, QGraphicsItem*)
- is deprecated. Please use HbSlider instead
-
The orientation is \b Qt::Vertical and the slider contains increase, track,
decrease and icon elements by default.
@@ -288,8 +282,6 @@
/*!
- \deprecated HbVolumeSlider::setCurrentValueVisible(bool)
- is deprecated. Please use HbSlider instead
Sets whether the text element is visible.
\sa isCurrentValueVisible( )
@@ -321,8 +313,6 @@
/*!
- \deprecated HbVolumeSlider::isCurrentValueVisible( ) const
- is deprecated. Please use HbSlider instead
Returns \c true whether the text element is visible.
The default value is \c false.
@@ -336,8 +326,6 @@
}
/*!
- \deprecated HbVolumeSlider::setToolTipVisible(bool)
- is deprecated. Please use HbSlider instead
\reimp
This is not supported in HbVolumeSlider
--- a/src/hbwidgets/sliders/hbvolumeslider_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/sliders/hbvolumeslider_p.h Fri May 14 16:09:54 2010 +0300
@@ -28,7 +28,7 @@
#include <hbslider.h>
-#include <hbstyleoptionslider.h>
+#include <hbstyleoptionslider_p.h>
#include "hbnamespace_p.h"
class HbVolumeSliderPrivate;
--- a/src/hbwidgets/sliders/hbzoomslider_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/sliders/hbzoomslider_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -33,9 +33,6 @@
#include <QGraphicsScene>
/*!
- \deprecated
- This class will be deprecated
- Use HbSlider instead
Example usage:
\code
HbSlider *slider = new HbSlider(Qt::Horizontal);
@@ -175,10 +172,7 @@
}
-/*!
- \deprecated HbZoomSlider::HbZoomSlider(QGraphicsItem*)
- is deprecated. Please use HbSlider instead
-
+/*!
Constructs a zoom slider with \a parent.
The orientation is \b Qt::Vertical and the slider contains increase, track,
@@ -205,8 +199,6 @@
/*!
- \deprecated HbZoomSlider::defaultZoomLevel( ) const
- is deprecated. Please use HbSlider instead
Returns the default Zoom Level of the zoom slider if set by application
otherwise returns minimum value.
@@ -224,10 +216,7 @@
}
-/*!
- \deprecated HbZoomSlider::setDefaultZoomLevel(int)
- is deprecated. Please use HbSlider instead
-
+/*!
sets the default Zoom Level of the zoom slider with \a value.
if not set minimum( ) value will be used for default value.
@@ -244,10 +233,7 @@
}
-/*!
- \deprecated HbZoomSlider::setToolTipVisible(bool)
- is deprecated. Please use HbSlider instead
-
+/*!
\reimp
This is not supported in HbZoomSlider
*/
--- a/src/hbwidgets/sliders/hbzoomslider_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/sliders/hbzoomslider_p.h Fri May 14 16:09:54 2010 +0300
@@ -27,7 +27,7 @@
#define HBZOOMSLIDER_H
#include <hbslider.h>
-#include <hbstyleoptionslider.h>
+#include <hbstyleoptionslider_p.h>
#include "hbnamespace_p.h"
class HbZoomSliderPrivate;
--- a/src/hbwidgets/sliders/sliders.pri Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/sliders/sliders.pri Fri May 14 16:09:54 2010 +0300
@@ -31,7 +31,6 @@
PUBLIC_HEADERS += $$PWD/hbabstractslidercontrol.h
PUBLIC_HEADERS += $$PWD/hbprogressbar.h
PUBLIC_HEADERS += $$PWD/hbprogressslider.h
-PUBLIC_HEADERS += $$PWD/hbprogressiveslider.h
PUBLIC_HEADERS += $$PWD/hbslider.h
PUBLIC_HEADERS += $$PWD/hbratingslider.h
@@ -40,10 +39,8 @@
PRIVATE_HEADERS += $$PWD/hbprogresssliderhandle_p.h
PRIVATE_HEADERS += $$PWD/hbprogressbar_p.h
PRIVATE_HEADERS += $$PWD/hbprogressslider_p.h
-PRIVATE_HEADERS += $$PWD/hbprogressiveslider_p.h
PRIVATE_HEADERS += $$PWD/hbslider_p.h
PRIVATE_HEADERS += $$PWD/hbslidercontrol_p.h
-PRIVATE_HEADERS += $$PWD/hbprogressslidercontrol_p.h
PRIVATE_HEADERS += $$PWD/hbslidercontrol_p_p.h
PRIVATE_HEADERS += $$PWD/hbsliderhandle_p.h
PRIVATE_HEADERS += $$PWD/hbratingslider_p.h
@@ -55,12 +52,10 @@
SOURCES += $$PWD/hbabstractslidercontrol.cpp
SOURCES += $$PWD/hbprogressslider.cpp
-SOURCES += $$PWD/hbprogressiveslider.cpp
SOURCES += $$PWD/hbprogressbar.cpp
SOURCES += $$PWD/hbprogresssliderhandle_p.cpp
SOURCES += $$PWD/hbslider.cpp
SOURCES += $$PWD/hbslidercontrol.cpp
-SOURCES += $$PWD/hbprogressslidercontrol.cpp
SOURCES += $$PWD/hbsliderhandle.cpp
SOURCES += $$PWD/hbslidertickmarks.cpp
SOURCES += $$PWD/hbslidertickmarkslabel.cpp
--- a/src/hbwidgets/widgets/hbcheckbox.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/widgets/hbcheckbox.cpp Fri May 14 16:09:54 2010 +0300
@@ -24,7 +24,7 @@
****************************************************************************/
#include <hbcheckbox.h>
-#include <hbstyleoptioncheckbox.h>
+#include <hbstyleoptioncheckbox_p.h>
#include "hbabstractbutton_p.h"
#include "hbtooltip.h"
@@ -49,7 +49,7 @@
public:
HbCheckBoxSpacer( QGraphicsItem *parent = 0 );
- QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const;
+ QSizeF sizeHint( Qt::SizeHint which, const QSizeF &constraint = QSizeF( ) ) const;
};
HbCheckBoxSpacer::HbCheckBoxSpacer( QGraphicsItem *parent )
@@ -59,14 +59,14 @@
// setFlag( QGraphicsItem::ItemHasNoContents, true );
}
-QSizeF HbCheckBoxSpacer::sizeHint(Qt::SizeHint which, const QSizeF &constraint ) const
+QSizeF HbCheckBoxSpacer::sizeHint( Qt::SizeHint which, const QSizeF &constraint ) const
{
Q_UNUSED( constraint );
if ( which == Qt::MaximumSize ) {
return QSizeF( QWIDGETSIZE_MAX, QWIDGETSIZE_MAX );
}
- return QSizeF(0.f,0.f);
+ return QSizeF( 0.f, 0.f );
}
@@ -75,13 +75,13 @@
*/
class HB_AUTOTEST_EXPORT HbCheckBoxPrivate : public HbAbstractButtonPrivate
{
- Q_DECLARE_PUBLIC(HbCheckBox)
+ Q_DECLARE_PUBLIC( HbCheckBox )
public:
- HbCheckBoxPrivate();
- virtual ~HbCheckBoxPrivate();
+ HbCheckBoxPrivate( );
+ virtual ~HbCheckBoxPrivate( );
- void createPrimitives();
+ void createPrimitives( );
public:
QString mText;
@@ -98,43 +98,43 @@
private class constructor
*/
HbCheckBoxPrivate::HbCheckBoxPrivate():
- mTextItem(0),
- mIconItem(0),
- mTouchArea(0),
- mTristate(false),
- mNoChange(false),
- mPublishedState(Qt::Unchecked)
+ mTextItem( 0 ),
+ mIconItem( 0 ),
+ mTouchArea( 0 ),
+ mTristate( false ),
+ mNoChange( false ),
+ mPublishedState( Qt::Unchecked )
{
//adding effect for checkbox
#ifdef HB_EFFECTS
- HbEffectInternal::add(HB_CHECKBOX_TYPE,"checkbox_selected", "pressed");
+ HbEffectInternal::add( HB_CHECKBOX_TYPE,"checkbox_selected", "pressed" );
#endif
}
/*
private class destructor
*/
-HbCheckBoxPrivate::~HbCheckBoxPrivate()
+HbCheckBoxPrivate::~HbCheckBoxPrivate( )
{
}
/*
create primitive
*/
-void HbCheckBoxPrivate::createPrimitives()
+void HbCheckBoxPrivate::createPrimitives( )
{
- Q_Q(HbCheckBox);
- if(!mTouchArea) {
- mTouchArea = q->style()->createPrimitive(HbStyle::P_CheckBox_toucharea, q);
- if(QGraphicsObject *ta = qgraphicsitem_cast<QGraphicsObject*>(mTouchArea)) {
- ta->grabGesture(Qt::TapGesture);
+ Q_Q( HbCheckBox );
+ if( !mTouchArea ) {
+ mTouchArea = q->style( )->createPrimitive( HbStyle::P_CheckBox_toucharea, q );
+ if( QGraphicsObject *ta = qgraphicsitem_cast<QGraphicsObject*>( mTouchArea ) ) {
+ ta->grabGesture( Qt::TapGesture );
}
}
- if (!mTextItem) {
- mTextItem = q->style()->createPrimitive(HbStyle::P_CheckBox_text, q);
+ if ( !mTextItem ) {
+ mTextItem = q->style( )->createPrimitive( HbStyle::P_CheckBox_text, q );
}
- if (!mIconItem) {
- mIconItem = q->style()->createPrimitive(HbStyle::P_CheckBox_icon, q);
+ if ( !mIconItem ) {
+ mIconItem = q->style( )->createPrimitive( HbStyle::P_CheckBox_icon, q );
}
}
@@ -194,18 +194,18 @@
By default the state of check box will be Unchecked, text will
be empty and tristate will be false.
*/
-HbCheckBox::HbCheckBox(QGraphicsItem *parent)
- : HbAbstractButton(*new HbCheckBoxPrivate, parent)
+HbCheckBox::HbCheckBox( QGraphicsItem *parent )
+ : HbAbstractButton( *new HbCheckBoxPrivate, parent )
{
- Q_D(HbCheckBox);
+ Q_D( HbCheckBox );
d->q_ptr = this;
- setCheckable(true);
- d->createPrimitives();
+ setCheckable( true );
+ d->createPrimitives( );
// creattion of top and bottom spacer.
- HbStyle::setItemName( new HbCheckBoxSpacer(this), "topSpacer" );
- HbStyle::setItemName( new HbCheckBoxSpacer(this), "bottomSpacer" );
+ HbStyle::setItemName( new HbCheckBoxSpacer( this ), "topSpacer" );
+ HbStyle::setItemName( new HbCheckBoxSpacer( this ), "bottomSpacer" );
#ifdef HB_GESTURE_FW
- grabGesture(Qt::TapGesture);
+ grabGesture( Qt::TapGesture );
#endif
}
@@ -216,14 +216,14 @@
By default the state of check box will be Unchecked.
Tristate will be false by default.
*/
-HbCheckBox::HbCheckBox(const QString &text, QGraphicsItem *parent )
- : HbAbstractButton(*new HbCheckBoxPrivate, parent)
+HbCheckBox::HbCheckBox( const QString &text, QGraphicsItem *parent )
+ : HbAbstractButton( *new HbCheckBoxPrivate, parent )
{
- Q_D(HbCheckBox);
+ Q_D( HbCheckBox );
d->q_ptr = this;
d->mText = text;
- setCheckable(true);
- d->createPrimitives();
+ setCheckable( true );
+ d->createPrimitives( );
// creattion of top and bottom spacer.
HbStyle::setItemName( new HbCheckBoxSpacer(this), "topSpacer");
HbStyle::setItemName( new HbCheckBoxSpacer(this), "bottomSpacer");
@@ -233,7 +233,7 @@
/*!
Destructor.
*/
-HbCheckBox::~HbCheckBox()
+HbCheckBox::~HbCheckBox( )
{
}
@@ -245,14 +245,14 @@
*/
void HbCheckBox::setText( const QString &text )
{
- Q_D(HbCheckBox);
- if(d->mText != text){
+ Q_D( HbCheckBox );
+ if( d->mText != text ){
d->mText = text;
//updatePrimitives();
if( d->mTextItem ){
HbStyleOptionCheckBox checkBoxOption;
- initStyleOption(&checkBoxOption);
- style()->updatePrimitive(d->mTextItem, HbStyle::P_CheckBox_text, &checkBoxOption);
+ initStyleOption( &checkBoxOption );
+ style( )->updatePrimitive( d->mTextItem, HbStyle::P_CheckBox_text, &checkBoxOption );
}
}
}
@@ -262,9 +262,9 @@
Returns the text of checkbox.
\sa setText()
*/
-QString HbCheckBox::text() const
+QString HbCheckBox::text( ) const
{
- Q_D(const HbCheckBox);
+ Q_D( const HbCheckBox );
return d->mText;
}
@@ -276,7 +276,7 @@
*/
void HbCheckBox::setTristate( bool isTristate )
{
- Q_D(HbCheckBox);
+ Q_D( HbCheckBox );
d->mTristate = isTristate;
}
@@ -287,7 +287,7 @@
*/
bool HbCheckBox::isTristate( ) const
{
- Q_D(const HbCheckBox);
+ Q_D( const HbCheckBox );
return d->mTristate;
}
@@ -297,8 +297,8 @@
*/
Qt::CheckState HbCheckBox::checkState() const
{
- Q_D(const HbCheckBox);
- if (d->mTristate && d->mNoChange) {
+ Q_D( const HbCheckBox );
+ if ( d->mTristate && d->mNoChange ) {
return Qt::PartiallyChecked;
}
return d->checked ? Qt::Checked : Qt::Unchecked;
@@ -314,11 +314,11 @@
configure the check and unchecked icons. Style needs to be changed if
user wants different icons.
*/
-QGraphicsItem* HbCheckBox::primitive(HbStyle::Primitive primitive) const
+QGraphicsItem *HbCheckBox::primitive( HbStyle::Primitive primitive ) const
{
- Q_D(const HbCheckBox);
+ Q_D( const HbCheckBox );
- switch (primitive) {
+ switch ( primitive ) {
case HbStyle::P_CheckBox_text:
return d->mTextItem;
case HbStyle::P_CheckBox_toucharea:
@@ -338,7 +338,7 @@
*/
void HbCheckBox::setCheckState( Qt::CheckState state )
{
- Q_D(HbCheckBox);
+ Q_D( HbCheckBox );
if (state == Qt::PartiallyChecked) {
d->mTristate = true;
d->mNoChange = true;
@@ -346,35 +346,35 @@
d->mNoChange = false;
}
d->blockRefresh = true;
- setChecked(state != Qt::Unchecked);
+ setChecked( state != Qt::Unchecked );
d->blockRefresh = false;
- d->refresh();
+ d->refresh( );
- if (state != d->mPublishedState) {
+ if ( state != d->mPublishedState ) {
d->mPublishedState = state;
- emit stateChanged(state);
+ emit stateChanged( state );
}
}
/*!
Updates the icon and text primitives.
*/
-void HbCheckBox::updatePrimitives()
+void HbCheckBox::updatePrimitives( )
{
- HbWidget::updatePrimitives();
- Q_D(HbCheckBox);
+ HbWidget::updatePrimitives( );
+ Q_D( HbCheckBox );
HbStyleOptionCheckBox checkBoxOption;
- initStyleOption(&checkBoxOption);
+ initStyleOption( &checkBoxOption );
- if (d->mTextItem) {
- style()->updatePrimitive(d->mTextItem, HbStyle::P_CheckBox_text, &checkBoxOption);
+ if ( d->mTextItem ) {
+ style( )->updatePrimitive( d->mTextItem, HbStyle::P_CheckBox_text, &checkBoxOption );
}
- if (d->mIconItem) {
- style()->updatePrimitive(d->mIconItem, HbStyle::P_CheckBox_icon, &checkBoxOption);
+ if ( d->mIconItem ) {
+ style( )->updatePrimitive( d->mIconItem, HbStyle::P_CheckBox_icon, &checkBoxOption );
}
if (d->mTouchArea) {
- style()->updatePrimitive(d->mTouchArea, HbStyle::P_CheckBox_toucharea, &checkBoxOption);
+ style( )->updatePrimitive( d->mTouchArea, HbStyle::P_CheckBox_toucharea, &checkBoxOption );
}
}
@@ -383,25 +383,25 @@
*/
void HbCheckBox::initStyleOption(HbStyleOptionCheckBox *option) const
{
- Q_D(const HbCheckBox);
+ Q_D( const HbCheckBox );
- HbAbstractButton::initStyleOption(option);
+ HbAbstractButton::initStyleOption( option );
- Q_ASSERT(option);
+ Q_ASSERT( option );
option->text = d->mText;
- if (d->mTristate && d->mNoChange){
- option->state.operator = (QStyle::State_NoChange);
+ if ( d->mTristate && d->mNoChange ){
+ option->state.operator = ( QStyle::State_NoChange );
} else {
- option->state.operator = (d->checked ? QStyle::State_On : QStyle::State_Off);
+ option->state.operator = ( d->checked ? QStyle::State_On : QStyle::State_Off );
}
}
/*!
Updates the primitive as per new size.
*/
-void HbCheckBox::resizeEvent(QGraphicsSceneResizeEvent *event)
+void HbCheckBox::resizeEvent( QGraphicsSceneResizeEvent *event )
{
- HbAbstractButton::resizeEvent(event);
+ HbAbstractButton::resizeEvent( event );
}
/*!
@@ -410,9 +410,9 @@
bool HbCheckBox::hitButton( const QPointF &pos ) const
{
Q_D(const HbCheckBox);
- QRectF compRect = d->mTouchArea->boundingRect();
- compRect.translate(d->mTouchArea->pos());
- return compRect.contains(pos);
+ QRectF compRect = d->mTouchArea->boundingRect( );
+ compRect.translate( d->mTouchArea->pos( ) );
+ return compRect.contains( pos );
}
/*!
@@ -422,13 +422,13 @@
{
Q_D(HbCheckBox);
d->mNoChange = false;
- Qt::CheckState state = checkState();
- if (state != d->mPublishedState) {
+ Qt::CheckState state = checkState( );
+ if ( state != d->mPublishedState ) {
#ifdef HB_EFFECTS
- HbEffect::start(d->mIconItem, HB_CHECKBOX_TYPE, "pressed");
+ HbEffect::start( d->mIconItem, HB_CHECKBOX_TYPE, "pressed" );
#endif
d->mPublishedState = state;
- emit stateChanged(state);
+ emit stateChanged( state );
}
}
@@ -437,40 +437,40 @@
*/
void HbCheckBox::nextCheckState( )
{
- if( checkState() == Qt::PartiallyChecked ) {
- HbAbstractButton::nextCheckState();
+ if( checkState( ) == Qt::PartiallyChecked ) {
+ HbAbstractButton::nextCheckState( );
}
- HbAbstractButton::nextCheckState();
- HbCheckBox::checkStateSet();
+ HbAbstractButton::nextCheckState( );
+ HbCheckBox::checkStateSet( );
}
#ifndef HB_GESTURE_FW
/*!
\reimp.
*/
-void HbCheckBox::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
+void HbCheckBox::mouseReleaseEvent( QGraphicsSceneMouseEvent *event )
{
- HbAbstractButton::mouseReleaseEvent(event);
+ HbAbstractButton::mouseReleaseEvent( event );
updatePrimitives();
}
/*!
\reimp.
*/
-void HbCheckBox::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
+void HbCheckBox::mouseMoveEvent( QGraphicsSceneMouseEvent *event )
{
- Q_UNUSED(event);
+ Q_UNUSED( event );
// To show the tooltip on press,move outside and come back to same button.
// check for hit pos
bool hit = hitButton( event->pos( ) );
if ( hit ) {
- HbToolTip::showText(toolTip(), this);
+ HbToolTip::showText( toolTip(), this );
}
}
#endif
#ifdef HB_GESTURE_FW
-void HbCheckBox::gestureEvent(QGestureEvent *event)
+void HbCheckBox::gestureEvent( QGestureEvent *event )
{
HbAbstractButton::gestureEvent( event );
}
@@ -480,21 +480,21 @@
*/
void HbCheckBox::keyPressEvent(QKeyEvent *keyEvent)
{
- switch (keyEvent->key()) {
+ switch ( keyEvent->key( ) ) {
case Qt::Key_Select:
case Qt::Key_Enter:
case Qt::Key_Return:
- HbAbstractButton::keyPressEvent(keyEvent);
+ HbAbstractButton::keyPressEvent( keyEvent );
break;
default:
- HbAbstractButton::keyPressEvent(keyEvent);
+ HbAbstractButton::keyPressEvent( keyEvent );
}
}
/*!
\reimp
*/
-QVariant HbCheckBox::itemChange(GraphicsItemChange change, const QVariant &value)
+QVariant HbCheckBox::itemChange( GraphicsItemChange change, const QVariant &value )
{
switch ( change ) {
case ItemEnabledHasChanged:
--- a/src/hbwidgets/widgets/hbcombobox.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/widgets/hbcombobox.cpp Fri May 14 16:09:54 2010 +0300
@@ -29,7 +29,7 @@
#include <hblistview.h>
#include <hbtoucharea.h>
#include <hbtextitem.h>
-#include <hbstyleoptioncombobox.h>
+#include <hbstyleoptioncombobox_p.h>
#include <QStandardItemModel>
#include <QDebug>
@@ -280,7 +280,7 @@
if( d->mEditable) {
return d->mLineEdit->validator( );
}
- return NULL;
+ return 0;
}
/*!
@@ -314,30 +314,6 @@
}
/*!
- \deprecated HbComboBox::insertPolicy() const
- is deprecated.
- \sa setInsertPolicy
-*/
-HbComboBox::InsertPolicy HbComboBox::insertPolicy( ) const
-{
- Q_D( const HbComboBox );
- qDebug() << "this is deprecated and will cease to exist in the near future.";
- return d->insertPolicy;
-}
-
-/*!
- \deprecated HbComboBox::setInsertPolicy(HbComboBox::InsertPolicy)
- is deprecated.
- \sa insertPolicy
-*/
-void HbComboBox::setInsertPolicy( InsertPolicy policy )
-{
- Q_D( HbComboBox );
- qDebug() << "this is deprecated and will cease to exist in the near future.";
- d->insertPolicy = policy;
-}
-
-/*!
@beta
Sets the model to \a model
comboBox Owns the model set by the Application.
@@ -488,7 +464,7 @@
if( d->mLineEdit ) {
d->mLineEdit->setText( QString() );
} else {
- d->mText = QString( );
+ d->mText.clear();
HbStyleOptionComboBox comboBoxOption;
initStyleOption(&comboBoxOption);
style()->updatePrimitive( d->mTextItem, HbStyle::P_ComboBox_text, &comboBoxOption);
@@ -635,7 +611,7 @@
if( d->mLineEdit ) {
d->mLineEdit->setText( QString() );
} else {
- d->mText = QString( );
+ d->mText.clear();
HbStyleOptionComboBox comboBoxOption;
initStyleOption(&comboBoxOption);
style()->updatePrimitive( d->mTextItem, HbStyle::P_ComboBox_text, &comboBoxOption);
--- a/src/hbwidgets/widgets/hbcombobox.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/widgets/hbcombobox.h Fri May 14 16:09:54 2010 +0300
@@ -35,8 +35,7 @@
class HB_WIDGETS_EXPORT HbComboBox : public HbWidget
{
Q_OBJECT
- Q_ENUMS(InsertPolicy)
- Q_PROPERTY( InsertPolicy insertPolicy READ insertPolicy WRITE setInsertPolicy )
+ Q_ENUMS( InsertPolicy )
Q_PROPERTY( bool editable READ isEditable WRITE setEditable )
Q_PROPERTY( int count READ count )
Q_PROPERTY( QStringList items READ items WRITE setItems )
@@ -44,6 +43,7 @@
Q_PROPERTY( QString currentText READ currentText )
public:
+
enum InsertPolicy {
NoInsert,
InsertAtTop,
@@ -63,7 +63,7 @@
void addItem( const QString &text, const QVariant &userData = QVariant() );
void addItem( const HbIcon &icon,
const QString &text,
- const QVariant &userData = QVariant() );
+ const QVariant &userData = QVariant( ) );
void addItems( const QStringList &texts );
@@ -71,14 +71,11 @@
void insertItem( int index,
const HbIcon &icon,
const QString &text,
- const QVariant & userData = QVariant() );
+ const QVariant & userData = QVariant( ) );
void insertItems( int index, const QStringList &texts );
int count( ) const;
- void setInsertPolicy( InsertPolicy policy );
- InsertPolicy insertPolicy( ) const;
-
void setItems( const QStringList &texts );
QStringList items( ) const;
@@ -89,7 +86,7 @@
QString itemText( int index ) const;
void setModel( QAbstractItemModel *model );
- QAbstractItemModel* model( ) const;
+ QAbstractItemModel *model( ) const;
void setEditable( bool editable );
bool isEditable( ) const;
@@ -109,10 +106,11 @@
inline int findText( const QString &text,
Qt::MatchFlags flags = Qt::MatchExactly|Qt::MatchCaseSensitive ) const
{ return findData( text, Qt::DisplayRole, flags ); }
+
int findData( const QVariant &data, int role = Qt::UserRole,
Qt::MatchFlags flags = Qt::MatchExactly|Qt::MatchCaseSensitive ) const;
- QGraphicsItem* primitive( HbStyle::Primitive primitive ) const;
+ QGraphicsItem *primitive( HbStyle::Primitive primitive ) const;
public slots:
void updatePrimitives( );
@@ -121,7 +119,6 @@
void setCurrentIndex( int index );
void setEditText( const QString &text );
-
signals:
void currentIndexChanged( int index );
void currentIndexChanged( const QString &text );
--- a/src/hbwidgets/widgets/hbcombobox_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/widgets/hbcombobox_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -32,10 +32,10 @@
#include <hbmainwindow.h>
#include <hbview.h>
#include <hbtextitem.h>
-#include <hbstyleoptioncombobox.h>
+#include <hbstyleoptioncombobox_p.h>
+#include <hbgraphicsscene.h>
#include <QSortFilterProxyModel>
-#include <QGraphicsScene>
#include <QCompleter>
#include <QItemSelectionModel>
@@ -65,7 +65,9 @@
mIsDropwnToSceneAdded(false),
mHasDownEffect ( false ),
mHasUpEffect (false ),
- mListItemHeight(-1)
+ mListItemHeight( -1 ),
+ mDropDownRowsInPortrait( -1 ),
+ mDropDownRowsInLandscape( -1 )
{
}
@@ -73,9 +75,9 @@
{
Q_Q(HbComboBox);
if( mButtonTouchAreaItem ) {
- static_cast<HbTouchArea*>(mButtonTouchAreaItem)->removeEventFilter( q );
+ static_cast<HbTouchArea*>( mButtonTouchAreaItem )->removeEventFilter( q );
}
- if (!q->scene() || !q->scene()->property("destructed").isValid()) {
+ if ( !q->scene() || !q->scene( )->property( "destructed" ).isValid( ) ) {
if( mDropDown ) {
delete mDropDown;
mDropDown = 0;
@@ -92,8 +94,7 @@
{
Q_Q( HbComboBox );
-
- mTextItem = q->style()->createPrimitive( HbStyle::P_ComboBox_text, q );
+ mTextItem = q->style( )->createPrimitive( HbStyle::P_ComboBox_text, q );
HbStyle::setItemName( mTextItem, "combobox_labelfield" );
mBackgroundItem = q->style( )->createPrimitive( HbStyle::P_ComboBox_background, q );
@@ -114,31 +115,31 @@
{
Q_Q( HbComboBox );
if (q->count() > 0) {
- HbWidgetFeedback::triggered(q, Hb::InstantPressed);
+ HbWidgetFeedback::triggered( q, Hb::InstantPressed );
}
mIsDown = true;
q->updatePrimitives( );
- q->setProperty("state", "pressed");
+ q->setProperty( "state", "pressed" );
}
void HbComboBoxPrivate::touchAreaReleaseEvent( )
{
Q_Q( HbComboBox );
mIsDown = false;
- touchAreaClicked();
+ touchAreaClicked( );
q->updatePrimitives( );
- if (q->count() > 0) {
- HbWidgetFeedback::triggered(q, Hb::InstantReleased);
+ if ( q->count() > 0 ) {
+ HbWidgetFeedback::triggered( q, Hb::InstantReleased );
}
- q->setProperty("state", "normal");
+ q->setProperty( "state", "normal" );
}
void HbComboBoxPrivate::touchAreaClicked( )
{
Q_Q( HbComboBox );
if ( mModel && mModel->rowCount( ) ) {
- addDropDownToScene();
+ addDropDownToScene( );
mDropDown->setVisible( true );
if( !mDropDown->mList ) {
mDropDown->createList( );
@@ -157,10 +158,10 @@
mDropDown->mList->setModel( mModel );
}
mDropDown->mList->scrollTo( mModel->index( 0, 0 ) );
- mDropDown->mList->setCurrentIndex(mModel->index( 0, 0 ), QItemSelectionModel::Select);
+ mDropDown->mList->setCurrentIndex( mModel->index( 0, 0 ), QItemSelectionModel::Select );
}
#ifdef HB_EFFECTS
- HbEffect::start(mDropDown, HB_DROPD0WN_ITEM_TYPE, "appear");
+ HbEffect::start( mDropDown, HB_DROPD0WN_ITEM_TYPE, "appear" );
#endif
positionDropDown( );
}
@@ -173,12 +174,12 @@
void HbComboBoxPrivate::vkbClosed()
{
- if( mDropDown->isVisible()) {
- positionDropDown();
+ if( mDropDown->isVisible( ) ) {
+ positionDropDown( );
}
}
-void HbComboBoxPrivate::showPopup( QAbstractItemModel* aModel, QModelIndex aIndex )
+void HbComboBoxPrivate::showPopup( QAbstractItemModel *aModel, QModelIndex aIndex )
{
Q_UNUSED( aModel );
Q_UNUSED( aIndex );
@@ -194,7 +195,7 @@
mDropDown->mList->setModel( aModel );
if ( aIndex.isValid( ) ) {
mDropDown->mList->scrollTo( aIndex, HbAbstractItemView::PositionAtTop );
- mDropDown->mList->setCurrentIndex(mCurrentIndex, QItemSelectionModel::Select);
+ mDropDown->mList->setCurrentIndex( mCurrentIndex, QItemSelectionModel::Select );
} else {
mDropDown->mList->scrollTo( aModel->index( 0, 0 ) );
}
@@ -214,19 +215,17 @@
void HbComboBoxPrivate::calculateListItemHeight()
{
- if( mListItemHeight == -1 ) {
- QAbstractItemModel *model = mDropDown->mList->model( );
- if( mCurrentIndex.isValid( ) && mDropDown->mList->itemByIndex( mCurrentIndex ) ) {
- mListItemHeight = mDropDown->mList->itemByIndex( mCurrentIndex )->geometry( ).height( );
- } else if( model->index( 0, 0 ).isValid() && mDropDown->mList->itemByIndex( model->index( 0, 0 ) ) ) {
- mListItemHeight = mDropDown->mList->itemByIndex( model->index( 0, 0 ) )->geometry( ).height( );
- } else {
- HbListViewItem *proto = mDropDown->mList->listItemPrototype();
- HbListViewItem *temp = static_cast<HbListViewItem*>(proto->createItem());
- mListItemHeight = temp->effectiveSizeHint(Qt::PreferredSize).height();
- delete temp;
- temp = 0;
- }
+ QAbstractItemModel *model = mDropDown->mList->model( );
+ if( mCurrentIndex.isValid( ) && mDropDown->mList->itemByIndex( mCurrentIndex ) ) {
+ mListItemHeight = mDropDown->mList->itemByIndex( mCurrentIndex )->geometry( ).height( );
+ } else if( model->index( 0, 0 ).isValid() && mDropDown->mList->itemByIndex( model->index( 0, 0 ) ) ) {
+ mListItemHeight = mDropDown->mList->itemByIndex( model->index( 0, 0 ) )->geometry( ).height( );
+ } else {
+ HbListViewItem *proto = mDropDown->mList->listItemPrototype( );
+ HbListViewItem *temp = static_cast<HbListViewItem*>( proto->createItem( ) );
+ mListItemHeight = temp->effectiveSizeHint( Qt::PreferredSize ).height( );
+ delete temp;
+ temp = 0;
}
}
@@ -237,14 +236,31 @@
QRectF sceneRect( QPointF( ), HbDeviceProfile::profile( q ).logicalSize( ) );
QPointF widgetPos = q->scenePos( );
QAbstractItemModel *model = mDropDown->mList->model( );
- calculateListItemHeight();
+ calculateListItemHeight( );
qreal totalHeightRequd = model->rowCount( ) * mListItemHeight;
+
qreal maxPopupHeight = 0.0;
- if(q->mainWindow()->orientation() == Qt::Horizontal ) {
- maxPopupHeight = 5 * mListItemHeight;
- } else if(q->mainWindow()->orientation() == Qt::Vertical ) {
- maxPopupHeight = 8 * mListItemHeight;
+ //read the maximum rows in drop down for different orientation from css
+ if( q->mainWindow( )->orientation( ) == Qt::Horizontal ){
+ if( mDropDownRowsInLandscape == -1 ) {
+ HbStyleParameters params;
+ q->style( )->parameters( params );
+ params.addParameter( "max-rows-in-dropdown" );
+ q->polish( params );
+ mDropDownRowsInLandscape = params.value( "max-rows-in-dropdown" ).toInt( );
+ }
+ maxPopupHeight = mDropDownRowsInLandscape * mListItemHeight;
+ } else if( q->mainWindow( )->orientation( ) == Qt::Vertical ){
+ if( mDropDownRowsInPortrait == -1 ) {
+ HbStyleParameters params;
+ q->style( )->parameters(params);
+ params.addParameter( "max-rows-in-dropdown" );
+ q->polish( params );
+ mDropDownRowsInPortrait = params.value("max-rows-in-dropdown").toInt();
+ }
+ maxPopupHeight = mDropDownRowsInPortrait * mListItemHeight;
}
+
if ( totalHeightRequd < maxPopupHeight ) {
maxPopupHeight = totalHeightRequd;
}
@@ -254,7 +270,7 @@
//position of drop down in both editable and non-editable combobox depends upon
//the available space above and below combobox
if( (widgetPos.y( ) + q->rect( ).height( ) + maxPopupHeight) < sceneRect.height( ) ) {
- popupPos = QPointF( widgetPos.x(), widgetPos.y( )+ q->rect( ).height( ) );
+ popupPos = QPointF( widgetPos.x(), widgetPos.y( ) + q->rect( ).height( ) );
#ifdef HB_EFFECTS
if ( !mHasDownEffect ) {
mHasDownEffect = true;
@@ -265,8 +281,8 @@
HbEffectInternal::add( mDropDown, "combo_disappear_downl", "disappear" );
}
#endif
- } else if( widgetPos.y() - maxPopupHeight > 0.0 ) {
- popupPos = QPointF( widgetPos.x(), widgetPos.y()-maxPopupHeight );
+ } else if( widgetPos.y( ) - maxPopupHeight > 0.0 ) {
+ popupPos = QPointF( widgetPos.x( ), widgetPos.y( ) - maxPopupHeight );
#ifdef HB_EFFECTS
if ( !mHasUpEffect ) {
// this is temporary until proper effect theming comes.
@@ -274,7 +290,7 @@
mHasUpEffect = true;
mHasDownEffect = false;
HbEffectInternal::add( mDropDown, "combo_appear_up", "appear" );
- HbEffectInternal::add( mDropDown, "combo_disappear_up", "disappear" );
+ HbEffectInternal::add( mDropDown, "combo_disappear_up", "disappear" );
}
#endif
} else {
@@ -310,22 +326,22 @@
// drop down will come on top/below of combo based upon which side has more space
// available
- HbEditorInterface editorInterface(q);
- HbVkbHost *host = editorInterface.vkbHost();
+ HbEditorInterface editorInterface( q );
+ HbVkbHost *host = editorInterface.vkbHost( );
if ( host ) {
- QSizeF keyBoardArea = host->keyboardArea();
- QSize screenSize = HbDeviceProfile::profile(q).logicalSize();
+ QSizeF keyBoardArea = host->keyboardArea( );
+ QSize screenSize = HbDeviceProfile::profile( q ).logicalSize( );
- qreal heightDifference = screenSize.height() - keyBoardArea.height();
- qreal topSpace = widgetPos.y();
- qreal bottomSpace = heightDifference - topSpace - q->boundingRect().height();
+ qreal heightDifference = screenSize.height( ) - keyBoardArea.height( );
+ qreal topSpace = widgetPos.y( );
+ qreal bottomSpace = heightDifference - topSpace - q->boundingRect( ).height( );
if( topSpace > bottomSpace ) {
//display drop down at top
- if( widgetPos.y() - maxPopupHeight > 0.0 ) {
- popupPos = QPointF( widgetPos.x(), widgetPos.y() - maxPopupHeight );
+ if( widgetPos.y( ) - maxPopupHeight > 0.0 ) {
+ popupPos = QPointF( widgetPos.x( ), widgetPos.y( ) - maxPopupHeight );
} else {
- popupPos = QPointF( widgetPos.x(), 0.0 );
+ popupPos = QPointF( widgetPos.x( ), 0.0 );
popupSize.setHeight( topSpace );
}
#ifdef HB_EFFECTS
@@ -341,7 +357,7 @@
} else {
//display drop down at bottom
- popupPos = QPointF( widgetPos.x(), widgetPos.y( ) + q->rect( ).height( ) );
+ popupPos = QPointF( widgetPos.x( ), widgetPos.y( ) + q->rect( ).height( ) );
if( bottomSpace < maxPopupHeight ) {
popupSize.setHeight( bottomSpace );
}
@@ -362,9 +378,9 @@
mDropDown->setMinimumSize( popupSize );
mDropDown->setMaximumSize( popupSize );
mDropDown->setPos(popupPos);
- QGraphicsWidget* p = q;
- while(p->parentWidget()) {
- p = p->parentWidget();
+ QGraphicsWidget *p = q;
+ while ( p->parentWidget( ) ) {
+ p = p->parentWidget( );
}
mDropDown->setZValue( p->zValue( ) + 1 );
}
@@ -379,8 +395,8 @@
mLineEdit->setText( mText );
} else {
HbStyleOptionComboBox comboBoxOption;
- q->initStyleOption(&comboBoxOption);
- q->style()->updatePrimitive( mTextItem, HbStyle::P_ComboBox_text, &comboBoxOption);
+ q->initStyleOption( &comboBoxOption );
+ q->style( )->updatePrimitive( mTextItem, HbStyle::P_ComboBox_text, &comboBoxOption);
}
mCurrentIndex = aIndex;
} else {
@@ -412,15 +428,17 @@
if ( mCompleter ) {
mCompleter->setCompletionPrefix( aString );
mCompleter->complete( );
- if( mCompleter->currentRow() == -1 )
- {
+ if( mCompleter->currentRow() == -1 ) {
if (( mDropDown ) && ( mDropDown->isVisible() )) {
mDropDown->setVisible(false);
}
}
}
} else {
- showPopup( mModel, mCurrentIndex);
+ if( mDropDown ) {
+ mDropDown->setVisible(false);
+ }
+ //showPopup( mModel, mCurrentIndex);
}
emit q->editTextChanged( aString );
}
@@ -482,8 +500,7 @@
return;
}
mEditable = editable;
- if( editable )
- {
+ if( editable ) {
if( mTextItem ) {
HbStyle::setItemName( mTextItem, "" );
delete mTextItem;
@@ -546,9 +563,8 @@
if ( q->scene( ) ) {
q->scene( )->addItem( mDropDown );
}
- QGraphicsScene *scene1 = mDropDown->scene( );
- if( scene1 )
- {
+ HbGraphicsScene *scene1 = static_cast<HbGraphicsScene*>( mDropDown->scene( ) );
+ if( scene1 ) {
scene1->installEventFilter( mDropDown );
//scene1->grabGesture( Qt::TapGesture );
}
@@ -574,7 +590,7 @@
} else {
HbStyleOptionComboBox comboBoxOption;
q->initStyleOption(&comboBoxOption);
- q->style()->updatePrimitive( mTextItem, HbStyle::P_ComboBox_text, &comboBoxOption);
+ q->style( )->updatePrimitive( mTextItem, HbStyle::P_ComboBox_text, &comboBoxOption );
}
}
currentIndexChanged( mCurrentIndex );
@@ -610,5 +626,3 @@
}
#include "moc_hbcombobox.cpp"
-
-
--- a/src/hbwidgets/widgets/hbcombobox_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/widgets/hbcombobox_p.h Fri May 14 16:09:54 2010 +0300
@@ -110,6 +110,8 @@
bool mHasUpEffect;
QString mText;
qreal mListItemHeight;
+ int mDropDownRowsInPortrait;
+ int mDropDownRowsInLandscape;
};
class HbComboListViewItem : public HbListViewItem
--- a/src/hbwidgets/widgets/hbcombodropdown_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/widgets/hbcombodropdown_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -30,9 +30,9 @@
#ifdef HB_GESTURE_FW
#include <hbtapgesture.h>
+#include <hbpangesture.h>
#endif
-
HbComboDropDown::HbComboDropDown( HbComboBoxPrivate *comboBoxPrivate, QGraphicsItem *parent )
:HbWidget( parent ),
mList( 0 ),
@@ -40,14 +40,14 @@
vkbOpened( false ),
backgroundPressed( false )
{
- setBackgroundItem( HbStyle::P_ComboBoxPopup_background );
+ setBackgroundItem( HbStyle::P_ComboBoxPopup_background );
#if QT_VERSION >= 0x040600
//this is to keep the focus in the previous widget.
setFlag( QGraphicsItem::ItemIsPanel, true );
setActive( false );
#endif
- //setFlag(QGraphicsItem::ItemIsPanel);
- //setPanelModality(PanelModal);
+ //setFlag(QGraphicsItem::ItemIsPanel);
+ //setPanelModality(PanelModal);
}
HbComboDropDown::~HbComboDropDown( )
@@ -61,7 +61,7 @@
mList->setLongPressEnabled(false);
HbComboListViewItem *protoType = new HbComboListViewItem(this);
mList->setItemPrototype( protoType );
- HbStyle::setItemName( mList , "list" );
+ HbStyle::setItemName( mList, "list" );
mList->setUniformItemSizes( true );
mList->setSelectionMode( HbAbstractItemView::SingleSelection );
}
@@ -98,7 +98,7 @@
case QEvent::GraphicsSceneMouseRelease:
{
if( !( this->isUnderMouse( ) ) && backgroundPressed ) {
- HbWidgetFeedback::triggered(this, Hb::InstantPopupClosed);
+ HbWidgetFeedback::triggered( this, Hb::InstantPopupClosed );
setVisible( false );
backgroundPressed = false;
accepted = true;
@@ -107,8 +107,14 @@
break;
case QEvent::Gesture:
{
- if(!this->isUnderMouse()) {
- accepted = true;
+ if( !this->isUnderMouse() ) {
+ //if its a pan gesture then don't accept the event so that list can be scrolled
+ //even if mouse is outside drop down area
+ if(QGestureEvent *gestureEvent = static_cast<QGestureEvent *>( event ) ) {
+ if( !qobject_cast<HbPanGesture *>( gestureEvent->gesture( Qt::PanGesture ) ) ) {
+ accepted = true;
+ }
+ }
}
}
break;
--- a/src/hbwidgets/widgets/hbdatetimepicker.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/widgets/hbdatetimepicker.cpp Fri May 14 16:09:54 2010 +0300
@@ -25,7 +25,7 @@
#include "hbdatetimepicker_p.h"
#include "hbdatetimepicker.h"
-#include "hbstyleoption.h"
+#include "hbstyleoption_p.h"
/*!
@beta
--- a/src/hbwidgets/widgets/hbdatetimepicker_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/widgets/hbdatetimepicker_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -25,7 +25,7 @@
#include "hbdatetimepicker_p.h"
#include "hbdatetimepicker.h"
-#include "hbstyleoption.h"
+#include "hbstyleoption_p.h"
#include "hbfeaturemanager_p.h"
//TODO:remove frameitem dependency
--- a/src/hbwidgets/widgets/hbgroupbox.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/widgets/hbgroupbox.cpp Fri May 14 16:09:54 2010 +0300
@@ -23,12 +23,12 @@
**
****************************************************************************/
-#include <hbgroupbox.h>
+#include "hbgroupbox.h"
#include "hbgroupbox_p.h"
#include "hbgroupboxheadingwidget_p.h"
#include "hbgroupboxcontentwidget_p.h"
#include <hbstyle.h>
-#include <hbstyleoption.h>
+#include <hbstyleoption_p.h>
#ifdef HB_EFFECTS
#include <hbeffect.h>
@@ -51,7 +51,8 @@
HbGroupBoxPrivate::HbGroupBoxPrivate()
:HbWidgetPrivate(),
mContentWidget( 0 ),
- mHeadingWidget( 0 )
+ mHeadingWidget( 0 ),
+ mGroupBoxType( GroupBoxTypeUnknown )
{
}
@@ -107,7 +108,7 @@
case GroupBoxSimpleLabel:
{
if(mHeadingWidget){
- mHeadingWidget->setType(type);
+ mHeadingWidget->setType(type);
mHeadingWidget->setVisible(true);
}else{
@@ -128,7 +129,7 @@
}
if(mContentWidget){
- mContentWidget->setType(type);
+ mContentWidget->setType(type);
mContentWidget->setVisible(true);
HbStyle::setItemName( mContentWidget , "contentwidget");
}else{
@@ -140,7 +141,7 @@
case GroupBoxCollapsingContainer:
{
if((mHeadingWidget)){
- mHeadingWidget->setType(type);
+ mHeadingWidget->setType(type);
mHeadingWidget->setVisible(true);
}else{
createHeadingWidget();
@@ -151,9 +152,9 @@
if(!q->isCollapsed()){
mContentWidget->setVisible(true);
HbStyle::setItemName( mContentWidget , "contentwidget");
- }else{
- mContentWidget->setVisible(false);
- HbStyle::setItemName( mContentWidget , "");
+ }else{
+ mContentWidget->setVisible(false);
+ HbStyle::setItemName( mContentWidget , "");
}
}else{
createContentWidget();
@@ -282,19 +283,6 @@
d->q_ptr = this;
}
-/*! Constructs a group box with the given \a title and \a parent.
-
- \deprecated HbGroupBox::HbGroupBox(const QString&, QGraphicsItem*)
- is deprecated.This version of overloaded constructor is deprecated and cease to exist in the near future
- */
-HbGroupBox::HbGroupBox(const QString &titleText, QGraphicsItem *parent )
- : HbWidget(*new HbGroupBoxPrivate, parent)
-{
- Q_UNUSED(titleText);
- Q_UNUSED(parent);
- qDebug() << "this version of constructor is deprecated and will cease to exist in the near future.";
-}
-
/*!
protected constructor for derived class
*/
@@ -585,7 +573,7 @@
Q_D( const HbGroupBox );
if(d->mContentWidget && d->mGroupBoxType != GroupBoxSimpleLabel)
return d->mContentWidget->mContent;
- return NULL;
+ return 0;
}
/*!
@@ -613,9 +601,9 @@
return d->mContentWidget->primitive(primitive);
break;
default:
- return NULL;
+ return 0;
}
- return NULL;
+ return 0;
}
/*!
@@ -632,122 +620,4 @@
d->mContentWidget->updatePrimitives();
}
-/*!
- Sets the group box title text
-
- There is no default title text.
-
- Note: titletext property is valid for simpleLabel & collapsing container type
- If titletext is set on richLabel type groupBox, it will be ignored
-
- \deprecated HbGroupBox::setTitleText(const QString&)
- is deprecated.Please use HbGroupBox::setHeading(const QString&) instead
-
- \sa titleText
-*/
-void HbGroupBox::setTitleText( const QString &text )
-{
- qDebug() << "This API is deprecated, please use HbGroupBox::setHeading( const QString &text ) instead.";
- setHeading(text);
-}
-
-/*!
- Returns title text shown on group box
-
- Note: If the groupBox type is RichLabel, then this will return NULL string
-
- \deprecated HbGroupBox::titleText() const
- is deprecated. Please use HbGroupBox::heading() const instead
-
- \sa setTitleText
-*/
-QString HbGroupBox::titleText( ) const
-{
- qDebug() << "This API is deprecated, please use HbGroupBox::heading( ) instead.";
- return heading();
-}
-
-/*!
- Sets the group box title widget
-
- There is no default title widget.
-
- Note: 1)if user set title text after this \li setTitleText then,title widget will be set to null .
- Either title text or title widget can be set, both cant se set.
- 2) GroupBox takes ownership of titlewidget and deletes the old title widget
-
- \deprecated HbGroupBox::setTitleWidget(HbWidget*)
- is deprecated. TitleWidget concept is removed. GroupBox nomore supports widget in the heading part
-
- \sa setTitleText \sa titleWidget
- */
-void HbGroupBox::setTitleWidget( HbWidget* widget )
-{
- Q_UNUSED(widget);
- qDebug() << "This API is deprecated and will cease to exist in the near future.";
-}
-
-/*!
- Returns group box title widget
-
- There is no default title widget.
-
- Note: If title text is set, then this will return HbLabel
-
- \deprecated HbGroupBox::titleWidget() const
- is deprecated. TitleWidget concept is removed. GroupBox nomore supports widget in the heading part
-
- \sa setTitleWidget
- */
-HbWidget* HbGroupBox::titleWidget( ) const
-{
- qDebug() << "This API is deprecated and will cease to exist in the near future.";
- return NULL;
-}
-
-/*!
- Returns the alignment of the group box title.
-
- The default alignment is Qt::AlignLeft.
-
- \deprecated HbGroupBox::textAlignment() const
- is deprecated. GroupBox heading will always be left aligned
-
- \sa Qt::Alignment
- */
-Qt::Alignment HbGroupBox::textAlignment() const
-{
- qDebug() << "This API is deprecated and will cease to exist in the near future.";
- return NULL;
-}
-
-/*!
- Sets the alignment of the group box title.
-
- Most styles place the title at the top of the frame. The horizontal
- alignment of the title can be specified using single values from
- the following list:
-
- \list
- \i Qt::AlignLeft aligns the title text on the left-hand side .
- \i Qt::AlignRight aligns the title text on the right-hand side .
- \i Qt::AlignHCenter aligns the title text with the horizontal center of the group box.
- \endlist
-
- The default alignment is Qt::AlignLeft.
-
- Note: This API will not work if heading is set as widget \li setTitleWidget
- This alignment is only of heading text \li setTitleText
-
- \deprecated HbGroupBox::setTextAlignment(QFlags<Qt::AlignmentFlag>)
- is deprecated. GroupBox heading will always be left aligned.
-
- \sa Qt::Alignment
- */
-void HbGroupBox::setTextAlignment(Qt::Alignment alignment)
-{
- Q_UNUSED(alignment);
- qDebug() << "This API is deprecated and will cease to exist in the near future.";
-}
-
#include "moc_hbgroupbox.cpp"
--- a/src/hbwidgets/widgets/hbgroupbox.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/widgets/hbgroupbox.h Fri May 14 16:09:54 2010 +0300
@@ -33,70 +33,48 @@
class HB_WIDGETS_EXPORT HbGroupBox : public HbWidget
{
Q_OBJECT
- //Deprecated
- Q_PROPERTY(QString titleText READ titleText WRITE setTitleText)
- //Deprecated
- Q_PROPERTY(Qt::Alignment textAlignment READ textAlignment WRITE setTextAlignment)
-
- Q_PROPERTY(QString heading READ heading WRITE setHeading)
- Q_PROPERTY(bool collapsable READ isCollapsable WRITE setCollapsable)
- Q_PROPERTY(bool collapsed READ isCollapsed WRITE setCollapsed)
- Q_PROPERTY(bool marqueeHeading READ marqueeHeading WRITE setMarqueeHeading)
+ Q_PROPERTY( QString heading READ heading WRITE setHeading )
+ Q_PROPERTY( bool collapsable READ isCollapsable WRITE setCollapsable )
+ Q_PROPERTY( bool collapsed READ isCollapsed WRITE setCollapsed )
+ Q_PROPERTY( bool marqueeHeading READ marqueeHeading WRITE setMarqueeHeading )
public:
- explicit HbGroupBox(QGraphicsItem *parent = 0);
- //Deprecated
- explicit HbGroupBox( const QString &titleText, QGraphicsItem *parent = 0 );
- ~HbGroupBox();
+ explicit HbGroupBox( QGraphicsItem *parent = 0 );
+ ~HbGroupBox( );
- void setHeading(const QString &text);
- QString heading() const;
-
- bool isCollapsable() const;
- bool isCollapsed() const;
+ void setHeading( const QString &text );
+ QString heading( ) const;
- void setMarqueeHeading(bool marquee = false);
- bool marqueeHeading() const;
-
- void setContentWidget(HbWidget* widget);
- HbWidget* contentWidget() const;
+ bool isCollapsable( ) const;
+ bool isCollapsed( ) const;
- virtual QGraphicsItem *primitive(HbStyle::Primitive primitive) const;
-
- enum {Type = Hb::ItemType_GroupBox};
- int type() const { return Type; }
-
- //Deprecated
- void setTitleText(const QString &text);
- //Deprecated
- QString titleText() const;
+ void setMarqueeHeading( bool marquee = false );
+ bool marqueeHeading( ) const;
+
+ void setContentWidget( HbWidget *widget );
+ HbWidget *contentWidget( ) const;
- //Deprecated
- void setTitleWidget( HbWidget* widget );
- //Deprecated
- HbWidget* titleWidget( ) const;
+ virtual QGraphicsItem *primitive( HbStyle::Primitive primitive ) const;
- //Deprecated
- Qt::Alignment textAlignment() const;
- //Deprecated
- void setTextAlignment(Qt::Alignment alignment);
+ enum { Type = Hb::ItemType_GroupBox };
+ int type( ) const { return Type; }
public slots:
- void updatePrimitives();
- void setCollapsed(bool collapsed = true);
- void setCollapsable(bool collapsable = true);
+ void updatePrimitives( );
+ void setCollapsed( bool collapsed = true );
+ void setCollapsable( bool collapsable = true );
-signals:
- void clicked();
+ signals:
+ void clicked();
void longPress(const QPointF &delta);
void toggled(bool state);
protected:
- HbGroupBox(HbGroupBoxPrivate &dd, QGraphicsItem *parent);
+ HbGroupBox( HbGroupBoxPrivate &dd, QGraphicsItem *parent );
private:
- Q_DECLARE_PRIVATE_D(d_ptr, HbGroupBox)
- Q_DISABLE_COPY(HbGroupBox)
+ Q_DECLARE_PRIVATE_D( d_ptr, HbGroupBox )
+ Q_DISABLE_COPY( HbGroupBox )
};
#endif //HbGroupBox_H
--- a/src/hbwidgets/widgets/hbgroupbox_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/widgets/hbgroupbox_p.h Fri May 14 16:09:54 2010 +0300
@@ -35,7 +35,8 @@
enum GroupBoxType{
GroupBoxSimpleLabel = 0x01,
GroupBoxRichLabel = 0x02,
- GroupBoxCollapsingContainer = 0x03
+ GroupBoxCollapsingContainer = 0x03,
+ GroupBoxTypeUnknown = 0x04
};
/*
--- a/src/hbwidgets/widgets/hbgroupboxcontentwidget_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/widgets/hbgroupboxcontentwidget_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -24,10 +24,8 @@
****************************************************************************/
#include "hbgroupboxcontentwidget_p.h"
-#include <hbstyleoption.h>
+#include <hbstyleoption_p.h>
#include <hbscrollarea.h>
-#include <hbgesturefilter.h>
-#include <hbgesture.h>
#include <QGraphicsSceneMouseEvent>
#include <hbwidgetfeedback.h>
#ifdef HB_GESTURE_FW
@@ -50,8 +48,8 @@
HbWidget(parent),
mContent(0),
mBackgroundItem(0),
+ groupBoxType( GroupBoxTypeUnknown ),
contentPressed(false)
-
{
groupBox = qgraphicsitem_cast<HbGroupBox*>( parent );
@@ -122,16 +120,18 @@
*/
void HbGroupBoxContentWidget::setType(GroupBoxType type)
{
- groupBoxType = type;
- // set dynamic properties for type
- if(groupBoxType == GroupBoxCollapsingContainer)
- setProperty("groupBoxType",3);
- else if(groupBoxType == GroupBoxRichLabel)
- setProperty("groupBoxType",2);
+ if( groupBoxType != type ){
+ groupBoxType = type;
+ // set dynamic properties for type
+ if(groupBoxType == GroupBoxCollapsingContainer)
+ setProperty("groupBoxType",3);
+ else if(groupBoxType == GroupBoxRichLabel)
+ setProperty("groupBoxType",2);
- if(groupBoxType != GroupBoxSimpleLabel){
- createPrimitives();
- //createConnection();
+ if(groupBoxType != GroupBoxSimpleLabel){
+ createPrimitives();
+ //createConnection();
+ }
}
}
@@ -147,7 +147,7 @@
delete mContent;
mContent = 0;
}
- // if NULL widget is passed dont do anything
+ // if NULL widget is passed don't do anything
if ( !widget ) {
return;
}
--- a/src/hbwidgets/widgets/hbgroupboxcontentwidget_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/widgets/hbgroupboxcontentwidget_p.h Fri May 14 16:09:54 2010 +0300
@@ -31,8 +31,6 @@
#include <hbgroupbox.h>
#include "hbgroupbox_p.h"
-class HbGestureSceneFilter;
-class HbGesture;
class QGestureEvent;
class HB_AUTOTEST_EXPORT HbGroupBoxContentWidget : public HbWidget
--- a/src/hbwidgets/widgets/hbgroupboxheadingwidget_p.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/widgets/hbgroupboxheadingwidget_p.cpp Fri May 14 16:09:54 2010 +0300
@@ -25,7 +25,7 @@
#include "hbgroupboxheadingwidget_p.h"
-#include <hbstyleoptiongroupbox.h>
+#include <hbstyleoptiongroupbox_p.h>
#include <hbwidgetfeedback.h>
#ifdef HB_EFFECTS
@@ -50,26 +50,27 @@
HbGroupBoxHeadingWidget holds the heading text and allows the groupBox to set marquee on it.
*/
-HbGroupBoxHeadingWidget::HbGroupBoxHeadingWidget(QGraphicsItem *parent ) :
- HbWidget(parent),
+HbGroupBoxHeadingWidget::HbGroupBoxHeadingWidget( QGraphicsItem *parent ) :
+ HbWidget( parent ),
mIconItem( 0 ),
mTextItem( 0 ),
mBackgroundItem( 0 ),
collapsable( true ),
collapsed( false),
marqueeEnabled( false ),
- headingPressed(false)
+ headingPressed(false),
+ groupBoxType( GroupBoxTypeUnknown )
{
groupBox = qgraphicsitem_cast<HbGroupBox*>( parent );
- init();
- setProperty("state", "normal");
+ init( );
+ setProperty( "state", "normal" );
}
/*
internal
Destructs HbGroupBoxHeadingWidget
*/
-HbGroupBoxHeadingWidget::~HbGroupBoxHeadingWidget()
+HbGroupBoxHeadingWidget::~HbGroupBoxHeadingWidget( )
{
}
@@ -77,16 +78,15 @@
internal
init
*/
-void HbGroupBoxHeadingWidget::init()
+void HbGroupBoxHeadingWidget::init( )
{
- createPrimitives();
-
- if(groupBoxType == GroupBoxCollapsingContainer){
- createConnection();
+ createPrimitives( );
+ if ( groupBoxType == GroupBoxCollapsingContainer ){
+ createConnection( );
}
#ifdef HB_GESTURE_FW
- grabGesture(Qt::TapGesture);
+ grabGesture( Qt::TapGesture );
#endif
}
@@ -95,9 +95,9 @@
*/
void HbGroupBoxHeadingWidget::createPrimitives()
{
- if(groupBoxType == GroupBoxCollapsingContainer && collapsable){
+ if( groupBoxType == GroupBoxCollapsingContainer && collapsable ){
if ( !mIconItem ) {
- mIconItem = style()->createPrimitive( HbStyle::P_GroupBoxHeading_icon , this );
+ mIconItem = style( )->createPrimitive( HbStyle::P_GroupBoxHeading_icon , this );
}
}
else if ( mIconItem ) {
@@ -106,18 +106,18 @@
}
if ( mTextItem ) {
delete mTextItem;
- mTextItem = 0 ;
+ mTextItem = 0;
}
if ( groupBoxType == GroupBoxCollapsingContainer ) {
- mTextItem = style()->createPrimitive( HbStyle::P_GroupBoxHeading_text , this );
+ mTextItem = style( )->createPrimitive( HbStyle::P_GroupBoxHeading_text , this );
}
else {
- mTextItem = style()->createPrimitive( HbStyle::P_GroupBoxMarquee_text , this );
+ mTextItem = style( )->createPrimitive( HbStyle::P_GroupBoxMarquee_text , this );
}
if ( !mBackgroundItem ) {
- mBackgroundItem = style()->createPrimitive( HbStyle::P_GroupBoxHeading_background , this );
- style()->setItemName( mBackgroundItem , "background" );
+ mBackgroundItem = style( )->createPrimitive( HbStyle::P_GroupBoxHeading_background , this );
+ style( )->setItemName( mBackgroundItem , "background" );
}
}
@@ -130,18 +130,18 @@
initStyleOption( &option );
if ( mIconItem ) {
- style()->updatePrimitive( mIconItem , HbStyle::P_GroupBoxHeading_icon , &option );
+ style( )->updatePrimitive( mIconItem , HbStyle::P_GroupBoxHeading_icon , &option );
}
if ( mTextItem ) {
if ( groupBoxType == GroupBoxCollapsingContainer ) {
- style()->updatePrimitive( mTextItem , HbStyle::P_GroupBoxHeading_text , &option );
+ style( )->updatePrimitive( mTextItem , HbStyle::P_GroupBoxHeading_text , &option );
}
else {
- style()->updatePrimitive( mTextItem , HbStyle::P_GroupBoxMarquee_text , &option );
+ style( )->updatePrimitive( mTextItem , HbStyle::P_GroupBoxMarquee_text , &option );
}
}
if ( mBackgroundItem ) {
- style()->updatePrimitive( mBackgroundItem , HbStyle::P_GroupBoxHeading_background , &option );
+ style( )->updatePrimitive( mBackgroundItem , HbStyle::P_GroupBoxHeading_background , &option );
}
}
@@ -153,10 +153,10 @@
{
#ifdef HB_EFFECTS
- HbEffectInternal::add(HB_GROUPBOX_HEADING_TYPE,"groupbox_icon_click", "iconclick");
+ HbEffectInternal::add( HB_GROUPBOX_HEADING_TYPE,"groupbox_icon_click", "iconclick" );
#endif
- connect ( this , SIGNAL ( clicked(bool) ) , groupBox , SLOT ( setCollapsed(bool) ));
+ connect ( this , SIGNAL ( clicked(bool) ) , groupBox , SLOT ( setCollapsed(bool) ) );
}
/*!
@@ -166,30 +166,30 @@
*/
void HbGroupBoxHeadingWidget::setType(GroupBoxType type)
{
- if ( groupBoxType == type )
- return;
- groupBoxType = type;
- // setting dynamic properties for type
- if(groupBoxType == GroupBoxCollapsingContainer)
- setProperty("groupBoxType",3);
- else if(groupBoxType == GroupBoxSimpleLabel)
- setProperty("groupBoxType",1);
+ if ( groupBoxType != type ){
+ groupBoxType = type;
+ // setting dynamic properties for type
+ if( groupBoxType == GroupBoxCollapsingContainer )
+ setProperty( "groupBoxType",3 );
+ else if( groupBoxType == GroupBoxSimpleLabel )
+ setProperty( "groupBoxType",1 );
+
+ if( groupBoxType != GroupBoxRichLabel ){
+ createPrimitives( );
+ }
- if(groupBoxType != GroupBoxRichLabel){
- createPrimitives();
- }
+ if( groupBoxType == GroupBoxCollapsingContainer ){
+ createConnection();
+ // collapsed is false by default for CollapsingContainer
+ collapsed = false;
+ // marquee is disabled by default for CollapsingContainer
+ marqueeEnabled = false;
+ }
- if(groupBoxType == GroupBoxCollapsingContainer){
- createConnection();
- // collapsed is false by default for CollapsingContainer
- collapsed = false;
- // marquee is disabled by default for CollapsingContainer
+ if( groupBoxType == GroupBoxSimpleLabel ){
+ // marquee is disabled by default for simple label
marqueeEnabled = false;
- }
-
- if(groupBoxType == GroupBoxSimpleLabel){
- // marquee is disabled by default for simple label
- marqueeEnabled = false;
+ }
}
}
@@ -198,7 +198,7 @@
internal
Sets the groupbox heading widgets text
*/
-void HbGroupBoxHeadingWidget::setHeading(const QString &text)
+void HbGroupBoxHeadingWidget::setHeading( const QString &text )
{
if( headingText == text )
return;
@@ -206,12 +206,12 @@
headingText = text;
HbStyleOptionGroupBox groupBoxOption;
- initStyleOption(&groupBoxOption);
+ initStyleOption( &groupBoxOption );
if ( groupBoxType == GroupBoxCollapsingContainer ) {
- style()->updatePrimitive( mTextItem , HbStyle::P_GroupBoxHeading_text , &groupBoxOption );
+ style( )->updatePrimitive( mTextItem , HbStyle::P_GroupBoxHeading_text , &groupBoxOption );
}
else {
- style()->updatePrimitive( mTextItem , HbStyle::P_GroupBoxMarquee_text , &groupBoxOption );
+ style( )->updatePrimitive( mTextItem , HbStyle::P_GroupBoxMarquee_text , &groupBoxOption );
}
}
@@ -227,7 +227,7 @@
marqueeEnabled = marquee;
HbStyleOptionGroupBox groupBoxOption;
- initStyleOption(&groupBoxOption);
+ initStyleOption( &groupBoxOption );
style()->updatePrimitive( mTextItem, HbStyle::P_GroupBoxMarquee_text, &groupBoxOption);
}
@@ -239,7 +239,7 @@
Returns the pointer for \a primitive passed.
Will return NULL if \a primitive passed is invalid
*/
-QGraphicsItem* HbGroupBoxHeadingWidget::primitive(HbStyle::Primitive primitive) const
+QGraphicsItem *HbGroupBoxHeadingWidget::primitive( HbStyle::Primitive primitive ) const
{
switch (primitive) {
case HbStyle::P_GroupBoxHeading_icon:
@@ -260,28 +260,28 @@
is useful for subclasses when they need a HbStyleOptionGroupBox, but don't want
to fill in all the information themselves.
*/
-void HbGroupBoxHeadingWidget::initStyleOption(HbStyleOptionGroupBox *option) const
+void HbGroupBoxHeadingWidget::initStyleOption( HbStyleOptionGroupBox *option ) const
{
HbWidget::initStyleOption( option );
option->collapsed = collapsed;
option->heading = headingText;
option->marqueeEnabled = marqueeEnabled;
// state & type info reqd fo background primitve updation
- if (headingPressed ) {
+ if ( headingPressed ) {
option->state = QStyle::State_On;
} else {
option->state = QStyle::State_Off;
}
- if(groupBoxType == GroupBoxCollapsingContainer)
+ if( groupBoxType == GroupBoxCollapsingContainer )
option->groupBoxType = HbStyleOptionGroupBox::GroupBoxCollapsingContainer;
- else if(groupBoxType == GroupBoxSimpleLabel)
+ else if( groupBoxType == GroupBoxSimpleLabel )
option->groupBoxType = HbStyleOptionGroupBox::GroupBoxSimpleLabel;
}
/*!
\reimp
*/
-QVariant HbGroupBoxHeadingWidget::itemChange(GraphicsItemChange change, const QVariant &value)
+QVariant HbGroupBoxHeadingWidget::itemChange( GraphicsItemChange change, const QVariant &value )
{
switch ( change ) {
case ItemVisibleHasChanged: {
@@ -310,16 +310,16 @@
default:
break;
}
- return HbWidget::itemChange(change, value);
+ return HbWidget::itemChange( change, value );
}
/*!
\reimp
*/
-void HbGroupBoxHeadingWidget::mousePressEvent(QGraphicsSceneMouseEvent *event)
+void HbGroupBoxHeadingWidget::mousePressEvent( QGraphicsSceneMouseEvent *event )
{
#ifdef HB_GESTURE_FW
- Q_UNUSED(event)
+ Q_UNUSED( event )
#else
HbWidget::mousePressEvent( event );
if ( !collapsable ){
@@ -328,10 +328,10 @@
}
if (groupBoxType == GroupBoxCollapsingContainer) {
- HbWidgetFeedback::triggered(this, Hb::InstantPressed, Hb::ModifierCollapsedItem);
+ HbWidgetFeedback::triggered( this, Hb::InstantPressed, Hb::ModifierCollapsedItem );
}
else {
- HbWidgetFeedback::triggered(this, Hb::InstantPressed);
+ HbWidgetFeedback::triggered( this, Hb::InstantPressed );
}
event->accept();
@@ -339,10 +339,10 @@
headingPressed = true;
HbStyleOptionGroupBox groupBoxOption;
- initStyleOption(&groupBoxOption);
+ initStyleOption( &groupBoxOption );
style()->updatePrimitive( mBackgroundItem , HbStyle::P_GroupBoxHeading_background , &groupBoxOption );
- setProperty("state", "pressed");
+ setProperty( "state", "pressed" );
#endif
}
@@ -357,10 +357,10 @@
HbWidget::mouseReleaseEvent( event );
if (groupBoxType == GroupBoxCollapsingContainer) {
- HbWidgetFeedback::triggered(this, Hb::InstantReleased, Hb::ModifierCollapsedItem);
+ HbWidgetFeedback::triggered( this, Hb::InstantReleased, Hb::ModifierCollapsedItem );
}
else {
- HbWidgetFeedback::triggered(this, Hb::InstantReleased);
+ HbWidgetFeedback::triggered( this, Hb::InstantReleased );
}
if ( this->isUnderMouse() ) {
@@ -369,45 +369,45 @@
HbEffect::start( mIconItem, HB_GROUPBOX_HEADING_TYPE, "iconclick");
#endif
}
- emit clicked(!collapsed);
+ emit clicked( !collapsed );
}
// background primitive updation, upon mouse release
headingPressed = false;
HbStyleOptionGroupBox groupBoxOption;
- initStyleOption(&groupBoxOption);
+ initStyleOption( &groupBoxOption );
style()->updatePrimitive( mBackgroundItem , HbStyle::P_GroupBoxHeading_background , &groupBoxOption );
- setProperty("state", "normal");
+ setProperty( "state", "normal" );
#endif
}
#ifdef HB_GESTURE_FW
void HbGroupBoxHeadingWidget::gestureEvent(QGestureEvent *event)
{
- if(HbTapGesture *tap = qobject_cast<HbTapGesture *>(event->gesture(Qt::TapGesture))) {
- switch(tap->state()) {
+ if(HbTapGesture *tap = qobject_cast<HbTapGesture*>( event->gesture( Qt::TapGesture ) ) ) {
+ switch( tap->state() ) {
case Qt::GestureStarted: //
{
if ( !collapsable ){
- event->ignore(tap);
+ event->ignore( tap );
return;
}
- if (collapsable) {
- HbWidgetFeedback::triggered(this, Hb::InstantPressed, Hb::ModifierCollapsedItem);
+ if ( collapsable ) {
+ HbWidgetFeedback::triggered( this, Hb::InstantPressed, Hb::ModifierCollapsedItem );
}
else {
- HbWidgetFeedback::triggered(this, Hb::InstantPressed);
+ HbWidgetFeedback::triggered( this, Hb::InstantPressed );
}
// background primitive updation, upon mouse press
headingPressed = true;
HbStyleOptionGroupBox groupBoxOption;
- initStyleOption(&groupBoxOption);
+ initStyleOption( &groupBoxOption );
style()->updatePrimitive( mBackgroundItem , HbStyle::P_GroupBoxHeading_background , &groupBoxOption );
- setProperty("state", "pressed");
+ setProperty( "state", "pressed" );
}
break;
@@ -416,36 +416,36 @@
headingPressed = false;
HbStyleOptionGroupBox groupBoxOption;
- initStyleOption(&groupBoxOption);
+ initStyleOption( &groupBoxOption );
style()->updatePrimitive( mBackgroundItem , HbStyle::P_GroupBoxHeading_background , &groupBoxOption );
- setProperty("state", "normal");
+ setProperty( "state", "normal" );
break;
}
case Qt::GestureFinished: // emit clicked
{
- if (collapsable) {
- HbWidgetFeedback::triggered(this, Hb::InstantReleased, Hb::ModifierCollapsedItem);
+ if ( collapsable ) {
+ HbWidgetFeedback::triggered( this, Hb::InstantReleased, Hb::ModifierCollapsedItem );
} else {
- HbWidgetFeedback::triggered(this, Hb::InstantReleased);
+ HbWidgetFeedback::triggered( this, Hb::InstantReleased );
}
if ( this->isUnderMouse() ) {
- if ( mIconItem && mIconItem->isUnderMouse() ) {
+ if ( mIconItem && mIconItem->isUnderMouse( ) ) {
#ifdef HB_EFFECTS
- HbEffect::start( mIconItem, HB_GROUPBOX_HEADING_TYPE, "iconclick");
+ HbEffect::start( mIconItem, HB_GROUPBOX_HEADING_TYPE, "iconclick" );
#endif
}
- emit clicked(!collapsed);
+ emit clicked( !collapsed );
}
// background primitive updation, upon mouse release
headingPressed = false;
HbStyleOptionGroupBox groupBoxOption;
- initStyleOption(&groupBoxOption);
- style()->updatePrimitive( mBackgroundItem , HbStyle::P_GroupBoxHeading_background , &groupBoxOption );
+ initStyleOption( &groupBoxOption );
+ style()->updatePrimitive( mBackgroundItem, HbStyle::P_GroupBoxHeading_background, &groupBoxOption );
- setProperty("state", "normal");
+ setProperty( "state", "normal" );
}
break;
default:
--- a/src/hbwidgets/widgets/hbgroupboxheadingwidget_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/widgets/hbgroupboxheadingwidget_p.h Fri May 14 16:09:54 2010 +0300
@@ -34,28 +34,28 @@
class HbStyleOptionGroupBox;
class QGestureEvent;
-
class HB_AUTOTEST_EXPORT HbGroupBoxHeadingWidget : public HbWidget
{
Q_OBJECT
public:
- HbGroupBoxHeadingWidget(QGraphicsItem *parent = 0);
- ~HbGroupBoxHeadingWidget();
- void init();
- void createPrimitives();
- void updatePrimitives();
+ HbGroupBoxHeadingWidget( QGraphicsItem *parent = 0 );
+ ~HbGroupBoxHeadingWidget( );
- void createConnection();
- void setType(GroupBoxType type);
- void setHeading(const QString &text);
- void setMarqueeHeading(bool marquee);
+ void init( );
+ void createPrimitives( );
+ void updatePrimitives( );
- QGraphicsItem* primitive(HbStyle::Primitive primitive) const;
+ void createConnection( );
+ void setType( GroupBoxType type );
+ void setHeading( const QString &text );
+ void setMarqueeHeading( bool marquee );
+
+ QGraphicsItem *primitive( HbStyle::Primitive primitive ) const;
enum { Type = HbPrivate::ItemType_GroupBoxHeadingWidget };
- int type() const { return Type; }
+ int type( ) const { return Type; }
public:
QGraphicsItem *mIconItem;
@@ -74,12 +74,12 @@
void clicked( bool checked = false );
protected:
- void initStyleOption(HbStyleOptionGroupBox *option) const;
- QVariant itemChange(GraphicsItemChange change, const QVariant &value);
- void mousePressEvent(QGraphicsSceneMouseEvent *event);
- void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
+ void initStyleOption( HbStyleOptionGroupBox *option ) const;
+ QVariant itemChange( GraphicsItemChange change, const QVariant &value );
+ void mousePressEvent( QGraphicsSceneMouseEvent *event );
+ void mouseReleaseEvent( QGraphicsSceneMouseEvent *event );
#ifdef HB_GESTURE_FW
- void gestureEvent(QGestureEvent *event);
+ void gestureEvent( QGestureEvent *event );
#endif
};
--- a/src/hbwidgets/widgets/hblabel.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/widgets/hblabel.cpp Fri May 14 16:09:54 2010 +0300
@@ -35,7 +35,7 @@
#include "hbinstance.h"
#include "hbcolorscheme.h"
#include "hbwidget_p.h"
-#include "hbstyleoptionlabel.h"
+#include "hbstyleoptionlabel_p.h"
#include "hbwidgetbase.h"
/*!
--- a/src/hbwidgets/widgets/hbpushbutton.cpp Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/widgets/hbpushbutton.cpp Fri May 14 16:09:54 2010 +0300
@@ -26,7 +26,7 @@
#include "hbpushbutton.h"
#include "hbpushbutton_p.h"
#include "hbstyle.h"
-#include "hbstyleoptionpushbutton.h"
+#include "hbstyleoptionpushbutton_p.h"
#include "hbframedrawerpool_p.h"
#include "hbnamespace.h"
#ifdef HB_EFFECTS
@@ -133,7 +133,6 @@
iconItem(0),
frameItem(0),
focusItem(0),
- orientation(Qt::Vertical),
backgroundFrameDrawer(0),
longPressTimer(0),
textAlignment(Qt::AlignHCenter | Qt::AlignVCenter ),
@@ -194,7 +193,7 @@
iconItem = q->style()->createPrimitive( HbStyle::P_PushButton_icon, q);
}
} else {
- if( iconItem ){
+ if( iconItem ) {
delete iconItem;
}
iconItem = 0;
@@ -211,10 +210,10 @@
}
if( !focusItem ) {
- focusItem = q->style()->createPrimitive(HbStyle::P_PushButton_focus, q);
- //focus primitive is will not be visible by default,
- //only in case of keyboard focus events it will be Visible.
- focusItem->setVisible( false );
+ focusItem = q->style()->createPrimitive(HbStyle::P_PushButton_focus, q);
+ //focus primitive is will not be visible by default,
+ //only in case of keyboard focus events it will be Visible.
+ focusItem->setVisible( false );
}
}
@@ -231,18 +230,18 @@
void HbPushButtonPrivate::_q_handleLongKeyPress( )
{
- Q_Q(HbPushButton);
- if(!longPress){
+ Q_Q( HbPushButton );
+ if(!longPress) {
longPress = true;
- emit q->longPress( q->pos() );
+ emit q->longPress( q->pos( ) );
}
}
void HbPushButtonPrivate::initialize()
{
- Q_Q(HbPushButton);
+ Q_Q( HbPushButton );
q_ptr = q;
- createPrimitives();
+ createPrimitives( );
}
/*!
@@ -252,10 +251,10 @@
HbPushButton::HbPushButton( QGraphicsItem *parent )
: HbAbstractButton( *new HbPushButtonPrivate, parent )
{
- Q_D(HbPushButton);
- d->initialize();
+ Q_D( HbPushButton );
+ d->initialize( );
- setProperty("state", "normal");
+ setProperty( "state", "normal" );
}
@@ -263,14 +262,14 @@
@beta
Constructs a new HbPushButton with \a text and \a parent.
*/
-HbPushButton::HbPushButton(const QString &text, QGraphicsItem *parent)
- : HbAbstractButton(*new HbPushButtonPrivate, parent)
+HbPushButton::HbPushButton( const QString &text, QGraphicsItem *parent )
+ : HbAbstractButton( *new HbPushButtonPrivate, parent )
{
- Q_D(HbPushButton);
+ Q_D( HbPushButton );
d->text = text;
- d->initialize();
+ d->initialize( );
- setProperty("state", "normal");
+ setProperty( "state", "normal" );
}
@@ -282,38 +281,19 @@
HbPushButton::HbPushButton( const HbIcon &icon, const QString &text, QGraphicsItem *parent )
: HbAbstractButton( *new HbPushButtonPrivate, parent )
{
- Q_D(HbPushButton);
+ Q_D( HbPushButton );
d->icon = icon;
d->text = text;
- d->initialize();
-
- setProperty("state", "normal");
-
-}
+ d->initialize( );
-/*!
- \deprecated HbPushButton::HbPushButton(const HbIcon&, const QString&, Qt::Orientation, QGraphicsItem*)
- is deprecated.
- Constructs a new HbPushButton with \a icon, \a text \a orientation and \a parent.
- */
-HbPushButton::HbPushButton( const HbIcon &icon, const QString &text,
- Qt::Orientation orientation, QGraphicsItem *parent )
- : HbAbstractButton( *new HbPushButtonPrivate, parent )
-{
- Q_D(HbPushButton);
- d->icon = icon;
- d->text = text;
- d->initialize();
- d->orientation = orientation;
+ setProperty( "state", "normal" );
- setProperty("state", "normal");
-
}
/*!
Destructs the push button.
*/
-HbPushButton::~HbPushButton()
+HbPushButton::~HbPushButton( )
{
}
@@ -328,10 +308,7 @@
*/
void HbPushButton::setBackground( const HbIcon &background )
{
- Q_D(HbPushButton);
- if( !d->frameItem ) {
- d->createPrimitives();
- }
+ Q_D( HbPushButton );
if ( d->background != background ) {
d->background = background;
d->backgroundFrameDrawer = 0;
@@ -347,9 +324,9 @@
\sa setBackground()
*/
-HbIcon HbPushButton::background() const
+HbIcon HbPushButton::background( ) const
{
- Q_D(const HbPushButton);
+ Q_D( const HbPushButton );
return d->background;
}
@@ -364,16 +341,13 @@
*/
void HbPushButton::setFrameBackground( HbFrameDrawer *backgroundFrameDrawer )
{
- Q_D(HbPushButton);
- if (d->backgroundFrameDrawer != backgroundFrameDrawer) {
- if( !d->frameItem ) {
- d->createPrimitives();
- }
- d->backgroundFrameDrawer=backgroundFrameDrawer;
- d->background=HbIcon();
+ Q_D( HbPushButton );
+ if ( d->backgroundFrameDrawer != backgroundFrameDrawer ) {
+ d->backgroundFrameDrawer = backgroundFrameDrawer;
+ d->background = HbIcon( );
HbStyleOptionPushButton buttonOption;
initStyleOption( &buttonOption );
- style()->updatePrimitive( d->frameItem, HbStyle::P_PushButton_background, &buttonOption );
+ style( )->updatePrimitive( d->frameItem, HbStyle::P_PushButton_background, &buttonOption );
}
}
@@ -383,9 +357,9 @@
\sa setBackground()
*/
-HbFrameDrawer* HbPushButton::frameBackground() const
+HbFrameDrawer *HbPushButton::frameBackground( ) const
{
- Q_D(const HbPushButton);
+ Q_D( const HbPushButton );
return ( d->backgroundFrameDrawer );
}
@@ -398,19 +372,19 @@
*/
void HbPushButton::setText( const QString &text )
{
- Q_D(HbPushButton);
+ Q_D( HbPushButton );
if ( d->text != text ) {
bool doPolish = text.isEmpty() || d->text.isEmpty();
d->text = text;
- d->createPrimitives();
+ d->createPrimitives( );
//updatePrimitives();
- if( d->textItem ){
+ if( d->textItem ) {
HbStyleOptionPushButton buttonOption;
- initStyleOption(&buttonOption);
- style()->updatePrimitive( d->textItem, HbStyle::P_PushButton_text, &buttonOption);
+ initStyleOption( &buttonOption );
+ style( )->updatePrimitive( d->textItem, HbStyle::P_PushButton_text, &buttonOption);
}
if(doPolish) {
- repolish();
+ repolish( );
}
}
}
@@ -422,9 +396,9 @@
\sa setText()
*/
-QString HbPushButton::text() const
+QString HbPushButton::text( ) const
{
- Q_D(const HbPushButton);
+ Q_D( const HbPushButton );
return d->text;
}
@@ -440,16 +414,16 @@
*/
void HbPushButton::setAdditionalText( const QString &additionalText )
{
- Q_D(HbPushButton);
+ Q_D( HbPushButton );
if ( d->additionalText != additionalText ) {
bool doPolish = additionalText.isEmpty() || d->additionalText.isEmpty();
d->additionalText = additionalText;
- d->createPrimitives();
+ d->createPrimitives( );
// updatePrimitives();
- if(d->additionalTextItem){
+ if( d->additionalTextItem ) {
HbStyleOptionPushButton buttonOption;
- initStyleOption(&buttonOption);
- style()->updatePrimitive( d->additionalTextItem, HbStyle::P_PushButton_additionaltext, &buttonOption);
+ initStyleOption( &buttonOption );
+ style( )->updatePrimitive( d->additionalTextItem, HbStyle::P_PushButton_additionaltext, &buttonOption);
}
if( doPolish ) {
repolish();
@@ -463,9 +437,9 @@
\sa setAdditionalText()
*/
-QString HbPushButton::additionalText() const
+QString HbPushButton::additionalText( ) const
{
- Q_D(const HbPushButton);
+ Q_D( const HbPushButton );
return d->additionalText;
}
@@ -477,22 +451,22 @@
\sa icon()
*/
-void HbPushButton::setIcon(const HbIcon &icon)
+void HbPushButton::setIcon( const HbIcon &icon )
{
Q_D(HbPushButton);
if ( d->icon != icon ) {
- bool doPolish = icon.isNull() || d->icon.isNull();
+ bool doPolish = icon.isNull( ) || d->icon.isNull();
d->icon = icon;
- d->createPrimitives();
+ d->createPrimitives( );
//updatePrimitives();
- if(d->iconItem ){
+ if( d->iconItem ) {
HbStyleOptionPushButton buttonOption;
initStyleOption( &buttonOption );
style()->updatePrimitive( d->iconItem, HbStyle::P_PushButton_icon, &buttonOption );
}
- if( doPolish ){
+ if( doPolish ) {
repolish();
}
}
@@ -504,66 +478,30 @@
\sa setIcon()
*/
-HbIcon HbPushButton::icon() const
+HbIcon HbPushButton::icon( ) const
{
- Q_D(const HbPushButton);
+ Q_D( const HbPushButton );
return d->icon;
}
-
/*!
- \deprecated HbPushButton::setOrientation( Qt::Orientation )
- is deprecated. Please use HbPushButton::setStretched(bool) instead
-
- Set the orientation.Default orientation is Qt::Vertical.
- In case of icon ,text and additional text it has to be set to Qt::Horizontal.
- In case of additionalText and text it has to be set to Qt:Vertical.
- \sa orientation()
-*/
-void HbPushButton::setOrientation( Qt::Orientation orientation )
-{
- Q_D(HbPushButton);
- if( d->orientation != orientation ) {
- d->orientation = orientation;
- // calling setStretchedMode internaly this api is going to be depricated.
- bool stretched =
- (d->orientation == Qt::Vertical)?(false):(true);
- setStretched( stretched );
- }
- qDebug()<<"This api is deprecated use HbPushButton::setStretched( bool stretched )";
-}
-
-/*!
- \deprecated HbPushButton::orientation() const
- is deprecated.Please use bool HbPushButton::isStretched() const instead
-
- Returns orientation of button
- \sa setOrientation ()
-*/
-Qt::Orientation HbPushButton::orientation() const
-{
- Q_D(const HbPushButton);
- qDebug()<<"This api is deprecated use bool HbPushButton::isStretched() const";
- return d->orientation;
-}
-
-/*!
+ @beta
Set the text alignment for primarytext and additional text.
The default alignment is Qt::AlignHCenter | Qt::AlignVCenter.
\sa textAlignment()
*/
void HbPushButton::setTextAlignment( Qt::Alignment alignment )
{
- Q_D(HbPushButton);
+ Q_D( HbPushButton );
//HbWidgetBase* textItem = static_cast<HbWidgetBase*>(d->textItem);
- if(!d->textItem){
+ if( !d->textItem ) {
//need to create text item if user call alignment api before setText.
- d->textItem = style()->createPrimitive( HbStyle::P_PushButton_text, this);
+ d->textItem = style( )->createPrimitive( HbStyle::P_PushButton_text, this);
}
//HbWidgetBasePrivate *textItem_p = HbWidgetBasePrivate::d_ptr(textItem);
// check for textitem and api protection flag
- if(alignment != d->textAlignment ){
+ if( alignment != d->textAlignment ){
//take the alignment
d->textAlignment = alignment;
//set the api protection flag
@@ -578,6 +516,7 @@
}
/*!
+ @beta
Returns the text alignment for primary text and additional text
\sa setTextAlignment()
*/
@@ -589,21 +528,22 @@
/*!
+ @beta
Set the text alignment for additional text.
The default alignment is Qt::AlignHCenter | Qt::AlignVCenter.
\sa additionalTextAlignment()
*/
void HbPushButton::setAdditionalTextAlignment( Qt::Alignment alignment )
{
- Q_D(HbPushButton);
+ Q_D( HbPushButton );
//HbWidgetBase* additionalTextItem = static_cast<HbWidgetBase*>(d->additionalTextItem);
- if(!d->additionalTextItem){
+ if(!d->additionalTextItem) {
//need to create text item if user call alignment api before setAdditionalText.
- d->additionalTextItem = style()->createPrimitive( HbStyle::P_PushButton_additionaltext, this);
+ d->additionalTextItem = style( )->createPrimitive( HbStyle::P_PushButton_additionaltext, this);
}
// check for textitem and api protection flag
- if(alignment != d->additionalTextAlignment ){
+ if( alignment != d->additionalTextAlignment ) {
//take the alignment
d->additionalTextAlignment = alignment;
//set the api protection flag
@@ -611,12 +551,13 @@
d->hasAdditionalTextAlignment = true;
HbStyleOptionPushButton buttonOption;
initStyleOption( &buttonOption );
- style()->updatePrimitive(
+ style( )->updatePrimitive(
d->additionalTextItem, HbStyle::P_PushButton_additionaltext, &buttonOption );
}
}
/*!
+ @beta
Returns the text alignment for additional text
\sa setAdditionalTextAlignment()
*/
@@ -627,6 +568,7 @@
}
/*!
+ @beta
Sets the stretched layout for button by default it set to true. setStretched true/false.
For the case icon and text with value false will appear icon and text vertically aligned.
and with value true will appear icon and text horizontally aligned.
@@ -648,6 +590,7 @@
}
/*!
+ @beta
Returns the whether button has streteched layout or not.
\sa setStretched ()
*/
@@ -664,11 +607,11 @@
\reimp
*/
-QGraphicsItem* HbPushButton::primitive( HbStyle::Primitive primitive ) const
+QGraphicsItem *HbPushButton::primitive( HbStyle::Primitive primitive ) const
{
- Q_D(const HbPushButton);
+ Q_D( const HbPushButton );
- switch (primitive) {
+ switch ( primitive ) {
case HbStyle::P_PushButton_background:
return d->frameItem;
case HbStyle::P_PushButton_icon:
@@ -691,7 +634,7 @@
*/
void HbPushButton::recreatePrimitives()
{
- Q_D(HbPushButton);
+ Q_D( HbPushButton );
HbWidget::recreatePrimitives();
delete d->frameItem;
@@ -707,16 +650,16 @@
delete d->focusItem;
d->focusItem = 0;
- d->createPrimitives();
- setFrameBackground(0);
+ d->createPrimitives( );
+ setFrameBackground( 0 );
}
/*!
\reimp
*/
void HbPushButton::updatePrimitives()
{
- Q_D(HbPushButton);
- HbWidget::updatePrimitives();
+ Q_D( HbPushButton );
+ HbWidget::updatePrimitives( );
HbStyleOptionPushButton buttonOption;
initStyleOption(&buttonOption);
@@ -725,15 +668,15 @@
}
if ( d->touchArea ) {
style()->updatePrimitive( d->touchArea, HbStyle::P_PushButton_toucharea, &buttonOption );
- }
- if( d->additionalTextItem ){
+ }
+ if( d->additionalTextItem ) {
style()->updatePrimitive(
d->additionalTextItem,HbStyle::P_PushButton_additionaltext,&buttonOption );
}
if ( d->iconItem) {
style()->updatePrimitive( d->iconItem, HbStyle::P_PushButton_icon, &buttonOption );
}
- if ( d->frameItem ){
+ if ( d->frameItem ) {
style()->updatePrimitive( d->frameItem, HbStyle::P_PushButton_background, &buttonOption );
}
// update will happen only for keyevents when focusItem will be visible.
@@ -745,7 +688,7 @@
/*!
\internal
*/
-HbPushButton::HbPushButton(HbPushButtonPrivate &dd, QGraphicsItem * parent) :
+HbPushButton::HbPushButton(HbPushButtonPrivate &dd, QGraphicsItem *parent) :
HbAbstractButton(dd, parent)
{
}
@@ -755,9 +698,9 @@
This method is useful for subclasses when they need a HbStyleOptionPushButton,
but don't want to fill in all the information themselves.
*/
-void HbPushButton::initStyleOption(HbStyleOptionPushButton *option) const
+void HbPushButton::initStyleOption( HbStyleOptionPushButton *option ) const
{
- Q_D(const HbPushButton);
+ Q_D( const HbPushButton );
HbAbstractButton::initStyleOption(option);
@@ -771,11 +714,11 @@
option->additionalTextAlignment = d->additionalTextAlignment;
option->hasTextAlignment = d->hasTextAlignment;
option->hasAdditionalTextAlignment = d->hasAdditionalTextAlignment;
- if(option->backgroundFrameDrawer) {
- HbFrameDrawerPool::release(option->backgroundFrameDrawer);
+ if( option->backgroundFrameDrawer ) {
+ HbFrameDrawerPool::release( option->backgroundFrameDrawer );
option->backgroundFrameDrawer = 0;
}
- option->backgroundFrameDrawer=( d->backgroundFrameDrawer );
+ option->backgroundFrameDrawer = ( d->backgroundFrameDrawer );
}
/*!
@@ -783,18 +726,18 @@
*/
void HbPushButton::keyPressEvent(QKeyEvent *event)
{
- Q_D(HbPushButton);
+ Q_D( HbPushButton );
- switch (event->key()) {
+ switch ( event->key() ) {
case Qt::Key_Select:
case Qt::Key_Enter:
case Qt::Key_Return:{
- if (!event->isAutoRepeat() && !d->autoRepeat && !d->longPressTimer) {
+ if (!event->isAutoRepeat( ) && !d->autoRepeat && !d->longPressTimer) {
d->longPressTimer = new QTimer();
d->longPressTimer->setInterval(300);
- connect( d->longPressTimer, SIGNAL(timeout()), this, SLOT(_q_handleLongKeyPress()) );
+ connect( d->longPressTimer, SIGNAL( timeout() ), this, SLOT(_q_handleLongKeyPress()) );
d->longPressTimer->start();
- }else{
+ }else {
#ifdef HB_EFFECTS
HbEffect::start( this, HB_PUSHBUTTON_TYPE, "pressed" );
#endif
@@ -850,21 +793,21 @@
void HbPushButton::mousePressEvent( QGraphicsSceneMouseEvent *event )
{
#ifndef HB_GESTURE_FW
- Q_D(HbPushButton);
- HbAbstractButton::mousePressEvent(event);
+ Q_D( HbPushButton );
+ HbAbstractButton::mousePressEvent( event );
HbStyleOptionPushButton buttonOption;
initStyleOption( &buttonOption );
- if( d->frameItem ){
+ if( d->frameItem ) {
style()->updatePrimitive( d->frameItem, HbStyle::P_PushButton_background, &buttonOption );
}
#ifdef HB_EFFECTS
- if ( hitButton(event->pos()) ){
+ if ( hitButton(event->pos()) ) {
HbEffect::start( this, HB_PUSHBUTTON_TYPE, "pressed" );
}
#endif
- setProperty("state", "pressed");
+ setProperty( "state", "pressed" );
#else
- Q_UNUSED(event)
+ Q_UNUSED( event )
#endif
}
@@ -872,46 +815,46 @@
/*!
\reimp
*/
-void HbPushButton::mouseReleaseEvent(QGraphicsSceneMouseEvent *event)
+void HbPushButton::mouseReleaseEvent( QGraphicsSceneMouseEvent *event )
{
- Q_D(HbPushButton);
- HbAbstractButton::mouseReleaseEvent(event);
+ Q_D( HbPushButton );
+ HbAbstractButton::mouseReleaseEvent( event );
HbStyleOptionPushButton buttonOption;
initStyleOption( &buttonOption );
- if( d->frameItem ){
+ if( d->frameItem ) {
style()->updatePrimitive( d->frameItem, HbStyle::P_PushButton_background, &buttonOption );
}
#ifdef HB_EFFECTS
- if ( hitButton(event->pos()) ){
+ if ( hitButton(event->pos()) ) {
HbEffect::start( this, HB_PUSHBUTTON_TYPE, "released" );
}
#endif
- setProperty("state", "normal");
+ setProperty( "state", "normal" );
}
/*!
\reimp
*/
-void HbPushButton::mouseMoveEvent(QGraphicsSceneMouseEvent *event)
+void HbPushButton::mouseMoveEvent( QGraphicsSceneMouseEvent *event )
{
- Q_D(HbPushButton);
- HbAbstractButton::mouseMoveEvent(event);
+ Q_D( HbPushButton );
+ HbAbstractButton::mouseMoveEvent( event );
HbStyleOptionPushButton buttonOption;
initStyleOption( &buttonOption );
- if( d->frameItem ){
+ if( d->frameItem ) {
style()->updatePrimitive( d->frameItem, HbStyle::P_PushButton_background, &buttonOption );
}
if (d->down) {
- setProperty("state", "pressed");
+ setProperty( "state", "pressed" );
} else {
- setProperty("state", "normal");
+ setProperty( "state", "normal" );
}
}
#endif
#ifdef HB_GESTURE_FW
-void HbPushButton::gestureEvent(QGestureEvent *event)
+void HbPushButton::gestureEvent( QGestureEvent *event )
{
Q_D(HbPushButton);
if(HbTapGesture *tap = qobject_cast<HbTapGesture *>(event->gesture(Qt::TapGesture))) {
@@ -920,30 +863,30 @@
#ifdef HB_EFFECTS
HbEffect::start( this, HB_PUSHBUTTON_TYPE, "pressed" );
#endif
- if(d->checkable && !d->checked){
- setProperty("state", "latched");
- }else if(!d->checkable){
- setProperty("state", "pressed");
+ if( d->checkable && !d->checked) {
+ setProperty( "state", "latched" );
+ }else if(!d->checkable) {
+ setProperty( "state", "pressed" );
}
}
break;
case Qt::GestureUpdated:
if(tap->tapStyleHint() == HbTapGesture::TapAndHold) {
d->longPress = true;
- emit longPress(event->mapToGraphicsScene(tap->position()));
+ emit longPress( event->mapToGraphicsScene(tap->position()) );
}
break;
case Qt::GestureCanceled:
- setProperty("state", "normal");
+ setProperty( "state", "normal" );
break;
case Qt::GestureFinished:{
#ifdef HB_EFFECTS
HbEffect::start( this, HB_PUSHBUTTON_TYPE, "released" );
#endif
- if( d->checkable && !d->checked){
- setProperty("state", "latched");
+ if( d->checkable && !d->checked) {
+ setProperty( "state", "latched" );
}else {
- setProperty("state", "normal");
+ setProperty( "state", "normal" );
}
}
@@ -953,7 +896,7 @@
}
}
- HbAbstractButton::gestureEvent(event);
+ HbAbstractButton::gestureEvent( event );
}
#endif
@@ -962,20 +905,20 @@
/*!
\reimp
*/
-void HbPushButton::resizeEvent(QGraphicsSceneResizeEvent *event)
+void HbPushButton::resizeEvent( QGraphicsSceneResizeEvent *event )
{
- HbAbstractButton::resizeEvent(event);
+ HbAbstractButton::resizeEvent( event );
}
/*!
reimp
*/
-void HbPushButton::polish( HbStyleParameters& params )
+void HbPushButton::polish( HbStyleParameters ¶ms )
{
Q_D( HbPushButton );
- if(d->stretched && (d->textItem && d->additionalTextItem && !d->iconItem)){
+ if( d->stretched && ( d->textItem && d->additionalTextItem && !d->iconItem ) ) {
d->stretched = false;
- qWarning()<<"Warning::Invalid Layout: Text and additonalText horizontal appearance not supported";
+ qWarning() << "Warning::Invalid Layout: Text and additonalText horizontal appearance not supported";
}
HbAbstractButton::polish( params );
}
@@ -984,14 +927,14 @@
/*!
\reimp
*/
-void HbPushButton::focusInEvent(QFocusEvent *event)
+void HbPushButton::focusInEvent( QFocusEvent *event )
{
- Q_D(HbPushButton);
- if((event->reason() == Qt::TabFocusReason || event->reason() == Qt::BacktabFocusReason)
+ Q_D( HbPushButton );
+ if( ( event->reason() == Qt::TabFocusReason || event->reason() == Qt::BacktabFocusReason )
&& ( d->navigationKeyPress ) ) {
- if(d->focusItem) {
- d->focusItem->setVisible(true);
- if( hasFocus()){
+ if( d->focusItem ) {
+ d->focusItem->setVisible( true );
+ if( hasFocus() ) {
HbStyleOptionPushButton buttonOption;
initStyleOption( &buttonOption );
style()->updatePrimitive( d->focusItem,HbStyle::P_PushButton_focus, &buttonOption );
@@ -1000,19 +943,19 @@
d->focusItem = style()->createPrimitive(HbStyle::P_PushButton_focus, this);
}
}
- HbAbstractButton::focusInEvent(event);
+ HbAbstractButton::focusInEvent( event );
}
/*!
\reimp
*/
-void HbPushButton::focusOutEvent(QFocusEvent *event)
+void HbPushButton::focusOutEvent( QFocusEvent *event )
{
- Q_D(HbPushButton);
- if(d->focusItem) {
- d->focusItem->setVisible(false);
+ Q_D( HbPushButton );
+ if( d->focusItem ) {
+ d->focusItem->setVisible( false );
}
- HbAbstractButton::focusOutEvent(event);
+ HbAbstractButton::focusOutEvent( event );
}
/*!
@@ -1039,7 +982,7 @@
/*!
Overloaded hit detection to include touch area
*/
-bool HbPushButton::hitButton(const QPointF &pos) const
+bool HbPushButton::hitButton( const QPointF &pos ) const
{
Q_D( const HbPushButton );
QRectF compRect = d->touchArea->boundingRect( );
--- a/src/hbwidgets/widgets/hbpushbutton.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/widgets/hbpushbutton.h Fri May 14 16:09:54 2010 +0300
@@ -41,24 +41,21 @@
Q_PROPERTY( QString text READ text WRITE setText )
Q_PROPERTY( QString additionalText READ additionalText WRITE setAdditionalText )
Q_PROPERTY( HbIcon icon READ icon WRITE setIcon )
- Q_PROPERTY( Qt::Orientation orientation READ orientation WRITE setOrientation )
Q_PROPERTY( Qt::Alignment textAlignment READ textAlignment WRITE setTextAlignment )
- Q_PROPERTY( Qt::Alignment additionalTextAlignment READ additionalTextAlignment WRITE setAdditionalTextAlignment )
+ Q_PROPERTY( Qt::Alignment additionalTextAlignment READ additionalTextAlignment WRITE setAdditionalTextAlignment )
Q_PROPERTY( bool stretched READ isStretched WRITE setStretched )
public:
explicit HbPushButton( QGraphicsItem *parent = 0 );
explicit HbPushButton( const QString &text, QGraphicsItem *parent = 0 );
HbPushButton( const HbIcon &icon, const QString &text, QGraphicsItem *parent = 0 );
- HbPushButton( const HbIcon &icon, const QString &text, Qt::Orientation orientation,
- QGraphicsItem *parent = 0 );
virtual ~HbPushButton( );
void setBackground( const HbIcon &background );
HbIcon background( ) const;
void setFrameBackground( HbFrameDrawer *backgroundFrameDrawer );
- HbFrameDrawer* frameBackground( ) const;
+ HbFrameDrawer *frameBackground( ) const;
QString text( ) const;
QString additionalText( ) const;
@@ -66,49 +63,54 @@
void setIcon( const HbIcon &icon );
HbIcon icon( ) const;
- void setOrientation( Qt::Orientation orientation );
- Qt::Orientation orientation( ) const;
-
void setTextAlignment( Qt::Alignment alignment );
Qt::Alignment textAlignment ( ) const;
void setAdditionalTextAlignment( Qt::Alignment alignment );
Qt::Alignment additionalTextAlignment ( ) const;
-
void setStretched( bool stretched = true );
bool isStretched( ) const;
- QGraphicsItem* primitive( HbStyle::Primitive primitive ) const;
+ QGraphicsItem *primitive( HbStyle::Primitive primitive ) const;
- enum { Type = Hb::ItemType_PushButton };
- int type() const { return Type; }
+ enum {
+ Type = Hb::ItemType_PushButton
+ };
+
+ int type() const {
+ return Type;
+ }
public slots:
+
void setText( const QString &text );
void setAdditionalText( const QString &additionalText );
void recreatePrimitives();
void updatePrimitives();
signals:
+
void longPress( QPointF );
protected:
+
HbPushButton( HbPushButtonPrivate &dd, QGraphicsItem *parent );
void initStyleOption( HbStyleOptionPushButton *option ) const;
void keyPressEvent( QKeyEvent *event );
void keyReleaseEvent( QKeyEvent *event );
void mousePressEvent( QGraphicsSceneMouseEvent *event );
+
#ifndef HB_GESTURE_FW
void mouseReleaseEvent( QGraphicsSceneMouseEvent *event );
- void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
+ void mouseMoveEvent( QGraphicsSceneMouseEvent *event );
#endif
- void gestureEvent(QGestureEvent *event);
+ void gestureEvent( QGestureEvent *event );
void resizeEvent( QGraphicsSceneResizeEvent *event );
- virtual void polish( HbStyleParameters& params );
+ virtual void polish( HbStyleParameters ¶ms );
void focusInEvent( QFocusEvent *event );
void focusOutEvent( QFocusEvent *event );
@@ -117,6 +119,7 @@
bool hitButton( const QPointF &pos ) const;
private:
+
Q_DECLARE_PRIVATE_D( d_ptr, HbPushButton )
Q_DISABLE_COPY( HbPushButton )
Q_PRIVATE_SLOT( d_func(),void _q_handleLongPress(QPointF) )
--- a/src/hbwidgets/widgets/hbpushbutton_p.h Mon May 03 12:48:33 2010 +0300
+++ b/src/hbwidgets/widgets/hbpushbutton_p.h Fri May 14 16:09:54 2010 +0300
@@ -74,7 +74,6 @@
QString additionalText;
HbIcon icon;
HbIcon background;
- Qt::Orientation orientation;
HbFrameDrawer *backgroundFrameDrawer;
QTimer *longPressTimer;
Qt::Alignment textAlignment;
--- a/src/src.pro Mon May 03 12:48:33 2010 +0300
+++ b/src/src.pro Fri May 14 16:09:54 2010 +0300
@@ -59,7 +59,7 @@
!contains(HB_NOMAKE_PARTS, hbservers) {
hbservers.depends = hbcore hbwidgets hbutils
- SUBDIRS *= hbcore hbwidgets
+ SUBDIRS *= hbcore hbwidgets hbutils
SUBDIRS += hbservers
}
@@ -69,7 +69,17 @@
SUBDIRS += hbplugins
}
-# TODO: remove these line when others have suitable .pro files for styling
-astyle.recurse = hbcore hbservers hbwidgets hbutils
+!contains(HB_NOMAKE_PARTS, hbapps) {
+ hbapps.depends = hbcore hbwidgets hbutils
+ SUBDIRS *= hbcore hbwidgets hbutils
+ SUBDIRS += hbapps
+}
+
+# do not build host tools on symbian
+!symbian:!contains(HB_NOMAKE_PARTS, hbtools) {
+ hbtools.depends = hbcore hbwidgets hbutils
+ SUBDIRS *= hbcore hbwidgets hbutils
+ SUBDIRS += hbtools
+}
include(hbcommon.pri)
