summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Makefile_Efl.am2
-rw-r--r--src/bin/elementary/test_external.c4
-rw-r--r--src/lib/efl/CMakeLists.txt2
-rw-r--r--src/lib/efl/Efl.h2
-rw-r--r--src/lib/efl/interfaces/efl_interfaces_main.c2
-rw-r--r--src/lib/efl/interfaces/efl_ui_range.eo (renamed from src/lib/efl/interfaces/efl_ui_progress.eo)32
-rw-r--r--src/lib/elementary/efl_ui_progressbar.c34
-rw-r--r--src/lib/elementary/efl_ui_progressbar.eo8
-rw-r--r--src/lib/elementary/efl_ui_progressbar_internal_part.eo4
-rw-r--r--src/lib/elementary/efl_ui_slider.c32
-rw-r--r--src/lib/elementary/efl_ui_slider.eo10
11 files changed, 66 insertions, 66 deletions
diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am
index b584ca3892..d615e27595 100644
--- a/src/Makefile_Efl.am
+++ b/src/Makefile_Efl.am
@@ -49,7 +49,7 @@ efl_eolian_files = \
49 lib/efl/interfaces/efl_ui_base.eo \ 49 lib/efl/interfaces/efl_ui_base.eo \
50 lib/efl/interfaces/efl_ui_drag.eo \ 50 lib/efl/interfaces/efl_ui_drag.eo \
51 lib/efl/interfaces/efl_ui_spin.eo \ 51 lib/efl/interfaces/efl_ui_spin.eo \
52 lib/efl/interfaces/efl_ui_progress.eo \ 52 lib/efl/interfaces/efl_ui_range.eo \
53 lib/efl/interfaces/efl_ui_view.eo \ 53 lib/efl/interfaces/efl_ui_view.eo \
54 lib/efl/interfaces/efl_ui_model_connect.eo \ 54 lib/efl/interfaces/efl_ui_model_connect.eo \
55 lib/efl/interfaces/efl_ui_factory.eo \ 55 lib/efl/interfaces/efl_ui_factory.eo \
diff --git a/src/bin/elementary/test_external.c b/src/bin/elementary/test_external.c
index c8a41c2592..2bb55a0bae 100644
--- a/src/bin/elementary/test_external.c
+++ b/src/bin/elementary/test_external.c
@@ -101,7 +101,7 @@ _timer_cb(void *data)
101 edje_object_part_external_param_set(edje, "ext_pbar7", &param); 101 edje_object_part_external_param_set(edje, "ext_pbar7", &param);
102 102
103 /* Test EO API for direct function calls */ 103 /* Test EO API for direct function calls */
104 efl_ui_progress_value_set(efl_part(edje, "ext_pbar3"), progress); 104 efl_ui_range_value_set(efl_part(edje, "ext_pbar3"), progress);
105 105
106 if (progress < 1.0) 106 if (progress < 1.0)
107 return ECORE_CALLBACK_RENEW; 107 return ECORE_CALLBACK_RENEW;
@@ -176,7 +176,7 @@ _bt_clicked(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUS
176 edje_object_part_external_param_set(edje, "ext_pbar7", &param); 176 edje_object_part_external_param_set(edje, "ext_pbar7", &param);
177 177
178 /* Test EO API for direct function calls */ 178 /* Test EO API for direct function calls */
179 efl_ui_progress_value_set(efl_part(edje, "ext_pbar3"), 0.0); 179 efl_ui_range_value_set(efl_part(edje, "ext_pbar3"), 0.0);
180 180
181 t = ecore_timer_add(0.1, _timer_cb, edje); 181 t = ecore_timer_add(0.1, _timer_cb, edje);
182 efl_key_data_set(edje, "timer", t); 182 efl_key_data_set(edje, "timer", t);
diff --git a/src/lib/efl/CMakeLists.txt b/src/lib/efl/CMakeLists.txt
index b0391072dd..1b0500a00a 100644
--- a/src/lib/efl/CMakeLists.txt
+++ b/src/lib/efl/CMakeLists.txt
@@ -52,7 +52,7 @@ set(PUBLIC_EO_FILES
52 interfaces/efl_types.eot 52 interfaces/efl_types.eot
53 interfaces/efl_ui_item.eo 53 interfaces/efl_ui_item.eo
54 interfaces/efl_ui_menu.eo 54 interfaces/efl_ui_menu.eo
55 interfaces/efl_ui_progress.eo 55 interfaces/efl_ui_range.eo
56 interfaces/efl_ui_spin.eo 56 interfaces/efl_ui_spin.eo
57 interfaces/efl_ui_autorepeat.eo 57 interfaces/efl_ui_autorepeat.eo
58 interfaces/efl_vpath.eo 58 interfaces/efl_vpath.eo
diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h
index 840f6eae89..4e7fbd6810 100644
--- a/src/lib/efl/Efl.h
+++ b/src/lib/efl/Efl.h
@@ -86,7 +86,7 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
86#include "interfaces/efl_ui_base.eo.h" 86#include "interfaces/efl_ui_base.eo.h"
87#include "interfaces/efl_ui_drag.eo.h" 87#include "interfaces/efl_ui_drag.eo.h"
88#include "interfaces/efl_ui_spin.eo.h" 88#include "interfaces/efl_ui_spin.eo.h"
89#include "interfaces/efl_ui_progress.eo.h" 89#include "interfaces/efl_ui_range.eo.h"
90#include "interfaces/efl_ui_item.eo.h" 90#include "interfaces/efl_ui_item.eo.h"
91#include "interfaces/efl_ui_menu.eo.h" 91#include "interfaces/efl_ui_menu.eo.h"
92#include "interfaces/efl_ui_autorepeat.eo.h" 92#include "interfaces/efl_ui_autorepeat.eo.h"
diff --git a/src/lib/efl/interfaces/efl_interfaces_main.c b/src/lib/efl/interfaces/efl_interfaces_main.c
index 9ea0cd2dd5..202be589c7 100644
--- a/src/lib/efl/interfaces/efl_interfaces_main.c
+++ b/src/lib/efl/interfaces/efl_interfaces_main.c
@@ -53,7 +53,7 @@
53#include "interfaces/efl_ui_base.eo.c" 53#include "interfaces/efl_ui_base.eo.c"
54#include "interfaces/efl_ui_drag.eo.c" 54#include "interfaces/efl_ui_drag.eo.c"
55#include "interfaces/efl_ui_spin.eo.c" 55#include "interfaces/efl_ui_spin.eo.c"
56#include "interfaces/efl_ui_progress.eo.c" 56#include "interfaces/efl_ui_range.eo.c"
57#include "interfaces/efl_ui_menu.eo.c" 57#include "interfaces/efl_ui_menu.eo.c"
58#include "interfaces/efl_ui_autorepeat.eo.c" 58#include "interfaces/efl_ui_autorepeat.eo.c"
59#include "interfaces/efl_ui_item.eo.c" 59#include "interfaces/efl_ui_item.eo.c"
diff --git a/src/lib/efl/interfaces/efl_ui_progress.eo b/src/lib/efl/interfaces/efl_ui_range.eo
index 9f12301831..b9eb9d5113 100644
--- a/src/lib/efl/interfaces/efl_ui_progress.eo
+++ b/src/lib/efl/interfaces/efl_ui_range.eo
@@ -1,12 +1,12 @@
1interface Efl.Ui.Progress 1interface Efl.Ui.Range
2{ 2{
3 [[Efl UI progress interface]] 3 [[Efl UI progress interface]]
4 methods { 4 methods {
5 @property span_size { 5 @property span_size {
6 [[Control the (exact) length of the bar region of a given progress widget 6 [[Control the (exact) length of the bar region of a given range widget
7 7
8 This sets the minimum width (when in horizontal mode) or height 8 This sets the minimum width (when in horizontal mode) or height
9 (when in vertical mode) of the actual bar area of the progress 9 (when in vertical mode) of the actual bar area of the range
10 bar $obj. This in turn affects the object's minimum size. Use 10 bar $obj. This in turn affects the object's minimum size. Use
11 this when you're not setting other size hints expanding on the 11 this when you're not setting other size hints expanding on the
12 given direction (like weight and alignment hints) and you would 12 given direction (like weight and alignment hints) and you would
@@ -20,34 +20,34 @@ interface Efl.Ui.Progress
20 get { 20 get {
21 } 21 }
22 values { 22 values {
23 size: int; [[The length of the progress's bar region]] 23 size: int; [[The length of the range's bar region]]
24 } 24 }
25 } 25 }
26 @property progress_value { 26 @property range_value {
27 [[Control the progress value (in percentage) on a given progress widget 27 [[Control the range value (in percentage) on a given range widget
28 28
29 Use this call to set progress levels. 29 Use this call to set range levels.
30 30
31 Note: If you pass a value out of the specified range for 31 Note: If you pass a value out of the specified interval for
32 $val, it will be interpreted as the closest of the boundary 32 $val, it will be interpreted as the closest of the boundary
33 values in the range.]] 33 values in the interval.]]
34 set { 34 set {
35 } 35 }
36 get { 36 get {
37 } 37 }
38 values { 38 values {
39 val: double; [[The progress value (must be between $0.0 and 1.0)]] 39 val: double; [[The range value (must be between $0.0 and 1.0)]]
40 } 40 }
41 } 41 }
42 @property progress_min_max { 42 @property range_min_max {
43 set { 43 set {
44 [[Set the minimum and maximum values for given progress widget. 44 [[Set the minimum and maximum values for given range widget.
45 45
46 Define the allowed range of values to be selected by the user. 46 Define the allowed range of values to be selected by the user.
47 47
48 If actual value is less than $min, it will be updated to $min. 48 If actual value is less than $min, it will be updated to $min.
49 If it is bigger then $max, will be updated to $max. Actual value 49 If it is bigger then $max, will be updated to $max. Actual value
50 can be get with @Efl.Ui.Progress.progress_value.get 50 can be get with @Efl.Ui.Range.range_value.get
51 51
52 By default, min is equal to 0.0, and max is equal to 1.0. 52 By default, min is equal to 0.0, and max is equal to 1.0.
53 53
@@ -56,7 +56,7 @@ interface Efl.Ui.Progress
56 ]] 56 ]]
57 } 57 }
58 get { 58 get {
59 [[Get the minimum and maximum values of the given progress widget. 59 [[Get the minimum and maximum values of the given range widget.
60 60
61 Note: If only one value is needed, the other pointer can be passed 61 Note: If only one value is needed, the other pointer can be passed
62 as $null. 62 as $null.
@@ -68,7 +68,7 @@ interface Efl.Ui.Progress
68 } 68 }
69 } 69 }
70 @property unit_format { 70 @property unit_format {
71 [[Control the format string for a given progress widget's units label 71 [[Control the format string for a given range widget's units label
72 72
73 If $NULL is passed on $format, it will make $obj's units 73 If $NULL is passed on $format, it will make $obj's units
74 area to be hidden completely. If not, it'll set the <b>format 74 area to be hidden completely. If not, it'll set the <b>format
@@ -78,7 +78,7 @@ interface Efl.Ui.Progress
78 optional. Use a format string such as "%1.2f meters" for 78 optional. Use a format string such as "%1.2f meters" for
79 example. 79 example.
80 80
81 Note: The default format string for a progress is an integer 81 Note: The default format string for a range is an integer
82 percentage, as in $"%.0f %%".]] 82 percentage, as in $"%.0f %%".]]
83 set { 83 set {
84 } 84 }
diff --git a/src/lib/elementary/efl_ui_progressbar.c b/src/lib/elementary/efl_ui_progressbar.c
index 2528db7604..85d1dd51d2 100644
--- a/src/lib/elementary/efl_ui_progressbar.c
+++ b/src/lib/elementary/efl_ui_progressbar.c
@@ -398,7 +398,7 @@ _efl_ui_progressbar_efl_orientation_orientation_get(Eo *obj EINA_UNUSED, Efl_Ui_
398} 398}
399 399
400EOLIAN static void 400EOLIAN static void
401_efl_ui_progressbar_efl_ui_progress_span_size_set(Eo *obj, Efl_Ui_Progressbar_Data *sd, Evas_Coord size) 401_efl_ui_progressbar_efl_ui_range_span_size_set(Eo *obj, Efl_Ui_Progressbar_Data *sd, Evas_Coord size)
402{ 402{
403 if (sd->size == size) return; 403 if (sd->size == size) return;
404 404
@@ -417,7 +417,7 @@ _efl_ui_progressbar_efl_ui_progress_span_size_set(Eo *obj, Efl_Ui_Progressbar_Da
417} 417}
418 418
419EOLIAN static Evas_Coord 419EOLIAN static Evas_Coord
420_efl_ui_progressbar_efl_ui_progress_span_size_get(Eo *obj EINA_UNUSED, Efl_Ui_Progressbar_Data *sd) 420_efl_ui_progressbar_efl_ui_range_span_size_get(Eo *obj EINA_UNUSED, Efl_Ui_Progressbar_Data *sd)
421{ 421{
422 return sd->size; 422 return sd->size;
423} 423}
@@ -473,7 +473,7 @@ _progressbar_part_value_get(Efl_Ui_Progressbar_Data *sd, const char* part)
473} 473}
474 474
475EOLIAN static void 475EOLIAN static void
476_efl_ui_progressbar_efl_ui_progress_progress_value_set(Eo *obj, Efl_Ui_Progressbar_Data *sd, double val) 476_efl_ui_progressbar_efl_ui_range_range_value_set(Eo *obj, Efl_Ui_Progressbar_Data *sd, double val)
477{ 477{
478 if (EINA_DBL_EQ(sd->val, val)) return; 478 if (EINA_DBL_EQ(sd->val, val)) return;
479 479
@@ -481,13 +481,13 @@ _efl_ui_progressbar_efl_ui_progress_progress_value_set(Eo *obj, Efl_Ui_Progressb
481} 481}
482 482
483EOLIAN static double 483EOLIAN static double
484_efl_ui_progressbar_efl_ui_progress_progress_value_get(Eo *obj EINA_UNUSED, Efl_Ui_Progressbar_Data *sd) 484_efl_ui_progressbar_efl_ui_range_range_value_get(Eo *obj EINA_UNUSED, Efl_Ui_Progressbar_Data *sd)
485{ 485{
486 return sd->val; 486 return sd->val;
487} 487}
488 488
489EOLIAN static void 489EOLIAN static void
490_efl_ui_progressbar_efl_ui_progress_unit_format_set(Eo *obj, Efl_Ui_Progressbar_Data *sd, const char *units) 490_efl_ui_progressbar_efl_ui_range_unit_format_set(Eo *obj, Efl_Ui_Progressbar_Data *sd, const char *units)
491{ 491{
492 const char *sig; 492 const char *sig;
493 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 493 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
@@ -502,7 +502,7 @@ _efl_ui_progressbar_efl_ui_progress_unit_format_set(Eo *obj, Efl_Ui_Progressbar_
502} 502}
503 503
504EOLIAN static const char * 504EOLIAN static const char *
505_efl_ui_progressbar_efl_ui_progress_unit_format_get(Eo *obj EINA_UNUSED, Efl_Ui_Progressbar_Data *sd) 505_efl_ui_progressbar_efl_ui_range_unit_format_get(Eo *obj EINA_UNUSED, Efl_Ui_Progressbar_Data *sd)
506{ 506{
507 return sd->units; 507 return sd->units;
508} 508}
@@ -530,37 +530,37 @@ _efl_ui_progressbar_pulse_get(Eo *obj EINA_UNUSED, Efl_Ui_Progressbar_Data *sd)
530EAPI void 530EAPI void
531elm_progressbar_value_set(Evas_Object *obj, double val) 531elm_progressbar_value_set(Evas_Object *obj, double val)
532{ 532{
533 efl_ui_progress_value_set(obj, val); 533 efl_ui_range_value_set(obj, val);
534} 534}
535 535
536EAPI double 536EAPI double
537elm_progressbar_value_get(const Evas_Object *obj) 537elm_progressbar_value_get(const Evas_Object *obj)
538{ 538{
539 return efl_ui_progress_value_get(obj); 539 return efl_ui_range_value_get(obj);
540} 540}
541 541
542EAPI void 542EAPI void
543elm_progressbar_span_size_set(Evas_Object *obj, Evas_Coord size) 543elm_progressbar_span_size_set(Evas_Object *obj, Evas_Coord size)
544{ 544{
545 efl_ui_progress_span_size_set(obj, size); 545 efl_ui_range_span_size_set(obj, size);
546} 546}
547 547
548EAPI Evas_Coord 548EAPI Evas_Coord
549elm_progressbar_span_size_get(const Evas_Object *obj) 549elm_progressbar_span_size_get(const Evas_Object *obj)
550{ 550{
551 return efl_ui_progress_span_size_get(obj); 551 return efl_ui_range_span_size_get(obj);
552} 552}
553 553
554EAPI void 554EAPI void
555elm_progressbar_unit_format_set(Evas_Object *obj, const char *units) 555elm_progressbar_unit_format_set(Evas_Object *obj, const char *units)
556{ 556{
557 efl_ui_progress_unit_format_set(obj, units); 557 efl_ui_range_unit_format_set(obj, units);
558} 558}
559 559
560EAPI const char * 560EAPI const char *
561elm_progressbar_unit_format_get(const Evas_Object *obj) 561elm_progressbar_unit_format_get(const Evas_Object *obj)
562{ 562{
563 return efl_ui_progress_unit_format_get(obj); 563 return efl_ui_range_unit_format_get(obj);
564} 564}
565 565
566EAPI void 566EAPI void
@@ -669,7 +669,7 @@ _efl_ui_progressbar_internal_part_efl_container_content_set(Eo *obj, Elm_Part_Da
669} 669}
670 670
671EOLIAN static void 671EOLIAN static void
672_efl_ui_progressbar_internal_part_efl_ui_progress_progress_value_set(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED, double val) 672_efl_ui_progressbar_internal_part_efl_ui_range_range_value_set(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED, double val)
673{ 673{
674 Elm_Part_Data *pd = efl_data_scope_get(obj, ELM_LAYOUT_INTERNAL_PART_CLASS); 674 Elm_Part_Data *pd = efl_data_scope_get(obj, ELM_LAYOUT_INTERNAL_PART_CLASS);
675 Efl_Ui_Progressbar_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_PROGRESSBAR_CLASS); 675 Efl_Ui_Progressbar_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_PROGRESSBAR_CLASS);
@@ -678,7 +678,7 @@ _efl_ui_progressbar_internal_part_efl_ui_progress_progress_value_set(Eo *obj, El
678} 678}
679 679
680EOLIAN static double 680EOLIAN static double
681_efl_ui_progressbar_internal_part_efl_ui_progress_progress_value_get(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED) 681_efl_ui_progressbar_internal_part_efl_ui_range_range_value_get(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED)
682{ 682{
683 Elm_Part_Data *pd = efl_data_scope_get(obj, ELM_LAYOUT_INTERNAL_PART_CLASS); 683 Elm_Part_Data *pd = efl_data_scope_get(obj, ELM_LAYOUT_INTERNAL_PART_CLASS);
684 Efl_Ui_Progressbar_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_PROGRESSBAR_CLASS); 684 Efl_Ui_Progressbar_Data *sd = efl_data_scope_get(pd->obj, EFL_UI_PROGRESSBAR_CLASS);
@@ -724,12 +724,12 @@ elm_progressbar_is_pulsing_get(const Evas_Object *obj)
724EAPI void 724EAPI void
725elm_progressbar_part_value_set(Evas_Object *obj, const char *part, double val) 725elm_progressbar_part_value_set(Evas_Object *obj, const char *part, double val)
726{ 726{
727 if (EINA_DBL_EQ(efl_ui_progress_value_get(efl_part(obj, part)), val)) return; 727 if (EINA_DBL_EQ(efl_ui_range_value_get(efl_part(obj, part)), val)) return;
728 efl_ui_progress_value_set(efl_part(obj, part), val); 728 efl_ui_range_value_set(efl_part(obj, part), val);
729} 729}
730 730
731EAPI double 731EAPI double
732elm_progressbar_part_value_get(const Evas_Object *obj, const char *part) 732elm_progressbar_part_value_get(const Evas_Object *obj, const char *part)
733{ 733{
734 return efl_ui_progress_value_get(efl_part(obj, part)); 734 return efl_ui_range_value_get(efl_part(obj, part));
735} 735}
diff --git a/src/lib/elementary/efl_ui_progressbar.eo b/src/lib/elementary/efl_ui_progressbar.eo
index 2dcaf65040..9086e6e82a 100644
--- a/src/lib/elementary/efl_ui_progressbar.eo
+++ b/src/lib/elementary/efl_ui_progressbar.eo
@@ -1,4 +1,4 @@
1class Efl.Ui.Progressbar (Elm.Layout, Efl.Ui.Progress, 1class Efl.Ui.Progressbar (Elm.Layout, Efl.Ui.Range,
2 Efl.Orientation) 2 Efl.Orientation)
3{ 3{
4 [[Elementary progressbar class]] 4 [[Elementary progressbar class]]
@@ -57,9 +57,9 @@ class Efl.Ui.Progressbar (Elm.Layout, Efl.Ui.Progress,
57 Elm.Layout.text_aliases { get; } 57 Elm.Layout.text_aliases { get; }
58 Elm.Layout.content_aliases { get; } 58 Elm.Layout.content_aliases { get; }
59 Elm.Layout.sizing_eval; 59 Elm.Layout.sizing_eval;
60 Efl.Ui.Progress.span_size { get; set; } 60 Efl.Ui.Range.span_size { get; set; }
61 Efl.Ui.Progress.progress_value { get; set; } 61 Efl.Ui.Range.range_value { get; set; }
62 Efl.Ui.Progress.unit_format { get; set; } 62 Efl.Ui.Range.unit_format { get; set; }
63 Efl.Orientation.orientation { get; set; } 63 Efl.Orientation.orientation { get; set; }
64 Efl.Part.part; 64 Efl.Part.part;
65 } 65 }
diff --git a/src/lib/elementary/efl_ui_progressbar_internal_part.eo b/src/lib/elementary/efl_ui_progressbar_internal_part.eo
index 09f40ee3d7..98ff92602f 100644
--- a/src/lib/elementary/efl_ui_progressbar_internal_part.eo
+++ b/src/lib/elementary/efl_ui_progressbar_internal_part.eo
@@ -1,9 +1,9 @@
1class Efl.Ui.Progressbar.Internal.Part (Elm.Layout.Internal.Part, Efl.Ui.Progress) 1class Efl.Ui.Progressbar.Internal.Part (Elm.Layout.Internal.Part, Efl.Ui.Range)
2{ 2{
3 [[Elementary progressbar internal part class]] 3 [[Elementary progressbar internal part class]]
4 data: Elm_Part_Data; 4 data: Elm_Part_Data;
5 implements { 5 implements {
6 Efl.Container.content { set; } 6 Efl.Container.content { set; }
7 Efl.Ui.Progress.progress_value { set; get; } 7 Efl.Ui.Range.range_value { set; get; }
8 } 8 }
9} 9}
diff --git a/src/lib/elementary/efl_ui_slider.c b/src/lib/elementary/efl_ui_slider.c
index 8f5d952afd..d708f30291 100644
--- a/src/lib/elementary/efl_ui_slider.c
+++ b/src/lib/elementary/efl_ui_slider.c
@@ -1296,25 +1296,25 @@ _efl_ui_slider_efl_object_constructor(Eo *obj, Efl_Ui_Slider_Data *_pd EINA_UNUS
1296EAPI void 1296EAPI void
1297elm_slider_span_size_set(Evas_Object *obj, Evas_Coord size) 1297elm_slider_span_size_set(Evas_Object *obj, Evas_Coord size)
1298{ 1298{
1299 efl_ui_progress_span_size_set(obj, size); 1299 efl_ui_range_span_size_set(obj, size);
1300} 1300}
1301 1301
1302EAPI Evas_Coord 1302EAPI Evas_Coord
1303elm_slider_span_size_get(const Evas_Object *obj) 1303elm_slider_span_size_get(const Evas_Object *obj)
1304{ 1304{
1305 return efl_ui_progress_span_size_get(obj); 1305 return efl_ui_range_span_size_get(obj);
1306} 1306}
1307 1307
1308EAPI void 1308EAPI void
1309elm_slider_unit_format_set(Evas_Object *obj, const char *units) 1309elm_slider_unit_format_set(Evas_Object *obj, const char *units)
1310{ 1310{
1311 efl_ui_progress_unit_format_set(obj, units); 1311 efl_ui_range_unit_format_set(obj, units);
1312} 1312}
1313 1313
1314EAPI const char * 1314EAPI const char *
1315elm_slider_unit_format_get(const Evas_Object *obj) 1315elm_slider_unit_format_get(const Evas_Object *obj)
1316{ 1316{
1317 return efl_ui_progress_unit_format_get(obj); 1317 return efl_ui_range_unit_format_get(obj);
1318} 1318}
1319 1319
1320EAPI void 1320EAPI void
@@ -1340,13 +1340,13 @@ elm_slider_horizontal_get(const Evas_Object *obj)
1340EAPI void 1340EAPI void
1341elm_slider_value_set(Evas_Object *obj, double val) 1341elm_slider_value_set(Evas_Object *obj, double val)
1342{ 1342{
1343 efl_ui_progress_value_set(obj, val); 1343 efl_ui_range_value_set(obj, val);
1344} 1344}
1345 1345
1346EAPI double 1346EAPI double
1347elm_slider_value_get(const Evas_Object *obj) 1347elm_slider_value_get(const Evas_Object *obj)
1348{ 1348{
1349 return efl_ui_progress_value_get(obj); 1349 return efl_ui_range_value_get(obj);
1350} 1350}
1351 1351
1352EAPI void 1352EAPI void
@@ -1395,7 +1395,7 @@ _efl_ui_slider_efl_orientation_orientation_get(Eo *obj EINA_UNUSED, Efl_Ui_Slide
1395} 1395}
1396 1396
1397EOLIAN static void 1397EOLIAN static void
1398_efl_ui_slider_efl_ui_progress_span_size_set(Eo *obj, Efl_Ui_Slider_Data *sd, Evas_Coord size) 1398_efl_ui_slider_efl_ui_range_span_size_set(Eo *obj, Efl_Ui_Slider_Data *sd, Evas_Coord size)
1399{ 1399{
1400 if (sd->size == size) return; 1400 if (sd->size == size) return;
1401 sd->size = size; 1401 sd->size = size;
@@ -1421,13 +1421,13 @@ _efl_ui_slider_efl_ui_progress_span_size_set(Eo *obj, Efl_Ui_Slider_Data *sd, Ev
1421} 1421}
1422 1422
1423EOLIAN static Evas_Coord 1423EOLIAN static Evas_Coord
1424_efl_ui_slider_efl_ui_progress_span_size_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd) 1424_efl_ui_slider_efl_ui_range_span_size_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd)
1425{ 1425{
1426 return sd->size; 1426 return sd->size;
1427} 1427}
1428 1428
1429EOLIAN static void 1429EOLIAN static void
1430_efl_ui_slider_efl_ui_progress_unit_format_set(Eo *obj, Efl_Ui_Slider_Data *sd, const char *units) 1430_efl_ui_slider_efl_ui_range_unit_format_set(Eo *obj, Efl_Ui_Slider_Data *sd, const char *units)
1431{ 1431{
1432 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 1432 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
1433 1433
@@ -1454,7 +1454,7 @@ _efl_ui_slider_efl_ui_progress_unit_format_set(Eo *obj, Efl_Ui_Slider_Data *sd,
1454} 1454}
1455 1455
1456EOLIAN static const char * 1456EOLIAN static const char *
1457_efl_ui_slider_efl_ui_progress_unit_format_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd) 1457_efl_ui_slider_efl_ui_range_unit_format_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd)
1458{ 1458{
1459 return sd->units; 1459 return sd->units;
1460} 1460}
@@ -1473,7 +1473,7 @@ _efl_ui_slider_indicator_format_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd)
1473} 1473}
1474 1474
1475EOLIAN static void 1475EOLIAN static void
1476_efl_ui_slider_efl_ui_progress_progress_min_max_set(Eo *obj, Efl_Ui_Slider_Data *sd, double min, double max) 1476_efl_ui_slider_efl_ui_range_range_min_max_set(Eo *obj, Efl_Ui_Slider_Data *sd, double min, double max)
1477{ 1477{
1478 if ((sd->val_min == min) && (sd->val_max == max)) return; 1478 if ((sd->val_min == min) && (sd->val_max == max)) return;
1479 sd->val_min = min; 1479 sd->val_min = min;
@@ -1485,14 +1485,14 @@ _efl_ui_slider_efl_ui_progress_progress_min_max_set(Eo *obj, Efl_Ui_Slider_Data
1485} 1485}
1486 1486
1487EOLIAN static void 1487EOLIAN static void
1488_efl_ui_slider_efl_ui_progress_progress_min_max_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd, double *min, double *max) 1488_efl_ui_slider_efl_ui_range_range_min_max_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd, double *min, double *max)
1489{ 1489{
1490 if (min) *min = sd->val_min; 1490 if (min) *min = sd->val_min;
1491 if (max) *max = sd->val_max; 1491 if (max) *max = sd->val_max;
1492} 1492}
1493 1493
1494EOLIAN static void 1494EOLIAN static void
1495_efl_ui_slider_efl_ui_progress_progress_value_set(Eo *obj, Efl_Ui_Slider_Data *sd, double val) 1495_efl_ui_slider_efl_ui_range_range_value_set(Eo *obj, Efl_Ui_Slider_Data *sd, double val)
1496{ 1496{
1497 if (sd->val == val) return; 1497 if (sd->val == val) return;
1498 sd->val = val; 1498 sd->val = val;
@@ -1505,7 +1505,7 @@ _efl_ui_slider_efl_ui_progress_progress_value_set(Eo *obj, Efl_Ui_Slider_Data *s
1505} 1505}
1506 1506
1507EOLIAN static double 1507EOLIAN static double
1508_efl_ui_slider_efl_ui_progress_progress_value_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd) 1508_efl_ui_slider_efl_ui_range_range_value_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd)
1509{ 1509{
1510 return sd->val; 1510 return sd->val;
1511} 1511}
@@ -1691,13 +1691,13 @@ _efl_ui_slider_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UN
1691EAPI void 1691EAPI void
1692elm_slider_min_max_set(Evas_Object *obj, double min, double max) 1692elm_slider_min_max_set(Evas_Object *obj, double min, double max)
1693{ 1693{
1694 efl_ui_progress_min_max_set(obj, min, max); 1694 efl_ui_range_min_max_set(obj, min, max);
1695} 1695}
1696 1696
1697EAPI void 1697EAPI void
1698elm_slider_min_max_get(const Evas_Object *obj, double *min, double *max) 1698elm_slider_min_max_get(const Evas_Object *obj, double *min, double *max)
1699{ 1699{
1700 efl_ui_progress_min_max_get(obj, min, max); 1700 efl_ui_range_min_max_get(obj, min, max);
1701} 1701}
1702 1702
1703#include "efl_ui_slider.eo.c" 1703#include "efl_ui_slider.eo.c"
diff --git a/src/lib/elementary/efl_ui_slider.eo b/src/lib/elementary/efl_ui_slider.eo
index 31d8c500ec..1e6d2d02fa 100644
--- a/src/lib/elementary/efl_ui_slider.eo
+++ b/src/lib/elementary/efl_ui_slider.eo
@@ -1,7 +1,7 @@
1type slider_func_type: __undefined_type; [[Elementary slider function type]] 1type slider_func_type: __undefined_type; [[Elementary slider function type]]
2type slider_freefunc_type: __undefined_type; [[Elementary slider free function type]] 2type slider_freefunc_type: __undefined_type; [[Elementary slider free function type]]
3 3
4class Efl.Ui.Slider (Elm.Layout, Efl.Ui.Progress, 4class Efl.Ui.Slider (Elm.Layout, Efl.Ui.Range,
5 Efl.Orientation, 5 Efl.Orientation,
6 Elm.Interface.Atspi.Value, 6 Elm.Interface.Atspi.Value,
7 Elm.Interface.Atspi_Widget_Action) 7 Elm.Interface.Atspi_Widget_Action)
@@ -144,10 +144,10 @@ class Efl.Ui.Slider (Elm.Layout, Efl.Ui.Progress,
144 Elm.Layout.text_aliases { get; } 144 Elm.Layout.text_aliases { get; }
145 Elm.Layout.content_aliases { get; } 145 Elm.Layout.content_aliases { get; }
146 Elm.Layout.sizing_eval; 146 Elm.Layout.sizing_eval;
147 Efl.Ui.Progress.span_size { get; set; } 147 Efl.Ui.Range.span_size { get; set; }
148 Efl.Ui.Progress.progress_value { get; set; } 148 Efl.Ui.Range.range_value { get; set; }
149 Efl.Ui.Progress.unit_format { get; set; } 149 Efl.Ui.Range.unit_format { get; set; }
150 Efl.Ui.Progress.progress_min_max {get; set; } 150 Efl.Ui.Range.range_min_max {get; set; }
151 Efl.Orientation.orientation { get; set; } 151 Efl.Orientation.orientation { get; set; }
152 Elm.Interface.Atspi.Value.value_and_text { get; set; } 152 Elm.Interface.Atspi.Value.value_and_text { get; set; }
153 Elm.Interface.Atspi.Value.range { get; } 153 Elm.Interface.Atspi.Value.range { get; }