Compiles now, but still crashy.
This commit is contained in:
@@ -10,102 +10,105 @@ static void _button_cb_begin(void *data, Evas_Object *obj,
|
||||
static void _combo_cb_clicked(void *data, Evas_Object *obj,
|
||||
const char *emission,
|
||||
const char *source);
|
||||
static void _page_hide_finished(void *data, Evas_Object *o,
|
||||
const char *emission,
|
||||
const char *source);
|
||||
|
||||
static void
|
||||
_page_hide_finished(void *data, Evas_Object *o, const char *emission __UNUSED__,
|
||||
const char *source __UNUSED__)
|
||||
{
|
||||
Evas_Object *gui;
|
||||
|
||||
gui = data;
|
||||
edje_object_part_unswallow(gui, o);
|
||||
evas_object_hide(o);
|
||||
}
|
||||
|
||||
static void
|
||||
_button_cb_return(void *data, Evas_Object *obj,
|
||||
const char *emission __UNUSED__,
|
||||
const char *source __UNUSED__)
|
||||
{
|
||||
Evas_Object *gui;
|
||||
char *signal;
|
||||
Ecdb_Page *page;
|
||||
|
||||
gui = data;
|
||||
|
||||
edje_object_part_text_set(obj, "progress_text", "Begin Burn");
|
||||
edje_object_part_text_set(obj, "progress_percent", "0%");
|
||||
signal = evas_object_data_get(obj, "hide_signal");
|
||||
edje_object_signal_emit(obj, signal, "ecdb");
|
||||
ecdb_welcome_page_show();
|
||||
page = data;
|
||||
edje_object_part_text_set(page->image, "progress_text", "Begin Burn");
|
||||
edje_object_part_text_set(page->image, "progress_percent", "0%");
|
||||
edje_object_signal_emit(page->image, "ecdb,burn_image_page,hide", "ecdb");
|
||||
ecdb_welcome_page_show(page);
|
||||
|
||||
/* Hide the filelist to be nice */
|
||||
edje_object_signal_emit(gui, "ecdb,filelist,hide", "ecdb");
|
||||
edje_object_signal_emit(page->gui, "ecdb,filelist,hide", "ecdb");
|
||||
}
|
||||
|
||||
static void
|
||||
_button_cb_begin(void *data, Evas_Object *obj,
|
||||
_button_cb_begin(void *data, Evas_Object *obj __UNUSED__,
|
||||
const char *emission __UNUSED__,
|
||||
const char *source __UNUSED__)
|
||||
{
|
||||
Evas_Object *gui, *o;
|
||||
Ecdb_Burn_Project *proj;
|
||||
Ecdb_Image_Project *proj;
|
||||
Ecdb_Page *page;
|
||||
Ecdb_Source *iso_file;
|
||||
char *file, buf[1024];
|
||||
Ecdb_Burn_Result burn_result;
|
||||
int drive, speed;
|
||||
int drive, speed, idx;
|
||||
|
||||
gui = data;
|
||||
o = evas_object_name_find(ecore_evas_get(em->main_win_ee),
|
||||
"ecdb/burn_image/file");
|
||||
file = ecdb_entry_text_get(o);
|
||||
page = data;
|
||||
proj = evas_object_data_get(page->image, "proj");
|
||||
file = ecdb_entry_text_get(proj->entry);
|
||||
|
||||
// Make sure that file actually exists
|
||||
if (!ecore_file_exists(file))
|
||||
{
|
||||
edje_object_part_text_set(obj, "progress_text", "File doesn't "
|
||||
edje_object_part_text_set(page->image, "progress_text", "File doesn't "
|
||||
"exists!");
|
||||
FREE(file);
|
||||
return;
|
||||
}
|
||||
|
||||
proj = ecdb_burn_project_new();
|
||||
ecdb_project_type_set(ECDB_PROJECT(proj), ECDB_IMAGE_PROJECT);
|
||||
iso_file = ecdb_source_new();
|
||||
proj->files = ecdb_source_new();
|
||||
ecdb_source_data_set(iso_file, file);
|
||||
FREE(file);
|
||||
ecdb_source_child_append(proj->files, iso_file);
|
||||
ecdb_source_child_append(ECDB_BURN(proj)->files, iso_file);
|
||||
|
||||
o = evas_object_name_find(evas_object_evas_get(obj),
|
||||
"ecdb/burn_image/drive");
|
||||
drive = ecdb_combo_selected_get(o);
|
||||
drive = ecdb_combo_selected_get(ECDB_PROJECT(proj)->drive_combo);
|
||||
if (drive < 0)
|
||||
{
|
||||
printf("Choose a drive!\n");
|
||||
ecdb_burn_project_destroy(proj);
|
||||
edje_object_part_text_set(obj, "progress_text", "Choose a Drive!");
|
||||
edje_object_part_text_set(page->image, "progress_text",
|
||||
"Choose a Drive!");
|
||||
return;
|
||||
}
|
||||
|
||||
o = evas_object_name_find(evas_object_evas_get(obj),
|
||||
"ecdb/burn_image/speed");
|
||||
speed = ecdb_speed_convert(eina_list_nth(em->drives, drive),
|
||||
ecdb_combo_selected_get(o));
|
||||
ecdb_combo_selected_get(ECDB_BURN(proj)->speed_combo));
|
||||
if (speed < 0)
|
||||
proj->speed = 0;
|
||||
ECDB_BURN(proj)->speed = 0;
|
||||
else
|
||||
proj->speed = speed;
|
||||
ECDB_BURN(proj)->speed = speed;
|
||||
|
||||
snprintf(buf, sizeof(buf), "Commencing...");
|
||||
edje_object_part_text_set(obj, "progress_text", buf);
|
||||
edje_object_part_text_set(page->image, "progress_text", buf);
|
||||
if (!ecdb_aquire_drive(ECDB_PROJECT(proj), drive))
|
||||
{
|
||||
printf("Couldn't grab drive!\n");
|
||||
ecdb_burn_project_destroy(proj);
|
||||
edje_object_part_text_set(obj, "progress_text",
|
||||
edje_object_part_text_set(page->image, "progress_text",
|
||||
"Couldn't grab the drive!");
|
||||
return;
|
||||
}
|
||||
|
||||
burn_result = ecdb_burn_project(proj);
|
||||
burn_result = ecdb_burn_project(ECDB_BURN(proj));
|
||||
switch (burn_result)
|
||||
{
|
||||
case ECDB_ERROR_NONE:
|
||||
edje_object_signal_emit(gui, "ecdb,filelist,hide", "ecdb");
|
||||
edje_object_signal_emit(obj, "ecdb,burn_image,start", "ecdb");
|
||||
const char *ids[] = {"ecdb/burn_image/file", "ecdb/burn_image/drive",
|
||||
"ecdb/burn_image/speed", "ecdb/burn_image/begin",
|
||||
"ecdb/burn_image/return"};
|
||||
ecdb_gui_controls_disable(ids, 5);
|
||||
edje_object_signal_emit(page->gui, "ecdb,filelist,hide", "ecdb");
|
||||
edje_object_signal_emit(page->image, "ecdb,burn_image,start", "ecdb");
|
||||
Evas_Object *objs[] = {proj->entry, ECDB_PROJECT(proj)->ret,
|
||||
ECDB_PROJECT(proj)->begin, ECDB_PROJECT(proj)->drive_combo,
|
||||
ECDB_BURN(proj)->speed_combo, NULL};
|
||||
for (idx = 0; objs[idx] != NULL; idx++)
|
||||
edje_object_signal_emit(objs[idx], "ecdb,disable", "ecdb");
|
||||
return;
|
||||
|
||||
case ECDB_ERROR_IMAGE_CREATE:
|
||||
@@ -124,11 +127,9 @@ _button_cb_begin(void *data, Evas_Object *obj,
|
||||
snprintf(buf, sizeof(buf), "Unknown error :-(");
|
||||
}
|
||||
|
||||
edje_object_part_text_set(obj, "progress_text", buf);
|
||||
Ecdb_Project *p = ECDB_PROJECT(proj);
|
||||
burn_drive_release(p->drive->tangible[0].drive, 1);
|
||||
burn_drive_info_free(p->drive->tangible);
|
||||
ecdb_burn_project_destroy(proj);
|
||||
edje_object_part_text_set(page->image, "progress_text", buf);
|
||||
burn_drive_release(ECDB_PROJECT(proj)->drive->tangible[0].drive, 1);
|
||||
burn_drive_info_free(ECDB_PROJECT(proj)->drive->tangible);
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -136,27 +137,26 @@ _combo_cb_clicked(void *data, Evas_Object *obj __UNUSED__,
|
||||
const char *emission __UNUSED__,
|
||||
const char *source __UNUSED__)
|
||||
{
|
||||
Evas_Object *c1, *c2, *b;
|
||||
Evas_Object *b;
|
||||
Ecdb_Burn_Project *bp;
|
||||
Ecdb_Drive_Info *drive;
|
||||
int sel, i, num_speeds, speed;
|
||||
char buf[1024];
|
||||
|
||||
c2 = data;
|
||||
c1 = evas_object_name_find(evas_object_evas_get(obj),
|
||||
"ecdb/burn_image/drive");
|
||||
sel = ecdb_combo_selected_get(c1);
|
||||
bp = data;
|
||||
sel = ecdb_combo_selected_get(ECDB_PROJECT(bp)->drive_combo);
|
||||
if (sel < 0)
|
||||
return;
|
||||
|
||||
drive = eina_list_nth(em->drives, sel);
|
||||
num_speeds = drive->write_speeds[0];
|
||||
ecdb_combo_data_set(c2, drive);
|
||||
ecdb_combo_data_set(bp->speed_combo, drive);
|
||||
for (i = 1; i < num_speeds; i++)
|
||||
{
|
||||
if ((drive->write_speeds[i]) <= 0)
|
||||
continue;
|
||||
|
||||
b = ecdb_combo_item_add(c2, NULL);
|
||||
b = ecdb_combo_item_add(bp->speed_combo, NULL);
|
||||
|
||||
if ((drive->profile_name) && (drive->profile_name[0] != '\0'))
|
||||
{
|
||||
@@ -174,94 +174,99 @@ _combo_cb_clicked(void *data, Evas_Object *obj __UNUSED__,
|
||||
|
||||
snprintf(buf, sizeof(buf), "%dX (%dkb/s)", speed, drive->write_speeds[i]);
|
||||
ecdb_combo_item_label_set(b, buf);
|
||||
ecdb_combo_append(c2, b);
|
||||
ecdb_combo_append(bp->speed_combo, b);
|
||||
evas_object_show(b);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
ecdb_burn_image_page_show(void)
|
||||
ecdb_burn_image_page_show(Ecdb_Page *page)
|
||||
{
|
||||
Evas_Object *swallow, *gui;
|
||||
|
||||
gui = evas_object_name_find(ecore_evas_get(em->main_win_ee), "gui");
|
||||
swallow = evas_object_name_find(ecore_evas_get(em->main_win_ee),
|
||||
"burn_image_page");
|
||||
|
||||
if (!swallow)
|
||||
if (!page->image)
|
||||
{
|
||||
Evas_Object *b, *c1, *c2;
|
||||
Evas_Object *b;
|
||||
Eina_List *l;
|
||||
Ecdb_Drive_Info *drive;
|
||||
Evas_Coord x, y, w, h;
|
||||
Ecdb_Image_Project *proj;
|
||||
Ecdb_Project *bp;
|
||||
Ecdb_Burn_Project *bup;
|
||||
|
||||
swallow = edje_object_add(ecore_evas_get(em->main_win_ee));
|
||||
edje_object_file_set(swallow, em->theme_path, "ecdb/burn_image_page");
|
||||
evas_object_name_set(swallow, "burn_image_page");
|
||||
evas_object_data_set(swallow, "hide_signal", "ecdb,burn_image_page,hide");
|
||||
edje_object_part_geometry_get(gui, "active_area", &x, &y, &w, &h);
|
||||
evas_object_move(swallow, x, y);
|
||||
evas_object_resize(swallow, w, h);
|
||||
edje_object_part_swallow(gui, "action_area", swallow);
|
||||
evas_object_show(swallow);
|
||||
|
||||
edje_object_signal_callback_add(swallow, "hide,finished",
|
||||
/* Create the swallow */
|
||||
page->image = edje_object_add(ecore_evas_get(em->main_win_ee));
|
||||
edje_object_file_set(page->image, em->theme_path, "ecdb/burn_image_page");
|
||||
edje_object_part_geometry_get(page->gui, "active_area", &x, &y, &w, &h);
|
||||
evas_object_move(page->gui, x, y);
|
||||
evas_object_resize(page->image, w, h);
|
||||
edje_object_part_swallow(page->gui, "action_area", page->image);
|
||||
edje_object_signal_callback_add(page->image, "hide,finished",
|
||||
"burn_image_page",
|
||||
ecdb_page_hide_finished, NULL);
|
||||
evas_object_show(swallow);
|
||||
_page_hide_finished, page->gui);
|
||||
evas_object_show(page->image);
|
||||
|
||||
b = ecdb_button_add(swallow, "ecdb/burn_image/return");
|
||||
ecdb_button_label_set(b, "Return to Main Page");
|
||||
edje_object_signal_callback_add(swallow, "mouse,clicked,1",
|
||||
"ecdb/burn_image/return", _button_cb_return, gui);
|
||||
evas_object_show(b);
|
||||
ecdb_button_icon_set(b, "ecdb/burn_image/return");
|
||||
/* Make the project */
|
||||
proj = ecdb_image_project_new();
|
||||
bp = ECDB_PROJECT(proj);
|
||||
bup = ECDB_BURN(proj);
|
||||
evas_object_data_set(page->image, "proj", proj);
|
||||
|
||||
b = ecdb_button_add(swallow, "ecdb/burn_image/begin");
|
||||
ecdb_button_label_set(b, "Start Burn");
|
||||
edje_object_signal_callback_add(swallow, "mouse,clicked,1",
|
||||
"ecdb/burn_image/begin", _button_cb_begin, gui);
|
||||
evas_object_show(b);
|
||||
ecdb_button_icon_set(b, "ecdb/burn_image/begin");
|
||||
/* Make the interface all nice and proper */
|
||||
bp->ret = ecdb_button_add(page->image, "ecdb/burn_image/return");
|
||||
ecdb_button_label_set(bp->ret, "Return to Main Page");
|
||||
edje_object_signal_callback_add(page->image, "mouse,clicked,1",
|
||||
"ecdb/burn_image/return", _button_cb_return, page);
|
||||
evas_object_show(bp->ret);
|
||||
ecdb_button_icon_set(bp->ret, "ecdb/burn_image/return");
|
||||
|
||||
b = ecdb_entry_add(swallow, "ecdb/burn_image/file");
|
||||
ecdb_entry_text_set(b, "Burn File");
|
||||
evas_object_show(b);
|
||||
bp->begin = ecdb_button_add(page->image, "ecdb/burn_image/begin");
|
||||
ecdb_button_label_set(bp->begin, "Start Burn");
|
||||
edje_object_signal_callback_add(page->image, "mouse,clicked,1",
|
||||
"ecdb/burn_image/begin", _button_cb_begin, page);
|
||||
evas_object_show(bp->begin);
|
||||
ecdb_button_icon_set(bp->begin, "ecdb/burn_image/begin");
|
||||
|
||||
c1 = ecdb_combo_add(swallow, "ecdb/burn_image/drive");
|
||||
ecdb_combo_header_set(c1, "Drive");
|
||||
ecdb_combo_header_create_set(c1, ecdb_gui_combo_header_from_drive);
|
||||
evas_object_show(c1);
|
||||
proj->entry = ecdb_entry_add(page->image, "ecdb/burn_image/file");
|
||||
ecdb_entry_text_set(proj->entry, "Burn File");
|
||||
evas_object_show(proj->entry);
|
||||
|
||||
c2 = ecdb_combo_add(swallow, "ecdb/burn_image/speed");
|
||||
ecdb_combo_header_create_set(c2, ecdb_gui_combo_header_from_speeds);
|
||||
ecdb_combo_header_set(c2, "Max Speed");
|
||||
evas_object_show(c2);
|
||||
bp->drive_combo = ecdb_combo_add(page->image, "ecdb/burn_image/drive");
|
||||
ecdb_combo_header_set(bp->drive_combo, "Drive");
|
||||
ecdb_combo_header_create_set(bp->drive_combo,
|
||||
ecdb_gui_combo_header_from_drive);
|
||||
evas_object_show(bp->drive_combo);
|
||||
|
||||
bup->speed_combo = ecdb_combo_add(page->image, "ecdb/burn_image/speed");
|
||||
ecdb_combo_header_create_set(bup->speed_combo,
|
||||
ecdb_gui_combo_header_from_speeds);
|
||||
ecdb_combo_header_set(bup->speed_combo, "Max Speed");
|
||||
evas_object_show(bup->speed_combo);
|
||||
|
||||
EINA_LIST_FOREACH(em->drives, l, drive)
|
||||
{
|
||||
b = ecdb_combo_item_add(c1, NULL);
|
||||
b = ecdb_combo_item_add(bp->drive_combo, NULL);
|
||||
ecdb_combo_item_label_set(b, drive->product);
|
||||
edje_object_signal_callback_add(b, "mouse,clicked,1", "*",
|
||||
_combo_cb_clicked, c2);
|
||||
ecdb_combo_append(c1, b);
|
||||
_combo_cb_clicked, proj);
|
||||
ecdb_combo_append(bp->drive_combo, b);
|
||||
evas_object_show(b);
|
||||
}
|
||||
}
|
||||
|
||||
else if (edje_object_part_swallow_get(gui, "action_area") != swallow)
|
||||
else if (edje_object_part_swallow_get(page->gui, "action_area") !=
|
||||
page->image)
|
||||
{
|
||||
edje_object_part_swallow(gui, "action_area", swallow);
|
||||
evas_object_show(swallow);
|
||||
edje_object_part_swallow(page->gui, "action_area", page->image);
|
||||
evas_object_show(page->image);
|
||||
}
|
||||
|
||||
edje_object_signal_emit(gui, "ecdb,burn_image_page,visible", "ecdb");
|
||||
edje_object_signal_emit(swallow, "ecdb,burn_image_page,visible", "ecdb");
|
||||
edje_object_signal_emit(page->gui, "ecdb,burn_image_page,visible", "ecdb");
|
||||
edje_object_signal_emit(page->image, "ecdb,burn_image_page,visible", "ecdb");
|
||||
}
|
||||
|
||||
void
|
||||
ecdb_burn_image_cleanup(void)
|
||||
{
|
||||
/*
|
||||
Evas_Object *swallow;
|
||||
const char *ids[] = {"ecdb/burn_image/return", "ecdb/burn_image/begin",
|
||||
"ecdb/burn_image/file", "ecdb/burn_image/drive"
|
||||
@@ -271,5 +276,6 @@ ecdb_burn_image_cleanup(void)
|
||||
edje_object_part_text_set(swallow, "progress_text", "Burn Complete!");
|
||||
ecdb_gui_controls_enable(ids, 5);
|
||||
edje_object_signal_emit(swallow, "ecdb,burn_image,done", "ecdb");
|
||||
*/
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user