# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1284701612 -10800
# Node ID a5dfa7884e305e34ffdecbf7af31d1988fff2d5d
# Parent  75f2092df3f70cef84aaae29d330670387c81d22
Revision: 201035
Kit: 201037

diff -r 75f2092df3f7 -r a5dfa7884e30 bin/extract.py
--- a/bin/extract.py	Thu Sep 02 21:00:34 2010 +0300
+++ b/bin/extract.py	Fri Sep 17 08:33:32 2010 +0300
@@ -33,6 +33,7 @@
 OUTPUT_DIR = os.getcwd()
 INCLUDE = None
 EXCLUDE = None
+CLEAN = False
 
 # ============================================================================
 # OptionParser
@@ -52,6 +53,8 @@
                         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("--clean", dest="clean", action="store_true",
+                        help="clean intermediate files in the output directory")
 
 # ============================================================================
 # Utils
@@ -105,7 +108,7 @@
 # main()
 # ============================================================================
 def main():
-    global VERBOSE, INPUT_DIR, OUTPUT_DIR, INCLUDE, EXCLUDE
+    global VERBOSE, INPUT_DIR, OUTPUT_DIR, INCLUDE, EXCLUDE, CLEAN
 
     parser = OptionParser()
     (options, args) = parser.parse_args()
@@ -120,12 +123,16 @@
         INCLUDE = options.include
     if options.exclude != None:
         EXCLUDE = options.exclude
+    if options.clean != None:
+        CLEAN = options.clean
 
     extracted = 0
     copied = 0
     omitted = 0
     workpath = None
     newline = False
+    if CLEAN:
+        shutil.rmtree(OUTPUT_DIR, ignore_errors=True)
     sys.stdout.write("Processing: ")
     for root, dirs, files in os.walk(INPUT_DIR):
         for file in files:
diff -r 75f2092df3f7 -r a5dfa7884e30 bin/installs.py
--- a/bin/installs.py	Thu Sep 02 21:00:34 2010 +0300
+++ b/bin/installs.py	Fri Sep 17 08:33:32 2010 +0300
@@ -84,7 +84,7 @@
                 target = make_target(root)
                 relpath = os.path.relpath(root, input_dir).replace("\\", "/")
                 if os.path.splitext(file)[1] == ".zip":
-                    out.write("symbian:BLD_INF_RULES.prj_exports += \":zip %s $${EPOCROOT}epoc32/data/z/resource/hb/themes/%s/\"\n" % (filepath, relpath)) 
+                    out.write("symbian:BLD_INF_RULES.prj_exports += \":zip %s $${EPOCROOT}epoc32/data/z/resource/hb/themes/%s/\"\n" % (filepath, relpath))
                     out.write("symbian:BLD_INF_RULES.prj_exports += \":zip %s $${EPOCROOT}epoc32/winscw/c/resource/hb/themes/%s/\"\n" % (filepath, relpath))
                     out.write("!isEmpty(%s.commands): %s.commands += &&\n" % (target, target))
                     out.write("%s.commands += $$QMAKE_UNZIP %s -d $$(HB_THEMES_DIR)/themes/%s\n" % (target, filepath, relpath))
@@ -97,6 +97,7 @@
                     out.write("%s.path = $$(HB_THEMES_DIR)/themes/%s\n" % (target, relpath))
                     out.write("INSTALLS += %s\n" % target)
                     roots.append(root)
+                out.write("QMAKE_CLEAN += %s\n" % filepath)
     out.close()
     return 0
 
diff -r 75f2092df3f7 -r a5dfa7884e30 package_definition.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/package_definition.xml	Fri Sep 17 08:33:32 2010 +0300
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<SystemDefinition schema="3.0.0" xmlns:qt="http://www.nokia.com/qt">
+ <package id="platformthemes" name="Platform Themes" levels="framework generic ui">
+   <collection id="platformthemes_info" name="Platform Themes Info">
+    <component id="platformthemes_build" name="Platform Themes Build" filter="s60">
+		<!-- no real structure in this package. Should break into collections / components -->
+      <unit bldFile="." qt:proFile="platformthemes.pro"/>
+     </component>
+   </collection>
+ </package>
+</SystemDefinition>
diff -r 75f2092df3f7 -r a5dfa7884e30 package_map.xml
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/package_map.xml	Fri Sep 17 08:33:32 2010 +0300
@@ -0,0 +1,1 @@
+<PackageMap root="sf" layer="mw"/>
diff -r 75f2092df3f7 -r a5dfa7884e30 platformthemes.pro
--- a/platformthemes.pro	Thu Sep 02 21:00:34 2010 +0300
+++ b/platformthemes.pro	Fri Sep 17 08:33:32 2010 +0300
@@ -52,7 +52,7 @@
 # ============================================================================
 # extract archives
 # ============================================================================
-ARGS = --input src --output $$OUT_PWD/tmp/src $$EXCLUDE
+ARGS = --input src --output $$OUT_PWD/tmp/src $$EXCLUDE --clean
 !system(python bin/extract.py $$ARGS) {
     error(*** bin/extract.py reported an error. Stop.)
 }
@@ -101,7 +101,7 @@
     error(*** bin/installs.py reported an error. Stop.)
 }
 isEmpty(QMAKE_UNZIP):QMAKE_UNZIP = unzip -u -o
-QMAKE_DISTCLEAN += $$OUT_PWD/tmp/installs.pri
+QMAKE_CLEAN += $$OUT_PWD/tmp/installs.pri
 
 # ============================================================================
 # generate rom files
diff -r 75f2092df3f7 -r a5dfa7884e30 src/effects/sfwhitetheme/applications.zip
Binary file src/effects/sfwhitetheme/applications.zip has changed
diff -r 75f2092df3f7 -r a5dfa7884e30 src/effects/sfwhitetheme/widgets.zip
Binary file src/effects/sfwhitetheme/widgets.zip has changed
diff -r 75f2092df3f7 -r a5dfa7884e30 src/icons/sfblacktheme/scalable/applications.zip
Binary file src/icons/sfblacktheme/scalable/applications.zip has changed
diff -r 75f2092df3f7 -r a5dfa7884e30 src/icons/sfblacktheme/scalable/icons.zip
Binary file src/icons/sfblacktheme/scalable/icons.zip has changed
diff -r 75f2092df3f7 -r a5dfa7884e30 src/icons/sfwhitetheme/scalable/applications.zip
Binary file src/icons/sfwhitetheme/scalable/applications.zip has changed
diff -r 75f2092df3f7 -r a5dfa7884e30 src/icons/sfwhitetheme/scalable/icons.zip
Binary file src/icons/sfwhitetheme/scalable/icons.zip has changed
diff -r 75f2092df3f7 -r a5dfa7884e30 src/style/sfblacktheme/variables/color/hbapplicationcolorgroup.css
--- a/src/style/sfblacktheme/variables/color/hbapplicationcolorgroup.css	Thu Sep 02 21:00:34 2010 +0300
+++ b/src/style/sfblacktheme/variables/color/hbapplicationcolorgroup.css	Fri Sep 17 08:33:32 2010 +0300
@@ -23,8 +23,8 @@
 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 */
-qtc_cal_meeting:#FFFFFF; /* Added 14.06.2010 */
 qtc_cal_view_text:#FFFFFF; /* Added 14.06.2010 */
+qtc_cal_meeting_text :#FFFFFF; /* Added 17.08.2010 */
 
 /* Application specific - Call handling */ 
 qtc_callhandling_answer_normal:#FFFFFF; /* Added 05.02.2010 */
@@ -37,7 +37,7 @@
 /* Application specific - Home screen */ 
 qtc_hs_list_item_title_normal:#FFFFFF; /* Added 05.02.2010 */
 qtc_hs_list_title2_normal:#FFFFFF;
-qtc_hs_list_item_content_normal:#FFFFFF; /* Added 05.02.2010 */
+qtc_hs_list_item_content_normal:#F0F0F0; /* Added 05.02.2010 */
 qtc_hs_list_item_pressed:#FFFFFF; /* Added 05.02.2010 */
 qtc_hs_list_item_latched:#FFFFFF;
 qtc_hs_list_item_highlight:#FFFFFF; /* Added 05.02.2010 */
diff -r 75f2092df3f7 -r a5dfa7884e30 src/style/sfwhitetheme/variables/color/hbapplicationcolorgroup.css
--- a/src/style/sfwhitetheme/variables/color/hbapplicationcolorgroup.css	Thu Sep 02 21:00:34 2010 +0300
+++ b/src/style/sfwhitetheme/variables/color/hbapplicationcolorgroup.css	Fri Sep 17 08:33:32 2010 +0300
@@ -23,8 +23,8 @@
 qtc_cal_day_preview_text:#505050; /* Modified 02.08.2010 */
 qtc_cal_day_hour_lines:#505050; /* Added 05.02.2010 */
 qtc_cal_monthgrid_title:#FFFFFF; /* Added 05.02.2010 */
-qtc_cal_meeting:#000000; /* Added 14.06.2010 */
 qtc_cal_view_text:#000000; /* Added 14.06.2010 */
+qtc_cal_meeting_text :#000000; /* Added 17.08.2010 */
 
 /* Application specific - Call handling */ 
 qtc_callhandling_answer_normal:#FFFFFF; /* Added 05.02.2010 */