--- a/contentstorage/castorage/conf/CI_castoragedb.confml Thu Sep 02 20:45:03 2010 +0300
+++ b/contentstorage/castorage/conf/CI_castoragedb.confml Fri Sep 17 08:32:18 2010 +0300
@@ -28,18 +28,18 @@
<desc>Icon Theme id. </desc>
</setting>
</setting>
- <setting ref="OperatorURLs" name="Operator URLs" minOccurs="0" type="sequence" mapKey="OperatorURLTitle" mapValue="OperatorURLTitle">
- <setting ref="OperatorURLTitle" name="Operator URL Title" type="string">
+ <setting ref="OperatorURLs" name="Operator URLs" minOccurs="0" type="sequence" mapKey="URLTitle" mapValue="URLTitle">
+ <setting ref="URLTitle" name="Operator URL Title" type="string" required="true">
<desc>Title of the Operator URL</desc>
</setting>
- <setting ref="OperatorURLShortTitle" name="Operator URL Short Title" type="string" required="true">
+ <setting ref="URLShortTitle" name="Operator URL Short Title" type="string">
<desc>Short Title of the Operator URL. Optional. Displayed when shortcut to Url is added to Homescreen</desc>
</setting>
- <setting ref="OperatorURL" name="Operator URL" type="string" required="true">
+ <setting ref="URL" name="Operator URL" type="string" required="true">
<desc>URL</desc>
<xs:pattern value="(http(|s)://([\w-]+\.)+[\w-]+(:[0-9]{1,5})?(/[\w- ./?%&=]*)?|)"/>
</setting>
- <setting ref="OperatorURLIcon" name="Operator URL Icon" type="file">
+ <setting ref="URLIcon" name="Operator URL Icon" type="file">
<desc>Icon for the Operator URL.</desc>
<property name="type" value="image/svg" unit="mime"/>
<localPath></localPath>
@@ -58,7 +58,7 @@
</setting>
<setting ref="Application" name="Application" type="string" relevant="Type='1'" required="true">
<desc>Application item for Operator collection.</desc>
- <xs:pattern value="^[-+]?[0-9]{10}"/>
+ <xs:pattern value="^[-+]?[0-9]{1,10}"/>
<!-- option map="DFSFeatures/Application"/>
<option map="CIA_PreinstalledContent/PreInstalledJavaRom"/>
<option map="CIA_PreinstalledContent/PreInstalledSymbianROM"/>
@@ -70,7 +70,7 @@
<!-- option map="HomescreenWidgets/Widgets"/>
<option map="CIA_PreinstalledWidgetUDA/PreInstalledWidgetUDA" /-->
</setting>
- <setting ref="OperatorURL" name="Operator URL" type="selection" relevant="Type='3'" required="true">
+ <setting ref="URL" name="Operator URL" type="selection" relevant="Type='3'" required="true">
<option map="CaStorageDbSetting/OperatorURLs"/>
</setting>
</setting>
@@ -94,8 +94,8 @@
<setting ref="GroupName" name="Collection Group Name" type="string">
<desc>Group name. Not localized name. Identify collection where application with predefined group name should be added after installation.</desc>
</setting>
- <setting ref="Locked" name="Lock Operator Collection and content" type="boolean">
- <desc>Lock operator collection and content - user can not delete operator collection, prevent renaming collection and even content. Not possible by user to add new content to defined collection</desc>
+ <setting ref="Locked" name="Lock Collection and content" type="boolean">
+ <desc>Lock collection and content - user cannot delete collection, prevent renaming collection and even content. Not possible by user to add new content to defined collection</desc>
</setting>
<setting ref="Icon" name="Collection Icon" type="file" >
<desc>Icon.</desc>
@@ -139,7 +139,7 @@
</setting>
<setting ref="Application" name="Application" type="string" relevant="Type='1'" required="true">
<desc>Application item for Operator collection.</desc>
- <xs:pattern value="^[-+]?[0-9]{10}"/>
+ <xs:pattern value="^[-+]?[0-9]{1,10}"/>
<!-- option map="DFSFeatures/Application"/>
<option map="CIA_PreinstalledContent/PreInstalledJavaRom"/>
<option map="CIA_PreinstalledContent/PreInstalledSymbianROM"/>