forked from enlightenment/enlightenment
clock - fix popup content.. use elm widgets now.
This commit is contained in:
parent
ee40261cf7
commit
63f879fc08
|
@ -219,7 +219,7 @@ _clock_month_update(Instance *inst)
|
||||||
Evas_Object *od, *oi;
|
Evas_Object *od, *oi;
|
||||||
int x, y;
|
int x, y;
|
||||||
|
|
||||||
oi = inst->o_cal;
|
oi = elm_layout_edje_get(inst->o_cal);
|
||||||
edje_object_part_text_set(oi, "e.text.month", inst->month);
|
edje_object_part_text_set(oi, "e.text.month", inst->month);
|
||||||
edje_object_part_text_set(oi, "e.text.year", inst->year);
|
edje_object_part_text_set(oi, "e.text.year", inst->year);
|
||||||
for (x = 0; x < 7; x++)
|
for (x = 0; x < 7; x++)
|
||||||
|
@ -303,7 +303,6 @@ _clock_popup_new(Instance *inst)
|
||||||
{
|
{
|
||||||
Evas *evas;
|
Evas *evas;
|
||||||
Evas_Object *o, *oi;
|
Evas_Object *o, *oi;
|
||||||
Evas_Coord mw = 128, mh = 128;
|
|
||||||
char todaystr[128];
|
char todaystr[128];
|
||||||
|
|
||||||
if (inst->popup) return;
|
if (inst->popup) return;
|
||||||
|
@ -317,12 +316,14 @@ _clock_popup_new(Instance *inst)
|
||||||
inst->popup = e_gadcon_popup_new(inst->gcc, 0);
|
inst->popup = e_gadcon_popup_new(inst->gcc, 0);
|
||||||
evas = e_comp_get(inst->popup)->evas;
|
evas = e_comp_get(inst->popup)->evas;
|
||||||
|
|
||||||
inst->o_table = e_widget_table_add(e_win_evas_win_get(evas), 0);
|
inst->o_table = elm_table_add(inst->popup->comp_object);
|
||||||
|
|
||||||
oi = edje_object_add(evas);
|
oi = elm_layout_add(inst->popup->comp_object);
|
||||||
inst->o_popclock = oi;
|
inst->o_popclock = oi;
|
||||||
|
evas_object_size_hint_weight_set(oi, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
|
||||||
|
evas_object_size_hint_align_set(oi, EVAS_HINT_FILL, EVAS_HINT_FILL);
|
||||||
evas_object_event_callback_add(oi, EVAS_CALLBACK_DEL, _popclock_del_cb, inst);
|
evas_object_event_callback_add(oi, EVAS_CALLBACK_DEL, _popclock_del_cb, inst);
|
||||||
|
|
||||||
if (inst->cfg->digital_clock)
|
if (inst->cfg->digital_clock)
|
||||||
e_theme_edje_object_set(oi, "base/theme/modules/clock",
|
e_theme_edje_object_set(oi, "base/theme/modules/clock",
|
||||||
"e/modules/clock/digital");
|
"e/modules/clock/digital");
|
||||||
|
@ -344,17 +345,20 @@ _clock_popup_new(Instance *inst)
|
||||||
|
|
||||||
edje_object_part_text_set(oi, "e.text.today", todaystr);
|
edje_object_part_text_set(oi, "e.text.today", todaystr);
|
||||||
|
|
||||||
o = e_widget_image_add_from_object(evas, oi, 128, 128);
|
elm_layout_sizing_eval(oi);
|
||||||
|
elm_table_pack(inst->o_table, oi, 0, 0, 1, 1);
|
||||||
evas_object_show(oi);
|
evas_object_show(oi);
|
||||||
e_widget_table_object_align_append(inst->o_table, o,
|
|
||||||
0, 0, 1, 1, 0, 0, 0, 0, 0.5, 0.5);
|
o = evas_object_rectangle_add(evas);
|
||||||
|
evas_object_size_hint_min_set(o, 80 * e_scale, 80 * e_scale);
|
||||||
|
elm_table_pack(inst->o_table, o, 0, 0, 1, 1);
|
||||||
|
|
||||||
o = e_widget_button_add(evas, _("Settings"), "preferences-system",
|
o = e_widget_button_add(evas, _("Settings"), "preferences-system",
|
||||||
_clock_settings_cb, inst, NULL);
|
_clock_settings_cb, inst, NULL);
|
||||||
e_widget_table_object_align_append(inst->o_table, o,
|
elm_table_pack(inst->o_table, o, 0, 2, 1, 1);
|
||||||
0, 1, 1, 1, 0, 0, 0, 0, 0.5, 1.0);
|
evas_object_show(o);
|
||||||
|
|
||||||
oi = edje_object_add(evas);
|
oi = elm_layout_add(inst->popup->comp_object);
|
||||||
inst->o_cal = oi;
|
inst->o_cal = oi;
|
||||||
e_theme_edje_object_set(oi, "base/theme/modules/clock",
|
e_theme_edje_object_set(oi, "base/theme/modules/clock",
|
||||||
"e/modules/clock/calendar");
|
"e/modules/clock/calendar");
|
||||||
|
@ -364,15 +368,12 @@ _clock_popup_new(Instance *inst)
|
||||||
_clock_month_prev_cb, inst);
|
_clock_month_prev_cb, inst);
|
||||||
edje_object_signal_callback_add(oi, "e,action,next", "*",
|
edje_object_signal_callback_add(oi, "e,action,next", "*",
|
||||||
_clock_month_next_cb, inst);
|
_clock_month_next_cb, inst);
|
||||||
edje_object_message_signal_process(oi);
|
edje_object_message_signal_process(elm_layout_edje_get(oi));
|
||||||
evas_object_resize(oi, 500, 500);
|
elm_layout_sizing_eval(oi);
|
||||||
edje_object_size_min_restricted_calc(oi, &mw, &mh, 128, 128);
|
elm_table_pack(inst->o_table, oi, 0, 1, 1, 1);
|
||||||
|
|
||||||
o = e_widget_image_add_from_object(evas, oi, mw, mh);
|
|
||||||
evas_object_show(oi);
|
evas_object_show(oi);
|
||||||
e_widget_table_object_align_append(inst->o_table, o,
|
|
||||||
1, 0, 1, 2, 0, 0, 0, 0, 0.5, 0.5);
|
|
||||||
|
|
||||||
|
evas_smart_objects_calculate(evas);
|
||||||
e_gadcon_popup_content_set(inst->popup, inst->o_table);
|
e_gadcon_popup_content_set(inst->popup, inst->o_table);
|
||||||
e_gadcon_popup_show(inst->popup);
|
e_gadcon_popup_show(inst->popup);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue