summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWooHyun Jung <wh0705.jung@samsung.com>2017-10-25 16:44:25 +0900
committerWooHyun Jung <wh0705.jung@samsung.com>2017-10-25 16:44:25 +0900
commitc1094da0f40ae59addf83d448308d9a1080e4392 (patch)
tree93cf20c830d462bc84b0ce1e37e04e563b4ac5f5
parent944c4dee1b74b7b5bff30cb99d34d7fa7e1c28f0 (diff)
efl_ui_clock: changed property name from value to time
-rw-r--r--src/bin/elementary/test_ui_clock.c2
-rw-r--r--src/lib/elementary/efl_ui_clock.c12
-rw-r--r--src/lib/elementary/efl_ui_clock.eo6
-rw-r--r--src/lib/elementary/efl_ui_clock.h2
-rw-r--r--src/lib/elementary/elm_datetime.c12
-rw-r--r--src/modules/elementary/clock_input_ctxpopup/clock_input_ctxpopup.c12
6 files changed, 23 insertions, 23 deletions
diff --git a/src/bin/elementary/test_ui_clock.c b/src/bin/elementary/test_ui_clock.c
index b911f9ca58..ad401c3bc9 100644
--- a/src/bin/elementary/test_ui_clock.c
+++ b/src/bin/elementary/test_ui_clock.c
@@ -32,7 +32,7 @@ _bt_clicked(void *data EINA_UNUSED, const Efl_Event *ev)
32 efl_ui_clock_field_visible_set(dt1, EFL_UI_CLOCK_TYPE_AMPM, EINA_TRUE); 32 efl_ui_clock_field_visible_set(dt1, EFL_UI_CLOCK_TYPE_AMPM, EINA_TRUE);
33 efl_ui_clock_field_visible_set(dt1, EFL_UI_CLOCK_TYPE_SECOND, EINA_TRUE); 33 efl_ui_clock_field_visible_set(dt1, EFL_UI_CLOCK_TYPE_SECOND, EINA_TRUE);
34 efl_ui_clock_field_visible_set(dt1, EFL_UI_CLOCK_TYPE_DAY, EINA_TRUE); 34 efl_ui_clock_field_visible_set(dt1, EFL_UI_CLOCK_TYPE_DAY, EINA_TRUE);
35 efl_ui_clock_value_set(dt1, new_time); 35 efl_ui_clock_time_set(dt1, new_time);
36 36
37 elm_object_disabled_set(dt1, EINA_TRUE); 37 elm_object_disabled_set(dt1, EINA_TRUE);
38 elm_object_disabled_set(ev->object, EINA_TRUE); 38 elm_object_disabled_set(ev->object, EINA_TRUE);
diff --git a/src/lib/elementary/efl_ui_clock.c b/src/lib/elementary/efl_ui_clock.c
index bfa4d45987..bd11bc8d60 100644
--- a/src/lib/elementary/efl_ui_clock.c
+++ b/src/lib/elementary/efl_ui_clock.c
@@ -1043,13 +1043,13 @@ _efl_ui_clock_field_limit_set(Eo *obj, Efl_Ui_Clock_Data *sd, Efl_Ui_Clock_Type
1043} 1043}
1044 1044
1045EOLIAN static Efl_Time 1045EOLIAN static Efl_Time
1046_efl_ui_clock_value_get(Eo *obj EINA_UNUSED, Efl_Ui_Clock_Data *sd) 1046_efl_ui_clock_time_get(Eo *obj EINA_UNUSED, Efl_Ui_Clock_Data *sd)
1047{ 1047{
1048 return sd->curr_time; 1048 return sd->curr_time;
1049} 1049}
1050 1050
1051EOLIAN static void 1051EOLIAN static void
1052_efl_ui_clock_value_set(Eo *obj, Efl_Ui_Clock_Data *sd, Efl_Time newtime) 1052_efl_ui_clock_time_set(Eo *obj, Efl_Ui_Clock_Data *sd, Efl_Time newtime)
1053{ 1053{
1054 if (_date_cmp(&sd->curr_time, &newtime)) return; 1054 if (_date_cmp(&sd->curr_time, &newtime)) return;
1055 sd->curr_time = newtime; 1055 sd->curr_time = newtime;
@@ -1064,13 +1064,13 @@ _efl_ui_clock_value_set(Eo *obj, Efl_Ui_Clock_Data *sd, Efl_Time newtime)
1064} 1064}
1065 1065
1066EOLIAN static Efl_Time 1066EOLIAN static Efl_Time
1067_efl_ui_clock_value_min_get(Eo *obj EINA_UNUSED, Efl_Ui_Clock_Data *sd) 1067_efl_ui_clock_time_min_get(Eo *obj EINA_UNUSED, Efl_Ui_Clock_Data *sd)
1068{ 1068{
1069 return sd->min_limit; 1069 return sd->min_limit;
1070} 1070}
1071 1071
1072EOLIAN static void 1072EOLIAN static void
1073_efl_ui_clock_value_min_set(Eo *obj, Efl_Ui_Clock_Data *sd, Efl_Time mintime) 1073_efl_ui_clock_time_min_set(Eo *obj, Efl_Ui_Clock_Data *sd, Efl_Time mintime)
1074{ 1074{
1075 struct tm old_time; 1075 struct tm old_time;
1076 1076
@@ -1089,13 +1089,13 @@ _efl_ui_clock_value_min_set(Eo *obj, Efl_Ui_Clock_Data *sd, Efl_Time mintime)
1089} 1089}
1090 1090
1091EOLIAN static Efl_Time 1091EOLIAN static Efl_Time
1092_efl_ui_clock_value_max_get(Eo *obj EINA_UNUSED, Efl_Ui_Clock_Data *sd) 1092_efl_ui_clock_time_max_get(Eo *obj EINA_UNUSED, Efl_Ui_Clock_Data *sd)
1093{ 1093{
1094 return sd->max_limit; 1094 return sd->max_limit;
1095} 1095}
1096 1096
1097EOLIAN static void 1097EOLIAN static void
1098_efl_ui_clock_value_max_set(Eo *obj, Efl_Ui_Clock_Data *sd, Efl_Time maxtime) 1098_efl_ui_clock_time_max_set(Eo *obj, Efl_Ui_Clock_Data *sd, Efl_Time maxtime)
1099{ 1099{
1100 struct tm old_time; 1100 struct tm old_time;
1101 1101
diff --git a/src/lib/elementary/efl_ui_clock.eo b/src/lib/elementary/efl_ui_clock.eo
index 3bb315d25f..0594bacc35 100644
--- a/src/lib/elementary/efl_ui_clock.eo
+++ b/src/lib/elementary/efl_ui_clock.eo
@@ -115,7 +115,7 @@ class Efl.Ui.Clock (Efl.Ui.Layout)
115 value: bool; [[$true to set edit mode, $false otherwise]] 115 value: bool; [[$true to set edit mode, $false otherwise]]
116 } 116 }
117 } 117 }
118 @property value_min { 118 @property time_min {
119 [[The lower boundary of a field. 119 [[The lower boundary of a field.
120 120
121 Year: years since 1900. Negative value represents year below 1900 121 Year: years since 1900. Negative value represents year below 1900
@@ -135,7 +135,7 @@ class Efl.Ui.Clock (Efl.Ui.Layout)
135 mintime: Efl.Time; [[Time structure containing the minimum time value.]] 135 mintime: Efl.Time; [[Time structure containing the minimum time value.]]
136 } 136 }
137 } 137 }
138 @property value_max { 138 @property time_max {
139 [[The upper boundary of a field. 139 [[The upper boundary of a field.
140 140
141 Year: years since 1900. Negative value represents year below 1900 141 Year: years since 1900. Negative value represents year below 1900
@@ -155,7 +155,7 @@ class Efl.Ui.Clock (Efl.Ui.Layout)
155 maxtime: Efl.Time; [[Time structure containing the maximum time value.]] 155 maxtime: Efl.Time; [[Time structure containing the maximum time value.]]
156 } 156 }
157 } 157 }
158 @property value { 158 @property time {
159 [[The current value of a clock object. 159 [[The current value of a clock object.
160 160
161 Year: years since 1900. Negative value represents year below 1900 161 Year: years since 1900. Negative value represents year below 1900
diff --git a/src/lib/elementary/efl_ui_clock.h b/src/lib/elementary/efl_ui_clock.h
index 4607d39af6..b882cd77a5 100644
--- a/src/lib/elementary/efl_ui_clock.h
+++ b/src/lib/elementary/efl_ui_clock.h
@@ -145,7 +145,7 @@
145 * 145 *
146 * __________ __________ 146 * __________ __________
147 * | | | | 147 * | | | |
148 * | Clock |<<<----------efl_ui_clock_value_set()---| | 148 * | Clock |<<<----------efl_ui_clock_time_set()----| |
149 * | widget | | Module | 149 * | widget | | Module |
150 * | base |----display_field_value()------------>>>| | 150 * | base |----display_field_value()------------>>>| |
151 * |__________| |__________| 151 * |__________| |__________|
diff --git a/src/lib/elementary/elm_datetime.c b/src/lib/elementary/elm_datetime.c
index 0b80f68025..6c9f34d652 100644
--- a/src/lib/elementary/elm_datetime.c
+++ b/src/lib/elementary/elm_datetime.c
@@ -82,28 +82,28 @@ elm_datetime_field_limit_get(const Evas_Object *obj, Elm_Datetime_Field_Type fie
82EAPI Eina_Bool 82EAPI Eina_Bool
83elm_datetime_value_min_set(Evas_Object *obj, const Efl_Time *mintime) 83elm_datetime_value_min_set(Evas_Object *obj, const Efl_Time *mintime)
84{ 84{
85 if (mintime) efl_ui_clock_value_min_set(obj, *mintime); 85 if (mintime) efl_ui_clock_time_min_set(obj, *mintime);
86 return EINA_TRUE; 86 return EINA_TRUE;
87} 87}
88 88
89EAPI Eina_Bool 89EAPI Eina_Bool
90elm_datetime_value_min_get(const Evas_Object *obj, Efl_Time *mintime) 90elm_datetime_value_min_get(const Evas_Object *obj, Efl_Time *mintime)
91{ 91{
92 if (mintime) *mintime = efl_ui_clock_value_min_get(obj); 92 if (mintime) *mintime = efl_ui_clock_time_min_get(obj);
93 return EINA_TRUE; 93 return EINA_TRUE;
94} 94}
95 95
96EAPI Eina_Bool 96EAPI Eina_Bool
97elm_datetime_value_set(Evas_Object *obj, const Efl_Time *newtime) 97elm_datetime_value_set(Evas_Object *obj, const Efl_Time *newtime)
98{ 98{
99 if (newtime) efl_ui_clock_value_set(obj, *newtime); 99 if (newtime) efl_ui_clock_time_set(obj, *newtime);
100 return EINA_TRUE; 100 return EINA_TRUE;
101} 101}
102 102
103EAPI Eina_Bool 103EAPI Eina_Bool
104elm_datetime_value_get(const Evas_Object *obj, Efl_Time *currtime) 104elm_datetime_value_get(const Evas_Object *obj, Efl_Time *currtime)
105{ 105{
106 if (currtime) *currtime = efl_ui_clock_value_get(obj); 106 if (currtime) *currtime = efl_ui_clock_time_get(obj);
107 return EINA_TRUE; 107 return EINA_TRUE;
108} 108}
109 109
@@ -121,13 +121,13 @@ EAPI Eina_Bool elm_datetime_field_visible_get(const Evas_Object *obj, Elm_Dateti
121EAPI Eina_Bool 121EAPI Eina_Bool
122elm_datetime_value_max_set(Evas_Object *obj, const Efl_Time *maxtime) 122elm_datetime_value_max_set(Evas_Object *obj, const Efl_Time *maxtime)
123{ 123{
124 if (maxtime) efl_ui_clock_value_max_set(obj, *maxtime); 124 if (maxtime) efl_ui_clock_time_max_set(obj, *maxtime);
125 return EINA_TRUE; 125 return EINA_TRUE;
126} 126}
127 127
128EAPI Eina_Bool 128EAPI Eina_Bool
129elm_datetime_value_max_get(const Evas_Object *obj, Efl_Time *maxtime) 129elm_datetime_value_max_get(const Evas_Object *obj, Efl_Time *maxtime)
130{ 130{
131 if (maxtime) *maxtime = efl_ui_clock_value_max_get(obj); 131 if (maxtime) *maxtime = efl_ui_clock_time_max_get(obj);
132 return EINA_TRUE; 132 return EINA_TRUE;
133} 133}
diff --git a/src/modules/elementary/clock_input_ctxpopup/clock_input_ctxpopup.c b/src/modules/elementary/clock_input_ctxpopup/clock_input_ctxpopup.c
index d94a8867a1..d6ef8f2b30 100644
--- a/src/modules/elementary/clock_input_ctxpopup/clock_input_ctxpopup.c
+++ b/src/modules/elementary/clock_input_ctxpopup/clock_input_ctxpopup.c
@@ -97,13 +97,13 @@ _diskselector_cb(void *data EINA_UNUSED, const Efl_Event *event)
97 disk_data = (DiskItem_Data *)elm_object_item_data_get(event->info); 97 disk_data = (DiskItem_Data *)elm_object_item_data_get(event->info);
98 if (!disk_data || !(disk_data->ctx_mod)) return; 98 if (!disk_data || !(disk_data->ctx_mod)) return;
99 99
100 curr_time = efl_ui_clock_value_get(disk_data->ctx_mod->mod_data.base); 100 curr_time = efl_ui_clock_time_get(disk_data->ctx_mod->mod_data.base);
101 fmt = disk_data->ctx_mod->mod_data.field_format_get(disk_data->ctx_mod->mod_data.base, disk_data->sel_field_type); 101 fmt = disk_data->ctx_mod->mod_data.field_format_get(disk_data->ctx_mod->mod_data.base, disk_data->sel_field_type);
102 if ((disk_data->sel_field_type == EFL_UI_CLOCK_TYPE_HOUR) && ((!strncmp(fmt, "%I", FIELD_FORMAT_LEN)) || 102 if ((disk_data->sel_field_type == EFL_UI_CLOCK_TYPE_HOUR) && ((!strncmp(fmt, "%I", FIELD_FORMAT_LEN)) ||
103 (!strncmp(fmt, "%l", FIELD_FORMAT_LEN))) && (curr_time.tm_hour >= 12)) 103 (!strncmp(fmt, "%l", FIELD_FORMAT_LEN))) && (curr_time.tm_hour >= 12))
104 disk_data->sel_field_value += 12; 104 disk_data->sel_field_value += 12;
105 _field_value_set(&curr_time, disk_data->sel_field_type, disk_data->sel_field_value); 105 _field_value_set(&curr_time, disk_data->sel_field_type, disk_data->sel_field_value);
106 efl_ui_clock_value_set(disk_data->ctx_mod->mod_data.base, curr_time); 106 efl_ui_clock_time_set(disk_data->ctx_mod->mod_data.base, curr_time);
107 evas_object_hide(disk_data->ctx_mod->ctxpopup); 107 evas_object_hide(disk_data->ctx_mod->ctxpopup);
108} 108}
109 109
@@ -116,10 +116,10 @@ _ampm_clicked_cb(void *data, const Efl_Event *event EINA_UNUSED)
116 ctx_mod = (Ctxpopup_Module_Data *)data; 116 ctx_mod = (Ctxpopup_Module_Data *)data;
117 if (!ctx_mod) return; 117 if (!ctx_mod) return;
118 118
119 curr_time = efl_ui_clock_value_get(ctx_mod->mod_data.base); 119 curr_time = efl_ui_clock_time_get(ctx_mod->mod_data.base);
120 if (curr_time.tm_hour >= 12) curr_time.tm_hour -= 12; 120 if (curr_time.tm_hour >= 12) curr_time.tm_hour -= 12;
121 else curr_time.tm_hour += 12; 121 else curr_time.tm_hour += 12;
122 efl_ui_clock_value_set(ctx_mod->mod_data.base, curr_time); 122 efl_ui_clock_time_set(ctx_mod->mod_data.base, curr_time);
123} 123}
124 124
125static void 125static void
@@ -169,7 +169,7 @@ _field_clicked_cb(void *data, const Efl_Event *event)
169 169
170 field_type = (Efl_Ui_Clock_Type )evas_object_data_get(event->object, "_field_type"); 170 field_type = (Efl_Ui_Clock_Type )evas_object_data_get(event->object, "_field_type");
171 fmt = ctx_mod->mod_data.field_format_get(ctx_mod->mod_data.base, field_type); 171 fmt = ctx_mod->mod_data.field_format_get(ctx_mod->mod_data.base, field_type);
172 time1 = efl_ui_clock_value_get(ctx_mod->mod_data.base); 172 time1 = efl_ui_clock_time_get(ctx_mod->mod_data.base);
173 val = _field_value_get(&time1, field_type); 173 val = _field_value_get(&time1, field_type);
174 ctx_mod->mod_data.field_limit_get(ctx_mod->mod_data.base, field_type, &min, &max); 174 ctx_mod->mod_data.field_limit_get(ctx_mod->mod_data.base, field_type, &min, &max);
175 175
@@ -283,7 +283,7 @@ field_value_display(Efl_Ui_Clock_Module_Data *module_data, Evas_Object *obj)
283 ctx_mod = (Ctxpopup_Module_Data *)module_data; 283 ctx_mod = (Ctxpopup_Module_Data *)module_data;
284 if (!ctx_mod || !obj) return; 284 if (!ctx_mod || !obj) return;
285 285
286 tim = efl_ui_clock_value_get(ctx_mod->mod_data.base); 286 tim = efl_ui_clock_time_get(ctx_mod->mod_data.base);
287 field_type = (Efl_Ui_Clock_Type )evas_object_data_get(obj, "_field_type"); 287 field_type = (Efl_Ui_Clock_Type )evas_object_data_get(obj, "_field_type");
288 fmt = ctx_mod->mod_data.field_format_get(ctx_mod->mod_data.base, field_type); 288 fmt = ctx_mod->mod_data.field_format_get(ctx_mod->mod_data.base, field_type);
289 buf[0] = 0; 289 buf[0] = 0;