vtorri
/
enventor
forked from enlightenment/enventor
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

code refactoring. 

remove duplicated logics wrt function toggles.

this is the precede work for improving tools gui.
This commit is contained in:
ChunEon Park 2015-06-22 18:25:48 +09:00
parent ea715444ed
commit 11e5dba045
4 changed files with 56 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bin/base_gui.c
View File

@ -63,12 +63,12 @@ base_title_set(const char *path)
}
void
base_statusbar_toggle(Eina_Bool config)
base_statusbar_toggle(Eina_Bool toggle)
{
base_data *bd = g_bd;
assert(bd);
if (config) config_stats_bar_set(!config_stats_bar_get());
if (toggle) config_stats_bar_set(!config_stats_bar_get());
if (config_stats_bar_get())
elm_object_signal_emit(bd->layout, "elm,state,statusbar,show", "");

41
src/bin/main.c
View File

@ -43,11 +43,13 @@ enventor_common_setup(Evas_Object *enventor)
enventor_object_font_set(enventor, font_name, font_style);
enventor_object_font_scale_set(enventor, config_font_scale_get());
enventor_object_live_view_scale_set(enventor, config_view_scale_get());
enventor_object_linenumber_set(enventor, config_linenumber_get());
tools_lines_update(enventor, EINA_FALSE);
enventor_object_part_highlight_set(enventor, config_part_highlight_get());
tools_highlight_update(enventor, EINA_FALSE);
enventor_object_auto_indent_set(enventor, config_auto_indent_get());
enventor_object_auto_complete_set(enventor, config_auto_complete_get());
enventor_object_dummy_swallow_set(enventor, config_dummy_swallow_get());
tools_swallow_update(enventor, EINA_FALSE);
tools_status_update(NULL, EINA_FALSE);
Eina_List *list = eina_list_append(NULL, config_edj_path_get());
enventor_object_path_set(enventor, ENVENTOR_OUT_EDJ, list);
@ -134,7 +136,6 @@ config_update_cb(void *data)
enventor_object_live_view_size_set(enventor, w, h);
base_tools_toggle(EINA_FALSE);
base_statusbar_toggle(EINA_FALSE);
base_console_auto_hide();
}
@ -515,29 +516,6 @@ enventor_setup(app_data *ad)
ad->enventor = enventor;
}
static void
part_highlight_toggle(app_data *ad)
{
config_part_highlight_set(!config_part_highlight_get());
enventor_object_part_highlight_set(ad->enventor,
config_part_highlight_get());
if (config_part_highlight_get())
stats_info_msg_update("Part Highlighting Enabled.");
else
stats_info_msg_update("Part Highlighting Disabled.");
}
static void
dummy_swallow_toggle(app_data *ad)
{
config_dummy_swallow_set(!config_dummy_swallow_get());
enventor_object_dummy_swallow_set(ad->enventor, config_dummy_swallow_get());
if (config_dummy_swallow_get())
stats_info_msg_update("Dummy Swallow Enabled.");
else
stats_info_msg_update("Dummy Swallow Disabled.");
}
static void
default_template_insert(app_data *ad)
{
@ -633,13 +611,13 @@ ctrl_func(app_data *ad, Ecore_Event_Key *event)
//Part Highlight
if (!strcmp(event->key, "h") || !strcmp(event->key, "H"))
{
part_highlight_toggle(ad);
tools_highlight_update(ad->enventor, EINA_TRUE);
return EINA_TRUE;
}
//Swallow Dummy Object
if (!strcmp(event->key, "w") || !strcmp(event->key, "W"))
{
dummy_swallow_toggle(ad);
tools_swallow_update(ad->enventor, EINA_TRUE);
return EINA_TRUE;
}
//Template Code
@ -773,8 +751,7 @@ main_key_down_cb(void *data, int type EINA_UNUSED, void *ev)
if (!strcmp(event->key, "F5"))
{
enventor_object_ctxpopup_dismiss(ad->enventor);
config_linenumber_set(!config_linenumber_get());
enventor_object_linenumber_set(ad->enventor, config_linenumber_get());
tools_lines_update(ad->enventor, EINA_TRUE);
return ECORE_CALLBACK_DONE;
}
//Tools
@ -795,7 +772,7 @@ main_key_down_cb(void *data, int type EINA_UNUSED, void *ev)
if (!strcmp(event->key, "F11"))
{
enventor_object_ctxpopup_dismiss(ad->enventor);
base_statusbar_toggle(EINA_TRUE);
tools_status_update(NULL, EINA_TRUE);
return ECORE_CALLBACK_DONE;
}
//Setting
@ -815,7 +792,7 @@ statusbar_set()
{
Evas_Object *obj = stats_init(base_layout_get());
elm_object_part_content_set(base_layout_get(), "elm.swallow.statusbar", obj);
base_statusbar_toggle(EINA_FALSE);
tools_status_update(NULL, EINA_FALSE);
}
static void

57
src/bin/tools.c
View File

@ -20,12 +20,7 @@ highlight_cb(void *data, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
Evas_Object *enventor = data;
config_part_highlight_set(!config_part_highlight_get());
enventor_object_part_highlight_set(enventor, config_part_highlight_get());
if (config_part_highlight_get())
stats_info_msg_update("Part Highlighting Enabled.");
else
stats_info_msg_update("Part Highlighting Disabled.");
tools_highlight_update(enventor, EINA_TRUE);
}
static void
@ -33,28 +28,21 @@ swallow_cb(void *data, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
Evas_Object *enventor = data;
config_dummy_swallow_set(!config_dummy_swallow_get());
enventor_object_dummy_swallow_set(enventor, config_dummy_swallow_get());
if (config_dummy_swallow_get())
stats_info_msg_update("Dummy Swallow Enabled.");
else
stats_info_msg_update("Dummy Swallow Disabled.");
tools_swallow_update(enventor, EINA_TRUE);
}
static void
lines_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
Evas_Object *enventor = data;
config_linenumber_set(!config_linenumber_get());
enventor_object_linenumber_set(enventor, config_linenumber_get());
tools_lines_update(enventor, EINA_TRUE);
}
static void
status_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
base_statusbar_toggle(EINA_TRUE);
tools_status_update(NULL, EINA_TRUE);
}
static void
@ -251,3 +239,40 @@ tools_live_edit_get(Evas_Object *tools)
{
return evas_object_data_get(tools, "live_edit");
}
void
tools_highlight_update(Evas_Object *enventor, Eina_Bool toggle)
{
if (toggle) config_part_highlight_set(!config_part_highlight_get());
enventor_object_part_highlight_set(enventor,
config_part_highlight_get());
if (config_part_highlight_get())
stats_info_msg_update("Part Highlighting Enabled.");
else
stats_info_msg_update("Part Highlighting Disabled.");
}
void
tools_lines_update(Evas_Object *enventor, Eina_Bool toggle)
{
if (toggle) config_linenumber_set(!config_linenumber_get());
enventor_object_linenumber_set(enventor, config_linenumber_get());
}
void
tools_swallow_update(Evas_Object *enventor, Eina_Bool toggle)
{
if (toggle) config_dummy_swallow_set(!config_dummy_swallow_get());
enventor_object_dummy_swallow_set(enventor, config_dummy_swallow_get());
if (config_dummy_swallow_get())
stats_info_msg_update("Dummy Swallow Enabled.");
else
stats_info_msg_update("Dummy Swallow Disabled.");
}
void
tools_status_update(Evas_Object *enventor EINA_UNUSED, Eina_Bool toggle)
{
base_statusbar_toggle(toggle);
}

4
src/include/tools.h
View File

@ -1,2 +1,6 @@
Evas_Object *tools_create(Evas_Object *parent, Evas_Object *enventor);
Evas_Object *tools_live_edit_get(Evas_Object *tools);
void tools_highlight_update(Evas_Object *enventor, Eina_Bool toggle);
void tools_lines_update(Evas_Object *enventor, Eina_Bool toggle);
void tools_swallow_update(Evas_Object *enventor, Eina_Bool toggle);
void tools_status_update(Evas_Object *enventor, Eina_Bool toggle);