[EGIT] [core/elementary] master 01/01: doc: improve ambigious doc descriptions.
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=93c22704356574224a66468edeab5cdb1af50280
commit 93c22704356574224a66468edeab5cdb1af50280
Author: ChunEon Park her...@hermet.pe.kr
Date: Tue Apr 21 11:54:07 2015 +0900
doc: improve ambigious doc descriptions.
even descriptions weren't matched each other.
---
src/lib/elm_gengrid.eo | 2 +-
src/lib/elm_interface_scrollable.eo | 2 +-
src/lib/elm_map.eo | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/lib/elm_gengrid.eo b/src/lib/elm_gengrid.eo
index d808ef6..e4f1e8e 100644
--- a/src/lib/elm_gengrid.eo
+++ b/src/lib/elm_gengrid.eo
@@ -437,7 +437,7 @@ class Elm_Gengrid (Elm_Layout, Elm_Interface_Scrollable,
Mouse wheel can be used for the user to scroll up and down the
gengrid.
-It's enabled by default.
+Wheel is enabled by default.
@see elm_gengrid_wheel_disabled_get()
diff --git a/src/lib/elm_interface_scrollable.eo
b/src/lib/elm_interface_scrollable.eo
index f239fc3..028b8a7 100644
--- a/src/lib/elm_interface_scrollable.eo
+++ b/src/lib/elm_interface_scrollable.eo
@@ -69,7 +69,7 @@ mixin Elm_Interface_Scrollable(Evas.Scrollable_Interface,
Evas.Object_Smart)
set {
/* @brief Set Wheel disable
* Enable or disable mouse wheel to be used to scroll the
scroller content.
- * It's disabled by default.
+ * Wheel is enabled by default.
*
* @ingroup Widget
*/
diff --git a/src/lib/elm_map.eo b/src/lib/elm_map.eo
index 2af68ff..3270097 100644
--- a/src/lib/elm_map.eo
+++ b/src/lib/elm_map.eo
@@ -85,7 +85,7 @@ class Elm_Map (Elm_Widget, Elm_Interface_Scrollable,
Mouse wheel can be used for the user to zoom in or zoom out the
map.
-It's disabled by default.
+Wheel is enabled by default.
@see elm_map_wheel_disabled_get()
--
[EGIT] [core/elementary] master 01/01: Revert checkbox: Adding third state (Indeterminate) support in checkbox
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=34be4a0184e1fef873a794b1f4dd1ccc9544b93a
commit 34be4a0184e1fef873a794b1f4dd1ccc9544b93a
Author: ChunEon Park her...@hermet.pe.kr
Date: Mon Apr 20 14:24:10 2015 +0900
Revert checkbox: Adding third state (Indeterminate) support in checkbox
This reverts commit d0507e117acd5bbfdecf4c43f1d338c00802af44.
oops this patch wasn't intended.
---
data/themes/Makefile.am | 1 -
data/themes/edc/elm/check.edc | 11 --
data/themes/img/sym_check_indeterminate.png | Bin 203 - 0 bytes
src/examples/check_example_02.c | 111 --
src/lib/elm_check.c | 169 ++--
src/lib/elm_check.eo| 40 +--
src/lib/elm_interface_atspi_accessible.h| 2 +-
src/lib/elm_widget_check.h | 5 +-
8 files changed, 42 insertions(+), 297 deletions(-)
diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am
index 64a1375..8237c67 100644
--- a/data/themes/Makefile.am
+++ b/data/themes/Makefile.am
@@ -586,7 +586,6 @@ img/split_v_glow.png \
img/split_v_hilight.png \
img/split_v_inset.png \
img/sym_check_alum.png \
-img/sym_check_indeterminate.png \
img/sym_close_dark_normal.png \
img/sym_close_dark_selected.png \
img/sym_close_light_normal.png \
diff --git a/data/themes/edc/elm/check.edc b/data/themes/edc/elm/check.edc
index 9b3068e..431cdc7 100644
--- a/data/themes/edc/elm/check.edc
+++ b/data/themes/edc/elm/check.edc
@@ -2,7 +2,6 @@ group { name: elm/check/base/default;
images.image: inset_shadow_tiny.png COMP;
images.image: bevel_in.png COMP;
images.image: sym_check_alum.png COMP;
- images.image: sym_check_indeterminate.png COMP;
#define ICON 1
#define LABEL2
#define MASK 3
@@ -145,11 +144,6 @@ group { name: elm/check/base/default;
inherit: default 0.0;
visible: 1;
}
- description { state: mixed 0.0;
-inherit: default 0.0;
-image.normal: sym_check_indeterminate.png;
-visible: 1;
- }
}
part { name: clip; type: RECT;
description { state: default 0.0;
@@ -276,11 +270,6 @@ group { name: elm/check/base/default;
target: indicator;
}
program {
- signal: elm,state,check,indeterminate; source: elm;
- action: STATE_SET mixed 0.0;
- target: indicator;
- }
- program {
signal: elm,state,text,visible; source: elm;
script {
new m = get_int(btmode);
diff --git a/data/themes/img/sym_check_indeterminate.png
b/data/themes/img/sym_check_indeterminate.png
deleted file mode 100755
index 3b2c0ea..000
Binary files a/data/themes/img/sym_check_indeterminate.png and /dev/null differ
diff --git a/src/examples/check_example_02.c b/src/examples/check_example_02.c
deleted file mode 100644
index 6aa0a1c..000
--- a/src/examples/check_example_02.c
+++ /dev/null
@@ -1,111 +0,0 @@
-//Compile with:
-//gcc -o check_example_02 check_example_02.c -g `pkg-config --cflags --libs
elementary` ./check_example_02
-
-#include Elementary.h
-
-Evas_Object *cb, *cb1, *cb2, *cb3;
-
-static void
-_print(void *data, Evas_Object *obj, void *event_info)
-{
- if (!elm_check_three_state_mode_get(cb))
- {
-printf(check0 %smarked\n, *((Eina_Bool*)data) ? : un);
- }
- else
- {
-printf(check0 elm_check_state_get() value is %d (%s)\n,
elm_check_state_get(cb), *((Eina_Bool*)data) ? EINA_TRUE : EINA_FALSE);
- }
-}
-
-static void
-_print1(void *data, Evas_Object *obj, void *event_info)
-{
- Check_State st = elm_check_state_get(cb1);
- if (st == _CHECK_STATE_CHECKED)
- printf(check1 elm_check_state_get() value is %d (%s)\n, st,
_CHECK_STATE_CHECKED);
- else if (st == _CHECK_STATE_INDETERMINATE)
- printf(check1 elm_check_state_get() value is %d (%s)\n, st,
_CHECK_STATE_INDETERMINATE);
- else
- printf(check1 elm_check_state_get() value is %d (%s)\n, st,
_CHECK_STATE_UNCHECKED);
-}
-
-static void
-_print2(void *data, Evas_Object *obj, void *event_info)
-{
- printf(Currently three state mode is: %s\n,
elm_check_three_state_mode_get(cb) ? On : Off);
- elm_check_three_state_mode_set(cb, elm_check_state_get(cb2));
- elm_check_three_state_mode_set(cb1, elm_check_state_get(cb2));
- printf(Three state mode is changed to: %s\n,
elm_check_three_state_mode_get(cb) ? On : Off);
-}
-
-static void
-_print3(void *data, Evas_Object *obj, void *event_info)
-{
- elm_object_disabled_set(cb, elm_check_state_get(cb3));
- elm_object_disabled_set(cb1, elm_check_state_get(cb3));
- printf(Checkbox disable mode is : %s\n, elm_check_state_get(cb3) ?
Enabled : Disabled);
-}
-
-EAPI_MAIN int
-elm_main(int argc, char **argv)
-{
- Evas_Object *win, *icon;
- Eina_Bool value, *value2, *value3;
- Check_State *value1
[EGIT] [tools/enventor] master 01/01: lib/main: minus initialization count when it's shutdown.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=5966093325e34f7bca27686cabd91945c198fba7 commit 5966093325e34f7bca27686cabd91945c198fba7 Author: ChunEon Park her...@hermet.pe.kr Date: Sun May 3 02:59:26 2015 +0900 lib/main: minus initialization count when it's shutdown. @fix --- src/lib/enventor_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/enventor_main.c b/src/lib/enventor_main.c index 646cb49..ab690a1 100644 --- a/src/lib/enventor_main.c +++ b/src/lib/enventor_main.c @@ -113,6 +113,8 @@ enventor_shutdown(void) return 0; } + if ((--_enventor_init_count) 0) return _enventor_init_count; + ecore_event_handler_del(_key_down_handler); _key_down_handler = NULL; --
[EGIT] [core/efl] master 01/02: evas vector: cancel the transformation when null is passed.
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=e08b942ffd640305c3ee489010d9fd0fb5ef7dd1
commit e08b942ffd640305c3ee489010d9fd0fb5ef7dd1
Author: ChunEon Park chuneon.p...@samsung.com
Date: Thu May 7 20:02:01 2015 +0900
evas vector: cancel the transformation when null is passed.
---
src/lib/evas/canvas/efl_vg_base.eo | 5 -
src/lib/evas/canvas/evas_vg_node.c | 16
2 files changed, 16 insertions(+), 5 deletions(-)
diff --git a/src/lib/evas/canvas/efl_vg_base.eo
b/src/lib/evas/canvas/efl_vg_base.eo
index 52cf3c8..78c6974 100644
--- a/src/lib/evas/canvas/efl_vg_base.eo
+++ b/src/lib/evas/canvas/efl_vg_base.eo
@@ -7,6 +7,9 @@ abstract Efl.VG.Base (Eo.Base, Efl.Gfx.Base, Efl.Gfx.Stack)
set {
/*@
Sets the transformation matrix to be used for this node object.
+
+ @note Pass @c NULL to cancel the applied transformation.
+
@since 1.14
*/
}
@@ -90,4 +93,4 @@ abstract Efl.VG.Base (Eo.Base, Efl.Gfx.Base, Efl.Gfx.Stack)
Efl.Gfx.Stack.lower;
@virtual .bounds_get;
}
-}
\ No newline at end of file
+}
diff --git a/src/lib/evas/canvas/evas_vg_node.c
b/src/lib/evas/canvas/evas_vg_node.c
index e3fb76e..2d84b86 100644
--- a/src/lib/evas/canvas/evas_vg_node.c
+++ b/src/lib/evas/canvas/evas_vg_node.c
@@ -28,12 +28,20 @@ _efl_vg_base_transformation_set(Eo *obj,
Efl_VG_Base_Data *pd,
const Eina_Matrix3 *m)
{
- if (!pd-m)
+ if (m)
{
-pd-m = malloc(sizeof (Eina_Matrix3));
-if (!pd-m) return ;
+if (!pd-m)
+ {
+ pd-m = malloc(sizeof (Eina_Matrix3));
+ if (!pd-m) return;
+ }
+memcpy(pd-m, m, sizeof (Eina_Matrix3));
+ }
+ else
+ {
+free(pd-m);
+pd-m = NULL;
}
- memcpy(pd-m, m, sizeof (Eina_Matrix3));
_efl_vg_base_changed(obj);
}
--
[EGIT] [core/efl] master 01/01: evas vector: remove white trailings
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=1c063e85d218d63f9f33482e1f5ab7d9436c94be
commit 1c063e85d218d63f9f33482e1f5ab7d9436c94be
Author: ChunEon Park chuneon.p...@samsung.com
Date: Fri May 8 20:51:52 2015 +0900
evas vector: remove white trailings
---
src/lib/evas/canvas/efl_vg_base.eo | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/lib/evas/canvas/efl_vg_base.eo
b/src/lib/evas/canvas/efl_vg_base.eo
index 78c6974..ae54a80 100644
--- a/src/lib/evas/canvas/efl_vg_base.eo
+++ b/src/lib/evas/canvas/efl_vg_base.eo
@@ -7,9 +7,7 @@ abstract Efl.VG.Base (Eo.Base, Efl.Gfx.Base, Efl.Gfx.Stack)
set {
/*@
Sets the transformation matrix to be used for this node object.
-
@note Pass @c NULL to cancel the applied transformation.
-
@since 1.14
*/
}
--
[EGIT] [core/elementary] master 01/01: genlist: fix to return item style correctly.
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=685cfef7d9f887008061bd394d47d1b309b91e80
commit 685cfef7d9f887008061bd394d47d1b309b91e80
Author: ChunEon Park her...@hermet.pe.kr
Date: Thu May 14 22:21:05 2015 +0900
genlist: fix to return item style correctly.
Since the genlist items can be unrealized,
they own the tooltip strings in their item field.
Also, the tooltip string should be returned with it.
@fix
---
src/lib/elm_genlist.c | 6 ++
src/lib/elm_genlist_item.eo | 1 +
2 files changed, 7 insertions(+)
diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index c41115f..18dcee4 100644
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -7037,6 +7037,12 @@ elm_genlist_item_tooltip_style_get(const Elm_Object_Item
*it)
return eo_do_ret(it, ret, elm_wdg_item_tooltip_style_get());
}
+EOLIAN static const char *
+_elm_genlist_item_elm_widget_item_tooltip_style_get(Eo *eo_it EINA_UNUSED,
Elm_Gen_Item *it)
+{
+ return it-tooltip.style;
+}
+
EAPI Eina_Bool
elm_genlist_item_tooltip_window_mode_set(Elm_Object_Item *item,
Eina_Bool disable)
diff --git a/src/lib/elm_genlist_item.eo b/src/lib/elm_genlist_item.eo
index 3291847..9e2c4db 100644
--- a/src/lib/elm_genlist_item.eo
+++ b/src/lib/elm_genlist_item.eo
@@ -498,6 +498,7 @@ class Elm.Genlist_Item(Elm.Widget_Item)
Elm.Widget_Item.part_content.get;
Elm.Widget_Item.tooltip_text_set;
Elm.Widget_Item.tooltip_style.set;
+ Elm.Widget_Item.tooltip_style.get;
Elm.Widget_Item.tooltip_window_mode.set;
Elm.Widget_Item.tooltip_content_cb_set;
Elm.Widget_Item.tooltip_unset;
--
[EGIT] [website/www-content] master 01/01: download: introduce development tool
hermet pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=cad9b03098b38b0f5548e3e7425a01c71825b496 commit cad9b03098b38b0f5548e3e7425a01c71825b496 Author: ChunEon Park chuneon.p...@samsung.com Date: Fri May 15 20:15:21 2015 +0900 download: introduce development tool --- pages/download-latest.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pages/download-latest.txt b/pages/download-latest.txt index 01bd4fa..18dffea 100644 --- a/pages/download-latest.txt +++ b/pages/download-latest.txt @@ -29,4 +29,7 @@ dlbase= http://download.enlightenment.org/rel/ |[[%%dlbase%%apps/econnman/econnman-%%econnman_vextn%%|Econnman]]|%%econnman_v%%| |[[%%dlbase%%apps/epour/epour-%%epour_vextn%%|Epour]]|%%epour_v%%| +^Development Tool^Version^ +|[[%%dlbase%%apps/enventor/enventor-%%enventor_vextn%%|Enventor]]|%%enventor_v%%| + Go to the [[https://phab.enlightenment.org/w/packaging_status/|package status of distributions]] for information on what distributions have packages and how up to date they are. --
[EGIT] [website/www-content] master 01/01: contact: add irc korean channel info.
hermet pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=0fa21445282e1a113c3673f7bb7f7e647191f0c0 commit 0fa21445282e1a113c3673f7bb7f7e647191f0c0 Author: ChunEon Park chuneon.p...@samsung.com Date: Fri May 15 19:36:30 2015 +0900 contact: add irc korean channel info. --- pages/contact.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/pages/contact.txt b/pages/contact.txt index f89a975..086bdc0 100644 --- a/pages/contact.txt +++ b/pages/contact.txt @@ -6,6 +6,7 @@ |[[http://www.freenode.net|irc.freenode.net]] |6667 |#e.py | Python related | |[[http://www.freenode.net|irc.freenode.net]] |6667 |#e.de | General in german | |[[http://www.freenode.net|irc.freenode.net]] |6667 |#e.fr | General in french | +|[[http://www.freenode.net|irc.freenode.net]] |6667 |#e.kr | General in korean | Many of the core developers involved in Enlightenment as well as a lot of users are on IRC. They use IRC often and will discuss many --
[EGIT] [core/efl] master 01/01: evas canvas: fix insane mouse move events on proxy source.
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=f3c78cd69ec28793fcbc8b5e8bf626b15eafe096
commit f3c78cd69ec28793fcbc8b5e8bf626b15eafe096
Author: ChunEon Park chuneon.p...@samsung.com
Date: Sat May 16 00:31:52 2015 +0900
evas canvas: fix insane mouse move events on proxy source.
There is no need compare - transformed mouse pos and origin pos.
This compare just block the mouse move event trigger on source.
@fix
---
src/lib/evas/canvas/evas_events.c | 16 ++--
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/src/lib/evas/canvas/evas_events.c
b/src/lib/evas/canvas/evas_events.c
index ae97030..b357044 100644
--- a/src/lib/evas/canvas/evas_events.c
+++ b/src/lib/evas/canvas/evas_events.c
@@ -302,11 +302,9 @@ _evas_event_source_mouse_move_events(Evas_Object *eo_obj,
Evas *eo_e, Evas_Event
_evas_event_havemap_adjust(eo_child, child,
ev-cur.canvas.x,
ev-cur.canvas.y,
child-mouse_grabbed);
- if ((e-pointer.x != ev-cur.canvas.x) ||
- (e-pointer.y != ev-cur.canvas.y))
-evas_object_event_callback_call(eo_child, child,
-EVAS_CALLBACK_MOUSE_MOVE,
-ev, event_id);
+ evas_object_event_callback_call(eo_child, child,
+ EVAS_CALLBACK_MOUSE_MOVE,
+ ev, event_id);
}
else
outs = eina_list_append(outs, eo_child);
@@ -374,11 +372,9 @@ _evas_event_source_mouse_move_events(Evas_Object *eo_obj,
Evas *eo_e, Evas_Event
_evas_event_havemap_adjust(eo_child, child,
ev-cur.canvas.x,
ev-cur.canvas.y,
child-mouse_grabbed);
- if ((e-pointer.x != ev-cur.canvas.x) ||
- (e-pointer.y != ev-cur.canvas.y))
-evas_object_event_callback_call(eo_child, child,
-EVAS_CALLBACK_MOUSE_MOVE,
-ev, event_id);
+ evas_object_event_callback_call(eo_child, child,
+ EVAS_CALLBACK_MOUSE_MOVE,
+ ev, event_id);
}
else if (child-mouse_in)
{
--
[EGIT] [core/efl] efl-1.14 01/01: evas canvas: fix insane mouse move events on proxy source.
hermet pushed a commit to branch efl-1.14.
http://git.enlightenment.org/core/efl.git/commit/?id=4f6e407c885917305bff5b21df2a61a7ddbf0591
commit 4f6e407c885917305bff5b21df2a61a7ddbf0591
Author: ChunEon Park chuneon.p...@samsung.com
Date: Sat May 16 00:31:52 2015 +0900
evas canvas: fix insane mouse move events on proxy source.
There is no need compare - transformed mouse pos and origin pos.
This compare just block the mouse move event trigger on source.
@fix
---
src/lib/evas/canvas/evas_events.c | 16 ++--
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/src/lib/evas/canvas/evas_events.c
b/src/lib/evas/canvas/evas_events.c
index ae97030..b357044 100644
--- a/src/lib/evas/canvas/evas_events.c
+++ b/src/lib/evas/canvas/evas_events.c
@@ -302,11 +302,9 @@ _evas_event_source_mouse_move_events(Evas_Object *eo_obj,
Evas *eo_e, Evas_Event
_evas_event_havemap_adjust(eo_child, child,
ev-cur.canvas.x,
ev-cur.canvas.y,
child-mouse_grabbed);
- if ((e-pointer.x != ev-cur.canvas.x) ||
- (e-pointer.y != ev-cur.canvas.y))
-evas_object_event_callback_call(eo_child, child,
-EVAS_CALLBACK_MOUSE_MOVE,
-ev, event_id);
+ evas_object_event_callback_call(eo_child, child,
+ EVAS_CALLBACK_MOUSE_MOVE,
+ ev, event_id);
}
else
outs = eina_list_append(outs, eo_child);
@@ -374,11 +372,9 @@ _evas_event_source_mouse_move_events(Evas_Object *eo_obj,
Evas *eo_e, Evas_Event
_evas_event_havemap_adjust(eo_child, child,
ev-cur.canvas.x,
ev-cur.canvas.y,
child-mouse_grabbed);
- if ((e-pointer.x != ev-cur.canvas.x) ||
- (e-pointer.y != ev-cur.canvas.y))
-evas_object_event_callback_call(eo_child, child,
-EVAS_CALLBACK_MOUSE_MOVE,
-ev, event_id);
+ evas_object_event_callback_call(eo_child, child,
+ EVAS_CALLBACK_MOUSE_MOVE,
+ ev, event_id);
}
else if (child-mouse_in)
{
--
[EGIT] [core/elementary] master 01/01: clipper: improve doc.
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=e72c34670f7538ee29b9cb11c6b2def5de3c572e
commit e72c34670f7538ee29b9cb11c6b2def5de3c572e
Author: ChunEon Park her...@hermet.pe.kr
Date: Fri May 15 23:31:07 2015 +0900
clipper: improve doc.
---
src/lib/elm_clipper.eo | 10 +-
src/lib/elm_clipper.h | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/lib/elm_clipper.eo b/src/lib/elm_clipper.eo
index fa31eb2..dc4b441 100644
--- a/src/lib/elm_clipper.eo
+++ b/src/lib/elm_clipper.eo
@@ -5,9 +5,9 @@ class Elm.Clipper (Elm.Container)
@property clip {
set {
/*@
-@brief Set the clip object of the clipper
+@brief Set the clip(mask) object of the clipper
-Sets the clip object for clipping
+Sets the clip(mask) object for clipping
@note
Allow setting only an Evas_Object_Rectangle and an
Evas_Object_Image as clip on 1.14
@@ -18,16 +18,16 @@ class Elm.Clipper (Elm.Container)
}
get {
/*@
-@brief Get the mask object of the clipper
+@brief Get the clip(mask) object of the clipper
-@see elm_clipper_mask_set()
+@see elm_clipper_clip_set()
@since 1.15
@ingroup Clipper */
}
values {
-Evas_Object *mask;
+Evas_Object *clip;
}
}
@property region {
diff --git a/src/lib/elm_clipper.h b/src/lib/elm_clipper.h
index 2ae4dd5..fa15cc9 100644
--- a/src/lib/elm_clipper.h
+++ b/src/lib/elm_clipper.h
@@ -2,8 +2,8 @@
* @defgroup Clipper Clipper
* @ingroup Elementary
*
- * This widget display a clipped object.
- * For this widget, need a clipper object and a content object.
+ * This widget displays a clipped(masked) object.
+ * For this widget, you need one clipper and one content objects.
* The content would be clipped out by the clipper.
* If clipper is not set, you would see the content without cuts
*
--
[EGIT] [core/elementary] master 01/01: fix makedist break.
hermet pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=521a2f035bc1bf9d914129cbb3bf2528666dd310 commit 521a2f035bc1bf9d914129cbb3bf2528666dd310 Author: ChunEon Park her...@hermet.pe.kr Date: Mon May 18 13:30:43 2015 +0900 fix makedist break. clipper.eo was missed in include list. --- src/lib/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 8cef646..c7ffa1d 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -695,6 +695,7 @@ elementaryeolianfiles_DATA = \ elm_button.eo \ elm_calendar.eo \ elm_check.eo \ +elm_clipper.eo \ elm_clock.eo \ elm_colorselector.eo \ elm_conformant.eo \ --
[EGIT] [core/elementary] master 01/01: clipper: hide the region_set()/get() APIs.
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=da3b2b1274927e995f43b74434068063ea2d5ff8
commit da3b2b1274927e995f43b74434068063ea2d5ff8
Author: ChunEon Park her...@hermet.pe.kr
Date: Mon May 18 13:56:09 2015 +0900
clipper: hide the region_set()/get() APIs.
Provide the simple api as possible.
---
src/lib/elm_clipper.c | 2 ++
src/lib/elm_clipper.eo | 30 --
2 files changed, 2 insertions(+), 30 deletions(-)
diff --git a/src/lib/elm_clipper.c b/src/lib/elm_clipper.c
index 374f9bf..16d7077 100644
--- a/src/lib/elm_clipper.c
+++ b/src/lib/elm_clipper.c
@@ -64,6 +64,7 @@ _elm_clipper_clip_get(Eo *obj EINA_UNUSED, Elm_Clipper_Data
*sd)
return sd-clipper;
}
+#if 0
EOLIAN static void
_elm_clipper_region_set(Eo *obj, Elm_Clipper_Data *sd, double x1, double y1,
double x2, double y2)
{
@@ -89,6 +90,7 @@ _elm_clipper_region_get(Eo *obj EINA_UNUSED, Elm_Clipper_Data
*sd, double *x1, d
if (x2) *x2 = sd-region_x2;
if (y2) *y2 = sd-region_y2;
}
+#endif
EOLIAN static Eina_Bool
_elm_clipper_elm_widget_sub_object_del(Eo *obj, Elm_Clipper_Data *sd,
Evas_Object *sobj)
diff --git a/src/lib/elm_clipper.eo b/src/lib/elm_clipper.eo
index dc4b441..1b4255f 100644
--- a/src/lib/elm_clipper.eo
+++ b/src/lib/elm_clipper.eo
@@ -30,36 +30,6 @@ class Elm.Clipper (Elm.Container)
Evas_Object *clip;
}
}
- @property region {
- set {
-/*@
-@brief Set the region of the clipper
-
-Sets the position and the size of the clipper on clipper object
-
-@note The value should be normalized. (0 ~ 1)
-
-@since 1.15
-
-@ingroup Clipper */
- }
- get {
-/*@
-@brief Get the region of the clipper
-
-@see elm_clipper_region_align_set()
-
-@since 1.15
-
-@ingroup Clipper */
- }
- values {
-double x1; /*@ left edge of the clipper on elm_clipper widget */
-double y1; /*@ top edge of the clipper on elm_clipper widget */
-double x2; /*@ right edge of the clipper on elm_clipper widget */
-double y2; /*@ bottom edge of the clipper on elm_clipper widget */
- }
- }
}
implements {
class.constructor;
--
[EGIT] [core/elementary] master 01/01: multibuttonentry: changed longpress callback name.
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=a44926a5d3e86d3e19a51af4185826d933bdaadc
commit a44926a5d3e86d3e19a51af4185826d933bdaadc
Author: ChunEon Park her...@hermet.pe.kr
Date: Fri Apr 17 16:32:04 2015 +0900
multibuttonentry: changed longpress callback name.
contextually, the longpress triggered by item.
so the name should be item,longpressed
thank Davide Andreoli for reporting.
---
src/lib/elc_multibuttonentry.c | 6 +++---
src/lib/elc_multibuttonentry.h | 2 +-
src/lib/elm_multibuttonentry.eo | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/lib/elc_multibuttonentry.c b/src/lib/elc_multibuttonentry.c
index 2ad0e83..7e4ec4b 100644
--- a/src/lib/elc_multibuttonentry.c
+++ b/src/lib/elc_multibuttonentry.c
@@ -22,25 +22,25 @@ static const char SIG_ITEM_SELECTED[] = item,selected;
static const char SIG_ITEM_ADDED[] = item,added;
static const char SIG_ITEM_DELETED[] = item,deleted;
static const char SIG_ITEM_CLICKED[] = item,clicked;
+static const char SIG_ITEM_LONGPRESSED[] = item,longpressed;
static const char SIG_CLICKED[] = clicked;
static const char SIG_FOCUSED[] = focused;
static const char SIG_UNFOCUSED[] = unfocused;
static const char SIG_EXPANDED[] = expanded;
static const char SIG_CONTRACTED[] = contracted;
static const char SIG_EXPAND_STATE_CHANGED[] = expand,state,changed;
-static const char SIG_LONGPRESSED[] = longpressed;
static const Evas_Smart_Cb_Description _smart_callbacks[] = {
{SIG_ITEM_SELECTED, },
{SIG_ITEM_ADDED, },
{SIG_ITEM_DELETED, },
{SIG_ITEM_CLICKED, },
+ {SIG_ITEM_LONGPRESSED, },
{SIG_CLICKED, },
{SIG_FOCUSED, },
{SIG_UNFOCUSED, },
{SIG_EXPANDED, },
{SIG_CONTRACTED, },
{SIG_EXPAND_STATE_CHANGED, },
- {SIG_LONGPRESSED, },
{NULL, NULL}
};
@@ -522,7 +522,7 @@ _long_press_cb(void *data)
sd-longpress_timer = NULL;
- evas_object_smart_callback_call(WIDGET(it), SIG_LONGPRESSED, EO_OBJ(it));
+ evas_object_smart_callback_call(WIDGET(it), SIG_ITEM_LONGPRESSED,
EO_OBJ(it));
return ECORE_CALLBACK_CANCEL;
}
diff --git a/src/lib/elc_multibuttonentry.h b/src/lib/elc_multibuttonentry.h
index d0862fc..75fe7a1 100644
--- a/src/lib/elc_multibuttonentry.h
+++ b/src/lib/elc_multibuttonentry.h
@@ -30,6 +30,7 @@
* - @c item,deleted - when a multi-button entry item is deleted.
* - @c item,clicked - this is called when an item is clicked by user
* interaction. Both item,selected and item,clicked are needed.
+ * - @c item,longpressed - when multi-button entry item is pressed for a
long time.
* - @c clicked - when multi-button entry is clicked.
* - @c focused - when multi-button entry is focused.
* - @c unfocused - when multi-button entry is unfocused.
@@ -37,7 +38,6 @@
* - @c contracted - when multi-button entry is contracted.
* - @c expand,state,changed - when shrink mode state of
* multi-button entry is changed.
- * - @c longpressed - when multi-button entry is pressed for a long time.
*
* Default text parts of the multi-button entry widget that you can use are:
* @li default - A label of the multi-button entry
diff --git a/src/lib/elm_multibuttonentry.eo b/src/lib/elm_multibuttonentry.eo
index 6149ab6..18727b4 100644
--- a/src/lib/elm_multibuttonentry.eo
+++ b/src/lib/elm_multibuttonentry.eo
@@ -274,13 +274,13 @@ class Elm_Multibuttonentry (Elm_Layout)
item,added;
item,deleted;
item,clicked;
+ item,longpressed;
clicked;
focused;
unfocused;
expanded;
contracted;
expand,state,changed;
- longpressed;
}
}
--
[EGIT] [core/elementary] elementary-1.14 01/01: Revert [ELM] elm_toolbar: Use item sizing eval function.
hermet pushed a commit to branch elementary-1.14.
http://git.enlightenment.org/core/elementary.git/commit/?id=1292778c8016184641735af2b79092f314f16764
commit 1292778c8016184641735af2b79092f314f16764
Author: ChunEon Park her...@hermet.pe.kr
Date: Tue May 19 21:59:35 2015 +0900
Revert [ELM] elm_toolbar: Use item sizing eval function.
This reverts commit d5e0d0076e932cc5d49728358b097a7a9f6d4238.
ahh. i didn't intend this.
---
src/lib/elm_toolbar.c | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index 9d41844..0087a0a 100644
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -1309,6 +1309,7 @@ _inform_item_number(Evas_Object *obj)
char buf[sizeof(elm,number,item,) + 4];
static int scount = 0;
int count = 0;
+ Evas_Coord mw, mh;
EINA_INLIST_FOREACH(sd-items, it)
{
@@ -1326,7 +1327,12 @@ _inform_item_number(Evas_Object *obj)
{
edje_object_signal_emit(VIEW(it), buf, elm);
edje_object_message_signal_process(VIEW(it));
- _resizing_eval_item(it);
+
+ mw = mh = -1;
+ elm_coords_finger_size_adjust(1, mw, 1, mh);
+
+ edje_object_size_min_restricted_calc(VIEW(it), mw, mh, mw,
mh);
+ evas_object_size_hint_min_set(VIEW(it), mw, mh);
}
}
}
--
[EGIT] [core/elementary] master 01/01: scroller: add example for resizing scroll's content area.
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=02c284e7d368a204912a7f3f172434d55117b66b
commit 02c284e7d368a204912a7f3f172434d55117b66b
Author: ChunEon Park her...@hermet.pe.kr
Date: Tue May 19 22:00:18 2015 +0900
scroller: add example for resizing scroll's content area.
Summary:
When content is resized, scrollbar's position is not updated.
Add bar position update after bar size is changed.
This is sample for resizing issue.
Test Plan: elementary_test - scroller3
Reviewers: jaehwan, woohyun, seoz, raster, Hermet
Reviewed By: Hermet
Subscribers: raster
Differential Revision: https://phab.enlightenment.org/D2291
---
src/bin/test.c | 2 +
src/bin/test_scroller.c | 141
2 files changed, 143 insertions(+)
diff --git a/src/bin/test.c b/src/bin/test.c
index 2af3706..9a7de33 100644
--- a/src/bin/test.c
+++ b/src/bin/test.c
@@ -148,6 +148,7 @@ void test_fileselector(void *data, Evas_Object *obj, void
*event_info);
void test_separator(void *data, Evas_Object *obj, void *event_info);
void test_scroller(void *data, Evas_Object *obj, void *event_info);
void test_scroller2(void *data, Evas_Object *obj, void *event_info);
+void test_scroller3(void *data, Evas_Object *obj, void *event_info);
void test_spinner(void *data, Evas_Object *obj, void *event_info);
void test_index(void *data, Evas_Object *obj, void *event_info);
void test_index2(void *data, Evas_Object *obj, void *event_info);
@@ -746,6 +747,7 @@ add_tests:
//--//
ADD_TEST(NULL, Scroller, Scroller, test_scroller);
ADD_TEST(NULL, Scroller, Scroller 2, test_scroller2);
+ ADD_TEST(NULL, Scroller, Scroller 3, test_scroller3);
//--//
// FIXME: add frame test
diff --git a/src/bin/test_scroller.c b/src/bin/test_scroller.c
index 8457e92..470a1f4 100644
--- a/src/bin/test_scroller.c
+++ b/src/bin/test_scroller.c
@@ -473,3 +473,144 @@ test_scroller2(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event
evas_object_resize(win, 320, 480);
evas_object_show(win);
}
+
+static Ecore_Timer *timer = NULL;
+static int append = 0;
+static int count = 0;
+
+void
+del_item(void *data EINA_UNUSED, Evas_Object *obj, void *event_info
EINA_UNUSED)
+{
+ evas_object_del(obj);
+}
+
+void
+append_item(void *data, Evas_Object *obj EINA_UNUSED, void *event_info
EINA_UNUSED)
+{
+ Evas_Object *bx = data, *bt;
+ char buf[PATH_MAX];
+
+ bt = elm_button_add(bx);
+ snprintf(buf, sizeof(buf), Item %d, ++count);
+ elm_object_text_set(bt, buf);
+ elm_box_pack_end(bx, bt);
+ evas_object_smart_callback_add(bt, clicked, del_item, NULL);
+ evas_object_show(bt);
+}
+
+void
+prepend_item(void *data, Evas_Object *obj EINA_UNUSED, void *event_info
EINA_UNUSED)
+{
+ Evas_Object *bx = data, *bt;
+ char buf[PATH_MAX];
+
+ bt = elm_button_add(bx);
+ snprintf(buf, sizeof(buf), Item %d, ++count);
+ elm_object_text_set(bt, buf);
+ elm_box_pack_start(bx, bt);
+ evas_object_smart_callback_add(bt, clicked, del_item, NULL);
+ evas_object_show(bt);
+}
+
+static Eina_Bool
+append_cb(void *data)
+{
+ Evas_Object *bx = data, *bt;
+ char buf[PATH_MAX];
+
+ bt = elm_button_add(bx);
+ snprintf(buf, sizeof(buf), Item %d, ++count);
+ elm_object_text_set(bt, buf);
+ elm_box_pack_end(bx, bt);
+ evas_object_smart_callback_add(bt, clicked, del_item, NULL);
+ evas_object_show(bt);
+
+ append--;
+
+ if (append = 0)
+ {
+timer = NULL;
+return ECORE_CALLBACK_CANCEL;
+ }
+ else
+ return ECORE_CALLBACK_RENEW;
+}
+
+static void
+append_items(void *data, Evas_Object *obj EINA_UNUSED, void *event_info
EINA_UNUSED)
+{
+ append += 10;
+ timer = ecore_timer_add(0.3, append_cb, data);
+}
+
+static void
+win_del_cb(void *data EINA_UNUSED,
+ Evas *e EINA_UNUSED,
+ Evas_Object *obj EINA_UNUSED,
+ void *event_info EINA_UNUSED)
+{
+ ecore_timer_del(timer);
+ timer = NULL;
+}
+
+void
+test_scroller3(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
*event_info EINA_UNUSED)
+{
+ Evas_Object *win, *bt, *bt2, *bt3, *bx, *bx2, *bx3, *bx4, *sc;
+
+ win = elm_win_util_standard_add(scroller3, Scroller 3);
+ elm_win_autodel_set(win, EINA_TRUE);
+ evas_object_event_callback_add(win, EVAS_CALLBACK_DEL, win_del_cb, NULL);
+
+ bx = elm_box_add(win);
+ evas_object_size_hint_weight_set(bx, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
+ elm_win_resize_object_add(win, bx);
+ evas_object_show(bx);
+
+ bx2 = elm_box_add(bx);
+ evas_object_size_hint_weight_set(bx2, EVAS_HINT_EXPAND, 0.1);
+ evas_object_size_hint_align_set(bx2, EVAS_HINT_FILL, EVAS_HINT_FILL);
+ elm_box_horizontal_set(bx2, EINA_TRUE);
+ elm_box_pack_end(bx, bx2);
+ evas_object_show(bx2);
+
+ bt = elm_button_add(bx2
[EGIT] [core/elementary] elementary-1.14 01/02: Merge branch 'elementary-1.14' of git+ssh://git.enlightenment.org/core/elementary into elementary-1.14
hermet pushed a commit to branch elementary-1.14. http://git.enlightenment.org/core/elementary.git/commit/?id=943312bcec14d53edd43565ab871d59e3244273f commit 943312bcec14d53edd43565ab871d59e3244273f Merge: 304899e d5e0d00 Author: ChunEon Park her...@hermet.pe.kr Date: Tue May 19 21:52:39 2015 +0900 Merge branch 'elementary-1.14' of git+ssh://git.enlightenment.org/core/elementary into elementary-1.14 src/lib/elm_toolbar.c | 8 +--- 1 file changed, 1 insertion(+), 7 deletions(-) --
[EGIT] [tools/enventor] master 01/01: auto_comp: +precise_is_inside
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=49a2a87c6f50207fb979f3982f05d52fca584e5e
commit 49a2a87c6f50207fb979f3982f05d52fca584e5e
Author: ChunEon Park her...@hermet.pe.kr
Date: Thu May 21 11:07:43 2015 +0900
auto_comp: +precise_is_inside
---
src/lib/auto_comp_code.h | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/lib/auto_comp_code.h b/src/lib/auto_comp_code.h
index 1227e69..88d2cd2 100644
--- a/src/lib/auto_comp_code.h
+++ b/src/lib/auto_comp_code.h
@@ -55,6 +55,12 @@ const char *AUTOCOMP_TYPE[AUTOCOMP_TYPE_LINE_CNT] =
type: IMAGE;,
};
+#define AUTOCOMP_TYPE_PRECISE_IS_INSIDE_CNT 1
+const char *AUTOCOMP_TYPE[AUTOCOMP_TYPE_PRECISE_IS_INSIDE_CNT] =
+{
+ precise_is_inside: ;,
+};
+
#define AUTOCOMP_INHERIT_LINE_CNT 1
const char *AUTOCOMP_INHERIT[AUTOCOMP_INHERIT_LINE_CNT] =
{
@@ -437,4 +443,4 @@ const char
*AUTOCOMP_ANTI_ALIAS[AUTOCOMP_ANTI_ALIAS_LINE_CNT] =
anti_alias: ;,
};
-#define COMPSET_CNT 67
+#define COMPSET_CNT 68
--
[EGIT] [tools/enventor] master 01/01: autocomp: fix the resoucre directory path
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=2d9f86a30d20c2816c8544a2d72bd5e791c6f083
commit 2d9f86a30d20c2816c8544a2d72bd5e791c6f083
Author: ChunEon Park her...@hermet.pe.kr
Date: Tue Jun 9 15:40:30 2015 +0900
autocomp: fix the resoucre directory path
auto_comp data is the library resource rather than application.
use the eina prefix rather then app data path.
---
src/include/globals.h | 1 +
src/lib/auto_comp.c| 4 +++-
src/lib/enventor_main.c| 8
src/lib/enventor_private.h | 3 ++-
4 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/include/globals.h b/src/include/globals.h
index df92df4..13e023e 100644
--- a/src/include/globals.h
+++ b/src/include/globals.h
@@ -1,2 +1,3 @@
extern const char *DEFAULT_EDC_FORMAT;
extern char EDJE_PATH[PATH_MAX];
+extern Eina_Prefix *PREFIX;
diff --git a/src/lib/auto_comp.c b/src/lib/auto_comp.c
index 17f8786..755d0e3 100644
--- a/src/lib/auto_comp.c
+++ b/src/lib/auto_comp.c
@@ -61,7 +61,9 @@ static void
autocomp_load(autocomp_data *ad)
{
char buf[PATH_MAX];
- snprintf(buf, sizeof(buf), %s/autocomp/autocomp.eet,
elm_app_data_dir_get());
+ snprintf(buf, sizeof(buf), %s/autocomp/autocomp.eet,
+eina_prefix_data_get(PREFIX));
+
if (ad-source_file)
{
if (lex_desc)
diff --git a/src/lib/enventor_main.c b/src/lib/enventor_main.c
index e558aeb..9af30f7 100644
--- a/src/lib/enventor_main.c
+++ b/src/lib/enventor_main.c
@@ -7,6 +7,7 @@
#include enventor_private.h
char EDJE_PATH[PATH_MAX];
+Eina_Prefix *PREFIX = NULL;
const char SIG_CURSOR_LINE_CHANGED[] = cursor,line,changed;
const char SIG_CURSOR_GROUP_CHANGED[]= cursor,group,changed;
const char SIG_LIVE_VIEW_LOADED[] = live_view,loaded;
@@ -23,7 +24,6 @@ const char SIG_FOCUSED[] = focused;
static int _enventor_init_count = 0;
static int _enventor_log_dom = -1;
static Ecore_Event_Handler *_key_down_handler = NULL;
-static Eina_Prefix *pfx = NULL;
static Eina_Bool
key_down_cb(void *data EINA_UNUSED, int type EINA_UNUSED, void *ev)
@@ -95,12 +95,12 @@ enventor_init(int argc, char **argv)
_enventor_log_dom = EINA_LOG_DOMAIN_GLOBAL;
}
- pfx = eina_prefix_new(NULL, enventor_init, ENVENTOR, enventor, NULL,
+ PREFIX = eina_prefix_new(NULL, enventor_init, ENVENTOR, enventor, NULL,
PACKAGE_BIN_DIR, PACKAGE_LIB_DIR,
PACKAGE_DATA_DIR, PACKAGE_DATA_DIR);
snprintf(EDJE_PATH, sizeof(EDJE_PATH), %s/themes/enventor.edj,
-eina_prefix_data_get(pfx));
+eina_prefix_data_get(PREFIX));
srand(time(NULL));
_key_down_handler = ecore_event_handler_add(ECORE_EVENT_KEY_DOWN,
@@ -128,7 +128,7 @@ enventor_shutdown(void)
eina_log_domain_unregister(_enventor_log_dom);
_enventor_log_dom = -1;
}
- eina_prefix_free(pfx);
+ eina_prefix_free(PREFIX);
elm_shutdown();
eio_shutdown();
diff --git a/src/lib/enventor_private.h b/src/lib/enventor_private.h
index 34fa7ac..b072cc1 100644
--- a/src/lib/enventor_private.h
+++ b/src/lib/enventor_private.h
@@ -1,6 +1,8 @@
#ifndef __ENVENTOR_PRIVATE_H__
#define __ENVENTOR_PRIVATE_H__
+#include common.h
+
#define QUOT quot;
#define QUOT_LEN 6
#define QUOT_UTF8 \
@@ -17,7 +19,6 @@
#define VIEW_DATA edj_mgr_view_get(NULL)
#define ATTR_VALUE_MAX_CNT 4
-extern char EDJE_PATH[PATH_MAX];
extern const char SIG_CURSOR_LINE_CHANGED[];
extern const char SIG_CURSOR_GROUP_CHANGED[];
extern const char SIG_MAX_LINE_CHANGED[];
--
[EGIT] [tools/enventor] master 01/01: setting: increase show transition duration.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=6854160251b2e5eefc6aedccb7d52737616c4039
commit 6854160251b2e5eefc6aedccb7d52737616c4039
Author: ChunEon Park her...@hermet.pe.kr
Date: Wed Jun 3 23:18:08 2015 +0900
setting: increase show transition duration.
---
data/themes/default/layout_setting.edc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/themes/default/layout_setting.edc
b/data/themes/default/layout_setting.edc
index 1dd6a9d..9802cb3 100644
--- a/data/themes/default/layout_setting.edc
+++ b/data/themes/default/layout_setting.edc
@@ -200,7 +200,7 @@ group { name: setting_layout;
program { name: load;
signal: load;
action: STATE_SET show 0.0;
- transition: DECELERATE 0.5;
+ transition: DECELERATE 1.0;
target: clipper;
after: event_blocker_hide;
}
--
[EGIT] [core/efl] master 01/01: ecore: null cb function is unacceptable.
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=be0c2f5a317cda9ff836c680af11ea5d8aa76294
commit be0c2f5a317cda9ff836c680af11ea5d8aa76294
Author: ChunEon Park chuneon.p...@samsung.com
Date: Wed Jun 10 17:45:28 2015 +0900
ecore: null cb function is unacceptable.
@fix
---
src/lib/ecore/ecore.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/lib/ecore/ecore.c b/src/lib/ecore/ecore.c
index 298e685..f94584d 100644
--- a/src/lib/ecore/ecore.c
+++ b/src/lib/ecore/ecore.c
@@ -448,7 +448,8 @@ EAPI Eina_Bool
ecore_fork_reset_callback_add(Ecore_Cb func, const void *data)
{
Ecore_Fork_Cb *fcb;
-
+
+ if (!func) return EINA_FALSE;
fcb = calloc(1, sizeof(Ecore_Fork_Cb));
if (!fcb) return EINA_FALSE;
fcb-func = func;
--
[EGIT] [core/efl] efl-1.14 01/01: ecore: null cb function is unacceptable.
hermet pushed a commit to branch efl-1.14.
http://git.enlightenment.org/core/efl.git/commit/?id=54886daace9d5fc264c8d8b3c32bec240fadd460
commit 54886daace9d5fc264c8d8b3c32bec240fadd460
Author: ChunEon Park chuneon.p...@samsung.com
Date: Wed Jun 10 17:45:28 2015 +0900
ecore: null cb function is unacceptable.
@fix
---
src/lib/ecore/ecore.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/lib/ecore/ecore.c b/src/lib/ecore/ecore.c
index 298e685..f94584d 100644
--- a/src/lib/ecore/ecore.c
+++ b/src/lib/ecore/ecore.c
@@ -448,7 +448,8 @@ EAPI Eina_Bool
ecore_fork_reset_callback_add(Ecore_Cb func, const void *data)
{
Ecore_Fork_Cb *fcb;
-
+
+ if (!func) return EINA_FALSE;
fcb = calloc(1, sizeof(Ecore_Fork_Cb));
if (!fcb) return EINA_FALSE;
fcb-func = func;
--
[EGIT] [tools/enventor] master 01/01: live_edit: ... fix live edit scaling issue.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=6d72ca9e4bdfefb693abc1944208fb8aaf018076
commit 6d72ca9e4bdfefb693abc1944208fb8aaf018076
Author: ChunEon Park her...@hermet.pe.kr
Date: Tue Jun 23 21:18:25 2015 +0900
live_edit: ... fix live edit scaling issue.
---
src/bin/live_edit.c | 214 +++-
src/bin/main.c | 2 +-
src/lib/template_code.h | 3 +-
3 files changed, 124 insertions(+), 95 deletions(-)
diff --git a/src/bin/live_edit.c b/src/bin/live_edit.c
index 7b0848a..79c9396 100644
--- a/src/bin/live_edit.c
+++ b/src/bin/live_edit.c
@@ -83,6 +83,18 @@ static const ctxpopup_it_data CTXPOPUP_ITEMS[] =
static live_data *g_ld = NULL;
+static Evas_Object *
+view_obj_get(live_data *ld)
+{
+ //This is a trick! we got the actual view object from the live edit.
+ Evas_Object *o, *o2, *o3;
+ o = elm_object_part_content_get(ld-live_view, elm.swallow.content);
+ o2 = elm_object_content_get(o);
+ o3 = elm_object_part_content_get(o2, elm.swallow.content);
+
+ return o3;
+}
+
static void
info_text_update(live_data *ld)
{
@@ -113,7 +125,6 @@ info_text_update(live_data *ld)
snprintf(buf, sizeof(buf), [%d x %d], layout_w, layout_h);
evas_object_text_text_set(ld-info_text[Info_Text_Size], buf);
-
//Update Position
Evas_Coord x, y, w, h;
Evas_Coord rx, ry, rw, rh;
@@ -154,6 +165,7 @@ live_edit_symbol_set(live_data *ld)
snprintf(buf, sizeof(buf), %s_bg,
CTXPOPUP_ITEMS[ld-part_info.type].name);
Evas_Object *layout_symbol = elm_layout_add(ld-layout);
elm_layout_file_set(layout_symbol, EDJE_PATH, buf);
+ elm_object_scale_set(layout_symbol, config_view_scale_get());
elm_object_part_content_set(ld-layout, elm.swallow.symbol,
layout_symbol);
}
@@ -250,18 +262,17 @@ cp_top_mouse_move_cb(void *data, Evas *e EINA_UNUSED,
Evas_Coord y = ev-cur.canvas.y;
- //Limit to boundary
- Evas_Coord lx, ly, lw, lh;
- evas_object_geometry_get(ld-live_view, lx, ly, NULL, NULL);
- config_view_size_get(lw, lh);
+ Evas_Object *view = view_obj_get(ld);
+ Evas_Coord vx, vy, vw, vh;
+ evas_object_geometry_get(view, vx, vy, vw, vh);
Evas_Coord rel2_y;
evas_object_geometry_get(ld-ctrl_pt[Ctrl_Pt_Rel2], NULL, rel2_y,
NULL, NULL);
- if (ly y) y = ly;
+ if (vy y) y = vy;
if ((y - ld-half_ctrl_size) rel2_y) y = (rel2_y + ld-half_ctrl_size);
- ld-part_info.rel1_y = ROUNDING(((double) (y - ly) / (double) lh), 2);
+ ld-part_info.rel1_y = ROUNDING(((double) (y - vy) / (double) vh), 2);
elm_object_signal_emit(ld-align_line[Align_Line_Top], elm,state,show,
);
}
@@ -276,18 +287,17 @@ cp_bottom_mouse_move_cb(void *data, Evas *e EINA_UNUSED,
Evas_Coord y = ev-cur.canvas.y;
- //Limit to boundary
- Evas_Coord lx, ly, lw, lh;
- evas_object_geometry_get(ld-live_view, lx, ly, NULL, NULL);
- config_view_size_get(lw, lh);
+ Evas_Object *view = view_obj_get(ld);
+ Evas_Coord vx, vy, vw, vh;
+ evas_object_geometry_get(view, vx, vy, vw, vh);
Evas_Coord rel1_y;
evas_object_geometry_get(ld-ctrl_pt[Ctrl_Pt_Rel1], NULL, rel1_y,
NULL, NULL);
- if (y (ly + lh)) y = (ly + lh);
+ if (y (vy + vh)) y = (vy + vh);
if (rel1_y (y + ld-half_ctrl_size)) y = (rel1_y + ld-half_ctrl_size);
- ld-part_info.rel2_y = ROUNDING(((double) (y - ly) / (double) lh), 2);
+ ld-part_info.rel2_y = ROUNDING(((double) (y - vy) / (double) vh), 2);
elm_object_signal_emit(ld-align_line[Align_Line_Bottom], elm,state,show,
);
@@ -297,8 +307,17 @@ static void
align_line_update(live_data *ld)
{
Evas_Coord lx, ly, lw, lh;
- evas_object_geometry_get(ld-live_view, lx, ly, NULL, NULL);
- config_view_size_get(lw, lh);
+ evas_object_geometry_get(ld-live_view, lx, ly, lw, lh);
+
+ Evas_Coord vw, vh;
+ config_view_size_get(vw, vh);
+ vw *= config_view_scale_get();
+ vh *= config_view_scale_get();
+
+ lx = (lx + (lw * 0.5)) - (vw * 0.5);
+ ly = (ly + (lh * 0.5)) - (vh * 0.5);
+ lw = vw;
+ lh = vh;
int x, y;
@@ -340,21 +359,20 @@ cp_rel1_mouse_move_cb(void *data, Evas *e EINA_UNUSED,
Evas_Coord x = ev-cur.canvas.x;
Evas_Coord y = ev-cur.canvas.y;
- //Limit to boundary
- Evas_Coord lx, ly, lw, lh;
- evas_object_geometry_get(ld-live_view, lx, ly, NULL, NULL);
- config_view_size_get(lw, lh);
+ Evas_Object *view = view_obj_get(ld);
+ Evas_Coord vx, vy, vw, vh;
+ evas_object_geometry_get(view, vx, vy, vw, vh);
Evas_Coord rel2_x, rel2_y;
evas_object_geometry_get(ld-ctrl_pt[Ctrl_Pt_Rel2], rel2_x, rel2_y,
NULL, NULL);
- if (lx x) x = lx;
- if (ly y) y = ly;
+ if (vx x) x = vx;
+ if (vy y) y = vy;
if ((x - ld-half_ctrl_size) rel2_x) x = (rel2_x + ld-half_ctrl_size);
if ((y - ld-half_ctrl_size) rel2_y) y = (rel2_y + ld-half_ctrl_size
[EGIT] [tools/enventor] master 01/01: get prepare for v0.6.0
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=b4a80c112d35cd86356891e048fdb5adbc2e9308 commit b4a80c112d35cd86356891e048fdb5adbc2e9308 Author: ChunEon Park her...@hermet.pe.kr Date: Tue Jun 23 21:38:16 2015 +0900 get prepare for v0.6.0 --- README | 2 +- configure.ac | 2 +- data/about/ABOUT | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README b/README index 4283318..8e6d693 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -[Enventor v0.5.0] +[Enventor v0.6.0] This is an EDC editor with some convenient functions. It's brand new and was only started near the begining of June 2013, so expecting it to do everything a mature script editor does is a bit premature, but considering it's young age, it does a lot. diff --git a/configure.ac b/configure.ac index 19dbfbd..b133177 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## m4_define([v_maj], [0]) -m4_define([v_min], [5]) +m4_define([v_min], [6]) m4_define([v_mic], [0]) #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 diff --git a/data/about/ABOUT b/data/about/ABOUT index cbfe178..d5d8246 100644 --- a/data/about/ABOUT +++ b/data/about/ABOUT @@ -1,4 +1,4 @@ -font_size=11b[Enventor v0.5.0]/b/font_size +font_size=11b[Enventor v0.6.0]/b/font_size This is an EDC editor with some convenient functions. It's band new and was only started near the begining of June 2013, so expecting it to do everything a mature script editor does is a bit premature, but considering it's young age, it does a lot. --
[EGIT] [tools/enventor] master 01/01: auto_comp: optimize code.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=c301fab3cd9973847e19f093268341191ec90f6d
commit c301fab3cd9973847e19f093268341191ec90f6d
Author: ChunEon Park her...@hermet.pe.kr
Date: Tue Jun 23 10:11:03 2015 +0900
auto_comp: optimize code.
use callback data rather than global variable.
---
src/lib/auto_comp.c | 53 +
1 file changed, 25 insertions(+), 28 deletions(-)
diff --git a/src/lib/auto_comp.c b/src/lib/auto_comp.c
index 2cfcdbd..769e9fa 100644
--- a/src/lib/auto_comp.c
+++ b/src/lib/auto_comp.c
@@ -363,11 +363,11 @@ entry_anchor_off(autocomp_data *ad)
}
static void
-anchor_unfocused_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
+anchor_unfocused_cb(void *data, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
- autocomp_data *ad = g_ad;
- if (!g_ad) return;
+ autocomp_data *ad = data;
+ if (!ad) return;
entry_anchor_off(ad);
}
@@ -581,11 +581,11 @@ candidate_list_show(autocomp_data *ad)
}
static void
-entry_changed_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
+entry_changed_cb(void *data, Evas_Object *obj EINA_UNUSED,
void *event_info)
{
- autocomp_data *ad = g_ad;
- if ((!g_ad) || (!ad-enabled)) return;
+ autocomp_data *ad = data;
+ if ((!ad) || (!ad-enabled)) return;
Elm_Entry_Change_Info *info = event_info;
@@ -620,21 +620,21 @@ entry_changed_cb(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED,
}
static void
-entry_cursor_changed_manual_cb(void *data EINA_UNUSED,
+entry_cursor_changed_manual_cb(void *data,
Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
- autocomp_data *ad = g_ad;
- if (!g_ad) return;
+ autocomp_data *ad = data;
+ if (!ad) return;
if (ad-anchor_visible) entry_anchor_off(ad);
}
static void
-entry_cursor_changed_cb(void *data EINA_UNUSED, Evas_Object *obj,
+entry_cursor_changed_cb(void *data, Evas_Object *obj,
void *event_info EINA_UNUSED)
{
- autocomp_data *ad = g_ad;
- if (!g_ad) return;
+ autocomp_data *ad = data;
+ if (!ad) return;
//Update anchor position
Evas_Coord x, y, cx, cy, cw, ch;
@@ -646,20 +646,20 @@ entry_cursor_changed_cb(void *data EINA_UNUSED,
Evas_Object *obj,
}
static void
-entry_press_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
+entry_press_cb(void *data, Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
- autocomp_data *ad = g_ad;
- if (!g_ad) return;
+ autocomp_data *ad = data;
+ if (!ad) return;
if (ad-anchor_visible) entry_anchor_off(ad);
}
static void
-entry_move_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED,
+entry_move_cb(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
- autocomp_data *ad = g_ad;
- if (!g_ad) return;
+ autocomp_data *ad = data;
+ if (!ad) return;
if (ad-anchor_visible) entry_anchor_off(ad);
}
@@ -676,7 +676,7 @@ list_item_move(autocomp_data *ad, Eina_Bool up)
if (it) elm_list_item_selected_set(it, EINA_TRUE);
evas_object_smart_callback_add(entry, unfocused, anchor_unfocused_cb,
- NULL);
+ ad);
}
/*/
@@ -723,17 +723,14 @@ autocomp_target_set(edit_data *ed)
if (!ed) return;
entry = edit_entry_get(ed);
- evas_object_smart_callback_add(entry, changed,user, entry_changed_cb,
- NULL);
+ evas_object_smart_callback_add(entry, changed,user, entry_changed_cb, ad);
evas_object_smart_callback_add(entry, cursor,changed,manual,
- entry_cursor_changed_manual_cb,
NULL);
+ entry_cursor_changed_manual_cb, ad);
evas_object_smart_callback_add(entry, cursor,changed,
- entry_cursor_changed_cb, NULL);
- evas_object_smart_callback_add(entry, unfocused, anchor_unfocused_cb,
- NULL);
- evas_object_smart_callback_add(entry, press, entry_press_cb, NULL);
- evas_object_event_callback_add(entry, EVAS_CALLBACK_MOVE,
- entry_move_cb, NULL);
+ entry_cursor_changed_cb, ad);
+ evas_object_smart_callback_add(entry, unfocused, anchor_unfocused_cb, ad);
+ evas_object_smart_callback_add(entry, press, entry_press_cb, ad);
+ evas_object_event_callback_add(entry, EVAS_CALLBACK_MOVE, entry_move_cb,
ad);
ad-anchor = elm_button_add(edit_obj_get(ed));
ad-ed = ed;
--
[EGIT] [tools/enventor] master 01/01: fix the candidate list size.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=e86b8256b614c784fb3576479170896a41ee8f89
commit e86b8256b614c784fb3576479170896a41ee8f89
Author: ChunEon Park her...@hermet.pe.kr
Date: Tue Jun 23 09:57:08 2015 +0900
fix the candidate list size.
don't oversized candidate popup than edit area.
Instead, enable the scroll of the list in order thatuser can choose one
item.
@fix
---
src/lib/auto_comp.c | 29 -
1 file changed, 20 insertions(+), 9 deletions(-)
diff --git a/src/lib/auto_comp.c b/src/lib/auto_comp.c
index b098173..2cfcdbd 100644
--- a/src/lib/auto_comp.c
+++ b/src/lib/auto_comp.c
@@ -374,7 +374,7 @@ anchor_unfocused_cb(void *data EINA_UNUSED, Evas_Object
*obj EINA_UNUSED,
static void
queue_reset(autocomp_data *ad)
{
- if (ad-queue_pos == -1) return;
+ if ((ad-queue_pos == 0) (!ad-anchor_visible)) return;
ad-queue_pos = 0;
memset(ad-queue, 0x0, sizeof(ad-queue));
entry_anchor_off(ad);
@@ -473,6 +473,18 @@ entry_tooltip_content_cb(void *data, Evas_Object *obj
EINA_UNUSED,
elm_object_focus_allow_set(ad-list, EINA_FALSE);
elm_list_mode_set(ad-list, ELM_LIST_EXPAND);
+ //compute list size to prevent over-sizing than enventor window.
+ Evas_Coord y, y2, h;
+ evas_object_geometry_get(edit_obj_get(ad-ed), NULL, y, NULL, h);
+ evas_object_geometry_get(ad-anchor, NULL, y2, NULL, NULL);
+ Elm_Tooltip_Orient tooltip_orient =
+ elm_object_tooltip_orient_get(ad-anchor);
+ Evas_Coord mh;
+ if (tooltip_orient == ELM_TOOLTIP_ORIENT_BOTTOM) mh = (h - y2);
+ else mh = (y2 - y);
+ evas_object_size_hint_max_set(ad-list, 99, mh);
+
+ //add keywords
Eina_List *l;
lexem *lexem_data;
EINA_LIST_FOREACH(ad-lexem_ptr-nodes, l, lexem_data)
@@ -489,8 +501,6 @@ entry_tooltip_content_cb(void *data, Evas_Object *obj
EINA_UNUSED,
Elm_Object_Item *it = elm_list_first_item_get(ad-list);
if (it) elm_list_item_selected_set(it, EINA_TRUE);
- evas_object_smart_callback_add(ad-list, unfocused, anchor_unfocused_cb,
- ad);
evas_object_event_callback_add(ad-list, EVAS_CALLBACK_DEL, list_del_cb,
ad);
if (!found)
{
@@ -616,7 +626,7 @@ entry_cursor_changed_manual_cb(void *data EINA_UNUSED,
{
autocomp_data *ad = g_ad;
if (!g_ad) return;
- entry_anchor_off(ad);
+ if (ad-anchor_visible) entry_anchor_off(ad);
}
static void
@@ -641,7 +651,7 @@ entry_press_cb(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED,
{
autocomp_data *ad = g_ad;
if (!g_ad) return;
- entry_anchor_off(ad);
+ if (ad-anchor_visible) entry_anchor_off(ad);
}
static void
@@ -650,7 +660,7 @@ entry_move_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED,
{
autocomp_data *ad = g_ad;
if (!g_ad) return;
- entry_anchor_off(ad);
+ if (ad-anchor_visible) entry_anchor_off(ad);
}
static void
@@ -658,6 +668,7 @@ list_item_move(autocomp_data *ad, Eina_Bool up)
{
Evas_Object *entry = edit_entry_get(ad-ed);
evas_object_smart_callback_del(entry, unfocused, anchor_unfocused_cb);
+ elm_object_focus_allow_set(ad-list, EINA_TRUE);
Elm_Object_Item *it = elm_list_selected_item_get(ad-list);
if (up) it = elm_list_item_prev(it);
@@ -737,14 +748,14 @@ autocomp_event_dispatch(const char *key)
//Reset queue.
if (!ad-anchor_visible)
{
-if (!strcmp(key, Up) || !strcmp(key, Down) || !strcmp(key, Left)
||
-!strcmp(key, Right))
+if (!strcmp(key, Up) || !strcmp(key, Down) ||
+!strcmp(key, Left) || !strcmp(key, Right))
queue_reset(ad);
return EINA_FALSE;
}
//Cancel the auto complete.
- if (!strcmp(key, BackSpace))
+ if (!strcmp(key, BackSpace) || !strcmp(key, Escape))
{
queue_reset(ad);
return EINA_TRUE;
--
[EGIT] [tools/enventor] master 01/01: auto_comp: close popup if the line is deleted.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=6e7e18b12bf3599c8ea31458064c6e38b62885c3
commit 6e7e18b12bf3599c8ea31458064c6e38b62885c3
Author: ChunEon Park her...@hermet.pe.kr
Date: Tue Jun 23 10:21:22 2015 +0900
auto_comp: close popup if the line is deleted.
@fix.
---
src/lib/auto_comp.c| 8
src/lib/enventor_private.h | 1 +
src/lib/enventor_smart.c | 2 ++
3 files changed, 11 insertions(+)
diff --git a/src/lib/auto_comp.c b/src/lib/auto_comp.c
index 769e9fa..9bb1471 100644
--- a/src/lib/auto_comp.c
+++ b/src/lib/auto_comp.c
@@ -695,6 +695,14 @@ autocomp_list_show(void)
}
void
+autocomp_reset(void)
+{
+ autocomp_data *ad = g_ad;
+ if (!ad) return;
+ queue_reset(ad);
+}
+
+void
autocomp_target_set(edit_data *ed)
{
autocomp_data *ad = g_ad;
diff --git a/src/lib/enventor_private.h b/src/lib/enventor_private.h
index cede4fc..7ae7a97 100644
--- a/src/lib/enventor_private.h
+++ b/src/lib/enventor_private.h
@@ -82,6 +82,7 @@ void autocomp_enabled_set(Eina_Bool enabled);
Eina_Bool autocomp_enabled_get(void);
Eina_Bool autocomp_event_dispatch(const char *key);
void autocomp_list_show(void);
+void autocomp_reset(void);
/* syntax color */
diff --git a/src/lib/enventor_smart.c b/src/lib/enventor_smart.c
index 99e83e7..6a08915 100644
--- a/src/lib/enventor_smart.c
+++ b/src/lib/enventor_smart.c
@@ -589,6 +589,8 @@ EOLIAN static void
_enventor_object_line_delete(Eo *obj EINA_UNUSED, Enventor_Object_Data *pd)
{
edit_line_delete(pd-ed);
+ //Close auto-completion popup if it's shown.
+ autocomp_reset();
}
EOLIAN static Eo *
--
[EGIT] [tools/enventor] master 01/01: --compiler warning.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=55b3a1c4b1a8d9b5adccaeefc63bdd0360c6fc4d commit 55b3a1c4b1a8d9b5adccaeefc63bdd0360c6fc4d Author: ChunEon Park her...@hermet.pe.kr Date: Tue Jun 23 08:25:29 2015 +0900 --compiler warning. shit, avoid unused compiler warning by trick. --- src/lib/edc_parser.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/lib/edc_parser.c b/src/lib/edc_parser.c index cb583e9..ff9139f 100644 --- a/src/lib/edc_parser.c +++ b/src/lib/edc_parser.c @@ -1152,7 +1152,9 @@ is_numberic(const char *str) if (!str || (*str == '\0') || isspace(*str)) return EINA_FALSE; - strtod(str, p); + double v = strtod(str, p); + (v); //trick for avoding unused compiler warning. + if (*p == '\0') ret = EINA_TRUE; return ret; --
[EGIT] [tools/enventor] master 01/01: updated README/ABOUT
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=149faa3f35afe913285de9aec4829b966542784d commit 149faa3f35afe913285de9aec4829b966542784d Author: ChunEon Park her...@hermet.pe.kr Date: Tue Jun 23 08:40:39 2015 +0900 updated README/ABOUT --- README | 93 data/about/ABOUT | 93 2 files changed, 94 insertions(+), 92 deletions(-) diff --git a/README b/README index ccef5fc..35853f1 100644 --- a/README +++ b/README @@ -28,63 +28,64 @@ Once you have met requirements, compiling and installing is simple: [Short Cut Keys] -Esc = Open/Close Menu -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 -F12 = Setting - -Ctrl+S = Quick Save + Update Live View -Ctrl+I = On/Off Auto Indentation -Ctrl+O = On/Off Auto Completion -Ctrl+W = Show/Hide Dummy Swallow -Ctrl+H = On/Off Part Highlighting -Ctrl+T = Insert Defaut Template Code -Ctrl+Mouse Wheel Up = View Scale Up / Font Size Up -Ctrl+Mouse Wheel Down = View Scale Down / Font Size Down +Esc - Open/Close Menu +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 +F12 - Setting + +Ctrl+S - Quick Save + Update Live View +Ctrl+I - On/Off Auto Indentation +Ctrl+O - On/Off Auto Completion +Ctrl+W - Show/Hide Dummy Swallow +Ctrl+H - On/Off Part Highlighting +Ctrl+T - Insert Defaut Template Code +Ctrl+Mouse Wheel Up - View Scale Up / Font Size Up +Ctrl+Mouse Wheel Down - View Scale Down / 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 - 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 -Ctrl+A = Select Text All -Ctrl+Double Click = Select a word -Ctrl+Z = Undo Text -Ctrl+R = Redo Text -Ctrl+C = Copy Selected Text -Ctrl+V = Paste Copied Text -Ctrl+X = Cut Selected Text -Ctrl+D = Delete a Current line -Ctrl+F = Find/Replace -Ctrl+L = Go to line -Ctrl+Home = Go to the Top line -Ctrl+End = Go to the Bottom line +Ctrl+A - Select Text All +Ctrl+Double Click - Select a word +Ctrl+Z - Undo Text +Ctrl+R - Redo Text +Ctrl+C - Copy Selected Text +Ctrl+V - Paste Copied Text +Ctrl+X - Cut Selected Text +Ctrl+D - Delete a Current line +Ctrl+F - Find/Replace +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] [--to] [--id image path] [--sd sound path] [--fd font path] [--dd data path] +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 binary file to the temporary directory. ---to = Open template menu when you launch Enventor ---id = image resources, that edc includes, path ---sd = sound resources, that edc includes, path ---fd = font resources, that edc includes, path ---dd = data resources, that edc includes, 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 binary file to the temporary directory. +-t = Open template menu when you launch Enventor +-i = image resources, that edc includes, path +-s = sound resources, that edc includes, path +-f = font resources, that edc includes, path +-d = data resources, that edc includes, path Examples of Enventor command line usage: $ enventor -$ enventor --to -$ enventor newfile.edc --to -$ enventor sample.edc output.edj --id ./images --sd ./sounds +$ enventor -t +$ enventor newfile.edc -t +$ enventor sample.edc output.edj -i ./images -s ./sounds [Developers] diff --git a/data/about/ABOUT b/data/about/ABOUT index 97e6d7a..f78550f 100644 --- a/data/about/ABOUT +++ b/data/about/ABOUT @@ -10,63 +10,64 @@ http://www.openhub.net/p/enventor font_size=11b[Short Cut Keys]/b/font_size -Esc = Open/Close Menu -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 -F12 = Setting +Esc - Open/Close Menu +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 +F12 - Setting -Ctrl+S = Quick Save + Update Live View -Ctrl+I = On/Off Auto Indentation -Ctrl+O = On/Off Auto Completion -Ctrl+W
[EGIT] [tools/enventor] master 01/01: code refactoring.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=11e5dba04538d789b19df7f0a285a1061c6a3a12
commit 11e5dba04538d789b19df7f0a285a1061c6a3a12
Author: ChunEon Park her...@hermet.pe.kr
Date: Mon Jun 22 18:25:48 2015 +0900
code refactoring.
remove duplicated logics wrt function toggles.
this is the precede work for improving tools gui.
---
src/bin/base_gui.c | 4 ++--
src/bin/main.c | 41 +-
src/bin/tools.c | 57 ++---
src/include/tools.h | 4
4 files changed, 56 insertions(+), 50 deletions(-)
diff --git a/src/bin/base_gui.c b/src/bin/base_gui.c
index ab91d03..1484e71 100644
--- a/src/bin/base_gui.c
+++ b/src/bin/base_gui.c
@@ -63,12 +63,12 @@ base_title_set(const char *path)
}
void
-base_statusbar_toggle(Eina_Bool config)
+base_statusbar_toggle(Eina_Bool toggle)
{
base_data *bd = g_bd;
assert(bd);
- if (config) config_stats_bar_set(!config_stats_bar_get());
+ if (toggle) config_stats_bar_set(!config_stats_bar_get());
if (config_stats_bar_get())
elm_object_signal_emit(bd-layout, elm,state,statusbar,show, );
diff --git a/src/bin/main.c b/src/bin/main.c
index a6a1ab2..9539fe4 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -43,11 +43,13 @@ enventor_common_setup(Evas_Object *enventor)
enventor_object_font_set(enventor, font_name, font_style);
enventor_object_font_scale_set(enventor, config_font_scale_get());
enventor_object_live_view_scale_set(enventor, config_view_scale_get());
- enventor_object_linenumber_set(enventor, config_linenumber_get());
+ tools_lines_update(enventor, EINA_FALSE);
enventor_object_part_highlight_set(enventor, config_part_highlight_get());
+ tools_highlight_update(enventor, EINA_FALSE);
enventor_object_auto_indent_set(enventor, config_auto_indent_get());
enventor_object_auto_complete_set(enventor, config_auto_complete_get());
- enventor_object_dummy_swallow_set(enventor, config_dummy_swallow_get());
+ tools_swallow_update(enventor, EINA_FALSE);
+ tools_status_update(NULL, EINA_FALSE);
Eina_List *list = eina_list_append(NULL, config_edj_path_get());
enventor_object_path_set(enventor, ENVENTOR_OUT_EDJ, list);
@@ -134,7 +136,6 @@ config_update_cb(void *data)
enventor_object_live_view_size_set(enventor, w, h);
base_tools_toggle(EINA_FALSE);
- base_statusbar_toggle(EINA_FALSE);
base_console_auto_hide();
}
@@ -516,29 +517,6 @@ enventor_setup(app_data *ad)
}
static void
-part_highlight_toggle(app_data *ad)
-{
- config_part_highlight_set(!config_part_highlight_get());
- enventor_object_part_highlight_set(ad-enventor,
- config_part_highlight_get());
- if (config_part_highlight_get())
- stats_info_msg_update(Part Highlighting Enabled.);
- else
- stats_info_msg_update(Part Highlighting Disabled.);
-}
-
-static void
-dummy_swallow_toggle(app_data *ad)
-{
- config_dummy_swallow_set(!config_dummy_swallow_get());
- enventor_object_dummy_swallow_set(ad-enventor, config_dummy_swallow_get());
- if (config_dummy_swallow_get())
- stats_info_msg_update(Dummy Swallow Enabled.);
- else
- stats_info_msg_update(Dummy Swallow Disabled.);
-}
-
-static void
default_template_insert(app_data *ad)
{
if (live_edit_get())
@@ -633,13 +611,13 @@ ctrl_func(app_data *ad, Ecore_Event_Key *event)
//Part Highlight
if (!strcmp(event-key, h) || !strcmp(event-key, H))
{
-part_highlight_toggle(ad);
+tools_highlight_update(ad-enventor, EINA_TRUE);
return EINA_TRUE;
}
//Swallow Dummy Object
if (!strcmp(event-key, w) || !strcmp(event-key, W))
{
-dummy_swallow_toggle(ad);
+tools_swallow_update(ad-enventor, EINA_TRUE);
return EINA_TRUE;
}
//Template Code
@@ -773,8 +751,7 @@ main_key_down_cb(void *data, int type EINA_UNUSED, void *ev)
if (!strcmp(event-key, F5))
{
enventor_object_ctxpopup_dismiss(ad-enventor);
-config_linenumber_set(!config_linenumber_get());
-enventor_object_linenumber_set(ad-enventor, config_linenumber_get());
+tools_lines_update(ad-enventor, EINA_TRUE);
return ECORE_CALLBACK_DONE;
}
//Tools
@@ -795,7 +772,7 @@ main_key_down_cb(void *data, int type EINA_UNUSED, void *ev)
if (!strcmp(event-key, F11))
{
enventor_object_ctxpopup_dismiss(ad-enventor);
-base_statusbar_toggle(EINA_TRUE);
+tools_status_update(NULL, EINA_TRUE);
return ECORE_CALLBACK_DONE;
}
//Setting
@@ -815,7 +792,7 @@ statusbar_set()
{
Evas_Object *obj = stats_init(base_layout_get());
elm_object_part_content_set(base_layout_get(), elm.swallow.statusbar,
obj);
- base_statusbar_toggle(EINA_FALSE);
+ tools_status_update(NULL, EINA_FALSE);
}
static void
diff --git a/src/bin/tools.c b/src
[EGIT] [admin/devs] master 01/01: update nikawhite public key
hermet pushed a commit to branch master. http://git.enlightenment.org/admin/devs.git/commit/?id=748f0807bed6130727e4dca6441158933dc7b723 commit 748f0807bed6130727e4dca6441158933dc7b723 Author: ChunEon Park chuneon.p...@samsung.com Date: Thu Jun 25 16:28:10 2015 +0900 update nikawhite public key --- probies/nikawhite/id_rsa.pub | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/probies/nikawhite/id_rsa.pub b/probies/nikawhite/id_rsa.pub index b0e0bec..915d0f8 100644 --- a/probies/nikawhite/id_rsa.pub +++ b/probies/nikawhite/id_rsa.pub @@ -1 +1 @@ -ssh-rsa B3NzaC1yc2EDAQABAAABAQCnYuP7PgbzM8iiQgZKPAvsaxDKCRR7VxEjwSEUaIUYG66+HDY82noCohuIT47FEkGdR5B4m0FtRigD4CNRs9UdWbxGRA/AI3vQjZubTIwMY0YuXIF5e8y9xyElnvCoHSvA6O/qcqWnk0biQmkTUQ1IwQT2dhoFhACMfVe9wVkctUxi232n1OsRiwkBnwAIxMoM51uQXCshHFQBfADuzAd1ZZMNB0doj3/M88yucclH17A02rmhqxeCLmTzLk1tC+nP3T8gwjU7s55lvi+Qa87UhoCwGkdF95DkutZAEqcc/EeDbVFXAoLII7SG2KDiZ+s9vbSg1iz/j+KBHcc0TaRj m.biliavs...@samsung.com +ssh-rsa B3NzaC1yc2EDAQABAAABAQDMqDBUDlM1siK2XZ6mdaZhaSZQbg92w+RiSUzMX58eJZmzjv/+tbNPxe65w4lD5L3axltOpORFrUcYgppXfCrnDj44PwKtnKDlU6S++FuNSaRltnwguvECBbnoObzFda9s4OY8GBhFTVd4VwzJdeoUJztF9f6k1WcpKgsbJ0nukPSCP+/j1RPqRQAnU9ofbzr4tXXY1vJUqQLlvs2gSkx+wjRCSuTPOsMpEnxQ/jh+vqW85Gcqbk06kWPKWZU28BfU9LmFaiMDCf3E4OPRdr1Kf6IUfmPWzFhvAQTCT9JxmTVWGTlJpK3E2HIxajWvlfnBjaeUw7Df+9bYICWfO261 nikawhite@mbiliavskyi --
[EGIT] [tools/enventor] master 01/01: menu: fix wrong grammar
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=9615d308ec47fc5293e1f9c3bd4f83b7c6855fb7 commit 9615d308ec47fc5293e1f9c3bd4f83b7c6855fb7 Author: ChunEon Park her...@hermet.pe.kr Date: Wed Jun 24 14:47:27 2015 +0900 menu: fix wrong grammar --- src/bin/menu.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/bin/menu.c b/src/bin/menu.c index 68c1ecd..e4780a0 100644 --- a/src/bin/menu.c +++ b/src/bin/menu.c @@ -184,7 +184,7 @@ warning_open(menu_data *md, Evas_Smart_Cb yes_cb, Evas_Smart_Cb save_cb) elm_object_part_text_set(layout, elm.text.desc, Without save, you will lose last changes!); elm_object_part_text_set(layout, elm.text.question, -Will you save this changes?); +Will you save changes?); elm_object_signal_callback_add(layout, elm,state,dismiss,done, , warning_dismiss_done, md); evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); @@ -213,7 +213,6 @@ warning_open(menu_data *md, Evas_Smart_Cb yes_cb, Evas_Smart_Cb save_cb) evas_object_smart_callback_add(btn, clicked, warning_no_btn_cb, md); elm_object_part_content_set(layout, elm.swallow.btn3, btn); - md-warning_layout = layout; menu_activate_request(); } --
[EGIT] [tools/enventor] master 01/01: updated NEWS
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=b94d20ec05f0b83087d33da73962b39cbba543fe commit b94d20ec05f0b83087d33da73962b39cbba543fe Author: ChunEon Park her...@hermet.pe.kr Date: Wed Jun 24 15:26:50 2015 +0900 updated NEWS --- NEWS | 1 + 1 file changed, 1 insertion(+) diff --git a/NEWS b/NEWS index c48ec15..eea2b2b 100644 --- a/NEWS +++ b/NEWS @@ -45,6 +45,7 @@ Fixes: * Close auto completion popup if the line is deleted. * Fix focus highlight remaining issue when live edit item is selected. * Zoom up/down properly on live edit mode. + * Cancel live edit if the about(F1) is activated. Changes since Enventor 0.4.0: - --
[EGIT] [tools/enventor] master 01/01: updatd command line help message.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=460e6dc97be5b5606a527ffd7287ae6d111db9e5 commit 460e6dc97be5b5606a527ffd7287ae6d111db9e5 Author: ChunEon Park her...@hermet.pe.kr Date: Wed Jun 24 15:50:20 2015 +0900 updatd command line help message. --- src/include/common.h | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/include/common.h b/src/include/common.h index 0217277..81bb8ea 100644 --- a/src/include/common.h +++ b/src/include/common.h @@ -7,12 +7,12 @@ typedef struct statusbar_s stats_data; #define ENVENTOR_HELP_EXAMPLES \ Examples of Enventor command line usage:\n \ $ enventor\n \ -$ enventor --to\n \ -$ enventor newfile.edc --to\n \ -$ enventor sample.edc output.edj --id ./images --sd ./sounds\n +$ enventor -t\n \ +$ enventor newfile.edc -t\n \ +$ enventor sample.edc output.edj -i ./images -s ./sounds\n #define ENVENTOR_USAGE \ -%prog [input file] [output file] [--to] [--id image path] [--sd sound path] [--fd font path] [--dd data path] +%prog [input file] [output file] [-t] [-i image path] [-s sound path] [-f font path] [-d data path] #define ENVENTOR_INFO \ This is an EDC editor with some convenient functions.\n \ --
[EGIT] [tools/enventor] enventor-0.6 01/01: updatd command line help message.
hermet pushed a commit to branch enventor-0.6. http://git.enlightenment.org/tools/enventor.git/commit/?id=db63cc7736d1f77dafd8c32958159118cf75970d commit db63cc7736d1f77dafd8c32958159118cf75970d Author: ChunEon Park her...@hermet.pe.kr Date: Wed Jun 24 15:50:20 2015 +0900 updatd command line help message. --- src/include/common.h | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/include/common.h b/src/include/common.h index 0217277..81bb8ea 100644 --- a/src/include/common.h +++ b/src/include/common.h @@ -7,12 +7,12 @@ typedef struct statusbar_s stats_data; #define ENVENTOR_HELP_EXAMPLES \ Examples of Enventor command line usage:\n \ $ enventor\n \ -$ enventor --to\n \ -$ enventor newfile.edc --to\n \ -$ enventor sample.edc output.edj --id ./images --sd ./sounds\n +$ enventor -t\n \ +$ enventor newfile.edc -t\n \ +$ enventor sample.edc output.edj -i ./images -s ./sounds\n #define ENVENTOR_USAGE \ -%prog [input file] [output file] [--to] [--id image path] [--sd sound path] [--fd font path] [--dd data path] +%prog [input file] [output file] [-t] [-i image path] [-s sound path] [-f font path] [-d data path] #define ENVENTOR_INFO \ This is an EDC editor with some convenient functions.\n \ --
[EGIT] [tools/enventor] master 01/01: updated NEWS.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=a604cfcae47c30b69e0ad5bb4f853f9ce2e944b0 commit a604cfcae47c30b69e0ad5bb4f853f9ce2e944b0 Author: ChunEon Park her...@hermet.pe.kr Date: Wed Jun 24 15:36:47 2015 +0900 updated NEWS. --- NEWS | 1 + 1 file changed, 1 insertion(+) diff --git a/NEWS b/NEWS index eea2b2b..8b3ced9 100644 --- a/NEWS +++ b/NEWS @@ -46,6 +46,7 @@ Fixes: * Fix focus highlight remaining issue when live edit item is selected. * Zoom up/down properly on live edit mode. * Cancel live edit if the about(F1) is activated. + * Ctrl + wheel works even with numlock. Changes since Enventor 0.4.0: - --
[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=e7540c84377b87d982d3c607ffb7fe796214ff86 commit e7540c84377b87d982d3c607ffb7fe796214ff86 Author: ChunEon Park chuneon.p...@samsung.com Date: Wed Jun 24 17:03:55 2015 +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 8b0d39a..e163c64 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.5.1 +enventor_v= 0.6.0 extn = .tar.gz dlbase= http://download.enlightenment.org/rel/ --
[EGIT] [tools/enventor] master 01/01: edj_viewer: fix wrong spacer highlight position.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=2a7ebec75b55308ae1cc3a0fa30033da71961e91
commit 2a7ebec75b55308ae1cc3a0fa30033da71961e91
Author: ChunEon Park her...@hermet.pe.kr
Date: Wed Jun 24 15:06:48 2015 +0900
edj_viewer: fix wrong spacer highlight position.
spacer position just need to relative to the it's layout.
this is much simpler way to support zooming as well as it's nature behavior.
---
src/lib/edj_viewer.c | 17 +++--
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/src/lib/edj_viewer.c b/src/lib/edj_viewer.c
index dcd2aa8..e45eaf6 100644
--- a/src/lib/edj_viewer.c
+++ b/src/lib/edj_viewer.c
@@ -98,25 +98,22 @@ part_obj_geom_cb(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj,
Evas_Coord x, y, w , h;
if (edje_edit_part_type_get(vd-layout, vd-part_name) ==
EDJE_PART_TYPE_SPACER)
{
-Evas_Coord scroller_x, scroller_y;
-Evas_Coord scroller_region_x, scroller_region_y;
Evas_Object *scroller_edje = elm_layout_edje_get(vd-scroller);
// Clipper need, to clip the highlight object for the part SPACER,
// because position of the highlight object is calculated here,
// not in edje. In case, when the SPACER is placed outside of
// scroller region view, the highlight should be hided.
Evas_Object *clipper =
- (Evas_Object *)edje_object_part_object_get(scroller_edje,
clipper);
+ (Evas_Object *)edje_object_part_object_get(scroller_edje,
+ clipper);
-elm_scroller_region_get(vd-scroller, scroller_region_x,
-scroller_region_y, NULL, NULL);
-evas_object_geometry_get(vd-scroller, scroller_x, scroller_y,
- NULL, NULL);
evas_object_smart_member_add(part_highlight, vd-scroller);
-edje_object_part_geometry_get(vd-layout, vd-part_name, x, y, w,
h);
+edje_object_part_geometry_get(vd-layout, vd-part_name,
+ x, y, w, h);
+Evas_Coord lx, ly;
+evas_object_geometry_get(vd-layout, lx, ly, NULL, NULL);
-evas_object_move(part_highlight, x + scroller_x - scroller_region_x +
1,
- y + scroller_y - scroller_region_y + 1);
+evas_object_move(part_highlight, (x + lx), (y + ly));
evas_object_resize(part_highlight, w, h);
evas_object_clip_set(part_highlight, clipper);
}
--
[EGIT] [tools/enventor] master 01/01: tools: update tooltip message
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=3c31b1661e1e6c9eb4e34b93f1727f0da1cd84e9 commit 3c31b1661e1e6c9eb4e34b93f1727f0da1cd84e9 Author: ChunEon Park her...@hermet.pe.kr Date: Wed Jun 24 15:38:20 2015 +0900 tools: update tooltip message --- src/bin/tools.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/tools.c b/src/bin/tools.c index 56d7729..d251d06 100644 --- a/src/bin/tools.c +++ b/src/bin/tools.c @@ -262,7 +262,7 @@ tools_init(Evas_Object *parent, Evas_Object *enventor) evas_object_show(sp); elm_box_pack_end(box, sp); - btn = tools_btn_create(box, console, Console Box (Ctrl + Down), + btn = tools_btn_create(box, console, Console Box (Alt + Down), console_cb, NULL); elm_object_tooltip_orient_set(btn, ELM_TOOLTIP_ORIENT_BOTTOM_LEFT); evas_object_size_hint_weight_set(btn, 0, EVAS_HINT_EXPAND); --
[EGIT] [tools/enventor] master 01/01: live edit: don't clip by symbol layout but live view.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=56816ab1f4760780df58c8810ea8b9458ffdc2d5
commit 56816ab1f4760780df58c8810ea8b9458ffdc2d5
Author: ChunEon Park her...@hermet.pe.kr
Date: Wed Jun 24 15:11:44 2015 +0900
live edit: don't clip by symbol layout but live view.
texts/control points don't need to be clipped by symbol layout.
if the zoom level is enoughly small and there is enough space to
display the control points and text, then we can display them.
---
src/bin/live_edit.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/bin/live_edit.c b/src/bin/live_edit.c
index 79c9396..f9b58c8 100644
--- a/src/bin/live_edit.c
+++ b/src/bin/live_edit.c
@@ -637,7 +637,7 @@ ctrl_pt_init(live_data *ld)
for (i = 0; i Ctrl_Pt_Cnt; i++)
{
Evas_Object *layout = elm_layout_add(ld-layout);
-evas_object_smart_member_add(layout, ld-layout);
+evas_object_smart_member_add(layout, ld-live_view);
elm_layout_file_set(layout, EDJE_PATH, ctrl_pt);
evas_object_resize(layout, ctrl_size, ctrl_size);
evas_object_show(layout);
@@ -836,7 +836,7 @@ info_text_init(live_data *ld)
for (i = 0; i Info_Text_Cnt; i++)
{
Evas_Object *text = evas_object_text_add(e);
-evas_object_smart_member_add(text, ld-layout);
+evas_object_smart_member_add(text, ld-live_view);
evas_object_pass_events_set(text, EINA_TRUE);
evas_object_layer_set(text, INFO_TEXT_LAYER);
evas_object_text_font_set(text, LIVE_EDIT_FONT,
--
[EGIT] [tools/enventor] master 01/01: live_edit: update live edit on scrolling.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=9342835f3df3fd52a5512456d674631f4735f656
commit 9342835f3df3fd52a5512456d674631f4735f656
Author: ChunEon Park her...@hermet.pe.kr
Date: Wed Jun 24 15:24:32 2015 +0900
live_edit: update live edit on scrolling.
---
src/bin/live_edit.c | 31 ++-
1 file changed, 26 insertions(+), 5 deletions(-)
diff --git a/src/bin/live_edit.c b/src/bin/live_edit.c
index f9b58c8..d9ef509 100644
--- a/src/bin/live_edit.c
+++ b/src/bin/live_edit.c
@@ -84,15 +84,29 @@ static const ctxpopup_it_data CTXPOPUP_ITEMS[] =
static live_data *g_ld = NULL;
static Evas_Object *
+view_scroller_get(live_data *ld)
+{
+ //This is a trick! we got the actual view object from the live edit.
+ if (!ld-live_view) return NULL;
+ return elm_object_part_content_get(ld-live_view,
+ elm.swallow.content);
+}
+
+static Evas_Object *
view_obj_get(live_data *ld)
{
//This is a trick! we got the actual view object from the live edit.
- Evas_Object *o, *o2, *o3;
- o = elm_object_part_content_get(ld-live_view, elm.swallow.content);
- o2 = elm_object_content_get(o);
- o3 = elm_object_part_content_get(o2, elm.swallow.content);
+ Evas_Object *o = view_scroller_get(ld);
+ Evas_Object *o2 = elm_object_content_get(o);
+ return elm_object_part_content_get(o2, elm.swallow.content);
+}
- return o3;
+static void
+view_scroll_cb(void *data, Evas_Object *obj EINA_UNUSED,
+ void *event_info EINA_UNUSED)
+{
+ live_data *ld = data;
+ live_edit_update_internal(ld);
}
static void
@@ -875,6 +889,9 @@ live_edit_layer_set(live_data *ld)
ld-layout = layout;
+ evas_object_smart_callback_add(view_scroller_get(ld), scroll,
+ view_scroll_cb, ld);
+
//Initial Layout Geometry
ld-part_info.rel1_x = LIVE_EDIT_REL1;
ld-part_info.rel1_y = LIVE_EDIT_REL1;
@@ -1001,6 +1018,10 @@ live_edit_cancel(void)
live_view_geom_cb);
evas_object_event_callback_del(ld-live_view, EVAS_CALLBACK_MOVE,
live_view_geom_cb);
+
+ evas_object_smart_callback_del(view_scroller_get(ld),
+ scroll,
+ view_scroll_cb);
ld-live_view = NULL;
evas_object_del(ld-layout);
--
[EGIT] [tools/enventor] enventor-0.6 01/03: Revert eo: sync with eolian syntax changes.
hermet pushed a commit to branch enventor-0.6.
http://git.enlightenment.org/tools/enventor.git/commit/?id=7cf5c822ce7e2dcf161ada6473dccf2842204630
commit 7cf5c822ce7e2dcf161ada6473dccf2842204630
Author: ChunEon Park her...@hermet.pe.kr
Date: Wed Jun 24 15:59:45 2015 +0900
Revert eo: sync with eolian syntax changes.
This reverts commit a81a0d23ee29f37338e142de6acc755a1542fd97.
---
src/lib/enventor_object.eo | 98 +++---
src/lib/enventor_smart.c | 6 +--
2 files changed, 51 insertions(+), 53 deletions(-)
diff --git a/src/lib/enventor_object.eo b/src/lib/enventor_object.eo
index e059a7b..060ee96 100644
--- a/src/lib/enventor_object.eo
+++ b/src/lib/enventor_object.eo
@@ -18,7 +18,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@ingroup Enventor */
}
values {
-part_highlight: bool; /*@ ... */
+Eina_Bool part_highlight; /*@ ... */
}
}
@property live_view_scale {
@@ -38,7 +38,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@ingroup Enventor */
}
values {
-scale: double; /*@ ... */
+double scale; /*@ ... */
}
}
@property dummy_swallow {
@@ -58,7 +58,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@ingroup Enventor */
}
values {
-dummy_swallow: bool; /*@ ... */
+Eina_Bool dummy_swallow; /*@ ... */
}
}
@property auto_complete {
@@ -78,7 +78,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@ingroup Enventor */
}
values {
-auto_complete: bool; /*@ ... */
+Eina_Bool auto_complete; /*@ ... */
}
}
@property auto_indent {
@@ -98,7 +98,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@ingroup Enventor */
}
values {
-auto_indent: bool; /*@ ... */
+Eina_Bool auto_indent; /*@ ... */
}
}
@property ctxpopup {
@@ -118,9 +118,9 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@ingroup Enventor */
}
values {
-ctxpopup: bool; /*@ ... */
+Eina_Bool ctxpopup; /*@ ... */
}
- }
+ }
@property focus {
set {
/*@
@@ -138,7 +138,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@ingroup Enventor */
}
values {
-focus: bool; /*@ ... */
+Eina_Bool focus; /*@ ... */
}
}
@property modified {
@@ -158,7 +158,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@ingroup Enventor */
}
values {
-modified: bool; /*@ ... */
+Eina_Bool modified; /*@ ... */
}
}
@property font_scale {
@@ -178,7 +178,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@ingroup Enventor */
}
values {
-font_scale: double; /*@ ... */
+double font_scale; /*@ ... */
}
}
@property linenumber {
@@ -198,7 +198,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@ingroup Enventor */
}
values {
-linenumber: bool; /*@ ... */
+bool linenumber; /*@ ... */
}
}
path_set {
@@ -210,8 +210,8 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@ingroup Enventor */
return: Eina_Bool;
params {
-@in type: Enventor_Path_Type; /*@ ... */
-@in pathes: const(Eina_List) *; /*@ ... */
+@in Enventor_Path_Type type; /*@ ... */
+@in const(Eina_List) *pathes; /*@ ... */
}
}
path_get {
@@ -223,7 +223,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@ingroup Enventor */
return: const(Eina_List) *;
params {
-@in type: Enventor_Path_Type; /*@ ... */
+@in Enventor_Path_Type type; /*@ ... */
}
}
max_line_get {
@@ -251,7 +251,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@see
@ingroup Enventor */
params {
-@in text: const(char) *; /*@ ... */
+@in const(char) *text; /*@ ... */
}
}
selection_get {
@@ -280,7 +280,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@see
@ingroup Enventor */
params {
-@in position: int; /*@ ... */
+@in int position; /*@ ... */
}
}
select_none {
@@ -297,8 +297,8 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@see
@ingroup Enventor */
params {
-@in start: int; /*@ ... */
-@in end: int; /*@ ... */
+@in int start; /*@ ... */
+@in int end
[EGIT] [tools/enventor] enventor-0.6 02/03: Revert lib/enventor: Use the new Eolian property syntax.
hermet pushed a commit to branch enventor-0.6.
http://git.enlightenment.org/tools/enventor.git/commit/?id=2bae53cbc5183a66d11562e8d813d083003e7f97
commit 2bae53cbc5183a66d11562e8d813d083003e7f97
Author: ChunEon Park her...@hermet.pe.kr
Date: Wed Jun 24 15:59:59 2015 +0900
Revert lib/enventor: Use the new Eolian property syntax.
This reverts commit d66139a1aafdc4db31025dc4fc211ddea592c607.
---
src/lib/enventor_object.eo | 24 +---
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/lib/enventor_object.eo b/src/lib/enventor_object.eo
index 060ee96..1e0fa2e 100644
--- a/src/lib/enventor_object.eo
+++ b/src/lib/enventor_object.eo
@@ -1,7 +1,7 @@
class Enventor.Object (Elm.Widget, Efl.File) {
eo_prefix: enventor_obj;
- methods {
- @property part_highlight {
+ properties {
+ part_highlight {
set {
/*@
@brief
@@ -21,7 +21,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
Eina_Bool part_highlight; /*@ ... */
}
}
- @property live_view_scale {
+ live_view_scale {
set {
/*@
@brief
@@ -41,7 +41,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
double scale; /*@ ... */
}
}
- @property dummy_swallow {
+ dummy_swallow {
set {
/*@
@brief
@@ -61,7 +61,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
Eina_Bool dummy_swallow; /*@ ... */
}
}
- @property auto_complete {
+ auto_complete {
set {
/*@
@brief
@@ -81,7 +81,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
Eina_Bool auto_complete; /*@ ... */
}
}
- @property auto_indent {
+ auto_indent {
set {
/*@
@brief
@@ -101,7 +101,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
Eina_Bool auto_indent; /*@ ... */
}
}
- @property ctxpopup {
+ ctxpopup {
set {
/*@
@brief
@@ -121,7 +121,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
Eina_Bool ctxpopup; /*@ ... */
}
}
- @property focus {
+ focus {
set {
/*@
@brief
@@ -141,7 +141,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
Eina_Bool focus; /*@ ... */
}
}
- @property modified {
+ modified {
set {
/*@
@brief
@@ -161,7 +161,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
Eina_Bool modified; /*@ ... */
}
}
- @property font_scale {
+ font_scale {
set {
/*@
@brief
@@ -181,7 +181,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
double font_scale; /*@ ... */
}
}
- @property linenumber {
+ linenumber {
set {
/*@
@brief
@@ -201,6 +201,8 @@ class Enventor.Object (Elm.Widget, Efl.File) {
bool linenumber; /*@ ... */
}
}
+ }
+ methods {
path_set {
/*@
@brief
--
[EGIT] [tools/enventor] master 01/01: auto_comp: fix crash at auto comp.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=e45efbf3816346ae06d48a84b256dd8ae90a8b98
commit e45efbf3816346ae06d48a84b256dd8ae90a8b98
Author: ChunEon Park her...@hermet.pe.kr
Date: Wed Jun 24 14:06:32 2015 +0900
auto_comp: fix crash at auto comp.
increase stack buffer size to afford more huge size of edc text.
and handle exceptional case for lack of stack size.
---
src/lib/auto_comp.c | 21 +
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/src/lib/auto_comp.c b/src/lib/auto_comp.c
index 9bb1471..9a4701f 100644
--- a/src/lib/auto_comp.c
+++ b/src/lib/auto_comp.c
@@ -7,7 +7,7 @@
#define QUEUE_SIZE 20
#define COMPSET_PAIR_MINIMUM 1
-#define MAX_CONTEXT_STACK 20
+#define MAX_CONTEXT_STACK 40
#define MAX_KEYWORD_LENGHT 40
typedef struct lexem_s
@@ -140,8 +140,8 @@ context_lexem_thread_cb(void *data, Ecore_Thread *thread
EINA_UNUSED)
int i = 0;
if (!td-utf8) return;
- char *utf8 = td-utf8;
+ char *utf8 = td-utf8;
char *cur = utf8;
char *end = cur + cur_pos;
char stack[MAX_CONTEXT_STACK][MAX_KEYWORD_LENGHT];
@@ -195,6 +195,7 @@ context_lexem_thread_cb(void *data, Ecore_Thread *thread
EINA_UNUSED)
memset(stack[depth], 0x0, MAX_KEYWORD_LENGHT);
strncpy(stack[depth], help_ptr, context_len);
depth++;
+ if (depth == MAX_CONTEXT_STACK) break;
}
if (*cur == '.')
{
@@ -217,6 +218,7 @@ context_lexem_thread_cb(void *data, Ecore_Thread *thread
EINA_UNUSED)
memset(stack[depth], 0x0, MAX_KEYWORD_LENGHT);
strncpy(stack[depth], help_ptr, context_len);
depth++;
+ if (depth == MAX_CONTEXT_STACK) break;
dot_lex = EINA_TRUE;
}
if ((*cur == ';') dot_lex)
@@ -247,7 +249,6 @@ context_lexem_thread_cb(void *data, Ecore_Thread *thread
EINA_UNUSED)
if (!strncmp(stack[i], td-result-name,
strlen(td-result-name)))
{
nodes = td-result-nodes;
- l = NULL;
find_flag = EINA_TRUE;
break;
}
@@ -258,7 +259,6 @@ context_lexem_thread_cb(void *data, Ecore_Thread *thread
EINA_UNUSED)
return;
}
}
- return;
}
static void
@@ -267,8 +267,7 @@ context_lexem_thread_end_cb(void *data, Ecore_Thread
*thread EINA_UNUSED)
ctx_lexem_td *td = (ctx_lexem_td *)data;
td-ad-lexem_ptr = td-result ? td-result : (lexem *)td-ad-lexem_root;
- if (td-ad-cntx_lexem_thread == thread)
- td-ad-cntx_lexem_thread = NULL;
+ td-ad-cntx_lexem_thread = NULL;
if (td-list_show || (td-result td-result-dot
td-ad-dot_candidate))
candidate_list_show(td-ad);
@@ -285,8 +284,7 @@ context_lexem_thread_cancel_cb(void *data, Ecore_Thread
*thread EINA_UNUSED)
td-ad-lexem_ptr = td-result ? td-result : (lexem *)td-ad-lexem_root;
if (td-list_show || (td-result td-result-dot
td-ad-dot_candidate))
candidate_list_show(td-ad);
- if (td-ad-cntx_lexem_thread == thread)
- td-ad-cntx_lexem_thread = NULL;
+ td-ad-cntx_lexem_thread = NULL;
td-ad-dot_candidate = EINA_FALSE;
free(td-utf8);
free(td);
@@ -301,9 +299,7 @@ context_lexem_get(autocomp_data *ad, Evas_Object *entry,
Eina_Bool list_show)
ad-lexem_ptr = (lexem *)ad-lexem_root;
return;
}
-
- if (ad-cntx_lexem_thread)
- ecore_thread_cancel(ad-cntx_lexem_thread);
+ ecore_thread_cancel(ad-cntx_lexem_thread);
ctx_lexem_td *td = (ctx_lexem_td *)calloc(1, sizeof(ctx_lexem_td));
td-utf8 = elm_entry_markup_to_utf8(text);
@@ -314,7 +310,8 @@ context_lexem_get(autocomp_data *ad, Evas_Object *entry,
Eina_Bool list_show)
ad-cntx_lexem_thread = ecore_thread_run(context_lexem_thread_cb,
context_lexem_thread_end_cb,
- context_lexem_thread_cancel_cb,
td);
+ context_lexem_thread_cancel_cb,
+ td);
}
static void
--
[EGIT] [tools/enventor] master 01/01: adjust live view zoom range
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=8d51516705c580820d5ad1d2d59234b96fae9f0e commit 8d51516705c580820d5ad1d2d59234b96fae9f0e Author: ChunEon Park her...@hermet.pe.kr Date: Wed Jun 24 14:35:14 2015 +0900 adjust live view zoom range 0.5 ~ 5.0 - 0.1 ~ 10.0 --- src/include/config_data.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/include/config_data.h b/src/include/config_data.h index dc236d6..630e773 100644 --- a/src/include/config_data.h +++ b/src/include/config_data.h @@ -1,7 +1,7 @@ #define MAX_FONT_SCALE 5.0 #define MIN_FONT_SCALE 0.5 -#define MAX_VIEW_SCALE 5.0 -#define MIN_VIEW_SCALE 0.5 +#define MAX_VIEW_SCALE 10.0 +#define MIN_VIEW_SCALE 0.1 void config_init(const char *edc_path, const char *edj_path, Eina_List *edc_img_path, Eina_List *edc_snd_path, Eina_List *edc_fnt_path, Eina_List *edc_dat_path); void config_term(void); --
[EGIT] [tools/enventor] master 01/01: cancel live edit if the about is activated.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=786fef138cf1bf7bd57c981530bfb8de514719bf
commit 786fef138cf1bf7bd57c981530bfb8de514719bf
Author: ChunEon Park her...@hermet.pe.kr
Date: Wed Jun 24 15:26:00 2015 +0900
cancel live edit if the about is activated.
---
src/bin/main.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/bin/main.c b/src/bin/main.c
index fb6f2e0..2c710a9 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -730,6 +730,7 @@ main_key_down_cb(void *data, int type EINA_UNUSED, void *ev)
if (!strcmp(event-key, F1))
{
enventor_object_ctxpopup_dismiss(ad-enventor);
+live_edit_cancel();
menu_about();
return ECORE_CALLBACK_DONE;
}
--
[EGIT] [tools/enventor] master 01/01: live_edit: fix focus highlight floating issue.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=f7bb26e9b17d4ce3e255474c19919d063e09de27
commit f7bb26e9b17d4ce3e255474c19919d063e09de27
Author: ChunEon Park her...@hermet.pe.kr
Date: Tue Jun 23 10:28:25 2015 +0900
live_edit: fix focus highlight floating issue.
After selecting a live view edit item,
the item focus highlighting is remained there.
Now it's fixed by moving the focus to live view.
---
src/bin/live_edit.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/bin/live_edit.c b/src/bin/live_edit.c
index 08246ba..67cf19a 100644
--- a/src/bin/live_edit.c
+++ b/src/bin/live_edit.c
@@ -874,6 +874,7 @@ ctxpopup_dismissed_cb(void *data, Evas_Object *obj,
{
live_data *ld = data;
if (!ld-layout) live_edit_cancel();
+ evas_object_focus_set(ld-live_view, EINA_TRUE);
evas_object_del(obj);
ld-ctxpopup = NULL;
}
--
[EGIT] [tools/enventor] master 01/01: live_view: fix incorrect zoom scale.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=24ad783b25840481abf60acf033af939222a9a55
commit 24ad783b25840481abf60acf033af939222a9a55
Author: ChunEon Park her...@hermet.pe.kr
Date: Tue Jun 23 10:55:35 2015 +0900
live_view: fix incorrect zoom scale.
Previously, the live view maximum size was not updated properly
even if the zoom scale value had been changed.
@fix
---
src/lib/edj_viewer.c | 25 +++--
1 file changed, 7 insertions(+), 18 deletions(-)
diff --git a/src/lib/edj_viewer.c b/src/lib/edj_viewer.c
index b7b739e..dcd2aa8 100644
--- a/src/lib/edj_viewer.c
+++ b/src/lib/edj_viewer.c
@@ -44,18 +44,13 @@ struct viewer_s
static void
view_obj_min_update(view_data *vd)
{
- Evas_Coord w, h;
double scale = edj_mgr_view_scale_get();
-
- edje_object_size_min_calc(vd-layout, w, h);
-
- if (vd-view_config_size.w 0)
- w = vd-view_config_size.w;
-
- if (vd-view_config_size.h 0)
- h = vd-view_config_size.h;
-
- evas_object_size_hint_min_set(vd-layout, ((double)w * scale), ((double)h *
scale));
+ evas_object_size_hint_min_set(vd-layout,
+ ((double)vd-view_config_size.w * scale),
+ ((double)vd-view_config_size.h * scale));
+ evas_object_size_hint_max_set(vd-layout,
+ ((double)vd-view_config_size.w * scale),
+ ((double)vd-view_config_size.h * scale));
}
static Eina_Bool
@@ -556,15 +551,9 @@ view_size_set(view_data *vd, Evas_Coord w, Evas_Coord h)
{
if (!vd) return;
- double scale = edj_mgr_view_scale_get();
-
vd-view_config_size.w = w;
vd-view_config_size.h = h;
-
- evas_object_size_hint_min_set(vd-layout, ((double)w * scale),
- ((double)h * scale));
- evas_object_size_hint_max_set(vd-layout, ((double)w * scale),
- ((double)h * scale));
+ view_obj_min_update(vd);
}
void
--
[EGIT] [tools/enventor] master 01/01: live_edit: support zoom on live editing.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=9dd9e0d9ebc59c562b7a866566b1686bf7082e04
commit 9dd9e0d9ebc59c562b7a866566b1686bf7082e04
Author: ChunEon Park her...@hermet.pe.kr
Date: Tue Jun 23 13:14:11 2015 +0900
live_edit: support zoom on live editing.
previously, it doesn't care the view zooming on live editing.
now it's working perfectly.
---
src/bin/live_edit.c | 57 +
src/bin/main.c | 3 +++
src/include/live_edit.h | 1 +
3 files changed, 43 insertions(+), 18 deletions(-)
diff --git a/src/bin/live_edit.c b/src/bin/live_edit.c
index f25a3e6..7b0848a 100644
--- a/src/bin/live_edit.c
+++ b/src/bin/live_edit.c
@@ -69,7 +69,7 @@ typedef struct live_editor_s
Eina_Bool on : 1;
} live_data;
-static void live_edit_update(live_data *ld);
+static void live_edit_update_internal(live_data *ld);
static const ctxpopup_it_data CTXPOPUP_ITEMS[] =
{
@@ -90,8 +90,7 @@ info_text_update(live_data *ld)
char buf[256];
Evas_Coord lx, ly, lw, lh;
- evas_object_geometry_get(ld-live_view, lx, ly, NULL, NULL);
- config_view_size_get(lw, lh);
+ evas_object_geometry_get(ld-live_view, lx, ly, lw, lh);
//Rel1
snprintf(buf, sizeof(buf), %.2f %.2f (%d, %d),
@@ -561,7 +560,7 @@ cp_mouse_move_cb(void *data, Evas *e, Evas_Object *obj,
void *event_info)
case Ctrl_Pt_Cnt: //for avoiding compiler warning.
break;
}
- live_edit_update(ld);
+ live_edit_update_internal(ld);
}
static void
@@ -616,6 +615,7 @@ ctrl_pt_init(live_data *ld)
for (i = 0; i Ctrl_Pt_Cnt; i++)
{
Evas_Object *layout = elm_layout_add(ld-layout);
+evas_object_smart_member_add(layout, ld-layout);
elm_layout_file_set(layout, EDJE_PATH, ctrl_pt);
evas_object_resize(layout, ctrl_size, ctrl_size);
evas_object_show(layout);
@@ -651,22 +651,28 @@ static void
layout_update(live_data *ld)
{
Evas_Coord x, y, w, h;
+ Evas_Coord scaled_w, scaled_h;
evas_object_geometry_get(ld-live_view, x, y, NULL, NULL);
config_view_size_get(w, h);
+ scaled_w = (w * config_view_scale_get());
+ scaled_h = (h * config_view_scale_get());
+
+ Evas_Coord x2 = round(((double) scaled_w) * ld-part_info.rel1_x);
+ Evas_Coord y2 = round(((double) scaled_h) * ld-part_info.rel1_y);
- Evas_Coord x2 = round(((double) w) * ld-part_info.rel1_x);
- Evas_Coord y2 = round(((double) h) * ld-part_info.rel1_y);
- evas_object_move(ld-layout, (x + x2), (y + y2));
+ evas_object_move(ld-layout,
+(x + x2 + ((w - scaled_w) * 0.5)),
+(y + y2 + ((h - scaled_h) * 0.5)));
Evas_Coord w2 =
- round(((double) w * (ld-part_info.rel2_x - ld-part_info.rel1_x)));
+ round(((double) scaled_w * (ld-part_info.rel2_x -
ld-part_info.rel1_x)));
Evas_Coord h2 =
- round(((double) h * (ld-part_info.rel2_y - ld-part_info.rel1_y)));
+ round(((double) scaled_h * (ld-part_info.rel2_y -
ld-part_info.rel1_y)));
evas_object_resize(ld-layout, w2, h2);
}
static void
-live_edit_update(live_data *ld)
+live_edit_update_internal(live_data *ld)
{
layout_update(ld);
ctrl_pt_update(ld);
@@ -679,7 +685,7 @@ live_view_geom_cb(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
{
live_data *ld = data;
- live_edit_update(ld);
+ live_edit_update_internal(ld);
}
static void
@@ -693,6 +699,11 @@ layout_mouse_move_cb(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj,
evas_object_geometry_get(ld-live_view, lx, ly, NULL, NULL);
config_view_size_get(lw, lh);
+ Evas_Coord scaled_w = lw * config_view_scale_get();
+ Evas_Coord scaled_h = lh * config_view_scale_get();
+ Evas_Coord scaled_x = (lx + ((lw - scaled_w) * 0.5));
+ Evas_Coord scaled_y = (ly + ((lh - scaled_h) * 0.5));
+
Evas_Coord x, y, w, h;
evas_object_geometry_get(obj, x, y, w, h);
@@ -706,15 +717,15 @@ layout_mouse_move_cb(void *data, Evas *e EINA_UNUSED,
Evas_Object *obj,
y = ev-cur.canvas.y - ld-move_delta.y;
//limit to live view boundary
- if (lx x) x = lx;
- if ((x + w) (lx + lw)) x -= ((x + w) - (lx + lw));
- if (ly y) y = ly;
- if ((y + h) (ly + lh)) y -= ((y + h) - (ly + lh));
+ if (scaled_x x) x = scaled_x;
+ if ((x + w) (scaled_x + scaled_w)) x -= ((x + w) - (scaled_x + scaled_w));
+ if (scaled_y y) y = scaled_y;
+ if ((y + h) (scaled_y + scaled_h)) y -= ((y + h) - (scaled_y + scaled_h));
double orig_rel1_x = ld-part_info.rel1_x;
double orig_rel1_y = ld-part_info.rel1_y;
- ld-part_info.rel1_x = ROUNDING(((double) (x - lx) / lw), 2);
- ld-part_info.rel1_y = ROUNDING(((double) (y - ly) / lh), 2);
+ ld-part_info.rel1_x = ROUNDING(((double) (x - scaled_x) / scaled_w), 2);
+ ld-part_info.rel1_y = ROUNDING(((double) (y - scaled_y) / scaled_h), 2);
ld-part_info.rel2_x
[EGIT] [core/elementary] master 01/01: list: --printf
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=07701a04c2ee9edf50f5484201867d90486888b3
commit 07701a04c2ee9edf50f5484201867d90486888b3
Author: ChunEon Park her...@hermet.pe.kr
Date: Mon Jun 22 21:41:14 2015 +0900
list: --printf
---
src/lib/elm_list.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c
index 1ee5915..d6a96b1 100644
--- a/src/lib/elm_list.c
+++ b/src/lib/elm_list.c
@@ -883,7 +883,6 @@ _items_fix(Evas_Object *obj)
vertical : horizontal, style);
else if (sd-mode == ELM_LIST_COMPRESS)
{
- printf(fix item to %s\n, it_compress);
if (it-even)
elm_widget_theme_object_set
(obj, VIEW(it), list, it_compress, style);
--
[EGIT] [tools/enventor] master 01/01: tools: improved ui.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=14a0e2cfd2f41dad50e823c9f309e088d662ceac
commit 14a0e2cfd2f41dad50e823c9f309e088d662ceac
Author: ChunEon Park her...@hermet.pe.kr
Date: Mon Jun 22 22:45:40 2015 +0900
tools: improved ui.
add click / toggle on/off effect.
---
data/themes/default/theme_ext.edc | 25 ++
src/bin/base_gui.c| 12 ++-
src/bin/goto.c| 8 +-
src/bin/live_edit.c | 6 +-
src/bin/main.c| 20 +++--
src/bin/menu.c| 4 +
src/bin/panes.c | 12 ++-
src/bin/search.c | 6 ++
src/bin/tools.c | 176 --
src/include/tools.h | 8 +-
10 files changed, 254 insertions(+), 23 deletions(-)
diff --git a/data/themes/default/theme_ext.edc
b/data/themes/default/theme_ext.edc
index fb8807f..9aae13c 100644
--- a/data/themes/default/theme_ext.edc
+++ b/data/themes/default/theme_ext.edc
@@ -1253,7 +1253,20 @@ group { name: elm/button/base/enventor;
desc { default;
}
}
+ rect { icon_highlight;
+ desc { default;
+ }
+ //This status is for tools selected effect
+ desc { selected;
+inherit: default 0.0;
+color: 51 153 255 255;
+ }
+ desc { clicked;
+inherit: selected 0.0;
+ }
+ }
rect { icon_clip;
+ clip_to: icon_highlight;
desc { default;
}
desc { disabled;
@@ -1397,6 +1410,16 @@ group { name: elm/button/base/enventor;
}
programs {
program {
+ signal: icon,highlight,enabled; source: ;
+ action: STATE_SET selected 0.0;
+ target: icon_highlight;
+ }
+ program {
+ signal: icon,highlight,disabled; source: ;
+ action: STATE_SET default 0.0;
+ target: icon_highlight;
+ }
+ program {
signal: mouse,down,1; source: event;
action: SIGNAL_EMIT elm,action,press elm;
after: button_click_anim;
@@ -1405,6 +1428,7 @@ group { name: elm/button/base/enventor;
action: STATE_SET clicked 0.0;
target: base;
target: text2;
+ target: icon_highlight;
}
program {
signal: mouse,up,1; source: event;
@@ -1415,6 +1439,7 @@ group { name: elm/button/base/enventor;
action: STATE_SET default 0.0;
target: base;
target: text2;
+ target: icon_highlight;
}
program {
signal: elm,anim,activate; source: elm;
diff --git a/src/bin/base_gui.c b/src/bin/base_gui.c
index 1484e71..4d1806e 100644
--- a/src/bin/base_gui.c
+++ b/src/bin/base_gui.c
@@ -148,6 +148,7 @@ void
base_console_full_view(void)
{
panes_console_full_view();
+ tools_console_update(EINA_TRUE);
}
void
@@ -165,15 +166,22 @@ base_console_auto_hide(void)
if (!config_console_get()) return;
if (bd-console_msg) return;
panes_editors_full_view(EINA_TRUE);
+ tools_console_update(EINA_FALSE);
}
void
base_console_toggle(void)
{
if (panes_editors_full_view_get())
- panes_editors_full_view(EINA_FALSE);
+ {
+tools_console_update(EINA_TRUE);
+panes_editors_full_view(EINA_FALSE);
+ }
else
- panes_editors_full_view(EINA_TRUE);
+ {
+tools_console_update(EINA_FALSE);
+panes_editors_full_view(EINA_TRUE);
+ }
}
void
diff --git a/src/bin/goto.c b/src/bin/goto.c
index e5e6d69..1c624e7 100644
--- a/src/bin/goto.c
+++ b/src/bin/goto.c
@@ -162,6 +162,8 @@ goto_open(Evas_Object *enventor)
btn);
evas_object_show(win);
+ tools_goto_update(enventor, EINA_FALSE);
+
gd-win = win;
gd-layout = layout;
gd-entry = entry;
@@ -180,12 +182,16 @@ void
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, win_w, win_h);
elm_win_screen_position_get(gd-win, win_x, win_y);
evas_object_del(gd-win);
free(gd);
g_gd = NULL;
+
+ tools_goto_update(enventor, EINA_FALSE);
}
diff --git a/src/bin/live_edit.c b/src/bin/live_edit.c
index 3c6df67..60aa284 100644
--- a/src/bin/live_edit.c
+++ b/src/bin/live_edit.c
@@ -912,6 +912,7 @@ live_edit_toggle(void)
{
live_data *ld = g_ld;
Eina_Bool on = !ld-on;
+ ld-on = on;
if (on)
{
@@ -919,11 +920,10 @@ live_edit_toggle(void)
ld-live_view = enventor_object_live_view_get(ld-enventor);
ld-ctxpopup = ctxpopup_create(ld);
stats_info_msg_update(Select a part to add in Live View.);
+tools_live_update(ld-enventor, EINA_FALSE);
}
else
live_edit_cancel();
-
- ld-on = on;
}
Eina_Bool
@@ -978,6 +978,8 @@ live_edit_cancel(void)
}
ld-on = EINA_FALSE
[EGIT] [tools/enventor] master 01/01: live_edit: fix regression bug that introduced in 14a0e2cfd2f41dad50e823c9f309e088d662ceac
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=772ffe222914f043f5a1a8ff9c183bc43d3f5b38
commit 772ffe222914f043f5a1a8ff9c183bc43d3f5b38
Author: ChunEon Park her...@hermet.pe.kr
Date: Mon Jun 22 22:50:22 2015 +0900
live_edit: fix regression bug that introduced in
14a0e2cfd2f41dad50e823c9f309e088d662ceac
toggling context is corrupted but recovered again.
---
src/bin/live_edit.c | 7 ---
src/bin/tools.c | 5 ++---
src/include/tools.h | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/bin/live_edit.c b/src/bin/live_edit.c
index 60aa284..08246ba 100644
--- a/src/bin/live_edit.c
+++ b/src/bin/live_edit.c
@@ -912,7 +912,6 @@ live_edit_toggle(void)
{
live_data *ld = g_ld;
Eina_Bool on = !ld-on;
- ld-on = on;
if (on)
{
@@ -920,10 +919,12 @@ live_edit_toggle(void)
ld-live_view = enventor_object_live_view_get(ld-enventor);
ld-ctxpopup = ctxpopup_create(ld);
stats_info_msg_update(Select a part to add in Live View.);
-tools_live_update(ld-enventor, EINA_FALSE);
+tools_live_update(EINA_TRUE);
}
else
live_edit_cancel();
+
+ ld-on = on;
}
Eina_Bool
@@ -979,7 +980,7 @@ live_edit_cancel(void)
ld-on = EINA_FALSE;
- tools_live_update(ld-enventor, EINA_FALSE);
+ tools_live_update(EINA_FALSE);
}
void
diff --git a/src/bin/tools.c b/src/bin/tools.c
index dc6856f..56d7729 100644
--- a/src/bin/tools.c
+++ b/src/bin/tools.c
@@ -399,13 +399,12 @@ tools_search_update(Evas_Object *enventor EINA_UNUSED,
}
void
-tools_live_update(Evas_Object *enventor EINA_UNUSED,
- Eina_Bool toggle EINA_UNUSED)
+tools_live_update(Eina_Bool on)
{
tools_data *td = g_td;
if (!td) return;
- if (live_edit_get())
+ if (on)
elm_object_signal_emit(td-live_btn, icon,highlight,enabled, );
else
elm_object_signal_emit(td-live_btn, icon,highlight,disabled, );
diff --git a/src/include/tools.h b/src/include/tools.h
index 0b4e4f6..b1be3f9 100644
--- a/src/include/tools.h
+++ b/src/include/tools.h
@@ -7,6 +7,6 @@ void tools_swallow_update(Evas_Object *enventor, Eina_Bool
toggle);
void tools_status_update(Evas_Object *enventor, Eina_Bool toggle);
void tools_goto_update(Evas_Object *enventor, Eina_Bool toggle);
void tools_search_update(Evas_Object *enventor, Eina_Bool toggle);
-void tools_live_update(Evas_Object *enventor, Eina_Bool toggle);
+void tools_live_update(Eina_Bool on);
void tools_console_update(Eina_Bool on);
void tools_menu_update(Eina_Bool on);
--
[EGIT] [tools/enventor] master 01/01: template: remove new line trailiings.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=273d0c21666941e34871c17c1ec92db4689b22d8
commit 273d0c21666941e34871c17c1ec92db4689b22d8
Author: ChunEon Park her...@hermet.pe.kr
Date: Wed Jun 24 13:17:22 2015 +0900
template: remove new line trailiings.
---
data/templates/basic.edc | 2 +-
data/templates/group.edc | 2 +-
data/templates/rotation+zoom.edc | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/data/templates/basic.edc b/data/templates/basic.edc
index 05acebc..0967a5b 100644
--- a/data/templates/basic.edc
+++ b/data/templates/basic.edc
@@ -70,4 +70,4 @@ collections {
}
*/
}
-}
+}
\ No newline at end of file
diff --git a/data/templates/group.edc b/data/templates/group.edc
index 5721e63..36aa1d0 100644
--- a/data/templates/group.edc
+++ b/data/templates/group.edc
@@ -38,4 +38,4 @@ collections {
}
}
}
-}
+}
\ No newline at end of file
diff --git a/data/templates/rotation+zoom.edc b/data/templates/rotation+zoom.edc
index 1734881..6594fdd 100644
--- a/data/templates/rotation+zoom.edc
+++ b/data/templates/rotation+zoom.edc
@@ -39,4 +39,4 @@ collections {
}
}
}
-}
+}
\ No newline at end of file
--
[EGIT] [tools/enventor] master 02/02: menu: removed tooltips from menu buttons.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=7e31de5ce31729a32bb898b6656abcfd701a1644
commit 7e31de5ce31729a32bb898b6656abcfd701a1644
Author: ChunEon Park her...@hermet.pe.kr
Date: Wed Jun 24 13:31:10 2015 +0900
menu: removed tooltips from menu buttons.
---
NEWS | 1 +
src/bin/menu.c | 16 +++-
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/NEWS b/NEWS
index 9cf8f5a..bd41717 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,7 @@ Additions:
Removes:
* Get rid of template insert feature per parts.
+ * Get rid of tooltips from menu buttons.
Improvements:
* Support more keywords in auto completion.
diff --git a/src/bin/menu.c b/src/bin/menu.c
index caff93d..19fa2d1 100644
--- a/src/bin/menu.c
+++ b/src/bin/menu.c
@@ -342,14 +342,12 @@ prev_btn_cb(void *data, Evas_Object *obj EINA_UNUSED,
}
static Evas_Object *
-btn_create(Evas_Object *parent, const char *label, const char *tooltip_msg,
- Evas_Smart_Cb cb, void *data)
+btn_create(Evas_Object *parent, const char *label, Evas_Smart_Cb cb, void
*data)
{
Evas_Object *btn;
btn = elm_button_add(parent);
elm_object_style_set(btn, anchor);
- elm_object_tooltip_text_set(btn, tooltip_msg);
elm_object_scale_set(btn, 1.25);
evas_object_smart_callback_add(btn, clicked, cb, data);
elm_object_text_set(btn, label);
@@ -646,28 +644,28 @@ menu_open(menu_data *md)
Evas_Object *btn;
//Button(New)
- btn = btn_create(layout, New, New File (F2), new_btn_cb, md);
+ btn = btn_create(layout, New, new_btn_cb, md);
elm_object_focus_set(btn, EINA_TRUE);
elm_object_part_content_set(layout, elm.swallow.new_btn, btn);
//Button(Save)
- btn = btn_create(layout, Save, Save File (F3), save_btn_cb, md);
+ btn = btn_create(layout, Save, save_btn_cb, md);
elm_object_part_content_set(layout, elm.swallow.save_btn, btn);
//Button(Load)
- btn = btn_create(layout, Load, Load File (F4), load_btn_cb, md);
+ btn = btn_create(layout, Load, load_btn_cb, md);
elm_object_part_content_set(layout, elm.swallow.load_btn, btn);
//Button(Setting)
- btn = btn_create(layout, Setting, Setting (F12), setting_btn_cb, md);
+ btn = btn_create(layout, Setting, setting_btn_cb, md);
elm_object_part_content_set(layout, elm.swallow.setting_btn, btn);
//Button(About)
- btn = btn_create(layout, About, About Enventor (F1), about_btn_cb, md);
+ btn = btn_create(layout, About, about_btn_cb, md);
elm_object_part_content_set(layout, elm.swallow.about_btn, btn);
//Button(Exit)
- btn = btn_create(layout, Exit, Exit Enventor, exit_btn_cb, md);
+ btn = btn_create(layout, Exit, exit_btn_cb, md);
elm_object_part_content_set(layout, elm.swallow.exit_btn, btn);
//Button(Prev)
--
[EGIT] [tools/enventor] master 01/01: revise description of live view.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=ca8c53e073bd7b223c21eb838a35289c5d35d945 commit ca8c53e073bd7b223c21eb838a35289c5d35d945 Author: ChunEon Park her...@hermet.pe.kr Date: Wed Jun 24 13:37:31 2015 +0900 revise description of live view. --- src/bin/main.c| 2 +- src/bin/setting.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bin/main.c b/src/bin/main.c index 7e36af0..fb6f2e0 100644 --- a/src/bin/main.c +++ b/src/bin/main.c @@ -174,7 +174,7 @@ main_mouse_wheel_cb(void *data, int type EINA_UNUSED, void *ev) live_edit_update(); char buf[256]; -snprintf(buf, sizeof(buf), View Scale: %2.2fx, scale); +snprintf(buf, sizeof(buf), Live View Scale: %2.2fx, scale); stats_info_msg_update(buf); return ECORE_CALLBACK_PASS_ON; diff --git a/src/bin/setting.c b/src/bin/setting.c index c87813b..71c02c3 100644 --- a/src/bin/setting.c +++ b/src/bin/setting.c @@ -285,7 +285,7 @@ general_layout_create(setting_data *sd, Evas_Object *parent) elm_slider_unit_format_set(slider_view, %1.2fx); 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, View Scale ); + elm_object_text_set(slider_view, Live View Scale); evas_object_show(slider_view); elm_box_pack_end(box, slider_view); @@ -312,7 +312,7 @@ 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, 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); --
[EGIT] [tools/enventor] master 01/01: fix the font/live zoom control issue.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=82d31b34188d13ed22675e14fd0df868a79d4d5e
commit 82d31b34188d13ed22675e14fd0df868a79d4d5e
Author: ChunEon Park her...@hermet.pe.kr
Date: Fri Jun 12 17:03:45 2015 +0900
fix the font/live zoom control issue.
When you focus on other window while you pressing the ctrl/alt key at the
enventor,
the ctrl/alt key pressed context can be corrupted.
because enventor keeps the extra flag for ctrl/alt key press states.
but in the problem case, the unpress key won't be trigged.
enventor doesn't need to keep the extra flag but track the modifiers in key
event.
@fix
---
src/bin/main.c | 101 -
1 file changed, 43 insertions(+), 58 deletions(-)
diff --git a/src/bin/main.c b/src/bin/main.c
index 1a384ed..7fdc476 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -9,29 +9,11 @@
typedef struct app_s
{
Evas_Object *enventor;
-
- Eina_Bool ctrl_pressed : 1;
- Eina_Bool alt_pressed : 1;
Eina_Bool template_new : 1;
} app_data;
int main(int argc, char **argv);
-static Eina_Bool
-main_key_up_cb(void *data, int type EINA_UNUSED, void *ev)
-{
- Ecore_Event_Key *event = ev;
- app_data *ad = data;
-
- if (!strcmp(Control_L, event-key))
- ad-ctrl_pressed = EINA_FALSE;
-
- if (!strcmp(Alt_L, event-key))
- ad-alt_pressed = EINA_FALSE;
-
- return ECORE_CALLBACK_PASS_ON;
-}
-
void
auto_comp_toggle(app_data *ad)
{
@@ -163,7 +145,8 @@ main_mouse_wheel_cb(void *data, int type EINA_UNUSED, void
*ev)
app_data *ad = data;
Evas_Coord x, y, w, h;
- if (!ad-ctrl_pressed) return ECORE_CALLBACK_PASS_ON;
+ if (event-modifiers != ECORE_EVENT_MODIFIER_CTRL)
+ return ECORE_CALLBACK_PASS_ON;
//View Scale
Evas_Object *view = enventor_object_live_view_get(ad-enventor);
@@ -582,101 +565,109 @@ default_template_insert(app_data *ad)
}
static Eina_Bool
-alt_func(app_data *ad, const char *key)
+alt_func(app_data *ad, Ecore_Event_Key *event)
{
+ if (event-modifiers != ECORE_EVENT_MODIFIER_ALT)
+ return EINA_FALSE;
+
//Full Edit View
- if (!strcmp(key, Left))
+ if (!strcmp(event-key, Left))
{
base_live_view_full_view();
-return ECORE_CALLBACK_DONE;
+return EINA_TRUE;
}
//Full Live View
- if (!strcmp(key, Right))
+ if (!strcmp(event-key, Right))
{
base_enventor_full_view();
-return ECORE_CALLBACK_DONE;
+return EINA_TRUE;
}
//Full Console View
- if (!strcmp(key, Up))
+ if (!strcmp(event-key, Up))
{
base_console_full_view();
-return ECORE_CALLBACK_DONE;
+return EINA_TRUE;
}
//Full Editors View
- if (!strcmp(key, Down))
+ if (!strcmp(event-key, Down))
{
base_editors_full_view();
-return ECORE_CALLBACK_DONE;
+return EINA_TRUE;
}
+
+ return EINA_FALSE;
}
static Eina_Bool
-ctrl_func(app_data *ad, const char *key)
+ctrl_func(app_data *ad, Ecore_Event_Key *event)
{
+ if (event-modifiers != ECORE_EVENT_MODIFIER_CTRL)
+ return EINA_FALSE;
+
//Save
- if (!strcmp(key, s) || !strcmp(key, S))
+ if (!strcmp(event-key, s) || !strcmp(event-key, S))
{
file_mgr_edc_save();
-return ECORE_CALLBACK_DONE;
+return EINA_TRUE;
}
//Delete Line
- if (!strcmp(key, d) || !strcmp(key, D))
+ if (!strcmp(event-key, d) || !strcmp(event-key, D))
{
enventor_object_line_delete(ad-enventor);
-return ECORE_CALLBACK_DONE;
+return EINA_TRUE;
}
//Find/Replace
- if (!strcmp(key, f) || !strcmp(key, F))
+ if (!strcmp(event-key, f) || !strcmp(event-key, F))
{
live_edit_cancel();
search_open(ad-enventor);
-return ECORE_CALLBACK_DONE;
+return EINA_TRUE;
}
//Goto Line
- if (!strcmp(key, l) || !strcmp(key, L))
+ if (!strcmp(event-key, l) || !strcmp(event-key, L))
{
live_edit_cancel();
goto_open(ad-enventor);
-return ECORE_CALLBACK_DONE;
+return EINA_TRUE;
}
//Part Highlight
- if (!strcmp(key, h) || !strcmp(key, H))
+ if (!strcmp(event-key, h) || !strcmp(event-key, H))
{
part_highlight_toggle(ad);
-return ECORE_CALLBACK_DONE;
+return EINA_TRUE;
}
//Swallow Dummy Object
- if (!strcmp(key, w) || !strcmp(key, W))
+ if (!strcmp(event-key, w) || !strcmp(event-key, W))
{
dummy_swallow_toggle(ad);
-return ECORE_CALLBACK_DONE;
+return EINA_TRUE;
}
//Template Code
- if (!strcmp(key, t) || !strcmp(key, T))
+ if (!strcmp(event-key, t) || !strcmp(event-key, T))
{
default_template_insert(ad);
-return ECORE_CALLBACK_DONE;
+return EINA_TRUE;
}
//Auto Indentation
- if (!strcmp(key, i) || !strcmp(key, I))
+ if (!strcmp
[EGIT] [tools/enventor] master 01/01: template: update basic.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=46a8114c893362dce4a6bf3440680ca59fd41f71
commit 46a8114c893362dce4a6bf3440680ca59fd41f71
Author: ChunEon Park her...@hermet.pe.kr
Date: Thu Jun 18 08:48:22 2015 +0900
template: update basic.
---
data/templates/basic.edc | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/data/templates/basic.edc b/data/templates/basic.edc
index ff0676e..05acebc 100644
--- a/data/templates/basic.edc
+++ b/data/templates/basic.edc
@@ -50,7 +50,6 @@ collections {
description { state: default 0.0;
rel1.relative: 0.5 0.5;
rel2.relative: 1.0 1.0;
- color: 255 255 0 255;
}
}
}
@@ -71,4 +70,4 @@ collections {
}
*/
}
-}
\ No newline at end of file
+}
--
[EGIT] [core/efl] master 01/01: eina: add eina_simple_xml example.
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=ca0e51a2c649a7b21303d5fd48bad2f9e08cbb7c
commit ca0e51a2c649a7b21303d5fd48bad2f9e08cbb7c
Author: ChunEon Park chuneon.p...@samsung.com
Date: Thu Jun 18 19:50:00 2015 +0900
eina: add eina_simple_xml example.
This example just prints tag and it's attributes in xml file.
But this example intended for the scenario,
if the attributes have the or characters inside of the string.
---
src/examples/eina/eina_simple_xml_parser_02.c | 73 +++
src/examples/eina/exia.xml| 5 ++
2 files changed, 78 insertions(+)
diff --git a/src/examples/eina/eina_simple_xml_parser_02.c
b/src/examples/eina/eina_simple_xml_parser_02.c
new file mode 100644
index 000..0d8269a
--- /dev/null
+++ b/src/examples/eina/eina_simple_xml_parser_02.c
@@ -0,0 +1,73 @@
+//Compile with:
+//gcc -Wall -o eina_simple_xml_parser_02 eina_simple_xml_parser_02.c
`pkg-config --cflags --libs eina`
+
+#include Eina.h
+#include stdio.h
+#include string.h
+
+
+static Eina_Bool
+_xml_attribute_parse_cb(void *data, const char *key, const char *value)
+{
+ printf(attributes, key = %s, value = %s\n, key, value);
+ return EINA_TRUE;
+}
+
+static Eina_Bool
+_xml_tag_parse_cb(void *data, Eina_Simple_XML_Type type, const char *content,
+ unsigned offset EINA_UNUSED, unsigned int length)
+{
+ if (length = 0) return EINA_FALSE;
+
+ if (type == EINA_SIMPLE_XML_OPEN)
+ {
+//Print tag
+if (!strncmp(Group, content, strlen(Group)))
+ printf(tag = Group\n);
+else if (!strncmp(Label, content, strlen(Label)))
+ printf(tag = Label\n);
+
+//Print attributes
+const char *tags = eina_simple_xml_tag_attributes_find(content,
length);
+eina_simple_xml_attributes_parse(tags, length - (tags - content),
+ _xml_attribute_parse_cb, NULL);
+ }
+
+ return EINA_TRUE;
+}
+
+int
+main(void)
+{
+ FILE *file;
+ long size;
+
+ eina_init();
+
+ //1. Open XML File
+ file = fopen(exia.xml, rb);
+
+ if (!file) return 0;
+
+ fseek(file, 0, SEEK_END);
+ size = ftell(file);
+ fseek(file, 0, SEEK_SET);
+
+ //2. Read XML File
+ char *buffer = malloc(size);
+ if (!buffer)
+ {
+fclose(file);
+return 0;
+ }
+
+ fread(buffer, 1, size, file);
+
+ //3. Start Parsing XML
+ eina_simple_xml_parse(buffer, size, EINA_FALSE, _xml_tag_parse_cb, NULL);
+
+ fclose(file);
+ free(buffer);
+
+ return 0;
+}
diff --git a/src/examples/eina/exia.xml b/src/examples/eina/exia.xml
new file mode 100644
index 000..f5ae55b
--- /dev/null
+++ b/src/examples/eina/exia.xml
@@ -0,0 +1,5 @@
+?xml version=1.0 encoding=UTF-8?
+Group xmlns=http://www.enlightenment.org/docs;
+ Label text=0 is bigger than3? (0 3 ?)
+ /Label
+/Group
--
[EGIT] [core/efl] master 01/01: eina/simple_xml_parser: don't parse the , in the attribute string.
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=d72aa3fecbf9899884fbdb125cdc58ca93792cbb
commit d72aa3fecbf9899884fbdb125cdc58ca93792cbb
Author: ChunEon Park chuneon.p...@samsung.com
Date: Thu Jun 18 19:51:06 2015 +0900
eina/simple_xml_parser: don't parse the , in the attribute string.
The tag identifier should not be inside of the string ~.
Previous logic doesn't care that scenario,
the parser context can be corrupted and it will be no more useful.
@fix
---
src/lib/eina/eina_simple_xml_parser.c | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/lib/eina/eina_simple_xml_parser.c
b/src/lib/eina/eina_simple_xml_parser.c
index 13dd5ee..d19e217 100644
--- a/src/lib/eina/eina_simple_xml_parser.c
+++ b/src/lib/eina/eina_simple_xml_parser.c
@@ -136,9 +136,16 @@ _eina_simple_xml_tag_start_find(const char *itr, const
char *itr_end)
static inline const char *
_eina_simple_xml_tag_end_find(const char *itr, const char *itr_end)
{
+ Eina_Bool inside_quote = EINA_FALSE;
for (; itr itr_end; itr++)
- if ((*itr == '') || (*itr == '')) /* consider also ends a tag */
- return itr;
+ {
+if (*itr == '') inside_quote = !inside_quote;
+if (!inside_quote)
+ {
+ if ((*itr == '') || (*itr == '')) /* consider also ends a tag
*/
+ return itr;
+ }
+ }
return NULL;
}
--
[EGIT] [core/efl] efl-1.14 01/01: eina/simple_xml_parser: don't parse the , in the attribute string.
hermet pushed a commit to branch efl-1.14.
http://git.enlightenment.org/core/efl.git/commit/?id=14b744b90e2e74d607bf8b74abecc3c1c37979b8
commit 14b744b90e2e74d607bf8b74abecc3c1c37979b8
Author: ChunEon Park chuneon.p...@samsung.com
Date: Thu Jun 18 19:51:06 2015 +0900
eina/simple_xml_parser: don't parse the , in the attribute string.
The tag identifier should not be inside of the string ~.
Previous logic doesn't care that scenario,
the parser context can be corrupted and it will be no more useful.
@fix
---
src/lib/eina/eina_simple_xml_parser.c | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/lib/eina/eina_simple_xml_parser.c
b/src/lib/eina/eina_simple_xml_parser.c
index 13dd5ee..d19e217 100644
--- a/src/lib/eina/eina_simple_xml_parser.c
+++ b/src/lib/eina/eina_simple_xml_parser.c
@@ -136,9 +136,16 @@ _eina_simple_xml_tag_start_find(const char *itr, const
char *itr_end)
static inline const char *
_eina_simple_xml_tag_end_find(const char *itr, const char *itr_end)
{
+ Eina_Bool inside_quote = EINA_FALSE;
for (; itr itr_end; itr++)
- if ((*itr == '') || (*itr == '')) /* consider also ends a tag */
- return itr;
+ {
+if (*itr == '') inside_quote = !inside_quote;
+if (!inside_quote)
+ {
+ if ((*itr == '') || (*itr == '')) /* consider also ends a tag
*/
+ return itr;
+ }
+ }
return NULL;
}
--
[EGIT] [core/elementary] master 01/01: win: fix bug about engine value.
hermet pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=f1880425f7c5791eac3a2d7f2690244ad88d0ffe commit f1880425f7c5791eac3a2d7f2690244ad88d0ffe Author: ChunEon Park her...@hermet.pe.kr Date: Wed Jun 17 13:54:42 2015 +0900 win: fix bug about engine value. When application does not have any value of engine, this app should be launched with elm_config's value. Signed-Off-By: Wonsik Jung sid...@samsung.com --- src/lib/elm_win.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c index 54643f4..a7c9e74 100644 --- a/src/lib/elm_win.c +++ b/src/lib/elm_win.c @@ -89,7 +89,7 @@ static const Elm_Win_Trap *trap = NULL; } \ } -#define ENGINE_GET() (_elm_preferred_engine ? _elm_preferred_engine : ) +#define ENGINE_GET() (_elm_preferred_engine ? _elm_preferred_engine : _elm_config-engine) typedef struct _Elm_Win_Data Elm_Win_Data; --
[EGIT] [core/elementary] elementary-1.14 01/01: win: fix bug about engine value.
hermet pushed a commit to branch elementary-1.14. http://git.enlightenment.org/core/elementary.git/commit/?id=438d6aa9a9b72d14295d86eafdee8bfc48baacf1 commit 438d6aa9a9b72d14295d86eafdee8bfc48baacf1 Author: ChunEon Park her...@hermet.pe.kr Date: Wed Jun 17 13:54:42 2015 +0900 win: fix bug about engine value. When application does not have any value of engine, this app should be launched with elm_config's value. Signed-Off-By: Wonsik Jung sid...@samsung.com --- src/lib/elm_win.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c index 965d192..c9e606f 100644 --- a/src/lib/elm_win.c +++ b/src/lib/elm_win.c @@ -89,7 +89,7 @@ static const Elm_Win_Trap *trap = NULL; } \ } -#define ENGINE_GET() (_elm_preferred_engine ? _elm_preferred_engine : ) +#define ENGINE_GET() (_elm_preferred_engine ? _elm_preferred_engine : _elm_config-engine) typedef struct _Elm_Win_Data Elm_Win_Data; --
[EGIT] [tools/enventor] master 01/01: clean up help message.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=3ff81bce00dd673fbe15b10185eda8c2a893a68d commit 3ff81bce00dd673fbe15b10185eda8c2a893a68d Author: ChunEon Park her...@hermet.pe.kr Date: Fri Jun 12 23:11:28 2015 +0900 clean up help message. --- src/include/common.h | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/include/common.h b/src/include/common.h index b68d5cf..9f38c36 100644 --- a/src/include/common.h +++ b/src/include/common.h @@ -12,17 +12,17 @@ $ enventor newfile.edc --to\n \ $ enventor sample.edc output.edj --id ./images --sd ./sounds\n #define ENVENTOR_USAGE \ -%prog [input file] [output file] [--to] [--id image path] [--sd sound path] [--fd font path] [--dd data path] +%prog [input file] [output file] [--to] [--id image path] [--sd sound path] [--fd font path] [--dd data path] #define ENVENTOR_INFO \ -\nThis is an EDC editor with some convenient functions.\n \ +This is an EDC editor with some convenient functions.\n \ It's brand new and was only started near the begining of June 2013,\n \ so expecting it to do everything a mature script editor does \n \ is a bit premature, but considering it's young age, it does a lot. \n \ \nPlease see next sites for more information on these.\n \ \n http://www.enlightenment.org \n \ -\n https://phab.enlightenment.org/w/projects/enventor/ \n \ -\n http://www.openhub.net/p/enventor\n; +https://phab.enlightenment.org/w/projects/enventor/ \n \ +http://www.openhub.net/p/enventor\n; #define ENVENTOR_COPYRIGHT \ Copyright (C) 2013-2015 ChunEon Park and various contributors (see AUTHORS)\n \ --
[EGIT] [tools/enventor] master 01/01: Indent: auto indentation when code is pasted.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=97941ff3784974f05443287c6af9f1eac2ef84f9
commit 97941ff3784974f05443287c6af9f1eac2ef84f9
Author: ChunEon Park her...@hermet.pe.kr
Date: Tue Jun 16 13:35:44 2015 +0900
Indent: auto indentation when code is pasted.
Summary:
if some edc code is pasted, the indentation could be corrupted.
let's make it fix automatically, even if indentation of
the pasted code is not correct, only when auto indent mode is enabled.
Reviewers: Jaehyun, Hermet
Projects: #enventor
Maniphest Tasks: T2174
Differential Revision: https://phab.enlightenment.org/D2601
---
src/lib/edc_editor.c | 10 -
src/lib/enventor_private.h | 1 +
src/lib/indent.c | 102 +++--
src/lib/redoundo.c | 12 ++
4 files changed, 119 insertions(+), 6 deletions(-)
diff --git a/src/lib/edc_editor.c b/src/lib/edc_editor.c
index 6572689..6d9a9f0 100644
--- a/src/lib/edc_editor.c
+++ b/src/lib/edc_editor.c
@@ -255,8 +255,14 @@ edit_changed_cb(void *data, Evas_Object *obj EINA_UNUSED,
void *event_info)
}
if (ed-auto_indent)
- indent_insert_apply(syntax_indent_data_get(ed-sh), ed-en_edit,
- info-change.insert.content, ed-cur_line);
+ {
+indent_insert_apply(syntax_indent_data_get(ed-sh), ed-en_edit,
+info-change.insert.content, ed-cur_line);
+ int increase =
+parser_line_cnt_get(ed-pd, info-change.insert.content);
+ edit_line_increase(ed, increase);
+ }
+
}
else
{
diff --git a/src/lib/enventor_private.h b/src/lib/enventor_private.h
index b072cc1..ffd1070 100644
--- a/src/lib/enventor_private.h
+++ b/src/lib/enventor_private.h
@@ -173,6 +173,7 @@ void redoundo_text_relative_push(redoundo_data *rd, const
char *text);
void redoundo_entry_region_push(redoundo_data *rd, int cursor_pos, int
cursor_pos2);
int redoundo_undo(redoundo_data *rd, Eina_Bool *changed);
int redoundo_redo(redoundo_data *rd, Eina_Bool *changed);
+void redoundo_n_diff_cancel(redoundo_data *rd, unsigned int n);
/* edj_viewer */
diff --git a/src/lib/indent.c b/src/lib/indent.c
index 18bdbeb..a5ed761 100644
--- a/src/lib/indent.c
+++ b/src/lib/indent.c
@@ -231,12 +231,106 @@ indent_delete_apply(indent_data *id EINA_UNUSED,
Evas_Object *entry,
return EINA_FALSE;
}
+static void
+indent_text_auto_format(indent_data *id EINA_UNUSED,
+Evas_Object *entry, const char *insert)
+{
+ char *utf8 = evas_textblock_text_markup_to_utf8(NULL, insert);
+ int utf8_size = strlen(utf8);
+
+ Evas_Object *tb = elm_entry_textblock_get(entry);
+ Evas_Textblock_Cursor *cur_start = evas_object_textblock_cursor_new(tb);
+ Evas_Textblock_Cursor *cur_end = evas_object_textblock_cursor_get(tb);
+ redoundo_data *rd = evas_object_data_get(entry, redoundo);
+
+ char *utf8_ptr = utf8;
+ char *utf8_lexem = utf8_ptr;
+ char *utf8_end = utf8 + utf8_size;
+ Eina_List *code_lines = NULL;
+ Eina_Strbuf *buf = eina_strbuf_new();
+
+ int tb_cur_pos = 0;
+
+ while (utf8_ptr = utf8_end)
+ {
+if (*utf8_ptr != ' ' *utf8_ptr != '\t' *utf8_ptr != '\n' )
+ {
+ utf8_lexem = utf8_ptr;
+ while (utf8_ptr = utf8_end)
+ {
+ if (*utf8_ptr == '{' || *utf8_ptr == '}' || *utf8_ptr == ';')
+{
+ if (utf8_ptr + 1 == utf8_end)
+ code_lines = eina_list_append(code_lines,
+ eina_stringshare_add(utf8_lexem));
+ else
+ code_lines = eina_list_append(code_lines,
+
eina_stringshare_add_length(utf8_lexem,
+ utf8_ptr - utf8_lexem + 1));
+ break;
+}
+ utf8_ptr++;
+ }
+ }
+utf8_ptr++;
+ }
+ free(utf8);
+
+ if (!code_lines) return;
+ tb_cur_pos = evas_textblock_cursor_pos_get(cur_end);
+ evas_textblock_cursor_pos_set(cur_start, tb_cur_pos - utf8_size);
+ evas_textblock_cursor_range_delete(cur_start, cur_end);
+
+ char *frmt_buf = NULL;
+ Eina_List *l = NULL;
+ Eina_Stringshare *line;
+ evas_textblock_cursor_line_char_first(cur_start);
+ int space = indent_space_get(id, entry);
+
+ EINA_LIST_FOREACH(code_lines, l, line)
+{
+ if (strstr(line, })) space -= TAB_SPACE;
+ char *p = alloca(space + 1);
+ memset(p, ' ', space);
+ p[space] = '\0';
+ eina_strbuf_append_printf(buf, %s%sbr/, p, line);
+ memset(p, 0x0, space);
+ if (strstr(line, {)) space += TAB_SPACE;
+ eina_stringshare_del(line);
+}
+
+ frmt_buf
[EGIT] [tools/enventor] master 01/01: update help description.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=02dca36f698f872fb4a81f8951a98b599364edea commit 02dca36f698f872fb4a81f8951a98b599364edea Author: ChunEon Park her...@hermet.pe.kr Date: Thu Jun 11 16:24:09 2015 +0900 update help description. --- README | 2 +- data/about/ABOUT | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README b/README index 6f76720..cec0b12 100644 --- a/README +++ b/README @@ -39,7 +39,7 @@ F10 = Show/Hide Console F11 = Show/Hide Status F12 = Setting -Ctrl+S = Quick Save + Compile EDC +Ctrl+S = Quick Save + Update Live View Ctrl+I = On/Off Auto Indentation Ctrl+O = On/Off Auto Completion Ctrl+W = Show/Hide Dummy Swallow diff --git a/data/about/ABOUT b/data/about/ABOUT index e78b9da..2db9c23 100644 --- a/data/about/ABOUT +++ b/data/about/ABOUT @@ -21,7 +21,7 @@ F10 = Show/Hide Console F11 = Show/Hide Status F12 = Setting -Ctrl+S = Quick Save + Compile EDC +Ctrl+S = Quick Save + Update Live View Ctrl+I = On/Off Auto Indentation Ctrl+O = On/Off Auto Completion Ctrl+W = Show/Hide Dummy Swallow --
[EGIT] [tools/enventor] master 01/01: removed template code insert feature.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=d8bac599a71d4c5306955d8ddaa51bba5aedf046
commit d8bac599a71d4c5306955d8ddaa51bba5aedf046
Author: ChunEon Park her...@hermet.pe.kr
Date: Thu Jun 11 16:39:26 2015 +0900
removed template code insert feature.
now enventor supports inserting part with live view editor,
i don't think this is required in enventor anymore.
---
README | 6 -
data/about/ABOUT | 6 -
src/bin/main.c | 73 +---
3 files changed, 1 insertion(+), 84 deletions(-)
diff --git a/README b/README
index cec0b12..4b39445 100644
--- a/README
+++ b/README
@@ -50,12 +50,6 @@ Ctrl+Down = On/Off Full Editors View
Ctrl+T = Insert Defaut Template Code
Ctrl+Mouse Wheel Up = View Scale Up / Font Size Up
Ctrl+Mouse Wheel Down = View Scale Down / Font Size Down
-Ctrl+Shift+B = Insert Part Template Code: Textblock
-Ctrl+Shift+I = Insert Part Template Code: Image
-Ctrl+Shift+R = Insert Part Template Code: Rectangle
-Ctrl+Shift+T = Insert Part Template Code: Text
-Ctrl+Shift+S = Insert Part Template Code: Spacer
-Ctrl+Shift+W = Insert Part Template Code: Swallow
Ctrl+A = Select Text All
Ctrl+Double Click = Select a word
diff --git a/data/about/ABOUT b/data/about/ABOUT
index 2db9c23..ed2592f 100644
--- a/data/about/ABOUT
+++ b/data/about/ABOUT
@@ -32,12 +32,6 @@ Ctrl+Down = On/Off Full Editors View
Ctrl+T = Insert Defaut Template Code
Ctrl+Mouse Wheel Up = View Scale Up / Font Size Up
Ctrl+Mouse Wheel Down = View Scale Down / Font Size Down
-Ctrl+Shift+B = Insert Part Template Code: Textblock
-Ctrl+Shift+I = Insert Part Template Code: Image
-Ctrl+Shift+R = Insert Part Template Code: Rectangle
-Ctrl+Shift+T = Insert Part Template Code: Text
-Ctrl+Shift+S = Insert Part Template Code: Spacer
-Ctrl+Shift+W = Insert Part Template Code: Swallow
Ctrl+A = Select Text All
Ctrl+Double Click = Select a word
diff --git a/src/bin/main.c b/src/bin/main.c
index 9f56794..1e61f23 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -11,7 +11,6 @@ typedef struct app_s
Evas_Object *enventor;
Eina_Bool ctrl_pressed : 1;
- Eina_Bool shift_pressed : 1;
Eina_Bool template_new : 1;
} app_data;
@@ -25,8 +24,6 @@ main_key_up_cb(void *data, int type EINA_UNUSED, void *ev)
if (!strcmp(Control_L, event-key))
ad-ctrl_pressed = EINA_FALSE;
- else if (!strcmp(Shift_L, event-key))
- ad-shift_pressed = EINA_FALSE;
return ECORE_CALLBACK_PASS_ON;
}
@@ -80,65 +77,6 @@ enventor_common_setup(Evas_Object *enventor)
config_edc_dat_path_list_get());
}
-static Eina_Bool
-template_insert_patch(app_data *ad, const char *key)
-{
- Edje_Part_Type part_type;
-
- if (live_edit_get())
- {
-stats_info_msg_update(Insertion of template code is disabled
- while in Live Edit mode);
-return ECORE_CALLBACK_DONE;
- }
-
- if (!strcmp(key, a) || !strcmp(key, A))
- part_type = EDJE_PART_TYPE_TABLE;
- else if (!strcmp(key, b) || !strcmp(key, B))
- part_type = EDJE_PART_TYPE_TEXTBLOCK;
- else if (!strcmp(key, e) || !strcmp(key, E))
- part_type = EDJE_PART_TYPE_EXTERNAL;
- else if (!strcmp(key, g) || !strcmp(key, G))
- part_type = EDJE_PART_TYPE_GRADIENT;
- else if (!strcmp(key, i) || !strcmp(key, I))
- part_type = EDJE_PART_TYPE_IMAGE;
- else if (!strcmp(key, o) || !strcmp(key, O))
- part_type = EDJE_PART_TYPE_GROUP;
- else if (!strcmp(key, p) || !strcmp(key, P))
- part_type = EDJE_PART_TYPE_PROXY;
- else if (!strcmp(key, r) || !strcmp(key, R))
- part_type = EDJE_PART_TYPE_RECTANGLE;
- else if (!strcmp(key, t) || !strcmp(key, T))
- part_type = EDJE_PART_TYPE_TEXT;
- else if (!strcmp(key, s) || !strcmp(key, S))
- part_type = EDJE_PART_TYPE_SPACER;
- else if (!strcmp(key, w) || !strcmp(key, W))
- part_type = EDJE_PART_TYPE_SWALLOW;
- else if (!strcmp(key, x) || !strcmp(key, X))
- part_type = EDJE_PART_TYPE_BOX;
- else
- part_type = EDJE_PART_TYPE_NONE;
-
- char syntax[12];
- if (enventor_object_template_part_insert(ad-enventor, part_type,
-ENVENTOR_TEMPLATE_INSERT_DEFAULT,
-REL1_X, REL1_Y, REL2_X, REL2_Y,
-syntax, sizeof(syntax)))
- {
-char msg[64];
-snprintf(msg, sizeof(msg), Template code inserted, (%s), syntax);
-stats_info_msg_update(msg);
-enventor_object_save(ad-enventor, config_edc_path_get());
- }
- else
- {
-stats_info_msg_update(Can't insert template code here. Move the
- cursor inside the \Collections,Images,Parts,
- Part,Programs\ scope.);
- }
- return ECORE_CALLBACK_DONE;
-}
-
static void
syntax_color_update(Evas_Object *enventor
[EGIT] [tools/enventor] master 01/01: don't clip the tooltip in tools.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=08c9ddeecd742a5ef8ba3d43eb9bf13116329e3b commit 08c9ddeecd742a5ef8ba3d43eb9bf13116329e3b Author: ChunEon Park her...@hermet.pe.kr Date: Thu Jun 11 16:42:40 2015 +0900 don't clip the tooltip in tools. i guess, since the tooltip has been changed recently, it's behavior changed a little. because of this, tooltip in tools got clipped outside of the viewport. Anyhow it's fixed. @fix --- src/bin/tools.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bin/tools.c b/src/bin/tools.c index 75c90d2..ccbae53 100644 --- a/src/bin/tools.c +++ b/src/bin/tools.c @@ -230,6 +230,7 @@ tools_create(Evas_Object *parent, Evas_Object *enventor) btn = tools_btn_create(box, console, Console Box (Ctrl + Down), console_cb, NULL); + elm_object_tooltip_orient_set(btn, ELM_TOOLTIP_ORIENT_BOTTOM_LEFT); evas_object_size_hint_weight_set(btn, 0, EVAS_HINT_EXPAND); evas_object_size_hint_align_set(btn, 1.0, EVAS_HINT_FILL); elm_box_pack_end(box, btn); --
[EGIT] [core/elementary] master 02/02: clendar: + null check
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=dd592451b8a65cb1a444691a88cef1d3fcc19fb2
commit dd592451b8a65cb1a444691a88cef1d3fcc19fb2
Author: ChunEon Park her...@hermet.pe.kr
Date: Mon Jun 15 13:39:14 2015 +0900
clendar: + null check
gmtime can return NULL vaule.
if so strftime will cause crash.
this patch just prevent that potential situation.
---
src/lib/elm_calendar.c | 24 +++-
1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/src/lib/elm_calendar.c b/src/lib/elm_calendar.c
index 0fc78f3..90a6f17 100644
--- a/src/lib/elm_calendar.c
+++ b/src/lib/elm_calendar.c
@@ -1004,17 +1004,23 @@ _elm_calendar_evas_object_smart_add(Eo *obj,
Elm_Calendar_Data *priv)
/* FIXME: I'm not aware of a known max, so if it fails,
* just make it larger. :| */
char buf[20];
+struct tm *info;
+
/* I don't know of a better way of doing it */
-if (strftime(buf, sizeof(buf), %a, gmtime(weekday)))
+info = gmtime(weekday);
+if (info)
{
- priv-weekdays[i] = eina_stringshare_add(buf);
- }
-else
- {
- /* If we failed getting day, get a default value */
- priv-weekdays[i] = _days_abbrev[i];
- WRN(Failed getting weekday name for '%s' from locale.,
- _days_abbrev[i]);
+ if (strftime(buf, sizeof(buf), %a, info))
+ {
+ priv-weekdays[i] = eina_stringshare_add(buf);
+ }
+ else
+ {
+ /* If we failed getting day, get a default value */
+ priv-weekdays[i] = _days_abbrev[i];
+ WRN(Failed getting weekday name for '%s' from locale.,
+ _days_abbrev[i]);
+ }
}
weekday += 86400; /* Advance by a day */
}
--
[EGIT] [core/elementary] master 01/01: calendar: + null check.
hermet pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=4b01ea2597526df8b0e0d82d25aae36c7faa8eff commit 4b01ea2597526df8b0e0d82d25aae36c7faa8eff Author: ChunEon Park her...@hermet.pe.kr Date: Mon Jun 15 13:58:02 2015 +0900 calendar: + null check. --- src/lib/elm_calendar.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/elm_calendar.c b/src/lib/elm_calendar.c index 90a6f17..9af34c4 100644 --- a/src/lib/elm_calendar.c +++ b/src/lib/elm_calendar.c @@ -1333,6 +1333,7 @@ _elm_calendar_mark_add(Eo *obj, Elm_Calendar_Data *sd, const char *mark_type, st Elm_Calendar_Mark *mark; mark = _mark_new(obj, mark_type, mark_time, repeat); + if (!mark) return NULL; sd-marks = eina_list_append(sd-marks, mark); mark-node = eina_list_last(sd-marks); --
[EGIT] [core/elementary] master 01/01: Revert Spinner: Add changed callback call when spinner value set.
hermet pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=3b4ff6cc9b8532886b7fe25b58d2a20ba1bac3ed commit 3b4ff6cc9b8532886b7fe25b58d2a20ba1bac3ed Author: ChunEon Park her...@hermet.pe.kr Date: Fri May 29 12:32:02 2015 +0900 Revert Spinner: Add changed callback call when spinner value set. This reverts commit 8278dff6a742c391f7c04c3de1033574d818dbb6. This is not good for scenarios and will break the compatibility. Thanks to David for reporting. --- src/lib/elm_spinner.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/lib/elm_spinner.c b/src/lib/elm_spinner.c index b306e87..9624380 100644 --- a/src/lib/elm_spinner.c +++ b/src/lib/elm_spinner.c @@ -1268,7 +1268,6 @@ _elm_spinner_value_set(Eo *obj, Elm_Spinner_Data *sd, double val) } _val_set(obj); _label_write(obj); - evas_object_smart_callback_call(obj, SIG_CHANGED, NULL); } EOLIAN static double --
[EGIT] [tools/enventor] master 01/01: template: update rotation+zoom
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=a59ebb43aad30c34dba8aa7277b36f4ea44b60c2
commit a59ebb43aad30c34dba8aa7277b36f4ea44b60c2
Author: ChunEon Park her...@hermet.pe.kr
Date: Sun May 31 01:43:53 2015 +0900
template: update rotation+zoom
---
data/templates/rotation+zoom.edc | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/data/templates/rotation+zoom.edc b/data/templates/rotation+zoom.edc
index 56379ec..1734881 100644
--- a/data/templates/rotation+zoom.edc
+++ b/data/templates/rotation+zoom.edc
@@ -14,9 +14,11 @@ collections {
}
description { state: rotated 0.0;
inherit: default 0.0;
- map.rotation.z: 360;
- map.zoom.x: 0.25;
- map.zoom.y: 0.25;
+ map {
+ rotation.z: 360;
+ zoom.x: 0.25;
+ zoom.y: 0.25;
+ }
}
}
}
--
[EGIT] [tools/enventor] master 01/01: template: add group
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=34893056cfa65f5f134c93c2414f3ada8e7d64c0
commit 34893056cfa65f5f134c93c2414f3ada8e7d64c0
Author: ChunEon Park her...@hermet.pe.kr
Date: Sun May 31 01:40:04 2015 +0900
template: add group
---
data/templates/Makefile.am | 5 +
data/templates/group.edc | 41 +
2 files changed, 46 insertions(+)
diff --git a/data/templates/Makefile.am b/data/templates/Makefile.am
index 4ae7e99..f07bf59 100644
--- a/data/templates/Makefile.am
+++ b/data/templates/Makefile.am
@@ -10,6 +10,8 @@ files_DATA = basic.edc \
clip.edj \
empty.edc \
empty.edj \
+ group.edc \
+ group.edj \
image.edc \
image.edj \
map.edc \
@@ -64,6 +66,9 @@ rect.edj: Makefile rect.edc
rotation+zoom.edj: Makefile rotation+zoom.edc
$(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/rotation+zoom.edc
$(builddir)/rotation+zoom.edj
+group.edj: Makefile group.edc
+ $(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/group.edc $(builddir)/group.edj
+
image.edj: Makefile image.edc
$(EDJE_CC) $(EDJE_FLAGS) $(srcdir)/image.edc $(builddir)/image.edj
diff --git a/data/templates/group.edc b/data/templates/group.edc
new file mode 100644
index 000..5721e63
--- /dev/null
+++ b/data/templates/group.edc
@@ -0,0 +1,41 @@
+collections {
+ group { name: main;
+ parts {
+ part { name: rect;
+type: RECT;
+description { state: default 0.0;
+ rel1.relative: 0.0 0.0;
+ rel2.relative: 1.0 0.5;
+ color: 0 136 170 255;
+}
+ }
+ part { name: group;
+type: GROUP;
+source: my_group;
+description { state: default 0.0;
+ rel1.relative: 0.0 0.5;
+ rel2.relative: 1.0 1.0;
+}
+ }
+ }
+ }
+ group { name: my_group;
+ parts {
+ part { name: text;
+type: TEXT;
+scale: 1;
+effect: FAR_SOFT_SHADOW;
+description { state: default 0.0;
+ color: 0 136 170 255;
+ color2: 0 136 170 50;
+ color3: 0 136 170 25;
+ text {
+ size: 30;
+ font: Sans;
+ text: My Group;
+ }
+}
+ }
+ }
+ }
+}
--
[EGIT] [tools/enventor] enventor-0.5 02/02: lib/main: minus initialization count when it's shutdown.
hermet pushed a commit to branch enventor-0.5. http://git.enlightenment.org/tools/enventor.git/commit/?id=c7bd3dfcc2d01a991e311bb313b9b15aaedb9ee7 commit c7bd3dfcc2d01a991e311bb313b9b15aaedb9ee7 Author: ChunEon Park her...@hermet.pe.kr Date: Sun May 3 02:59:26 2015 +0900 lib/main: minus initialization count when it's shutdown. @fix --- src/lib/enventor_main.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/enventor_main.c b/src/lib/enventor_main.c index 646cb49..ab690a1 100644 --- a/src/lib/enventor_main.c +++ b/src/lib/enventor_main.c @@ -113,6 +113,8 @@ enventor_shutdown(void) return 0; } + if ((--_enventor_init_count) 0) return _enventor_init_count; + ecore_event_handler_del(_key_down_handler); _key_down_handler = NULL; --
[EGIT] [tools/enventor] enventor-0.5 01/02: remove redundant code.
hermet pushed a commit to branch enventor-0.5.
http://git.enlightenment.org/tools/enventor.git/commit/?id=59e6772811df0c9fb271e3d4d0423f09da062890
commit 59e6772811df0c9fb271e3d4d0423f09da062890
Author: ChunEon Park her...@hermet.pe.kr
Date: Mon Mar 2 14:49:51 2015 +0900
remove redundant code.
it was for compatible for enventor v0.5.0 release.
now we are on development stage.
---
m4/efl_eo.m4 | 7 ---
src/lib/edj_viewer.c | 5 +
src/lib/enventor_smart.c | 4
3 files changed, 1 insertion(+), 15 deletions(-)
diff --git a/m4/efl_eo.m4 b/m4/efl_eo.m4
index 1fee0bf..a3bd952 100644
--- a/m4/efl_eo.m4
+++ b/m4/efl_eo.m4
@@ -3,10 +3,3 @@ AC_DEFUN([EFL_ENABLE_EO_API_SUPPORT],
[
AC_DEFINE([EFL_EO_API_SUPPORT], [1], [Enable access to unstable EFL Eo API])
])
-
-AC_DEFUN([EFL_ENABLE_EO_LATEST],
-[
- AC_DEFINE([EO_LATEST], [0], [Enable access to unstable EFL Eo Latest API])
-])
-
-
diff --git a/src/lib/edj_viewer.c b/src/lib/edj_viewer.c
index 04be065..9f15689 100644
--- a/src/lib/edj_viewer.c
+++ b/src/lib/edj_viewer.c
@@ -300,12 +300,9 @@ view_obj_idler_cb(void *data)
elm_object_part_content_set(vd-base, elm.swallow.content,
vd-layout);
elm_object_content_set(vd-scroller, vd-base);
-#if EO_LATEST
+
Eina_Bool ret;
if (eo_do_ret(vd-enventor, ret, enventor_obj_dummy_swallow_get()))
-#else
- if (eo_do(vd-enventor, enventor_obj_dummy_swallow_get()))
-#endif
dummy_obj_new(vd-layout);
vd-idler = NULL;
diff --git a/src/lib/enventor_smart.c b/src/lib/enventor_smart.c
index df31c0a..bda656e 100644
--- a/src/lib/enventor_smart.c
+++ b/src/lib/enventor_smart.c
@@ -606,12 +606,8 @@ enventor_object_add(Evas_Object *parent)
EAPI Eina_Bool
enventor_object_file_set(Evas_Object *obj, const char *file)
{
-#if EO_LATEST
Eina_Bool ret;
return eo_do_ret(obj, ret, efl_file_set(file, NULL));
-#else
- return eo_do(obj, efl_file_set(file, NULL));
-#endif
}
#include enventor_object.eo.c
--
[EGIT] [core/elementary] master 01/01: clipper: removed.
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=6a286e94784d68ec2856ab1e2d5fbc6cca02
commit 6a286e94784d68ec2856ab1e2d5fbc6cca02
Author: ChunEon Park her...@hermet.pe.kr
Date: Thu May 28 17:41:49 2015 +0900
clipper: removed.
we've discussed and concluded it's unncessary.
---
src/lib/Elementary.h.in | 1 -
src/lib/Makefile.am | 7 --
src/lib/elm_clipper.c| 229 ---
src/lib/elm_clipper.eo | 48 -
src/lib/elm_clipper.h| 41
src/lib/elm_clipper_eo.h | 11 ---
src/lib/elm_clipper_legacy.h | 12 ---
7 files changed, 349 deletions(-)
diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in
index 87d9045..cd17bbf 100644
--- a/src/lib/Elementary.h.in
+++ b/src/lib/Elementary.h.in
@@ -195,7 +195,6 @@ EAPI extern Elm_Version *elm_version;
#include elm_cache.h
#include elm_calendar.h
#include elm_check.h
-#include elm_clipper.h
#include elm_clock.h
#include elm_cnp.h
#include elm_colorselector.h
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 2a52436..de85749 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -48,7 +48,6 @@ elm_widget_bubble.h \
elm_widget_button.h \
elm_widget_calendar.h \
elm_widget_check.h \
-elm_widget_clipper.h \
elm_widget_clock.h \
elm_widget_colorselector.h \
elm_widget_conform.h \
@@ -178,9 +177,6 @@ elm_calendar_common.h \
elm_check.h \
elm_check_eo.h \
elm_check_legacy.h \
-elm_clipper.h \
-elm_clipper_eo.h \
-elm_clipper_legacy.h \
elm_clock.h \
elm_clock_eo.h \
elm_clock_legacy.h \
@@ -426,7 +422,6 @@ elm_bubble.c \
elm_button.c \
elm_calendar.c \
elm_check.c \
-elm_clipper.c \
elm_clock.c \
elm_cnp.c \
elm_colorselector.c \
@@ -548,7 +543,6 @@ elm_bubble.eo \
elm_button.eo \
elm_calendar.eo \
elm_check.eo \
-elm_clipper.eo \
elm_clock.eo \
elm_colorselector.eo \
elm_conformant.eo \
@@ -701,7 +695,6 @@ elementaryeolianfiles_DATA = \
elm_button.eo \
elm_calendar.eo \
elm_check.eo \
-elm_clipper.eo \
elm_clock.eo \
elm_colorselector.eo \
elm_conformant.eo \
diff --git a/src/lib/elm_clipper.c b/src/lib/elm_clipper.c
deleted file mode 100644
index 5b869e8..000
--- a/src/lib/elm_clipper.c
+++ /dev/null
@@ -1,229 +0,0 @@
-#ifdef HAVE_CONFIG_H
-# include elementary_config.h
-#endif
-
-#define ELM_INTERFACE_ATSPI_ACCESSIBLE_PROTECTED
-
-#include Elementary.h
-
-#include elm_priv.h
-#include elm_widget_clipper.h
-#include elm_widget_container.h
-
-#define MY_CLASS ELM_CLIPPER_CLASS
-
-#define MY_CLASS_NAME Elm_Clipper
-#define MY_CLASS_NAME_LEGACY elm_clipper
-
-static void
-_calc_region(Eo *obj)
-{
- int x, y, w, h;
- int calx1, caly1, calx2, caly2;
-
- ELM_CLIPPER_DATA_GET(obj, sd);
- evas_object_geometry_get(sd-content, x, y, w, h);
-
- calx1 = (int)(w * sd-region_x1 + x);
- caly1 = (int)(h * sd-region_y1 + y);
-
- if (sd-region_x2 sd-region_x1) calx2 = 0;
- else calx2 = (int)(w * (sd-region_x2 - sd-region_x1));
- if (sd-region_y2 sd-region_y1) caly2 = 0;
- else caly2 = (int)(h * (sd-region_y2 - sd-region_y1));
-
- evas_object_move(sd-clipper, calx1, caly1);
- evas_object_resize(sd-clipper, calx2, caly2);
-}
-
-EOLIAN static void
-_elm_clipper_clip_set(Eo *obj, Elm_Clipper_Data *sd, Evas_Object *clip)
-{
- if (sd-clipper != clip)
- {
-if (sd-clipper)
- {
- elm_widget_sub_object_del(obj, sd-clipper);
- if (sd-content) evas_object_clip_unset(sd-content);
- sd-clipper = NULL;
- }
-if (clip)
- {
- elm_widget_sub_object_add(obj, clip);
- evas_object_smart_member_add(clip, obj);
- _calc_region(obj);
- if (sd-content) evas_object_clip_set(sd-content, clip);
- sd-clipper = clip;
- }
- }
-}
-
-EOLIAN static Evas_Object *
-_elm_clipper_clip_get(Eo *obj EINA_UNUSED, Elm_Clipper_Data *sd)
-{
- return sd-clipper;
-}
-
-#if 0
-EOLIAN static void
-_elm_clipper_region_set(Eo *obj, Elm_Clipper_Data *sd, double x1, double y1,
double x2, double y2)
-{
- if (x2 x1 || y2 y1)
- ERR(Clipper region x2/y2 should be greater than or equal to x1/y1!\n);
-
- if (sd-region_x1 != x1 || sd-region_y1 != y1 ||
- sd-region_x2 != x2 || sd-region_y2 != y2)
- {
-sd-region_x1 = x1;
-sd-region_y1 = y1;
-sd-region_x2 = x2;
-sd-region_y2 = y2;
-_calc_region(obj);
- }
-}
-
-EOLIAN static void
-_elm_clipper_region_get(Eo *obj EINA_UNUSED, Elm_Clipper_Data *sd, double *x1,
double *y1, double *x2, double *y2)
-{
- if (x1) *x1 = sd-region_x1;
- if (y1) *y1 = sd-region_y1;
- if (x2) *x2 = sd-region_x2;
- if (y2) *y2 = sd-region_y2;
-}
-#endif
-
-EOLIAN static Eina_Bool
-_elm_clipper_elm_widget_sub_object_del(Eo *obj, Elm_Clipper_Data *sd,
Evas_Object
[EGIT] [tools/enventor] enventor-0.5 01/01: bump up version.
hermet pushed a commit to branch enventor-0.5. http://git.enlightenment.org/tools/enventor.git/commit/?id=d1d7ce813cfd79d1fb11404ad0f1ccfc18ca519a commit d1d7ce813cfd79d1fb11404ad0f1ccfc18ca519a Author: ChunEon Park her...@hermet.pe.kr Date: Thu May 28 15:33:09 2015 +0900 bump up version. --- NEWS | 9 - README | 8 configure.ac | 2 +- data/about/ABOUT | 2 +- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/NEWS b/NEWS index 949bc52..8870fd0 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,14 @@ == -Enventor 0.5.0 +Enventor 0.5.1 == +Changes since Enventor 0.5.0: +- + +Fixes: + * Fix the compatibility to eo syntax change. + * Fix library initialization count corruption. + Changes since Enventor 0.4.0: - diff --git a/README b/README index c7f2c70..04efc61 100644 --- a/README +++ b/README @@ -1,14 +1,14 @@ -[Enventor v0.5.0] +[Enventor v0.5.1] This is an EDC editor with some convenient functions. It's brand new and was only started near the begining of June 2013, so expecting it to do everything a mature script editor does is a bit premature, but considering it's young age, it does a lot. [Requirements] - efl (= 1.13.0) - elementary (= 1.13.0) + efl (= 1.14.0) + elementary (= 1.14.0) -Please note that some features may not quite function correctly or completely less EFL 1.13. Newer would be better. +Please note that some features may not quite function correctly or completely less EFL 1.14. Newer would be better. Please see next sites for more information on these. diff --git a/configure.ac b/configure.ac index 4ff97c3..e181891 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## m4_define([v_maj], [0]) m4_define([v_min], [5]) -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 cba0bac..7c6979b 100644 --- a/data/about/ABOUT +++ b/data/about/ABOUT @@ -1,4 +1,4 @@ -font_size=11b[Enventor v0.5.0]/b/font_size +font_size=11b[Enventor v0.5.1]/b/font_size This is an EDC editor with some convenient functions. It's band new and was only started near the begining of June 2013, so expecting it to do everything a mature script editor does is a bit premature, but considering it's young age, it does a lot. --
[EGIT] [website/www-content] master 01/01: up to date enventor download link.
hermet pushed a commit to branch master. http://git.enlightenment.org/website/www-content.git/commit/?id=2f5a4c6324712faec823bfdf9bbf6fdf9b817585 commit 2f5a4c6324712faec823bfdf9bbf6fdf9b817585 Author: ChunEon Park chuneon.p...@samsung.com Date: Thu May 28 15:42:00 2015 +0900 up to date enventor download link. --- 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 b00b73b..5d70af6 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.5.0 +enventor_v= 0.5.1 extn = .tar.gz dlbase= http://download.enlightenment.org/rel/ --
[EGIT] [tools/enventor] master 01/01: edc_parser: support proxy, textblock
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=8c8cca1495db1117ed931fa685178bcbb096d815
commit 8c8cca1495db1117ed931fa685178bcbb096d815
Author: ChunEon Park her...@hermet.pe.kr
Date: Tue Jun 30 16:15:54 2015 +0900
edc_parser: support proxy, textblock
---
src/lib/edc_parser.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/lib/edc_parser.c b/src/lib/edc_parser.c
index cc864ea..0e05ea1 100644
--- a/src/lib/edc_parser.c
+++ b/src/lib/edc_parser.c
@@ -125,12 +125,12 @@ end:
static void
cur_state_thread_blocking(void *data, Ecore_Thread *thread EINA_UNUSED)
{
-#define PART_SYNTAX_CNT 7
+#define PART_SYNTAX_CNT 9
const char *GROUP = group;
const char *PARTS = parts;
- const char *PART[PART_SYNTAX_CNT] =
- { part, image, text, swallow, rect, group, spacer };
+ const char *PART[PART_SYNTAX_CNT] = { part, image, textblock,
+swallow, rect, group, spacer, proxy, text };
const char *DESC[2] = { desc, description };
const int DESC_LEN[2] = { 4, 11 };
--
[EGIT] [tools/enventor] master 01/01: color: + textblock
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=ed624ce10892dc9037fb9c27d030c090155df0d3
commit ed624ce10892dc9037fb9c27d030c090155df0d3
Author: ChunEon Park her...@hermet.pe.kr
Date: Tue Jun 30 16:21:26 2015 +0900
color: + textblock
---
data/color/color.src | 1 +
1 file changed, 1 insertion(+)
diff --git a/data/color/color.src b/data/color/color.src
index a6eae6d..96c92e5 100644
--- a/data/color/color.src
+++ b/data/color/color.src
@@ -65,6 +65,7 @@ group syntax_color_group struct {
value key string: table;
value key string: text ;
value key string: text.;
+value key string: textblock;
value key string: zoom;
}
}
--
[EGIT] [tools/enventor] master 01/01: template_code: updated to new style of edc.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=533dc32dec98dd30542a71ddca1687402f2f41bb
commit 533dc32dec98dd30542a71ddca1687402f2f41bb
Author: ChunEon Park her...@hermet.pe.kr
Date: Tue Jun 30 16:28:16 2015 +0900
template_code: updated to new style of edc.
---
src/lib/template_code.h | 46 --
1 file changed, 20 insertions(+), 26 deletions(-)
diff --git a/src/lib/template_code.h b/src/lib/template_code.h
index 471782d..39a546f 100644
--- a/src/lib/template_code.h
+++ b/src/lib/template_code.h
@@ -1,14 +1,12 @@
-#define TEMPLATE_GROUP_LINE_CNT 28
+#define TEMPLATE_GROUP_LINE_CNT 26
const char *TEMPLATE_GROUP[TEMPLATE_GROUP_LINE_CNT] =
{
- group { name: \XXX\;br/,
+ group { \XXX\;br/,
parts {br/,
- part { name: \XXX\;br/,
-type: IMAGE;br/,
+ image { \XXX\;br/,
scale: 1;br/,
-mouse_events: 1;br/,
-description { state: \default\ 0.0;br/,
+desc { \default\;br/,
rel1 { relative: 0.25 0.25; offset: 0 0; /*to: \XXX\;*/
}br/,
rel2 { relative: 0.75 0.75; offset: -1 -1; /*to: \XXX\;*/
}br/,
align: 0.5 0.5;br/,
@@ -21,10 +19,10 @@ const char *TEMPLATE_GROUP[TEMPLATE_GROUP_LINE_CNT] =
}br/,
}br/,
programs {br/,
- program { name: \XXX\;br/,
+ program { \XXX\;br/,
//signal: \XXX\;br/,
//source: \XXX\;br/,
-action: STATE_SET \default\ 0.0;br/,
+action: STATE_SET \default\;br/,
target: \XXX\;br/,
//transition: LINEAR 1.0;br/,
}br/,
@@ -40,14 +38,13 @@ const char *TEMPLATE_PART_TALE[TEMPLATE_PART_TALE_LINE_CNT]
=
}
};
-#define TEMPLATE_PART_IMAGE_LINE_CNT 10
+#define TEMPLATE_PART_IMAGE_LINE_CNT 9
const char *TEMPLATE_PART_IMAGE[TEMPLATE_PART_IMAGE_LINE_CNT] =
{
type: IMAGE;br/,
scale: 1;br/,
- mouse_events: 1;br/,
- description { state: \default\ 0.0;br/,
+ desc { \default\;br/,
align: 0.5 0.5;br/,
fixed: 0 0;br/,
min: 0 0;br/,
@@ -56,14 +53,13 @@ const char
*TEMPLATE_PART_IMAGE[TEMPLATE_PART_IMAGE_LINE_CNT] =
//aspect: 1 1;br/
};
-#define TEMPLATE_PART_RECT_LINE_CNT 9
+#define TEMPLATE_PART_RECT_LINE_CNT 8
const char *TEMPLATE_PART_RECT[TEMPLATE_PART_RECT_LINE_CNT] =
{
type: RECT;br/,
scale: 1;br/,
- mouse_events: 1;br/,
- description { state: \default\ 0.0;br/,
+ desc { \default\;br/,
color: 0 136 170 255;br/,
align: 0.5 0.5;br/,
fixed: 0 0;br/,
@@ -71,14 +67,13 @@ const char *TEMPLATE_PART_RECT[TEMPLATE_PART_RECT_LINE_CNT]
=
visible: 1;br/
};
-#define TEMPLATE_PART_SWALLOW_LINE_CNT 8
+#define TEMPLATE_PART_SWALLOW_LINE_CNT 7
const char *TEMPLATE_PART_SWALLOW[TEMPLATE_PART_SWALLOW_LINE_CNT] =
{
type: SWALLOW;br/,
scale: 1;br/,
- mouse_events: 1;br/,
- description { state: \default\ 0.0;br/,
+ desc { \default\;br/,
align: 0.5 0.5;br/,
fixed: 0 0;br/,
min: 0 0;br/,
@@ -91,21 +86,20 @@ const char
*TEMPLATE_PART_SPACER[TEMPLATE_PART_SPACER_LINE_CNT] =
{
type: SPACER;br/,
scale: 1;br/,
- description { state: \default\ 0.0;br/,
+ desc { \default\;br/,
align: 0.5 0.5;br/,
fixed: 0 0;br/,
min: 0 0;br/
};
-#define TEMPLATE_PART_TEXT_LINE_CNT 19
+#define TEMPLATE_PART_TEXT_LINE_CNT 18
const char *TEMPLATE_PART_TEXT[TEMPLATE_PART_TEXT_LINE_CNT] =
{
type: TEXT;br/,
scale: 1;br/,
- mouse_events: 1;br/,
effect: FAR_SOFT_SHADOW;br/,
- description { state: \default\ 0.0;br/,
+ desc { \default\;br/,
align: 0.5 0.5;br/,
fixed: 0 0;br/,
min: 0 0;br/,
@@ -128,7 +122,7 @@ const char
*TEMPLATE_PART_TEXTBLOCK[TEMPLATE_PART_TEXTBLOCK_LINE_CNT] =
{
type: TEXTBLOCK;br/,
scale: 1;br/,
- description { state: \default\ 0.0;br/,
+ desc { \default\;br/,
align: 0.5 0.5;br/,
fixed: 0 0;br/,
min: 0 0;br/,
@@ -140,7 +134,7 @@ const char
*TEMPLATE_PART_TEXTBLOCK[TEMPLATE_PART_TEXTBLOCK_LINE_CNT] =
const char *TEMPLATE_DESC[TEMPLATE_DESC_LINE_CNT] =
{
- description { state: \XXX\ 0.0;br/,
+ desc { \XXX\;br/,
//inherit: \default\;br/,
rel1 { relative: 0.0 0.0; offset: 0 0; /*to: \XXX\;*/ }br/,
rel2 { relative: 1.0 1.0; offset: -1 -1; /*to: \XXX\;*/ }br/,
@@ -156,10 +150,10 @@ const char *TEMPLATE_DESC[TEMPLATE_DESC_LINE_CNT] =
const char *TEMPLATE_PROG[TEMPLATE_PROG_LINE_CNT] =
{
- program { name: \XXX\;br/,
+ program { \XXX\;br/,
//signal: \XXX\;br/,
//source: \XXX\;br/,
- action: STATE_SET \default\ 0.0;br/,
+ action: STATE_SET \default\;br/,
target: \XXX\;br/,
//transition: LINEAR 1.0;br/,
}
@@ -183,7
[EGIT] [tools/enventor] master 01/01: template: update to new sexy edc style.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=8822f5be5af1327a22bbb9b6342ebf70019c0e06
commit 8822f5be5af1327a22bbb9b6342ebf70019c0e06
Author: ChunEon Park her...@hermet.pe.kr
Date: Tue Jun 30 16:14:49 2015 +0900
template: update to new sexy edc style.
---
data/templates/clip.edc | 14 ++
data/templates/group.edc | 21 +
data/templates/image.edc | 9 -
data/templates/map.edc | 29 -
data/templates/minimum.edc | 4 ++--
data/templates/proxy.edc | 14 ++
data/templates/rect.edc | 9 -
data/templates/rotation+zoom.edc | 22 ++
data/templates/sound.edc | 11 +--
data/templates/spacer.edc| 19 ---
data/templates/text.edc | 9 -
data/templates/textblock.edc | 11 +--
data/templates/transition.edc| 20 +---
data/templates/tween.edc | 14 ++
14 files changed, 90 insertions(+), 116 deletions(-)
diff --git a/data/templates/clip.edc b/data/templates/clip.edc
index 95360db..f31faa2 100644
--- a/data/templates/clip.edc
+++ b/data/templates/clip.edc
@@ -2,20 +2,18 @@ collections {
images {
image: logo.png COMP;
}
- group { name: main;
+ group { main;
parts {
- part { name: clipper;
-type: RECT;
-description { state: default 0.0;
+ rect { clipper;
+desc { default;
rel1.relative: 0.0 0.0;
rel2.relative: 0.5 1.0;
color: 0 136 170 255;
}
}
- part { name: logo;
-type: IMAGE;
+ image { logo;
clip_to: clipper;
-description { state: default 0.0;
+desc { default;
rel1.relative: 0.0 0.0;
rel2.relative: 1.0 1.0;
image.normal: logo.png;
@@ -25,4 +23,4 @@ collections {
}
}
}
-}
\ No newline at end of file
+}
diff --git a/data/templates/group.edc b/data/templates/group.edc
index 36aa1d0..858e97e 100644
--- a/data/templates/group.edc
+++ b/data/templates/group.edc
@@ -1,31 +1,28 @@
collections {
- group { name: main;
+ group { main;
parts {
- part { name: rect;
-type: RECT;
-description { state: default 0.0;
+ rect { rect;
+desc { default;
rel1.relative: 0.0 0.0;
rel2.relative: 1.0 0.5;
color: 0 136 170 255;
}
}
- part { name: group;
-type: GROUP;
+ group { group;
source: my_group;
-description { state: default 0.0;
+desc { default;
rel1.relative: 0.0 0.5;
rel2.relative: 1.0 1.0;
}
}
}
}
- group { name: my_group;
+ group { my_group;
parts {
- part { name: text;
-type: TEXT;
+ text { text;
scale: 1;
effect: FAR_SOFT_SHADOW;
-description { state: default 0.0;
+desc { default;
color: 0 136 170 255;
color2: 0 136 170 50;
color3: 0 136 170 25;
@@ -38,4 +35,4 @@ collections {
}
}
}
-}
\ No newline at end of file
+}
diff --git a/data/templates/image.edc b/data/templates/image.edc
index 488ecce..fa74c9d 100644
--- a/data/templates/image.edc
+++ b/data/templates/image.edc
@@ -2,11 +2,10 @@ collections {
images {
image: logo.png COMP;
}
- group { name: main;
+ group { main;
parts {
- part { name: logo;
-type: IMAGE;
-description { state: default 0.0;
+ image { logo;
+desc { default;
rel1.relative: 0.0 0.0;
rel2.relative: 1.0 1.0;
image.normal: logo.png;
@@ -16,4 +15,4 @@ collections {
}
}
}
-}
\ No newline at end of file
+}
diff --git a/data/templates/map.edc b/data/templates/map.edc
index 4c46f1c..5dc6734 100644
--- a/data/templates/map.edc
+++ b/data/templates/map.edc
@@ -2,11 +2,10 @@ collections {
images {
image: logo.png COMP;
}
- group { name: main;
+ group { main;
parts {
- part { name: logo;
-type: IMAGE;
-description { state: default 0.0;
+ image { logo;
+desc { default;
rel1.relative: 0.0 0.0;
rel2.relative: 0.5 0.5;
image.normal: logo.png;
@@ -17,17 +16,15 @@ collections {
map.color[3]: 0 0 0 0;
}
}
- part { name: perps_point;
-type: RECT;
-description { state: default 0.0;
+ rect { perps_point;
+desc { default;
rel1.relative
[EGIT] [tools/enventor] master 01/01: change Enventor_Path_Type interface.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=fe2ad1f07b2120ef32b1d514584238180fa17f22
commit fe2ad1f07b2120ef32b1d514584238180fa17f22
Author: ChunEon Park her...@hermet.pe.kr
Date: Wed Jul 1 12:04:48 2015 +0900
change Enventor_Path_Type interface.
changed names for enum value consistency.
---
src/bin/main.c| 10 +-
src/bin/menu.c| 5 +++--
src/bin/newfile.c | 2 +-
src/lib/Enventor_Legacy.h | 10 +-
src/lib/build.c | 14 +++---
src/lib/edc_editor.c | 2 +-
src/lib/enventor_smart.c | 2 +-
7 files changed, 23 insertions(+), 22 deletions(-)
diff --git a/src/bin/main.c b/src/bin/main.c
index 3e80188..abe0786 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -58,16 +58,16 @@ enventor_common_setup(Evas_Object *enventor)
enventor_object_auto_complete_set(enventor, config_auto_complete_get());
Eina_List *list = eina_list_append(NULL, config_edj_path_get());
- enventor_object_path_set(enventor, ENVENTOR_OUT_EDJ, list);
+ enventor_object_path_set(enventor, ENVENTOR_PATH_TYPE_EDJ, list);
eina_list_free(list);
- enventor_object_path_set(enventor, ENVENTOR_RES_IMAGE,
+ enventor_object_path_set(enventor, ENVENTOR_PATH_TYPE_IMAGE,
config_edc_img_path_list_get());
- enventor_object_path_set(enventor, ENVENTOR_RES_SOUND,
+ enventor_object_path_set(enventor, ENVENTOR_PATH_TYPE_SOUND,
config_edc_snd_path_list_get());
- enventor_object_path_set(enventor, ENVENTOR_RES_FONT,
+ enventor_object_path_set(enventor, ENVENTOR_PATH_TYPE_FONT,
config_edc_fnt_path_list_get());
- enventor_object_path_set(enventor, ENVENTOR_RES_DATA,
+ enventor_object_path_set(enventor, ENVENTOR_PATH_TYPE_DATA,
config_edc_dat_path_list_get());
}
diff --git a/src/bin/menu.c b/src/bin/menu.c
index 9252b87..dd9ee5a 100644
--- a/src/bin/menu.c
+++ b/src/bin/menu.c
@@ -428,7 +428,7 @@ fileselector_save_done_cb(void *data, Evas_Object *obj,
void *event_info)
{
config_edc_path_set(selected);
Eina_List *list = eina_list_append(NULL, config_edj_path_get());
-enventor_object_path_set(md-enventor, ENVENTOR_OUT_EDJ, list);
+enventor_object_path_set(md-enventor, ENVENTOR_PATH_TYPE_EDJ, list);
eina_list_free(list);
if (!enventor_object_save(md-enventor, selected))
{
@@ -448,7 +448,8 @@ fileselector_save_done_cb(void *data, Evas_Object *obj,
void *event_info)
{
Eina_List *edj_pathes = NULL;
edj_pathes = eina_list_append(edj_pathes, selected);
-enventor_object_path_set(md-enventor, ENVENTOR_OUT_EDJ, edj_pathes);
+enventor_object_path_set(md-enventor, ENVENTOR_PATH_TYPE_EDJ,
+ edj_pathes);
enventor_object_modified_set(md-enventor, EINA_TRUE);
enventor_object_save(md-enventor, config_edc_path_get());
eina_list_free(edj_pathes);
diff --git a/src/bin/newfile.c b/src/bin/newfile.c
index 09ec9d4..d3e7e09 100644
--- a/src/bin/newfile.c
+++ b/src/bin/newfile.c
@@ -46,7 +46,7 @@ newfile_set(Evas_Object *enventor, Eina_Bool template_new)
config_edc_path_set(path);
Eina_List *list = eina_list_append(NULL, config_edj_path_get());
-enventor_object_path_set(enventor, ENVENTOR_OUT_EDJ, list);
+enventor_object_path_set(enventor, ENVENTOR_PATH_TYPE_EDJ, list);
eina_list_free(list);
}
success = eina_file_copy(buf, path,
diff --git a/src/lib/Enventor_Legacy.h b/src/lib/Enventor_Legacy.h
index d2bb2ce..d582a6f 100644
--- a/src/lib/Enventor_Legacy.h
+++ b/src/lib/Enventor_Legacy.h
@@ -18,11 +18,11 @@
typedef enum
{
- ENVENTOR_OUT_EDJ = 0,
- ENVENTOR_RES_IMAGE,
- ENVENTOR_RES_SOUND,
- ENVENTOR_RES_FONT,
- ENVENTOR_RES_DATA,
+ ENVENTOR_PATH_TYPE_EDJ = 0,
+ ENVENTOR_PATH_TYPE_IMAGE,
+ ENVENTOR_PATH_TYPE_SOUND,
+ ENVENTOR_PATH_TYPE_FONT,
+ ENVENTOR_PATH_TYPE_DATA,
ENVENTOR_PATH_TYPE_LAST
} Enventor_Path_Type;
diff --git a/src/lib/build.c b/src/lib/build.c
index 880cef9..81911ea 100644
--- a/src/lib/build.c
+++ b/src/lib/build.c
@@ -79,16 +79,16 @@ build_cmd_set(build_data *bd)
Eina_Strbuf *strbuf_dat = NULL;
Eina_Strbuf *strbuf = NULL;
//Image
- strbuf_img = strbuf_path_get(bd, ENVENTOR_RES_IMAGE, -id );
+ strbuf_img = strbuf_path_get(bd, ENVENTOR_PATH_TYPE_IMAGE, -id );
if (!strbuf_img) goto err;
- strbuf_snd = strbuf_path_get(bd, ENVENTOR_RES_SOUND, -sd );
+ strbuf_snd = strbuf_path_get(bd, ENVENTOR_PATH_TYPE_SOUND, -sd );
if (!strbuf_snd) goto err;
- strbuf_fnt = strbuf_path_get(bd, ENVENTOR_RES_FONT, -fd );
+ strbuf_fnt = strbuf_path_get(bd, ENVENTOR_PATH_TYPE_FONT, -fd );
if (!strbuf_fnt) goto err;
- strbuf_dat = strbuf_path_get(bd, ENVENTOR_RES_DATA, -dd );
+ strbuf_dat
[EGIT] [tools/enventor] master 01/01: edc_parser: remove redundant code.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=22f990960f9a9d363140e6b00fc3a37e9c29e5cb commit 22f990960f9a9d363140e6b00fc3a37e9c29e5cb Author: ChunEon Park her...@hermet.pe.kr Date: Wed Jul 1 10:03:06 2015 +0900 edc_parser: remove redundant code. --- src/lib/edc_parser.c | 14 -- 1 file changed, 14 deletions(-) diff --git a/src/lib/edc_parser.c b/src/lib/edc_parser.c index 8c4ef86..e820944 100644 --- a/src/lib/edc_parser.c +++ b/src/lib/edc_parser.c @@ -353,20 +353,6 @@ type_init_thread_blocking(void *data, Ecore_Thread *thread EINA_UNUSED) //FIXME: construct from the configuration file. - Eina_Array *comps = eina_array_new(4); - eina_array_push(comps, eina_stringshare_add(RAW)); - eina_array_push(comps, eina_stringshare_add(USER)); - eina_array_push(comps, eina_stringshare_add(COMP)); - eina_array_push(comps, eina_stringshare_add(LOSSY)); - - memset(attr, 0x00, sizeof(parser_attr)); - attr.keyword = eina_stringshare_add(image); - attr.value.strs = comps; - attr.value.type = ATTR_VALUE_CONSTANT; - attr.value.prepend_str = ATTR_PREPEND_COLON; - attr.value.append_str = ATTR_APPEND_SEMICOLON; - eina_inarray_push(td-attrs, attr); - Eina_Array *trans = eina_array_new(11); eina_array_push(trans, eina_stringshare_add(LINEAR)); eina_array_push(trans, eina_stringshare_add(ACCELERATE)); --
[EGIT] [tools/enventor] master 01/01: edj_viewer: code refactoring.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=1285140af4f5ddc1c4860c67c4d4e5dee90f1f81
commit 1285140af4f5ddc1c4860c67c4d4e5dee90f1f81
Author: ChunEon Park her...@hermet.pe.kr
Date: Wed Jul 1 11:55:04 2015 +0900
edj_viewer: code refactoring.
remove duplicated code.
---
src/lib/edj_viewer.c | 47 +--
1 file changed, 21 insertions(+), 26 deletions(-)
diff --git a/src/lib/edj_viewer.c b/src/lib/edj_viewer.c
index bc91495..c2f942a 100644
--- a/src/lib/edj_viewer.c
+++ b/src/lib/edj_viewer.c
@@ -53,6 +53,17 @@ view_obj_min_update(view_data *vd)
((double)vd-view_config_size.h * scale));
}
+static void
+view_obj_create_post_job(view_data *vd)
+{
+ eio_monitor_del(vd-edj_monitor);
+ vd-edj_monitor = eio_monitor_add(build_edj_path_get());
+ if (!vd-edj_monitor) EINA_LOG_ERR(Failed to add Eio_Monitor);
+ view_obj_min_update(vd);
+ evas_object_smart_callback_call(vd-enventor, SIG_LIVE_VIEW_LOADED,
+ (void*)edj_mgr_obj_get());
+}
+
static Eina_Bool
file_set_animator_cb(void *data)
{
@@ -65,13 +76,8 @@ file_set_animator_cb(void *data)
if (edje_object_file_set(vd-layout, build_edj_path_get(), vd-group_name))
{
-eio_monitor_del(vd-edj_monitor);
-vd-edj_monitor = eio_monitor_add(build_edj_path_get());
-if (!vd-edj_monitor) EINA_LOG_ERR(Failed to add Eio_Monitor);
+view_obj_create_post_job(vd);
vd-animator = NULL;
-view_obj_min_update(vd);
-evas_object_smart_callback_call(vd-enventor, SIG_LIVE_VIEW_LOADED,
-(void*)edj_mgr_obj_get());
return ECORE_CALLBACK_CANCEL;
}
@@ -275,30 +281,20 @@ base_create(Evas_Object *parent)
return base;
}
-static Evas_Object *
-view_obj_create(view_data *vd, const char *file_path, const char *group)
+static void
+view_obj_create(view_data *vd)
{
Evas *e = evas_object_evas_get(vd-base);
- Evas_Object *layout = edje_edit_object_add(e);
- if (!edje_object_file_set(layout, file_path, group))
- {
-//FIXME: more optimized way?
-vd-animator = ecore_animator_add(file_set_animator_cb, vd);
- }
+ vd-layout = edje_edit_object_add(e);
+ if (!edje_object_file_set(vd-layout, build_edj_path_get(), vd-group_name))
+ vd-animator = ecore_animator_add(file_set_animator_cb, vd);
else
- {
-eio_monitor_del(vd-edj_monitor);
-vd-edj_monitor = eio_monitor_add(file_path);
-if (!vd-edj_monitor) EINA_LOG_ERR(Failed to add Eio_Monitor);
-evas_object_smart_callback_call(vd-enventor, SIG_LIVE_VIEW_LOADED,
-edj_mgr_obj_get());
- }
+ view_obj_create_post_job(vd);
- evas_object_size_hint_weight_set(layout, EVAS_HINT_EXPAND,
+ evas_object_size_hint_weight_set(vd-layout, EVAS_HINT_EXPAND,
EVAS_HINT_EXPAND);
- evas_object_event_callback_add(layout, EVAS_CALLBACK_RESIZE,
+ evas_object_event_callback_add(vd-layout, EVAS_CALLBACK_RESIZE,
layout_resize_cb, vd);
- return layout;
}
static void
@@ -330,8 +326,7 @@ view_obj_idler_cb(void *data)
vd-base = base_create(vd-scroller);
- vd-layout = view_obj_create(vd, build_edj_path_get(), vd-group_name);
- view_obj_min_update(vd);
+ view_obj_create(vd);
view_scale_set(vd, edj_mgr_view_scale_get());
event_layer_set(vd);
--
[EGIT] [tools/enventor] master 01/01: main: code refactoring.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=6b6f4b19c18966a718e1e95d68f60531e07e9a18
commit 6b6f4b19c18966a718e1e95d68f60531e07e9a18
Author: ChunEon Park her...@hermet.pe.kr
Date: Fri Jul 3 23:01:22 2015 +0900
main: code refactoring.
don't keep temporary variable.
---
src/bin/main.c | 41 ++---
1 file changed, 14 insertions(+), 27 deletions(-)
diff --git a/src/bin/main.c b/src/bin/main.c
index abe0786..0997efe 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -9,7 +9,6 @@
typedef struct app_s
{
Evas_Object *enventor;
- Eina_Bool template_new : 1;
Eina_Bool on_saving : 1;
Eina_Bool lazy_save : 1;
} app_data;
@@ -222,11 +221,11 @@ tools_set(Evas_Object *enventor)
return tools;
}
-static Eina_Bool
+static void
args_dispatch(int argc, char **argv, char *edc_path, char *edj_path,
Eina_List **img_path, Eina_List **snd_path,
Eina_List **fnt_path, Eina_List **dat_path,
- Eina_Bool *template_new)
+ Eina_Bool *default_edc, Eina_Bool *template)
{
Eina_List *id = NULL;
@@ -236,7 +235,6 @@ args_dispatch(int argc, char **argv, char *edc_path, char
*edj_path,
Eina_Bool quit = EINA_FALSE;
Eina_Bool help = EINA_FALSE;
- Eina_Bool default_edc = EINA_TRUE;
//No arguments. set defaults
if (argc == 1) goto defaults;
@@ -268,7 +266,7 @@ args_dispatch(int argc, char **argv, char *edc_path, char
*edj_path,
};
Ecore_Getopt_Value values[] = {
- ECORE_GETOPT_VALUE_BOOL(*template_new),
+ ECORE_GETOPT_VALUE_BOOL(*template),
ECORE_GETOPT_VALUE_LIST(id),
ECORE_GETOPT_VALUE_LIST(sd),
ECORE_GETOPT_VALUE_LIST(fd),
@@ -287,7 +285,7 @@ args_dispatch(int argc, char **argv, char *edc_path, char
*edj_path,
if (strstr(argv[i], .edc))
{
sprintf(edc_path, %s, argv[i]);
- default_edc = EINA_FALSE;
+ *default_edc = EINA_FALSE;
}
else if (strstr(argv[i], .edj))
{
@@ -304,7 +302,7 @@ args_dispatch(int argc, char **argv, char *edc_path, char
*edj_path,
}
defaults:
- if (default_edc)
+ if (*default_edc)
{
Eina_Tmpstr *tmp_path;
eina_file_mkstemp(DEFAULT_EDC_FORMAT, tmp_path);
@@ -341,12 +339,11 @@ defaults:
ecore_getopt_list_free(fd);
ecore_getopt_list_free(sd);
ecore_getopt_list_free(dd);
-
- return default_edc;
}
-static Eina_Bool
-config_data_set(app_data *ad, int argc, char **argv)
+static void
+config_data_set(app_data *ad, int argc, char **argv, Eina_Bool *default_edc,
+Eina_Bool *template)
{
char edc_path[PATH_MAX] = { 0, };
char edj_path[PATH_MAX] = { 0, };
@@ -354,16 +351,11 @@ config_data_set(app_data *ad, int argc, char **argv)
Eina_List *snd_path = NULL;
Eina_List *fnt_path = NULL;
Eina_List *dat_path = NULL;
- Eina_Bool template_new = EINA_FALSE;
- Eina_Bool default_edc = args_dispatch(argc, argv, edc_path, edj_path,
- img_path, snd_path, fnt_path,
- dat_path, template_new);
+ args_dispatch(argc, argv, edc_path, edj_path, img_path, snd_path,
+ fnt_path, dat_path, default_edc, template);
config_init(edc_path, edj_path, img_path, snd_path, fnt_path, dat_path);
config_update_cb_set(config_update_cb, ad);
- ad-template_new = template_new;
-
- return default_edc;
}
static void
@@ -836,13 +828,6 @@ statusbar_set()
}
static void
-template_show(app_data *ad)
-{
- if (ad-template_new)
- menu_edc_new(EINA_TRUE);
-}
-
-static void
live_edit_set(Evas_Object *enventor, Evas_Object *tools)
{
Evas_Object *trigger = tools_live_edit_get(tools);
@@ -859,7 +844,9 @@ init(app_data *ad, int argc, char **argv)
enventor_init(argc, argv);
- Eina_Bool default_edc = config_data_set(ad, argc, argv);
+ Eina_Bool template = EINA_FALSE;
+ Eina_Bool default_edc = EINA_TRUE;
+ config_data_set(ad, argc, argv, default_edc, template);
newfile_default_set(default_edc);
base_gui_init();
statusbar_set();
@@ -875,7 +862,7 @@ init(app_data *ad, int argc, char **argv)
menu_init(ad-enventor);
- template_show(ad);
+ if (template) menu_edc_new(EINA_TRUE);
//Initialize syntax color.
syntax_color_init(ad-enventor);
--
[EGIT] [tools/enventor] master 01/01: newfile: code refactoring.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=8ef03ee90c8e0ea69272f502b6e4c4aca8d7f281
commit 8ef03ee90c8e0ea69272f502b6e4c4aca8d7f281
Author: ChunEon Park her...@hermet.pe.kr
Date: Fri Jul 3 22:38:18 2015 +0900
newfile: code refactoring.
return function as soon as possible.
---
src/bin/newfile.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/bin/newfile.c b/src/bin/newfile.c
index d3e7e09..9108c2f 100644
--- a/src/bin/newfile.c
+++ b/src/bin/newfile.c
@@ -64,15 +64,15 @@ newfile_set(Evas_Object *enventor, Eina_Bool template_new)
void
newfile_default_set(Eina_Bool default_edc)
{
+ if (!default_edc) return;
+
Eina_Bool success = EINA_TRUE;
char buf[PATH_MAX];
+
snprintf(buf, sizeof(buf), %s/templates/basic.edc,
elm_app_data_dir_get());
- if (default_edc)
- {
-success = eina_file_copy(buf,config_edc_path_get(),
- EINA_FILE_COPY_DATA, NULL, NULL);
- }
+ success = eina_file_copy(buf,config_edc_path_get(),
+EINA_FILE_COPY_DATA, NULL, NULL);
if (!success)
{
EINA_LOG_ERR(Cannot find file! \%s\, buf);
--
[EGIT] [tools/enventor] master 01/01: edc_parser: remove the generated code '0.0' at the end of state.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=8678084b8f30382cf2b26edfdb477db4121da32b
commit 8678084b8f30382cf2b26edfdb477db4121da32b
Author: ChunEon Park her...@hermet.pe.kr
Date: Thu Jul 2 21:42:18 2015 +0900
edc_parser: remove the generated code '0.0' at the end of state.
0.0 is generally unused but annoying to users.
---
src/lib/edc_parser.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/lib/edc_parser.c b/src/lib/edc_parser.c
index bc9691a..07efbf2 100644
--- a/src/lib/edc_parser.c
+++ b/src/lib/edc_parser.c
@@ -8,7 +8,6 @@
const char ATTR_PREPEND_COLON[] = :;
const char ATTR_PREPEND_NONE[] = ;
const char ATTR_APPEND_SEMICOLON[] = ;;
-const char ATTR_APPEND_STATE_VAL[] = 0.0;;
typedef struct parser_attr_s
{
@@ -837,7 +836,7 @@ type_init_thread_blocking(void *data, Ecore_Thread *thread
EINA_UNUSED)
attr.keyword = eina_stringshare_add(STATE_SET);
attr.value.type = ATTR_VALUE_STATE;
attr.value.prepend_str = ATTR_PREPEND_NONE;
- attr.value.append_str = ATTR_APPEND_STATE_VAL;
+ attr.value.append_str = ATTR_APPEND_SEMICOLON;
attr.value.program = EINA_TRUE;
eina_inarray_push(td-attrs, attr);
@@ -845,7 +844,7 @@ type_init_thread_blocking(void *data, Ecore_Thread *thread
EINA_UNUSED)
attr.keyword = eina_stringshare_add(inherit);
attr.value.type = ATTR_VALUE_STATE;
attr.value.prepend_str = ATTR_PREPEND_COLON;
- attr.value.append_str = ATTR_APPEND_STATE_VAL;
+ attr.value.append_str = ATTR_APPEND_SEMICOLON;
eina_inarray_push(td-attrs, attr);
//Type: Image
--
[EGIT] [tools/enventor] master 01/01: syntax_color: apply string syntax color prior to others.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=d2e3c6dc6bff1b3b11e697ad49fcde7e0891cf91
commit d2e3c6dc6bff1b3b11e697ad49fcde7e0891cf91
Author: ChunEon Park her...@hermet.pe.kr
Date: Sat Jul 4 01:08:01 2015 +0900
syntax_color: apply string syntax color prior to others.
even if the comments are inside of the qutoes,
the comments syntax color should not be applied.
---
src/lib/syntax_color.c | 28 ++--
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/lib/syntax_color.c b/src/lib/syntax_color.c
index bd432cd..ac0f47e 100644
--- a/src/lib/syntax_color.c
+++ b/src/lib/syntax_color.c
@@ -860,6 +860,20 @@ color_apply(color_data *cd, const char *src, int length,
char *from, char *to)
}
}
+//escape string: ~
+ret = string_apply(strbuf, cur, prev, cd-col_string, inside_string);
+if (ret == 1)
+ {
+ inside_string = !inside_string;
+ continue;
+ }
+
+if (inside_string || inside_comment)
+ {
+ cur++;
+ continue;
+ }
+
//handle comment: /* ~ */
ret = comment_apply(strbuf, src, length, cur, prev, cd-col_comment,
inside_comment);
@@ -875,20 +889,6 @@ color_apply(color_data *cd, const char *src, int length,
char *from, char *to)
else if (ret == -1) goto finished;
}
-//escape string: ~
-ret = string_apply(strbuf, cur, prev, cd-col_string, inside_string);
-if (ret == 1)
- {
- inside_string = !inside_string;
- continue;
- }
-
-if (inside_string || inside_comment)
- {
- cur++;
- continue;
- }
-
//handle comment: preprocessors, #
ret = macro_apply(strbuf, src, length, cur, prev, cd-col_macro,
cd);
if (ret == 1) continue;
--
[EGIT] [tools/enventor] master 01/01: color: added more keywords
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=820f107e482a941cd8b9d57c7d5a442b013f0a27
commit 820f107e482a941cd8b9d57c7d5a442b013f0a27
Author: ChunEon Park her...@hermet.pe.kr
Date: Mon Jun 29 21:35:04 2015 +0900
color: added more keywords
---
data/color/color.src | 3 +++
1 file changed, 3 insertions(+)
diff --git a/data/color/color.src b/data/color/color.src
index 69e98bb..1d750b9 100644
--- a/data/color/color.src
+++ b/data/color/color.src
@@ -32,6 +32,7 @@ group syntax_color_group struct {
value key string: collections;
value key string: data;
value key string: description;
+value key string: desc;
value key string: dragable;
value key string: fill;
value key string: group;
@@ -47,6 +48,7 @@ group syntax_color_group struct {
value key string: programs;
value key string: program;
value key string: perspective ;
+value key string: rect;
value key string: rel1;
value key string: rel2;
value key string: rotation;
@@ -55,6 +57,7 @@ group syntax_color_group struct {
value key string: set;
value key string: sounds;
value key string: styles;
+value key string: swallow;
value key string: size ;
value key string: table;
value key string: text ;
--
[EGIT] [tools/enventor] master 01/01: color: fix conflict set and set_xxx.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=f705d89495f7625b09607cd47093818c7b89726e
commit f705d89495f7625b09607cd47093818c7b89726e
Author: ChunEon Park her...@hermet.pe.kr
Date: Mon Jun 29 22:01:40 2015 +0900
color: fix conflict set and set_xxx.
this is tricky but works.
---
data/color/color.src | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/data/color/color.src b/data/color/color.src
index 1d750b9..617d529 100644
--- a/data/color/color.src
+++ b/data/color/color.src
@@ -54,7 +54,8 @@ group syntax_color_group struct {
value key string: rotation;
value key string: sample;
value key string: script;
-value key string: set;
+value key string: set.;
+value key string: set ;
value key string: sounds;
value key string: styles;
value key string: swallow;
--
[EGIT] [tools/enventor] master 01/01: autocomp: remove generation of optional code.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=b0e0820148c09fbbf2c36acfc7b221438d371b08
commit b0e0820148c09fbbf2c36acfc7b221438d371b08
Author: ChunEon Park her...@hermet.pe.kr
Date: Mon Jul 6 19:32:38 2015 +0900
autocomp: remove generation of optional code.
---
data/autocomp/autocomp.src | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/data/autocomp/autocomp.src b/data/autocomp/autocomp.src
index 3615621..b9a6c61 100644
--- a/data/autocomp/autocomp.src
+++ b/data/autocomp/autocomp.src
@@ -733,9 +733,9 @@ group lexem struct {
}
group txt var_array {
count 1;
- value string string: %s: \\
0.0;;
+ value string string: %s: \\;;
}
- value cursor_offset int: 6;
+ value cursor_offset int: 2;
value line_back int: 0;
group name var_array {
count 1;
@@ -1255,9 +1255,9 @@ group lexem struct {
}
group txt var_array {
count 1;
- value string string: %s: STATE_SET \\
0.0;;
+ value string string: %s: STATE_SET
\\;;
}
- value cursor_offset int: 6;
+ value cursor_offset int: 2;
value line_back int: 0;
group name var_array {
count 1;
--
[EGIT] [tools/enventor] master 01/01: fix to avoid popup of file modified
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=1cc52fee5727d37398e3ed9d12e28f92f58fb0a2
commit 1cc52fee5727d37398e3ed9d12e28f92f58fb0a2
Author: ChunEon Park her...@hermet.pe.kr
Date: Fri Jul 3 19:58:20 2015 +0900
fix to avoid popup of file modified
if the file is modified continously,
it couldn't catch that the file is modified by self or not.
we do avoid this by delaying the notifying event for 3 secs.
---
src/lib/enventor_smart.c | 20 ++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/src/lib/enventor_smart.c b/src/lib/enventor_smart.c
index 486a8f8..aeab6b1 100644
--- a/src/lib/enventor_smart.c
+++ b/src/lib/enventor_smart.c
@@ -25,6 +25,7 @@ typedef struct _Enventor_Object_Data
edit_data *ed;
Eio_Monitor *edc_monitor;
Eina_Stringshare *group_name;
+ Ecore_Timer *file_modified_timer;
Eina_Bool dummy_swallow : 1;
@@ -50,6 +51,18 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
/*/
/* Internal method implementation*/
/*/
+
+static Eina_Bool
+file_modified_timer(void *data)
+{
+ Enventor_EDC_Modified modified;
+ Enventor_Object_Data *pd = data;
+ modified.self_changed = EINA_FALSE;
+ evas_object_smart_callback_call(pd-obj, SIG_EDC_MODIFIED, modified);
+ pd-file_modified_timer = NULL;
+ return ECORE_CALLBACK_CANCEL;
+}
+
static Eina_Bool
file_modified_cb(void *data, int type EINA_UNUSED, void *event)
{
@@ -60,8 +73,10 @@ file_modified_cb(void *data, int type EINA_UNUSED, void
*event)
if (ev-monitor != pd-edc_monitor) return ECORE_CALLBACK_PASS_ON;
if (!edit_saved_get(pd-ed))
{
-modified.self_changed = EINA_FALSE;
-evas_object_smart_callback_call(pd-obj, SIG_EDC_MODIFIED, modified);
+/* Don't notify info right soon,
+ if the source changing can be happened continously. */
+if (pd-file_modified_timer) ecore_timer_del(pd-file_modified_timer);
+pd-file_modified_timer = ecore_timer_add(3, file_modified_timer, pd);
return ECORE_CALLBACK_DONE;
}
if (!edit_changed_get(pd-ed)) return ECORE_CALLBACK_DONE;
@@ -167,6 +182,7 @@ _enventor_object_evas_object_smart_del(Evas_Object *obj
EINA_UNUSED,
{
EINA_REFCOUNT_UNREF(pd)
{
+ecore_timer_del(pd-file_modified_timer);
eio_monitor_del(pd-edc_monitor);
eina_stringshare_del(pd-group_name);
edit_term(pd-ed);
--
[EGIT] [tools/enventor] master 01/01: update edj as soon as possible.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=aa962ba1791accd678d4dd074c67c7730599e632
commit aa962ba1791accd678d4dd074c67c7730599e632
Author: ChunEon Park her...@hermet.pe.kr
Date: Tue Jun 30 18:24:24 2015 +0900
update edj as soon as possible.
checks the new edj per every frame if it failed to load.
---
src/lib/edj_viewer.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/lib/edj_viewer.c b/src/lib/edj_viewer.c
index e45eaf6..37db9b3 100644
--- a/src/lib/edj_viewer.c
+++ b/src/lib/edj_viewer.c
@@ -24,7 +24,7 @@ struct viewer_s
Eina_Stringshare *part_name;
Ecore_Idler *idler;
- Ecore_Timer *timer;
+ Ecore_Animator *animator;
Eio_Monitor *edj_monitor;
Ecore_Event_Handler *monitor_event;
Ecore_Event_Handler *exe_del_event;
@@ -54,12 +54,12 @@ view_obj_min_update(view_data *vd)
}
static Eina_Bool
-file_set_timer_cb(void *data)
+file_set_animator_cb(void *data)
{
view_data *vd = data;
if (!vd-layout)
{
-vd-timer = NULL;
+vd-animator = NULL;
return ECORE_CALLBACK_CANCEL;
}
@@ -68,7 +68,7 @@ file_set_timer_cb(void *data)
eio_monitor_del(vd-edj_monitor);
vd-edj_monitor = eio_monitor_add(build_edj_path_get());
if (!vd-edj_monitor) EINA_LOG_ERR(Failed to add Eio_Monitor);
-vd-timer = NULL;
+vd-animator = NULL;
return ECORE_CALLBACK_CANCEL;
}
@@ -278,7 +278,7 @@ view_obj_create(view_data *vd, const char *file_path, const
char *group)
if (!edje_object_file_set(layout, file_path, group))
{
//FIXME: more optimized way?
-vd-timer = ecore_timer_add(1, file_set_timer_cb, vd);
+vd-animator = ecore_animator_add(file_set_animator_cb, vd);
}
else
{
@@ -406,7 +406,7 @@ view_term(view_data *vd)
part_obj_del_cb);
evas_object_del(vd-scroller);
ecore_idler_del(vd-idler);
- ecore_timer_del(vd-timer);
+ ecore_animator_del(vd-animator);
eio_monitor_del(vd-edj_monitor);
ecore_event_handler_del(vd-monitor_event);
ecore_event_handler_del(vd-exe_del_event);
--
[EGIT] [tools/enventor] master 01/01: eo: sync with eolian syntax changes.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=a81a0d23ee29f37338e142de6acc755a1542fd97
commit a81a0d23ee29f37338e142de6acc755a1542fd97
Author: ChunEon Park her...@hermet.pe.kr
Date: Sun May 24 18:18:12 2015 +0900
eo: sync with eolian syntax changes.
---
src/lib/enventor_object.eo | 98 +++---
src/lib/enventor_smart.c | 6 ++-
2 files changed, 53 insertions(+), 51 deletions(-)
diff --git a/src/lib/enventor_object.eo b/src/lib/enventor_object.eo
index 114f85d..0b3a8a2 100644
--- a/src/lib/enventor_object.eo
+++ b/src/lib/enventor_object.eo
@@ -18,7 +18,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@ingroup Enventor */
}
values {
-Eina_Bool part_highlight; /*@ ... */
+part_highlight: bool; /*@ ... */
}
}
@property live_view_scale {
@@ -38,7 +38,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@ingroup Enventor */
}
values {
-double scale; /*@ ... */
+scale: double; /*@ ... */
}
}
@property dummy_swallow {
@@ -58,7 +58,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@ingroup Enventor */
}
values {
-Eina_Bool dummy_swallow; /*@ ... */
+dummy_swallow: bool; /*@ ... */
}
}
@property auto_complete {
@@ -78,7 +78,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@ingroup Enventor */
}
values {
-Eina_Bool auto_complete; /*@ ... */
+auto_complete: bool; /*@ ... */
}
}
@property auto_indent {
@@ -98,7 +98,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@ingroup Enventor */
}
values {
-Eina_Bool auto_indent; /*@ ... */
+auto_indent: bool; /*@ ... */
}
}
@property ctxpopup {
@@ -118,9 +118,9 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@ingroup Enventor */
}
values {
-Eina_Bool ctxpopup; /*@ ... */
+ctxpopup: bool; /*@ ... */
}
- }
+ }
@property focus {
set {
/*@
@@ -138,7 +138,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@ingroup Enventor */
}
values {
-Eina_Bool focus; /*@ ... */
+focus: bool; /*@ ... */
}
}
@property modified {
@@ -158,7 +158,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@ingroup Enventor */
}
values {
-Eina_Bool modified; /*@ ... */
+modified: bool; /*@ ... */
}
}
@property font_scale {
@@ -178,7 +178,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@ingroup Enventor */
}
values {
-double font_scale; /*@ ... */
+font_scale: double; /*@ ... */
}
}
@property linenumber {
@@ -198,7 +198,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@ingroup Enventor */
}
values {
-bool linenumber; /*@ ... */
+linenumber: bool; /*@ ... */
}
}
path_set {
@@ -210,8 +210,8 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@ingroup Enventor */
return: Eina_Bool;
params {
-@in Enventor_Path_Type type; /*@ ... */
-@in const(Eina_List) *pathes; /*@ ... */
+@in type: Enventor_Path_Type; /*@ ... */
+@in pathes: const(Eina_List) *; /*@ ... */
}
}
path_get {
@@ -223,7 +223,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@ingroup Enventor */
return: const(Eina_List) *;
params {
-@in Enventor_Path_Type type; /*@ ... */
+@in type: Enventor_Path_Type; /*@ ... */
}
}
max_line_get {
@@ -251,7 +251,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@see
@ingroup Enventor */
params {
-@in const(char) *text; /*@ ... */
+@in text: const(char) *; /*@ ... */
}
}
selection_get {
@@ -280,7 +280,7 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@see
@ingroup Enventor */
params {
-@in int position; /*@ ... */
+@in position: int; /*@ ... */
}
}
select_none {
@@ -297,8 +297,8 @@ class Enventor.Object (Elm.Widget, Efl.File) {
@see
@ingroup Enventor */
params {
-@in int start; /*@ ... */
-@in int end; /*@ ... */
+@in start: int; /*@ ... */
+@in end: int; /*@ ... */
}
}
line_delete {
@@ -315,9 +315,9 @@ class Enventor.Object
[EGIT] [tools/enventor] master 02/02: auto_comp: fix build break.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=b59cc1022d33606e428e1a18d4b6e3e27693fbe1
commit b59cc1022d33606e428e1a18d4b6e3e27693fbe1
Author: ChunEon Park her...@hermet.pe.kr
Date: Sun May 24 18:16:30 2015 +0900
auto_comp: fix build break.
there were typo that caused build break.
---
src/lib/auto_comp_code.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lib/auto_comp_code.h b/src/lib/auto_comp_code.h
index 88d2cd2..2f81fac 100644
--- a/src/lib/auto_comp_code.h
+++ b/src/lib/auto_comp_code.h
@@ -55,8 +55,8 @@ const char *AUTOCOMP_TYPE[AUTOCOMP_TYPE_LINE_CNT] =
type: IMAGE;,
};
-#define AUTOCOMP_TYPE_PRECISE_IS_INSIDE_CNT 1
-const char *AUTOCOMP_TYPE[AUTOCOMP_TYPE_PRECISE_IS_INSIDE_CNT] =
+#define AUTOCOMP_PRECISE_IS_INSIDE_LINE_CNT 1
+const char *AUTOCOMP_PRECISE_IS_INSIDE[AUTOCOMP_PRECISE_IS_INSIDE_LINE_CNT] =
{
precise_is_inside: ;,
};
--
[EGIT] [tools/enventor] master 01/01: auto_comp: fix missing precise_is_inside.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=118e86e0dda6180958e41219124c59cbdaa622d8 commit 118e86e0dda6180958e41219124c59cbdaa622d8 Author: ChunEon Park her...@hermet.pe.kr Date: Mon May 25 02:27:55 2015 +0900 auto_comp: fix missing precise_is_inside. --- src/lib/auto_comp.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/auto_comp.c b/src/lib/auto_comp.c index 816c9fd..9d87687 100644 --- a/src/lib/auto_comp.c +++ b/src/lib/auto_comp.c @@ -118,6 +118,7 @@ init_thread_cb(void *data, Ecore_Thread *thread EINA_UNUSED) COMPDATA_SET(ad, layout,AUTOCOMP_LAYOUT, 2, 0); COMPDATA_SET(ad, padding,AUTOCOMP_PADDING, 1, 0); COMPDATA_SET(ad, position, AUTOCOMP_POSITION, 1, 0); + COMPDATA_SET(ad, precise_is_inside, AUTOCOMP_PRECISE_IS_INSIDE, 1, 0); COMPDATA_SET(ad, prefer, AUTOCOMP_PREFER, 1, 0); COMPDATA_SET(ad, smooth, AUTOCOMP_SMOOTH, 1, 0); COMPDATA_SET(ad, span, AUTOCOMP_SPAN, 1, 0); --
[EGIT] [core/elementary] master 01/01: prefs: add empty field to avoid build warning.
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=d2270809299e7c0b3dfb669f753484be9c100362
commit d2270809299e7c0b3dfb669f753484be9c100362
Author: ChunEon Park her...@hermet.pe.kr
Date: Mon Aug 3 13:56:01 2015 +0900
prefs: add empty field to avoid build warning.
this addition is a trick to avoid g/gcc compile warning.
warning: empty struct has size 0 in C, size 1 in C++.
---
src/lib/elm_prefs_common.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/lib/elm_prefs_common.h b/src/lib/elm_prefs_common.h
index 3ebe9e2..8552fbf 100644
--- a/src/lib/elm_prefs_common.h
+++ b/src/lib/elm_prefs_common.h
@@ -32,6 +32,7 @@ EAPI Evas_Object *elm_prefs_add(Evas_Object *parent);
typedef struct _Elm_Prefs_Item_Spec_Void Elm_Prefs_Item_Spec_Void;
struct _Elm_Prefs_Item_Spec_Void
{
+ int:0; //Trick for removing warning (warning: empty struct has size 0 in
C, size 1 in C++)
};
typedef struct _Elm_Prefs_Item_Spec_Bool Elm_Prefs_Item_Spec_Bool;
--
[EGIT] [tools/enventor] master 01/01: fix win32 porting.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=072bba3dc10cae6c58264fd48bf1a9cdd1aec431 commit 072bba3dc10cae6c58264fd48bf1a9cdd1aec431 Author: ChunEon Park her...@hermet.pe.kr Date: Thu Aug 20 11:03:46 2015 +0900 fix win32 porting. specify missing dll import/export declarations for EAPIs. --- src/lib/enventor_private.h | 19 +++ 1 file changed, 19 insertions(+) diff --git a/src/lib/enventor_private.h b/src/lib/enventor_private.h index 1b37811..82638a8 100644 --- a/src/lib/enventor_private.h +++ b/src/lib/enventor_private.h @@ -1,6 +1,25 @@ #ifndef __ENVENTOR_PRIVATE_H__ #define __ENVENTOR_PRIVATE_H__ +/*** + * Compatible ABI for Win32 + ***/ +#ifdef _WIN32 +# ifdef EAPI +# undef EAPI +# endif +# ifdef ENVENTOR_WIN32_BUILD_SUPPORT +# define EAPI __declspec(dllexport) +# else +# define EAPI __declspec(dllimport) +# endif +# ifdef EOAPI +# undef EOAPI +# endif +#define EOAPI EAPI +#endif + + #include common.h #define QUOT quot; --
[EGIT] [core/efl] master 01/01: evil: fix incorrect function call.
hermet pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=024812c1a76286991f292c3191936778ec219ff8
commit 024812c1a76286991f292c3191936778ec219ff8
Author: ChunEon Park her...@hermet.pe.kr
Date: Thu Aug 20 14:25:15 2015 +0900
evil: fix incorrect function call.
_localtime64_s() requires _time64_t as one argument but here we passes
time_s.
Proper api is localtime_s().
---
src/lib/evil/evil_time.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/evil/evil_time.c b/src/lib/evil/evil_time.c
index 9e6fd5c..6964654 100644
--- a/src/lib/evil/evil_time.c
+++ b/src/lib/evil/evil_time.c
@@ -13,7 +13,7 @@
struct tm *
evil_localtime_r(const time_t *timep, struct tm *result)
{
- _localtime64_s(result, timep);
+ localtime_s(result, timep);
return result;
}
--
[EGIT] [core/efl] master 01/01: evil: add missing since
hermet pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=12b4e371acf96be29dfe2527638d32eb5b1041d6 commit 12b4e371acf96be29dfe2527638d32eb5b1041d6 Author: ChunEon Park her...@hermet.pe.kr Date: Sat Aug 22 16:01:45 2015 +0900 evil: add missing since --- src/lib/evil/evil_string.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/evil/evil_string.h b/src/lib/evil/evil_string.h index 372a4e4..6de66e9 100644 --- a/src/lib/evil/evil_string.h +++ b/src/lib/evil/evil_string.h @@ -32,6 +32,8 @@ * Conformity: BSD * * Supported OS: Windows XP. + * + * @since 1.13 */ EAPI char *strndup(const char *str, size_t n); --
