{
Evas_Object *lb = elm_label_add(win);
elm_object_text_set(lb,
- "<b>Use Tab and Shift+Tab</b>"
+ "<b>Use Tab, Shift+Tab, and<br/>"
+ "Arrow Keys</b>"
);
evas_object_size_hint_weight_set(lb, 0.0, 0.0);
evas_object_size_hint_align_set(lb, EVAS_HINT_FILL,
}
{
- Evas_Object *tg = elm_toggle_add(win);
- elm_toggle_states_labels_set(tg, "Yes", "No");
+ Evas_Object *tg = elm_check_add(win);
+ elm_object_style_set(tg, "toggle");
+ elm_object_part_text_set(tg, "on", "Yes");
+ elm_object_part_text_set(tg, "off", "No");
elm_box_pack_end(bx, tg);
my_show(tg);
}
elm_entry_scrollable_set(en, EINA_TRUE);
evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.0);
evas_object_size_hint_align_set(en, EVAS_HINT_FILL, 0.5);
- elm_entry_entry_set(en, "This is a single line");
- elm_entry_single_line_set(en, 1);
+ elm_object_text_set(en, "This is a single line");
+ elm_entry_single_line_set(en, EINA_TRUE);
elm_box_pack_end(bx, en);
my_show(en);
}
EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(sc, EVAS_HINT_FILL,
EVAS_HINT_FILL);
- elm_scroller_bounce_set(sc, 1, 1);
+ elm_scroller_bounce_set(sc, EINA_TRUE, EINA_TRUE);
elm_scroller_content_min_limit(sc, 1, 1);
elm_box_pack_end(bx2, sc);
my_show(sc);
EVAS_HINT_FILL);
evas_object_size_hint_weight_set(bt, 0.0, 0.0);
elm_object_event_callback_add(bt, _event, NULL);
- elm_scroller_content_set(sc, bt);
+ elm_object_content_set(sc, bt);
my_show(bt);
elm_object_event_callback_del(bt, _event, NULL);
}
EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(sc, EVAS_HINT_FILL,
EVAS_HINT_FILL);
+<<<<<<< HEAD
elm_scroller_bounce_set(sc, 0, 1);
+=======
+ elm_scroller_bounce_set(sc, EINA_FALSE, EINA_TRUE);
+>>>>>>> remotes/origin/upstream
elm_scroller_content_min_limit(sc, 1, 0);
elm_box_pack_end(bx2, sc);
my_show(sc);
evas_object_size_hint_align_set(bx3, EVAS_HINT_FILL,
EVAS_HINT_FILL);
evas_object_size_hint_weight_set(bx3, 0.0, 0.0);
- elm_scroller_content_set(sc, bx3);
+ elm_object_content_set(sc, bx3);
my_show(bx3);
for (i = 5; i; i--)
{//Second Col
char buf[PATH_MAX];
Evas_Object *ly = elm_layout_add(win);
- snprintf(buf, sizeof(buf), "%s/objects/test.edj", PACKAGE_DATA_DIR);
+ snprintf(buf, sizeof(buf), "%s/objects/test.edj", elm_app_data_dir_get());
elm_layout_file_set(ly, buf, "twolines");
evas_object_size_hint_weight_set(ly, EVAS_HINT_EXPAND,
EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL,
EVAS_HINT_FILL);
evas_object_size_hint_weight_set(bx2, 0.0, 0.0);
- elm_layout_content_set(ly, "element1", bx2);
+ elm_object_part_content_set(ly, "element1", bx2);
my_show(bx2);
for (i = 3; i; i--)
evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL,
EVAS_HINT_FILL);
evas_object_size_hint_weight_set(bx2, 0.0, 0.0);
- elm_layout_content_set(ly, "element2", bx2);
+ elm_object_part_content_set(ly, "element2", bx2);
my_show(bx2);
{
{
Evas_Object *tb = elm_table_add(win);
evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_frame_content_set(fr, tb);
+ elm_object_content_set(fr, tb);
my_show(tb);
for (j = 0; j < 1; j++)
for (i = 0; i < 2; i++)
{
Evas_Object *tb = elm_table_add(win);
evas_object_size_hint_weight_set(tb, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_bubble_content_set(fr, tb);
+ elm_object_content_set(fr, tb);
my_show(tb);
for (j = 0; j < 2; j++)
for (i = 0; i < 1; i++)