[EGIT] [core/efl] master 01/01: Eo base: Make object del event @hot.
tasn pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=6721a7f1d6ccc3dec929683d4ecb724c2a1a0dd5
commit 6721a7f1d6ccc3dec929683d4ecb724c2a1a0dd5
Author: Tom Hacohen
Date: Wed Feb 3 09:15:04 2016 +
Eo base: Make object del event @hot.
This event also needs to be hot, because it's lifecycle related.
We could leak and etc. if this event is not hot.
@fix.
---
src/lib/eo/eo_base.eo | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/eo/eo_base.eo b/src/lib/eo/eo_base.eo
index 18f780a..7695208 100644
--- a/src/lib/eo/eo_base.eo
+++ b/src/lib/eo/eo_base.eo
@@ -291,6 +291,6 @@ abstract Eo.Base ()
events {
callback,add @hot; [[A callback was added.]]
callback,del @hot; [[A callback was deleted.]]
- del; [[Obj is being deleted.]]
+ del @hot; [[Obj is being deleted.]]
}
}
--
[EGIT] [core/efl] master 01/01: Evas textgrid: Use default language according to locale
tasn pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=757f8429922f0f5bbb4ae503a2bac643f42c4195
commit 757f8429922f0f5bbb4ae503a2bac643f42c4195
Author: Youngbok Shin
Date: Wed Feb 3 09:34:32 2016 +
Evas textgrid: Use default language according to locale
Summary:
Use default language according to locale.
It's the same as the recent changes on Evas Text, Textblock.
@feature
Test Plan: N/A
Reviewers: herdsman, raster, tasn
Subscribers: cedric, jpeg
Differential Revision: https://phab.enlightenment.org/D3642
---
src/lib/evas/canvas/evas_object_textgrid.c | 4
1 file changed, 4 insertions(+)
diff --git a/src/lib/evas/canvas/evas_object_textgrid.c
b/src/lib/evas/canvas/evas_object_textgrid.c
index 0e10f3c..7aa7216 100644
--- a/src/lib/evas/canvas/evas_object_textgrid.c
+++ b/src/lib/evas/canvas/evas_object_textgrid.c
@@ -1157,6 +1157,10 @@ _evas_textgrid_efl_text_properties_font_set(Eo *eo_obj,
Evas_Textgrid_Data *o, c
evas_object_async_block(obj);
font_description = evas_font_desc_new();
+
+ /* Set default language according to locale. */
+ eina_stringshare_replace(&(font_description->lang),
+evas_font_lang_normalize("auto"));
evas_font_name_parse(font_description, font_name);
if (o->cur.font_description &&
!evas_font_desc_cmp(font_description, o->cur.font_description) &&
--
[EGIT] [core/elementary] master 01/01: calendar.edc: fix typo in text style
furrymyad pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=ce1edd404b8468d34e68461d96c4b0e978e453ba
commit ce1edd404b8468d34e68461d96c4b0e978e453ba
Author: Vitalii Vorobiov
Date: Wed Feb 3 12:13:49 2016 +
calendar.edc: fix typo in text style
@fix
---
data/themes/edc/elm/calendar.edc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/themes/edc/elm/calendar.edc b/data/themes/edc/elm/calendar.edc
index 5ba602a..9ce4353 100644
--- a/data/themes/edc/elm/calendar.edc
+++ b/data/themes/edc/elm/calendar.edc
@@ -9,7 +9,7 @@
base: "font="FN" font_size=10 color=#3399ff style=glow
glow_color=#3399ff18 align=center text_class=calendar_day_text_today
color_class=calendar_day_text_today";\
}\
style { name: "calendar_date_disabled_style";\
- base: "font="FN" font_size=10 color=#151515 style=shadow_bottom
shadow_color=#ffc0 align=center text_class=calendar_day_text_disabled
text_class=calendar_day_text_disabled";\
+ base: "font="FN" font_size=10 color=#151515 style=shadow,bottom
shadow_color=#ffc0 align=center text_class=calendar_day_text_disabled
text_class=calendar_day_text_disabled";\
}\
#define CAL_SPIN(_sufix, _text, _relative)\
--
[EGIT] [core/elementary] elementary-1.16 01/01: calendar.edc: fix typo in text style
furrymyad pushed a commit to branch elementary-1.16.
http://git.enlightenment.org/core/elementary.git/commit/?id=9fe33f1db5be4e15746f5717ba7af2b593a06078
commit 9fe33f1db5be4e15746f5717ba7af2b593a06078
Author: Vitalii Vorobiov
Date: Wed Feb 3 12:18:28 2016 +
calendar.edc: fix typo in text style
@fix
---
data/themes/edc/elm/calendar.edc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/data/themes/edc/elm/calendar.edc b/data/themes/edc/elm/calendar.edc
index 35a0367..48a7163 100644
--- a/data/themes/edc/elm/calendar.edc
+++ b/data/themes/edc/elm/calendar.edc
@@ -9,7 +9,7 @@
base: "font="FN" font_size=10 color=#3399ff style=glow
glow_color=#3399ff18 align=center";\
}\
style { name: "calendar_date_disabled_style";\
- base: "font="FN" font_size=10 color=#151515 style=shadow_bottom
shadow_color=#ffc0 align=center";\
+ base: "font="FN" font_size=10 color=#151515 style=shadow,bottom
shadow_color=#ffc0 align=center";\
}\
#define CAL_SPIN(_sufix, _signal_sufix, _text, _relative)\
--
[EGIT] [core/efl] master 01/01: Efl: Fixup ref in eo file that I forgot to commit
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=10de442a0059a1aa11bc44ffcbe67aa2bd81ae9d
commit 10de442a0059a1aa11bc44ffcbe67aa2bd81ae9d
Author: Jean-Philippe Andre
Date: Wed Feb 3 20:13:46 2016 +0900
Efl: Fixup ref in eo file that I forgot to commit
---
src/lib/efl/interfaces/efl_gfx_types.eot | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/lib/efl/interfaces/efl_gfx_types.eot
b/src/lib/efl/interfaces/efl_gfx_types.eot
index 99d86c1..2f98951 100644
--- a/src/lib/efl/interfaces/efl_gfx_types.eot
+++ b/src/lib/efl/interfaces/efl_gfx_types.eot
@@ -106,7 +106,7 @@ struct Efl.Gfx.Gradient.Stop
struct Efl.Gfx.Stroke_Color
{
- [[Internal structure for @ref Efl.Gfx.Stroke.]]
+ [[Internal structure for @Efl.Gfx.Stroke.]]
r: int;
g: int;
b: int;
--
[EGIT] [core/efl] master 01/01: Efl: Eo-ify remaining Efl.Gfx enums and structs
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=1ac79c3b13277c649a211dc80dd1f571c9327db2
commit 1ac79c3b13277c649a211dc80dd1f571c9327db2
Author: Jean-Philippe Andre
Date: Wed Feb 3 18:23:45 2016 +0900
Efl: Eo-ify remaining Efl.Gfx enums and structs
---
src/Makefile_Efl.am | 12 ++-
src/lib/efl/Efl.h| 137 ++-
src/lib/efl/interfaces/efl_gfx_base.eo | 27 +-
src/lib/efl/interfaces/efl_gfx_types.eot | 135 ++
4 files changed, 153 insertions(+), 158 deletions(-)
diff --git a/src/Makefile_Efl.am b/src/Makefile_Efl.am
index c055257..4b6f6c0 100644
--- a/src/Makefile_Efl.am
+++ b/src/Makefile_Efl.am
@@ -23,7 +23,12 @@ efl_eolian_files = \
$(efl_eolian_legacy_files) \
$(NULL)
-efl_eolian_files_h = $(efl_eolian_files:%.eo=%.eo.h)
+efl_eolian_type_files = \
+ lib/efl/interfaces/efl_gfx_types.eot \
+ $(NULL)
+
+efl_eolian_files_h = $(efl_eolian_files:%.eo=%.eo.h) \
+ $(efl_eolian_type_files:%.eot=%.eot.h)
efl_eolian_files_c = $(efl_eolian_files:%.eo=%.eo.c)
efl_eolian_legacy_files_h = $(efl_eolian_legacy_files:%.eo=%.eo.legacy.h)
@@ -40,10 +45,11 @@ CLEANFILES += \
EXTRA_DIST += \
lib/efl/Efl_Config.h \
lib/efl/Efl.h \
- $(efl_eolian_files)
+ $(efl_eolian_files) \
+ $(efl_eolian_type_files)
efleolianfilesdir = $(datadir)/eolian/include/efl-@VMAJ@
-efleolianfiles_DATA = $(efl_eolian_files)
+efleolianfiles_DATA = $(efl_eolian_files) $(efl_eolian_type_files)
lib_LTLIBRARIES += lib/efl/libefl.la
diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h
index b8bc51d..b45b791 100644
--- a/src/lib/efl/Efl.h
+++ b/src/lib/efl/Efl.h
@@ -33,140 +33,16 @@ extern "C" {
# endif
#endif /* ! _WIN32 */
-/**
- * These values determine how the points are interpreted in a stream of points.
- *
- * @since 1.14
- */
-typedef enum _Efl_Gfx_Path_Command
-{
- EFL_GFX_PATH_COMMAND_TYPE_END = 0, /**< The end of stream , no more points
to process. */
- EFL_GFX_PATH_COMMAND_TYPE_MOVE_TO, /**< The next point is the start point of
a sub path */
- EFL_GFX_PATH_COMMAND_TYPE_LINE_TO, /**< The next point is used to draw a
line from current point */
- EFL_GFX_PATH_COMMAND_TYPE_CUBIC_TO, /**< The next three point is used to
draw a cubic bezier curve from current point */
- EFL_GFX_PATH_COMMAND_TYPE_CLOSE, /**< Close the curent subpath by drawing a
line between current point and the first point of current subpath */
- EFL_GFX_PATH_COMMAND_TYPE_LAST, /**< Not a valid command, but last one
according to this version header */
-} Efl_Gfx_Path_Command;
-
-/**
- * Type describing dash
- *
- * @see efl_gfx_shape_stroke_dash_set()
- *
- * @since 1.14
- */
-typedef struct _Efl_Gfx_Dash Efl_Gfx_Dash;
-struct _Efl_Gfx_Dash
-{
- double length; /**< dash drawing length */
- double gap; /**< distance bettwen two dashes */
-};
-
-/**
- * These values determine how the end of opened sub-paths are rendered in a
- * stroke.
- *
- * @see efl_gfx_shape_stroke_cap_set()
- *
- * @since 1.14
- */
-typedef enum _Efl_Gfx_Cap
-{
- EFL_GFX_CAP_BUTT = 0, /**< The end of lines is rendered as a full stop on
the last point itself */
- EFL_GFX_CAP_ROUND, /**< The end of lines is rendered as a half-circle around
the last point */
- EFL_GFX_CAP_SQUARE, /**< The end of lines is rendered as a square around the
last point */
- EFL_GFX_CAP_LAST /**< End of enum value */
-} Efl_Gfx_Cap;
-
-/**
- * These values determine how two joining lines are rendered in a stroker.
- *
- * @see efl_gfx_shape_stroke_join_set()
- *
- * @since 1.14
- */
-typedef enum _Efl_Gfx_Join
-{
- EFL_GFX_JOIN_MITER = 0, /**< Used to render rounded line joins. Circular
arcs are used to join two lines smoothly. */
- EFL_GFX_JOIN_ROUND, /**< Used to render beveled line joins. The outer corner
of the joined lines is filled by enclosing the triangular region of the corner
with a straight line between the outer corners of each stroke. */
- EFL_GFX_JOIN_BEVEL, /**< Used to render mitered line joins. The intersection
of the strokes is clipped at a line perpendicular to the bisector of the angle
between the strokes, at the distance from the intersection of the segments
equal to the product of the miter limit value and the border radius. This
prevents long spikes being created. */
- EFL_GFX_JOIN_LAST /**< End of enum value */
-} Efl_Gfx_Join;
-
-/**
- * Type defining gradient stop.
- * @note Describe the location and color of a transition point in a gradient.
- * @since 1.14
- */
-typedef struct _Efl_Gfx_Gradient_Stop Efl_Gfx_Gradient_Stop;
-struct _Efl_Gfx_Gradient_Stop
-{
- double offset; /**< The location of the gradient stop within the gradient
vector*/
- int r; /**< The component R color of the gradient stop */
- int g; /**< The component G color of the gradient stop */
- int b; /**< The component B color of the graident stop */
-
[EGIT] [bindings/python/python-efl] master 01/03: Elm.MultiButtonEntry: Correct documentation
kuuko pushed a commit to branch master. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=ba7bf818d88d3331781b055622842ef4a3943d7d commit ba7bf818d88d3331781b055622842ef4a3943d7d Author: Kai Huuhko Date: Wed Feb 3 11:05:31 2016 +0200 Elm.MultiButtonEntry: Correct documentation --- efl/elementary/multibuttonentry.pxi | 92 +++-- 1 file changed, 78 insertions(+), 14 deletions(-) diff --git a/efl/elementary/multibuttonentry.pxi b/efl/elementary/multibuttonentry.pxi index 8c6e272..56e5329 100644 --- a/efl/elementary/multibuttonentry.pxi +++ b/efl/elementary/multibuttonentry.pxi @@ -163,6 +163,11 @@ cdef class MultiButtonEntryItem(ObjectItem): return self property selected: +"""Control the selected state of an item + +:type: bool + +""" def __get__(self): return bool(elm_multibuttonentry_item_selected_get(self.item)) @@ -175,6 +180,11 @@ cdef class MultiButtonEntryItem(ObjectItem): return bool(elm_multibuttonentry_item_selected_get(self.item)) property prev: +"""Get the previous item in the multibuttonentry + +:type: :class:`MultiButtonEntryItem` + +""" def __get__(self): return _object_item_to_python(elm_multibuttonentry_item_prev_get(self.item)) @@ -182,6 +192,11 @@ cdef class MultiButtonEntryItem(ObjectItem): return _object_item_to_python(elm_multibuttonentry_item_prev_get(self.item)) property next: +"""Get the next item in the multibuttonentry + +:type: :class:`MultiButtonEntryItem` + +""" def __get__(self): return _object_item_to_python(elm_multibuttonentry_item_next_get(self.item)) @@ -239,8 +254,11 @@ cdef class MultiButtonEntry(Object): property expanded: """Control the multibuttonentry to expanded state. -In expanded state, the complete entry will be displayed. -Otherwise, only single line of the entry will be displayed. +In expanded state the entry widget expands to accommodate all items. +Otherwise a single line of items will be displayed with a counter for +items that don't fit the line. + +.. seealso:: :meth:`format_function_set` :type: bool @@ -257,6 +275,16 @@ cdef class MultiButtonEntry(Object): return bool(elm_multibuttonentry_expanded_get(self.obj)) def item_prepend(self, label, func = None, *args, **kwargs): +"""Prepend a new item to the multibuttonentry + +:param string label: The label of new item +:param func: The callback function to be invoked when this item is pressed. +:param \*args: The data to be attached for callback +:param \*\*kwargs: The data to be attached for callback + +:return: :class:`MultiButtonEntryItem` + +""" cdef: Elm_Object_Item *item Evas_Smart_Cb cb = NULL @@ -281,6 +309,16 @@ cdef class MultiButtonEntry(Object): return None def item_append(self, label, func = None, *args, **kwargs): +"""Append a new item to the multibuttonentry + +:param string label: The label of new item +:param func: The callback function to be invoked when this item is pressed. +:param \*args: The data to be attached for callback +:param \*\*kwargs: The data to be attached for callback + +:return: :class:`MultiButtonEntryItem` + +""" cdef: Elm_Object_Item *item Evas_Smart_Cb cb = NULL @@ -305,6 +343,17 @@ cdef class MultiButtonEntry(Object): return None def item_insert_before(self, MultiButtonEntryItem before, label, func = None, *args, **kwargs): +"""Add a new item to the multibuttonentry before the indicated object + +:param MultiButtonEntryItem before: The item before which to add it +:param string label: The label of new item +:param func: The callback function to be invoked when this item is pressed. +:param \*args: The data to be attached for callback +:param \*\*kwargs: The data to be attached for callback + +:return: :class:`MultiButtonEntryItem` + +""" cdef: Elm_Object_Item *item Evas_Smart_Cb cb = NULL @@ -330,6 +379,17 @@ cdef class MultiButtonEntry(Object): return None def item_insert_after(self, MultiButtonEntryItem after, label, func = None, *args, **kwargs): +"""Add a new item to the multibuttonentry after the indicated object + +:param MultiButtonEntryItem before: The item after which to add it +:param string label: The label of new item +:param func: The callback function to be invoked when this item is pressed. +:param \*args: The data to be attached for callback +:param \*\*kwargs: The data to be attached for callback + +:return: :cla
[EGIT] [bindings/python/python-efl] master 03/03: Update TODO
kuuko pushed a commit to branch master. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=9a3d441f1c5a7bdf13d95af53062991bc8a0e009 commit 9a3d441f1c5a7bdf13d95af53062991bc8a0e009 Author: Kai Huuhko Date: Wed Feb 3 11:08:39 2016 +0200 Update TODO --- TODO | 11 +-- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/TODO b/TODO index 3a1396e..52d63a4 100644 --- a/TODO +++ b/TODO @@ -3,15 +3,7 @@ BUGS * EdjeEdit: PartState API does not work * Elm.Map: overlays_show segfaults, scrollers in examples are jumpy -* Genlist: "filter,done" event is not always fired (see the genlist_filter.py test) -* Elementary: when we use custom function callbacks we usually leak some -reference around, some examples: -- Fileselector.custom_filter_append() -- Multibuttonentry.format_function_set() -- Multibuttonentry.filter_append() -- Multibuttonentry.filterprepend() - ... maybe do like is done in genlist filter_set() ?? -* API break in https://git.enlightenment.org/bindings/python/python-efl.git/commit/efl/elementary/label.pyx?id=9be98bb979917932cc2850a54f6e79281c871401 , find out if it had users anywhere, remove if not +* Genlist: "filter,done" event is sometimes fired before filter callbacks are done (see the genlist_filter.py test) Failing unit tests -- @@ -32,7 +24,6 @@ TODO Elm --- -* Drag-n-Drop * Automate compilation of the example edje files. * Add more examples * Prefs (only supports simple types, not so great for us) --
[EGIT] [bindings/python/python-efl] master 02/03: Elm.Genlist: Add small optimizations for filter and state cbs
kuuko pushed a commit to branch master. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=d5656fdd3d2abc7e8a1503ecebd915dce819c588 commit d5656fdd3d2abc7e8a1503ecebd915dce819c588 Author: Kai Huuhko Date: Wed Feb 3 11:07:27 2016 +0200 Elm.Genlist: Add small optimizations for filter and state cbs --- efl/elementary/genlist.pxi | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/efl/elementary/genlist.pxi b/efl/elementary/genlist.pxi index d395297..2a2d78f 100644 --- a/efl/elementary/genlist.pxi +++ b/efl/elementary/genlist.pxi @@ -66,6 +66,8 @@ cdef Eina_Bool _py_elm_genlist_item_state_get(void *data, Evas_Object *obj, cons cdef: GenlistItem item = data unicode u = _ctouni(part) +bint ret +Genlist o func = item.item_class._state_get_func if func is None: @@ -78,12 +80,14 @@ cdef Eina_Bool _py_elm_genlist_item_state_get(void *data, Evas_Object *obj, cons traceback.print_exc() return 0 -return ret if ret is not None else 0 +return ret cdef Eina_Bool _py_elm_genlist_item_filter_get(void *data, Evas_Object *obj, void *key) with gil: cdef: GenlistItem item = data object pykey = key +bint ret +Genlist o func = item.item_class._filter_get_func if func is None: @@ -96,7 +100,7 @@ cdef Eina_Bool _py_elm_genlist_item_filter_get(void *data, Evas_Object *obj, voi traceback.print_exc() return 0 -return 1 if ret else 0 +return ret cdef void _py_elm_genlist_object_item_del(void *data, Evas_Object *obj) with gil: cdef GenlistItem item = data --
[EGIT] [tools/eflete] master 03/28: fix clang warning: equality comparison with extraneous parentheses
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=d7d83515c0bd9797d206f870074047b8c3bd364f
commit d7d83515c0bd9797d206f870074047b8c3bd364f
Author: Andrii Kroitor
Date: Tue Feb 2 15:20:49 2016 +0200
fix clang warning: equality comparison with extraneous parentheses
---
src/bin/ui/group_navigator.c | 6 +++---
src/bin/ui/workspace/groupedit_calc.c | 4 ++--
src/bin/ui/workspace/workspace.c | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/bin/ui/group_navigator.c b/src/bin/ui/group_navigator.c
index f62c139..6f5a385 100644
--- a/src/bin/ui/group_navigator.c
+++ b/src/bin/ui/group_navigator.c
@@ -549,7 +549,7 @@ _selected_cb(void *data,
else
elm_object_disabled_set(pl->btn_down, false);
}
-else if ((itc == pl->itc_item))
+else if (itc == pl->itc_item)
{
if
(elm_genlist_item_item_class_get(elm_genlist_item_prev_get(glit)) ==
pl->itc_item)
elm_object_disabled_set(pl->btn_up, false);
@@ -1400,9 +1400,9 @@ _on_btn_minus_clicked(void *data,
_part_del(pl, glit);
else if ((itc == pl->itc_state_selected) || (itc == pl->itc_state))
_state_del(pl, glit);
- else if ((itc == pl->itc_item))
+ else if (itc == pl->itc_item)
_item_del(pl, glit);
- else if ((itc == pl->itc_program))
+ else if (itc == pl->itc_program)
_program_del(pl, glit);
TODO("Check if we still need this")
diff --git a/src/bin/ui/workspace/groupedit_calc.c
b/src/bin/ui/workspace/groupedit_calc.c
index d7d765b..c12dd7d 100644
--- a/src/bin/ui/workspace/groupedit_calc.c
+++ b/src/bin/ui/workspace/groupedit_calc.c
@@ -180,7 +180,7 @@ _parts_list_find(Eina_List *parts, const char *part)
EINA_LIST_FOREACH(parts, l, gp)
{
-if ((gp->part->name == part))
+if (gp->part->name == part)
return gp;
}
return NULL;
@@ -199,7 +199,7 @@ _part_item_search(Eina_List *items, const char *item_name)
{
/* we are sure that all strings are stringshare, and for compare two
* strings enough compare they pointers */
-if ((item->name == item_name))
+if (item->name == item_name)
return item;
}
return NULL;
diff --git a/src/bin/ui/workspace/workspace.c b/src/bin/ui/workspace/workspace.c
index 4413f45..4c4dbdd 100644
--- a/src/bin/ui/workspace/workspace.c
+++ b/src/bin/ui/workspace/workspace.c
@@ -956,7 +956,7 @@ _mode_changed(void *data,
/* delete all object besides groupedit, because all these objects we created
* on mode chage. It's do for create, alwayes actual and correct object, and
* eliminates from updates, like live_view update mehanism. So, Profit! */
- if ((sd->active_mode == MODE_NORMAL)/* || (sd->active_mode ==
MODE_SEPARATE) */)
+ if (sd->active_mode == MODE_NORMAL/* || (sd->active_mode == MODE_SEPARATE)
*/)
evas_object_hide(sd->groupedit);
else
evas_object_del(sd->demo_object);
--
[EGIT] [tools/eflete] master 12/28: gengrid.edc: update TEXT part names
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=ae9e75d1448090223f0b8c42d4bf8181a94bb2c2
commit ae9e75d1448090223f0b8c42d4bf8181a94bb2c2
Author: Vyacheslav Reutskiy
Date: Tue Feb 2 10:23:48 2016 +0200
gengrid.edc: update TEXT part names
Change-Id: I667225f47d5f7f2d61555958ef3bd39f0c500c17
---
data/themes/default/widgets/gengrid.edc | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/data/themes/default/widgets/gengrid.edc
b/data/themes/default/widgets/gengrid.edc
index d5ad11e..e02cd7c 100644
--- a/data/themes/default/widgets/gengrid.edc
+++ b/data/themes/default/widgets/gengrid.edc
@@ -240,7 +240,7 @@ group { name: "elm/gengrid/item/default/default";
#define SOUND_EDITOR_HIGHLIGHT_COLOR 6 130 134 255
group { name: "elm/gengrid/item/sound_editor/default";
data.item: "contents" "elm.swallow.icon";
- data.item: "texts" "elm.label.type elm.label";
+ data.item: "texts" "elm.text elm.text.type";
images {
image: "border_1.png" COMP;
}
@@ -273,11 +273,11 @@ group { name: "elm/gengrid/item/sound_editor/default";
rel2 {
relative: 0.0 0.0;
to_x: "padding.bottom";
- to_y: "elm.label";
+ to_y: "elm.text";
}
}
}
- part { name: "elm.label.type";
+ part { name: "elm.text.type";
clip_to: "clipper";
type: TEXT;
mouse_events: 0;
@@ -304,7 +304,7 @@ group { name: "elm/gengrid/item/sound_editor/default";
rel2.to: "bg";
}
}
- part { name: "elm.label";
+ part { name: "elm.text";
type: TEXT;
mouse_events: 0;
scale: 1;
@@ -359,7 +359,7 @@ group { name: "elm/gengrid/item/sound_editor/default";
rel1.to: "bg";
rel2 {
to_x: "bg";
- to_y: "elm.label";
+ to_y: "elm.text";
relative: 1.0 0.0;
}
}
@@ -379,7 +379,7 @@ group { name: "elm/gengrid/item/sound_editor/default";
signal: "elm,state,selected";
source: "elm";
action: STATE_SET "selected" 0.0;
- target: "elm.label";
+ target: "elm.text";
target: "border";
target: "clipper";
transition: ACCELERATE 0.1;
@@ -389,7 +389,7 @@ group { name: "elm/gengrid/item/sound_editor/default";
signal: "elm,state,unselected";
source: "elm";
action: STATE_SET "default" 0.0;
- target: "elm.label";
+ target: "elm.text";
target: "border";
target: "clipper";
transition: ACCELERATE 0.2;
--
[EGIT] [tools/eflete] master 11/28: property sound: collect the pointers to attribute controls
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=3c31d256305d09db3079fc2332aee1ffe4a49c73
commit 3c31d256305d09db3079fc2332aee1ffe4a49c73
Author: Vyacheslav Reutskiy
Date: Tue Feb 2 10:21:06 2016 +0200
property sound: collect the pointers to attribute controls
It's make posible to use pointers for attribute controls and delete
the unnecessary elm_object_content_get calls.
Change-Id: I4caf4863629ee9db7390987846842592d88d5f76
---
src/bin/ui/property_sound.c | 44
1 file changed, 16 insertions(+), 28 deletions(-)
diff --git a/src/bin/ui/property_sound.c b/src/bin/ui/property_sound.c
index 907ddf5..f89c6b1 100644
--- a/src/bin/ui/property_sound.c
+++ b/src/bin/ui/property_sound.c
@@ -852,14 +852,14 @@ _sample_info_create(Evas_Object *parent, Sound_Prop_Data
*edit)
BOX_ADD(edit->info_frame, edit->sample_box, false, false);
elm_box_align_set(edit->sample_box, 0.5, 0.0);
- edit->snd_data.file_name = prop_item_label_add(edit->sample_box,
&edit->snd_data.file_name, _("file name:"), _(" - "));
- elm_box_pack_end(edit->sample_box, edit->snd_data.file_name);
- edit->snd_data.duration = prop_item_label_add(edit->sample_box,
&edit->snd_data.duration, _("duration:"), _(" - "));
- elm_box_pack_end(edit->sample_box, edit->snd_data.duration);
- edit->snd_data.type = prop_item_label_add(edit->sample_box,
&edit->snd_data.type, _("type:"), _(" - "));
- elm_box_pack_end(edit->sample_box, edit->snd_data.type);
- edit->snd_data.size = prop_item_label_add(edit->sample_box,
&edit->snd_data.size, _("size:"), _(" - "));
- elm_box_pack_end(edit->sample_box, edit->snd_data.size);
+ item = prop_item_label_add(edit->sample_box, &edit->snd_data.file_name,
_("file name:"), _(" - "));
+ elm_box_pack_end(edit->sample_box, item);
+ item = prop_item_label_add(edit->sample_box, &edit->snd_data.duration,
_("duration:"), _(" - "));
+ elm_box_pack_end(edit->sample_box, item);
+ item = prop_item_label_add(edit->sample_box, &edit->snd_data.type,
_("type:"), _(" - "));
+ elm_box_pack_end(edit->sample_box, item);
+ item = prop_item_label_add(edit->sample_box, &edit->snd_data.size,
_("size:"), _(" - "));
+ elm_box_pack_end(edit->sample_box, item);
item = prop_sound_editor_compression_type_add(edit->sample_box, edit);
elm_box_pack_end(edit->sample_box, item);
@@ -881,8 +881,8 @@ _tone_info_create(Evas_Object *parent, Sound_Prop_Data
*edit)
BOX_ADD(edit->info_frame, edit->tone_box, false, false);
elm_box_align_set(edit->tone_box, 0.5, 0.0);
- edit->snd_data.tone_name = prop_item_label_add(edit->tone_box,
&edit->snd_data.tone_name, _("name:"), _(" - "));
- elm_box_pack_end(edit->tone_box, edit->snd_data.tone_name);
+ item = prop_item_label_add(edit->tone_box, &edit->snd_data.tone_name,
_("name:"), _(" - "));
+ elm_box_pack_end(edit->tone_box, item);
item = prop_sound_editor_tone_frequency_add(edit->tone_box, edit);
elm_box_pack_end(edit->tone_box, item);
@@ -935,26 +935,14 @@ _sound_unselected(void *data,
Evas_Object *obj __UNUSED__,
void *event_info __UNUSED__)
{
- Evas_Object *item;
Sound_Prop_Data *pd = (Sound_Prop_Data *)data;
- item = elm_object_part_content_get(pd->snd_data.file_name,
"elm.swallow.content");
- elm_object_text_set(item, _("-"));
-
- item = elm_object_part_content_get(pd->snd_data.duration,
"elm.swallow.content");
- elm_object_text_set(item, _("-"));
-
- item = elm_object_part_content_get(pd->snd_data.type,
"elm.swallow.content");
- elm_object_text_set(item, _("-"));
-
- item = elm_object_part_content_get(pd->snd_data.size,
"elm.swallow.content");
- elm_object_text_set(item, _("-"));
-
- item = elm_object_part_content_get(pd->snd_data.tone_name,
"elm.swallow.content");
- elm_object_text_set(item, _("-"));
-
- item = elm_object_part_content_get(pd->snd_data.duration,
"swallow.content1");
- elm_object_text_set(item, _("-"));
+ elm_object_text_set(pd->snd_data.file_name, _("-"));
+ elm_object_text_set(pd->snd_data.duration, _("-"));
+ elm_object_text_set(pd->snd_data.type, _("-"));
+ elm_object_text_set(pd->snd_data.size, _("-"));
+ elm_object_text_set(pd->snd_data.tone_name, _("-"));
+ elm_object_text_set(pd->snd_data.duration, _("-"));
}
Evas_Object *
--
[EGIT] [tools/eflete] master 28/28: config: update the default size of left panes
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=180c3a5cf8ebc36a1e4e8ae985c634cce0de456d
commit 180c3a5cf8ebc36a1e4e8ae985c634cce0de456d
Author: Vyacheslav Reutskiy
Date: Wed Feb 3 14:03:44 2016 +0200
config: update the default size of left panes
Change-Id: I9fb116355251a71b6c68bc6b6d606544036fef37
---
src/bin/config/config.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/bin/config/config.c b/src/bin/config/config.c
index 9bfbb84..a42b42d 100644
--- a/src/bin/config/config.c
+++ b/src/bin/config/config.c
@@ -393,7 +393,7 @@ _config_default_new(void)
conf->window.y = 0;
conf->window.w = 1366;
conf->window.h = 768;
- conf->panes.left = 0.0;
+ conf->panes.left = 0.2;
conf->panes.right =1.0;
conf->panes.tabs_size =0.3;
conf->profile = strdup("default");
--
[EGIT] [tools/eflete] master 24/28: live_popup: fix possible out of bounds
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=72bcb43dcbfcd664c43eef39f084224cd1b3fe1e
commit 72bcb43dcbfcd664c43eef39f084224cd1b3fe1e
Author: Andrii Kroitor
Date: Wed Feb 3 12:12:05 2016 +0200
live_popup: fix possible out of bounds
---
src/bin/ui/live_view/elementary/live_popup.c | 9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/bin/ui/live_view/elementary/live_popup.c
b/src/bin/ui/live_view/elementary/live_popup.c
index 92551b1..e825b80 100644
--- a/src/bin/ui/live_view/elementary/live_popup.c
+++ b/src/bin/ui/live_view/elementary/live_popup.c
@@ -29,10 +29,15 @@ _on_popup_swallow_check(void *data,
Evas_Object *content;
char *pointer = NULL;
Eina_Stringshare *but_swallow = NULL, *title_swallow = NULL;
+ int num;
+ TODO("recheck this logic");
pointer = strstr(part->name, "button");
- if (pointer) but_swallow = eina_stringshare_printf("button%c",
- pointer[sizeof(pointer)
- 2]);
+ if ((pointer) && (strlen(pointer) == strlen("button") + 1))
+ {
+num = atoi(pointer + strlen("button"));
+but_swallow = eina_stringshare_printf("button%d", num);
+ }
if (!strcmp(part->name, "elm.swallow.title.icon"))
title_swallow = eina_stringshare_add("title,icon");
--
[EGIT] [tools/eflete] master 19/28: property_sound: use ecore_audio_obj_paused_set instead internal members
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=49c0d13804c9a9b2c85a75b923402c870c9703af
commit 49c0d13804c9a9b2c85a75b923402c870c9703af
Author: Vyacheslav Reutskiy
Date: Tue Feb 2 18:00:24 2016 +0200
property_sound: use ecore_audio_obj_paused_set instead internal members
Change-Id: Id54027a5354fce42827e0be279248a543b7c43bd
---
src/bin/ui/property_sound.c | 68 +++--
1 file changed, 23 insertions(+), 45 deletions(-)
diff --git a/src/bin/ui/property_sound.c b/src/bin/ui/property_sound.c
index 7d12804..2034542 100644
--- a/src/bin/ui/property_sound.c
+++ b/src/bin/ui/property_sound.c
@@ -64,7 +64,6 @@ struct _Sound_Prop_Data
const void *data;
Ecore_Audio_Vio vio;
Eo *in, *out;
- Eina_Binbuf *buf;
} io;
#endif
@@ -73,8 +72,6 @@ struct _Sound_Prop_Data
Evas_Object *rewind;
Evas_Object *play;
Evas_Object *pause;
- Eina_Bool playing : 1;
- Eina_Bool stopped : 1;
} player_data;
struct {
@@ -101,9 +98,6 @@ static const char *edje_sound_compression[] = { N_("RAW"),
static Evas_Object *
prop_sound_editor_compression_type_add(Evas_Object *property, Sound_Prop_Data
*pd);
-static void
-_interrupt_playing(Sound_Prop_Data *edit);
-
static Evas_Object *
prop_item_label_add(Evas_Object *parent,
Evas_Object **label,
@@ -240,7 +234,6 @@ _play_finished_cb(void *data,
edit->io.in = NULL;
eo_del(edit->io.out);
edit->io.out = NULL;
- edit->player_data.playing = false;
return true;
}
@@ -305,13 +298,6 @@ _tone_play(Sound_Prop_Data *edit)
assert(edit != NULL);
tone = (Tone_Resource *)edit->snd->resource;
- if (edit->player_data.stopped)
- {
-eo_do(edit->io.in, ecore_audio_obj_paused_set(false));
-ecore_timer_thaw(edit->player_data.timer);
-edit->player_data.stopped = false;
-return;
- }
if (!edit->io.in)
{
@@ -339,7 +325,6 @@ _tone_play(Sound_Prop_Data *edit)
if (value)
eo_do(edit->io.in, value = ecore_audio_obj_in_seek(value, SEEK_SET));
- edit->player_data.playing = true;
edit->player_data.timer = ecore_timer_add(UPDATE_FREQUENCY, _rewind_cb,
edit);
}
@@ -352,14 +337,6 @@ _sample_play(Sound_Prop_Data *edit)
assert(edit != NULL);
- if (edit->player_data.stopped)
- {
-eo_do(edit->io.in, ecore_audio_obj_paused_set(false));
-ecore_timer_thaw(edit->player_data.timer);
-edit->player_data.stopped = false;
-return;
- }
-
if (!edit->io.in)
{
sample = (External_Resource *)edit->snd->resource;
@@ -384,46 +361,36 @@ _sample_play(Sound_Prop_Data *edit)
if (value)
eo_do(edit->io.in, value = ecore_audio_obj_in_seek(value, SEEK_SET));
- edit->player_data.playing = true;
edit->player_data.timer = ecore_timer_add(UPDATE_FREQUENCY, _rewind_cb,
edit);
}
static void
_interrupt_playing(Sound_Prop_Data *edit)
{
+ Eina_Bool ret;
+
assert(edit != NULL);
- Eina_Bool ret;
- if (edit->player_data.playing)
+ if (!edit->io.in) return; /* case when previous sound playing is finished */
+ eo_do(edit->io.in, ret = ecore_audio_obj_paused_get());
+ if (ret)
{
eo_do(edit->io.out, ret =
ecore_audio_obj_out_input_detach(edit->io.in));
-if (!ret)
- ERR("Could not detach input");
-if (!edit->player_data.stopped)
- {
- ecore_timer_del(edit->player_data.timer);
- edit->player_data.timer = NULL;
- }
+if (!ret) ERR("Could not detach input");
+
+ecore_timer_del(edit->player_data.timer);
+edit->player_data.timer = NULL;
+
elm_object_part_content_unset(edit->sound_player,
"swallow.button.play");
evas_object_hide(edit->player_data.pause);
elm_object_part_content_set(edit->sound_player, "swallow.button.play",
edit->player_data.play);
evas_object_show(edit->player_data.play);
- }
- if (edit->io.in)
- {
+
eo_del(edit->io.in);
edit->io.in = NULL;
eo_del(edit->io.out);
edit->io.out = NULL;
}
- if (edit->io.buf)
- {
-eina_binbuf_free(edit->io.buf);
-edit->io.buf = NULL;
- }
-
- edit->player_data.stopped = false;
- edit->player_data.playing = false;
}
static void
@@ -432,9 +399,21 @@ _on_play_cb(void *data,
void *event_info EINA_UNUSED)
{
Sound_Prop_Data *edit = (Sound_Prop_Data *)data;
+ Eina_Bool paused;
assert(edit != NULL);
+ if (edit->io.in)
+ {
+eo_do(edit->io.in, paused = ecore_audio_obj_paused_get());
+if (paused)
+ {
+ eo_do(edit->io.in, ecore_audio_obj_paused_set(false));
+ ecore_timer_thaw(edit->player_data.timer);
+ return;
+ }
+ }
+
switch (edit->snd->type)
{
case SOUND_TYPE_SAMPLE:
@@ -459,7 +438
[EGIT] [tools/eflete] master 21/28: main_window: disable history tab when DEMO or editors are shown
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=fa78d913e68ebf55e1d2ea83ca01688a8085409a
commit fa78d913e68ebf55e1d2ea83ca01688a8085409a
Author: Vitalii Vorobiov
Date: Tue Feb 2 18:01:33 2016 +
main_window: disable history tab when DEMO or editors are shown
---
src/bin/eflete.h | 1 +
src/bin/ui/main_window.c | 29 +++--
2 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/src/bin/eflete.h b/src/bin/eflete.h
index 61e7f05..912b4a4 100644
--- a/src/bin/eflete.h
+++ b/src/bin/eflete.h
@@ -106,6 +106,7 @@ struct _App_Data
Evas_Object *signal_list;
Evas_Object *bottom_right;
Evas_Object *right_top, *history, *property;
+ Elm_Object_Item *item_history, *item_property;
Evas_Object *canvas;
} block;
Live_View *live_view;
diff --git a/src/bin/ui/main_window.c b/src/bin/ui/main_window.c
index bcac0f9..6acd8dc 100644
--- a/src/bin/ui/main_window.c
+++ b/src/bin/ui/main_window.c
@@ -93,6 +93,23 @@ _property_click(void *data __UNUSED__,
elm_layout_signal_emit(ap.block.right_top, "property,show", "eflete");
}
+static void
+_show_history(void *data __UNUSED__,
+ Evas_Object *obj __UNUSED__,
+ void *event_info __UNUSED__)
+{
+ elm_object_item_disabled_set(ap.block.item_history, false);
+}
+
+static void
+_hide_history(void *data __UNUSED__,
+ Evas_Object *obj __UNUSED__,
+ void *event_info __UNUSED__)
+{
+ elm_object_item_disabled_set(ap.block.item_history, true);
+ elm_toolbar_item_selected_set(ap.block.item_property, true);
+}
+
Eina_Bool
ui_main_window_add(void)
{
@@ -172,8 +189,16 @@ ui_main_window_add(void)
evas_object_size_hint_align_set(toolbar, EVAS_HINT_FILL, EVAS_HINT_FILL);
elm_toolbar_align_set(toolbar, 0.0);
- elm_toolbar_item_append(toolbar, NULL, _("Properties"), _property_click,
NULL);
- elm_toolbar_item_append(toolbar, NULL, _("History"), _history_click, NULL);
+ ap.block.item_property = elm_toolbar_item_append(toolbar, NULL,
_("Properties"), _property_click, NULL);
+ ap.block.item_history = elm_toolbar_item_append(toolbar, NULL,
_("History"), _history_click, NULL);
+ elm_object_item_disabled_set(ap.block.item_history, true);
+
+ evas_object_smart_callback_add(ap.win, SIGNAL_DIFFERENT_TAB_CLICKED,
_hide_history, NULL);
+ evas_object_smart_callback_add(ap.win, SIGNAL_IMAGE_EDITOR_TAB_CLICKED,
_hide_history, NULL);
+ evas_object_smart_callback_add(ap.win, SIGNAL_SOUND_EDITOR_TAB_CLICKED,
_hide_history, NULL);
+ evas_object_smart_callback_add(ap.win, SIGNAL_STYLE_EDITOR_TAB_CLICKED,
_hide_history, NULL);
+ evas_object_smart_callback_add(ap.win, SIGNAL_COLOR_EDITOR_TAB_CLICKED,
_hide_history, NULL);
+ evas_object_smart_callback_add(ap.win, SIGNAL_TAB_CHANGED, _show_history,
NULL);
ap.block.property = ui_property_add(ap.win);
elm_layout_content_set(ap.block.right_top, "elm.swallow.property",
ap.block.property);
--
[EGIT] [tools/eflete] master 23/28: groupedit_calc: remove unnecessaty evas_object_table_col_row_size_get calls
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=c1ef92f8893a582bc126d0af025883f2aec2f043
commit c1ef92f8893a582bc126d0af025883f2aec2f043
Author: Andrii Kroitor
Date: Wed Feb 3 11:30:27 2016 +0200
groupedit_calc: remove unnecessaty evas_object_table_col_row_size_get calls
---
src/bin/ui/workspace/groupedit_calc.c | 24 ++--
1 file changed, 10 insertions(+), 14 deletions(-)
diff --git a/src/bin/ui/workspace/groupedit_calc.c
b/src/bin/ui/workspace/groupedit_calc.c
index c12dd7d..49f20a1 100644
--- a/src/bin/ui/workspace/groupedit_calc.c
+++ b/src/bin/ui/workspace/groupedit_calc.c
@@ -263,21 +263,18 @@ _conteiner_cell_sizer_add(Ws_Groupedit_Smart_Data *sd,
Groupedit_Part *gp, const
}
static void
-_part_table_items_add(Ws_Groupedit_Smart_Data *sd, Groupedit_Part *gp,
Eina_List ***items_draw)
+_part_table_items_add(Ws_Groupedit_Smart_Data *sd, Groupedit_Part *gp,
Eina_List ***items_draw, int col, int row)
{
- const Evas_Object *table;
Evas_Object *cell, *cell_content;
Eina_List *l;
Eina_Stringshare *item_name;
- int i, j, col, row;
+ int i, j;
unsigned char span_col, span_row;
Groupedit_Item *item;
assert(gp->container != NULL);
assert(gp->items == NULL);
- table = edje_object_part_object_get(sd->group->edit_object, gp->part->name);
- evas_object_table_col_row_size_get(table, &col, &row);
evas_object_table_clear(gp->container, true);
for (i = 0; i < col; i++)
@@ -319,7 +316,7 @@ _part_table_add(Ws_Groupedit_Smart_Data *sd, Groupedit_Part
*gp)
Eina_List *l;
Eina_Stringshare *str;
- int span_c, span_r, col, row, i, j;
+ int span_c, span_r, col, row, col_pos, row_pos, i, j;
const Evas_Object *table;
Eina_List ***items_draw;
@@ -336,22 +333,21 @@ _part_table_add(Ws_Groupedit_Smart_Data *sd,
Groupedit_Part *gp)
items_draw[i] = (Eina_List **)mem_calloc(1, sizeof(Eina_List *) * row);
EINA_LIST_FOREACH(gp->part->items, l, str)
{
-col = edje_edit_part_item_position_col_get(sd->group->edit_object,
gp->part->name, str);
-row = edje_edit_part_item_position_row_get(sd->group->edit_object,
gp->part->name, str);
+col_pos = edje_edit_part_item_position_col_get(sd->group->edit_object,
gp->part->name, str);
+row_pos = edje_edit_part_item_position_row_get(sd->group->edit_object,
gp->part->name, str);
span_c = edje_edit_part_item_span_col_get(sd->group->edit_object,
gp->part->name, str);
span_r = edje_edit_part_item_span_row_get(sd->group->edit_object,
gp->part->name, str);
-if (items_draw[col][row] == (Eina_List *)-1) items_draw[col][row] =
NULL;
-items_draw[col][row] = eina_list_append(items_draw[col][row], str);
-for (i = col; i < (col + span_c); i++)
+if (items_draw[col_pos][row_pos] == (Eina_List *)-1)
items_draw[col_pos][row_pos] = NULL;
+items_draw[col_pos][row_pos] =
eina_list_append(items_draw[col_pos][row_pos], str);
+for (i = col_pos; i < (col_pos + span_c); i++)
{
- for (j = row; j < (row + span_r); j++)
+ for (j = row_pos; j < (row_pos + span_r); j++)
if (!items_draw[i][j]) items_draw[i][j] = (Eina_List *) -1;
}
}
- _part_table_items_add(sd, gp, items_draw);
+ _part_table_items_add(sd, gp, items_draw, col, row);
- evas_object_table_col_row_size_get(table, &col, &row);
for (i = 0; i < col; i++)
{
for (j = 0; j < row; j++)
--
[EGIT] [tools/eflete] master 13/28: sound editor: use the Sound_Data for communicate sound editor and property
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=632ac08f01e078457e344d39a6d05cbafba804e3
commit 632ac08f01e078457e344d39a6d05cbafba804e3
Author: Vyacheslav Reutskiy
Date: Tue Feb 2 10:25:33 2016 +0200
sound editor: use the Sound_Data for communicate sound editor and property
Change-Id: I14bf6d02589f40b9181d4a8cf7f9c637d1a34258
---
src/bin/ui/editors/sound_editor.c | 246
src/bin/ui/editors/sound_editor.h | 1 +
src/bin/ui/property_sound.c | 289 ++
3 files changed, 172 insertions(+), 364 deletions(-)
diff --git a/src/bin/ui/editors/sound_editor.c
b/src/bin/ui/editors/sound_editor.c
index 701c9f9..ae02fdd 100644
--- a/src/bin/ui/editors/sound_editor.c
+++ b/src/bin/ui/editors/sound_editor.c
@@ -54,7 +54,7 @@ struct _Sound_Editor
Elm_Validator_Regexp *tone_validator, *frq_validator;
Evas_Object *gengrid;
Evas_Object *markup;
- Elm_Object_Item *tone;
+ Elm_Object_Item *tone_header;
Search_Data sound_search_data;
Evas_Object *check;
const char *snd_src;
@@ -67,39 +67,28 @@ _grid_label_get(void *data,
Evas_Object *obj __UNUSED__,
const char *part)
{
- const Item *it = data;
- if (!part)
- return NULL;
+ Sound_Data *snd = (Sound_Data *)data;
- if (!strcmp(part, "elm.label.type"))
- return strdup(it->format);
- else
- return strdup(it->sound_name);
-}
-
-static char *
-_grid_group_label_get(void *data,
- Evas_Object *obj __UNUSED__,
- const char *part)
-{
- const Item *it = data;
- if (!part)
- return NULL;
+ if (!part) goto exit;
if (!strcmp(part, "elm.text"))
- return strdup(it->sound_name);
+ return strdup(snd->name);
+
+ if (!strcmp(part, "elm.text.type"))
+ return strdup(snd->type_label);
+exit:
return NULL;
}
static void
-_grid_del(void *data,
- Evas_Object *obj __UNUSED__)
+_grid_del(void *data, Evas_Object *obj __UNUSED__)
{
- Item *it = data;
- eina_stringshare_del(it->sound_name);
- eina_stringshare_del(it->format);
- free(it);
+ Sound_Data *snd = (Sound_Data *)data;
+
+ eina_stringshare_del(snd->name);
+ eina_stringshare_del(snd->type_label);
+ free(snd);
}
static Eina_Stringshare *
@@ -123,92 +112,68 @@ _sound_format_get(Eina_Stringshare *snd_src)
}
static void
-_grid_sel_sample(void *data,
- Evas_Object *obj __UNUSED__,
- void *event_info)
-{
- Sound_Editor *edit = (Sound_Editor *)data;
- Selected_Sound_Data *snd_data = mem_calloc(1, sizeof(Selected_Sound_Data));
- External_Resource *res;
- const Item *item;
-
- assert(edit != NULL);
-
- item = elm_object_item_data_get((Elm_Gengrid_Item *)event_info);
- snd_data->markup = edit->markup;
- snd_data->gengrid = edit->gengrid;
- snd_data->sound_type = SOUND_TYPE_SAMPLE;
- snd_data->compression_type = item->comp;
- snd_data->quality = item->rate;
-
- res = pm_resource_get(ap.project->sounds, item->sound_name);
- if (!res->used_in) elm_object_disabled_set(edit->btn_del, false);
-
- evas_object_smart_callback_call(ap.win, SIGNAL_SOUND_SELECT, snd_data);
- free(snd_data);
-}
-
-static void
-_grid_sel_tone(void *data,
+_grid_selected(void *data,
Evas_Object *obj __UNUSED__,
- void *event_info __UNUSED__)
+ void *event_info)
{
Sound_Editor *edit = (Sound_Editor *)data;
- Selected_Sound_Data *snd_data = mem_calloc(1, sizeof(Selected_Sound_Data));
- External_Resource *res;
- const Item *item;
+ External_Resource *res = NULL;
+ Sound_Data *snd;
assert(edit != NULL);
- item = elm_object_item_data_get((Elm_Gengrid_Item *)event_info);
- snd_data->markup = edit->markup;
- snd_data->gengrid = edit->gengrid;
- snd_data->sound_type = SOUND_TYPE_TONE;
- snd_data->tone = edit->tone;
- snd_data->tone_frq = item->tone_frq;
- elm_object_disabled_set(edit->btn_del, false);
+ snd = elm_object_item_data_get((Elm_Gengrid_Item *)event_info);
+ switch (snd->type)
+ {
+ case SOUND_TYPE_SAMPLE:
+ res = pm_resource_get(ap.project->sounds, snd->name);
+ break;
+ case SOUND_TYPE_TONE:
+ res = pm_resource_get(ap.project->tones, snd->name);
+ break;
+ }
+
+ assert(res != NULL);
- res = pm_resource_get(ap.project->tones, item->sound_name);
if (!res->used_in) elm_object_disabled_set(edit->btn_del, false);
-
- evas_object_smart_callback_call(ap.win, SIGNAL_SOUND_SELECT, snd_data);
- free(snd_data);
+ evas_object_smart_callback_call(ap.win, SIGNAL_SOUND_SELECT, snd);
}
static void
_gengrid_content_fill(Sound_Editor *edit)
{
Eina_List *l;
- Item *it;
- External_Resource *res;
+ External_Resource *sample;
+ Tone_Resource *tone;
+ Sound_Data *snd;
assert(edit != NULL);
assert(ap.project != NULL);
- it = (
[EGIT] [tools/eflete] master 15/28: property_sound: do not play the sound on select
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=dff9ccf83dc357498443574e660f8e3e09486e1d
commit dff9ccf83dc357498443574e660f8e3e09486e1d
Author: Vyacheslav Reutskiy
Date: Tue Feb 2 11:21:10 2016 +0200
property_sound: do not play the sound on select
Play sound on select it's a bad practice, because Eflete don't
know about valume, and very loud sound can cause inconvenience
for user.
Change-Id: I1cc154a62f4dd51a15f5057bc4bb69fda8487669
---
src/bin/ui/property_sound.c | 25 +
1 file changed, 1 insertion(+), 24 deletions(-)
diff --git a/src/bin/ui/property_sound.c b/src/bin/ui/property_sound.c
index c1f6676..e7680ae 100644
--- a/src/bin/ui/property_sound.c
+++ b/src/bin/ui/property_sound.c
@@ -70,7 +70,6 @@ struct _Sound_Prop_Data
struct {
Ecore_Timer *timer;
- Evas_Object *check;
Evas_Object *rewind;
Evas_Object *play;
Evas_Object *pause;
@@ -530,7 +529,7 @@ _player_units_free(char *str)
static void
_sound_player_create(Evas_Object *parent, Sound_Prop_Data *edit)
{
- Evas_Object *icon, *item;
+ Evas_Object *icon;
assert(parent != NULL);
assert(edit != NULL);
@@ -559,11 +558,6 @@ _sound_player_create(Evas_Object *parent, Sound_Prop_Data
*edit)
elm_object_part_content_set(edit->sound_player, "eflete.swallow.teg",
edit->snd_data.teg);
- INFO_ADD(parent, item, _("Play on select:"), "item");
- CHECK_ADD(item, edit->player_data.check);
- elm_object_part_content_set(item, "swallow.second",
edit->player_data.check);
- elm_object_part_content_set(edit->sound_player, "eflete.swallow.check",
item);
-
edit->player_data.rewind = elm_slider_add(edit->sound_player);
elm_slider_unit_format_set(edit->player_data.rewind, "%2.0f");
elm_slider_units_format_function_set(edit->player_data.rewind,
_player_units_format,
@@ -644,9 +638,6 @@ _grid_sample_selected(void *data,
External_Resource *sample;
double len = 0.0;
-#ifdef HAVE_AUDIO
- Eina_Bool auto_play = elm_check_state_get(edit->player_data.check);
-#endif
edit->snd = snd;
#ifdef HAVE_AUDIO
@@ -668,13 +659,6 @@ _grid_sample_selected(void *data,
edje_edit_sound_compression_rate_get(ap.project->global_object, snd->name),
edje_edit_sound_compression_type_get(ap.project->global_object, snd->name));
-#ifdef HAVE_AUDIO
- if ((edit->player_data.switched) || (auto_play))
- {
-edit->player_data.switched = false;
-_sample_play(edit);
- }
-#endif
}
static void
@@ -699,13 +683,6 @@ _grid_tone_selected(void *data,
elm_slider_value_set(edit->player_data.rewind, 0.0);
_tone_info_update(edit, tone->name, tone->freq);
-#ifdef HAVE_AUDIO
- if ((edit->player_data.switched) ||
(elm_check_state_get(edit->player_data.check)))
- {
-edit->player_data.switched = false;
-_tone_play(edit);
- }
-#endif
}
static void
--
[EGIT] [tools/eflete] master 02/28: project_manager: correct declaration of function with no parameters
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=f2b003f722b0444327a1aa5a59c997f4a26f2f77
commit f2b003f722b0444327a1aa5a59c997f4a26f2f77
Author: Andrii Kroitor
Date: Tue Feb 2 15:17:36 2016 +0200
project_manager: correct declaration of function with no parameters
---
src/bin/project_manager/project_manager.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/bin/project_manager/project_manager.c
b/src/bin/project_manager/project_manager.c
index 5430bdf..07014a2 100644
--- a/src/bin/project_manager/project_manager.c
+++ b/src/bin/project_manager/project_manager.c
@@ -252,7 +252,7 @@ exit:
eina_stringshare_del(tmp)
static Project *
-_project_files_create()
+_project_files_create(void)
{
Project *pro;
Eina_Stringshare *folder_path, *pro_path, *tmp;
@@ -312,7 +312,7 @@ _project_files_create()
#undef MKDIR
static void
-_copy_meta_data_to_pro()
+_copy_meta_data_to_pro(void)
{
Eet_File *ef;
char *name, *authors, *version, *license, *comment;
@@ -337,7 +337,7 @@ _copy_meta_data_to_pro()
}
static Eina_Bool
-_project_edj_file_copy()
+_project_edj_file_copy(void)
{
Eina_Stringshare *src, *dst;
Eina_Bool result;
@@ -434,14 +434,14 @@ _project_import_edj(void *data,
PROGRESS_SEND(_("Start import '%s' file as new project"), worker.edj);
PROGRESS_SEND(_("Creating a specifiec file and folders"));
- worker.project = _project_files_create(worker);
+ worker.project = _project_files_create();
TODO("Add correct error handling here (if project == NULL). Probably we
should add negative TC where directory already exist");
THREAD_TESTCANCEL;
worker.project->pro_path = eina_stringshare_printf("%s/%s/%s.pro",
worker.path, worker.name, worker.name);
THREAD_TESTCANCEL;
PROGRESS_SEND(_("Import processing"));
- _project_edj_file_copy(worker);
- _copy_meta_data_to_pro(worker);
+ _project_edj_file_copy();
+ _copy_meta_data_to_pro();
_project_special_group_add(worker.project);
_project_dummy_image_add(worker.project);
_project_open_internal(worker.project);
--
[EGIT] [tools/eflete] master 04/28: config: remove wrong check
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=92e2b0d6f88bc356a71dcde10f1980deaa671800 commit 92e2b0d6f88bc356a71dcde10f1980deaa671800 Author: Andrii Kroitor Date: Tue Feb 2 17:50:32 2016 +0200 config: remove wrong check --- src/bin/config/config.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/bin/config/config.c b/src/bin/config/config.c index af9d3e9..9bfbb84 100644 --- a/src/bin/config/config.c +++ b/src/bin/config/config.c @@ -266,13 +266,12 @@ _default_shortcuts_get() Shortcuts *shortcut; #define ADD_SHORTCUT(Name, Keycode, Modifiers, Descr, Holdable) \ - shortcut = mem_calloc(1, sizeof(Shortcuts)); \ - if (!shortcut) return shortcuts; \ + shortcut = mem_calloc(1, sizeof(Shortcuts)); \ shortcut->keyname = eina_stringshare_add_length(Name, strlen(Name)); \ shortcut->keycode = Keycode; \ shortcut->modifiers = Modifiers; \ shortcut->description = eina_stringshare_add_length(Descr, strlen(Descr));\ - shortcut->holdable = Holdable; \ + shortcut->holdable = Holdable;\ shortcuts = eina_list_append(shortcuts, shortcut); /* No modifiers */ --
[EGIT] [tools/eflete] master 08/28: tabs: fix unsafe list usage
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=3483f9e22c68182547be9e93cbdc2c51c615c436
commit 3483f9e22c68182547be9e93cbdc2c51c615c436
Author: Andrii Kroitor
Date: Tue Feb 2 17:57:05 2016 +0200
tabs: fix unsafe list usage
---
src/bin/ui/tab_home_import_edc.c | 36 ++--
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/bin/ui/tab_home_import_edc.c b/src/bin/ui/tab_home_import_edc.c
index 9bfc8f4..80c50c5 100644
--- a/src/bin/ui/tab_home_import_edc.c
+++ b/src/bin/ui/tab_home_import_edc.c
@@ -238,21 +238,21 @@ _dir_item_add(Evas_Smart_Cb del_func)
}
static void
-_dir_add(Eina_List *dirs_list, Evas_Smart_Cb del_func)
+_dir_add(Eina_List **dirs_list, Evas_Smart_Cb del_func)
{
Dir_Data *dir_data, *tmp;
dir_data = _dir_item_add(del_func);
- if (eina_list_count(dirs_list) == 1)
+ if (eina_list_count(*dirs_list) == 1)
{
/* enable the 'del' button of first item, make posible to delete the
* first item */
-tmp = eina_list_data_get(dirs_list);
+tmp = eina_list_data_get(*dirs_list);
elm_object_disabled_set(tmp->btn_del, false);
}
- tmp = eina_list_data_get(eina_list_last(dirs_list));
+ tmp = eina_list_data_get(eina_list_last(*dirs_list));
elm_box_pack_after(tab_edc.box, dir_data->item, tmp->item);
- dirs_list = eina_list_append(dirs_list, dir_data);
+ *dirs_list = eina_list_append(*dirs_list, dir_data);
}
static void
@@ -260,7 +260,7 @@ _img_dir_add(void *data __UNUSED__,
Evas_Object *obj __UNUSED__,
void *event_info __UNUSED__)
{
- _dir_add(tab_edc.img_dirs, _img_dir_del);
+ _dir_add(&tab_edc.img_dirs, _img_dir_del);
}
static void
@@ -268,7 +268,7 @@ _fnt_dir_add(void *data __UNUSED__,
Evas_Object *obj __UNUSED__,
void *event_info __UNUSED__)
{
- _dir_add(tab_edc.fnt_dirs, _fnt_dir_del);
+ _dir_add(&tab_edc.fnt_dirs, _fnt_dir_del);
}
static void
@@ -276,7 +276,7 @@ _snd_dir_add(void *data __UNUSED__,
Evas_Object *obj __UNUSED__,
void *event_info __UNUSED__)
{
- _dir_add(tab_edc.snd_dirs, _snd_dir_del);
+ _dir_add(&tab_edc.snd_dirs, _snd_dir_del);
}
/*
@@ -285,7 +285,7 @@ _vbr_dir_add(void *data __UNUSED__,
Evas_Object *obj __UNUSED__,
void *event_info __UNUSED__)
{
- _dir_add(tab_edc.vbr_dirs, _vbr_dir_del);
+ _dir_add(&tab_edc.vbr_dirs, _vbr_dir_del);
}
*/
@@ -294,7 +294,7 @@ _data_dir_add(void *data __UNUSED__,
Evas_Object *obj __UNUSED__,
void *event_info __UNUSED__)
{
- _dir_add(tab_edc.data_dirs, _data_dir_del);
+ _dir_add(&tab_edc.data_dirs, _data_dir_del);
}
static Eina_Strbuf * /* need free by user side */
@@ -337,13 +337,13 @@ _edje_cc_opt_build(void)
}
static void
-_dirs_cleanup(Eina_List *list, Evas_Smart_Cb del_func)
+_dirs_cleanup(Eina_List **list, Evas_Smart_Cb del_func)
{
Dir_Data *data;
- while (1 != eina_list_count(list))
+ while (1 != eina_list_count(*list))
{
-data = eina_list_data_get(eina_list_last(list));
+data = eina_list_data_get(eina_list_last(*list));
del_func(data, NULL, NULL);
}
}
@@ -365,11 +365,11 @@ _progress_end(void *data, PM_Project_Result result)
elm_entry_entry_set(tab_edc.name, NULL);
elm_entry_entry_set(tab_edc.path,
profile_get()->general.projects_folder);
elm_entry_entry_set(tab_edc.edc, NULL);
-_dirs_cleanup(tab_edc.img_dirs, _img_dir_del);
-_dirs_cleanup(tab_edc.fnt_dirs, _fnt_dir_del);
-_dirs_cleanup(tab_edc.snd_dirs, _snd_dir_del);
-/* _dirs_cleanup(tab_edc.vbr_dirs, _vbr_dir_del); */
-_dirs_cleanup(tab_edc.data_dirs, _data_dir_del);
+_dirs_cleanup(&tab_edc.img_dirs, _img_dir_del);
+_dirs_cleanup(&tab_edc.fnt_dirs, _fnt_dir_del);
+_dirs_cleanup(&tab_edc.snd_dirs, _snd_dir_del);
+/* _dirs_cleanup(&tab_edc.vbr_dirs, _vbr_dir_del); */
+_dirs_cleanup(&tab_edc.data_dirs, _data_dir_del);
elm_entry_entry_set(tab_edc.meta.version, NULL);
elm_entry_entry_set(tab_edc.meta.authors, NULL);
elm_entry_entry_set(tab_edc.meta.licenses, NULL);
--
[EGIT] [tools/eflete] master 01/28: groupedit_calc: alias-group's part should not be clickable
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=0e5be6f492c0eb11825684a6f1069782526da331 commit 0e5be6f492c0eb11825684a6f1069782526da331 Author: Vitalii Vorobiov Date: Tue Feb 2 16:52:25 2016 + groupedit_calc: alias-group's part should not be clickable --- src/bin/ui/workspace/groupedit_calc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/bin/ui/workspace/groupedit_calc.c b/src/bin/ui/workspace/groupedit_calc.c index 23ac562..d7d765b 100644 --- a/src/bin/ui/workspace/groupedit_calc.c +++ b/src/bin/ui/workspace/groupedit_calc.c @@ -691,7 +691,8 @@ _part_draw_add(Ws_Groupedit_Smart_Data *sd, Part *part) } evas_object_data_set(gp->draw, "sd", sd); - evas_object_event_callback_add(gp->draw, EVAS_CALLBACK_MOUSE_DOWN, _part_select, gp); + if (!sd->group->main_group) + evas_object_event_callback_add(gp->draw, EVAS_CALLBACK_MOUSE_DOWN, _part_select, gp); return gp; } --
[EGIT] [tools/eflete] master 09/28: sound editor: add a structure for transfer sound data to prorperty
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=d130bbc91b20593ea363c0292eca12d450159f7a
commit d130bbc91b20593ea363c0292eca12d450159f7a
Author: Vyacheslav Reutskiy
Date: Tue Feb 2 09:00:55 2016 +0200
sound editor: add a structure for transfer sound data to prorperty
This commit starts the sound editor refactoring.
Change-Id: I2f95b822de6ac0e2060df94ee242df2968bc9250
---
src/bin/ui/editors/sound_editor.h | 7 +++
1 file changed, 7 insertions(+)
diff --git a/src/bin/ui/editors/sound_editor.h
b/src/bin/ui/editors/sound_editor.h
index 1c987f4..a7c45e2 100644
--- a/src/bin/ui/editors/sound_editor.h
+++ b/src/bin/ui/editors/sound_editor.h
@@ -66,6 +66,13 @@ typedef struct {
double quality;
int tone_frq;
} Selected_Sound_Data;
+struct _Sound_Data {
+ Sound_Type type;
+ Resource *resource; /* for SAMPLE it's External_Resource, TONE -
Tone_Resource */
+ Eina_Stringshare *name;
+ Eina_Stringshare *type_label;
+};
+typedef struct _Sound_Data Sound_Data;
/**
* Show the whole inwin window by using some data
--
[EGIT] [tools/eflete] master 22/28: tabs: avoid double tab clicking
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=a60e8dcf40256230add1244ff371e56821e264aa
commit a60e8dcf40256230add1244ff371e56821e264aa
Author: Vitalii Vorobiov
Date: Tue Feb 2 18:02:42 2016 +
tabs: avoid double tab clicking
When any of editors is clicked its doing double callback emitting
(both editors and tab changed).
For example, in main window its disable history in one callback
and instantly enable it in second callback
@fix
---
src/bin/ui/tabs.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/bin/ui/tabs.c b/src/bin/ui/tabs.c
index 7cc8b52..6c5449a 100644
--- a/src/bin/ui/tabs.c
+++ b/src/bin/ui/tabs.c
@@ -115,6 +115,11 @@ _content_set(void *data,
workspace_groupview_hard_update(tabs.current_workspace);
item->need_recalc = false;
}
+
+/* call 'tab,changed' on tab click, and sent Group accociated with
clicked
+ * tab or NULL, if click on 'home' tab */
+evas_object_smart_callback_call(ap.win, SIGNAL_TAB_CHANGED,
+item ? item->group : NULL);
}
else
{
@@ -149,11 +154,6 @@ _content_set(void *data,
evas_object_smart_callback_call(ap.win,
SIGNAL_DIFFERENT_TAB_CLICKED, NULL);
}
}
-
- /* call 'tab,changed' on tab click, and sent Group accociated with clicked
-* tab or NULL, if click on 'home' tab */
- evas_object_smart_callback_call(ap.win, SIGNAL_TAB_CHANGED,
- item ? item->group : NULL);
}
static Tabs_Item *
--
[EGIT] [tools/eflete] master 18/28: property_sound: delete Eo out when playing is finished
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=4b1172cf923d8e8349a9e78c73f0fd0a1a86eb4c commit 4b1172cf923d8e8349a9e78c73f0fd0a1a86eb4c Author: Vyacheslav Reutskiy Date: Tue Feb 2 14:45:19 2016 +0200 property_sound: delete Eo out when playing is finished Change-Id: I76d20e30a535b176360be74436b8b966c469a260 --- src/bin/ui/property_sound.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/bin/ui/property_sound.c b/src/bin/ui/property_sound.c index 8a84b44..7d12804 100644 --- a/src/bin/ui/property_sound.c +++ b/src/bin/ui/property_sound.c @@ -238,6 +238,8 @@ _play_finished_cb(void *data, eo_del(edit->io.in); edit->io.in = NULL; + eo_del(edit->io.out); + edit->io.out = NULL; edit->player_data.playing = false; return true; } --
[EGIT] [tools/eflete] master 25/28: group_navigator: fix clang "Dead assignment" warning
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=e2aeac5003af6e7be2ea17ca213bab0d97877549
commit e2aeac5003af6e7be2ea17ca213bab0d97877549
Author: Andrii Kroitor
Date: Wed Feb 3 13:32:31 2016 +0200
group_navigator: fix clang "Dead assignment" warning
---
src/bin/ui/group_navigator.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/bin/ui/group_navigator.c b/src/bin/ui/group_navigator.c
index 6f5a385..4f65b03 100644
--- a/src/bin/ui/group_navigator.c
+++ b/src/bin/ui/group_navigator.c
@@ -1740,7 +1740,7 @@ group_navigator_add(Group *group)
elm_object_item_disabled_set(pl->add_state_menu_item, true);
pl->add_part_item_menu_item = elm_menu_item_add(pl->menu, NULL, NULL,
_("Item"), _on_menu_add_item_clicked, NULL);
elm_object_item_disabled_set(pl->add_part_item_menu_item, true);
- menu_item = elm_menu_item_separator_add(pl->menu, NULL);
+ elm_menu_item_separator_add(pl->menu, NULL);
menu_item = elm_menu_item_add(pl->menu, NULL, NULL, _("Rectangle"),
_on_menu_add_part_clicked, &_type_rect);
elm_menu_item_icon_name_set(menu_item, "type_rectangle");
@@ -1762,7 +1762,7 @@ group_navigator_add(Group *group)
elm_menu_item_icon_name_set(menu_item, "type_proxy");
menu_item = elm_menu_item_add(pl->menu, NULL, NULL, _("Spacer"),
_on_menu_add_part_clicked, &_type_spacer);
elm_menu_item_icon_name_set(menu_item, "type_spacer");
- menu_item = elm_menu_item_separator_add(pl->menu, NULL);
+ elm_menu_item_separator_add(pl->menu, NULL);
elm_menu_item_add(pl->menu, NULL, NULL, _("Program"),
_on_menu_add_program_clicked, NULL);
pl->name_validator = elm_validator_regexp_new(PART_NAME_REGEX, NULL);
--
[EGIT] [tools/eflete] master 10/28: property_sound: delete buttons prev and next from player
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=53482914eedcfafb8b42bca4f4edae77c68e24e3
commit 53482914eedcfafb8b42bca4f4edae77c68e24e3
Author: Vyacheslav Reutskiy
Date: Tue Feb 2 10:08:01 2016 +0200
property_sound: delete buttons prev and next from player
Sound editor is not a music player.
Change-Id: I0697f1927b818f0efa420ef473b92f0417261001
---
src/bin/ui/property_sound.c | 67 +
1 file changed, 1 insertion(+), 66 deletions(-)
diff --git a/src/bin/ui/property_sound.c b/src/bin/ui/property_sound.c
index 0c707cc..907ddf5 100644
--- a/src/bin/ui/property_sound.c
+++ b/src/bin/ui/property_sound.c
@@ -533,63 +533,6 @@ _on_play_cb(void *data,
}
static void
-_on_prev_cb(void *data,
-Evas_Object *obj EINA_UNUSED,
-void *event_info EINA_UNUSED)
-{
- Elm_Object_Item *it, *first, *last;
- Sound_Prop_Data *edit = (Sound_Prop_Data *)data;
-
- assert(edit != NULL);
-
- edit->player_data.switched = true;
- first = elm_gengrid_first_item_get(edit->gengrid);
- last = elm_gengrid_last_item_get(edit->gengrid);
- it = elm_gengrid_selected_item_get(edit->gengrid);
- it = elm_gengrid_item_prev_get(it);
-
- if (it == first)
- {
-it = last;
-if (last == edit->tone)
- it = elm_gengrid_item_prev_get(edit->tone);
- }
- else if (it == edit->tone)
- it = elm_gengrid_item_prev_get(edit->tone);
-
- elm_gengrid_item_selected_set(it, true);
-}
-
-static void
-_on_next_cb(void *data EINA_UNUSED,
-Evas_Object *obj EINA_UNUSED,
-void *event_info EINA_UNUSED)
-{
- Elm_Object_Item *it, *first, *last;
- Sound_Prop_Data *edit = (Sound_Prop_Data *)data;
-
- assert(edit != NULL);
-
- edit->player_data.switched = true;
- first = elm_gengrid_first_item_get(edit->gengrid);
- last = elm_gengrid_last_item_get(edit->gengrid);
- it = elm_gengrid_selected_item_get(edit->gengrid);
- it = elm_gengrid_item_next_get(it);
-
- if (!it)
- it = elm_gengrid_item_next_get(first);
- else if (it == edit->tone)
- {
-if (edit->tone == last)
- it = elm_gengrid_item_next_get(first);
-else
- it = elm_gengrid_item_next_get(edit->tone);
- }
-
- elm_gengrid_item_selected_set(it, true);
-}
-
-static void
_on_pause_cb(void *data EINA_UNUSED,
Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
@@ -655,7 +598,7 @@ _player_units_free(char *str)
static void
_sound_player_create(Evas_Object *parent, Sound_Prop_Data *edit)
{
- Evas_Object *bt, *icon, *item;
+ Evas_Object *icon, *item;
assert(parent != NULL);
assert(edit != NULL);
@@ -699,18 +642,10 @@ _sound_player_create(Evas_Object *parent, Sound_Prop_Data
*edit)
elm_object_part_content_set(edit->sound_player, "eflete.swallow.fast",
edit->player_data.rewind);
evas_object_smart_callback_add(edit->player_data.rewind, "changed",
_on_rewind_cb, edit);
- BT_ADD(edit->sound_player, bt, icon, "media_player/prev");
- elm_object_part_content_set(edit->sound_player, "swallow.button.prev", bt);
- evas_object_smart_callback_add(bt, "clicked", _on_prev_cb, edit);
-
BT_ADD(edit->sound_player, edit->player_data.play, icon,
"media_player/play");
elm_object_part_content_set(edit->sound_player, "swallow.button.play",
edit->player_data.play);
evas_object_smart_callback_add(edit->player_data.play, "clicked",
_on_play_cb, edit);
- BT_ADD(edit->sound_player, bt, icon, "media_player/next");
- elm_object_part_content_set(edit->sound_player, "swallow.button.next", bt);
- evas_object_smart_callback_add(bt, "clicked", _on_next_cb, edit);
-
edit->player_data.pause = elm_button_add(edit->sound_player);
elm_object_style_set(edit->player_data.pause, "anchor");
evas_object_size_hint_align_set(edit->player_data.pause, EVAS_HINT_FILL,
EVAS_HINT_FILL);
--
[EGIT] [tools/eflete] master 06/28: container: remove unused calculation
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=1e926c44966165550955c9d1cf9111b657bbd908
commit 1e926c44966165550955c9d1cf9111b657bbd908
Author: Andrii Kroitor
Date: Tue Feb 2 17:52:48 2016 +0200
container: remove unused calculation
---
src/bin/ui/container/container.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/bin/ui/container/container.c b/src/bin/ui/container/container.c
index 5e6b24d..6110e01 100644
--- a/src/bin/ui/container/container.c
+++ b/src/bin/ui/container/container.c
@@ -279,7 +279,6 @@ _mouse_move_hBR_cb(void *data,
/* calc wigth and heght */
TODO("need do refactoring here")
- nw = w + dx;
if (sd->size->w + H_WIGTH + dx <= sd->con_size_min.w + H_WIGTH)
nw = sd->con_size_min.w + H_WIGTH + sd->dx + sd->pad_left_top.w +
sd->pad_right_bottom.w;
else
@@ -290,7 +289,6 @@ _mouse_move_hBR_cb(void *data,
else nw = w + dx;
}
- nh = h + dy;
if (sd->size->h + H_HEIGHT + dy <= sd->con_size_min.h + H_HEIGHT)
nh = sd->con_size_min.h + H_HEIGHT + sd->dy + sd->pad_left_top.h +
sd->pad_right_bottom.h;
else
--
[EGIT] [tools/eflete] master 27/28: move the eflete config to $HOME/.config
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=5e2368bedfcd8cdc81ef4bd48cd718aa6b3886bb
commit 5e2368bedfcd8cdc81ef4bd48cd718aa6b3886bb
Author: Vyacheslav Reutskiy
Date: Wed Feb 3 13:59:18 2016 +0200
move the eflete config to $HOME/.config
This commit is moved the Eflete config folder to correct place.
After apply this commit need to delete folder $HOME/.eflete, because
this folder not been used anymore.
Change-Id: Iebad6543b5436bc3815ea5611268e478cbc21761
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index b14b96e..dc4defd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -196,7 +196,7 @@ EFLETE_DEFINE+="
-DEFLETE_IMG_PATH=\\\"${datadir}/eflete/images/\\\" "
EFLETE_DEFINE+="
-DEFLETE_TEMPLATE_EDC_PATH=\\\"${datadir}/eflete/themes/default/template/edc\\\"
"
EFLETE_DEFINE+="
-DEFLETE_TEMPLATE_IMAGES_PATH=\\\"${datadir}/eflete/themes/default/template/images\\\"
"
EFLETE_DEFINE+="
-DEFLETE_TEMPLATE_SOUNDS_PATH=\\\"${datadir}/eflete/themes/default/template/sounds\\\"
"
-EFLETE_DEFINE+=" -DEFLETE_SETT_PATH=\\\"${HOME}/.eflete/\\\" "
+EFLETE_DEFINE+=" -DEFLETE_SETT_PATH=\\\"${HOME}/.config/eflete/\\\" "
AC_SUBST([EFLETE_DEFINE])
AM_PROG_CC_C_O
--
[EGIT] [tools/eflete] master 17/28: property_sound: delete the code dublicationh
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=355d0dc3c9e7368d12c830aac1d05793866610bd
commit 355d0dc3c9e7368d12c830aac1d05793866610bd
Author: Vyacheslav Reutskiy
Date: Tue Feb 2 12:41:37 2016 +0200
property_sound: delete the code dublicationh
Change-Id: I75ad8830e5258048277e96fcedb53cac91ceeb75
---
src/bin/ui/property_sound.c | 47 -
1 file changed, 17 insertions(+), 30 deletions(-)
diff --git a/src/bin/ui/property_sound.c b/src/bin/ui/property_sound.c
index 2b37a21..8a84b44 100644
--- a/src/bin/ui/property_sound.c
+++ b/src/bin/ui/property_sound.c
@@ -302,11 +302,6 @@ _tone_play(Sound_Prop_Data *edit)
assert(edit != NULL);
- elm_object_part_content_unset(edit->sound_player, "swallow.button.play");
- evas_object_hide(edit->player_data.play);
- elm_object_part_content_set(edit->sound_player, "swallow.button.play",
edit->player_data.pause);
- evas_object_show(edit->player_data.pause);
-
tone = (Tone_Resource *)edit->snd->resource;
if (edit->player_data.stopped)
{
@@ -355,11 +350,6 @@ _sample_play(Sound_Prop_Data *edit)
assert(edit != NULL);
- elm_object_part_content_unset(edit->sound_player, "swallow.button.play");
- evas_object_hide(edit->player_data.play);
- elm_object_part_content_set(edit->sound_player, "swallow.button.play",
edit->player_data.pause);
- evas_object_show(edit->player_data.pause);
-
if (edit->player_data.stopped)
{
eo_do(edit->io.in, ecore_audio_obj_paused_set(false));
@@ -377,10 +367,6 @@ _sample_play(Sound_Prop_Data *edit)
if (!ret)
{
ERR("Can not set source obj for added sample");
- elm_object_part_content_unset(edit->sound_player,
"swallow.button.play");
- evas_object_hide(edit->player_data.pause);
- elm_object_part_content_set(edit->sound_player,
"swallow.button.play", edit->player_data.play);
- evas_object_show(edit->player_data.play);
return;
}
}
@@ -389,10 +375,6 @@ _sample_play(Sound_Prop_Data *edit)
if (!ret)
{
ERR("Couldn't attach input and output!");
-elm_object_part_content_unset(edit->sound_player,
"swallow.button.play");
-evas_object_hide(edit->player_data.pause);
-elm_object_part_content_set(edit->sound_player, "swallow.button.play",
edit->player_data.play);
-evas_object_show(edit->player_data.play);
return;
}
@@ -405,17 +387,6 @@ _sample_play(Sound_Prop_Data *edit)
}
static void
-_play_sound(Sound_Prop_Data *edit)
-{
- assert(edit != NULL);
-
- if (SOUND_TYPE_SAMPLE == edit->snd->type)
- _sample_play(edit);
- else
- _tone_play(edit);
-}
-
-static void
_interrupt_playing(Sound_Prop_Data *edit)
{
assert(edit != NULL);
@@ -458,7 +429,23 @@ _on_play_cb(void *data,
Evas_Object *obj EINA_UNUSED,
void *event_info EINA_UNUSED)
{
- _play_sound(data);
+ Sound_Prop_Data *edit = (Sound_Prop_Data *)data;
+
+ assert(edit != NULL);
+
+ switch (edit->snd->type)
+ {
+ case SOUND_TYPE_SAMPLE:
+ _sample_play(edit);
+ break;
+ case SOUND_TYPE_TONE:
+ _tone_play(edit);
+ break;
+ }
+ elm_object_part_content_unset(edit->sound_player, "swallow.button.play");
+ evas_object_hide(edit->player_data.play);
+ elm_object_part_content_set(edit->sound_player, "swallow.button.play",
edit->player_data.pause);
+ evas_object_show(edit->player_data.pause);
}
static void
--
[EGIT] [tools/eflete] master 14/28: sound editor: delete needless data structures
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=fb74d8494e64d7080bf681599c3a65334d10dc3a
commit fb74d8494e64d7080bf681599c3a65334d10dc3a
Author: Vyacheslav Reutskiy
Date: Tue Feb 2 10:26:28 2016 +0200
sound editor: delete needless data structures
Change-Id: I50330fe91995e0d873fa259bed79756a95fe08cc
---
src/bin/ui/editors/sound_editor.h | 26 --
1 file changed, 26 deletions(-)
diff --git a/src/bin/ui/editors/sound_editor.h
b/src/bin/ui/editors/sound_editor.h
index c67351b..f5da6a6 100644
--- a/src/bin/ui/editors/sound_editor.h
+++ b/src/bin/ui/editors/sound_editor.h
@@ -36,37 +36,11 @@ TODO("Check pulse_audio on configure and add COREAUDIO
support")
#include
#endif
-#define SIG_SOUND_SELECTED "sound_selected"
-
typedef enum {
SOUND_TYPE_SAMPLE,
SOUND_TYPE_TONE
} Sound_Type;
-typedef struct
-{
- Eina_Stringshare *sound_name;
- Eina_Stringshare *src;
- Eina_Stringshare *format;
- Edje_Edit_Sound_Comp comp;
- double rate;
- int tone_frq;
-} Item;
-
-typedef struct {
- Evas_Object *markup;
- Evas_Object *gengrid;
- Sound_Type sound_type;
- Elm_Object_Item *tone;
- Eina_Stringshare *file_name;
- double duration;
- Eina_Stringshare *snd_src;
- Eina_Stringshare *format;
- int length;
- Edje_Edit_Sound_Comp compression_type;
- double quality;
- int tone_frq;
-} Selected_Sound_Data;
struct _Sound_Data {
Sound_Type type;
Resource *resource; /* for SAMPLE it's External_Resource, TONE -
Tone_Resource */
--
[EGIT] [tools/eflete] master 05/28: editor: fix targets clean logic on program action set
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=22ba2bc82dcf92d7c1afa78f183531369c012349 commit 22ba2bc82dcf92d7c1afa78f183531369c012349 Author: Andrii Kroitor Date: Tue Feb 2 17:51:59 2016 +0200 editor: fix targets clean logic on program action set --- src/bin/editor/editor_program.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bin/editor/editor_program.c b/src/bin/editor/editor_program.c index 218c488..9359882 100644 --- a/src/bin/editor/editor_program.c +++ b/src/bin/editor/editor_program.c @@ -150,6 +150,7 @@ editor_program_action_set(Evas_Object *edit_object, Change *change, Eina_Bool me if it was not list of programs (EDJE_ACTION_TYPE_ACTION_STOP) */ if (old_value == EDJE_ACTION_TYPE_ACTION_STOP) clean_targets = true; + break; case EDJE_ACTION_TYPE_ACTION_STOP: /*this action uses programs as targets*/ default: --
[EGIT] [tools/eflete] master 20/28: live_gengrid: fix SIGSEV on item text load
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=7241ea1de8e62733d64fedf6f34d4da38d674fdf
commit 7241ea1de8e62733d64fedf6f34d4da38d674fdf
Author: Vitalii Vorobiov
Date: Tue Feb 2 18:45:19 2016 +
live_gengrid: fix SIGSEV on item text load
@fix #50533
---
src/bin/ui/live_view/elementary/live_gengrid.c | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/bin/ui/live_view/elementary/live_gengrid.c
b/src/bin/ui/live_view/elementary/live_gengrid.c
index cfc4220..f87b6c5 100644
--- a/src/bin/ui/live_view/elementary/live_gengrid.c
+++ b/src/bin/ui/live_view/elementary/live_gengrid.c
@@ -99,7 +99,12 @@ _grid_text_get(void *data __UNUSED__,
EINA_LIST_FOREACH(part_list, l, demo_part)
{
if (!strcmp(demo_part->name, part))
- return strdup(demo_part->text_content);
+ {
+ if (!demo_part->text_content)
+ return NULL;
+ else
+ return strdup(demo_part->text_content);
+ }
}
return NULL;
--
From owner-freebsd-po...@freebsd.org Wed Feb 03 07:11:07 2016
Return-path:
Envelope-to: arch...@mail-archive.com
Delivery-date: Wed, 03 Feb 2016 07:11:07 -0800
Received: from bolt10b.mxthunder.net ([208.53.48.136])
by mail-archive.com with esmtp (Exim 4.76)
(envelope-from )
id 1aQz5A-0003io-AK
for arch...@mail-archive.com; Wed, 03 Feb 2016 07:11:00 -0800
Received: by bolt10b.mxthunder.net (Postfix, from userid 12345)
id 3pwRBZ5N4zz2NZwb; Wed, 3 Feb 2016 07:04:23 -0800 (PST)
Received: from mx2.freebsd.org (mx2.freebsd.org [8.8.178.116])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by bolt10b.mxthunder.net (Postfix) with ESMTPS id 3pwR9V1wxKz2NZdm
for ; Wed, 3 Feb 2016 07:03:57 -0800 (PST)
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by mx2.freebsd.org (Postfix) with ESMTPS id 5E3CB4213;
Wed, 3 Feb 2016 15:03:57 + (UTC)
(envelope-from owner-freebsd-po...@freebsd.org)
Received: from mailman.ysv.freebsd.org (mailman.ysv.freebsd.org
[IPv6:2001:1900:2254:206a::50:5])
by mx1.freebsd.org (Postfix) with ESMTP id 44761DDF;
Wed, 3 Feb 2016 15:03:57 + (UTC)
(envelope-from owner-freebsd-po...@freebsd.org)
Delivered-To: freebsd-po...@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 10914A99522
for ;
Wed, 3 Feb 2016 15:03:51 + (UTC) (envelope-from w...@hiwaay.net)
Received: from fly.hiwaay.net (fly.hiwaay.net [216.180.54.1])
(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
(Client did not present a certificate)
by mx1.freebsd.org (Postfix) with ESMTPS id D9383D68
for ; Wed, 3 Feb 2016 15:03:50 + (UTC)
(envelope-from w...@hiwaay.net)
Received: from kabini1.local (dynamic-216-186-244-25.knology.net
[216.186.244.25] (may be forged)) (authenticated bits=0)
by fly.hiwaay.net (8.13.8/8.13.8/fly) with ESMTP id u13F3mgE014512
(version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits8 verify=NO)
for ; Wed, 3 Feb 2016 09:03:49 -0600
Subject: Re: [moved from toolchain] GCC5: pkg vs. ports
To: freebsd-po...@freebsd.org
References: <56b20ca6.2080...@hiwaay.net>
<56b215f4.1020...@infracaninophile.co.uk>
From: "William A. Mahaffey III"
Message-ID: <56b216d4.3060...@hiwaay.net>
Date: Wed, 3 Feb 2016 09:09:18 -0553.75
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:38.0) Gecko/20100101
Thunderbird/38.4.0
MIME-Version: 1.0
In-Reply-To: <56b215f4.1020...@infracaninophile.co.uk>
X-BeenThere: freebsd-po...@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: Porting software to FreeBSD
List-Unsubscribe: ,
List-Archive:
List-Help:
List-Subscribe: ,
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="us-ascii"; Format="flowed"
Errors-To: owner-freebsd-po...@freebsd.org
Sender: owner-freebsd-po...@freebsd.org
X-MXTHUNDER-Identifier: <56b216d4.3060...@hiwaay.net>
X-MXTHUNDER-IP-Rating: 0, 8.8.178.116, Ugly c=0.369283 p=0.17 Source Normal
X-MXTHUNDER-Scan-Result: 100
X-MXTHUNDER-Rules:
100-5946975-2380-2399-m
100-5946619-4958-4972-m
100-5946619-7047-7061-m
100-5946975-0-7119-f
X-MXTHUNDER-Group: Bulk Mail
On 02/03/16 09:06, Matthew Seaman wrote:
> On 2016/02/03 14:18, William A
[EGIT] [tools/eflete] master 16/28: property_sound: delete the Sound_Prop_Data extra members
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=7ff35da87fa501304e8d06ee6b4d860073d9c348
commit 7ff35da87fa501304e8d06ee6b4d860073d9c348
Author: Vyacheslav Reutskiy
Date: Tue Feb 2 11:51:12 2016 +0200
property_sound: delete the Sound_Prop_Data extra members
Change-Id: I07329a3053a3b8d864f88f35371bb925e537a2b6
---
src/bin/ui/property_sound.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/bin/ui/property_sound.c b/src/bin/ui/property_sound.c
index e7680ae..2b37a21 100644
--- a/src/bin/ui/property_sound.c
+++ b/src/bin/ui/property_sound.c
@@ -73,10 +73,8 @@ struct _Sound_Prop_Data
Evas_Object *rewind;
Evas_Object *play;
Evas_Object *pause;
- Eina_Bool decoration : 1;
Eina_Bool playing : 1;
Eina_Bool stopped : 1;
- Eina_Bool switched : 1;
} player_data;
struct {
--
[EGIT] [tools/eflete] master 07/28: demo/live_segment_control: remove unused function call
rimmed pushed a commit to branch master.
http://git.enlightenment.org/tools/eflete.git/commit/?id=6750491e0b526f75d04cf844099b0bb664285884
commit 6750491e0b526f75d04cf844099b0bb664285884
Author: Andrii Kroitor
Date: Tue Feb 2 17:53:50 2016 +0200
demo/live_segment_control: remove unused function call
---
src/bin/ui/live_view/elementary/live_segment_control.c | 8 ++--
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/bin/ui/live_view/elementary/live_segment_control.c
b/src/bin/ui/live_view/elementary/live_segment_control.c
index daddb3f..a19ae65 100644
--- a/src/bin/ui/live_view/elementary/live_segment_control.c
+++ b/src/bin/ui/live_view/elementary/live_segment_control.c
@@ -25,13 +25,11 @@ _on_sc_swallow_check(void *data __UNUSED__,
void *ei __UNUSED__)
{
Demo_Part *part = (Demo_Part *)ei;
- Elm_Object_Item *item = NULL;
+ Elm_Object_Item *item;
int i;
Evas_Object *object = (Evas_Object *) data;
- item = elm_segment_control_item_selected_get(object);
-
for (i = 0; i < 3; i++)
{
TODO("Three items at the same time (store it somehow and free later)")
@@ -70,13 +68,11 @@ _on_sc_text_check(void *data,
void *ei __UNUSED__)
{
Demo_Part *part = (Demo_Part *)ei;
- Elm_Object_Item *item = NULL;
+ Elm_Object_Item *item;
int i;
Evas_Object *object = (Evas_Object *) data;
- item = elm_segment_control_item_selected_get(object);
-
for (i = 0; i < 3; i++)
{
item = elm_segment_control_item_get(object, i);
--
[EGIT] [tools/eflete] master 26/28: update authors
rimmed pushed a commit to branch master. http://git.enlightenment.org/tools/eflete.git/commit/?id=86c67bd6d0f98ea505426426aeb3bac6b1195c16 commit 86c67bd6d0f98ea505426426aeb3bac6b1195c16 Author: Vyacheslav Reutskiy Date: Wed Feb 3 12:14:55 2016 +0200 update authors Change-Id: I086536b59b8fb374f74ed16abf57fe1079ec0d55 --- AUTHORS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index 7b933d5..4df8e6d 100644 --- a/AUTHORS +++ b/AUTHORS @@ -11,6 +11,6 @@ Igor Gala (igor.gal...@gmail.com) Olga Kolesnik (o.koles...@samsung.com) +Yurii Tsivun (y.tsi...@gmail.com) Oleg Dotsenko (o.dotse...@samsung.com) -Yurii Tsivun (y.tsi...@samsung.com) Dmitriy Samoylov (dm.samoy...@samsung.com) --
[EGIT] [core/enlightenment] enlightenment-0.20 02/03: 20.5 release
discomfitor pushed a commit to branch enlightenment-0.20. http://git.enlightenment.org/core/enlightenment.git/commit/?id=227f66420fd64c3e95b6bd1da3aa5fcaf25aa9a5 commit 227f66420fd64c3e95b6bd1da3aa5fcaf25aa9a5 Author: Mike Blumenkrantz Date: Wed Feb 3 11:47:26 2016 -0500 20.5 release --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index eb29d43..3cc5d48 100644 --- a/configure.ac +++ b/configure.ac @@ -2,11 +2,11 @@ ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## m4_define([v_maj], [0]) m4_define([v_min], [20]) -m4_define([v_mic], [4]) +m4_define([v_mic], [5]) 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 m4_undefine([v_rev]) -m4_define([relname], [0.20.4]) +m4_define([relname], [0.20.5]) ##-- When doing snapshots - change soname. remove dnl on below line m4_define([relname], [ver-autocannoli-0.20]) dnl m4_define([v_rel], [-release relname]) --
[EGIT] [core/enlightenment] annotated tag v0.20.5 created (now 89933d3)
This is an automated email from the git hooks/post-receive script. discomfitor pushed a change to annotated tag v0.20.5 in repository core/enlightenment. at 89933d3 (tag) tagging 9578d651994d281cd2a5c91dc18f5f5d69385377 (commit) replaces v0.20.4 tagged by Mike Blumenkrantz on Wed Feb 3 11:49:15 2016 -0500 - Log - 0.20.5 release Mike Blumenkrantz (3): add back x11 window focusing 20.5 release 20.5 NEWS updates --- This annotated tag includes the following new commits: new 4a6f329 add back x11 window focusing new 227f664 20.5 release new 9578d65 20.5 NEWS updates The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. --
[EGIT] [core/enlightenment] enlightenment-0.20 01/03: add back x11 window focusing
discomfitor pushed a commit to branch enlightenment-0.20. http://git.enlightenment.org/core/enlightenment.git/commit/?id=4a6f329905a074d081fae41e7520678ddbd021e3 commit 4a6f329905a074d081fae41e7520678ddbd021e3 Author: Mike Blumenkrantz Date: Wed Feb 3 11:45:27 2016 -0500 add back x11 window focusing somehow during a cherry-pick of 96b55ce441d68c7a23a15a344c850d92a35af544, this line was removed. no conflicts were raised during the cherry-pick. thanksgit.jpg fix T3137 --- src/bin/e_grabinput.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bin/e_grabinput.c b/src/bin/e_grabinput.c index 6bf5852..c050a08 100644 --- a/src/bin/e_grabinput.c +++ b/src/bin/e_grabinput.c @@ -189,6 +189,7 @@ _e_grabinput_focus_do(Ecore_Window win, E_Focus_Method method) case E_FOCUS_METHOD_PASSIVE: #ifndef HAVE_WAYLAND_ONLY if (e_comp_util_has_x()) + ecore_x_window_focus(win); #endif break; --
[EGIT] [core/enlightenment] enlightenment-0.20 03/03: 20.5 NEWS updates
discomfitor pushed a commit to branch enlightenment-0.20. http://git.enlightenment.org/core/enlightenment.git/commit/?id=9578d651994d281cd2a5c91dc18f5f5d69385377 commit 9578d651994d281cd2a5c91dc18f5f5d69385377 Author: Mike Blumenkrantz Date: Wed Feb 3 11:48:33 2016 -0500 20.5 NEWS updates --- NEWS | 7 +++ 1 file changed, 7 insertions(+) diff --git a/NEWS b/NEWS index c52368f..81935c7 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,9 @@ +Release 0.20.5: +- +Mike Blumenkrantz (1): + add back x11 window focusing + + Release 0.20.4: - Chris Michael (5): @@ -3140,3 +3146,4 @@ Fixes: * Further improve initial window placement coordinates * Fixed cases where gadgets would sometimes reorder randomly on shelves * fixed filemanager race condition causing create-queued icons to not be deleted + --
[EGIT] [core/efl] master 01/01: Eo: fix eo_shutdown()'s return value to be FALSE on shutdown.
tasn pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=d01ed68825ffb0e12ca7107cf2a903ed3e24c282 commit d01ed68825ffb0e12ca7107cf2a903ed3e24c282 Author: Tom Hacohen Date: Wed Feb 3 16:32:50 2016 + Eo: fix eo_shutdown()'s return value to be FALSE on shutdown. The return value of init/shutdown is true if eo is init, false otherwise. This was broken until now. @fix. --- src/lib/eo/Eo.h | 4 ++-- src/lib/eo/eo.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/eo/Eo.h b/src/lib/eo/Eo.h index 4eb13cd..d2dbfb78 100644 --- a/src/lib/eo/Eo.h +++ b/src/lib/eo/Eo.h @@ -415,7 +415,7 @@ EAPI const char *eo_class_name_get(const Eo_Class *klass); /** * @brief Init the eo subsystem - * @return @c EINA_TRUE on success. + * @return @c EINA_TRUE if eo is init, @c EINA_FALSE otherwise. * * @see eo_shutfown() */ @@ -423,7 +423,7 @@ EAPI Eina_Bool eo_init(void); /** * @brief Shutdown the eo subsystem - * @return @c EINA_TRUE on success. + * @return @c EINA_TRUE if eo is init, @c EINA_FALSE otherwise. * * @see eo_init() */ diff --git a/src/lib/eo/eo.c b/src/lib/eo/eo.c index ede2863..2fd8f53 100644 --- a/src/lib/eo/eo.c +++ b/src/lib/eo/eo.c @@ -1898,7 +1898,7 @@ eo_shutdown(void) _eo_log_dom = -1; eina_shutdown(); - return EINA_TRUE; + return EINA_FALSE; } EAPI Eina_Bool --
[EGIT] [core/enlightenment] master 01/02: ignore subsequent bindings with ANY context after finding a previous ANY binding
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=39c6f1c33a1a63f050b55a9b8639e0b784468fb7
commit 39c6f1c33a1a63f050b55a9b8639e0b784468fb7
Author: Mike Blumenkrantz
Date: Wed Feb 3 17:56:14 2016 -0500
ignore subsequent bindings with ANY context after finding a previous ANY
binding
if multiple ANY bindings exist for a given event, return the first one found
---
src/bin/e_bindings.c | 6 ++
1 file changed, 6 insertions(+)
diff --git a/src/bin/e_bindings.c b/src/bin/e_bindings.c
index 89cb8a9..9d294c1 100644
--- a/src/bin/e_bindings.c
+++ b/src/bin/e_bindings.c
@@ -432,6 +432,7 @@ e_bindings_mouse_button_find(E_Binding_Context ctxt,
E_Binding_Event_Mouse_Butto
((binding->any_mod) || (binding->mod == ev->modifiers)))
{
if (!_e_bindings_context_match(binding->ctxt, ctxt)) continue;
+ if (act && (binding->ctxt == E_BINDING_CONTEXT_ANY)) continue;
act = e_action_find(binding->action);
if (bind_ret) *bind_ret = binding;
if (!act) continue;
@@ -685,6 +686,7 @@ e_bindings_key_event_find(E_Binding_Context ctxt,
Ecore_Event_Key *ev, E_Binding
((binding->any_mod) || (binding->mod == mod)))
{
if (!_e_bindings_context_match(binding->ctxt, ctxt)) continue;
+ if (act && (binding->ctxt == E_BINDING_CONTEXT_ANY)) continue;
act = e_action_find(binding->action);
if (bind_ret) *bind_ret = binding;
if (!act) continue;
@@ -844,6 +846,7 @@ e_bindings_edge_event_find(E_Binding_Context ctxt,
E_Event_Zone_Edge *ev, Eina_B
((binding->any_mod) || (binding->mod == mod)))
{
if (!_e_bindings_context_match(binding->ctxt, ctxt)) continue;
+ if (act && (binding->ctxt == E_BINDING_CONTEXT_ANY)) continue;
act = e_action_find(binding->action);
if (bind_ret) *bind_ret = binding;
if (!act) continue;
@@ -1014,6 +1017,7 @@ e_bindings_signal_find(E_Binding_Context ctxt, const char
*sig, const char *src,
((binding->any_mod) || (binding->mod == mod)))
{
if (!_e_bindings_context_match(binding->ctxt, ctxt)) continue;
+ if (act && (binding->ctxt == E_BINDING_CONTEXT_ANY)) continue;
act = e_action_find(binding->action);
if (bind_ret) *bind_ret = binding;
if (!act) continue;
@@ -1177,6 +1181,7 @@ e_bindings_wheel_find(E_Binding_Context ctxt,
E_Binding_Event_Wheel *ev, E_Bindi
((binding->any_mod) || (binding->mod == ev->modifiers)))
{
if (!_e_bindings_context_match(binding->ctxt, ctxt)) continue;
+ if (act && (binding->ctxt == E_BINDING_CONTEXT_ANY)) continue;
act = e_action_find(binding->action);
if (bind_ret) *bind_ret = binding;
if (!act) continue;
@@ -1279,6 +1284,7 @@ e_bindings_acpi_find(E_Binding_Context ctxt, E_Event_Acpi
*ev, E_Binding_Acpi **
if (binding->status != ev->status) continue;
}
if (!_e_bindings_context_match(binding->ctxt, ctxt)) continue;
+ if (act && (binding->ctxt == E_BINDING_CONTEXT_ANY)) continue;
act = e_action_find(binding->action);
if (bind_ret) *bind_ret = binding;
if (!act) continue;
--
[EGIT] [core/enlightenment] master 02/02: add bool return for mouse-based E_Action callbacks
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=fe5d2e6e61747e27292339b01c8b5f9193ecad62
commit fe5d2e6e61747e27292339b01c8b5f9193ecad62
Author: Mike Blumenkrantz
Date: Wed Feb 3 17:58:34 2016 -0500
add bool return for mouse-based E_Action callbacks
in many cases, a mouse action's callback will fail to execute as a result
of multiple
objects being under the pointer at the time of the event. in this case,
the callback should be able to determine whether action callback processing
should
continue.
as an example, when attempting to execute an action which only activates for
client objects, if the passed object is not a client then the callback
should return
false to indicate that it was not able to perform the action for the given
object,
allowing further actions to be attempted on this object
---
src/bin/e_actions.c | 75 ---
src/bin/e_actions.h | 6 ++--
src/bin/e_bindings.c | 58 +++---
src/modules/clock/e_mod_main.c| 3 +-
src/modules/tiling/e_mod_tiling.c | 18 +-
src/modules/winlist/e_mod_main.c | 18 +-
6 files changed, 101 insertions(+), 77 deletions(-)
diff --git a/src/bin/e_actions.c b/src/bin/e_actions.c
index d7c2682..b3ff169 100644
--- a/src/bin/e_actions.c
+++ b/src/bin/e_actions.c
@@ -15,7 +15,7 @@
if (act) act->func.go_mouse = _e_actions_act_##name##_go_mouse; \
}
#define ACT_FN_GO_MOUSE(act, use) \
- static void _e_actions_act_##act##_go_mouse(E_Object * obj EINA_UNUSED,
const char *params use, E_Binding_Event_Mouse_Button * ev EINA_UNUSED)
+ static Eina_Bool _e_actions_act_##act##_go_mouse(E_Object * obj EINA_UNUSED,
const char *params use, E_Binding_Event_Mouse_Button * ev EINA_UNUSED)
#define ACT_GO_WHEEL(name)\
{ \
@@ -23,7 +23,7 @@
if (act) act->func.go_wheel = _e_actions_act_##name##_go_wheel; \
}
#define ACT_FN_GO_WHEEL(act, use) \
- static void _e_actions_act_##act##_go_wheel(E_Object * obj EINA_UNUSED,
const char *params use, E_Binding_Event_Wheel * ev EINA_UNUSED)
+ static Eina_Bool _e_actions_act_##act##_go_wheel(E_Object * obj EINA_UNUSED,
const char *params use, E_Binding_Event_Wheel * ev EINA_UNUSED)
#define ACT_GO_EDGE(name) \
{ \
@@ -63,7 +63,7 @@
if (act) act->func.end_mouse = _e_actions_act_##name##_end_mouse; \
}
#define ACT_FN_END_MOUSE(act, use) \
- static void _e_actions_act_##act##_end_mouse(E_Object * obj EINA_UNUSED,
const char *params use, E_Binding_Event_Mouse_Button * ev EINA_UNUSED)
+ static Eina_Bool _e_actions_act_##act##_end_mouse(E_Object * obj
EINA_UNUSED, const char *params use, E_Binding_Event_Mouse_Button * ev
EINA_UNUSED)
#define ACT_END_KEY(name) \
{ \
@@ -103,9 +103,10 @@ ACT_FN_GO(window_move, EINA_UNUSED)
ACT_FN_GO_MOUSE(window_move, EINA_UNUSED)
{
if (!obj) obj = E_OBJECT(e_client_focused_get());
- if (!obj) return;
- if (obj->type != E_CLIENT_TYPE) return;
+ if (!obj) return EINA_FALSE;
+ if (obj->type != E_CLIENT_TYPE) return EINA_FALSE;
e_client_act_move_begin((E_Client *)obj, ev);
+ return EINA_TRUE;
}
ACT_FN_GO_SIGNAL(window_move, )
@@ -136,9 +137,10 @@ ACT_FN_END(window_move, EINA_UNUSED)
ACT_FN_END_MOUSE(window_move, EINA_UNUSED)
{
if (!obj) obj = E_OBJECT(e_client_focused_get());
- if (!obj) return;
- if (obj->type != E_CLIENT_TYPE) return;
+ if (!obj) return EINA_FALSE;
+ if (obj->type != E_CLIENT_TYPE) return EINA_FALSE;
e_client_act_move_end((E_Client *)obj, ev);
+ return EINA_TRUE;
}
ACT_FN_GO_KEY(window_move, EINA_UNUSED, EINA_UNUSED)
@@ -167,10 +169,11 @@ ACT_FN_GO(window_resize, EINA_UNUSED)
ACT_FN_GO_MOUSE(window_resize, EINA_UNUSED)
{
if (!obj) obj = E_OBJECT(e_client_focused_get());
- if (!obj) return;
- if (obj->type != E_CLIENT_TYPE) return;
+ if (!obj) return EINA_FALSE;
+ if (obj->type != E_CLIENT_TYPE) return EINA_FALSE;
if (!((E_Client *)obj)->lock_user_size)
e_client_act_resize_begin((E_Client *)obj, ev);
+ return EINA_TRUE;
}
ACT_FN_GO_SIGNAL(window_resize, )
@@ -204,9 +207,10 @@ ACT_FN_END(window_resize, EINA_UNUSED)
ACT_FN_END_MOUSE(window_resize, EINA_UNUSED)
{
if (!obj) obj = E_OBJECT(e_client_focused_get());
- if (!obj) return;
- if (obj->type != E_CLIENT_TYPE) return;
+ if (!obj) return EINA_FALSE;
+ if (obj->type != E_CLIENT_TYPE) return EINA_FALSE;
e_client_act_resize_end((E_Client *)obj, ev);
+ return EINA_TRUE;
}
ACT_FN_GO_KEY(window_resize, EINA_UNUSED, EINA_UNUSED)
@@ -238,13 +242,14 @@ ACT_FN_GO
[EGIT] [core/efl] master 03/03: eolian-js: Remove replacing commas by underscores in events.
felipealmeida pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=c9bc6fb4cd903a40f9d4494e70e1feae0c5a4e80
commit c9bc6fb4cd903a40f9d4494e70e1feae0c5a4e80
Author: Felipe Magno de Almeida
Date: Wed Feb 3 21:06:17 2016 -0200
eolian-js: Remove replacing commas by underscores in events.
This was done before when the identifier was used to generate
methods. Now using strings to denote events this is not needed
anymore.
---
src/bin/eolian_js/main.cc | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/bin/eolian_js/main.cc b/src/bin/eolian_js/main.cc
index b144a45..c8dc1f0 100644
--- a/src/bin/eolian_js/main.cc
+++ b/src/bin/eolian_js/main.cc
@@ -928,7 +928,6 @@ int main(int argc, char** argv)
, last; first != last; ++first)
{
std::string event_name (::eolian_event_name_get(&*first));
- std::replace(event_name.begin(), event_name.end(), ',', '_');
if (!eolian_event_is_beta(&*first) &&
event_member_names.find(event_name) == event_member_names.end())
--
[EGIT] [core/efl] master 02/03: eolian-js: Modified formating to replace verb position in method names
felipealmeida pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=8ff1194d32f28717e37177af4501e3fbd62fdf41
commit 8ff1194d32f28717e37177af4501e3fbd62fdf41
Author: Felipe Magno de Almeida
Date: Sun Jan 17 14:09:55 2016 -0200
eolian-js: Modified formating to replace verb position in method names
Formatting now checks if the last function is a known verb and changes
its position to the first word of the method if it is. Making the
method use the same coding standard as node.js.
---
src/bin/eolian_js/eolian/js/format.hh | 181 +++---
src/bin/eolian_js/main.cc | 24 ++---
2 files changed, 178 insertions(+), 27 deletions(-)
diff --git a/src/bin/eolian_js/eolian/js/format.hh
b/src/bin/eolian_js/eolian/js/format.hh
index a07d541..e1f02c3 100644
--- a/src/bin/eolian_js/eolian/js/format.hh
+++ b/src/bin/eolian_js/eolian/js/format.hh
@@ -11,24 +11,175 @@ namespace eolian { namespace js {
namespace format {
-std::string generic(std::string const& in)
+const char* verbs[] =
+ {
+"add",
+"get",
+"is",
+"del",
+"thaw",
+"freeze",
+"save",
+"wait",
+"eject",
+"raise",
+"lower",
+"load",
+"dup",
+"reset",
+"unload",
+"close",
+"set",
+"interpolate",
+"has",
+"grab",
+"check",
+"find",
+"ungrab",
+"unset",
+"clear",
+"pop",
+"new",
+"peek",
+"push",
+"update",
+"show",
+"move",
+"hide",
+"calculate",
+"resize",
+"attach",
+"pack",
+"unpack",
+"emit"
+ };
+
+const char* not_verbs[] =
+ {
+"below",
+"above",
+"name",
+"unfreezable",
+"value",
+"r",
+"g",
+"b",
+"a",
+"finalize",
+"destructor",
+"to",
+"circle",
+"rect",
+"path",
+"commands",
+"type",
+"colorspace"
+"op",
+"type",
+"properties",
+"status",
+"status",
+"relative",
+"ptr",
+"pair",
+"pos",
+"end"
+ };
+
+std::string format_method(std::string const& in)
{
- std::string s = in;
- auto i = s.find('_');
- while (i != std::string::npos)
+ std::string r;
+ std::string::const_iterator current = in.begin(), last = in.end();
+ do
{
-if (i <= 0 || i+1 >= s.size() ||
-!::isalnum(s[i-1]) || !::isalnum(s[i+1]))
- {
- EINA_CXX_DOM_LOG_WARN(eolian::js::domain) << "Entity '" << in
- << "' can't be conveniently converted to a JavaScript name.";
- return in;
- }
-s[i+1] = static_cast(::toupper(s[i+1]));
-s.erase(i, 1);
-i = s.find('_', i);
+ std::string::const_iterator word_end = std::find(current, last, '_');
+ if(word_end == last)
+ {
+ bool found_verb = false, found_not_verb = false;
+ std::string v(current, word_end);
+ for(const char** verb = &format::verbs[0]; verb != &format::verbs
+ [sizeof(format::verbs)/sizeof(format::verbs[0])]; ++verb)
+ {
+ if(!std::lexicographical_compare
+ (current, word_end, *verb, *verb + std::strlen(*verb))
+ && !std::lexicographical_compare
+ (*verb, *verb + std::strlen(*verb), current, word_end))
+ {
+ found_verb = true;
+ }
+ }
+ if(!found_verb)
+ {
+ for(const char** not_verb = &format::not_verbs[0]; not_verb !=
&format::not_verbs
+ [sizeof(format::not_verbs)/sizeof(format::not_verbs[0])];
++not_verb)
+ {
+ if(!std::lexicographical_compare
+(current, word_end, *not_verb, *not_verb +
std::strlen(*not_verb))
+&& !std::lexicographical_compare
+(*not_verb, *not_verb + std::strlen(*not_verb), current,
word_end))
+ {
+ found_not_verb = true;
+ }
+ }
+ if(!found_not_verb)
+ EINA_CXX_DOM_LOG_WARN(eolian::js::domain)
+ << "Last word is NOT a not-verb " << v << std::endl;
+ }
+ if(found_verb || !found_not_verb)
+ r = v + r;
+ else
+ {
+ v[0] = std::toupper(v[0]);
+ r += v;
+ r[0] = std::tolower(r[0]);
+ }
+ current = last;
+ }
+ else
+ {
+ r += std::toupper(*current++);
+ std::copy(current, word_end, std::back_inserter(r));
+ current = word_end + 1;
+ }
}
- return s;
+ while(current != last);
+
+ EINA_CXX_DOM_LOG_DBG(eolian::js::domain)
+ << "Formatted method " << r << " with input " << in << std::endl;
+
+ return r;
+}
+
+std::string format_field(std::string const& in)
+{
+ return format_method(in);
+}
+
+
[EGIT] [core/efl] master 01/03: eina-cxx: Fix instantiating eina domain without eina_init
felipealmeida pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=3a33ef45bd90cc17b484cedddc8b2df3736e015a
commit 3a33ef45bd90cc17b484cedddc8b2df3736e015a
Author: Felipe Magno de Almeida
Date: Sun Jan 17 14:07:17 2016 -0200
eina-cxx: Fix instantiating eina domain without eina_init
Added eina_init to eina_domain initialization as to force eina_init to
happen before initialization of global eina domains. This fixes
eolian_js domain in src/bin/eolian_js.
---
src/bindings/eina_cxx/eina_log.hh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/bindings/eina_cxx/eina_log.hh
b/src/bindings/eina_cxx/eina_log.hh
index 77e30e5..5ec0744 100644
--- a/src/bindings/eina_cxx/eina_log.hh
+++ b/src/bindings/eina_cxx/eina_log.hh
@@ -148,7 +148,7 @@ struct log_domain : _domain_base
* @param color Color of the domain name.
*/
log_domain(char const* name, char const* color = "black")
-: _domain( ::eina_log_domain_register(name, color))
+: _domain( (::eina_init(), ::eina_log_domain_register(name, color)) )
{
}
@@ -158,6 +158,7 @@ struct log_domain : _domain_base
~log_domain()
{
::eina_log_domain_unregister(_domain);
+::eina_shutdown();
}
int domain_raw() const { return _domain; }
private:
--
[EGIT] [core/efl] master 01/02: edje: add "keys" block to classes setter/getter
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=ee31bb541edca1688e8e6f3c62a3ce648ccb7b5c
commit ee31bb541edca1688e8e6f3c62a3ce648ccb7b5c
Author: Jee-Yong Um
Date: Wed Feb 3 15:21:14 2016 -0800
edje: add "keys" block to classes setter/getter
Summary:
With "keys" block, make color/text/size_class setter/getter
to @property methods.
Reviewers: jpeg, cedric
Reviewed By: cedric
Subscribers: cedric
Differential Revision: https://phab.enlightenment.org/D3619
Signed-off-by: Cedric BAIL
---
src/lib/edje/edje_object.eo | 182
1 file changed, 82 insertions(+), 100 deletions(-)
diff --git a/src/lib/edje/edje_object.eo b/src/lib/edje/edje_object.eo
index 30204fb..ad6c905 100644
--- a/src/lib/edje/edje_object.eo
+++ b/src/lib/edje/edje_object.eo
@@ -214,8 +214,18 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
This function sets the text class for the Edje.]]
return: bool; [[$true, on success or $false, on error]]
}
- values {
+ get {
+[[Gets font and font size from edje text class.
+
+ This function gets the font and the font size from the object
+ text class. The font string will only be valid until the text
+ class is changed or the edje object is deleted.]]
+return: bool; [[$true, on success or $false, on error]]
+ }
+ keys {
text_class: const(char)*; [[The text class name]]
+ }
+ values {
font: const(char)*; [[Font name]]
size: Evas.Font.Size; [[Font Size]]
}
@@ -1822,19 +1832,6 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
@in cur: Edje.Cursor; [[The cursor to adjust.]]
}
}
- text_class_get @const {
- [[Gets font and font size from edje text class.
-
- This function gets the font and the font size from the object
- text class. The font string will only be valid until the text
- class is changed or the edje object is deleted.]]
- return: bool; [[$true, on success or $false, on error]]
- params {
-@in text_class: const(char)*; [[The text class name]]
-@out font: const(char)*; [[Font name]]
-@out size: Evas.Font.Size; [[Font Size]]
- }
- }
text_class_del {
[[Delete the object text class.
@@ -1850,70 +1847,58 @@ class Edje.Object (Evas.Smart_Clipped, Efl.File)
@in text_class: const(char)*; [[The color class to be deleted.]]
}
}
- color_class_set {
- [[Sets the object color class.
+ @property color_class {
+ set {
+[[Sets the object color class.
- This function sets the color values for an object level color
- class. This will cause all edje parts in the specified object that
- have the specified color class to have their colors multiplied by
- these values.
+ This function sets the color values for an object level color
+ class. This will cause all edje parts in the specified object
that
+ have the specified color class to have their colors multiplied by
+ these values.
- The first color is the object, the second is the text outline, and
- the third is the text shadow. (Note that the second two only apply
- to text parts).
+ The first color is the object, the second is the text outline,
and
+ the third is the text shadow. (Note that the second two only
apply
+ to text parts).
- Setting color emits a signal "color_class,set" with source being
- the given color.
+ Setting color emits a signal "color_class,set" with source being
+ the given color.
- Note: unlike Evas, Edje colors are not pre-multiplied. That is,
- half-transparent white is 255 255 255 128.]]
+ Note: unlike Evas, Edje colors are not pre-multiplied. That is,
+ half-transparent white is 255 255 255 128.]]
+return: bool;
+ }
+ get {
+[[Gets the object color class.
- return: bool;
- params {
-@in color_class: const(char)*;
-@in r: int; [[Object Red value]]
-@in g: int; [[Object Green value]]
-@in b: int; [[Object Blue value]]
-@in a: int; [[Object Alpha value]]
-@in r2: int; [[Outline Red value]]
-@in g2: int; [[Outline Green value]]
-@in b2: int; [[Outline Blue value]]
-@in a2: int; [[Outline Alpha value]]
-@in r3: int; [[Shadow Red value]]
-@in g3: int; [[Shadow Green value]]
-@in b3: int; [[Shadow Blue value]]
[EGIT] [core/efl] master 02/02: edje: fix edje_file_data_get() when no collections are present
cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=505491c47c7939e2fab2c2188a26ff5406f35fe5
commit 505491c47c7939e2fab2c2188a26ff5406f35fe5
Author: Jean Guyomarc'h
Date: Wed Feb 3 15:23:34 2016 -0800
edje: fix edje_file_data_get() when no collections are present
Summary:
edje_file_data_get() failed if the Edje file did not contain
a collection (e.g. contained only data.item.
This allows to load data from the file even when no collections
are present, but only if specified.
@fix
Reviewers: raster, jpeg, stefan_schmidt, cedric
Reviewed By: cedric
Subscribers: cedric, jpeg
Differential Revision: https://phab.enlightenment.org/D3632
Signed-off-by: Cedric BAIL
---
src/lib/edje/edje_cache.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/lib/edje/edje_cache.c b/src/lib/edje/edje_cache.c
index ab8a9b4..526324e 100644
--- a/src/lib/edje/edje_cache.c
+++ b/src/lib/edje/edje_cache.c
@@ -259,7 +259,7 @@ _edje_file_coll_open(Edje_File *edf, const char *coll)
}
static Edje_File *
-_edje_file_open(const Eina_File *f, int *error_ret, time_t mtime)
+_edje_file_open(const Eina_File *f, int *error_ret, time_t mtime, Eina_Bool
coll)
{
Edje_Color_Class *cc;
Edje_Text_Class *tc;
@@ -292,7 +292,7 @@ _edje_file_open(const Eina_File *f, int *error_ret, time_t
mtime)
_edje_file_free(edf);
return NULL;
}
- if (!edf->collection)
+ if (!edf->collection && coll)
{
*error_ret = EDJE_LOAD_ERROR_CORRUPT_FILE;
_edje_file_free(edf);
@@ -384,7 +384,7 @@ find_list:
}
}
- edf = _edje_file_open(file, error_ret, eina_file_mtime_get(file));
+ edf = _edje_file_open(file, error_ret, eina_file_mtime_get(file), !!coll);
if (!edf) return NULL;
eina_hash_direct_add(_edje_file_hash, &edf->f, edf);
--
[EGIT] [core/elementary] master 01/02: js: Added combobox class to JavaScript binding
felipealmeida pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=8b8a5d5167318fc02916cea07f9713100e90550d
commit 8b8a5d5167318fc02916cea07f9713100e90550d
Author: divyesh purohit
Date: Sat Jan 30 18:29:35 2016 -0200
js: Added combobox class to JavaScript binding
---
src/lib/elementary_js.cc | 2 ++
src/lib/elm_combobox.eo | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/lib/elementary_js.cc b/src/lib/elementary_js.cc
index 873d637..7837adc 100644
--- a/src/lib/elementary_js.cc
+++ b/src/lib/elementary_js.cc
@@ -67,6 +67,7 @@ EAPI void register_clock(v8::Handle global,
v8::Isolate* isolate);
EAPI void register_colorselector(v8::Handle global, v8::Isolate*
isolate);
EAPI void register_conformant(v8::Handle global, v8::Isolate*
isolate);
EAPI void register_container(v8::Handle global, v8::Isolate*
isolate);
+EAPI void register_combobox(v8::Handle global, v8::Isolate*
isolate);
EAPI void register_ctxpopup(v8::Handle global, v8::Isolate*
isolate);
EAPI void register_datetime(v8::Handle global, v8::Isolate*
isolate);
EAPI void register_dayselector(v8::Handle global, v8::Isolate*
isolate);
@@ -182,6 +183,7 @@ void init(v8::Handle exports)
elm::register_clock(exports, v8::Isolate::GetCurrent());
elm::register_colorselector(exports, v8::Isolate::GetCurrent());
elm::register_conformant(exports, v8::Isolate::GetCurrent());
+ elm::register_combobox(exports, v8::Isolate::GetCurrent());
elm::register_container(exports, v8::Isolate::GetCurrent());
elm::register_ctxpopup(exports, v8::Isolate::GetCurrent());
elm::register_datetime(exports, v8::Isolate::GetCurrent());
diff --git a/src/lib/elm_combobox.eo b/src/lib/elm_combobox.eo
index 4e13197..0075530 100644
--- a/src/lib/elm_combobox.eo
+++ b/src/lib/elm_combobox.eo
@@ -1,4 +1,4 @@
-class Elm_Combobox (Elm.Button, Evas.Selectable_Interface,
+class Elm.Combobox (Elm.Button, Evas.Selectable_Interface,
Elm_Interface_Atspi_Widget_Action,
Elm.Entry, Elm.Genlist, Elm.Hover)
{
--
[EGIT] [core/elementary] master 02/02: js: Added layout example
felipealmeida pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=13e2ed7cd8f3499ed1b0e68a877243f044becb7f
commit 13e2ed7cd8f3499ed1b0e68a877243f044becb7f
Author: Felipe Magno de Almeida
Date: Wed Feb 3 21:19:51 2016 -0200
js: Added layout example
---
src/examples/layout_example.js | 63 ++
1 file changed, 63 insertions(+)
diff --git a/src/examples/layout_example.js b/src/examples/layout_example.js
new file mode 100644
index 000..d6e5dd7
--- /dev/null
+++ b/src/examples/layout_example.js
@@ -0,0 +1,63 @@
+
+Elm = require('elm').Elm;
+efl = require('efl');
+Evas = efl.Evas;
+
+win = new Elm.WinStandard(null);
+win.setTitle("Layout");
+win.setAutohide(true);
+
+box = new Elm.Box(win);
+box.setSizeHintWeight(1.0, 1.0);
+win.addResizeObject(box);
+box.setVisible(true);
+
+ly = new Elm.Layout(box);
+
+if (!ly.setTheme("layout", "application", "titlebar"))
+{
+console.log('Error setting layout');
+}
+
+ly.setPartText('elm.text', 'Some title');
+ly.setSizeHintWeight(1.0, 1.0);
+ly.setSizeHintAlign(1.0, 1.0);
+box.packEnd(ly);
+ly.setVisible(true);
+
+bt = new Elm.Icon(ly);
+bt.setStandard('chat');
+bt.setSizeHintMin(20, 20);
+// elm_layout_icon_set(ly, bt);
+ly.setContent('elm.swallow.icon', bt);
+ly.emitSignal('elm,state,icon,visible', 'elm');
+
+bt = new Elm.Icon(ly);
+bt.setStandard('close');
+bt.setSizeHintMin(20, 20);
+// elm_layout_end_set(ly, bt);
+ly.setContent('elm.swallow.end', bt);
+ly.emitSignal('elm,state,end,visible', 'elm');
+
+ly = new Elm.Layout(box);
+ly.setFile('/home/felipe/dev/samsung/upstream/elementary/build/data/objects/test.edj',
"layout");
+ly.setSizeHintWeight(1.0, 1.0);
+box.packEnd(ly);
+ly.setVisible(true);
+
+//elm_layout_signal_callback_add(ly, "*", "*", _cb_signal, NULL);
+// I hope to translate to:
+//ly.on_layout('*', '*', function(emission, source)
+// { console.log("signal: '" + emission + "' '" + source + "'");});
+
+bt = new Elm.Button(ly);
+bt.setPartText(null, "Button 1");
+ly.setContent("element1", bt);
+
+bt.on("clicked", function() { console.log('button clicked'); });
+
+ly.setPartCursor("text", 'watch');
+ly.on('mouse,down', function() { console.log('layout mouse down') });
+ly.on('mouse,up', function() { console.log('layout mouse up') });
+
+win.setVisible(true);
--
[EGIT] [core/efl] master 01/01: ecore_imf/ibus: fix indentation
jihoon pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=478433f0cf2da46f49103c141aa324d269d608df
commit 478433f0cf2da46f49103c141aa324d269d608df
Author: Jihoon Kim
Date: Thu Feb 4 08:44:14 2016 +0900
ecore_imf/ibus: fix indentation
---
src/modules/ecore_imf/ibus/ibus_imcontext.c | 92 ++---
src/modules/ecore_imf/ibus/ibus_module.c| 42 ++---
2 files changed, 67 insertions(+), 67 deletions(-)
diff --git a/src/modules/ecore_imf/ibus/ibus_imcontext.c
b/src/modules/ecore_imf/ibus/ibus_imcontext.c
index 0203b3e..4bfe627 100644
--- a/src/modules/ecore_imf/ibus/ibus_imcontext.c
+++ b/src/modules/ecore_imf/ibus/ibus_imcontext.c
@@ -80,16 +80,16 @@ utf8_offset_to_index(const char *str, int offset)
static int
sort_cb(const void *d1, const void *d2)
{
-const Ecore_IMF_Preedit_Attr *attr1 = d1;
-const Ecore_IMF_Preedit_Attr *attr2 = d2;
+ const Ecore_IMF_Preedit_Attr *attr1 = d1;
+ const Ecore_IMF_Preedit_Attr *attr2 = d2;
-if (!attr1) return 1;
-if (!attr2) return -1;
+ if (!attr1) return 1;
+ if (!attr2) return -1;
-if (attr1->start_index < attr2->start_index)
- return -1;
-else
- return 1;
+ if (attr1->start_index < attr2->start_index)
+ return -1;
+ else
+ return 1;
}
static void
@@ -233,44 +233,44 @@ _request_surrounding_text(IBusIMContext *ibusimcontext)
EINA_SAFETY_ON_NULL_RETURN(ibusimcontext->ibuscontext);
EINA_SAFETY_ON_NULL_RETURN(ibusimcontext->ctx);
-if ((ibusimcontext->caps & IBUS_CAP_SURROUNDING_TEXT) != 0 &&
-ibus_input_context_needs_surrounding_text(ibusimcontext->ibuscontext))
- {
- char *surrounding = NULL;
- int cursor_pos;
- IBusText *ibustext;
-
- EINA_LOG_DBG ("requesting surrounding text...\n");
-
- if (ecore_imf_context_surrounding_get(ibusimcontext->ctx,
- &surrounding,
- &cursor_pos))
- {
- if (!surrounding)
-return;
-
- if (cursor_pos < 0)
-{
- free(surrounding);
- return;
-}
-
- ibustext = ibus_text_new_from_string(surrounding);
-
-
ibus_input_context_set_surrounding_text(ibusimcontext->ibuscontext,
- ibustext,
- cursor_pos,
- cursor_pos);
-
- free(surrounding);
- }
- else
- {
- ibusimcontext->caps &= ~IBUS_CAP_SURROUNDING_TEXT;
- ibus_input_context_set_capabilities(ibusimcontext->ibuscontext,
- ibusimcontext->caps);
- }
- }
+ if ((ibusimcontext->caps & IBUS_CAP_SURROUNDING_TEXT) != 0 &&
+ ibus_input_context_needs_surrounding_text(ibusimcontext->ibuscontext))
+ {
+char *surrounding = NULL;
+int cursor_pos;
+IBusText *ibustext;
+
+EINA_LOG_DBG ("requesting surrounding text...\n");
+
+if (ecore_imf_context_surrounding_get(ibusimcontext->ctx,
+ &surrounding,
+ &cursor_pos))
+ {
+ if (!surrounding)
+ return;
+
+ if (cursor_pos < 0)
+ {
+ free(surrounding);
+ return;
+ }
+
+ ibustext = ibus_text_new_from_string(surrounding);
+
+
ibus_input_context_set_surrounding_text(ibusimcontext->ibuscontext,
+ ibustext,
+ cursor_pos,
+ cursor_pos);
+
+ free(surrounding);
+ }
+else
+ {
+ ibusimcontext->caps &= ~IBUS_CAP_SURROUNDING_TEXT;
+ ibus_input_context_set_capabilities(ibusimcontext->ibuscontext,
+ ibusimcontext->caps);
+ }
+ }
}
IBusIMContext *
diff --git a/src/modules/ecore_imf/ibus/ibus_module.c
b/src/modules/ecore_imf/ibus/ibus_module.c
index ba44fdb..63240f1 100644
--- a/src/modules/ecore_imf/ibus/ibus_module.c
+++ b/src/modules/ecore_imf/ibus/ibus_module.c
@@ -59,8 +59,8 @@ static Ecore_IMF_Context_Class ibus_imf_class = {
NULL
};
-static Ecore_IMF_Context *im_module_create (void);
-static Ecore_IMF_Context *im_module_exit (void);
+static Ecore_IMF_Context *im_module_create(void);
+static Ecore_IMF_Context *im_module_exit(void);
static Eina_Bool
im_module_init(void)
@@ -73,10 +73,10 @@ im_module_init(void)
if (strcmp(s, "x11")) return EINA_FALSE;
}
ecore_main_loop_glib_integrate();
-
[EGIT] [core/efl] master 01/01: ecore_imf/wayland: Add support to get input panel language locale
jihoon pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=7564d49a832ada9ca889539561760605f1d7db39
commit 7564d49a832ada9ca889539561760605f1d7db39
Author: Jihoon Kim
Date: Thu Feb 4 11:56:13 2016 +0900
ecore_imf/wayland: Add support to get input panel language locale
---
src/modules/ecore_imf/wayland/wayland_imcontext.c | 27 +--
src/modules/ecore_imf/wayland/wayland_imcontext.h | 4
src/modules/ecore_imf/wayland/wayland_module.c| 2 +-
3 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/src/modules/ecore_imf/wayland/wayland_imcontext.c
b/src/modules/ecore_imf/wayland/wayland_imcontext.c
index 1c92cca..dd36f0f 100644
--- a/src/modules/ecore_imf/wayland/wayland_imcontext.c
+++ b/src/modules/ecore_imf/wayland/wayland_imcontext.c
@@ -44,6 +44,7 @@ struct _WaylandIMContext
char *preedit_text;
char *preedit_commit;
+ char *language;
Eina_List *preedit_attrs;
int32_t preedit_cursor;
@@ -591,11 +592,17 @@ text_input_input_panel_state(void *data
EINA_UNUSED,
}
static void
-text_input_language(void *data EINA_UNUSED,
+text_input_language(void *data,
struct wl_text_input *text_input EINA_UNUSED,
uint32_t serial EINA_UNUSED,
-const char *language EINA_UNUSED)
+const char *language)
{
+WaylandIMContext *imcontext = (WaylandIMContext *)data;
+
+if (imcontext->language)
+ free(imcontext->language);
+
+imcontext->language = strdup(language ? language : "");
}
static void
@@ -646,6 +653,12 @@ wayland_im_context_del(Ecore_IMF_Context *ctx)
EINA_LOG_DOM_INFO(_ecore_imf_wayland_log_dom, "context_del");
+ if (imcontext->language)
+ {
+free(imcontext->language);
+imcontext->language = NULL;
+ }
+
if (imcontext->text_input)
wl_text_input_destroy(imcontext->text_input);
@@ -951,6 +964,16 @@
wayland_im_context_input_panel_language_set(Ecore_IMF_Context *ctx,
imcontext->content_hint &= ~WL_TEXT_INPUT_CONTENT_HINT_LATIN;
}
+EAPI void
+wayland_im_context_input_panel_language_locale_get(Ecore_IMF_Context *ctx,
+ char **locale)
+{
+ WaylandIMContext *imcontext = (WaylandIMContext
*)ecore_imf_context_data_get(ctx);
+
+ if (locale)
+ *locale = strdup(imcontext->language ? imcontext->language : "");
+}
+
WaylandIMContext *wayland_im_context_new (struct wl_text_input_manager
*text_input_manager)
{
WaylandIMContext *context = calloc(1, sizeof(WaylandIMContext));
diff --git a/src/modules/ecore_imf/wayland/wayland_imcontext.h
b/src/modules/ecore_imf/wayland/wayland_imcontext.h
index a76203f..18925e5 100644
--- a/src/modules/ecore_imf/wayland/wayland_imcontext.h
+++ b/src/modules/ecore_imf/wayland/wayland_imcontext.h
@@ -79,6 +79,10 @@ EAPI void
wayland_im_context_input_hint_set(Ecore_IMF_Context *ctx,
EAPI void wayland_im_context_input_panel_language_set(Ecore_IMF_Context *ctx,
Ecore_IMF_Input_Panel_Lang lang);
+EAPI void
+wayland_im_context_input_panel_language_locale_get(Ecore_IMF_Context *ctx,
+ char **locale);
+
WaylandIMContext *wayland_im_context_new(struct wl_text_input_manager
*text_input_manager);
extern int _ecore_imf_wayland_log_dom;
diff --git a/src/modules/ecore_imf/wayland/wayland_module.c
b/src/modules/ecore_imf/wayland/wayland_module.c
index 3a24996..7fc2474 100644
--- a/src/modules/ecore_imf/wayland/wayland_module.c
+++ b/src/modules/ecore_imf/wayland/wayland_module.c
@@ -79,7 +79,7 @@ static Ecore_IMF_Context_Class wayland_imf_class =
NULL, /* input_panel_state_get */
NULL, /*
input_panel_event_callback_add */
NULL, /*
input_panel_event_callback_del */
- NULL, /*
input_panel_language_locale_get */
+ wayland_im_context_input_panel_language_locale_get, /*
input_panel_language_locale_get */
NULL, /* candidate_window_geometry_get
*/
wayland_im_context_input_hint_set, /* input_hint_set */
NULL /* bidi_direction_set */
--
[EGIT] [core/efl] master 01/01: ecore_imf/wayland: notify language changed
jihoon pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=b1336a27c1a5de3e6f629ff47552deec5fdf172a
commit b1336a27c1a5de3e6f629ff47552deec5fdf172a
Author: Jihoon Kim
Date: Thu Feb 4 11:58:03 2016 +0900
ecore_imf/wayland: notify language changed
---
src/modules/ecore_imf/wayland/wayland_imcontext.c | 17 +++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/src/modules/ecore_imf/wayland/wayland_imcontext.c
b/src/modules/ecore_imf/wayland/wayland_imcontext.c
index dd36f0f..d58606e 100644
--- a/src/modules/ecore_imf/wayland/wayland_imcontext.c
+++ b/src/modules/ecore_imf/wayland/wayland_imcontext.c
@@ -598,11 +598,24 @@ text_input_language(void *data,
const char *language)
{
WaylandIMContext *imcontext = (WaylandIMContext *)data;
+Eina_Bool changed = EINA_FALSE;
+
+if (!imcontext || !language) return;
if (imcontext->language)
- free(imcontext->language);
+ {
+ free(imcontext->language);
+
+ if (strcmp(imcontext->language, language) != 0)
+ changed = EINA_TRUE;
+ }
+else
+ changed = EINA_TRUE;
+
+imcontext->language = strdup(language);
-imcontext->language = strdup(language ? language : "");
+if (imcontext->ctx && changed)
+ ecore_imf_context_input_panel_event_callback_call(imcontext->ctx,
ECORE_IMF_INPUT_PANEL_LANGUAGE_EVENT, 0);
}
static void
--
[EGIT] [core/efl] master 01/01: ecore_imf/wayland: support to set prediction allow mode
jihoon pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=584a5a32a216203bf57b090390c415747b690968
commit 584a5a32a216203bf57b090390c415747b690968
Author: Jihoon Kim
Date: Thu Feb 4 12:00:45 2016 +0900
ecore_imf/wayland: support to set prediction allow mode
---
src/modules/ecore_imf/wayland/wayland_imcontext.c | 12
src/modules/ecore_imf/wayland/wayland_imcontext.h | 4
src/modules/ecore_imf/wayland/wayland_module.c| 2 +-
3 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/src/modules/ecore_imf/wayland/wayland_imcontext.c
b/src/modules/ecore_imf/wayland/wayland_imcontext.c
index d58606e..c23343f 100644
--- a/src/modules/ecore_imf/wayland/wayland_imcontext.c
+++ b/src/modules/ecore_imf/wayland/wayland_imcontext.c
@@ -987,6 +987,18 @@
wayland_im_context_input_panel_language_locale_get(Ecore_IMF_Context *ctx,
*locale = strdup(imcontext->language ? imcontext->language : "");
}
+EAPI void
+wayland_im_context_prediction_allow_set(Ecore_IMF_Context *ctx,
+Eina_Bool prediction)
+{
+ WaylandIMContext *imcontext = (WaylandIMContext
*)ecore_imf_context_data_get(ctx);
+
+ if (prediction)
+ imcontext->content_hint |= WL_TEXT_INPUT_CONTENT_HINT_AUTO_COMPLETION;
+ else
+ imcontext->content_hint &= ~WL_TEXT_INPUT_CONTENT_HINT_AUTO_COMPLETION;
+}
+
WaylandIMContext *wayland_im_context_new (struct wl_text_input_manager
*text_input_manager)
{
WaylandIMContext *context = calloc(1, sizeof(WaylandIMContext));
diff --git a/src/modules/ecore_imf/wayland/wayland_imcontext.h
b/src/modules/ecore_imf/wayland/wayland_imcontext.h
index 18925e5..483e482 100644
--- a/src/modules/ecore_imf/wayland/wayland_imcontext.h
+++ b/src/modules/ecore_imf/wayland/wayland_imcontext.h
@@ -83,6 +83,10 @@ EAPI void
wayland_im_context_input_panel_language_locale_get(Ecore_IMF_Context *ctx,
char **locale);
+EAPI void
+wayland_im_context_prediction_allow_set(Ecore_IMF_Context *ctx,
+Eina_Bool prediction);
+
WaylandIMContext *wayland_im_context_new(struct wl_text_input_manager
*text_input_manager);
extern int _ecore_imf_wayland_log_dom;
diff --git a/src/modules/ecore_imf/wayland/wayland_module.c
b/src/modules/ecore_imf/wayland/wayland_module.c
index 7fc2474..a47aaee 100644
--- a/src/modules/ecore_imf/wayland/wayland_module.c
+++ b/src/modules/ecore_imf/wayland/wayland_module.c
@@ -61,7 +61,7 @@ static Ecore_IMF_Context_Class wayland_imf_class =
wayland_im_context_input_mode_set, /* input_mode_set */
wayland_im_context_filter_event, /* filter_event */
wayland_im_context_preedit_string_with_attributes_get, /*
preedit_string_with_attribute_get */
- NULL, /* prediction_allow_set */
+ wayland_im_context_prediction_allow_set, /* prediction_allow_set */
wayland_im_context_autocapital_type_set, /* autocapital_type_set */
NULL, /* control panel show */
NULL, /* control panel hide */
--
[EGIT] [core/efl] master 01/01: ecore_imf/wayland: do not check input panel enable in show or hide
jihoon pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=a57d301f2a4e719c83f370a745446409a33b32ca commit a57d301f2a4e719c83f370a745446409a33b32ca Author: Jihoon Kim Date: Thu Feb 4 13:57:43 2016 +0900 ecore_imf/wayland: do not check input panel enable in show or hide Input panel enable is already being checked in ecore_imf API. --- src/modules/ecore_imf/wayland/wayland_imcontext.c | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/modules/ecore_imf/wayland/wayland_imcontext.c b/src/modules/ecore_imf/wayland/wayland_imcontext.c index c23343f..f2a2dce 100644 --- a/src/modules/ecore_imf/wayland/wayland_imcontext.c +++ b/src/modules/ecore_imf/wayland/wayland_imcontext.c @@ -827,8 +827,7 @@ wayland_im_context_show(Ecore_IMF_Context *ctx) EINA_LOG_DOM_INFO(_ecore_imf_wayland_log_dom, "context_show"); - if ((imcontext->text_input) && - (ecore_imf_context_input_panel_enabled_get(ctx))) + if (imcontext->text_input) wl_text_input_show_input_panel(imcontext->text_input); } @@ -839,8 +838,7 @@ wayland_im_context_hide(Ecore_IMF_Context *ctx) EINA_LOG_DOM_INFO(_ecore_imf_wayland_log_dom, "context_hide"); - if ((imcontext->text_input) && - (ecore_imf_context_input_panel_enabled_get(ctx))) + if (imcontext->text_input) wl_text_input_hide_input_panel(imcontext->text_input); } --
[EGIT] [core/efl] master 01/01: ecore_imf/wayland: Fix IME hide -> show issue in case of focus-out and then focus-in
jihoon pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=4b777ec1845c731285f842ec75aa464e5c2e3096
commit 4b777ec1845c731285f842ec75aa464e5c2e3096
Author: Haifeng Deng
Date: Tue Nov 24 17:30:14 2015 +0800
ecore_imf/wayland: Fix IME hide -> show issue in case of focus-out and then
focus-in
Change-Id: I1d3d7023dbd10b78f510380ff3c46087228f9180
---
AUTHORS | 1 +
src/modules/ecore_imf/wayland/wayland_imcontext.c | 62 ++-
2 files changed, 61 insertions(+), 2 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index 0ee154e..a3b0e1e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -460,3 +460,4 @@ Viacheslav Lvov
Vitaliy Venzak
perepelits.m
rustyBSD
+Haifeng Deng
diff --git a/src/modules/ecore_imf/wayland/wayland_imcontext.c
b/src/modules/ecore_imf/wayland/wayland_imcontext.c
index f2a2dce..cecd275 100644
--- a/src/modules/ecore_imf/wayland/wayland_imcontext.c
+++ b/src/modules/ecore_imf/wayland/wayland_imcontext.c
@@ -31,6 +31,11 @@
#include "wayland_imcontext.h"
+#define HIDE_TIMER_INTERVAL 0.05
+
+static Eina_Bool _clear_hide_timer();
+static Ecore_Timer *_hide_timer = NULL;
+
struct _WaylandIMContext
{
Ecore_IMF_Context *ctx;
@@ -137,6 +142,55 @@ update_state(WaylandIMContext *imcontext)
wl_text_input_commit_state(imcontext->text_input, ++imcontext->serial);
}
+
+ _clear_hide_timer();
+}
+
+static Eina_Bool _clear_hide_timer()
+{
+ if (_hide_timer)
+ {
+ecore_timer_del(_hide_timer);
+_hide_timer = NULL;
+return EINA_TRUE;
+ }
+
+ return EINA_FALSE;
+}
+
+static void _send_input_panel_hide_request(Ecore_IMF_Context *ctx)
+{
+ WaylandIMContext *imcontext = (WaylandIMContext
*)ecore_imf_context_data_get(ctx);
+ if (imcontext && imcontext->text_input)
+ wl_text_input_hide_input_panel(imcontext->text_input);
+}
+
+static Eina_Bool _hide_timer_handler(void *data)
+{
+ Ecore_IMF_Context *ctx = (Ecore_IMF_Context *)data;
+ _send_input_panel_hide_request(ctx);
+
+ _hide_timer = NULL;
+ return ECORE_CALLBACK_CANCEL;
+}
+
+static void _input_panel_hide_timer_start(void *data)
+{
+ if (!_hide_timer)
+ _hide_timer = ecore_timer_add(HIDE_TIMER_INTERVAL, _hide_timer_handler,
data);
+}
+
+static void _input_panel_hide(Ecore_IMF_Context *ctx, Eina_Bool instant)
+{
+ if (instant || (_hide_timer && ecore_timer_pending_get(_hide_timer) <= 0.0))
+ {
+_clear_hide_timer();
+_send_input_panel_hide_request(ctx);
+ }
+ else
+ {
+_input_panel_hide_timer_start(ctx);
+ }
}
static Eina_Bool
@@ -311,6 +365,7 @@ show_input_panel(Ecore_IMF_Context *ctx)
if (ecore_imf_context_input_panel_enabled_get(ctx))
{
+_clear_hide_timer();
wl_text_input_show_input_panel(imcontext->text_input);
wl_text_input_activate(imcontext->text_input, seat,
ecore_wl2_window_surface_get(imcontext->window));
@@ -715,7 +770,7 @@ wayland_im_context_focus_out(Ecore_IMF_Context *ctx)
if (imcontext->text_input)
{
if (ecore_imf_context_input_panel_enabled_get(ctx))
- wl_text_input_hide_input_panel(imcontext->text_input);
+ _input_panel_hide(ctx, EINA_FALSE);
wl_text_input_deactivate(imcontext->text_input,
ecore_wl2_input_seat_get(imcontext->input));
@@ -828,7 +883,10 @@ wayland_im_context_show(Ecore_IMF_Context *ctx)
EINA_LOG_DOM_INFO(_ecore_imf_wayland_log_dom, "context_show");
if (imcontext->text_input)
- wl_text_input_show_input_panel(imcontext->text_input);
+ {
+_clear_hide_timer();
+wl_text_input_show_input_panel(imcontext->text_input);
+ }
}
EAPI void
--
[EGIT] [tools/enventor] master 01/01: Here, it comes with new design of enventor logo.
hermet pushed a commit to branch master. http://git.enlightenment.org/tools/enventor.git/commit/?id=0627ab6b5176fb6d6280f08099278dd80e3d8a2b commit 0627ab6b5176fb6d6280f08099278dd80e3d8a2b Author: Hermet Park Date: Thu Feb 4 14:38:05 2016 +0900 Here, it comes with new design of enventor logo. --- AUTHORS| 1 + data/about/ABOUT | 1 + data/icon/enventor.png | Bin 67812 -> 5151 bytes data/images/ENVENTOR_EMBEDDED_LOGO.png | Bin 67812 -> 39650 bytes data/themes/default/images/logo.png| Bin 67812 -> 5151 bytes 5 files changed, 2 insertions(+) diff --git a/AUTHORS b/AUTHORS index a318704..6b5e01b 100644 --- a/AUTHORS +++ b/AUTHORS @@ -23,3 +23,4 @@ Vincent Torri Stephen Houston Jee-Yong Um Tae-Hyup Kim +Yurii Tsivun diff --git a/data/about/ABOUT b/data/about/ABOUT index 10e0d79..7740b26 100644 --- a/data/about/ABOUT +++ b/data/about/ABOUT @@ -84,6 +84,7 @@ Kateryna Fesyna Yunho Jeong Mincheol Seo Raoul Hecky +Yurii Tsivun And various contributors (See AUTHORS) diff --git a/data/icon/enventor.png b/data/icon/enventor.png index af8fd2f..725990a 100644 Binary files a/data/icon/enventor.png and b/data/icon/enventor.png differ diff --git a/data/images/ENVENTOR_EMBEDDED_LOGO.png b/data/images/ENVENTOR_EMBEDDED_LOGO.png index af8fd2f..fe12617 100644 Binary files a/data/images/ENVENTOR_EMBEDDED_LOGO.png and b/data/images/ENVENTOR_EMBEDDED_LOGO.png differ diff --git a/data/themes/default/images/logo.png b/data/themes/default/images/logo.png index af8fd2f..725990a 100644 Binary files a/data/themes/default/images/logo.png and b/data/themes/default/images/logo.png differ --
[EGIT] [tools/enventor] master 01/01: update enventor menu design.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=ca031579278d53161c8b7300e93da0324ce71b06
commit ca031579278d53161c8b7300e93da0324ce71b06
Author: Hermet Park
Date: Thu Feb 4 15:18:18 2016 +0900
update enventor menu design.
---
data/themes/default/images/Makefile.am | 1 +
data/themes/default/images/full_logo.png | Bin 0 -> 39650 bytes
data/themes/default/layout_common.edc| 29 +
3 files changed, 10 insertions(+), 20 deletions(-)
diff --git a/data/themes/default/images/Makefile.am
b/data/themes/default/images/Makefile.am
index c5f9571..727aaf0 100644
--- a/data/themes/default/images/Makefile.am
+++ b/data/themes/default/images/Makefile.am
@@ -20,6 +20,7 @@ EXTRA_DIST = \
holes_tiny_vert.png \
inset_shadow.png \
logo.png \
+ full_logo.png \
frame_bg.png \
part_highlight.png \
preference.png \
diff --git a/data/themes/default/images/full_logo.png
b/data/themes/default/images/full_logo.png
new file mode 100644
index 000..fe12617
Binary files /dev/null and b/data/themes/default/images/full_logo.png differ
diff --git a/data/themes/default/layout_common.edc
b/data/themes/default/layout_common.edc
index 30f0184..ca42f4f 100644
--- a/data/themes/default/layout_common.edc
+++ b/data/themes/default/layout_common.edc
@@ -9,6 +9,7 @@ images {
image: "disabler.png" COMP;
image: "bevel_out.png" COMP;
image: "pm_fill.png" COMP;
+ image: "full_logo.png" COMP;
}
group { name: "about_layout";
@@ -765,30 +766,18 @@ group { name: "menu_layout";
rel2.relative: 0.5 1;
}
}
- part { name: "title";
- type: TEXT;
+ image { "logo";
scale: 1;
- effect: GLOW;
clip_to: "clipper";
- description { state: "default" 0.0;
-rel1.relative: 0 0;
-rel2.relative: 1 0;
-rel1.to_x: "base_frame";
-rel2.to_x: "base_frame";
+ desc { "default";
+rel1.relative: 0.5 0;
+rel2.relative: 0.5 0;
rel1.to_y: "padding1";
rel2.to_y: "padding1";
-min: 0 120;
-fixed: 0 1;
-align: 1 1;
-text {
- font: FN;
- text: "Enventor Menu";
- size: 28;
- align: 0.5 1;
- min: 1 0;
- ellipsis: -1;
-}
-color: COL_HI;
+min: 350 200;
+fixed: 1 1;
+align: 0.5 0.8;
+image.normal: "full_logo.png";
}
}
part { name: "padding1";
--
[EGIT] [tools/enventor] master 01/01: status: disable status when menus were enabled.
hermet pushed a commit to branch master.
http://git.enlightenment.org/tools/enventor.git/commit/?id=9974c8bcb690d90a6030bea2f5bc4a908d28f090
commit 9974c8bcb690d90a6030bea2f5bc4a908d28f090
Author: Hermet Park
Date: Thu Feb 4 15:35:38 2016 +0900
status: disable status when menus were enabled.
---
src/bin/menu.c | 8 +++-
src/bin/statusbar.c | 7 +++
src/include/statusbar.h | 1 +
3 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/src/bin/menu.c b/src/bin/menu.c
index 3e3be05..b46d2a7 100644
--- a/src/bin/menu.c
+++ b/src/bin/menu.c
@@ -61,6 +61,7 @@ menu_close(menu_data *md)
if (!md->menu_layout) return;
elm_object_signal_emit(md->menu_layout, "elm,state,dismiss", "");
+ stats_disabled_set(EINA_FALSE);
tools_menu_update(EINA_FALSE);
}
@@ -636,6 +637,7 @@ menu_open(menu_data *md)
elm_object_part_content_set(layout, "elm.swallow.exit_btn", btn);
tools_menu_update(EINA_TRUE);
+ stats_disabled_set(EINA_TRUE);
md->menu_layout = layout;
md->active_request++;
@@ -788,7 +790,10 @@ menu_deactivate_request(void)
md->active_request--;
if (md->active_request == 0)
- enventor_object_focus_set(base_enventor_get(), EINA_TRUE);
+ {
+enventor_object_focus_set(base_enventor_get(), EINA_TRUE);
+stats_disabled_set(EINA_FALSE);
+ }
if (!md->menu_layout) return;
elm_object_disabled_set(md->menu_layout, EINA_FALSE);
elm_object_focus_set(md->menu_layout, EINA_TRUE);
@@ -799,5 +804,6 @@ menu_activate_request(void)
{
menu_data *md = g_md;
if (md->menu_layout) elm_object_disabled_set(md->menu_layout, EINA_TRUE);
+ stats_disabled_set(EINA_TRUE);
md->active_request++;
}
diff --git a/src/bin/statusbar.c b/src/bin/statusbar.c
index d618429..254afdc 100644
--- a/src/bin/statusbar.c
+++ b/src/bin/statusbar.c
@@ -232,3 +232,10 @@ stats_ctxpopup_dismiss(void)
}
return EINA_FALSE;
}
+
+void
+stats_disabled_set(Eina_Bool disabled)
+{
+ stats_data *sd = g_sd;
+ elm_object_disabled_set(sd->layout, disabled);
+}
diff --git a/src/include/statusbar.h b/src/include/statusbar.h
index 8732ccb..ae54c19 100644
--- a/src/include/statusbar.h
+++ b/src/include/statusbar.h
@@ -9,3 +9,4 @@ Evas_Object *stats_obj_get(void);
void stats_edc_group_update(const char *group_name);
Eina_Stringshare *stats_group_name_get(void);
Eina_Bool stats_ctxpopup_dismiss(void);
+void stats_disabled_set(Eina_Bool disabled);
--
