-#include <Elementary.h>
#ifdef HAVE_CONFIG_H
# include "elementary_config.h"
#endif
+#include <Elementary.h>
#ifndef ELM_LIB_QUICKLAUNCH
#ifdef HAVE_ELEMENTARY_EWEATHER
if (module[current])
eweather_plugin_set(eweather, module[current]);
- eweather_code_set(eweather, elm_entry_entry_get(en));
+ eweather_code_set(eweather, elm_object_text_get(en));
printf("CURRENT %d %p %p\n", current, module[current], eweather);
}
_hover_select_cb(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info)
{
EWeather *eweather = eweather_object_eweather_get(weather[0]);
- module[0] = eweather_plugin_search(eweather, elm_hoversel_item_label_get(event_info));
+ module[0] = eweather_plugin_search(eweather, elm_object_item_text_get(event_info));
eweather = eweather_object_eweather_get(weather[1]);
- module[1] = eweather_plugin_search(eweather, elm_hoversel_item_label_get(event_info));
+ module[1] = eweather_plugin_search(eweather, elm_object_item_text_get(event_info));
printf("%p %p\n", module[0], module[1]);
}
#endif
void
test_weather(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
- Evas_Object *win, *bg;
+ Evas_Object *win;
#ifdef HAVE_ELEMENTARY_EWEATHER
Evas_Object *bx, *bx0, *bt;
EWeather *eweather;
unsigned int i;
#endif
- win = elm_win_add(NULL, "weather", ELM_WIN_BASIC);
- elm_win_title_set(win, "Weather");
- elm_win_autodel_set(win, 1);
-
- bg = elm_bg_add(win);
- evas_object_size_hint_weight_set(bg, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- elm_win_resize_object_add(win, bg);
- evas_object_show(bg);
+ win = elm_win_util_standard_add("weather", "Weather");
+ elm_win_autodel_set(win, EINA_TRUE);
-#ifdef HAVE_ELEMENTARY_EWEATHER
+#ifdef HAVE_ELEMENTARY_EWEATHER
bx = elm_box_add(win);
elm_win_resize_object_add(win, bx);
evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
weather[0] = eweather_object_add(evas_object_evas_get(win));
evas_object_size_hint_weight_set(weather[0], EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(weather[0], -1.0, -1.0);
- elm_flip_content_front_set(fl, weather[0]);
+ elm_object_part_content_set(fl, "front", weather[0]);
evas_object_show(weather[0]);
module[1] = NULL;
eweather = eweather_object_eweather_get(weather[1]);
evas_object_size_hint_weight_set(weather[1], EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(weather[1], -1.0, -1.0);
- elm_flip_content_back_set(fl, weather[1]);
+ elm_object_part_content_set(fl, "back", weather[1]);
evas_object_show(weather[1]);
evas_object_show(fl);
evas_object_show(bx0);
bt = elm_button_add(win);
- elm_button_label_set(bt, "First city");
+ elm_object_text_set(bt, "First city");
evas_object_show(bt);
elm_box_pack_end(bx0, bt);
evas_object_smart_callback_add(bt, "clicked", _first_city_cb, NULL);
bt = elm_button_add(win);
- elm_button_label_set(bt, "Second city");
+ elm_object_text_set(bt, "Second city");
evas_object_show(bt);
elm_box_pack_end(bx0, bt);
evas_object_smart_callback_add(bt, "clicked", _second_city_cb, NULL);
hv = elm_hoversel_add(win);
elm_hoversel_hover_parent_set(hv, win);
- elm_hoversel_label_set(hv, "data source");
+ elm_object_text_set(hv, "data source");
evas_object_size_hint_weight_set(hv, 0.0, 0.0);
evas_object_size_hint_align_set(hv, 0.5, 0.5);
elm_box_pack_end(bx0, hv);
elm_hoversel_item_add(hv, eweather_plugin_name_get(eweather, i), NULL, ELM_ICON_NONE, _hover_select_cb, NULL);
en = elm_entry_add(win);
- elm_entry_line_wrap_set(en, 0);
+ elm_entry_line_wrap_set(en, ELM_WRAP_NONE);
elm_entry_single_line_set(en, EINA_TRUE);
- elm_entry_entry_set(en, "Paris");
+ elm_object_text_set(en, "Paris");
evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_box_pack_end(bx0, en);
evas_object_show(en);
bt = elm_button_add(win);
- elm_button_label_set(bt, "Apply");
+ elm_object_text_set(bt, "Apply");
evas_object_show(bt);
elm_box_pack_end(bx0, bt);
evas_object_smart_callback_add(bt, "clicked", _apply_cb, NULL);
#else
Evas_Object *lbl;
-
+
lbl = elm_label_add(win);
elm_win_resize_object_add(win, lbl);
- elm_label_label_set(lbl, "libeweather is required to display the forecast.");
+ elm_object_text_set(lbl, "libeweather is required to display the forecast.");
evas_object_show(lbl);
#endif