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

enventor - updated menu ui

This commit is contained in:
ChunEon Park 2013-08-28 23:15:00 +09:00
parent 76eab51421
commit 995bb31ee4
2 changed files with 51 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
data/themes/menu.edc
View File

@ -1134,31 +1134,45 @@ group { name: "setting_layout";
rel2.to: "preference_frame";
}
}
part { name: "elm.swallow.reset_btn";
type: SWALLOW;
scale: 1;
clip_to: "clipper";
description {
align: 0 1;
min: 70 35;
fixed: 1 1;
rel1.to: "base_frame";
rel1.relative: 0 1;
rel2.to: "base_frame";
rel2.relative: 0 1;
}
}
part { name: "elm.swallow.apply_btn";
type: SWALLOW;
scale: 1;
clip_to: "clipper";
description {
align: 1 1;
min: 70 35;
align: 1 0.5;
min: 50 25;
fixed: 1 1;
rel1.to: "elm.swallow.reset_btn";
rel1.relative: 0 0;
rel2.to: "elm.swallow.reset_btn";
rel2.relative: 0 1;
}
}
part { name: "elm.swallow.reset_btn";
type: SWALLOW;
scale: 1;
clip_to: "clipper";
description {
align: 0.5 1;
min: 50 25;
fixed: 1 1;
rel1.to: "base_frame";
rel1.relative: 1 1;
rel1.relative: 0.5 0.99;
rel2.to: "base_frame";
rel2.relative: 0.5 0.99;
}
}
part { name: "elm.swallow.cancel_btn";
type: SWALLOW;
scale: 1;
clip_to: "clipper";
description {
align: 0 0.5;
min: 50 25;
fixed: 1 1;
rel1.to: "elm.swallow.reset_btn";
rel1.relative: 1 0;
rel2.to: "elm.swallow.reset_btn";
rel2.relative: 1 1;
}
}

21
src/bin/menu.c
View File

@ -270,6 +270,14 @@ snd_path_entry_update(Evas_Object *entry, Eina_List *edc_snd_paths)
}
}
static void
setting_cancel_btn_cb(void *data, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
menu_data *md = data;
setting_close(md);
}
static void
setting_reset_btn_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
@ -511,7 +519,7 @@ setting_open(menu_data *md)
elm_object_part_content_set(layout, "elm.swallow.apply_btn", btn);
//Cancel Button
//Reset Button
btn = elm_button_add(layout);
elm_object_style_set(btn, elm_app_name_get());
elm_object_text_set(btn, "Reset");
@ -520,6 +528,15 @@ setting_open(menu_data *md)
elm_object_part_content_set(layout, "elm.swallow.reset_btn", btn);
//Cancel Button
btn = elm_button_add(layout);
elm_object_style_set(btn, elm_app_name_get());
elm_object_text_set(btn, "Cancel");
evas_object_smart_callback_add(btn, "clicked", setting_cancel_btn_cb, md);
evas_object_show(btn);
elm_object_part_content_set(layout, "elm.swallow.cancel_btn", btn);
if (md->menu_layout)
elm_object_disabled_set(md->menu_layout, EINA_TRUE);
@ -877,6 +894,7 @@ edc_file_save(menu_data *md)
Evas_Object *fs = elm_fileselector_add(layout);
elm_object_part_text_set(fs, "ok", "Save");
elm_object_part_text_set(fs, "cancel", "Close");
elm_fileselector_path_set(fs, getenv("HOME"));
elm_fileselector_expandable_set(fs, EINA_FALSE);
elm_fileselector_is_save_set(fs, EINA_TRUE);
@ -910,6 +928,7 @@ edc_file_load(menu_data *md)
Evas_Object *fs = elm_fileselector_add(layout);
elm_fileselector_path_set(fs, getenv("HOME"));
elm_object_part_text_set(fs, "ok", "Load");
elm_object_part_text_set(fs, "cancel", "Close");
elm_fileselector_expandable_set(fs, EINA_FALSE);
elm_fileselector_is_save_set(fs, EINA_TRUE);
evas_object_smart_callback_add(fs, "done", fileselector_load_done_cb, md);