--- a/.hgtags	Fri Mar 19 09:40:18 2010 +0200
+++ b/.hgtags	Mon Apr 19 14:02:15 2010 +0300
@@ -1,1 +1,4 @@
-89e9ee88bc049183769730d8aa31c27b18c2a1cc 20102wk07rc
+89e9ee88bc049183769730d8aa31c27b18c2a1cc 2010wk07_rc
+b0950401b844cc4460b4a24fcdfda23035afcadc 2010wk09_rc
+bff35c9a6221cf815339f49887ae16e7a751676a 2010wk09_rel
+821369dbf08b6aed4c2c6f992381d1f974cc8a23 2010wk11_rc

--- a/bin/sync.py	Fri Mar 19 09:40:18 2010 +0200
+++ b/bin/sync.py	Mon Apr 19 14:02:15 2010 +0300
@@ -1,39 +1,55 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
 #
-# ============================================================================
-#  Name        : sync.py
-#  Part of     : Hb
-#  Description : Hb themes sync script
-#  Version     : %version: 1 %
+# Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #
-#  Copyright (c) 2008-2009 Nokia.  All rights reserved.
-#  This material, including documentation and any related computer
-#  programs, is protected by copyright controlled by Nokia.  All
-#  rights are reserved.  Copying, including reproducing, storing,
-#  adapting or translating, any or all of this material requires the
-#  prior written consent of Nokia.  This material also contains
-#  confidential information which may not be disclosed to others
-#  without the prior written consent of Nokia.
-# ============================================================================
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:  Hb themes sync script
+#
 
 import os
+import re
+import sys
+import time
 import shutil
+import fnmatch
 import zipfile
 import optparse
+import tempfile
+if sys.version_info[0] == 2 and sys.version_info[1] < 4:
+    # for scratchbox compatibility
+    import popen2
+else:
+    import subprocess
 
 # ============================================================================
 # Globals
 # ============================================================================
 VERBOSE = False
-EXTRACT = False
 ARCHIVES = False
+INCLUDE = None
+EXCLUDE = None
 INPUT_DIR = os.getcwd()
 OUTPUT_DIR = os.getcwd()
 IBY_SOURCE_PREFIX = "ZRESOURCE/hb/themes"
 IBY_TARGET_PREFIX = "RESOURCE_FILES_DIR/hb/themes"
-BLD_TARGET_PREFIX = "/epoc32/data/z/resource/hb/themes"
-BLD_2ND_TARGET_PREFIX = "/epoc32/winscw/c/resource/hb/themes"
+BLD_HW_TARGET_PREFIX = "/epoc32/data/z/resource/hb/themes"
+BLD_EMU_TARGET_PREFIX = "/epoc32/winscw/c/resource/hb/themes"
+BLD_TARGET_PREFIXES = []
+SYMBIAN = False
+EXIT_STATUS = 0
+NAME = "themes"
+THEME_COMMON = "themecommon"
+THEME_SETTINGS_FILE = "theme.theme"
+ENCODER = "SVGTBinEncode.exe"
+NVG = False
 
 # ============================================================================
 # OptionParser
@@ -45,16 +61,26 @@
                         help="print verbose information about each step of the sync process")
         self.add_option("-q", "--quiet", action="store_false", dest="verbose",
                         help="do not print information about each step of the sync process")
+        self.add_option("-n", "--name", dest="name", metavar="name",
+                        help="specify the package <name> (default %s)" % NAME)
+        self.add_option("--symbian", action="store_true", dest="symbian",
+                        help="work in Symbian mode")
+        self.add_option("--nvg", action="store_true", dest="nvg",
+                        help="do convert svg to nvg")
+        self.add_option("--no-nvg", action="store_false", dest="nvg",
+                        help="do not convert svg to nvg")
 
         group = optparse.OptionGroup(self, "Input/output options")
         self.add_option("-i", "--input", dest="input", metavar="dir",
                         help="specify the input <dir> (default %s)" % INPUT_DIR)
         self.add_option("-o", "--output", dest="output", metavar="dir",
                         help="specify the output <dir> (default %s)" % OUTPUT_DIR)
-        self.add_option("-e", "--extract", action="store_true", dest="extract",
-                        help="extract archives for installation (default %s)" % EXTRACT)
         self.add_option("-a", "--archives", action="store_true", dest="archives",
                         help="export/install archives (default %s)" % ARCHIVES)
+        self.add_option("--include", dest="include", action="append", metavar="pattern",
+                        help="specify the include <pattern> (default %s)" % INCLUDE)
+        self.add_option("--exclude", dest="exclude", action="append", metavar="pattern",
+                        help="specify the exclude <pattern> (default %s)" % EXCLUDE)
         self.add_option_group(group)
 
         group = optparse.OptionGroup(self, "Prefix options")
@@ -62,8 +88,12 @@
                         help="specify the iby source <prefix> (default %s)" % IBY_SOURCE_PREFIX)
         self.add_option("--iby-target-prefix", dest="ibytargetprefix", metavar="prefix",
                         help="specify the iby target <prefix> (default %s)" % IBY_TARGET_PREFIX)
-        self.add_option("--bld-target-prefix", dest="bldtargetprefix", metavar="prefix",
-                        help="specify the bld target <prefix> (default %s)" % BLD_TARGET_PREFIX)
+        self.add_option("--bld-hw-target-prefix", dest="bldhwtargetprefix", metavar="prefix",
+                        help="specify the bld harware target <prefix> (default %s)" % BLD_HW_TARGET_PREFIX)
+        self.add_option("--bld-emu-target-prefix", dest="bldemutargetprefix", metavar="prefix",
+                        help="specify the bld emulator target <prefix> (default %s)" % BLD_EMU_TARGET_PREFIX)
+        self.add_option("--bld-target-prefix", dest="bldtargetprefixes", action="append", metavar="prefix",
+                        help="specify an additional bld target <prefix>")
         self.add_option_group(group)
 
 # ============================================================================
@@ -83,87 +113,173 @@
         return abspath[i:]
     os.path.relpath = relpath
 
-def extract(path, filepath):
-    if not os.path.exists(path):
-        os.makedirs(path)
-    
-    files = list()
-    if VERBOSE:
-        if EXTRACT:
-            print "Extracting: %s" % filepath
+def run_process(command, cwd=None):
+    code = 0
+    output = ""
+    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)
+            code = process.wait()
+            output = process.fromchild.read()
         else:
-            print "Reading: %s" % filepath
-    archive = zipfile.ZipFile(filepath)
-    for entry in archive.namelist():
-        if entry.endswith("/"):
-            if EXTRACT:
-                out = os.path.join(path, entry)
-                if not os.path.exists(out):
-                    os.makedirs(out)
-        else:
-            files.append(entry)
-            if EXTRACT:
-                out = open(os.path.join(path, entry), "w")
-                out.write(archive.read(entry))
-                out.close()
-    return files
+            process = subprocess.Popen(command, stderr=subprocess.PIPE, stdout=subprocess.PIPE)
+            (stdout, stderr) = process.communicate()
+            code = process.returncode
+            output = stdout + stderr
+        if cwd != None:
+            os.chdir(oldcwd)
+    except Exception, e:
+        print(e)
+        code = -1
+    return [code, output]
+
+def make_target(path):
+    # generate a compatible make target name from path
+    target = os.path.splitdrive(path)[1].strip("\\/")
+    return "_".join(re.split("[\\\/]+", target))
 
 class Theme:
     def __init__(self, name):
         self.name = name
         self.paths = []
-        self.archives = []
-        self.verbatims = []
-        self.sources = {}
-        self.targets = {}
+        self.files = {}
+        self.archives = {}
 
     def initialize(self):
         for path in self.paths:
             for root, dirs, files in os.walk(path):
                 for file in files:
                     filepath = os.path.join(root, file)
-                    extension = os.path.splitext(filepath)[1]
-                    if os.path.isfile(filepath) and extension == ".zip":
-                        self.archives.append(filepath)
-                    if os.path.isfile(filepath) and (extension in ['.css', '.theme']):
-                        self.verbatims.append(filepath)
-                        if VERBOSE:
-                            print "Found: %s" % filepath
-        for archive in self.archives:
-            path = os.path.dirname(archive)
-            if path not in self.sources:
-                self.sources[path] = list()
-            self.sources[path] += extract(path, archive)
-        for verbatim in self.verbatims:
-            path = os.path.dirname(verbatim)
-            if path not in self.sources:
-                self.sources[path] = list()
-            file = os.path.split(verbatim)[1]
-            filelist = list()
-            filelist.append(file)
-            self.sources[path] += filelist
-        for path, files in self.sources.iteritems():
+                    if self._include(filepath):
+                        extension = os.path.splitext(filepath)[1]
+                        if extension == ".zip":
+                            if root not in self.archives:
+                                self.archives[root] = list()
+                            self.archives[root].append(filepath)
+                        else:
+                            if root not in self.files:
+                                self.files[root] = list()
+                            self.files[root].append(filepath)
+
+    def _write_zip_entry(self, archive, filepath):
+        path, filename = os.path.split(filepath)
+        oldcwd = os.getcwd()
+        os.chdir(path)
+        archive.write(filename)
+        os.chdir(oldcwd)
+
+    def encode(self):
+        print "Encoding: %s" % self.name
+        for path, archives in self.archives.iteritems():
             relpath = os.path.relpath(path, INPUT_DIR)
-            if relpath not in self.targets:
-                self.targets[relpath] = list()
-            self.targets[relpath] = files
+            if not relpath.startswith("icons"):
+                continue
+            for archive in archives:
+                # ensure that output dir exists
+                outpath = os.path.join(OUTPUT_DIR, relpath)
+                if not os.path.exists(outpath):
+                    os.makedirs(outpath)
+
+                # extract to a temp dir
+                tempdir = tempfile.mkdtemp()
+                zip = zipfile.ZipFile(archive)
+                for name in zip.namelist():
+                    file = open(os.path.join(tempdir, name),'w')
+                    file.write(zip.read(name))
+                    file.close()
 
-    def write_iby(self, filepath):
-        global IBY_SOURCE_PREFIX, IBY_TARGET_PREFIX
-        out = open(filepath, "w")
+                # convert & re-archive
+                total = 0
+                converted = 0
+                tmpfile, tmpfilepath = tempfile.mkstemp(".zip")
+                tmparchive = zipfile.ZipFile(tmpfilepath, 'w')
+                for root, dirs, files in os.walk(tempdir):
+                    for file in files:
+                        filepath = os.path.join(root, file)
+                        basepath, extension = os.path.splitext(filepath)
+                        if extension == ".svg":
+                            total += 1
+                            res = run_process([ENCODER, "-v", "6", filepath, "-e", ".nvg"])[0]
+                            exists = os.path.exists(basepath + ".nvg")
+                            if not exists:
+                                self._write_zip_entry(tmparchive, filepath)
+                            else:
+                                converted += 1
+                                self._write_zip_entry(tmparchive, basepath + ".nvg")
+       
+                # cleanup
+                tmparchive.close()
+                os.close(tmpfile)
+                if converted > 0:
+                    shutil.move(tmpfilepath, os.path.join(outpath, os.path.basename(archive)))
+                else:
+                    os.remove(tmpfilepath)
+                shutil.rmtree(tempdir, True)
+                print "          %s (%s/%s)" % (os.path.join(relpath, os.path.basename(archive)), converted, total)
+
+    def write_iby(self, ibypath):
+        global IBY_SOURCE_PREFIX, IBY_TARGET_PREFIX, EXIT_STATUS
+        outpath = os.path.dirname(ibypath)
+        if not os.path.exists(outpath):
+            os.makedirs(outpath)
+        out = open(ibypath, "w")
         out.write("#ifndef __%s_IBY__\n" % self.name.upper())
         out.write("#define __%s_IBY__\n" % self.name.upper())
         out.write("\n")
         out.write("#include <bldvariant.hrh>\n")
         out.write("\n")
-        for path, entries in self.targets.iteritems():
-            for entry in entries:
-                entry = os.path.join(path, entry)
-                out.write("data=%s/%s\t%s/%s\n" % (IBY_SOURCE_PREFIX, entry, IBY_TARGET_PREFIX, entry))
+        out.write("data=%s/%s.themeindex\t%s/%s.themeindex\n" % (IBY_SOURCE_PREFIX, self.name, IBY_TARGET_PREFIX, self.name))
+        written_entries = list()
+        for path, files in self.files.iteritems():
+            relpath = os.path.relpath(path, INPUT_DIR)
+            for filepath in files:
+                filename = os.path.basename(filepath)
+                entry = os.path.join(relpath, filename)
+                if entry not in written_entries:
+                    written_entries.append(filepath)
+                    out.write("data=%s/%s\t%s/%s\n" % (IBY_SOURCE_PREFIX, entry, IBY_TARGET_PREFIX, entry))
+                else:
+                    print "ERROR: %s duplicate entry %s" % (ibypath, entry)
+                    EXIT_STATUS = -1
+        for path, archives in self.archives.iteritems():
+            relpath = os.path.relpath(path, INPUT_DIR)
+            for archive in archives:
+                files = self._list_files(archive)
+                for filepath in files:
+                    entry = os.path.join(relpath, filepath)
+                    if entry not in written_entries:
+                        written_entries.append(entry)
+                        out.write("data=%s/%s\t%s/%s\n" % (IBY_SOURCE_PREFIX, entry, IBY_TARGET_PREFIX, entry))
+                    else:
+                        print "ERROR: %s duplicate entry %s" % (ibypath, entry)
+                        EXIT_STATUS = -1
         out.write("\n")
         out.write("#endif __%s_IBY__\n" % self.name.upper())
         out.close()
 
+    def _list_files(self, filepath):
+        files = list()
+        archive = zipfile.ZipFile(filepath)
+        for entry in archive.namelist():
+            if not entry.endswith("/"):
+                files.append(entry)
+        return files
+
+    def _include(self, filepath):
+        result = True
+        if INCLUDE != None:
+            for pattern in INCLUDE:
+                if not fnmatch.fnmatch(filepath, pattern):
+                    result = False
+        if EXCLUDE != None:
+            for pattern in EXCLUDE:
+                if fnmatch.fnmatch(filepath, pattern):
+                    result = False
+        return result
+
 def lookup_themes(path):
     themes = {}
     # base: effects, icons...
@@ -179,88 +295,187 @@
                     themes[theme].paths.append(themepath)
     return themes
 
-def write_pri(filepath, themes):
+def write_txt(filepath, themes, prefixes):
+    outpath = os.path.dirname(filepath)
+    if not os.path.exists(outpath):
+        os.makedirs(outpath)
+    out = open(filepath, "w")
+    for name, theme in themes.iteritems():
+        for prefix in prefixes:
+            path = os.path.normpath("%s/icons/%s" % (prefix, name))
+            out.write("%s %s %s\n" % (name, path, prefix))
+    out.close()
+
+def write_pri(filepath, themes, settingsfile_exists):
+    outpath = os.path.dirname(filepath)
+    if not os.path.exists(outpath):
+        os.makedirs(outpath)
+    outpath = os.path.splitdrive(OUTPUT_DIR)[1]
     out = open(filepath, "w")
     out.write("symbian {\n")
     out.write("\tBLD_INF_RULES.prj_exports += \"$${LITERAL_HASH}include <platform_paths.hrh>\"\n")
+    # TODO: temp workaround to include pre-generated .themeindex files
+    rompath = os.path.join(os.getcwd(), "rom")
+    for entry in os.listdir(rompath):
+        filepath = os.path.join(rompath, entry)
+        if os.path.isfile(filepath) and os.path.splitext(filepath)[1] == ".themeindex":
+            filepath = os.path.splitdrive(filepath)[1]
+            filename = os.path.basename(filepath)
+            out.write("\tBLD_INF_RULES.prj_exports += \"%s\t%s/%s\"\n" % (filepath, BLD_HW_TARGET_PREFIX, filename))
+            out.write("\tBLD_INF_RULES.prj_exports += \"%s\t%s/%s\"\n" % (filepath, BLD_EMU_TARGET_PREFIX, filename))
+
+    if settingsfile_exists:
+        # exporting theme settings file
+        settingsPath = os.path.splitdrive(os.path.join(INPUT_DIR,THEME_SETTINGS_FILE))[1]
+        out.write("\tBLD_INF_RULES.prj_exports += \"%s\t%s/%s\"\n" % (settingsPath, BLD_HW_TARGET_PREFIX, THEME_SETTINGS_FILE))
+        out.write("\tBLD_INF_RULES.prj_exports += \"%s\t%s/%s\"\n" % (settingsPath, BLD_EMU_TARGET_PREFIX, THEME_SETTINGS_FILE))
+        out.write("\tBLD_INF_RULES.prj_exports += \"%s.iby\tCORE_MW_LAYER_IBY_EXPORT_PATH(%s.iby)\"\n" % (os.path.join(outpath, THEME_COMMON), THEME_COMMON))
+
     for name, theme in themes.iteritems():
         ibyfile = "%s.iby" % name
-        out.write("\tBLD_INF_RULES.prj_exports += \"%s\tCORE_MW_LAYER_IBY_EXPORT_PATH(%s)\"\n" % (ibyfile, ibyfile))
-        for verbatim in theme.verbatims:
-            filename = os.path.basename(verbatim)
-            relpath = os.path.relpath(os.path.dirname(verbatim), INPUT_DIR)
-            verbatim = os.path.splitdrive(verbatim)[1]
-            out.write("\tBLD_INF_RULES.prj_exports += \"%s\t%s/%s\"\n" % (verbatim, BLD_TARGET_PREFIX, os.path.join(relpath, filename)))
-            out.write("\tBLD_INF_RULES.prj_exports += \"%s\t%s/%s\"\n" % (verbatim, BLD_2ND_TARGET_PREFIX, os.path.join(relpath, filename)))
-        for archive in theme.archives:
-            filename = os.path.basename(archive)
-            relpath = os.path.relpath(os.path.dirname(archive), INPUT_DIR)
-            archive = os.path.splitdrive(archive)[1]
-            if ARCHIVES:
-                out.write("\tBLD_INF_RULES.prj_exports += \"%s\t%s/%s\"\n" % (archive, BLD_TARGET_PREFIX, os.path.join(relpath, filename)))
-                out.write("\tBLD_INF_RULES.prj_exports += \"%s\t%s/%s\"\n" % (archive, BLD_2ND_TARGET_PREFIX, os.path.join(relpath, filename)))
-            else:
-                out.write("\tBLD_INF_RULES.prj_exports += \":zip %s\t%s/%s\"\n" % (archive, BLD_TARGET_PREFIX, relpath))
-                out.write("\tBLD_INF_RULES.prj_exports += \":zip %s\t%s/%s\"\n" % (archive, BLD_2ND_TARGET_PREFIX, relpath))
+        out.write("\tBLD_INF_RULES.prj_exports += \"%s\tCORE_MW_LAYER_IBY_EXPORT_PATH(%s)\"\n" % (os.path.join(outpath, ibyfile), ibyfile))
+        for path, files in theme.files.iteritems():
+            relpath = os.path.relpath(path, INPUT_DIR)
+            for filepath in files:
+                filepath = os.path.splitdrive(filepath)[1]
+                filename = os.path.basename(filepath)
+                out.write("\tBLD_INF_RULES.prj_exports += \"%s\t%s/%s\"\n" % (filepath, BLD_HW_TARGET_PREFIX, os.path.join(relpath, filename)))
+                out.write("\tBLD_INF_RULES.prj_exports += \"%s\t%s/%s\"\n" % (filepath, BLD_EMU_TARGET_PREFIX, os.path.join(relpath, filename)))
+        for path, archives in theme.archives.iteritems():
+            relpath = os.path.relpath(path, INPUT_DIR)
+            for filepath in archives:
+                filepath = os.path.splitdrive(filepath)[1]
+                filename = os.path.basename(filepath)
+                if ARCHIVES:
+                    out.write("\tBLD_INF_RULES.prj_exports += \"%s\t%s/%s\"\n" % (filepath, BLD_HW_TARGET_PREFIX, os.path.join(relpath, filename)))
+                    out.write("\tBLD_INF_RULES.prj_exports += \"%s\t%s/%s\"\n" % (filepath, BLD_EMU_TARGET_PREFIX, os.path.join(relpath, filename)))
+                else:
+                    out.write("\tBLD_INF_RULES.prj_exports += \":zip %s\t%s/%s\"\n" % (filepath, BLD_HW_TARGET_PREFIX, relpath))
+                    out.write("\tBLD_INF_RULES.prj_exports += \":zip %s\t%s/%s\"\n" % (filepath, BLD_EMU_TARGET_PREFIX, relpath))
     out.write("} else {\n")
+    out.write("\tisEmpty(QMAKE_UNZIP):QMAKE_UNZIP = unzip -u -o\n")
+
+    if settingsfile_exists:
+    # installing theme settings file
+        settingsPath = os.path.join(INPUT_DIR,THEME_SETTINGS_FILE)
+        out.write("\t%s.path += $$(HB_THEMES_DIR)/themes\n" % THEME_COMMON)
+        out.write("\t%s.files += %s\n" % (THEME_COMMON, settingsPath))
+        out.write("\tINSTALLS += %s\n" % THEME_COMMON)
+
     for name, theme in themes.iteritems():
-        if ARCHIVES:
-            i = 1
-            for archive in theme.archives:
-                relpath = os.path.relpath(os.path.dirname(archive), INPUT_DIR)
-                out.write("\t%s%i.path = $$(HB_THEMES_DIR)/themes/%s\n" % (name, i, relpath))
-                out.write("\t%s%i.files += %s\n" % (name, i, archive))
-                out.write("\tINSTALLS += %s%i\n" % (name, i))
-                i += 1
-        else:
-            i = 1
-            for path, files in theme.sources.iteritems():
-                relpath = os.path.relpath(path, INPUT_DIR)
-                out.write("\t%s%i.path = $$(HB_THEMES_DIR)/themes/%s\n" % (name, i, relpath))
-                for file in files:
-                    out.write("\t%s%i.files += %s\n" % (name, i, os.path.join(path, file)))
-                out.write("\tINSTALLS += %s%i\n" % (name, i))
-                i += 1
+        for path, files in theme.files.iteritems():
+            target = make_target(path)
+            relpath = os.path.relpath(path, INPUT_DIR)
+            out.write("\t%s.path += $$(HB_THEMES_DIR)/themes/%s\n" % (target, relpath))
+            out.write("\t%s.files += %s\n" % (target, " ".join(files)))
+            out.write("\tINSTALLS += %s\n" % target)
+        for path, archives in theme.archives.iteritems():
+            target = make_target(path)
+            relpath = os.path.relpath(path, INPUT_DIR)
+            out.write("\t%s_zip.path += $$(HB_THEMES_DIR)/themes/%s\n" % (target, relpath))
+            if ARCHIVES:
+                out.write("\t%s_zip.files += %s\n" % (target, " ".join(archives)))
+            else:
+                commands = []
+                for archive in archives:
+                    commands.append("$$QMAKE_UNZIP %s -d $$(HB_THEMES_DIR)/themes/%s" % (archive, relpath))
+                out.write("\t%s_zip.commands += %s\n" % (target, " && ".join(commands)))
+            out.write("\tINSTALLS += %s_zip\n" % target)
     out.write("}\n")
     out.close()
 
+
+def write_common_iby(path):
+    global VERBOSE, IBY_SOURCE_PREFIX, IBY_TARGET_PREFIX, OUTPUT_DIR, INPUT_DIR 
+    global THEME_COMMON, THEME_SETTINGS_FILE
+
+    # Create iby file for theme.theme if it is there
+    theme_theme = os.path.join(INPUT_DIR,THEME_SETTINGS_FILE)
+    if os.path.isfile(theme_theme):
+        if VERBOSE:
+            print "Writing:  %s.iby" % THEME_COMMON
+        ibypath = os.path.join(OUTPUT_DIR, THEME_COMMON + ".iby")
+        outpath = os.path.dirname(ibypath)
+        if not os.path.exists(outpath):
+            os.makedirs(outpath)
+        out = open(ibypath, "w")
+        out.write("#ifndef __%s_IBY__\n" % THEME_COMMON.upper())
+        out.write("#define __%s_IBY__\n" % THEME_COMMON.upper())
+        out.write("\n")
+        out.write("#include <bldvariant.hrh>\n")
+        out.write("\n")
+        out.write("data=%s/%s\t%s/%s\n" % (IBY_SOURCE_PREFIX, THEME_SETTINGS_FILE, IBY_TARGET_PREFIX, THEME_SETTINGS_FILE))
+        out.write("\n")
+        out.write("#endif __%s_IBY__\n" % THEME_COMMON.upper())
+        return True
+
+    # theme common iby not written, return false
+    return False
+
 # ============================================================================
 # main()
 # ============================================================================
 def main():
-    global VERBOSE, EXTRACT, ARCHIVES, INPUT_DIR, OUTPUT_DIR
-    global IBY_SOURCE_PREFIX, IBY_TARGET_PREFIX, BLD_TARGET_PREFIX
+    global VERBOSE, ARCHIVES, INPUT_DIR, OUTPUT_DIR, INCLUDE, EXCLUDE, SYMBIAN, NAME, NVG
+    global IBY_SOURCE_PREFIX, IBY_TARGET_PREFIX
+    global BLD_HW_TARGET_PREFIX, BLD_EMU_TARGET_PREFIX, BLD_TARGET_PREFIXES
 
     parser = OptionParser()
     (options, args) = parser.parse_args()
 
-    if options.verbose:
+    if options.verbose != None:
         VERBOSE = options.verbose
-    if options.extract:
-        EXTRACT = options.extract
-    if options.archives:
+    if options.symbian != None:
+        SYMBIAN = options.symbian
+    if options.nvg != None:
+        NVG = options.nvg
+    if options.name != None:
+        NAME = options.name
+    if options.archives != None:
         ARCHIVES = options.archives
-    if options.input:
+    if options.include != None:
+        INCLUDE = options.include
+    if options.exclude != None:
+        EXCLUDE = options.exclude
+    if options.input != None:
         INPUT_DIR = options.input
-    if options.output:
+    if options.output != None:
         OUTPUT_DIR = options.output
-    if options.ibysourceprefix:
+    if options.ibysourceprefix != None:
         IBY_SOURCE_PREFIX = options.ibysourceprefix
-    if options.ibytargetprefix:
+    if options.ibytargetprefix != None:
         IBY_TARGET_PREFIX = options.ibytargetprefix
-    if options.bldtargetprefix:
-        BLD_TARGET_PREFIX = options.bldtargetprefix
+    if options.bldhwtargetprefix != None:
+        BLD_HW_TARGET_PREFIX = options.bldhwtargetprefix
+    if options.bldemutargetprefix != None:
+        BLD_EMU_TARGET_PREFIX = options.bldemutargetprefix
+    if options.bldtargetprefixes != None:
+        BLD_TARGET_PREFIXES = options.bldtargetprefixes
+
+    settingsfile_exists = write_common_iby(INPUT_DIR)
 
     themes = lookup_themes(INPUT_DIR)
     for name, theme in themes.iteritems():
         theme.initialize()
+        if SYMBIAN and NVG:
+            theme.encode()
         if VERBOSE:
-            print "Writing: %s.iby" % name
+            print "Writing:  %s.iby" % name
         theme.write_iby(os.path.join(OUTPUT_DIR, "%s.iby" % name))
 
     if VERBOSE:
-        print "Writing: themes.pri"
-    write_pri(os.path.join(OUTPUT_DIR, "themes.pri"), themes)
+        print "Writing:  %s.pri" % NAME
+    write_pri(os.path.join(OUTPUT_DIR, "%s.pri" % NAME), themes, settingsfile_exists)
+    if VERBOSE:
+        print "Writing:  %s.txt" % NAME
+    if SYMBIAN:
+        prefixes = [BLD_HW_TARGET_PREFIX, BLD_EMU_TARGET_PREFIX]
+        prefixes += BLD_TARGET_PREFIXES
+        write_txt(os.path.join(OUTPUT_DIR, "%s.txt" % NAME), themes, prefixes)
+    else:
+        write_txt(os.path.join(OUTPUT_DIR, "%s.txt" % NAME), themes, [os.path.join(os.environ["HB_THEMES_DIR"], "themes")])
+
+    return EXIT_STATUS
 
 if __name__ == "__main__":
-    main()
+    sys.exit(main())

--- a/layers.sysdef.xml	Fri Mar 19 09:40:18 2010 +0200
+++ b/layers.sysdef.xml	Mon Apr 19 14:02:15 2010 +0300
@@ -7,7 +7,7 @@
 	<systemModel>
       	<layer name="mw_layer">
     		<module name="platformthemes">
-    			<unit name="platformthemes" unitID="qtdo.platformthemes" bldFile="&layer_real_source_path;" mrp="" proFile="themes.pro"/>
+    			<unit name="platformthemes" unitID="qtdo.platformthemes" bldFile="&layer_real_source_path;" mrp="" proFile="platformthemes.pro"/>
     		</module>
         </layer>
     </systemModel>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/makeindex.mk	Mon Apr 19 14:02:15 2010 +0300
@@ -0,0 +1,41 @@
+#
+# Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:  Hb make index wrapper
+#
+
+MAKE = make
+
+do_nothing :
+	echo do_nothing
+
+MAKMAKE : do_nothing
+
+RESOURCE : do_nothing
+
+SAVESPACE : do_nothing
+
+BLD :
+	-$(MAKE) index
+
+FREEZE : do_nothing
+
+LIB : do_nothing
+
+CLEANLIB : do_nothing
+
+FINAL : do_nothing
+
+CLEAN : do_nothing
+
+RELEASABLES : do_nothing

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/platformthemes.pro	Mon Apr 19 14:02:15 2010 +0300
@@ -0,0 +1,78 @@
+#
+# Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description:  Project definition file for project platformthemes
+#
+
+NAME = platformthemes
+TEMPLATE = subdirs
+!symbian {
+    HB_THEMES_DIR = $$(HB_THEMES_DIR)
+    isEmpty(HB_THEMES_DIR) {
+        win32:ENV_HELP = eg. set HB_THEMES_DIR=C:\hb\themes
+        else:ENV_HELP = eg. export HB_THEMES_DIR=/usr/local/hb/themes
+        error(HB_THEMES_DIR environment variable is not set. ($$ENV_HELP))
+    }
+} else {
+    ARGS += --symbian
+    nvg:ARGS += --nvg
+    no_nvg:ARGS += --no-nvg
+}
+ARGS += -v --input $$IN_PWD/src --output $$OUT_PWD/src --name $$NAME
+ARGS += --exclude \"*distribution.policy.s60\"
+!system(python $$IN_PWD/bin/sync.py $$ARGS) {
+    error(*** bin/sync.py reported an error. Stop.)
+}
+
+*symbian* {
+    THEMEINDEXER = bin\themeindexer_symbian.exe
+} else {
+
+    win32:!win32-g++ {
+        unixstyle = false
+    } else:win32-g++:isEmpty(QMAKE_SH) {
+        unixstyle = false
+    } else {
+        unixstyle = true
+    }
+
+    $$unixstyle {
+        DEVNULL = /dev/null
+    } else {
+        DEVNULL = nul
+    }
+    THEMEINDEXER = themeindexer
+    !system($$THEMEINDEXER > $$DEVNULL 2>&1) {
+        error('themeindexer' must be in PATH.)
+    }
+}
+
+*symbian* {
+    # NOTE: temporarily disabled due to:
+    #       "Qt: INTERNALL ERROR: failed to install GetMessage hook"
+    # BLD_INF_RULES.prj_mmpfiles += "gnumakefile makeindex.mk"
+
+    install.depends = default
+    uninstall.depends = cleanexport
+    QMAKE_EXTRA_TARGETS += install uninstall
+}
+index.path = .
+index.commands = $$THEMEINDEXER -f $$OUT_PWD/src/$${NAME}.txt
+QMAKE_EXTRA_TARGETS += index
+
+message(Run \'make install\')
+
+include($$OUT_PWD/src/$${NAME}.pri)
+
+# NOTE: must be after .pri include above!
+INSTALLS += index

Binary file rom/sfblacknvgtheme.themeindex has changed

Binary file rom/sfblacktheme.themeindex has changed

Binary file rom/sfwhitetheme.themeindex has changed

Binary file src/effects/sfblacktheme/applications.zip has changed

Binary file src/effects/sfblacktheme/effects.zip has changed

Binary file src/effects/sfblacktheme/widgets.zip has changed

--- a/src/icons/engineeringtheme/index.theme	Fri Mar 19 09:40:18 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-[Icon Theme]
-Name=engineeringtheme
-Comment=Deprecated Engineering Theme
-Hidden=false
-Directories=scalable

Binary file src/icons/engineeringtheme/scalable/applications.zip has changed

Binary file src/icons/engineeringtheme/scalable/icons.zip has changed

Binary file src/icons/engineeringtheme/scalable/widgets.zip has changed

Binary file src/icons/sfblacknvgtheme/scalable/applications.zip has changed

Binary file src/icons/sfblacknvgtheme/scalable/icons.zip has changed

Binary file src/icons/sfblacknvgtheme/scalable/smileys.zip has changed

Binary file src/icons/sfblacknvgtheme/scalable/widgets.zip has changed

Binary file src/icons/sfblacktheme/scalable/applications.zip has changed

Binary file src/icons/sfblacktheme/scalable/icons.zip has changed

Binary file src/icons/sfblacktheme/scalable/widgets.zip has changed

Binary file src/icons/sfwhitetheme/scalable/applications.zip has changed

Binary file src/icons/sfwhitetheme/scalable/icons.zip has changed

Binary file src/icons/sfwhitetheme/scalable/widgets.zip has changed

--- a/src/style/engineeringtheme/variables/color/hbcolorgroup.css	Fri Mar 19 09:40:18 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,300 +0,0 @@
-/* Color definitions for Engineering Theme */
-
-@variables
-{
-/* Default palette */
-qtc_default_decor_normal:#000000;
-qtc_default_decor_pressed:#000000;
-qtc_default_decor_latched:#000000;
-qtc_default_decor_highlight:#000000;
-qtc_default_decor_disabled:#959799;
-qtc_default_main_pane_normal:#000000;
-qtc_default_main_pane_pressed:#000000;
-qtc_default_main_pane_latched:#000000;
-qtc_default_main_pane_highlight:#000000;
-qtc_default_main_pane_disabled:#959799;
-qtc_default_popup_normal:#000000;
-qtc_default_popup_pressed:#000000;
-qtc_default_popup_latched:#000000;
-qtc_default_popup_highlight:#000000;
-qtc_default_popup_disabled:#959799;
-
-/* Title pane */
-qtc_title_pane_normal:#FFFFFF;
-qtc_title_pane_pressed:#125987;
-qtc_title_pane_highlight:#FFFFFF;
-qtc_title_pane_latched:#FFFFFF;
-qtc_title_pane_trans_normal:#FFFFFF;
-qtc_title_pane_trans_pressed:#FFFFFF;
-qtc_title_pane_trans_highlight:#FFFFFF;
-qtc_title_pane_trans_latched:#FFFFFF;
-
-/* Main area - View */
-qtc_view_normal:#595B5D;
-qtc_view_pressed:#125987;
-qtc_view_line_normal:#FFFFFF;
-qtc_view_link_normal:#009CEF;
-qtc_view_visited_normal:#B27200;
-qtc_view_separator_normal:#595B5D;
-
-/* Main area - View title */
-qtc_viewtitle_normal:#FFFFFF;
-
-/* Main area - Tab */
-qtc_tab_active_normal:#FFFFFF;
-qtc_tab_passive_normal:#FFFFFF;
-qtc_tab_passive_pressed:#125987;
-
-/* Main area - Grid */
-qtc_grid_normal:#595B5D;
-qtc_grid_pressed:#125987;
-qtc_grid_highlight:#FFFFFF;
-
-/* Main area - List */
-qtc_list_item_title_normal:#595B5D;
-qtc_list_item_content_normal:#636567;
-qtc_list_item_parent_normal:#454749;
-qtc_list_item_pressed:#125987;
-qtc_list_item_highlight:#FFFFFF;
-qtc_list_item_disabled:#959799;
-
-/* Main area - Button */
-qtc_button_normal:#FFFFFF;
-qtc_button_pressed:#125987;
-qtc_button_latched:#FFFFFF;
-qtc_button_highlight:#FFFFFF;
-qtc_button_disabled:#959799;
-
-/* Main area - Editor */
-qtc_editor_normal:#4D4D4D;
-qtc_editor_selected:#FFFFFF;
-qtc_editor_marker_normal:#4D4D4D;
-qtc_editor_hint_normal:#959799;
-
-/* Main area - Toolbar */
-qtc_toolbar_normal:#FFFFFF;
-qtc_toolbar_pressed:#125987;
-qtc_toolbar_latched:#FFFFFF;
-qtc_toolbar_disabled:#959799;
-qtc_toolbar_highlight:#FFFFFF;
-qtc_toolbar_trans_normal:#FFFFFF;
-qtc_toolbar_trans_pressed:#FFFFFF;
-qtc_toolbar_trans_latched:#FFFFFF;
-qtc_toolbar_trans_disabled:#FFFFFF;
-qtc_toolbar_trans_highlight:#FFFFFF;
-
-/* Main area - Toolbar extension */
-
-/* Main area - Groupbox */
-qtc_groupbox_normal:#595B5D;
-qtc_groupbox_pressed:#FFFFFF;
-qtc_groupbox_highlight:#FFFFFF;
-
-/* Pop-ups - Generic pop-up */
-qtc_popup_sk_normal:#595B5D;
-qtc_popup_sk_highlight:#FFFFFF;
-qtc_popup_sk_pressed:#125987;
-qtc_popup_heading_normal:#595B5D;
-qtc_popup_heading_pressed:#125987;
-qtc_popup_heading_highlight:#FFFFFF;
-qtc_popup_normal:#595B5D;
-
-/* Pop-ups - Preview pop-up */
-qtc_popup_preview_normal:#ffffff;
-qtc_popup_preview_pressed:#ffffff;
-qtc_popup_preview_link:#8CE0FF;
-
-/* Pop-ups - Transparent pop-up */
-qtc_popup_trans_normal:#000000;
-qtc_popup_trans_pressed:#000000;
-qtc_popup_trans_link:#8CE0FF;
-
-/* Pop-ups - Grid in a pop-up */
-qtc_popup_grid_normal:#009CEF;
-qtc_popup_grid_pressed:#FFFFFF; 
-qtc_popup_grid_highlight:#FFFFFF;
-qtc_popup_grid_disabled:#959799;
-
-/* Pop-ups - List in a pop-up */
-qtc_popup_list_title_normal:#00B200;
-qtc_popup_list_item_content_normal:#26C100;
-qtc_popup_list_item_parent_normal:#595B5D;
-qtc_popup_list_item_pressed:#FFFFFF;
-qtc_popup_list_item_highlight:#FFFFFF;
-qtc_popup_list_item_disabled:#959799;
-
-/* Pop-ups - Combobox */
-qtc_combobox_normal:#4D4D4D;
-qtc_combobox_pressed:#125987;
-qtc_combobox_highlight:#4D4D4D;
-qtc_combobox_disabled:#E6E6E6;
-qtc_combobox_edit:#4D4D4D;
-
-/* Virtual inputs */
-qtc_input_button_normal:#595B5D;
-qtc_input_button_pressed:#125987;
-qtc_input_button_latched:#595B5D;
-qtc_input_button_disabled:#959799;
-qtc_input_function_normal:#FFFFFF;
-qtc_input_function_pressed:#FFFFFF;
-qtc_input_function_latched:#8CE0FF;
-qtc_input_function_disabled:#959799;
-qtc_input_title_normal:#595B5D;
-
-/* Application specific - Conversational list */
-qtc_conv_received_normal:#B5B5B5;
-qtc_conv_received_pressed:#B5B5B5;
-qtc_conv_received_highlight:#FFFFFF;
-qtc_conv_sent_normal:#B5B5B5;
-qtc_conv_sent_pressed:#B5B5B5;
-qtc_conv_sent_highlight:#FFFFFF;
-
-/* Application specific - Tumbler */
-qtc_tumbler_normal:#333333;
-qtc_tumbler_selected:#FFFFFF;
-qtc_tumbler_highlight:#FFFFFF;
-
-/* Application specific - Calendar */
-
-/* Deprecated compatibility mappings */
-default_decor_normal:var(qtc_default_decor_normal);
-default_decor_pressed:var(qtc_default_decor_pressed);
-default_decor_latched:var(qtc_default_decor_latched);
-default_decor_highlight:var(qtc_default_decor_highlight);
-default_decor_disabled:var(qtc_default_decor_disabled);
-default_main_pane_normal:var(qtc_default_main_pane_normal);
-default_main_pane_pressed:var(qtc_default_main_pane_pressed);
-default_main_pane_latched:var(qtc_default_main_pane_latched);
-default_main_pane_highlight:var(qtc_default_main_pane_highlight);
-default_main_pane_disabled:var(qtc_default_main_pane_disabled);
-default_popup_normal:var(qtc_default_popup_normal);
-default_popup_pressed:var(qtc_default_popup_pressed);
-default_popup_latched:var(qtc_default_popup_latched);
-default_popup_highlight:var(qtc_default_popup_highlight);
-default_popup_disabled:var(qtc_default_popup_disabled);
-title_pane_normal:var(qtc_title_pane_normal);
-title_pane_pressed:var(qtc_title_pane_pressed);
-title_pane_highlight:var(qtc_title_pane_highlight);
-title_pane_latched:var(qtc_title_pane_latched);
-title_pane_trans_normal:var(qtc_title_pane_trans_normal);
-title_pane_trans_pressed:var(qtc_title_pane_trans_pressed);
-title_pane_trans_highlight:var(qtc_title_pane_trans_highlight);
-title_pane_trans_latched:var(qtc_title_pane_trans_latched);
-view_normal:var(qtc_view_normal);
-view_pressed:var(qtc_view_pressed);
-view_line_normal:var(qtc_view_line_normal);
-view_link_normal:var(qtc_view_link_normal);
-view_visited_normal:var(qtc_view_visited_normal);
-view_separator_normal:var(qtc_view_separator_normal);
-viewtitle_normal:var(qtc_viewtitle_normal);
-tab_active_normal:var(qtc_tab_active_normal);
-tab_passive_normal:var(qtc_tab_passive_normal);
-tab_passive_pressed:var(qtc_tab_passive_pressed);
-grid_normal:var(qtc_grid_normal);
-grid_pressed:var(qtc_grid_pressed);
-grid_highlight:var(qtc_grid_highlight);
-list_item_title_normal:var(qtc_list_item_title_normal);
-list_item_content_normal:var(qtc_list_item_content_normal);
-list_item_parent_normal:var(qtc_list_item_parent_normal);
-list_item_pressed:var(qtc_list_item_pressed);
-list_item_highlight:var(qtc_list_item_highlight);
-list_item_disabled:var(qtc_list_item_disabled);
-button_normal:var(qtc_button_normal);
-button_pressed:var(qtc_button_pressed);
-button_latched:var(qtc_button_latched);
-button_highlight:var(qtc_button_highlight);
-button_disabled:var(qtc_button_disabled);
-editor_normal:var(qtc_editor_normal);
-editor_selected:var(qtc_editor_selected);
-editor_marker_normal:var(qtc_editor_marker_normal);
-editor_hint_normal:var(qtc_editor_hint_normal);
-toolbar_normal:var(qtc_toolbar_normal);
-toolbar_pressed:var(qtc_toolbar_pressed);
-toolbar_latched:var(qtc_toolbar_latched);
-toolbar_disabled:var(qtc_toolbar_disabled);
-toolbar_highlight:var(qtc_toolbar_highlight);
-toolbar_trans_normal:var(qtc_toolbar_trans_normal);
-toolbar_trans_pressed:var(qtc_toolbar_trans_pressed);
-toolbar_trans_latched:var(qtc_toolbar_trans_latched);
-toolbar_trans_disabled:var(qtc_toolbar_trans_disabled);
-toolbar_trans_highlight:var(qtc_toolbar_trans_highlight);
-groupbox_normal:var(qtc_groupbox_normal);
-groupbox_pressed:var(qtc_groupbox_pressed);
-groupbox_highlight:var(qtc_groupbox_highlight);
-popup_sk_normal:var(qtc_popup_sk_normal);
-popup_sk_highlight:var(qtc_popup_sk_highlight);
-popup_sk_pressed:var(qtc_popup_sk_pressed);
-popup_heading_normal:var(qtc_popup_heading_normal);
-popup_heading_pressed:var(qtc_popup_heading_pressed);
-popup_heading_highlight:var(qtc_popup_heading_highlight);
-popup_normal:var(qtc_popup_normal);
-popup_preview_normal:var(qtc_popup_preview_normal);
-popup_preview_pressed:var(qtc_popup_preview_pressed);
-popup_preview_link:var(qtc_popup_preview_link);
-popup_trans_normal:var(qtc_popup_trans_normal);
-popup_trans_pressed:var(qtc_popup_trans_pressed);
-popup_trans_link:var(qtc_popup_trans_link);
-popup_grid_normal:var(qtc_popup_grid_normal);
-popup_grid_pressed:var(qtc_popup_grid_pressed); 
-popup_grid_highlight:var(qtc_popup_grid_highlight);
-popup_grid_disabled:var(qtc_popup_grid_disabled);
-popup_list_title_normal:var(qtc_popup_list_title_normal);
-popup_list_item_content_normal:var(qtc_popup_list_item_content_normal);
-popup_list_item_parent_normal:var(qtc_popup_list_item_parent_normal);
-popup_list_item_pressed:var(qtc_popup_list_item_pressed);
-popup_list_item_highlight:var(qtc_popup_list_item_highlight);
-popup_list_item_disabled:var(qtc_popup_list_item_disabled);
-combobox_normal:var(qtc_combobox_normal);
-combobox_pressed:var(qtc_combobox_pressed);
-combobox_highlight:var(qtc_combobox_highlight);
-combobox_disabled:var(qtc_combobox_disabled);
-combobox_edit:var(qtc_combobox_edit);
-input_button_normal:var(qtc_input_button_normal);
-input_button_pressed:var(qtc_input_button_pressed);
-input_button_latched:var(qtc_input_button_latched);
-input_button_disabled:var(qtc_input_button_disabled);
-input_function_normal:var(qtc_input_function_normal);
-input_function_pressed:var(qtc_input_function_pressed);
-input_function_latched:var(qtc_input_function_latched);
-input_function_disabled:var(qtc_input_function_disabled);
-input_title_normal:var(qtc_input_title_normal);
-
-/* Deprecated legacy variables */
-foreground:var(qtc_default_main_pane_normal);
-popupbackground:#FFFFFF;
-popupforeground:var(qtc_default_popup_normal);
-menubackground:#FFFFFF;
-menuforeground_enabled:var(qtc_default_popup_normal);
-menuforeground_disabled:var(qtc_default_popup_disabled);
-toolbuttonforeground_enabled:var(qtc_toolbar_normal);
-toolbuttonforeground_disabled:var(qtc_toolbar_disabled);
-slider_ticktext_color:var(qtc_default_main_pane_normal);
-
-/* Unclear cases - consider deprecated */
-list_item_separator_normal:#4d4d4d;
-qtc_checkbox_normal:#000000;
-qtc_checkbox_disabled:#a0a0a4;
-qtc_popup_trans:#000000;
-answer_normal:#FFFFFF;
-answer_pressed:#008200;
-answer_highlight:#CCFFCC;
-reject_normal:#FFFFFF;
-reject_pressed:#820000;
-reject_highlight:#FFCCCC;
-hs_list_item_title_normal:#595B5D;
-hs_list_item_content_normal:#636567;
-hs_list_item_pressed:#125987;
-hs_list_item_highlight:#FFFFFF;
-
-/* Deprecated autotest variables */
-testforeground:#010101;
-testforeground_focused:#010101;
-testforeground_nonfocused:#000000;
-testforeground_enabled:#000000;
-testforeground_disabled:#000000;
-testforground_state5:#010101;
-testforground_state5:#020202;
-my_widget_background_pressed:#ff0000;
-my_widget_background_notpressed:#0000ff;
-}
-

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/style/sfblacknvgtheme/variables/color/hbapplicationcolorgroup.css	Mon Apr 19 14:02:15 2010 +0300
@@ -0,0 +1,55 @@
+/* Application specific color groups */
+
+
+@variables
+{
+/* Application specific - Conversational list */ 
+qtc_conv_list_received_normal:#B5B5B5; /* Modified 05.02.2010 */
+qtc_conv_list_received_pressed:#B5B5B5; /* Modified 05.02.2010 */
+qtc_conv_list_received_highlight:#FFFFFF; /* Modified 05.02.2010 */
+qtc_conv_list_sent_normal:#B5B5B5; /* Modified 05.02.2010 */
+qtc_conv_list_sent_pressed:#B5B5B5; /* Modified 05.02.2010 */
+qtc_conv_list_sent_highlight:#FFFFFF; /* Modified 05.02.2010 */
+
+/* Application specific - Calendar */ 
+qtc_cal_grid_line:#8E8E8E; /* Added 05.02.2010 */
+qtc_cal_month_highlighted_text:#FFFFFF; /* Added 05.02.2010 */
+qtc_cal_month_active_dates:#E5E5E5; /* Added 05.02.2010 */
+qtc_cal_month_notactive_dates:#9B9B9B; /* Added 05.02.2010 */
+qtc_cal_month_current_day:#00BAFF; /* Added 05.02.2010 */
+qtc_cal_week_day:#00BAFF; /* Added 05.02.2010 */
+qtc_cal_day_preview_heading:#FFFFFF; /* Added 05.02.2010 */
+qtc_cal_day_preview_text:#FFFFFF; /* Added 05.02.2010 */
+qtc_cal_day_hour_lines:#8E8E8E; /* Added 05.02.2010 */
+qtc_cal_monthgrid_title:#FFFFFF; /* Added 05.02.2010 */
+
+/* Application specific - Call handling */ 
+qtc_callhandling_answer_normal:#FFFFFF; /* Added 05.02.2010 */
+qtc_callhandling_answer_pressed:#FFFFFF; /* Added 05.02.2010 */
+qtc_callhandling_answer_highlight:#FFFFFF; /* Added 05.02.2010 */
+qtc_callhandling_reject_normal:#FFFFFF; /* Added 05.02.2010 */
+qtc_callhandling_reject_pressed:#FFFFFF; /* Added 05.02.2010 */
+qtc_callhandling_reject_highlight:#FFFFFF; /* Added 05.02.2010 */
+
+/* Application specific - Home screen */ 
+qtc_hs_list_item_title_normal:#FFFFFF; /* Added 05.02.2010 */
+qtc_hs_list_item_content_normal:#FFFFFF; /* Added 05.02.2010 */
+qtc_hs_list_item_pressed:#FFFFFF; /* Added 05.02.2010 */
+qtc_hs_list_item_highlight:#FFFFFF; /* Added 05.02.2010 */
+
+/* Application specific - Messaging */ 
+qtc_messaging_heading:#FFFFFF; /* Added 05.02.2010 */
+
+/* Application specific - Radio & Calculator */ 
+qtc_lcd_title_normal:#FFFFFF; /* Added 11.02.2010 */
+qtc_lcd_content_normal:#FFFFFF; /* Added 11.02.2010 */
+qtc_lcd_link_normal:#33C8FF; /* Added 22.02.2010 */
+qtc_radio_tuner_normal:#FFFFFF; /* Added 05.02.2010 */
+qtc_radio_tuner_line:#FFFFFF; /* Added 05.02.2010 */
+
+/* Application specific - Multimedia */ 
+qtc_multimedia_trans:#FFFFFF; /* Modified 19.02.2010 */
+qtc_multimedia_trans_pressed:#FFFFFF; /* Added 19.02.2010 */
+
+}
+

--- a/src/style/sfblacknvgtheme/variables/color/hbcolorgroup.css	Fri Mar 19 09:40:18 2010 +0200
+++ b/src/style/sfblacknvgtheme/variables/color/hbcolorgroup.css	Mon Apr 19 14:02:15 2010 +0300
@@ -1,5 +1,3 @@
-/* Color definitions for SF Black Reference Theme */
-
 @variables
 {
 /* Default palette */
@@ -28,10 +26,10 @@
 qtc_title_pane_trans_pressed:#FFFFFF;
 qtc_title_pane_trans_highlight:#FFFFFF;
 qtc_title_pane_trans_latched:#FFFFFF;
+qtc_status_pane:#FFFFFF; /* Added 05.02.2010 */
+qtc_status_pane_trans:#FFFFFF; /* Added 05.02.2010 */
 
 /* Main area - View */
-qtc_status_pane:#FFFFFF;
-qtc_status_pane_trans:#FFFFFF;
 qtc_view_normal:#FFFFFF;
 qtc_view_pressed:#FFFFFF;
 qtc_view_line_normal:#FFFFFF;
@@ -42,38 +40,66 @@
 /* Main area - View title */
 qtc_viewtitle_normal:#E6E6E6;
 
-/* Main area - Tab */
+/* Main area - Tab */ 
 qtc_tab_active_normal:#FFFFFF;
 qtc_tab_passive_normal:#FFFFFF;
-qtc_tab_passive_pressed:#FFFFFF;
+qtc_tab_passive_Pressed:#FFFFFF;
 
-/* Main area - Grid */
+/* Main area - Grid */ 
 qtc_grid_normal:#DCDCDC;
 qtc_grid_pressed:#FFFFFF;
 qtc_grid_highlight:#FFFFFF;
-qtc_grid_latched:#FFFFFF;
+qtc_grid_latched:#FFFFFF; /* Added 05.02.2010 */
+qtg_grid_disabled:#9B9B9B; /* Added 15.02.2010 */
 
-/* Main area - List */
-qtc_list_item_title_normal:#FFFFFF;
+/* Main area - List */ 
+qtc_list_item_title_normal:#FFFFFF; /* Modified 19.02.2010 */
 qtc_list_item_content_normal:#F0F0F0;
 qtc_list_item_parent_normal:#F0F0F0;
 qtc_list_item_pressed:#FFFFFF;
 qtc_list_item_highlight:#FFFFFF;
 qtc_list_item_disabled:#9B9B9B;
-qtc_list_item_latched:#FFFFFF;
+qtc_list_item_latched:#FFFFFF; /* Added 05.02.2010 */
+qtc_list_item_separator:#FFFFFF; /* Added 22.02.2010 */
 
-/* Main area - Button */
+/* Button */ 
 qtc_button_normal:#FFFFFF;
 qtc_button_pressed:#FFFFFF;
 qtc_button_latched:#FFFFFF;
 qtc_button_highlight:#FFFFFF;
 qtc_button_disabled:#9B9B9B;
 
-/* Main area - Editor */
-qtc_editor_normal:#FFFFFF;
-qtc_editor_selected:#FFFFFF;
-qtc_editor_marker_normal:#4D4D4D;
-qtc_editor_hint_normal:#F0F0F0;
+/* LineEdit */ 
+qtc_lineedit_normal:#FFFFFF;
+qtc_lineedit_selected:#FFFFFF;
+qtc_lineedit_marker_normal:#4D4D4D;
+qtc_lineedit_hint_normal:#F0F0F0;
+
+/* Combobox */ 
+qtc_combobox_normal:#FFFFFF;
+qtc_combobox_pressed:#FFFFFF;
+qtc_combobox_highlight:#FFFFFF;
+qtc_combobox_disabled:#9B9B9B;
+qtc_combobox_edit:#4D4D4D;
+qtc_combobox_latched:#FFFFFF; /* Added 05.02.2010 */
+
+/* Tumbler */
+qtc_tumbler_normal:#FFFFFF;
+qtc_tumbler_selected:#FFFFFF;
+qtc_tumbler_highlight:#FFFFFF;
+
+/* Main area - DataForm */
+qtc_dataform_value:#FFFFFF; /* Added 08.02.2010 */
+
+/* Main area - ProgressSlider */
+qtc_progslider_normal:#FFFFFF; /* Added 09.02.2010 */
+qtc_progslider_pressed:#FFFFFF; /* Added 09.02.2010 */
+
+/* Main area - Text edit */ 
+qtc_textedit_normal:#FFFFFF; /* Added 17.02.2010 */
+qtc_textedit_selected:#FFFFFF; /* Added 17.02.2010 */
+qtc_textedit_marker_normal:#4D4D4D; /* Added 17.02.2010 */
+qtc_textedit_hint_normal:#F0F0F0; /* Added 17.02.2010 */
 
 /* Main area - Toolbar */
 qtc_toolbar_normal:#FFFFFF;
@@ -87,22 +113,19 @@
 qtc_toolbar_trans_disabled:#9B9B9B;
 qtc_toolbar_trans_highlight:#FFFFFF;
 
-/* Main area - Toolbar extension */
-
 /* Main area - Groupbox */
 qtc_groupbox_normal:#FFFFFF;
 qtc_groupbox_pressed:#FFFFFF;
 qtc_groupbox_highlight:#FFFFFF;
 
-/* Pop-ups - Generic pop-up */
+/* Pop-ups - Generic pop-up */ 
 qtc_popup_sk_normal:#FFFFFF;
 qtc_popup_sk_highlight:#FFFFFF;
 qtc_popup_sk_pressed:#FFFFFF;
-qtc_popup_sk_disabled:#9B9B9B;
+qtc_popup_sk_disabled:#9B9B9B; /* Added 05.02.2010 */
 qtc_popup_heading_normal:#FFFFFF;
-qtc_popup_heading_pressed:#FFFFFF;
-qtc_popup_heading_highlight:#FFFFFF;
 qtc_popup_normal:#B5B5B5;
+qtc_popup_link:#33C8FF; /* Added 16.02.2010 */
 
 /* Pop-ups - Preview pop-up */
 qtc_popup_preview_normal:#FFFFFF;
@@ -114,88 +137,85 @@
 qtc_popup_trans_pressed:#F0F0F0;
 qtc_popup_trans_link:#33C8FF;
 
-/* Pop-ups - Grid in a pop-up */
+/* Pop-ups - Grid in a pop-up */ 
 qtc_popup_grid_normal:#FFFFFF;
 qtc_popup_grid_pressed:#FFFFFF; 
 qtc_popup_grid_highlight:#FFFFFF;
 qtc_popup_grid_disabled:#9B9B9B;
-qtc_popup_grid_latched:#FFFFFF;
-qtc_popup_grid_trans_normal:#FFFFFF;
-qtc_popup_grid_trans_pressed:#FFFFFF;
+qtc_popup_grid_latched:#FFFFFF; /* Added 05.02.2010 */
+qtc_popup_grid_trans_normal:#FFFFFF; /* Added 05.02.2010 */
+qtc_popup_grid_trans_pressed:#FFFFFF; /* Added 05.02.2010 */
 
-/* Pop-ups - List in a pop-up */
+/* Pop-ups - List in a pop-up */ 
 qtc_popup_list_title_normal:#FFFFFF;
 qtc_popup_list_item_content_normal:#FFFFFF;
 qtc_popup_list_item_parent_normal:#FFFFFF;
 qtc_popup_list_item_pressed:#FFFFFF;
 qtc_popup_list_item_highlight:#FFFFFF;
 qtc_popup_list_item_disabled:#9B9B9B;
-qtc_popup_list_item_latched:#FFFFFF;
-
-/* Pop-ups - Combobox */
-qtc_combobox_normal:#FFFFFF;
-qtc_combobox_pressed:#FFFFFF;
-qtc_combobox_highlight:#FFFFFF;
-qtc_combobox_disabled:#9B9B9B;
-qtc_combobox_edit:#4D4D4D;
-qtc_combobox_latched:#FFFFFF;
+qtc_popup_list_item_latched:#FFFFFF; /* Added 05.02.2010 */
 
-/* Virtual inputs */
-qtc_input_button_normal:#FFFFFF;
-qtc_input_button_pressed:#FFFFFF;
-qtc_input_button_latched:#FFFFFF;
-qtc_input_button_disabled:#9B9B9B;
-qtc_input_function_normal:#FFFFFF;
-qtc_input_function_pressed:#FFFFFF;
-qtc_input_function_latched:#FFFFFF;
-qtc_input_function_disabled:#9B9B9B;
-qtc_input_title_normal:#FFFFFF;
+/* Virtual inputs */ 
+qtc_input_button_normal:#FFFFFF; /* Modified 19.02.2010 */
+qtc_input_button_accented_normal:#FFFFFF; /* Added 22.02.2010 */
+qtc_input_button_pressed:#FFFFFF; /* Modified 19.02.2010 */
+qtc_input_button_latched:#FFFFFF; /* Modified 19.02.2010 */
+qtc_input_button_disabled:#9B9B9B; /* Modified 19.02.2010 */
+qtc_input_function_normal:#FFFFFF; /* Modified 19.02.2010 */
+qtc_input_function_pressed:#FFFFFF; /* Modified 19.02.2010 */
+qtc_input_function_latched:#FFFFFF; /* Modified 19.02.2010 */
+qtc_input_function_disabled:#9B9B9B; /* Modified 19.02.2010 */
+qtc_input_preview_normal:#FFFFFF; /* Modified 22.02.2010 */
 
-/* Application specific - Conversational list */
-qtc_conv_received_normal:#B5B5B5;
-qtc_conv_received_pressed:#B5B5B5;
-qtc_conv_received_highlight:#FFFFFF;
-qtc_conv_sent_normal:#B5B5B5;
-qtc_conv_sent_pressed:#B5B5B5;
-qtc_conv_sent_highlight:#FFFFFF;
+/* Application specific color groups */
+
+/* Application specific - Conversational list */ 
+qtc_conv_list_received_normal:#B5B5B5; /* Modified 05.02.2010 */
+qtc_conv_list_received_pressed:#B5B5B5; /* Modified 05.02.2010 */
+qtc_conv_list_received_highlight:#FFFFFF; /* Modified 05.02.2010 */
+qtc_conv_list_sent_normal:#B5B5B5; /* Modified 05.02.2010 */
+qtc_conv_list_sent_pressed:#B5B5B5; /* Modified 05.02.2010 */
+qtc_conv_list_sent_highlight:#FFFFFF; /* Modified 05.02.2010 */
 
-/* Application specific - Tumbler */
-qtc_tumbler_normal:#FFFFFF;
-qtc_tumbler_selected:#FFFFFF;
-qtc_tumbler_highlight:#FFFFFF;
+/* Application specific - Calendar */ 
+qtc_cal_grid_line:#8E8E8E; /* Added 05.02.2010 */
+qtc_cal_month_highlighted_text:#FFFFFF; /* Added 05.02.2010 */
+qtc_cal_month_active_dates:#E5E5E5; /* Added 05.02.2010 */
+qtc_cal_month_notactive_dates:#9B9B9B; /* Added 05.02.2010 */
+qtc_cal_month_current_day:#00BAFF; /* Added 05.02.2010 */
+qtc_cal_week_day:#00BAFF; /* Added 05.02.2010 */
+qtc_cal_day_preview_heading:#FFFFFF; /* Added 05.02.2010 */
+qtc_cal_day_preview_text:#FFFFFF; /* Added 05.02.2010 */
+qtc_cal_day_hour_lines:#8E8E8E; /* Added 05.02.2010 */
+qtc_cal_monthgrid_title:#FFFFFF; /* Added 05.02.2010 */
 
-/* Application specific - Calendar */
-qtc_cal_grid_line:#8E8E8E;
-qtc_cal_month_highlighted_text:#FFFFFF;
-qtc_cal_month_active_dates:#E5E5E5;
-qtc_cal_month_notactive_dates:#9B9B9B;
-qtc_cal_month_current_day:#00BAFF;
-qtc_cal_week_day:#00BAFF;
-qtc_cal_day_preview_heading:#FFFFFF;
-qtc_cal_day_preview_text:#FFFFFF;
-qtc_cal_day_hour_lines:#8E8E8E;
-qtc_cal_monthgrid_title:#FFFFFF;
+/* Application specific - Call handling */ 
+qtc_callhandling_answer_normal:#FFFFFF; /* Added 05.02.2010 */
+qtc_callhandling_answer_pressed:#FFFFFF; /* Added 05.02.2010 */
+qtc_callhandling_answer_highlight:#FFFFFF; /* Added 05.02.2010 */
+qtc_callhandling_reject_normal:#FFFFFF; /* Added 05.02.2010 */
+qtc_callhandling_reject_pressed:#FFFFFF; /* Added 05.02.2010 */
+qtc_callhandling_reject_highlight:#FFFFFF; /* Added 05.02.2010 */
 
-qtc_callhandling_answer_normal:#FFFFFF;
-qtc_callhandling_answer_pressed:#FFFFFF;
-qtc_callhandling_answer_highlight:#FFFFFF;
-qtc_callhandling_reject_normal:#FFFFFF;
-qtc_callhandling_reject_pressed:#FFFFFF;
-qtc_callhandling_reject_highlight:#FFFFFF;
+/* Application specific - Home screen */ 
+qtc_hs_list_item_title_normal:#FFFFFF; /* Added 05.02.2010 */
+qtc_hs_list_item_content_normal:#FFFFFF; /* Added 05.02.2010 */
+qtc_hs_list_item_pressed:#FFFFFF; /* Added 05.02.2010 */
+qtc_hs_list_item_highlight:#FFFFFF; /* Added 05.02.2010 */
+
+/* Application specific - Messaging */ 
+qtc_messaging_heading:#FFFFFF; /* Added 05.02.2010 */
 
-qtc_hs_list_item_title_normal:#FFFFFF;
-qtc_hs_list_item_content_normal:#FFFFFF;
-qtc_hs_list_item_pressed:#FFFFFF;
-qtc_hs_list_item_highlight:#FFFFFF;
-
-qtc_messaging_heading:#FFFFFF;
+/* Application specific - Radio & Calculator */ 
+qtc_lcd_title_normal:#FFFFFF; /* Added 11.02.2010 */
+qtc_lcd_content_normal:#FFFFFF; /* Added 11.02.2010 */
+qtc_lcd_link_normal:#33C8FF; /* Added 22.02.2010 */
+qtc_radio_tuner_normal:#FFFFFF; /* Added 05.02.2010 */
+qtc_radio_tuner_line:#FFFFFF; /* Added 05.02.2010 */
 
-qtc_radio_title_normal:#FFFFFF;
-qtc_radio_content_normal:#FFFFFF;
-qtc_radio_tuner_normal:#FFFFFF;
-qtc_radio_tuner_line:#FFFFFF;
-
-qtc_multimedia_popup_trans:#FFFFFF;
+/* Application specific - Multimedia */ 
+qtc_multimedia_trans:#FFFFFF; /* Modified 19.02.2010 */
+qtc_multimedia_trans_pressed:#FFFFFF; /* Added 19.02.2010 */
 
 /* Deprecated compatibility mappings */
 default_decor_normal:var(qtc_default_decor_normal);
@@ -328,5 +348,6 @@
 testforground_state5:#020202;
 my_widget_background_pressed:#ff0000;
 my_widget_background_notpressed:#0000ff;
+
 }
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/style/sfblacknvgtheme/variables/color/hbwidgetcolorgroup.css	Mon Apr 19 14:02:15 2010 +0300
@@ -0,0 +1,175 @@
+/* Widget color groups */
+
+
+@variables
+{
+/* Default palette */
+qtc_default_decor_normal:#FFFFFF;
+qtc_default_decor_pressed:#FFFFFF;
+qtc_default_decor_latched:#FFFFFF;
+qtc_default_decor_highlight:#FFFFFF;
+qtc_default_decor_disabled:#9B9B9B; 
+qtc_default_main_pane_normal:#FFFFFF;
+qtc_default_main_pane_pressed:#FFFFFF;
+qtc_default_main_pane_latched:#FFFFFF;
+qtc_default_main_pane_highlight:#FFFFFF;
+qtc_default_main_pane_disabled:#9B9B9B; 
+qtc_default_popup_normal:#FFFFFF;
+qtc_default_popup_pressed:#FFFFFF;
+qtc_default_popup_latched:#FFFFFF;
+qtc_default_popup_highlight:#FFFFFF;
+qtc_default_popup_disabled:#9B9B9B;
+
+/* Title pane */
+qtc_title_pane_normal:#FFFFFF;
+qtc_title_pane_pressed:#FFFFFF;
+qtc_title_pane_highlight:#FFFFFF;
+qtc_title_pane_latched:#FFFFFF;
+qtc_title_pane_trans_normal:#FFFFFF;
+qtc_title_pane_trans_pressed:#FFFFFF;
+qtc_title_pane_trans_highlight:#FFFFFF;
+qtc_title_pane_trans_latched:#FFFFFF;
+qtc_status_pane:#FFFFFF; /* Added 05.02.2010 */
+qtc_status_pane_trans:#FFFFFF; /* Added 05.02.2010 */
+
+/* Main area - View */
+qtc_view_normal:#FFFFFF;
+qtc_view_pressed:#FFFFFF;
+qtc_view_line_normal:#FFFFFF;
+qtc_view_link_normal:#33C8FF;
+qtc_view_visited_normal:#B378FF;
+qtc_view_separator_normal:#9B9B9B;
+
+/* Main area - View title */
+qtc_viewtitle_normal:#E6E6E6;
+
+/* Main area - Tab */ 
+qtc_tab_active_normal:#FFFFFF;
+qtc_tab_passive_normal:#FFFFFF;
+qtc_tab_passive_Pressed:#FFFFFF;
+
+/* Main area - Grid */ 
+qtc_grid_normal:#DCDCDC;
+qtc_grid_pressed:#FFFFFF;
+qtc_grid_highlight:#FFFFFF;
+qtc_grid_latched:#FFFFFF; /* Added 05.02.2010 */
+qtg_grid_disabled:#9B9B9B; /* Added 15.02.2010 */
+
+/* Main area - List */ 
+qtc_list_item_title_normal:#FFFFFF; /* Modified 19.02.2010 */
+qtc_list_item_content_normal:#F0F0F0;
+qtc_list_item_parent_normal:#F0F0F0;
+qtc_list_item_pressed:#FFFFFF;
+qtc_list_item_highlight:#FFFFFF;
+qtc_list_item_disabled:#9B9B9B;
+qtc_list_item_latched:#FFFFFF; /* Added 05.02.2010 */
+qtc_list_item_separator:#FFFFFF; /* Added 22.02.2010 */
+
+/* Button */ 
+qtc_button_normal:#FFFFFF;
+qtc_button_pressed:#FFFFFF;
+qtc_button_latched:#FFFFFF;
+qtc_button_highlight:#FFFFFF;
+qtc_button_disabled:#9B9B9B;
+
+/* LineEdit */ 
+qtc_lineedit_normal:#FFFFFF;
+qtc_lineedit_selected:#FFFFFF;
+qtc_lineedit_marker_normal:#4D4D4D;
+qtc_lineedit_hint_normal:#F0F0F0;
+
+/* Combobox */ 
+qtc_combobox_normal:#FFFFFF;
+qtc_combobox_pressed:#FFFFFF;
+qtc_combobox_highlight:#FFFFFF;
+qtc_combobox_disabled:#9B9B9B;
+qtc_combobox_edit:#4D4D4D;
+qtc_combobox_latched:#FFFFFF; /* Added 05.02.2010 */
+
+/* Tumbler */
+qtc_tumbler_normal:#FFFFFF;
+qtc_tumbler_selected:#FFFFFF;
+qtc_tumbler_highlight:#FFFFFF;
+
+/* Main area - DataForm */
+qtc_dataform_value:#FFFFFF; /* Added 08.02.2010 */
+
+/* Main area - ProgressSlider */
+qtc_progslider_normal:#FFFFFF; /* Added 09.02.2010 */
+qtc_progslider_pressed:#FFFFFF; /* Added 09.02.2010 */
+
+/* Main area - Text edit */ 
+qtc_textedit_normal:#FFFFFF; /* Added 17.02.2010 */
+qtc_textedit_selected:#FFFFFF; /* Added 17.02.2010 */
+qtc_textedit_marker_normal:#4D4D4D; /* Added 17.02.2010 */
+qtc_textedit_hint_normal:#F0F0F0; /* Added 17.02.2010 */
+
+/* Main area - Toolbar */
+qtc_toolbar_normal:#FFFFFF;
+qtc_toolbar_pressed:#FFFFFF;
+qtc_toolbar_latched:#FFFFFF;
+qtc_toolbar_disabled:#9B9B9B;
+qtc_toolbar_highlight:#FFFFFF;
+qtc_toolbar_trans_normal:#FFFFFF;
+qtc_toolbar_trans_pressed:#FFFFFF;
+qtc_toolbar_trans_latched:#FFFFFF;
+qtc_toolbar_trans_disabled:#9B9B9B;
+qtc_toolbar_trans_highlight:#FFFFFF;
+
+/* Main area - Groupbox */
+qtc_groupbox_normal:#FFFFFF;
+qtc_groupbox_pressed:#FFFFFF;
+qtc_groupbox_highlight:#FFFFFF;
+
+/* Pop-ups - Generic pop-up */ 
+qtc_popup_sk_normal:#FFFFFF;
+qtc_popup_sk_highlight:#FFFFFF;
+qtc_popup_sk_pressed:#FFFFFF;
+qtc_popup_sk_disabled:#9B9B9B; /* Added 05.02.2010 */
+qtc_popup_heading_normal:#FFFFFF;
+qtc_popup_normal:#B5B5B5;
+qtc_popup_link:#33C8FF; /* Added 16.02.2010 */
+
+/* Pop-ups - Preview pop-up */
+qtc_popup_preview_normal:#FFFFFF;
+qtc_popup_preview_pressed:#F0F0F0;
+qtc_popup_preview_link:#33C8FF;
+
+/* Pop-ups - Transparent pop-up */
+qtc_popup_trans_normal:#FFFFFF;
+qtc_popup_trans_pressed:#F0F0F0;
+qtc_popup_trans_link:#33C8FF;
+
+/* Pop-ups - Grid in a pop-up */ 
+qtc_popup_grid_normal:#FFFFFF;
+qtc_popup_grid_pressed:#FFFFFF; 
+qtc_popup_grid_highlight:#FFFFFF;
+qtc_popup_grid_disabled:#9B9B9B;
+qtc_popup_grid_latched:#FFFFFF; /* Added 05.02.2010 */
+qtc_popup_grid_trans_normal:#FFFFFF; /* Added 05.02.2010 */
+qtc_popup_grid_trans_pressed:#FFFFFF; /* Added 05.02.2010 */
+
+/* Pop-ups - List in a pop-up */ 
+qtc_popup_list_title_normal:#FFFFFF;
+qtc_popup_list_item_content_normal:#FFFFFF;
+qtc_popup_list_item_parent_normal:#FFFFFF;
+qtc_popup_list_item_pressed:#FFFFFF;
+qtc_popup_list_item_highlight:#FFFFFF;
+qtc_popup_list_item_disabled:#9B9B9B;
+qtc_popup_list_item_latched:#FFFFFF; /* Added 05.02.2010 */
+
+/* Virtual inputs */ 
+qtc_input_button_normal:#FFFFFF; /* Modified 19.02.2010 */
+qtc_input_button_accented_normal:#FFFFFF; /* Added 22.02.2010 */
+qtc_input_button_pressed:#FFFFFF; /* Modified 19.02.2010 */
+qtc_input_button_latched:#FFFFFF; /* Modified 19.02.2010 */
+qtc_input_button_disabled:#9B9B9B; /* Modified 19.02.2010 */
+qtc_input_function_normal:#FFFFFF; /* Modified 19.02.2010 */
+qtc_input_function_pressed:#FFFFFF; /* Modified 19.02.2010 */
+qtc_input_function_latched:#FFFFFF; /* Modified 19.02.2010 */
+qtc_input_function_disabled:#9B9B9B; /* Modified 19.02.2010 */
+qtc_input_preview_normal:#FFFFFF; /* Modified 22.02.2010 */
+
+
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/style/sfblacktheme/variables/color/hbapplicationcolorgroup.css	Mon Apr 19 14:02:15 2010 +0300
@@ -0,0 +1,55 @@
+/* Application specific color groups */
+
+
+@variables
+{
+/* Application specific - Conversational list */ 
+qtc_conv_list_received_normal:#B5B5B5; /* Modified 05.02.2010 */
+qtc_conv_list_received_pressed:#B5B5B5; /* Modified 05.02.2010 */
+qtc_conv_list_received_highlight:#FFFFFF; /* Modified 05.02.2010 */
+qtc_conv_list_sent_normal:#B5B5B5; /* Modified 05.02.2010 */
+qtc_conv_list_sent_pressed:#B5B5B5; /* Modified 05.02.2010 */
+qtc_conv_list_sent_highlight:#FFFFFF; /* Modified 05.02.2010 */
+
+/* Application specific - Calendar */ 
+qtc_cal_grid_line:#8E8E8E; /* Added 05.02.2010 */
+qtc_cal_month_highlighted_text:#FFFFFF; /* Added 05.02.2010 */
+qtc_cal_month_active_dates:#E5E5E5; /* Added 05.02.2010 */
+qtc_cal_month_notactive_dates:#9B9B9B; /* Added 05.02.2010 */
+qtc_cal_month_current_day:#00BAFF; /* Added 05.02.2010 */
+qtc_cal_week_day:#00BAFF; /* Added 05.02.2010 */
+qtc_cal_day_preview_heading:#FFFFFF; /* Added 05.02.2010 */
+qtc_cal_day_preview_text:#FFFFFF; /* Added 05.02.2010 */
+qtc_cal_day_hour_lines:#8E8E8E; /* Added 05.02.2010 */
+qtc_cal_monthgrid_title:#FFFFFF; /* Added 05.02.2010 */
+
+/* Application specific - Call handling */ 
+qtc_callhandling_answer_normal:#FFFFFF; /* Added 05.02.2010 */
+qtc_callhandling_answer_pressed:#FFFFFF; /* Added 05.02.2010 */
+qtc_callhandling_answer_highlight:#FFFFFF; /* Added 05.02.2010 */
+qtc_callhandling_reject_normal:#FFFFFF; /* Added 05.02.2010 */
+qtc_callhandling_reject_pressed:#FFFFFF; /* Added 05.02.2010 */
+qtc_callhandling_reject_highlight:#FFFFFF; /* Added 05.02.2010 */
+
+/* Application specific - Home screen */ 
+qtc_hs_list_item_title_normal:#FFFFFF; /* Added 05.02.2010 */
+qtc_hs_list_item_content_normal:#FFFFFF; /* Added 05.02.2010 */
+qtc_hs_list_item_pressed:#FFFFFF; /* Added 05.02.2010 */
+qtc_hs_list_item_highlight:#FFFFFF; /* Added 05.02.2010 */
+
+/* Application specific - Messaging */ 
+qtc_messaging_heading:#FFFFFF; /* Added 05.02.2010 */
+
+/* Application specific - Radio & Calculator */ 
+qtc_lcd_title_normal:#FFFFFF; /* Added 11.02.2010 */
+qtc_lcd_content_normal:#FFFFFF; /* Added 11.02.2010 */
+qtc_lcd_link_normal:#33C8FF; /* Added 22.02.2010 */
+qtc_radio_tuner_normal:#FFFFFF; /* Added 05.02.2010 */
+qtc_radio_tuner_line:#FFFFFF; /* Added 05.02.2010 */
+
+/* Application specific - Multimedia */ 
+qtc_multimedia_trans:#FFFFFF; /* Modified 19.02.2010 */
+qtc_multimedia_trans_pressed:#FFFFFF; /* Added 19.02.2010 */
+
+}
+

--- a/src/style/sfblacktheme/variables/color/hbcolorgroup.css	Fri Mar 19 09:40:18 2010 +0200
+++ b/src/style/sfblacktheme/variables/color/hbcolorgroup.css	Mon Apr 19 14:02:15 2010 +0300
@@ -1,5 +1,3 @@
-/* Color definitions for SF Black Reference Theme */
-
 @variables
 {
 /* Default palette */
@@ -28,10 +26,10 @@
 qtc_title_pane_trans_pressed:#FFFFFF;
 qtc_title_pane_trans_highlight:#FFFFFF;
 qtc_title_pane_trans_latched:#FFFFFF;
+qtc_status_pane:#FFFFFF; /* Added 05.02.2010 */
+qtc_status_pane_trans:#FFFFFF; /* Added 05.02.2010 */
 
 /* Main area - View */
-qtc_status_pane:#FFFFFF;
-qtc_status_pane_trans:#FFFFFF;
 qtc_view_normal:#FFFFFF;
 qtc_view_pressed:#FFFFFF;
 qtc_view_line_normal:#FFFFFF;
@@ -42,38 +40,66 @@
 /* Main area - View title */
 qtc_viewtitle_normal:#E6E6E6;
 
-/* Main area - Tab */
+/* Main area - Tab */ 
 qtc_tab_active_normal:#FFFFFF;
 qtc_tab_passive_normal:#FFFFFF;
-qtc_tab_passive_pressed:#FFFFFF;
+qtc_tab_passive_Pressed:#FFFFFF;
 
-/* Main area - Grid */
+/* Main area - Grid */ 
 qtc_grid_normal:#DCDCDC;
 qtc_grid_pressed:#FFFFFF;
 qtc_grid_highlight:#FFFFFF;
-qtc_grid_latched:#FFFFFF;
+qtc_grid_latched:#FFFFFF; /* Added 05.02.2010 */
+qtg_grid_disabled:#9B9B9B; /* Added 15.02.2010 */
 
-/* Main area - List */
-qtc_list_item_title_normal:#FFFFFF;
+/* Main area - List */ 
+qtc_list_item_title_normal:#FFFFFF; /* Modified 19.02.2010 */
 qtc_list_item_content_normal:#F0F0F0;
 qtc_list_item_parent_normal:#F0F0F0;
 qtc_list_item_pressed:#FFFFFF;
 qtc_list_item_highlight:#FFFFFF;
 qtc_list_item_disabled:#9B9B9B;
-qtc_list_item_latched:#FFFFFF;
+qtc_list_item_latched:#FFFFFF; /* Added 05.02.2010 */
+qtc_list_item_separator:#FFFFFF; /* Added 22.02.2010 */
 
-/* Main area - Button */
+/* Button */ 
 qtc_button_normal:#FFFFFF;
 qtc_button_pressed:#FFFFFF;
 qtc_button_latched:#FFFFFF;
 qtc_button_highlight:#FFFFFF;
 qtc_button_disabled:#9B9B9B;
 
-/* Main area - Editor */
-qtc_editor_normal:#FFFFFF;
-qtc_editor_selected:#FFFFFF;
-qtc_editor_marker_normal:#4D4D4D;
-qtc_editor_hint_normal:#F0F0F0;
+/* LineEdit */ 
+qtc_lineedit_normal:#FFFFFF;
+qtc_lineedit_selected:#FFFFFF;
+qtc_lineedit_marker_normal:#4D4D4D;
+qtc_lineedit_hint_normal:#F0F0F0;
+
+/* Combobox */ 
+qtc_combobox_normal:#FFFFFF;
+qtc_combobox_pressed:#FFFFFF;
+qtc_combobox_highlight:#FFFFFF;
+qtc_combobox_disabled:#9B9B9B;
+qtc_combobox_edit:#4D4D4D;
+qtc_combobox_latched:#FFFFFF; /* Added 05.02.2010 */
+
+/* Tumbler */
+qtc_tumbler_normal:#FFFFFF;
+qtc_tumbler_selected:#FFFFFF;
+qtc_tumbler_highlight:#FFFFFF;
+
+/* Main area - DataForm */
+qtc_dataform_value:#FFFFFF; /* Added 08.02.2010 */
+
+/* Main area - ProgressSlider */
+qtc_progslider_normal:#FFFFFF; /* Added 09.02.2010 */
+qtc_progslider_pressed:#FFFFFF; /* Added 09.02.2010 */
+
+/* Main area - Text edit */ 
+qtc_textedit_normal:#FFFFFF; /* Added 17.02.2010 */
+qtc_textedit_selected:#FFFFFF; /* Added 17.02.2010 */
+qtc_textedit_marker_normal:#4D4D4D; /* Added 17.02.2010 */
+qtc_textedit_hint_normal:#F0F0F0; /* Added 17.02.2010 */
 
 /* Main area - Toolbar */
 qtc_toolbar_normal:#FFFFFF;
@@ -87,22 +113,19 @@
 qtc_toolbar_trans_disabled:#9B9B9B;
 qtc_toolbar_trans_highlight:#FFFFFF;
 
-/* Main area - Toolbar extension */
-
 /* Main area - Groupbox */
 qtc_groupbox_normal:#FFFFFF;
 qtc_groupbox_pressed:#FFFFFF;
 qtc_groupbox_highlight:#FFFFFF;
 
-/* Pop-ups - Generic pop-up */
+/* Pop-ups - Generic pop-up */ 
 qtc_popup_sk_normal:#FFFFFF;
 qtc_popup_sk_highlight:#FFFFFF;
 qtc_popup_sk_pressed:#FFFFFF;
-qtc_popup_sk_disabled:#9B9B9B;
+qtc_popup_sk_disabled:#9B9B9B; /* Added 05.02.2010 */
 qtc_popup_heading_normal:#FFFFFF;
-qtc_popup_heading_pressed:#FFFFFF;
-qtc_popup_heading_highlight:#FFFFFF;
 qtc_popup_normal:#B5B5B5;
+qtc_popup_link:#33C8FF; /* Added 16.02.2010 */
 
 /* Pop-ups - Preview pop-up */
 qtc_popup_preview_normal:#FFFFFF;
@@ -114,88 +137,85 @@
 qtc_popup_trans_pressed:#F0F0F0;
 qtc_popup_trans_link:#33C8FF;
 
-/* Pop-ups - Grid in a pop-up */
+/* Pop-ups - Grid in a pop-up */ 
 qtc_popup_grid_normal:#FFFFFF;
 qtc_popup_grid_pressed:#FFFFFF; 
 qtc_popup_grid_highlight:#FFFFFF;
 qtc_popup_grid_disabled:#9B9B9B;
-qtc_popup_grid_latched:#FFFFFF;
-qtc_popup_grid_trans_normal:#FFFFFF;
-qtc_popup_grid_trans_pressed:#FFFFFF;
+qtc_popup_grid_latched:#FFFFFF; /* Added 05.02.2010 */
+qtc_popup_grid_trans_normal:#FFFFFF; /* Added 05.02.2010 */
+qtc_popup_grid_trans_pressed:#FFFFFF; /* Added 05.02.2010 */
 
-/* Pop-ups - List in a pop-up */
+/* Pop-ups - List in a pop-up */ 
 qtc_popup_list_title_normal:#FFFFFF;
 qtc_popup_list_item_content_normal:#FFFFFF;
 qtc_popup_list_item_parent_normal:#FFFFFF;
 qtc_popup_list_item_pressed:#FFFFFF;
 qtc_popup_list_item_highlight:#FFFFFF;
 qtc_popup_list_item_disabled:#9B9B9B;
-qtc_popup_list_item_latched:#FFFFFF;
-
-/* Pop-ups - Combobox */
-qtc_combobox_normal:#FFFFFF;
-qtc_combobox_pressed:#FFFFFF;
-qtc_combobox_highlight:#FFFFFF;
-qtc_combobox_disabled:#9B9B9B;
-qtc_combobox_edit:#4D4D4D;
-qtc_combobox_latched:#FFFFFF;
+qtc_popup_list_item_latched:#FFFFFF; /* Added 05.02.2010 */
 
-/* Virtual inputs */
-qtc_input_button_normal:#FFFFFF;
-qtc_input_button_pressed:#FFFFFF;
-qtc_input_button_latched:#FFFFFF;
-qtc_input_button_disabled:#9B9B9B;
-qtc_input_function_normal:#FFFFFF;
-qtc_input_function_pressed:#FFFFFF;
-qtc_input_function_latched:#FFFFFF;
-qtc_input_function_disabled:#9B9B9B;
-qtc_input_title_normal:#FFFFFF;
+/* Virtual inputs */ 
+qtc_input_button_normal:#FFFFFF; /* Modified 19.02.2010 */
+qtc_input_button_accented_normal:#FFFFFF; /* Added 22.02.2010 */
+qtc_input_button_pressed:#FFFFFF; /* Modified 19.02.2010 */
+qtc_input_button_latched:#FFFFFF; /* Modified 19.02.2010 */
+qtc_input_button_disabled:#9B9B9B; /* Modified 19.02.2010 */
+qtc_input_function_normal:#FFFFFF; /* Modified 19.02.2010 */
+qtc_input_function_pressed:#FFFFFF; /* Modified 19.02.2010 */
+qtc_input_function_latched:#FFFFFF; /* Modified 19.02.2010 */
+qtc_input_function_disabled:#9B9B9B; /* Modified 19.02.2010 */
+qtc_input_preview_normal:#FFFFFF; /* Modified 22.02.2010 */
 
-/* Application specific - Conversational list */
-qtc_conv_received_normal:#B5B5B5;
-qtc_conv_received_pressed:#B5B5B5;
-qtc_conv_received_highlight:#FFFFFF;
-qtc_conv_sent_normal:#B5B5B5;
-qtc_conv_sent_pressed:#B5B5B5;
-qtc_conv_sent_highlight:#FFFFFF;
+/* Application specific color groups */
+
+/* Application specific - Conversational list */ 
+qtc_conv_list_received_normal:#B5B5B5; /* Modified 05.02.2010 */
+qtc_conv_list_received_pressed:#B5B5B5; /* Modified 05.02.2010 */
+qtc_conv_list_received_highlight:#FFFFFF; /* Modified 05.02.2010 */
+qtc_conv_list_sent_normal:#B5B5B5; /* Modified 05.02.2010 */
+qtc_conv_list_sent_pressed:#B5B5B5; /* Modified 05.02.2010 */
+qtc_conv_list_sent_highlight:#FFFFFF; /* Modified 05.02.2010 */
 
-/* Application specific - Tumbler */
-qtc_tumbler_normal:#FFFFFF;
-qtc_tumbler_selected:#FFFFFF;
-qtc_tumbler_highlight:#FFFFFF;
+/* Application specific - Calendar */ 
+qtc_cal_grid_line:#8E8E8E; /* Added 05.02.2010 */
+qtc_cal_month_highlighted_text:#FFFFFF; /* Added 05.02.2010 */
+qtc_cal_month_active_dates:#E5E5E5; /* Added 05.02.2010 */
+qtc_cal_month_notactive_dates:#9B9B9B; /* Added 05.02.2010 */
+qtc_cal_month_current_day:#00BAFF; /* Added 05.02.2010 */
+qtc_cal_week_day:#00BAFF; /* Added 05.02.2010 */
+qtc_cal_day_preview_heading:#FFFFFF; /* Added 05.02.2010 */
+qtc_cal_day_preview_text:#FFFFFF; /* Added 05.02.2010 */
+qtc_cal_day_hour_lines:#8E8E8E; /* Added 05.02.2010 */
+qtc_cal_monthgrid_title:#FFFFFF; /* Added 05.02.2010 */
 
-/* Application specific - Calendar */
-qtc_cal_grid_line:#8E8E8E;
-qtc_cal_month_highlighted_text:#FFFFFF;
-qtc_cal_month_active_dates:#E5E5E5;
-qtc_cal_month_notactive_dates:#9B9B9B;
-qtc_cal_month_current_day:#00BAFF;
-qtc_cal_week_day:#00BAFF;
-qtc_cal_day_preview_heading:#FFFFFF;
-qtc_cal_day_preview_text:#FFFFFF;
-qtc_cal_day_hour_lines:#8E8E8E;
-qtc_cal_monthgrid_title:#FFFFFF;
+/* Application specific - Call handling */ 
+qtc_callhandling_answer_normal:#FFFFFF; /* Added 05.02.2010 */
+qtc_callhandling_answer_pressed:#FFFFFF; /* Added 05.02.2010 */
+qtc_callhandling_answer_highlight:#FFFFFF; /* Added 05.02.2010 */
+qtc_callhandling_reject_normal:#FFFFFF; /* Added 05.02.2010 */
+qtc_callhandling_reject_pressed:#FFFFFF; /* Added 05.02.2010 */
+qtc_callhandling_reject_highlight:#FFFFFF; /* Added 05.02.2010 */
 
-qtc_callhandling_answer_normal:#FFFFFF;
-qtc_callhandling_answer_pressed:#FFFFFF;
-qtc_callhandling_answer_highlight:#FFFFFF;
-qtc_callhandling_reject_normal:#FFFFFF;
-qtc_callhandling_reject_pressed:#FFFFFF;
-qtc_callhandling_reject_highlight:#FFFFFF;
+/* Application specific - Home screen */ 
+qtc_hs_list_item_title_normal:#FFFFFF; /* Added 05.02.2010 */
+qtc_hs_list_item_content_normal:#FFFFFF; /* Added 05.02.2010 */
+qtc_hs_list_item_pressed:#FFFFFF; /* Added 05.02.2010 */
+qtc_hs_list_item_highlight:#FFFFFF; /* Added 05.02.2010 */
+
+/* Application specific - Messaging */ 
+qtc_messaging_heading:#FFFFFF; /* Added 05.02.2010 */
 
-qtc_hs_list_item_title_normal:#FFFFFF;
-qtc_hs_list_item_content_normal:#FFFFFF;
-qtc_hs_list_item_pressed:#FFFFFF;
-qtc_hs_list_item_highlight:#FFFFFF;
-
-qtc_messaging_heading:#FFFFFF;
+/* Application specific - Radio & Calculator */ 
+qtc_lcd_title_normal:#FFFFFF; /* Added 11.02.2010 */
+qtc_lcd_content_normal:#FFFFFF; /* Added 11.02.2010 */
+qtc_lcd_link_normal:#33C8FF; /* Added 22.02.2010 */
+qtc_radio_tuner_normal:#FFFFFF; /* Added 05.02.2010 */
+qtc_radio_tuner_line:#FFFFFF; /* Added 05.02.2010 */
 
-qtc_radio_title_normal:#FFFFFF;
-qtc_radio_content_normal:#FFFFFF;
-qtc_radio_tuner_normal:#FFFFFF;
-qtc_radio_tuner_line:#FFFFFF;
-
-qtc_multimedia_popup_trans:#FFFFFF;
+/* Application specific - Multimedia */ 
+qtc_multimedia_trans:#FFFFFF; /* Modified 19.02.2010 */
+qtc_multimedia_trans_pressed:#FFFFFF; /* Added 19.02.2010 */
 
 /* Deprecated compatibility mappings */
 default_decor_normal:var(qtc_default_decor_normal);
@@ -328,5 +348,6 @@
 testforground_state5:#020202;
 my_widget_background_pressed:#ff0000;
 my_widget_background_notpressed:#0000ff;
+
 }
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/style/sfblacktheme/variables/color/hbwidgetcolorgroup.css	Mon Apr 19 14:02:15 2010 +0300
@@ -0,0 +1,175 @@
+/* Widget color groups */
+
+
+@variables
+{
+/* Default palette */
+qtc_default_decor_normal:#FFFFFF;
+qtc_default_decor_pressed:#FFFFFF;
+qtc_default_decor_latched:#FFFFFF;
+qtc_default_decor_highlight:#FFFFFF;
+qtc_default_decor_disabled:#9B9B9B; 
+qtc_default_main_pane_normal:#FFFFFF;
+qtc_default_main_pane_pressed:#FFFFFF;
+qtc_default_main_pane_latched:#FFFFFF;
+qtc_default_main_pane_highlight:#FFFFFF;
+qtc_default_main_pane_disabled:#9B9B9B; 
+qtc_default_popup_normal:#FFFFFF;
+qtc_default_popup_pressed:#FFFFFF;
+qtc_default_popup_latched:#FFFFFF;
+qtc_default_popup_highlight:#FFFFFF;
+qtc_default_popup_disabled:#9B9B9B;
+
+/* Title pane */
+qtc_title_pane_normal:#FFFFFF;
+qtc_title_pane_pressed:#FFFFFF;
+qtc_title_pane_highlight:#FFFFFF;
+qtc_title_pane_latched:#FFFFFF;
+qtc_title_pane_trans_normal:#FFFFFF;
+qtc_title_pane_trans_pressed:#FFFFFF;
+qtc_title_pane_trans_highlight:#FFFFFF;
+qtc_title_pane_trans_latched:#FFFFFF;
+qtc_status_pane:#FFFFFF; /* Added 05.02.2010 */
+qtc_status_pane_trans:#FFFFFF; /* Added 05.02.2010 */
+
+/* Main area - View */
+qtc_view_normal:#FFFFFF;
+qtc_view_pressed:#FFFFFF;
+qtc_view_line_normal:#FFFFFF;
+qtc_view_link_normal:#33C8FF;
+qtc_view_visited_normal:#B378FF;
+qtc_view_separator_normal:#9B9B9B;
+
+/* Main area - View title */
+qtc_viewtitle_normal:#E6E6E6;
+
+/* Main area - Tab */ 
+qtc_tab_active_normal:#FFFFFF;
+qtc_tab_passive_normal:#FFFFFF;
+qtc_tab_passive_Pressed:#FFFFFF;
+
+/* Main area - Grid */ 
+qtc_grid_normal:#DCDCDC;
+qtc_grid_pressed:#FFFFFF;
+qtc_grid_highlight:#FFFFFF;
+qtc_grid_latched:#FFFFFF; /* Added 05.02.2010 */
+qtg_grid_disabled:#9B9B9B; /* Added 15.02.2010 */
+
+/* Main area - List */ 
+qtc_list_item_title_normal:#FFFFFF; /* Modified 19.02.2010 */
+qtc_list_item_content_normal:#F0F0F0;
+qtc_list_item_parent_normal:#F0F0F0;
+qtc_list_item_pressed:#FFFFFF;
+qtc_list_item_highlight:#FFFFFF;
+qtc_list_item_disabled:#9B9B9B;
+qtc_list_item_latched:#FFFFFF; /* Added 05.02.2010 */
+qtc_list_item_separator:#FFFFFF; /* Added 22.02.2010 */
+
+/* Button */ 
+qtc_button_normal:#FFFFFF;
+qtc_button_pressed:#FFFFFF;
+qtc_button_latched:#FFFFFF;
+qtc_button_highlight:#FFFFFF;
+qtc_button_disabled:#9B9B9B;
+
+/* LineEdit */ 
+qtc_lineedit_normal:#FFFFFF;
+qtc_lineedit_selected:#FFFFFF;
+qtc_lineedit_marker_normal:#4D4D4D;
+qtc_lineedit_hint_normal:#F0F0F0;
+
+/* Combobox */ 
+qtc_combobox_normal:#FFFFFF;
+qtc_combobox_pressed:#FFFFFF;
+qtc_combobox_highlight:#FFFFFF;
+qtc_combobox_disabled:#9B9B9B;
+qtc_combobox_edit:#4D4D4D;
+qtc_combobox_latched:#FFFFFF; /* Added 05.02.2010 */
+
+/* Tumbler */
+qtc_tumbler_normal:#FFFFFF;
+qtc_tumbler_selected:#FFFFFF;
+qtc_tumbler_highlight:#FFFFFF;
+
+/* Main area - DataForm */
+qtc_dataform_value:#FFFFFF; /* Added 08.02.2010 */
+
+/* Main area - ProgressSlider */
+qtc_progslider_normal:#FFFFFF; /* Added 09.02.2010 */
+qtc_progslider_pressed:#FFFFFF; /* Added 09.02.2010 */
+
+/* Main area - Text edit */ 
+qtc_textedit_normal:#FFFFFF; /* Added 17.02.2010 */
+qtc_textedit_selected:#FFFFFF; /* Added 17.02.2010 */
+qtc_textedit_marker_normal:#4D4D4D; /* Added 17.02.2010 */
+qtc_textedit_hint_normal:#F0F0F0; /* Added 17.02.2010 */
+
+/* Main area - Toolbar */
+qtc_toolbar_normal:#FFFFFF;
+qtc_toolbar_pressed:#FFFFFF;
+qtc_toolbar_latched:#FFFFFF;
+qtc_toolbar_disabled:#9B9B9B;
+qtc_toolbar_highlight:#FFFFFF;
+qtc_toolbar_trans_normal:#FFFFFF;
+qtc_toolbar_trans_pressed:#FFFFFF;
+qtc_toolbar_trans_latched:#FFFFFF;
+qtc_toolbar_trans_disabled:#9B9B9B;
+qtc_toolbar_trans_highlight:#FFFFFF;
+
+/* Main area - Groupbox */
+qtc_groupbox_normal:#FFFFFF;
+qtc_groupbox_pressed:#FFFFFF;
+qtc_groupbox_highlight:#FFFFFF;
+
+/* Pop-ups - Generic pop-up */ 
+qtc_popup_sk_normal:#FFFFFF;
+qtc_popup_sk_highlight:#FFFFFF;
+qtc_popup_sk_pressed:#FFFFFF;
+qtc_popup_sk_disabled:#9B9B9B; /* Added 05.02.2010 */
+qtc_popup_heading_normal:#FFFFFF;
+qtc_popup_normal:#B5B5B5;
+qtc_popup_link:#33C8FF; /* Added 16.02.2010 */
+
+/* Pop-ups - Preview pop-up */
+qtc_popup_preview_normal:#FFFFFF;
+qtc_popup_preview_pressed:#F0F0F0;
+qtc_popup_preview_link:#33C8FF;
+
+/* Pop-ups - Transparent pop-up */
+qtc_popup_trans_normal:#FFFFFF;
+qtc_popup_trans_pressed:#F0F0F0;
+qtc_popup_trans_link:#33C8FF;
+
+/* Pop-ups - Grid in a pop-up */ 
+qtc_popup_grid_normal:#FFFFFF;
+qtc_popup_grid_pressed:#FFFFFF; 
+qtc_popup_grid_highlight:#FFFFFF;
+qtc_popup_grid_disabled:#9B9B9B;
+qtc_popup_grid_latched:#FFFFFF; /* Added 05.02.2010 */
+qtc_popup_grid_trans_normal:#FFFFFF; /* Added 05.02.2010 */
+qtc_popup_grid_trans_pressed:#FFFFFF; /* Added 05.02.2010 */
+
+/* Pop-ups - List in a pop-up */ 
+qtc_popup_list_title_normal:#FFFFFF;
+qtc_popup_list_item_content_normal:#FFFFFF;
+qtc_popup_list_item_parent_normal:#FFFFFF;
+qtc_popup_list_item_pressed:#FFFFFF;
+qtc_popup_list_item_highlight:#FFFFFF;
+qtc_popup_list_item_disabled:#9B9B9B;
+qtc_popup_list_item_latched:#FFFFFF; /* Added 05.02.2010 */
+
+/* Virtual inputs */ 
+qtc_input_button_normal:#FFFFFF; /* Modified 19.02.2010 */
+qtc_input_button_accented_normal:#FFFFFF; /* Added 22.02.2010 */
+qtc_input_button_pressed:#FFFFFF; /* Modified 19.02.2010 */
+qtc_input_button_latched:#FFFFFF; /* Modified 19.02.2010 */
+qtc_input_button_disabled:#9B9B9B; /* Modified 19.02.2010 */
+qtc_input_function_normal:#FFFFFF; /* Modified 19.02.2010 */
+qtc_input_function_pressed:#FFFFFF; /* Modified 19.02.2010 */
+qtc_input_function_latched:#FFFFFF; /* Modified 19.02.2010 */
+qtc_input_function_disabled:#9B9B9B; /* Modified 19.02.2010 */
+qtc_input_preview_normal:#FFFFFF; /* Modified 22.02.2010 */
+
+
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/style/sfwhitetheme/variables/color/hbapplicationcolorgroup.css	Mon Apr 19 14:02:15 2010 +0300
@@ -0,0 +1,55 @@
+/* Application specific color groups */
+
+
+@variables
+{
+/* Application specific - Conversational list */ 
+qtc_conv_list_received_normal:#505050; /* Modified 05.02.2010 */
+qtc_conv_list_received_pressed:#FFFFFF; /* Modified 05.02.2010 */
+qtc_conv_list_received_highlight:#FFFFFF; /* Modified 05.02.2010 */
+qtc_conv_list_sent_normal:#505050; /* Modified 05.02.2010 */
+qtc_conv_list_sent_pressed:#FFFFFF; /* Modified 05.02.2010 */
+qtc_conv_list_sent_highlight:#FFFFFF; /* Modified 05.02.2010 */
+
+/* Application specific - Calendar */ 
+qtc_cal_grid_line:#DCDCDC; /* Added 05.02.2010 */
+qtc_cal_month_highlighted_text:#FFFFFF; /* Added 05.02.2010 */
+qtc_cal_month_active_dates:#505050; /* Added 05.02.2010 */
+qtc_cal_month_notactive_dates:#A0A0A0; /* Added 05.02.2010 */
+qtc_cal_month_current_day:#66CCAD; /* Added 05.02.2010 */
+qtc_cal_week_day:#505050; /* Added 05.02.2010 */
+qtc_cal_day_preview_heading:#FFFFFF; /* Added 05.02.2010 */
+qtc_cal_day_preview_text:#FFFFFF; /* Added 05.02.2010 */
+qtc_cal_day_hour_lines:#505050; /* Added 05.02.2010 */
+qtc_cal_monthgrid_title:#FFFFFF; /* Added 05.02.2010 */
+
+/* Application specific - Call handling */ 
+qtc_callhandling_answer_normal:#FFFFFF; /* Added 05.02.2010 */
+qtc_callhandling_answer_pressed:#FFFFFF; /* Added 05.02.2010 */
+qtc_callhandling_answer_highlight:#FFFFFF; /* Added 05.02.2010 */
+qtc_callhandling_reject_normal:#FFFFFF; /* Added 05.02.2010 */
+qtc_callhandling_reject_pressed:#FFFFFF; /* Added 05.02.2010 */
+qtc_callhandling_reject_highlight:#FFFFFF; /* Added 05.02.2010 */
+
+/* Application specific - Home screen */ 
+qtc_hs_list_item_title_normal:#505050; /* Added 05.02.2010 */
+qtc_hs_list_item_content_normal:#519FB9; /* Added 05.02.2010 */
+qtc_hs_list_item_pressed:#FFFFFF; /* Added 05.02.2010 */
+qtc_hs_list_item_highlight:#FFFFFF; /* Added 05.02.2010 */
+
+/* Application specific - Messaging */
+qtc_messaging_heading:#3C3C3C; /* Added 05.02.2010 */
+
+/* Application specific - Radio & Calculator */ 
+qtc_lcd_title_normal:#505050; /* Added 11.02.2010 */
+qtc_lcd_content_normal:#519FB9; /* Added 11.02.2010 */
+qtc_lcd_link_normal:#33C8FF; /* Added 22.02.2010 */
+qtc_radio_tuner_normal:#505050; /* Added 05.02.2010 */
+qtc_radio_tuner_line:#3C3C3C; /* Added 05.02.2010 */
+
+/* Application specific - Multimedia */ 
+qtc_multimedia_trans:#FFFFFF; /* Modified 19.02.2010 */
+qtc_multimedia_trans_pressed:#FFFFFF; /* Added 19.02.2010 */
+
+}
+

--- a/src/style/sfwhitetheme/variables/color/hbcolorgroup.css	Fri Mar 19 09:40:18 2010 +0200
+++ b/src/style/sfwhitetheme/variables/color/hbcolorgroup.css	Mon Apr 19 14:02:15 2010 +0300
@@ -1,4 +1,5 @@
-/* Color definitions for SF White Theme */
+/* Widget color groups */
+
 
 @variables
 {
@@ -28,10 +29,10 @@
 qtc_title_pane_trans_pressed:#FFFFFF;
 qtc_title_pane_trans_highlight:#FFFFFF;
 qtc_title_pane_trans_latched:#FFFFFF;
+qtc_status_pane:#FFFFFF; /* Added 05.02.2010 */
+qtc_status_pane_trans:#FFFFFF; /* Added 05.02.2010 */
 
 /* Main area - View */
-qtc_status_pane:#FFFFFF;
-qtc_status_pane_trans:#FFFFFF;
 qtc_view_normal:#FFFFFF;
 qtc_view_pressed:#FFFFFF;
 qtc_view_line_normal:#FFFFFF;
@@ -45,35 +46,63 @@
 /* Main area - Tab */
 qtc_tab_active_normal:#3C3C3C;
 qtc_tab_passive_normal:#3C3C3C;
-qtc_tab_passive_pressed:#3C3C3C;
+qtc_tab_passive_Pressed:#3C3C3C;
 
-/* Main area - Grid */
+/* Main area - Grid */ 
 qtc_grid_normal:#595B5D;
 qtc_grid_pressed:#FFFFFF;
 qtc_grid_highlight:#FFFFFF;
-qtc_grid_latched:#FFFFFF;
+qtc_grid_latched:#FFFFFF; /* Added 05.02.2010 */
+qtg_grid_disabled:#9B9B9B; /* Added 15.02.2010 */
 
-/* Main area - List */
+/* Main area - List */ 
 qtc_list_item_title_normal:#505050;
-qtc_list_item_content_normal:#505050;
+qtc_list_item_content_normal:#519FB9;
 qtc_list_item_parent_normal:#505050;
 qtc_list_item_pressed:#FFFFFF;
 qtc_list_item_highlight:#FFFFFF;
 qtc_list_item_disabled:#A0A0A0;
-qtc_list_item_latched:#FFFFFF;
+qtc_list_item_latched:#FFFFFF; /* Added 05.02.2010 */
+qtc_list_item_separator:#000000; /* Added 22.02.2010 */
 
-/* Main area - Button */
+/* Button */
 qtc_button_normal:#3C3C3C;
 qtc_button_pressed:#FFFFFF;
 qtc_button_latched:#FFFFFF;
 qtc_button_highlight:#FFFFFF;
 qtc_button_disabled:#787878;
 
-/* Main area - Editor */
-qtc_editor_normal:#505050;
-qtc_editor_selected:#FFFFFF;
-qtc_editor_marker_normal:#505050;
-qtc_editor_hint_normal:#A0A0A0;
+/* LineEdit */
+qtc_lineedit_normal:#505050;
+qtc_lineedit_selected:#FFFFFF;
+qtc_lineedit_marker_normal:#505050;
+qtc_lineedit_hint_normal:#A0A0A0;
+
+/* Combobox */ 
+qtc_combobox_normal:#3C3C3C;
+qtc_combobox_pressed:#FFFFFF;
+qtc_combobox_highlight:#3C3C3C;
+qtc_combobox_disabled:#787878;
+qtc_combobox_edit:#3C3C3C;
+qtc_combobox_latched:#FFFFFF; /* Added 05.02.2010 */
+
+/* Tumbler */
+qtc_tumbler_normal:#3C3C3C;
+qtc_tumbler_selected:#FFFFFF;
+qtc_tumbler_highlight:#FFFFFF;
+
+/* Main area - DataForm */
+qtc_dataform_value:#3C3C3C; /* Added 08.02.2010 */
+
+/* Main area - ProgressSlider */
+qtc_progslider_normal:#3C3C3C; /* Added 09.02.2010 */
+qtc_progslider_pressed:#FFFFFF; /* Added 09.02.2010 */
+
+/* Main area - TextEdit */
+qtc_textedit_normal:#505050;
+qtc_textedit_selected:#FFFFFF;
+qtc_textedit_marker_normal:#505050;
+qtc_textedit_hint_normal:#A0A0A0;
 
 /* Main area - Toolbar */
 qtc_toolbar_normal:#3C3C3C;
@@ -87,22 +116,19 @@
 qtc_toolbar_trans_disabled:#FFFFFF;
 qtc_toolbar_trans_highlight:#FFFFFF;
 
-/* Main area - Toolbar extension */
-
 /* Main area - Groupbox */
 qtc_groupbox_normal:#3C3C3C;
 qtc_groupbox_pressed:#FFFFFF;
 qtc_groupbox_highlight:#FFFFFF;
 
-/* Pop-ups - Generic pop-up */
+/* Pop-ups - Generic pop-up */ 
 qtc_popup_sk_normal:#3C3C3C;
 qtc_popup_sk_highlight:#FFFFFF;
 qtc_popup_sk_pressed:#FFFFFF;
-qtc_popup_sk_disabled:#787878;
+qtc_popup_sk_disabled:#787878; /* Added 05.02.2010 */
 qtc_popup_heading_normal:#3C3C3C;
-qtc_popup_heading_pressed:#FFFFFF;
-qtc_popup_heading_highlight:#FFFFFF;
 qtc_popup_normal:#3C3C3C;
+qtc_popup_link:#8CE0FF; /* Added 16.02.2010 */
 
 /* Pop-ups - Preview pop-up */
 qtc_popup_preview_normal:#FFFFFF;
@@ -119,83 +145,78 @@
 qtc_popup_grid_pressed:#FFFFFF; 
 qtc_popup_grid_highlight:#FFFFFF;
 qtc_popup_grid_disabled:#787878;
-qtc_popup_grid_latched:#FFFFFF;
-qtc_popup_grid_trans_normal:#FFFFFF;
-qtc_popup_grid_trans_pressed:#FFFFFF;
+qtc_popup_grid_latched:#FFFFFF; /* Added 05.02.2010 */
+qtc_popup_grid_trans_normal:#FFFFFF; /* Added 05.02.2010 */
+qtc_popup_grid_trans_pressed:#FFFFFF; /* Added 05.02.2010 */
 
-/* Pop-ups - List in a pop-up */
+/* Pop-ups - List in a pop-up */ 
 qtc_popup_list_title_normal:#505050;
 qtc_popup_list_item_content_normal:#519FB9;
 qtc_popup_list_item_parent_normal:#505050;
 qtc_popup_list_item_pressed:#FFFFFF;
 qtc_popup_list_item_highlight:#FFFFFF;
 qtc_popup_list_item_disabled:#787878;
-qtc_popup_list_item_latched:#FFFFFF;
-
-/* Pop-ups - Combobox */
-qtc_combobox_normal:#3C3C3C;
-qtc_combobox_pressed:#FFFFFF;
-qtc_combobox_highlight:#3C3C3C;
-qtc_combobox_disabled:#787878;
-qtc_combobox_edit:#3C3C3C;
-qtc_combobox_latched:#FFFFFF;
+qtc_popup_list_item_latched:#FFFFFF; /* Added 05.02.2010 */
 
 /* Virtual inputs */
-qtc_input_button_normal:#505050;
-qtc_input_button_pressed:#FFFFFF;
-qtc_input_button_latched:#FFFFFF;
-qtc_input_button_disabled:#787878;
-qtc_input_function_normal:#FFFFFF;
-qtc_input_function_pressed:#FFFFFF;
-qtc_input_function_latched:#FFFFFF;
-qtc_input_function_disabled:#646464;
-qtc_input_title_normal:#3C3C3C;
+qtc_input_button_normal:#505050; /* Modified 19.02.2010 */
+qtc_input_button_accented_normal:#3C3C3C; /* Added 22.02.2010 */
+qtc_input_button_pressed:#FFFFFF; /* Modified 19.02.2010 */
+qtc_input_button_latched:#FFFFFF; /* Modified 19.02.2010 */
+qtc_input_button_disabled:#787878; /* Modified 19.02.2010 */
+qtc_input_function_normal:#FFFFFF; /* Modified 19.02.2010 */
+qtc_input_function_pressed:#FFFFFF; /* Modified 19.02.2010 */
+qtc_input_function_latched:#FFFFFF; /* Modified 19.02.2010 */
+qtc_input_function_disabled:#646464; /* Modified 19.02.2010 */
+qtc_input_preview_normal:#3C3C3C; /* Modified 22.02.2010 */
 
-/* Application specific - Conversational list */
-qtc_conv_received_normal:#505050;
-qtc_conv_received_pressed:#FFFFFF;
-qtc_conv_received_highlight:#FFFFFF;
-qtc_conv_sent_normal:#505050;
-qtc_conv_sent_pressed:#FFFFFF;
-qtc_conv_sent_highlight:#FFFFFF;
-
-/* Application specific - Tumbler */
-qtc_tumbler_normal:#3C3C3C;
-qtc_tumbler_selected:#FFFFFF;
-qtc_tumbler_highlight:#FFFFFF;
+/* Application specific - Conversational list */ 
+qtc_conv_list_received_normal:#505050; /* Modified 05.02.2010 */
+qtc_conv_list_received_pressed:#FFFFFF; /* Modified 05.02.2010 */
+qtc_conv_list_received_highlight:#FFFFFF; /* Modified 05.02.2010 */
+qtc_conv_list_sent_normal:#505050; /* Modified 05.02.2010 */
+qtc_conv_list_sent_pressed:#FFFFFF; /* Modified 05.02.2010 */
+qtc_conv_list_sent_highlight:#FFFFFF; /* Modified 05.02.2010 */
 
-/* Application specific - Calendar */
-qtc_cal_grid_line:#DCDCDC;
-qtc_cal_month_highlighted_text:#FFFFFF;
-qtc_cal_month_active_dates:#505050;
-qtc_cal_month_notactive_dates:#A0A0A0;
-qtc_cal_month_current_day:#66CCAD;
-qtc_cal_week_day:#505050;
-qtc_cal_day_preview_heading:#FFFFFF;
-qtc_cal_day_preview_text:#FFFFFF;
-qtc_cal_day_hour_lines:#505050;
-qtc_cal_monthgrid_title:#FFFFFF;
+/* Application specific - Calendar */ 
+qtc_cal_grid_line:#DCDCDC; /* Added 05.02.2010 */
+qtc_cal_month_highlighted_text:#FFFFFF; /* Added 05.02.2010 */
+qtc_cal_month_active_dates:#505050; /* Added 05.02.2010 */
+qtc_cal_month_notactive_dates:#A0A0A0; /* Added 05.02.2010 */
+qtc_cal_month_current_day:#66CCAD; /* Added 05.02.2010 */
+qtc_cal_week_day:#505050; /* Added 05.02.2010 */
+qtc_cal_day_preview_heading:#FFFFFF; /* Added 05.02.2010 */
+qtc_cal_day_preview_text:#FFFFFF; /* Added 05.02.2010 */
+qtc_cal_day_hour_lines:#505050; /* Added 05.02.2010 */
+qtc_cal_monthgrid_title:#FFFFFF; /* Added 05.02.2010 */
+
+/* Application specific - Call handling */ 
+qtc_callhandling_answer_normal:#FFFFFF; /* Added 05.02.2010 */
+qtc_callhandling_answer_pressed:#FFFFFF; /* Added 05.02.2010 */
+qtc_callhandling_answer_highlight:#FFFFFF; /* Added 05.02.2010 */
+qtc_callhandling_reject_normal:#FFFFFF; /* Added 05.02.2010 */
+qtc_callhandling_reject_pressed:#FFFFFF; /* Added 05.02.2010 */
+qtc_callhandling_reject_highlight:#FFFFFF; /* Added 05.02.2010 */
 
-qtc_callhandling_answer_normal:#FFFFFF;
-qtc_callhandling_answer_pressed:#FFFFFF;
-qtc_callhandling_answer_highlight:#FFFFFF;
-qtc_callhandling_reject_normal:#FFFFFF;
-qtc_callhandling_reject_pressed:#FFFFFF;
-qtc_callhandling_reject_highlight:#FFFFFF;
+/* Application specific - Home screen */ 
+qtc_hs_list_item_title_normal:#505050; /* Added 05.02.2010 */
+qtc_hs_list_item_content_normal:#519FB9; /* Added 05.02.2010 */
+qtc_hs_list_item_pressed:#FFFFFF; /* Added 05.02.2010 */
+qtc_hs_list_item_highlight:#FFFFFF; /* Added 05.02.2010 */
+
+/* Application specific - Messaging */
+qtc_messaging_heading:#3C3C3C; /* Added 05.02.2010 */
 
-qtc_hs_list_item_title_normal:#505050;
-qtc_hs_list_item_content_normal:#519FB9;
-qtc_hs_list_item_pressed:#FFFFFF;
-qtc_hs_list_item_highlight:#FFFFFF;
-
-qtc_messaging_heading:#3C3C3C;
+/* Application specific - Radio & Calculator */ 
+qtc_lcd_title_normal:#505050; /* Added 11.02.2010 */
+qtc_lcd_content_normal:#519FB9; /* Added 11.02.2010 */
+qtc_lcd_link_normal:#33C8FF; /* Added 22.02.2010 */
+qtc_radio_tuner_normal:#505050; /* Added 05.02.2010 */
+qtc_radio_tuner_line:#3C3C3C; /* Added 05.02.2010 */
 
-qtc_radio_title_normal:#505050;
-qtc_radio_content_normal:#519FB9;
-qtc_radio_tuner_normal:#505050;
-qtc_radio_tuner_line:#3C3C3C;
-
-qtc_multimedia_popup_trans:#FFFFFF;
+/* Application specific - Multimedia */ 
+qtc_multimedia_trans:#FFFFFF; /* Modified 19.02.2010 */
+qtc_multimedia_trans_pressed:#FFFFFF; /* Added 19.02.2010 */
 
 /* Deprecated compatibility mappings */
 default_decor_normal:var(qtc_default_decor_normal);

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/style/sfwhitetheme/variables/color/hbwidgetcolorgroup.css	Mon Apr 19 14:02:15 2010 +0300
@@ -0,0 +1,174 @@
+/* Widget color groups */
+
+
+@variables
+{
+/* Default palette */
+qtc_default_decor_normal:#3C3C3C;
+qtc_default_decor_pressed:#FFFFFF;
+qtc_default_decor_latched:#FFFFFF;
+qtc_default_decor_highlight:#FFFFFF;
+qtc_default_decor_disabled:#9B9B9B; 
+qtc_default_main_pane_normal:#8C8C96;
+qtc_default_main_pane_pressed:#3F89A9;
+qtc_default_main_pane_latched:#009CEF;
+qtc_default_main_pane_highlight:#B27200;
+qtc_default_main_pane_disabled:#595B5D; 
+qtc_default_popup_normal:#505050;
+qtc_default_popup_pressed:#FFFFFF;
+qtc_default_popup_latched:#FFFFFF;
+qtc_default_popup_highlight:#FFFFFF;
+qtc_default_popup_disabled:#9B9B9B;
+
+/* Title pane */
+qtc_title_pane_normal:#FFFFFF;
+qtc_title_pane_pressed:#FFFFFF;
+qtc_title_pane_highlight:#FFFFFF;
+qtc_title_pane_latched:#FFFFFF;
+qtc_title_pane_trans_normal:#FFFFFF;
+qtc_title_pane_trans_pressed:#FFFFFF;
+qtc_title_pane_trans_highlight:#FFFFFF;
+qtc_title_pane_trans_latched:#FFFFFF;
+qtc_status_pane:#FFFFFF; /* Added 05.02.2010 */
+qtc_status_pane_trans:#FFFFFF; /* Added 05.02.2010 */
+
+/* Main area - View */
+qtc_view_normal:#FFFFFF;
+qtc_view_pressed:#FFFFFF;
+qtc_view_line_normal:#FFFFFF;
+qtc_view_link_normal:#33C8FF;
+qtc_view_visited_normal:#B378FF;
+qtc_view_separator_normal:#9B9B9B;
+
+/* Main area - View title */
+qtc_viewtitle_normal:#3C3C3C;
+
+/* Main area - Tab */
+qtc_tab_active_normal:#3C3C3C;
+qtc_tab_passive_normal:#3C3C3C;
+qtc_tab_passive_Pressed:#3C3C3C;
+
+/* Main area - Grid */ 
+qtc_grid_normal:#595B5D;
+qtc_grid_pressed:#FFFFFF;
+qtc_grid_highlight:#FFFFFF;
+qtc_grid_latched:#FFFFFF; /* Added 05.02.2010 */
+qtg_grid_disabled:#9B9B9B; /* Added 15.02.2010 */
+
+/* Main area - List */ 
+qtc_list_item_title_normal:#505050;
+qtc_list_item_content_normal:#519FB9;
+qtc_list_item_parent_normal:#505050;
+qtc_list_item_pressed:#FFFFFF;
+qtc_list_item_highlight:#FFFFFF;
+qtc_list_item_disabled:#A0A0A0;
+qtc_list_item_latched:#FFFFFF; /* Added 05.02.2010 */
+qtc_list_item_separator:#000000; /* Added 22.02.2010 */
+
+/* Button */
+qtc_button_normal:#3C3C3C;
+qtc_button_pressed:#FFFFFF;
+qtc_button_latched:#FFFFFF;
+qtc_button_highlight:#FFFFFF;
+qtc_button_disabled:#787878;
+
+/* LineEdit */
+qtc_lineedit_normal:#505050;
+qtc_lineedit_selected:#FFFFFF;
+qtc_lineedit_marker_normal:#505050;
+qtc_lineedit_hint_normal:#A0A0A0;
+
+/* Combobox */ 
+qtc_combobox_normal:#3C3C3C;
+qtc_combobox_pressed:#FFFFFF;
+qtc_combobox_highlight:#3C3C3C;
+qtc_combobox_disabled:#787878;
+qtc_combobox_edit:#3C3C3C;
+qtc_combobox_latched:#FFFFFF; /* Added 05.02.2010 */
+
+/* Tumbler */
+qtc_tumbler_normal:#3C3C3C;
+qtc_tumbler_selected:#FFFFFF;
+qtc_tumbler_highlight:#FFFFFF;
+
+/* Main area - DataForm */
+qtc_dataform_value:#3C3C3C; /* Added 08.02.2010 */
+
+/* Main area - ProgressSlider */
+qtc_progslider_normal:#3C3C3C; /* Added 09.02.2010 */
+qtc_progslider_pressed:#FFFFFF; /* Added 09.02.2010 */
+
+/* Main area - TextEdit */
+qtc_textedit_normal:#505050;
+qtc_textedit_selected:#FFFFFF;
+qtc_textedit_marker_normal:#505050;
+qtc_textedit_hint_normal:#A0A0A0;
+
+/* Main area - Toolbar */
+qtc_toolbar_normal:#3C3C3C;
+qtc_toolbar_pressed:#FFFFFF;
+qtc_toolbar_latched:#FFFFFF;
+qtc_toolbar_disabled:#787878;
+qtc_toolbar_highlight:#FFFFFF;
+qtc_toolbar_trans_normal:#FFFFFF;
+qtc_toolbar_trans_pressed:#FFFFFF;
+qtc_toolbar_trans_latched:#FFFFFF;
+qtc_toolbar_trans_disabled:#FFFFFF;
+qtc_toolbar_trans_highlight:#FFFFFF;
+
+/* Main area - Groupbox */
+qtc_groupbox_normal:#3C3C3C;
+qtc_groupbox_pressed:#FFFFFF;
+qtc_groupbox_highlight:#FFFFFF;
+
+/* Pop-ups - Generic pop-up */ 
+qtc_popup_sk_normal:#3C3C3C;
+qtc_popup_sk_highlight:#FFFFFF;
+qtc_popup_sk_pressed:#FFFFFF;
+qtc_popup_sk_disabled:#787878; /* Added 05.02.2010 */
+qtc_popup_heading_normal:#3C3C3C;
+qtc_popup_normal:#3C3C3C;
+qtc_popup_link:#8CE0FF; /* Added 16.02.2010 */
+
+/* Pop-ups - Preview pop-up */
+qtc_popup_preview_normal:#FFFFFF;
+qtc_popup_preview_pressed:#FFFFFF;
+qtc_popup_preview_link:#8CE0FF;
+
+/* Pop-ups - Transparent pop-up */
+qtc_popup_trans_normal:#FFFFFF;
+qtc_popup_trans_pressed:#FFFFFF;
+qtc_popup_trans_link:#8CE0FF;
+
+/* Pop-ups - Grid in a pop-up */
+qtc_popup_grid_normal:#3C3C3C;
+qtc_popup_grid_pressed:#FFFFFF; 
+qtc_popup_grid_highlight:#FFFFFF;
+qtc_popup_grid_disabled:#787878;
+qtc_popup_grid_latched:#FFFFFF; /* Added 05.02.2010 */
+qtc_popup_grid_trans_normal:#FFFFFF; /* Added 05.02.2010 */
+qtc_popup_grid_trans_pressed:#FFFFFF; /* Added 05.02.2010 */
+
+/* Pop-ups - List in a pop-up */ 
+qtc_popup_list_title_normal:#505050;
+qtc_popup_list_item_content_normal:#519FB9;
+qtc_popup_list_item_parent_normal:#505050;
+qtc_popup_list_item_pressed:#FFFFFF;
+qtc_popup_list_item_highlight:#FFFFFF;
+qtc_popup_list_item_disabled:#787878;
+qtc_popup_list_item_latched:#FFFFFF; /* Added 05.02.2010 */
+
+/* Virtual inputs */
+qtc_input_button_normal:#505050; /* Modified 19.02.2010 */
+qtc_input_button_accented_normal:#3C3C3C; /* Added 22.02.2010 */
+qtc_input_button_pressed:#FFFFFF; /* Modified 19.02.2010 */
+qtc_input_button_latched:#FFFFFF; /* Modified 19.02.2010 */
+qtc_input_button_disabled:#787878; /* Modified 19.02.2010 */
+qtc_input_function_normal:#FFFFFF; /* Modified 19.02.2010 */
+qtc_input_function_pressed:#FFFFFF; /* Modified 19.02.2010 */
+qtc_input_function_latched:#FFFFFF; /* Modified 19.02.2010 */
+qtc_input_function_disabled:#646464; /* Modified 19.02.2010 */
+qtc_input_preview_normal:#3C3C3C; /* Modified 22.02.2010 */
+
+}
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/theme.theme	Mon Apr 19 14:02:15 2010 +0300
@@ -0,0 +1,2 @@
+[Default Theme]
+Name=hbdefault

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/theme.theme_new	Mon Apr 19 14:02:15 2010 +0300
@@ -0,0 +1,3 @@
+[Default]
+BaseTheme = sfblacktheme
+DefaultActiveTheme = sfblacktheme

--- a/themes.pro	Fri Mar 19 09:40:18 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-#
-# ============================================================================
-#  Name        : themes.pro
-#  Part of     : Hb-platformthemes
-#  Description : Project definition file for project Hb-platformthemes
-#  Version     : %version: 1 %
-#
-#  Copyright (c) 2008-2009 Nokia.  All rights reserved.
-#  This material, including documentation and any related computer
-#  programs, is protected by copyright controlled by Nokia.  All
-#  rights are reserved.  Copying, including reproducing, storing,
-#  adapting or translating, any or all of this material requires the
-#  prior written consent of Nokia.  This material also contains
-#  confidential information which may not be disclosed to others
-#  without the prior written consent of Nokia.
-# ============================================================================
-#
-
-TEMPLATE = subdirs
-!symbian {
-    HB_THEMES_DIR = $$(HB_THEMES_DIR)
-    isEmpty(HB_THEMES_DIR):error(HB_THEMES_DIR environment variable is not set)
-}
-ARGS = -v --input $$IN_PWD/src
-!symbian:ARGS += --extract
-system(python $$IN_PWD/bin/sync.py $$ARGS)
-
-symbian {
-    install.depends = export
-    QMAKE_EXTRA_TARGETS += install
-    message(Run 'make export')
-} else {
-    export.depends = install
-    QMAKE_EXTRA_TARGETS += export
-    message(Run 'make install')
-}
-
-include(themes.pri)