##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
-AC_INIT([elementary], [v_ver]-alpha, [enlightenment-devel@lists.sourceforge.net])
+AC_INIT([elementary], [v_ver]-beta, [enlightenment-devel@lists.sourceforge.net])
AC_PREREQ(2.52)
AC_CONFIG_SRCDIR([configure.ac])
AC_CONFIG_MACRO_DIR([m4])
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",
}
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",
}
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",
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",
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);
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);
}
}
- part { name: "bottom";
+ part { name: "elm.bottom";
mouse_events: 0;
clip_to: "bottom_clipper";
type: TEXT;
size: 30;
min: 1 1;
align: 0.5 0.5;
- source: "top";
+ source: "elm.top";
}
}
}
}
}
- part { name: "top";
+ part { name: "elm.top";
mouse_events: 0;
clip_to: "top_clipper";
type: TEXT;
msgstr ""
"Project-Id-Version: elementary\n"
"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-04-16 15:55+0900\n"
+"POT-Creation-Date: 2012-04-20 22:30+0900\n"
"PO-Revision-Date: 2010-12-26 10:05+0200\n"
"Last-Translator: Tom Hacohen <tom.hacohen@partner.samsung.com>\n"
"Language-Team: General\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-#: src/lib/elc_fileselector.c:842
+#: src/lib/elc_fileselector.c:854
msgid "Up"
msgstr ""
-#: src/lib/elc_fileselector.c:857
+#: src/lib/elc_fileselector.c:869
msgid "Home"
msgstr ""
-#: src/lib/elc_fileselector.c:1009 src/lib/elm_entry.c:1371
+#: src/lib/elc_fileselector.c:1021 src/lib/elm_entry.c:1371
msgid "Cancel"
msgstr ""
-#: src/lib/elc_fileselector.c:1019
+#: src/lib/elc_fileselector.c:1031
msgid "OK"
msgstr ""
msgstr ""
"Project-Id-Version: elementary\n"
"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-04-16 15:55+0900\n"
+"POT-Creation-Date: 2012-04-20 22:30+0900\n"
"PO-Revision-Date: 2010-12-26 10:05+0200\n"
"Last-Translator: Tom Hacohen <tom.hacohen@partner.samsung.com>\n"
"Language-Team: General\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: src/lib/elc_fileselector.c:842
+#: src/lib/elc_fileselector.c:854
msgid "Up"
msgstr ""
-#: src/lib/elc_fileselector.c:857
+#: src/lib/elc_fileselector.c:869
msgid "Home"
msgstr ""
-#: src/lib/elc_fileselector.c:1009 src/lib/elm_entry.c:1371
+#: src/lib/elc_fileselector.c:1021 src/lib/elm_entry.c:1371
msgid "Cancel"
msgstr ""
-#: src/lib/elc_fileselector.c:1019
+#: src/lib/elc_fileselector.c:1031
msgid "OK"
msgstr ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-04-16 15:55+0900\n"
+"POT-Creation-Date: 2012-04-20 22:30+0900\n"
"PO-Revision-Date: 2011-10-23 01:31+0100\n"
"Last-Translator: Daniel Kolesa <quaker66@gmail.com>\n"
"Language-Team: Czech <kde-i18n-doc@kde.org>\n"
"X-Generator: Lokalize 1.2\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: src/lib/elc_fileselector.c:842
+#: src/lib/elc_fileselector.c:854
msgid "Up"
msgstr "Nahoru"
-#: src/lib/elc_fileselector.c:857
+#: src/lib/elc_fileselector.c:869
msgid "Home"
msgstr "Domů"
-#: src/lib/elc_fileselector.c:1009 src/lib/elm_entry.c:1371
+#: src/lib/elc_fileselector.c:1021 src/lib/elm_entry.c:1371
msgid "Cancel"
msgstr "Zrušit"
-#: src/lib/elc_fileselector.c:1019
+#: src/lib/elc_fileselector.c:1031
msgid "OK"
msgstr "OK"
msgstr ""
"Project-Id-Version: elementary 0.7.0.57309\n"
"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-04-16 15:55+0900\n"
+"POT-Creation-Date: 2012-04-20 22:30+0900\n"
"PO-Revision-Date: 2011-02-25 20:22+0100\n"
"Last-Translator: Fabian Nowak <timystery@arcor.de>\n"
"Language-Team: German\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/lib/elc_fileselector.c:842
+#: src/lib/elc_fileselector.c:854
msgid "Up"
msgstr "Aufwärts"
-#: src/lib/elc_fileselector.c:857
+#: src/lib/elc_fileselector.c:869
msgid "Home"
msgstr "Persönlicher Ordner"
-#: src/lib/elc_fileselector.c:1009 src/lib/elm_entry.c:1371
+#: src/lib/elc_fileselector.c:1021 src/lib/elm_entry.c:1371
msgid "Cancel"
msgstr "Abbrechen"
-#: src/lib/elc_fileselector.c:1019
+#: src/lib/elc_fileselector.c:1031
msgid "OK"
msgstr "OK"
msgstr ""
"Project-Id-Version: elementary\n"
"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-04-16 15:55+0900\n"
+"POT-Creation-Date: 2012-04-20 22:30+0900\n"
"PO-Revision-Date: 2010-12-26 10:05+0200\n"
"Last-Translator: Tom Hacohen <tom.hacohen@partner.samsung.com>\n"
"Language-Team: General\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: src/lib/elc_fileselector.c:842
+#: src/lib/elc_fileselector.c:854
msgid "Up"
msgstr ""
-#: src/lib/elc_fileselector.c:857
+#: src/lib/elc_fileselector.c:869
msgid "Home"
msgstr ""
-#: src/lib/elc_fileselector.c:1009 src/lib/elm_entry.c:1371
+#: src/lib/elc_fileselector.c:1021 src/lib/elm_entry.c:1371
msgid "Cancel"
msgstr ""
-#: src/lib/elc_fileselector.c:1019
+#: src/lib/elc_fileselector.c:1031
msgid "OK"
msgstr ""
msgstr ""
"Project-Id-Version: Elementary\n"
"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-04-16 15:55+0900\n"
+"POT-Creation-Date: 2012-04-20 22:30+0900\n"
"PO-Revision-Date: 2011-11-08 07:57+0100\n"
"Last-Translator: dazibao <dazibao@sfr.fr>\n"
"Language-Team: French <sansgourou@gmail.com>\n"
"X-Poedit-Country: FRANCE\n"
"X-Poedit-SourceCharset: utf-8\n"
-#: src/lib/elc_fileselector.c:842
+#: src/lib/elc_fileselector.c:854
msgid "Up"
msgstr "Monter"
-#: src/lib/elc_fileselector.c:857
+#: src/lib/elc_fileselector.c:869
msgid "Home"
msgstr "Home"
-#: src/lib/elc_fileselector.c:1009 src/lib/elm_entry.c:1371
+#: src/lib/elc_fileselector.c:1021 src/lib/elm_entry.c:1371
msgid "Cancel"
msgstr "Annuler"
-#: src/lib/elc_fileselector.c:1019
+#: src/lib/elc_fileselector.c:1031
msgid "OK"
msgstr "OK"
msgstr ""
"Project-Id-Version: elementary\n"
"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-04-16 15:55+0900\n"
+"POT-Creation-Date: 2012-04-20 22:30+0900\n"
"PO-Revision-Date: 2010-12-26 10:05+0200\n"
"Last-Translator: Aharon Hillel <a.hillel@partner.samsung.com>\n"
"Language-Team: General\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/lib/elc_fileselector.c:842
+#: src/lib/elc_fileselector.c:854
msgid "Up"
msgstr ""
-#: src/lib/elc_fileselector.c:857
+#: src/lib/elc_fileselector.c:869
msgid "Home"
msgstr ""
-#: src/lib/elc_fileselector.c:1009 src/lib/elm_entry.c:1371
+#: src/lib/elc_fileselector.c:1021 src/lib/elm_entry.c:1371
msgid "Cancel"
msgstr "בטל"
-#: src/lib/elc_fileselector.c:1019
+#: src/lib/elc_fileselector.c:1031
msgid "OK"
msgstr "אשר"
msgstr ""
"Project-Id-Version: Elementary\n"
"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-04-16 15:55+0900\n"
+"POT-Creation-Date: 2012-04-20 22:30+0900\n"
"PO-Revision-Date: 2011-11-08 14:19+0100\n"
"Last-Translator: Massimo Maiurana <maiurana@gmail.com>\n"
"Language-Team: none\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/lib/elc_fileselector.c:842
+#: src/lib/elc_fileselector.c:854
msgid "Up"
msgstr "Su"
-#: src/lib/elc_fileselector.c:857
+#: src/lib/elc_fileselector.c:869
msgid "Home"
msgstr "Home"
-#: src/lib/elc_fileselector.c:1009 src/lib/elm_entry.c:1371
+#: src/lib/elc_fileselector.c:1021 src/lib/elm_entry.c:1371
msgid "Cancel"
msgstr "Annulla"
-#: src/lib/elc_fileselector.c:1019
+#: src/lib/elc_fileselector.c:1031
msgid "OK"
msgstr "OK"
msgstr ""
"Project-Id-Version: elementary\n"
"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-04-16 15:55+0900\n"
+"POT-Creation-Date: 2012-04-20 22:30+0900\n"
"PO-Revision-Date: 2011-02-22 09:09-0800\n"
"Last-Translator: Daniel Juyung Seo <seojuyung@gmail.com>\n"
"Language-Team: General\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/lib/elc_fileselector.c:842
+#: src/lib/elc_fileselector.c:854
msgid "Up"
msgstr "위로"
-#: src/lib/elc_fileselector.c:857
+#: src/lib/elc_fileselector.c:869
msgid "Home"
msgstr "홈"
-#: src/lib/elc_fileselector.c:1009 src/lib/elm_entry.c:1371
+#: src/lib/elc_fileselector.c:1021 src/lib/elm_entry.c:1371
msgid "Cancel"
msgstr "취소"
-#: src/lib/elc_fileselector.c:1019
+#: src/lib/elc_fileselector.c:1031
msgid "OK"
msgstr "확인"
msgstr ""
"Project-Id-Version: elementary 0.7.0.57309\n"
"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-04-16 15:55+0900\n"
+"POT-Creation-Date: 2012-04-20 22:30+0900\n"
"PO-Revision-Date: 2011-06-19 16:41+0100\n"
"Last-Translator: Heimen Stoffels <vistausss@gmail.com>\n"
"Language-Team: Dutch <vistausss@gmail.com>\n"
"X-Poedit-Language: Dutch\n"
"X-Poedit-Country: NETHERLANDS\n"
-#: src/lib/elc_fileselector.c:842
+#: src/lib/elc_fileselector.c:854
msgid "Up"
msgstr "Omhoog"
-#: src/lib/elc_fileselector.c:857
+#: src/lib/elc_fileselector.c:869
msgid "Home"
msgstr "Persoonlijke map"
-#: src/lib/elc_fileselector.c:1009 src/lib/elm_entry.c:1371
+#: src/lib/elc_fileselector.c:1021 src/lib/elm_entry.c:1371
msgid "Cancel"
msgstr "Annuleren"
-#: src/lib/elc_fileselector.c:1019
+#: src/lib/elc_fileselector.c:1031
msgid "OK"
msgstr "OK"
msgstr ""
"Project-Id-Version: elementary\n"
"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-04-16 15:55+0900\n"
+"POT-Creation-Date: 2012-04-20 22:30+0900\n"
"PO-Revision-Date: 2010-12-26 10:05+0200\n"
"Last-Translator: Tom Hacohen <tom.hacohen@partner.samsung.com>\n"
"Language-Team: General\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/lib/elc_fileselector.c:842
+#: src/lib/elc_fileselector.c:854
msgid "Up"
msgstr ""
-#: src/lib/elc_fileselector.c:857
+#: src/lib/elc_fileselector.c:869
msgid "Home"
msgstr ""
-#: src/lib/elc_fileselector.c:1009 src/lib/elm_entry.c:1371
+#: src/lib/elc_fileselector.c:1021 src/lib/elm_entry.c:1371
msgid "Cancel"
msgstr ""
-#: src/lib/elc_fileselector.c:1019
+#: src/lib/elc_fileselector.c:1031
msgid "OK"
msgstr ""
msgstr ""
"Project-Id-Version: Elementary\n"
"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-04-16 15:55+0900\n"
+"POT-Creation-Date: 2012-04-20 22:30+0900\n"
"PO-Revision-Date: 2011-11-17 12:25-0000\n"
"Last-Translator: Sérgio Marques <smarquespt@gmail.com>\n"
"Language-Team: \n"
"X-Poedit-Language: Portuguese\n"
"X-Poedit-Country: Portugal\n"
-#: src/lib/elc_fileselector.c:842
+#: src/lib/elc_fileselector.c:854
msgid "Up"
msgstr "Para cima"
-#: src/lib/elc_fileselector.c:857
+#: src/lib/elc_fileselector.c:869
msgid "Home"
msgstr "Pasta pessoal"
-#: src/lib/elc_fileselector.c:1009 src/lib/elm_entry.c:1371
+#: src/lib/elc_fileselector.c:1021 src/lib/elm_entry.c:1371
msgid "Cancel"
msgstr "Cancelar"
-#: src/lib/elc_fileselector.c:1019
+#: src/lib/elc_fileselector.c:1031
msgid "OK"
msgstr "OK"
msgstr ""
"Project-Id-Version: elementary\n"
"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-04-16 15:55+0900\n"
+"POT-Creation-Date: 2012-04-20 22:30+0900\n"
"PO-Revision-Date: 2010-12-26 10:05+0200\n"
"Last-Translator: Tom Hacohen <tom.hacohen@partner.samsung.com>\n"
"Language-Team: General\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/lib/elc_fileselector.c:842
+#: src/lib/elc_fileselector.c:854
msgid "Up"
msgstr ""
-#: src/lib/elc_fileselector.c:857
+#: src/lib/elc_fileselector.c:869
msgid "Home"
msgstr ""
-#: src/lib/elc_fileselector.c:1009 src/lib/elm_entry.c:1371
+#: src/lib/elc_fileselector.c:1021 src/lib/elm_entry.c:1371
msgid "Cancel"
msgstr ""
-#: src/lib/elc_fileselector.c:1019
+#: src/lib/elc_fileselector.c:1031
msgid "OK"
msgstr ""
msgstr ""
"Project-Id-Version: elementary\n"
"Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2012-04-16 15:55+0900\n"
+"POT-Creation-Date: 2012-04-20 22:30+0900\n"
"PO-Revision-Date: 2010-12-26 10:05+0200\n"
"Last-Translator: Tom Hacohen <tom.hacohen@partner.samsung.com>\n"
"Language-Team: General\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/lib/elc_fileselector.c:842
+#: src/lib/elc_fileselector.c:854
msgid "Up"
msgstr ""
-#: src/lib/elc_fileselector.c:857
+#: src/lib/elc_fileselector.c:869
msgid "Home"
msgstr ""
-#: src/lib/elc_fileselector.c:1009 src/lib/elm_entry.c:1371
+#: src/lib/elc_fileselector.c:1021 src/lib/elm_entry.c:1371
msgid "Cancel"
msgstr ""
-#: src/lib/elc_fileselector.c:1019
+#: src/lib/elc_fileselector.c:1031
msgid "OK"
msgstr ""
+#ifdef HAVE_CONFIG_H
+# include "elementary_config.h"
+#endif
-#define _GNU_SOURCE
#include <string.h>
#include <Elementary.h>
#include "test.h"
-#ifdef HAVE_CONFIG_H
-# include "elementary_config.h"
-#endif
#ifndef ELM_LIB_QUICKLAUNCH
/* all tests prototypes */
elm_object_item_text_get(event_info));
}
-#define ITEM_NEW(_hov, _label, _icon) \
- if (_icon) \
- { \
- ic = elm_icon_add(obj); \
- elm_icon_standard_set(ic, _icon); \
- elm_icon_resizable_set(ic, EINA_FALSE, EINA_FALSE); \
- } \
- else \
- ic = NULL; \
- it = elm_ctxpopup_item_append(_hov, _label, ic, _ctxpopup_item_cb, NULL); \
+#define ITEM_NEW(_hov, _label, _icon) \
+ if (_icon) \
+ { \
+ ic = elm_icon_add(obj); \
+ elm_icon_standard_set(ic, _icon); \
+ elm_icon_resizable_set(ic, EINA_FALSE, EINA_FALSE); \
+ } \
+ else \
+ ic = NULL; \
+ it = elm_ctxpopup_item_append(_hov, _label, ic, _ctxpopup_item_cb, NULL); \
static void
_list_item_cb(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
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 *
}
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)
_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);
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++)
{
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
_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);
}
}
Evas_Object *edje;
Evas_Object *button;
Evas_Object *entry;
+ char *path;
};
static const char *widtype = NULL;
{
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);
}
_del_hook(Evas_Object *obj)
{
Widget_Data *wd = elm_widget_data_get(obj);
+ if (wd->path) free(wd->path);
free(wd);
}
{
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 *
{
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
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, ""))
{
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);
}
}
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);
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);
}
"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");
}
_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");
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);
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);
}
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);
}
}
_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)
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);
}
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);
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);
}
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
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]);
}
}
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);
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);
}
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
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);
// 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)
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
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
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);
}
}
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)
{
_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
{
_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",
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 *
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;
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);
}
_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,
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);
}
((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);
}
}
_item_del(Elm_Gen_Item *it)
{
Evas_Object *obj = WIDGET(it);
+ Widget_Data *wd = it->wd;
evas_event_freeze(evas_object_evas_get(obj));
elm_genlist_item_subitems_clear((Elm_Object_Item *)it);
- if (it->wd->show_item == it) it->wd->show_item = NULL;
+ if (wd->show_item == it) wd->show_item = NULL;
if (it->realized) _elm_genlist_item_unrealize(it, EINA_FALSE);
if (it->item->decorate_all_item_realized) _decorate_all_item_unrealize(it);
if (it->item->block) _item_block_del(it);
if (it->item->queued)
- it->wd->queue = eina_list_remove(it->wd->queue, it);
- if (it->wd->anchor_item == it)
+ wd->queue = eina_list_remove(wd->queue, it);
+ if (wd->anchor_item == it)
+ {
+ wd->anchor_item = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->next);
+ if (!wd->anchor_item)
+ wd->anchor_item = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->prev);
+ }
+ if (wd->expanded_item == it)
{
- it->wd->anchor_item = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->next);
- if (!it->wd->anchor_item)
- it->wd->anchor_item = ELM_GEN_ITEM_FROM_INLIST(EINA_INLIST_GET(it)->prev);
+ wd->expanded_item = NULL;
+ if (wd->tree_effect_animator)
+ {
+ ecore_animator_del(wd->tree_effect_animator);
+ wd->tree_effect_animator = NULL;
+ }
+ wd->move_effect_mode = ELM_GENLIST_TREE_EFFECT_NONE;
}
- if (it->wd->expanded_item == it) it->wd->expanded_item = NULL;
- if (it->wd->expanded_next_item == it) it->wd->expanded_next_item = NULL;
+ if (wd->expanded_next_item == it) wd->expanded_next_item = NULL;
+ if (wd->move_items) wd->move_items = eina_list_remove(wd->move_items, it);
if (it->parent)
it->parent->item->items = eina_list_remove(it->parent->item->items, it);
if (it->item->swipe_timer)
if (s)
{
- edje_object_part_text_set(target, key, s);
+ edje_object_part_text_escaped_set(target, key, s);
free(s);
}
else
static void
_item_unrealize_cb(Elm_Gen_Item *it)
{
+ Evas_Object *content;
+ elm_widget_stringlist_free(it->item->flip_contents);
+ it->item->flip_contents = NULL;
+ EINA_LIST_FREE(it->item->flip_content_objs, content)
+ evas_object_del(content);
+
if (it->item->nocache_once || it->item->nocache)
{
evas_object_del(VIEW(it));
_decorate_all_item_position(it, it->item->scrl_x, it->item->scrl_y);
evas_object_show(it->deco_all_view);
+ if (it->selected) edje_object_signal_emit(it->deco_all_view, "elm,state,selected", "elm");
+
it->item->decorate_all_item_realized = EINA_TRUE;
it->want_unrealize = EINA_FALSE;
}
static void
_elm_genlist_move_items_set(Elm_Gen_Item *it)
{
- Eina_List *l;
+ Eina_List *l, *ll;
Elm_Gen_Item *it2 = NULL;
Evas_Coord ox, oy, ow, oh, dh = 0;
if (it->item->expanded)
{
it->wd->move_items = elm_genlist_realized_items_get(it->wd->obj);
- EINA_LIST_FOREACH(it->wd->move_items, l, it2)
+ EINA_LIST_FOREACH_SAFE(it->wd->move_items, l, ll, it2)
{
if (it2 == it->wd->expanded_next_item) break;
it->wd->move_items = eina_list_remove(it->wd->move_items, it2);
{
if (it->item->type != ELM_GENLIST_ITEM_GROUP)
{
- if (it->selected) _item_unselect(it);
if (it->itc->decorate_all_item_style)
_decorate_all_item_realize(it, EINA_TRUE);
}
EINA_LIST_FREE(it->content_objs, content)
evas_object_del(content);
- if (elm_widget_type_get(WIDGET(it)) == _genlist)
- {
- elm_widget_stringlist_free(it->item->flip_contents);
- it->item->flip_contents = NULL;
- EINA_LIST_FREE(it->item->flip_content_objs, content)
- evas_object_del(content);
- }
-
it->unrealize_cb(it);
it->realized = EINA_FALSE;
if (wd->tree_effect_animator)
{
if (wd->move_effect_mode == ELM_GENLIST_TREE_EFFECT_CONTRACT)
- _item_subitems_clear(wd->expanded_item);
+ _item_subitems_clear(wd->expanded_item);
EINA_LIST_FOREACH(wd->expanded_item->item->items, l, it)
{
it->item->tree_effect_finished = EINA_TRUE;
_tree_effect_animator_cb(void *data)
{
Widget_Data *wd = data;
- if (!wd) return EINA_FALSE;
+ if (!wd) return ECORE_CALLBACK_CANCEL;
Evas_Coord ox, oy, ow, oh, cvx, cvy, cvw, cvh;
Elm_Gen_Item *it = NULL, *it2, *expanded_next_it;
const Eina_List *l;
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);
}
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);
}
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);
}
}
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;
}
}
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);
}
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 *
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))
{
_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);
}
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);
}
}
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)
{
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
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);
}
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");
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);
}
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
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 *
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);
{
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;
}
{
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)
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
{
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
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);
}
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)
{
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);
}
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
{
}
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");
}
mw = mh = -1;
{
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);
edje_object_signal_emit(VIEW(item), "elm,state,text,visible", "elm");
elm_coords_finger_size_adjust(1, &mw, 1, &mh);
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",
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");
}
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 *
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);
}
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);