Clean test_map, test_multi and test_photocam files

Remove commented lines, extra lines and spaces.


SVN revision: 53638
This commit is contained in:
Bruno Dilly 2010-10-19 18:26:28 +00:00
parent b74069f814
commit 0121df333c
3 changed files with 26 additions and 71 deletions

View File

@ -33,112 +33,96 @@ Marker_Data data_parking= {PACKAGE_DATA_DIR"/images/parking.png"};
static void
my_map_clicked(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
//Evas_Object *win = data;
printf("clicked\n");
}
static void
my_map_press(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
//Evas_Object *win = data;
printf("press\n");
}
static void
my_map_longpressed(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
//Evas_Object *win = data;
printf("longpressed\n");
}
static void
my_map_clicked_double(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
//Evas_Object *win = data;
printf("clicked,double\n");
}
static void
my_map_load(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
//Evas_Object *win = data;
printf("load\n");
}
static void
my_map_loaded(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
//Evas_Object *win = data;
printf("loaded\n");
}
static void
my_map_load_details(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
//Evas_Object *win = data;
printf("load,details\n");
}
static void
my_map_loaded_details(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
//Evas_Object *win = data;
printf("loaded,details\n");
}
static void
my_map_zoom_start(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
//Evas_Object *win = data;
printf("zoom,start\n");
}
static void
my_map_zoom_stop(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
//Evas_Object *win = data;
printf("zoom,stop\n");
}
static void
my_map_zoom_change(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
//Evas_Object *win = data;
printf("zoom,change\n");
}
static void
my_map_anim_start(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
//Evas_Object *win = data;
printf("anim,start\n");
}
static void
my_map_anim_stop(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
//Evas_Object *win = data;
printf("anim,stop\n");
}
static void
my_map_drag_start(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
//Evas_Object *win = data;
printf("drag,start\n");
}
static void
my_map_drag_stop(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
//Evas_Object *win = data;
printf("drag_stop\n");
}
static void
my_map_scroll(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
{
//Evas_Object *win = data;
double lon, lat;
elm_map_geo_region_get(obj, &lon, &lat);
printf("scroll longitude : %f latitude : %f\n", lon, lat);

View File

@ -12,8 +12,7 @@ static void
_mouse_down(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *o __UNUSED__, void *event_info)
{
Evas_Event_Mouse_Down *ev = event_info;
// Evas_Object *win = data;
if (ev->button != 1) return;
printf("MOUSE: down @ %4i %4i\n", ev->canvas.x, ev->canvas.y);
evas_object_move(indicator[0], ev->canvas.x, ev->canvas.y);
@ -25,7 +24,6 @@ static void
_mouse_up(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *o __UNUSED__, void *event_info)
{
Evas_Event_Mouse_Up *ev = event_info;
// Evas_Object *win = data;
if (ev->button != 1) return;
printf("MOUSE: up @ %4i %4i\n", ev->canvas.x, ev->canvas.y);
evas_object_hide(indicator[0]);
@ -35,20 +33,15 @@ static void
_mouse_move(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *o __UNUSED__, void *event_info)
{
Evas_Event_Mouse_Move *ev = event_info;
// Evas_Object *win = data;
printf("MOUSE: move @ %4i %4i\n", ev->cur.canvas.x, ev->cur.canvas.y);
evas_object_move(indicator[0], ev->cur.canvas.x, ev->cur.canvas.y);
evas_object_resize(indicator[0], 1, 1);
}
static void
_multi_down(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *o __UNUSED__, void *event_info)
{
Evas_Event_Multi_Down *ev = event_info;
// Evas_Object *win = data;
printf("MULTI: down @ %4i %4i | dev: %i\n", ev->canvas.x, ev->canvas.y, ev->device);
if (ev->device >= IND_NUM) return;
evas_object_move(indicator[ev->device], ev->canvas.x, ev->canvas.y);
@ -60,7 +53,6 @@ static void
_multi_up(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *o __UNUSED__, void *event_info)
{
Evas_Event_Multi_Up *ev = event_info;
// Evas_Object *win = data;
printf("MULTI: up @ %4i %4i | dev: %i\n", ev->canvas.x, ev->canvas.y, ev->device);
if (ev->device >= IND_NUM) return;
evas_object_hide(indicator[ev->device]);
@ -70,16 +62,13 @@ static void
_multi_move(void *data __UNUSED__, Evas *e __UNUSED__, Evas_Object *o __UNUSED__, void *event_info)
{
Evas_Event_Multi_Move *ev = event_info;
// Evas_Object *win = data;
printf("MULTI: move @ %4i %4i | dev: %i\n", ev->cur.canvas.x, ev->cur.canvas.y, ev->device);
printf("MULTI: move @ %4i %4i | dev: %i\n", ev->cur.canvas.x,
ev->cur.canvas.y, ev->device);
if (ev->device >= IND_NUM) return;
evas_object_move(indicator[ev->device], ev->cur.canvas.x, ev->cur.canvas.y);
evas_object_resize(indicator[ev->device], 1, 1);
}
void
test_multi(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
@ -99,16 +88,16 @@ test_multi(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
evas_object_color_set(r, 0, 0, 0, 0);
elm_win_resize_object_add(win, r);
evas_object_show(r);
for (i = 0; i < IND_NUM; i++)
{
char buf[PATH_MAX];
snprintf(buf, sizeof(buf), "%s/objects/multip.edj", PACKAGE_DATA_DIR);
indicator[i] = edje_object_add(evas_object_evas_get(win));
edje_object_file_set(indicator[i], buf, "point");
}
evas_object_event_callback_add(r, EVAS_CALLBACK_MOUSE_DOWN, _mouse_down, win);
evas_object_event_callback_add(r, EVAS_CALLBACK_MOUSE_UP, _mouse_up, win);
evas_object_event_callback_add(r, EVAS_CALLBACK_MOUSE_MOVE, _mouse_move, win);
@ -118,7 +107,7 @@ test_multi(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info
evas_object_size_hint_min_set(bg, 160, 160);
evas_object_resize(win, 480, 800);
evas_object_show(win);
}

View File

@ -9,112 +9,96 @@ static Evas_Object *rect;
static void
my_ph_clicked(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
// Evas_Object *win = data;
printf("clicked\n");
}
static void
my_ph_press(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
// Evas_Object *win = data;
printf("press\n");
}
static void
my_ph_longpressed(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
// Evas_Object *win = data;
printf("longpressed\n");
}
static void
my_ph_clicked_double(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
// Evas_Object *win = data;
printf("clicked,double\n");
}
static void
my_ph_load(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
// Evas_Object *win = data;
printf("load\n");
}
static void
my_ph_loaded(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
// Evas_Object *win = data;
printf("loaded\n");
}
static void
my_ph_load_details(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
// Evas_Object *win = data;
printf("load,details\n");
}
static void
my_ph_loaded_details(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
// Evas_Object *win = data;
printf("loaded,details\n");
}
static void
my_ph_zoom_start(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
// Evas_Object *win = data;
printf("zoom,start\n");
}
static void
my_ph_zoom_stop(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
// Evas_Object *win = data;
printf("zoom,stop\n");
}
static void
my_ph_zoom_change(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
// Evas_Object *win = data;
printf("zoom,change\n");
}
static void
my_ph_anim_start(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
// Evas_Object *win = data;
printf("anim,start\n");
}
static void
my_ph_anim_stop(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
// Evas_Object *win = data;
printf("anim,stop\n");
}
static void
my_ph_drag_start(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
// Evas_Object *win = data;
printf("drag,start\n");
}
static void
my_ph_drag_stop(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
// Evas_Object *win = data;
printf("drag_stop\n");
}
static void
my_ph_scroll(void *data __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
{
// Evas_Object *win = data;
int x, y, w, h;
elm_photocam_region_get(obj, &x, &y, &w, &h);
printf("scroll %i %i %ix%i\n", x, y, w, h);
@ -136,18 +120,18 @@ my_bt_open(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
Evas_Object *ph, *win;
Evas_Object *iw, *fs;
ph = data;
win = evas_object_data_get(ph, "window");
iw = elm_win_inwin_add(win);
fs = elm_fileselector_add(win);
elm_fileselector_expandable_set(fs, EINA_TRUE);
elm_fileselector_path_set(fs, getenv("HOME"));
evas_object_smart_callback_add(fs, "done", sel_done, ph);
evas_object_data_set(ph, "inwin", iw);
elm_win_inwin_content_set(iw, fs);
evas_object_show(fs);
elm_win_inwin_activate(iw);
@ -170,7 +154,7 @@ static void
my_bt_zoom_in(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
double zoom;
zoom = elm_photocam_zoom_get(data);
zoom -= 0.5;
elm_photocam_zoom_mode_set(data, ELM_PHOTOCAM_ZOOM_MODE_MANUAL);
@ -181,7 +165,7 @@ static void
my_bt_zoom_out(void *data, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
double zoom;
zoom = elm_photocam_zoom_get(data);
zoom += 0.5;
elm_photocam_zoom_mode_set(data, ELM_PHOTOCAM_ZOOM_MODE_MANUAL);
@ -236,7 +220,7 @@ _photocam_mouse_wheel_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUS
if (zoom >= 1) elm_photocam_zoom_set(photocam, zoom);
}
static void
static void
_photocam_move_resize_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__)
{
int x,y,w,h;
@ -273,7 +257,7 @@ test_photocam(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
evas_object_size_hint_weight_set(ph, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_win_resize_object_add(win, ph);
evas_object_data_set(ph, "window", win);
rect = evas_object_rectangle_add(evas_object_evas_get(win));
evas_object_color_set(rect, 0, 0, 0, 0);
evas_object_repeat_events_set(rect,1);
@ -300,15 +284,15 @@ test_photocam(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
evas_object_smart_callback_add(ph, "scroll,drag,start", my_ph_drag_start, win);
evas_object_smart_callback_add(ph, "scroll,drag,stop", my_ph_drag_stop, win);
evas_object_smart_callback_add(ph, "scroll", my_ph_scroll, win);
elm_photocam_file_set(ph, img[1]);
evas_object_show(ph);
tb2 = elm_table_add(win);
evas_object_size_hint_weight_set(tb2, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_win_resize_object_add(win, tb2);
bt = elm_button_add(win);
elm_button_label_set(bt, "Z -");
evas_object_smart_callback_add(bt, "clicked", my_bt_zoom_out, ph);
@ -316,7 +300,7 @@ test_photocam(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
evas_object_size_hint_align_set(bt, 0.1, 0.1);
elm_table_pack(tb2, bt, 0, 0, 1, 1);
evas_object_show(bt);
bt = elm_button_add(win);
elm_button_label_set(bt, "Select Photo");
evas_object_smart_callback_add(bt, "clicked", my_bt_open, ph);
@ -324,7 +308,7 @@ test_photocam(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
evas_object_size_hint_align_set(bt, 0.5, 0.1);
elm_table_pack(tb2, bt, 1, 0, 1, 1);
evas_object_show(bt);
bt = elm_button_add(win);
elm_button_label_set(bt, "Z +");
evas_object_smart_callback_add(bt, "clicked", my_bt_zoom_in, ph);
@ -333,7 +317,6 @@ test_photocam(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
elm_table_pack(tb2, bt, 2, 0, 1, 1);
evas_object_show(bt);
bt = elm_button_add(win);
elm_button_label_set(bt, "Show 30,50 500x300");
evas_object_smart_callback_add(bt, "clicked", my_bt_show_reg, ph);
@ -341,7 +324,7 @@ test_photocam(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
evas_object_size_hint_align_set(bt, 0.1, 0.5);
elm_table_pack(tb2, bt, 0, 1, 1, 1);
evas_object_show(bt);
bt = elm_button_add(win);
elm_button_label_set(bt, "Bring 800,300 500x300");
evas_object_smart_callback_add(bt, "clicked", my_bt_bring_reg, ph);
@ -349,8 +332,7 @@ test_photocam(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
evas_object_size_hint_align_set(bt, 0.9, 0.5);
elm_table_pack(tb2, bt, 2, 1, 1, 1);
evas_object_show(bt);
bt = elm_button_add(win);
elm_button_label_set(bt, "Pause On/Off");
evas_object_smart_callback_add(bt, "clicked", my_bt_pause, ph);
@ -358,7 +340,7 @@ test_photocam(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
evas_object_size_hint_align_set(bt, 0.1, 0.9);
elm_table_pack(tb2, bt, 0, 2, 1, 1);
evas_object_show(bt);
bt = elm_button_add(win);
elm_button_label_set(bt, "Fit");
evas_object_smart_callback_add(bt, "clicked", my_bt_zoom_fit, ph);
@ -366,7 +348,7 @@ test_photocam(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
evas_object_size_hint_align_set(bt, 0.5, 0.9);
elm_table_pack(tb2, bt, 1, 2, 1, 1);
evas_object_show(bt);
bt = elm_button_add(win);
elm_button_label_set(bt, "Fill");
evas_object_smart_callback_add(bt, "clicked", my_bt_zoom_fill, ph);
@ -374,9 +356,9 @@ test_photocam(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_in
evas_object_size_hint_align_set(bt, 0.9, 0.9);
elm_table_pack(tb2, bt, 2, 2, 1, 1);
evas_object_show(bt);
evas_object_show(tb2);
evas_object_resize(win, 800, 800);
evas_object_show(win);
}