raster pushed a commit to branch master.
http://git.enlightenment.org/apps/ecrire.git/commit/?id=5b1f5a8d255844f887ca5eb7bcb421268ed59d3f
commit 5b1f5a8d255844f887ca5eb7bcb421268ed59d3f
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date: Wed Apr 15 13:29:33 2020 +0100
move menu init code to later next to where items are disabled
---
src/bin/main.c | 56 ++++++++++++++++++++++++++++----------------------------
1 file changed, 28 insertions(+), 28 deletions(-)
diff --git a/src/bin/main.c b/src/bin/main.c
index 6f99074..04053d3 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -682,34 +682,6 @@ elm_main(int argc, char **argv)
main_ec_ent->win = elm_win_util_standard_add("erire", "Ecrire");
elm_win_autodel_set(main_ec_ent->win, EINA_FALSE);
- menu = elm_win_main_menu_get(main_ec_ent->win);
- mit = elm_menu_item_add(menu, NULL, NULL, _("File"), NULL, NULL);
- elm_menu_item_add(menu, mit, "document-new", _("New"), _new, main_ec_ent);
- elm_menu_item_add(menu, mit, "document-open", _("Open"), _open,
main_ec_ent);
- main_ec_ent->save_item =
- elm_menu_item_add(menu, mit, "document-save", _("Save"), _save,
main_ec_ent);
- elm_menu_item_add(menu, mit, "document-save-as", _("Save As"), _save_as,
main_ec_ent);
- elm_menu_item_separator_add(menu, mit);
- elm_menu_item_add(menu, mit, "application-exit", _("Exit"), _app_exit,
main_ec_ent);
-
- mit = elm_menu_item_add(menu, NULL, NULL, _("Edit"), NULL, NULL);
- main_ec_ent->cut_item =
- elm_menu_item_add(menu, mit, "edit-cut", _("Cut"), _cut, main_ec_ent);
- main_ec_ent->copy_item =
- elm_menu_item_add(menu, mit, "edit-copy", _("Copy"), _copy, main_ec_ent);
- main_ec_ent->paste_item =
- elm_menu_item_add(menu, mit, "edit-paste", _("Paste"), _paste, main_ec_ent);
- elm_menu_item_separator_add(menu, mit);
- main_ec_ent->undo_item =
- elm_menu_item_add(menu, mit, "edit-undo", _("Undo"), _undo, main_ec_ent);
- main_ec_ent->redo_item =
- elm_menu_item_add(menu, mit, "edit-redo", _("Redo"), _redo, main_ec_ent);
- elm_menu_item_separator_add(menu, mit);
- elm_menu_item_add(menu, mit, "edit-find-replace", _("Find"), _find,
main_ec_ent);
- elm_menu_item_add(menu, mit, "go-jump", _("Go to line.."), _goto_line,
main_ec_ent);
- elm_menu_item_separator_add(menu, mit);
- elm_menu_item_add(menu, mit, "preferences-system", _("Settings"),
_font_settings, main_ec_ent);
-
bx = elm_box_add(main_ec_ent->win);
elm_win_resize_object_add(main_ec_ent->win, bx);
evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
@@ -756,6 +728,34 @@ elm_main(int argc, char **argv)
evas_object_smart_callback_add(main_ec_ent->entry, "selection,cleared",
_sel_clear, main_ec_ent);
evas_object_event_callback_add(main_ec_ent->entry, EVAS_CALLBACK_KEY_DOWN,
_key_cb, main_ec_ent);
+ menu = elm_win_main_menu_get(main_ec_ent->win);
+ mit = elm_menu_item_add(menu, NULL, NULL, _("File"), NULL, NULL);
+ elm_menu_item_add(menu, mit, "document-new", _("New"), _new, main_ec_ent);
+ elm_menu_item_add(menu, mit, "document-open", _("Open"), _open,
main_ec_ent);
+ main_ec_ent->save_item =
+ elm_menu_item_add(menu, mit, "document-save", _("Save"), _save,
main_ec_ent);
+ elm_menu_item_add(menu, mit, "document-save-as", _("Save As"), _save_as,
main_ec_ent);
+ elm_menu_item_separator_add(menu, mit);
+ elm_menu_item_add(menu, mit, "application-exit", _("Exit"), _app_exit,
main_ec_ent);
+
+ mit = elm_menu_item_add(menu, NULL, NULL, _("Edit"), NULL, NULL);
+ main_ec_ent->cut_item =
+ elm_menu_item_add(menu, mit, "edit-cut", _("Cut"), _cut, main_ec_ent);
+ main_ec_ent->copy_item =
+ elm_menu_item_add(menu, mit, "edit-copy", _("Copy"), _copy, main_ec_ent);
+ main_ec_ent->paste_item =
+ elm_menu_item_add(menu, mit, "edit-paste", _("Paste"), _paste, main_ec_ent);
+ elm_menu_item_separator_add(menu, mit);
+ main_ec_ent->undo_item =
+ elm_menu_item_add(menu, mit, "edit-undo", _("Undo"), _undo, main_ec_ent);
+ main_ec_ent->redo_item =
+ elm_menu_item_add(menu, mit, "edit-redo", _("Redo"), _redo, main_ec_ent);
+ elm_menu_item_separator_add(menu, mit);
+ elm_menu_item_add(menu, mit, "edit-find-replace", _("Find"), _find,
main_ec_ent);
+ elm_menu_item_add(menu, mit, "go-jump", _("Go to line.."), _goto_line,
main_ec_ent);
+ elm_menu_item_separator_add(menu, mit);
+ elm_menu_item_add(menu, mit, "preferences-system", _("Settings"),
_font_settings, main_ec_ent);
+
/*
#ifdef HAVE_ECORE_X
if (!ecore_x_selection_owner_get(ECORE_X_ATOM_SELECTION_CLIPBOARD))
--
