Combos work now, fix popup placement, move burn image gui stuff into its own file.
This commit is contained in:
@ -1,8 +1,6 @@
|
||||
/* vim: set sw=3 ts=3 sts=3 expandtab: */
|
||||
#include "ecdb.h"
|
||||
|
||||
static Evas_Object *combo_header_create(Evas_Object *c, const char *name,
|
||||
Evas_Object *obj, int sel);
|
||||
static void _button_cb_return(void *data, Evas_Object *obj, void *event_info);
|
||||
static void _button_cb_begin(void *data, Evas_Object *obj, void *event_info);
|
||||
|
||||
@ -100,9 +98,6 @@ ecdb_erase_page_show(void)
|
||||
edje_object_part_swallow(gui, "action_area", swallow);
|
||||
evas_object_show(swallow);
|
||||
|
||||
//edje_object_signal_callback_add(swallow, "mouse,down,1", "ecdb/*",
|
||||
// ecdb_cb_controls_focused, NULL);
|
||||
|
||||
edje_object_signal_callback_add(swallow, "hide,finished", "erase_page",
|
||||
ecdb_page_hide_finished, NULL);
|
||||
evas_object_show(swallow);
|
||||
@ -125,7 +120,7 @@ ecdb_erase_page_show(void)
|
||||
|
||||
b = ecdb_combo_add(swallow, "ecdb/erase/drive");
|
||||
ecdb_combo_header_set(b, "Drive");
|
||||
ecdb_combo_header_create_set(b, combo_header_create);
|
||||
ecdb_combo_header_create_set(b, ecdb_gui_combo_header_from_drive);
|
||||
|
||||
EINA_LIST_FOREACH(em->drives, l, drive)
|
||||
{
|
||||
@ -147,30 +142,20 @@ ecdb_erase_page_show(void)
|
||||
}
|
||||
|
||||
void
|
||||
ecdb_gui_erase_cleanup(void)
|
||||
ecdb_erase_cleanup(void)
|
||||
{
|
||||
Evas_Object *swallow;
|
||||
const char *ids[] = {"ecdb/erase/return", "ecdb/erase/begin",
|
||||
"ecdb/erase/speed"};
|
||||
"ecdb/erase/speed", "ecdb/erase/drive"};
|
||||
|
||||
swallow = evas_object_name_find(ecore_evas_get(em->main_win_ee),
|
||||
"erase_page");
|
||||
edje_object_part_text_set(swallow, "progress_text", "Erase Complete!");
|
||||
ecdb_gui_controls_enable(ids, 3);
|
||||
ecdb_gui_controls_enable(ids, 4);
|
||||
edje_object_signal_emit(swallow, "ecdb,erase,done", "ecdb");
|
||||
}
|
||||
|
||||
static Evas_Object *
|
||||
combo_header_create(Evas_Object *c, const char *name, Evas_Object *obj, int sel)
|
||||
{
|
||||
Evas_Object *ret;
|
||||
Ecdb_Drive_Info *drive;
|
||||
|
||||
ret = ecdb_label_add(c, name);
|
||||
drive = eina_list_nth(em->drives, sel);
|
||||
ecdb_label_text_set(ret, drive->product);
|
||||
evas_object_show(ret);
|
||||
|
||||
return ret;
|
||||
|
||||
swallow = evas_object_name_find(ecore_evas_get(em->main_win_ee),
|
||||
"ecdb/erase/drive");
|
||||
ecdb_check_checked_set(swallow, 0);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user