[EGIT] [tools/enventor] master 01/01: edc_navigator: 2nd patch for base navigation behavior.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=50a7b468ef5ae48b0dc9ef027f970903d1f751ed
commit 50a7b468ef5ae48b0dc9ef027f970903d1f751ed
Author: Hermet Park <her...@hermet.pe.kr>
Date: Fri Feb 26 22:22:29 2016 +0900
edc_navigator: 2nd patch for base navigation behavior.
not completed.
---
data/themes/default/layout_common.edc | 2 +-
src/bin/Makefile.am | 3 +-
src/bin/base_gui.c| 19 +++
src/bin/edc_navigator.c | 267 ++
src/bin/main.c| 2 +
src/include/base_gui.h| 3 +
src/include/edc_navigator.h | 4 +
src/lib/enventor_object.eo| 9 ++
src/lib/enventor_smart.c | 15 ++
9 files changed, 322 insertions(+), 2 deletions(-)
diff --git a/data/themes/default/layout_common.edc
b/data/themes/default/layout_common.edc
index dc511e8..dc9255b 100644
--- a/data/themes/default/layout_common.edc
+++ b/data/themes/default/layout_common.edc
@@ -2720,7 +2720,7 @@ group { name: "main_layout";
}
desc { "visible";
inherit: "default";
-min: 150 0;
+min: 200 0;
}
}
}
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 9f520fd..57cecd5 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -28,7 +28,8 @@ enventor_SOURCES = \
globals.c \
live_edit.c \
console.c \
- file_mgr.c
+ file_mgr.c \
+ edc_navigator.c
enventor_LDADD = \
$(top_builddir)/src/lib/libenventor.la \
diff --git a/src/bin/base_gui.c b/src/bin/base_gui.c
index 817efc1..05b9e4c 100644
--- a/src/bin/base_gui.c
+++ b/src/bin/base_gui.c
@@ -197,11 +197,25 @@ base_gui_term(void)
base_data *bd = g_bd;
assert(bd);
+ edc_navigator_term();
panes_term();
+
free(bd);
}
void
+base_edc_navigator_parts_reload(void)
+{
+ edc_navigator_parts_reload();
+}
+
+void
+base_edc_navigator_group_reload(void)
+{
+ edc_navigator_group_reload();
+}
+
+void
base_console_reset(void)
{
base_data *bd = g_bd;
@@ -265,6 +279,11 @@ base_gui_init(void)
if (config_console_get())
panes_editors_full_view(EINA_TRUE);
+ //EDC Navigator
+ Evas_Object *edc_navigator = edc_navigator_init(layout);
+ elm_object_part_content_set(layout, "elm.swallow.edc_navigator",
+ edc_navigator);
+
bd->win = win;
bd->layout = layout;
bd->console = console;
diff --git a/src/bin/edc_navigator.c b/src/bin/edc_navigator.c
new file mode 100644
index 000..c269e57
--- /dev/null
+++ b/src/bin/edc_navigator.c
@@ -0,0 +1,267 @@
+#include "common.h"
+
+typedef struct edc_navigator_s
+{
+ Evas_Object *genlist;
+
+ Eina_List *group_items; //group object item
+ Eina_List *part_items; //part object item
+ Eina_List *state_items; //state object item
+
+ Eina_List *group_list; //group name list
+ Eina_List *part_list; //part name list
+ Eina_List *state_list; //state name list
+
+ Elm_Genlist_Item_Class *group_itc;
+ Elm_Genlist_Item_Class *part_itc;
+ Elm_Genlist_Item_Class *state_itc;
+} navi_data;
+
+static navi_data *g_nd = NULL;
+
+/*/
+/* Internal method implementation*/
+/*/
+static void
+gl_state_selected_cb(void *data, Evas_Object *obj EINA_UNUSED, void
*event_info)
+{
+ Elm_Object_Item *it = event_info;
+ //TODO: Search Current State
+}
+
+static void
+states_reload(navi_data *nd, Elm_Object_Item *part_it)
+{
+ const char *part = elm_object_item_text_get(part_it);
+ if (!part) return;
+
+ Eina_List *l;
+ Elm_Object_Item *it;
+
+ //Remove Previous Parts
+ EINA_LIST_FREE(nd->state_items, it)
+ elm_object_item_del(it);
+
+ //Append States
+ Evas_Object *enventor = base_enventor_get();
+ edje_edit_string_list_free(nd->state_list);
+ nd->state_list = enventor_object_part_states_list_get(enventor, part);
+ char *name;
+
+ EINA_LIST_FOREACH(nd->state_list, l, name)
+ {
+it = elm_genlist_item_append(nd->genlist,
+ nd->state_itc, /* item class */
+ name, /* item data */
+ part_it, /* parent */
+ ELM_GENLIST_ITEM_NONE, /* item type */
+ gl_state_selected_cb, /* select cb */
+ nd); /* select cb data
*/
+nd->state_items = eina_li
[EGIT] [tools/enventor] master 01/01: code refactoring.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=8679899045d230b0374292feb26c41556c302593
commit 8679899045d230b0374292feb26c41556c302593
Author: Hermet Park <her...@hermet.pe.kr>
Date: Fri Jan 22 19:30:29 2016 +0900
code refactoring.
remove enventor reference passing. it's avaiable to be globally accessed.
---
src/bin/goto.c | 4 +--
src/bin/main.c | 26 -
src/bin/search.c| 4 +--
src/bin/tools.c | 83 -
src/include/tools.h | 14 -
5 files changed, 61 insertions(+), 70 deletions(-)
diff --git a/src/bin/goto.c b/src/bin/goto.c
index ea08885..d2be96e 100644
--- a/src/bin/goto.c
+++ b/src/bin/goto.c
@@ -199,7 +199,7 @@ goto_open(Evas_Object *enventor)
if (!evas_object_key_grab(keygrabber, "Escape", 0, 0, EINA_TRUE))
EINA_LOG_ERR(_("Failed to grab key - Escape"));
- tools_goto_update(enventor, EINA_FALSE);
+ tools_goto_update();
gd->win = win;
gd->layout = layout;
@@ -232,5 +232,5 @@ goto_close(void)
free(gd);
g_gd = NULL;
- tools_goto_update(enventor, EINA_FALSE);
+ tools_goto_update();
}
diff --git a/src/bin/main.c b/src/bin/main.c
index 60fc19a..415f2b7 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -37,12 +37,12 @@ auto_indent_toggle(app_data *ad)
}
static void
-enventor_tools_update(Evas_Object *enventor)
+tools_update(void)
{
- tools_lines_update(enventor, EINA_FALSE);
- tools_highlight_update(enventor, EINA_FALSE);
- tools_dummy_update(enventor, EINA_FALSE);
- tools_status_update(enventor, EINA_FALSE);
+ tools_lines_update(EINA_FALSE);
+ tools_highlight_update(EINA_FALSE);
+ tools_dummy_update(EINA_FALSE);
+ tools_status_update(EINA_FALSE);
}
static void
@@ -128,7 +128,7 @@ config_update_cb(void *data)
Evas_Object *enventor = ad->enventor;
enventor_common_setup(enventor);
- enventor_tools_update(enventor);
+ tools_update();
syntax_color_update(enventor);
@@ -214,9 +214,9 @@ main_mouse_wheel_cb(void *data, int type EINA_UNUSED, void
*ev)
static Evas_Object *
tools_set(Evas_Object *enventor)
{
- Evas_Object *tools = tools_init(base_layout_get(), enventor);
+ Evas_Object *tools = tools_init(base_layout_get());
base_tools_set(tools);
- enventor_tools_update(enventor);
+ tools_update();
return tools;
}
@@ -644,13 +644,13 @@ ctrl_func(app_data *ad, Evas_Event_Key_Down *event)
//Part Highlight
if (!strcmp(event->key, "h") || !strcmp(event->key, "H"))
{
-tools_highlight_update(ad->enventor, EINA_TRUE);
+tools_highlight_update(EINA_TRUE);
return EINA_TRUE;
}
//Swallow Dummy Object
if (!strcmp(event->key, "w") || !strcmp(event->key, "W"))
{
-tools_dummy_update(ad->enventor, EINA_TRUE);
+tools_dummy_update(EINA_TRUE);
return EINA_TRUE;
}
//Template Code
@@ -765,7 +765,7 @@ keygrabber_key_down_cb(void *data, Evas *e EINA_UNUSED,
if (!strcmp(ev->key, "F5"))
{
enventor_object_ctxpopup_dismiss(ad->enventor);
-tools_lines_update(ad->enventor, EINA_TRUE);
+tools_lines_update(EINA_TRUE);
return;
}
//Tools
@@ -786,7 +786,7 @@ keygrabber_key_down_cb(void *data, Evas *e EINA_UNUSED,
if (!strcmp(ev->key, "F11"))
{
enventor_object_ctxpopup_dismiss(ad->enventor);
-tools_status_update(NULL, EINA_TRUE);
+tools_status_update(EINA_TRUE);
return;
}
//Setting
@@ -804,7 +804,7 @@ statusbar_set()
{
Evas_Object *obj = stats_init(base_layout_get());
elm_object_part_content_set(base_layout_get(), "elm.swallow.statusbar",
obj);
- tools_status_update(NULL, EINA_FALSE);
+ tools_status_update(EINA_FALSE);
stats_view_scale_update(config_view_scale_get());
}
diff --git a/src/bin/search.c b/src/bin/search.c
index 510d2cb..b888b79 100644
--- a/src/bin/search.c
+++ b/src/bin/search.c
@@ -413,7 +413,7 @@ search_open(Evas_Object *enventor)
btn_replace_all);
evas_object_show(win);
- tools_search_update(enventor, EINA_FALSE);
+ tools_search_update();
//Keygrabber
Evas_Object *keygrabber =
@@ -461,5 +461,5 @@ search_close(void)
free(sd);
g_sd = NULL;
- tools_search_update(enventor, EINA_FALSE);
+ tools_search_update();
}
diff --git a/src/bin/tools.c b/src/bin/tools.c
index 379643b..00463fa 100644
--- a/src/bin/tools.c
+++ b/src/bin/tools.c
@@ -21,13 +21,12 @@ typedef struct tools_s
static tools_data *g_td = NULL;
static void
-menu_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
+menu_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
+void *event_info EINA_UNUSED)
{
- Evas_Object *enventor = data;
-
[EGIT] [tools/enventor] master 01/01: base_gui: remove redundant code.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=d4115210daced61d0c1ba38d888a604ffa2b9d05
commit d4115210daced61d0c1ba38d888a604ffa2b9d05
Author: Hermet Park <her...@hermet.pe.kr>
Date: Fri Jan 22 18:58:34 2016 +0900
base_gui: remove redundant code.
---
src/bin/base_gui.c | 13 +++--
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/src/bin/base_gui.c b/src/bin/base_gui.c
index 6a1722b..ef49d1d 100644
--- a/src/bin/base_gui.c
+++ b/src/bin/base_gui.c
@@ -21,14 +21,7 @@ win_delete_request_cb(void *data EINA_UNUSED, Evas_Object
*obj EINA_UNUSED,
{
menu_exit();
}
-/*
-static void
-win_focused_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
- void *event_info EINA_UNUSED)
-{
- goto_close();
-}
-*/
+
static void
win_resize_cb(void *data EINA_UNUSED, Evas *o EINA_UNUSED, Evas_Object *obj,
void *event_info EINA_UNUSED)
@@ -233,11 +226,11 @@ base_gui_init(void)
NULL);
evas_object_smart_callback_add(win, "delete,request", win_delete_request_cb,
NULL);
-/* evas_object_smart_callback_add(win, "focused", win_focused_cb, NULL);*/
//Window icon
Evas_Object *icon = evas_object_image_add(evas_object_evas_get(win));
- snprintf(buf, sizeof(buf), "%s/images/ENVENTOR_EMBEDDED_LOGO.png",
elm_app_data_dir_get());
+ snprintf(buf, sizeof(buf), "%s/images/ENVENTOR_EMBEDDED_LOGO.png",
+elm_app_data_dir_get());
evas_object_image_file_set(icon, buf, NULL);
elm_win_icon_object_set(win, icon);
--
[EGIT] [tools/enventor] master 01/01: update gitignore.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=c2bf98db8e1902212f05ae5f9d9304f04a57e6cc commit c2bf98db8e1902212f05ae5f9d9304f04a57e6cc Author: Hermet Park <her...@hermet.pe.kr> Date: Fri Jan 22 18:59:41 2016 +0900 update gitignore. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 90d298b..6a2dc4d 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ *.sed *.sin *.gmo +tags Enventor.h --
[EGIT] [tools/enventor] master 01/01: main: update live view scale value after setting is done.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=cc2e04fe999366875ab5296caae7c92412c13820 commit cc2e04fe999366875ab5296caae7c92412c13820 Author: Hermet Park <her...@hermet.pe.kr> Date: Fri Jan 22 19:07:59 2016 +0900 main: update live view scale value after setting is done. This is a missing code from newly introduced view scale slider 350ee8c413d8e1204b44276bc717b2e8caa40f14 --- src/bin/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/main.c b/src/bin/main.c index eed2b71..60fc19a 100644 --- a/src/bin/main.c +++ b/src/bin/main.c @@ -142,7 +142,7 @@ config_update_cb(void *data) h = 0; } enventor_object_live_view_size_set(enventor, w, h); - + stats_view_scale_update(config_view_scale_get()); base_tools_toggle(EINA_FALSE); base_console_auto_hide(); } --
[EGIT] [tools/enventor] master 01/01: code refactoring.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=5c23a5b66137149a2622c9f18d15ca0ee61a2837
commit 5c23a5b66137149a2622c9f18d15ca0ee61a2837
Author: Hermet Park <her...@hermet.pe.kr>
Date: Fri Jan 22 19:59:37 2016 +0900
code refactoring.
tools_close() returns a result in order that the caller decides a next
behavior.
---
src/bin/live_edit.c | 6 --
src/bin/main.c | 3 +--
src/bin/tools.c | 2 +-
src/include/live_edit.h | 2 +-
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/bin/live_edit.c b/src/bin/live_edit.c
index c3214b5..a219d10 100644
--- a/src/bin/live_edit.c
+++ b/src/bin/live_edit.c
@@ -1006,11 +1006,11 @@ live_edit_get(void)
return ld->on;
}
-void
+Eina_Bool
live_edit_cancel(void)
{
live_data *ld = g_ld;
- if (!ld->on) return;
+ if (!ld->on) return EINA_FALSE;
if (ld->ctxpopup) elm_ctxpopup_dismiss(ld->ctxpopup);
@@ -1057,6 +1057,8 @@ live_edit_cancel(void)
ld->on = EINA_FALSE;
tools_live_update(EINA_FALSE);
+
+ return EINA_TRUE;
}
void
diff --git a/src/bin/main.c b/src/bin/main.c
index 953c720..e342f39 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -699,9 +699,8 @@ keygrabber_key_down_cb(void *data, Evas *e EINA_UNUSED,
{
if (stats_ctxpopup_dismiss()) return;
-if (live_edit_get())
+if (live_edit_cancel())
{
- live_edit_cancel();
enventor_object_focus_set(ad->enventor, EINA_TRUE);
return;
}
diff --git a/src/bin/tools.c b/src/bin/tools.c
index 968001a..1708df8 100644
--- a/src/bin/tools.c
+++ b/src/bin/tools.c
@@ -24,7 +24,7 @@ static void
menu_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
- if (live_edit_get()) live_edit_cancel();
+ live_edit_cancel();
if (search_is_opened()) search_close();
if (goto_is_opened()) tools_goto_update();
diff --git a/src/include/live_edit.h b/src/include/live_edit.h
index 6696d2c..7cf6711 100644
--- a/src/include/live_edit.h
+++ b/src/include/live_edit.h
@@ -6,6 +6,6 @@
void live_edit_init(Evas_Object *trigger);
void live_edit_term(void);
void live_edit_toggle(void);
-void live_edit_cancel(void);
+Eina_Bool live_edit_cancel(void);
Eina_Bool live_edit_get(void);
void live_edit_update(void);
--
[EGIT] [tools/enventor] master 01/01: set slider step size for view scale in setting.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=4b9dd42839892fdfaffd7db8e4f501fa5e6afc3c
commit 4b9dd42839892fdfaffd7db8e4f501fa5e6afc3c
Author: Hermet Park <her...@hermet.pe.kr>
Date: Fri Jan 22 19:06:26 2016 +0900
set slider step size for view scale in setting.
Now slider cursor moves by 0.01.
---
src/bin/setting.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/bin/setting.c b/src/bin/setting.c
index 857c38f..741c376 100644
--- a/src/bin/setting.c
+++ b/src/bin/setting.c
@@ -292,6 +292,8 @@ general_layout_create(setting_data *sd, Evas_Object *parent)
elm_slider_span_size_set(slider_view, 190);
elm_slider_indicator_show_set(slider_view, EINA_FALSE);
elm_slider_unit_format_set(slider_view, "%1.2fx");
+ double step = 0.01 / (double) (MAX_VIEW_SCALE - MIN_VIEW_SCALE);
+ elm_slider_step_set(slider_view, step);
elm_slider_min_max_set(slider_view, MIN_VIEW_SCALE, MAX_VIEW_SCALE);
elm_slider_value_set(slider_view, (double) config_view_scale_get());
elm_object_text_set(slider_view, _("Live View Scale"));
--
[EGIT] [tools/enventor] master 01/01: don't block mouse events.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=df29f91476d8c1f112857bf526cca61c87d37118
commit df29f91476d8c1f112857bf526cca61c87d37118
Author: Hermet Park <her...@hermet.pe.kr>
Date: Fri Jan 22 19:33:34 2016 +0900
don't block mouse events.
This part blocks the status's button click.
---
data/themes/default/layout_common.edc | 1 +
1 file changed, 1 insertion(+)
diff --git a/data/themes/default/layout_common.edc
b/data/themes/default/layout_common.edc
index 4c1142a..c30f15a 100644
--- a/data/themes/default/layout_common.edc
+++ b/data/themes/default/layout_common.edc
@@ -2385,6 +2385,7 @@ group { name: "statusbar_layout";
type: TEXT;
scale: 1;
effect: GLOW;
+ nomouse;
description { state: "default" 0.0;
align: 0 0.5;
rel1.offset: 0 -1;
--
[EGIT] [tools/enventor] master 01/01: code refactoring.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=b50dbe2571869d36003a9eac581febf358d9b992
commit b50dbe2571869d36003a9eac581febf358d9b992
Author: Hermet Park <her...@hermet.pe.kr>
Date: Fri Jan 22 19:41:51 2016 +0900
code refactoring.
remove enventor reference passing. it's avaiable to be globally accessed.
---
src/bin/goto.c | 13 +
src/bin/main.c | 4 ++--
src/bin/search.c | 48 ++--
src/bin/tools.c | 4 ++--
src/include/goto.h | 2 +-
src/include/search.h | 2 +-
6 files changed, 37 insertions(+), 36 deletions(-)
diff --git a/src/bin/goto.c b/src/bin/goto.c
index d2be96e..a10cbe3 100644
--- a/src/bin/goto.c
+++ b/src/bin/goto.c
@@ -12,7 +12,6 @@ typedef struct goto_s
Evas_Object *layout;
Evas_Object *entry;
Evas_Object *btn;
- Evas_Object *enventor;
Ecore_Timer *timer;
} goto_data;
@@ -61,7 +60,7 @@ goto_line(goto_data *gd)
{
const char *txt = elm_entry_entry_get(gd->entry);
int line = atoi(txt);
- enventor_object_line_goto(gd->enventor, line);
+ enventor_object_line_goto(base_enventor_get(), line);
goto_close();
}
@@ -83,7 +82,8 @@ entry_changed_cb(void *data, Evas_Object *obj, void*
event_info EINA_UNUSED)
int line = atoi(txt);
- if ((line < 1) || (line > enventor_object_max_line_get(gd->enventor)))
+ if ((line < 1) ||
+ (line > enventor_object_max_line_get(base_enventor_get(
{
elm_object_part_text_set(gd->layout, "elm.text.msg",
_("Invalid line number"));
@@ -113,7 +113,7 @@ keygrabber_key_down_cb(void *data EINA_UNUSED, Evas *e
EINA_UNUSED,
}
void
-goto_open(Evas_Object *enventor)
+goto_open(void)
{
static Elm_Entry_Filter_Accept_Set digits_filter_data;
goto_data *gd = g_gd;
@@ -162,7 +162,7 @@ goto_open(Evas_Object *enventor)
char buf[256];
snprintf(buf, sizeof(buf), _("Enter line number [1..%d]:"),
-enventor_object_max_line_get(enventor));
+enventor_object_max_line_get(base_enventor_get()));
elm_object_part_text_set(layout, "elm.text.goto", buf);
//Entry (line)
@@ -205,7 +205,6 @@ goto_open(Evas_Object *enventor)
gd->layout = layout;
gd->entry = entry;
gd->btn = btn;
- gd->enventor = enventor;
}
Eina_Bool
@@ -221,8 +220,6 @@ goto_close(void)
goto_data *gd = g_gd;
if (!gd) return;
- Evas_Object *enventor = gd->enventor;
-
//Save last state
evas_object_geometry_get(gd->win, NULL, NULL, _w, _h);
elm_win_screen_position_get(gd->win, _x, _y);
diff --git a/src/bin/main.c b/src/bin/main.c
index 415f2b7..ff4bbb2 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -631,14 +631,14 @@ ctrl_func(app_data *ad, Evas_Event_Key_Down *event)
if (!strcmp(event->key, "f") || !strcmp(event->key, "F"))
{
live_edit_cancel();
-search_open(ad->enventor);
+search_open();
return EINA_TRUE;
}
//Goto Line
if (!strcmp(event->key, "l") || !strcmp(event->key, "L"))
{
live_edit_cancel();
-goto_open(ad->enventor);
+goto_open();
return EINA_TRUE;
}
//Part Highlight
diff --git a/src/bin/search.c b/src/bin/search.c
index b888b79..9e570ca 100644
--- a/src/bin/search.c
+++ b/src/bin/search.c
@@ -10,7 +10,6 @@ typedef struct search_s
Evas_Object *layout;
Evas_Object *en_find;
Evas_Object *en_replace;
- Evas_Object *enventor;
int pos;
int len;
int syntax_color;
@@ -60,8 +59,10 @@ replace_all_proc(search_data *sd)
char buf[256];
int replace_cnt = 0;
+ Evas_Object *enventor = base_enventor_get();
- const char *text = (const char *) enventor_object_text_get(sd->enventor);
+ const char *text =
+ (const char *) enventor_object_text_get(enventor);
char *utf8 = elm_entry_markup_to_utf8(text);
char *s = utf8;
@@ -71,9 +72,9 @@ replace_all_proc(search_data *sd)
while ((s = strstr(s, find)))
{
pos = s + (delta * replace_cnt) - utf8;
-enventor_object_select_region_set(sd->enventor, pos, (pos + find_len));
-enventor_object_text_insert(sd->enventor, replace);
-enventor_object_select_none(sd->enventor);
+enventor_object_select_region_set(enventor, pos, (pos + find_len));
+enventor_object_text_insert(enventor, replace);
+enventor_object_select_none(enventor);
replace_cnt++;
s++;
}
@@ -90,7 +91,7 @@ static Eina_Bool
selection_region_anim_cb(void *data)
{
search_data *sd = data;
- enventor_object_select_region_set(sd->enventor, sd->pos,
+ enventor_object_select_region_set(base_enventor_get(), sd->pos,
(sd->pos + sd->l
[EGIT] [tools/enventor] master 01/01: code refactoring.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=ede00648d93c9ff1250052f22f2d5bcc7de0b65c
commit ede00648d93c9ff1250052f22f2d5bcc7de0b65c
Author: Hermet Park <her...@hermet.pe.kr>
Date: Fri Jan 22 19:53:32 2016 +0900
code refactoring.
remove enventor reference passing. it's avaiable to be globally accessed.
---
src/bin/file_mgr.c | 20 +---
src/bin/live_edit.c | 14 ++
src/bin/main.c | 6 +++---
src/bin/menu.c | 49 -
src/bin/newfile.c | 7 ---
src/include/file_mgr.h | 2 +-
src/include/live_edit.h | 2 +-
src/include/menu.h | 2 +-
src/include/newfile.h | 2 +-
9 files changed, 50 insertions(+), 54 deletions(-)
diff --git a/src/bin/file_mgr.c b/src/bin/file_mgr.c
index 530b037..e6bd9b0 100644
--- a/src/bin/file_mgr.c
+++ b/src/bin/file_mgr.c
@@ -6,7 +6,6 @@
#include "common.h"
typedef struct file_mgr_s {
- Evas_Object *enventor;
Evas_Object *warning_layout;
Eina_Bool edc_modified : 1;
} file_mgr_data;
@@ -20,7 +19,7 @@ warning_dismiss_done(void *data, Evas_Object *obj EINA_UNUSED,
{
file_mgr_data *fmd = data;
evas_object_del(fmd->warning_layout);
- enventor_object_focus_set(fmd->enventor, EINA_TRUE);
+ enventor_object_focus_set(base_enventor_get(), EINA_TRUE);
fmd->warning_layout = NULL;
}
@@ -35,7 +34,7 @@ warning_ignore_btn_cb(void *data, Evas_Object *obj
EINA_UNUSED,
void *event_info EINA_UNUSED)
{
file_mgr_data *fmd = data;
- enventor_object_modified_set(fmd->enventor, EINA_TRUE);
+ enventor_object_modified_set(base_enventor_get(), EINA_TRUE);
warning_close(fmd);
}
@@ -44,7 +43,7 @@ warning_save_as_btn_cb(void *data, Evas_Object *obj
EINA_UNUSED,
void *event_info EINA_UNUSED)
{
file_mgr_data *fmd = data;
- enventor_object_modified_set(fmd->enventor, EINA_TRUE);
+ enventor_object_modified_set(base_enventor_get(), EINA_TRUE);
menu_edc_save();
warning_close(fmd);
}
@@ -54,7 +53,7 @@ warning_replace_btn_cb(void *data, Evas_Object *obj
EINA_UNUSED,
void *event_info EINA_UNUSED)
{
file_mgr_data *fmd = data;
- enventor_object_file_set(fmd->enventor, config_input_path_get());
+ enventor_object_file_set(base_enventor_get(), config_input_path_get());
warning_close(fmd);
}
@@ -148,8 +147,9 @@ file_mgr_edc_save(void)
char buf[PATH_MAX];
file_mgr_data *fmd = g_fmd;
- Eina_Bool save_success = enventor_object_save(fmd->enventor,
config_input_path_get());
- enventor_object_modified_set(fmd->enventor, !save_success);
+ Eina_Bool save_success = enventor_object_save(base_enventor_get(),
+ config_input_path_get());
+ enventor_object_modified_set(base_enventor_get(), !save_success);
if (!config_stats_bar_get()) return;
@@ -185,7 +185,7 @@ file_mgr_warning_close(void)
}
void
-file_mgr_init(Evas_Object *enventor)
+file_mgr_init(void)
{
file_mgr_data *fmd = calloc(1, sizeof(file_mgr_data));
if (!fmd)
@@ -195,9 +195,7 @@ file_mgr_init(Evas_Object *enventor)
}
g_fmd = fmd;
- fmd->enventor = enventor;
-
- evas_object_smart_callback_add(enventor, "edc,modified",
+ evas_object_smart_callback_add(base_enventor_get(), "edc,modified",
enventor_edc_modified_cb, fmd);
}
diff --git a/src/bin/live_edit.c b/src/bin/live_edit.c
index c44c939..c3214b5 100644
--- a/src/bin/live_edit.c
+++ b/src/bin/live_edit.c
@@ -49,7 +49,6 @@ typedef struct live_editor_s
Evas_Object *ctxpopup;
Evas_Object *layout;
Evas_Object *live_view;
- Evas_Object *enventor;
Evas_Object *trigger;
Evas_Object *ctrl_pt[Ctrl_Pt_Cnt];
Evas_Object *align_line[Align_Line_Cnt];
@@ -193,7 +192,7 @@ static void
live_edit_insert(live_data *ld)
{
int type = CTXPOPUP_ITEMS[ld->part_info.type].type;
- enventor_object_template_part_insert(ld->enventor,
+ enventor_object_template_part_insert(base_enventor_get(),
type,
ENVENTOR_TEMPLATE_INSERT_LIVE_EDIT,
ld->part_info.rel1_x,
@@ -201,7 +200,7 @@ live_edit_insert(live_data *ld)
ld->part_info.rel2_x,
ld->part_info.rel2_y,
NULL, 0);
- enventor_object_save(ld->enventor, config_input_path_get());
+ enventor_object_save(base_enventor_get(), config_input_path_get());
}
static Eina_Bool
@@ -988,8 +987,8 @@ live_edit_toggle(void)
if (on)
{
-enventor_object_disabled_set(ld->enventor, EINA_TRUE);
-ld->live_view = enventor_object_live_view_
[EGIT] [tools/enventor] master 01/01: add live view scale slider onto status bar.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=350ee8c413d8e1204b44276bc717b2e8caa40f14
commit 350ee8c413d8e1204b44276bc717b2e8caa40f14
Author: Hermet Park <her...@hermet.pe.kr>
Date: Fri Jan 22 17:34:32 2016 +0900
add live view scale slider onto status bar.
@feature
---
data/themes/default/images.edc | 2 +
data/themes/default/images/Makefile.am | 3 +-
data/themes/default/images/expand.png | Bin 0 -> 202 bytes
data/themes/default/layout_common.edc | 90 +++---
po/en.po | 5 --
po/ru.po | 5 --
src/bin/base_gui.c | 12
src/bin/live_edit.c| 1 -
src/bin/main.c | 9 ++-
src/bin/menu.c | 2 +
src/bin/statusbar.c| 115 +
src/include/base_gui.h | 2 +-
src/include/common.h | 2 +
src/include/config_data.h | 2 +-
src/include/statusbar.h| 2 +
15 files changed, 226 insertions(+), 26 deletions(-)
diff --git a/data/themes/default/images.edc b/data/themes/default/images.edc
index ab0b573..f48381f 100644
--- a/data/themes/default/images.edc
+++ b/data/themes/default/images.edc
@@ -19,6 +19,7 @@ images {
image: "live_text.png" COMP;
image: "live_textblock.png" COMP;
image: "live_edit.png" COMP;
+ image: "expand.png" COMP;
}
#define ICON_GROUP(_group_name, _image_path) \
@@ -45,6 +46,7 @@ ICON_GROUP("live_edit", "live_edit.png")
ICON_GROUP("save", "save.png")
ICON_GROUP("undo", "undo.png")
ICON_GROUP("redo", "redo.png")
+ICON_GROUP("expand", "expand.png")
ICON_GROUP("IMAGE", "live_image.png")
ICON_GROUP("RECT", "live_rectangle.png")
ICON_GROUP("SPACER", "live_spacer.png")
diff --git a/data/themes/default/images/Makefile.am
b/data/themes/default/images/Makefile.am
index 177e9ef..c5f9571 100644
--- a/data/themes/default/images/Makefile.am
+++ b/data/themes/default/images/Makefile.am
@@ -67,4 +67,5 @@ EXTRA_DIST = \
redo.png \
undo.png \
white_bar_vert_glow.png \
- horizontal_separated_bar_small_glow.png
+ horizontal_separated_bar_small_glow.png \
+ expand.png
diff --git a/data/themes/default/images/expand.png
b/data/themes/default/images/expand.png
new file mode 100644
index 000..6d9996c
Binary files /dev/null and b/data/themes/default/images/expand.png differ
diff --git a/data/themes/default/layout_common.edc
b/data/themes/default/layout_common.edc
index 562340a..4c1142a 100644
--- a/data/themes/default/layout_common.edc
+++ b/data/themes/default/layout_common.edc
@@ -1793,14 +1793,60 @@ group { name: "statusbar_layout";
color: 0 0 0 0;
}
}
- part { name: "size_spacer";
+ part { name: "scale_spacer";
type: SPACER;
scale: 1;
description { state: "default" 0.0;
rel1.relative: 0 0;
rel2.relative: 0 1;
-min: 250 0;
+min: 120 0;
+fixed: 1 0;
+ }
+ }
+ swallow { "scale_btn";
+ clip_to: "base_clip";
+ scale: 1;
+ description { state: "default" 0.0;
+rel1.relative: 0.0 0.0;
+rel2.relative: 0.0 1.0;
+align: 0.0 0.5;
+min: 18 18;
+fixed: 1 0;
+ }
+ }
+ part { name: "elm.text.scale";
+ type: TEXT;
+ clip_to: "base_clip";
+ scale: 1;
+ effect: GLOW;
+ description { state: "default" 0.0;
+rel1.to_x: "scale_btn";
+rel2.to_x: "scale_btn";
+rel1.relative: 1.0 0.0;
+rel2.relative: 1.0 1.0;
+align: 0 0.5;
+fixed: 1 0;
+color: COL_HI;
+text {
+ size: 11;
+ align: 0 0.5;
+ min: 1 0;
+ ellipsis: -1;
+ text:"1.00x";
+}
+ }
+ }
+ part { name: "size_spacer";
+ type: SPACER;
+ scale: 1;
+ description { state: "default" 0.0;
+rel1.relative: 1 0;
+rel2.relative: 1 1;
+rel1.to: "scale_spacer";
+rel2.to: "scale_spacer";
+min: 120 0;
fixed: 1 0;
+align: 0 0.5;
}
}
part { name: "elm.text.size[";
@@ -1809,16 +1855,16 @@ group { name: "statusbar_layout";
scale: 1;
effect: SHADOW BOTTOM;
[EGIT] [tools/enventor] master 01/01: code refactoring.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=4d3c94cf64998f0c59c2c8583daafa0aab55121b
commit 4d3c94cf64998f0c59c2c8583daafa0aab55121b
Author: Hermet Park <her...@hermet.pe.kr>
Date: Fri Jan 22 20:22:46 2016 +0900
code refactoring.
goto_close(), search_close() returns a result in order that the caller
decides a next behavior.
---
src/bin/goto.c | 6 --
src/bin/search.c | 6 --
src/bin/tools.c | 12 ++--
src/include/goto.h | 2 +-
src/include/search.h | 2 +-
5 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/src/bin/goto.c b/src/bin/goto.c
index a10cbe3..fb1245e 100644
--- a/src/bin/goto.c
+++ b/src/bin/goto.c
@@ -214,11 +214,11 @@ goto_is_opened(void)
return (gd ? EINA_TRUE : EINA_FALSE);
}
-void
+Eina_Bool
goto_close(void)
{
goto_data *gd = g_gd;
- if (!gd) return;
+ if (!gd) return EINA_FALSE;
//Save last state
evas_object_geometry_get(gd->win, NULL, NULL, _w, _h);
@@ -230,4 +230,6 @@ goto_close(void)
g_gd = NULL;
tools_goto_update();
+
+ return EINA_TRUE;
}
diff --git a/src/bin/search.c b/src/bin/search.c
index 9e570ca..1d6ae13 100644
--- a/src/bin/search.c
+++ b/src/bin/search.c
@@ -443,11 +443,11 @@ search_is_opened(void)
return (sd ? EINA_TRUE : EINA_FALSE);
}
-void
+Eina_Bool
search_close(void)
{
search_data *sd = g_sd;
- if (!sd) return;
+ if (!sd) return EINA_FALSE;
Evas_Object *enventor = base_enventor_get();
@@ -466,4 +466,6 @@ search_close(void)
g_sd = NULL;
tools_search_update();
+
+ return EINA_TRUE;
}
diff --git a/src/bin/tools.c b/src/bin/tools.c
index 1708df8..5fa5657 100644
--- a/src/bin/tools.c
+++ b/src/bin/tools.c
@@ -25,8 +25,8 @@ menu_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
live_edit_cancel();
- if (search_is_opened()) search_close();
- if (goto_is_opened()) tools_goto_update();
+ search_close();
+ tools_goto_update();
menu_toggle();
}
@@ -63,7 +63,7 @@ find_cb(void *data, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
live_edit_cancel();
- if (search_is_opened()) search_close();
+ if (search_close()) return;
else search_open();
}
@@ -72,7 +72,7 @@ goto_cb(void *data, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
live_edit_cancel();
- if (goto_is_opened()) goto_close();
+ if (goto_close()) return;
else goto_open();
}
@@ -90,8 +90,8 @@ static void
live_edit_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
- if (search_is_opened()) search_close();
- if (goto_is_opened()) goto_close();
+ search_close();
+ goto_close();
live_edit_toggle();
}
diff --git a/src/include/goto.h b/src/include/goto.h
index c731e5c..18196dc 100644
--- a/src/include/goto.h
+++ b/src/include/goto.h
@@ -1,5 +1,5 @@
#define DEFAULT_GOTO_WIN_W 330
#define DEFAULT_GOTO_WIN_H 77
void goto_open(void);
-void goto_close(void);
+Eina_Bool goto_close(void);
Eina_Bool goto_is_opened(void);
diff --git a/src/include/search.h b/src/include/search.h
index 67e3694..f316cda 100644
--- a/src/include/search.h
+++ b/src/include/search.h
@@ -1,5 +1,5 @@
#define DEFAULT_SEARCH_WIN_W 330
#define DEFAULT_SEARCH_WIN_H 90
void search_open(void);
-void search_close(void);
+Eina_Bool search_close(void);
Eina_Bool search_is_opened(void);
--
[EGIT] [tools/enventor] master 01/01: improve menu ui.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=6f4a9b2683b14d7fe4fab6706897e6a0fec39820
commit 6f4a9b2683b14d7fe4fab6706897e6a0fec39820
Author: Hermet Park <her...@hermet.pe.kr>
Date: Fri Jan 22 20:47:04 2016 +0900
improve menu ui.
removed the prev button.
instead, user can toggle menu screen off, by clicking the dim area.
---
data/themes/default/layout_common.edc | 37 +--
po/en.po | 4
po/ru.po | 4
src/bin/menu.c| 14 -
4 files changed, 18 insertions(+), 41 deletions(-)
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,25 +733,25 @@ group { name: "warning_layout";
group { name: "menu_layout";
parts {
- part { name: "bg";
+ part { name: "clipper";
type: RECT;
description { state: "default" 0.0;
-color: 0 0 0 0;
+color: 255 255 255 0;
}
description { state: "show" 0.0;
-color: 0 0 0 175;
- }
- description { state: "anim" 0.0;
-color: 0 0 0 200;
+color: 255 255 255 255;
}
}
- part { name: "clipper";
+ part { name: "bg";
type: RECT;
description { state: "default" 0.0;
-color: 255 255 255 0;
+color: 0 0 0 0;
}
description { state: "show" 0.0;
-color: 255 255 255 255;
+color: 0 0 0 175;
+ }
+ description { state: "anim" 0.0;
+color: 0 0 0 200;
}
}
part { name: "base_frame";
@@ -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
[EGIT] [tools/enventor] master 01/01: toggle on the fixed view size forcely, when user starts to drag the slider to change the view scale.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=3fb96ced83b109431fea6dfcd613f08d3154fb1c
commit 3fb96ced83b109431fea6dfcd613f08d3154fb1c
Author: Hermet Park <her...@hermet.pe.kr>
Date: Fri Jan 22 21:00:48 2016 +0900
toggle on the fixed view size forcely,
when user starts to drag the slider to change the view scale.
Enventor assumes user wants a fixed view size
when they try to scale up/down the live view.
---
src/bin/setting.c | 3 ++-
src/bin/statusbar.c | 9 +
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/src/bin/setting.c b/src/bin/setting.c
index 741c376..1bb9dae 100644
--- a/src/bin/setting.c
+++ b/src/bin/setting.c
@@ -323,7 +323,8 @@ general_layout_create(setting_data *sd, Evas_Object *parent)
elm_box_pack_end(box2, layout_padding3);
- Evas_Object *label_view_size = label_create(layout_padding3, _("Fixed Live
View Size"));
+ Evas_Object *label_view_size = label_create(layout_padding3,
+ _("Fixed Live View Size"));
elm_object_part_content_set(layout_padding3, "elm.swallow.content",
label_view_size);
diff --git a/src/bin/statusbar.c b/src/bin/statusbar.c
index 422534c..dd44626 100644
--- a/src/bin/statusbar.c
+++ b/src/bin/statusbar.c
@@ -27,6 +27,15 @@ slider_changed_cb(void *data, Evas_Object *obj,
scale = config_view_scale_get();
enventor_object_live_view_scale_set(base_enventor_get(), scale);
stats_view_scale_update(scale);
+
+ //Toggle on the configurable view size forcely.
+ if (!config_view_size_configurable_get())
+ {
+config_view_size_configurable_set(EINA_TRUE);
+Evas_Coord w, h;
+config_view_size_get(, );
+enventor_object_live_view_size_set(base_enventor_get(), w, h);
+ }
}
static void
--
[EGIT] [tools/enventor] master 01/01: removed unused textblock tags.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=f9edc4363ddc59650186ea7403eb3af517935ee8 commit f9edc4363ddc59650186ea7403eb3af517935ee8 Author: Hermet Park <her...@hermet.pe.kr> Date: Tue Jan 26 00:51:54 2016 +0900 removed unused textblock tags. --- data/themes/default/theme_ext.edc | 70 +++ 1 file changed, 4 insertions(+), 66 deletions(-) diff --git a/data/themes/default/theme_ext.edc b/data/themes/default/theme_ext.edc index 5173170..f8593f5 100644 --- a/data/themes/default/theme_ext.edc +++ b/data/themes/default/theme_ext.edc @@ -11,73 +11,11 @@ #define PANEMIN2 16 #define PANEWID 32 -#define ENABLED_TEXTBLOCK_TAGS \ - tag: "em" "+ font_style=Oblique"; \ - tag: "hilight" "+ font_weight=Bold style=glow glow_color=#3399ff80";\ - tag: "error" "+ underline=single underline_color=#ff underline2_color=#ff"; \ - tag: "link" "+ color=#3399ff underline=on underline_color=#3399ff"; \ - tag: "preedit" "+ underline=on underline_color=#3399ff";\ - tag: "preedit_sel" "+ backing=on backing_color=#00 color=#ff"; \ - tag: "title" "+ font_size=26"; \ - tag: "subtitle" "+ font_size=18"; \ - tag: "bigger" "+ font_size=12"; \ - tag: "big" "+ font_size=11";\ - tag: "small" "+ font_size=8"; \ - tag: "smaller" "+ font_size=7"; \ - tag: "name" "+ color=#88 font_weight=Bold"; \ - tag: "val" "+ color=#ff"; \ - tag: "info" "+ color=#3399ff style=glow glow_color=#3399ff30"; \ - tag: "success" "+ color=#00ff00 style=glow glow_color=#00ff0030"; \ - tag: "warning" "+ color=#ff7c00 style=glow glow_color=#ff7c0030"; \ - tag: "failure" "+ color=#ff style=glow glow_color=#ff30"; \ - tag: "code" "+ font=Mono style=plain color=#ff";\ - tag: "comment" "+ color=#00B000"; \ - tag: "string" "+ color=#ff3a35";\ - tag: "number" "+ color=#D4D42A font_weight=Bold"; \ - tag: "brace" "+ color=#656565"; \ - tag: "type" "+ color=#3399ff"; \ - tag: "class" "+ color=#72AAD4 font_weight=Bold";\ - tag: "function" "+ color=#72AAD4 font_weight=Bold"; \ - tag: "param" "+ color=#ff"; \ - tag: "keyword" "+ color=#ff9900 font_weight=Bold"; \ - tag: "preprocessor" "+ color=#3399ff font_weight=Bold"; \ - tag: "line_added" "+ color=#00B000";\ - tag: "line_removed" "+ color=#ff3a35"; \ - tag: "line_changed" "+ color=#ff9900"; +#define ENABLED_TEXTBLOCK_TAGS\ + tag: "hilight" "+ style=glow glow_color=#3399ff80";\ -#define DISABLED_TEXTBLOCK_TAGS\ - tag: "em" "+ font_style=Oblique"; \ - tag: "hilight" "+ font_weight=Bold style=glow glow_color=#3399ff20";\ - tag: "error" "+ underline=double underline_color=#ff underline2_color=#ff"; \ - tag: "link" "+ color=#101820 shadow_color=#66aaff28 underline=on underline_color=#101820"; \ - tag: "preedit" "+ underline=on underline_color=#3399ff88"; \ - tag: "preedit_sel" "+ backing=on backing_color=#00 color=#88"; \ - tag: "title" "+ font_size=26"; \ - tag: "subtitle" "+ font_size=18"; \ - tag: "bigger" "+ font_size=12&quo
[EGIT] [tools/enventor] master 01/01: about - use entry_file_set() instead of direct file accessing.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=c79a0aa4e5f2be3e1c092e88471ac289726e2cc8 commit c79a0aa4e5f2be3e1c092e88471ac289726e2cc8 Author: Hermet Park <her...@hermet.pe.kr> Date: Mon Jan 25 15:56:20 2016 +0900 about - use entry_file_set() instead of direct file accessing. This changes enventor makes much simpler to maintaining code. Additionally, the about file should have been markup format. Previously, it used to use markup partially so its format was ambigious. --- data/about/ABOUT | 178 +++ src/bin/menu.c | 38 +--- 2 files changed, 91 insertions(+), 125 deletions(-) diff --git a/data/about/ABOUT b/data/about/ABOUT index 3475339..10e0d79 100644 --- a/data/about/ABOUT +++ b/data/about/ABOUT @@ -1,89 +1,89 @@ -
[EGIT] [apps/epour] master 01/01: improve korean translate
hermet pushed a commit to branch master. http://git.enlightenment.org/apps/epour.git/commit/?id=8bf8f56dcbe9bb506935c1bb2c58000d193f5042 commit 8bf8f56dcbe9bb506935c1bb2c58000d193f5042 Author: Hermet Park <her...@hermet.pe.kr> Date: Wed Jan 20 22:39:36 2016 +0900 improve korean translate --- po/epour.pot | 201 ++- po/ko.po | 55 2 files changed, 128 insertions(+), 128 deletions(-) diff --git a/po/epour.pot b/po/epour.pot index ade5380..ac0dff1 100644 --- a/po/epour.pot +++ b/po/epour.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-22 09:05+0300\n" +"POT-Creation-Date: 2016-01-20 22:04+0900\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <l...@li.org>\n" @@ -17,280 +17,281 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: ../epour/gui/Widgets.py:106 -msgid "Close" -msgstr "" - -#: ../epour/gui/Widgets.py:119 -msgid "OK" -msgstr "" - -#: ../epour/gui/Widgets.py:128 -msgid "Confirm exit" -msgstr "" - -#: ../epour/gui/Widgets.py:129 -msgid "Are you sure you wish to exit Epour?" -msgstr "" - -#: ../epour/gui/Widgets.py:131 -msgid "Yes" -msgstr "" - -#: ../epour/gui/Widgets.py:135 -msgid "No" -msgstr "" - -#: ../epour/gui/TorrentProps.py:87 +#: ../epour/gui/TorrentProps.py:90 msgid "Enable/disable file download" msgstr "" -#: ../epour/gui/TorrentProps.py:121 +#: ../epour/gui/TorrentProps.py:124 msgid "Invalid torrent handle." msgstr "" -#: ../epour/gui/TorrentProps.py:146 +#: ../epour/gui/TorrentProps.py:149 msgid "Torrent info" msgstr "" -#: ../epour/gui/TorrentProps.py:154 +#: ../epour/gui/TorrentProps.py:157 msgid "Torrent settings" msgstr "" -#: ../epour/gui/TorrentProps.py:162 +#: ../epour/gui/TorrentProps.py:165 msgid "Torrent status" msgstr "" -#: ../epour/gui/TorrentProps.py:171 +#: ../epour/gui/TorrentProps.py:174 msgid "Magnet URI" msgstr "" -#: ../epour/gui/TorrentProps.py:179 +#: ../epour/gui/TorrentProps.py:182 msgid "Copy" msgstr "" -#: ../epour/gui/TorrentProps.py:206 +#: ../epour/gui/TorrentProps.py:209 #, python-format msgid "Epour - Files for torrent: %s" msgstr "" -#: ../epour/gui/TorrentProps.py:248 +#: ../epour/gui/TorrentProps.py:251 msgid "Select all" msgstr "" -#: ../epour/gui/TorrentProps.py:252 +#: ../epour/gui/TorrentProps.py:255 msgid "Select none" msgstr "" -#: ../epour/gui/TorrentProps.py:391 +#: ../epour/gui/TorrentProps.py:394 msgid "Private" msgstr "" -#: ../epour/gui/TorrentProps.py:442 +#: ../epour/gui/TorrentProps.py:445 msgid "Storage path" msgstr "" -#: ../epour/gui/TorrentProps.py:448 +#: ../epour/gui/TorrentProps.py:451 msgid "Select" msgstr "" -#: ../epour/gui/TorrentProps.py:500 +#: ../epour/gui/TorrentProps.py:503 msgid "disabled" msgstr "" -#: ../epour/gui/TorrentProps.py:536 ../epour/gui/__init__.py:428 +#: ../epour/gui/TorrentProps.py:539 ../epour/gui/__init__.py:432 msgid "Queued" msgstr "" -#: ../epour/gui/TorrentProps.py:536 ../epour/gui/__init__.py:428 +#: ../epour/gui/TorrentProps.py:539 ../epour/gui/__init__.py:432 msgid "Checking" msgstr "" -#: ../epour/gui/TorrentProps.py:536 ../epour/gui/__init__.py:428 +#: ../epour/gui/TorrentProps.py:539 ../epour/gui/__init__.py:432 msgid "Downloading metadata" msgstr "" -#: ../epour/gui/TorrentProps.py:536 ../epour/gui/__init__.py:429 +#: ../epour/gui/TorrentProps.py:539 ../epour/gui/__init__.py:433 msgid "Downloading" msgstr "" -#: ../epour/gui/TorrentProps.py:537 ../epour/gui/__init__.py:429 +#: ../epour/gui/TorrentProps.py:540 ../epour/gui/__init__.py:433 msgid "Finished" msgstr "" -#: ../epour/gui/TorrentProps.py:537 ../epour/gui/__init__.py:429 +#: ../epour/gui/TorrentProps.py:540 ../epour/gui/__init__.py:433 msgid "Seeding" msgstr "" -#: ../epour/gui/TorrentProps.py:537 ../epour/gui/__init__.py:429 +#: ../epour/gui/TorrentProps.py:540 ../epour/gui/__init__.py:433 msgid "Allocating" msgstr "" -#: ../epour/gui/TorrentProps.py:537 ../epour/gui/__init__.py:430 +#: ../epour/gui/TorrentProps.py:540 ../epour/gui/__init__.py:434 msgid "Checking resume data" ms
[EGIT] [tools/enventor] master 01/01: text_setting: remove redundant code.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=d84e1b11b60fb55730a4e76a5521d5c0bdeeb45c
commit d84e1b11b60fb55730a4e76a5521d5c0bdeeb45c
Author: Hermet Park <her...@hermet.pe.kr>
Date: Tue Feb 16 21:46:51 2016 +0900
text_setting: remove redundant code.
That code is totally useless at the moment.
I belive color palette will be introduced in enventor soon.
---
src/bin/text_setting.c | 118 +
1 file changed, 2 insertions(+), 116 deletions(-)
diff --git a/src/bin/text_setting.c b/src/bin/text_setting.c
index e4fb384..886a37b 100644
--- a/src/bin/text_setting.c
+++ b/src/bin/text_setting.c
@@ -190,42 +190,6 @@ text_setting_syntax_color_update(Evas_Object *ctxpopup,
}
static void
-color_btn_up_cb(void *data, Evas_Object *obj EINA_UNUSED,
-void *event_info EINA_UNUSED)
-{
- Evas_Object *layout = data;
- Evas_Object *slider = elm_object_part_content_get(layout,
- "elm.swallow.slider");
- Evas_Object *entry = elm_object_part_content_get(layout,
-"elm.swallow.entry");
- double value = elm_slider_value_get(slider);
- char buf[128];
-
- value += 1;
-
- snprintf(buf, sizeof(buf), "%1.0f", value);
- elm_object_text_set(entry, buf);
-}
-
-static void
-color_btn_down_cb(void *data, Evas_Object *obj EINA_UNUSED,
- void *event_info EINA_UNUSED)
-{
- Evas_Object *layout = data;
- Evas_Object *slider = elm_object_part_content_get(layout,
- "elm.swallow.slider");
- Evas_Object *entry = elm_object_part_content_get(layout,
-"elm.swallow.entry");
- double value = elm_slider_value_get(slider);
- char buf[128];
-
- value -= 1;
-
- snprintf(buf, sizeof(buf), "%1.0f", value);
- elm_object_text_set(entry, buf);
-}
-
-static void
color_ctxpopup_dismiss_cb(void *data EINA_UNUSED, Evas_Object *obj,
void *event_info EINA_UNUSED)
{
@@ -252,16 +216,9 @@ color_ctxpopup_del_cb(void *data EINA_UNUSED, Evas *e
EINA_UNUSED,
}
static void
-color_slider_changed_cb(void *data, Evas_Object *obj,
+color_slider_changed_cb(void *data EINA_UNUSED, Evas_Object *obj,
void *event_info EINA_UNUSED)
{
- Evas_Object *entry = data;
- double val = elm_slider_value_get(obj);
- char buf[128];
-
- snprintf(buf, sizeof(buf), "%1.0f", val);
- elm_object_text_set(entry, buf);
-
Evas_Object *ctxpopup = evas_object_data_get(obj, "ctxpopup");
color_keyword *selected_color_keyword;
selected_color_keyword = evas_object_data_get(ctxpopup, "color_keyword");
@@ -270,30 +227,6 @@ color_slider_changed_cb(void *data, Evas_Object *obj,
syntax_template_apply();
}
-static void
-color_entry_changed_cb(void *data, Evas_Object *obj,
- void *event_info EINA_UNUSED)
-{
- Evas_Object *slider = data;
- double text_val, val, min_val, max_val;
- char buf[128];
-
- text_val = atof(elm_object_text_get(obj));
- elm_slider_min_max_get(slider, _val, _val);
-
- if (text_val < min_val) val = min_val;
- else if (text_val > max_val) val = max_val;
- else val = text_val;
-
- if (val != text_val)
- {
-snprintf(buf, sizeof(buf), "%1.0f", val);
-elm_object_text_set(obj, buf);
- }
- else
- elm_slider_value_set(slider, val);
-}
-
static Evas_Object *
color_slider_layout_create(Evas_Object *parent, Evas_Object *ctxpopup,
const char *type, double slider_val)
@@ -322,55 +255,8 @@ color_slider_layout_create(Evas_Object *parent,
Evas_Object *ctxpopup,
elm_object_part_text_set(layout, "elm.text.slider_min", slider_min);
elm_object_part_text_set(layout, "elm.text.slider_max", slider_max);
elm_object_part_content_set(layout, "elm.swallow.slider", slider);
-
- //Entry
- char buf[128];
- Evas_Object *entry = elm_entry_add(layout);
- elm_entry_context_menu_disabled_set(entry, EINA_TRUE);
- elm_entry_single_line_set(entry, EINA_TRUE);
- evas_object_size_hint_weight_set(entry, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- snprintf(buf, sizeof(buf), "%1.0f", slider_val);
- elm_object_text_set(entry, buf);
- elm_object_part_content_set(layout, "elm.swallow.entry", entry);
-
- Elm_Entry_Filter_Accept_Set digits_filter_data;
- Elm_Entry_Filter_Limit_Size limit_filter_data;
- digits_filter_data.accepted = "0123456789";
- digits_filter_data.rejected = NULL;
- limit_filter_data.max_char_count = 4;
- elm_entry_markup_filter_append(entry, elm_entry_filter_accept_set,
- _filter_data);
-
[EGIT] [tools/enventor] master 01/01: setting: fix broken view scale entries.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=d388f581e55aab7c385b401d6c384fbf4c63e681 commit d388f581e55aab7c385b401d6c384fbf4c63e681 Author: Hermet Park <her...@hermet.pe.kr> Date: Tue Feb 16 21:58:58 2016 +0900 setting: fix broken view scale entries. this seems caused by elementary change, 92d905ffa0e9c5b2f5b01885856349a010b49ee4 --- src/bin/setting.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/bin/setting.c b/src/bin/setting.c index 10fa9ac..416d4d1 100644 --- a/src/bin/setting.c +++ b/src/bin/setting.c @@ -354,8 +354,8 @@ general_layout_create(setting_data *sd, Evas_Object *parent) //Entry (View Width) Evas_Object *entry_view_size_w = entry_create(box2); - evas_object_size_hint_weight_set(entry_view_size_w, 0.15, 0); - evas_object_size_hint_align_set(entry_view_size_w, 1.0, 0); + evas_object_size_hint_weight_set(entry_view_size_w, 0.15, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(entry_view_size_w, EVAS_HINT_FILL, EVAS_HINT_FILL); digits_filter_data.accepted = "0123456789"; digits_filter_data.rejected = NULL; @@ -377,8 +377,8 @@ general_layout_create(setting_data *sd, Evas_Object *parent) //Entry (View Height) Evas_Object *entry_view_size_h = entry_create(box2); - evas_object_size_hint_weight_set(entry_view_size_h, 0.15, 0); - evas_object_size_hint_align_set(entry_view_size_h, 1.0, 0); + evas_object_size_hint_weight_set(entry_view_size_h, 0.15, EVAS_HINT_EXPAND); + evas_object_size_hint_align_set(entry_view_size_h, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_entry_markup_filter_append(entry_view_size_h, elm_entry_filter_accept_set, --
[EGIT] [tools/enventor] master 01/01: console: code refactoring
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=28e9bebcc5b5603f9aea96eb39dac8cd2dc90287
commit 28e9bebcc5b5603f9aea96eb39dac8cd2dc90287
Author: Hermet Park <her...@hermet.pe.kr>
Date: Wed Feb 17 19:16:39 2016 +0900
console: code refactoring
make it clean.
---
src/bin/base_gui.c | 1 -
src/bin/console.c | 25 +
2 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/src/bin/base_gui.c b/src/bin/base_gui.c
index 552d913..ef49d1d 100644
--- a/src/bin/base_gui.c
+++ b/src/bin/base_gui.c
@@ -44,7 +44,6 @@ base_error_msg_set(const char *msg)
console_text_set(bd->console, msg);
panes_editors_full_view(EINA_FALSE);
bd->console_msg = EINA_TRUE;
- error_word_selection_set(bd->console);
}
void
diff --git a/src/bin/console.c b/src/bin/console.c
index ff9eef2..7e01687 100644
--- a/src/bin/console.c
+++ b/src/bin/console.c
@@ -1,10 +1,8 @@
#include "common.h"
-void
-console_text_set(Evas_Object *console, const char *text)
-{
- elm_entry_entry_set(console, text);
-}
+/*/
+/* Internal method implementation*/
+/*/
static void
token_value_get(char *src, char *key_str, char end_key, int offset, char *dst)
@@ -68,18 +66,29 @@ error_word_selection_anim_cb(void *data)
}
void
-error_word_selection_set(Evas_Object *console)
+error_word_select(Evas_Object *console)
{
ecore_animator_add(error_word_selection_anim_cb, console);
}
static void
-console_mouse_down_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj,
+console_mouse_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object
*obj,
void *evnent_info)
{
if (((Evas_Event_Mouse_Down*)evnent_info)->flags &
EVAS_BUTTON_DOUBLE_CLICK)
- ecore_animator_add(error_word_selection_anim_cb, obj);
+ error_word_select(obj);
+}
+
+/*/
+/* Externally accessible calls */
+/*/
+
+void
+console_text_set(Evas_Object *console, const char *text)
+{
+ elm_entry_entry_set(console, text);
+ error_word_select(console);
}
Evas_Object *
--
[EGIT] [tools/enventor] master 01/01: editor: remove an unnecessary comment.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=958900962e7868ed3f3763965accf2aa5ade7388 commit 958900962e7868ed3f3763965accf2aa5ade7388 Author: Hermet Park <her...@hermet.pe.kr> Date: Wed Feb 17 21:57:49 2016 +0900 editor: remove an unnecessary comment. --- src/lib/edc_editor.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/lib/edc_editor.c b/src/lib/edc_editor.c index 25bf4ac..5ce44e6 100644 --- a/src/lib/edc_editor.c +++ b/src/lib/edc_editor.c @@ -156,7 +156,6 @@ entry_recover(edit_data *ed, int cursor_pos, int sel_cur_begin, int sel_cur_end) edje_object_part_text_cursor_pos_set(en_edje, "elm.text", EDJE_CURSOR_SELECTION_END, sel_cur_end); - //recover selection region ed->on_select_recover = EINA_FALSE; } --
[EGIT] [tools/enventor] master 01/01: autocomp: generate lazy style code.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=b15e55fa6ea3bbe8d5b8e00fcc229d2b5136c800
commit b15e55fa6ea3bbe8d5b8e00fcc229d2b5136c800
Author: Hermet Park <her...@hermet.pe.kr>
Date: Wed Feb 17 22:13:24 2016 +0900
autocomp: generate lazy style code.
---
data/autocomp/autocomp.src | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/autocomp/autocomp.src b/data/autocomp/autocomp.src
index f99a2e9..620751c 100644
--- a/data/autocomp/autocomp.src
+++ b/data/autocomp/autocomp.src
@@ -1720,7 +1720,7 @@ group "lexem" struct {
}
group "txt" var_array {
count 2;
- value "string" string: "%s { name: \"\";";
+ value "string" string: "%s { \"\";";
value "string" string: "}";
}
value "cursor_offset" int: 4;
--
[EGIT] [tools/enventor] master 01/01: remove minimum template code.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=67f80c2b03b9252335b5ff87f5b23e650b7beee6
commit 67f80c2b03b9252335b5ff87f5b23e650b7beee6
Author: Hermet Park <her...@hermet.pe.kr>
Date: Wed Feb 17 22:15:01 2016 +0900
remove minimum template code.
actually, empty template code is replaced with minimum template code.
orignally, empty template code is useless.
---
data/templates/Makefile.am | 5 -
data/templates/empty.edc | 7 +++
data/templates/minimum.edc | 7 ---
3 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/data/templates/Makefile.am b/data/templates/Makefile.am
index f07bf59..831781e 100644
--- a/data/templates/Makefile.am
+++ b/data/templates/Makefile.am
@@ -16,8 +16,6 @@ files_DATA = basic.edc \
image.edj \
map.edc \
map.edj \
- minimum.edc \
- minimum.edj \
proxy.edc \
proxy.edj \
rect.edc \
@@ -87,8 +85,5 @@ spacer.edj: Makefile spacer.edc
sound.edj: Makefile sound.edc
$(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/sound.edc $(builddir)/sound.edj
-minimum.edj: Makefile minimum.edc
- $(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/minimum.edc $(builddir)/minimum.edj
-
clean-local:
rm -f *.edj
diff --git a/data/templates/empty.edc b/data/templates/empty.edc
index e69de29..912f184 100644
--- a/data/templates/empty.edc
+++ b/data/templates/empty.edc
@@ -0,0 +1,7 @@
+collections {
+ base_scale: 1.0;
+ group { "main";
+ parts {
+ }
+ }
+}
diff --git a/data/templates/minimum.edc b/data/templates/minimum.edc
deleted file mode 100644
index 912f184..000
--- a/data/templates/minimum.edc
+++ /dev/null
@@ -1,7 +0,0 @@
-collections {
- base_scale: 1.0;
- group { "main";
- parts {
- }
- }
-}
--
[EGIT] [tools/enventor] master 01/01: fix broken live spacer image.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=7108c1c05e757548fa56fb8037ca7d6cca058b9f
commit 7108c1c05e757548fa56fb8037ca7d6cca058b9f
Author: Hermet Park <her...@hermet.pe.kr>
Date: Wed Feb 17 22:46:32 2016 +0900
fix broken live spacer image.
---
data/themes/default/content.edc| 13 -
data/themes/default/images/live_spacer.png | Bin 376 -> 347 bytes
data/themes/default/live_edit.edc | 2 +-
3 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/data/themes/default/content.edc b/data/themes/default/content.edc
index f1b450a..df2775f 100644
--- a/data/themes/default/content.edc
+++ b/data/themes/default/content.edc
@@ -18,24 +18,19 @@ group { name: "swallow";
}
}
-group { name: "spacer";
- inherit: "swallow";
+group { "spacer";
parts {
- part { name: "img";
- type: IMAGE;
+ image {
repeat_events: 1;
- description { state: "default" 0.0;
+ desc {
image.normal: "live_spacer.png";
-image.border: 5 5 5 5;
+image.border: 3 3 2 4;
fill.smooth: 0;
-aspect: 0 0;
-aspect_preference: NONE;
}
}
}
}
-
group { name: "part_highlight";
parts {
part { name: "base";
diff --git a/data/themes/default/images/live_spacer.png
b/data/themes/default/images/live_spacer.png
index d6f4208..8aa75fa 100644
Binary files a/data/themes/default/images/live_spacer.png and
b/data/themes/default/images/live_spacer.png differ
diff --git a/data/themes/default/live_edit.edc
b/data/themes/default/live_edit.edc
index 75740d3..f1f7fc4 100644
--- a/data/themes/default/live_edit.edc
+++ b/data/themes/default/live_edit.edc
@@ -77,7 +77,7 @@ group { "Spacer_bg";
image {
desc {
image.normal: "live_spacer.png";
-image.border: 5 5 5 5;
+image.border: 3 3 2 4;
fill.smooth: 0;
}
}
--
[EGIT] [tools/enventor] master 01/01: removed logo from about page.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=33b1f74e48ef2bfdcd039fc10e7be64bcc86691a
commit 33b1f74e48ef2bfdcd039fc10e7be64bcc86691a
Author: Hermet Park <her...@hermet.pe.kr>
Date: Fri Feb 19 02:21:47 2016 +0900
removed logo from about page.
---
data/themes/default/layout_common.edc | 13 -
1 file changed, 13 deletions(-)
diff --git a/data/themes/default/layout_common.edc
b/data/themes/default/layout_common.edc
index 3a9fdd4..b6c9037 100644
--- a/data/themes/default/layout_common.edc
+++ b/data/themes/default/layout_common.edc
@@ -3,7 +3,6 @@ images {
image: "warning.png" COMP;
image: "fileselect.png" COMP;
image: "new.png" COMP;
- image: "logo.png" COMP;
image: "shine.png" COMP;
image: "bub_over_bot.png" COMP;
image: "disabler.png" COMP;
@@ -30,18 +29,6 @@ group { name: "about_layout";
color: 0 0 0 175;
}
}
- part { name: "logo";
- scale: 1;
- description { state: "default" 0.0;
-min: 80 80;
-max: 80 80;
-rel1.offset: -25 -25;
-rel2.offset: -26 -26;
-image.normal: "logo.png";
-align: 1 1;
-color: 255 255 255 205;
- }
- }
part { name: "left_top_padding";
type: SPACER;
scale: 1;
--
[EGIT] [tools/enventor] master 01/01: revise previous patch code.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=30af154860dc07c29d9e23de734f10f3b82ba909
commit 30af154860dc07c29d9e23de734f10f3b82ba909
Author: Hermet Park <her...@hermet.pe.kr>
Date: Fri Feb 19 02:52:49 2016 +0900
revise previous patch code.
d929258e573a3d42e9ac611fa0fc22bdc6aa0aed.
scalable.
icon.
etc...
---
data/themes/default/images.edc| 2 ++
data/themes/default/images/Makefile.am| 3 ++-
data/themes/default/images/icon_close.png | Bin 0 -> 426 bytes
data/themes/default/layout_common.edc | 35 +-
src/bin/menu.c| 35 +-
5 files changed, 39 insertions(+), 36 deletions(-)
diff --git a/data/themes/default/images.edc b/data/themes/default/images.edc
index c0a9eca..1756b86 100644
--- a/data/themes/default/images.edc
+++ b/data/themes/default/images.edc
@@ -1,4 +1,5 @@
images {
+ image: "icon_close.png" COMP;
image: "slider_up.png" COMP;
image: "slider_down.png" COMP;
image: "menu.png" COMP;
@@ -53,5 +54,6 @@ ICON_GROUP("Spacer", "live_spacer.png")
ICON_GROUP("Swallow", "live_swallow.png")
ICON_GROUP("Text", "live_text.png")
ICON_GROUP("Textblock", "live_textblock.png")
+ICON_GROUP("close", "icon_close.png")
#undef ICON_GROUP
diff --git a/data/themes/default/images/Makefile.am
b/data/themes/default/images/Makefile.am
index 37de141..58eab21 100644
--- a/data/themes/default/images/Makefile.am
+++ b/data/themes/default/images/Makefile.am
@@ -69,4 +69,5 @@ EXTRA_DIST = \
white_bar_vert_glow.png \
horizontal_separated_bar_small_glow.png \
expand.png \
- invert.png
+ invert.png \
+ icon_close.png
diff --git a/data/themes/default/images/icon_close.png
b/data/themes/default/images/icon_close.png
new file mode 100644
index 000..d3a58ff
Binary files /dev/null and b/data/themes/default/images/icon_close.png differ
diff --git a/data/themes/default/layout_common.edc
b/data/themes/default/layout_common.edc
index f9f5aea..b8600d2 100644
--- a/data/themes/default/layout_common.edc
+++ b/data/themes/default/layout_common.edc
@@ -60,16 +60,28 @@ group { name: "about_layout";
rel2.relative: 0 0;
}
}
- part { name: "elm.swallow.back_button";
- type: SWALLOW;
+ swallow { "elm.swallow.back_button";
scale: 1;
- description { state: "default" 0.0;
+ clip_to: "clipper";
+ desc {
fixed: 1 1;
min: 26 26;
max: 26 26;
-rel1.offset: 0 10;
-rel2.offset: -37 -1;
align: 1 0.0;
+rel1.relative: 0 0;
+rel2.relative: 0 0;
+rel1.to: "back_button_padding";
+rel2.to: "back_button_padding";
+ }
+ }
+ spacer { "back_button_padding";
+ scale: 1;
+ desc {
+fixed: 1 1;
+min: 22 0;
+align: 1 0.0;
+rel1.relative: 1 0;
+rel2.relative: 1 0;
}
}
part { name: "event_blocker";
@@ -942,15 +954,13 @@ group { name: "menu_layout";
align: 1 1;
}
}
- part { name: "elm.swallow.back_button";
- type: SWALLOW;
+ swallow { "elm.swallow.back_button";
scale: 1;
- description { state: "default" 0.0;
+ clip_to: "clipper";
+ desc {
fixed: 1 1;
min: 26 26;
max: 26 26;
-rel1.offset: 0 10;
-rel2.offset: -37 -1;
align: 1 0.0;
}
}
@@ -1007,11 +1017,6 @@ 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/src/bin/menu.c b/src/bin/menu.c
index b1cb2c9..3894480 100644
--- a/src/bin/menu.c
+++ b/src/bin/menu.c
@@ -138,15 +138,15 @@ newfile_cancel_btn_cb(void *data, Evas_Object *obj
EINA_UNUSED,
}
static void
-about_close_cb(void *data, Evas_Object *obj EINA_UNUSED,
- void *envent_info EINA_UNUSED)
+about_back_btn_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
+ void *envent_info EINA_UNUSED)
{
menu_data *md = data;
about_close(md);
}
static void
-menu_close_cb(void *data, Evas_Object *obj EINA_UNUSED,
+menu_back_btn_clicked_cb(void *data, Evas_Object *o
[EGIT] [tools/enventor] master 01/01: update readme/about guide.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=956141c9202958ab31968eb6f1c70aa82763cc7b commit 956141c9202958ab31968eb6f1c70aa82763cc7b Author: Hermet Park <her...@hermet.pe.kr> Date: Fri Feb 19 17:29:29 2016 +0900 update readme/about guide. --- README | 24 data/about/ABOUT | 24 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/README b/README index 6e33995..0545f18 100644 --- a/README +++ b/README @@ -34,25 +34,25 @@ F1 - About F2 - New F3 - Save F4 - Load -F5 - Show/Hide Line Number -F9 - Show/Hide Tools -F10 - Show/Hide Console -F11 - Show/Hide Status +F5 - Toggle Line Number +F9 - Toggle Tools +F10 - Toggle Console +F11 - Toggle Status F12 - Settings Ctrl+S - Quick Save + Update Live View -Ctrl+I - On/Off Auto Indentation -Ctrl+O - On/Off Auto Completion -Ctrl+W - Show/Hide Dummy Parts -Ctrl+H - On/Off Part Highlighting +Ctrl+I - Toggle Auto Indentation +Ctrl+O - Toggle Auto Completion +Ctrl+W - Toggle Dummy Parts +Ctrl+H - Toggle Part Highlighting Ctrl+T - Insert Defaut Template Code Ctrl+Mouse Wheel Up - View Zoom In (Only if view size is set) / Font Size Up Ctrl+Mouse Wheel Down - View Zoom Out (Only if view size is set) / Font Size Down -Alt+Left - On/Off Full Edit View -Alt+Right - On/Off Full Live View -Alt+Up - On/Off Full Console View -Alt+Down - On/Off Full Editors View +Alt+Left - Toggle Full Edit View +Alt+Right - Toggle Full Live View +Alt+Up - Toggle Full Console View +Alt+Down - Toggle Full Editors View Ctrl+A - Select Text All Ctrl+Double Click - Select a word diff --git a/data/about/ABOUT b/data/about/ABOUT index 7740b26..2c9c33c 100644 --- a/data/about/ABOUT +++ b/data/about/ABOUT @@ -16,25 +16,25 @@ F1 - About F2 - New F3 - Save F4 - Load -F5 - Show/Hide Line Number -F9 - Show/Hide Tools -F10 - Show/Hide Console -F11 - Show/Hide Status +F5 - Toggle Line Number +F9 - Toggle Tools +F10 - Toggle Console +F11 - Toggle Status F12 - Settings Ctrl+S - Quick Save + Update Live View -Ctrl+I - On/Off Auto Indentation -Ctrl+O - On/Off Auto Completion -Ctrl+W - Show/Hide Dummy Parts -Ctrl+H - On/Off Part Highlighting +Ctrl+I - Toggle Auto Indentation +Ctrl+O - Toggle Auto Completion +Ctrl+W - Toggle Dummy Parts +Ctrl+H - Toggle Part Highlighting Ctrl+T - Insert Defaut Template Code Ctrl+Mouse Wheel Up - View Zoom In (Only if view size is set) / Font Size Up Ctrl+Mouse Wheel Down - View Zoom Out (Only if view size is set) / Font Size Down -Alt+Left - On/Off Full Edit View -Alt+Right - On/Off Full Live View -Alt+Up - On/Off Full Console View -Alt+Down - On/Off Full Editors View +Alt+Left - Toggle Full Edit View +Alt+Right - Toggle Full Live View +Alt+Up - Toggle Full Console View +Alt+Down - Toggle Full Editors View Ctrl+A - Select Text All Ctrl+Double Click - Select a word --
[EGIT] [tools/enventor] master 01/01: one more doc updation.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=0eacf2eb08c8a4b13ccfaa9904f592f9a1f663c9 commit 0eacf2eb08c8a4b13ccfaa9904f592f9a1f663c9 Author: Hermet Park <her...@hermet.pe.kr> Date: Fri Feb 19 17:32:14 2016 +0900 one more doc updation. --- README | 4 ++-- data/about/ABOUT | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README b/README index 0545f18..24457f0 100644 --- a/README +++ b/README @@ -46,8 +46,8 @@ Ctrl+O - Toggle Auto Completion Ctrl+W - Toggle Dummy Parts Ctrl+H - Toggle Part Highlighting Ctrl+T - Insert Defaut Template Code -Ctrl+Mouse Wheel Up - View Zoom In (Only if view size is set) / Font Size Up -Ctrl+Mouse Wheel Down - View Zoom Out (Only if view size is set) / Font Size Down +Ctrl+Mouse Wheel Up - View Zoom In / Font Size Up +Ctrl+Mouse Wheel Down - View Zoom Out / Font Size Down Alt+Left - Toggle Full Edit View Alt+Right - Toggle Full Live View diff --git a/data/about/ABOUT b/data/about/ABOUT index 2c9c33c..f6f9119 100644 --- a/data/about/ABOUT +++ b/data/about/ABOUT @@ -28,8 +28,8 @@ Ctrl+O - Toggle Auto Completion Ctrl+W - Toggle Dummy Parts Ctrl+H - Toggle Part Highlighting Ctrl+T - Insert Defaut Template Code -Ctrl+Mouse Wheel Up - View Zoom In (Only if view size is set) / Font Size Up -Ctrl+Mouse Wheel Down - View Zoom Out (Only if view size is set) / Font Size Down +Ctrl+Mouse Wheel Up - View Zoom In / Font Size Up +Ctrl+Mouse Wheel Down - View Zoom Out / Font Size Down Alt+Left - Toggle Full Edit View Alt+Right - Toggle Full Live View --
[EGIT] [core/elementary] master 01/01: transit: rename from elm_transit_revert_go() to elm_transit_revert()
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=9fceae128e2f38cf2317c723c7def2ac4c49ad18
commit 9fceae128e2f38cf2317c723c7def2ac4c49ad18
Author: Hermet Park <her...@hermet.pe.kr>
Date: Sun Feb 14 20:45:50 2016 +0900
transit: rename from elm_transit_revert_go() to elm_transit_revert()
elm_transit_revert_go() sounds like it triggers animation on reverse way.
but this api acutally just change a current state.
It doesn't trigger the transtion.
---
src/bin/test_transit.c| 2 +-
src/bin/test_transit_bezier.c | 2 +-
src/lib/elm_transit.c | 11 ---
src/lib/elm_transit.h | 3 ++-
4 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/bin/test_transit.c b/src/bin/test_transit.c
index bfdd2d9..17b3911 100644
--- a/src/bin/test_transit.c
+++ b/src/bin/test_transit.c
@@ -25,7 +25,7 @@ static void
_transit_revert(void *data, Evas_Object *obj EINA_UNUSED, void *event_info
EINA_UNUSED)
{
Elm_Transit *trans = (Elm_Transit*)data;
- elm_transit_revert_go(trans);
+ elm_transit_revert(trans);
}
static void
diff --git a/src/bin/test_transit_bezier.c b/src/bin/test_transit_bezier.c
index 24966e8..d448666 100644
--- a/src/bin/test_transit_bezier.c
+++ b/src/bin/test_transit_bezier.c
@@ -29,7 +29,7 @@ static void
_transit_revert(void *data, Evas_Object *obj EINA_UNUSED, void *event_info
EINA_UNUSED)
{
Elm_Transit *trans = (Elm_Transit*)data;
- elm_transit_revert_go(trans);
+ elm_transit_revert(trans);
}
static void
diff --git a/src/lib/elm_transit.c b/src/lib/elm_transit.c
index ea70529..13f6d78 100644
--- a/src/lib/elm_transit.c
+++ b/src/lib/elm_transit.c
@@ -773,10 +773,13 @@ elm_transit_duration_get(const Elm_Transit *transit)
return transit->time.duration;
}
-EAPI void
-elm_transit_revert_go(Elm_Transit *transit)
+EAPI Eina_Bool
+elm_transit_revert(Elm_Transit *transit)
{
- ELM_TRANSIT_CHECK_OR_RETURN(transit);
+ ELM_TRANSIT_CHECK_OR_RETURN(transit, EINA_FALSE);
+
+ if (!transit->animator) return EINA_FALSE;
+
if (transit->revert_mode)
{
transit->total_revert_time += transit->time.revert_elapsed;
@@ -788,6 +791,8 @@ elm_transit_revert_go(Elm_Transit *transit)
transit->time.revert_elapsed = 0;
transit->revert_begin_progress = 0;
}
+
+ return EINA_TRUE;
}
EAPI void
diff --git a/src/lib/elm_transit.h b/src/lib/elm_transit.h
index 6464d52..ced6656 100644
--- a/src/lib/elm_transit.h
+++ b/src/lib/elm_transit.h
@@ -591,11 +591,12 @@ EAPI void elm_transit_go(Elm_Transit
*transit);
* @note @p transit can not be NULL
*
* @param transit The transit object.
+ * @return @c EINA_TRUE if transition is reverted, @c EINA_FALSE otherwise.
*
* @since 1.18
* @ingroup Transit
*/
-EAPI void elm_transit_revert_go(Elm_Transit *transit);
+EAPI Eina_Bool elm_transit_revert(Elm_Transit *transit);
/**
* Starts the transition in given seconds.
--
[EGIT] [games/etypers] master 01/01: remove popup and use notify.
hermet pushed a commit to branch master.
http://git.enlightenment.org/games/etypers.git/commit/?id=e62d37c033899b2da0241c27964a19edf4eb5857
commit e62d37c033899b2da0241c27964a19edf4eb5857
Author: Hermet Park <her...@hermet.pe.kr>
Date: Fri Feb 12 02:06:21 2016 +0900
remove popup and use notify.
popup is ugly and has a lot of issues.
contruct menus by using notify to avoid this.
---
src/bin/etypers.c | 270 --
1 file changed, 138 insertions(+), 132 deletions(-)
diff --git a/src/bin/etypers.c b/src/bin/etypers.c
index 2ac5d91..9df2c1c 100644
--- a/src/bin/etypers.c
+++ b/src/bin/etypers.c
@@ -1,23 +1,3 @@
-/*
- * EFL Typers.
- *
- * Copyright 2012 Hermet Park
- *
- * This application is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This application is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
#include
#define DEFAULT_WIN_W 400
@@ -38,14 +18,13 @@ static void _resume(AppData *appdata);
static void _popup(AppData *appdata);
static void _reset_defense_wall(AppData *appdata);
-static char EDJE_PATH[PATH_MAX];
-
enum _GameState
{
- Ready,
+ Ready = 0,
Playing,
Paused,
SubPopup,
+ SubPopup2,
GameOver
};
@@ -71,7 +50,6 @@ struct _AppData
Evas_Object *table;
Evas_Object *popup;
GameState state;
- GameState prev_state;
Ecore_Animator *animator;
};
@@ -355,8 +333,6 @@ _app_release(AppData *appdata)
eina_list_free(appdata->defense_wall);
- free(appdata);
-
elm_exit();
}
@@ -366,21 +342,15 @@ _win_del(void *data, Evas_Object *obj, void *event_info)
_app_release(data);
}
-static void
-_win_resize(void *data, Evas *e, Evas_Object *obj, void *event_info)
-{
- AppData *appdata = data;
- Evas_Coord w, h;
- evas_object_geometry_get(obj, NULL, NULL, , );
- appdata->bound_w = w;
- appdata->bound_h = h;
-}
-
static Evas_Object *
-_layout_create(Evas_Object *win, const char *filepath, const char *group)
+_layout_create(Evas_Object *win)
{
Evas_Object *ly = elm_layout_add(win);
- elm_layout_file_set(ly, filepath, group);
+
+ char buf[PATH_MAX];
+ snprintf(buf, sizeof(buf), "%s/theme/etypers.edj", PACKAGE_DATA_DIR);
+
+ elm_layout_file_set(ly, buf, "gui");
evas_object_size_hint_weight_set(ly, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
elm_win_resize_object_add(win, ly);
evas_object_show(ly);
@@ -518,7 +488,8 @@ static void
_game_level_cb(void *data, Evas_Object *obj, void *event_info)
{
AppData *appdata = evas_object_data_get(obj, "appdata");
- evas_object_del(obj);
+ evas_object_del(appdata->popup);
+ appdata->popup = NULL;
appdata->level = (int)(uintptr_t) data;
_game_reset(appdata);
@@ -527,47 +498,67 @@ _game_level_cb(void *data, Evas_Object *obj, void
*event_info)
}
static void
-_level_back_btn_cb(void *data, Evas_Object *obj, void *event_info)
-{
- Evas_Object *popup = data;
- AppData *appdata = evas_object_data_get(popup, "appdata");
- appdata->state = appdata->prev_state;
- evas_object_del(popup);
- _pause(appdata);
- _popup(appdata);
-}
-
-static void
_game_start_cb(void *data, Evas_Object *obj, void *event_info)
{
AppData *appdata = data;
evas_object_del(appdata->popup);
- appdata->popup = NULL;
- appdata->prev_state = appdata->state;
- appdata->state = SubPopup;
- Evas_Object *popup = elm_popup_add(appdata->win);
- evas_object_data_set(popup, "appdata", data);
- elm_object_part_text_set(popup, "title,text", "Start Level");
- //FIXME: Content height is not fit to the actual total item height
- elm_popup_item_append(popup, "Level 1", NULL, _game_level_cb, (void *) 1);
- elm_popup_item_append(popup, "Level 2", NULL, _game_level_cb, (void *) 2);
- elm_popup_item_append(popup, "Level 3", NULL, _game_level_cb, (void *) 3);
- elm_popup_item_append(popup, "Level 4", NULL, _game_level_cb, (void *) 4);
- elm_popup_item_append(popup, "Level 5", NULL, _game_level_cb, (void *) 5);
- elm_popup_item_append(popup, "Level 6", NULL, _game_level_cb, (void *) 6);
- elm_popup_item_append(popup, "Level 7", NULL, _game_level_cb, (void *) 7);
- elm_popup_item_append(popup, "
[EGIT] [games/etypers] master 01/01: score shouldn't be less than 0.
hermet pushed a commit to branch master. http://git.enlightenment.org/games/etypers.git/commit/?id=7bdf3816f850871e91910e27f98cf1880c23fa9e commit 7bdf3816f850871e91910e27f98cf1880c23fa9e Author: Hermet Park <her...@hermet.pe.kr> Date: Fri Feb 12 02:12:41 2016 +0900 score shouldn't be less than 0. --- src/bin/etypers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/etypers.c b/src/bin/etypers.c index 9df2c1c..a0a436c 100644 --- a/src/bin/etypers.c +++ b/src/bin/etypers.c @@ -36,7 +36,7 @@ struct _AppData double level; double last_frame_time; double interval_time; - unsigned long score; + long score; float hit_cnt; float hit_try_cnt; unsigned long combo; --
[EGIT] [games/etypers] master 01/01: adjust drop speed.
hermet pushed a commit to branch master.
http://git.enlightenment.org/games/etypers.git/commit/?id=377878169f9a7954401da8d6293303b94c7b6cfb
commit 377878169f9a7954401da8d6293303b94c7b6cfb
Author: Hermet Park <her...@hermet.pe.kr>
Date: Fri Feb 12 02:16:52 2016 +0900
adjust drop speed.
i hope this is last change today.
---
src/bin/etypers.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/bin/etypers.c b/src/bin/etypers.c
index a0a436c..7a1ba4a 100644
--- a/src/bin/etypers.c
+++ b/src/bin/etypers.c
@@ -4,7 +4,7 @@
#define DEFAULT_WIN_H 600
#define NEW_ENEMY_DURATION_SEC 5
#define LEVEL_INC_WEIGHT 0.01
-#define DROP_DIST_WEIGHT 50
+#define DROP_DIST_WEIGHT 25
#define DEFENSE_WALL_CNT 15
#define WALL_COLOR 100, 100, 100, 170
#define MINUS_SCORE 25
@@ -280,7 +280,7 @@ _animator_cb(void *data)
Enemy *enemy;
Eina_Inlist *l;
float drop_dist = (float) ((current_time - appdata->last_frame_time) *
- DROP_DIST_WEIGHT) + (appdata->level * 0.095);
+ DROP_DIST_WEIGHT) + (appdata->level * 0.2);
EINA_INLIST_FOREACH_SAFE(appdata->enemies, l, enemy)
{
--
[EGIT] [core/efl] master 01/01: evas/canvas: fix an incorrect sizing of smart object bounding box.
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=909af58b8e325afd7517ab59f2b6295a10935f96
commit 909af58b8e325afd7517ab59f2b6295a10935f96
Author: Hermet Park <her...@hermet.pe.kr>
Date: Tue Feb 2 21:14:43 2016 +0900
evas/canvas: fix an incorrect sizing of smart object bounding box.
height of the children b-box should be arranged by parent y-pos.
Signed-Off-By: KeuckDo Bang <keuckdo.b...@samsung.com>
Signed-Off-By: MinKyu Kim <imetjade@samsung.com>
@fix
---
src/lib/evas/canvas/evas_object_smart.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lib/evas/canvas/evas_object_smart.c
b/src/lib/evas/canvas/evas_object_smart.c
index 1f3339f..8f9874f 100644
--- a/src/lib/evas/canvas/evas_object_smart.c
+++ b/src/lib/evas/canvas/evas_object_smart.c
@@ -1139,8 +1139,8 @@ evas_object_update_bounding_box(Evas_Object *eo_obj,
Evas_Object_Protected_Data
/* Update top limit */
if (noclip && y < smart_parent->cur.bounding_box.y)
{
-smart_parent->cur.bounding_box.h +=
smart_parent->cur.bounding_box.x - x;
-smart_parent->cur.bounding_box.y = y;
+ smart_parent->cur.bounding_box.h +=
smart_parent->cur.bounding_box.y - y;
+ smart_parent->cur.bounding_box.y = y;
propagate = EINA_TRUE;
}
--
[EGIT] [tools/enventor] master 01/01: statusbar: fix view sizing issue when an invert button is clicked repeatedly.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=d23793101b6dc91dab6827f0b4ab4beb35309c0f
commit d23793101b6dc91dab6827f0b4ab4beb35309c0f
Author: Hermet Park <her...@hermet.pe.kr>
Date: Wed Mar 16 21:27:04 2016 +0900
statusbar: fix view sizing issue when an invert button is clicked
repeatedly.
previously, the button was available even if the inverting animation was
going
on. This caused the corruption view size because of context loss.
We could avoid this issue by freezing button when transition is going on.
---
src/bin/statusbar.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/bin/statusbar.c b/src/bin/statusbar.c
index 31e0784..8964d77 100644
--- a/src/bin/statusbar.c
+++ b/src/bin/statusbar.c
@@ -85,7 +85,7 @@ view_invert_transit_end(void *data, Elm_Transit *transit
EINA_UNUSED)
}
static void
-view_invert_btn_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
+view_invert_btn_cb(void *data EINA_UNUSED, Evas_Object *obj,
void *event_info EINA_UNUSED)
{
invert_data *id = malloc(sizeof(invert_data));
@@ -98,6 +98,7 @@ view_invert_btn_cb(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED,
id->diff_h = w - h;
Elm_Transit *transit = elm_transit_add();
+ elm_transit_object_add(transit, obj);
elm_transit_effect_add(transit, view_invert_transit_op, id,
view_invert_transit_end);
elm_transit_tween_mode_set(transit, ELM_TRANSIT_TWEEN_MODE_DECELERATE);
--
[EGIT] [tools/enventor] master 01/02: updated po
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=d2d0b8c33bd1a653f720df560b50f731edfc8513 commit d2d0b8c33bd1a653f720df560b50f731edfc8513 Author: Hermet Park <her...@hermet.pe.kr> Date: Fri Mar 11 17:38:27 2016 +0900 updated po --- po/en.po | 13 + po/ru.po | 14 ++ 2 files changed, 27 insertions(+) diff --git a/po/en.po b/po/en.po index 1f3ea07..be3ac4e 100644 --- a/po/en.po +++ b/po/en.po @@ -107,6 +107,10 @@ msgstr "" msgid "Double click the part to confirm." msgstr "" +#: src/bin/live_edit.c:995 +msgid "Select a part to add in Live View." +msgstr "" + #: src/bin/live_edit.c:1070 msgid "Faild to allocate Memory!" msgstr "" @@ -127,6 +131,11 @@ msgstr "" msgid "Auto Indentation Disabled." msgstr "" +#: src/bin/main.c:180 +#, c-format +msgid "Live View Scale: %2.2fx" +msgstr "" + #: src/bin/main.c:206 #, c-format msgid "Font Size: %1.1fx" @@ -239,6 +248,10 @@ 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 f5f7f10..59d6769 100644 --- a/po/ru.po +++ b/po/ru.po @@ -107,6 +107,10 @@ msgstr "Ошибка перехвата нажатия - Escape" msgid "Double click the part to confirm." msgstr "Сделайте двойной клик мыши по примитиву для вставки." +#: src/bin/live_edit.c:995 +msgid "Select a part to add in Live View." +msgstr "" + #: src/bin/live_edit.c:1070 msgid "Faild to allocate Memory!" msgstr "Ошибка выделения памяти!" @@ -127,6 +131,11 @@ msgstr "Автовыравнивание Включено" msgid "Auto Indentation Disabled." msgstr "Автовыравнивание Выключено" +#: src/bin/main.c:180 +#, fuzzy, c-format +msgid "Live View Scale: %2.2fx" +msgstr "Масштаб Live View" + #: src/bin/main.c:206 #, c-format msgid "Font Size: %1.1fx" @@ -241,6 +250,11 @@ msgstr "Выход" msgid "Close Enventor Menu (Esc)" msgstr "Закрыть меню (Esc)" +#: src/bin/menu.c:673 +#, fuzzy +msgid "Back" +msgstr "Назад" + #: src/bin/newfile.c:56 src/bin/newfile.c:79 #, c-format msgid "Cannot find file! \"%s\"" --
[EGIT] [tools/enventor] master 02/02: fix the build break that introduced by eo syntax change.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=986663f5ed27d21ab3a309f6db5895ef1892a7cd
commit 986663f5ed27d21ab3a309f6db5895ef1892a7cd
Author: Hermet Park <her...@hermet.pe.kr>
Date: Fri Mar 11 17:38:36 2016 +0900
fix the build break that introduced by eo syntax change.
---
src/lib/enventor_smart.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/lib/enventor_smart.c b/src/lib/enventor_smart.c
index a5b118c..694b557 100644
--- a/src/lib/enventor_smart.c
+++ b/src/lib/enventor_smart.c
@@ -751,7 +751,8 @@ EAPI Evas_Object *
enventor_object_add(Evas_Object *parent)
{
EINA_SAFETY_ON_NULL_RETURN_VAL(parent, NULL);
- Evas_Object *obj = eo_add(MY_CLASS, parent);
+ Evas_Object *obj;
+ eo_add(, MY_CLASS, parent);
return obj;
}
--
[EGIT] [tools/enventor] master 01/01: + syntax color keywords
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=d77d8f7a504acf9c30dd477df6065493909282a5
commit d77d8f7a504acf9c30dd477df6065493909282a5
Author: Hermet Park <her...@hermet.pe.kr>
Date: Sat Mar 12 15:17:20 2016 +0900
+ syntax color keywords
---
data/color/edc.src | 2 ++
1 file changed, 2 insertions(+)
diff --git a/data/color/edc.src b/data/color/edc.src
index be9dec1..ebad78c 100644
--- a/data/color/edc.src
+++ b/data/color/edc.src
@@ -48,6 +48,7 @@ group "syntax_color_group" struct {
value "key" string: "item";
value "key" string: "map";
value "key" string: "origin";
+value "key" string: "params";
value "key" string: "parts";
value "key" string: "part";
value "key" string: "programs";
@@ -138,6 +139,7 @@ group "syntax_color_group" struct {
value "key" string: "span";
value "key" string: "spread";
value "key" string: "state";
+value "key" string: "string";
value "key" string: "style";
value "key" string: "smooth";
value "key" string: "source";
--
[EGIT] [tools/enventor] master 01/01: remove broken theme extension code.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=5c40f9b8f69355f1af165ff2b90383b05531f784
commit 5c40f9b8f69355f1af165ff2b90383b05531f784
Author: Hermet Park <her...@hermet.pe.kr>
Date: Wed Mar 16 13:02:43 2016 +0900
remove broken theme extension code.
redundant code were remained uselessly.
these were catched by edje error logs.
---
data/themes/default/theme_ext.edc | 4
1 file changed, 4 deletions(-)
diff --git a/data/themes/default/theme_ext.edc
b/data/themes/default/theme_ext.edc
index 5ad9e0b..5da128f 100644
--- a/data/themes/default/theme_ext.edc
+++ b/data/themes/default/theme_ext.edc
@@ -1176,13 +1176,11 @@ group { name: "elm/button/base/enventor";
if (!d) {
set_state(PART:"elm.swallow.content", "default", 0.0);
set_state(PART:"sizer.content", "default", 0.0);
- set_state(PART:"elm.text", "icononly", 0.0);
set_state(PART:"icon_clip", "default", 0.0);
set_state(PART:"event", "default", 0.0);
} else {
set_state(PART:"elm.swallow.content", "default", 0.0);
set_state(PART:"sizer.content", "default", 0.0);
- set_state(PART:"elm.text", "icononly", 0.0);
set_state(PART:"icon_clip", "disabled", 0.0);
set_state(PART:"event", "disabled", 0.0);
}
@@ -1367,7 +1365,6 @@ group { name: "elm/button/base/enventor";
}
program { name: "button_click_anim";
action: STATE_SET "clicked" 0.0;
- target: "base";
target: "text2";
target: "icon_highlight";
}
@@ -1378,7 +1375,6 @@ group { name: "elm/button/base/enventor";
}
program { name: "button_unclick_anim";
action: STATE_SET "default" 0.0;
- target: "base";
target: "text2";
target: "icon_highlight";
}
--
[EGIT] [tools/enventor] master 01/01: edc_navigator: fix the editor cursor jump issue.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=18ca260c1aaceb30ab49b79ef47d5337709b018b
commit 18ca260c1aaceb30ab49b79ef47d5337709b018b
Author: Hermet Park <her...@hermet.pe.kr>
Date: Wed Mar 16 20:02:32 2016 +0900
edc_navigator: fix the editor cursor jump issue.
Skip a group selection callback because it leads the editor cursor jump on
to
the group area. But this group updation could be triggered in a various
scenario. The cursor should be jumped only when user clicked a group item
in the genlist.
---
src/bin/edc_navigator.c | 10 ++
1 file changed, 10 insertions(+)
diff --git a/src/bin/edc_navigator.c b/src/bin/edc_navigator.c
index bf00cad..3ba946f 100644
--- a/src/bin/edc_navigator.c
+++ b/src/bin/edc_navigator.c
@@ -24,6 +24,8 @@ typedef struct edc_navigator_s
Elm_Genlist_Item_Class *programs_itc;
Elm_Genlist_Item_Class *program_itc;
+ Eina_Bool group_select_skip : 1;
+
} navi_data;
typedef struct part_item_data_s
@@ -789,6 +791,7 @@ static void
gl_group_selected_cb(void *data, Evas_Object *obj EINA_UNUSED, void
*event_info)
{
navi_data *nd = data;
+ if (nd->group_select_skip) return;
Elm_Object_Item *it = event_info;
@@ -838,7 +841,14 @@ edc_navigator_group_update(const char *cur_group)
if (!strcmp(group_name, cur_group) &&
(strlen(group_name) == cur_group_len))
{
+
+ //Skip a group selection callback because it leads the editor
+ //cursor jump on to the group area. But this group updation could
+ //be triggered in a various scenario. The cursor should be jumped
+ //only when user clicks a group item in the genlist.
+ nd->group_select_skip = EINA_TRUE;
elm_genlist_item_selected_set(it, EINA_TRUE);
+ nd->group_select_skip = EINA_FALSE;
group_it = it;
break;
}
--
[EGIT] [tools/enventor] master 01/01: editor: removed a fixed 1 0; warning.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=c0942cd60a6b4d007a26fd878781840ca9c7ac38
commit c0942cd60a6b4d007a26fd878781840ca9c7ac38
Author: Hermet Park <her...@hermet.pe.kr>
Date: Tue Mar 29 08:35:19 2016 +0900
editor: removed a fixed 1 0; warning.
---
data/themes/default/layout_common.edc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/data/themes/default/layout_common.edc
b/data/themes/default/layout_common.edc
index d47cb4f..f9f8c7e 100644
--- a/data/themes/default/layout_common.edc
+++ b/data/themes/default/layout_common.edc
@@ -2737,10 +2737,10 @@ group { name: "edit_layout";
rel1.to: "elm.swallow.linenumber";
rel2.to: "elm.swallow.linenumber";
rel2.relative: 1 1;
+fixed: 1 0;
}
description { state: "hide" 0.0;
-rel1.to: "elm.swallow.linenumber";
-rel2.to: "elm.swallow.linenumber";
+inherit: "default";
rel2.relative: 0 1;
}
}
--
[EGIT] [tools/edi] master 01/01: remove duplicated variable declaration.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=411927a00281cb52ab405a7c202bb00e3d0178dc
commit 411927a00281cb52ab405a7c202bb00e3d0178dc
Author: Hermet Park <her...@hermet.pe.kr>
Date: Sat Apr 9 09:48:15 2016 +0900
remove duplicated variable declaration.
---
elm_code/src/lib/widget/elm_code_widget.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/elm_code/src/lib/widget/elm_code_widget.c
b/elm_code/src/lib/widget/elm_code_widget.c
index 2ce6496..abb766b 100644
--- a/elm_code/src/lib/widget/elm_code_widget.c
+++ b/elm_code/src/lib/widget/elm_code_widget.c
@@ -1486,7 +1486,7 @@ _elm_code_widget_ensure_n_grid_rows(Elm_Code_Widget
*widget, int rows)
if (rows == existing)
return;
- for (int i = existing; i < rows; i++)
+ for (i = existing; i < rows; i++)
{
grid = evas_object_textgrid_add(pd->gridbox);
evas_object_size_hint_weight_set(grid, EVAS_HINT_EXPAND, 0.0);
--
[EGIT] [core/efl] master 01/01: elementary/scroller: code refactoring.
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=5f9e73b96601d225d3d1d1bc842e4fc18b2a0822
commit 5f9e73b96601d225d3d1d1bc842e4fc18b2a0822
Author: Hermet Park <her...@hermet.pe.kr>
Date: Tue Apr 12 00:36:12 2016 +0900
elementary/scroller: code refactoring.
try to update scroller size when popup layout is updated.
---
src/lib/elementary/elc_popup.c | 8 ++--
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c
index c43d22e..88b8167 100644
--- a/src/lib/elementary/elc_popup.c
+++ b/src/lib/elementary/elc_popup.c
@@ -197,7 +197,6 @@ _notify_resize_cb(void *data,
ELM_POPUP_CHECK(popup);
- _scroller_size_calc(popup);
elm_layout_sizing_eval(popup);
}
@@ -419,7 +418,6 @@ _elm_popup_elm_widget_theme_apply(Eo *obj, Elm_Popup_Data
*sd)
elm_layout_signal_emit(sd->content_area, "elm,scroll,enable", "elm");
_visuals_set(obj);
- _scroller_size_calc(obj);
elm_layout_sizing_eval(obj);
/* access */
@@ -448,6 +446,8 @@ _elm_popup_elm_layout_sizing_eval(Eo *obj, Elm_Popup_Data
*sd)
Evas_Coord h_box = 0, minh_box = 0;
Evas_Coord minw = -1, minh = -1;
+ _scroller_size_calc(obj);
+
if (sd->items)
{
EINA_LIST_FOREACH(sd->items, elist, it)
@@ -1064,7 +1064,6 @@ _elm_popup_elm_layout_text_set(Eo *obj, Elm_Popup_Data
*_pd, const char *part, c
else
int_ret = elm_layout_text_set(_pd->main_layout, part, label);
- _scroller_size_calc(obj);
elm_layout_sizing_eval(obj);
return int_ret;
@@ -1246,7 +1245,6 @@ _elm_popup_elm_container_content_set(Eo *obj,
Elm_Popup_Data *_pd EINA_UNUSED, c
else
ret = elm_obj_container_content_set(_pd->main_layout, part, content);
- _scroller_size_calc(obj);
elm_layout_sizing_eval(obj);
return ret;
@@ -1804,7 +1802,6 @@ _elm_popup_item_append(Eo *obj, Elm_Popup_Data *sd, const
char *label, Evas_Obje
elm_box_pack_end(sd->box, VIEW(it));
sd->items = eina_list_append(sd->items, it);
- _scroller_size_calc(obj);
elm_layout_sizing_eval(obj);
return eo_it;
@@ -1840,7 +1837,6 @@ _elm_popup_scrollable_set(Eo *obj, Elm_Popup_Data *pd,
Eina_Bool scroll)
elm_layout_signal_emit(pd->content_area, "elm,scroll,enable", "elm");
}
- _scroller_size_calc(obj);
elm_layout_sizing_eval(obj);
}
--
[EGIT] [tools/enventor] master 01/01: tools: arrange mirror mode tooltip direction.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=ccbf9d65c6602e05cb55dabbde1ed193f2212931
commit ccbf9d65c6602e05cb55dabbde1ed193f2212931
Author: Hermet Park <her...@hermet.pe.kr>
Date: Fri Mar 25 13:39:57 2016 +0900
tools: arrange mirror mode tooltip direction.
---
src/bin/tools.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/bin/tools.c b/src/bin/tools.c
index 030260c..d7588d2 100644
--- a/src/bin/tools.c
+++ b/src/bin/tools.c
@@ -198,7 +198,6 @@ tools_init(Evas_Object *parent)
//icon image is temporary, it should be changed to its own icon.
btn = tools_btn_create(box, "highlight", _("Mirror Mode (Ctrl + M)"),
mirror_cb);
- elm_object_tooltip_orient_set(btn, ELM_TOOLTIP_ORIENT_BOTTOM_RIGHT);
evas_object_size_hint_weight_set(btn, 0, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(btn, 0.0, EVAS_HINT_FILL);
elm_box_pack_end(box, btn);
--
[EGIT] [tools/enventor] master 01/01: statusbar: adjust statusbar tooltip direction.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=5bf80181186b0997710ef88b5026123a506572f9
commit 5bf80181186b0997710ef88b5026123a506572f9
Author: Hermet Park <her...@hermet.pe.kr>
Date: Fri Mar 25 13:45:39 2016 +0900
statusbar: adjust statusbar tooltip direction.
---
src/bin/statusbar.c | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/bin/statusbar.c b/src/bin/statusbar.c
index 8964d77..fc37b8a 100644
--- a/src/bin/statusbar.c
+++ b/src/bin/statusbar.c
@@ -246,6 +246,7 @@ view_scale_btn_cb(void *data, Evas_Object *obj, void
*event_info EINA_UNUSED)
static Evas_Object *
create_statusbar_btn(Evas_Object *layout, const char *image,
const char *part_name, const char *tooltip_msg,
+ Elm_Tooltip_Orient tooltip_orient,
Evas_Smart_Cb func, void *data)
{
Evas_Object *box = elm_box_add(layout);
@@ -264,7 +265,7 @@ create_statusbar_btn(Evas_Object *layout, const char *image,
elm_object_content_set(btn, img);
elm_object_tooltip_text_set(box, tooltip_msg);
- elm_object_tooltip_orient_set(box, ELM_TOOLTIP_ORIENT_TOP_RIGHT);
+ elm_object_tooltip_orient_set(box, tooltip_orient);
elm_box_pack_end(box, btn);
elm_object_part_content_set(layout, part_name, box);
@@ -316,14 +317,17 @@ stats_init(Evas_Object *parent)
//View Scale button
create_statusbar_btn(layout, "expand", "scale_btn",
"View Scale (Ctrl + Mouse Wheel)",
+ELM_TOOLTIP_ORIENT_TOP_RIGHT,
view_scale_btn_cb, sd);
//View Resize Button
create_statusbar_btn(layout, "expand", "resize_btn",
"Resize View Size",
+ELM_TOOLTIP_ORIENT_TOP,
view_resize_btn_cb, sd);
//View Invert Button
create_statusbar_btn(layout, "invert", "invert_btn",
"Invert View Size",
+ELM_TOOLTIP_ORIENT_TOP,
view_invert_btn_cb, sd);
sd->layout = layout;
--
[EGIT] [tools/enventor] master 01/01: edj_viewer: refactoring mirror mode code.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=9ed5a70ac8190f110043802a9b3f2be906b6bb13
commit 9ed5a70ac8190f110043802a9b3f2be906b6bb13
Author: Hermet Park <her...@hermet.pe.kr>
Date: Fri Mar 25 16:33:38 2016 +0900
edj_viewer: refactoring mirror mode code.
simpler and nicer code.
---
src/lib/edj_viewer.c | 26 +++---
src/lib/enventor_private.h | 3 +--
src/lib/enventor_smart.c | 2 +-
3 files changed, 9 insertions(+), 22 deletions(-)
diff --git a/src/lib/edj_viewer.c b/src/lib/edj_viewer.c
index 02f41d6..46c12e2 100644
--- a/src/lib/edj_viewer.c
+++ b/src/lib/edj_viewer.c
@@ -50,7 +50,6 @@ struct viewer_s
Eina_Bool edj_reload_need : 1;
Eina_Bool file_set_finished : 1;
- Eina_Bool mirror_mode : 1;
};
const char *PART_NAME = "part_name";
@@ -153,13 +152,6 @@ view_images_monitor_set(view_data *vd)
}
static void
-view_mirror_mode_update(view_data *vd)
-{
- if (!vd) return;
- edje_object_mirrored_set(vd->layout, vd->mirror_mode);
-}
-
-static void
view_obj_create_post_job(view_data *vd)
{
vd->file_set_finished = EINA_TRUE;
@@ -623,8 +615,6 @@ view_init(Evas_Object *enventor, const char *group,
vd->view_config_size.w = 0;
vd->view_config_size.h = 0;
- vd->mirror_mode = enventor_object_mirror_mode_get(vd->enventor);
-
return vd;
}
@@ -825,15 +815,6 @@ view_size_get(view_data *vd, Evas_Coord *w, Evas_Coord *h)
*h = vd->view_config_size.h;
}
-void
-view_mirror_mode_set(view_data *vd, Eina_Bool mirror_mode)
-{
- if (!vd) return;
-
- vd->mirror_mode = mirror_mode;
- view_mirror_mode_update(vd);
-}
-
Eina_List *
view_parts_list_get(view_data *vd)
{
@@ -904,3 +885,10 @@ view_part_state_set(view_data *vd, Eina_Stringshare *part,
vd->changed_part.state = state;
}
+void
+view_mirror_mode_update(view_data *vd)
+{
+ if (!vd || !vd->layout) return;
+ edje_object_mirrored_set(vd->layout,
+enventor_obj_mirror_mode_get(vd->enventor));
+}
diff --git a/src/lib/enventor_private.h b/src/lib/enventor_private.h
index 77f375e..7b3a37d 100644
--- a/src/lib/enventor_private.h
+++ b/src/lib/enventor_private.h
@@ -219,8 +219,7 @@ Evas_Object *view_obj_get(view_data *vd);
void view_new(view_data *vd, const char *group);
void view_part_highlight_set(view_data *vd, const char *part_name);
void view_dummy_set(view_data *vd, Eina_Bool dummy_on);
-void view_mirror_mode_set(view_data *vd, Eina_Bool mirror_mode);
-Eina_Bool view_mirror_mode_get(view_data *vd);
+void view_mirror_mode_update(view_data *vd);
void view_program_run(view_data *vd, const char *program);
Eina_Stringshare *view_group_name_get(view_data *vd);
void *view_data_get(view_data *vd);
diff --git a/src/lib/enventor_smart.c b/src/lib/enventor_smart.c
index 24f8b30..4138de6 100644
--- a/src/lib/enventor_smart.c
+++ b/src/lib/enventor_smart.c
@@ -546,7 +546,7 @@ _enventor_object_mirror_mode_set(Eo *obj EINA_UNUSED,
Eina_Bool mirror_mode)
{
pd->mirror_mode = !!mirror_mode;
- view_mirror_mode_set(VIEW_DATA, mirror_mode);
+ view_mirror_mode_update(VIEW_DATA);
}
EOLIAN static Eina_Bool
--
[EGIT] [tools/enventor] master 02/02: edc_parser: fix typo.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=665bcb9b55f54eb86b69675dd1196d9183af8521
commit 665bcb9b55f54eb86b69675dd1196d9183af8521
Author: Hermet Park <her...@hermet.pe.kr>
Date: Mon Mar 7 20:47:24 2016 +0900
edc_parser: fix typo.
---
src/lib/edc_parser.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/edc_parser.c b/src/lib/edc_parser.c
index ae042bb..af359d9 100644
--- a/src/lib/edc_parser.c
+++ b/src/lib/edc_parser.c
@@ -543,7 +543,7 @@ cur_state_thread_blocking(void *data, Ecore_Thread *thread
EINA_UNUSED)
while (temp_pos && (temp_pos < name_end))
{
space_pos = temp_pos;
- temp_pos++;
+ if (!(++temp_pos)) break;
temp_pos = strchr(temp_pos, ' ');
}
--
[EGIT] [tools/enventor] master 01/02: Revert "edc_parser: check null for code safety"
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=6280b1e6805d94791e233e369f7f38adacb11d59
commit 6280b1e6805d94791e233e369f7f38adacb11d59
Author: Hermet Park <her...@hermet.pe.kr>
Date: Mon Mar 7 20:45:11 2016 +0900
Revert "edc_parser: check null for code safety"
This reverts commit ed5c01209deb62b5a054217601d2048666c7a478.
---
src/lib/edc_parser.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/lib/edc_parser.c b/src/lib/edc_parser.c
index 7f25adc..ae042bb 100644
--- a/src/lib/edc_parser.c
+++ b/src/lib/edc_parser.c
@@ -543,7 +543,7 @@ cur_state_thread_blocking(void *data, Ecore_Thread *thread
EINA_UNUSED)
while (temp_pos && (temp_pos < name_end))
{
space_pos = temp_pos;
- if (++temp_pos) break;
+ temp_pos++;
temp_pos = strchr(temp_pos, ' ');
}
@@ -552,6 +552,7 @@ cur_state_thread_blocking(void *data, Ecore_Thread *thread
EINA_UNUSED)
while (temp_pos && (temp_pos < name_end))
{
tab_pos = temp_pos;
+ temp_pos++;
temp_pos = strchr(p, '\t');
}
--
[EGIT] [tools/enventor] master 01/01: edc_parser: remove unnecessary code.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=ea3d989d703db8e719d0e85e3a6248ee0cbaa561
commit ea3d989d703db8e719d0e85e3a6248ee0cbaa561
Author: Hermet Park <her...@hermet.pe.kr>
Date: Mon Mar 7 21:50:30 2016 +0900
edc_parser: remove unnecessary code.
---
src/lib/edc_parser.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/lib/edc_parser.c b/src/lib/edc_parser.c
index af359d9..025cf35 100644
--- a/src/lib/edc_parser.c
+++ b/src/lib/edc_parser.c
@@ -552,7 +552,6 @@ cur_state_thread_blocking(void *data, Ecore_Thread *thread
EINA_UNUSED)
while (temp_pos && (temp_pos < name_end))
{
tab_pos = temp_pos;
- temp_pos++;
temp_pos = strchr(p, '\t');
}
--
[EGIT] [tools/enventor] master 01/02: updated README
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=87820ee919125b397deb14349206bbb6f5f2bee4 commit 87820ee919125b397deb14349206bbb6f5f2bee4 Author: Hermet Park <her...@hermet.pe.kr> Date: Mon Mar 7 19:17:29 2016 +0900 updated README --- README | 58 ++ 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/README b/README index 7ef320d..466eafe 100644 --- a/README +++ b/README @@ -1,34 +1,34 @@ -[Enventor v0.7.0] - +[Enventor v0.8.0] + This is an EDC editor with some convenient functions. It was started near the begining of June 2013, so expecting it to do everything a mature script editor does is a bit premature. However, considering its young age, it does a lot. - - + + [Requirements] - + efl (>= 1.16.0) elementary (>= 1.16.0) - + Please note that some features may not quite function correctly or completely prior to EFL 1.16. Newer would be better. - + Please see the following sites for more information. - + http://www.enlightenment.org https://phab.enlightenment.org/w/projects/enventor/ -http://www.openhub.net/p/enventor - - +http://www.openhub.net/p/enventor + + [Compiling] - + Once you have met the requirements, compiling and installing is simple: - + $ ./autogen.sh $ make $ sudo make install $ sudo ldconfig (it may need on Linux System) - + [Short Cut Keys] - + Esc - Open/Close Menu F1 - About F2 - New @@ -39,7 +39,7 @@ F9 - Toggle Tools F10 - Toggle EDC Navigator F11 - Toggle Status F12 - Settings - + Ctrl+S - Quick Save + Update Live View Ctrl+I - Toggle Auto Indentation Ctrl+O - Toggle Auto Completion @@ -67,13 +67,13 @@ Ctrl+L - Go to line Ctrl+Home - Go to the Top line Ctrl+End - Go to the Bottom line Ctrl+Space - Search candidate keywords in the context - - + + [Command Line Usage] - + enventor --help enventor [input file] [output file] [-t] [-i image path] [-s sound path] [-f font path] [-d data path] - + input file = EDC file to open. If input file is skipped, Enventor will open a default template code with a temporary file. output file = EDJ file to store compiled file. If output file is skipped, Enventor will store the binary file to the temporary directory. -t = Open template menu when you launch Enventor @@ -81,27 +81,29 @@ output file = EDJ file to store compiled file. If output file is skipped, Envent -s = path to sound resources that the edc includes -f = path to font resources that the edc includes -d = path to data resources that the edc includes - + Examples of Enventor command line usage: $ enventor $ enventor -t $ enventor newfile.edc -t $ enventor sample.edc output.edj -i ./images -s ./sounds - - + + [Developers] - + Many developers have contributed to Enventor project. The following names are dedicated Enventor developers' names but there are more people who've gladly contributed for Enventor. For a complete list of contributors, See AUTHORS file. - + Copyright (C) 2013 - 2016 by: - + Hermet Park Jaehyun Cho Mykyta Biliavskyi Kateryna Fesyna +Tae-Hyup Kim Yunho Jeong Mincheol Seo Raoul Hecky - +Yurii Tsivun + And various contributors (See AUTHORS) - + --
[EGIT] [tools/enventor] master 01/01: updated AUTHORS
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=160489f60ee40ba9924da6c62b9fecce0ccb07a4 commit 160489f60ee40ba9924da6c62b9fecce0ccb07a4 Author: Hermet Park <her...@hermet.pe.kr> Date: Mon Mar 7 21:52:52 2016 +0900 updated AUTHORS --- AUTHORS | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS b/AUTHORS index 0529a32..c2fa004 100644 --- a/AUTHORS +++ b/AUTHORS @@ -25,3 +25,4 @@ Jee-Yong Um <jc9...@samsung.com> Tae-Hyup Kim <taehyub@samsung.com> Yurii Tsivun <y.tsi...@samsung.com> Yongheon Shin <yongheon.s...@samsung.com> +Vyacheslav Reutskiy <v.reuts...@samsung.com> --
[EGIT] [tools/enventor] master 03/03: Revert "Revert "Fix to apply Eo4.""
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=498c1259ebc7b3087af84bece94924c7b45e2673
commit 498c1259ebc7b3087af84bece94924c7b45e2673
Author: Hermet Park <her...@hermet.pe.kr>
Date: Tue Mar 8 16:53:27 2016 +0900
Revert "Revert "Fix to apply Eo4.""
This reverts commit e67a1d1607a846a0b7192cc735990ab35aa145d6.
0.8.0 was released. revert this again.
---
src/lib/edj_viewer.c | 3 +--
src/lib/enventor_smart.c | 12 +---
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/src/lib/edj_viewer.c b/src/lib/edj_viewer.c
index 2b28701..0a24dea 100644
--- a/src/lib/edj_viewer.c
+++ b/src/lib/edj_viewer.c
@@ -163,8 +163,7 @@ view_obj_create_post_job(view_data *vd)
if (vd->part_name) view_part_highlight_set(vd, vd->part_name);
- Eina_Bool ret;
- if (eo_do_ret(vd->enventor, ret, enventor_obj_dummy_parts_get()))
+ if (enventor_obj_dummy_parts_get(vd->enventor))
dummy_obj_new(vd->layout);
if (vd->changed_part.part)
diff --git a/src/lib/enventor_smart.c b/src/lib/enventor_smart.c
index 7b5c3a8..a5b118c 100644
--- a/src/lib/enventor_smart.c
+++ b/src/lib/enventor_smart.c
@@ -196,7 +196,7 @@ _enventor_object_evas_object_smart_add(Eo *obj,
Enventor_Object_Data *pd)
pd->obj = obj;
elm_widget_sub_object_parent_add(obj);
- eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
+ evas_obj_smart_add(eo_super(obj, MY_CLASS));
build_init();
autocomp_init();
@@ -288,10 +288,9 @@ EOLIAN static Eo *
_enventor_object_eo_base_constructor(Eo *obj,
Enventor_Object_Data *pd EINA_UNUSED)
{
- obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
- eo_do(obj,
- evas_obj_type_set(MY_CLASS_NAME_LEGACY),
- evas_obj_smart_callbacks_descriptions_set(_smart_callbacks));
+ obj = eo_constructor(eo_super(obj, MY_CLASS));
+ evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
+ evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
return obj;
}
@@ -759,8 +758,7 @@ enventor_object_add(Evas_Object *parent)
EAPI Eina_Bool
enventor_object_file_set(Evas_Object *obj, const char *file)
{
- Eina_Bool ret;
- return eo_do_ret(obj, ret, efl_file_set(file, NULL));
+ return efl_file_set(obj, file, NULL);
}
#include "enventor_object.eo.c"
--
[EGIT] [tools/enventor] master 02/03: Revert "Revert "editor: don't auto save always.""
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=3869e9acc882051892e0745977cb0c9549f9e0f7
commit 3869e9acc882051892e0745977cb0c9549f9e0f7
Author: Hermet Park <her...@hermet.pe.kr>
Date: Tue Mar 8 16:53:13 2016 +0900
Revert "Revert "editor: don't auto save always.""
This reverts commit aa6607c616d5a907a172bcfd8078fdd85b86b6c6.
0.8.0 was released. revert this again.
---
src/lib/edc_editor.c | 9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/lib/edc_editor.c b/src/lib/edc_editor.c
index 087bcee..0fd966c 100644
--- a/src/lib/edc_editor.c
+++ b/src/lib/edc_editor.c
@@ -1139,8 +1139,13 @@ static Eina_Bool
auto_save_timer_cb(void *data)
{
edit_data *ed = data;
- edit_save(ed, build_edc_path_get());
- build_edc();
+
+ //Avoid auto save if save has been already accomplished.
+ if (ed->edit_changed)
+ {
+edit_save(ed, build_edc_path_get());
+build_edc();
+ }
ed->auto_save_timer = NULL;
return ECORE_CALLBACK_CANCEL;
}
--
[EGIT] [tools/enventor] master 01/03: Revert "Revert "edc_editor: Support auto save to update preview.""
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=a3185bc64be3fb30b22d175d180f717ca7f4c5ae
commit a3185bc64be3fb30b22d175d180f717ca7f4c5ae
Author: Hermet Park <her...@hermet.pe.kr>
Date: Tue Mar 8 16:52:25 2016 +0900
Revert "Revert "edc_editor: Support auto save to update preview.""
This reverts commit b663d049dbfc9d63842930b5fa14f699da153eb7.
0.8.0 was released. revert this again.
---
src/lib/auto_comp.c| 4
src/lib/edc_editor.c | 37 +
src/lib/enventor_private.h | 2 ++
3 files changed, 43 insertions(+)
diff --git a/src/lib/auto_comp.c b/src/lib/auto_comp.c
index 664db9e..9754e62 100644
--- a/src/lib/auto_comp.c
+++ b/src/lib/auto_comp.c
@@ -506,6 +506,8 @@ list_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object
*obj EINA_UNUSED,
{
autocomp_data *ad = data;
ad->list = NULL;
+
+ edit_auto_save_timer_apply(ad->ed);
}
@@ -579,6 +581,8 @@ entry_tooltip_content_cb(void *data, Evas_Object *obj
EINA_UNUSED,
elm_list_go(ad->list);
evas_object_show(ad->list);
+ edit_auto_save_timer_cancel(ad->ed);
+
return ad->list;
}
diff --git a/src/lib/edc_editor.c b/src/lib/edc_editor.c
index f5a4c14..087bcee 100644
--- a/src/lib/edc_editor.c
+++ b/src/lib/edc_editor.c
@@ -13,6 +13,7 @@ const int MAX_LINE_DIGIT_CNT = 10;
const int SYNTAX_COLOR_SPARE_LINES = 42;
const double SYNTAX_COLOR_DEFAULT_TIME = 0.25;
const double SYNTAX_COLOR_SHORT_TIME = 0.025;
+const double AUTO_SAVE_TIME = 2.0;
typedef struct syntax_color_thread_data_s
{
@@ -48,6 +49,7 @@ struct editor_s
int right;
} bracket;
+ Ecore_Timer *auto_save_timer;
Ecore_Timer *syntax_color_timer;
Ecore_Thread *syntax_color_thread;
@@ -470,6 +472,8 @@ edit_changed_cb(void *data, Evas_Object *obj EINA_UNUSED,
void *event_info)
syntax_color_partial_update(ed, SYNTAX_COLOR_DEFAULT_TIME);
parser_bracket_cancel(ed->pd);
+
+ edit_auto_save_timer_apply(ed);
}
static void
@@ -564,6 +568,8 @@ ctxpopup_del_cb(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj EINA_UNUSED,
{
edit_data *ed = data;
ed->ctxpopup = NULL;
+
+ edit_auto_save_timer_apply(ed);
}
//This function is called when user press up/down key or mouse wheel up/down
@@ -725,6 +731,8 @@ candidate_list_show(edit_data *ed, char *text, char *cur,
char *selected)
evas_object_event_callback_add(ctxpopup, EVAS_CALLBACK_DEL,
ctxpopup_del_cb, ed);
ed->ctxpopup = ctxpopup;
elm_object_tree_focus_allow_set(ed->layout, EINA_FALSE);
+
+ edit_auto_save_timer_cancel(ed);
}
static void
@@ -1127,6 +1135,16 @@ edit_focused_cb(void *data, Evas_Object *obj EINA_UNUSED,
evas_object_smart_callback_call(ed->enventor, SIG_FOCUSED, NULL);
}
+static Eina_Bool
+auto_save_timer_cb(void *data)
+{
+ edit_data *ed = data;
+ edit_save(ed, build_edc_path_get());
+ build_edc();
+ ed->auto_save_timer = NULL;
+ return ECORE_CALLBACK_CANCEL;
+}
+
/*/
/* Externally accessible calls */
/*/
@@ -1884,5 +1902,24 @@ edit_redoundo(edit_data *ed, Eina_Bool undo)
edit_changed_set(ed, EINA_TRUE);
syntax_color_full_update(ed, EINA_TRUE);
+ edit_auto_save_timer_apply(ed);
+
return EINA_TRUE;
}
+
+void
+edit_auto_save_timer_apply(edit_data *ed)
+{
+ if (ed->auto_save_timer)
+ ecore_timer_del(ed->auto_save_timer);
+ ed->auto_save_timer = ecore_timer_add(AUTO_SAVE_TIME, auto_save_timer_cb,
+ ed);
+}
+
+void
+edit_auto_save_timer_cancel(edit_data *ed)
+{
+ if (ed->auto_save_timer)
+ ecore_timer_del(ed->auto_save_timer);
+ ed->auto_save_timer = NULL;
+}
diff --git a/src/lib/enventor_private.h b/src/lib/enventor_private.h
index c16e5e9..e1df42f 100644
--- a/src/lib/enventor_private.h
+++ b/src/lib/enventor_private.h
@@ -296,5 +296,7 @@ void edit_disabled_set(edit_data *ed, Eina_Bool disabled);
void edit_error_set(edit_data *ed, int line, const char *target);
void edit_text_insert(edit_data *ed, const char *text);
void edit_part_cursor_set(edit_data *ed, const char *group_name, const char
*part_name);
+void edit_auto_save_timer_apply(edit_data *ed);
+void edit_auto_save_timer_cancel(edit_data *ed);
#endif
--
[EGIT] [core/elementary] master 01/01: Revert "list: set internal box as homogeneous if no separator items are present"
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=89a2a7c134c8b5a9ab128c44db693c207bed55f3
commit 89a2a7c134c8b5a9ab128c44db693c207bed55f3
Author: Hermet Park <her...@hermet.pe.kr>
Date: Tue Mar 8 20:58:17 2016 +0900
Revert "list: set internal box as homogeneous if no separator items are
present"
This reverts commit 9f4c43c20dfa36e7a8be18278acf4336c13574d7.
I'm sorry but this causes a side effect(list sizing issue) at enventor.
And I couldn't find any mis-usage in enventor side.
We can't not accept this patch unless we figure the exact reason out.
---
src/lib/elm_list.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c
index 78c6804..14164dc 100644
--- a/src/lib/elm_list.c
+++ b/src/lib/elm_list.c
@@ -815,7 +815,6 @@ _items_fix(Evas_Object *obj)
const char *it_plain;
const char *it_compress;
const char *it_compress_odd;
- Eina_Bool separators = EINA_FALSE;
ELM_LIST_DATA_GET(obj, sd);
@@ -851,7 +850,6 @@ _items_fix(Evas_Object *obj)
if (mw > minw[1]) minw[1] = mw;
if (mh > minh[1]) minh[1] = mh;
}
-separators |= it->is_separator;
}
if ((minw[0] != sd->minw[0]) || (minw[1] != sd->minw[1]) ||
@@ -865,7 +863,6 @@ _items_fix(Evas_Object *obj)
}
i = 0;
- elm_box_homogeneous_set(sd->box, !separators);
EINA_LIST_FOREACH(sd->items, l, eo_it)
{
ELM_LIST_ITEM_DATA_GET(eo_it, it);
--
[EGIT] [tools/enventor] enventor-0.8 01/01: bump up version
hermet pushed a commit to branch enventor-0.8. http://git.enlightenment.org/tools/enventor.git/commit/?id=9291f9263ca2bb990b48ddc386d54dc4335d2c0d commit 9291f9263ca2bb990b48ddc386d54dc4335d2c0d Author: Hermet Park <her...@hermet.pe.kr> Date: Tue Mar 8 16:47:51 2016 +0900 bump up version --- NEWS | 8 +++- README | 2 +- configure.ac | 2 +- data/about/ABOUT | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index c21e4d7..c2d1980 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,13 @@ == -Enventor 0.8.0 +Enventor 0.8.1 == +Changes since Enventor 0.8.0: +- + +Fixes: + * Fix package build issue. + Changes since Enventor 0.7.0: - diff --git a/README b/README index 466eafe..abeaf08 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -[Enventor v0.8.0] +[Enventor v0.8.1] This is an EDC editor with some convenient functions. It was started near the begining of June 2013, so expecting it to do everything a mature script editor does is a bit premature. However, considering its young age, it does a lot. diff --git a/configure.ac b/configure.ac index 2808910..4235142 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## m4_define([v_maj], [0]) m4_define([v_min], [8]) -m4_define([v_mic], [0]) +m4_define([v_mic], [1]) #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]) diff --git a/data/about/ABOUT b/data/about/ABOUT index ced67e3..6f1d56b 100644 --- a/data/about/ABOUT +++ b/data/about/ABOUT @@ -1,4 +1,4 @@ -
[EGIT] [website/www-content] master 01/01: bump up enventor version
hermet pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=3b9175e70ad567816777bf4261dccc03b58c7538 commit 3b9175e70ad567816777bf4261dccc03b58c7538 Author: Hermet Park <her...@hermet.pe.kr> Date: Tue Mar 8 17:33:57 2016 +0900 bump up enventor version --- pages/download-latest.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/download-latest.txt b/pages/download-latest.txt index 5e0bc50..1195e2c 100644 --- a/pages/download-latest.txt +++ b/pages/download-latest.txt @@ -11,7 +11,7 @@ rage_v= 0.1.4 econnman_v= 1.1 epour_v = 0.6.0 -enventor_v= 0.7.0 +enventor_v= 0.8.1 eflete_v = 0.5.0 extn = .tar.gz --
[EGIT] [tools/enventor] master 01/01: fix makedist failure.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=5cc7bc477010af745b7d0f5f000581bf16a5425e commit 5cc7bc477010af745b7d0f5f000581bf16a5425e Author: Hermet Park <her...@hermet.pe.kr> Date: Tue Mar 8 16:34:21 2016 +0900 fix makedist failure. include missing resources. --- data/themes/default/images/Makefile.am | 4 +++- src/include/Makefile.am| 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/data/themes/default/images/Makefile.am b/data/themes/default/images/Makefile.am index a35e749..814c3c7 100644 --- a/data/themes/default/images/Makefile.am +++ b/data/themes/default/images/Makefile.am @@ -79,4 +79,6 @@ EXTRA_DIST = \ navi_text.png \ navi_textblock.png \ navi_spacer.png \ - navi_unknown.png + navi_unknown.png \ + navi_state.png \ + navi_program.png diff --git a/src/include/Makefile.am b/src/include/Makefile.am index 2875f75..3665827 100644 --- a/src/include/Makefile.am +++ b/src/include/Makefile.am @@ -15,4 +15,5 @@ EXTRA_DIST = common.h \ search.h \ live_edit.h \ console.h \ - file_mgr.h + file_mgr.h \ + edc_navigator.h --
[EGIT] [tools/enventor] master 01/01: editor: fix initial max line 0 issue.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=7795dbe1012864d5d1d9efbaa86195f5c249bd27
commit 7795dbe1012864d5d1d9efbaa86195f5c249bd27
Author: Hermet Park <her...@hermet.pe.kr>
Date: Sat Mar 5 00:26:41 2016 +0900
editor: fix initial max line 0 issue.
Update max line correctly of the statusbar.
This fix brought Enventor_Max_Line passed away
because Enventor_Cursor_Line can be used instead.
@fix
---
src/bin/main.c| 4 +++-
src/lib/Enventor_Legacy.h | 8 ++--
src/lib/edc_editor.c | 25 ++---
3 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/src/bin/main.c b/src/bin/main.c
index 2b5c558..a46459f 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -392,7 +392,7 @@ enventor_cursor_line_changed_cb(void *data EINA_UNUSED,
Evas_Object *obj,
void *event_info)
{
Enventor_Cursor_Line *cur_line = (Enventor_Cursor_Line *)event_info;
- stats_line_num_update(cur_line->line, enventor_object_max_line_get(obj));
+ stats_line_num_update(cur_line->cur_line, cur_line->max_line);
}
static void
@@ -520,6 +520,8 @@ static void
enventor_setup(app_data *ad)
{
Evas_Object *enventor = enventor_object_add(base_layout_get());
+ evas_object_smart_callback_add(enventor, "max_line,changed",
+ enventor_cursor_line_changed_cb, ad);
evas_object_smart_callback_add(enventor, "cursor,line,changed",
enventor_cursor_line_changed_cb, ad);
evas_object_smart_callback_add(enventor, "cursor,group,changed",
diff --git a/src/lib/Enventor_Legacy.h b/src/lib/Enventor_Legacy.h
index 829f93c..3e1b54d 100644
--- a/src/lib/Enventor_Legacy.h
+++ b/src/lib/Enventor_Legacy.h
@@ -50,16 +50,12 @@ typedef struct
typedef struct
{
- int line;
+ int cur_line;
+ int max_line;
} Enventor_Cursor_Line;
typedef struct
{
- int line;
-} Enventor_Max_Line;
-
-typedef struct
-{
Eina_Bool self_changed : 1;
} Enventor_EDC_Modified;
diff --git a/src/lib/edc_editor.c b/src/lib/edc_editor.c
index e08aa16..999400b 100644
--- a/src/lib/edc_editor.c
+++ b/src/lib/edc_editor.c
@@ -800,7 +800,8 @@ cur_line_pos_set(edit_data *ed, Eina_Bool force)
ed->cur_line = line;
Enventor_Cursor_Line cur_line;
- cur_line.line = line;
+ cur_line.cur_line = line;
+ cur_line.max_line = ed->line_max;
evas_object_smart_callback_call(ed->enventor, SIG_CURSOR_LINE_CHANGED,
_line);
}
@@ -1008,7 +1009,6 @@ static Eina_Bool
edit_edc_load(edit_data *ed, const char *file_path)
{
char buf[MAX_LINE_DIGIT_CNT];
-
Eina_File *file = NULL;
Eina_Strbuf *strbuf_line = NULL;
Eina_Stringshare *group_name = NULL;
@@ -1093,10 +1093,11 @@ err:
if (utf8_edit) eina_file_map_free(file, utf8_edit);
if (file) eina_file_close(file);
- Enventor_Max_Line max_line;
- max_line.line = ed->line_max;
+ Enventor_Cursor_Line cursor_line;
+ cursor_line.cur_line = ed->cur_line;
+ cursor_line.max_line = ed->line_max;
evas_object_smart_callback_call(ed->enventor, SIG_MAX_LINE_CHANGED,
- _line);
+ _line);
if (ed->view_sync_cb)
ed->view_sync_cb(ed->view_sync_cb_data, NULL, 0.0, NULL, group_name);
@@ -1737,10 +1738,11 @@ edit_line_increase(edit_data *ed, int cnt)
}
elm_entry_calc_force(ed->en_line);
- Enventor_Max_Line max_line;
- max_line.line = ed->line_max;
+ Enventor_Cursor_Line cur_line;
+ cur_line.cur_line = ed->cur_line;
+ cur_line.max_line = ed->line_max;
evas_object_smart_callback_call(ed->enventor, SIG_MAX_LINE_CHANGED,
- _line);
+ _line);
}
void
@@ -1771,10 +1773,11 @@ edit_line_decrease(edit_data *ed, int cnt)
if (ed->line_max < 1) line_init(ed);
- Enventor_Max_Line max_line;
- max_line.line = ed->line_max;
+ Enventor_Cursor_Line cur_line;
+ cur_line.cur_line = ed->cur_line;
+ cur_line.max_line = ed->line_max;
evas_object_smart_callback_call(ed->enventor, SIG_MAX_LINE_CHANGED,
- _line);
+ _line);
}
void
--
[EGIT] [tools/enventor] master 01/01: editor: reset cursor position when edc is loaded.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=332bbeda4f4fca9c0857fae9bf1b3be94baf0c2b commit 332bbeda4f4fca9c0857fae9bf1b3be94baf0c2b Author: Hermet Park <her...@hermet.pe.kr> Date: Sat Mar 5 00:30:52 2016 +0900 editor: reset cursor position when edc is loaded. edc editor needs to reset cursor position when a edc is newly loaded. People granted this behavior. --- src/lib/edc_editor.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/lib/edc_editor.c b/src/lib/edc_editor.c index 999400b..4eabad7 100644 --- a/src/lib/edc_editor.c +++ b/src/lib/edc_editor.c @@ -1078,6 +1078,7 @@ edit_edc_load(edit_data *ed, const char *file_path) elm_entry_entry_append(ed->en_line, markup_line); free(markup_line); + ed->cur_line = 1; ed->line_max = line_num; group_name = parser_first_group_name_get(ed->pd, ed->en_edit); @@ -1104,6 +1105,8 @@ err: eina_stringshare_del(group_name); + elm_entry_cursor_pos_set(ed->en_edit, 0); + return ret; } --
[EGIT] [tools/enventor] master 01/01: statusbar: replace a group guide text with a group icon.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=e78aec8ef67e4b2ef7d7761d3fca7fccdfa70cef
commit e78aec8ef67e4b2ef7d7761d3fca7fccdfa70cef
Author: Hermet Park <her...@hermet.pe.kr>
Date: Fri Mar 4 23:58:13 2016 +0900
statusbar: replace a group guide text with a group icon.
---
data/themes/default/layout_common.edc | 57 +--
1 file changed, 8 insertions(+), 49 deletions(-)
diff --git a/data/themes/default/layout_common.edc
b/data/themes/default/layout_common.edc
index 2daf59b..7372723 100644
--- a/data/themes/default/layout_common.edc
+++ b/data/themes/default/layout_common.edc
@@ -10,6 +10,7 @@ images {
image: "pm_fill.png" COMP;
image: "full_logo.png" COMP;
image: "cursor_arrow.png" COMP;
+ image: "navi_group.png" COMP;
}
group { name: "about_layout";
@@ -2333,39 +2334,19 @@ group { name: "statusbar_layout";
align: 1 0.5;
}
}
- swallow { "group_btn";
+ image { "group_icon";
clip_to: "base_clip";
scale: 1;
- description { state: "default" 0.0;
-rel1.to_x: "elm.text.group[";
-rel2.to_x: "elm.text.group[";
-rel1.relative: 0.0 0.0;
-rel2.relative: 0.0 1.0;
-align: 1 0.5;
-min: 18 18;
-fixed: 1 0;
- }
- }
- part { name: "elm.text.group[";
- type: TEXT;
- clip_to: "base_clip";
- scale: 1;
- effect: SHADOW BOTTOM;
- description { state: "default" 0.0;
+ desc { "default";
rel1.to_x: "cursor_spacer";
rel2.to_x: "elm.text.group_name";
rel1.relative: 1.0 0.0;
rel2.relative: 0.0 1.0;
+rel1.offset: 0 1;
+min: 15 15;
+max: 15 15;
align: 1 0.5;
-color: COL_NM;
-text {
- text: "Group [";
- size: 11;
- align: 1 0.5;
- min: 1 0;
- max: 1 0;
- ellipsis: -1;
-}
+image.normal: "navi_group.png";
}
}
part { name: "elm.text.group_name";
@@ -2375,7 +2356,7 @@ group { name: "statusbar_layout";
effect: GLOW;
description { state: "default" 0.0;
rel1.to_x: "group_spacer";
-rel2.to_x: "elm.text.group]";
+rel2.to_x: "line_spacer";
rel1.relative: 0.0 0.0;
rel2.relative: 0.0 1.0;
align: 1 0.5;
@@ -2389,28 +2370,6 @@ group { name: "statusbar_layout";
}
}
}
- part { name: "elm.text.group]";
- type: TEXT;
- scale: 1;
- effect: SHADOW BOTTOM;
- clip_to: "base_clip";
- description {
-rel1.to_x: "line_spacer";
-rel1.relative: 0 0.0;
-rel2.to_x: "line_spacer";
-rel2.relative: 0 1.0;
-align: 1 0.5;
-fixed: 1 0;
-color: COL_NM;
-text {
- text: "]";
- size: 11;
- align: 1 0.5;
- min: 1 0;
- ellipsis: -1;
-}
- }
- }
part { name: "line_spacer";
type: SPACER;
scale: 1;
--
[EGIT] [tools/enventor] master 01/01: status: update line ui.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=da5134a165471a95e86f350341d244d4f0ffe1d0
commit da5134a165471a95e86f350341d244d4f0ffe1d0
Author: Hermet Park <her...@hermet.pe.kr>
Date: Sat Mar 5 00:06:35 2016 +0900
status: update line ui.
---
data/themes/default/layout_common.edc | 27 +++
1 file changed, 3 insertions(+), 24 deletions(-)
diff --git a/data/themes/default/layout_common.edc
b/data/themes/default/layout_common.edc
index 7372723..5c8712e 100644
--- a/data/themes/default/layout_common.edc
+++ b/data/themes/default/layout_common.edc
@@ -2406,7 +2406,7 @@ group { name: "statusbar_layout";
fixed: 1 0;
color: COL_NM;
text {
- text: "Line [";
+ text: "Line ";
size: 11;
align: 1 0.5;
min: 1 0;
@@ -2463,10 +2463,8 @@ group { name: "statusbar_layout";
scale: 1;
effect: GLOW;
description { state: "default" 0.0;
-rel1.to_x: "elm.text.line]";
-rel2.to_x: "elm.text.line]";
-rel1.relative: 0.0 0.0;
-rel2.relative: 0.0 1.0;
+rel1.relative: 1.0 0.0;
+rel2.relative: 1.0 1.0;
align: 1 0.5;
fixed: 1 0;
color: COL_HI;
@@ -2478,25 +2476,6 @@ group { name: "statusbar_layout";
}
}
}
- part { name: "elm.text.line]";
- type: TEXT;
- clip_to: "base_clip";
- scale: 1;
- effect: SHADOW BOTTOM;
- description { state: "default" 0.0;
-rel1.relative: 1 0;
-align: 1 0.5;
-fixed: 1 0;
-color: COL_NM;
-text {
- text: "]";
- size: 11;
- align: 1 0.5;
- min: 1 0;
- ellipsis: -1;
-}
- }
- }
part { name: "elm.text.info_msg";
type: TEXT;
scale: 1;
--
[EGIT] [tools/enventor] master 01/01: update status cursor image.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=683e13de47615bee387758bd3e11c52b7ce847c8 commit 683e13de47615bee387758bd3e11c52b7ce847c8 Author: Hermet Park <her...@hermet.pe.kr> Date: Sat Mar 5 00:02:54 2016 +0900 update status cursor image. --- data/themes/default/images/cursor_arrow.png | Bin 325 -> 264 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/data/themes/default/images/cursor_arrow.png b/data/themes/default/images/cursor_arrow.png index d02f5b0..c58b971 100644 Binary files a/data/themes/default/images/cursor_arrow.png and b/data/themes/default/images/cursor_arrow.png differ --
[EGIT] [tools/enventor] master 04/04: indent: add a comment to be fixed.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=8500ebbb80f0bae704b3aaf8c29287643bf07d01 commit 8500ebbb80f0bae704b3aaf8c29287643bf07d01 Author: Hermet Park <her...@hermet.pe.kr> Date: Mon Mar 7 22:35:53 2016 +0900 indent: add a comment to be fixed. --- src/lib/indent.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/indent.c b/src/lib/indent.c index 5622ed9..5096c3c 100644 --- a/src/lib/indent.c +++ b/src/lib/indent.c @@ -379,6 +379,7 @@ indent_code_lines_create(indent_data *id EINA_UNUSED, const char *utf8) code_lines = eina_list_append(code_lines, eina_stringshare_add(utf8_lexem)); else + //FIXME: Here stringshare occurs memory leak. :( code_lines = eina_list_append(code_lines, eina_stringshare_add_length(utf8_lexem, --
[EGIT] [tools/enventor] master 02/04: dummy_obj: don't allocate memory if the object is invalid.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=9b48678c70ac95c93302659ee08a8856b2f48166
commit 9b48678c70ac95c93302659ee08a8856b2f48166
Author: Hermet Park <her...@hermet.pe.kr>
Date: Mon Mar 7 22:28:57 2016 +0900
dummy_obj: don't allocate memory if the object is invalid.
---
src/lib/dummy_obj.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/lib/dummy_obj.c b/src/lib/dummy_obj.c
index f6d3e53..f8740d7 100644
--- a/src/lib/dummy_obj.c
+++ b/src/lib/dummy_obj.c
@@ -228,6 +228,8 @@ dummy_obj_update(Evas_Object *layout)
void
dummy_obj_new(Evas_Object *layout)
{
+ if (!layout) return;
+
dummy_obj *dummy = evas_object_data_get(layout, DUMMYOBJ);
if (dummy) return;
--
[EGIT] [tools/enventor] master 01/04: edc_editor: free string resources after it used.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=f26a4db6913ef356b5820f4d09020aad0beef0e1
commit f26a4db6913ef356b5820f4d09020aad0beef0e1
Author: Hermet Park <her...@hermet.pe.kr>
Date: Mon Mar 7 22:22:31 2016 +0900
edc_editor: free string resources after it used.
---
src/lib/edc_editor.c | 16 ++--
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/lib/edc_editor.c b/src/lib/edc_editor.c
index 8811169..151f19c 100644
--- a/src/lib/edc_editor.c
+++ b/src/lib/edc_editor.c
@@ -372,17 +372,17 @@ bracket_update(edit_data *ed)
Evas_Object *tb = elm_entry_textblock_get(ed->en_edit);
Evas_Textblock_Cursor *cur1 = evas_object_textblock_cursor_get(tb);
- char ch1, ch2;
- ch1 = -1;
- ch2 = -1;
+ char *ch1 = NULL;
+ char *ch2 = NULL;
- ch1 = evas_textblock_cursor_content_get(cur1)[0];
+ ch1 = evas_textblock_cursor_content_get(cur1);
Eina_Bool is_exist = evas_textblock_cursor_char_prev(cur1);
if (is_exist)
- ch2 = evas_textblock_cursor_content_get(cur1)[0];
+ ch2 = evas_textblock_cursor_content_get(cur1);
evas_textblock_cursor_char_next(cur1);
- if (ch1 != '{' && ch1 != '}' && ch2 != '{' && ch2 != '}')
+ if (is_exist && (*ch1 != '{') && (*ch1 != '}') && (*ch2 != '{')
+ && (*ch2 != '}'))
{
if (ed->bracket.prev_left != -1 && ed->bracket.prev_right != -1)
{
@@ -394,9 +394,13 @@ bracket_update(edit_data *ed)
syntax_color_partial_update(ed, SYNTAX_COLOR_SHORT_TIME);
}
+free(ch1);
+free(ch2);
return;
}
parser_bracket_find(ed->pd, ed->en_edit, bracket_changed_cb, ed);
+ free(ch1);
+ free(ch2);
}
static void
--
[EGIT] [tools/enventor] master 02/03: edc_editor: free string memory after use them.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=ce3b32741da06d7ca29ff201d426871c4f5e0dd1
commit ce3b32741da06d7ca29ff201d426871c4f5e0dd1
Author: Hermet Park <her...@hermet.pe.kr>
Date: Mon Mar 7 22:53:51 2016 +0900
edc_editor: free string memory after use them.
---
src/lib/edc_editor.c | 21 -
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/src/lib/edc_editor.c b/src/lib/edc_editor.c
index 151f19c..35c4ef4 100644
--- a/src/lib/edc_editor.c
+++ b/src/lib/edc_editor.c
@@ -182,12 +182,17 @@ error_highlight(edit_data *ed, Evas_Object *tb)
{
Evas_Textblock_Cursor *cur1 = evas_object_textblock_cursor_new(tb);
error_line_num_highlight(ed);
+ char *p;
if (ed->error_line != -1)
{
evas_textblock_cursor_line_set(cur1, ed->error_line);
evas_textblock_cursor_line_char_first(cur1);
-while(evas_textblock_cursor_content_get(cur1)[0] == ' ')
- evas_textblock_cursor_char_next(cur1);
+while((p = evas_textblock_cursor_content_get(cur1)) && (*p == ' '))
+ {
+ evas_textblock_cursor_char_next(cur1);
+ free(p);
+ }
+free(p);
evas_object_textblock_text_markup_prepend(cur1, "");
evas_textblock_cursor_line_char_last(cur1);
evas_object_textblock_text_markup_prepend(cur1, "");
@@ -203,8 +208,12 @@ error_highlight(edit_data *ed, Evas_Object *tb)
break;
}
evas_textblock_cursor_paragraph_char_first(cur1);
-while(evas_textblock_cursor_content_get(cur1)[0] == ' ')
- evas_textblock_cursor_char_next(cur1);
+while((p = evas_textblock_cursor_content_get(cur1)) && (*p == ' '))
+ {
+ evas_textblock_cursor_char_next(cur1);
+ free(p);
+ }
+free(p);
evas_object_textblock_text_markup_prepend(cur1, "");
evas_textblock_cursor_paragraph_char_last(cur1);
evas_object_textblock_text_markup_prepend(cur1, "");
@@ -477,7 +486,7 @@ ctxpopup_candidate_dismiss_cb(void *data, Evas_Object *obj,
elm_entry_cursor_line_end_set(ed->en_edit);
int end_pos = elm_entry_cursor_pos_get(ed->en_edit);
int i = 0;
- char *ch;
+ char *ch = NULL;
for (i = cur_pos; i <= end_pos; i++)
{
@@ -486,8 +495,10 @@ ctxpopup_candidate_dismiss_cb(void *data, Evas_Object *obj,
if (*ch == ';')
{
elm_entry_cursor_pos_set(ed->en_edit, i + 1);
+ free(ch);
break;
}
+free(ch);
}
evas_object_del(obj);
--
[EGIT] [tools/enventor] master 01/02: edc_parser: fix one more memory leak.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=55987e5774f1ce01baeb84abd00be9509ef239d1
commit 55987e5774f1ce01baeb84abd00be9509ef239d1
Author: Hermet Park <her...@hermet.pe.kr>
Date: Mon Mar 7 23:26:00 2016 +0900
edc_parser: fix one more memory leak.
---
src/lib/edc_parser.c | 5 +
1 file changed, 5 insertions(+)
diff --git a/src/lib/edc_parser.c b/src/lib/edc_parser.c
index 966885a..a8a4863 100644
--- a/src/lib/edc_parser.c
+++ b/src/lib/edc_parser.c
@@ -1342,12 +1342,14 @@ parser_collections_block_pos_get(const Evas_Object
*entry,
{
block = strchr(block, '\n');
*ret = block - utf8 + 1;
+ free(utf8);
return EINA_FALSE;
}
else if (*block == '{')
{
block = strchr(block, '\n');
*ret = block - utf8 + 1;
+ free(utf8);
return EINA_TRUE;
}
block++;
@@ -1364,14 +1366,17 @@ parser_collections_block_pos_get(const Evas_Object
*entry,
{
group_block = strchr(group_block, '\n');
*ret = group_block - utf8 + 1;
+ free(utf8);
return EINA_FALSE;
}
group_block++;
}
+ free(utf8);
return EINA_FALSE;
}
pos--;
}
+ free(utf8);
return EINA_FALSE;
}
--
[EGIT] [tools/enventor] master 02/02: indent: free code line resource properly.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=8f53a8d9cf8fbec81d3630384eb8695159e6b220 commit 8f53a8d9cf8fbec81d3630384eb8695159e6b220 Author: Hermet Park <her...@hermet.pe.kr> Date: Mon Mar 7 23:42:10 2016 +0900 indent: free code line resource properly. --- src/lib/indent.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/indent.c b/src/lib/indent.c index 5096c3c..892947f 100644 --- a/src/lib/indent.c +++ b/src/lib/indent.c @@ -892,6 +892,8 @@ indent_text_create(indent_data *id, eina_strbuf_free(buf); free(utf8_buf); + eina_list_free(code_lines); + if (indented_line_cnt) *indented_line_cnt = line_cnt; return indented_markup; } --
[EGIT] [tools/enventor] master 03/03: edc_editor: one more memory leak :(
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=79f10753fe2ff01343ed3916b42f5656b7592855
commit 79f10753fe2ff01343ed3916b42f5656b7592855
Author: Hermet Park <her...@hermet.pe.kr>
Date: Mon Mar 7 22:55:34 2016 +0900
edc_editor: one more memory leak :(
---
src/lib/edc_editor.c | 24 +---
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/lib/edc_editor.c b/src/lib/edc_editor.c
index 35c4ef4..0fd966c 100644
--- a/src/lib/edc_editor.c
+++ b/src/lib/edc_editor.c
@@ -513,7 +513,7 @@ ctxpopup_candidate_changed_cb(void *data, Evas_Object *obj
EINA_UNUSED,
{
edit_data *ed = data;
const char *text = event_info;
- char *ch;
+ char *ch = NULL;
int cur_pos, end_pos;
int i;
cur_pos = elm_entry_cursor_pos_get(ed->en_edit);
@@ -521,16 +521,18 @@ ctxpopup_candidate_changed_cb(void *data, Evas_Object
*obj EINA_UNUSED,
end_pos = elm_entry_cursor_pos_get(ed->en_edit);
for (i = cur_pos; i <= end_pos; i++)
- {
- elm_entry_cursor_pos_set(ed->en_edit, i);
- ch = elm_entry_cursor_content_get(ed->en_edit);
- if (!strcmp(ch, ";"))
-{
- //1 more space for end_pos to replace until ';'.
- end_pos = elm_entry_cursor_pos_get(ed->en_edit) + 1;
- break;
-}
- }
+ {
+elm_entry_cursor_pos_set(ed->en_edit, i);
+ch = elm_entry_cursor_content_get(ed->en_edit);
+if (!strcmp(ch, ";"))
+ {
+ //1 more space for end_pos to replace until ';'.
+ end_pos = elm_entry_cursor_pos_get(ed->en_edit) + 1;
+ free(ch);
+ break;
+ }
+free(ch);
+ }
elm_entry_select_region_set(ed->en_edit, cur_pos, end_pos);
--
[EGIT] [tools/enventor] master 01/03: console: free memory after used it.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=135af1a13ff8fbc706f302a79e6472994a20ef8f
commit 135af1a13ff8fbc706f302a79e6472994a20ef8f
Author: Hermet Park <her...@hermet.pe.kr>
Date: Mon Mar 7 22:41:31 2016 +0900
console: free memory after used it.
---
src/bin/console.c | 9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/bin/console.c b/src/bin/console.c
index 92c1184..29e7b33 100644
--- a/src/bin/console.c
+++ b/src/bin/console.c
@@ -39,7 +39,7 @@ error_word_select(Evas_Object *console)
//find error word position
const char *entry_text = enventor_object_text_get(base_enventor_get());
-const char *utf8 = elm_entry_markup_to_utf8(entry_text);
+char *utf8 = elm_entry_markup_to_utf8(entry_text);
enventor_object_line_goto(base_enventor_get(), atoi(error_line));
int pos = enventor_object_cursor_pos_get(base_enventor_get());
@@ -48,12 +48,17 @@ error_word_select(Evas_Object *console)
const char *matched = strstr(search_line, error_word);
if (matched == NULL)
- return;
+ {
+ free(utf8);
+ return;
+ }
int start, end;
start = matched - utf8;
end = start + strlen(error_word);
+free(utf8);
+
//select error word
enventor_object_select_region_set(base_enventor_get(), start, end);
}
--
[EGIT] [tools/enventor] master 01/01: edc_parser: go away memory leaks!
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=f760fd414483c43d5700f22f940078aa9107848f
commit f760fd414483c43d5700f22f940078aa9107848f
Author: Hermet Park <her...@hermet.pe.kr>
Date: Mon Mar 7 23:04:40 2016 +0900
edc_parser: go away memory leaks!
---
src/lib/edc_parser.c | 18 +++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/lib/edc_parser.c b/src/lib/edc_parser.c
index 4dcaa95..966885a 100644
--- a/src/lib/edc_parser.c
+++ b/src/lib/edc_parser.c
@@ -1671,7 +1671,11 @@ parser_paragh_name_get(parser_data *pd EINA_UNUSED,
Evas_Object *entry)
{
cur += quot_len;
cur = strstr(cur, quot);
- if (!cur) return NULL;
+ if (!cur)
+ {
+ free(utf8);
+ return NULL;
+ }
cur += quot_len;
}
@@ -1687,7 +1691,11 @@ parser_paragh_name_get(parser_data *pd EINA_UNUSED,
Evas_Object *entry)
cur++;
}
- if (depth == 0) return NULL;
+ if (depth == 0)
+ {
+free(utf8);
+return NULL;
+ }
//2. Parse the paragraph Name
cur = stack[depth - 1];
@@ -1699,10 +1707,14 @@ parser_paragh_name_get(parser_data *pd EINA_UNUSED,
Evas_Object *entry)
{
group_info *gi = _list[i];
if (!strncmp(cur, gi->str, gi->len))
- return eina_stringshare_add_length(gi->str, gi->len);
+ {
+ free(utf8);
+ return eina_stringshare_add_length(gi->str, gi->len);
+ }
}
}
+ free(utf8);
return NULL;
}
--
[EGIT] [tools/enventor] master 03/04: edc_parser: remove memory leak.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=442c22e28a62c2b3cff4e7d4ca1bce970c9a2a72
commit 442c22e28a62c2b3cff4e7d4ca1bce970c9a2a72
Author: Hermet Park <her...@hermet.pe.kr>
Date: Mon Mar 7 22:30:16 2016 +0900
edc_parser: remove memory leak.
---
src/lib/edc_parser.c | 4
1 file changed, 4 deletions(-)
diff --git a/src/lib/edc_parser.c b/src/lib/edc_parser.c
index 025cf35..4dcaa95 100644
--- a/src/lib/edc_parser.c
+++ b/src/lib/edc_parser.c
@@ -655,10 +655,6 @@ type_init_thread_blocking(void *data, Ecore_Thread *thread
EINA_UNUSED)
eina_array_push(wh, eina_stringshare_add("W:"));
eina_array_push(wh, eina_stringshare_add("H:"));
- wh = eina_array_new(2);
- eina_array_push(wh, eina_stringshare_add("W:"));
- eina_array_push(wh, eina_stringshare_add("H:"));
-
memset(, 0x00, sizeof(parser_attr));
attr.keyword = eina_stringshare_add("max");
attr.value.strs = wh;
--
[EGIT] [tools/enventor] master 01/01: panes: free all transits when enventor is terminated.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=c03187f3cda66ece083b12c8fb49b2469a4851ea
commit c03187f3cda66ece083b12c8fb49b2469a4851ea
Author: Hermet Park <her...@hermet.pe.kr>
Date: Mon Mar 7 22:14:45 2016 +0900
panes: free all transits when enventor is terminated.
---
src/bin/panes.c | 42 ++
1 file changed, 42 insertions(+)
diff --git a/src/bin/panes.c b/src/bin/panes.c
index 6c990c4..0d4f3b7 100644
--- a/src/bin/panes.c
+++ b/src/bin/panes.c
@@ -16,6 +16,7 @@ typedef struct _pane_data
double origin;
double delta;
double last_size[2]; //when down the panes bar
+ Elm_Transit *transit;
} pane_data;
typedef struct _panes_data
@@ -89,17 +90,35 @@ h_unpress_cb(void *data, Evas_Object *obj, void *event_info
EINA_UNUSED)
}
static void
+horiz_transit_del_cb(void *data, Elm_Transit *transit EINA_UNUSED)
+{
+ panes_data *pd = data;
+ pd->horiz.transit = NULL;
+}
+
+static void
+vert_transit_del_cb(void *data, Elm_Transit *transit EINA_UNUSED)
+{
+ panes_data *pd = data;
+ pd->vert.transit = NULL;
+}
+
+static void
panes_h_full_view_cancel(panes_data *pd)
{
pd->horiz.origin = elm_panes_content_right_size_get(pd->horiz.obj);
pd->horiz.delta = pd->horiz.last_size[1] - pd->horiz.origin;
+ elm_transit_del(pd->horiz.transit);
+
Elm_Transit *transit = elm_transit_add();
elm_transit_effect_add(transit, transit_op_h, pd, NULL);
elm_transit_tween_mode_set(transit, ELM_TRANSIT_TWEEN_MODE_DECELERATE);
elm_transit_duration_set(transit, TRANSIT_TIME);
+ elm_transit_del_cb_set(transit, horiz_transit_del_cb, pd);
elm_transit_go(transit);
+ pd->horiz.transit = transit;
pd->horiz.state = PANES_SPLIT_VIEW;
}
@@ -116,12 +135,16 @@ panes_v_full_view_cancel(panes_data *pd)
config_console_size_set(DEFAULT_CONSOLE_SIZE);
}
+ elm_transit_del(pd->vert.transit);
+
Elm_Transit *transit = elm_transit_add();
+ elm_transit_del_cb_set(transit, vert_transit_del_cb, pd);
elm_transit_effect_add(transit, transit_op_v, pd, NULL);
elm_transit_tween_mode_set(transit, ELM_TRANSIT_TWEEN_MODE_DECELERATE);
elm_transit_duration_set(transit, TRANSIT_TIME);
elm_transit_go(transit);
+ pd->vert.transit = transit;
pd->vert.state = PANES_SPLIT_VIEW;
}
@@ -143,12 +166,16 @@ panes_text_editor_full_view(void)
pd->horiz.origin = origin;
pd->horiz.delta = 0.0 - pd->horiz.origin;
+ elm_transit_del(pd->horiz.transit);
+
Elm_Transit *transit = elm_transit_add();
elm_transit_effect_add(transit, transit_op_h, pd, NULL);
elm_transit_tween_mode_set(transit, ELM_TRANSIT_TWEEN_MODE_DECELERATE);
elm_transit_duration_set(transit, TRANSIT_TIME);
+ elm_transit_del_cb_set(transit, horiz_transit_del_cb, pd);
elm_transit_go(transit);
+ pd->horiz.transit = transit;
pd->horiz.state = PANES_TEXT_EDITOR_EXPAND;
}
@@ -170,12 +197,16 @@ panes_live_view_full_view(void)
pd->horiz.origin = origin;
pd->horiz.delta = 1.0 - pd->horiz.origin;
+ elm_transit_del(pd->horiz.transit);
+
Elm_Transit *transit = elm_transit_add();
elm_transit_effect_add(transit, transit_op_h, pd, NULL);
elm_transit_tween_mode_set(transit, ELM_TRANSIT_TWEEN_MODE_DECELERATE);
elm_transit_duration_set(transit, TRANSIT_TIME);
+ elm_transit_del_cb_set(transit, horiz_transit_del_cb, pd);
elm_transit_go(transit);
+ pd->horiz.transit = transit;
pd->horiz.state = PANES_LIVE_VIEW_EXPAND;
}
@@ -198,12 +229,15 @@ panes_editors_full_view(Eina_Bool full_view)
pd->vert.origin = elm_panes_content_right_size_get(pd->vert.obj);
pd->vert.delta = 0.0 - pd->vert.origin;
+elm_transit_del(pd->vert.transit);
Elm_Transit *transit = elm_transit_add();
elm_transit_effect_add(transit, transit_op_v, pd, NULL);
elm_transit_tween_mode_set(transit, ELM_TRANSIT_TWEEN_MODE_DECELERATE);
elm_transit_duration_set(transit, TRANSIT_TIME);
+elm_transit_del_cb_set(transit, vert_transit_del_cb, pd);
elm_transit_go(transit);
+pd->vert.transit = transit;
pd->vert.state = PANES_EDITORS_EXPAND;
}
else
@@ -232,12 +266,16 @@ panes_console_full_view(void)
pd->vert.origin = origin;
pd->vert.delta = 1.0 - pd->vert.origin;
+ elm_transit_del(pd->vert.transit);
+
Elm_Transit *transit = elm_transit_add();
elm_transit_effect_add(transit, transit_op_v, pd, NULL);
elm_transit_tween_mode_set(transit, ELM_TRANSIT_TWEEN_MODE_DECELERATE);
elm_transit_duration_set(transit, TRANSIT_TIME);
+ elm_transit_del_cb_set(transit, vert_transit_del_cb, pd);
elm_transit_go(transit);
+ pd->vert.transit = transit;
pd->vert.state = PANES_CONSOLE_EXPAND;
}
@@ -267,6 +305,8 @@ panes_term(void)
{
[EGIT] [tools/enventor] master 03/03: Revert "edc_editor: Support auto save to update preview."
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=b663d049dbfc9d63842930b5fa14f699da153eb7
commit b663d049dbfc9d63842930b5fa14f699da153eb7
Author: Hermet Park <her...@hermet.pe.kr>
Date: Tue Mar 8 10:17:25 2016 +0900
Revert "edc_editor: Support auto save to update preview."
This reverts commit 509b9bd6283bebc56beb11e2e485b19cd6c3f09f.
---
src/lib/auto_comp.c| 4
src/lib/edc_editor.c | 37 -
src/lib/enventor_private.h | 2 --
3 files changed, 43 deletions(-)
diff --git a/src/lib/auto_comp.c b/src/lib/auto_comp.c
index 9754e62..664db9e 100644
--- a/src/lib/auto_comp.c
+++ b/src/lib/auto_comp.c
@@ -506,8 +506,6 @@ list_del_cb(void *data, Evas *e EINA_UNUSED, Evas_Object
*obj EINA_UNUSED,
{
autocomp_data *ad = data;
ad->list = NULL;
-
- edit_auto_save_timer_apply(ad->ed);
}
@@ -581,8 +579,6 @@ entry_tooltip_content_cb(void *data, Evas_Object *obj
EINA_UNUSED,
elm_list_go(ad->list);
evas_object_show(ad->list);
- edit_auto_save_timer_cancel(ad->ed);
-
return ad->list;
}
diff --git a/src/lib/edc_editor.c b/src/lib/edc_editor.c
index 087bcee..f5a4c14 100644
--- a/src/lib/edc_editor.c
+++ b/src/lib/edc_editor.c
@@ -13,7 +13,6 @@ const int MAX_LINE_DIGIT_CNT = 10;
const int SYNTAX_COLOR_SPARE_LINES = 42;
const double SYNTAX_COLOR_DEFAULT_TIME = 0.25;
const double SYNTAX_COLOR_SHORT_TIME = 0.025;
-const double AUTO_SAVE_TIME = 2.0;
typedef struct syntax_color_thread_data_s
{
@@ -49,7 +48,6 @@ struct editor_s
int right;
} bracket;
- Ecore_Timer *auto_save_timer;
Ecore_Timer *syntax_color_timer;
Ecore_Thread *syntax_color_thread;
@@ -472,8 +470,6 @@ edit_changed_cb(void *data, Evas_Object *obj EINA_UNUSED,
void *event_info)
syntax_color_partial_update(ed, SYNTAX_COLOR_DEFAULT_TIME);
parser_bracket_cancel(ed->pd);
-
- edit_auto_save_timer_apply(ed);
}
static void
@@ -568,8 +564,6 @@ ctxpopup_del_cb(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj EINA_UNUSED,
{
edit_data *ed = data;
ed->ctxpopup = NULL;
-
- edit_auto_save_timer_apply(ed);
}
//This function is called when user press up/down key or mouse wheel up/down
@@ -731,8 +725,6 @@ candidate_list_show(edit_data *ed, char *text, char *cur,
char *selected)
evas_object_event_callback_add(ctxpopup, EVAS_CALLBACK_DEL,
ctxpopup_del_cb, ed);
ed->ctxpopup = ctxpopup;
elm_object_tree_focus_allow_set(ed->layout, EINA_FALSE);
-
- edit_auto_save_timer_cancel(ed);
}
static void
@@ -1135,16 +1127,6 @@ edit_focused_cb(void *data, Evas_Object *obj EINA_UNUSED,
evas_object_smart_callback_call(ed->enventor, SIG_FOCUSED, NULL);
}
-static Eina_Bool
-auto_save_timer_cb(void *data)
-{
- edit_data *ed = data;
- edit_save(ed, build_edc_path_get());
- build_edc();
- ed->auto_save_timer = NULL;
- return ECORE_CALLBACK_CANCEL;
-}
-
/*/
/* Externally accessible calls */
/*/
@@ -1902,24 +1884,5 @@ edit_redoundo(edit_data *ed, Eina_Bool undo)
edit_changed_set(ed, EINA_TRUE);
syntax_color_full_update(ed, EINA_TRUE);
- edit_auto_save_timer_apply(ed);
-
return EINA_TRUE;
}
-
-void
-edit_auto_save_timer_apply(edit_data *ed)
-{
- if (ed->auto_save_timer)
- ecore_timer_del(ed->auto_save_timer);
- ed->auto_save_timer = ecore_timer_add(AUTO_SAVE_TIME, auto_save_timer_cb,
- ed);
-}
-
-void
-edit_auto_save_timer_cancel(edit_data *ed)
-{
- if (ed->auto_save_timer)
- ecore_timer_del(ed->auto_save_timer);
- ed->auto_save_timer = NULL;
-}
diff --git a/src/lib/enventor_private.h b/src/lib/enventor_private.h
index e1df42f..c16e5e9 100644
--- a/src/lib/enventor_private.h
+++ b/src/lib/enventor_private.h
@@ -296,7 +296,5 @@ void edit_disabled_set(edit_data *ed, Eina_Bool disabled);
void edit_error_set(edit_data *ed, int line, const char *target);
void edit_text_insert(edit_data *ed, const char *text);
void edit_part_cursor_set(edit_data *ed, const char *group_name, const char
*part_name);
-void edit_auto_save_timer_apply(edit_data *ed);
-void edit_auto_save_timer_cancel(edit_data *ed);
#endif
--
[EGIT] [tools/enventor] master 02/03: Revert "editor: don't auto save always."
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=aa6607c616d5a907a172bcfd8078fdd85b86b6c6
commit aa6607c616d5a907a172bcfd8078fdd85b86b6c6
Author: Hermet Park <her...@hermet.pe.kr>
Date: Tue Mar 8 10:16:55 2016 +0900
Revert "editor: don't auto save always."
This reverts commit 3a2c08e6c5240f708cf67c208eaee66af7b68463.
Revert this temporarily for release enventor 0.8.0
---
src/lib/edc_editor.c | 9 ++---
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/src/lib/edc_editor.c b/src/lib/edc_editor.c
index 0fd966c..087bcee 100644
--- a/src/lib/edc_editor.c
+++ b/src/lib/edc_editor.c
@@ -1139,13 +1139,8 @@ static Eina_Bool
auto_save_timer_cb(void *data)
{
edit_data *ed = data;
-
- //Avoid auto save if save has been already accomplished.
- if (ed->edit_changed)
- {
-edit_save(ed, build_edc_path_get());
-build_edc();
- }
+ edit_save(ed, build_edc_path_get());
+ build_edc();
ed->auto_save_timer = NULL;
return ECORE_CALLBACK_CANCEL;
}
--
[EGIT] [tools/enventor] master 01/03: Revert "Fix to apply Eo4."
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=e67a1d1607a846a0b7192cc735990ab35aa145d6
commit e67a1d1607a846a0b7192cc735990ab35aa145d6
Author: Hermet Park <her...@hermet.pe.kr>
Date: Tue Mar 8 10:16:04 2016 +0900
Revert "Fix to apply Eo4."
This reverts commit b656f774d959a7dfac807f2756869bef3d24a102.
Revert this for enventor 0.8.0 release.
---
src/lib/edj_viewer.c | 3 ++-
src/lib/enventor_smart.c | 12 +++-
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/lib/edj_viewer.c b/src/lib/edj_viewer.c
index 0a24dea..2b28701 100644
--- a/src/lib/edj_viewer.c
+++ b/src/lib/edj_viewer.c
@@ -163,7 +163,8 @@ view_obj_create_post_job(view_data *vd)
if (vd->part_name) view_part_highlight_set(vd, vd->part_name);
- if (enventor_obj_dummy_parts_get(vd->enventor))
+ Eina_Bool ret;
+ if (eo_do_ret(vd->enventor, ret, enventor_obj_dummy_parts_get()))
dummy_obj_new(vd->layout);
if (vd->changed_part.part)
diff --git a/src/lib/enventor_smart.c b/src/lib/enventor_smart.c
index a5b118c..7b5c3a8 100644
--- a/src/lib/enventor_smart.c
+++ b/src/lib/enventor_smart.c
@@ -196,7 +196,7 @@ _enventor_object_evas_object_smart_add(Eo *obj,
Enventor_Object_Data *pd)
pd->obj = obj;
elm_widget_sub_object_parent_add(obj);
- evas_obj_smart_add(eo_super(obj, MY_CLASS));
+ eo_do_super(obj, MY_CLASS, evas_obj_smart_add());
build_init();
autocomp_init();
@@ -288,9 +288,10 @@ EOLIAN static Eo *
_enventor_object_eo_base_constructor(Eo *obj,
Enventor_Object_Data *pd EINA_UNUSED)
{
- obj = eo_constructor(eo_super(obj, MY_CLASS));
- evas_obj_type_set(obj, MY_CLASS_NAME_LEGACY);
- evas_obj_smart_callbacks_descriptions_set(obj, _smart_callbacks);
+ obj = eo_do_super_ret(obj, MY_CLASS, obj, eo_constructor());
+ eo_do(obj,
+ evas_obj_type_set(MY_CLASS_NAME_LEGACY),
+ evas_obj_smart_callbacks_descriptions_set(_smart_callbacks));
return obj;
}
@@ -758,7 +759,8 @@ enventor_object_add(Evas_Object *parent)
EAPI Eina_Bool
enventor_object_file_set(Evas_Object *obj, const char *file)
{
- return efl_file_set(obj, file, NULL);
+ Eina_Bool ret;
+ return eo_do_ret(obj, ret, efl_file_set(file, NULL));
}
#include "enventor_object.eo.c"
--
[EGIT] [tools/enventor] master 01/01: editor: don't auto save always.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=3a2c08e6c5240f708cf67c208eaee66af7b68463
commit 3a2c08e6c5240f708cf67c208eaee66af7b68463
Author: Hermet Park <her...@hermet.pe.kr>
Date: Sat Mar 5 11:17:15 2016 +0900
editor: don't auto save always.
If save has been accomplished, we can skip a auto save.
This auto save brings enventor unexpected error highlighting twice.
---
src/lib/edc_editor.c | 9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/lib/edc_editor.c b/src/lib/edc_editor.c
index 4eabad7..af96fbc 100644
--- a/src/lib/edc_editor.c
+++ b/src/lib/edc_editor.c
@@ -1122,8 +1122,13 @@ static Eina_Bool
auto_save_timer_cb(void *data)
{
edit_data *ed = data;
- edit_save(ed, build_edc_path_get());
- build_edc();
+
+ //Avoid auto save if save has been already accomplished.
+ if (ed->edit_changed)
+ {
+edit_save(ed, build_edc_path_get());
+build_edc();
+ }
ed->auto_save_timer = NULL;
return ECORE_CALLBACK_CANCEL;
}
--
[EGIT] [tools/enventor] master 01/01: remove unused compile warnings.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=6d2b4a01b415015e8d14617d8842725b6297bac9
commit 6d2b4a01b415015e8d14617d8842725b6297bac9
Author: Hermet Park <her...@hermet.pe.kr>
Date: Sat Mar 5 11:27:24 2016 +0900
remove unused compile warnings.
---
src/bin/main.c | 27 +++
src/bin/menu.c | 3 +--
src/bin/statusbar.c | 12
src/bin/tools.c | 6 +++---
src/lib/ctxpopup.c | 34 ++
src/lib/edc_parser.c | 1 -
src/lib/edj_viewer.c | 1 -
7 files changed, 25 insertions(+), 59 deletions(-)
diff --git a/src/bin/main.c b/src/bin/main.c
index a46459f..64f70b3 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -168,9 +168,9 @@ main_mouse_wheel_cb(void *data, int type EINA_UNUSED, void
*ev)
scale = config_view_scale_get();
enventor_object_live_view_scale_set(ad->enventor, scale);
-Evas_Coord w, h;
-config_view_size_get(, );
-enventor_object_live_view_size_set(base_enventor_get(), w, h);
+Evas_Coord ww, hh;
+config_view_size_get(, );
+enventor_object_live_view_size_set(base_enventor_get(), ww, hh);
//Just in live edit mode case.
live_edit_update();
@@ -211,7 +211,7 @@ main_mouse_wheel_cb(void *data, int type EINA_UNUSED, void
*ev)
}
static Evas_Object *
-tools_set(Evas_Object *enventor)
+tools_set(void)
{
Evas_Object *tools = tools_init(base_layout_get());
base_tools_set(tools);
@@ -388,7 +388,8 @@ elm_setup()
}
static void
-enventor_cursor_line_changed_cb(void *data EINA_UNUSED, Evas_Object *obj,
+enventor_cursor_line_changed_cb(void *data EINA_UNUSED,
+Evas_Object *obj EINA_UNUSED,
void *event_info)
{
Enventor_Cursor_Line *cur_line = (Enventor_Cursor_Line *)event_info;
@@ -456,7 +457,9 @@ enventor_program_run_cb(void *data EINA_UNUSED, Evas_Object
*obj EINA_UNUSED,
}
static void
-enventor_ctxpopup_activated_cb(void *data, Evas_Object *obj, void *event_info)
+enventor_ctxpopup_activated_cb(void *data EINA_UNUSED,
+ Evas_Object *obj EINA_UNUSED,
+ void *event_info)
{
Enventor_Ctxpopup_Type type = (Enventor_Ctxpopup_Type) event_info;
@@ -817,7 +820,7 @@ statusbar_set()
}
static void
-live_edit_set(Evas_Object *enventor, Evas_Object *tools)
+live_edit_set(Evas_Object *tools)
{
Evas_Object *trigger = tools_live_edit_get(tools);
live_edit_init(trigger);
@@ -903,8 +906,8 @@ init(app_data *ad, int argc, char **argv)
statusbar_set();
enventor_setup(ad);
file_mgr_init();
- Evas_Object *tools = tools_set(ad->enventor);
- live_edit_set(ad->enventor, tools);
+ Evas_Object *tools = tools_set();
+ live_edit_set(tools);
base_gui_show();
@@ -927,7 +930,7 @@ init(app_data *ad, int argc, char **argv)
}
static void
-term(app_data *ad)
+term(void)
{
menu_term();
live_edit_term();
@@ -947,13 +950,13 @@ int elm_main(int argc, char **argv)
if (!init(, argc, argv))
{
-term();
+term();
return 0;
}
elm_run();
- term();
+ term();
return 0;
}
diff --git a/src/bin/menu.c b/src/bin/menu.c
index 3894480..ae20669 100644
--- a/src/bin/menu.c
+++ b/src/bin/menu.c
@@ -315,10 +315,9 @@ exit_yes_btn_cb(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED,
}
static void
-exit_save_btn_cb(void *data, Evas_Object *obj EINA_UNUSED,
+exit_save_btn_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
- menu_data *md = data;
enventor_object_save(base_enventor_get(), config_input_path_get());
elm_exit();
}
diff --git a/src/bin/statusbar.c b/src/bin/statusbar.c
index 564c1f8..6d68fcb 100644
--- a/src/bin/statusbar.c
+++ b/src/bin/statusbar.c
@@ -27,12 +27,9 @@ stats_data *g_sd = NULL;
/*/
static void
-view_scale_slider_changed_cb(void *data, Evas_Object *obj,
+view_scale_slider_changed_cb(void *data EINA_UNUSED, Evas_Object *obj,
void *event_info EINA_UNUSED)
{
-
- stats_data *sd = data;
-
double scale = elm_slider_value_get(obj);
double rounded = ROUNDING(scale, 1);
@@ -88,10 +85,9 @@ view_invert_transit_end(void *data, Elm_Transit *transit
EINA_UNUSED)
}
static void
-view_invert_btn_cb(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
+view_invert_btn_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
+ void *event_info EINA_UNUSED)
{
- stats_data *sd = data;
-
invert_data *id = malloc(sizeof(invert_data));
Evas_Coord w, h;
@@ -110,7 +106,7 @@ view_invert_btn_cb(void *data, Evas_Object *obj, void
*event_info EINA_UNUSED)
}
static void
-view_resize_slider_changed_cb(void *data, E
[EGIT] [tools/enventor] master 01/01: remove compile warnings.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=964a31831d0e3fd342fdf0f024647896b1dda375
commit 964a31831d0e3fd342fdf0f024647896b1dda375
Author: Hermet Park <her...@hermet.pe.kr>
Date: Sat Mar 5 11:49:12 2016 +0900
remove compile warnings.
1. unused variable.
2. compare signed and unsigned
3. undelcared function call.
---
src/bin/edc_navigator.c | 10 ++
src/include/common.h| 3 ---
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/bin/edc_navigator.c b/src/bin/edc_navigator.c
index dcd81bc..bf00cad 100644
--- a/src/bin/edc_navigator.c
+++ b/src/bin/edc_navigator.c
@@ -1,5 +1,8 @@
#include "common.h"
+#define EDJE_EDIT_IS_UNSTABLE_AND_I_KNOW_ABOUT_IT
+#include
+
typedef struct edc_navigator_s
{
Evas_Object *genlist;
@@ -536,10 +539,9 @@ gl_program_content_get_cb(void *data EINA_UNUSED,
Evas_Object *obj,
static void
-gl_program_selected_cb(void *data, Evas_Object *obj EINA_UNUSED,
+gl_program_selected_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
void *event_info)
{
- navi_data *nd = data;
Elm_Object_Item *it = event_info;
find_program_proc(stats_group_name_get(), elm_object_item_text_get(it));
}
@@ -826,7 +828,7 @@ edc_navigator_group_update(const char *cur_group)
//Find a current group item and select it.
Elm_Object_Item *group_it = NULL;
- int cur_group_len = strlen(cur_group);
+ unsigned int cur_group_len = strlen(cur_group);
EINA_LIST_FOREACH(nd->group_items, l, it)
{
@@ -878,7 +880,7 @@ edc_navigator_reload(const char *cur_group)
Eina_List *l;
char *name;
Elm_Object_Item *it;
- int cur_group_len = strlen(cur_group);
+ unsigned int cur_group_len = strlen(cur_group);
EINA_LIST_FOREACH(nd->group_list, l, name)
{
diff --git a/src/include/common.h b/src/include/common.h
index fc319d7..907e280 100644
--- a/src/include/common.h
+++ b/src/include/common.h
@@ -1,9 +1,6 @@
#ifndef __COMMON_H__
#define __COMMON_H__
-typedef struct statusbar_s stats_data;
-
-
#define ENVENTOR_HELP_EXAMPLES \
"Examples of Enventor command line usage:\n \
$ enventor\n \
--
[EGIT] [tools/enventor] master 01/01: editor: restore error underline style.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=5900c6ac379533807789b23bd2e0ba5e26e10400
commit 5900c6ac379533807789b23bd2e0ba5e26e10400
Author: Hermet Park <her...@hermet.pe.kr>
Date: Sat Mar 5 11:13:35 2016 +0900
editor: restore error underline style.
---
data/themes/default/theme_ext.edc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/data/themes/default/theme_ext.edc
b/data/themes/default/theme_ext.edc
index 67362b3..5ad9e0b 100644
--- a/data/themes/default/theme_ext.edc
+++ b/data/themes/default/theme_ext.edc
@@ -13,9 +13,11 @@
#define ENABLED_TEXTBLOCK_TAGS\
tag: "hilight" "+ style=glow glow_color=#3388ddaa";\
+ tag: "error" "+ underline=single underline_color=#ff
underline2_color=#ff"; \
#define DISABLED_TEXTBLOCK_TAGS \
tag: "hilight" "+ style=glow glow_color=#3399ff20";\
+ tag: "error" "+ underline=single underline_color=#ff
underline2_color=#ff"; \
group { name: "elm/scroller/base/enventor";
images.image: "inset_shadow.png" COMP;
--
[EGIT] [tools/enventor] master 01/01: remove compile warnings.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=6428fd4ede06400d53cbaa2d82f27fd6ef07f158
commit 6428fd4ede06400d53cbaa2d82f27fd6ef07f158
Author: Hermet Park <her...@hermet.pe.kr>
Date: Sat Mar 5 11:40:18 2016 +0900
remove compile warnings.
insert brackets to declare structure initial values clearly.
---
src/lib/ctxpopup.c | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/lib/ctxpopup.c b/src/lib/ctxpopup.c
index 9d3b160..5c7469f 100644
--- a/src/lib/ctxpopup.c
+++ b/src/lib/ctxpopup.c
@@ -43,16 +43,16 @@ typedef struct preset_colors_data_s
static rgba_value preset_cur_color;
static preset_colors_data preset_colors =
- { 0,
- 255, 0, 0, 255,
- 0, 255, 0, 255,
- 0, 0, 255, 255,
- 255, 255, 0, 255,
- 255, 0, 255, 255,
- 0, 255, 255, 255,
- 0, 0, 0, 255,
- 255, 255, 255, 255,
- 128, 128, 128, 255};
+ { EINA_FALSE,
+ {{255, 0, 0, 255},
+ {0, 255, 0, 255},
+ {0, 0, 255, 255},
+ {255, 255, 0, 255},
+ {255, 0, 255, 255},
+ {0, 255, 255, 255},
+ {0, 0, 0, 255},
+ {255, 255, 255, 255},
+ {128, 128, 128, 255}}};
/*/
/* Internal method implementation*/
--
[EGIT] [tools/enventor] master 01/01: edj_viewer: fix a problem that live view failed to update images.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=3f8dfe944c4477a20bb1997ca48e52c1473c2f27
commit 3f8dfe944c4477a20bb1997ca48e52c1473c2f27
Author: Hermet Park <her...@hermet.pe.kr>
Date: Sat Mar 5 13:02:18 2016 +0900
edj_viewer: fix a problem that live view failed to update images.
This problem scenario belongs to the image modification by an other process.
If an image size is very huge, live view possibly lost the image monitoring
because of asynchorous file handling.
Here solution is to update images repeatedly for those unexpected case.
@fix T3094
---
src/lib/edj_viewer.c | 109 +--
1 file changed, 88 insertions(+), 21 deletions(-)
diff --git a/src/lib/edj_viewer.c b/src/lib/edj_viewer.c
index 0bd8d03..0a24dea 100644
--- a/src/lib/edj_viewer.c
+++ b/src/lib/edj_viewer.c
@@ -25,7 +25,9 @@ struct viewer_s
Ecore_Idler *idler;
Ecore_Animator *animator;
- Ecore_Timer *timer;
+ Ecore_Timer *update_img_timer;
+ Ecore_Timer *update_edj_timer;
+ Ecore_Timer *edj_monitor_timer;
Eio_Monitor *edj_monitor;
Eina_List *img_monitors;
Eina_List *part_names;
@@ -63,15 +65,14 @@ exe_del_event_cb(void *data, int type, void *even);
/*/
static Eina_Bool
-img_changed_animator_cb(void *data)
+img_changed_timer_cb(void *data)
{
view_data *vd = data;
Eina_File *file = eina_file_open(eio_monitor_path_get(vd->img_monitor),
EINA_FALSE);
if (!file) return ECORE_CALLBACK_RENEW;
-
vd->edj_reload_need = EINA_TRUE;
- vd->timer = NULL;
+ vd->update_img_timer = NULL;
vd->img_monitor = NULL;
build_edc();
eina_file_close(file);
@@ -89,8 +90,11 @@ img_changed_cb(void *data, int type EINA_UNUSED, void *event)
{
if (ev->monitor != monitor) continue;
vd->img_monitor = monitor;
-ecore_timer_del(vd->timer);
-vd->timer = ecore_timer_add(0.025, img_changed_animator_cb, vd);
+ecore_timer_del(vd->update_img_timer);
+//FIXME: here 0.5 was confirmed by experimental way. But we need to
+//decide the time size based on the image file size in order that
+//we could update small images quickly but large images slowly.
+vd->update_img_timer = ecore_timer_add(1, img_changed_timer_cb, vd);
return ECORE_CALLBACK_DONE;
}
return ECORE_CALLBACK_PASS_ON;
@@ -353,21 +357,9 @@ view_obj_parts_callbacks_set(view_data *vd)
edje_edit_string_list_free(parts);
}
-static Eina_Bool
-exe_del_event_cb(void *data, int type EINA_UNUSED, void *event EINA_UNUSED)
+static void
+update_edj_file_internal(view_data *vd)
{
- view_data *vd = data;
-
- if (!vd->edj_reload_need) return ECORE_CALLBACK_PASS_ON;
-
- if (!edje_object_file_set(vd->layout, build_edj_path_get(), vd->group_name))
- {
-vd->del_cb(vd->data);
-view_term(vd);
-EINA_LOG_ERR("Failed to load edj file \"%s\"", build_edj_path_get());
-return ECORE_CALLBACK_DONE;
- }
-
view_images_monitor_set(vd);
view_obj_min_update(vd);
view_part_highlight_set(vd, vd->part_name);
@@ -382,11 +374,73 @@ exe_del_event_cb(void *data, int type EINA_UNUSED, void
*event EINA_UNUSED)
evas_object_smart_callback_call(vd->enventor, SIG_LIVE_VIEW_UPDATED,
edj_mgr_obj_get());
+}
+
+static Eina_Bool
+update_edj_file(void *data)
+{
+ view_data *vd = data;
+
+ if (!vd->edj_reload_need)
+ {
+vd->update_edj_timer = NULL;
+return ECORE_CALLBACK_DONE;
+ }
+
+ //wait for whether edj is generated completely.
+ Eina_File *file = eina_file_open(build_edj_path_get(), EINA_FALSE);
+ if (!file) return ECORE_CALLBACK_RENEW;
+ eina_file_close(file);
+
+ //Failed to load edj? I have no idea. Try again.
+ if (!edje_object_file_set(vd->layout, build_edj_path_get(), vd->group_name))
+ return ECORE_CALLBACK_RENEW;
+
+ update_edj_file_internal(vd);
+ vd->update_edj_timer = NULL;
+
+ return ECORE_CALLBACK_DONE;
+}
+
+static Eina_Bool
+exe_del_event_cb(void *data, int type EINA_UNUSED, void *event EINA_UNUSED)
+{
+ view_data *vd = data;
+
+ if (!vd->edj_reload_need) return ECORE_CALLBACK_PASS_ON;
+
+ //Failed to load edj? I have no idea. Try again.
+ if (!edje_object_file_set(vd->layout, build_edj_path_get(), vd->group_name))
+ {
+ecore_timer_del(vd->update_edj_timer);
+vd->update_edj_timer = ecore_timer_add(0.25, update_edj_file, vd);
+return ECORE_CALLBACK_PASS_ON;
+ }
+
+ update_edj_file_internal(vd);
return ECORE_CALLBACK_PASS_ON;
}
static Eina_Bool
+edj_monitor_timer_cb(void *data)
+{
+ view_data *vd = data;
+
+ Ei
[EGIT] [tools/enventor] master 02/02: add missing images part in a group template code.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=9caad87f12cc75df607c1bc27fcf78c25119c46f
commit 9caad87f12cc75df607c1bc27fcf78c25119c46f
Author: Hermet Park <her...@hermet.pe.kr>
Date: Fri Apr 1 16:42:28 2016 +0900
add missing images part in a group template code.
@fix
---
src/lib/template_code.h | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/lib/template_code.h b/src/lib/template_code.h
index efa735d..c0f1a7b 100644
--- a/src/lib/template_code.h
+++ b/src/lib/template_code.h
@@ -1,7 +1,11 @@
-#define TEMPLATE_GROUP_LINE_CNT 26
+#define TEMPLATE_GROUP_LINE_CNT 30
const char *TEMPLATE_GROUP[TEMPLATE_GROUP_LINE_CNT] =
{
+ " /* TODO: Please replace embedded image files to your application image
files. */",
+ " images {",
+ " image: \"ENVENTOR_EMBEDDED_LOGO.png\" COMP;",
+ " }",
" parts {",
" image { \"XXX\";",
" scale: 1;",
--
[EGIT] [tools/enventor] master 02/02: refactoring console code.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=09bf899aed6892202af2be07a14d9937862bcab9
commit 09bf899aed6892202af2be07a14d9937862bcab9
Author: Hermet Park <her...@hermet.pe.kr>
Date: Fri Apr 1 16:21:38 2016 +0900
refactoring console code.
just rewrite code for readibility.
no logic change.
---
src/bin/console.c | 21 -
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/bin/console.c b/src/bin/console.c
index 8f5b21d..dbdeb8b 100644
--- a/src/bin/console.c
+++ b/src/bin/console.c
@@ -64,16 +64,23 @@ error_word_select(Evas_Object *console)
}
static void
-make_single_error_msg(const char *src, char *dst)
+set_console_error_msg(Evas_Object *console, const char *src)
{
- /* We cut a error messages since it contains unnecessary information.
+ /* We cut error messages since it contains unnecessary information.
Most of the time, first one line has a practical information. */
const char *new_line = "";
const char *eol = strstr(src, new_line);
if (!eol) return;
- strncpy(dst, src, eol - src);
- dst[eol - src] = '\0';
+
+ char * single_error_msg = alloca((eol - src) + 1);
+ if (!single_error_msg) return;
+
+ strncpy(single_error_msg, src, eol - src);
+ single_error_msg[eol - src] = '\0';
+
+ elm_entry_entry_set(console, single_error_msg);
}
+
/*/
/* Externally accessible calls */
/*/
@@ -81,11 +88,7 @@ make_single_error_msg(const char *src, char *dst)
void
console_text_set(Evas_Object *console, const char *text)
{
- char * single_error_msg = NULL;
- single_error_msg = alloca(strlen(text) + 1);
- if (!single_error_msg) return;
- make_single_error_msg(text, single_error_msg);
- elm_entry_entry_set(console, single_error_msg);
+ set_console_error_msg(console, text);
error_word_select(console);
}
--
[EGIT] [tools/enventor] master 01/01: reverse live edit coordinates when mirror mode is enabled.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=a07d7c012068f8092cf3f93b8d0b5c3949942169
commit a07d7c012068f8092cf3f93b8d0b5c3949942169
Author: Hermet Park <her...@hermet.pe.kr>
Date: Tue Mar 29 20:07:46 2016 +0900
reverse live edit coordinates when mirror mode is enabled.
literally, the origin of the coordinates should be reversed on the mirrored
mode.
---
src/bin/live_edit.c | 117 ++--
src/bin/tools.c | 2 +
2 files changed, 69 insertions(+), 50 deletions(-)
diff --git a/src/bin/live_edit.c b/src/bin/live_edit.c
index d23abc7..d84dd5f 100644
--- a/src/bin/live_edit.c
+++ b/src/bin/live_edit.c
@@ -118,17 +118,33 @@ info_text_update(live_data *ld)
Evas_Coord lx, ly, lw, lh;
evas_object_geometry_get(ld->live_view, , , , );
+ Evas_Object *enventor = base_enventor_get();
+
+ //reverse coordinates if mirror mode is enabled.
+ double ox = ld->part_info.rel1_x;
+ double ox2 = ld->part_info.rel2_x;
+ double ow = (ld->part_info.rel1_x * (double) lw);
+ double ow2 = (ld->part_info.rel2_x * (double) lw);
+
+ if (enventor_object_mirror_mode_get(enventor))
+ {
+ox = 1 - ox;
+ox2 = 1 - ox2;
+ow = lw - ow;
+ow2 = lw - ow2;
+ }
+
//Rel1
snprintf(buf, sizeof(buf), "%.2f %.2f (%d, %d)",
-ld->part_info.rel1_x, ld->part_info.rel1_y,
-(int) round(ld->part_info.rel1_x * (double) lw),
+ox, ld->part_info.rel1_y,
+(int) round(ow),
(int) round(ld->part_info.rel1_y * (double) lh));
- evas_object_text_text_set(ld->info_text[Info_Text_Rel1], buf);
+ evas_object_text_text_set(ld->info_text[Info_Text_Rel1], buf);
//Rel2
snprintf(buf, sizeof(buf), "%.2f %.2f (%d, %d)",
-ld->part_info.rel2_x, ld->part_info.rel2_y,
-(int) round(ld->part_info.rel2_x * (double) lw),
+ox2, ld->part_info.rel2_y,
+(int) round(ow2),
(int) round(ld->part_info.rel2_y * (double) lh));
evas_object_text_text_set(ld->info_text[Info_Text_Rel2], buf);
@@ -137,9 +153,9 @@ info_text_update(live_data *ld)
config_view_size_get(, );
vw = (Evas_Coord) (((double) vw) *
-(ld->part_info.rel2_x - ld->part_info.rel1_x));
+ (ld->part_info.rel2_x - ld->part_info.rel1_x));
vh = (Evas_Coord) (((double) vh) *
-(ld->part_info.rel2_y - ld->part_info.rel1_y));
+ (ld->part_info.rel2_y - ld->part_info.rel1_y));
snprintf(buf, sizeof(buf), "[%d x %d]", vw, vh);
evas_object_text_text_set(ld->info_text[Info_Text_Size], buf);
@@ -920,6 +936,49 @@ live_edit_layer_set(live_data *ld)
info_text_init(ld);
}
+static void
+live_btn_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
+void *event_info EINA_UNUSED)
+{
+ live_edit_cancel();
+ goto_close();
+ search_close();
+
+ live_data *ld = g_ld;
+
+ ld->part_info.type = (unsigned int)(uintptr_t)data;
+ enventor_object_disabled_set(base_enventor_get(), EINA_TRUE);
+ ld->live_view = enventor_object_live_view_get(base_enventor_get());
+ ld->on = EINA_TRUE;
+
+ live_edit_layer_set(ld);
+
+ stats_info_msg_update(_("Double click the part to confirm. (Esc =
cancel)"));
+}
+
+static Evas_Object *
+live_btn_create(Evas_Object *parent, const char *name, void * data)
+{
+ Evas_Object *btn = elm_button_add(parent);
+ elm_object_style_set(btn, "enventor");
+ evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ elm_object_focus_allow_set(btn, EINA_FALSE);
+ char buf[128];
+ snprintf(buf, sizeof(buf), "Add %s", name);
+ elm_object_tooltip_text_set(btn, buf);
+ elm_object_tooltip_orient_set(btn, ELM_TOOLTIP_ORIENT_BOTTOM);
+
+ Evas_Object *img = elm_image_add(btn);
+ elm_image_file_set(img, EDJE_PATH, name);
+ elm_object_content_set(btn, img);
+
+ evas_object_smart_callback_add(btn, "clicked", live_btn_clicked_cb, data);
+ evas_object_show(btn);
+
+ return btn;
+}
+
void
live_edit_update(void)
{
@@ -940,6 +999,7 @@ Eina_Bool
live_edit_get(void)
{
live_data *ld = g_ld;
+ if (!ld) return EINA_FALSE;
return ld->on;
}
@@ -994,49 +1054,6 @@ live_edit_cancel(void)
return EINA_TRUE;
}
-static void
-live_btn_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED,
-void *event_info EINA_UNUSED)
-{
- live_edit_cancel();
- goto_close();
- search_close();
-
- live_data *ld = g_ld;
-
- ld->part_info.type = (unsigned int)(uintptr_t)data;
- enventor_object_disabled_set(base_enventor_get(), EINA_TRUE);
- ld->live_view = e
[EGIT] [core/efl] master 01/01: elput - update gitignore.
hermet pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=c7dbd127231416972dc0de32a264f8cb3dbecec3 commit c7dbd127231416972dc0de32a264f8cb3dbecec3 Author: Hermet Park <her...@hermet.pe.kr> Date: Thu Apr 14 20:02:09 2016 +0900 elput - update gitignore. ignore a generated pc file. --- pc/.gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/pc/.gitignore b/pc/.gitignore index bacff7b..f66395b 100644 --- a/pc/.gitignore +++ b/pc/.gitignore @@ -73,3 +73,4 @@ /emile.pc /efl-js.pc /elementary-cxx.pc +/elput.pc --
[EGIT] [tools/enventor] master 01/01: devel version is always higher than released version of enventor.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=8b28c062d9107746272556b10be977427e815c17 commit 8b28c062d9107746272556b10be977427e815c17 Author: Hermet Park <her...@hermet.pe.kr> Date: Thu Apr 14 19:31:52 2016 +0900 devel version is always higher than released version of enventor. by doing this, your enventor could work with enventor libaries of devel version. --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 2808910..920afec 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## m4_define([v_maj], [0]) m4_define([v_min], [8]) -m4_define([v_mic], [0]) +m4_define([v_mic], [99]) #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]) --
[EGIT] [tools/enventor] master 01/01: edc_navigator: support stop all programs.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=a4d4fb748c0405704b6ab18d1b6e13e27540ecf9
commit a4d4fb748c0405704b6ab18d1b6e13e27540ecf9
Author: Hermet Park <her...@hermet.pe.kr>
Date: Sat Apr 23 13:14:49 2016 +0900
edc_navigator: support stop all programs.
for this, added one more api, enventor_object_programs_stop()
---
data/themes/default/images.edc | 2 +
data/themes/default/images/Makefile.am | 3 +-
data/themes/default/images/navi_stop.png | Bin 0 -> 155 bytes
src/bin/edc_navigator.c | 67 +++
src/bin/main.c | 2 +-
src/lib/edj_viewer.c | 8
src/lib/enventor_object.eo | 2 +
src/lib/enventor_private.h | 1 +
src/lib/enventor_smart.c | 8
9 files changed, 84 insertions(+), 9 deletions(-)
diff --git a/data/themes/default/images.edc b/data/themes/default/images.edc
index 3a09b0c..c437f0d 100644
--- a/data/themes/default/images.edc
+++ b/data/themes/default/images.edc
@@ -37,6 +37,7 @@ images {
image: "navi_program.png" COMP;
image: "navi_unknown.png" COMP;
image: "navi_play.png" COMP;
+ image: "navi_stop.png" COMP;
}
#define ICON_GROUP(_group_name, _image_path) \
@@ -87,5 +88,6 @@ ICON_GROUP("navi_state", "navi_state.png")
ICON_GROUP("navi_program", "navi_program.png")
ICON_GROUP("navi_unknown", "navi_unknown.png")
ICON_GROUP("navi_play", "navi_play.png")
+ICON_GROUP("navi_stop", "navi_stop.png")
#undef ICON_GROUP
diff --git a/data/themes/default/images/Makefile.am
b/data/themes/default/images/Makefile.am
index 9aada26..e3899a3 100644
--- a/data/themes/default/images/Makefile.am
+++ b/data/themes/default/images/Makefile.am
@@ -84,5 +84,6 @@ EXTRA_DIST = \
navi_unknown.png \
navi_state.png \
navi_program.png \
- navi_play.png \
+ navi_play.png \
+ navi_stop.png \
bg_demo.png
diff --git a/data/themes/default/images/navi_stop.png
b/data/themes/default/images/navi_stop.png
new file mode 100644
index 000..6ef754b
Binary files /dev/null and b/data/themes/default/images/navi_stop.png differ
diff --git a/src/bin/edc_navigator.c b/src/bin/edc_navigator.c
index 5ad0827..8a4d758 100644
--- a/src/bin/edc_navigator.c
+++ b/src/bin/edc_navigator.c
@@ -738,6 +738,7 @@ static Evas_Object *
gl_program_content_get_cb(void *data EINA_UNUSED, Evas_Object *obj,
const char *part)
{
+ //1. Icon
if (!strcmp("elm.swallow.icon", part))
{
Evas_Object *image = elm_image_add(obj);
@@ -745,17 +746,30 @@ gl_program_content_get_cb(void *data EINA_UNUSED,
Evas_Object *obj,
return image;
}
- //play/stop button
+ //2. Play Button
program_it *pit = data;
- Evas_Object *btn = elm_button_add(obj);
+
+ //Box
+ Evas_Object *box = elm_box_add(obj);
+ elm_object_tooltip_text_set(box, "Play Program");
+
+ //Button
+ Evas_Object *btn = elm_button_add(box);
+ evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_scale_set(btn, 0.5);
evas_object_smart_callback_add(btn, "clicked", program_btn_clicked_cb,
pit);
+ evas_object_show(btn);
+
+ //Image
Evas_Object *img = elm_image_add(btn);
elm_image_file_set(img, EDJE_PATH, "navi_play");
elm_object_content_set(btn, img);
- return btn;
+ elm_box_pack_end(box, btn);
+
+ return box;
}
static void
@@ -814,6 +828,18 @@ sub_programs_update(navi_data *nd, programs_it *pit)
/* Programs Related */
static void
+programs_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info)
+{
+ programs_it *pit = data;
+ Evas_Object *enventor = base_enventor_get();
+ enventor_object_programs_stop(enventor);
+
+ if (!config_stats_bar_get()) return;
+
+ stats_info_msg_update(_("Stop all running programs."));
+}
+
+static void
programs_expand(programs_it *pit)
{
if (elm_genlist_item_expanded_get(pit->it)) return;
@@ -966,12 +992,39 @@ static Evas_Object *
gl_programs_content_get_cb(void *data EINA_UNUSED, Evas_Object *obj,
const char *part)
{
- if (strcmp("elm.swallow.icon", part)) return NULL;
+ //1. Icon
+ if (!strcmp("elm.swallow.icon", part))
+ {
+Evas_Object *image = elm_image_add(obj);
+elm_image_file_set(image, EDJE_PATH, "navi_program");
- Evas_Object *image = elm_image_add(obj);
- elm_image_file_set(image, EDJE_PATH, "navi_program");
+return image;
+ }
- return image;
+ //2. Stop All Button
+ programs_it
[EGIT] [tools/enventor] master 01/01: edc_navigator: optimize state update logic.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=6f9d51e28b7017579e42e682cbe81288c96e6ea9
commit 6f9d51e28b7017579e42e682cbe81288c96e6ea9
Author: Hermet Park <her...@hermet.pe.kr>
Date: Sat Apr 23 13:27:58 2016 +0900
edc_navigator: optimize state update logic.
don't need to flush every updation time.
we only update changed states.
---
src/bin/edc_navigator.c | 53 +++--
1 file changed, 47 insertions(+), 6 deletions(-)
diff --git a/src/bin/edc_navigator.c b/src/bin/edc_navigator.c
index 8a4d758..44aeef4 100644
--- a/src/bin/edc_navigator.c
+++ b/src/bin/edc_navigator.c
@@ -85,6 +85,8 @@ struct state_it_s
char *name;
Elm_Object_Item *it;
part_it *pit;
+
+ Eina_Bool discarded : 1;
};
struct program_it_s
@@ -653,23 +655,50 @@ gl_state_selected_cb(void *data, Evas_Object *obj
EINA_UNUSED,
static void
states_update(navi_data *nd, part_it *pit)
{
- navigator_states_clear(pit);
-
Evas_Object *enventor = base_enventor_get();
Eina_List *state_list = enventor_object_part_states_list_get(enventor,
pit->name);
- if (!state_list) return;
-
- //Append state list
char *name;
- Eina_List *l;
+ Eina_List *l, *ll;
state_it *sit;
int idx = 0;
+ if (!state_list)
+ {
+navigator_states_clear(pit);
+return;
+ }
+
+ //1. Prepare for validation.
+ EINA_LIST_FOREACH(pit->states, l, sit)
+ {
+sit->discarded = EINA_TRUE;
+sit->tag.idx = IDX_MAX;
+ }
+
+ //2. New States
EINA_LIST_FOREACH(state_list, l, name)
{
+Eina_Bool new_state = EINA_TRUE;
idx++;
+//Check if it is existed?
+EINA_LIST_FOREACH(pit->states, ll, sit)
+ {
+ if (!strcmp(name, sit->name) &&
+ (strlen(name) == strlen(sit->name)))
+ {
+ sit->discarded = EINA_FALSE;
+ new_state = EINA_FALSE;
+ //update index of the item
+ sit->tag.idx = idx;
+ break;
+ }
+
+ }
+if (!new_state) continue;
+
+//Ok, this state is newly added
sit = calloc(1, sizeof(state_it));
if (!sit)
{
@@ -695,6 +724,18 @@ states_update(navi_data *nd, part_it *pit)
pit->states = eina_list_append(pit->states, sit);
}
+ //3. Update states
+ EINA_LIST_FOREACH_SAFE(pit->states, l, ll, sit)
+ {
+//Remove them from the previous list.
+if (sit->discarded)
+ {
+ pit->states = eina_list_remove_list(pit->states, l);
+ navigator_state_free(sit);
+ continue;
+ }
+ }
+
edje_edit_string_list_free(state_list);
}
--
[EGIT] [tools/enventor] master 01/01: tiny optimization.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=087538ce0c77990cbbf0ea9fb2f96c83c8a7c2e6
commit 087538ce0c77990cbbf0ea9fb2f96c83c8a7c2e6
Author: Hermet Park <her...@hermet.pe.kr>
Date: Sat Apr 23 11:30:36 2016 +0900
tiny optimization.
sharing enventor string names.
---
src/bin/globals.c | 1 +
src/bin/live_edit.c| 2 +-
src/bin/menu.c | 4 ++--
src/bin/panes.c| 2 +-
src/bin/statusbar.c| 6 +++---
src/bin/text_setting.c | 2 +-
src/bin/tools.c| 2 +-
src/include/globals.h | 1 +
8 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/bin/globals.c b/src/bin/globals.c
index a6444d0..14da88e 100644
--- a/src/bin/globals.c
+++ b/src/bin/globals.c
@@ -2,3 +2,4 @@
const char *DEFAULT_EDC_FORMAT = "enventor_XX.edc";
char EDJE_PATH[PATH_MAX];
+const char *ENVENTOR_NAME = "enventor";
diff --git a/src/bin/live_edit.c b/src/bin/live_edit.c
index 221aca4..e837d24 100644
--- a/src/bin/live_edit.c
+++ b/src/bin/live_edit.c
@@ -1018,7 +1018,7 @@ static Evas_Object *
live_btn_create(Evas_Object *parent, const char *name, void * data)
{
Evas_Object *btn = elm_button_add(parent);
- elm_object_style_set(btn, "enventor");
+ elm_object_style_set(btn, ENVENTOR_NAME);
evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_object_focus_allow_set(btn, EINA_FALSE);
diff --git a/src/bin/menu.c b/src/bin/menu.c
index 7b35408..7522e28 100644
--- a/src/bin/menu.c
+++ b/src/bin/menu.c
@@ -247,7 +247,7 @@ about_open(menu_data *md)
//Back Button
Evas_Object *back_button = elm_button_add(layout);
- elm_object_style_set(back_button, "enventor");
+ elm_object_style_set(back_button, ENVENTOR_NAME);
elm_object_scale_set(back_button, 1.15);
elm_object_focus_allow_set(back_button, EINA_FALSE);
evas_object_show(back_button);
@@ -629,7 +629,7 @@ menu_open(menu_data *md)
//Back Button
Evas_Object *back_button = elm_button_add(layout);
- elm_object_style_set(back_button, "enventor");
+ elm_object_style_set(back_button, ENVENTOR_NAME);
elm_object_scale_set(back_button, 1.15);
elm_object_focus_allow_set(back_button, EINA_FALSE);
evas_object_show(back_button);
diff --git a/src/bin/panes.c b/src/bin/panes.c
index 573589c..8760a87 100644
--- a/src/bin/panes.c
+++ b/src/bin/panes.c
@@ -338,7 +338,7 @@ panes_init(Evas_Object *parent)
//Panes Horizontal
Evas_Object *panes_h = elm_panes_add(parent);
- elm_object_style_set(panes_h, "enventor");
+ elm_object_style_set(panes_h, ENVENTOR_NAME);
elm_panes_horizontal_set(panes_v, EINA_TRUE);
evas_object_size_hint_weight_set(panes_h, EVAS_HINT_EXPAND,
EVAS_HINT_EXPAND);
diff --git a/src/bin/statusbar.c b/src/bin/statusbar.c
index fc37b8a..0779c03 100644
--- a/src/bin/statusbar.c
+++ b/src/bin/statusbar.c
@@ -174,7 +174,7 @@ view_resize_btn_cb(void *data, Evas_Object *obj, void
*event_info EINA_UNUSED)
Evas_Object *ctxpopup = elm_ctxpopup_add(base_layout_get());
if (!ctxpopup) return;
- elm_object_style_set(ctxpopup, "enventor");
+ elm_object_style_set(ctxpopup, ENVENTOR_NAME);
elm_ctxpopup_direction_priority_set(ctxpopup, ELM_CTXPOPUP_DIRECTION_UP,
ELM_CTXPOPUP_DIRECTION_RIGHT,
ELM_CTXPOPUP_DIRECTION_LEFT,
@@ -215,7 +215,7 @@ view_scale_btn_cb(void *data, Evas_Object *obj, void
*event_info EINA_UNUSED)
//Ctxpopup
Evas_Object *ctxpopup = elm_ctxpopup_add(base_layout_get());
- elm_object_style_set(ctxpopup, "enventor");
+ elm_object_style_set(ctxpopup, ENVENTOR_NAME);
//Slider
Evas_Object *slider = elm_slider_add(ctxpopup);
@@ -252,7 +252,7 @@ create_statusbar_btn(Evas_Object *layout, const char *image,
Evas_Object *box = elm_box_add(layout);
Evas_Object *btn = elm_button_add(box);
- elm_object_style_set(btn, "enventor");
+ elm_object_style_set(btn, ENVENTOR_NAME);
elm_object_focus_allow_set(btn, EINA_FALSE);
evas_object_size_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(btn, EVAS_HINT_FILL, EVAS_HINT_FILL);
diff --git a/src/bin/text_setting.c b/src/bin/text_setting.c
index 22690fa..3a8b460 100644
--- a/src/bin/text_setting.c
+++ b/src/bin/text_setting.c
@@ -380,7 +380,7 @@ color_ctxpopup_create(text_setting_data *tsd,
elm_config_focus_autoscroll_mode_set(ELM_FOCUS_AUTOSCROLL_MODE_NONE);
- elm_object_style_set(ctxpopup, "enventor");
+ elm_object_style_set(ctxpopup, ENVENTOR_NAME);
evas_object_data_set(ctxpopup, "color_keyword", selected_color_keyword);
elm_ctxpopup_direction_priority_set(ctxpopup, ELM_CTXPOPUP_DIRECTION_RIGHT,
[EGIT] [tools/enventor] master 01/01: edc_navigator: fix item contents remaining bugs.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=2b7a8af2cebeaab71cf1bae708ce0237d2f63137
commit 2b7a8af2cebeaab71cf1bae708ce0237d2f63137
Author: Hermet Park <her...@hermet.pe.kr>
Date: Sat Apr 23 13:53:37 2016 +0900
edc_navigator: fix item contents remaining bugs.
Genlist reuses the contents unintendly.
Definitely, This is a genlist bug
and it looks a side effect of resuable contents feature. :(
---
src/bin/edc_navigator.c | 31 +--
1 file changed, 29 insertions(+), 2 deletions(-)
diff --git a/src/bin/edc_navigator.c b/src/bin/edc_navigator.c
index 44aeef4..507c97c 100644
--- a/src/bin/edc_navigator.c
+++ b/src/bin/edc_navigator.c
@@ -52,6 +52,8 @@ struct programs_it_s
Elm_Object_Item *it;
Eina_List *programs;
group_it *git;
+
+ Evas_Object *content; //Stop all programs
};
struct group_it_s
@@ -96,6 +98,8 @@ struct program_it_s
Elm_Object_Item *it;
programs_it *pit;
+ Evas_Object *content; //Play button
+
Eina_Bool discarded : 1;
};
@@ -775,6 +779,15 @@ gl_program_text_get_cb(void *data, Evas_Object *obj
EINA_UNUSED,
return strdup(spit->name);
}
+static void
+gl_program_del_cb(void *data, Evas_Object *obj EINA_UNUSED)
+{
+ //FIXME: Genlist reuses this content and it breaks edc navigator.
+ //This is an absolutely bug. This del_cb() is a workaround for this.
+ program_it *pit = data;
+ evas_object_del(pit->content);
+}
+
static Evas_Object *
gl_program_content_get_cb(void *data EINA_UNUSED, Evas_Object *obj,
const char *part)
@@ -810,6 +823,8 @@ gl_program_content_get_cb(void *data EINA_UNUSED,
Evas_Object *obj,
elm_box_pack_end(box, btn);
+ pit->content = box;
+
return box;
}
@@ -1029,9 +1044,17 @@ gl_programs_text_get_cb(void *data EINA_UNUSED,
Evas_Object *obj EINA_UNUSED,
return strdup("PROGRAMS");
}
+static void
+gl_programs_del_cb(void *data, Evas_Object *obj EINA_UNUSED)
+{
+ //FIXME: Genlist reuses this content and it breaks edc navigator.
+ //This is an absolutely bug. This del_cb() is a workaround for this.
+ programs_it *pit = data;
+ evas_object_del(pit->content);
+}
+
static Evas_Object *
-gl_programs_content_get_cb(void *data EINA_UNUSED, Evas_Object *obj,
- const char *part)
+gl_programs_content_get_cb(void *data, Evas_Object *obj, const char *part)
{
//1. Icon
if (!strcmp("elm.swallow.icon", part))
@@ -1065,6 +1088,8 @@ gl_programs_content_get_cb(void *data EINA_UNUSED,
Evas_Object *obj,
elm_box_pack_end(box, btn);
+ pit->content = box;
+
return box;
}
@@ -1544,6 +1569,7 @@ edc_navigator_init(Evas_Object *parent)
itc->item_style = "default";
itc->func.text_get = gl_programs_text_get_cb;
itc->func.content_get = gl_programs_content_get_cb;
+ itc->func.del = gl_programs_del_cb;
nd->programs_itc = itc;
@@ -1552,6 +1578,7 @@ edc_navigator_init(Evas_Object *parent)
itc->item_style = "default";
itc->func.text_get = gl_program_text_get_cb;
itc->func.content_get = gl_program_content_get_cb;
+ itc->func.del = gl_program_del_cb;
nd->program_itc = itc;
--
[EGIT] [tools/enventor] master 01/01: edc_navigator: ++safety.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=ce9c4ba4e5f3a54a8f6bdbb33103370414ca815d
commit ce9c4ba4e5f3a54a8f6bdbb33103370414ca815d
Author: Hermet Park <her...@hermet.pe.kr>
Date: Sat Apr 23 14:06:28 2016 +0900
edc_navigator: ++safety.
---
src/bin/edc_navigator.c | 26 ++
1 file changed, 26 insertions(+)
diff --git a/src/bin/edc_navigator.c b/src/bin/edc_navigator.c
index 507c97c..9f4f806 100644
--- a/src/bin/edc_navigator.c
+++ b/src/bin/edc_navigator.c
@@ -788,6 +788,15 @@ gl_program_del_cb(void *data, Evas_Object *obj EINA_UNUSED)
evas_object_del(pit->content);
}
+static void
+program_content_del_cb(void *data, Evas *e EINA_UNUSED,
+Evas_Object *obj EINA_UNUSED,
+void *event_info EINA_UNUSED)
+{
+ programs_it *pit = data;
+ pit->content = NULL;
+}
+
static Evas_Object *
gl_program_content_get_cb(void *data EINA_UNUSED, Evas_Object *obj,
const char *part)
@@ -803,9 +812,13 @@ gl_program_content_get_cb(void *data EINA_UNUSED,
Evas_Object *obj,
//2. Play Button
program_it *pit = data;
+ evas_object_del(pit->content);
+
//Box
Evas_Object *box = elm_box_add(obj);
elm_object_tooltip_text_set(box, "Play Program");
+ evas_object_event_callback_add(box, EVAS_CALLBACK_DEL,
+ program_content_del_cb, pit);
//Button
Evas_Object *btn = elm_button_add(box);
@@ -1053,6 +1066,15 @@ gl_programs_del_cb(void *data, Evas_Object *obj
EINA_UNUSED)
evas_object_del(pit->content);
}
+static void
+programs_content_del_cb(void *data, Evas *e EINA_UNUSED,
+Evas_Object *obj EINA_UNUSED,
+void *event_info EINA_UNUSED)
+{
+ programs_it *pit = data;
+ pit->content = NULL;
+}
+
static Evas_Object *
gl_programs_content_get_cb(void *data, Evas_Object *obj, const char *part)
{
@@ -1068,8 +1090,12 @@ gl_programs_content_get_cb(void *data, Evas_Object *obj,
const char *part)
//2. Stop All Button
programs_it *pit = data;
+ evas_object_del(pit->content);
+
//Box
Evas_Object *box = elm_box_add(obj);
+ evas_object_event_callback_add(box, EVAS_CALLBACK_DEL,
+ programs_content_del_cb, pit);
elm_object_tooltip_text_set(box, "Stop All Programs");
//Button
--
[EGIT] [tools/enventor] master 01/01: edc_navigator: add play button icon.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=97fbb51062cb4c17b6a67f00fd8073aabbcca58b commit 97fbb51062cb4c17b6a67f00fd8073aabbcca58b Author: Hermet Park <her...@hermet.pe.kr> Date: Sat Apr 23 11:43:47 2016 +0900 edc_navigator: add play button icon. --- data/themes/default/images/navi_play.png | Bin 312 -> 196 bytes src/bin/edc_navigator.c | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/themes/default/images/navi_play.png b/data/themes/default/images/navi_play.png index 2878856..98ce53c 100644 Binary files a/data/themes/default/images/navi_play.png and b/data/themes/default/images/navi_play.png differ diff --git a/src/bin/edc_navigator.c b/src/bin/edc_navigator.c index ed0335b..5ad0827 100644 --- a/src/bin/edc_navigator.c +++ b/src/bin/edc_navigator.c @@ -748,13 +748,13 @@ gl_program_content_get_cb(void *data EINA_UNUSED, Evas_Object *obj, //play/stop button program_it *pit = data; Evas_Object *btn = elm_button_add(obj); + elm_object_scale_set(btn, 0.5); evas_object_smart_callback_add(btn, "clicked", program_btn_clicked_cb, pit); -/* Evas_Object *img = elm_image_add(btn); elm_image_file_set(img, EDJE_PATH, "navi_play"); elm_object_content_set(btn, img); -*/ + return btn; } --
[EGIT] [tools/enventor] master 01/01: edc_navigator: deselect an selected item when user focuses on editing.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=0f6a9873cee207a26b10930a5d5917aecdaeda32
commit 0f6a9873cee207a26b10930a5d5917aecdaeda32
Author: Hermet Park <her...@hermet.pe.kr>
Date: Fri Apr 22 17:38:23 2016 +0900
edc_navigator: deselect an selected item when user focuses on editing.
---
src/bin/base_gui.c | 11 ++-
src/bin/edc_navigator.c | 40 ++--
src/bin/main.c | 11 +++
src/include/base_gui.h | 1 +
src/include/edc_navigator.h | 1 +
5 files changed, 57 insertions(+), 7 deletions(-)
diff --git a/src/bin/base_gui.c b/src/bin/base_gui.c
index 6ba4100..43a8b2a 100644
--- a/src/bin/base_gui.c
+++ b/src/bin/base_gui.c
@@ -94,6 +94,12 @@ void base_file_browser_toggle(Eina_Bool toggle)
elm_object_signal_emit(bd->layout, "elm,state,file_browser,hide", "");
}
+void base_edc_navigator_deselect(void)
+{
+ if (config_edc_navigator_get())
+ edc_navigator_deselect();
+}
+
void base_edc_navigator_toggle(Eina_Bool toggle)
{
base_data *bd = g_bd;
@@ -107,7 +113,10 @@ void base_edc_navigator_toggle(Eina_Bool toggle)
elm_object_signal_emit(bd->layout, "elm,state,edc_navigator,show", "");
}
else
- elm_object_signal_emit(bd->layout, "elm,state,edc_navigator,hide", "");
+ {
+elm_object_signal_emit(bd->layout, "elm,state,edc_navigator,hide", "");
+edc_navigator_deselect();
+ }
}
void
diff --git a/src/bin/edc_navigator.c b/src/bin/edc_navigator.c
index c83f865..ef23e23 100644
--- a/src/bin/edc_navigator.c
+++ b/src/bin/edc_navigator.c
@@ -27,6 +27,8 @@ typedef struct edc_navigator_s
Elm_Genlist_Item_Class *programs_itc;
Elm_Genlist_Item_Class *program_itc;
+ Eina_Bool selected : 1;
+
} navi_data;
typedef enum
@@ -112,6 +114,26 @@ static void programs_contract(programs_it *pit);
/*/
/* Internal method implementation*/
/*/
+static void
+gl_selected_cb(void *data, Evas_Object *obj, void *event_info)
+{
+ navi_data *nd = data;
+ nd->selected = EINA_TRUE;
+}
+
+static void
+gl_unselected_cb(void *data, Evas_Object *obj, void *event_info)
+{
+ navi_data *nd = data;
+ nd->selected = EINA_FALSE;
+}
+
+static void
+navigator_item_deselect(navi_data *nd)
+{
+ Elm_Object_Item *it = elm_genlist_selected_item_get(nd->genlist);
+ if (it) elm_genlist_item_selected_set(it, EINA_FALSE);
+}
static int
gl_comp_func(const void *pa, const void *pb)
@@ -626,7 +648,6 @@ gl_state_selected_cb(void *data, Evas_Object *obj
EINA_UNUSED,
state_it *sit = data;
find_state_proc(sit->pit->git->name, sit->pit->name,
part_type_get(sit->pit),
sit->name);
-
}
static void
@@ -1227,6 +1248,13 @@ gl_contract_request_cb(void *data, Evas_Object *obj,
void *event_info)
/*/
/* Externally accessible calls */
/*/
+void
+edc_navigator_deselect(void)
+{
+ navi_data *nd = g_nd;
+ if (!nd || !nd->selected) return;
+ navigator_item_deselect(nd);
+}
void
edc_navigator_group_update(const char *cur_group)
@@ -1235,11 +1263,7 @@ edc_navigator_group_update(const char *cur_group)
if (!nd) return;
//Cancel item selection if group was not indicated.
- if (!cur_group)
- {
-Elm_Object_Item *it = elm_genlist_selected_item_get(nd->genlist);
-if (it) elm_genlist_item_selected_set(it, EINA_FALSE);
- }
+ if (!cur_group) navigator_item_deselect(nd);
Eina_List *group_list = edje_file_collection_list(config_output_path_get());
unsigned int cur_group_len = 0;
@@ -1347,6 +1371,10 @@ edc_navigator_init(Evas_Object *parent)
gl_expand_request_cb, nd);
evas_object_smart_callback_add(genlist, "contract,request",
gl_contract_request_cb, nd);
+ evas_object_smart_callback_add(genlist, "selected",
+ gl_selected_cb, nd);
+ evas_object_smart_callback_add(genlist, "selected",
+ gl_unselected_cb, nd);
evas_object_size_hint_weight_set(genlist, EVAS_HINT_EXPAND,
EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(genlist, EVAS_HINT_FILL, EVAS_HINT_FILL);
diff --git a/src/bin/main.c b/src/bin/main.c
index 124ed08..30582dc 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -459,6 +459,7 @@ enventor_live_view_cursor_moved_cb(v
[EGIT] [tools/enventor] master 01/01: edc_navigator: store/restore auto contraction mode.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=386edb7ab55e2456c7bf5395070fcc425fc48cb8
commit 386edb7ab55e2456c7bf5395070fcc425fc48cb8
Author: Hermet Park <her...@hermet.pe.kr>
Date: Fri Apr 22 16:22:53 2016 +0900
edc_navigator: store/restore auto contraction mode.
---
src/bin/config_data.c | 18 ++
src/bin/edc_navigator.c | 15 +++
src/include/common.h | 2 +-
src/include/config_data.h | 2 ++
4 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/src/bin/config_data.c b/src/bin/config_data.c
index 6b3b98e..b9c0391 100644
--- a/src/bin/config_data.c
+++ b/src/bin/config_data.c
@@ -42,6 +42,7 @@ typedef struct config_s
Eina_Bool smart_undo_redo;
Eina_Bool file_browser;
Eina_Bool edc_navigator;
+ Eina_Bool auto_contract;
} config_data;
static config_data *g_cd = NULL;
@@ -189,6 +190,7 @@ config_load(void)
cd->smart_undo_redo = EINA_FALSE;
cd->file_browser = EINA_TRUE;
cd->edc_navigator = EINA_TRUE;
+cd->auto_contract = EINA_FALSE;
}
g_cd = cd;
@@ -310,6 +312,8 @@ eddc_init(void)
file_browser, EET_T_UCHAR);
EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, config_data, "edc_navigator",
edc_navigator, EET_T_UCHAR);
+ EET_DATA_DESCRIPTOR_ADD_BASIC(edd_base, config_data, "auto_contract",
+auto_contract, EET_T_UCHAR);
}
void
@@ -942,6 +946,20 @@ config_file_browser_get(void)
}
void
+config_auto_contract_set(Eina_Bool enabled)
+{
+ config_data *cd = g_cd;
+ cd->auto_contract = enabled;
+}
+
+Eina_Bool
+config_auto_contract_get(void)
+{
+ config_data *cd = g_cd;
+ return cd->auto_contract;
+}
+
+void
config_edc_navigator_set(Eina_Bool enabled)
{
config_data *cd = g_cd;
diff --git a/src/bin/edc_navigator.c b/src/bin/edc_navigator.c
index b2c25bb..c83f865 100644
--- a/src/bin/edc_navigator.c
+++ b/src/bin/edc_navigator.c
@@ -27,8 +27,6 @@ typedef struct edc_navigator_s
Elm_Genlist_Item_Class *programs_itc;
Elm_Genlist_Item_Class *program_itc;
- Eina_Bool auto_contract : 1;
-
} navi_data;
typedef enum
@@ -131,9 +129,10 @@ static void
check_changed_cb(void *data, Evas_Object *obj, void *event_info)
{
navi_data *nd = data;
- nd->auto_contract = elm_check_state_get(obj);
+ Eina_Bool auto_contract = elm_check_state_get(obj);
+ config_auto_contract_set(auto_contract);
- if (!nd->auto_contract) return;
+ if (!auto_contract) return;
// Contract all groups instantly.
Eina_List *l;
@@ -778,7 +777,7 @@ programs_expand(programs_it *pit)
sub_programs_update(pit->git->nd, pit);
//If auto contraction is enabled, then close other parts
- if (!(pit->git->nd->auto_contract)) return;
+ if (!config_auto_contract_get()) return;
//Contract part states
part_it *pit2;
@@ -1084,7 +1083,7 @@ part_expand(part_it *pit)
states_update(pit->git->nd, pit);
//If auto contraction is enabled, then close other parts and programs
- if (!(pit->git->nd->auto_contract)) return;
+ if (!config_auto_contract_get()) return;
//Contract other part states
part_it *pit2;
@@ -1129,7 +1128,7 @@ group_expand(group_it *git)
group_update(git->nd, git);
//If auto contraction is enabled, then close other parts
- if (!(git->nd->auto_contract)) return;
+ if (!config_auto_contract_get()) return;
//Contract other groups
group_it *git2;
@@ -1357,7 +1356,7 @@ edc_navigator_init(Evas_Object *parent)
//Check for genlist option
Evas_Object *check = elm_check_add(box);
elm_object_text_set(check, "Automatic Contraction");
- elm_check_state_set(check, EINA_FALSE);
+ elm_check_state_set(check, config_auto_contract_get());
evas_object_smart_callback_add(check, "changed", check_changed_cb, nd);
elm_object_focus_allow_set(check, EINA_FALSE);
evas_object_size_hint_weight_set(check, EVAS_HINT_EXPAND, 0);
diff --git a/src/include/common.h b/src/include/common.h
index 5736664..dc87c5d 100644
--- a/src/include/common.h
+++ b/src/include/common.h
@@ -54,7 +54,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.\n"
#define ROUNDING(x, dig) (floor((x) * pow(10, dig) + 0.5) / pow(10, dig))
-#define ENVENTOR_CONFIG_VERSION 8
+#define ENVENTOR_CONFIG_VERSION 9
#define EVENT_KEY_MODIFIER_CHECK(NAME, MASK) \
((MASK & ECORE_EVENT_MODIFIER_##NAME) && \
diff --git a/src/include/config_data.h b/src/include/config_data.h
index 3e0ca07..90d765e 100644
--- a/src/include/config_data.h
+++ b/src/include/config_data.h
@@ -63,3 +63,5 @@ void config_file_browser_set(Eina_Bool enabled);
Eina_Bool config_file_browser_get(void);
void config_edc_navigator_set(Eina_Bool enabled);
Eina_Bool config_edc_navigator_get(void);
+void config_auto_contract_set(Eina_Bool enabled);
+Eina_Bool config_auto_contract_get(void);
--
[EGIT] [tools/enventor] master 01/01: edc_navigator: feature extension.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=4ee083fdac5d91cbaab8283c54e38f187104d70a
commit 4ee083fdac5d91cbaab8283c54e38f187104d70a
Author: Hermet Park <her...@hermet.pe.kr>
Date: Fri Apr 22 15:39:24 2016 +0900
edc_navigator: feature extension.
Now this function has an option for auto contraction.
User could choose one of them for their taste.
---
src/bin/base_gui.c | 39 +-
src/bin/edc_navigator.c | 1030 ++-
src/bin/main.c |6 +-
src/include/base_gui.h |3 +-
src/include/edc_navigator.h |1 -
5 files changed, 739 insertions(+), 340 deletions(-)
diff --git a/src/bin/base_gui.c b/src/bin/base_gui.c
index 1282f8e..6ba4100 100644
--- a/src/bin/base_gui.c
+++ b/src/bin/base_gui.c
@@ -7,7 +7,6 @@ typedef struct base_s
Evas_Object *console;
Evas_Object *enventor;
Ecore_Timer *edc_navi_update_timer;
- Ecore_Timer *edc_navi_reload_timer;
Eina_Bool console_msg : 1;
} base_data;
@@ -34,25 +33,10 @@ win_resize_cb(void *data EINA_UNUSED, Evas *o EINA_UNUSED,
Evas_Object *obj,
}
static Eina_Bool
-edc_navigator_reload_timer_cb(void *data)
-{
- base_data *bd = data;
-
- edc_navigator_reload(stats_group_name_get());
-
- bd->edc_navi_reload_timer = NULL;
-
- return ECORE_CALLBACK_CANCEL;
-}
-
-static Eina_Bool
edc_navigator_update_timer_cb(void *data)
{
- base_data *bd = g_bd;
-
- const char *group_name = data;
- edc_navigator_group_update(group_name);
-
+ base_data *bd = data;
+ edc_navigator_group_update(stats_group_name_get());
bd->edc_navi_update_timer = NULL;
return ECORE_CALLBACK_CANCEL;
@@ -119,7 +103,7 @@ void base_edc_navigator_toggle(Eina_Bool toggle)
if (config_edc_navigator_get())
{
-base_edc_navigator_reload();
+base_edc_navigator_group_update();
elm_object_signal_emit(bd->layout, "elm,state,edc_navigator,show", "");
}
else
@@ -241,7 +225,6 @@ base_gui_term(void)
if (!bd) return;
ecore_timer_del(bd->edc_navi_update_timer);
- ecore_timer_del(bd->edc_navi_reload_timer);
file_browser_term();
edc_navigator_term();
panes_term();
@@ -251,7 +234,7 @@ base_gui_term(void)
}
void
-base_edc_navigator_group_update(const char *group_name)
+base_edc_navigator_group_update(void)
{
if (!config_edc_navigator_get()) return;
@@ -261,20 +244,6 @@ base_edc_navigator_group_update(const char *group_name)
ecore_timer_del(bd->edc_navi_update_timer);
bd->edc_navi_update_timer = ecore_timer_add(EDC_NAVIGATOR_UPDATE_TIME,
edc_navigator_update_timer_cb,
- group_name);
-}
-
-void
-base_edc_navigator_reload(void)
-{
- if (!config_edc_navigator_get()) return;
-
- base_data *bd = g_bd;
- if (!bd) return;
-
- ecore_timer_del(bd->edc_navi_reload_timer);
- bd->edc_navi_reload_timer = ecore_timer_add(EDC_NAVIGATOR_UPDATE_TIME,
- edc_navigator_reload_timer_cb,
bd);
}
diff --git a/src/bin/edc_navigator.c b/src/bin/edc_navigator.c
index 3ba946f..b2c25bb 100644
--- a/src/bin/edc_navigator.c
+++ b/src/bin/edc_navigator.c
@@ -3,20 +3,23 @@
#define EDJE_EDIT_IS_UNSTABLE_AND_I_KNOW_ABOUT_IT
#include
+#define IDX_MAX 99
+#define PROGRAM_IDX (IDX_MAX - 1)
+
+typedef struct group_it_s group_it;
+typedef struct part_it_s part_it;
+typedef struct state_it_s state_it;
+typedef struct programs_it_s programs_it;
+typedef struct program_it_s program_it;
+typedef struct list_it_s list_it;
+
typedef struct edc_navigator_s
{
+ Evas_Object *box;
Evas_Object *genlist;
- Elm_Object_Item *programs_it;
-
- Eina_List *group_items; //group object item
- Eina_List *part_items; //part object item
- Eina_List *state_items; //state object item
- Eina_List *program_items; //program object item
+ Evas_Object *check;
- Eina_List *group_list; //group name list
- Eina_List *part_list; //part name list
- Eina_List *state_list; //state name list
- Eina_List *program_list;//program name list
+ Eina_List *groups;
Elm_Genlist_Item_Class *group_itc;
Elm_Genlist_Item_Class *part_itc;
@@ -24,15 +27,75 @@ typedef struct edc_navigator_s
Elm_Genlist_Item_Class *programs_itc;
Elm_Genlist_Item_Class *program_itc;
- Eina_Bool group_select_skip : 1;
+ Eina_Bool auto_contract : 1;
} navi_data;
-typedef struct part_item_data_s
+typedef enum
+{
+ Item_Type_Group = 0,
+ Item_Type_Part = 1,
+ Item_Type_State = 2,
+ Item_Type_Programs = 3,
+ Item_Type_Program = 4
+} Item_Type;
+
+struct list_it_s
+{
+ Item_Type type;
+ int idx
[EGIT] [tools/enventor] master 01/01: edc_navigator: provide a program launch button.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=955b762eccebf72b65acfc39e53deaf7896b30fb
commit 955b762eccebf72b65acfc39e53deaf7896b30fb
Author: Hermet Park <her...@hermet.pe.kr>
Date: Fri Apr 22 19:31:07 2016 +0900
edc_navigator: provide a program launch button.
Now launching program by double clicking the program part in the code
is removed! This was not intuitive.
---
data/themes/default/images.edc | 2 ++
data/themes/default/images/Makefile.am | 1 +
data/themes/default/images/navi_play.png | Bin 0 -> 312 bytes
src/bin/edc_navigator.c | 39 ++-
src/bin/main.c | 13 ---
src/lib/edc_editor.c | 22 +++--
src/lib/edj_viewer.c | 2 --
src/lib/enventor_main.c | 1 -
src/lib/enventor_object.eo | 6 -
src/lib/enventor_private.h | 1 -
src/lib/enventor_smart.c | 9 ++-
11 files changed, 52 insertions(+), 44 deletions(-)
diff --git a/data/themes/default/images.edc b/data/themes/default/images.edc
index cf18c1c..3a09b0c 100644
--- a/data/themes/default/images.edc
+++ b/data/themes/default/images.edc
@@ -36,6 +36,7 @@ images {
image: "navi_state.png" COMP;
image: "navi_program.png" COMP;
image: "navi_unknown.png" COMP;
+ image: "navi_play.png" COMP;
}
#define ICON_GROUP(_group_name, _image_path) \
@@ -85,5 +86,6 @@ ICON_GROUP("navi_spacer", "navi_spacer.png")
ICON_GROUP("navi_state", "navi_state.png")
ICON_GROUP("navi_program", "navi_program.png")
ICON_GROUP("navi_unknown", "navi_unknown.png")
+ICON_GROUP("navi_play", "navi_play.png")
#undef ICON_GROUP
diff --git a/data/themes/default/images/Makefile.am
b/data/themes/default/images/Makefile.am
index 77bcd3b..9aada26 100644
--- a/data/themes/default/images/Makefile.am
+++ b/data/themes/default/images/Makefile.am
@@ -84,4 +84,5 @@ EXTRA_DIST = \
navi_unknown.png \
navi_state.png \
navi_program.png \
+ navi_play.png \
bg_demo.png
diff --git a/data/themes/default/images/navi_play.png
b/data/themes/default/images/navi_play.png
new file mode 100644
index 000..2878856
Binary files /dev/null and b/data/themes/default/images/navi_play.png differ
diff --git a/src/bin/edc_navigator.c b/src/bin/edc_navigator.c
index 6e9ca9d..9b301e5 100644
--- a/src/bin/edc_navigator.c
+++ b/src/bin/edc_navigator.c
@@ -712,6 +712,20 @@ gl_state_content_get_cb(void *data EINA_UNUSED,
Evas_Object *obj,
/* Program Related */
+static void
+program_btn_clicked_cb(void *data, Evas_Object *obj, void *event_info)
+{
+ program_it *pit = data;
+ Evas_Object *enventor = base_enventor_get();
+ enventor_object_program_run(enventor, pit->name);
+
+ if (!config_stats_bar_get()) return;
+
+ char buf[256];
+ snprintf(buf, sizeof(buf),_("Program Run: \"%s\""), pit->name);
+ stats_info_msg_update(buf);
+}
+
static char *
gl_program_text_get_cb(void *data, Evas_Object *obj EINA_UNUSED,
const char *part EINA_UNUSED)
@@ -724,15 +738,26 @@ static Evas_Object *
gl_program_content_get_cb(void *data EINA_UNUSED, Evas_Object *obj,
const char *part)
{
- if (strcmp("elm.swallow.icon", part)) return NULL;
-
- Evas_Object *image = elm_image_add(obj);
- elm_image_file_set(image, EDJE_PATH, "navi_state");
+ if (!strcmp("elm.swallow.icon", part))
+ {
+Evas_Object *image = elm_image_add(obj);
+elm_image_file_set(image, EDJE_PATH, "navi_state");
+return image;
+ }
- return image;
+ //play/stop button
+ program_it *pit = data;
+ Evas_Object *btn = elm_button_add(obj);
+ evas_object_smart_callback_add(btn, "clicked", program_btn_clicked_cb,
+ pit);
+/*
+ Evas_Object *img = elm_image_add(btn);
+ elm_image_file_set(img, EDJE_PATH, "navi_play");
+ elm_object_content_set(btn, img);
+*/
+ return btn;
}
-
static void
gl_program_selected_cb(void *data, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
@@ -1261,6 +1286,8 @@ edc_navigator_group_update(const char *cur_group)
navi_data *nd = g_nd;
if (!nd) return;
+ //FIXME: This function is unnecessarily called... why?
+
//Cancel item selection if group was not indicated.
if (!cur_group) navigator_item_deselect(nd);
diff --git a/src/bin/main.c b/src/bin/main.c
index 30582dc..3d1e2c5 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -463,17 +463,6 @@ enventor_live_view_cursor_moved_cb(void *data EINA_UNUSED,
}
static void
-enventor_program_run_cb(void *data EINA_UNUSED, Ev
[EGIT] [tools/enventor] master 01/01: edc_navigator: don't sorted insert for groups and programs.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=e70197ff493cd8ff4fefd9ffa8e5d84ee27a43d7 commit e70197ff493cd8ff4fefd9ffa8e5d84ee27a43d7 Author: Hermet Park <her...@hermet.pe.kr> Date: Fri Apr 22 18:32:10 2016 +0900 edc_navigator: don't sorted insert for groups and programs. I found a genlist has a logical error (probably). This change avoid that error. But even programs and groups doesn't need a sorting. --- src/bin/edc_navigator.c | 36 +--- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/src/bin/edc_navigator.c b/src/bin/edc_navigator.c index ef23e23..6e9ca9d 100644 --- a/src/bin/edc_navigator.c +++ b/src/bin/edc_navigator.c @@ -847,14 +847,13 @@ programs_update(navi_data *nd, group_it *git) pit->tag.type = Item_Type_Programs; pit->tag.idx = PROGRAM_IDX; pit->git = git; -pit->it = elm_genlist_item_sorted_insert(nd->genlist, - nd->programs_itc, - pit, - git->it, - ELM_GENLIST_ITEM_TREE, - gl_comp_func, - gl_programs_selected_cb, - pit); +pit->it = elm_genlist_item_append(nd->genlist, + nd->programs_itc, + pit, + git->it, + ELM_GENLIST_ITEM_TREE, + gl_programs_selected_cb, + pit); return; } @@ -1313,14 +1312,13 @@ edc_navigator_group_update(const char *cur_group) git->tag.idx = idx; git->name = strdup(name); git->nd = nd; -git->it = elm_genlist_item_sorted_insert(nd->genlist, - nd->group_itc, - git, - NULL, - ELM_GENLIST_ITEM_TREE, - gl_comp_func, - gl_group_selected_cb, - git); +git->it = elm_genlist_item_append(nd->genlist, + nd->group_itc, + git, + NULL, + ELM_GENLIST_ITEM_TREE, + gl_group_selected_cb, + git); nd->groups = eina_list_append(nd->groups, git); } @@ -1396,7 +1394,7 @@ edc_navigator_init(Evas_Object *parent) Elm_Genlist_Item_Class *itc; itc = elm_genlist_item_class_new(); - itc->item_style = "tree_effect"; + itc->item_style = "default"; itc->func.text_get = gl_group_text_get_cb; itc->func.content_get = gl_group_content_get_cb; @@ -1404,7 +1402,7 @@ edc_navigator_init(Evas_Object *parent) //Part Item Class itc = elm_genlist_item_class_new(); - itc->item_style = "tree_effect"; + itc->item_style = "default"; itc->func.text_get = gl_part_text_get_cb; itc->func.content_get = gl_part_content_get_cb; @@ -1420,7 +1418,7 @@ edc_navigator_init(Evas_Object *parent) //Programs Item Class itc = elm_genlist_item_class_new(); - itc->item_style = "tree_effect"; + itc->item_style = "default"; itc->func.text_get = gl_programs_text_get_cb; itc->func.content_get = gl_programs_content_get_cb; --
[EGIT] [tools/enventor] master 01/01: live_edit: fix center guide text positioning problem.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=c33f8358365c6759c38d04cd7f303398c994b6e4 commit c33f8358365c6759c38d04cd7f303398c994b6e4 Author: Hermet Park <her...@hermet.pe.kr> Date: Thu Apr 28 22:45:20 2016 +0900 live_edit: fix center guide text positioning problem. This problem looks it just introduced from copy & paste... @fix T3568 --- src/bin/live_edit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/live_edit.c b/src/bin/live_edit.c index b3e8b71..66d84fd 100644 --- a/src/bin/live_edit.c +++ b/src/bin/live_edit.c @@ -189,7 +189,7 @@ info_text_update(live_data *ld) x = (layout_x + (layout_w/2)) - (w/2); y = (layout_y + (layout_h/2)) - (h/2); if (x < lx) x = lx; - if (y < lx) y = ly; + if (y < ly) y = ly; if ((x + w) > (lx + lw)) x = ((lx + lw) - w); if ((y + h) > (ly + lh)) y = ((ly + lh) - h); evas_object_move(ld->info_text[Info_Text_Size], x, y); --
[EGIT] [tools/enventor] master 01/01: fix unexpected close on edc navigator.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=d271175953c132f5cbe92b62d92d8a14a33cd90d
commit d271175953c132f5cbe92b62d92d8a14a33cd90d
Author: Hermet Park <her...@hermet.pe.kr>
Date: Tue Apr 26 20:39:44 2016 +0900
fix unexpected close on edc navigator.
if edj view failed to load a edj, edje_edit apis will occur crashes.
we could avoid this crash in enventor side.
@fix T3510
---
src/bin/main.c | 1 -
src/lib/edj_viewer.c | 14 --
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/bin/main.c b/src/bin/main.c
index a0004c5..1e57ca1 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -506,7 +506,6 @@ enventor_live_view_updated_cb(void *data, Evas_Object *obj,
ad->lazy_save = EINA_FALSE;
ad->on_saving = EINA_FALSE;
}
-printf("%s\n", __func__);
base_edc_navigator_group_update();
}
diff --git a/src/lib/edj_viewer.c b/src/lib/edj_viewer.c
index f474927..0e24117 100644
--- a/src/lib/edj_viewer.c
+++ b/src/lib/edj_viewer.c
@@ -377,6 +377,7 @@ update_edj_file_internal(view_data *vd)
view_obj_parts_callbacks_set(vd);
vd->edj_reload_need = EINA_FALSE;
+ vd->file_set_finished = EINA_TRUE;
evas_object_smart_callback_call(vd->enventor, SIG_LIVE_VIEW_UPDATED,
edj_mgr_obj_get());
@@ -420,6 +421,7 @@ exe_del_event_cb(void *data, int type EINA_UNUSED, void
*event EINA_UNUSED)
{
dummy_obj_update(vd->layout);
ecore_timer_del(vd->update_edj_timer);
+vd->file_set_finished = EINA_FALSE;
vd->update_edj_timer = ecore_timer_add(0.25, update_edj_file, vd);
return ECORE_CALLBACK_PASS_ON;
}
@@ -824,42 +826,42 @@ view_size_get(view_data *vd, Evas_Coord *w, Evas_Coord *h)
Eina_List *
view_parts_list_get(view_data *vd)
{
- if (!vd->file_set_finished) return NULL;
+ if (!vd || !vd->file_set_finished) return NULL;
return edje_edit_parts_list_get(vd->layout);
}
Eina_List *
view_images_list_get(view_data *vd)
{
- if (!vd->file_set_finished) return NULL;
+ if (!vd || !vd->file_set_finished) return NULL;
return edje_edit_images_list_get(vd->layout);
}
Eina_List *
view_programs_list_get(view_data *vd)
{
- if (!vd->file_set_finished) return NULL;
+ if (!vd || !vd->file_set_finished) return NULL;
return edje_edit_programs_list_get(vd->layout);
}
Edje_Part_Type
view_part_type_get(view_data *vd, const char *part)
{
- if (!vd->file_set_finished) return EDJE_PART_TYPE_NONE;
+ if (!vd || !vd->file_set_finished) return EDJE_PART_TYPE_NONE;
return edje_edit_part_type_get(vd->layout, part);
}
Eina_List *
view_part_states_list_get(view_data *vd, const char *part)
{
- if (!vd->file_set_finished) return NULL;
+ if (!vd || !vd->file_set_finished) return NULL;
return edje_edit_part_states_list_get(vd->layout, part);
}
Eina_List *
view_program_targets_get(view_data *vd, const char *prog)
{
- if (!vd->file_set_finished) return NULL;
+ if (!vd || !vd->file_set_finished) return NULL;
return edje_edit_program_targets_get(vd->layout, prog);
}
--
