Compare commits

...

21 Commits

Author SHA1 Message Date
ChunEon Park d49f88e927 bump up version to 0.3.2 2014-08-30 15:11:24 +09:00
Mykyta Biliavskyi 8d5e5c847b dummy_object: change input param for edje_object_add from Evas_Object* to Evas*
Reviewers: Hermet

Subscribers: NikaWhite

Projects: #enventor

Differential Revision: https://phab.enlightenment.org/D1355
2014-08-30 14:56:59 +09:00
Daniel Juyung Seo c687b539a7 edc_editor, edc_parser: fixed resource leak.
This fixes coverity CID 47576, 47577, and 47578.
2014-08-30 14:54:59 +09:00
Daniel Juyung Seo 7571783f4a config: fixed buffer not null terminated bug.
This fixes coverity CID 47570.
2014-08-30 14:54:28 +09:00
Daniel Juyung Seo 229a9e2a68 search: initialize the local variable.
This fixed coverity CID 47575.
2014-08-30 14:54:19 +09:00
ChunEon Park a985f33cae auto_comp: reset tooltip at better proper position.
it's better to reset tooltip content callback when it's going off.
2014-08-30 14:53:00 +09:00
ChunEon Park f8fb99a5ab auto_comp: correct candidates lists.
Reset content_cb to have guarantee the callback call.
If anchor is changed faster than tooltip hide,
the callback won't be called since tooltip regards the content callback is same with before.
2014-08-30 14:52:14 +09:00
ChunEon Park 43e0887f4e updated AUTHORS 2014-08-30 14:51:08 +09:00
Alex-P. Natsios 6a006ad32f auto_completion - fix typo for 'relative'
Summary:
Fixes a typo in the completion popup.

relatvie -> relative

Test Plan: try to open a popup that suggests autocompletion for 'relative'

Reviewers: Hermet

Reviewed By: Hermet

Differential Revision: https://phab.enlightenment.org/D1299
2014-08-30 14:50:45 +09:00
ChunEon Park 13db2e20bc ctxpopup: free the resource after use 2014-08-30 14:50:06 +09:00
Mykyta Biliavskyi f113552e43 menu: Update window title on creation empty project.
Summary:
empty file creation changes window title.
Sets filepath into title. @fix

Reviewers: Hermet

Reviewed By: Hermet

Projects: #enventor

Differential Revision: https://phab.enlightenment.org/D1287
2014-08-30 14:49:38 +09:00
Mykyta Biliavskyi e8786202a5 menu: Fix change window title.
Summary: When file saved with new name -  changes title of main window. @fix

Reviewers: Hermet

Projects: #enventor

Differential Revision: https://phab.enlightenment.org/D1286
2014-08-30 14:49:03 +09:00
ChunEon Park 6be82f90cd edc_editor: update file path on title exactly. 2014-08-30 14:48:19 +09:00
ChunEon Park a79c423b37 updated AUTHORS
Conflicts:

	AUTHORS
2014-08-30 14:47:41 +09:00
Mykyta Biliavskyi 310e5feb89 edc_editor: fix segfault on last character undo.
Summary:
In case when undone character(s) in entry, was call updating syntax highlight. If entry is empty, then pointer of text  didn't cleared and it was cause segfault in evas_textblock module.
@fix Fixes T1480

Reviewers: Hermet

Subscribers: kfesyna

Projects: #enventor

Maniphest Tasks: T1480

Differential Revision: https://phab.enlightenment.org/D1272

Conflicts:

	src/bin/edc_editor.c
2014-08-30 14:47:11 +09:00
ChunEon Park be786d617f indent: free the used memory. 2014-08-30 14:45:51 +09:00
ChunEon Park 10848a3c99 bump up version. 2014-08-02 18:50:25 +09:00
ChunEon Park 7b711c9fc8 editor: update current line status properly.
put the line updation in the line inc/dec functions to be ensure.

Conflicts:

	src/bin/redoundo.c
2014-08-02 18:48:47 +09:00
ChunEon Park cdd1f989fe editor: set line number status correctly when edc is empty. 2014-08-02 18:48:08 +09:00
ChunEon Park cfa983db58 editor: update line status when text is changed. 2014-08-02 18:47:09 +09:00
Kateryna Fesyna 46b5582e4f edc_editor: focus lose on left-arrow key is pressed
Summary:
Call elm_object_focus_allow_set() function for en_line entry to
forbid focusing it, so en_editor would not lose its focus.

Reviewers: Hermet

Differential Revision: https://phab.enlightenment.org/D1246
2014-08-02 18:46:19 +09:00
13 changed files with 69 additions and 20 deletions

View File

@ -6,3 +6,5 @@ Ryuan Choi <ryuan.choi@gmail.com>
Jihoon Kim <jihoon48.kim@samsung.com>
The Rasterman (Carsten Haitzler) <raster@rasterman.com>
Kateryna Fesyna <k.fesyna@samsung.com>
Mykyta Biliavskyi <m.biliavskyi@samsung.com>
Alex-P. Natsios <drakevr@linuxteam.teilar.gr>

16
NEWS
View File

@ -1,6 +1,16 @@
============
Enventor 0.3.0
============
==============
Enventor 0.3.2
==============
Changes since Enventor 0.3.1:
---------------------------
Fixes:
* Fixed memory leaks in some cases.
* Fixed segfault in applying syntax color.
* Fixed window title file path to be updated correctly.
* Fixed auto completion keyword relative
* Fixed auto completion candidation list to be updated correctly.
* Fixed dummy object(swallow) was invisible case.
Changes since Enventor 0.2.0:
---------------------------

2
README
View File

@ -1,4 +1,4 @@
[Enventor v0.3.0]
[Enventor v0.3.2]
This is an EDC editor with some convenient functions. It's brand new and was
only started near the begining of June 2013, so expecting it to do everything a

View File

@ -2,7 +2,7 @@
##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
m4_define([v_maj], [0])
m4_define([v_min], [3])
m4_define([v_mic], [0])
m4_define([v_mic], [2])
#m4_define([v_rev], m4_esyscmd([(git rev-list --count HEAD 2>/dev/null || echo 0) | tr -d '\n']))dnl
##-- When released, remove the dnl on the below line
dnl m4_undefine([v_rev])

View File

@ -66,7 +66,7 @@ init_thread_cb(void *data, Ecore_Thread *thread EINA_UNUSED)
COMPDATA_SET(ad, "scale",AUTOCOMP_SCALE, 1, 0);
COMPDATA_SET(ad, "rel1",AUTOCOMP_REL1, 2, 1);
COMPDATA_SET(ad, "rel2",AUTOCOMP_REL2, 2, 1);
COMPDATA_SET(ad, "relatvie",AUTOCOMP_RELATIVE, 1, 0);
COMPDATA_SET(ad, "relative",AUTOCOMP_RELATIVE, 1, 0);
COMPDATA_SET(ad, "offset", AUTOCOMP_OFFSET, 1, 0);
COMPDATA_SET(ad, "color", AUTOCOMP_COLOR, 1, 0);
COMPDATA_SET(ad, "color2", AUTOCOMP_COLOR2, 1, 0);
@ -119,7 +119,14 @@ init_thread_cancel_cb(void *data, Ecore_Thread *thread EINA_UNUSED)
static void
entry_anchor_off(autocomp_data *ad)
{
if (ad->anchor_visible) elm_object_tooltip_hide(ad->anchor);
if (ad->anchor_visible)
{
elm_object_tooltip_hide(ad->anchor);
/* Reset content_cb to have guarantee the callback call. If anchor is
changed faster than tooltip hide, the callback won't be called
since tooltip regards the content callback is same with before. */
elm_object_tooltip_content_cb_set(ad->anchor, NULL, NULL, NULL);
}
ad->anchor_visible = EINA_FALSE;
ad->compset_list = eina_list_free(ad->compset_list);
}

View File

@ -46,7 +46,7 @@ config_edj_path_update(config_data *cd)
if (ext && file)
snprintf(buf, (ext - file) + 1, "%s", file);
else
strncpy(buf, file, sizeof(buf));
strncpy(buf, file, sizeof(buf) - 1);
char *filedir = ecore_file_dir_get(cd->edc_path);
sprintf(edj_path, "%s/%s.edj", filedir, buf);
free(filedir);

View File

@ -227,6 +227,7 @@ state_candidate_set(Evas_Object *ctxpopup, void *data, Eina_Bool prog)
end:
eina_stringshare_del(program);
view_string_list_free(targets);
if (!prog && target) eina_stringshare_del(target);
return ret;
}

View File

@ -27,7 +27,7 @@ dummy_objs_update(dummy_obj *dummy)
char *part_name;
Edje_Part_Type type;
part_obj *po;
Evas *evas = evas_object_evas_get(dummy->layout);
Eina_Bool removed;
//Remove the fake swallow objects that parts are removed.
@ -71,7 +71,7 @@ dummy_objs_update(dummy_obj *dummy)
if (!po) continue;
//New part. Add fake object.
Evas_Object *obj = edje_object_add(dummy->layout);
Evas_Object *obj = edje_object_add(evas);
edje_object_file_set(obj, EDJE_PATH, "swallow");
edje_object_part_swallow(dummy->layout, part_name, obj);

View File

@ -204,7 +204,7 @@ syntax_color_full_update(edit_data *ed, Eina_Bool thread)
if (thread)
{
syntax_color_td *td = malloc(sizeof(syntax_color_td));
syntax_color_td *td = calloc(1, sizeof(syntax_color_td));
td->ed = ed;
Evas_Object *tb = elm_entry_textblock_get(ed->en_edit);
td->text = (char *) evas_object_textblock_text_markup_get(tb);
@ -644,7 +644,11 @@ image_preview_show(edit_data *ed, char *cur, Evas_Coord x, Evas_Coord y)
ctxpopup_img_preview_create(ed, fullpath,
ctxpopup_preview_dismiss_cb,
ctxpopup_preview_relay_cb);
if (!ctxpopup) return EINA_FALSE;
if (!ctxpopup)
{
free(filename);
return EINA_FALSE;
}
evas_object_move(ctxpopup, x, y);
evas_object_show(ctxpopup);
@ -953,6 +957,7 @@ edit_init(Evas_Object *parent)
evas_object_color_set(en_line, 101, 101, 101, 255);
elm_entry_editable_set(en_line, EINA_FALSE);
elm_entry_line_wrap_set(en_line, ELM_WRAP_NONE);
elm_object_focus_allow_set(en_line, EINA_FALSE);
evas_object_size_hint_weight_set(en_line, 0, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(en_line, 0, EVAS_HINT_FILL);
elm_object_part_content_set(layout, "elm.swallow.linenumber", en_line);
@ -1043,6 +1048,8 @@ edit_edc_read(edit_data *ed, const char *file_path)
strbuf_line = eina_strbuf_new();
if (!strbuf_line) goto err;
base_title_set(file_path);
utf8_edit = eina_file_map_all(file, EINA_FILE_REMOVE);
if (!utf8_edit) goto err;
@ -1074,8 +1081,6 @@ edit_edc_read(edit_data *ed, const char *file_path)
parser_first_group_name_get(ed->pd, ed->en_edit);
stats_edc_group_update(group_name);
stats_line_num_update(0, ed->line_max);
base_title_set(config_edc_path_get());
ecore_animator_add(syntax_color_timer_cb, ed);
@ -1086,6 +1091,7 @@ err:
if (utf8_edit) eina_file_map_free(file, utf8_edit);
if (file) eina_file_close(file);
autocomp_target_set(ed);
stats_line_num_update(1, ed->line_max);
}
void
@ -1220,6 +1226,8 @@ edit_line_increase(edit_data *ed, int cnt)
elm_entry_entry_append(ed->en_line, buf);
}
elm_entry_calc_force(ed->en_line);
stats_line_num_update(ed->cur_line, ed->line_max);
}
void
@ -1249,4 +1257,5 @@ edit_line_decrease(edit_data *ed, int cnt)
ed->line_max -= cnt;
if (ed->line_max < 1) line_init(ed);
stats_line_num_update(ed->cur_line, ed->line_max);
}

View File

@ -728,10 +728,18 @@ parser_cur_group_name_get(parser_data *pd, Evas_Object *entry,
if (!td) return;
const char *text = elm_entry_entry_get(entry);
if (!text) return;
if (!text)
{
free(td);
return;
}
char *utf8 = elm_entry_markup_to_utf8(text);
if (!utf8) return;
if (!utf8)
{
free(td);
return;
}
td->pd = pd;
td->utf8 = utf8;
@ -756,10 +764,18 @@ parser_cur_name_get(parser_data *pd, Evas_Object *entry, void (*cb)(void *data,
if (!td) return;
const char *text = elm_entry_entry_get(entry);
if (!text) return;
if (!text)
{
free(td);
return;
}
char *utf8 = elm_entry_markup_to_utf8(text);
if (!utf8) return;
if (!utf8)
{
free(td);
return;
}
td->pd = pd;
td->utf8 = utf8;

View File

@ -83,7 +83,7 @@ indent_insert_br_case(indent_data *id, Evas_Object *entry)
}
int space = indent_space_get(id, entry);
if (space <= 0) return;
if (space <= 0) goto end;
//Alloc Empty spaces
char *p = alloca(space + 1);
@ -91,6 +91,9 @@ indent_insert_br_case(indent_data *id, Evas_Object *entry)
p[space] = '\0';
elm_entry_entry_insert(entry, p);
end:
free(utf8);
}
static void

View File

@ -841,6 +841,7 @@ fileselector_save_done_cb(void *data, Evas_Object *obj, void *event_info)
edj_mgr_reload_need_set(EINA_TRUE);
config_apply();
base_title_set(selected);
fileselector_close(md);
menu_close(md);
}

View File

@ -148,7 +148,7 @@ find_backward_proc(search_data *sd)
char buf[256];
Eina_Bool need_iterate = EINA_TRUE;
int len;
int len = 0;
const char *text = elm_entry_entry_get(sd->entry);
if (!text) return;