diff -r 360d55486d7f -r 5de72ea7a065 calendarui/controller/data/xml/calenmonthview.docml
--- a/calendarui/controller/data/xml/calenmonthview.docml	Fri Jun 11 13:37:54 2010 +0300
+++ b/calendarui/controller/data/xml/calenmonthview.docml	Wed Jun 23 18:11:28 2010 +0300
@@ -23,15 +23,12 @@
             <widget name="monthViewExceptPreviewPane" type="HbWidget">
                 <widget name="monthTitle" type="HbLabel">
                     <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
+					<fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
                     <real name="z" value="6"/>
-                    <sizehint height="3.5un" type="PREFERRED" width="52un"/>
-                    <sizehint height="3.5un" type="MINIMUM" width="52un"/>
-                    <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
-                    <sizehint height="3.5un" type="MAXIMUM" width="52un"/>
-                    <enums name="elideMode" value="ElideNone"/>
-                    <enums name="textFormat" value="PlainText"/>
-                    <string name="plainText" value=""/>
-                    <enums name="logicalFont" value="FontSecondary"/>
+                    <sizehint height="expr(var(hb-param-text-height-secondary) + 0.75un + 0.75un)" type="PREFERRED" width="52un"/>
+                    <sizehint height="expr(var(hb-param-text-height-secondary) + 0.75un + 0.75un)" type="MINIMUM" width="52un"/>
+                    <contentsmargins bottom="0.75un" left="var(hb-param-margin-gene-left)" right="var(hb-param-margin-gene-right)" top="0.75un"/>
+                    <sizehint height="expr(var(hb-param-text-height-secondary) + 0.75un + 0.75un)" type="MAXIMUM" width="52un"/>
                 </widget>
                 <widget name="dayNamesWidget" type="HbWidget">
                     <widget name="firstDayLabel" type="HbLabel">
@@ -40,10 +37,7 @@
                         <sizehint height="3un" type="PREFERRED" width="3.41604un"/>
                         <sizehint height="3un" type="MINIMUM" width="3.41604un"/>
                         <sizehint height="3un" type="MAXIMUM" width="10.54104un"/>
-                        <enums name="elideMode" value="ElideNone"/>
-                        <enums name="textFormat" value="PlainText"/>
-                        <string name="plainText" value=""/>
-                        <enums name="logicalFont" value="FontSecondary"/>
+                        <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-tiny)"/>
                     </widget>
                     <widget name="secondDayLabel" type="HbLabel">
                         <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
@@ -51,10 +45,7 @@
                         <sizehint height="3un" type="PREFERRED" width="3.41604un"/>
                         <sizehint height="3un" type="MINIMUM" width="3.41604un"/>
                         <sizehint height="3un" type="MAXIMUM" width="10.54104un"/>
-                        <enums name="elideMode" value="ElideNone"/>
-                        <enums name="textFormat" value="PlainText"/>
-                        <string name="plainText" value=""/>
-                        <enums name="logicalFont" value="FontSecondary"/>
+                        <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-tiny)"/>
                     </widget>
                     <widget name="thirdDayLabel" type="HbLabel">
                         <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
@@ -62,10 +53,7 @@
                         <sizehint height="3un" type="PREFERRED" width="3.41604un"/>
                         <sizehint height="3un" type="MINIMUM" width="3.41604un"/>
                         <sizehint height="3un" type="MAXIMUM" width="10.54104un"/>
-                        <enums name="elideMode" value="ElideNone"/>
-                        <enums name="textFormat" value="PlainText"/>
-                        <string name="plainText" value=""/>
-                        <enums name="logicalFont" value="FontSecondary"/>
+                        <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-tiny)"/>
                     </widget>
                     <widget name="fourthDayLabel" type="HbLabel">
                         <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
@@ -73,10 +61,7 @@
                         <sizehint height="3un" type="PREFERRED" width="3.41604un"/>
                         <sizehint height="3un" type="MINIMUM" width="3.41604un"/>
                         <sizehint height="3un" type="MAXIMUM" width="10.54104un"/>
-                        <enums name="elideMode" value="ElideNone"/>
-                        <enums name="textFormat" value="PlainText"/>
-                        <string name="plainText" value=""/>
-                        <enums name="logicalFont" value="FontSecondary"/>
+                        <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-tiny)"/>
                     </widget>
                     <widget name="fifthDayLabel" type="HbLabel">
                         <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
@@ -84,10 +69,7 @@
                         <sizehint height="3un" type="PREFERRED" width="3.41604un"/>
                         <sizehint height="3un" type="MINIMUM" width="3.41604un"/>
                         <sizehint height="3un" type="MAXIMUM" width="10.54104un"/>
-                        <enums name="elideMode" value="ElideNone"/>
-                        <enums name="textFormat" value="PlainText"/>
-                        <string name="plainText" value=""/>
-                        <enums name="logicalFont" value="FontSecondary"/>
+                        <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-tiny)"/>
                     </widget>
                     <widget name="sixthDayLabel" type="HbLabel">
                         <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
@@ -95,10 +77,7 @@
                         <sizehint height="3un" type="PREFERRED" width="3.41604un"/>
                         <sizehint height="3un" type="MINIMUM" width="3.41604un"/>
                         <sizehint height="3un" type="MAXIMUM" width="10.54104un"/>
-                        <enums name="elideMode" value="ElideNone"/>
-                        <enums name="textFormat" value="PlainText"/>
-                        <string name="plainText" value=""/>
-                        <enums name="logicalFont" value="FontSecondary"/>
+                        <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-tiny)"/>
                     </widget>
                     <widget name="seventhDayLabel" type="HbLabel">
                         <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
@@ -106,10 +85,7 @@
                         <sizehint height="3un" type="PREFERRED" width="3.41604un"/>
                         <sizehint height="3un" type="MINIMUM" width="3.41604un"/>
                         <sizehint height="3un" type="MAXIMUM" width="10.54104un"/>
-                        <enums name="elideMode" value="ElideNone"/>
-                        <enums name="textFormat" value="PlainText"/>
-                        <string name="plainText" value=""/>
-                        <enums name="logicalFont" value="FontSecondary"/>
+                        <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-tiny)"/>
                     </widget>
                     <real name="z" value="6"/>
                     <sizehint height="3un" type="PREFERRED" width="52un"/>
@@ -132,60 +108,42 @@
                         <sizehint height="42.77612un" type="PREFERRED" width="6.41604un"/>
                         <sizehint height="0un" type="MINIMUM" width="6.41604un"/>
                         <sizehint height="42.77612un" type="MAXIMUM" width="6.41604un"/>
-                        <enums name="elideMode" value="ElideNone"/>
-                        <enums name="textFormat" value="PlainText"/>
-                        <string name="plainText" value=""/>
-                        <enums name="logicalFont" value="FontSecondary"/>
+                        <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-tiny)"/>
                     </widget>
                     <widget name="secondWeekLabel" type="HbLabel">
                         <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
                         <sizehint height="42.77612un" type="PREFERRED" width="6.41604un"/>
                         <sizehint height="0un" type="MINIMUM" width="6.41604un"/>
                         <sizehint height="42.77612un" type="MAXIMUM" width="6.41604un"/>
-                        <enums name="elideMode" value="ElideNone"/>
-                        <enums name="textFormat" value="PlainText"/>
-                        <string name="plainText" value=""/>
-                        <enums name="logicalFont" value="FontSecondary"/>
+                        <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-tiny)"/>
                     </widget>
                     <widget name="thirdWeekLabel" type="HbLabel">
                         <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
                         <sizehint height="42.77612un" type="PREFERRED" width="6.41604un"/>
                         <sizehint height="0un" type="MINIMUM" width="6.41604un"/>
                         <sizehint height="42.77612un" type="MAXIMUM" width="6.41604un"/>
-                        <enums name="elideMode" value="ElideNone"/>
-                        <enums name="textFormat" value="PlainText"/>
-                        <string name="plainText" value=""/>
-                        <enums name="logicalFont" value="FontSecondary"/>
+                        <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-tiny)"/>
                     </widget>
                     <widget name="fourthWeekLabel" type="HbLabel">
                         <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
                         <sizehint height="42.77612un" type="PREFERRED" width="6.41604un"/>
                         <sizehint height="0un" type="MINIMUM" width="6.41604un"/>
                         <sizehint height="42.77612un" type="MAXIMUM" width="6.41604un"/>
-                        <enums name="elideMode" value="ElideNone"/>
-                        <enums name="textFormat" value="PlainText"/>
-                        <string name="plainText" value=""/>
-                        <enums name="logicalFont" value="FontSecondary"/>
+                        <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-tiny)"/>
                     </widget>
                     <widget name="fifthWeekLabel" type="HbLabel">
                         <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
                         <sizehint height="42.77612un" type="PREFERRED" width="6.41604un"/>
                         <sizehint height="0un" type="MINIMUM" width="6.41604un"/>
                         <sizehint height="42.77612un" type="MAXIMUM" width="6.41604un"/>
-                        <enums name="elideMode" value="ElideNone"/>
-                        <enums name="textFormat" value="PlainText"/>
-                        <string name="plainText" value=""/>
-                        <enums name="logicalFont" value="FontSecondary"/>
+                        <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-tiny)"/>
                     </widget>
                     <widget name="sixthWeekLabel" type="HbLabel">
                         <enums name="alignment" value="AlignVCenter|AlignHCenter"/>
                         <sizehint height="42.77612un" type="PREFERRED" width="6.41604un"/>
                         <sizehint height="0un" type="MINIMUM" width="6.41604un"/>
                         <sizehint height="42.77612un" type="MAXIMUM" width="6.41604un"/>
-                        <enums name="elideMode" value="ElideNone"/>
-                        <enums name="textFormat" value="PlainText"/>
-                        <string name="plainText" value=""/>
-                        <enums name="logicalFont" value="FontSecondary"/>
+                        <fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-tiny)"/>
                     </widget>
                     <real name="z" value="3"/>
                     <sizehint height="43.77612un" type="PREFERRED" width="6.41604un"/>
@@ -482,41 +440,59 @@
         </widget>	
     </section>
     <section name="landscape">
+     	<widget name="prevPaneLayout" type="HbWidget">
+            <sizehint height="42.8806un" type="PREFERRED" width="11.9403un"/>
+        </widget>
+		<widget name="prevPaneContainer" type="HbWidget">
+            <sizehint height="42.8806un" type="PREFERRED" width="23.8806un"/>
+        </widget>
 		<widget name="prevPaneWidget" type="HbWidget">
             <sizehint height="42.8806un" type="FIXED" width="40.8un"/>
 		</widget>
+		<widget name="currPaneContainer" type="HbWidget">
+	    <sizehint height="42.8806un" type="PREFERRED" width="23.8806un"/>
+		</widget>
+		<widget name="currPaneLayout" type="HbWidget">
+	    <sizehint height="42.8806un" type="PREFERRED" width="11.9403un"/>
+		</widget>
 		<widget name="currPaneWidget" type="HbWidget">
             <sizehint height="42.8806un" type="FIXED" width="40.8un"/>
 		</widget>
+		<widget name="nextPaneLayout" type="HbWidget">
+            <sizehint height="42.8806un" type="PREFERRED" width="11.9403un"/>
+        </widget>
+		<widget name="nextPaneContainer" type="HbWidget">
+            <sizehint height="42.8806un" type="PREFERRED" width="11.9403un"/>
+        </widget>
 		<widget name="nextPaneWidget" type="HbWidget">
             <sizehint height="42.8806un" type="FIXED" width="40.8un"/>
 		</widget>
 		<widget name="prevPreviewPaneContents" type="HbWidget">
-                        <sizehint type="MINIMUM" width="40.8un"/>
+            <sizehint type="MINIMUM" width="40.8un"/>
             <sizehint type="MAXIMUM" width="40.8un"/>
 		</widget>
 		<widget name="currPreviewPaneContents" type="HbWidget">
-                        <sizehint type="MINIMUM" width="40.8un"/>
+            <sizehint type="MINIMUM" width="40.8un"/>
             <sizehint type="MAXIMUM" width="40.8un"/>
 		</widget>
 		<widget name="nextPreviewPaneContents" type="HbWidget">
-                        <sizehint type="MINIMUM" width="40.8un"/>
+            <sizehint type="MINIMUM" width="40.8un"/>
             <sizehint type="MAXIMUM" width="40.8un"/>
 		</widget>
         <widget name="monthGridWeekNumWidget" type="HbWidget">
-            <sizehint height="34.77612un" type="MAXIMUM" width="52un"/>
-            <sizehint height="34.77612un" type="MAXIMUM" width="52un"/>
-            <sizehint height="34.77612un" type="MINIMUM" width="52un"/>
+            <sizehint height="33.1un" type="PREFERRED" width="52un"/>
+            <sizehint height="33.1un" type="MAXIMUM" width="52un"/>
+            <sizehint height="33.1un" type="MINIMUM" width="52un"/>
         </widget>
         <widget name="monthGrid" type="HbGridView">
-            <sizehint height="34.77612un" type="PREFERRED" width="52un"/>
-            <sizehint height="34.77612un" type="MAXIMUM" width="52un"/>
-            <sizehint height="34.77612un" type="MINIMUM" width="0un"/>
+            <sizehint height="33.1un" type="PREFERRED" width="52un"/>
+            <sizehint height="33.1un" type="MAXIMUM" width="52un"/>
+            <sizehint height="33.1un" type="MINIMUM" width="0un"/>
         </widget>
         <widget name="weekNumbersWidget" type="HbWidget">
-            <sizehint height="34.77612un" type="PREFERRED" width="6.41604un"/>
-            <sizehint height="34.77612un" type="MINIMUM" width="6.41604un"/>
-            <sizehint height="34.77612un" type="MAXIMUM" width="6.41604un"/>
+            <sizehint height="33.1un" type="PREFERRED" width="6.41604un"/>
+            <sizehint height="33.1un" type="MAXIMUM" width="6.41604un"/>
+            <sizehint height="33.1un" type="MINIMUM" width="6.41604un"/>
         </widget>
         <widget name="content" role="HbView:widget" type="HbWidget">
             <layout orientation="Horizontal" spacing="0.75un" type="linear">