From: Woochan Lee Date: Wed, 11 May 2016 23:39:16 +0000 (+0900) Subject: Example update. X-Git-Tag: submit/tizen/20160617.075742~39 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2f6ebd771847062e6c2c121343bcf7eae9166ae1;p=platform%2Fcore%2Fuifw%2Fui-viewmgr.git Example update. Change-Id: I13b9e38dd5b5df039a99a9421b532d986e94197d --- diff --git a/src/examples/efl/contents.cpp b/src/examples/efl/contents.cpp index c9e78e6..31be69e 100644 --- a/src/examples/efl/contents.cpp +++ b/src/examples/efl/contents.cpp @@ -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* diff --git a/src/examples/efl/page10.h b/src/examples/efl/page10.h index b1ce51e..8f7de8c 100644 --- a/src/examples/efl/page10.h +++ b/src/examples/efl/page10.h @@ -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); } diff --git a/src/examples/efl/page12.h b/src/examples/efl/page12.h index c89d66e..fdfafcf 100644 --- a/src/examples/efl/page12.h +++ b/src/examples/efl/page12.h @@ -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(); } diff --git a/src/examples/efl/page13.h b/src/examples/efl/page13.h index bdaec6b..1ca40a4 100644 --- a/src/examples/efl/page13.h +++ b/src/examples/efl/page13.h @@ -15,8 +15,10 @@ * */ -/** 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 { diff --git a/src/examples/efl/page14.h b/src/examples/efl/page14.h index e473d90..36080ef 100644 --- a/src/examples/efl/page14.h +++ b/src/examples/efl/page14.h @@ -15,8 +15,10 @@ * */ -/** 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 { diff --git a/src/examples/efl/page15.h b/src/examples/efl/page15.h index dfdde0b..30dc9ce 100644 --- a/src/examples/efl/page15.h +++ b/src/examples/efl/page15.h @@ -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); } }; diff --git a/src/examples/efl/page16.h b/src/examples/efl/page16.h index 12f3053..89ea0ef 100644 --- a/src/examples/efl/page16.h +++ b/src/examples/efl/page16.h @@ -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 { diff --git a/src/examples/efl/page2.h b/src/examples/efl/page2.h index a2b070b..ae4b496 100644 --- a/src/examples/efl/page2.h +++ b/src/examples/efl/page2.h @@ -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 { diff --git a/src/examples/efl/page6.h b/src/examples/efl/page6.h index 48b3354..5f56952 100644 --- a/src/examples/efl/page6.h +++ b/src/examples/efl/page6.h @@ -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 { diff --git a/src/examples/efl/page7.h b/src/examples/efl/page7.h index 29d0531..27f5df8 100644 --- a/src/examples/efl/page7.h +++ b/src/examples/efl/page7.h @@ -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); diff --git a/src/examples/efl/page9.h b/src/examples/efl/page9.h index 3b905c5..bfe54a0 100644 --- a/src/examples/efl/page9.h +++ b/src/examples/efl/page9.h @@ -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); }