summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2019-08-26 14:21:10 +0900
committerWooHyun Jung <wh0705.jung@samsung.com>2019-08-26 14:21:10 +0900
commitde183719b337332c840562d9332709e9a59ddad8 (patch)
tree09b1ad3b3a5db95b1701bfb8a0de029bbf821e0f
parent2f534b0256c68327dae371d4400ffb643ffc9dfe (diff)
efl_ui_spin_button: rename editable to direct_text_input
Summary: as suggested in T8097. Reviewers: cedric, zmike, woohyun Reviewed By: woohyun Subscribers: #reviewers, #committers Tags: #efl Differential Revision: https://phab.enlightenment.org/D9707
-rw-r--r--src/bin/elementary/test_ui_spin_button.c6
-rw-r--r--src/lib/elementary/efl_ui_datepicker.c6
-rw-r--r--src/lib/elementary/efl_ui_spin_button.c4
-rw-r--r--src/lib/elementary/efl_ui_spin_button.eo4
-rw-r--r--src/lib/elementary/efl_ui_timepicker.c4
5 files changed, 12 insertions, 12 deletions
diff --git a/src/bin/elementary/test_ui_spin_button.c b/src/bin/elementary/test_ui_spin_button.c
index e6b3135..d6b9a96 100644
--- a/src/bin/elementary/test_ui_spin_button.c
+++ b/src/bin/elementary/test_ui_spin_button.c
@@ -42,7 +42,7 @@ test_ui_spin_button(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *
42 efl_ui_range_value_set(efl_added, 6), 42 efl_ui_range_value_set(efl_added, 6),
43 efl_ui_range_step_set(efl_added, 2), 43 efl_ui_range_step_set(efl_added, 2),
44 efl_ui_spin_button_wraparound_set(efl_added, EINA_TRUE), 44 efl_ui_spin_button_wraparound_set(efl_added, EINA_TRUE),
45 efl_ui_spin_button_editable_set(efl_added, EINA_TRUE), 45 efl_ui_spin_button_direct_text_input_set(efl_added, EINA_TRUE),
46 efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_STEADY,_spin_delay_changed_cb, NULL), 46 efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_STEADY,_spin_delay_changed_cb, NULL),
47 efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_CHANGED, _spin_changed_cb, NULL), 47 efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_CHANGED, _spin_changed_cb, NULL),
48 efl_pack(bx, efl_added)); 48 efl_pack(bx, efl_added));
@@ -51,13 +51,13 @@ test_ui_spin_button(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *
51 efl_ui_range_limits_set(efl_added, -100.0, 100.0), 51 efl_ui_range_limits_set(efl_added, -100.0, 100.0),
52 efl_ui_range_value_set(efl_added, 0), 52 efl_ui_range_value_set(efl_added, 0),
53 efl_ui_format_string_set(efl_added, "test float %0.2f", EFL_UI_FORMAT_STRING_TYPE_SIMPLE), 53 efl_ui_format_string_set(efl_added, "test float %0.2f", EFL_UI_FORMAT_STRING_TYPE_SIMPLE),
54 efl_ui_spin_button_editable_set(efl_added, EINA_FALSE), 54 efl_ui_spin_button_direct_text_input_set(efl_added, EINA_FALSE),
55 efl_pack(bx, efl_added)); 55 efl_pack(bx, efl_added));
56 56
57 efl_add(EFL_UI_SPIN_BUTTON_CLASS, bx, 57 efl_add(EFL_UI_SPIN_BUTTON_CLASS, bx,
58 efl_ui_range_limits_set(efl_added, 1, 12), 58 efl_ui_range_limits_set(efl_added, 1, 12),
59 efl_ui_range_value_set(efl_added, 1), 59 efl_ui_range_value_set(efl_added, 1),
60 efl_ui_spin_button_editable_set(efl_added, EINA_FALSE), 60 efl_ui_spin_button_direct_text_input_set(efl_added, EINA_FALSE),
61 efl_ui_format_values_set(efl_added, EINA_C_ARRAY_ACCESSOR_NEW(special_values)), 61 efl_ui_format_values_set(efl_added, EINA_C_ARRAY_ACCESSOR_NEW(special_values)),
62 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL), 62 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL),
63 efl_pack(bx, efl_added)); 63 efl_pack(bx, efl_added));
diff --git a/src/lib/elementary/efl_ui_datepicker.c b/src/lib/elementary/efl_ui_datepicker.c
index 0a4a39b..84b3841 100644
--- a/src/lib/elementary/efl_ui_datepicker.c
+++ b/src/lib/elementary/efl_ui_datepicker.c
@@ -162,21 +162,21 @@ _fields_init(Eo *obj)
162 pd->year = efl_add(EFL_UI_SPIN_BUTTON_CLASS, obj, 162 pd->year = efl_add(EFL_UI_SPIN_BUTTON_CLASS, obj,
163 efl_ui_range_limits_set(efl_added, 1900, 2037), 163 efl_ui_range_limits_set(efl_added, 1900, 2037),
164 efl_ui_spin_button_wraparound_set(efl_added, EINA_TRUE), 164 efl_ui_spin_button_wraparound_set(efl_added, EINA_TRUE),
165 efl_ui_spin_button_editable_set(efl_added, EINA_TRUE), 165 efl_ui_spin_button_direct_text_input_set(efl_added, EINA_TRUE),
166 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL), 166 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL),
167 efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_CHANGED,_field_changed_cb, obj)); 167 efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_CHANGED,_field_changed_cb, obj));
168 168
169 pd->month = efl_add(EFL_UI_SPIN_BUTTON_CLASS, obj, 169 pd->month = efl_add(EFL_UI_SPIN_BUTTON_CLASS, obj,
170 efl_ui_range_limits_set(efl_added, 1, 12), 170 efl_ui_range_limits_set(efl_added, 1, 12),
171 efl_ui_spin_button_wraparound_set(efl_added, EINA_TRUE), 171 efl_ui_spin_button_wraparound_set(efl_added, EINA_TRUE),
172 efl_ui_spin_button_editable_set(efl_added, EINA_TRUE), 172 efl_ui_spin_button_direct_text_input_set(efl_added, EINA_TRUE),
173 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL), 173 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL),
174 efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_CHANGED,_field_changed_cb, obj)); 174 efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_CHANGED,_field_changed_cb, obj));
175 175
176 pd->day = efl_add(EFL_UI_SPIN_BUTTON_CLASS, obj, 176 pd->day = efl_add(EFL_UI_SPIN_BUTTON_CLASS, obj,
177 efl_ui_range_limits_set(efl_added, 1, 31), 177 efl_ui_range_limits_set(efl_added, 1, 31),
178 efl_ui_spin_button_wraparound_set(efl_added, EINA_TRUE), 178 efl_ui_spin_button_wraparound_set(efl_added, EINA_TRUE),
179 efl_ui_spin_button_editable_set(efl_added, EINA_TRUE), 179 efl_ui_spin_button_direct_text_input_set(efl_added, EINA_TRUE),
180 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL), 180 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL),
181 efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_CHANGED,_field_changed_cb, obj)); 181 efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_CHANGED,_field_changed_cb, obj));
182 182
diff --git a/src/lib/elementary/efl_ui_spin_button.c b/src/lib/elementary/efl_ui_spin_button.c
index 131d84f..627c6fd 100644
--- a/src/lib/elementary/efl_ui_spin_button.c
+++ b/src/lib/elementary/efl_ui_spin_button.c
@@ -722,13 +722,13 @@ _efl_ui_spin_button_efl_ui_range_display_range_value_set(Eo *obj, Efl_Ui_Spin_Bu
722} 722}
723 723
724EOLIAN static void 724EOLIAN static void
725_efl_ui_spin_button_editable_set(Eo *obj EINA_UNUSED, Efl_Ui_Spin_Button_Data *sd, Eina_Bool editable) 725_efl_ui_spin_button_direct_text_input_set(Eo *obj EINA_UNUSED, Efl_Ui_Spin_Button_Data *sd, Eina_Bool editable)
726{ 726{
727 sd->editable = editable; 727 sd->editable = editable;
728} 728}
729 729
730EOLIAN static Eina_Bool 730EOLIAN static Eina_Bool
731_efl_ui_spin_button_editable_get(const Eo *obj EINA_UNUSED, Efl_Ui_Spin_Button_Data *sd) 731_efl_ui_spin_button_direct_text_input_get(const Eo *obj EINA_UNUSED, Efl_Ui_Spin_Button_Data *sd)
732{ 732{
733 return sd->editable; 733 return sd->editable;
734} 734}
diff --git a/src/lib/elementary/efl_ui_spin_button.eo b/src/lib/elementary/efl_ui_spin_button.eo
index 06a57f1..8216c5d 100644
--- a/src/lib/elementary/efl_ui_spin_button.eo
+++ b/src/lib/elementary/efl_ui_spin_button.eo
@@ -40,7 +40,7 @@ class @beta Efl.Ui.Spin_Button extends Efl.Ui.Spin implements Efl.Ui.Focus.Compo
40 circulate: bool(false); [[$true to enable circulate or $false to disable it.]] 40 circulate: bool(false); [[$true to enable circulate or $false to disable it.]]
41 } 41 }
42 } 42 }
43 @property editable { 43 @property direct_text_input {
44 [[Control whether the spin can be directly edited by the user. 44 [[Control whether the spin can be directly edited by the user.
45 45
46 Spin objects can have editing disabled, in which case they can only 46 Spin objects can have editing disabled, in which case they can only
@@ -55,7 +55,7 @@ class @beta Efl.Ui.Spin_Button extends Efl.Ui.Spin implements Efl.Ui.Focus.Compo
55 get { 55 get {
56 } 56 }
57 values { 57 values {
58 editable: bool(false); [[$true to allow users to edit it or $false to don't allow users to edit it directly.]] 58 direct_text_input: bool(false); [[$true to allow users to edit it or $false to don't allow users to edit it directly.]]
59 } 59 }
60 } 60 }
61 } 61 }
diff --git a/src/lib/elementary/efl_ui_timepicker.c b/src/lib/elementary/efl_ui_timepicker.c
index a1ca671..901678c 100644
--- a/src/lib/elementary/efl_ui_timepicker.c
+++ b/src/lib/elementary/efl_ui_timepicker.c
@@ -124,14 +124,14 @@ _fields_init(Eo *obj)
124 pd->hour = efl_add(EFL_UI_SPIN_BUTTON_CLASS, obj, 124 pd->hour = efl_add(EFL_UI_SPIN_BUTTON_CLASS, obj,
125 efl_ui_range_limits_set(efl_added, 1, 12), 125 efl_ui_range_limits_set(efl_added, 1, 12),
126 efl_ui_spin_button_wraparound_set(efl_added, EINA_TRUE), 126 efl_ui_spin_button_wraparound_set(efl_added, EINA_TRUE),
127 efl_ui_spin_button_editable_set(efl_added, EINA_TRUE), 127 efl_ui_spin_button_direct_text_input_set(efl_added, EINA_TRUE),
128 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL), 128 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL),
129 efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_CHANGED,_field_changed_cb, obj)); 129 efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_CHANGED,_field_changed_cb, obj));
130 130
131 pd->min = efl_add(EFL_UI_SPIN_BUTTON_CLASS, obj, 131 pd->min = efl_add(EFL_UI_SPIN_BUTTON_CLASS, obj,
132 efl_ui_range_limits_set(efl_added, 0, 59), 132 efl_ui_range_limits_set(efl_added, 0, 59),
133 efl_ui_spin_button_wraparound_set(efl_added, EINA_TRUE), 133 efl_ui_spin_button_wraparound_set(efl_added, EINA_TRUE),
134 efl_ui_spin_button_editable_set(efl_added, EINA_TRUE), 134 efl_ui_spin_button_direct_text_input_set(efl_added, EINA_TRUE),
135 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL), 135 efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL),
136 efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_CHANGED,_field_changed_cb, obj)); 136 efl_event_callback_add(efl_added, EFL_UI_RANGE_EVENT_CHANGED,_field_changed_cb, obj));
137 137