enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

use the new escape text set to clear up issues if theme has TEXT vs 

TEXTBLOCK items and handling escapes so text is consistend across elm.
fiuxes the fileselector issues kai reported.



SVN revision: 70362
This commit is contained in:
Carsten Haitzler 2012-04-20 12:51:10 +00:00
parent c1aab815f3
commit 3a7b769a63
29 changed files with 191 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
legacy/elementary/data/themes/widgets/flipselector.edc
View File

@ -23,7 +23,7 @@ group { name: "elm/flipselector/base/default";
public animator_bottom_down(val, Float:pos) {
new tmp[FLIP_PICKER_MAX_LEN];
set_tween_state(PART:"bottom", pos, "shrink", 0.0, "default", 0.0);
set_tween_state(PART:"elm.bottom", pos, "shrink", 0.0, "default", 0.0);
set_tween_state(PART:"bottom_sheet", pos, "shrink", 0.0, "default",
0.0);
set_tween_state(PART:"shadow", pos, "half", 0.0, "full",
@ -42,7 +42,7 @@ group { name: "elm/flipselector/base/default";
}
public animator_top_down(val, Float:pos) {
set_tween_state(PART:"top", pos, "default", 0.0, "shrink", 0.0);
set_tween_state(PART:"elm.top", pos, "default", 0.0, "shrink", 0.0);
set_tween_state(PART:"top_sheet", pos, "default", 0.0, "shrink",
0.0);
set_tween_state(PART:"shadow", pos, "default", 0.0, "half",
@ -53,7 +53,7 @@ group { name: "elm/flipselector/base/default";
}
public animator_bottom_up(val, Float:pos) {
set_tween_state(PART:"bottom", pos, "default", 0.0, "shrink", 0.0);
set_tween_state(PART:"elm.bottom", pos, "default", 0.0, "shrink", 0.0);
set_tween_state(PART:"bottom_sheet", pos, "default", 0.0, "shrink",
0.0);
set_tween_state(PART:"shadow", pos, "full", 0.0, "half",
@ -66,7 +66,7 @@ group { name: "elm/flipselector/base/default";
public animator_top_up(val, Float:pos) {
new tmp[FLIP_PICKER_MAX_LEN];
set_tween_state(PART:"top", pos, "shrink", 0.0, "default", 0.0);
set_tween_state(PART:"elm.top", pos, "shrink", 0.0, "default", 0.0);
set_tween_state(PART:"top_sheet", pos, "shrink", 0.0, "default",
0.0);
set_tween_state(PART:"shadow", pos, "half", 0.0, "default",
@ -100,17 +100,17 @@ group { name: "elm/flipselector/base/default";
set_text(PART:"bottom_b", tmp);
set_state(PART:"top", "shrink", 0.0);
set_text(PART:"top", tmp);
set_state(PART:"top", "default", 0.0);
set_text(PART:"top", tmp);
set_state(PART:"elm.top", "shrink", 0.0);
set_text(PART:"elm.top", tmp);
set_state(PART:"elm.top", "default", 0.0);
set_text(PART:"elm.top", tmp);
replace_str(prev, 0, tmp);
set_state(PART:"bottom", "default", 0.0);
set_text(PART:"bottom", value);
set_state(PART:"bottom", "shrink", 0.0);
set_text(PART:"bottom", value);
set_state(PART:"elm.bottom", "default", 0.0);
set_text(PART:"elm.bottom", value);
set_state(PART:"elm.bottom", "shrink", 0.0);
set_text(PART:"elm.bottom", value);
set_text(PART:"top_b", value);
@ -139,17 +139,17 @@ group { name: "elm/flipselector/base/default";
set_text(PART:"top_b", tmp);
set_state(PART:"bottom", "shrink", 0.0);
set_text(PART:"bottom", tmp);
set_state(PART:"bottom", "default", 0.0);
set_text(PART:"bottom", tmp);
set_state(PART:"elm.bottom", "shrink", 0.0);
set_text(PART:"elm.bottom", tmp);
set_state(PART:"elm.bottom", "default", 0.0);
set_text(PART:"elm.bottom", tmp);
replace_str(prev, 0, tmp);
set_state(PART:"top", "default", 0.0);
set_text(PART:"top", value);
set_state(PART:"top", "shrink", 0.0);
set_text(PART:"top", value);
set_state(PART:"elm.top", "default", 0.0);
set_text(PART:"elm.top", value);
set_state(PART:"elm.top", "shrink", 0.0);
set_text(PART:"elm.top", value);
set_text(PART:"bottom_b", value);
@ -282,7 +282,7 @@ group { name: "elm/flipselector/base/default";
}
}
part { name: "bottom";
part { name: "elm.bottom";
mouse_events: 0;
clip_to: "bottom_clipper";
type: TEXT;
@ -332,7 +332,7 @@ group { name: "elm/flipselector/base/default";
size: 30;
min: 1 1;
align: 0.5 0.5;
source: "top";
source: "elm.top";
}
}
}
@ -353,7 +353,7 @@ group { name: "elm/flipselector/base/default";
}
}
part { name: "top";
part { name: "elm.top";
mouse_events: 0;
clip_to: "top_clipper";
type: TEXT;

59
legacy/elementary/src/lib/elc_fileselector.c
View File

@ -247,9 +247,9 @@ _itc_text_get(void *data,
Evas_Object *obj __UNUSED__,
const char *source __UNUSED__)
{
return strdup(ecore_file_file_get(data)); /* NOTE this will be
* free() by the
* caller */
return elm_entry_utf8_to_markup(ecore_file_file_get(data)); /* NOTE this will be
* free() by the
* caller */
}
static Evas_Object *
@ -388,6 +388,8 @@ _sel_do(void *data)
}
else /* navigating through folders only or file is not a dir. */
{
char *s;
if (wd->expand && wd->mode == ELM_FILESELECTOR_LIST)
_do_anchors(sd->fs, path);
else if (wd->only_folder)
@ -397,8 +399,14 @@ _sel_do(void *data)
_populate(sd->fs, p, NULL);
eina_stringshare_del(p);
}
elm_object_text_set(wd->filename_entry,
ecore_file_file_get(path));
s = elm_entry_utf8_to_markup(ecore_file_file_get(path));
if (s)
{
elm_object_text_set(wd->filename_entry, s);
free(s);
}
else
elm_object_text_set(wd->filename_entry, "");
}
evas_object_smart_callback_call(sd->fs, SIG_SELECTED, (void *)path);
@ -519,11 +527,15 @@ _do_anchors(Evas_Object *obj,
const char *path)
{
Widget_Data *wd = elm_widget_data_get(obj);
char **tok, buf[PATH_MAX * 3];
char **tok, buf[PATH_MAX * 3], *s;
int i, j;
if (!wd) return;
s = elm_entry_utf8_to_markup(path);
if (!s) return;
buf[0] = '\0';
tok = eina_str_split(path, "/", 0);
tok = eina_str_split(s, "/", 0);
free(s);
eina_strlcat(buf, "<a href=/>root</a>", sizeof(buf));
for (i = 0; tok[i]; i++)
{
@ -1144,16 +1156,31 @@ elm_fileselector_selected_get(const Evas_Object *obj)
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return NULL;
if (!wd->path) return NULL;
if (wd->filename_entry)
{
const char *name;
char buf[PATH_MAX];
char *dir;
char *dir, *s;
dir = wd->only_folder ? ecore_file_dir_get(wd->path) : strdup(wd->path);
name = elm_object_text_get(wd->filename_entry);
snprintf(buf, sizeof(buf), "%s/%s",
dir, name);
if (name)
{
s = elm_entry_markup_to_utf8(name);
if (s)
{
snprintf(buf, sizeof(buf), "%s/%s", dir, s);
free(s);
}
else
snprintf(buf, sizeof(buf), "%s", dir);
}
else
{
snprintf(buf, sizeof(buf), "%s", dir);
}
if (wd->only_folder && !ecore_file_is_dir(buf))
eina_stringshare_replace(&wd->selection, ecore_file_dir_get(buf));
else
@ -1201,8 +1228,16 @@ elm_fileselector_selected_set(Evas_Object *obj,
_populate(obj, ecore_file_dir_get(path), NULL);
if (wd->filename_entry)
{
elm_object_text_set(wd->filename_entry,
ecore_file_file_get(path));
char *s;
s = elm_entry_utf8_to_markup(ecore_file_file_get(path));
if (s)
{
elm_object_text_set(wd->filename_entry, s);
free(s);
}
else
elm_object_text_set(wd->filename_entry, "");
eina_stringshare_replace(&wd->selection, path);
}
}

23
legacy/elementary/src/lib/elc_fileselector_entry.c
View File

@ -8,6 +8,7 @@ struct _Widget_Data
Evas_Object *edje;
Evas_Object *button;
Evas_Object *entry;
char *path;
};
static const char *widtype = NULL;
@ -71,7 +72,12 @@ _FILE_CHOSEN_fwd(void *data, Evas_Object *obj __UNUSED__, void *event_info)
{
Widget_Data *wd = elm_widget_data_get(data);
const char *file = event_info;
elm_object_text_set(wd->entry, file);
char *s;
s = elm_entry_utf8_to_markup(file);
if (!s) return;
elm_object_text_set(wd->entry, s);
free(s);
evas_object_smart_callback_call(data, SIG_FILE_CHOSEN, event_info);
}
@ -99,6 +105,7 @@ static void
_del_hook(Evas_Object *obj)
{
Widget_Data *wd = elm_widget_data_get(obj);
if (wd->path) free(wd->path);
free(wd);
}
@ -404,9 +411,16 @@ elm_fileselector_entry_path_set(Evas_Object *obj, const char *path)
{
ELM_CHECK_WIDTYPE(obj, widtype);
Widget_Data *wd = elm_widget_data_get(obj);
char *s;
if (!wd) return;
elm_fileselector_button_path_set(wd->button, path);
elm_object_text_set(wd->entry, path);
s = elm_entry_utf8_to_markup(path);
if (s)
{
elm_object_text_set(wd->entry, s);
free(s);
}
}
EAPI const char *
@ -414,8 +428,11 @@ elm_fileselector_entry_path_get(const Evas_Object *obj)
{
ELM_CHECK_WIDTYPE(obj, widtype) NULL;
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd) return NULL;
return elm_object_text_get(wd->entry);
if (wd->path) free(wd->path);
wd->path = elm_entry_markup_to_utf8(elm_object_text_get(wd->entry));
return wd->path;
}
EAPI void

8
legacy/elementary/src/lib/elc_multibuttonentry.c
View File

@ -590,7 +590,7 @@ _set_label(Evas_Object *obj, const char *str)
Evas_Coord width, height, sum_width = 0;
evas_object_size_hint_min_set(wd->label, 0, 0);
evas_object_resize(wd->label, 0, 0);
edje_object_part_text_set(wd->label, "mbe.label", str);
edje_object_part_text_escaped_set(wd->label, "mbe.label", str);
if (!strcmp(str, ""))
{
@ -636,7 +636,7 @@ _set_guidetext(Evas_Object *obj, const char *str)
evas_object_size_hint_weight_set(wd->guidetext, 0.0, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(wd->guidetext, EVAS_HINT_FILL,
EVAS_HINT_FILL);
edje_object_part_text_set(wd->guidetext, "elm.text", str);
edje_object_part_text_escaped_set(wd->guidetext, "elm.text", str);
_view_update(obj);
}
}
@ -848,7 +848,7 @@ _add_button_item(Evas_Object *obj, const char *str, Multibuttonentry_Pos pos, co
elm_object_text_set(wd->entry, "");
_elm_theme_object_set(obj, btn, "multibuttonentry", "btn", elm_widget_style_get(obj));
edje_object_part_text_set(btn, "elm.btn.text", str_utf8);
edje_object_part_text_escaped_set(btn, "elm.btn.text", str_utf8);
edje_object_part_geometry_get(btn, "elm.btn.text", NULL, NULL, &width, &height);
evas_object_size_hint_min_set(btn, width, height);
@ -1383,7 +1383,7 @@ _item_text_set_hook(Elm_Object_Item *it, const char *part, const char *label)
if (part && strcmp(part, "default")) return;
if (!label) return;
item = (Elm_Multibuttonentry_Item *)it;
edje_object_part_text_set(item->button, "elm.btn.text", label);
edje_object_part_text_escaped_set(item->button, "elm.btn.text", label);
_resize_button(item->button, &item->rw, &item->vw);
}

6
legacy/elementary/src/lib/elc_popup.c
View File

@ -206,8 +206,8 @@ _theme_hook(Evas_Object *obj)
"item", elm_widget_style_get(obj));
if (item->label)
{
edje_object_part_text_set(VIEW(item), "elm.text",
item->label);
edje_object_part_text_escaped_set(VIEW(item), "elm.text",
item->label);
edje_object_signal_emit(VIEW(item),
"elm,state,item,text,visible", "elm");
}
@ -1048,7 +1048,7 @@ static void
_item_text_set(Elm_Popup_Content_Item *item, const char *label)
{
if (!eina_stringshare_replace(&item->label, label)) return;
edje_object_part_text_set(VIEW(item), "elm.text", label);
edje_object_part_text_escaped_set(VIEW(item), "elm.text", label);
if (item->label)
edje_object_signal_emit(VIEW(item),
"elm,state,item,text,visible", "elm");

26
legacy/elementary/src/lib/elm_actionslider.c
View File

@ -79,13 +79,13 @@ _mirrored_set(Evas_Object *obj, Eina_Bool rtl)
edje_object_mirrored_set(wd->as, rtl);
if (!elm_widget_mirrored_get(obj))
{
edje_object_part_text_set(wd->as, "elm.text.left", wd->text_left);
edje_object_part_text_set(wd->as, "elm.text.right", wd->text_right);
edje_object_part_text_escaped_set(wd->as, "elm.text.left", wd->text_left);
edje_object_part_text_escaped_set(wd->as, "elm.text.right", wd->text_right);
}
else
{
edje_object_part_text_set(wd->as, "elm.text.left", wd->text_right);
edje_object_part_text_set(wd->as, "elm.text.right", wd->text_left);
edje_object_part_text_escaped_set(wd->as, "elm.text.left", wd->text_right);
edje_object_part_text_escaped_set(wd->as, "elm.text.right", wd->text_left);
}
edje_object_part_drag_value_get(wd->as, "elm.drag_button_base", &pos, NULL);
edje_object_part_drag_value_set(wd->as, "elm.drag_button_base", 1.0 - pos, 0.5);
@ -126,8 +126,8 @@ _theme_hook(Evas_Object *obj)
edje_object_part_swallow(wd->as, "elm.drag_button_base", wd->drag_button_base);
_mirrored_set(obj, elm_widget_mirrored_get(obj));
edje_object_part_text_set(wd->as, "elm.text.center", wd->text_center);
edje_object_part_text_set(wd->as, "elm.text.indicator", wd->indicator_label);
edje_object_part_text_escaped_set(wd->as, "elm.text.center", wd->text_center);
edje_object_part_text_escaped_set(wd->as, "elm.text.indicator", wd->indicator_label);
edje_object_message_signal_process(wd->as);
_sizing_eval(obj);
}
@ -326,29 +326,29 @@ _elm_actionslider_label_set(Evas_Object *obj, const char *item, const char *labe
if (!item || !strcmp(item, "indicator"))
{
eina_stringshare_replace(&wd->indicator_label, label);
edje_object_part_text_set(wd->as, "elm.text.indicator",
wd->indicator_label);
edje_object_part_text_escaped_set(wd->as, "elm.text.indicator",
wd->indicator_label);
}
else if (!strcmp(item, "left"))
{
eina_stringshare_replace(&wd->text_left, label);
if (!elm_widget_mirrored_get(obj))
edje_object_part_text_set(wd->as, "elm.text.left", wd->text_left);
edje_object_part_text_escaped_set(wd->as, "elm.text.left", wd->text_left);
else
edje_object_part_text_set(wd->as, "elm.text.right", wd->text_left);
edje_object_part_text_escaped_set(wd->as, "elm.text.right", wd->text_left);
}
else if (!strcmp(item, "center"))
{
eina_stringshare_replace(&wd->text_center, label);
edje_object_part_text_set(wd->as, "elm.text.center", wd->text_center);
edje_object_part_text_escaped_set(wd->as, "elm.text.center", wd->text_center);
}
else if (!strcmp(item, "right"))
{
eina_stringshare_replace(&wd->text_right, label);
if (!elm_widget_mirrored_get(obj))
edje_object_part_text_set(wd->as, "elm.text.right", wd->text_right);
edje_object_part_text_escaped_set(wd->as, "elm.text.right", wd->text_right);
else
edje_object_part_text_set(wd->as, "elm.text.left", wd->text_right);
edje_object_part_text_escaped_set(wd->as, "elm.text.left", wd->text_right);
}
}

12
legacy/elementary/src/lib/elm_bubble.c
View File

@ -66,10 +66,10 @@ _theme_hook(Evas_Object *obj)
_mirrored_set(obj, elm_widget_mirrored_get(obj));
_elm_theme_object_set(obj, wd->bbl, "bubble", corner_string[wd->pos],
elm_widget_style_get(obj));
edje_object_part_text_set(wd->bbl, "elm.text", wd->label);
edje_object_part_text_escaped_set(wd->bbl, "elm.text", wd->label);
if (wd->label) edje_object_signal_emit(wd->bbl, "elm,state,text,visible", "elm");
else edje_object_signal_emit(wd->bbl, "elm,state,text,hidden", "elm");
edje_object_part_text_set(wd->bbl, "elm.info", wd->info);
edje_object_part_text_escaped_set(wd->bbl, "elm.info", wd->info);
if (wd->info) edje_object_signal_emit(wd->bbl, "elm,state,info,visible", "elm");
else edje_object_signal_emit(wd->bbl, "elm,state,info,hidden", "elm");
if (wd->content)
@ -270,18 +270,18 @@ _elm_bubble_label_set(Evas_Object *obj, const char *item, const char *label)
if (!item || !strcmp(item, "default"))
{
eina_stringshare_replace(&wd->label, label);
edje_object_part_text_set(wd->bbl, "elm.text", label);
edje_object_part_text_escaped_set(wd->bbl, "elm.text", label);
if (label) edje_object_signal_emit(wd->bbl, "elm,state,text,visible",
"elm");
"elm");
else edje_object_signal_emit(wd->bbl, "elm,state,text,hidden", "elm");
_sizing_eval(obj);
}
else if (!strcmp(item, "info"))
{
eina_stringshare_replace(&wd->info, label);
edje_object_part_text_set(wd->bbl, "elm.info", label);
edje_object_part_text_escaped_set(wd->bbl, "elm.info", label);
if (label) edje_object_signal_emit(wd->bbl, "elm,state,info,visible",
"elm");
"elm");
else edje_object_signal_emit(wd->bbl, "elm,state,info,hidden", "elm");
_sizing_eval(obj);
}

4
legacy/elementary/src/lib/elm_button.c
View File

@ -127,7 +127,7 @@ _theme_hook(Evas_Object *obj)
edje_object_signal_emit(wd->btn, "elm,state,icon,visible", "elm");
else
edje_object_signal_emit(wd->btn, "elm,state,icon,hidden", "elm");
edje_object_part_text_set(wd->btn, "elm.text", wd->label);
edje_object_part_text_escaped_set(wd->btn, "elm.text", wd->label);
if (elm_object_disabled_get(obj))
edje_object_signal_emit(wd->btn, "elm,state,disabled", "elm");
edje_object_message_signal_process(wd->btn);
@ -375,7 +375,7 @@ _elm_button_label_set(Evas_Object *obj, const char *item, const char *label)
else
edje_object_signal_emit(wd->btn, "elm,state,text,hidden", "elm");
edje_object_message_signal_process(wd->btn);
edje_object_part_text_set(wd->btn, "elm.text", label);
edje_object_part_text_escaped_set(wd->btn, "elm.text", label);
_sizing_eval(obj);
}

10
legacy/elementary/src/lib/elm_calendar.c
View File

@ -207,11 +207,11 @@ _set_month_year(Widget_Data *wd)
buf = wd->format_func(&wd->selected_time);
if (buf)
{
edje_object_part_text_set(wd->calendar, "month_text", buf);
edje_object_part_text_escaped_set(wd->calendar, "month_text", buf);
free(buf);
}
else
edje_object_part_text_set(wd->calendar, "month_text", "");
edje_object_part_text_escaped_set(wd->calendar, "month_text", "");
}
static void
@ -384,9 +384,9 @@ _set_headers(Evas_Object *obj)
for (i = 0; i < ELM_DAY_LAST; i++)
{
part[3] = i + '0';
edje_object_part_text_set(
wd->calendar, part,
wd->weekdays[(i + wd->first_week_day) % ELM_DAY_LAST]);
edje_object_part_text_escaped_set
(wd->calendar, part,
wd->weekdays[(i + wd->first_week_day) % ELM_DAY_LAST]);
}
}

12
legacy/elementary/src/lib/elm_check.c
View File

@ -115,9 +115,9 @@ _theme_hook(Evas_Object *obj)
edje_object_signal_emit(wd->chk, "elm,state,text,visible", "elm");
else
edje_object_signal_emit(wd->chk, "elm,state,text,hidden", "elm");
edje_object_part_text_set(wd->chk, "elm.text", wd->label);
edje_object_part_text_set(wd->chk, "elm.ontext", wd->ontext);
edje_object_part_text_set(wd->chk, "elm.offtext", wd->offtext);
edje_object_part_text_escaped_set(wd->chk, "elm.text", wd->label);
edje_object_part_text_escaped_set(wd->chk, "elm.ontext", wd->ontext);
edje_object_part_text_escaped_set(wd->chk, "elm.offtext", wd->offtext);
if (elm_widget_disabled_get(obj))
edje_object_signal_emit(wd->chk, "elm,state,disabled", "elm");
edje_object_message_signal_process(wd->chk);
@ -341,17 +341,17 @@ _elm_check_label_set(Evas_Object *obj, const char *item, const char *label)
else
edje_object_signal_emit(wd->chk, "elm,state,text,hidden", "elm");
edje_object_message_signal_process(wd->chk);
edje_object_part_text_set(wd->chk, "elm.text", label);
edje_object_part_text_escaped_set(wd->chk, "elm.text", label);
}
else if ((item) && (!strcmp(item, "on")))
{
eina_stringshare_replace(&wd->ontext, label);
edje_object_part_text_set(wd->chk, "elm.ontext", wd->ontext);
edje_object_part_text_escaped_set(wd->chk, "elm.ontext", wd->ontext);
}
else if ((item) && (!strcmp(item, "off")))
{
eina_stringshare_replace(&wd->offtext, label);
edje_object_part_text_set(wd->chk, "elm.offtext", wd->offtext);
edje_object_part_text_escaped_set(wd->chk, "elm.offtext", wd->offtext);
}
_sizing_eval(obj);
}

4
legacy/elementary/src/lib/elm_datetime.c
View File

@ -325,7 +325,7 @@ _theme_hook(Evas_Object *obj)
snprintf(buf, sizeof(buf), EDC_PART_FIELD_ENABLE_SIG_STR, field->location);
edje_object_signal_emit(wd->base, buf, "elm");
snprintf(buf, sizeof(buf), EDC_PART_SEPARATOR_STR, field->location);
edje_object_part_text_set(wd->base, buf, field->separator);
edje_object_part_text_escaped_set(wd->base, buf, field->separator);
dt_mod->field_value_display(wd->mod_data, field->item_obj);
}
else
@ -751,7 +751,7 @@ _reload_format(Evas_Object *obj)
edje_object_signal_emit(wd->base, buf, "elm");
}
snprintf(buf, sizeof(buf), EDC_PART_SEPARATOR_STR, (field->location + 1));
edje_object_part_text_set(wd->base, buf, field->separator);
edje_object_part_text_escaped_set(wd->base, buf, field->separator);
}
edje_object_message_signal_process(wd->base);
_field_list_arrange(obj);

22
legacy/elementary/src/lib/elm_diskselector.c
View File

@ -226,7 +226,7 @@ _check_string(void *data)
// cut it off at byte mark returned form _check_letter
strncpy(buf, it->label, length);
buf[length] = '\0';
edje_object_part_text_set(VIEW(it), "elm.text", buf);
edje_object_part_text_escaped_set(VIEW(it), "elm.text", buf);
}
if (wd->check_idler)
@ -288,14 +288,14 @@ _item_del_pre_hook(Elm_Object_Item *it)
if (dit)
{
eina_stringshare_replace(&wd->first->label, dit->label);
edje_object_part_text_set(wd->VIEW(first), "elm.text",
edje_object_part_text_escaped_set(wd->VIEW(first), "elm.text",
wd->first->label);
}
dit = eina_list_nth(wd->items, 1);
if (dit)
{
eina_stringshare_replace(&wd->second->label, dit->label);
edje_object_part_text_set(wd->VIEW(second), "elm.text",
edje_object_part_text_escaped_set(wd->VIEW(second), "elm.text",
wd->second->label);
}
// if more than 3 itmes should be displayed
@ -304,21 +304,21 @@ _item_del_pre_hook(Elm_Object_Item *it)
dit = eina_list_nth(wd->items, i);
item2 = eina_list_nth(wd->over_items, i - 2);
eina_stringshare_replace(&item2->label, dit->label);
edje_object_part_text_set(VIEW(item2), "elm.text", item2->label);
edje_object_part_text_escaped_set(VIEW(item2), "elm.text", item2->label);
}
dit = eina_list_nth(wd->items, eina_list_count(wd->items) - 1);
if (dit)
{
eina_stringshare_replace(&wd->last->label, dit->label);
edje_object_part_text_set(wd->VIEW(last), "elm.text",
edje_object_part_text_escaped_set(wd->VIEW(last), "elm.text",
wd->last->label);
}
dit = eina_list_nth(wd->items, eina_list_count(wd->items) - 2);
if (dit)
{
eina_stringshare_replace(&wd->s_last->label, dit->label);
edje_object_part_text_set(wd->VIEW(s_last), "elm.text",
edje_object_part_text_escaped_set(wd->VIEW(s_last), "elm.text",
wd->s_last->label);
}
// if more than 3 itmes should be displayed
@ -327,7 +327,7 @@ _item_del_pre_hook(Elm_Object_Item *it)
dit = eina_list_nth(wd->items, wd->item_count - i);
item2 = eina_list_nth(wd->under_items, i - 3);
eina_stringshare_replace(&item2->label, dit->label);
edje_object_part_text_set(VIEW(item2), "elm.text",
edje_object_part_text_escaped_set(VIEW(item2), "elm.text",
item2->label);
}
}
@ -367,7 +367,7 @@ _item_new(Evas_Object *obj, Evas_Object *icon, const char *label, Evas_Smart_Cb
if (it->label)
{
edje_object_part_text_set(VIEW(it), "elm.text", it->label);
edje_object_part_text_escaped_set(VIEW(it), "elm.text", it->label);
edje_object_signal_callback_add(VIEW(it), "elm,action,click", "", _item_click_cb, it);
}
if (it->icon)
@ -504,7 +504,7 @@ _theme_hook(Evas_Object * obj)
{
_elm_theme_object_set(obj, VIEW(it), "diskselector", "item",
elm_widget_style_get(obj));
edje_object_part_text_set(VIEW(it), "elm.text", it->label);
edje_object_part_text_escaped_set(VIEW(it), "elm.text", it->label);
}
}
else
@ -513,7 +513,7 @@ _theme_hook(Evas_Object * obj)
{
_elm_theme_object_set(obj, VIEW(it), "diskselector", "item",
elm_widget_style_get(obj));
edje_object_part_text_set(VIEW(it), "elm.text", it->label);
edje_object_part_text_escaped_set(VIEW(it), "elm.text", it->label);
}
}
_elm_theme_object_set(obj, wd->right_blank, "diskselector", "item",
@ -986,7 +986,7 @@ _item_text_set_hook(Elm_Object_Item *it, const char *part, const char *label)
if (part && strcmp(part, "default")) return;
item = (Elm_Diskselector_Item *)it;
eina_stringshare_replace(&item->label, label);
edje_object_part_text_set(VIEW(item), "elm.text", item->label);
edje_object_part_text_escaped_set(VIEW(item), "elm.text", item->label);
}
static const char *

10
legacy/elementary/src/lib/elm_flipselector.c
View File

@ -371,15 +371,15 @@ _sizing_eval(Evas_Object *obj)
if (wd->sentinel)
{
const char *label = elm_object_item_text_get(DATA_GET(wd->sentinel));
tmp = edje_object_part_text_get(wd->base, "top");
edje_object_part_text_set(wd->base, "top", label);
tmp = edje_object_part_text_get(wd->base, "elm.top");
edje_object_part_text_escaped_set(wd->base, "elm.top", label);
}
edje_object_size_min_restricted_calc(wd->base, &minw, &minh, minw, minh);
elm_coords_finger_size_adjust(1, &minw, 2, &minh);
evas_object_size_hint_min_get(obj, &w, &h);
if (wd->sentinel) edje_object_part_text_set(wd->base, "top", tmp);
if (wd->sentinel) edje_object_part_text_escaped_set(wd->base, "elm.top", tmp);
if (w > minw) minw = w;
if (h > minh) minh = h;
@ -401,8 +401,8 @@ _update_view(Evas_Object *obj)
item = DATA_GET(wd->current);
if (item) label = item->label;
edje_object_part_text_set(wd->base, "top", label ? label : "");
edje_object_part_text_set(wd->base, "bottom", label ? label : "");
edje_object_part_text_escaped_set(wd->base, "elm.top", label ? label : "");
edje_object_part_text_escaped_set(wd->base, "elm.bottom", label ? label : "");
edje_object_message_signal_process(wd->base);
}

4
legacy/elementary/src/lib/elm_frame.c
View File

@ -57,7 +57,7 @@ _theme_hook(Evas_Object *obj)
_mirrored_set(obj, elm_widget_mirrored_get(obj));
_elm_theme_object_set(obj, wd->frm, "frame", "base",
elm_widget_style_get(obj));
edje_object_part_text_set(wd->frm, "elm.text", wd->label);
edje_object_part_text_escaped_set(wd->frm, "elm.text", wd->label);
if (wd->content)
edje_object_part_swallow(wd->frm, "elm.swallow.content", wd->content);
edje_object_scale_set(wd->frm,
@ -127,7 +127,7 @@ _elm_frame_label_set(Evas_Object *obj, const char *item, const char *label)
if (item && strcmp(item, "default")) return;
if (!wd) return;
eina_stringshare_replace(&(wd->label), label);
edje_object_part_text_set(wd->frm, "elm.text", wd->label);
edje_object_part_text_escaped_set(wd->frm, "elm.text", wd->label);
_sizing_eval(obj);
}

2
legacy/elementary/src/lib/elm_gengrid.c
View File

@ -934,7 +934,7 @@ _item_realize(Elm_Gen_Item *it)
((void *)it->base.data, WIDGET(it), key);
if (s)
{
edje_object_part_text_set(VIEW(it), key, s);
edje_object_part_text_escaped_set(VIEW(it), key, s);
free(s);
}
}

2
legacy/elementary/src/lib/elm_genlist.c
View File

@ -1926,7 +1926,7 @@ _item_text_realize(Elm_Gen_Item *it,
if (s)
{
edje_object_part_text_set(target, key, s);
edje_object_part_text_escaped_set(target, key, s);
free(s);
}
else

6
legacy/elementary/src/lib/elm_index.c
View File

@ -288,7 +288,7 @@ _index_box_auto_fill(Evas_Object *obj, Evas_Object *box, int level)
elm_widget_style_get(obj));
}
edje_object_part_text_set(o, "elm.text", it->letter);
edje_object_part_text_escaped_set(o, "elm.text", it->letter);
edje_object_size_min_restricted_calc(o, &mw, &mh, 0, 0);
evas_object_size_hint_min_set(o, mw, mh);
evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@ -458,8 +458,8 @@ _sel_eval(Evas_Object *obj, Evas_Coord evx, Evas_Coord evy)
}
if (!label) label = strdup("");
if (!last) last = strdup("");
edje_object_part_text_set(wd->base, "elm.text.body", label);
edje_object_part_text_set(wd->base, "elm.text", last);
edje_object_part_text_escaped_set(wd->base, "elm.text.body", label);
edje_object_part_text_escaped_set(wd->base, "elm.text", last);
free(label);
free(last);
}

6
legacy/elementary/src/lib/elm_layout.c
View File

@ -308,7 +308,7 @@ _parts_text_fix(Widget_Data *wd)
EINA_LIST_FOREACH(wd->subs, l, si)
{
if (si->type == TEXT)
edje_object_part_text_set(wd->lay, si->part, si->p.text.text);
edje_object_part_text_escaped_set(wd->lay, si->part, si->p.text.text);
}
}
@ -330,7 +330,7 @@ _elm_layout_label_set(Evas_Object *obj, const char *part, const char *text)
eina_stringshare_del(si->part);
eina_stringshare_del(si->p.text.text);
free(si);
edje_object_part_text_set(wd->lay, part, NULL);
edje_object_part_text_escaped_set(wd->lay, part, NULL);
wd->subs = eina_list_remove_list(wd->subs, l);
return;
}
@ -350,7 +350,7 @@ _elm_layout_label_set(Evas_Object *obj, const char *part, const char *text)
}
eina_stringshare_replace(&si->p.text.text, text);
edje_object_part_text_set(wd->lay, part, text);
edje_object_part_text_escaped_set(wd->lay, part, text);
_request_sizing_eval(wd);
}

4
legacy/elementary/src/lib/elm_list.c
View File

@ -1138,7 +1138,7 @@ _item_text_set_hook(Elm_Object_Item *it, const char *part, const char *text)
if (part && strcmp(part, "default")) return;
if (!eina_stringshare_replace(&list_it->label, text)) return;
if (VIEW(list_it))
edje_object_part_text_set(VIEW(list_it), "elm.text", text);
edje_object_part_text_escaped_set(VIEW(list_it), "elm.text", text);
}
static const char *
@ -1351,7 +1351,7 @@ _fix_items(Evas_Object *obj)
else if (!strcmp(stacking, "above"))
evas_object_raise(VIEW(it));
}
edje_object_part_text_set(VIEW(it), "elm.text", it->label);
edje_object_part_text_escaped_set(VIEW(it), "elm.text", it->label);
if ((!it->icon) && (minh[0] > 0))
{

4
legacy/elementary/src/lib/elm_map.c
View File

@ -1513,7 +1513,7 @@ static void
_overlay_default_layout_text_update(Overlay_Default *ovl, const char *text)
{
if (!ovl->content && !ovl->icon && !ovl->clas_content && !ovl->clas_icon)
edje_object_part_text_set(elm_layout_edje_get(ovl->layout), "elm.text",
edje_object_part_text_escaped_set(elm_layout_edje_get(ovl->layout), "elm.text",
text);
}
@ -2277,7 +2277,7 @@ _overlay_scale_show(Overlay_Scale *ovl)
if (text < 1) snprintf(buf, sizeof(buf), "%d m", (int)(text * 1000));
else snprintf(buf, sizeof(buf), "%d km", (int)text);
edje_object_part_text_set(elm_layout_edje_get(ovl->obj), "elm.text", buf);
edje_object_part_text_escaped_set(elm_layout_edje_get(ovl->obj), "elm.text", buf);
_obj_place(ovl->obj, ovl->x, ovl->y, w, ovl->h);
}

8
legacy/elementary/src/lib/elm_progressbar.c
View File

@ -68,7 +68,7 @@ _theme_hook(Evas_Object *obj)
}
if (wd->label)
{
edje_object_part_text_set(wd->progressbar, "elm.text", wd->label);
edje_object_part_text_escaped_set(wd->progressbar, "elm.text", wd->label);
edje_object_signal_emit(wd->progressbar, "elm,state,text,visible", "elm");
}
if (wd->pulse)
@ -159,10 +159,10 @@ _units_set(Evas_Object *obj)
{
char buf[1024];
snprintf(buf, sizeof(buf), wd->units, 100 * wd->val);
edje_object_part_text_set(wd->progressbar, "elm.text.status", buf);
edje_object_part_text_escaped_set(wd->progressbar, "elm.text.status", buf);
}
else
edje_object_part_text_set(wd->progressbar, "elm.text.status", NULL);
edje_object_part_text_escaped_set(wd->progressbar, "elm.text.status", NULL);
}
static void
@ -183,7 +183,7 @@ _elm_progressbar_label_set(Evas_Object *obj, const char *item, const char *label
edje_object_signal_emit(wd->progressbar, "elm,state,text,hidden", "elm");
edje_object_message_signal_process(wd->progressbar);
}
edje_object_part_text_set(wd->progressbar, "elm.text", label);
edje_object_part_text_escaped_set(wd->progressbar, "elm.text", label);
_sizing_eval(obj);
}

4
legacy/elementary/src/lib/elm_radio.c
View File

@ -117,7 +117,7 @@ _theme_hook(Evas_Object *obj)
edje_object_signal_emit(wd->radio, "elm,state,text,visible", "elm");
else
edje_object_signal_emit(wd->radio, "elm,state,text,hidden", "elm");
edje_object_part_text_set(wd->radio, "elm.text", wd->label);
edje_object_part_text_escaped_set(wd->radio, "elm.text", wd->label);
if (elm_widget_disabled_get(obj))
{
edje_object_signal_emit(wd->radio, "elm,state,disabled", "elm");
@ -263,7 +263,7 @@ _elm_radio_label_set(Evas_Object *obj, const char *item, const char *label)
edje_object_signal_emit(wd->radio, "elm,state,text,hidden", "elm");
edje_object_message_signal_process(wd->radio);
}
edje_object_part_text_set(wd->radio, "elm.text", label);
edje_object_part_text_escaped_set(wd->radio, "elm.text", label);
_sizing_eval(obj);
}

6
legacy/elementary/src/lib/elm_segment_control.c
View File

@ -331,7 +331,7 @@ _swallow_item_objects(Elm_Segment_Item *it)
if (it->label)
{
edje_object_part_text_set(VIEW(it), "elm.text", it->label);
edje_object_part_text_escaped_set(VIEW(it), "elm.text", it->label);
edje_object_signal_emit(VIEW(it), "elm,state,text,visible", "elm");
}
else
@ -453,7 +453,7 @@ _item_text_set_hook(Elm_Object_Item *it, const char *part, const char *label)
edje_object_signal_emit(VIEW(item), "elm,state,text,hidden", "elm");
edje_object_message_signal_process(VIEW(item));
//label can be NULL also.
edje_object_part_text_set(VIEW(item), "elm.text", item->label);
edje_object_part_text_escaped_set(VIEW(item), "elm.text", item->label);
}
static const char *
@ -544,7 +544,7 @@ _item_new(Evas_Object *obj, Evas_Object *icon, const char *label)
else
edje_object_signal_emit(VIEW(it), "elm,state,text,hidden", "elm");
edje_object_message_signal_process(VIEW(it));
edje_object_part_text_set(VIEW(it), "elm.text", label);
edje_object_part_text_escaped_set(VIEW(it), "elm.text", label);
it->icon = icon;
if (it->icon) elm_widget_sub_object_add(VIEW(it), it->icon);

20
legacy/elementary/src/lib/elm_slider.c
View File

@ -175,7 +175,7 @@ _labels_foreach_text_set(const Eina_Hash *hash __UNUSED__, const void *key, void
{
Widget_Data *wd = fdata;
edje_object_part_text_set(wd->slider, key, data);
edje_object_part_text_escaped_set(wd->slider, key, data);
return 1;
}
@ -352,7 +352,7 @@ _units_set(Evas_Object *obj)
{
char *buf;
buf = wd->units_format_func(wd->val);
edje_object_part_text_set(wd->slider, "elm.units", buf);
edje_object_part_text_escaped_set(wd->slider, "elm.units", buf);
if (wd->units_format_free) wd->units_format_free(buf);
}
else if (wd->units)
@ -360,10 +360,10 @@ _units_set(Evas_Object *obj)
char buf[1024];
snprintf(buf, sizeof(buf), wd->units, wd->val);
edje_object_part_text_set(wd->slider, "elm.units", buf);
edje_object_part_text_escaped_set(wd->slider, "elm.units", buf);
}
else
edje_object_part_text_set(wd->slider, "elm.units", NULL);
edje_object_part_text_escaped_set(wd->slider, "elm.units", NULL);
}
static void
@ -375,17 +375,17 @@ _indicator_set(Evas_Object *obj)
{
char *buf;
buf = wd->indicator_format_func(wd->val);
edje_object_part_text_set(wd->slider, "elm.dragable.slider:elm.indicator", buf);
edje_object_part_text_escaped_set(wd->slider, "elm.dragable.slider:elm.indicator", buf);
if (wd->indicator_format_free) wd->indicator_format_free(buf);
}
else if (wd->indicator)
{
char buf[1024];
snprintf(buf, sizeof(buf), wd->indicator, wd->val);
edje_object_part_text_set(wd->slider, "elm.dragable.slider:elm.indicator", buf);
edje_object_part_text_escaped_set(wd->slider, "elm.dragable.slider:elm.indicator", buf);
}
else
edje_object_part_text_set(wd->slider, "elm.dragable.slider:elm.indicator", NULL);
edje_object_part_text_escaped_set(wd->slider, "elm.dragable.slider:elm.indicator", NULL);
}
static void
@ -605,7 +605,7 @@ _elm_slider_label_set(Evas_Object *obj, const char *part, const char *label)
edje_object_message_signal_process(wd->slider);
}
edje_object_part_text_set(wd->slider, real_part, label);
edje_object_part_text_escaped_set(wd->slider, real_part, label);
_sizing_eval(obj);
}
@ -770,8 +770,8 @@ _min_max_set(Evas_Object *obj)
snprintf((char*) buf_max, length + 128, wd->units, wd->val_max);
}
edje_object_part_text_set(wd->slider, "elm.units.min", buf_min);
edje_object_part_text_set(wd->slider, "elm.units.max", buf_max);
edje_object_part_text_escaped_set(wd->slider, "elm.units.min", buf_min);
edje_object_part_text_escaped_set(wd->slider, "elm.units.max", buf_max);
if (wd->units_format_func && wd->units_format_free)
{

2
legacy/elementary/src/lib/elm_spinner.c
View File

@ -227,7 +227,7 @@ _write_label(Evas_Object *obj)
snprintf(buf, sizeof(buf), "%.0f", wd->val);
apply:
edje_object_part_text_set(wd->spinner, "elm.text", buf);
edje_object_part_text_escaped_set(wd->spinner, "elm.text", buf);
if (wd->entry_visible) _entry_show(wd);
}

8
legacy/elementary/src/lib/elm_toolbar.c
View File

@ -336,7 +336,7 @@ _theme_hook_item(Evas_Object *obj, Elm_Toolbar_Item *it, double scale, int icon_
evas_object_size_hint_max_set(it->icon, ms, ms);
edje_object_part_swallow(view, "elm.swallow.icon", it->icon);
}
edje_object_part_text_set(view, "elm.text", it->label);
edje_object_part_text_escaped_set(view, "elm.text", it->label);
}
else
{
@ -1000,7 +1000,7 @@ _item_new(Evas_Object *obj, const char *icon, const char *label, Evas_Smart_Cb f
evas_object_show(it->icon);
elm_widget_sub_object_add(obj, it->icon);
}
edje_object_part_text_set(VIEW(it), "elm.text", it->label);
edje_object_part_text_escaped_set(VIEW(it), "elm.text", it->label);
mw = mh = -1;
elm_coords_finger_size_adjust(1, &mw, 1, &mh);
edje_object_size_min_restricted_calc(VIEW(it), &mw, &mh, mw, mh);
@ -1038,7 +1038,7 @@ _elm_toolbar_item_label_update(Elm_Toolbar_Item *item)
{
Evas_Coord mw = -1, mh = -1;
Widget_Data *wd = elm_widget_data_get(WIDGET(item));
edje_object_part_text_set(VIEW(item), "elm.text", item->label);
edje_object_part_text_escaped_set(VIEW(item), "elm.text", item->label);
elm_coords_finger_size_adjust(1, &mw, 1, &mh);
edje_object_size_min_restricted_calc(VIEW(item), &mw, &mh, mw, mh);
@ -1085,7 +1085,7 @@ _item_label_set(Elm_Toolbar_Item *item, const char *label, const char *sig)
s = edje_object_data_get(VIEW(item), "transition_animation_on");
if ((s) && (atoi(s)))
{
edje_object_part_text_set(VIEW(item), "elm.text_new", item->label);
edje_object_part_text_escaped_set(VIEW(item), "elm.text_new", item->label);
edje_object_signal_emit (VIEW(item), sig, "elm");
edje_object_signal_callback_add(VIEW(item),
"elm,state,label_set,done", "elm",

2
legacy/elementary/src/lib/elm_video.c
View File

@ -211,7 +211,7 @@ _title_change(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED
const char *title;
title = emotion_object_title_get(wd->emotion);
edje_object_part_text_set(wd->layout, "elm,title", title);
edje_object_part_text_escaped_set(wd->layout, "elm,title", title);
edje_object_signal_emit(wd->layout, "elm,video,title", "elm");
}

4
legacy/elementary/src/lib/elm_win.c
View File

@ -2127,7 +2127,7 @@ elm_win_title_set(Evas_Object *obj, const char *title)
eina_stringshare_replace(&(win->title), title);
ecore_evas_title_set(win->ee, win->title);
if (win->frame_obj)
edje_object_part_text_set(win->frame_obj, "elm.text.title", win->title);
edje_object_part_text_escaped_set(win->frame_obj, "elm.text.title", win->title);
}
EAPI const char *
@ -3239,7 +3239,7 @@ _elm_inwin_text_set_hook(Evas_Object *obj, const char *item, const char *text)
Widget_Data *wd = elm_widget_data_get(obj);
if (!wd || !item) return;
edje_object_part_text_set(wd->frm, item, text);
edje_object_part_text_escaped_set(wd->frm, item, text);
_sizing_eval(obj);
}

6
legacy/elementary/src/lib/elu_ews_wm.c
View File

@ -180,9 +180,9 @@ _elm_ews_border_config_apply(Ecore_Evas *ee, Evas_Object *o, Elm_Theme *th)
title = ecore_evas_title_get(ee);
ecore_evas_name_class_get(ee, &name, &class);
edje_object_part_text_set(o, "elm.text.title", title);
edje_object_part_text_set(o, "elm.text.name", name);
edje_object_part_text_set(o, "elm.text.class", class);
edje_object_part_text_escaped_set(o, "elm.text.title", title);
edje_object_part_text_escaped_set(o, "elm.text.name", name);
edje_object_part_text_escaped_set(o, "elm.text.class", class);
_elm_ews_border_geo_apply(ee, o);
_elm_ews_border_focus_apply(ee, o);