--- a/.hgtags	Fri May 14 16:24:50 2010 +0300
+++ b/.hgtags	Thu May 27 13:23:10 2010 +0300
@@ -8,3 +8,5 @@
 6fd8fce204a753ee5c22e18e57668b6bf5ee74aa 2010wk15_rc
 34af997bec3a7e40cea4548d9f499d9259270f17 2010wk15_rel
 e18709034041cb5125f9829fd557402ca4bd29ae 2010wk17_rc
+8b378bdb55718df53b098ca0a9a1ad4d2d38db8c 2010wk17_rel
+f8ccbc2fb5d4ae2f192fcad9b09ee76f8b892dad 2010wk19_rc

Binary file src/animations/sfwhitetheme/animations.zip has changed

--- a/src/icons/sfblacknvgtheme/index.theme	Fri May 14 16:24:50 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-[Icon Theme]
-Name=sfblacknvgtheme
-Comment=Reference SF Black Theme (NVG version)
-Hidden=false
-Directories=scalable

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

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

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

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

--- a/src/icons/sfblacktheme/index.theme	Fri May 14 16:24:50 2010 +0300
+++ b/src/icons/sfblacktheme/index.theme	Thu May 27 13:23:10 2010 +0300
@@ -3,4 +3,6 @@
 Comment=Reference SF Black Theme
 Hidden=false
 Directories=scalable
-Example=qtg_graf_theme_preview
+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

--- a/src/icons/sfblacktheme/locked.txt	Fri May 14 16:24:50 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-qtg_large_bluetooth
-qtg_large_flash
-qtg_large_ovi_suite
-qtg_large_ovistore
-qtg_large_realplayer

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

--- a/src/icons/sfwhitetheme/index.theme	Fri May 14 16:24:50 2010 +0300
+++ b/src/icons/sfwhitetheme/index.theme	Thu May 27 13:23:10 2010 +0300
@@ -3,4 +3,6 @@
 Comment=Reference SF White Theme
 Hidden=false
 Directories=scalable
-Example=qtg_graf_theme_preview
+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

--- a/src/icons/sfwhitetheme/locked.txt	Fri May 14 16:24:50 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-qtg_large_bluetooth
-qtg_large_flash
-qtg_large_ovi_suite
-qtg_large_ovistore
-qtg_large_realplayer

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

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

--- a/src/style/sfblacktheme/variables/color/hbapplicationcolorgroup.css	Fri May 14 16:24:50 2010 +0300
+++ b/src/style/sfblacktheme/variables/color/hbapplicationcolorgroup.css	Thu May 27 13:23:10 2010 +0300
@@ -51,5 +51,8 @@
 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 */
+
+/* Application specific - Messaging */ 
+qtc_messaging_char_count:#FFFFFF; /* Added 19.04.2010 */
 }
 

--- a/src/style/sfwhitetheme/variables/color/hbapplicationcolorgroup.css	Fri May 14 16:24:50 2010 +0300
+++ b/src/style/sfwhitetheme/variables/color/hbapplicationcolorgroup.css	Thu May 27 13:23:10 2010 +0300
@@ -51,5 +51,8 @@
 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 */
+
+/* Application specific - Messaging */ 
+qtc_messaging_char_count:#FFFFFF; /* Added 19.04.2010 */
 }
 

--- a/src/theme.theme_old	Fri May 14 16:24:50 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-[Default Theme]
-Name=hbdefault