--- a/phoneuis/bubblemanager2/tsrc/unit/ut_bubbleheadingwidget/resources/bubbleheadingwidget.css	Wed Jun 23 18:12:20 2010 +0300
+++ b/phoneuis/bubblemanager2/tsrc/unit/ut_bubbleheadingwidget/resources/bubbleheadingwidget.css	Tue Jul 06 14:15:47 2010 +0300
@@ -5,66 +5,111 @@
     layout: three_lines_layout;
 }
 
+BubbleHeadingWidget[layoutOption="three_lines_1"]
+{
+    layout: three_lines_layout_1;
+}
+
+BubbleHeadingWidget[layoutOption="three_lines_2"]
+{
+    layout: three_lines_layout_2;
+}
+
 BubbleHeadingWidget[layoutOption="two_lines"]
 {
     layout: two_lines_layout;
 }
 
+BubbleHeadingWidget[layoutOption="two_lines_1"]
+{
+    layout: two_lines_layout_1;
+}
+
+BubbleHeadingWidget[layoutOption="two_lines_2"]
+{
+    layout: two_lines_layout_2;
+}
+
+
 BubbleHeadingWidget[layoutOption="one_line"]
 {
     layout: one_line_layout;
 }
 
-BubbleHeadingWidget:text_line_1
+BubbleHeadingWidget[layoutOption="one_line_1"]
 {
-    preferred-height: var(hb-param-text-height-primary);
-    left: -var(hb-param-margin-gene-middle-horizontal);
-    color: var(qtc_list_item_title_normal);
+    layout: one_line_layout_1;
+}
+
+BubbleHeadingWidget[layoutOption="one_line_2"]
+{
+    layout: one_line_layout_2;
 }
 
-BubbleHeadingWidget:text_line_2[layoutOption!="one_line"]
+BubbleHeadingWidget:text_line_1
 {
-    preferred-height: var(hb-param-text-height-primary);
-    preferred-width: -1;
-    left: -var(hb-param-margin-gene-middle-horizontal);
+    text-height: var(hb-param-text-height-primary);
+    color: var(qtc_list_item_title_normal);
+    text-line-count-min:1;
+    text-line-count-max:1;    
+}
+
+BubbleHeadingWidget:text_line_2
+{
+    text-height: var(hb-param-text-height-primary);
+    text-align: left;
+    color: var(qtc_list_item_title_normal);
+    text-line-count-min:1;
+    text-line-count-max:1;
+    pref-width: -1;
     top: -var(hb-param-margin-gene-middle-vertical);
     text-align: left;
-    color: var(qtc_list_item_title_normal);
+    size-policy-horizontal: expanding;    
 }
 
 BubbleHeadingWidget:text_line_2[layoutOption="one_line"]
 {
-    preferred-height: var(hb-param-text-height-primary);
-    preferred-width: 30un;
+    pref-width: 35un; /* not in spec yet, fixed value needed for localisation */
     left: -var(hb-param-margin-gene-middle-horizontal);
     text-align: right;
-    color: var(qtc_list_item_title_normal);
+    size-policy-horizontal: fixed;    
+}
+
+BubbleHeadingWidget:text_line_2[layoutOption="one_line_1"]
+{
+    pref-width: 35un;
+    left: -var(hb-param-margin-gene-middle-horizontal);
+    text-align: right;
+    size-policy-horizontal: fixed;    
+}
+
+BubbleHeadingWidget:text_line_2[layoutOption="one_line_2"]
+{
+    pref-width: 35un;
+    left: -var(hb-param-margin-gene-middle-horizontal);
+    text-align: right;
+    size-policy-horizontal: fixed;    
 }
 
 BubbleHeadingWidget:text_line_3
 {
-    preferred-height: var(hb-param-text-height-primary);
-    left: -var(hb-param-margin-gene-middle-horizontal);
+    text-height: var(hb-param-text-height-primary);
     top: -var(hb-param-margin-gene-middle-vertical);
     color: var(qtc_list_item_title_normal);
+    text-line-count-min:1;
+    text-line-count-max:1;
 }
 
-BubbleHeadingWidget:status_icon
-{
-    fixed-width:   var(hb-param-graphic-size-primary-large);
-    fixed-height:  var(hb-param-graphic-size-primary-large);
-}
-
-BubbleHeadingWidget:number_type_icon
+BubbleHeadingWidget:indicator_icon_1
 {
     fixed-height: var(hb-param-graphic-size-secondary);
     fixed-width:  var(hb-param-graphic-size-secondary);
     color: var(qtc_list_item_title_normal);
 }
 
-BubbleHeadingWidget:ciphering_icon
+BubbleHeadingWidget:indicator_icon_2
 {
-    fixed-height: 2.5un;
-    fixed-width:  2.5un;
+    fixed-height: var(hb-param-graphic-size-secondary);
+    fixed-width:  var(hb-param-graphic-size-secondary);
     color: var(qtc_list_item_title_normal);
 }