felipealmeida pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=bc861a6975ac4edc11d0df3066a257d096c7c4f8
commit bc861a6975ac4edc11d0df3066a257d096c7c4f8
Author: Larry <larry....@gmail.com>
Date: Mon Feb 22 21:06:55 2016 -0300
moved eolian undefined enums to elm_systray.eo and elm_slider.eo
---
src/lib/elm_config.h | 15 ---------------
src/lib/elm_general.eot | 15 +++++++++++++++
src/lib/elm_slider.eo | 2 +-
src/lib/elm_systray.eo | 28 ++++++++++++++++++++++++++--
src/lib/elm_systray_common.h | 25 -------------------------
5 files changed, 42 insertions(+), 43 deletions(-)
diff --git a/src/lib/elm_config.h b/src/lib/elm_config.h
index 6d9cf05..746a171 100644
--- a/src/lib/elm_config.h
+++ b/src/lib/elm_config.h
@@ -837,21 +837,6 @@ EAPI Elm_Focus_Autoscroll_Mode
elm_config_focus_autoscroll_mode_get(void);
EAPI void
elm_config_focus_autoscroll_mode_set(Elm_Focus_Autoscroll_Mode mode);
/**
- * Slider's indicator visiblity mode.
- *
- * @since 1.13
- * @ingroup Slider
- */
-
-typedef enum
-{
- ELM_SLIDER_INDICATOR_VISIBLE_MODE_DEFAULT, /**< show indicator on mouse
down or change in slider value */
- ELM_SLIDER_INDICATOR_VISIBLE_MODE_ALWAYS, /**< Always show the
indicator. */
- ELM_SLIDER_INDICATOR_VISIBLE_MODE_ON_FOCUS, /**< Show the indicator on
focus */
- ELM_SLIDER_INDICATOR_VISIBLE_MODE_NONE /**< Never show the indicator
*/
-} Elm_Slider_Indicator_Visible_Mode;
-
-/**
* Sets the slider's indicator visible mode.
*
* @param obj The slider object.
diff --git a/src/lib/elm_general.eot b/src/lib/elm_general.eot
index c52dde5..3132c9e 100644
--- a/src/lib/elm_general.eot
+++ b/src/lib/elm_general.eot
@@ -237,3 +237,18 @@ enum Elm.Prefs.Item_Type
separator, [[separator type, bound to separator-like UI elements]]
swallow [[swallow type, bound to an empty 'spot' on the UI meant to receive
and display external content]]
}
+
+
+enum Elm.Slider.Indicator_Visible_Mode
+{
+ [[
+ Slider's indicator visiblity mode.
+ @since 1.13
+ ]]
+ default, [[show indicator on mouse down or change in slider value]]
+ always, [[Always show the indicator.]]
+ on_focus, [[Show the indicator on focus]]
+ none [[Never show the indicator ]]
+}
+
+
diff --git a/src/lib/elm_slider.eo b/src/lib/elm_slider.eo
index 5fc1696..729073c 100644
--- a/src/lib/elm_slider.eo
+++ b/src/lib/elm_slider.eo
@@ -236,7 +236,7 @@ class Elm.Slider (Elm.Layout, Elm.Interface_Atspi_Value,
[[Get the visible mode of indicator.]]
}
values {
- indicator_visible_mode: Elm_Slider_Indicator_Visible_Mode; [[The
indicator visible mode.]]
+ indicator_visible_mode: Elm.Slider.Indicator_Visible_Mode; [[The
indicator visible mode.]]
}
}
@property indicator_format_function {
diff --git a/src/lib/elm_systray.eo b/src/lib/elm_systray.eo
index 8854e99..9c99db6 100644
--- a/src/lib/elm_systray.eo
+++ b/src/lib/elm_systray.eo
@@ -1,3 +1,27 @@
+enum Elm.Systray.Category
+{
+ [[
+ Category of the Status Notifier Item.
+ @since 1.8
+ ]]
+ app_status, [[Indicators of application status]]
+ communications, [[Communications apps]]
+ sys_services, [[System Service apps]]
+ hardware, [[Hardware indicators]]
+ other [[undefined category]]
+}
+
+enum Elm.Systray.Status
+{
+ [[
+ Application status information.
+ @since 1.8
+ ]]
+ passive, [[Passive (normal)]]
+ active, [[Active]]
+ attention [[Needs Attention]]
+}
+
class Elm.Systray (Eo.Base)
{
eo_prefix: elm_obj_systray;
@@ -22,7 +46,7 @@ class Elm.Systray (Eo.Base)
[[Get the category of the Status Notifier Item.]]
}
values {
- cat: Elm_Systray_Category; [[Category]]
+ cat: Elm.Systray.Category; [[Category]]
}
}
@property icon_theme_path {
@@ -66,7 +90,7 @@ class Elm.Systray (Eo.Base)
[[Get the status of the Status Notifier Item.]]
}
values {
- st: Elm_Systray_Status; [[Status]]
+ st: Elm.Systray.Status; [[Status]]
}
}
@property icon_name {
diff --git a/src/lib/elm_systray_common.h b/src/lib/elm_systray_common.h
index f0871c9..67064ee 100644
--- a/src/lib/elm_systray_common.h
+++ b/src/lib/elm_systray_common.h
@@ -3,29 +3,4 @@
*/
EAPI extern int ELM_EVENT_SYSTRAY_READY;
-/**
- * Category of the Status Notifier Item.
- *
- * @since 1.8
- */
-typedef enum _Elm_Systray_Category
-{
- ELM_SYSTRAY_CATEGORY_APP_STATUS, /**< Indicators of application status */
- ELM_SYSTRAY_CATEGORY_COMMUNICATIONS, /**< Communications apps */
- ELM_SYSTRAY_CATEGORY_SYS_SERVICES, /**< System Service apps */
- ELM_SYSTRAY_CATEGORY_HARDWARE, /**< Hardware indicators */
- ELM_SYSTRAY_CATEGORY_OTHER /**< Undefined category */
-} Elm_Systray_Category;
-
-/**
- * Application status information.
- *
- * @since 1.8
- */
-typedef enum _Elm_Systray_Status
-{
- ELM_SYSTRAY_STATUS_PASSIVE, /**< Passive (normal) */
- ELM_SYSTRAY_STATUS_ACTIVE, /**< Active */
- ELM_SYSTRAY_STATUS_ATTENTION /**< Needs Attention */
-} Elm_Systray_Status;
--
