--- a/qtinternetradio/ui/resources/layout/termsconsview.docml Fri Jun 11 13:30:40 2010 +0300
+++ b/qtinternetradio/ui/resources/layout/termsconsview.docml Wed Jun 23 18:04:00 2010 +0300
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<hbdocument version="1.0">
+<hbdocument version="1.1">
<widget name="ext-IRTermsConsView" type="HbView">
<widget name="container" role="HbView:widget" type="HbWidget">
<widget name="heading_text" type="HbGroupBox">
@@ -10,65 +10,87 @@
<fontspec name="fontSpec" role="Secondary" textheight="var(hb-param-text-height-secondary)"/>
</widget>
<widget name="text_edit" type="HbTextEdit">
- <bool name="readOnly" value="TRUE"/>
+ <enums name="cursorVisibility" value="TextCursorHidden"/>
<string locid="txt_irad_terms_content" name="plainText"/>
- <enums name="cursorVisibility" value="TextCursorHidden"/>
+ <bool name="readOnly" value="TRUE"/>
<enums name="contextMenuFlags" value="ShowTextContextMenuOnSelectionClicked"/>
+ <fontspec name="fontSpec" role="Secondary" textheight="expr(var(hb-param-text-height-secondary) )"/>
</widget>
- <widget name="btn_container" type="HbWidget">
- <widget name="accept_btn" type="HbPushButton">
- <sizehint height="6un" type="PREFERRED" width="40un"/>
- <string locid="txt_irad_accept" name="text"/>
- </widget>
- <widget name="decline_btn" type="HbPushButton">
- <sizehint height="6un" type="PREFERRED" width="40un"/>
- <string locid="txt_irad_decline" name="text"/>
- </widget>
- <layout orientation="Vertical" type="linear">
- <linearitem itemname="accept_btn"/>
- <linearitem itemname="decline_btn"/>
- </layout>
+ <widget name="accept_btn" type="HbPushButton">
+ <string locid="txt_irad_accept" name="text"/>
+ </widget>
+ <widget name="decline_btn" type="HbPushButton">
+ <string locid="txt_irad_decline" name="text"/>
</widget>
<layout orientation="Vertical" spacing="0un" type="linear">
<contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
<linearitem itemname="heading_text"/>
<linearitem itemname="text_edit"/>
- <linearitem itemname="btn_container"/>
+ <linearitem itemname="accept_btn"/>
+ <linearitem itemname="decline_btn"/>
</layout>
</widget>
<string locid="txt_irad_title_internet_radio" name="title"/>
</widget>
<section name="prt_section">
<widget name="container" role="HbView:widget" type="HbWidget">
- <widget name="btn_container" type="HbWidget">
- <sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
- <sizehint height="20un" type="PREFERRED"/>
+ <widget name="prt_content_container" type="HbWidget">
+ <widget name="text_edit" type="HbTextEdit"/>
+ <widget name="accept_btn" type="HbPushButton"/>
+ <widget name="decline_btn" type="HbPushButton"/>
+ <contentsmargins bottom="expr(var(hb-param-margin-gene-screen) )" left="expr(var(hb-param-margin-gene-screen) )" right="expr(var(hb-param-margin-gene-screen) )" top="expr(var(hb-param-margin-gene-screen) )"/>
<layout type="anchor">
- <anchoritem dst="decline_btn" dstEdge="LEFT" spacing="var(hb-param-margin-gene-screen)" src="" srcEdge="LEFT"/>
- <anchoritem dst="decline_btn" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-screen)" src="" srcEdge="RIGHT"/>
- <anchoritem dst="decline_btn" dstEdge="BOTTOM" spacing="-3un" src="" srcEdge="BOTTOM"/>
- <anchoritem dst="accept_btn" dstEdge="LEFT" spacing="var(hb-param-margin-gene-screen)" src="" srcEdge="LEFT"/>
- <anchoritem dst="accept_btn" dstEdge="TOP" spacing="3un" src="" srcEdge="TOP"/>
- <anchoritem dst="accept_btn" dstEdge="RIGHT" spacing="-var(hb-param-margin-gene-screen)" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="accept_btn" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
+ <anchoritem dst="accept_btn" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-top) )" src="text_edit" srcEdge="BOTTOM"/>
+ <anchoritem dst="accept_btn" dstEdge="RIGHT" spacing="0un" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="text_edit" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
+ <anchoritem dst="text_edit" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-top) )" src="" srcEdge="TOP"/>
+ <anchoritem dst="text_edit" dstEdge="RIGHT" spacing="0un" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="decline_btn" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
+ <anchoritem dst="decline_btn" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-top) )" src="accept_btn" srcEdge="BOTTOM"/>
+ <anchoritem dst="decline_btn" dstEdge="RIGHT" spacing="0un" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="decline_btn" dstEdge="BOTTOM" spacing="0un" src="" srcEdge="BOTTOM"/>
</layout>
</widget>
+ <layout orientation="Vertical" spacing="0un" type="linear">
+ <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
+ <linearitem itemname="heading_text"/>
+ <linearitem itemname="prt_content_container"/>
+ </layout>
</widget>
</section>
<section name="lsc_section">
<widget name="container" role="HbView:widget" type="HbWidget">
- <widget name="btn_container" type="HbWidget">
- <sizepolicy horizontalPolicy="Preferred" horizontalStretch="0" verticalPolicy="Fixed" verticalStretch="0"/>
- <sizehint height="10un" type="PREFERRED"/>
+ <widget name="lsc_content_container" type="HbWidget">
+ <widget name="text_edit" type="HbTextEdit"/>
+ <widget name="lsc_btn_container" type="HbWidget">
+ <widget name="accept_btn" type="HbPushButton"/>
+ <widget name="decline_btn" type="HbPushButton"/>
+ <layout orientation="Horizontal" spacing="expr(var(hb-param-margin-gene-screen) )" type="linear">
+ <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
+ <linearitem itemname="accept_btn"/>
+ <linearitem itemname="decline_btn"/>
+ </layout>
+ </widget>
+ <contentsmargins bottom="expr(var(hb-param-margin-gene-screen) )" left="expr(var(hb-param-margin-gene-screen) )" right="expr(var(hb-param-margin-gene-screen) )" top="expr(var(hb-param-margin-gene-screen) )"/>
<layout type="anchor">
- <anchoritem dst="accept_btn" dstEdge="LEFT" spacing="5un" src="" srcEdge="LEFT"/>
- <anchoritem dst="accept_btn" dstEdge="CENTERV" spacing="0un" src="" srcEdge="CENTERV"/>
- <anchoritem dst="decline_btn" dstEdge="RIGHT" spacing="-5un" src="" srcEdge="RIGHT"/>
- <anchoritem dst="decline_btn" dstEdge="CENTERV" spacing="0un" src="" srcEdge="CENTERV"/>
+ <anchoritem dst="text_edit" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
+ <anchoritem dst="text_edit" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-top) )" src="" srcEdge="TOP"/>
+ <anchoritem dst="text_edit" dstEdge="RIGHT" spacing="0un" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="lsc_btn_container" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
+ <anchoritem dst="lsc_btn_container" dstEdge="TOP" spacing="expr(var(hb-param-margin-gene-top) )" src="text_edit" srcEdge="BOTTOM"/>
+ <anchoritem dst="lsc_btn_container" dstEdge="RIGHT" spacing="0un" src="" srcEdge="RIGHT"/>
+ <anchoritem dst="lsc_btn_container" dstEdge="BOTTOM" spacing="0un" src="" srcEdge="BOTTOM"/>
</layout>
</widget>
+ <layout orientation="Vertical" spacing="0un" type="linear">
+ <contentsmargins bottom="0un" left="0un" right="0un" top="0un"/>
+ <linearitem itemname="heading_text"/>
+ <linearitem itemname="lsc_content_container"/>
+ </layout>
</widget>
</section>
- <metadata activeUIState="Common ui state" display="NHD portrait" unit="un">
+ <metadata activeUIState="lsc_state" display="NHD-3.2-inch_portrait" unit="un">
<uistate name="Common ui state" sections="#common"/>
<uistate name="prt_state" sections="#common prt_section"/>
<uistate name="lsc_state" sections="#common lsc_section"/>