Example update. 21/69121/3
authorWoochan Lee <wc0917.lee@samsung.com>
Wed, 11 May 2016 23:39:16 +0000 (08:39 +0900)
committerHermet Park <chuneon.park@samsung.com>
Thu, 12 May 2016 08:11:11 +0000 (01:11 -0700)
Change-Id: I13b9e38dd5b5df039a99a9421b532d986e94197d

src/examples/efl/contents.cpp
src/examples/efl/page10.h
src/examples/efl/page12.h
src/examples/efl/page13.h
src/examples/efl/page14.h
src/examples/efl/page15.h
src/examples/efl/page16.h
src/examples/efl/page2.h
src/examples/efl/page6.h
src/examples/efl/page7.h
src/examples/efl/page9.h

index c9e78e64a014d3d41bd907389f0d912c5bd5ac57..31be69e741520f78b51bc365ed38d958f788ed34 100644 (file)
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ *  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 "main.h"
 
 Elm_Toolbar*
index b1ce51ed87583a9e5492c4dd797fc8e004bdb5d0..8f7de8cb6b7190c2d3ae3c436ffb7d685cea6075 100644 (file)
@@ -15,7 +15,7 @@
  *
  */
 
-/** This page implements on_rotate() method to create portarit, landscape content.
+/** This page implements on_rotate() method to create portrait, landscape content.
  *  This page will be created suitable content in on_rotate() method.
  */
 class page10: public ui_standard_view
@@ -45,6 +45,7 @@ protected:
                                        {
                                                UI_VIEWMGR->push_view(new page11());
                                        });
+
                        this->set_content(content, "Page 10");
                        this->set_indicator(UI_VIEW_INDICATOR_DEFAULT);
                }
@@ -62,6 +63,7 @@ protected:
                                        {
                                                UI_VIEWMGR->push_view(new page11());
                                        });
+
                        this->set_content(content, "Page 10");
                        this->set_indicator(UI_VIEW_INDICATOR_OPTIMAL);
                }
index c89d66e885f668bbfe1aecc4927b10109c0e6329..fdfafcf8814bbea173546e0a4ca727a722cc9ad5 100644 (file)
@@ -61,6 +61,7 @@ protected:
                                        view->create_popup();
                                },
                                this);
+
                this->set_title_right_btn(right_btn);
        }
 
@@ -89,6 +90,7 @@ public:
                                        elm_popup_dismiss(obj);
                                },
                                NULL);
+
                popup->set_content(obj);
                popup->activate();
        }
index bdaec6bb7abe590d7d96095685fb361e4e2b8fe1..1ca40a43990b41f292428f4201923536f17daac9 100644 (file)
  *
  */
 
-/** This example create a simple view which is inheritance ui_standard_view.
- *  Then push in viewmgr.
+/** This page inherit ui_ui_standard_view
+ *  And make a view transition style as fade.
+ *  The fade effect will be shown when view appear or disappear.
+ *  The default of transition style of view was slide in/out.
  */
 class page13: public ui_standard_view
 {
index e473d906d187c57c351ae3f1bb9e23adf11e0708..36080ef2e41a33ad4ad845091a7b915b06bd021f 100644 (file)
  *
  */
 
-/** This example create a simple view which is inheritance ui_standard_view.
- *  Then push in viewmgr.
+/** This page inherit ui_ui_standard_view
+ *  And make a view transition style as none.
+ *  There will be no effect when view appear or disappear.
+ *  The default of transition style of view was slide in/out.
  */
 class page14: public ui_standard_view
 {
index dfdde0bf9f13390fc930a1a7c354edd3a50aa700..30dc9ceb251c5525b1013e53eb4c0bc46030d49c 100644 (file)
@@ -15,8 +15,9 @@
  *
  */
 
-/** This example create a simple view which is inheritance ui_standard_view.
- *  Then push in viewmgr.
+/** This page inherit ui_ui_standard_view
+ *  This create a content that has same size of screen.
+ *  When this view has rotated viewmgr's internal scroller will be enabled automatically.
  */
 class page15: public ui_standard_view
 {
@@ -39,6 +40,7 @@ protected:
                        UI_VIEWMGR->push_view(new page16());
                                },
                                this);
+
                this->set_title_right_btn(right_btn);
        }
 };
index 12f3053b6b950cfd20c76bd712e1efe031f419a2..89ea0ef25d34bd50d7fffb1cdaeec4fe9ff213d3 100644 (file)
@@ -15,8 +15,8 @@
  *
  */
 
-/** This example create a simple view which is inheritance ui_standard_view.
- *  Then push in viewmgr.
+/** This page inherit ui_ui_standard_view
+ *  This view create a lot of buttons to show how to handle title area visible state with animation or no effect.
  */
 class page16: public ui_standard_view
 {
index a2b070bb65f197910e79a88ecf4978222edbf188..ae4b49670833df56c1687f5294826841f91c6bd1 100644 (file)
@@ -16,7 +16,7 @@
  */
 
 /** This example create a simple view which is inheritance ui_standard_view.
- *  And add two buttons in view title area. hen push in viewmgr.
+ *  And add two buttons in view title area. then push in viewmgr.
  */
 class page2: public ui_standard_view
 {
index 48b3354b086d5f33a69c6fa85c47beb7fa6e064d..5f569525e68e4306a42f01f3b6fb0ac28c20e966 100644 (file)
@@ -15,7 +15,7 @@
  *
  */
 
-/** This page inherit ui_standard_view to show title with toolbar sample.
+/** This page inherit ui_standard_view to show title with toolbar(toolbar_with_title) example.
  */
 class page6: public ui_standard_view
 {
index 29d0531624710bd0e0849fd4f141ceaccbeaba8c..27f5df805da7822cf30c2b09541fade0bc949bca 100644 (file)
@@ -15,8 +15,7 @@
  *
  */
 
-/** This page inherit ui_standard_view to show title with toolbar sample.
- *  And this page make a content in page constructor time.
+/** This page inherit ui_standard_view to show title with toolbar(navigationbar) example.
  */
 class page7: public ui_standard_view
 {
@@ -38,8 +37,7 @@ protected:
                                        UI_VIEWMGR->push_view(new page8());
                                });
 
-               //FIXME: Don't delete view's content when this view poped.
-               this->set_removable_content(false);
+               //Arguments: content, title
                this->set_content(content, "Page7");
                Elm_Toolbar *toolbar = create_toolbar(this->get_base(), "navigationbar");
                this->set_toolbar(toolbar);
index 3b905c5d2a60ca24710b7f39dccde313e1721f3d..bfe54a03ae0db2657efb042bf06be1431a48ef70 100644 (file)
@@ -16,7 +16,7 @@
  */
 
 /** This page inherit ui_standard_view.
- *  And implement on_portait(), on_landscape() method to create portarit, landscape content.
+ *  And implement on_portait(), on_landscape() method to create portrait, landscape content.
  *  This page will be created suitable content in on_portrait(), on_landscape() method.
  */
 class page9: public ui_standard_view
@@ -48,6 +48,7 @@ protected:
                                {
                                        UI_VIEWMGR->push_view(new page10());
                        });
+
                this->set_content(content, "Page 9");
                this->set_indicator(UI_VIEW_INDICATOR_DEFAULT);
        }
@@ -67,6 +68,7 @@ protected:
                                {
                                        UI_VIEWMGR->push_view(new page10());
                                });
+
                this->set_content(content, "Page 9");
                this->set_indicator(UI_VIEW_INDICATOR_OPTIMAL);
        }