--- a/.hgtags Mon Apr 19 14:02:15 2010 +0300
+++ b/.hgtags Mon May 03 13:01:49 2010 +0300
@@ -2,3 +2,7 @@
b0950401b844cc4460b4a24fcdfda23035afcadc 2010wk09_rc
bff35c9a6221cf815339f49887ae16e7a751676a 2010wk09_rel
821369dbf08b6aed4c2c6f992381d1f974cc8a23 2010wk11_rc
+2c99524b3cb5b1a20cc3f335049013a0ecb64bc9 2010wk11_rel
+390a3c18521b0f792bf2ce4bc4bf55922ed7d364 2010wk13_rc
+d65c35959cc2fa89718df7192cdedb15cc7a7a0a 2010wk13_rel
+6fd8fce204a753ee5c22e18e57668b6bf5ee74aa 2010wk15_rc
--- a/bin/sync.py Mon Apr 19 14:02:15 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,481 +0,0 @@
-#
-# 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 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
-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_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
-# ============================================================================
-class OptionParser(optparse.OptionParser):
- def __init__(self):
- optparse.OptionParser.__init__(self)
- self.add_option("-v", "--verbose", action="store_true", dest="verbose",
- 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("-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")
- self.add_option("--iby-source-prefix", dest="ibysourceprefix", metavar="prefix",
- 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-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)
-
-# ============================================================================
-# Utils
-# ============================================================================
-if not hasattr(os.path, "relpath"):
- def relpath(path, start=os.curdir):
- abspath = os.path.abspath(path)
- absstart = os.path.abspath(start)
- if abspath == absstart:
- return "."
- i = len(absstart)
- if not absstart.endswith(os.path.sep):
- i += len(os.path.sep)
- if not abspath.startswith(absstart):
- i = 0
- return abspath[i:]
- os.path.relpath = relpath
-
-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:
- 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.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)
- 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 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()
-
- # 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")
- 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...
- for base in os.listdir(path):
- basepath = os.path.join(path, base)
- if os.path.isdir(basepath):
- # theme: footheme, bartheme...
- for theme in os.listdir(basepath):
- themepath = os.path.join(basepath, theme)
- if os.path.isdir(themepath):
- if theme not in themes:
- themes[theme] = Theme(theme)
- themes[theme].paths.append(themepath)
- return 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" % (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():
- 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, 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 != None:
- VERBOSE = options.verbose
- 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.include != None:
- INCLUDE = options.include
- if options.exclude != None:
- EXCLUDE = options.exclude
- if options.input != None:
- INPUT_DIR = options.input
- if options.output != None:
- OUTPUT_DIR = options.output
- if options.ibysourceprefix != None:
- IBY_SOURCE_PREFIX = options.ibysourceprefix
- if options.ibytargetprefix != None:
- IBY_TARGET_PREFIX = options.ibytargetprefix
- 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
- theme.write_iby(os.path.join(OUTPUT_DIR, "%s.iby" % name))
-
- if VERBOSE:
- 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__":
- sys.exit(main())
--- a/makeindex.mk Mon Apr 19 14:02:15 2010 +0300
+++ b/makeindex.mk Mon May 03 13:01:49 2010 +0300
@@ -25,8 +25,7 @@
SAVESPACE : do_nothing
-BLD :
- -$(MAKE) index
+BLD : do_nothing
FREEZE : do_nothing
@@ -34,7 +33,8 @@
CLEANLIB : do_nothing
-FINAL : do_nothing
+FINAL :
+ -$(MAKE) index
CLEAN : do_nothing
--- a/platformthemes.pro Mon Apr 19 14:02:15 2010 +0300
+++ b/platformthemes.pro Mon May 03 13:01:49 2010 +0300
@@ -58,9 +58,7 @@
}
*symbian* {
- # NOTE: temporarily disabled due to:
- # "Qt: INTERNALL ERROR: failed to install GetMessage hook"
- # BLD_INF_RULES.prj_mmpfiles += "gnumakefile makeindex.mk"
+ BLD_INF_RULES.prj_mmpfiles += "gnumakefile makeindex.mk"
install.depends = default
uninstall.depends = cleanexport
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
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/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/sfblacknvgtheme/variables/color/hbcolorgroup.css Mon Apr 19 14:02:15 2010 +0300
+++ b/src/style/sfblacknvgtheme/variables/color/hbcolorgroup.css Mon May 03 13:01:49 2010 +0300
@@ -50,7 +50,7 @@
qtc_grid_pressed:#FFFFFF;
qtc_grid_highlight:#FFFFFF;
qtc_grid_latched:#FFFFFF; /* Added 05.02.2010 */
-qtg_grid_disabled:#9B9B9B; /* Added 15.02.2010 */
+qtc_grid_disabled:#9B9B9B; /* Modified 01.03.2010 */
/* Main area - List */
qtc_list_item_title_normal:#FFFFFF; /* Modified 19.02.2010 */
@@ -89,7 +89,7 @@
qtc_tumbler_highlight:#FFFFFF;
/* Main area - DataForm */
-qtc_dataform_value:#FFFFFF; /* Added 08.02.2010 */
+qtc_dataform_heading:#FFFFFF; /* Added 04.03.2010 */
/* Main area - ProgressSlider */
qtc_progslider_normal:#FFFFFF; /* Added 09.02.2010 */
@@ -144,7 +144,6 @@
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;
@@ -154,6 +153,7 @@
qtc_popup_list_item_highlight:#FFFFFF;
qtc_popup_list_item_disabled:#9B9B9B;
qtc_popup_list_item_latched:#FFFFFF; /* Added 05.02.2010 */
+qtc_popup_list_item_trans_normal:#FFFFFF; /* Added 12.02.2010 */
/* Virtual inputs */
qtc_input_button_normal:#FFFFFF; /* Modified 19.02.2010 */
@@ -166,6 +166,9 @@
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 */
+qtc_input_hint_normal:#F0F0F0; /* Added 05.03.2010 */
+qtc_input_grid_line:#9B9B9B; /* Added 12.03.2010 */
+
/* Application specific color groups */
@@ -202,6 +205,7 @@
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 */
+qtc_hs_badge:#FFFFFF; /* Added 01.03.2010 */
/* Application specific - Messaging */
qtc_messaging_heading:#FFFFFF; /* Added 05.02.2010 */
@@ -216,138 +220,7 @@
/* 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);
-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 */
-/* Old color roles used for RnD */
-foreground:#FFFFFF;
-popupbackground:#000000;
-popupforeground:#FFFFFF;
-menubackground:#000000;
-menuforeground_enabled:#FFFFFF;
-menuforeground_disabled:#9B9B9B;
-toolbuttonforeground_enabled:#FFFFFF;
-toolbuttonforeground_disabled:#9B9B9B;
-slider_ticktext_color:#FFFFFF;
-
-/* Unclear cases - consider deprecated */
-list_item_separator_normal:#4d4d4d;
-qtc_checkbox_normal:#000000;
-qtc_checkbox_disabled:#a0a0a4;
-qtc_popup_trans:#000000;
-
-/* 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;
+qtc_multimedia_trans_disabled:#9B9B9B; /* Added 09.03.2010 */
}
--- a/src/style/sfblacktheme/variables/color/hbapplicationcolorgroup.css Mon Apr 19 14:02:15 2010 +0300
+++ b/src/style/sfblacktheme/variables/color/hbapplicationcolorgroup.css Mon May 03 13:01:49 2010 +0300
@@ -10,6 +10,7 @@
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 */
+qtc_conv_list_dimmed:#9B9B9B; /* Added 26.03.2010 */
/* Application specific - Calendar */
qtc_cal_grid_line:#8E8E8E; /* Added 05.02.2010 */
@@ -36,9 +37,8 @@
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_badge:#FFFFFF; /* Added 01.03.2010 */
+qtc_hs_cal:#000000; /* Added 18.03.2010 */
/* Application specific - Radio & Calculator */
qtc_lcd_title_normal:#FFFFFF; /* Added 11.02.2010 */
@@ -50,6 +50,6 @@
/* Application specific - Multimedia */
qtc_multimedia_trans:#FFFFFF; /* Modified 19.02.2010 */
qtc_multimedia_trans_pressed:#FFFFFF; /* Added 19.02.2010 */
-
+qtc_multimedia_trans_disabled:#9B9B9B; /* Added 09.03.2010 */
}
--- a/src/style/sfblacktheme/variables/color/hbcolorgroup.css Mon Apr 19 14:02:15 2010 +0300
+++ b/src/style/sfblacktheme/variables/color/hbcolorgroup.css Mon May 03 13:01:49 2010 +0300
@@ -1,5 +1,10 @@
+/* Widget color groups */
+
+
@variables
{
+
+
/* Default palette */
qtc_default_decor_normal:#FFFFFF;
qtc_default_decor_pressed:#FFFFFF;
@@ -50,7 +55,7 @@
qtc_grid_pressed:#FFFFFF;
qtc_grid_highlight:#FFFFFF;
qtc_grid_latched:#FFFFFF; /* Added 05.02.2010 */
-qtg_grid_disabled:#9B9B9B; /* Added 15.02.2010 */
+qtc_grid_disabled:#9B9B9B; /* Modified 01.03.2010 */
/* Main area - List */
qtc_list_item_title_normal:#FFFFFF; /* Modified 19.02.2010 */
@@ -89,7 +94,8 @@
qtc_tumbler_highlight:#FFFFFF;
/* Main area - DataForm */
-qtc_dataform_value:#FFFFFF; /* Added 08.02.2010 */
+qtc_dataform_heading:#FFFFFF; /* Added 04.03.2010 */
+qtc_dataform_heading_link:#33C8FF; /* Added 22.03.2010 */
/* Main area - ProgressSlider */
qtc_progslider_normal:#FFFFFF; /* Added 09.02.2010 */
@@ -144,7 +150,6 @@
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;
@@ -154,6 +159,7 @@
qtc_popup_list_item_highlight:#FFFFFF;
qtc_popup_list_item_disabled:#9B9B9B;
qtc_popup_list_item_latched:#FFFFFF; /* Added 05.02.2010 */
+qtc_popup_list_item_trans_normal:#FFFFFF; /* Added 12.02.2010 */
/* Virtual inputs */
qtc_input_button_normal:#FFFFFF; /* Modified 19.02.2010 */
@@ -166,8 +172,9 @@
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 */
+qtc_input_hint_normal:#F0F0F0; /* Added 05.03.2010 */
+qtc_input_grid_line:#9B9B9B; /* Added 12.03.2010 */
-/* Application specific color groups */
/* Application specific - Conversational list */
qtc_conv_list_received_normal:#B5B5B5; /* Modified 05.02.2010 */
@@ -176,6 +183,7 @@
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 */
+qtc_conv_list_dimmed:#9B9B9B; /* Added 26.03.2010 */
/* Application specific - Calendar */
qtc_cal_grid_line:#8E8E8E; /* Added 05.02.2010 */
@@ -202,9 +210,8 @@
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_badge:#FFFFFF; /* Added 01.03.2010 */
+qtc_hs_cal:#000000; /* Added 18.03.2010 */
/* Application specific - Radio & Calculator */
qtc_lcd_title_normal:#FFFFFF; /* Added 11.02.2010 */
@@ -216,138 +223,7 @@
/* Application specific - Multimedia */
qtc_multimedia_trans:#FFFFFF; /* Modified 19.02.2010 */
qtc_multimedia_trans_pressed:#FFFFFF; /* Added 19.02.2010 */
+qtc_multimedia_trans_disabled:#9B9B9B; /* Added 09.03.2010 */
-/* 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 */
-/* Old color roles used for RnD */
-foreground:#FFFFFF;
-popupbackground:#000000;
-popupforeground:#FFFFFF;
-menubackground:#000000;
-menuforeground_enabled:#FFFFFF;
-menuforeground_disabled:#9B9B9B;
-toolbuttonforeground_enabled:#FFFFFF;
-toolbuttonforeground_disabled:#9B9B9B;
-slider_ticktext_color:#FFFFFF;
-
-/* Unclear cases - consider deprecated */
-list_item_separator_normal:#4d4d4d;
-qtc_checkbox_normal:#000000;
-qtc_checkbox_disabled:#a0a0a4;
-qtc_popup_trans:#000000;
-
-/* 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;
}
-
--- a/src/style/sfblacktheme/variables/color/hbwidgetcolorgroup.css Mon Apr 19 14:02:15 2010 +0300
+++ b/src/style/sfblacktheme/variables/color/hbwidgetcolorgroup.css Mon May 03 13:01:49 2010 +0300
@@ -53,7 +53,7 @@
qtc_grid_pressed:#FFFFFF;
qtc_grid_highlight:#FFFFFF;
qtc_grid_latched:#FFFFFF; /* Added 05.02.2010 */
-qtg_grid_disabled:#9B9B9B; /* Added 15.02.2010 */
+qtc_grid_disabled:#9B9B9B; /* Modified 01.03.2010 */
/* Main area - List */
qtc_list_item_title_normal:#FFFFFF; /* Modified 19.02.2010 */
@@ -92,7 +92,8 @@
qtc_tumbler_highlight:#FFFFFF;
/* Main area - DataForm */
-qtc_dataform_value:#FFFFFF; /* Added 08.02.2010 */
+qtc_dataform_heading:#FFFFFF; /* Added 04.03.2010 */
+qtc_dataform_heading_link:#33C8FF; /* Added 22.03.2010 */
/* Main area - ProgressSlider */
qtc_progslider_normal:#FFFFFF; /* Added 09.02.2010 */
@@ -147,7 +148,6 @@
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;
@@ -157,6 +157,7 @@
qtc_popup_list_item_highlight:#FFFFFF;
qtc_popup_list_item_disabled:#9B9B9B;
qtc_popup_list_item_latched:#FFFFFF; /* Added 05.02.2010 */
+qtc_popup_list_item_trans_normal:#FFFFFF; /* Added 12.02.2010 */
/* Virtual inputs */
qtc_input_button_normal:#FFFFFF; /* Modified 19.02.2010 */
@@ -169,7 +170,7 @@
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 */
-
-
+qtc_input_hint_normal:#F0F0F0; /* Added 05.03.2010 */
+qtc_input_grid_line:#9B9B9B; /* Added 12.03.2010 */
}
--- a/src/style/sfwhitetheme/variables/color/hbapplicationcolorgroup.css Mon Apr 19 14:02:15 2010 +0300
+++ b/src/style/sfwhitetheme/variables/color/hbapplicationcolorgroup.css Mon May 03 13:01:49 2010 +0300
@@ -10,6 +10,7 @@
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 */
+qtc_conv_list_dimmed:#787878; /* Added 26.03.2010 */
/* Application specific - Calendar */
qtc_cal_grid_line:#DCDCDC; /* Added 05.02.2010 */
@@ -36,9 +37,8 @@
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_badge:#FFFFFF; /* Added 01.03.2010 */
+qtc_hs_cal:#3C3C3C; /* Added 18.03.2010 */
/* Application specific - Radio & Calculator */
qtc_lcd_title_normal:#505050; /* Added 11.02.2010 */
@@ -50,6 +50,6 @@
/* Application specific - Multimedia */
qtc_multimedia_trans:#FFFFFF; /* Modified 19.02.2010 */
qtc_multimedia_trans_pressed:#FFFFFF; /* Added 19.02.2010 */
-
+qtc_multimedia_trans_disabled:#787878; /* Added 09.03.2010 */
}
--- a/src/style/sfwhitetheme/variables/color/hbcolorgroup.css Mon Apr 19 14:02:15 2010 +0300
+++ b/src/style/sfwhitetheme/variables/color/hbcolorgroup.css Mon May 03 13:01:49 2010 +0300
@@ -3,6 +3,8 @@
@variables
{
+
+
/* Default palette */
qtc_default_decor_normal:#3C3C3C;
qtc_default_decor_pressed:#FFFFFF;
@@ -53,7 +55,7 @@
qtc_grid_pressed:#FFFFFF;
qtc_grid_highlight:#FFFFFF;
qtc_grid_latched:#FFFFFF; /* Added 05.02.2010 */
-qtg_grid_disabled:#9B9B9B; /* Added 15.02.2010 */
+qtc_grid_disabled:#9B9B9B; /* Modified 01.03.2010 */
/* Main area - List */
qtc_list_item_title_normal:#505050;
@@ -92,7 +94,8 @@
qtc_tumbler_highlight:#FFFFFF;
/* Main area - DataForm */
-qtc_dataform_value:#3C3C3C; /* Added 08.02.2010 */
+qtc_dataform_heading:#3C3C3C; /* Added 04.03.2010 */
+qtc_dataform_heading_link:#33C8FF; /* Added 22.03.2010 */
/* Main area - ProgressSlider */
qtc_progslider_normal:#3C3C3C; /* Added 09.02.2010 */
@@ -147,7 +150,6 @@
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;
@@ -157,6 +159,7 @@
qtc_popup_list_item_highlight:#FFFFFF;
qtc_popup_list_item_disabled:#787878;
qtc_popup_list_item_latched:#FFFFFF; /* Added 05.02.2010 */
+qtc_popup_list_item_trans_normal:#FFFFFF; /* Added 12.02.2010 */
/* Virtual inputs */
qtc_input_button_normal:#505050; /* Modified 19.02.2010 */
@@ -169,6 +172,9 @@
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 */
+qtc_input_hint_normal:#A0A0A0; /* Added 05.03.2010 */
+qtc_input_grid_line:#787878; /* Added 12.03.2010 */
+
/* Application specific - Conversational list */
qtc_conv_list_received_normal:#505050; /* Modified 05.02.2010 */
@@ -177,6 +183,7 @@
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 */
+qtc_conv_list_dimmed:#787878; /* Added 26.03.2010 */
/* Application specific - Calendar */
qtc_cal_grid_line:#DCDCDC; /* Added 05.02.2010 */
@@ -203,9 +210,8 @@
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_badge:#FFFFFF; /* Added 01.03.2010 */
+qtc_hs_cal:#3C3C3C; /* Added 18.03.2010 */
/* Application specific - Radio & Calculator */
qtc_lcd_title_normal:#505050; /* Added 11.02.2010 */
@@ -217,137 +223,7 @@
/* Application specific - Multimedia */
qtc_multimedia_trans:#FFFFFF; /* Modified 19.02.2010 */
qtc_multimedia_trans_pressed:#FFFFFF; /* Added 19.02.2010 */
+qtc_multimedia_trans_disabled:#787878; /* Added 09.03.2010 */
-/* 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 */
-/* Old color roles used for RnD */
-foreground:#FFFFFF;
-popupbackground:#000000;
-popupforeground:#FFFFFF;
-menubackground:#000000;
-menuforeground_enabled:#FFFFFF;
-menuforeground_disabled:#9B9B9B;
-toolbuttonforeground_enabled:#FFFFFF;
-toolbuttonforeground_disabled:#9B9B9B;
-slider_ticktext_color:#FFFFFF;
-
-/* Unclear cases - consider deprecated */
-list_item_separator_normal:#4d4d4d;
-qtc_checkbox_normal:#000000;
-qtc_checkbox_disabled:#a0a0a4;
-qtc_popup_trans:#000000;
-
-/* 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;
}
-
--- a/src/style/sfwhitetheme/variables/color/hbwidgetcolorgroup.css Mon Apr 19 14:02:15 2010 +0300
+++ b/src/style/sfwhitetheme/variables/color/hbwidgetcolorgroup.css Mon May 03 13:01:49 2010 +0300
@@ -53,7 +53,7 @@
qtc_grid_pressed:#FFFFFF;
qtc_grid_highlight:#FFFFFF;
qtc_grid_latched:#FFFFFF; /* Added 05.02.2010 */
-qtg_grid_disabled:#9B9B9B; /* Added 15.02.2010 */
+qtc_grid_disabled:#9B9B9B; /* Modified 01.03.2010 */
/* Main area - List */
qtc_list_item_title_normal:#505050;
@@ -92,7 +92,8 @@
qtc_tumbler_highlight:#FFFFFF;
/* Main area - DataForm */
-qtc_dataform_value:#3C3C3C; /* Added 08.02.2010 */
+qtc_dataform_heading:#3C3C3C; /* Added 04.03.2010 */
+qtc_dataform_heading_link:#33C8FF; /* Added 22.03.2010 */
/* Main area - ProgressSlider */
qtc_progslider_normal:#3C3C3C; /* Added 09.02.2010 */
@@ -147,7 +148,6 @@
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;
@@ -157,6 +157,7 @@
qtc_popup_list_item_highlight:#FFFFFF;
qtc_popup_list_item_disabled:#787878;
qtc_popup_list_item_latched:#FFFFFF; /* Added 05.02.2010 */
+qtc_popup_list_item_trans_normal:#FFFFFF; /* Added 12.02.2010 */
/* Virtual inputs */
qtc_input_button_normal:#505050; /* Modified 19.02.2010 */
@@ -169,6 +170,7 @@
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 */
-
+qtc_input_hint_normal:#A0A0A0; /* Added 05.03.2010 */
+qtc_input_grid_line:#787878; /* Added 12.03.2010 */
}
--- a/src/theme.theme Mon Apr 19 14:02:15 2010 +0300
+++ b/src/theme.theme Mon May 03 13:01:49 2010 +0300
@@ -1,2 +1,3 @@
-[Default Theme]
-Name=hbdefault
+[Default]
+BaseTheme = sfblacktheme
+DefaultActiveTheme = sfblacktheme
--- a/src/theme.theme_new Mon Apr 19 14:02:15 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-[Default]
-BaseTheme = sfblacktheme
-DefaultActiveTheme = sfblacktheme
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/theme.theme_old Mon May 03 13:01:49 2010 +0300
@@ -0,0 +1,2 @@
+[Default Theme]
+Name=hbdefault