X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=plugins%2Fdali-sharp%2Fexamples%2Fimage-view.cs;h=ba4eb06ac1b70f9bb9a5f353b8492c05c66f444f;hp=6ece63b7fe6c3e45472f65168e0c7a10f78365f7;hb=318378db7fbb0bcfb08c3c603f54857d6f5c9639;hpb=24ea337df1049251ab2e47c556edc6e8458f9c93

diff --git a/plugins/dali-sharp/examples/image-view.cs b/plugins/dali-sharp/examples/image-view.cs
index 6ece63b..ba4eb06 100755
--- a/plugins/dali-sharp/examples/image-view.cs
+++ b/plugins/dali-sharp/examples/image-view.cs
@@ -35,7 +35,7 @@ namespace ImageViewExample
         private bool _isAniFinised = true;
         private Layer layer, _layer1, _layer2;
         private PushButton _pushButton1, _pushButton2;
-        private Stage stage;
+        private Window window;
 
         public Example(Dali.Application application)
         {
@@ -46,46 +46,46 @@ namespace ImageViewExample
         public void Initialize(object source, NUIApplicationInitEventArgs e)
         {
             Log("Customized Application Initialize event handler");
-            stage = Stage.Instance;
-            stage.BackgroundColor = Color.Cyan;
-            stage.Touch += OnStageTouched;
-            stage.Wheel += OnStageWheelMoved;
-            stage.Key += OnStageKeyPressed;
-            //stage.EventProcessingFinished += OnStageEventProcessingFinished;
-
-            layer = stage.GetDefaultLayer();
+            window = Window.Instance;
+            window.BackgroundColor = Color.Cyan;
+            window.Touched += OnWindowTouched;
+            window.WheelRolled += OnWindowWheelMoved;
+            window.Key += OnWindowKeyPressed;
+            //window.EventProcessingFinished += OnWindowEventProcessingFinished;
+
+            layer = window.GetDefaultLayer();
             _layer1 = new Layer();
             _layer2 = new Layer();
-            stage.AddLayer(_layer1);
-            stage.AddLayer(_layer2);
+            window.Add(_layer1);
+            window.Add(_layer2);
             Log("_layer1.Behavior =" + _layer1.Behavior);
             if (_layer1.Behavior == Layer.LayerBehavior.LAYER_UI)
             {
                 _layer1.Behavior = Layer.LayerBehavior.LAYER_2D;
                 Log("again _layer1.Behavior =" + _layer1.Behavior);
             }
-            // Add a ImageView to the stage
+            // Add a ImageView to the window
             _imageView = new ImageView();
             _imageView.ResourceUrl = "./images/gallery-3.jpg";
             _imageView.ParentOrigin = ParentOrigin.Center;
-            _imageView.AnchorPoint = AnchorPoint.Center;
+            _imageView.PivotPoint = AnchorPoint.Center;
             _imageView.PixelArea = new Vector4(0.0f, 0.0f, 0.5f, 0.5f);
             //_imageView.SetResizePolicy(ResizePolicyType.USE_NATURAL_SIZE, DimensionType.ALL_DIMENSIONS);
             layer.Add(_imageView);
 
             _pushButton1 = new PushButton();
             _pushButton1.ParentOrigin = ParentOrigin.BottomLeft;
-            _pushButton1.AnchorPoint = AnchorPoint.BottomLeft;
+            _pushButton1.PivotPoint = AnchorPoint.BottomLeft;
             _pushButton1.LabelText = "start animation";
-            _pushButton1.Position = new Vector3(0.0f, stage.Size.Height * 0.1f, 0.0f);
+            _pushButton1.Position = new Vector3(0.0f, window.Size.Height * 0.1f, 0.0f);
             _pushButton1.Clicked += OnPushButtonClicked1;
             _layer1.Add(_pushButton1);
 
             _pushButton2 = new PushButton();
             _pushButton2.ParentOrigin = ParentOrigin.BottomLeft;
-            _pushButton2.AnchorPoint = AnchorPoint.BottomLeft;
+            _pushButton2.PivotPoint = AnchorPoint.BottomLeft;
             _pushButton2.LabelText = "reload image with same URL";
-            _pushButton2.Position = new Vector3(0.0f, stage.Size.Height * 0.2f, 0.0f);
+            _pushButton2.Position = new Vector3(0.0f, window.Size.Height * 0.2f, 0.0f);
             _pushButton2.Clicked += OnPushButtonClicked2;
             _layer2.Add(_pushButton2);
 
@@ -100,7 +100,7 @@ namespace ImageViewExample
                 _imageView = new ImageView();
                 _imageView.ResourceUrl = "./images/gallery-3.jpg";
                 _imageView.ParentOrigin = ParentOrigin.Center;
-                _imageView.AnchorPoint = AnchorPoint.Center;
+                _imageView.PivotPoint = AnchorPoint.Center;
                 _imageView.PixelArea = new Vector4(0.0f, 0.0f, 0.5f, 0.5f);
                 //_imageView.SetResizePolicy(ResizePolicyType.USE_NATURAL_SIZE, DimensionType.ALL_DIMENSIONS);
                 layer.Add(_imageView);
@@ -154,8 +154,8 @@ namespace ImageViewExample
                 _animation.TargetProperty = "Size";
                 KeyFrames _keyFrames = new KeyFrames();
                 _keyFrames.Add(0.0f, new Size(0.0f, 0.0f, 0.0f));
-                _keyFrames.Add(0.3f, new Size((stage.Size * 0.7f)));
-                _keyFrames.Add(1.0f, new Size(stage.Size));
+                _keyFrames.Add(0.3f, new Size((window.Size * 0.7f)));
+                _keyFrames.Add(1.0f, new Size(window.Size));
                 _animation.AnimateBetween(_imageView, _keyFrames, Animation.Interpolation.Linear);
 
                 _animation.EndAction = Animation.EndActions.Discard;
@@ -189,33 +189,33 @@ namespace ImageViewExample
             }
         }
 
-        public void OnStageEventProcessingFinished(object sender, EventArgs e)
+        public void OnWindowEventProcessingFinished(object sender, EventArgs e)
         {
-            Log("OnStageEventProcessingFinished()!");
+            Log("OnWindowEventProcessingFinished()!");
             if (e != null)
             {
                 Log("e != null !");
             }
         }
 
-        public void OnStageKeyPressed(object sender, Stage.KeyEventArgs e)
+        public void OnWindowKeyPressed(object sender, Window.KeyEventArgs e)
         {
-            Log("OnStageKeyEventOccured()!");
+            Log("OnWindowKeyEventOccured()!");
             Log("keyPressedName=" + e.Key.KeyPressedName);
             Log("state=" + e.Key.State);
         }
 
-        public void OnStageWheelMoved(object sender, Stage.WheelEventArgs e)
+        public void OnWindowWheelMoved(object sender, Window.WheelEventArgs e)
         {
-            Log("OnStageWheelEventOccured()!");
+            Log("OnWindowWheelEventOccured()!");
             Log("direction=" + e.Wheel.Direction);
             Log("type=" + e.Wheel.Type);
         }
 
-        // Callback for stage touched signal handling
-        public void OnStageTouched(object sender, Stage.TouchEventArgs e)
+        // Callback for window touched signal handling
+        public void OnWindowTouched(object sender, Window.TouchEventArgs e)
         {
-            Log("OnStageTouched()! e.TouchData.GetState(0)=" + e.Touch.GetState(0));
+            Log("OnWindowTouched()! e.TouchData.GetState(0)=" + e.Touch.GetState(0));
         }
 
         public void MainLoop()