fix bug hermet added in font code! :)

[framework/uifw/elementary.git] / src / lib / elm_actionslider.h

diff --git a/src/lib/elm_actionslider.h b/src/lib/elm_actionslider.h
index f0d2c04..1be91fc 100644 (file)
--- a/src/lib/elm_actionslider.h
+++ b/src/lib/elm_actionslider.h
@@ -1,5 +1,6 @@
 /**
  * @addtogroup Actionslider Actionslider
+ * @ingroup Elementary
  *
  * @image html img/widget/actionslider/preview-00.png
  * @image latex img/widget/actionslider/preview-00.eps
@@ -28,19 +29,15 @@
  *                 "right" or "center").
  *
  * Default text parts of the actionslider widget that you can use for are:
-<<<<<<< HEAD
- * @li "indicator" - A indicator label of the actionslider
-=======
  * @li "indicator" - An indicator label of the actionslider
->>>>>>> remotes/origin/upstream
  * @li "left" - A left label of the actionslider
  * @li "right" - A right label of the actionslider
  * @li "center" - A center label of the actionslider
  *
  * Supported elm_object common APIs.
- * @li elm_object_part_text_set
- * @li elm_object_part_text_get
- * 
+ * @li @ref elm_object_part_text_set
+ * @li @ref elm_object_part_text_get
+ *
  * See an example of actionslider usage @ref actionslider_example_page "here"
  * @{
  */
@@ -58,6 +55,8 @@ typedef enum
  *
  * @param parent The parent object
  * @return The new actionslider object or NULL if it cannot be created
+ *
+ * @ingroup Actionslider
  */
 EAPI Evas_Object                *elm_actionslider_add(Evas_Object *parent);
 
@@ -66,6 +65,8 @@ EAPI Evas_Object                *elm_actionslider_add(Evas_Object *parent);
  *
  * @param obj The actionslider object
  * @return The selected label
+ *
+ * @ingroup Actionslider
  */
 EAPI const char                 *elm_actionslider_selected_label_get(const Evas_Object *obj);
 
@@ -74,6 +75,8 @@ EAPI const char                 *elm_actionslider_selected_label_get(const Evas_
  *
  * @param obj The actionslider object.
  * @param pos The position of the indicator.
+ *
+ * @ingroup Actionslider
  */
 EAPI void                        elm_actionslider_indicator_pos_set(Evas_Object *obj, Elm_Actionslider_Pos pos);
 
@@ -82,6 +85,8 @@ EAPI void                        elm_actionslider_indicator_pos_set(Evas_Object
  *
  * @param obj The actionslider object.
  * @return The position of the indicator.
+ *
+ * @ingroup Actionslider
  */
 EAPI Elm_Actionslider_Pos        elm_actionslider_indicator_pos_get(const Evas_Object *obj);
 
@@ -91,6 +96,8 @@ EAPI Elm_Actionslider_Pos        elm_actionslider_indicator_pos_get(const Evas_O
  *
  * @param obj The actionslider object.
  * @param pos Bit mask indicating the magnet positions.
+ *
+ * @ingroup Actionslider
  */
 EAPI void                        elm_actionslider_magnet_pos_set(Evas_Object *obj, Elm_Actionslider_Pos pos);
 
@@ -99,6 +106,8 @@ EAPI void                        elm_actionslider_magnet_pos_set(Evas_Object *ob
  *
  * @param obj The actionslider object.
  * @return The positions with magnet property.
+ *
+ * @ingroup Actionslider
  */
 EAPI Elm_Actionslider_Pos        elm_actionslider_magnet_pos_get(const Evas_Object *obj);
 
@@ -110,6 +119,8 @@ EAPI Elm_Actionslider_Pos        elm_actionslider_magnet_pos_get(const Evas_Obje
  *
  * @param obj The actionslider object.
  * @param pos Bit mask indicating the enabled positions.
+ *
+ * @ingroup Actionslider
  */
 EAPI void                        elm_actionslider_enabled_pos_set(Evas_Object *obj, Elm_Actionslider_Pos pos);
 
@@ -118,36 +129,11 @@ EAPI void                        elm_actionslider_enabled_pos_set(Evas_Object *o
  *
  * @param obj The actionslider object.
  * @return The enabled positions.
- */
-EAPI Elm_Actionslider_Pos        elm_actionslider_enabled_pos_get(const Evas_Object *obj);
-
-/**
-<<<<<<< HEAD
- * Hold actionslider object movement.
- *
- * @param[in] obj The actionslider object
- * @param[in] flag Actionslider hold/release
- * (EINA_TURE = hold/EIN_FALSE = release)
  *
  * @ingroup Actionslider
  */
-EAPI void   elm_actionslider_hold(Evas_Object *obj, Eina_Bool flag);
-
-
-/*
- *  Deprecated APIs
- */
-
-typedef enum
-  {
-     ELM_ACTIONSLIDER_LABEL_LEFT,
-     ELM_ACTIONSLIDER_LABEL_RIGHT,
-     ELM_ACTIONSLIDER_LABEL_CENTER,
-     ELM_ACTIONSLIDER_LABEL_BUTTON
-  } Elm_Actionslider_Label_Pos;
+EAPI Elm_Actionslider_Pos        elm_actionslider_enabled_pos_get(const Evas_Object *obj);
 
 /**
-=======
->>>>>>> remotes/origin/upstream
  * @}
  */