From 9dd6cf1ca5c8044d269713208e040850fbeb6c99 Mon Sep 17 00:00:00 2001 From: "dongsug.song" Date: Tue, 15 Nov 2016 11:47:03 +0900 Subject: [PATCH] Revert "[3.0] Add descriptions and example codes" This reverts commit 3bff3a4cd1bb1271f948a65b4c8b6fe781ac7074. Change-Id: I26452c7ec515b5ef9a25506edff03a4b506525b7 --- .../public-api/controls/buttons/check-box-button.h | 24 --------------- .../public-api/controls/buttons/push-button.h | 36 ---------------------- doc/dali-toolkit-doc.h | 8 ++--- 3 files changed, 4 insertions(+), 64 deletions(-) diff --git a/dali-toolkit/public-api/controls/buttons/check-box-button.h b/dali-toolkit/public-api/controls/buttons/check-box-button.h index 2a93154..17463dd 100644 --- a/dali-toolkit/public-api/controls/buttons/check-box-button.h +++ b/dali-toolkit/public-api/controls/buttons/check-box-button.h @@ -52,30 +52,6 @@ class CheckBoxButton; * * When the button is disabled, \e background image and \e selected image are replaced by \e disabled images. * - * Usage example: - - * - * @code - * // in Creating a DALi Application - * void HelloWorldExample::Create( Application& application ) - * { - * CheckBoxButton button = CheckBoxButton::New(); - * button.SetParentOrigin( ParentOrigin::CENTER ); - * button.SetLabelText( "Check" ); - * button.SetSize( 200, 40 ); - * button.SetBackgroundColor( Color::WHITE ); - * Stage::GetCurrent().Add( button ); - * - * // Connect to a button signal emitted by the button - * button.StateChangedSignal().Connect( this, &HelloWorldExample::OnButtonStateChanged ); - * } - * - * bool HelloWorldExample::OnButtonStateChanged( Button button ) - * { - * // Do something when the button state is changed - * // You can get the state using button.IsSelected() call - * return true; - * } - * @endcode * @SINCE_1_0.0 */ class DALI_IMPORT_API CheckBoxButton : public Button diff --git a/dali-toolkit/public-api/controls/buttons/push-button.h b/dali-toolkit/public-api/controls/buttons/push-button.h index 5d58a77..894082b 100644 --- a/dali-toolkit/public-api/controls/buttons/push-button.h +++ b/dali-toolkit/public-api/controls/buttons/push-button.h @@ -46,42 +46,6 @@ class PushButton; * By default a PushButton emits a Button::PressedSignal() signal when the button is pressed, a Button::ClickedSignal() signal when it's clicked * and a Button::ReleasedSignal() signal when it's released or having pressed it, the touch point leaves the boundary of the button. * - * Usage example: - - * - * @code - * // in Creating a DALi Application - * void HelloWorldExample::Create( Application& application ) - * { - * PushButton button = PushButton::New(); - * button.SetParentOrigin( ParentOrigin::CENTER ); - * button.SetLabelText( "Press" ); - * Stage::GetCurrent().Add( button ); - * - * // Connect to button signals emitted by the button - * button.ClickedSignal().Connect( this, &HelloWorldExample::OnButtonClicked ); - * button.PressedSignal().Connect( this, &HelloWorldExample::OnButtonPressed ); - * button.ReleasedSignal().Connect( this, &HelloWorldExample::OnButtonReleased ); - * } - * - * bool HelloWorldExample::OnButtonClicked( Button button ) - * { - * // Do something when the button is clicked - * return true; - * } - * - * bool HelloWorldExample::OnButtonPressed( Button button ) - * { - * // Do something when the button is pressed - * return true; - * } - * - * bool HelloWorldExample::OnButtonReleased( Button button ) - * { - * // Do something when the button is released - * return true; - * } - * @endcode - * * See Button for more detail on signals and modifying appearance via properties. * @SINCE_1_0.0 */ diff --git a/doc/dali-toolkit-doc.h b/doc/dali-toolkit-doc.h index b2bd746..41cf322 100644 --- a/doc/dali-toolkit-doc.h +++ b/doc/dali-toolkit-doc.h @@ -90,11 +90,11 @@ * * * @ref dali_toolkit_controls_scroll_bar - * ScrollBar is a component that can be linked to the scrollable objects. + * ScrollBar control. * * * @ref dali_toolkit_controls_scrollable - * Scrollable contains scrolled controls. + * Scrollable container controls. * * * @ref dali_toolkit_controls_item_view @@ -165,10 +165,10 @@ * @brief ImageView is a control displying an image. * @defgroup dali_toolkit_controls_scroll_bar Scroll Bar - * @brief ScrollBar is a component that can be linked to the scrollable objects. + * @brief ScrollBar control. * @defgroup dali_toolkit_controls_scrollable Scrollable - * @brief Scrollable contains scrolled controls. + * @brief Scrollable container controls. * @{ * @defgroup dali_toolkit_controls_item_view Item View -- 2.7.4