intf: rename progress to range

This is more appropriate name especially on slider widget.

ref T5361

src/Makefile_Efl.am

@@ -49,7 +49,7 @@ efl_eolian_files = \
       lib/efl/interfaces/efl_ui_base.eo \
       lib/efl/interfaces/efl_ui_drag.eo \
       lib/efl/interfaces/efl_ui_spin.eo \
-      lib/efl/interfaces/efl_ui_progress.eo \
+      lib/efl/interfaces/efl_ui_range.eo \
       lib/efl/interfaces/efl_ui_view.eo \
       lib/efl/interfaces/efl_ui_model_connect.eo \
       lib/efl/interfaces/efl_ui_factory.eo \

src/bin/elementary/test_external.c

@@ -101,7 +101,7 @@ _timer_cb(void *data)
    edje_object_part_external_param_set(edje, "ext_pbar7", &param);
 
    /* Test EO API for direct function calls */
-   efl_ui_progress_value_set(efl_part(edje, "ext_pbar3"), progress);
+   efl_ui_range_value_set(efl_part(edje, "ext_pbar3"), progress);
 
    if (progress < 1.0)
      return ECORE_CALLBACK_RENEW;
@@ -176,7 +176,7 @@ _bt_clicked(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUS
    edje_object_part_external_param_set(edje, "ext_pbar7", &param);
 
    /* Test EO API for direct function calls */
-   efl_ui_progress_value_set(efl_part(edje, "ext_pbar3"), 0.0);
+   efl_ui_range_value_set(efl_part(edje, "ext_pbar3"), 0.0);
 
    t = ecore_timer_add(0.1, _timer_cb, edje);
    efl_key_data_set(edje, "timer", t);

src/lib/efl/CMakeLists.txt

@@ -52,7 +52,7 @@ set(PUBLIC_EO_FILES
   interfaces/efl_types.eot
   interfaces/efl_ui_item.eo
   interfaces/efl_ui_menu.eo
-  interfaces/efl_ui_progress.eo
+  interfaces/efl_ui_range.eo
   interfaces/efl_ui_spin.eo
   interfaces/efl_ui_autorepeat.eo
   interfaces/efl_vpath.eo

src/lib/efl/Efl.h

@@ -86,7 +86,7 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command;
 #include "interfaces/efl_ui_base.eo.h"
 #include "interfaces/efl_ui_drag.eo.h"
 #include "interfaces/efl_ui_spin.eo.h"
-#include "interfaces/efl_ui_progress.eo.h"
+#include "interfaces/efl_ui_range.eo.h"
 #include "interfaces/efl_ui_item.eo.h"
 #include "interfaces/efl_ui_menu.eo.h"
 #include "interfaces/efl_ui_autorepeat.eo.h"

src/lib/efl/interfaces/efl_interfaces_main.c

@@ -53,7 +53,7 @@
 #include "interfaces/efl_ui_base.eo.c"
 #include "interfaces/efl_ui_drag.eo.c"
 #include "interfaces/efl_ui_spin.eo.c"
-#include "interfaces/efl_ui_progress.eo.c"
+#include "interfaces/efl_ui_range.eo.c"
 #include "interfaces/efl_ui_menu.eo.c"
 #include "interfaces/efl_ui_autorepeat.eo.c"
 #include "interfaces/efl_ui_item.eo.c"

src/lib/efl/interfaces/efl_ui_range.eo

@@ -1,12 +1,12 @@
-interface Efl.Ui.Progress
+interface Efl.Ui.Range
 {
    [[Efl UI progress interface]]
    methods {
       @property span_size {
-         [[Control the (exact) length of the bar region of a given progress widget
+         [[Control the (exact) length of the bar region of a given range widget
 
            This sets the minimum width (when in horizontal mode) or height
-           (when in vertical mode) of the actual bar area of the progress
+           (when in vertical mode) of the actual bar area of the range
            bar $obj. This in turn affects the object's minimum size. Use
            this when you're not setting other size hints expanding on the
            given direction (like weight and alignment hints) and you would
@@ -20,34 +20,34 @@ interface Efl.Ui.Progress
          get {
          }
          values {
-            size: int; [[The length of the progress's bar region]]
+            size: int; [[The length of the range's bar region]]
          }
       }
-      @property progress_value {
-         [[Control the progress value (in percentage) on a given progress widget
+      @property range_value {
+         [[Control the range value (in percentage) on a given range widget
 
-           Use this call to set progress levels.
+           Use this call to set range levels.
 
-           Note: If you pass a value out of the specified range for
+           Note: If you pass a value out of the specified interval for
            $val, it will be interpreted as the closest of the boundary
-           values in the range.]]
+           values in the interval.]]
          set {
          }
          get {
          }
          values {
-            val: double; [[The progress value (must be between $0.0 and 1.0)]]
+            val: double; [[The range value (must be between $0.0 and 1.0)]]
          }
       }
-      @property progress_min_max {
+      @property range_min_max {
          set {
-            [[Set the minimum and maximum values for given progress widget.
+            [[Set the minimum and maximum values for given range widget.
 
               Define the allowed range of values to be selected by the user.
 
               If actual value is less than $min, it will be updated to $min.
               If it is bigger then $max, will be updated to $max. Actual value
-              can be get with @Efl.Ui.Progress.progress_value.get
+              can be get with @Efl.Ui.Range.range_value.get
 
               By default, min is equal to 0.0, and max is equal to 1.0.
 
@@ -56,7 +56,7 @@ interface Efl.Ui.Progress
             ]]
          }
          get {
-            [[Get the minimum and maximum values of the given progress widget.
+            [[Get the minimum and maximum values of the given range widget.
 
               Note: If only one value is needed, the other pointer can be passed
               as $null.
@@ -68,7 +68,7 @@ interface Efl.Ui.Progress
          }
       }
       @property unit_format {
-         [[Control the format string for a given progress widget's units label
+         [[Control the format string for a given range widget's units label
 
            If $NULL is passed on $format, it will make $obj's units
            area to be hidden completely. If not, it'll set the <b>format
@@ -78,7 +78,7 @@ interface Efl.Ui.Progress
            optional. Use a format string such as "%1.2f meters" for
            example.
 
-           Note: The default format string for a progress is an integer
+           Note: The default format string for a range is an integer
            percentage, as in $"%.0f %%".]]
          set {
          }

src/lib/elementary/efl_ui_progressbar.c

@@ -398,7 +398,7 @@ _efl_ui_progressbar_efl_orientation_orientation_get(Eo *obj EINA_UNUSED, Efl_Ui_
 }
 
 EOLIAN static void
-_efl_ui_progressbar_efl_ui_progress_span_size_set(Eo *obj, Efl_Ui_Progressbar_Data *sd, Evas_Coord size)
+_efl_ui_progressbar_efl_ui_range_span_size_set(Eo *obj, Efl_Ui_Progressbar_Data *sd, Evas_Coord size)
 {
    if (sd->size == size) return;
 
@@ -417,7 +417,7 @@ _efl_ui_progressbar_efl_ui_progress_span_size_set(Eo *obj, Efl_Ui_Progressbar_Da
 }
 
 EOLIAN static Evas_Coord
-_efl_ui_progressbar_efl_ui_progress_span_size_get(Eo *obj EINA_UNUSED, Efl_Ui_Progressbar_Data *sd)
+_efl_ui_progressbar_efl_ui_range_span_size_get(Eo *obj EINA_UNUSED, Efl_Ui_Progressbar_Data *sd)
 {
    return sd->size;
 }
@@ -473,7 +473,7 @@ _progressbar_part_value_get(Efl_Ui_Progressbar_Data *sd, const char* part)
 }
 
 EOLIAN static void
-_efl_ui_progressbar_efl_ui_progress_progress_value_set(Eo *obj, Efl_Ui_Progressbar_Data *sd, double val)
+_efl_ui_progressbar_efl_ui_range_range_value_set(Eo *obj, Efl_Ui_Progressbar_Data *sd, double val)
 {
    if (EINA_DBL_EQ(sd->val, val)) return;
 
@@ -481,13 +481,13 @@ _efl_ui_progressbar_efl_ui_progress_progress_value_set(Eo *obj, Efl_Ui_Progressb
 }
 
 EOLIAN static double
-_efl_ui_progressbar_efl_ui_progress_progress_value_get(Eo *obj EINA_UNUSED, Efl_Ui_Progressbar_Data *sd)
+_efl_ui_progressbar_efl_ui_range_range_value_get(Eo *obj EINA_UNUSED, Efl_Ui_Progressbar_Data *sd)
 {
    return sd->val;
 }
 
 EOLIAN static void
-_efl_ui_progressbar_efl_ui_progress_unit_format_set(Eo *obj, Efl_Ui_Progressbar_Data *sd, const char *units)
+_efl_ui_progressbar_efl_ui_range_unit_format_set(Eo *obj, Efl_Ui_Progressbar_Data *sd, const char *units)
 {
    const char *sig;
    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_
 }
 
 EOLIAN static const char *
-_efl_ui_progressbar_efl_ui_progress_unit_format_get(Eo *obj EINA_UNUSED, Efl_Ui_Progressbar_Data *sd)
+_efl_ui_progressbar_efl_ui_range_unit_format_get(Eo *obj EINA_UNUSED, Efl_Ui_Progressbar_Data *sd)
 {
    return sd->units;
 }
@@ -530,37 +530,37 @@ _efl_ui_progressbar_pulse_get(Eo *obj EINA_UNUSED, Efl_Ui_Progressbar_Data *sd)
 EAPI void
 elm_progressbar_value_set(Evas_Object *obj, double val)
 {
-   efl_ui_progress_value_set(obj, val);
+   efl_ui_range_value_set(obj, val);
 }
 
 EAPI double
 elm_progressbar_value_get(const Evas_Object *obj)
 {
-   return efl_ui_progress_value_get(obj);
+   return efl_ui_range_value_get(obj);
 }
 
 EAPI void
 elm_progressbar_span_size_set(Evas_Object *obj, Evas_Coord size)
 {
-   efl_ui_progress_span_size_set(obj, size);
+   efl_ui_range_span_size_set(obj, size);
 }
 
 EAPI Evas_Coord
 elm_progressbar_span_size_get(const Evas_Object *obj)
 {
-   return efl_ui_progress_span_size_get(obj);
+   return efl_ui_range_span_size_get(obj);
 }
 
 EAPI void
 elm_progressbar_unit_format_set(Evas_Object *obj, const char *units)
 {
-   efl_ui_progress_unit_format_set(obj, units);
+   efl_ui_range_unit_format_set(obj, units);
 }
 
 EAPI const char *
 elm_progressbar_unit_format_get(const Evas_Object *obj)
 {
-   return efl_ui_progress_unit_format_get(obj);
+   return efl_ui_range_unit_format_get(obj);
 }
 
 EAPI void
@@ -669,7 +669,7 @@ _efl_ui_progressbar_internal_part_efl_container_content_set(Eo *obj, Elm_Part_Da
 }
 
 EOLIAN static void
-_efl_ui_progressbar_internal_part_efl_ui_progress_progress_value_set(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED, double val)
+_efl_ui_progressbar_internal_part_efl_ui_range_range_value_set(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED, double val)
 {
   Elm_Part_Data *pd = efl_data_scope_get(obj, ELM_LAYOUT_INTERNAL_PART_CLASS);
   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
 }
 
 EOLIAN static double
-_efl_ui_progressbar_internal_part_efl_ui_progress_progress_value_get(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED)
+_efl_ui_progressbar_internal_part_efl_ui_range_range_value_get(Eo *obj, Elm_Part_Data *_pd EINA_UNUSED)
 {
    Elm_Part_Data *pd = efl_data_scope_get(obj, ELM_LAYOUT_INTERNAL_PART_CLASS);
    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)
 EAPI void
 elm_progressbar_part_value_set(Evas_Object *obj, const char *part, double val)
 {
-   if (EINA_DBL_EQ(efl_ui_progress_value_get(efl_part(obj, part)), val)) return;
-   efl_ui_progress_value_set(efl_part(obj, part), val);
+   if (EINA_DBL_EQ(efl_ui_range_value_get(efl_part(obj, part)), val)) return;
+   efl_ui_range_value_set(efl_part(obj, part), val);
 }
 
 EAPI double
 elm_progressbar_part_value_get(const Evas_Object *obj, const char *part)
 {
-   return efl_ui_progress_value_get(efl_part(obj, part));
+   return efl_ui_range_value_get(efl_part(obj, part));
 }

src/lib/elementary/efl_ui_progressbar.eo

@@ -1,4 +1,4 @@
-class Efl.Ui.Progressbar (Elm.Layout, Efl.Ui.Progress,
+class Efl.Ui.Progressbar (Elm.Layout, Efl.Ui.Range,
                           Efl.Orientation)
 {
    [[Elementary progressbar class]]
@@ -57,9 +57,9 @@ class Efl.Ui.Progressbar (Elm.Layout, Efl.Ui.Progress,
       Elm.Layout.text_aliases { get; }
       Elm.Layout.content_aliases { get; }
       Elm.Layout.sizing_eval;
-      Efl.Ui.Progress.span_size { get; set; }
-      Efl.Ui.Progress.progress_value { get; set; }
-      Efl.Ui.Progress.unit_format { get; set; }
+      Efl.Ui.Range.span_size { get; set; }
+      Efl.Ui.Range.range_value { get; set; }
+      Efl.Ui.Range.unit_format { get; set; }
       Efl.Orientation.orientation { get; set; }
       Efl.Part.part;
    }

src/lib/elementary/efl_ui_progressbar_internal_part.eo

@@ -1,9 +1,9 @@
-class Efl.Ui.Progressbar.Internal.Part (Elm.Layout.Internal.Part, Efl.Ui.Progress)
+class Efl.Ui.Progressbar.Internal.Part (Elm.Layout.Internal.Part, Efl.Ui.Range)
 {
    [[Elementary progressbar internal part class]]
    data: Elm_Part_Data;
    implements {
       Efl.Container.content { set; }
-      Efl.Ui.Progress.progress_value { set; get; }
+      Efl.Ui.Range.range_value { set; get; }
    }
 }

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
 EAPI void
 elm_slider_span_size_set(Evas_Object *obj, Evas_Coord size)
 {
-   efl_ui_progress_span_size_set(obj, size);
+   efl_ui_range_span_size_set(obj, size);
 }
 
 EAPI Evas_Coord
 elm_slider_span_size_get(const Evas_Object *obj)
 {
-   return efl_ui_progress_span_size_get(obj);
+   return efl_ui_range_span_size_get(obj);
 }
 
 EAPI void
 elm_slider_unit_format_set(Evas_Object *obj, const char *units)
 {
-   efl_ui_progress_unit_format_set(obj, units);
+   efl_ui_range_unit_format_set(obj, units);
 }
 
 EAPI const char *
 elm_slider_unit_format_get(const Evas_Object *obj)
 {
-   return efl_ui_progress_unit_format_get(obj);
+   return efl_ui_range_unit_format_get(obj);
 }
 
 EAPI void
@@ -1340,13 +1340,13 @@ elm_slider_horizontal_get(const Evas_Object *obj)
 EAPI void
 elm_slider_value_set(Evas_Object *obj, double val)
 {
-   efl_ui_progress_value_set(obj, val);
+   efl_ui_range_value_set(obj, val);
 }
 
 EAPI double
 elm_slider_value_get(const Evas_Object *obj)
 {
-   return efl_ui_progress_value_get(obj);
+   return efl_ui_range_value_get(obj);
 }
 
 EAPI void
@@ -1395,7 +1395,7 @@ _efl_ui_slider_efl_orientation_orientation_get(Eo *obj EINA_UNUSED, Efl_Ui_Slide
 }
 
 EOLIAN static void
-_efl_ui_slider_efl_ui_progress_span_size_set(Eo *obj, Efl_Ui_Slider_Data *sd, Evas_Coord size)
+_efl_ui_slider_efl_ui_range_span_size_set(Eo *obj, Efl_Ui_Slider_Data *sd, Evas_Coord size)
 {
    if (sd->size == size) return;
    sd->size = size;
@@ -1421,13 +1421,13 @@ _efl_ui_slider_efl_ui_progress_span_size_set(Eo *obj, Efl_Ui_Slider_Data *sd, Ev
 }
 
 EOLIAN static Evas_Coord
-_efl_ui_slider_efl_ui_progress_span_size_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd)
+_efl_ui_slider_efl_ui_range_span_size_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd)
 {
    return sd->size;
 }
 
 EOLIAN static void
-_efl_ui_slider_efl_ui_progress_unit_format_set(Eo *obj, Efl_Ui_Slider_Data *sd, const char *units)
+_efl_ui_slider_efl_ui_range_unit_format_set(Eo *obj, Efl_Ui_Slider_Data *sd, const char *units)
 {
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
 
@@ -1454,7 +1454,7 @@ _efl_ui_slider_efl_ui_progress_unit_format_set(Eo *obj, Efl_Ui_Slider_Data *sd,
 }
 
 EOLIAN static const char *
-_efl_ui_slider_efl_ui_progress_unit_format_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd)
+_efl_ui_slider_efl_ui_range_unit_format_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd)
 {
    return sd->units;
 }
@@ -1473,7 +1473,7 @@ _efl_ui_slider_indicator_format_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd)
 }
 
 EOLIAN static void
-_efl_ui_slider_efl_ui_progress_progress_min_max_set(Eo *obj, Efl_Ui_Slider_Data *sd, double min, double max)
+_efl_ui_slider_efl_ui_range_range_min_max_set(Eo *obj, Efl_Ui_Slider_Data *sd, double min, double max)
 {
    if ((sd->val_min == min) && (sd->val_max == max)) return;
    sd->val_min = min;
@@ -1485,14 +1485,14 @@ _efl_ui_slider_efl_ui_progress_progress_min_max_set(Eo *obj, Efl_Ui_Slider_Data
 }
 
 EOLIAN static void
-_efl_ui_slider_efl_ui_progress_progress_min_max_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd, double *min, double *max)
+_efl_ui_slider_efl_ui_range_range_min_max_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd, double *min, double *max)
 {
    if (min) *min = sd->val_min;
    if (max) *max = sd->val_max;
 }
 
 EOLIAN static void
-_efl_ui_slider_efl_ui_progress_progress_value_set(Eo *obj, Efl_Ui_Slider_Data *sd, double val)
+_efl_ui_slider_efl_ui_range_range_value_set(Eo *obj, Efl_Ui_Slider_Data *sd, double val)
 {
    if (sd->val == val) return;
    sd->val = val;
@@ -1505,7 +1505,7 @@ _efl_ui_slider_efl_ui_progress_progress_value_set(Eo *obj, Efl_Ui_Slider_Data *s
 }
 
 EOLIAN static double
-_efl_ui_slider_efl_ui_progress_progress_value_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd)
+_efl_ui_slider_efl_ui_range_range_value_get(Eo *obj EINA_UNUSED, Efl_Ui_Slider_Data *sd)
 {
    return sd->val;
 }
@@ -1691,13 +1691,13 @@ _efl_ui_slider_elm_interface_atspi_widget_action_elm_actions_get(Eo *obj EINA_UN
 EAPI void
 elm_slider_min_max_set(Evas_Object *obj, double min, double max)
 {
-   efl_ui_progress_min_max_set(obj, min, max);
+   efl_ui_range_min_max_set(obj, min, max);
 }
 
 EAPI void
 elm_slider_min_max_get(const Evas_Object *obj, double *min, double *max)
 {
-   efl_ui_progress_min_max_get(obj, min, max);
+   efl_ui_range_min_max_get(obj, min, max);
 }
 
 #include "efl_ui_slider.eo.c"

src/lib/elementary/efl_ui_slider.eo

@@ -1,7 +1,7 @@
 type slider_func_type: __undefined_type; [[Elementary slider function type]]
 type slider_freefunc_type: __undefined_type; [[Elementary slider free function type]]
 
-class Efl.Ui.Slider (Elm.Layout, Efl.Ui.Progress,
+class Efl.Ui.Slider (Elm.Layout, Efl.Ui.Range,
                      Efl.Orientation,
                      Elm.Interface.Atspi.Value,
                      Elm.Interface.Atspi_Widget_Action)
@@ -144,10 +144,10 @@ class Efl.Ui.Slider (Elm.Layout, Efl.Ui.Progress,
       Elm.Layout.text_aliases { get; }
       Elm.Layout.content_aliases { get; }
       Elm.Layout.sizing_eval;
-      Efl.Ui.Progress.span_size { get; set; }
-      Efl.Ui.Progress.progress_value { get; set; }
-      Efl.Ui.Progress.unit_format { get; set; }
-      Efl.Ui.Progress.progress_min_max {get; set; }
+      Efl.Ui.Range.span_size { get; set; }
+      Efl.Ui.Range.range_value { get; set; }
+      Efl.Ui.Range.unit_format { get; set; }
+      Efl.Ui.Range.range_min_max {get; set; }
       Efl.Orientation.orientation { get; set; }
       Elm.Interface.Atspi.Value.value_and_text { get; set; }
       Elm.Interface.Atspi.Value.range { get; }