rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=42eda5629f85d9393c2c214cba79e8f30d59de33
commit 42eda5629f85d9393c2c214cba79e8f30d59de33 Author: Vitalii Vorobiov <[email protected]> Date: Thu Jan 28 13:09:32 2016 +0000 shortcuts: rename editors to managers --- src/bin/config/config.c | 8 ++++---- src/bin/eflete.h | 1 - src/bin/ui/dialogs/about_window.c | 3 --- src/bin/ui/shortcuts/shortcuts.c | 24 ++++++++++++------------ src/bin/ui/style_manager.c | 10 +++++----- 5 files changed, 21 insertions(+), 25 deletions(-) diff --git a/src/bin/config/config.c b/src/bin/config/config.c index bd2e950..af9d3e9 100644 --- a/src/bin/config/config.c +++ b/src/bin/config/config.c @@ -291,10 +291,10 @@ _default_shortcuts_get() ADD_SHORTCUT("y", 29, CTRL, "redo", false); ADD_SHORTCUT("1", 10, CTRL, "open_edj", false); - ADD_SHORTCUT("2", 11, CTRL, "tab.image_editor", false); - ADD_SHORTCUT("3", 12, CTRL, "tab.sound_editor", false); - ADD_SHORTCUT("4", 13, CTRL, "tab.style_editor", false); - ADD_SHORTCUT("5", 14, CTRL, "tab.colorclass_viewer", false); + ADD_SHORTCUT("2", 11, CTRL, "tab.image_manager", false); + ADD_SHORTCUT("3", 12, CTRL, "tab.sound_manager", false); + ADD_SHORTCUT("4", 13, CTRL, "tab.style_manager", false); + ADD_SHORTCUT("5", 14, CTRL, "tab.colorclass_manager", false); ADD_SHORTCUT("6", 15, CTRL, "animator", false); ADD_SHORTCUT("equal", 21, CTRL, "zoom.in", false); diff --git a/src/bin/eflete.h b/src/bin/eflete.h index 23d284d..61e7f05 100644 --- a/src/bin/eflete.h +++ b/src/bin/eflete.h @@ -94,7 +94,6 @@ struct _App_Data Evas_Object *colorsel; /**< global colorselector. the one colorselector for application. */ Evas_Object *statusbar; /**< The statusbar object, which contain some items */ - int modal_editor; /**< count of open editors */ struct { Evas_Object *left; Evas_Object *right; diff --git a/src/bin/ui/dialogs/about_window.c b/src/bin/ui/dialogs/about_window.c index 8eef6e4..7995ccd 100644 --- a/src/bin/ui/dialogs/about_window.c +++ b/src/bin/ui/dialogs/about_window.c @@ -26,9 +26,7 @@ _on_mwin_del(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) { - ui_menu_items_list_disable_set(ap.menu, MENU_ITEMS_LIST_MAIN, false); - ap.modal_editor--; } static void @@ -87,6 +85,5 @@ about_window_add() elm_object_part_content_set(mwin, "eflete.swallow.btn_close", button); evas_object_show(mwin); - ap.modal_editor++; return mwin; } diff --git a/src/bin/ui/shortcuts/shortcuts.c b/src/bin/ui/shortcuts/shortcuts.c index 99dee3b..6b80c59 100644 --- a/src/bin/ui/shortcuts/shortcuts.c +++ b/src/bin/ui/shortcuts/shortcuts.c @@ -173,7 +173,7 @@ PART_ADD(EDJE_PART_TYPE_BOX, box) /* different adding is for image */ /* static void -_on_image_editor_done(void *data __UNUSED__, +_on_image_manager_done(void *data __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info) { @@ -190,8 +190,8 @@ _image_part_choose_cb(void) Evas_Object *img_edit; - img_edit = image_editor_window_add(ap.project, SINGLE); - evas_object_smart_callback_add(img_edit, SIG_IMAGE_SELECTED, _on_image_editor_done, NULL); + img_edit = image_manager_window_add(ap.project, SINGLE); + evas_object_smart_callback_add(img_edit, SIG_IMAGE_SELECTED, _on_image_manager_done, NULL); return true; } */ @@ -457,7 +457,7 @@ _close_tab_cb(void) } static Eina_Bool -_style_editor_open_cb(void) +_style_manager_open_cb(void) { if (ap.colorsel) evas_object_smart_callback_call(ap.colorsel, "dismissed", NULL); @@ -467,7 +467,7 @@ _style_editor_open_cb(void) } static Eina_Bool -_image_editor_open_cb(void) +_image_manager_open_cb(void) { if (ap.colorsel) evas_object_smart_callback_call(ap.colorsel, "dismissed", NULL); @@ -477,7 +477,7 @@ _image_editor_open_cb(void) } static Eina_Bool -_sound_editor_open_cb(void) +_sound_manager_open_cb(void) { if (ap.colorsel) evas_object_smart_callback_call(ap.colorsel, "dismissed", NULL); @@ -658,10 +658,10 @@ static Function_Set _sc_func_set_init[] = {"close", _close_tab_cb}, {"undo", _undo_cb}, {"redo", _redo_cb}, - {"tab.style_editor", _style_editor_open_cb}, - {"tab.image_editor", _image_editor_open_cb}, - {"tab.sound_editor", _sound_editor_open_cb}, - {"tab.colorclass_viewer", _colorclass_manager_open_cb}, + {"tab.style_manager", _style_manager_open_cb}, + {"tab.image_manager", _image_manager_open_cb}, + {"tab.sound_manager", _sound_manager_open_cb}, + {"tab.colorclass_manager", _colorclass_manager_open_cb}, {"animator", _animator_open_cb}, {NULL, NULL} }; @@ -675,7 +675,7 @@ _key_press_event_cb(void *data __UNUSED__, int type __UNUSED__, void *event) Key_Pair *key = mem_malloc(sizeof(Key_Pair)); - if ((!ap.popup) && (!ap.modal_editor)) + if (!ap.popup) { /* * (ev->modifiers && 255) because modifiers contain both locks and modifs, @@ -708,7 +708,7 @@ _key_unpress_event_cb(void *data __UNUSED__, int type __UNUSED__, void *event) Eina_List *l; - if ((!ap.popup) && (!ap.modal_editor)) + if (!ap.popup) { EINA_LIST_FOREACH(ap.shortcuts->holded_functions, l, sc_func) { diff --git a/src/bin/ui/style_manager.c b/src/bin/ui/style_manager.c index a8e8f03..ca2c604 100644 --- a/src/bin/ui/style_manager.c +++ b/src/bin/ui/style_manager.c @@ -512,7 +512,7 @@ _item_style_label_get(void *data, } static inline Evas_Object * -_style_editor_search_field_create(Evas_Object *parent) +_style_manager_search_field_create(Evas_Object *parent) { Evas_Object *entry, *icon; @@ -800,7 +800,7 @@ _form_right_side(Style_Editor *style_edit) elm_object_part_text_set(layout, "label.list", _("Font list")); evas_object_show(layout); - search = _style_editor_search_field_create(layout); + search = _style_manager_search_field_create(layout); elm_object_part_content_set(layout, "swallow.search", search); evas_object_smart_callback_add(search, "changed", _search_changed, style_edit); evas_object_smart_callback_add(search, "activated", _search_nxt_gd_item, style_edit); @@ -923,7 +923,7 @@ _add_box_bg(Style_Editor *style_edit) } static void -_on_style_editor_close(void *data, +_on_style_manager_close(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__, void *event_info __UNUSED__) @@ -972,7 +972,7 @@ style_manager_add() evas_textblock_style_set(ts, style_buf); evas_object_textblock_style_set(style_edit->textblock_style, ts); evas_object_textblock_text_markup_set(style_edit->textblock_style, - _("The quick brown fox jumps over the lazy dog")); + _("The quick brown fox <\t>jumps over the lazy dog")); evas_object_show(style_edit->textblock_style); elm_object_part_content_set(main_layout, "swallow.preview", style_edit->entry_prev); @@ -985,7 +985,7 @@ style_manager_add() evas_textblock_style_free(ts); evas_object_event_callback_add(main_layout, EVAS_CALLBACK_DEL, - _on_style_editor_close, style_edit); + _on_style_manager_close, style_edit); return main_layout; } --
