# HG changeset patch
# User hgs
# Date 1282576772 -10800
# Node ID e63789a1ced850d2ca435438b02eee1993625a45
# Parent  83e593299ea6c08b370119fe0bbab6af8d1a0322
201033

diff -r 83e593299ea6 -r e63789a1ced8 confml/platformthemes.confml
--- a/confml/platformthemes.confml	Fri Aug 06 13:41:12 2010 +0300
+++ b/confml/platformthemes.confml	Mon Aug 23 18:19:32 2010 +0300
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration xmlns="http://www.s60.com/xml/confml/1" xmlns:xi="http://www.w3.org/2001/XInclude" name="theme" version="1">
-  <desc>HbTheme</desc>
-  <data>
-    <HbTheme>
-      <AvailableThemes extensionPolicy="append">
-        <ThemeName>sfblacktheme</ThemeName>
-        <ThxPath>\epoc32\data\z\resource\hb\themes\sfblacktheme.thx</ThxPath>
-      </AvailableThemes>
-      <AvailableThemes>
-        <ThemeName>sfwhitetheme</ThemeName>
-        <ThxPath>\epoc32\data\z\resource\hb\themes\sfwhitetheme.thx</ThxPath>
-      </AvailableThemes>
-    </HbTheme>
-  </data>
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration xmlns="http://www.s60.com/xml/confml/1" xmlns:xi="http://www.w3.org/2001/XInclude" name="theme" version="1">
+  <desc>HbTheme</desc>
+  <data>
+    <HbTheme>
+      <AvailableThemes extensionPolicy="append">
+        <ThemeName>sfblacktheme</ThemeName>
+        <ThxPath>\epoc32\data\z\resource\hb\themes\sfblacktheme.thx</ThxPath>
+      </AvailableThemes>
+      <AvailableThemes>
+        <ThemeName>sfwhitetheme</ThemeName>
+        <ThxPath>\epoc32\data\z\resource\hb\themes\sfwhitetheme.thx</ThxPath>
+      </AvailableThemes>
+    </HbTheme>
+  </data>
 </configuration>
\ No newline at end of file
diff -r 83e593299ea6 -r e63789a1ced8 layers.sysdef.xml
--- a/layers.sysdef.xml	Fri Aug 06 13:41:12 2010 +0300
+++ b/layers.sysdef.xml	Mon Aug 23 18:19:32 2010 +0300
@@ -1,14 +1,14 @@
-<?xml version="1.0"?>
-<!DOCTYPE SystemDefinition SYSTEM "sysdef_1_5_1.dtd" [
-  <!ENTITY layer_real_source_path "sf/mw/platformthemes" >
-]>
-
-<SystemDefinition name="platformthemes" schema="1.5.1">
-	<systemModel>
-      	<layer name="mw_layer">
-    		<module name="platformthemes">
-    			<unit name="platformthemes" unitID="qtdo.platformthemes" bldFile="&layer_real_source_path;" mrp="" proFile="platformthemes.pro"/>
-    		</module>
-        </layer>
-    </systemModel>
-</SystemDefinition>
+<?xml version="1.0"?>
+<!DOCTYPE SystemDefinition SYSTEM "sysdef_1_5_1.dtd" [
+  <!ENTITY layer_real_source_path "sf/mw/platformthemes" >
+]>
+
+<SystemDefinition name="platformthemes" schema="1.5.1">
+	<systemModel>
+      	<layer name="mw_layer">
+    		<module name="platformthemes">
+    			<unit name="platformthemes" unitID="qtdo.platformthemes" bldFile="&layer_real_source_path;" mrp="" proFile="platformthemes.pro"/>
+    		</module>
+        </layer>
+    </systemModel>
+</SystemDefinition>
diff -r 83e593299ea6 -r e63789a1ced8 src/effects/sfwhitetheme/widgets.zip
Binary file src/effects/sfwhitetheme/widgets.zip has changed
diff -r 83e593299ea6 -r e63789a1ced8 src/icons/sfblacktheme/index.theme
--- a/src/icons/sfblacktheme/index.theme	Fri Aug 06 13:41:12 2010 +0300
+++ b/src/icons/sfblacktheme/index.theme	Mon Aug 23 18:19:32 2010 +0300
@@ -1,8 +1,8 @@
-[Icon Theme]
-Name=sfblacktheme
-Comment=Reference SF Black Theme
-Hidden=false
-Directories=scalable
-PreviewIconPath_prt=/scalable/qtg_graf_theme_preview_prt.svg
-PreviewIconPath_lsc=/scalable/qtg_graf_theme_preview_lsc.svg
-PreviewThumbnailPath=/scalable/qtg_graf_theme_preview_thumbnail.svg
+[Icon Theme]
+Name=sfblacktheme
+Comment=Reference SF Black Theme
+Hidden=false
+Directories=scalable
+PreviewIconPath_prt=/scalable/qtg_graf_theme_preview_prt.svg
+PreviewIconPath_lsc=/scalable/qtg_graf_theme_preview_lsc.svg
+PreviewThumbnailPath=/scalable/qtg_graf_theme_preview_thumbnail.svg
diff -r 83e593299ea6 -r e63789a1ced8 src/icons/sfblacktheme/mirrored.txt
--- a/src/icons/sfblacktheme/mirrored.txt	Fri Aug 06 13:41:12 2010 +0300
+++ b/src/icons/sfblacktheme/mirrored.txt	Mon Aug 23 18:19:32 2010 +0300
@@ -1,46 +1,46 @@
-
-#Grid
-
-qtg_fr_popup_grid_normal
-qtg_fr_popup_grid_highlight
-qtg_fr_popup_grid_pressed
-qtg_fr_popup_grid_latched
-qtg_fr_popup_trans_grid_normal
-
-
-#Progress bar
-
-qtg_fr_progbar_v_frame
-qtg_fr_progbar_v_filled
-qtg_graf_progbar_v_wait
-qtg_fr_progbar_v_mask
-
-
-#Slider
-
-qtg_fr_slider_v_frame_normal
-qtg_fr_slider_v_frame_pressed
-qtg_fr_slider_v_filled
-
-
-#Toolbar
-
-qtg_fr_tb_v_normal
-qtg_fr_tb_v_highlight
-qtg_fr_tb_v_pressed
-qtg_fr_tb_v_latched
-qtg_fr_tb_v_disabled
-qtg_fr_tb_trans_v_normal
-qtg_fr_tb_trans_v_highlight
-qtg_fr_tb_trans_v_pressed
-qtg_fr_tb_trans_v_latched
-qtg_fr_tb_trans_v_disabled
-
-
-#Scrollbar
-
-qtg_fr_scroll_v_active_handle_normal
-qtg_fr_scroll_v_active_frame_normal
-qtg_fr_scroll_v_active_handle_pressed
-qtg_fr_scroll_v_active_frame_pressed
-
+
+#Grid
+
+qtg_fr_popup_grid_normal
+qtg_fr_popup_grid_highlight
+qtg_fr_popup_grid_pressed
+qtg_fr_popup_grid_latched
+qtg_fr_popup_trans_grid_normal
+
+
+#Progress bar
+
+qtg_fr_progbar_v_frame
+qtg_fr_progbar_v_filled
+qtg_graf_progbar_v_wait
+qtg_fr_progbar_v_mask
+
+
+#Slider
+
+qtg_fr_slider_v_frame_normal
+qtg_fr_slider_v_frame_pressed
+qtg_fr_slider_v_filled
+
+
+#Toolbar
+
+qtg_fr_tb_v_normal
+qtg_fr_tb_v_highlight
+qtg_fr_tb_v_pressed
+qtg_fr_tb_v_latched
+qtg_fr_tb_v_disabled
+qtg_fr_tb_trans_v_normal
+qtg_fr_tb_trans_v_highlight
+qtg_fr_tb_trans_v_pressed
+qtg_fr_tb_trans_v_latched
+qtg_fr_tb_trans_v_disabled
+
+
+#Scrollbar
+
+qtg_fr_scroll_v_active_handle_normal
+qtg_fr_scroll_v_active_frame_normal
+qtg_fr_scroll_v_active_handle_pressed
+qtg_fr_scroll_v_active_frame_pressed
+
diff -r 83e593299ea6 -r e63789a1ced8 src/icons/sfblacktheme/scalable/applications.zip
Binary file src/icons/sfblacktheme/scalable/applications.zip has changed
diff -r 83e593299ea6 -r e63789a1ced8 src/icons/sfblacktheme/scalable/icons.zip
Binary file src/icons/sfblacktheme/scalable/icons.zip has changed
diff -r 83e593299ea6 -r e63789a1ced8 src/icons/sfblacktheme/scalable/widgets.zip
Binary file src/icons/sfblacktheme/scalable/widgets.zip has changed
diff -r 83e593299ea6 -r e63789a1ced8 src/icons/sfwhitetheme/index.theme
--- a/src/icons/sfwhitetheme/index.theme	Fri Aug 06 13:41:12 2010 +0300
+++ b/src/icons/sfwhitetheme/index.theme	Mon Aug 23 18:19:32 2010 +0300
@@ -1,8 +1,8 @@
-[Icon Theme]
-Name=sfwhitetheme
-Comment=Reference SF White Theme
-Hidden=false
-Directories=scalable
-PreviewIconPath_prt=/scalable/qtg_graf_theme_preview_prt.svg
-PreviewIconPath_lsc=/scalable/qtg_graf_theme_preview_lsc.svg
-PreviewThumbnailPath=/scalable/qtg_graf_theme_preview_thumbnail.svg
+[Icon Theme]
+Name=sfwhitetheme
+Comment=Reference SF White Theme
+Hidden=false
+Directories=scalable
+PreviewIconPath_prt=/scalable/qtg_graf_theme_preview_prt.svg
+PreviewIconPath_lsc=/scalable/qtg_graf_theme_preview_lsc.svg
+PreviewThumbnailPath=/scalable/qtg_graf_theme_preview_thumbnail.svg
diff -r 83e593299ea6 -r e63789a1ced8 src/icons/sfwhitetheme/mirrored.txt
--- a/src/icons/sfwhitetheme/mirrored.txt	Fri Aug 06 13:41:12 2010 +0300
+++ b/src/icons/sfwhitetheme/mirrored.txt	Mon Aug 23 18:19:32 2010 +0300
@@ -1,46 +1,46 @@
-
-#Grid
-
-qtg_fr_popup_grid_normal
-qtg_fr_popup_grid_highlight
-qtg_fr_popup_grid_pressed
-qtg_fr_popup_grid_latched
-qtg_fr_popup_trans_grid_normal
-
-
-#Progress bar
-
-qtg_fr_progbar_v_frame
-qtg_fr_progbar_v_filled
-qtg_graf_progbar_v_wait
-qtg_fr_progbar_v_mask
-
-
-#Slider
-
-qtg_fr_slider_v_frame_normal
-qtg_fr_slider_v_frame_pressed
-qtg_fr_slider_v_filled
-
-
-#Toolbar
-
-qtg_fr_tb_v_normal
-qtg_fr_tb_v_highlight
-qtg_fr_tb_v_pressed
-qtg_fr_tb_v_latched
-qtg_fr_tb_v_disabled
-qtg_fr_tb_trans_v_normal
-qtg_fr_tb_trans_v_highlight
-qtg_fr_tb_trans_v_pressed
-qtg_fr_tb_trans_v_latched
-qtg_fr_tb_trans_v_disabled
-
-
-#Scrollbar
-
-qtg_fr_scroll_v_active_handle_normal
-qtg_fr_scroll_v_active_frame_normal
-qtg_fr_scroll_v_active_handle_pressed
-qtg_fr_scroll_v_active_frame_pressed
-
+
+#Grid
+
+qtg_fr_popup_grid_normal
+qtg_fr_popup_grid_highlight
+qtg_fr_popup_grid_pressed
+qtg_fr_popup_grid_latched
+qtg_fr_popup_trans_grid_normal
+
+
+#Progress bar
+
+qtg_fr_progbar_v_frame
+qtg_fr_progbar_v_filled
+qtg_graf_progbar_v_wait
+qtg_fr_progbar_v_mask
+
+
+#Slider
+
+qtg_fr_slider_v_frame_normal
+qtg_fr_slider_v_frame_pressed
+qtg_fr_slider_v_filled
+
+
+#Toolbar
+
+qtg_fr_tb_v_normal
+qtg_fr_tb_v_highlight
+qtg_fr_tb_v_pressed
+qtg_fr_tb_v_latched
+qtg_fr_tb_v_disabled
+qtg_fr_tb_trans_v_normal
+qtg_fr_tb_trans_v_highlight
+qtg_fr_tb_trans_v_pressed
+qtg_fr_tb_trans_v_latched
+qtg_fr_tb_trans_v_disabled
+
+
+#Scrollbar
+
+qtg_fr_scroll_v_active_handle_normal
+qtg_fr_scroll_v_active_frame_normal
+qtg_fr_scroll_v_active_handle_pressed
+qtg_fr_scroll_v_active_frame_pressed
+
diff -r 83e593299ea6 -r e63789a1ced8 src/icons/sfwhitetheme/scalable/applications.zip
Binary file src/icons/sfwhitetheme/scalable/applications.zip has changed
diff -r 83e593299ea6 -r e63789a1ced8 src/icons/sfwhitetheme/scalable/icons.zip
Binary file src/icons/sfwhitetheme/scalable/icons.zip has changed
diff -r 83e593299ea6 -r e63789a1ced8 src/icons/sfwhitetheme/scalable/widgets.zip
Binary file src/icons/sfwhitetheme/scalable/widgets.zip has changed
diff -r 83e593299ea6 -r e63789a1ced8 src/style/sfblacktheme/variables/color/hbapplicationcolorgroup.css
--- a/src/style/sfblacktheme/variables/color/hbapplicationcolorgroup.css	Fri Aug 06 13:41:12 2010 +0300
+++ b/src/style/sfblacktheme/variables/color/hbapplicationcolorgroup.css	Mon Aug 23 18:19:32 2010 +0300
@@ -1,66 +1,66 @@
-/* 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 */
-qtc_conv_list_dimmed:#9B9B9B; /* Added 26.03.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 */
-qtc_cal_meeting:#FFFFFF; /* Added 14.06.2010 */
-qtc_cal_view_text:#FFFFFF; /* Added 14.06.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_title2_normal:#FFFFFF;
-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_latched:#FFFFFF;
-qtc_hs_list_item_highlight:#FFFFFF; /* Added 05.02.2010 */
-qtc_hs_badge:#FFFFFF;  /* Added 01.03.2010 */
-qtc_hs_cal:#000000; /* Added 18.03.2010 */
-qtc_hs_snapguide:#93c7ed; /* Added 24.05.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_normal:#FFFFFF; /* Modified 02.06.2010 */
-qtc_multimedia_trans_pressed:#FFFFFF; /* Added 19.02.2010 */
-qtc_multimedia_trans_disabled:#9B9B9B; /* Added 09.03.2010 */
-
-/* Application specific - Messaging */ 
-qtc_messaging_char_count:#FFFFFF; /* Added 19.04.2010 */
-
-/* Screensaver */
-qtc_screensaver:#FFFFFF; /* Added 16.06.2010 */
-}
-
+/* 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 */
+qtc_conv_list_dimmed:#9B9B9B; /* Added 26.03.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 */
+qtc_cal_meeting:#FFFFFF; /* Added 14.06.2010 */
+qtc_cal_view_text:#FFFFFF; /* Added 14.06.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_title2_normal:#FFFFFF;
+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_latched:#FFFFFF;
+qtc_hs_list_item_highlight:#FFFFFF; /* Added 05.02.2010 */
+qtc_hs_badge:#FFFFFF;  /* Added 01.03.2010 */
+qtc_hs_cal:#000000; /* Added 18.03.2010 */
+qtc_hs_snapguide:#93c7ed; /* Added 24.05.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_normal:#FFFFFF; /* Modified 02.06.2010 */
+qtc_multimedia_trans_pressed:#FFFFFF; /* Added 19.02.2010 */
+qtc_multimedia_trans_disabled:#9B9B9B; /* Added 09.03.2010 */
+
+/* Application specific - Messaging */ 
+qtc_messaging_char_count:#FFFFFF; /* Added 19.04.2010 */
+
+/* Screensaver */
+qtc_screensaver:#FFFFFF; /* Added 16.06.2010 */
+}
+
diff -r 83e593299ea6 -r e63789a1ced8 src/style/sfblacktheme/variables/color/hbwidgetcolorgroup.css
--- a/src/style/sfblacktheme/variables/color/hbwidgetcolorgroup.css	Fri Aug 06 13:41:12 2010 +0300
+++ b/src/style/sfblacktheme/variables/color/hbwidgetcolorgroup.css	Mon Aug 23 18:19:32 2010 +0300
@@ -1,172 +1,172 @@
-/* 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;
-qtc_view_normal_secondary:#FFFFFF;
-
-/* Main area - View title */
-qtc_viewtitle_normal:#E6E6E6;
-
-/* Main area - Grid */ 
-qtc_grid_normal:#DCDCDC;
-qtc_grid_pressed:#FFFFFF;
-qtc_grid_highlight:#FFFFFF;
-qtc_grid_latched:#FFFFFF; /* Added 05.02.2010 */
-qtc_grid_disabled:#9B9B9B; /* Modified 01.03.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:#3C3C3C;
-qtc_tumbler_selected:#3C3C3C;
-qtc_tumbler_highlight:#FFFFFF;
-
-/* Main area - DataForm */
-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 */
-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 */
-
-/* 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 */
-qtc_popup_list_item_trans_normal:#FFFFFF; /* Added 12.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 */
-qtc_input_hint_normal:#F0F0F0; /* Added 05.03.2010 */
-qtc_input_grid_line:#9B9B9B; /* Added 12.03.2010 */
-}
-
+/* 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;
+qtc_view_normal_secondary:#FFFFFF;
+
+/* Main area - View title */
+qtc_viewtitle_normal:#E6E6E6;
+
+/* Main area - Grid */ 
+qtc_grid_normal:#DCDCDC;
+qtc_grid_pressed:#FFFFFF;
+qtc_grid_highlight:#FFFFFF;
+qtc_grid_latched:#FFFFFF; /* Added 05.02.2010 */
+qtc_grid_disabled:#9B9B9B; /* Modified 01.03.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:#3C3C3C;
+qtc_tumbler_selected:#3C3C3C;
+qtc_tumbler_highlight:#FFFFFF;
+
+/* Main area - DataForm */
+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 */
+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 */
+
+/* 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 */
+qtc_popup_list_item_trans_normal:#FFFFFF; /* Added 12.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 */
+qtc_input_hint_normal:#F0F0F0; /* Added 05.03.2010 */
+qtc_input_grid_line:#9B9B9B; /* Added 12.03.2010 */
+}
+
diff -r 83e593299ea6 -r e63789a1ced8 src/style/sfwhitetheme/variables/color/hbapplicationcolorgroup.css
--- a/src/style/sfwhitetheme/variables/color/hbapplicationcolorgroup.css	Fri Aug 06 13:41:12 2010 +0300
+++ b/src/style/sfwhitetheme/variables/color/hbapplicationcolorgroup.css	Mon Aug 23 18:19:32 2010 +0300
@@ -1,66 +1,66 @@
-/* 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 */
-qtc_conv_list_dimmed:#787878; /* Added 26.03.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 */
-qtc_cal_meeting:#000000; /* Added 14.06.2010 */
-qtc_cal_view_text:#000000; /* Added 14.06.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_title2_normal:#3C3C3C;
-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_latched:#FFFFFF;
-qtc_hs_list_item_highlight:#FFFFFF; /* Added 05.02.2010 */
-qtc_hs_badge:#FFFFFF; /* Added 01.03.2010 */
-qtc_hs_cal:#3C3C3C; /* Added 18.03.2010 */
-qtc_hs_snapguide:#f7931e; /* Added 24.05.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_normal:#FFFFFF; /* Modified 02.06.2010 */
-qtc_multimedia_trans_pressed:#FFFFFF; /* Added 19.02.2010 */
-qtc_multimedia_trans_disabled:#787878; /* Added 09.03.2010 */
-
-/* Application specific - Messaging */ 
-qtc_messaging_char_count:#FFFFFF; /* Added 19.04.2010 */
-
-/* Screensaver */
-qtc_screensaver:#FFFFFF; /* Added 16.06.2010 */
-}
-
+/* 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 */
+qtc_conv_list_dimmed:#787878; /* Added 26.03.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:#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 */
+
+/* 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_title2_normal:#3C3C3C;
+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_latched:#FFFFFF;
+qtc_hs_list_item_highlight:#FFFFFF; /* Added 05.02.2010 */
+qtc_hs_badge:#FFFFFF; /* Added 01.03.2010 */
+qtc_hs_cal:#3C3C3C; /* Added 18.03.2010 */
+qtc_hs_snapguide:#f7931e; /* Added 24.05.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_normal:#FFFFFF; /* Modified 02.06.2010 */
+qtc_multimedia_trans_pressed:#FFFFFF; /* Added 19.02.2010 */
+qtc_multimedia_trans_disabled:#787878; /* Added 09.03.2010 */
+
+/* Application specific - Messaging */ 
+qtc_messaging_char_count:#FFFFFF; /* Added 19.04.2010 */
+
+/* Screensaver */
+qtc_screensaver:#FFFFFF; /* Added 16.06.2010 */
+}
+
diff -r 83e593299ea6 -r e63789a1ced8 src/style/sfwhitetheme/variables/color/hbwidgetcolorgroup.css
--- a/src/style/sfwhitetheme/variables/color/hbwidgetcolorgroup.css	Fri Aug 06 13:41:12 2010 +0300
+++ b/src/style/sfwhitetheme/variables/color/hbwidgetcolorgroup.css	Mon Aug 23 18:19:32 2010 +0300
@@ -1,172 +1,172 @@
-/* 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:#9B9B9B; 
-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:#3C3C3C; /* Modified 26.05.2010 */
-qtc_title_pane_pressed:#FFFFFF;
-qtc_title_pane_highlight:#FFFFFF;
-qtc_title_pane_latched:#000000; /* Modified 26.05.2010 */
-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:#000000;
-qtc_view_pressed:#505050;
-qtc_view_line_normal:#A0A0A0;
-qtc_view_link_normal:#33C8FF;
-qtc_view_visited_normal:#B378FF;
-qtc_view_separator_normal:#9B9B9B;
-qtc_view_normal_secondary:#FFFFFF;
-
-/* Main area - View title */
-qtc_viewtitle_normal:#3C3C3C;
-
-/* Main area - Grid */ 
-qtc_grid_normal:#595B5D;
-qtc_grid_pressed:#FFFFFF;
-qtc_grid_highlight:#FFFFFF;
-qtc_grid_latched:#FFFFFF; /* Added 05.02.2010 */
-qtc_grid_disabled:#9B9B9B; /* Modified 01.03.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_heading:#FFFFFF; /* Modified 10.06.2010 */
-qtc_dataform_heading_link:#8CE0FF; /* Modified 10.06.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 */
-
-/* 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 */
-qtc_popup_list_item_trans_normal:#FFFFFF; /* Added 12.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 */
-qtc_input_hint_normal:#A0A0A0; /* Added 05.03.2010 */
-qtc_input_grid_line:#787878; /* Added 12.03.2010 */
-}
-
+/* 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:#9B9B9B; 
+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:#3C3C3C; /* Modified 26.05.2010 */
+qtc_title_pane_pressed:#FFFFFF;
+qtc_title_pane_highlight:#FFFFFF;
+qtc_title_pane_latched:#000000; /* Modified 26.05.2010 */
+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:#000000;
+qtc_view_pressed:#505050;
+qtc_view_line_normal:#A0A0A0;
+qtc_view_link_normal:#33C8FF;
+qtc_view_visited_normal:#B378FF;
+qtc_view_separator_normal:#9B9B9B;
+qtc_view_normal_secondary:#FFFFFF;
+
+/* Main area - View title */
+qtc_viewtitle_normal:#3C3C3C;
+
+/* Main area - Grid */ 
+qtc_grid_normal:#595B5D;
+qtc_grid_pressed:#FFFFFF;
+qtc_grid_highlight:#FFFFFF;
+qtc_grid_latched:#FFFFFF; /* Added 05.02.2010 */
+qtc_grid_disabled:#9B9B9B; /* Modified 01.03.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_heading:#FFFFFF; /* Modified 10.06.2010 */
+qtc_dataform_heading_link:#8CE0FF; /* Modified 10.06.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 */
+
+/* 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 */
+qtc_popup_list_item_trans_normal:#FFFFFF; /* Added 12.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 */
+qtc_input_hint_normal:#A0A0A0; /* Added 05.03.2010 */
+qtc_input_grid_line:#787878; /* Added 12.03.2010 */
+}
+
diff -r 83e593299ea6 -r e63789a1ced8 src/theme.theme
--- a/src/theme.theme	Fri Aug 06 13:41:12 2010 +0300
+++ b/src/theme.theme	Mon Aug 23 18:19:32 2010 +0300
@@ -1,3 +1,3 @@
-[Default]
-BaseTheme = sfwhitetheme
-DefaultActiveTheme = sfblacktheme
+[Default]
+BaseTheme = sfwhitetheme
+DefaultActiveTheme = sfblacktheme
diff -r 83e593299ea6 -r e63789a1ced8 sysdef_1_5_1.dtd
--- a/sysdef_1_5_1.dtd	Fri Aug 06 13:41:12 2010 +0300
+++ b/sysdef_1_5_1.dtd	Mon Aug 23 18:19:32 2010 +0300
@@ -1,88 +1,88 @@
- <!ELEMENT SystemDefinition (systemModel?, build?)>
- <!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED>
- <!ELEMENT systemModel (layer+)>
- <!ELEMENT layer (logicalset* | module*)*>
- <!ATTLIST layer
-  name CDATA #REQUIRED
-  levels CDATA #IMPLIED
-  span CDATA #IMPLIED>
- <!ELEMENT logicalset (logicalsubset* | module* | unit* | package* | prebuilt*)*>
- <!ATTLIST logicalset name CDATA #REQUIRED>
- <!ELEMENT logicalsubset (module* | unit* | package* | prebuilt*)*>
- <!ATTLIST logicalsubset name CDATA #REQUIRED>
- <!ELEMENT module (component* | unit* | package* | prebuilt*)*>
- <!ATTLIST module
-  name CDATA #REQUIRED
-  level CDATA #IMPLIED>
- <!ELEMENT component (unit* | package* | prebuilt*)*>
- <!ATTLIST component name CDATA #REQUIRED>
- <!ELEMENT unit EMPTY>
- <!ATTLIST unit
-  unitID ID #REQUIRED
-  name CDATA #REQUIRED
-  mrp CDATA #REQUIRED
-  filter CDATA #IMPLIED
-  bldFile CDATA #REQUIRED
-  priority CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  proFile CDATA #IMPLIED
-  qmakeArgs CDATA #IMPLIED>
- <!ELEMENT package EMPTY>
- <!ATTLIST package
-  name CDATA #REQUIRED
-  mrp CDATA #REQUIRED
-  filter CDATA #IMPLIED
-  contract CDATA #IMPLIED>
- <!ELEMENT prebuilt EMPTY>
- <!ATTLIST prebuilt
-  name CDATA #REQUIRED
-  version CDATA #REQUIRED
-  late (Y|N) #IMPLIED
-  filter CDATA #IMPLIED
-  contract CDATA #IMPLIED>
- <!ELEMENT build (option* | target+ | targetList+ | unitList+ | configuration+)*>
- <!ELEMENT unitList (unitRef+)>
- <!ATTLIST unitList
-  name ID #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT unitRef EMPTY>
- <!ATTLIST unitRef unit IDREF #REQUIRED>
- <!ELEMENT targetList EMPTY>
- <!ATTLIST targetList
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  target IDREFS #REQUIRED>
- <!ELEMENT target EMPTY>
- <!ATTLIST target
-  name ID #REQUIRED
-  abldTarget CDATA #REQUIRED
-  description CDATA #REQUIRED>
- <!ELEMENT option EMPTY>
- <!ATTLIST option
-  name ID #REQUIRED
-  abldOption CDATA #REQUIRED
-  description CDATA #REQUIRED
-  enable (Y | N | y | n) #REQUIRED>
- <!ELEMENT configuration (unitListRef+ | layerRef+ | task+)*>
- <!ATTLIST configuration
-  name ID #REQUIRED
-  description CDATA #REQUIRED
-  filter CDATA #REQUIRED>
- <!ELEMENT task ( unitListRef* , (buildLayer | specialInstructions))>
- <!ELEMENT unitListRef EMPTY>
- <!ATTLIST unitListRef unitList IDREF #REQUIRED>
- <!ELEMENT layerRef EMPTY>
- <!ATTLIST layerRef layerName CDATA #REQUIRED>
- <!ELEMENT buildLayer EMPTY>
- <!ATTLIST buildLayer
-  command CDATA #REQUIRED
-  targetList IDREFS #IMPLIED
-  unitParallel (Y | N | y | n) #REQUIRED
-  targetParallel (Y | N | y | n) #IMPLIED>
- <!ELEMENT specialInstructions EMPTY>
- <!ATTLIST specialInstructions
-  name CDATA #REQUIRED
-  cwd CDATA #REQUIRED
-  command CDATA #REQUIRED>  
+ <!ELEMENT SystemDefinition (systemModel?, build?)>
+ <!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED>
+ <!ELEMENT systemModel (layer+)>
+ <!ELEMENT layer (logicalset* | module*)*>
+ <!ATTLIST layer
+  name CDATA #REQUIRED
+  levels CDATA #IMPLIED
+  span CDATA #IMPLIED>
+ <!ELEMENT logicalset (logicalsubset* | module* | unit* | package* | prebuilt*)*>
+ <!ATTLIST logicalset name CDATA #REQUIRED>
+ <!ELEMENT logicalsubset (module* | unit* | package* | prebuilt*)*>
+ <!ATTLIST logicalsubset name CDATA #REQUIRED>
+ <!ELEMENT module (component* | unit* | package* | prebuilt*)*>
+ <!ATTLIST module
+  name CDATA #REQUIRED
+  level CDATA #IMPLIED>
+ <!ELEMENT component (unit* | package* | prebuilt*)*>
+ <!ATTLIST component name CDATA #REQUIRED>
+ <!ELEMENT unit EMPTY>
+ <!ATTLIST unit
+  unitID ID #REQUIRED
+  name CDATA #REQUIRED
+  mrp CDATA #REQUIRED
+  filter CDATA #IMPLIED
+  bldFile CDATA #REQUIRED
+  priority CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  proFile CDATA #IMPLIED
+  qmakeArgs CDATA #IMPLIED>
+ <!ELEMENT package EMPTY>
+ <!ATTLIST package
+  name CDATA #REQUIRED
+  mrp CDATA #REQUIRED
+  filter CDATA #IMPLIED
+  contract CDATA #IMPLIED>
+ <!ELEMENT prebuilt EMPTY>
+ <!ATTLIST prebuilt
+  name CDATA #REQUIRED
+  version CDATA #REQUIRED
+  late (Y|N) #IMPLIED
+  filter CDATA #IMPLIED
+  contract CDATA #IMPLIED>
+ <!ELEMENT build (option* | target+ | targetList+ | unitList+ | configuration+)*>
+ <!ELEMENT unitList (unitRef+)>
+ <!ATTLIST unitList
+  name ID #REQUIRED
+  description CDATA #REQUIRED>
+ <!ELEMENT unitRef EMPTY>
+ <!ATTLIST unitRef unit IDREF #REQUIRED>
+ <!ELEMENT targetList EMPTY>
+ <!ATTLIST targetList
+  name ID #REQUIRED
+  description CDATA #REQUIRED
+  target IDREFS #REQUIRED>
+ <!ELEMENT target EMPTY>
+ <!ATTLIST target
+  name ID #REQUIRED
+  abldTarget CDATA #REQUIRED
+  description CDATA #REQUIRED>
+ <!ELEMENT option EMPTY>
+ <!ATTLIST option
+  name ID #REQUIRED
+  abldOption CDATA #REQUIRED
+  description CDATA #REQUIRED
+  enable (Y | N | y | n) #REQUIRED>
+ <!ELEMENT configuration (unitListRef+ | layerRef+ | task+)*>
+ <!ATTLIST configuration
+  name ID #REQUIRED
+  description CDATA #REQUIRED
+  filter CDATA #REQUIRED>
+ <!ELEMENT task ( unitListRef* , (buildLayer | specialInstructions))>
+ <!ELEMENT unitListRef EMPTY>
+ <!ATTLIST unitListRef unitList IDREF #REQUIRED>
+ <!ELEMENT layerRef EMPTY>
+ <!ATTLIST layerRef layerName CDATA #REQUIRED>
+ <!ELEMENT buildLayer EMPTY>
+ <!ATTLIST buildLayer
+  command CDATA #REQUIRED
+  targetList IDREFS #IMPLIED
+  unitParallel (Y | N | y | n) #REQUIRED
+  targetParallel (Y | N | y | n) #IMPLIED>
+ <!ELEMENT specialInstructions EMPTY>
+ <!ATTLIST specialInstructions
+  name CDATA #REQUIRED
+  cwd CDATA #REQUIRED
+  command CDATA #REQUIRED>