Merge "Size negotiation patch 1: Remove SetPreferred size" into tizen

[platform/core/uifw/dali-demo.git] / demo / dali-demo.cpp

diff --git a/demo/dali-demo.cpp b/demo/dali-demo.cpp
index 9194f65..31ddbd0 100644 (file)
--- a/demo/dali-demo.cpp
+++ b/demo/dali-demo.cpp
@@ -1,18 +1,19 @@
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
+/*
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
 
 #include "dali-table-view.h"
 
@@ -34,8 +35,19 @@ int main(int argc, char **argv)
   demo.AddExample(Example("motion-blur.example", "Motion Blur"));
   demo.AddExample(Example("motion-stretch.example", "Motion Stretch"));
   demo.AddExample(Example("page-turn-view.example", "Page Turn View"));
+  demo.AddExample(Example("radial-menu.example", "Radial Menu"));
+  demo.AddExample(Example("refraction-effect.example", "Refraction"));
   demo.AddExample(Example("scroll-view.example", "Scroll View"));
   demo.AddExample(Example("shadow-bone-lighting.example", "Lights and shadows"));
+//  demo.AddExample(Example("builder.example", "Script Based UI"));
+  demo.AddExample(Example("image-scaling-irregular-grid.example", "Image Scaling Modes"));
+  demo.AddExample(Example("text-view.example", "Text View"));
+  demo.AddExample(Example("animated-shapes.example", "Animated Shapes"));
+  demo.AddExample(Example("path-animation.example", "Path Animation"));
+  demo.AddExample(Example("size-negotiation.example", "Size Negotiation"));
+
+  demo.SortAlphabetically( true );
+
   app.MainLoop();
 
   return 0;