--- a/bin/extract.py	Mon Aug 23 18:19:32 2010 +0300
+++ b/bin/extract.py	Fri Sep 03 19:11:12 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:

--- a/bin/installs.py	Mon Aug 23 18:19:32 2010 +0300
+++ b/bin/installs.py	Fri Sep 03 19:11:12 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
 

--- a/platformthemes.pro	Mon Aug 23 18:19:32 2010 +0300
+++ b/platformthemes.pro	Fri Sep 03 19:11:12 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

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

Binary file src/effects/sfwhitetheme/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/sfwhitetheme/scalable/applications.zip has changed

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

--- a/src/style/sfblacktheme/variables/color/hbapplicationcolorgroup.css	Mon Aug 23 18:19:32 2010 +0300
+++ b/src/style/sfblacktheme/variables/color/hbapplicationcolorgroup.css	Fri Sep 03 19:11:12 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 */

--- a/src/style/sfwhitetheme/variables/color/hbapplicationcolorgroup.css	Mon Aug 23 18:19:32 2010 +0300
+++ b/src/style/sfwhitetheme/variables/color/hbapplicationcolorgroup.css	Fri Sep 03 19:11:12 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 */