--- a/homescreenapp/hsapplication/conf/base/confml/homescreendb.confml	Thu May 27 12:46:08 2010 +0300
+++ b/homescreenapp/hsapplication/conf/base/confml/homescreendb.confml	Fri Jun 11 13:30:16 2010 +0300
@@ -3,14 +3,6 @@
   <confml:feature ref="HomeScreenDbSettings" name="HomeScreen database settings">
     <confml:setting ref="portraitWallpaper" name="Portrait wallpaper" type="string"/>
     <confml:setting ref="landscapeWallpaper" name="Landscape wallpaper" type="string"/>
-    <confml:setting ref="maximumPageCount" name="Maximum number of pages" type="int"/>
-    <confml:setting ref="maximumWidgetHeight" name="Maximum height of widget" type="real"/>
-    <confml:setting ref="maximumWidgetWidth" name="Maximum width of widget" type="real"/>
-    <confml:setting ref="minimumWidgetHeight" name="Minimum height of widget" type="real"/>
-    <confml:setting ref="minimumWidgetWidth" name="Minimum width of widget" type="real"/>
-    <confml:setting ref="defaultPageId" name="Default page ID" type="selection">
-      <confml:option map="HomeScreenDbSettings/Pages"/>
-    </confml:setting>
     <confml:setting ref="Pages" mapKey="id" mapValue="id" name="Pages" type="sequence">
       <confml:setting ref="id" name="ID" type="int"/>
       <confml:setting ref="indexPosition" name="Index Position" type="int"/>
@@ -73,18 +65,22 @@
       <confml:setting ref="widgetDragEffectDuration" name="Widget drag effect duration" type="int"/>
       <confml:setting ref="widgetDropEffectDuration" name="Widget drop effect duration" type="int"/>
       <confml:setting ref="boundaryFeedbackEffectDistance" name="Boundary feedback effect distance" type="int"/>
+      <confml:setting ref="maximumPageCount" name="Maximum number of pages" type="int"/>
+      <confml:setting ref="maximumWidgetHeight" name="Maximum height of widget" type="real"/>
+      <confml:setting ref="maximumWidgetWidth" name="Maximum width of widget" type="real"/>
+      <confml:setting ref="minimumWidgetHeight" name="Minimum height of widget" type="real"/>
+      <confml:setting ref="minimumWidgetWidth" name="Minimum width of widget" type="real"/>
+      <confml:setting ref="defaultPageId" name="Default page ID" type="selection">
+        <confml:option map="HomeScreenDbSettings/Pages"/>
+      </confml:setting>
+      <confml:setting ref="shortcutLabelsVisible" name="Minimum width of widget" type="int"/>     
+      <confml:setting ref="pageChangePanDistance" name="Amount of pan needed to change page" type="real"/>     
     </confml:setting>
   </confml:feature>
   <confml:data>
     <confml:HomeScreenDbSettings>
       <confml:landscapeWallpaper/>
       <confml:portraitWallpaper/>
-      <confml:maximumPageCount>8</confml:maximumPageCount>
-      <confml:maximumWidgetHeight>39</confml:maximumWidgetHeight>
-      <confml:maximumWidgetWidth>48</confml:maximumWidgetWidth>
-      <confml:minimumWidgetHeight>8.75</confml:minimumWidgetHeight>
-      <confml:minimumWidgetWidth>8.75</confml:minimumWidgetWidth>
-      <confml:defaultPageId map="HomeScreenDbSettings/Pages[@key='1']"/>
       <confml:Widgets><confml:id>1</confml:id><confml:uri>hsclockwidgetplugin</confml:uri><confml:pageId  map="HomeScreenDbSettings/Pages[@key='1']"></confml:pageId></confml:Widgets>
       <confml:Widgets><confml:id>2</confml:id><confml:uri>hsdialerwidgetplugin</confml:uri><confml:pageId map="HomeScreenDbSettings/Pages[@key='1']"></confml:pageId></confml:Widgets>
       <confml:Widgets><confml:id>3</confml:id><confml:uri>ftuhswidget</confml:uri><confml:pageId map="HomeScreenDbSettings/Pages[@key='1']"></confml:pageId></confml:Widgets>
@@ -163,6 +159,14 @@
       	<confml:widgetDragEffectDuration>200</confml:widgetDragEffectDuration>
       	<confml:widgetDropEffectDuration>200</confml:widgetDropEffectDuration>
       	<confml:boundaryFeedbackEffectDistance>3</confml:boundaryFeedbackEffectDistance>
+        <confml:maximumPageCount>8</confml:maximumPageCount>
+        <confml:maximumWidgetHeight>39</confml:maximumWidgetHeight>
+        <confml:maximumWidgetWidth>48</confml:maximumWidgetWidth>
+        <confml:minimumWidgetHeight>8.75</confml:minimumWidgetHeight>
+        <confml:minimumWidgetWidth>8.75</confml:minimumWidgetWidth> 
+       	<confml:defaultPageId map="HomeScreenDbSettings/Pages[@key='1']"/>
+        <confml:shortcutLabelsVisible>1</confml:shortcutLabelsVisible>
+        <confml:pageChangePanDistance>17.91</confml:pageChangePanDistance>           	
       </confml:GeneralConfiguration>
     </confml:HomeScreenDbSettings>
   </confml:data>