libburnia/experimental-legacy
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use custom ewl callback instead of global ecore event. Use the correct fill policy in the config dialog.

Browse Source
This commit is contained in:
Jaime Thomas 2009-02-22 00:21:31 +00:00
parent ab859df1f4
commit 32ee084cc2
4 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ecdb/trunk/src/ecdb.c
View File

@ -179,7 +179,7 @@ ecdb_setup(void)
ECDB_DRIVE_ACTION_FINISHED = ecore_event_type_new(); ECDB_DRIVE_ACTION_FINISHED = ecore_event_type_new();
ECDB_DRIVE_ACTION_BEGUN = ecore_event_type_new(); ECDB_DRIVE_ACTION_BEGUN = ecore_event_type_new();
ECDB_DRIVE_ACTION_UPDATE = ecore_event_type_new(); ECDB_DRIVE_ACTION_UPDATE = ecore_event_type_new();
ECDB_FILELIST_SIZE_CHANGED = ecore_event_type_new(); ECDB_FILELIST_SIZE_CHANGED = ewl_callback_type_add();
ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, ecdb_shutdown, NULL); ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, ecdb_shutdown, NULL);
ecore_event_handler_add(ECORE_X_EVENT_XDND_POSITION, ecdb_dnd_position, em); ecore_event_handler_add(ECORE_X_EVENT_XDND_POSITION, ecdb_dnd_position, em);

33
ecdb/trunk/src/ecdb_burn_data_gui.c
View File

@ -9,7 +9,7 @@ static void _button_cb_begin(void *data, Evas_Object *obj,
const char *source); const char *source);
static void _page_del(void *data, Evas *e, Evas_Object *obj, void *ev); static void _page_del(void *data, Evas *e, Evas_Object *obj, void *ev);
static void _combo_cb_clicked(void *data, Evas_Object *obj, void *event_info); static void _combo_cb_clicked(void *data, Evas_Object *obj, void *event_info);
static int _update_capacity(void *data, int type, void *ev_data); static void _update_capacity(Ewl_Widget *w, void *ev_info, void *data);
// Config inwin updates // Config inwin updates
static void _joliet_clicked(void *data, Evas_Object *obj, const char *emission, static void _joliet_clicked(void *data, Evas_Object *obj, const char *emission,
@ -76,8 +76,8 @@ _page_hide_finished(void *data, Evas_Object *o,
evas_object_hide(o); evas_object_hide(o);
} }
static int static void
_update_capacity(void *data, int type, void *ev_data) _update_capacity(Ewl_Widget *w, void *ev_info, void *data)
{ {
Ecdb_Page *page; Ecdb_Page *page;
Ecdb_Source *src; Ecdb_Source *src;
@ -89,7 +89,12 @@ _update_capacity(void *data, int type, void *ev_data)
proj = evas_object_data_get(page->data, "proj"); proj = evas_object_data_get(page->data, "proj");
base_proj = ECDB_PROJECT(proj); base_proj = ECDB_PROJECT(proj);
src = evas_object_data_get(proj->capacity, "src"); src = data;
/* Find our topmost source */
while ((src) && (src->parent))
src = src->parent;
if ((base_proj->drive) && (base_proj->drive->capacity > 0)) if ((base_proj->drive) && (base_proj->drive->capacity > 0))
{ {
printf("drive capacity: %lld, src->size: %lld\n", printf("drive capacity: %lld, src->size: %lld\n",
@ -108,8 +113,7 @@ _update_capacity(void *data, int type, void *ev_data)
edje_object_signal_emit(page->data, "ecdb,capacity, exceeded", "ecdb"); edje_object_signal_emit(page->data, "ecdb,capacity, exceeded", "ecdb");
} }
ecdb_capacity_float_set(proj->capacity, val); ecdb_capacity_float_set(proj->capacity, val);
printf("%lld\n", src->size);
return ECORE_CALLBACK_RENEW;
} }
static void static void
@ -209,7 +213,7 @@ _combo_cb_clicked(void *data, Evas_Object *obj __UNUSED__,
void *event_info __UNUSED__) void *event_info __UNUSED__)
{ {
Evas_Object *b; Evas_Object *b;
Ecdb_Burn_Project *proj; Ecdb_Data_Project *proj;
Ecdb_Project *base_proj; Ecdb_Project *base_proj;
int sel, i, num_speeds, speed; int sel, i, num_speeds, speed;
char buf[1024]; char buf[1024];
@ -226,19 +230,20 @@ _combo_cb_clicked(void *data, Evas_Object *obj __UNUSED__,
base_proj->drive = eina_list_nth(em->drives, sel); base_proj->drive = eina_list_nth(em->drives, sel);
/* Don't keep adding items to the combo if the drive hasn't changed */ /* Don't keep adding items to the combo if the drive hasn't changed */
if (base_proj->drive == ecdb_combo_data_get(proj->speed_combo)) if (base_proj->drive == ecdb_combo_data_get(ECDB_BURN(proj)->speed_combo))
return; return;
// Update the capacity here, as our capacity could change with the drive // Update the capacity here, as our capacity could change with the drive
ecore_event_add(ECDB_FILELIST_SIZE_CHANGED, NULL, NULL, NULL); ewl_callback_call_with_event_data(proj->filelist, ECDB_FILELIST_SIZE_CHANGED,
ECDB_BURN(proj)->files);
num_speeds = base_proj->drive->write_speeds[0]; num_speeds = base_proj->drive->write_speeds[0];
ecdb_combo_data_set(proj->speed_combo, base_proj->drive); ecdb_combo_data_set(ECDB_BURN(proj)->speed_combo, base_proj->drive);
for (i = 1; i < num_speeds; i++) for (i = 1; i < num_speeds; i++)
{ {
if (base_proj->drive->write_speeds[i] <= 0) if (base_proj->drive->write_speeds[i] <= 0)
continue; continue;
b = ecdb_combo_item_add(proj->speed_combo, NULL); b = ecdb_combo_item_add(ECDB_BURN(proj)->speed_combo, NULL);
if ((base_proj->drive->profile_name) && if ((base_proj->drive->profile_name) &&
(base_proj->drive->profile_name[0] != '\0')) (base_proj->drive->profile_name[0] != '\0'))
@ -258,7 +263,7 @@ _combo_cb_clicked(void *data, Evas_Object *obj __UNUSED__,
snprintf(buf, sizeof(buf), "%dX (%dkb/s)", speed, snprintf(buf, sizeof(buf), "%dX (%dkb/s)", speed,
base_proj->drive->write_speeds[i]); base_proj->drive->write_speeds[i]);
ecdb_combo_item_label_set(b, buf); ecdb_combo_item_label_set(b, buf);
ecdb_combo_append(proj->speed_combo, b); ecdb_combo_append(ECDB_BURN(proj)->speed_combo, b);
evas_object_show(b); evas_object_show(b);
} }
} }
@ -567,6 +572,8 @@ ecdb_burn_data_page_show(Ecdb_Page *page)
proj->filelist = ecdb_custom_filelist_new(); proj->filelist = ecdb_custom_filelist_new();
ewl_container_child_append(EWL_CONTAINER(embed), proj->filelist); ewl_container_child_append(EWL_CONTAINER(embed), proj->filelist);
ewl_callback_append(proj->filelist, ECDB_FILELIST_SIZE_CHANGED,
_update_capacity, page);
ewl_widget_show(proj->filelist); ewl_widget_show(proj->filelist);
src = ecdb_source_new(); src = ecdb_source_new();
@ -589,8 +596,6 @@ ecdb_burn_data_page_show(Ecdb_Page *page)
proj->capacity = ecdb_capacity_add(page->data, "ecdb/burn_data/capacity"); proj->capacity = ecdb_capacity_add(page->data, "ecdb/burn_data/capacity");
evas_object_data_set(proj->capacity, "src", src); evas_object_data_set(proj->capacity, "src", src);
ecore_event_handler_add(ECDB_FILELIST_SIZE_CHANGED, _update_capacity,
page);
evas_object_show(proj->capacity); evas_object_show(proj->capacity);
t = ecdb_config_inwin_add(bp->ret, NULL); t = ecdb_config_inwin_add(bp->ret, NULL);

2
ecdb/trunk/src/ecdb_config_dialog.c
View File

@ -53,7 +53,7 @@ ecdb_config_dialog_show(void)
ewl_dialog_active_area_set(EWL_DIALOG(conf_win), EWL_POSITION_TOP); ewl_dialog_active_area_set(EWL_DIALOG(conf_win), EWL_POSITION_TOP);
main_box = ewl_vbox_new(); main_box = ewl_vbox_new();
ewl_container_child_append(EWL_CONTAINER(conf_win), main_box); ewl_container_child_append(EWL_CONTAINER(conf_win), main_box);
ewl_object_fill_policy_set(EWL_OBJECT(main_box), EWL_FLAG_FILL_HSHRINKABLE); ewl_object_fill_policy_set(EWL_OBJECT(main_box), EWL_FLAG_FILL_FILL);
ewl_widget_show(main_box); ewl_widget_show(main_box);
/* Setup and show the stock icons */ /* Setup and show the stock icons */

5
ecdb/trunk/src/ecdb_filelist_custom.c
View File

@ -90,7 +90,7 @@ ecdb_custom_filelist_dnd_dropped_cb(Ewl_Widget *w, void *ev,
// Send out this event so that we can get notified on size changes // Send out this event so that we can get notified on size changes
// and update the capacity measure // and update the capacity measure
ecore_event_add(ECDB_FILELIST_SIZE_CHANGED, NULL, NULL, NULL); ewl_callback_call_with_event_data(w, ECDB_FILELIST_SIZE_CHANGED, parent);
} }
void void
@ -322,7 +322,8 @@ ecdb_custom_filelist_cb_key_down(Ewl_Widget *w, void *ev, void *data)
ecdb_source_child_remove(parent, child); ecdb_source_child_remove(parent, child);
ecdb_source_destroy(child); ecdb_source_destroy(child);
ecdb_custom_filelist_directory_set(fl, parent); ecdb_custom_filelist_directory_set(fl, parent);
ecore_event_add(ECDB_FILELIST_SIZE_CHANGED, NULL, NULL, NULL); ewl_callback_call_with_event_data(EWL_WIDGET(fl),
ECDB_FILELIST_SIZE_CHANGED, parent);
break; break;
} }
} }