X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Flib%2Felm_panel.h;h=fabbcc0aee32338a715257f998ed053be90e9fdc;hb=c414ba036271833c1098337494b02d9eb6266d48;hp=40e4e60d9e86f5b2c8b8570c9e50dfc126d0a083;hpb=4f67709746839e2ede6156ee691090c13caa2000;p=framework%2Fuifw%2Felementary.git

diff --git a/src/lib/elm_panel.h b/src/lib/elm_panel.h
index 40e4e60..fabbcc0 100644
--- a/src/lib/elm_panel.h
+++ b/src/lib/elm_panel.h
@@ -1,5 +1,6 @@
 /**
  * @defgroup Panel Panel
+ * @ingroup Elementary
  *
  * @image html img/widget/panel/preview-00.png
  * @image latex img/widget/panel/preview-00.eps
@@ -12,20 +13,16 @@
  * @li ELM_PANEL_ORIENT_LEFT
  * @li ELM_PANEL_ORIENT_RIGHT
  *
-<<<<<<< HEAD
- * Default contents parts of the panel widget that you can use for are:
-=======
  * Default content parts of the panel widget that you can use for are:
->>>>>>> remotes/origin/upstream
  * @li "default" - A content of the panel
  *
  * Supported elm_object common APIs.
- * @li elm_object_signal_emit
- * @li elm_object_signal_callback_add
- * @li elm_object_signal_callback_del
- * @li elm_object_part_content_set
- * @li elm_object_part_content_get
- * @li elm_object_part_content_unset
+ * @li @ref elm_object_signal_emit
+ * @li @ref elm_object_signal_callback_add
+ * @li @ref elm_object_signal_callback_del
+ * @li @ref elm_object_part_content_set
+ * @li @ref elm_object_part_content_get
+ * @li @ref elm_object_part_content_unset
  *
  * @ref tutorial_panel shows one way to use this widget.
  * @{
@@ -44,23 +41,23 @@ typedef enum
  * @param parent The parent object
  *
  * @return The panel object, or NULL on failure
+ *
+ * @ingroup Panel
  */
 EAPI Evas_Object                 *elm_panel_add(Evas_Object *parent);
 
 /**
  * @brief Sets the orientation of the panel
  *
-<<<<<<< HEAD
- * @param parent The parent object
-=======
  * @param obj The panel object
->>>>>>> remotes/origin/upstream
  * @param orient The panel orientation. Can be one of the following:
  * @li ELM_PANEL_ORIENT_TOP
  * @li ELM_PANEL_ORIENT_LEFT
  * @li ELM_PANEL_ORIENT_RIGHT
  *
  * Sets from where the panel will (dis)appear.
+ *
+ * @ingroup Panel
  */
 EAPI void                         elm_panel_orient_set(Evas_Object *obj, Elm_Panel_Orient orient);
 
@@ -69,6 +66,8 @@ EAPI void                         elm_panel_orient_set(Evas_Object *obj, Elm_Pan
  *
  * @param obj The panel object
  * @return The Elm_Panel_Orient, or ELM_PANEL_ORIENT_LEFT on failure.
+ *
+ * @ingroup Panel
  */
 EAPI Elm_Panel_Orient             elm_panel_orient_get(const Evas_Object *obj);
 
@@ -76,11 +75,9 @@ EAPI Elm_Panel_Orient             elm_panel_orient_get(const Evas_Object *obj);
  * @brief Set the state of the panel.
  *
  * @param obj The panel object
-<<<<<<< HEAD
- * @param hidden If true, the panel will run the animation to contract
-=======
  * @param hidden If true, the panel will run the animation to disappear.
->>>>>>> remotes/origin/upstream
+ *
+ * @ingroup Panel
  */
 EAPI void                         elm_panel_hidden_set(Evas_Object *obj, Eina_Bool hidden);
 
@@ -88,11 +85,9 @@ EAPI void                         elm_panel_hidden_set(Evas_Object *obj, Eina_Bo
  * @brief Get the state of the panel.
  *
  * @param obj The panel object
-<<<<<<< HEAD
- * @param hidden If true, the panel is in the "hide" state
-=======
  * @return EINA_TRUE if it is hidden state
->>>>>>> remotes/origin/upstream
+ *
+ * @ingroup Panel
  */
 EAPI Eina_Bool                    elm_panel_hidden_get(const Evas_Object *obj);
 
@@ -100,38 +95,11 @@ EAPI Eina_Bool                    elm_panel_hidden_get(const Evas_Object *obj);
  * @brief Toggle the hidden state of the panel from code
  *
  * @param obj The panel object
- */
-EAPI void                         elm_panel_toggle(Evas_Object *obj);
-
-/**
-<<<<<<< HEAD
-=======
- * @brief Set the content of the panel.
  *
- * @param obj The panel object
- * @param content The content object
+ * @ingroup Panel
  */
-EAPI void elm_panel_content_set(Evas_Object *obj, Evas_Object *content);
-
-/**
- * @brief Get the content of the panel.
- *
- * @param obj The panel object
- * @return The content object of the panel or NULL if none is set.
- *
- * @see elm_panel_content_set()
- */
-EAPI Evas_Object * elm_panel_content_get(const Evas_Object *obj);
-
-/**
- * @brief Remove and return the content from the panel.
- *
- * @param obj The panel object
- * @return The content object of the panel or NULL if none is set.
- */
-EAPI Evas_Object * elm_panel_content_unset(Evas_Object *obj);
+EAPI void                         elm_panel_toggle(Evas_Object *obj);
 
 /**
->>>>>>> remotes/origin/upstream
  * @}
  */