diff --git a/experimental/ecdb/trunk/data/themes/default/default.edc b/experimental/ecdb/trunk/data/themes/default/default.edc index 999ada56..d2b8265a 100644 --- a/experimental/ecdb/trunk/data/themes/default/default.edc +++ b/experimental/ecdb/trunk/data/themes/default/default.edc @@ -1,4 +1,5 @@ #include "images/images.edc" +#include "fonts/fonts.edc" collections { #include "groups/window.edc" diff --git a/experimental/ecdb/trunk/data/themes/default/fonts/DejaVuSans.ttf b/experimental/ecdb/trunk/data/themes/default/fonts/DejaVuSans.ttf new file mode 100644 index 00000000..b75b497b Binary files /dev/null and b/experimental/ecdb/trunk/data/themes/default/fonts/DejaVuSans.ttf differ diff --git a/experimental/ecdb/trunk/data/themes/default/fonts/fonts.edc b/experimental/ecdb/trunk/data/themes/default/fonts/fonts.edc new file mode 100644 index 00000000..81d83fad --- /dev/null +++ b/experimental/ecdb/trunk/data/themes/default/fonts/fonts.edc @@ -0,0 +1,3 @@ +fonts { + font: "DejaVuSans.ttf" "ecdb/default"; +} diff --git a/experimental/ecdb/trunk/src/ecdb_gui.c b/experimental/ecdb/trunk/src/ecdb_gui.c index eda9ac21..a4fcf06f 100644 --- a/experimental/ecdb/trunk/src/ecdb_gui.c +++ b/experimental/ecdb/trunk/src/ecdb_gui.c @@ -28,7 +28,8 @@ ecdb_cb_resize(Ecore_Evas *ee) } static void -_cb_filelist_mouse_in(Ewl_Widget *w, void *ev __UNUSED__, void *data) +_cb_filelist_mouse_in(Ewl_Widget *w __UNUSED__, void *ev __UNUSED__, + void *data) { Evas_Object *gui = data; edje_object_signal_emit(gui, "ecdb,filelist,in", "ecdb"); @@ -36,13 +37,29 @@ _cb_filelist_mouse_in(Ewl_Widget *w, void *ev __UNUSED__, void *data) } static void -_cb_filelist_mouse_out(Ewl_Widget *w, void *ev __UNUSED__, void *data) +_cb_filelist_mouse_out(Ewl_Widget *w __UNUSED__, void *ev __UNUSED__, + void *data) { Evas_Object *gui = data; edje_object_signal_emit(gui, "ecdb,filelist,out", "ecdb"); printf("Emitting signal\n"); } +static void +_cb_filelist_mouse_down(void *data __UNUSED__, Evas *e __UNUSED__, + Evas_Object *eo, void *ev_data __UNUSED__) +{ + evas_object_focus_set(eo, TRUE); +} + +static void +_cb_filelist_key_down(void *data, Evas *e, Evas_Object *eo, void *ev_data) +{ + Evas_Event_Key_Down *ek = ev_data; + + printf("key pressed: %s\n", ek->key); +} + int ecdb_create_main_gui(void) { @@ -103,6 +120,10 @@ ecdb_create_main_gui(void) evas_object_move(swallow, x, y); evas_object_resize(swallow, x, y); edje_object_part_swallow(gui, "filelist", swallow); + evas_object_event_callback_add(swallow, EVAS_CALLBACK_MOUSE_DOWN, + _cb_filelist_mouse_down, gui); + evas_object_event_callback_add(swallow, EVAS_CALLBACK_KEY_DOWN, + _cb_filelist_key_down, gui); evas_object_show(swallow); return TRUE;