diff --git a/data/themes/default/layout_common.edc b/data/themes/default/layout_common.edc index c30f15a..30f0184 100644 --- a/data/themes/default/layout_common.edc +++ b/data/themes/default/layout_common.edc @@ -733,6 +733,15 @@ group { name: "warning_layout"; group { name: "menu_layout"; parts { + part { name: "clipper"; + type: RECT; + description { state: "default" 0.0; + color: 255 255 255 0; + } + description { state: "show" 0.0; + color: 255 255 255 255; + } + } part { name: "bg"; type: RECT; description { state: "default" 0.0; @@ -745,15 +754,6 @@ group { name: "menu_layout"; color: 0 0 0 200; } } - part { name: "clipper"; - type: RECT; - description { state: "default" 0.0; - color: 255 255 255 0; - } - description { state: "show" 0.0; - color: 255 255 255 255; - } - } part { name: "base_frame"; type: SPACER; scale: 1; @@ -954,20 +954,6 @@ group { name: "menu_layout"; align: 1 1; } } - part { name: "elm.swallow.prev_btn"; - type: SWALLOW; - scale: 1; - clip_to: "clipper"; - description { state: "default" 0.0; - rel1.relative: 0 0; - rel2.relative: 1 0; - rel1.to: "padding7"; - rel2.to: "padding7"; - align: 1 1; - min: 40 40; - fixed: 1 1; - } - } part { name: "event_blocker"; type: RECT; description { state: "default" 0.0; @@ -1021,6 +1007,11 @@ group { name: "menu_layout"; program { name: "dismiss_done"; action: SIGNAL_EMIT "elm,state,dismiss,done" ""; } + program { "bg_clicked"; + signal: "mouse,clicked,1"; + source: "bg"; + action: SIGNAL_EMIT "elm,state,clicked" ""; + } } } diff --git a/po/en.po b/po/en.po index 5cb2ce3..b93192d 100644 --- a/po/en.po +++ b/po/en.po @@ -243,10 +243,6 @@ msgstr "" msgid "Close Enventor Menu (Esc)" msgstr "" -#: src/bin/menu.c:673 -msgid "Back" -msgstr "" - #: src/bin/newfile.c:56 src/bin/newfile.c:79 #, c-format msgid "Cannot find file! \"%s\"" diff --git a/po/ru.po b/po/ru.po index ce72a58..b910342 100644 --- a/po/ru.po +++ b/po/ru.po @@ -245,10 +245,6 @@ msgstr "Выход" msgid "Close Enventor Menu (Esc)" msgstr "Закрыть меню (Esc)" -#: src/bin/menu.c:673 -msgid "Back" -msgstr "Назад" - #: src/bin/newfile.c:56 src/bin/newfile.c:79 #, c-format msgid "Cannot find file! \"%s\"" diff --git a/src/bin/menu.c b/src/bin/menu.c index d3b4c42..f159786 100644 --- a/src/bin/menu.c +++ b/src/bin/menu.c @@ -333,8 +333,8 @@ exit_btn_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, } static void -prev_btn_cb(void *data, Evas_Object *obj EINA_UNUSED, - void *event_info EINA_UNUSED) +menu_clicked(void *data, Evas_Object *obj EINA_UNUSED, + const char *emission EINA_UNUSED, const char *source EINA_UNUSED) { menu_data *md = data; enventor_object_focus_set(base_enventor_get(), EINA_TRUE); @@ -633,6 +633,8 @@ menu_open(menu_data *md) //Layout Evas_Object *layout = elm_layout_add(base_win_get()); elm_layout_file_set(layout, EDJE_PATH, "menu_layout"); + elm_object_signal_callback_add(layout, "elm,state,clicked", "", + menu_clicked, md); elm_object_signal_callback_add(layout, "elm,state,dismiss,done", "", menu_dismiss_done, md); evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -667,14 +669,6 @@ menu_open(menu_data *md) btn = btn_create(layout, _("Exit"), exit_btn_cb, md); elm_object_part_content_set(layout, "elm.swallow.exit_btn", btn); - //Button(Prev) - btn = elm_button_add(layout); - elm_object_style_set(btn, "anchor"); - evas_object_smart_callback_add(btn, "clicked", prev_btn_cb, md); - elm_object_tooltip_text_set(btn, _("Close Enventor Menu (Esc)")); - elm_object_text_set(btn, _("Back")); - elm_object_part_content_set(layout, "elm.swallow.prev_btn", btn); - tools_menu_update(EINA_TRUE); md->menu_layout = layout;