diff -r 238255e8b033 -r 84d9eb65b26f messagingapp/msgui/unifiedviewer/resources/layouts/univiewerbodywidget.widgetml
--- a/messagingapp/msgui/unifiedviewer/resources/layouts/univiewerbodywidget.widgetml	Fri Apr 16 14:56:15 2010 +0300
+++ b/messagingapp/msgui/unifiedviewer/resources/layouts/univiewerbodywidget.widgetml	Mon May 03 12:29:07 2010 +0300
@@ -1,40 +1,85 @@
 <hbwidget version="0.1">
   <layout name="layout-portrait" type="mesh">
+     <meshitem src="slideCounter" srcEdge="LEFT" dst="" dstEdge="LEFT"  />
+     <meshitem src="slideCounter" srcEdge="TOP" dst="" dstEdge="TOP"  />
+     <meshitem src="slideCounter" srcEdge="RIGHT" dst="" dstEdge="RIGHT"  />
+
      <meshitem src="audioItem" srcEdge="LEFT" dst="" dstEdge="LEFT"  />
-     <meshitem src="audioItem" srcEdge="TOP" dst="" dstEdge="TOP"  />
+     <meshitem src="audioItem" srcEdge="TOP" dst="slideCounter" dstEdge="BOTTOM"  />
      <meshitem src="audioItem" srcEdge="RIGHT" dst="" dstEdge="RIGHT"  />
 
      <meshitem src="pixmap" srcEdge="TOP" dst="audioItem" dstEdge="BOTTOM"  />
-     <meshitem src="pixmap" srcEdge="CENTERH" dst="" dstEdge="CENTERH"  />
+     <meshitem src="pixmap" srcEdge="LEFT" dst="" dstEdge="LEFT" spacer="leftSpacer"  />
+     <meshitem src="pixmap" srcEdge="RIGHT" dst="" dstEdge="RIGHT"  spacer="rightSpacer"  />
 
      <meshitem src="textItem" srcEdge="TOP" dst="pixmap" dstEdge="BOTTOM" />
      <meshitem src="textItem" srcEdge="LEFT" dst="" dstEdge="LEFT" />
      <meshitem src="textItem" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-     <meshitem src="textItem" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
+     <meshitem src="textItem" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" spacer="bottomSpacer" />
+  </layout>
+
+  <layout name="layout-portrait-no-text" type="mesh">
+     <meshitem src="slideCounter" srcEdge="LEFT" dst="" dstEdge="LEFT"  />
+     <meshitem src="slideCounter" srcEdge="TOP" dst="" dstEdge="TOP"  />
+     <meshitem src="slideCounter" srcEdge="RIGHT" dst="" dstEdge="RIGHT"  />
+
+     <meshitem src="audioItem" srcEdge="LEFT" dst="" dstEdge="LEFT"  />
+     <meshitem src="audioItem" srcEdge="TOP" dst="slideCounter" dstEdge="BOTTOM"  />
+     <meshitem src="audioItem" srcEdge="RIGHT" dst="" dstEdge="RIGHT"  />
+
+     <meshitem src="pixmap" srcEdge="TOP" dst="audioItem" dstEdge="BOTTOM"  />
+     <meshitem src="pixmap" srcEdge="LEFT" dst="" dstEdge="LEFT" spacer="leftSpacer"  />
+     <meshitem src="pixmap" srcEdge="RIGHT" dst="" dstEdge="RIGHT"  spacer="rightSpacer"  />
+     <meshitem src="pixmap" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" spacer="bottomSpacer" />
   </layout>
 
   <layout name="layout-landscape" type="mesh">
+     <meshitem src="slideCounter" srcEdge="LEFT" dst="" dstEdge="LEFT"  />
+     <meshitem src="slideCounter" srcEdge="TOP" dst="" dstEdge="TOP"  />
+     <meshitem src="slideCounter" srcEdge="RIGHT" dst="" dstEdge="RIGHT"  />
+
      <meshitem src="audioItem" srcEdge="LEFT" dst="" dstEdge="LEFT"  />
-     <meshitem src="audioItem" srcEdge="TOP" dst="" dstEdge="TOP"  />
+     <meshitem src="audioItem" srcEdge="TOP" dst="slideCounter" dstEdge="BOTTOM"  />
      <meshitem src="audioItem" srcEdge="RIGHT" dst="" dstEdge="RIGHT"  />
 
-     <meshitem src="pixmap" srcEdge="TOP" dst="audioItem" dstEdge="BOTTOM" />
-     <meshitem src="pixmap" srcEdge="LEFT" dst="" dstEdge="LEFT" />
+     <meshitem src="pixmap" srcEdge="TOP" dst="audioItem" dstEdge="BOTTOM"  />
+     <meshitem src="pixmap" srcEdge="LEFT" dst="" dstEdge="LEFT"  spacer="leftSpacer"   />
+     <meshitem src="pixmap" srcEdge="RIGHT" dst="" dstEdge="CENTERH"  spacer="rightSpacer"  />
+
+
+     <meshitem src="textItem" srcEdge="LEFT" dst="" dstEdge="CENTERH"  />
+     <meshitem src="textItem" srcEdge="TOP" dst="audioItem" dstEdge="BOTTOM"  />
+     <meshitem src="textItem" srcEdge="RIGHT" dst="" dstEdge="RIGHT"  />
+     <meshitem src="textItem" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" spacer="bottomSpacer"  />
+  </layout>
 
-     <meshitem src="textItem" srcEdge="LEFT" dst="pixmap" dstEdge="RIGHT" />
+  <layout name="layout-landscape-no-pixmap" type="mesh">
+     <meshitem src="slideCounter" srcEdge="LEFT" dst="" dstEdge="LEFT"  />
+     <meshitem src="slideCounter" srcEdge="TOP" dst="" dstEdge="TOP"  />
+     <meshitem src="slideCounter" srcEdge="RIGHT" dst="" dstEdge="RIGHT"  />
+
+     <meshitem src="audioItem" srcEdge="LEFT" dst="" dstEdge="LEFT"  />
+     <meshitem src="audioItem" srcEdge="TOP" dst="slideCounter" dstEdge="BOTTOM"  />
+     <meshitem src="audioItem" srcEdge="RIGHT" dst="" dstEdge="RIGHT"  />
+
+     <meshitem src="textItem" srcEdge="LEFT" dst="" dstEdge="LEFT" />
      <meshitem src="textItem" srcEdge="TOP" dst="audioItem" dstEdge="BOTTOM" />
      <meshitem src="textItem" srcEdge="RIGHT" dst="" dstEdge="RIGHT" />
-     <meshitem src="textItem" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" />
-
+     <meshitem src="textItem" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" spacer="bottomSpacer"  />
   </layout>
 
   <layout name="layout-landscape-no-text" type="mesh">
+     <meshitem src="slideCounter" srcEdge="LEFT" dst="" dstEdge="LEFT"  />
+     <meshitem src="slideCounter" srcEdge="TOP" dst="" dstEdge="TOP"  />
+     <meshitem src="slideCounter" srcEdge="RIGHT" dst="" dstEdge="RIGHT"  />
+
      <meshitem src="audioItem" srcEdge="LEFT" dst="" dstEdge="LEFT"  />
-     <meshitem src="audioItem" srcEdge="TOP" dst="" dstEdge="TOP"  />
+     <meshitem src="audioItem" srcEdge="TOP" dst="slideCounter" dstEdge="BOTTOM"  />
      <meshitem src="audioItem" srcEdge="RIGHT" dst="" dstEdge="RIGHT"  />
 
      <meshitem src="pixmap" srcEdge="TOP" dst="audioItem" dstEdge="BOTTOM"  />
-     <meshitem src="pixmap" srcEdge="CENTERH" dst="" dstEdge="CENTERH"  />
+     <meshitem src="pixmap" srcEdge="LEFT" dst="" dstEdge="LEFT" spacer="leftSpacer"  />
+     <meshitem src="pixmap" srcEdge="RIGHT" dst="" dstEdge="RIGHT" spacer="rightSpacer"  />
+     <meshitem src="pixmap" srcEdge="BOTTOM" dst="" dstEdge="BOTTOM" spacer="bottomSpacer"  />
   </layout>
-
 </hbwidget>
\ No newline at end of file