flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcl...@apache.org
Subject [43/51] [partial] trying to merge TourDeFlex develop release into master
Date Sat, 23 Aug 2014 03:41:29 GMT
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/5ed4d983/TourDeFlex/TourDeFlex_content/flex4.0/CustomItemRendererWithEffects/srcview/src/renderers/ImageRenderer1.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex_content/flex4.0/CustomItemRendererWithEffects/srcview/src/renderers/ImageRenderer1.mxml b/TourDeFlex/TourDeFlex_content/flex4.0/CustomItemRendererWithEffects/srcview/src/renderers/ImageRenderer1.mxml
index f6f1dd5..4337b10 100644
--- a/TourDeFlex/TourDeFlex_content/flex4.0/CustomItemRendererWithEffects/srcview/src/renderers/ImageRenderer1.mxml
+++ b/TourDeFlex/TourDeFlex_content/flex4.0/CustomItemRendererWithEffects/srcview/src/renderers/ImageRenderer1.mxml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 
   Licensed to the Apache Software Foundation (ASF) under one or more
@@ -17,40 +17,40 @@
   limitations under the License.
 
 -->
-<s:ItemRenderer xmlns:fx="http://ns.adobe.com/mxml/2009"
-				xmlns:s="library://ns.adobe.com/flex/spark"
-				xmlns:mx="library://ns.adobe.com/flex/mx" 
-				autoDrawBackground="false" 
-				depth="0" depth.hovered="1">
-	
-	<s:states>
-		<s:State name="normal" />
-		<s:State name="hovered" />
-	</s:states>
-
-	<s:postLayoutTransformOffsets>
-		<mx:TransformOffsets id="offsets" x.hovered="-40" y.hovered="-40" scaleX.hovered="2" scaleY.hovered="2" />
-	</s:postLayoutTransformOffsets>	
-	
-	<s:transitions>
-		<mx:Transition fromState="normal" toState="hovered" autoReverse="true">
-			<s:Animate target="{offsets}" duration="200">
-				<s:SimpleMotionPath property="scaleX" />
-				<s:SimpleMotionPath property="scaleY" />
-				<s:SimpleMotionPath property="x" />
-				<s:SimpleMotionPath property="y" />
-			</s:Animate>
-		</mx:Transition>
-		<mx:Transition fromState="hovered" toState="normal" autoReverse="true">
-			<s:Animate target="{offsets}" duration="200">
-				<s:SimpleMotionPath property="scaleX" />
-				<s:SimpleMotionPath property="scaleY" />
-				<s:SimpleMotionPath property="x" />
-				<s:SimpleMotionPath property="y" />
-			</s:Animate>
-		</mx:Transition>
-	</s:transitions>	
-	
-	<mx:Image id="image" source="{data.image}" width="60" height="60" horizontalCenter="0" verticalCenter="0"/>
-
+<s:ItemRenderer xmlns:fx="http://ns.adobe.com/mxml/2009"
+				xmlns:s="library://ns.adobe.com/flex/spark"
+				xmlns:mx="library://ns.adobe.com/flex/mx" 
+				autoDrawBackground="false" 
+				depth="0" depth.hovered="1">
+	
+	<s:states>
+		<s:State name="normal" />
+		<s:State name="hovered" />
+	</s:states>
+
+	<s:postLayoutTransformOffsets>
+		<mx:TransformOffsets id="offsets" x.hovered="-40" y.hovered="-40" scaleX.hovered="2" scaleY.hovered="2" />
+	</s:postLayoutTransformOffsets>	
+	
+	<s:transitions>
+		<mx:Transition fromState="normal" toState="hovered" autoReverse="true">
+			<s:Animate target="{offsets}" duration="200">
+				<s:SimpleMotionPath property="scaleX" />
+				<s:SimpleMotionPath property="scaleY" />
+				<s:SimpleMotionPath property="x" />
+				<s:SimpleMotionPath property="y" />
+			</s:Animate>
+		</mx:Transition>
+		<mx:Transition fromState="hovered" toState="normal" autoReverse="true">
+			<s:Animate target="{offsets}" duration="200">
+				<s:SimpleMotionPath property="scaleX" />
+				<s:SimpleMotionPath property="scaleY" />
+				<s:SimpleMotionPath property="x" />
+				<s:SimpleMotionPath property="y" />
+			</s:Animate>
+		</mx:Transition>
+	</s:transitions>	
+	
+	<mx:Image id="image" source="{data.image}" width="60" height="60" horizontalCenter="0" verticalCenter="0"/>
+
 </s:ItemRenderer>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/5ed4d983/TourDeFlex/TourDeFlex_content/flex4.0/CustomItemRendererWithEffects/srcview/src/renderers/ImageRenderer2.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex_content/flex4.0/CustomItemRendererWithEffects/srcview/src/renderers/ImageRenderer2.mxml b/TourDeFlex/TourDeFlex_content/flex4.0/CustomItemRendererWithEffects/srcview/src/renderers/ImageRenderer2.mxml
index 2152cd3..8885082 100644
--- a/TourDeFlex/TourDeFlex_content/flex4.0/CustomItemRendererWithEffects/srcview/src/renderers/ImageRenderer2.mxml
+++ b/TourDeFlex/TourDeFlex_content/flex4.0/CustomItemRendererWithEffects/srcview/src/renderers/ImageRenderer2.mxml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 
   Licensed to the Apache Software Foundation (ASF) under one or more
@@ -17,38 +17,38 @@
   limitations under the License.
 
 -->
-<s:ItemRenderer xmlns:fx="http://ns.adobe.com/mxml/2009"
-				xmlns:s="library://ns.adobe.com/flex/spark"
-				xmlns:mx="library://ns.adobe.com/flex/mx" 
-				autoDrawBackground="false" 
-				depth="0" depth.hovered="1">
-	
-	<s:states>
-		<s:State name="normal" />
-		<s:State name="hovered" />
-	</s:states>
-
-	<s:transitions>
-		<s:Transition fromState="normal" toState="hovered" autoReverse="true">
-			<s:Parallel>
-				<s:Rotate3D target="{image}" angleYFrom="0" angleYTo="360" autoCenterProjection="true" autoCenterTransform="true" duration="400"/>
-				<s:Fade target="{image}" startDelay="400" duration="200"/>
-				<s:Fade target="{group}" startDelay="400" duration="200"/>
-			</s:Parallel>
-		</s:Transition>
-	</s:transitions>
-	
-	<s:Rect id="rect" left="0" right="0" top="0" bottom="0">
-		<s:fill>
-			<s:SolidColor color="black" alpha="0.7"/>
-		</s:fill>
-	</s:Rect>
-
-	<s:Group id="group" left="0" right="0" top="0" bottom="0" visible.normal="false">
-		<s:Label text="{data.firstName}" verticalCenter="-10" horizontalCenter="0" color="white"/> 
-		<s:Label text="{data.lastName}" verticalCenter="10" horizontalCenter="0" color="white"/> 
-	</s:Group>
-
-	<mx:Image id="image" source="{data.image}" width="70" height="70" horizontalCenter="0" verticalCenter="0" visible.hovered="false"/>
-	
+<s:ItemRenderer xmlns:fx="http://ns.adobe.com/mxml/2009"
+				xmlns:s="library://ns.adobe.com/flex/spark"
+				xmlns:mx="library://ns.adobe.com/flex/mx" 
+				autoDrawBackground="false" 
+				depth="0" depth.hovered="1">
+	
+	<s:states>
+		<s:State name="normal" />
+		<s:State name="hovered" />
+	</s:states>
+
+	<s:transitions>
+		<s:Transition fromState="normal" toState="hovered" autoReverse="true">
+			<s:Parallel>
+				<s:Rotate3D target="{image}" angleYFrom="0" angleYTo="360" autoCenterProjection="true" autoCenterTransform="true" duration="400"/>
+				<s:Fade target="{image}" startDelay="400" duration="200"/>
+				<s:Fade target="{group}" startDelay="400" duration="200"/>
+			</s:Parallel>
+		</s:Transition>
+	</s:transitions>
+	
+	<s:Rect id="rect" left="0" right="0" top="0" bottom="0">
+		<s:fill>
+			<s:SolidColor color="black" alpha="0.7"/>
+		</s:fill>
+	</s:Rect>
+
+	<s:Group id="group" left="0" right="0" top="0" bottom="0" visible.normal="false">
+		<s:Label text="{data.firstName}" verticalCenter="-10" horizontalCenter="0" color="white"/> 
+		<s:Label text="{data.lastName}" verticalCenter="10" horizontalCenter="0" color="white"/> 
+	</s:Group>
+
+	<mx:Image id="image" source="{data.image}" width="70" height="70" horizontalCenter="0" verticalCenter="0" visible.hovered="false"/>
+	
 </s:ItemRenderer>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/5ed4d983/TourDeFlex/TourDeFlex_content/flex4.0/CustomItemRendererWithEffects/srcview/src/sample1.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex_content/flex4.0/CustomItemRendererWithEffects/srcview/src/sample1.mxml b/TourDeFlex/TourDeFlex_content/flex4.0/CustomItemRendererWithEffects/srcview/src/sample1.mxml
index 1462f03..015493f 100644
--- a/TourDeFlex/TourDeFlex_content/flex4.0/CustomItemRendererWithEffects/srcview/src/sample1.mxml
+++ b/TourDeFlex/TourDeFlex_content/flex4.0/CustomItemRendererWithEffects/srcview/src/sample1.mxml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 
   Licensed to the Apache Software Foundation (ASF) under one or more
@@ -17,45 +17,45 @@
   limitations under the License.
 
 -->
-<s:Application xmlns:fx="http://ns.adobe.com/mxml/2009" 
-			   xmlns:s="library://ns.adobe.com/flex/spark" 
-			   xmlns:mx="library://ns.adobe.com/flex/mx" 
-			   applicationComplete="srv.send()" viewSourceURL="srcview/index.html">
-	
-	
-	<fx:Script>
-		<![CDATA[
-			import mx.collections.ArrayCollection;
-			import mx.rpc.events.ResultEvent;
-			
-			import skins.TDFPanelSkin;
-			
-			[Bindable]
-			private var employees:ArrayCollection;
-			
-			private function resultHandler(event:ResultEvent):void
-			{
-				employees = event.result.list.employee as ArrayCollection;
-			}
-			
-		]]>
-	</fx:Script>
-	
-	<fx:Declarations>
-		<s:HTTPService id="srv" url="data/list.xml" result="resultHandler(event)"/>
-	</fx:Declarations>
-	
-	<s:Panel width="100%" height="100%" title="Custom Item Renderer with Animation" skinClass="skins.TDFPanelSkin">
-		<s:layout>
-			<s:HorizontalLayout paddingLeft="100" paddingRight="10" paddingTop="10" paddingBottom="10"/>
-		</s:layout>
-		<s:DataGroup dataProvider="{employees}" width="300" itemRenderer="renderers.ImageRenderer1">
-			<s:layout>
-				<s:TileLayout horizontalGap="0" verticalGap="0"/>
-			</s:layout>
-		</s:DataGroup>
-		<s:Label color="0x323232" width="200" text="The item renderer on this DataGroup uses the Spark Animate to scale the image
-when hovered over each item. See the ImageRenderer1.mxml source for more information."/>
-	</s:Panel>
-	
-</s:Application>
+<s:Application xmlns:fx="http://ns.adobe.com/mxml/2009" 
+			   xmlns:s="library://ns.adobe.com/flex/spark" 
+			   xmlns:mx="library://ns.adobe.com/flex/mx" 
+			   applicationComplete="srv.send()" viewSourceURL="srcview/index.html">
+	
+	
+	<fx:Script>
+		<![CDATA[
+			import mx.collections.ArrayCollection;
+			import mx.rpc.events.ResultEvent;
+			
+			import skins.TDFPanelSkin;
+			
+			[Bindable]
+			private var employees:ArrayCollection;
+			
+			private function resultHandler(event:ResultEvent):void
+			{
+				employees = event.result.list.employee as ArrayCollection;
+			}
+			
+		]]>
+	</fx:Script>
+	
+	<fx:Declarations>
+		<s:HTTPService id="srv" url="data/list.xml" result="resultHandler(event)"/>
+	</fx:Declarations>
+	
+	<s:Panel width="100%" height="100%" title="Custom Item Renderer with Animation" skinClass="skins.TDFPanelSkin">
+		<s:layout>
+			<s:HorizontalLayout paddingLeft="100" paddingRight="10" paddingTop="10" paddingBottom="10"/>
+		</s:layout>
+		<s:DataGroup dataProvider="{employees}" width="300" itemRenderer="renderers.ImageRenderer1">
+			<s:layout>
+				<s:TileLayout horizontalGap="0" verticalGap="0"/>
+			</s:layout>
+		</s:DataGroup>
+		<s:Label color="0x323232" width="200" text="The item renderer on this DataGroup uses the Spark Animate to scale the image
+when hovered over each item. See the ImageRenderer1.mxml source for more information."/>
+	</s:Panel>
+	
+</s:Application>

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/5ed4d983/TourDeFlex/TourDeFlex_content/flex4.0/CustomItemRendererWithEffects/srcview/src/sample2.mxml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex_content/flex4.0/CustomItemRendererWithEffects/srcview/src/sample2.mxml b/TourDeFlex/TourDeFlex_content/flex4.0/CustomItemRendererWithEffects/srcview/src/sample2.mxml
index b1712bf..8b9784d 100644
--- a/TourDeFlex/TourDeFlex_content/flex4.0/CustomItemRendererWithEffects/srcview/src/sample2.mxml
+++ b/TourDeFlex/TourDeFlex_content/flex4.0/CustomItemRendererWithEffects/srcview/src/sample2.mxml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 
   Licensed to the Apache Software Foundation (ASF) under one or more
@@ -17,59 +17,59 @@
   limitations under the License.
 
 -->
-<s:Application xmlns:fx="http://ns.adobe.com/mxml/2009" 
-			   xmlns:s="library://ns.adobe.com/flex/spark" 
-			   xmlns:mx="library://ns.adobe.com/flex/mx" 
-			   applicationComplete="srv.send()" viewSourceURL="srcview/index.html">
-	
-	<fx:Style>
-
-		@namespace s "library://ns.adobe.com/flex/spark";
-		@namespace mx "library://ns.adobe.com/flex/halo";
-		
-		@font-face {
-			src: url("assets/MyriadPro-Semibold.otf");
-			fontFamily: "main";
-		}
-		
-		s|Application {
-			font-family: main;
-			font-size: 14;
-		}
-		
-	</fx:Style>
-	
-	<fx:Script>
-		<![CDATA[
-			import mx.collections.ArrayCollection;
-			import mx.rpc.events.ResultEvent;
-			
-			[Bindable]
-			private var employees:ArrayCollection;
-			
-			private function resultHandler(event:ResultEvent):void
-			{
-				employees = event.result.list.employee as ArrayCollection;
-			}
-			
-		]]>
-	</fx:Script>
-	
-	<fx:Declarations>
-		<s:HTTPService id="srv" url="data/list.xml" result="resultHandler(event)"/>
-	</fx:Declarations>
-	<s:Panel width="100%" height="100%" title="Custom Item Renderer with Animation" skinClass="skins.TDFPanelSkin">
-		<s:layout>
-			<s:HorizontalLayout paddingTop="2" paddingLeft="50" paddingRight="8"/>
-		</s:layout>
-		
-		<s:DataGroup dataProvider="{employees}" width="440" itemRenderer="renderers.ImageRenderer2" horizontalCenter="0" verticalCenter="0">
-			<s:layout>
-				<s:TileLayout />
-			</s:layout>
-		</s:DataGroup>
-		<s:Label color="0x323232" width="200" text="The item renderer on this DataGroup uses effects to provide a
-Spark 3D rotation effect when hovered over each item. See the ImageRenderer2.mxml source for more information. This sample also 
-shows the use of a special font for the text."/>
-	</s:Panel>
-</s:Application>
+<s:Application xmlns:fx="http://ns.adobe.com/mxml/2009" 
+			   xmlns:s="library://ns.adobe.com/flex/spark" 
+			   xmlns:mx="library://ns.adobe.com/flex/mx" 
+			   applicationComplete="srv.send()" viewSourceURL="srcview/index.html">
+	
+	<fx:Style>
+
+		@namespace s "library://ns.adobe.com/flex/spark";
+		@namespace mx "library://ns.adobe.com/flex/halo";
+		
+		@font-face {
+			src: url("assets/MyriadPro-Semibold.otf");
+			fontFamily: "main";
+		}
+		
+		s|Application {
+			font-family: main;
+			font-size: 14;
+		}
+		
+	</fx:Style>
+	
+	<fx:Script>
+		<![CDATA[
+			import mx.collections.ArrayCollection;
+			import mx.rpc.events.ResultEvent;
+			
+			[Bindable]
+			private var employees:ArrayCollection;
+			
+			private function resultHandler(event:ResultEvent):void
+			{
+				employees = event.result.list.employee as ArrayCollection;
+			}
+			
+		]]>
+	</fx:Script>
+	
+	<fx:Declarations>
+		<s:HTTPService id="srv" url="data/list.xml" result="resultHandler(event)"/>
+	</fx:Declarations>
+	<s:Panel width="100%" height="100%" title="Custom Item Renderer with Animation" skinClass="skins.TDFPanelSkin">
+		<s:layout>
+			<s:HorizontalLayout paddingTop="2" paddingLeft="50" paddingRight="8"/>
+		</s:layout>
+		
+		<s:DataGroup dataProvider="{employees}" width="440" itemRenderer="renderers.ImageRenderer2" horizontalCenter="0" verticalCenter="0">
+			<s:layout>
+				<s:TileLayout />
+			</s:layout>
+		</s:DataGroup>
+		<s:Label color="0x323232" width="200" text="The item renderer on this DataGroup uses effects to provide a
+Spark 3D rotation effect when hovered over each item. See the ImageRenderer2.mxml source for more information. This sample also 
+shows the use of a special font for the text."/>
+	</s:Panel>
+</s:Application>

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/5ed4d983/TourDeFlex/TourDeFlex_content/flex4.0/CustomLayout-Animated/data/catalog.xml
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex_content/flex4.0/CustomLayout-Animated/data/catalog.xml b/TourDeFlex/TourDeFlex_content/flex4.0/CustomLayout-Animated/data/catalog.xml
index ecf9bc6..710fef8 100644
--- a/TourDeFlex/TourDeFlex_content/flex4.0/CustomLayout-Animated/data/catalog.xml
+++ b/TourDeFlex/TourDeFlex_content/flex4.0/CustomLayout-Animated/data/catalog.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 
   Licensed to the Apache Software Foundation (ASF) under one or more
@@ -17,177 +17,177 @@
   limitations under the License.
 
 -->
-
-<catalog>
-
-    <product productId="1">
-        <name>Nokia 6010</name>
-        <color></color>
-        <description>Easy to use without sacrificing style, the Nokia 6010 phone offers functional voice communication supported by text messaging, multimedia messaging, mobile internet, games and more</description>
-        <price>99.99</price>
-        <image>assets/pic/Nokia_6010.gif</image>
-        <series>6000</series>
-        <triband>false</triband>
-        <camera>false</camera>
-        <video>false</video>
-        <highlight1>MMS</highlight1>
-		<highlight2>Large color display</highlight2>
-    </product>
-
-    <product productId="2">
-        <name>Nokia 3100</name>
-        <color>Blue</color>
-        <description>Light up the night with a glow-in-the-dark cover - when it's charged with light you can easily find your phone in the dark. When you get a call, the Nokia 3100 phone flashes in tune with your ringing tone. And when you snap on a Nokia Xpress-on™ gaming cover*, you'll get luminescent light effects in time to the gaming action.</description>
-        <price>139</price>
-        <image>assets/pic/Nokia_3100_blue.gif</image>
-        <series>3000</series>
-        <triband>true</triband>
-        <camera>false</camera>
-        <video>false</video>
-        <highlight1>Glow-in-the-dark</highlight1>
-		<highlight2>Flashing lights</highlight2>
-    </product>
-
-    <product productId="3">
-        <name>Nokia 3100</name>
-        <color>Pink</color>
-        <description>Light up the night with a glow-in-the-dark cover - when it's charged with light you can easily find your phone in the dark. When you get a call, the Nokia 3100 phone flashes in tune with your ringing tone. And when you snap on a Nokia Xpress-on™ gaming cover*, you'll get luminescent light effects in time to the gaming action.</description>
-        <price>139</price>
-        <image>assets/pic/Nokia_3100_pink.gif</image>
-        <series>3000</series>
-        <triband>true</triband>
-        <camera>false</camera>
-        <video>false</video>
-        <highlight1>Glow-in-the-dark</highlight1>
-		<highlight2>Flashing lights</highlight2>
-    </product>
-
-    <product productId="4">
-        <name>Nokia 3120</name>
-        <color></color>
-        <description>Designed for both business and pleasure, the elegant Nokia 3120 phone offers a pleasing mix of features. Enclosed within its chic, compact body, you will discover the benefits of tri-band compatibility, a color screen, MMS, XHTML browsing, cheerful screensavers, and much more.</description>
-        <price>159.99</price>
-        <image>assets/pic/Nokia_3120.gif</image>
-        <series>3000</series>
-        <triband>true</triband>
-        <camera>false</camera>
-        <video>false</video>
-        <highlight1>Multimedia messaging</highlight1>
-		<highlight2>Animated screensavers</highlight2>
-    </product>
-
-    <product productId="5">
-        <name>Nokia 3220</name>
-        <color></color>
-        <description>The Nokia 3220 phone is a fresh new cut on some familiar ideas - animate your MMS messages with cute characters, see the music with lights that flash in time with your ringing tone, download wallpapers and screensavers with matching color schemes for the interface.</description>
-        <price>159.99</price>
-        <image>assets/pic/Nokia_3220.gif</image>
-        <series>3000</series>
-        <triband>false</triband>
-        <camera>true</camera>
-        <video>false</video>
-        <highlight1>MIDI tones</highlight1>
-		<highlight2>Cut-out covers</highlight2>
-    </product>
-
-    <product productId="6">
-        <name>Nokia 3650</name>
-        <color></color>
-        <description>Messaging is more personal, versatile and fun with the Nokia 3650 camera phone.  Capture experiences as soon as you see them and send the photos you take to you friends and family.</description>
-        <price>199.99</price>
-        <image>assets/pic/Nokia_3650.gif</image>
-        <series>3000</series>
-        <triband>false</triband>
-        <camera>true</camera>
-        <video>true</video>
-        <highlight1>Infrared or Bluetooth</highlight1>
-		<highlight2>Built-in XHTML browser</highlight2>
-    </product>
-
-    <product productId="7">
-        <name>Nokia 6820</name>
-        <color></color>
-        <description>Messaging just got a whole lot smarter. The Nokia 6820 messaging device puts the tools you need for rich communication - full messaging keyboard, digital camera, mobile email, MMS, SMS, and Instant Messaging - right at your fingertips, in a small, sleek device.</description>
-        <price>299.99</price>
-        <image>assets/pic/Nokia_6820.gif</image>
-        <series>6000</series>
-        <triband>true</triband>
-        <camera>true</camera>
-        <video>false</video>
-        <highlight1>Messaging keyboard</highlight1>
-		<highlight2>Bluetooth </highlight2>
-    </product>
-
-    <product productId="8">
-        <name>Nokia 6670</name>
-        <color></color>
-        <description>Classic business tools meet your creative streak in the Nokia 6670 imaging smartphone. It has a Netfront Web browser with PDF support, document viewer applications for email attachments, a direct printing application, and a megapixel still camera that also shoots up to 10 minutes of video.</description>
-        <price>309.99</price>
-        <image>assets/pic/Nokia_6670.gif</image>
-        <series>6000</series>
-        <triband>false</triband>
-        <camera>true</camera>
-        <video>true</video>
-        <highlight1>PDF support</highlight1>
-		<highlight2>4x digital zoom</highlight2>
-    </product>
-
-    <product productId="9">
-        <name>Nokia 6620</name>
-        <color></color>
-        <description>Shoot a basket. Shoot a movie. Video phones from Nokia... the perfect way to save and share life’s playful moments. Feel connected.</description>
-        <price>329.99</price>
-        <image>assets/pic/Nokia_6620.gif</image>
-        <series>6000</series>
-        <triband>false</triband>
-        <camera>true</camera>
-        <video>true</video>
-        <highlight1>Bluetooth technology</highlight1>
-		<highlight2>Up to 10 minutes video</highlight2>
-    </product>
-
-    <product productId="10">
-        <name>Nokia 3230</name>
-        <color>Silver</color>
-        <description>Get creative with the Nokia 3230 smartphone. Create your own ringing tones, print your mobile images, play multiplayer games over a wireless Bluetooth connection, and browse HTML and xHTML Web pages. Plus, with a 32 MB MMC card and expandable memory, you'll have lots of space to be creative.</description>
-        <price>369</price>
-        <image>assets/pic/Nokia_3230_black.gif</image>
-        <series>3000</series>
-        <triband>false</triband>
-        <camera>true</camera>
-        <video>true</video>
-        <highlight1>1.3 megapixel</highlight1>
-		<highlight2>Expandable memory</highlight2>
-    </product>
-
-    <product productId="11">
-        <name>Nokia 3230</name>
-        <color>Bronze</color>
-        <description>Get creative with the Nokia 3230 smartphone. Create your own ringing tones, print your mobile images, play multiplayer games over a wireless Bluetooth connection, and browse HTML and xHTML Web pages. Plus, with a 32 MB MMC card and expandable memory, you'll have lots of space to be creative.</description>
-        <price>369</price>
-        <image>assets/pic/Nokia_3230_bronze.gif</image>
-        <series>3000</series>
-        <triband>false</triband>
-        <camera>true</camera>
-        <video>true</video>
-        <highlight1>1.3 megapixel</highlight1>
-		<highlight2>Expandable memory</highlight2>
-    </product>
-
-    <product productId="12">
-        <name>Nokia 6630</name>
-        <color></color>
-        <description>Not only is the Nokia 6630 imaging smartphone a 1.3 megapixel digital imaging device (1.3 megapixel camera sensor, effective resolution 1.23 megapixels for image capture, image size 1280 x 960 pixels), it's also a portable office and a modern rich-media machine.</description>
-        <price>379</price>
-        <image>assets/pic/Nokia_6630.gif</image>
-        <series>6000</series>
-        <triband>false</triband>
-        <camera>true</camera>
-        <video>true</video>
-        <highlight1>1.3 megapixel</highlight1>
-		<highlight2>6x smooth digital zoom</highlight2>
-    </product>
-
-    
-   
+
+<catalog>
+
+    <product productId="1">
+        <name>Nokia 6010</name>
+        <color></color>
+        <description>Easy to use without sacrificing style, the Nokia 6010 phone offers functional voice communication supported by text messaging, multimedia messaging, mobile internet, games and more</description>
+        <price>99.99</price>
+        <image>assets/pic/Nokia_6010.gif</image>
+        <series>6000</series>
+        <triband>false</triband>
+        <camera>false</camera>
+        <video>false</video>
+        <highlight1>MMS</highlight1>
+		<highlight2>Large color display</highlight2>
+    </product>
+
+    <product productId="2">
+        <name>Nokia 3100</name>
+        <color>Blue</color>
+        <description>Light up the night with a glow-in-the-dark cover - when it's charged with light you can easily find your phone in the dark. When you get a call, the Nokia 3100 phone flashes in tune with your ringing tone. And when you snap on a Nokia Xpress-on™ gaming cover*, you'll get luminescent light effects in time to the gaming action.</description>
+        <price>139</price>
+        <image>assets/pic/Nokia_3100_blue.gif</image>
+        <series>3000</series>
+        <triband>true</triband>
+        <camera>false</camera>
+        <video>false</video>
+        <highlight1>Glow-in-the-dark</highlight1>
+		<highlight2>Flashing lights</highlight2>
+    </product>
+
+    <product productId="3">
+        <name>Nokia 3100</name>
+        <color>Pink</color>
+        <description>Light up the night with a glow-in-the-dark cover - when it's charged with light you can easily find your phone in the dark. When you get a call, the Nokia 3100 phone flashes in tune with your ringing tone. And when you snap on a Nokia Xpress-on™ gaming cover*, you'll get luminescent light effects in time to the gaming action.</description>
+        <price>139</price>
+        <image>assets/pic/Nokia_3100_pink.gif</image>
+        <series>3000</series>
+        <triband>true</triband>
+        <camera>false</camera>
+        <video>false</video>
+        <highlight1>Glow-in-the-dark</highlight1>
+		<highlight2>Flashing lights</highlight2>
+    </product>
+
+    <product productId="4">
+        <name>Nokia 3120</name>
+        <color></color>
+        <description>Designed for both business and pleasure, the elegant Nokia 3120 phone offers a pleasing mix of features. Enclosed within its chic, compact body, you will discover the benefits of tri-band compatibility, a color screen, MMS, XHTML browsing, cheerful screensavers, and much more.</description>
+        <price>159.99</price>
+        <image>assets/pic/Nokia_3120.gif</image>
+        <series>3000</series>
+        <triband>true</triband>
+        <camera>false</camera>
+        <video>false</video>
+        <highlight1>Multimedia messaging</highlight1>
+		<highlight2>Animated screensavers</highlight2>
+    </product>
+
+    <product productId="5">
+        <name>Nokia 3220</name>
+        <color></color>
+        <description>The Nokia 3220 phone is a fresh new cut on some familiar ideas - animate your MMS messages with cute characters, see the music with lights that flash in time with your ringing tone, download wallpapers and screensavers with matching color schemes for the interface.</description>
+        <price>159.99</price>
+        <image>assets/pic/Nokia_3220.gif</image>
+        <series>3000</series>
+        <triband>false</triband>
+        <camera>true</camera>
+        <video>false</video>
+        <highlight1>MIDI tones</highlight1>
+		<highlight2>Cut-out covers</highlight2>
+    </product>
+
+    <product productId="6">
+        <name>Nokia 3650</name>
+        <color></color>
+        <description>Messaging is more personal, versatile and fun with the Nokia 3650 camera phone.  Capture experiences as soon as you see them and send the photos you take to you friends and family.</description>
+        <price>199.99</price>
+        <image>assets/pic/Nokia_3650.gif</image>
+        <series>3000</series>
+        <triband>false</triband>
+        <camera>true</camera>
+        <video>true</video>
+        <highlight1>Infrared or Bluetooth</highlight1>
+		<highlight2>Built-in XHTML browser</highlight2>
+    </product>
+
+    <product productId="7">
+        <name>Nokia 6820</name>
+        <color></color>
+        <description>Messaging just got a whole lot smarter. The Nokia 6820 messaging device puts the tools you need for rich communication - full messaging keyboard, digital camera, mobile email, MMS, SMS, and Instant Messaging - right at your fingertips, in a small, sleek device.</description>
+        <price>299.99</price>
+        <image>assets/pic/Nokia_6820.gif</image>
+        <series>6000</series>
+        <triband>true</triband>
+        <camera>true</camera>
+        <video>false</video>
+        <highlight1>Messaging keyboard</highlight1>
+		<highlight2>Bluetooth </highlight2>
+    </product>
+
+    <product productId="8">
+        <name>Nokia 6670</name>
+        <color></color>
+        <description>Classic business tools meet your creative streak in the Nokia 6670 imaging smartphone. It has a Netfront Web browser with PDF support, document viewer applications for email attachments, a direct printing application, and a megapixel still camera that also shoots up to 10 minutes of video.</description>
+        <price>309.99</price>
+        <image>assets/pic/Nokia_6670.gif</image>
+        <series>6000</series>
+        <triband>false</triband>
+        <camera>true</camera>
+        <video>true</video>
+        <highlight1>PDF support</highlight1>
+		<highlight2>4x digital zoom</highlight2>
+    </product>
+
+    <product productId="9">
+        <name>Nokia 6620</name>
+        <color></color>
+        <description>Shoot a basket. Shoot a movie. Video phones from Nokia... the perfect way to save and share life’s playful moments. Feel connected.</description>
+        <price>329.99</price>
+        <image>assets/pic/Nokia_6620.gif</image>
+        <series>6000</series>
+        <triband>false</triband>
+        <camera>true</camera>
+        <video>true</video>
+        <highlight1>Bluetooth technology</highlight1>
+		<highlight2>Up to 10 minutes video</highlight2>
+    </product>
+
+    <product productId="10">
+        <name>Nokia 3230</name>
+        <color>Silver</color>
+        <description>Get creative with the Nokia 3230 smartphone. Create your own ringing tones, print your mobile images, play multiplayer games over a wireless Bluetooth connection, and browse HTML and xHTML Web pages. Plus, with a 32 MB MMC card and expandable memory, you'll have lots of space to be creative.</description>
+        <price>369</price>
+        <image>assets/pic/Nokia_3230_black.gif</image>
+        <series>3000</series>
+        <triband>false</triband>
+        <camera>true</camera>
+        <video>true</video>
+        <highlight1>1.3 megapixel</highlight1>
+		<highlight2>Expandable memory</highlight2>
+    </product>
+
+    <product productId="11">
+        <name>Nokia 3230</name>
+        <color>Bronze</color>
+        <description>Get creative with the Nokia 3230 smartphone. Create your own ringing tones, print your mobile images, play multiplayer games over a wireless Bluetooth connection, and browse HTML and xHTML Web pages. Plus, with a 32 MB MMC card and expandable memory, you'll have lots of space to be creative.</description>
+        <price>369</price>
+        <image>assets/pic/Nokia_3230_bronze.gif</image>
+        <series>3000</series>
+        <triband>false</triband>
+        <camera>true</camera>
+        <video>true</video>
+        <highlight1>1.3 megapixel</highlight1>
+		<highlight2>Expandable memory</highlight2>
+    </product>
+
+    <product productId="12">
+        <name>Nokia 6630</name>
+        <color></color>
+        <description>Not only is the Nokia 6630 imaging smartphone a 1.3 megapixel digital imaging device (1.3 megapixel camera sensor, effective resolution 1.23 megapixels for image capture, image size 1280 x 960 pixels), it's also a portable office and a modern rich-media machine.</description>
+        <price>379</price>
+        <image>assets/pic/Nokia_6630.gif</image>
+        <series>6000</series>
+        <triband>false</triband>
+        <camera>true</camera>
+        <video>true</video>
+        <highlight1>1.3 megapixel</highlight1>
+		<highlight2>6x smooth digital zoom</highlight2>
+    </product>
+
+    
+   
 </catalog>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/5ed4d983/TourDeFlex/TourDeFlex_content/flex4.0/CustomLayout-Animated/sample.html
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex_content/flex4.0/CustomLayout-Animated/sample.html b/TourDeFlex/TourDeFlex_content/flex4.0/CustomLayout-Animated/sample.html
index b18b9e0..4da4b4d 100644
--- a/TourDeFlex/TourDeFlex_content/flex4.0/CustomLayout-Animated/sample.html
+++ b/TourDeFlex/TourDeFlex_content/flex4.0/CustomLayout-Animated/sample.html
@@ -14,108 +14,108 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- saved from url=(0014)about:internet -->
-<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">	
-    <!-- 
-    Smart developers always View Source. 
-    
-    This application was built using Adobe Flex, an open source framework
-    for building rich Internet applications that get delivered via the
-    Flash Player or to desktops via Adobe AIR. 
-    
-    Learn more about Flex at http://flex.org 
-    // -->
-    <head>
-        <title></title>         
-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<!-- Include CSS to eliminate any default margins/padding and set the height of the html element and 
-		     the body element to 100%, because Firefox, or any Gecko based browser, interprets percentage as 
-			 the percentage of the height of its parent container, which has to be set explicitly.  Initially, 
-			 don't display flashContent div so it won't show if JavaScript disabled.
-		-->
-        <style type="text/css" media="screen"> 
-			html, body	{ height:100%; }
-			body { margin:0; padding:0; overflow:auto; text-align:center; 
-			       background-color: #323232; }   
-			#flashContent { display:none; }
-        </style>
-		
-		<!-- Enable Browser History by replacing useBrowserHistory tokens with two hyphens -->
-        <!-- BEGIN Browser History required section -->
-        <link rel="stylesheet" type="text/css" href="history/history.css" />
-        <script type="text/javascript" src="history/history.js"></script>
-        <!-- END Browser History required section -->  
-		    
-        <script type="text/javascript" src="swfobject.js"></script>
-        <script type="text/javascript">
-            <!-- For version detection, set to min. required Flash Player version, or 0 (or 0.0.0), for no version detection. --> 
-            var swfVersionStr = "10.0.0";
-            <!-- To use express install, set to playerProductInstall.swf, otherwise the empty string. -->
-            var xiSwfUrlStr = "playerProductInstall.swf";
-            var flashvars = {};
-            var params = {};
-            params.quality = "high";
-            params.bgcolor = "#323232";
-            params.allowscriptaccess = "sameDomain";
-            params.allowfullscreen = "true";
-            var attributes = {};
-            attributes.id = "sample";
-            attributes.name = "sample";
-            attributes.align = "middle";
-            swfobject.embedSWF(
-                "sample.swf", "flashContent", 
-                "100%", "100%", 
-                swfVersionStr, xiSwfUrlStr, 
-                flashvars, params, attributes);
-			<!-- JavaScript enabled so display the flashContent div in case it is not replaced with a swf object. -->
-			swfobject.createCSS("#flashContent", "display:block;text-align:left;");
-        </script>
-    </head>
-    <body>
-        <!-- SWFObject's dynamic embed method replaces this alternative HTML content with Flash content when enough 
-			 JavaScript and Flash plug-in support is available. The div is initially hidden so that it doesn't show
-			 when JavaScript is disabled.
-		-->
-        <div id="flashContent">
-        	<p>
-	        	To view this page ensure that Adobe Flash Player version 
-				10.0.0 or greater is installed. 
-			</p>
-			<script type="text/javascript"> 
-				var pageHost = ((document.location.protocol == "https:") ? "https://" :	"http://"); 
-				document.write("<a href='http://www.adobe.com/go/getflashplayer'><img src='" 
-								+ pageHost + "www.adobe.com/images/shared/download_buttons/get_flash_player.gif' alt='Get Adobe Flash player' /></a>" ); 
-			</script> 
-        </div>
-	   	
-       	<noscript>
-            <object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="100%" height="100%" id="sample">
-                <param name="movie" value="sample.swf" />
-                <param name="quality" value="high" />
-                <param name="bgcolor" value="#323232" />
-                <param name="allowScriptAccess" value="sameDomain" />
-                <param name="allowFullScreen" value="true" />
-                <!--[if !IE]>-->
-                <object type="application/x-shockwave-flash" data="sample.swf" width="100%" height="100%">
-                    <param name="quality" value="high" />
-                    <param name="bgcolor" value="#323232" />
-                    <param name="allowScriptAccess" value="sameDomain" />
-                    <param name="allowFullScreen" value="true" />
-                <!--<![endif]-->
-                <!--[if gte IE 6]>-->
-                	<p> 
-                		Either scripts and active content are not permitted to run or Adobe Flash Player version
-                		10.0.0 or greater is not installed.
-                	</p>
-                <!--<![endif]-->
-                    <a href="http://www.adobe.com/go/getflashplayer">
-                        <img src="http://www.adobe.com/images/shared/download_buttons/get_flash_player.gif" alt="Get Adobe Flash Player" />
-                    </a>
-                <!--[if !IE]>-->
-                </object>
-                <!--<![endif]-->
-            </object>
-	    </noscript>		
-   </body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- saved from url=(0014)about:internet -->
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">	
+    <!-- 
+    Smart developers always View Source. 
+    
+    This application was built using Adobe Flex, an open source framework
+    for building rich Internet applications that get delivered via the
+    Flash Player or to desktops via Adobe AIR. 
+    
+    Learn more about Flex at http://flex.org 
+    // -->
+    <head>
+        <title></title>         
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<!-- Include CSS to eliminate any default margins/padding and set the height of the html element and 
+		     the body element to 100%, because Firefox, or any Gecko based browser, interprets percentage as 
+			 the percentage of the height of its parent container, which has to be set explicitly.  Initially, 
+			 don't display flashContent div so it won't show if JavaScript disabled.
+		-->
+        <style type="text/css" media="screen"> 
+			html, body	{ height:100%; }
+			body { margin:0; padding:0; overflow:auto; text-align:center; 
+			       background-color: #323232; }   
+			#flashContent { display:none; }
+        </style>
+		
+		<!-- Enable Browser History by replacing useBrowserHistory tokens with two hyphens -->
+        <!-- BEGIN Browser History required section -->
+        <link rel="stylesheet" type="text/css" href="history/history.css" />
+        <script type="text/javascript" src="history/history.js"></script>
+        <!-- END Browser History required section -->  
+		    
+        <script type="text/javascript" src="swfobject.js"></script>
+        <script type="text/javascript">
+            <!-- For version detection, set to min. required Flash Player version, or 0 (or 0.0.0), for no version detection. --> 
+            var swfVersionStr = "10.0.0";
+            <!-- To use express install, set to playerProductInstall.swf, otherwise the empty string. -->
+            var xiSwfUrlStr = "playerProductInstall.swf";
+            var flashvars = {};
+            var params = {};
+            params.quality = "high";
+            params.bgcolor = "#323232";
+            params.allowscriptaccess = "sameDomain";
+            params.allowfullscreen = "true";
+            var attributes = {};
+            attributes.id = "sample";
+            attributes.name = "sample";
+            attributes.align = "middle";
+            swfobject.embedSWF(
+                "sample.swf", "flashContent", 
+                "100%", "100%", 
+                swfVersionStr, xiSwfUrlStr, 
+                flashvars, params, attributes);
+			<!-- JavaScript enabled so display the flashContent div in case it is not replaced with a swf object. -->
+			swfobject.createCSS("#flashContent", "display:block;text-align:left;");
+        </script>
+    </head>
+    <body>
+        <!-- SWFObject's dynamic embed method replaces this alternative HTML content with Flash content when enough 
+			 JavaScript and Flash plug-in support is available. The div is initially hidden so that it doesn't show
+			 when JavaScript is disabled.
+		-->
+        <div id="flashContent">
+        	<p>
+	        	To view this page ensure that Adobe Flash Player version 
+				10.0.0 or greater is installed. 
+			</p>
+			<script type="text/javascript"> 
+				var pageHost = ((document.location.protocol == "https:") ? "https://" :	"http://"); 
+				document.write("<a href='http://www.adobe.com/go/getflashplayer'><img src='" 
+								+ pageHost + "www.adobe.com/images/shared/download_buttons/get_flash_player.gif' alt='Get Adobe Flash player' /></a>" ); 
+			</script> 
+        </div>
+	   	
+       	<noscript>
+            <object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="100%" height="100%" id="sample">
+                <param name="movie" value="sample.swf" />
+                <param name="quality" value="high" />
+                <param name="bgcolor" value="#323232" />
+                <param name="allowScriptAccess" value="sameDomain" />
+                <param name="allowFullScreen" value="true" />
+                <!--[if !IE]>-->
+                <object type="application/x-shockwave-flash" data="sample.swf" width="100%" height="100%">
+                    <param name="quality" value="high" />
+                    <param name="bgcolor" value="#323232" />
+                    <param name="allowScriptAccess" value="sameDomain" />
+                    <param name="allowFullScreen" value="true" />
+                <!--<![endif]-->
+                <!--[if gte IE 6]>-->
+                	<p> 
+                		Either scripts and active content are not permitted to run or Adobe Flash Player version
+                		10.0.0 or greater is not installed.
+                	</p>
+                <!--<![endif]-->
+                    <a href="http://www.adobe.com/go/getflashplayer">
+                        <img src="http://www.adobe.com/images/shared/download_buttons/get_flash_player.gif" alt="Get Adobe Flash Player" />
+                    </a>
+                <!--[if !IE]>-->
+                </object>
+                <!--<![endif]-->
+            </object>
+	    </noscript>		
+   </body>
+</html>

http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/5ed4d983/TourDeFlex/TourDeFlex_content/flex4.0/CustomLayout-Animated/srcview/source/data/catalog.xml.txt
----------------------------------------------------------------------
diff --git a/TourDeFlex/TourDeFlex_content/flex4.0/CustomLayout-Animated/srcview/source/data/catalog.xml.txt b/TourDeFlex/TourDeFlex_content/flex4.0/CustomLayout-Animated/srcview/source/data/catalog.xml.txt
index 463effe..a03eca7 100644
--- a/TourDeFlex/TourDeFlex_content/flex4.0/CustomLayout-Animated/srcview/source/data/catalog.xml.txt
+++ b/TourDeFlex/TourDeFlex_content/flex4.0/CustomLayout-Animated/srcview/source/data/catalog.xml.txt
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
 
 Licensed to the Apache Software Foundation (ASF) under one or more
@@ -17,177 +17,177 @@ See the License for the specific language governing permissions and
 limitations under the License.
 
 -->
-
-<catalog>
-
-    <product productId="1">
-        <name>Nokia 6010</name>
-        <color></color>
-        <description>Easy to use without sacrificing style, the Nokia 6010 phone offers functional voice communication supported by text messaging, multimedia messaging, mobile internet, games and more</description>
-        <price>99.99</price>
-        <image>assets/pic/Nokia_6010.gif</image>
-        <series>6000</series>
-        <triband>false</triband>
-        <camera>false</camera>
-        <video>false</video>
-        <highlight1>MMS</highlight1>
-		<highlight2>Large color display</highlight2>
-    </product>
-
-    <product productId="2">
-        <name>Nokia 3100</name>
-        <color>Blue</color>
-        <description>Light up the night with a glow-in-the-dark cover - when it's charged with light you can easily find your phone in the dark. When you get a call, the Nokia 3100 phone flashes in tune with your ringing tone. And when you snap on a Nokia Xpress-on™ gaming cover*, you'll get luminescent light effects in time to the gaming action.</description>
-        <price>139</price>
-        <image>assets/pic/Nokia_3100_blue.gif</image>
-        <series>3000</series>
-        <triband>true</triband>
-        <camera>false</camera>
-        <video>false</video>
-        <highlight1>Glow-in-the-dark</highlight1>
-		<highlight2>Flashing lights</highlight2>
-    </product>
-
-    <product productId="3">
-        <name>Nokia 3100</name>
-        <color>Pink</color>
-        <description>Light up the night with a glow-in-the-dark cover - when it's charged with light you can easily find your phone in the dark. When you get a call, the Nokia 3100 phone flashes in tune with your ringing tone. And when you snap on a Nokia Xpress-on™ gaming cover*, you'll get luminescent light effects in time to the gaming action.</description>
-        <price>139</price>
-        <image>assets/pic/Nokia_3100_pink.gif</image>
-        <series>3000</series>
-        <triband>true</triband>
-        <camera>false</camera>
-        <video>false</video>
-        <highlight1>Glow-in-the-dark</highlight1>
-		<highlight2>Flashing lights</highlight2>
-    </product>
-
-    <product productId="4">
-        <name>Nokia 3120</name>
-        <color></color>
-        <description>Designed for both business and pleasure, the elegant Nokia 3120 phone offers a pleasing mix of features. Enclosed within its chic, compact body, you will discover the benefits of tri-band compatibility, a color screen, MMS, XHTML browsing, cheerful screensavers, and much more.</description>
-        <price>159.99</price>
-        <image>assets/pic/Nokia_3120.gif</image>
-        <series>3000</series>
-        <triband>true</triband>
-        <camera>false</camera>
-        <video>false</video>
-        <highlight1>Multimedia messaging</highlight1>
-		<highlight2>Animated screensavers</highlight2>
-    </product>
-
-    <product productId="5">
-        <name>Nokia 3220</name>
-        <color></color>
-        <description>The Nokia 3220 phone is a fresh new cut on some familiar ideas - animate your MMS messages with cute characters, see the music with lights that flash in time with your ringing tone, download wallpapers and screensavers with matching color schemes for the interface.</description>
-        <price>159.99</price>
-        <image>assets/pic/Nokia_3220.gif</image>
-        <series>3000</series>
-        <triband>false</triband>
-        <camera>true</camera>
-        <video>false</video>
-        <highlight1>MIDI tones</highlight1>
-		<highlight2>Cut-out covers</highlight2>
-    </product>
-
-    <product productId="6">
-        <name>Nokia 3650</name>
-        <color></color>
-        <description>Messaging is more personal, versatile and fun with the Nokia 3650 camera phone.  Capture experiences as soon as you see them and send the photos you take to you friends and family.</description>
-        <price>199.99</price>
-        <image>assets/pic/Nokia_3650.gif</image>
-        <series>3000</series>
-        <triband>false</triband>
-        <camera>true</camera>
-        <video>true</video>
-        <highlight1>Infrared or Bluetooth</highlight1>
-		<highlight2>Built-in XHTML browser</highlight2>
-    </product>
-
-    <product productId="7">
-        <name>Nokia 6820</name>
-        <color></color>
-        <description>Messaging just got a whole lot smarter. The Nokia 6820 messaging device puts the tools you need for rich communication - full messaging keyboard, digital camera, mobile email, MMS, SMS, and Instant Messaging - right at your fingertips, in a small, sleek device.</description>
-        <price>299.99</price>
-        <image>assets/pic/Nokia_6820.gif</image>
-        <series>6000</series>
-        <triband>true</triband>
-        <camera>true</camera>
-        <video>false</video>
-        <highlight1>Messaging keyboard</highlight1>
-		<highlight2>Bluetooth </highlight2>
-    </product>
-
-    <product productId="8">
-        <name>Nokia 6670</name>
-        <color></color>
-        <description>Classic business tools meet your creative streak in the Nokia 6670 imaging smartphone. It has a Netfront Web browser with PDF support, document viewer applications for email attachments, a direct printing application, and a megapixel still camera that also shoots up to 10 minutes of video.</description>
-        <price>309.99</price>
-        <image>assets/pic/Nokia_6670.gif</image>
-        <series>6000</series>
-        <triband>false</triband>
-        <camera>true</camera>
-        <video>true</video>
-        <highlight1>PDF support</highlight1>
-		<highlight2>4x digital zoom</highlight2>
-    </product>
-
-    <product productId="9">
-        <name>Nokia 6620</name>
-        <color></color>
-        <description>Shoot a basket. Shoot a movie. Video phones from Nokia... the perfect way to save and share life’s playful moments. Feel connected.</description>
-        <price>329.99</price>
-        <image>assets/pic/Nokia_6620.gif</image>
-        <series>6000</series>
-        <triband>false</triband>
-        <camera>true</camera>
-        <video>true</video>
-        <highlight1>Bluetooth technology</highlight1>
-		<highlight2>Up to 10 minutes video</highlight2>
-    </product>
-
-    <product productId="10">
-        <name>Nokia 3230</name>
-        <color>Silver</color>
-        <description>Get creative with the Nokia 3230 smartphone. Create your own ringing tones, print your mobile images, play multiplayer games over a wireless Bluetooth connection, and browse HTML and xHTML Web pages. Plus, with a 32 MB MMC card and expandable memory, you'll have lots of space to be creative.</description>
-        <price>369</price>
-        <image>assets/pic/Nokia_3230_black.gif</image>
-        <series>3000</series>
-        <triband>false</triband>
-        <camera>true</camera>
-        <video>true</video>
-        <highlight1>1.3 megapixel</highlight1>
-		<highlight2>Expandable memory</highlight2>
-    </product>
-
-    <product productId="11">
-        <name>Nokia 3230</name>
-        <color>Bronze</color>
-        <description>Get creative with the Nokia 3230 smartphone. Create your own ringing tones, print your mobile images, play multiplayer games over a wireless Bluetooth connection, and browse HTML and xHTML Web pages. Plus, with a 32 MB MMC card and expandable memory, you'll have lots of space to be creative.</description>
-        <price>369</price>
-        <image>assets/pic/Nokia_3230_bronze.gif</image>
-        <series>3000</series>
-        <triband>false</triband>
-        <camera>true</camera>
-        <video>true</video>
-        <highlight1>1.3 megapixel</highlight1>
-		<highlight2>Expandable memory</highlight2>
-    </product>
-
-    <product productId="12">
-        <name>Nokia 6630</name>
-        <color></color>
-        <description>Not only is the Nokia 6630 imaging smartphone a 1.3 megapixel digital imaging device (1.3 megapixel camera sensor, effective resolution 1.23 megapixels for image capture, image size 1280 x 960 pixels), it's also a portable office and a modern rich-media machine.</description>
-        <price>379</price>
-        <image>assets/pic/Nokia_6630.gif</image>
-        <series>6000</series>
-        <triband>false</triband>
-        <camera>true</camera>
-        <video>true</video>
-        <highlight1>1.3 megapixel</highlight1>
-		<highlight2>6x smooth digital zoom</highlight2>
-    </product>
-
-    
-   
+
+<catalog>
+
+    <product productId="1">
+        <name>Nokia 6010</name>
+        <color></color>
+        <description>Easy to use without sacrificing style, the Nokia 6010 phone offers functional voice communication supported by text messaging, multimedia messaging, mobile internet, games and more</description>
+        <price>99.99</price>
+        <image>assets/pic/Nokia_6010.gif</image>
+        <series>6000</series>
+        <triband>false</triband>
+        <camera>false</camera>
+        <video>false</video>
+        <highlight1>MMS</highlight1>
+		<highlight2>Large color display</highlight2>
+    </product>
+
+    <product productId="2">
+        <name>Nokia 3100</name>
+        <color>Blue</color>
+        <description>Light up the night with a glow-in-the-dark cover - when it's charged with light you can easily find your phone in the dark. When you get a call, the Nokia 3100 phone flashes in tune with your ringing tone. And when you snap on a Nokia Xpress-on™ gaming cover*, you'll get luminescent light effects in time to the gaming action.</description>
+        <price>139</price>
+        <image>assets/pic/Nokia_3100_blue.gif</image>
+        <series>3000</series>
+        <triband>true</triband>
+        <camera>false</camera>
+        <video>false</video>
+        <highlight1>Glow-in-the-dark</highlight1>
+		<highlight2>Flashing lights</highlight2>
+    </product>
+
+    <product productId="3">
+        <name>Nokia 3100</name>
+        <color>Pink</color>
+        <description>Light up the night with a glow-in-the-dark cover - when it's charged with light you can easily find your phone in the dark. When you get a call, the Nokia 3100 phone flashes in tune with your ringing tone. And when you snap on a Nokia Xpress-on™ gaming cover*, you'll get luminescent light effects in time to the gaming action.</description>
+        <price>139</price>
+        <image>assets/pic/Nokia_3100_pink.gif</image>
+        <series>3000</series>
+        <triband>true</triband>
+        <camera>false</camera>
+        <video>false</video>
+        <highlight1>Glow-in-the-dark</highlight1>
+		<highlight2>Flashing lights</highlight2>
+    </product>
+
+    <product productId="4">
+        <name>Nokia 3120</name>
+        <color></color>
+        <description>Designed for both business and pleasure, the elegant Nokia 3120 phone offers a pleasing mix of features. Enclosed within its chic, compact body, you will discover the benefits of tri-band compatibility, a color screen, MMS, XHTML browsing, cheerful screensavers, and much more.</description>
+        <price>159.99</price>
+        <image>assets/pic/Nokia_3120.gif</image>
+        <series>3000</series>
+        <triband>true</triband>
+        <camera>false</camera>
+        <video>false</video>
+        <highlight1>Multimedia messaging</highlight1>
+		<highlight2>Animated screensavers</highlight2>
+    </product>
+
+    <product productId="5">
+        <name>Nokia 3220</name>
+        <color></color>
+        <description>The Nokia 3220 phone is a fresh new cut on some familiar ideas - animate your MMS messages with cute characters, see the music with lights that flash in time with your ringing tone, download wallpapers and screensavers with matching color schemes for the interface.</description>
+        <price>159.99</price>
+        <image>assets/pic/Nokia_3220.gif</image>
+        <series>3000</series>
+        <triband>false</triband>
+        <camera>true</camera>
+        <video>false</video>
+        <highlight1>MIDI tones</highlight1>
+		<highlight2>Cut-out covers</highlight2>
+    </product>
+
+    <product productId="6">
+        <name>Nokia 3650</name>
+        <color></color>
+        <description>Messaging is more personal, versatile and fun with the Nokia 3650 camera phone.  Capture experiences as soon as you see them and send the photos you take to you friends and family.</description>
+        <price>199.99</price>
+        <image>assets/pic/Nokia_3650.gif</image>
+        <series>3000</series>
+        <triband>false</triband>
+        <camera>true</camera>
+        <video>true</video>
+        <highlight1>Infrared or Bluetooth</highlight1>
+		<highlight2>Built-in XHTML browser</highlight2>
+    </product>
+
+    <product productId="7">
+        <name>Nokia 6820</name>
+        <color></color>
+        <description>Messaging just got a whole lot smarter. The Nokia 6820 messaging device puts the tools you need for rich communication - full messaging keyboard, digital camera, mobile email, MMS, SMS, and Instant Messaging - right at your fingertips, in a small, sleek device.</description>
+        <price>299.99</price>
+        <image>assets/pic/Nokia_6820.gif</image>
+        <series>6000</series>
+        <triband>true</triband>
+        <camera>true</camera>
+        <video>false</video>
+        <highlight1>Messaging keyboard</highlight1>
+		<highlight2>Bluetooth </highlight2>
+    </product>
+
+    <product productId="8">
+        <name>Nokia 6670</name>
+        <color></color>
+        <description>Classic business tools meet your creative streak in the Nokia 6670 imaging smartphone. It has a Netfront Web browser with PDF support, document viewer applications for email attachments, a direct printing application, and a megapixel still camera that also shoots up to 10 minutes of video.</description>
+        <price>309.99</price>
+        <image>assets/pic/Nokia_6670.gif</image>
+        <series>6000</series>
+        <triband>false</triband>
+        <camera>true</camera>
+        <video>true</video>
+        <highlight1>PDF support</highlight1>
+		<highlight2>4x digital zoom</highlight2>
+    </product>
+
+    <product productId="9">
+        <name>Nokia 6620</name>
+        <color></color>
+        <description>Shoot a basket. Shoot a movie. Video phones from Nokia... the perfect way to save and share life’s playful moments. Feel connected.</description>
+        <price>329.99</price>
+        <image>assets/pic/Nokia_6620.gif</image>
+        <series>6000</series>
+        <triband>false</triband>
+        <camera>true</camera>
+        <video>true</video>
+        <highlight1>Bluetooth technology</highlight1>
+		<highlight2>Up to 10 minutes video</highlight2>
+    </product>
+
+    <product productId="10">
+        <name>Nokia 3230</name>
+        <color>Silver</color>
+        <description>Get creative with the Nokia 3230 smartphone. Create your own ringing tones, print your mobile images, play multiplayer games over a wireless Bluetooth connection, and browse HTML and xHTML Web pages. Plus, with a 32 MB MMC card and expandable memory, you'll have lots of space to be creative.</description>
+        <price>369</price>
+        <image>assets/pic/Nokia_3230_black.gif</image>
+        <series>3000</series>
+        <triband>false</triband>
+        <camera>true</camera>
+        <video>true</video>
+        <highlight1>1.3 megapixel</highlight1>
+		<highlight2>Expandable memory</highlight2>
+    </product>
+
+    <product productId="11">
+        <name>Nokia 3230</name>
+        <color>Bronze</color>
+        <description>Get creative with the Nokia 3230 smartphone. Create your own ringing tones, print your mobile images, play multiplayer games over a wireless Bluetooth connection, and browse HTML and xHTML Web pages. Plus, with a 32 MB MMC card and expandable memory, you'll have lots of space to be creative.</description>
+        <price>369</price>
+        <image>assets/pic/Nokia_3230_bronze.gif</image>
+        <series>3000</series>
+        <triband>false</triband>
+        <camera>true</camera>
+        <video>true</video>
+        <highlight1>1.3 megapixel</highlight1>
+		<highlight2>Expandable memory</highlight2>
+    </product>
+
+    <product productId="12">
+        <name>Nokia 6630</name>
+        <color></color>
+        <description>Not only is the Nokia 6630 imaging smartphone a 1.3 megapixel digital imaging device (1.3 megapixel camera sensor, effective resolution 1.23 megapixels for image capture, image size 1280 x 960 pixels), it's also a portable office and a modern rich-media machine.</description>
+        <price>379</price>
+        <image>assets/pic/Nokia_6630.gif</image>
+        <series>6000</series>
+        <triband>false</triband>
+        <camera>true</camera>
+        <video>true</video>
+        <highlight1>1.3 megapixel</highlight1>
+		<highlight2>6x smooth digital zoom</highlight2>
+    </product>
+
+    
+   
 </catalog>
\ No newline at end of file


Mime
View raw message