clouseau clouseau.c: Refactoring. Made main function more readable.

SVN revision: 79012
This commit is contained in:
Daniel Juyung Seo 2012-11-09 06:46:33 +00:00
parent 1c458e4bb5
commit 07edfbc4f3
1 changed files with 97 additions and 93 deletions

View File

@ -1681,33 +1681,11 @@ _ofl_bt_clicked(void *data,
_show_gui(data, EINA_TRUE); _show_gui(data, EINA_TRUE);
} }
#ifndef ELM_LIB_QUICKLAUNCH static void
EAPI int _control_buttons_create(gui_elements *gui, Evas_Object *win)
elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED) {
{ /* Create Client Window */ Evas_Object *show_hidden_check, *show_clippers_check, *highlight_check;
Evas_Object *win, *panes,
*show_hidden_check, *show_clippers_check, *highlight_check;
/* For inwin popup */
Evas_Object *lb, *bxx, *bt_bx, *bt_ok, *bt_cancel;
Evas_Object *bt_ofl; /* work_offline button */
void *st;
gui = calloc(1, sizeof(gui_elements));
gui->win = win = elm_win_util_standard_add("client", CLIENT_NAME);
elm_win_autodel_set(win, EINA_TRUE);
_titlebar_string_set(gui, EINA_FALSE);
gui->bx = elm_box_add(win);
evas_object_size_hint_weight_set(gui->bx,
EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(gui->bx, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_win_resize_object_add(win, gui->bx);
/* Control buttons */
{
gui->hbx = elm_box_add(gui->bx); gui->hbx = elm_box_add(gui->bx);
evas_object_size_hint_align_set(gui->hbx, 0.0, 0.5); evas_object_size_hint_align_set(gui->hbx, 0.0, 0.5);
elm_box_horizontal_set(gui->hbx, EINA_TRUE); elm_box_horizontal_set(gui->hbx, EINA_TRUE);
@ -1745,16 +1723,18 @@ elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
elm_check_state_set(highlight_check , do_highlight); elm_check_state_set(highlight_check , do_highlight);
elm_box_pack_end(gui->hbx, highlight_check); elm_box_pack_end(gui->hbx, highlight_check);
evas_object_show(highlight_check); evas_object_show(highlight_check);
}
panes = elm_panes_add(gui->bx); evas_object_smart_callback_add(show_hidden_check, "changed",
evas_object_size_hint_weight_set(panes, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); _show_hidden_check_changed, gui);
evas_object_size_hint_align_set(panes, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_smart_callback_add(show_clippers_check, "changed",
elm_box_pack_end(gui->bx, panes); _show_clippers_check_changed, gui);
evas_object_show(panes); evas_object_smart_callback_add(highlight_check, "changed",
_highlight_check_check_changed, gui);
}
/* The main list */ static void
{ _main_list_create(Evas_Object *panes)
{
gui->gl = elm_genlist_add(panes); gui->gl = elm_genlist_add(panes);
elm_genlist_select_mode_set(gui->gl, ELM_OBJECT_SELECT_MODE_ALWAYS); elm_genlist_select_mode_set(gui->gl, ELM_OBJECT_SELECT_MODE_ALWAYS);
evas_object_size_hint_align_set(gui->gl, evas_object_size_hint_align_set(gui->gl,
@ -1764,13 +1744,6 @@ elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
elm_object_part_content_set(panes, "left", gui->gl); elm_object_part_content_set(panes, "left", gui->gl);
evas_object_show(gui->gl); evas_object_show(gui->gl);
evas_object_smart_callback_add(show_hidden_check, "changed",
_show_hidden_check_changed, gui);
evas_object_smart_callback_add(show_clippers_check, "changed",
_show_clippers_check_changed, gui);
evas_object_smart_callback_add(highlight_check, "changed",
_highlight_check_check_changed, gui);
itc.item_style = "default"; itc.item_style = "default";
itc.func.text_get = item_text_get; itc.func.text_get = item_text_get;
itc.func.content_get = item_icon_get; itc.func.content_get = item_icon_get;
@ -1787,21 +1760,52 @@ elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
"contracted", gl_con, gui->gl); "contracted", gl_con, gui->gl);
evas_object_smart_callback_add(gui->gl, evas_object_smart_callback_add(gui->gl,
"selected", _gl_selected, gui); "selected", _gl_selected, gui);
} }
/* Properties list */ static void
{ _property_list_create(Evas_Object *panes)
Evas_Object *prop_list = NULL; {
prop_list = clouseau_object_information_list_add(panes); Evas_Object *o= NULL;
gui->prop_list = prop_list; gui->prop_list = o = clouseau_object_information_list_add(panes);
evas_object_size_hint_align_set(prop_list, evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);
EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_weight_set(prop_list,
elm_object_part_content_set(panes, "right", o);
evas_object_show(o);
}
#ifndef ELM_LIB_QUICKLAUNCH
EAPI int
elm_main(int argc EINA_UNUSED, char **argv EINA_UNUSED)
{ /* Create Client Window */
Evas_Object *win, *panes;
/* For inwin popup */
Evas_Object *lb, *bxx, *bt_bx, *bt_ok, *bt_cancel;
Evas_Object *bt_ofl; /* work_offline button */
void *st;
gui = calloc(1, sizeof(gui_elements));
gui->win = win = elm_win_util_standard_add("client", CLIENT_NAME);
elm_win_autodel_set(win, EINA_TRUE);
_titlebar_string_set(gui, EINA_FALSE);
gui->bx = elm_box_add(win);
evas_object_size_hint_weight_set(gui->bx,
EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(gui->bx, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_win_resize_object_add(win, gui->bx);
elm_object_part_content_set(panes, "right", prop_list); _control_buttons_create(gui, win);
evas_object_show(prop_list); panes = elm_panes_add(gui->bx);
} evas_object_size_hint_weight_set(panes, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(panes, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_box_pack_end(gui->bx, panes);
evas_object_show(panes);
_main_list_create(panes);
_property_list_create(panes);
/* START Add buttom panel */ /* START Add buttom panel */
gui->panel = elm_panel_add(win); gui->panel = elm_panel_add(win);