[EGIT] [core/efl] master 01/01: Evas gl: Add support for S3TC textures
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=b0df3079276b542d2264af4413ff9cedfb098f89
commit b0df3079276b542d2264af4413ff9cedfb098f89
Author: Jean-Philippe Andre jp.an...@samsung.com
Date: Mon Jun 30 15:10:07 2014 +0900
Evas gl: Add support for S3TC textures
Add support for DXT1, DXT3 and DXT5 textures (4 formats in total).
@feature Add support for S3TC textures if the GPU supports them
---
src/lib/evas/common/evas_image_main.c | 6 ++
.../evas/engines/gl_common/evas_gl_common.h| 18 -
.../evas/engines/gl_common/evas_gl_context.c | 6 ++
src/modules/evas/engines/gl_common/evas_gl_image.c | 94 --
.../evas/engines/gl_common/evas_gl_texture.c | 45 ++-
src/modules/evas/loaders/dds/evas_image_load_dds.c | 6 +-
6 files changed, 124 insertions(+), 51 deletions(-)
diff --git a/src/lib/evas/common/evas_image_main.c
b/src/lib/evas/common/evas_image_main.c
index faabda4..c911d3f 100644
--- a/src/lib/evas/common/evas_image_main.c
+++ b/src/lib/evas/common/evas_image_main.c
@@ -130,10 +130,16 @@ _evas_common_rgba_image_surface_size(unsigned int w,
unsigned int h,
case EVAS_COLORSPACE_GRY8: siz = w * h * sizeof(DATA8); break;
case EVAS_COLORSPACE_AGRY88: siz = w * h * sizeof(DATA16); break;
case EVAS_COLORSPACE_RGBA8_ETC2_EAC:
+ case EVAS_COLORSPACE_RGBA_S3TC_DXT2:
+ case EVAS_COLORSPACE_RGBA_S3TC_DXT3:
+ case EVAS_COLORSPACE_RGBA_S3TC_DXT4:
+ case EVAS_COLORSPACE_RGBA_S3TC_DXT5:
block_size = 16;
// fallthrough
case EVAS_COLORSPACE_ETC1:
case EVAS_COLORSPACE_RGB8_ETC2:
+ case EVAS_COLORSPACE_RGB_S3TC_DXT1:
+ case EVAS_COLORSPACE_RGBA_S3TC_DXT1:
reset_borders = EINA_FALSE;
if (l r t b)
{
diff --git a/src/modules/evas/engines/gl_common/evas_gl_common.h
b/src/modules/evas/engines/gl_common/evas_gl_common.h
index 4e9fe63..fb1281e 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_common.h
+++ b/src/modules/evas/engines/gl_common/evas_gl_common.h
@@ -120,7 +120,18 @@
#ifndef GL_COMPRESSED_RGBA8_ETC2_EAC
# define GL_COMPRESSED_RGBA8_ETC2_EAC 0x9278
#endif
-
+#ifndef GL_COMPRESSED_RGB_S3TC_DXT1_EXT
+# define GL_COMPRESSED_RGB_S3TC_DXT1_EXT 0x83F0
+#endif
+#ifndef GL_COMPRESSED_RGBA_S3TC_DXT1_EXT
+# define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT 0x83F1
+#endif
+#ifndef GL_COMPRESSED_RGBA_S3TC_DXT3_EXT
+# define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT 0x83F2
+#endif
+#ifndef GL_COMPRESSED_RGBA_S3TC_DXT5_EXT
+# define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT 0x83F3
+#endif
#ifndef GL_UNPACK_ROW_LENGTH
# define GL_UNPACK_ROW_LENGTH 0x0cf2
@@ -379,6 +390,7 @@ struct _Evas_GL_Shared
Eina_Bool etc1 : 1;
Eina_Bool etc2 : 1;
Eina_Bool etc1_subimage : 1;
+ Eina_Bool s3tc : 1;
// tuning params - per gpu/cpu combo?
#define MAX_CUTOUT 512
#define DEF_CUTOUT 512
@@ -403,6 +415,8 @@ struct _Evas_GL_Shared
#define MAX_ATLAS_H512
#define DEF_ATLAS_H 512
+ Eina_List *cspaces; // depend on the values of etc1, etc2 and st3c
+
struct {
struct {
int max;
@@ -421,7 +435,7 @@ struct _Evas_GL_Shared
struct {
Eina_List *whole;
- Eina_List *atlas[6];
+ Eina_List *atlas[10];
} tex;
Eina_Hash *native_pm_hash;
diff --git a/src/modules/evas/engines/gl_common/evas_gl_context.c
b/src/modules/evas/engines/gl_common/evas_gl_context.c
index 6c2e9b0..e24d2ba 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_context.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_context.c
@@ -625,6 +625,9 @@ evas_gl_common_context_new(void)
#endif
if (strstr((char *)ext, OES_compressed_ETC1_RGB8_texture))
shared-info.etc1 = 1;
+ if (strstr((char *)ext, GL_EXT_texture_compression_s3tc) ||
+ strstr((char *)ext, GL_S3_s3tc))
+ shared-info.s3tc = 1;
#ifdef GL_GLES
// FIXME: there should be an extension name/string to check for
// not just symbols in the lib
@@ -761,6 +764,7 @@ evas_gl_common_context_new(void)
bgra : %i\n
etc1 : %i\n
etc2 : %i%s\n
+ s3tc : %i\n
max ansiotropic filtering: %3.3f\n
egl sec map image: %i\n
max vertex count: %i\n
@@ -781,6 +785,7 @@ evas_gl_common_context_new(void)
(int)shared-info.bgra,
(int)shared-info.etc1,
(int)shared-info.etc2, shared-info.etc2 ?
(GL_COMPRESSED_RGB8_ETC2, GL_COMPRESSED_RGBA8_ETC2_EAC) : ,
+ (int)shared-info.s3tc,
(double)shared-info.anisotropic,
(int)shared-info.sec_image_map,
(int)shared-info.max_vertex_elements,
[EGIT] [core/efl] master 02/02: edje: Edje-Edit: edje_edit_state_map_perspective_xet()
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=ddac21534f9eaa8bc01f8c72c1bff5926de27bd6
commit ddac21534f9eaa8bc01f8c72c1bff5926de27bd6
Author: Igor Gala i.g...@samsung.com
Date: Thu Jul 3 16:23:15 2014 +0900
edje: Edje-Edit: edje_edit_state_map_perspective_xet()
Summary:
There are new 'get and set' API for block 'map'.
Those functions return or set part's name which is used as 'perspective
point'
for giving a part '3d look'.
@feature
Reviewers: seoz, cedric, raster, Hermet
CC: reutskiy.v.v, cedric
Differential Revision: https://phab.enlightenment.org/D1047
---
src/lib/edje/Edje_Edit.h | 35 +++
src/lib/edje/edje_edit.c | 34 ++
2 files changed, 69 insertions(+)
diff --git a/src/lib/edje/Edje_Edit.h b/src/lib/edje/Edje_Edit.h
index 5330618..db5c9c1 100644
--- a/src/lib/edje/Edje_Edit.h
+++ b/src/lib/edje/Edje_Edit.h
@@ -3271,6 +3271,41 @@ EAPI Eina_Bool edje_edit_state_limit_set(Evas_Object
*obj, const char *part, con
*/
EAPI unsigned char edje_edit_state_limit_get(Evas_Object *obj, const char
*part, const char *state, double value);
+//@}
+/**/
+/** MAP API /
+/**/
+/** @name Map API
+ * Functions to deal with objects with rotation properties (see @ref edcref).
+ */ //@{
+
+/** Get the part's name that is used as the 'perspective point'.
+ *
+ * @param obj Object being edited.
+ * @param part The name of the part.
+ * @param state The name of the state to get perspective (not including the
state value).
+ * @param value The state value.
+ *
+ * @return The name of the source part that is used as 'perspective point'.
+ * @since 1.11
+ */
+EAPI const char *
+edje_edit_state_map_perspective_get(Evas_Object *obj, const char *part, const
char *state, double value);
+
+/** Set the part's name that is used as the 'perspective point'.
+ *
+ * @param obj Object being edited.
+ * @param part The name of the part.
+ * @param state The name of the state to get perspective (not including the
state value).
+ * @param value The state value.
+ * @param source_part The source part's name.
+ *
+ * @return @cEINA_TRUE in case of success, @cEINA_FALSE otherwise.
+ * @since 1.11
+ */
+EAPI Eina_Bool
+edje_edit_state_map_perspective_set(Evas_Object *obj, const char *part, const
char *state, double value, const char *source_part);
+
/** Get the part's name that is used as the 'light' for calculating the
brightness.
*
* @param obj Object being edited.
diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c
index bac6127..9ebd81e 100644
--- a/src/lib/edje/edje_edit.c
+++ b/src/lib/edje/edje_edit.c
@@ -5993,6 +5993,40 @@ edje_edit_state_map_rotation_center_set(Evas_Object
*obj, const char *part, cons
}
/**/
+/* MAP API */
+/**/
+
+EAPI const char *
+edje_edit_state_map_perspective_get(Evas_Object *obj, const char *part, const
char *state, double value)
+{
+ Edje_Real_Part *erl;
+
+ GET_PD_OR_RETURN(NULL);
+
+ erl = ed-table_parts[pd-map.id_persp % ed-table_parts_size];
+ if (erl-part-name)
+ return eina_stringshare_add(erl-part-name);
+
+ return NULL;
+}
+
+EAPI Eina_Bool
+edje_edit_state_map_perspective_set(Evas_Object *obj, const char *part, const
char *state, double value, const char *source_part)
+{
+ int src_id;
+
+ if (!source_part) return EINA_FALSE;
+ GET_PD_OR_RETURN(EINA_FALSE);
+
+ src_id = _edje_part_id_find(ed, source_part);
+ pd-map.id_persp = src_id;
+
+ edje_object_calc_force(obj);
+ return EINA_TRUE;
+}
+
+
+/**/
/* TEXT API */
/**/
--
[EGIT] [core/efl] master 01/02: update README to have right version for vest release!
raster pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=2b38608b3a5491f9830ecc36125d03132b25d6be commit 2b38608b3a5491f9830ecc36125d03132b25d6be Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Thu Jul 3 14:15:27 2014 +0900 update README to have right version for vest release! --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index 2a3248c..a41b6e8 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -EFL 1.9.0 +EFL 1.11.0 = ** --
[EGIT] [core/elementary] master 02/02: genlist: focus of genlist item should adjust according to genlist's viewport
raster pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=b58434fc0faf645a26e299d1f68f648acad20299
commit b58434fc0faf645a26e299d1f68f648acad20299
Author: Anil Kumar Nahak ak.na...@samsung.com
Date: Thu Jul 3 16:39:41 2014 +0900
genlist: focus of genlist item should adjust according to genlist's viewport
Summary: The focus of genlist should adjust its position on
resizing(shrinking).
Reviewers: seoz
Differential Revision: https://phab.enlightenment.org/D1072
---
src/lib/elm_genlist.c | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/lib/elm_genlist.c b/src/lib/elm_genlist.c
index 2d2d1ec..49535eb 100644
--- a/src/lib/elm_genlist.c
+++ b/src/lib/elm_genlist.c
@@ -7487,7 +7487,7 @@ _elm_genlist_elm_widget_focus_highlight_geometry_get(Eo
*obj EINA_UNUSED, Elm_Ge
{
*y = oy;
}
- else if (item_y (oy + oh - item_h))
+ if (item_y (oy + oh - item_h))
{
*y = oy + oh - item_h;
}
@@ -7496,6 +7496,10 @@ _elm_genlist_elm_widget_focus_highlight_geometry_get(Eo
*obj EINA_UNUSED, Elm_Ge
{
*w = item_w - (item_w - ow);
}
+ if (item_x ox)
+ {
+*x = ox;
+ }
}
EOLIAN static Elm_Object_Item *
--
[EGIT] [core/elementary] master 01/02: update README to have right version for vest release!
raster pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=f1cd199ad961056e97475c6d77525c1b37a575c1 commit f1cd199ad961056e97475c6d77525c1b37a575c1 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Thu Jul 3 14:15:44 2014 +0900 update README to have right version for vest release! --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index b55158e..d0e868f 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -Elementary 1.9.0 +Elementary 1.11.0 ** --
[EGIT] [core/efl] master 01/01: Edje_Edit: added API for group.limits
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=8c74a8fbb04243df53eb195c1a2f992287723371
commit 8c74a8fbb04243df53eb195c1a2f992287723371
Author: Andrii Kroitor an.kroi...@samsung.com
Date: Thu Jul 3 16:54:44 2014 +0900
Edje_Edit: added API for group.limits
Summary:
added functions:
edje_edit_group_limits_vertical_list_get
edje_edit_group_limits_vertical_add
edje_edit_group_limits_vertical_del
edje_edit_group_limits_horizontal_list_get
edje_edit_group_limits_horizontal_add
edje_edit_group_limits_horizontal_del
edje_edit_limits_list_free
Reviewers: cedric, seoz, raster, Hermet
CC: reutskiy.v.v, cedric
Differential Revision: https://phab.enlightenment.org/D1073
---
src/lib/edje/Edje_Edit.h | 71
src/lib/edje/edje_edit.c | 95
2 files changed, 166 insertions(+)
diff --git a/src/lib/edje/Edje_Edit.h b/src/lib/edje/Edje_Edit.h
index db5c9c1..f5b3ced 100644
--- a/src/lib/edje/Edje_Edit.h
+++ b/src/lib/edje/Edje_Edit.h
@@ -85,6 +85,13 @@ struct _Edje_Part_Image_Use
};
typedef struct _Edje_Part_Image_Use Edje_Part_Image_Use;
+struct _Edje_Edit_Limit
+{
+ Eina_Stringshare *name;
+ int value;
+};
+typedef struct _Edje_Edit_Limit Edje_Edit_Limit;
+
/**
* @file
* @brief Functions to deal with edje internal object. Don't use in standard
@@ -402,6 +409,70 @@ EAPI Eina_Bool
edje_edit_group_broadcast_signal_get(Evas_Object *obj);
EAPI Eina_Bool edje_edit_group_broadcast_signal_set(Evas_Object *obj,
Eina_Bool bs);
//@}
+
+
+/** Retrieves a list with the item names inside the vertical limits block at
the group level.
+ *
+ * @param obj Object being edited.
+ *
+ * @return List of strings, each being a name of vertical limit in the limits
block for the group.
+ */
+EAPI Eina_List * edje_edit_group_limits_vertical_list_get(Evas_Object *obj);
+
+/** Delete given pair name-value from the vertical limits block at the group
level.
+ *
+ * @param obj Object being edited.
+ * @param name Limit name.
+ * @param value Limit value.
+ *
+ * @return @c EINA_TRUE if successful, @c EINA_FALSE otherwise.
+ */
+EAPI Eina_Bool edje_edit_group_limits_vertical_del(Evas_Object *obj, const
char *name, int value);
+
+/** Add given pair name-value to the vertical limits block at the group level.
+ *
+ * @param obj Object being edited.
+ * @param name Limit name.
+ * @param value Limit value.
+ *
+ * @return @c EINA_TRUE if successful, @c EINA_FALSE otherwise.
+ */
+EAPI Eina_Bool edje_edit_group_limits_vertical_add(Evas_Object *obj, const
char *name, int value);
+
+/** Retrieves a list with the item names inside the horizontal limits block at
the group level.
+ *
+ * @param obj Object being edited.
+ *
+ * @return List of strings, each being a name of horizontal limit in the
limits block for the group.
+ */
+EAPI Eina_List * edje_edit_group_limits_horizontal_list_get(Evas_Object *obj);
+
+/** Delete given pair name-value from the horizontal limits block at the group
level.
+ *
+ * @param obj Object being edited.
+ * @param name Limit name.
+ * @param value Limit value.
+ *
+ * @return @c EINA_TRUE if successful, @c EINA_FALSE otherwise.
+ */
+EAPI Eina_Bool edje_edit_group_limits_horizontal_del(Evas_Object *obj, const
char *name, int value);
+
+/** Add given pair name-value to the horizontal limits block at the group
level.
+ *
+ * @param obj Object being edited.
+ * @param name Limit name.
+ * @param value Limit value.
+ *
+ * @return @c EINA_TRUE if successful, @c EINA_FALSE otherwise.
+ */
+EAPI Eina_Bool edje_edit_group_limits_horizontal_add(Evas_Object *obj, const
char *name, int value);
+
+/** Free an Eina_List of (Edje_Edit_List *) allocated by an
edje_edit_limits_vertical_list_get() or edje_edit_limits_horizontal_list_get()
functions.
+ *
+ * @param lst List to free.
+ */
+EAPI void edje_edit_limits_list_free(Eina_List *lst);
+
/**/
/** ALIAS API
**/
/**/
diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c
index 9ebd81e..d62939a 100644
--- a/src/lib/edje/edje_edit.c
+++ b/src/lib/edje/edje_edit.c
@@ -1872,6 +1872,101 @@ edje_edit_group_broadcast_signal_set(Evas_Object *obj,
Eina_Bool bs)
return EINA_TRUE;
}
+#define LIMITS(TYPE) \
+EAPI Eina_List * \
+edje_edit_group_limits_##TYPE##_list_get(Evas_Object * obj) \
+{ \
+ Eina_List *limits = NULL; \
+ unsigned int i; \
+ Edje_Edit_Limit *lim; \
+ \
+ GET_ED_OR_RETURN(NULL); \
+ \
+ if (!ed-file || !ed-collection) \
+ return NULL; \
+ lim = calloc(ed-collection-limits.TYPE##_count, sizeof(Edje_Edit_Limit));
\
+ for(i = 0; i ed-collection-limits.TYPE##_count; i++) \
+ { \
+
[EGIT] [core/efl] master 01/01: edje_edit: Add edje_edit_part_item_aspect_mode functions.
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=2155e8a3fb5e16eb5e6743b47a929e7395698c8e
commit 2155e8a3fb5e16eb5e6743b47a929e7395698c8e
Author: Vorobiov Vitalii vi.vorob...@samsung.com
Date: Thu Jul 3 16:59:16 2014 +0900
edje_edit: Add edje_edit_part_item_aspect_mode functions.
Summary:
Add two main functions for TABLE and BOX part items:
- edje_edit_part_item_aspect_mode_get
- edje_edit_part_item_aspect_mode_set
Also add support to generate source code of changed aspect mode for an item
@feature
Reviewers: cedric, Hermet, seoz, raster
CC: reutskiy.v.v, cedric
Differential Revision: https://phab.enlightenment.org/D1075
---
src/lib/edje/Edje_Edit.h | 39 +
src/lib/edje/edje_edit.c | 65 +++-
2 files changed, 103 insertions(+), 1 deletion(-)
diff --git a/src/lib/edje/Edje_Edit.h b/src/lib/edje/Edje_Edit.h
index f5b3ced..b21f459 100644
--- a/src/lib/edje/Edje_Edit.h
+++ b/src/lib/edje/Edje_Edit.h
@@ -1911,6 +1911,45 @@ EAPI Eina_Bool
edje_edit_part_item_aspect_h_set(Evas_Object *obj, const char *pa
*/
EAPI int edje_edit_part_item_prefer_w_get(Evas_Object *obj, const char *part,
const char *item);
+/** Get aspect mode for an item of TABLE or BOX.
+ *
+ * This may return next values:
+ * - EDJE_ASPECT_CONTROL_NONE
+ * - EDJE_ASPECT_CONTROL_NEITHER
+ * - EDJE_ASPECT_CONTROL_HORIZONTAL
+ * - EDJE_ASPECT_CONTROL_VERTICAL
+ * - EDJE_ASPECT_CONTROL_BOTH
+ *
+ * @param obj Object being edited.
+ * @param part Part that contain item.
+ * @param item The name of the item to set aspect mode.
+ *
+ * @return One of possible enum Edje_Aspect_Control.
+ * @since 1.11
+ */
+EAPI Edje_Aspect_Control
+edje_edit_part_item_aspect_mode_get(Evas_Object *obj, const char *part, const
char *item);
+
+/** Set aspect mode for an item of TABLE or BOX.
+ *
+ * Mode may be next:
+ * - EDJE_ASPECT_CONTROL_NONE
+ * - EDJE_ASPECT_CONTROL_NEITHER
+ * - EDJE_ASPECT_CONTROL_HORIZONTAL
+ * - EDJE_ASPECT_CONTROL_VERTICAL
+ * - EDJE_ASPECT_CONTROL_BOTH
+ *
+ * @param obj Object being edited.
+ * @param part Part that contain item.
+ * @param item The name of the item to set aspect mode.
+ * @param mode One of possible enum from Edje_Aspect_Control:
+
+ * @return EINA_TRUE if successful, EINA_FALSE otherwise.
+ * @since 1.11
+ */
+EAPI Eina_Bool
+edje_edit_part_item_aspect_mode_set(Evas_Object *obj, const char *part, const
char *item, Edje_Aspect_Control mode);
+
/** Set the prefer width value of a part's item.
*
* @param obj Object being edited.
diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c
index d62939a..bb34cc1 100644
--- a/src/lib/edje/edje_edit.c
+++ b/src/lib/edje/edje_edit.c
@@ -4245,6 +4245,67 @@ FUNC_PART_ITEM_INT(aspect, h, 0);
FUNC_PART_ITEM_INT(prefer, w, 0);
FUNC_PART_ITEM_INT(prefer, h, 0);
+EAPI Edje_Aspect_Control
+edje_edit_part_item_aspect_mode_get(Evas_Object *obj, const char *part, const
char *item_name)
+{
+ Edje_Part *ep;
+ unsigned int i;
+ Edje_Pack_Element *item = NULL;
+
+ if ((!obj) || (!part) || (!item_name))
+ return EDJE_ASPECT_CONTROL_NONE;
+
+ GET_RP_OR_RETURN(EDJE_ASPECT_CONTROL_NONE);
+
+ ep = rp-part;
+ for (i = 0; i ep-items_count; ++i)
+ {
+if (ep-items[i]-name (!strcmp(ep-items[i]-name, item_name)))
+ {
+ item = ep-items[i];
+ break;
+ }
+ }
+ if (!item) return EDJE_ASPECT_CONTROL_NONE;
+
+ return item-aspect.mode;
+
+}
+
+EAPI Eina_Bool
+edje_edit_part_item_aspect_mode_set(Evas_Object *obj, const char *part, const
char *item_name, Edje_Aspect_Control mode)
+{
+ Edje_Part *ep;
+ unsigned int i;
+ Edje_Pack_Element *item = NULL;
+
+ if ((!obj) || (!part) || (!item_name))
+ return EINA_FALSE;
+
+ GET_RP_OR_RETURN(EINA_FALSE);
+
+ if ((rp-part-type != EDJE_PART_TYPE_BOX)
+ (rp-part-type != EDJE_PART_TYPE_TABLE))
+ return EINA_FALSE;
+
+ ep = rp-part;
+
+ for (i = 0; i ep-items_count; ++i)
+ {
+if (ep-items[i]-name (!strcmp(ep-items[i]-name, item_name)))
+ {
+ item = ep-items[i];
+ break;
+ }
+ }
+ if (!item) return EINA_FALSE;
+
+ item-aspect.mode = mode;
+
+ return EINA_TRUE;
+
+}
+
EAPI Eina_Bool
edje_edit_part_item_padding_get(Evas_Object *obj, const char *part, const char
*item_name, int *l, int *r, int *t, int *b)
{
@@ -9039,6 +9100,7 @@ static const char *effects[] = {NONE, PLAIN,
OUTLINE, SOFT_OUTLINE, SHA
static const char *shadow_direction[] = {BOTTOM_RIGHT, BOTTOM,
BOTTOM_LEFT, LEFT, TOP_LEFT, TOP, TOP_RIGHT, RIGHT};
static const char *prefers[] = {NONE, VERTICAL, HORIZONTAL, BOTH};
static const char *entry_mode[] = {NONE, PLAIN, EDITABLE, PASSWORD};
+static const char *aspect_mode[] = {NONE, NEITHER, HORIZONTAL,
VERTICAL, BOTH};
static Eina_Bool
_edje_generate_source_of_group(Edje
[EGIT] [core/efl] master 01/01: edje_edit: Add edje_edit_part_item_position_get/set.
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=8b66dc0e7c27984e9118e966cafe141de15cdf46
commit 8b66dc0e7c27984e9118e966cafe141de15cdf46
Author: Maksym Volodin m.volo...@samsung.com
Date: Thu Jul 3 17:15:10 2014 +0900
edje_edit: Add edje_edit_part_item_position_get/set.
Summary: Edje_edit_part_item_position_set/get operates with column/row
part`s item position, only for TABLE type part.
Reviewers: seoz, raster, cedric, Hermet, reutskiy.v.v
CC: reutskiy.v.v, cedric, c
Differential Revision: https://phab.enlightenment.org/D1078
---
src/lib/edje/Edje_Edit.h | 26 +
src/lib/edje/edje_edit.c | 60 ++--
2 files changed, 84 insertions(+), 2 deletions(-)
diff --git a/src/lib/edje/Edje_Edit.h b/src/lib/edje/Edje_Edit.h
index b21f459..39058d6 100644
--- a/src/lib/edje/Edje_Edit.h
+++ b/src/lib/edje/Edje_Edit.h
@@ -2057,6 +2057,32 @@ EAPI double edje_edit_part_item_align_y_get(Evas_Object
*obj, const char *part,
*/
EAPI Eina_Bool edje_edit_part_item_align_y_set(Evas_Object *obj, const char
*part, const char *item, double align_y);
+/** Get column/row position of the part's item.
+ *
+ * @param obj Object being edited.
+ * @param part Part that contain item.
+ * @param item_name The name of the item.
+ * @param col Column item position.
+ * @param row Row item position.
+ *
+ * @return @c EINA_TRUE If successfull, @c EINA_FALSE otherwise.
+ * @since 1.11
+ */
+EAPI Eina_Bool edje_edit_part_item_position_get(Evas_Object *obj, const char
*part, const char *item_name, unsigned short *col, unsigned short *row);
+
+/** Set column/row position of a new part's item.
+ *
+ * @param obj Object being edited.
+ * @param part Part that contain item.
+ * @param item_name The name of the item.
+ * @param col Column item position.
+ * @param row Row item position.
+ *
+ * @return @c EINA_TRUE If successfull, @c EINA_FALSE otherwise.
+ * @since 1.11
+ */
+EAPI Eina_Bool edje_edit_part_item_position_set(Evas_Object *obj, const char
*part, const char *item_name, unsigned short col, unsigned short row);
+
//@}
/**/
/** STATES API
/
diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c
index bb34cc1..8f4e526 100644
--- a/src/lib/edje/edje_edit.c
+++ b/src/lib/edje/edje_edit.c
@@ -4427,6 +4427,61 @@ FUNC_PART_ITEM_DOUBLE(align_y, align.y);
#undef FUNC_PART_ITEM_DOUBLE
+EAPI Eina_Bool
+edje_edit_part_item_position_get(Evas_Object *obj, const char *part,
+ const char *item_name,
+ unsigned short *col,
+ unsigned short *row)
+ {
+ Edje_Part *ep;
+ unsigned int i;
+ Edje_Pack_Element *item = NULL;
+ if ((!obj) || (!part) || (!item_name))
+ return EINA_FALSE;
+ GET_RP_OR_RETURN(EINA_FALSE);
+ ep = rp-part;
+ for (i = 0; i ep-items_count; ++i)
+ {
+ if (ep-items[i]-name (!strcmp(ep-items[i]-name, item_name)))
+{
+ item = ep-items[i];
+ break;
+}
+ }
+ if (!item) return EINA_FALSE;
+ *col = item-col;
+ *row = item-row;
+ return EINA_TRUE;
+ }
+EAPI Eina_Bool
+edje_edit_part_item_position_set(Evas_Object *obj, const char *part,
+ const char *item_name,
+ unsigned short col,
+ unsigned short row)
+ {
+ Edje_Part *ep;
+ unsigned int i;
+ Edje_Pack_Element *item = NULL;
+ if ((!obj) || (!part) || (!item_name))
+ return EINA_FALSE;
+ GET_RP_OR_RETURN(EINA_FALSE);
+ ep = rp-part;
+ if (rp-part-type != EDJE_PART_TYPE_TABLE)
+ return EINA_FALSE;
+ for (i = 0; i ep-items_count; ++i)
+ {
+ if (ep-items[i]-name (!strcmp(ep-items[i]-name, item_name)))
+{
+ item = ep-items[i];
+ break;
+}
+ }
+ if (!item) return EINA_FALSE;
+ item-col = col;
+ item-row = row;
+ return EINA_TRUE;
+ }
+
/*/
/* PART STATES API */
/*/
@@ -10054,10 +10109,11 @@ _edje_generate_source_of_part(Evas_Object *obj,
Edje_Part *ep, Eina_Strbuf *buf)
if (TO_DOUBLE(item-align.x) != 0.5 ||
TO_DOUBLE(item-align.y) != 0.5)
BUF_APPENDF(I7align: %g %g;\n, TO_DOUBLE(item-align.x),
TO_DOUBLE(item-align.y));
+
+ if (edje_edit_part_type_get(obj, part) ==
EDJE_PART_TYPE_TABLE)
+BUF_APPENDF(I7position: %d %d;\n, item-col, item-row);
//TODO weight
//TODO options
- //TODO col
- //TODO row
//TODO colspan
[EGIT] [core/efl] master 01/01: edje_edit: Add edje_edit_state_map_point_color functions.
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=2447bc35566d48d8a6c959ab065ea5f567fa4cee
commit 2447bc35566d48d8a6c959ab065ea5f567fa4cee
Author: Vorobiov Vitalii vi.vorob...@samsung.com
Date: Thu Jul 3 17:27:52 2014 +0900
edje_edit: Add edje_edit_state_map_point_color functions.
Summary:
Add two main functions for working with map colors of part vertexes/points:
- edje_edit_state_map_point_color_get
- edje_edit_state_map_point_color_set
@feature
Reviewers: seoz, raster, cedric, Hermet
CC: reutskiy.v.v, cedric
Differential Revision: https://phab.enlightenment.org/D1086
---
src/lib/edje/Edje_Edit.h | 48
src/lib/edje/edje_edit.c | 82
2 files changed, 130 insertions(+)
diff --git a/src/lib/edje/Edje_Edit.h b/src/lib/edje/Edje_Edit.h
index 39058d6..0214b3a 100644
--- a/src/lib/edje/Edje_Edit.h
+++ b/src/lib/edje/Edje_Edit.h
@@ -3690,6 +3690,54 @@ edje_edit_state_map_rotation_center_get(Evas_Object
*obj, const char *part, cons
EAPI Eina_Bool
edje_edit_state_map_rotation_center_set(Evas_Object *obj, const char *part,
const char *state, double value, const char *source_part);
+/** This sets the color for vertex/point of the current part.
+ * For more detailed information please @see evas_map_point_color_set().
+ *
+ * In edje there is (currently) only 4 main point:
+ * - Top-Left (0), Top-Right (1), Bottom-Right (2), Bottom-Left (3).
+ *
+ * Default value is 255 255 255 255 for every point.
+ *
+ * @param obj Object being edited.
+ * @param part The name of the part.
+ * @param state The name of the state (not including the state value).
+ * @param value The state value.
+ * @param idx The index of point.
+ * @param r The red value to set.
+ * @param g The green color value to set.
+ * @param b The blue color value to set.
+ * @param a The alpha color value to set.
+ *
+ * @return EINA_TRUE in case of success, EINA_FALSE otherwise.
+ * @since 1.11
+ **/
+EAPI Eina_Bool
+edje_edit_state_map_point_color_set(Evas_Object *obj, const char *part, const
char *state, double value, int idx, int r, int g, int b, int a);
+
+/** This gets the color of given vertex/point of the current part.
+ * For more detailed information please @see evas_map_point_color_set().
+ *
+ * In edje there is (currently) only 4 main point:
+ * - Top-Left (0), Top-Right (1), Bottom-Right (2), Bottom-Left (3).
+ *
+ * Default value is 255 255 255 255 for every point.
+ *
+ * @param obj Object being edited.
+ * @param part The name of the part.
+ * @param state The name of the state (not including the state value).
+ * @param value The state value.
+ * @param idx The index of point.
+ * @param r The red value to get.
+ * @param g The green color value to get.
+ * @param b The blue color value to get.
+ * @param a The alpha color value to get.
+ *
+ * @return EINA_TRUE in case of success, EINA_FALSE otherwise.
+ * @since 1.11
+ **/
+EAPI Eina_Bool
+edje_edit_state_map_point_color_get(Evas_Object *obj, const char *part, const
char *state, double value, int idx, int *r, int *g, int *b, int *a);
+
/** Set the source part for given part state.
*
* Set source causes the part to use another part content as the content
diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c
index 8f4e526..a701749 100644
--- a/src/lib/edje/edje_edit.c
+++ b/src/lib/edje/edje_edit.c
@@ -6203,6 +6203,88 @@ edje_edit_state_map_rotation_center_set(Evas_Object
*obj, const char *part, cons
return EINA_TRUE;
}
+EAPI Eina_Bool
+edje_edit_state_map_point_color_get(Evas_Object *obj, const char *part, const
char *state, double value, int idx, int *r, int *g, int *b, int *a)
+{
+ Edje_Map_Color *color = NULL;
+ unsigned int i;
+
+ if ((!obj) || (!part) || (!state))
+ return EINA_FALSE;
+
+ GET_PD_OR_RETURN(EINA_FALSE);
+
+ /* check if current color is exists and get it. */
+ for (i = 0; i pd-map.colors_count; ++i)
+ {
+if (pd-map.colors[i]-idx == idx)
+ {
+ color = pd-map.colors[i];
+ break;
+ }
+ }
+ if (!color)
+ {
+if (r) *r = 255;
+if (g) *g = 255;
+if (b) *b = 255;
+if (a) *a = 255;
+ }
+ else
+ {
+if (r) *r = color-r;
+if (g) *g = color-g;
+if (b) *b = color-b;
+if (a) *a = color-a;
+ }
+
+ return EINA_TRUE;
+}
+
+EAPI Eina_Bool
+edje_edit_state_map_point_color_set(Evas_Object *obj, const char *part, const
char *state, double value, int idx, int r, int g, int b, int a)
+{
+ Edje_Map_Color *color = NULL;
+ unsigned int i;
+
+ if ((!obj) || (!part) || (!state))
+ return EINA_FALSE;
+
+ GET_PD_OR_RETURN(EINA_FALSE);
+
+ /* check if current color is exists and get it. */
+ for (i = 0; i pd-map.colors_count; ++i)
+ {
+if (pd-map.colors[i]-idx == idx)
+ {
+
[EGIT] [core/efl] master 01/01: configure.ac: Remove obsolete macros
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=368058cdc71e6f8f042f6326d01e0b3327c6e744
commit 368058cdc71e6f8f042f6326d01e0b3327c6e744
Author: bluezery ohpo...@gmail.com
Date: Thu Jul 3 17:32:10 2014 +0900
configure.ac: Remove obsolete macros
Summary:
AC_HELP_STRING -- AS_HELP_STRING
AC_TRY_COMPILE -- AC_COMPILE_IFELSE + AC_LAGN_PROGRAM
those are deprecated for almost 10 years
autoupdate tool do this automatcally.
@fix
Reviewers: raster, cedric, stefan_schmidt
CC: cedric
Differential Revision: https://phab.enlightenment.org/D1088
---
configure.ac | 178 +--
1 file changed, 63 insertions(+), 115 deletions(-)
diff --git a/configure.ac b/configure.ac
index 9ca05dc..69cd418 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,7 @@ EFL_ENABLE_EO_API_SUPPORT
EFL_ENABLE_BETA_API_SUPPORT
AC_ARG_WITH([api],
- [AC_HELP_STRING([--with-api=@:@eo/legacy/both@:@], [Select the EFL API
Model @:@default=both@:@])],
+ [AS_HELP_STRING([--with-api=@:@eo/legacy/both@:@],[Select the EFL API
Model @:@default=both@:@])],
[efl_api=${withval}],
[efl_api=both])
@@ -59,8 +59,7 @@ AC_SUBST(EFL_API_EO_DEF)
# string to identify the build
AC_ARG_WITH([id],
- [AC_HELP_STRING([--with-id=BUILD_ID],
- [Specify a string to identify the build (vendor,
maintainer, etc).
+ [AS_HELP_STRING([--with-id=BUILD_ID],[Specify a string to identify the
build (vendor, maintainer, etc).
@:@default=none@:@])],
[EFL_BUILD_ID=${withval}],
[EFL_BUILD_ID=none])
@@ -68,8 +67,7 @@ AC_SUBST(EFL_BUILD_ID)
# profile
AC_ARG_WITH([profile],
- [AC_HELP_STRING([--with-profile=PROFILE],
- [use the predefined build profile, one of: dev, debug and
release.
+ [AS_HELP_STRING([--with-profile=PROFILE],[use the predefined build profile,
one of: dev, debug and release.
@:@default=dev@:@])],
[build_profile=${withval}],
[build_profile=def_build_profile])
@@ -92,8 +90,7 @@ esac
# TODO: add some build profile (server, full, etc...)
AC_ARG_WITH([crypto],
- [AC_HELP_STRING([--with-crypto=CRYPTO],
- [use the predefined build crypto, one of:
+ [AS_HELP_STRING([--with-crypto=CRYPTO],[use the predefined build crypto,
one of:
openssl, gnutls or none.
@:@default=openssl@:@])],
[build_crypto=${withval}],
@@ -108,8 +105,7 @@ case ${build_crypto} in
esac
AC_ARG_WITH([tests],
- [AC_HELP_STRING([--with-tests=none|regular|coverage],
- [choose testing method: regular, coverage or none.
+ [AS_HELP_STRING([--with-tests=none|regular|coverage],[choose testing
method: regular, coverage or none.
@:@default=none@:@])],
[build_tests=${withval}],
[build_tests=auto])
@@ -138,8 +134,7 @@ esac
dbusservicedir=${datadir}/dbus-1/services
AC_ARG_WITH([dbus-services],
- [AC_HELP_STRING([--with-dbus-services=DBUS_SERVICES],
- [specify a directory to store dbus service files.])],
+ [AS_HELP_STRING([--with-dbus-services=DBUS_SERVICES],[specify a directory
to store dbus service files.])],
[dbusservicedir=$withval])
AC_SUBST(dbusservicedir)
@@ -366,8 +361,7 @@ AM_CONDITIONAL([HAVE_CRYPTO_OPENSSL], [test
${build_crypto} = openssl])
# check for lua old
want_lua_old=no
AC_ARG_ENABLE([lua-old],
- [AC_HELP_STRING([--enable-lua-old],
- [Enable interpreted Lua support (5.1 or 5.2).
@:@default=disabled@:@])],
+ [AS_HELP_STRING([--enable-lua-old],[Enable interpreted Lua support (5.1 or
5.2). @:@default=disabled@:@])],
[
if test x${enableval} = xyes ; then
want_lua_old=yes
@@ -448,10 +442,8 @@ case ${build_profile} in
AC_MSG_CHECKING([whether -Wshadow generates spurious warnings])
CFLAGS_save=${CFLAGS}
CFLAGS=${CFLAGS} -Werror -Wshadow
- AC_TRY_COMPILE([int x;], [int x = 0; (void)x;],
- [AC_MSG_RESULT([no])
-EFL_CHECK_COMPILER_FLAGS([EFL], [-Wshadow])],
- [AC_MSG_RESULT([yes])])
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[int x;]], [[int x = 0;
(void)x;]])],[AC_MSG_RESULT([no])
+EFL_CHECK_COMPILER_FLAGS([EFL], [-Wshadow])],[AC_MSG_RESULT([yes])])
CFLAGS=${CFLAGS_save}
;;
@@ -477,7 +469,7 @@ build_cpu_neon=no
want_neon=yes
AC_ARG_ENABLE([neon],
- [AC_HELP_STRING([--disable-neon], [disable neon support
@:@default=enable@:@])],
+ [AS_HELP_STRING([--disable-neon],[disable neon support
@:@default=enable@:@])],
[
if test x${enableval} = xyes; then
want_neon=yes
@@ -555,15 +547,12 @@ case $host_cpu in
AC_MSG_CHECKING([whether to use NEON instructions])
CFLAGS_save=${CFLAGS}
CFLAGS=${CFLAGS} -mfpu=neon -ftree-vectorize
- AC_TRY_COMPILE([#include arm_neon.h],
- [asm volatile (vqadd.u8 d0, d1, d0\n)],
-
[EGIT] [core/efl] master 01/01: eo: constructor tests do not use eo_add_custom(..)
jeyzu pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=46a78e8c9d46225f3cd3d6b3c6eca3ab7361f361
commit 46a78e8c9d46225f3cd3d6b3c6eca3ab7361f361
Author: Jérémy Zurcher jer...@asynk.ch
Date: Thu Jul 3 10:41:53 2014 +0200
eo: constructor tests do not use eo_add_custom(..)
as stated in f92e5d50, instead of using eo_add_custom() thus a custom
constructor and maybe overriding the default constructor to block it,
- use the default constructor to build the object
- add calls to eo_add(), to initialize the object
eo_add(class, parent, val_a_set(1), val_b_set(2), ... );
- override eo_finalize to validate the object and if needed,
use eo_error_set(obj) to abort object construction
---
src/tests/eo/constructors/constructors_main.c | 17 +++--
src/tests/eo/constructors/constructors_simple.c | 19 ---
src/tests/eo/constructors/constructors_simple.h | 1 -
3 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/src/tests/eo/constructors/constructors_main.c
b/src/tests/eo/constructors/constructors_main.c
index 7b7da02..cab5e7f 100644
--- a/src/tests/eo/constructors/constructors_main.c
+++ b/src/tests/eo/constructors/constructors_main.c
@@ -66,13 +66,26 @@ main(int argc, char *argv[])
fail_if(obj);
my_init_count = 0;
- obj = eo_add_custom(SIMPLE_CLASS, NULL, simple_constructor(7));
+ obj = eo_add(SIMPLE_CLASS, NULL);
fail_if(!obj);
-
fail_if(my_init_count != 2);
eo_do(obj, a = simple_a_get());
+ fail_if(a != 0);
+
+ my_init_count = 0;
+ obj = eo_add(SIMPLE_CLASS, NULL, simple_a_set(7));
+ fail_if(!obj);
+ fail_if(my_init_count != 2);
+ eo_do(obj, a = simple_a_get(););
fail_if(a != 7);
+ my_init_count = 0;
+ obj = eo_add(SIMPLE_CLASS, NULL, simple_b_set(6), simple_a_set(-1),
+b = simple_b_get());
+ fail_if(obj);
+ fail_if(b != 6);
+ fail_if(my_init_count != 0);
+
eo_unref(obj);
eo_shutdown();
diff --git a/src/tests/eo/constructors/constructors_simple.c
b/src/tests/eo/constructors/constructors_simple.c
index fa6b3fd..9a25e2b 100644
--- a/src/tests/eo/constructors/constructors_simple.c
+++ b/src/tests/eo/constructors/constructors_simple.c
@@ -40,24 +40,21 @@ _GET_SET_FUNC(b)
extern int my_init_count;
static void
-_simple_constructor(Eo *obj, void *class_data, int a)
+_constructor(Eo *obj, void *class_data EINA_UNUSED)
{
- Private_Data *pd = class_data;
-
eo_do_super(obj, MY_CLASS, eo_constructor());
- pd-a = a;
- printf(%s %d\n, __func__, pd-a);
-
my_init_count++;
}
-static void
-_constructor(Eo *obj, void *class_data EINA_UNUSED)
+static Eo*
+_finalize(Eo *obj, void *class_data EINA_UNUSED)
{
- eo_do_super(obj, MY_CLASS, eo_constructor());
+ Private_Data *pd = class_data;
- my_init_count++;
+ if (pd-a 0) eo_error_set(obj);
+
+ return eo_do_super(obj, MY_CLASS, eo_finalize());
}
static void
@@ -85,7 +82,7 @@ EO_VOID_FUNC_BODYV(simple_constructor, EO_FUNC_CALL(a), int
a);
static Eo_Op_Description op_descs[] = {
EO_OP_FUNC_OVERRIDE(eo_constructor, _constructor),
EO_OP_FUNC_OVERRIDE(eo_destructor, _destructor),
- EO_OP_FUNC(simple_constructor, _simple_constructor, Construct and set
A.),
+ EO_OP_FUNC_OVERRIDE(eo_finalize, _finalize),
EO_OP_FUNC(simple_a_set, _a_set, Set property a),
EO_OP_FUNC(simple_a_get, _a_get, Get property a),
EO_OP_FUNC(simple_b_set, _b_set, Set property b),
diff --git a/src/tests/eo/constructors/constructors_simple.h
b/src/tests/eo/constructors/constructors_simple.h
index d8ab0e9..c4b3d7b 100644
--- a/src/tests/eo/constructors/constructors_simple.h
+++ b/src/tests/eo/constructors/constructors_simple.h
@@ -1,7 +1,6 @@
#ifndef SIMPLE_H
#define SIMPLE_H
-EAPI void simple_constructor(int a);
EAPI void simple_a_set(int a);
EAPI int simple_a_get(void);
EAPI void simple_b_set(int b);
--
Re: [E-devel] [EGIT] [core/efl] master 01/01: ecore-drm: Fix formatting from a7428edeb41efe67b0a
Hello, On Thu, Jul 3, 2014 at 5:57 AM, Chris Michael devilho...@comcast.net wrote: On 07/02/2014 01:46 PM, Tom Hacohen wrote: We already had an argument about it on the ML a few months back. ((a == b) !c) Is the correct way of doing it. You don't need to surround single (or single negated) expressions with parenthesis. All of us hate it and find it terribly annoying. It doesn't appear anywhere in the EFL except for some pieces of code you managed to sneak in. :) Well actually, it used to be done like that way back in the day (even before you were around so it's not about me sneaking stuff in and I'd appreciate it very much if you did not start making this personal). You may have noticed that I stop answering thread with this kind of behavior. Maybe it is time for us to have a code of conduct to limit this kind of behavior as many of us dislike it, their is no improvement in that regard and it seems it needs to be formalized to have some kind of effect... -- Cedric BAIL -- Open source business process management suite built on Java and Eclipse Turn processes into business applications with Bonita BPM Community Edition Quickly connect people, data, and systems into organized workflows Winner of BOSSIE, CODIE, OW2 and Gartner awards http://p.sf.net/sfu/Bonitasoft ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] master 01/01: edje_edit: fix edc code generation for image fill tipe parameter and PLAY_SAMPLE and PLAY_TONE actions.
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=f0f5c393d0144e75862524765c4004aa02cbee75
commit f0f5c393d0144e75862524765c4004aa02cbee75
Author: Kateryna Fesyna k.fes...@samsung.com
Date: Thu Jul 3 18:54:36 2014 +0900
edje_edit: fix edc code generation for image fill tipe parameter and
PLAY_SAMPLE and PLAY_TONE actions.
Summary: This commit fixes edc code generation for image fill tipe
parameter and PLAY_SAMPLE and PLAY_TONE actions.
Reviewers: cedric, Hermet, seoz, raster, reutskiy.v.v
CC: reutskiy.v.v, cedric
Differential Revision: https://phab.enlightenment.org/D1091
---
src/lib/edje/edje_edit.c | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c
index a701749..bb7f93b 100644
--- a/src/lib/edje/edje_edit.c
+++ b/src/lib/edje/edje_edit.c
@@ -9589,7 +9589,7 @@ _edje_generate_source_of_program(Evas_Object *obj, const
char *program, Eina_Str
case EDJE_ACTION_TYPE_SOUND_SAMPLE:
{
BUF_APPEND(I4action: PLAY_SAMPLE );
- BUF_APPENDF(\%s\ %.000f, epr-sample_name, epr-speed);
+ BUF_APPENDF(\%s\ %.4f, epr-sample_name, epr-speed);
switch (epr-channel)
{
case EDJE_CHANNEL_BACKGROUND:
@@ -9631,7 +9631,7 @@ _edje_generate_source_of_program(Evas_Object *obj, const
char *program, Eina_Str
case EDJE_ACTION_TYPE_SOUND_TONE:
{
BUF_APPEND(I4action: PLAY_TONE );
- BUF_APPENDF(\%s\ %.000f\n;, epr-tone_name, epr-duration);
+ BUF_APPENDF(\%s\ %.4f\n;, epr-tone_name, epr-duration);
break;
}
//TODO Support Drag
@@ -9912,7 +9912,8 @@ _edje_generate_source_of_state(Evas_Object *obj, const
char *part, const char *s
BUF_APPENDF(I7offset: %d %d;\n, img-image.fill.abs_x,
img-image.fill.abs_y);
BUF_APPEND(I6}\n);
}
- BUF_APPEND(I6type: TILE;\n);
+ if (img-image.fill.type == EDJE_FILL_TYPE_TILE)
+ BUF_APPEND(I6type: TILE;\n);
BUF_APPEND(I5}\n);
}
--
[EGIT] [core/efl] master 01/01: Edje_Edit: added clean save function
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=d8316bcc0757f604ede2af0891345d702d0442c4
commit d8316bcc0757f604ede2af0891345d702d0442c4
Author: Andrii Kroitor an.kroi...@samsung.com
Date: Thu Jul 3 19:23:11 2014 +0900
Edje_Edit: added clean save function
Summary:
This save function removes all unnecessary string from internal eet
distionary in .edj file. Needed after removing some objects from edje_object
e.g. groups, parts, limits etc.
Reviewers: cedric, seoz, raster, Hermet
CC: reutskiy.v.v, cedric
Differential Revision: https://phab.enlightenment.org/D1090
---
src/lib/edje/Edje_Edit.h | 15 +
src/lib/edje/edje_edit.c | 81
2 files changed, 96 insertions(+)
diff --git a/src/lib/edje/Edje_Edit.h b/src/lib/edje/Edje_Edit.h
index 0214b3a..0740e29 100644
--- a/src/lib/edje/Edje_Edit.h
+++ b/src/lib/edje/Edje_Edit.h
@@ -205,6 +205,21 @@ EAPI Eina_Bool edje_edit_save(Evas_Object *obj);
*/
EAPI Eina_Bool edje_edit_save_all(Evas_Object *obj);
+/** Save every group into new file.
+ *
+ * Use this function when you need clean eet dictionary in .edj file from
+ * unnecessary text entries (e.g. names of deleted groups etc.).
+ *
+ * @param obj Object to save.
+ * @param new_file_name Where to save object. File should not exist, otherwise
+ * EINA_FALSE will be returned.
+ *
+ * @return EINA_TRUE if successful, EINA_FALSE otherwise.
+ *
+ * @see edje_edit_save()
+ */
+EAPI Eina_Bool edje_edit_clean_save_as(Evas_Object *obj, const char*
new_file_name);
+
/** Save the group(s) back to the file, without generation source code.
*
* This function saves changes in group(s) back into the edj file. Process of
diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c
index bb7f93b..7f9f17d 100644
--- a/src/lib/edje/edje_edit.c
+++ b/src/lib/edje/edje_edit.c
@@ -10942,6 +10942,87 @@ _edje_edit_internal_save(Evas_Object *obj, int
current_only, Eina_Bool generate_
}
EAPI Eina_Bool
+edje_edit_clean_save_as(Evas_Object *obj, const char* new_file_name)
+{
+ Eet_File *ef, *ef_out;
+ GET_ED_OR_RETURN(EINA_FALSE);
+ GET_EED_OR_RETURN(EINA_FALSE);
+
+ if (!ed-file) return EINA_FALSE;
+
+ if (ecore_file_exists(new_file_name))
+ {
+ERR(Error. file \%s\ allready exists,
+new_file_name);
+return EINA_FALSE;
+ }
+ ef = eet_open(ed-file-path, EET_FILE_MODE_READ);
+ if (!ef)
+ {
+ERR(Error. unable to open \%s\ for reading,
+ed-file-path);
+return EINA_FALSE;
+ }
+ ef_out = eet_open(new_file_name, EET_FILE_MODE_WRITE);
+ if (!ef_out)
+ {
+ERR(Error. unable to open \%s\ for writing output,
+new_file_name);
+eet_close(ef);
+return EINA_FALSE;
+ }
+
+ /* copying file structure */
+ _edje_edit_edje_file_save(ef_out, ed-file);
+
+ int count = 0;
+ char **ent = eet_list(ef, *, count);
+ int i;
+ int size = 0;
+ const void * data;
+
+ /* copying data */
+ for (i = 0; i count; i++)
+ {
+/* Skiping entries that need special saving */
+if (!strcmp(ent[i], edje/file)) continue;
+if (!strcmp(ent[i], edje_sources)) continue;
+if (strstr(ent[i], collection)) continue;
+
+data = eet_read_direct(ef, ent[i], size);
+if (data) eet_write(ef_out, ent[i], data, size, 0);
+else
+ {
+ data = eet_read(ef, ent[i], size);
+ eet_write(ef_out, ent[i], data, size, 1);
+ }
+ }
+ free(ent);
+
+ /* copying groups */
+ Edje_Part_Collection_Directory_Entry *ce;
+ Evas_Object *part_obj;
+ part_obj = edje_edit_object_add(ed-base-evas);
+ Eina_Iterator *it = eina_hash_iterator_data_new(ed-file-collection);
+ EINA_ITERATOR_FOREACH(it, ce)
+ {
+/* forcing collection load into memory */
+edje_object_file_set(part_obj, ed-file-path, ce-entry);
+
+_edje_edit_collection_save(ef_out, ce-ref);
+ }
+ eina_iterator_free(it);
+
+ /* generating source code */
+ _edje_edit_source_save(ef_out, obj);
+
+ eet_close(ef);
+ eet_close(ef_out);
+
+ return EINA_TRUE;
+}
+
+EAPI Eina_Bool
edje_edit_save(Evas_Object *obj)
{
return _edje_edit_internal_save(obj, 1, EINA_TRUE);
--
[EGIT] [core/efl] master 01/01: edje: Edje-Edit: edje_edit_state_map_on_xet()
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=6fbcf48fe054e7b9bfa50c8932ca49976567647b
commit 6fbcf48fe054e7b9bfa50c8932ca49976567647b
Author: Igor Gala i.g...@samsung.com
Date: Thu Jul 3 19:37:16 2014 +0900
edje: Edje-Edit: edje_edit_state_map_on_xet()
Summary:
There are new 'get and set' API for block 'map'.
Those functions return or set flag which enables mapping for the part.
Default is 0.
@feature
Reviewers: seoz, cedric, raster, Hermet
CC: reutskiy.v.v, cedric
Differential Revision: https://phab.enlightenment.org/D1051
---
src/lib/edje/Edje_Edit.h | 27 +++
src/lib/edje/edje_edit.c | 25 +
2 files changed, 48 insertions(+), 4 deletions(-)
diff --git a/src/lib/edje/Edje_Edit.h b/src/lib/edje/Edje_Edit.h
index 0740e29..8cd253e 100644
--- a/src/lib/edje/Edje_Edit.h
+++ b/src/lib/edje/Edje_Edit.h
@@ -3430,6 +3430,33 @@ EAPI unsigned char edje_edit_state_limit_get(Evas_Object
*obj, const char *part,
* Functions to deal with objects with rotation properties (see @ref edcref).
*/ //@{
+/** Get the flag which enables mapping for the part.
+ *
+ * @param obj Object being edited.
+ * @param part The name of the part.
+ * @param state The name of the state (not including the state value).
+ * @param value The state value.
+ *
+ * @return @cEINA_TRUE in case if mapping allowed or @cEINA_FALSE otherwise.
+ * @since 1.11
+ **/
+EAPI Eina_Bool
+edje_edit_state_map_on_get(Evas_Object *obj, const char *part, const char
*state, double value);
+
+/** This enables mapping for the part. Default is 0.
+ *
+ * @param obj Object being edited.
+ * @param part The name of the part.
+ * @param state The name of the state (not including the state value).
+ * @param value The state value.
+ * @param on The flag which allow mapping for the part.
+ *
+ * @return @cEINA_TRUE in case of success, @cEINA_FALSE otherwise.
+ * @since 1.11
+ **/
+EAPI Eina_Bool
+edje_edit_state_map_on_set(Evas_Object *obj, const char *part, const char
*state, double value, Eina_Bool on);
+
/** Get the part's name that is used as the 'perspective point'.
*
* @param obj Object being edited.
diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c
index 7f9f17d..2f8c888 100644
--- a/src/lib/edje/edje_edit.c
+++ b/src/lib/edje/edje_edit.c
@@ -6011,6 +6011,9 @@ edje_edit_state_limit_get(Evas_Object *obj, const char
*part, const char *state,
return pd-limit;
}
+/**/
+/* MAP API */
+/**/
EAPI const char *
edje_edit_state_map_light_get(Evas_Object *obj, const char *part, const char
*state, double value)
@@ -6285,10 +6288,6 @@ edje_edit_state_map_point_color_set(Evas_Object *obj,
const char *part, const ch
return EINA_TRUE;
}
-/**/
-/* MAP API */
-/**/
-
EAPI const char *
edje_edit_state_map_perspective_get(Evas_Object *obj, const char *part, const
char *state, double value)
{
@@ -6318,6 +6317,24 @@ edje_edit_state_map_perspective_set(Evas_Object *obj,
const char *part, const ch
return EINA_TRUE;
}
+EAPI Eina_Bool
+edje_edit_state_map_on_get(Evas_Object *obj, const char *part, const char
*state, double value)
+{
+ GET_PD_OR_RETURN(EINA_FALSE);
+
+ return pd-map.on;
+}
+
+EAPI Eina_Bool
+edje_edit_state_map_on_set(Evas_Object *obj, const char *part, const char
*state, double value, Eina_Bool on)
+{
+ GET_PD_OR_RETURN(EINA_FALSE);
+
+ pd-map.on = on;
+
+ edje_object_calc_force(obj);
+ return EINA_TRUE;
+}
/**/
/* TEXT API */
--
[EGIT] [core/elementary] master 01/01: ctxpopup: Add get_items, get_last_item, get_first_item, get_next_item and get_prev_item API
stanluk pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=467adad7808a60cc16e872b888ff451730f92d8d
commit 467adad7808a60cc16e872b888ff451730f92d8d
Author: Michal Jagiello m.jagie...@samsung.com
Date: Thu Jul 3 13:05:28 2014 +0200
ctxpopup: Add get_items, get_last_item, get_first_item, get_next_item and
get_prev_item API
Summary: API to get list of ctxpopup items and give the possibility to
iterate the ctxpopup items
Reviewers: stanluk, z.kosinski, Hermet, seoz, raster
CC: Hermet, seoz
Differential Revision: https://phab.enlightenment.org/D1055
---
src/lib/elc_ctxpopup.c| 148 +-
src/lib/elc_ctxpopup.eo | 79 ++
src/lib/elc_ctxpopup_common.h | 30 +
src/lib/elm_widget_ctxpopup.h | 4 ++
4 files changed, 232 insertions(+), 29 deletions(-)
diff --git a/src/lib/elc_ctxpopup.c b/src/lib/elc_ctxpopup.c
index 9278dcb..a2ae83d 100644
--- a/src/lib/elc_ctxpopup.c
+++ b/src/lib/elc_ctxpopup.c
@@ -35,6 +35,10 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] = {
static Eina_Bool _key_action_move(Evas_Object *obj, const char *params);
static Eina_Bool _key_action_escape(Evas_Object *obj, const char *params);
+static Elm_Ctxpopup_Item* _item_new(Eo *obj,
+Elm_Ctxpopup_Data *sd,
+Evas_Smart_Cb func,
+const void *data);
static const Elm_Action key_actions[] = {
{move, _key_action_move},
@@ -1254,41 +1258,13 @@ _elm_ctxpopup_item_append(Eo *obj, Elm_Ctxpopup_Data
*sd, const char *label, Eva
{
Elm_Ctxpopup_Item *item;
-
- item = elm_widget_item_new(obj, Elm_Ctxpopup_Item);
+ item = _item_new(obj, sd, func, data);
if (!item) return NULL;
- elm_widget_item_del_pre_hook_set(item, _item_del_pre_hook);
- elm_widget_item_disable_hook_set(item, _item_disable_hook);
- elm_widget_item_text_set_hook_set(item, _item_text_set_hook);
- elm_widget_item_text_get_hook_set(item, _item_text_get_hook);
- elm_widget_item_content_set_hook_set(item, _item_content_set_hook);
- elm_widget_item_content_get_hook_set(item, _item_content_get_hook);
- elm_widget_item_signal_emit_hook_set(item, _item_signal_emit_hook);
-
- if (!sd-list)
- {
-//The first item is appended.
-sd-list = elm_list_add(obj);
-if (!strncmp(elm_object_style_get(obj), default, strlen(default)))
- elm_object_style_set(sd-list, ctxpopup);
-else elm_object_style_set(sd-list, elm_object_style_get(obj));
-elm_list_mode_set(sd-list, ELM_LIST_EXPAND);
-elm_list_horizontal_set(sd-list, sd-horizontal);
-evas_object_event_callback_add
- (sd-list, EVAS_CALLBACK_RESIZE, _list_resize_cb, obj);
-elm_layout_content_set(obj, default, sd-list);
- }
-
- item-wcb.org_func_cb = func;
- item-wcb.org_data = data;
- item-wcb.cobj = obj;
item-list_item =
elm_list_item_append(sd-list, label, icon, NULL, _item_wrap_cb, item);
sd-items = eina_list_append(sd-items, item);
- sd-dir = ELM_CTXPOPUP_DIRECTION_UNKNOWN;
-
if (sd-visible) elm_layout_sizing_eval(obj);
return (Elm_Object_Item *)item;
@@ -1346,4 +1322,118 @@ _elm_ctxpopup_class_constructor(Eo_Class *klass)
evas_smart_legacy_type_register(MY_CLASS_NAME_LEGACY, klass);
}
+EOLIAN static const Eina_List*
+_elm_ctxpopup_items_get(Eo *obj EINA_UNUSED, Elm_Ctxpopup_Data *sd)
+{
+ return sd-items;
+}
+
+EOLIAN static Elm_Object_Item*
+_elm_ctxpopup_first_item_get(Eo *obj EINA_UNUSED, Elm_Ctxpopup_Data *sd)
+{
+ if (!sd-items) return NULL;
+
+ return eina_list_data_get(sd-items);
+}
+
+EOLIAN static Elm_Object_Item*
+_elm_ctxpopup_last_item_get(Eo *obj EINA_UNUSED, Elm_Ctxpopup_Data *sd)
+{
+ if (!sd-items) return NULL;
+
+ return eina_list_data_get(eina_list_last(sd-items));
+}
+
+EOLIAN static Elm_Object_Item*
+_elm_ctxpopup_item_prepend(Eo *obj, Elm_Ctxpopup_Data *sd, const char *label,
Evas_Object *icon, Evas_Smart_Cb func, const void *data)
+{
+ Elm_Ctxpopup_Item *item;
+
+ item = _item_new(obj, sd, func, data);
+ if (!item) return NULL;
+
+ item-list_item =
+ elm_list_item_prepend(sd-list, label, icon, NULL, _item_wrap_cb, item);
+ sd-items = eina_list_prepend(sd-items, item);
+
+ if (sd-visible) elm_layout_sizing_eval(obj);
+
+ return (Elm_Object_Item *)item;
+}
+
+EAPI Elm_Object_Item *
+elm_ctxpopup_item_prev_get(const Elm_Object_Item *it)
+{
+ Eina_List *l;
+ Elm_Ctxpopup_Item *item = (Elm_Ctxpopup_Item *)it;
+
+ ELM_CTXPOPUP_ITEM_CHECK_OR_RETURN(it, NULL);
+ ELM_CTXPOPUP_DATA_GET(WIDGET(item), sd);
+
+ if (!sd-items) return NULL;
+
+ l = eina_list_data_find_list(sd-items, it);
+ if (l l-prev) return eina_list_data_get(l-prev);
+
+ return NULL;
+}
+
+EAPI Elm_Object_Item *
+elm_ctxpopup_item_next_get(const Elm_Object_Item *it)
+{
+
Re: [E-devel] [webkit-efl] Stop to maintain EFL WK1 port
Yep, I will keep webkit2 support (as the backend of elm_web) and improve it more and more. Until you kick elm_web out. :) 2014-07-03 9:21 GMT+09:00 Carsten Haitzler ras...@rasterman.com: On Wed, 2 Jul 2014 20:59:16 +0900 ryuan Choi ryuan.c...@gmail.com said: Hi. It might be possible to refactor ewebkit2 to use EFL++ directly after dropping the support of the lower version of EFL. But in my two cents, it's not important. Unfortunately, ewebkit2 developers not familiar with the latest EFL changes. They only have small experience with the EFL on the tizen. (me too. :/ ) By the way, I removed(and checked) the all of WebKit1/Efl (ewebkit) code from the webkit.org repository. (https://bugs.webkit.org/show_bug.cgi?id=134087) Should(Can) I remove ewebkit backend for elm_web ? you mean remove just the webkitefl for webkit1 support in elm_web - keep wenkit2 support... right? Best Regards, Ryuan Choi 2014-07-01 18:39 GMT+09:00 Carsten Haitzler ras...@rasterman.com: On Wed, 25 Jun 2014 12:44:19 -0300 Felipe Magno de Almeida felipe.m.alme...@gmail.com said: On Sat, Jun 21, 2014 at 1:20 AM, Cedric BAIL moa.blueb...@gmail.com wrote: On Jun 21, 2014 2:26 AM, Carsten Haitzler ras...@rasterman.com wrote: On Fri, 20 Jun 2014 21:25:54 -0300 Felipe Magno de Almeida felipe.m.alme...@gmail.com said: On Fri, Jun 20, 2014 at 9:07 PM, Carsten Haitzler ras...@rasterman.com wrote: On Fri, 20 Jun 2014 15:02:37 -0300 Felipe Magno de Almeida felipe.m.alme...@gmail.com said: [snip] I think it would make the port easier to mantain. It would give RAII, STL-compatibility, easier callback support with lambda-support and a value-based API. But that's just my opinion. elm web has a c api. will always have one. thus we then would have to write a c+ + elm web by hand AND a c+eo one. no. use eo to write one and efl++ exposes elm web. webkit api is internal then and thats how it should be. I think Felipe was referring to the internal of WebKit talking to efl which is already in c++ and would likely benefit from using the c++ with no penalty. Exactly. Sorry for not being clear. I didn't mean use EFL++ for the elm_web, but for the WebKit backend for EFL. There's no reason to use the C EFL API by C++ code, IMO. oh - then i don't know .. but i suspect the code is already done and using efl's c interface inside the c++ code as that is working today already. -- - Codito, ergo sum - I code, therefore I am -- The Rasterman (Carsten Haitzler)ras...@rasterman.com -- Open source business process management suite built on Java and Eclipse Turn processes into business applications with Bonita BPM Community Edition Quickly connect people, data, and systems into organized workflows Winner of BOSSIE, CODIE, OW2 and Gartner awards http://p.sf.net/sfu/Bonitasoft ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Open source business process management suite built on Java and Eclipse Turn processes into business applications with Bonita BPM Community Edition Quickly connect people, data, and systems into organized workflows Winner of BOSSIE, CODIE, OW2 and Gartner awards http://p.sf.net/sfu/Bonitasoft ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- - Codito, ergo sum - I code, therefore I am -- The Rasterman (Carsten Haitzler)ras...@rasterman.com -- Open source business process management suite built on Java and Eclipse Turn processes into business applications with Bonita BPM Community Edition Quickly connect people, data, and systems into organized workflows Winner of BOSSIE, CODIE, OW2 and Gartner awards http://p.sf.net/sfu/Bonitasoft ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [webkit-efl] Stop to maintain EFL WK1 port
On Thu, 3 Jul 2014 20:27:27 +0900 ryuan Choi ryuan.c...@gmail.com said: Yep, I will keep webkit2 support (as the backend of elm_web) and improve it more and more. Until you kick elm_web out. :) cool. that sounds good. and actually no desire to kick elm_web out. if anything we should use it more... :) 2014-07-03 9:21 GMT+09:00 Carsten Haitzler ras...@rasterman.com: On Wed, 2 Jul 2014 20:59:16 +0900 ryuan Choi ryuan.c...@gmail.com said: Hi. It might be possible to refactor ewebkit2 to use EFL++ directly after dropping the support of the lower version of EFL. But in my two cents, it's not important. Unfortunately, ewebkit2 developers not familiar with the latest EFL changes. They only have small experience with the EFL on the tizen. (me too. :/ ) By the way, I removed(and checked) the all of WebKit1/Efl (ewebkit) code from the webkit.org repository. (https://bugs.webkit.org/show_bug.cgi?id=134087) Should(Can) I remove ewebkit backend for elm_web ? you mean remove just the webkitefl for webkit1 support in elm_web - keep wenkit2 support... right? Best Regards, Ryuan Choi 2014-07-01 18:39 GMT+09:00 Carsten Haitzler ras...@rasterman.com: On Wed, 25 Jun 2014 12:44:19 -0300 Felipe Magno de Almeida felipe.m.alme...@gmail.com said: On Sat, Jun 21, 2014 at 1:20 AM, Cedric BAIL moa.blueb...@gmail.com wrote: On Jun 21, 2014 2:26 AM, Carsten Haitzler ras...@rasterman.com wrote: On Fri, 20 Jun 2014 21:25:54 -0300 Felipe Magno de Almeida felipe.m.alme...@gmail.com said: On Fri, Jun 20, 2014 at 9:07 PM, Carsten Haitzler ras...@rasterman.com wrote: On Fri, 20 Jun 2014 15:02:37 -0300 Felipe Magno de Almeida felipe.m.alme...@gmail.com said: [snip] I think it would make the port easier to mantain. It would give RAII, STL-compatibility, easier callback support with lambda-support and a value-based API. But that's just my opinion. elm web has a c api. will always have one. thus we then would have to write a c+ + elm web by hand AND a c+eo one. no. use eo to write one and efl++ exposes elm web. webkit api is internal then and thats how it should be. I think Felipe was referring to the internal of WebKit talking to efl which is already in c++ and would likely benefit from using the c++ with no penalty. Exactly. Sorry for not being clear. I didn't mean use EFL++ for the elm_web, but for the WebKit backend for EFL. There's no reason to use the C EFL API by C++ code, IMO. oh - then i don't know .. but i suspect the code is already done and using efl's c interface inside the c++ code as that is working today already. -- - Codito, ergo sum - I code, therefore I am -- The Rasterman (Carsten Haitzler)ras...@rasterman.com -- Open source business process management suite built on Java and Eclipse Turn processes into business applications with Bonita BPM Community Edition Quickly connect people, data, and systems into organized workflows Winner of BOSSIE, CODIE, OW2 and Gartner awards http://p.sf.net/sfu/Bonitasoft ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Open source business process management suite built on Java and Eclipse Turn processes into business applications with Bonita BPM Community Edition Quickly connect people, data, and systems into organized workflows Winner of BOSSIE, CODIE, OW2 and Gartner awards http://p.sf.net/sfu/Bonitasoft ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- - Codito, ergo sum - I code, therefore I am -- The Rasterman (Carsten Haitzler)ras...@rasterman.com -- Open source business process management suite built on Java and Eclipse Turn processes into business applications with Bonita BPM Community Edition Quickly connect people, data, and systems into organized workflows Winner of BOSSIE, CODIE, OW2 and Gartner awards http://p.sf.net/sfu/Bonitasoft ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- - Codito, ergo sum - I code, therefore I am
Re: [E-devel] [EGIT] [core/efl] master 01/01: ecore-drm: Fix formatting from a7428edeb41efe67b0a
On 07/03/2014 05:17 AM, Cedric BAIL wrote: Hello, On Thu, Jul 3, 2014 at 5:57 AM, Chris Michael devilho...@comcast.net wrote: On 07/02/2014 01:46 PM, Tom Hacohen wrote: We already had an argument about it on the ML a few months back. ((a == b) !c) Is the correct way of doing it. You don't need to surround single (or single negated) expressions with parenthesis. All of us hate it and find it terribly annoying. It doesn't appear anywhere in the EFL except for some pieces of code you managed to sneak in. :) Well actually, it used to be done like that way back in the day (even before you were around so it's not about me sneaking stuff in and I'd appreciate it very much if you did not start making this personal). You may have noticed that I stop answering thread with this kind of behavior. Maybe it is time for us to have a code of conduct to limit this kind of behavior as many of us dislike it, their is no improvement in that regard and it seems it needs to be formalized to have some kind of effect... I have noticed ... and perhaps I should do the same and just not respond when things are made to be personal. I would certainly agree with some form of code of conduct to limit/remove these types of statements...however I am less sure of it's actual effectiveness... dh -- Open source business process management suite built on Java and Eclipse Turn processes into business applications with Bonita BPM Community Edition Quickly connect people, data, and systems into organized workflows Winner of BOSSIE, CODIE, OW2 and Gartner awards http://p.sf.net/sfu/Bonitasoft ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [apps/terminology] master 01/02: hide tw popup on terminal popup show
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=4f945bcdd77a991886679218283b2721c944dd48
commit 4f945bcdd77a991886679218283b2721c944dd48
Author: Mike Blumenkrantz zm...@samsung.com
Date: Thu Jul 3 11:13:22 2014 -0400
hide tw popup on terminal popup show
fix T1290
---
src/bin/main.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/bin/main.c b/src/bin/main.c
index e4d75bf..1c85c2a 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -1095,6 +1095,7 @@ _popmedia_show(Term *term, const char *src)
int type = 0;
if (!config) return;
+ ty_dbus_link_hide();
if (term-popmedia)
{
const char *s;
--
[EGIT] [apps/terminology] master 02/02: disallow tw popups while terminology popup is present
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=3f53f0aa5e6c4af6152655b729b91c71d48e12f6
commit 3f53f0aa5e6c4af6152655b729b91c71d48e12f6
Author: Mike Blumenkrantz zm...@samsung.com
Date: Thu Jul 3 11:13:49 2014 -0400
disallow tw popups while terminology popup is present
fix T1290
---
src/bin/main.c | 6 ++
src/bin/main.h | 1 +
src/bin/termio.c | 3 ++-
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/bin/main.c b/src/bin/main.c
index 1c85c2a..90a7bf3 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -2347,6 +2347,12 @@ main_term_new(Win *wn, Config *config, const char *cmd,
return term;
}
+Eina_Bool
+main_term_popup_exists(const Term *term)
+{
+ return term-popmedia || term-popmedia_queue;
+}
+
Win *main_term_win_get(Term *term)
{
return term-wn;
diff --git a/src/bin/main.h b/src/bin/main.h
index 290d106..fda5b4c 100644
--- a/src/bin/main.h
+++ b/src/bin/main.h
@@ -20,6 +20,7 @@ void main_config_sync(const Config *config);
void change_theme(Evas_Object *win, Config *config);
+Eina_Bool main_term_popup_exists(const Term *term);
void main_term_focus(Term *term);
Win *main_term_win_get(Term *term);
diff --git a/src/bin/termio.c b/src/bin/termio.c
index 7f8e6b5..27d625b 100644
--- a/src/bin/termio.c
+++ b/src/bin/termio.c
@@ -562,7 +562,8 @@ _update_link(Evas_Object *obj, Termio *sd,
}
if (sd-link.string)
{
- if ((sd-link.string[0] == '/') ||
(link_is_url(sd-link.string)))
+ if ((!main_term_popup_exists(sd-term))
+ ((sd-link.string[0] == '/') ||
(link_is_url(sd-link.string
{
Evas_Coord _x = ox, _y = oy;
uint64_t xwin;
--
[EGIT] [core/enlightenment] master 04/04: hide tw popups on mouse up/down
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=814507c1d4ad529d59d21d4bed4991d46bcaded6
commit 814507c1d4ad529d59d21d4bed4991d46bcaded6
Author: Mike Blumenkrantz zm...@samsung.com
Date: Thu Jul 3 11:01:28 2014 -0400
hide tw popups on mouse up/down
fix T1290
---
src/modules/teamwork/e_mod_tw.c | 9 +
1 file changed, 9 insertions(+)
diff --git a/src/modules/teamwork/e_mod_tw.c b/src/modules/teamwork/e_mod_tw.c
index 07bd467..f606efd 100644
--- a/src/modules/teamwork/e_mod_tw.c
+++ b/src/modules/teamwork/e_mod_tw.c
@@ -1127,6 +1127,13 @@ tw_handler_hide(void)
}
static Eina_Bool
+button_press(void *data EINA_UNUSED, int type EINA_UNUSED, void *ev
EINA_UNUSED)
+{
+ if (tw_mod-pop) tw_handler_hide();
+ return ECORE_CALLBACK_RENEW;
+}
+
+static Eina_Bool
desk_show(void *data EINA_UNUSED, int type EINA_UNUSED, E_Event_Desk_Show *ev
EINA_UNUSED)
{
if (tw_mod-pop) tw_handler_hide();
@@ -1213,6 +1220,8 @@ e_tw_init(void)
E_LIST_HANDLER_APPEND(handlers, ECORE_CON_EVENT_URL_DATA,
download_media_data, tw_mod);
E_LIST_HANDLER_APPEND(handlers, E_EVENT_CLIENT_FOCUS_OUT, focus_out,
tw_mod);
E_LIST_HANDLER_APPEND(handlers, E_EVENT_DESK_SHOW, desk_show, tw_mod);
+ E_LIST_HANDLER_APPEND(handlers, ECORE_EVENT_MOUSE_BUTTON_DOWN,
button_press, tw_mod);
+ E_LIST_HANDLER_APPEND(handlers, ECORE_EVENT_MOUSE_BUTTON_UP, button_press,
tw_mod);
tw_mod-media =
eina_hash_string_superfast_new((Eina_Free_Cb)download_media_free);
return 1;
--
[EGIT] [core/enlightenment] master 02/04: put back efm icon edje type check
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=a0790eefff2d6add734aa1f921717905f7bd8e59
commit a0790eefff2d6add734aa1f921717905f7bd8e59
Author: Mike Blumenkrantz zm...@samsung.com
Date: Thu Jul 3 10:48:32 2014 -0400
put back efm icon edje type check
---
src/bin/e_fm.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c
index 7cfc99c..f02ff18 100644
--- a/src/bin/e_fm.c
+++ b/src/bin/e_fm.c
@@ -7660,7 +7660,8 @@ _e_fm2_cb_icon_mouse_move(void *data, Evas *e __UNUSED__,
Evas_Object *obj __UNU
_e_fm2_cb_icon_thumb_dnd_gen, o,
1);
edje_object_signal_emit(o, e,state,selected, e);
- edje_object_signal_emit(o2, e,state,selected, e);
+ if (isedje(o2))
+edje_object_signal_emit(o2, e,state,selected, e);
edje_object_signal_emit(o, e,state,move, e);
if (layout)
{
--
[EGIT] [core/enlightenment] master 03/04: generate thumbnail based on rotated image according to EXIF orientation tag
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=82b813d9159fc859ddd5c535d6fe5e3ad3f2790e
commit 82b813d9159fc859ddd5c535d6fe5e3ad3f2790e
Author: wonguk.jeong wonguk.je...@samsung.com
Date: Thu Jul 3 10:48:51 2014 -0400
generate thumbnail based on rotated image according to EXIF orientation tag
Summary:
jpeg image which has EXIF orientation meta data was not rotated properly in
fm or preview.
@fix
Test Plan:
1. get in efl/src/tests/evas/images/ in fm.
2. check whether Light_exif_*.jpg are properly rotated or not.
Reviewers: raster, zmike
CC: seoz, cedric
Differential Revision: https://phab.enlightenment.org/D1109
---
src/bin/e_thumb_main.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/bin/e_thumb_main.c b/src/bin/e_thumb_main.c
index 939ace2..c508ddd 100644
--- a/src/bin/e_thumb_main.c
+++ b/src/bin/e_thumb_main.c
@@ -420,6 +420,7 @@ _e_thumb_generate(E_Thumb *eth)
else if (evas_object_image_extension_can_load_get(ext))
{
im = evas_object_image_add(evas);
+ evas_object_image_load_orientation_set(im, EINA_TRUE);
evas_object_image_load_size_set(im, eth-w, eth-h);
evas_object_image_file_set(im, eth-file, NULL);
iw = 0; ih = 0;
--
[EGIT] [core/enlightenment] master 01/04: move isedje() e_util and simplify/inline
discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=fd6f6864675b62292d50f6ca679af4bc1b6c2997
commit fd6f6864675b62292d50f6ca679af4bc1b6c2997
Author: Mike Blumenkrantz zm...@samsung.com
Date: Thu Jul 3 10:45:59 2014 -0400
move isedje() e_util and simplify/inline
---
src/bin/e_menu.c | 11 ---
src/bin/e_utils.h | 6 ++
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/src/bin/e_menu.c b/src/bin/e_menu.c
index 3ec1dbd..4c9e1fb 100644
--- a/src/bin/e_menu.c
+++ b/src/bin/e_menu.c
@@ -724,17 +724,6 @@ e_menu_item_label_set(E_Menu_Item *mi, const char *label)
mi-menu-changed = 1;
}
-static Eina_Bool
-isedje(Evas_Object *obj)
-{
- const char *type;
- if (!obj) return EINA_FALSE;
- type = evas_object_type_get(obj);
- if (!obj) return EINA_FALSE;
- if (!strcmp(type, edje)) return EINA_TRUE;
- return EINA_FALSE;
-}
-
EAPI void
e_menu_item_submenu_set(E_Menu_Item *mi, E_Menu *sub)
{
diff --git a/src/bin/e_utils.h b/src/bin/e_utils.h
index 79229a8..ae5d8bc 100644
--- a/src/bin/e_utils.h
+++ b/src/bin/e_utils.h
@@ -87,5 +87,11 @@ e_util_pointer_center(const E_Client *ec)
y + ec-y + (ec-h / 2));
}
+static inline Eina_Bool
+isedje(const Evas_Object *obj)
+{
+ return obj !e_util_strcmp(evas_object_type_get(obj), edje);
+}
+
#endif
#endif
--
[EGIT] [core/enlightenment] annotated tag v0.19.0-alpha2 created
discomfitor pushed a change to annotated tag v0.19.0-alpha2 in repository core/enlightenment. at 1881c9a5cb (tag) tagging 9bd9907cd002fc9c77f33de26675b52e778ad1ec (commit) replaces v0.19.0-alpha1 tagged by Mike Blumenkrantz on Thu Jul 3 11:29:27 2014 -0400 - Log - 0.19.0 alpha2 Carsten Haitzler (15): fix build in imagery fgor syscon power gadget - not ugly red shiny button re-do backgrounds to remove max fields e config - make all configs have full backlight config (and the same) theme dialog - make theme dir if it doesnt exist ibar - fix segv when ibar_icon data is NULL update po files unbreak enlightenment compile due to eo usage fix complaint on making a system dir from desktop icon editing e menus - check if its an edje obj without having complaints or using eo fix eio moniotr complaint on non-existing dirs fix monitoring of non-existant files/dirs in clock module fix appmenu shutdown of dbus when it's null - no complaint fix ibar focus tracking bug with deleted objects (ERR complaints) fix 2 ecore_exe magic complaints - inst-exe is garbage. whitespace/formatting cleanups in shot module Cedric BAIL (4): edje: remove use of deprecated functions. bg: remove useless and wrong size hint. background: make them HiDPI compliant. pkgbuild: we do not support Bluez. Christopher Michael (10): bluez-module: Fixup menu activation code remove call to e_comp_object_frame_geometry_get when handling x/y cpufreq: Fix duplicate structure name when including EGL headers systray: Fix duplicate structure name when including EGL headers check for an already existing wayland compositor before trying to comp-wl: Only blacklist the actual Nvidia driver Port D1089 patch from Seunghun Lee shiin@samsung.com to current e-comp-wl: Fix keyboard input sending wrong keys ibar: add some safeguards to make sure an icon has an exe_current econnman: Adjust size of wifi popup dialog to be more sane for smaller Gwanglim Lee (1): fix visibility issues related to desktop window profile Igor Murzov (3): Add some more messages to the pot file Properly use gettext for plural forms Update russian translation Mike Blumenkrantz (36): unset release stuff Revert fix crash in deskmirror with smart data being null block mouse actions on frame for iconic clients block client resize requests for fullscreen clients hybris support apply a tighter clamp to internal window autosize remove useless null checks add todo file with release blockers remove calls to e_place_zone_region_smart_cleanup() in tiling unload bugfix: Navigate menu is now sorted case insensitively wizard comp effect disabling now disables all effects rename ibar focus signals simplify ibar client desk visibility check add desk_change client smart callback unify ibar menu hiding update ibar menu theme states dynamically fix e_comp_object_client_get() when used with signal callback todo updates remove wp2 module add activate test don't apply desk transitions for new clients add some helpful notes for commonly-misunderstood E_Client flags remove notification theme fallback make notifications fade appropriately remove T1330 from blockers fix another eo error don't unset icon dnd during dnd pre-end cb unset fwin win delete callback before delete during delete callback reenable edges after signal move ends remove unused E_Zone member redo zone edge flip blocker to require mouse out of current edge before reactivating use battery popup for battery popup mouse events move isedje() e_util and simplify/inline put back efm icon edje type check hide tw popups on mouse up/down alpha2 Sebastian Dransfeld (4): backlight: Only check output name if sysdev is set e: rename applications menu to fit xdg menu spec e: set XDG_MENU_PREFIX so menus get merged e-xdg: augment XDG_CONFIG_DIRS as well Stefan Schmidt (2): po: Set initial values for Language and Language-Team po: Fix copy and paste error in Esperanto po file Yomi (1): Fix misspellings on line 21 and line 24. maxerba (1): Updating catalan translation q66 (1): fix e19 build wonguk.jeong (2): e_int_client_menu: fix window visibility problem during moving to current desktop generate thumbnail based on rotated image according to EXIF orientation tag --- No new revisions were added by this update. --
[EGIT] [core/enlightenment] master 02/02: unset release mode
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=90cde14ac45584edcf2e1bd06a9d7b7c06e26657 commit 90cde14ac45584edcf2e1bd06a9d7b7c06e26657 Author: Mike Blumenkrantz zm...@samsung.com Date: Thu Jul 3 11:48:04 2014 -0400 unset release mode --- configure.ac | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 2cb3c32..deaa278 100644 --- a/configure.ac +++ b/configure.ac @@ -5,11 +5,11 @@ m4_define([v_min], [19]) m4_define([v_mic], [0]) m4_define([v_rev], m4_esyscmd([(git rev-list --count HEAD 2/dev/null || echo 0) | tr -d '\n']))dnl ##-- When released, remove the dnl on the below line -m4_undefine([v_rev]) +dnl m4_undefine([v_rev]) m4_define([relname], [0.19.0]) ##-- When doing snapshots - change soname. remove dnl on below line m4_define([relname], [ver-serious-0.19]) -m4_define([v_rel], [-release relname]) +dnl m4_define([v_rel], [-release relname]) ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## m4_ifdef([v_rev], [m4_define([v_ver], [v_maj.v_min.v_mic.v_rev])], [m4_define([v_ver], [v_maj.v_min.v_mic])]) m4_define([lt_cur], m4_eval(v_maj + v_min)) @@ -18,7 +18,7 @@ m4_define([lt_age], v_min) ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## -AC_INIT([enlightenment], [v_ver-alpha2], [enlightenment-devel@lists.sourceforge.net]) +AC_INIT([enlightenment], [v_ver], [enlightenment-devel@lists.sourceforge.net]) AC_PREREQ([2.52]) AC_CONFIG_SRCDIR([configure.ac]) AC_CONFIG_MACRO_DIR([m4]) @@ -55,7 +55,7 @@ AC_DEFINE_UNQUOTED(VMAJ, [v_maj], [Major version]) AC_DEFINE_UNQUOTED(VMIN, [v_min], [Minor version]) AC_DEFINE_UNQUOTED(VMIC, [v_mic], [Micro version]) AC_DEFINE_UNQUOTED(VREV, [v_rev], [Revison]) -AC_DEFINE_UNQUOTED(E19_RELEASE_BUILD, [1], [doin it]) +##AC_DEFINE_UNQUOTED(E19_RELEASE_BUILD, [1], [doin it]) version_info=lt_cur:lt_rev:lt_age release_info=v_rel AC_SUBST([version_info]) --
[EGIT] [core/enlightenment] master 01/02: alpha2
discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=9bd9907cd002fc9c77f33de26675b52e778ad1ec commit 9bd9907cd002fc9c77f33de26675b52e778ad1ec Author: Mike Blumenkrantz zm...@samsung.com Date: Thu Jul 3 11:23:43 2014 -0400 alpha2 --- configure.ac | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index deaa278..2cb3c32 100644 --- a/configure.ac +++ b/configure.ac @@ -5,11 +5,11 @@ m4_define([v_min], [19]) m4_define([v_mic], [0]) m4_define([v_rev], m4_esyscmd([(git rev-list --count HEAD 2/dev/null || echo 0) | tr -d '\n']))dnl ##-- When released, remove the dnl on the below line -dnl m4_undefine([v_rev]) +m4_undefine([v_rev]) m4_define([relname], [0.19.0]) ##-- When doing snapshots - change soname. remove dnl on below line m4_define([relname], [ver-serious-0.19]) -dnl m4_define([v_rel], [-release relname]) +m4_define([v_rel], [-release relname]) ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## m4_ifdef([v_rev], [m4_define([v_ver], [v_maj.v_min.v_mic.v_rev])], [m4_define([v_ver], [v_maj.v_min.v_mic])]) m4_define([lt_cur], m4_eval(v_maj + v_min)) @@ -18,7 +18,7 @@ m4_define([lt_age], v_min) ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## -AC_INIT([enlightenment], [v_ver], [enlightenment-devel@lists.sourceforge.net]) +AC_INIT([enlightenment], [v_ver-alpha2], [enlightenment-devel@lists.sourceforge.net]) AC_PREREQ([2.52]) AC_CONFIG_SRCDIR([configure.ac]) AC_CONFIG_MACRO_DIR([m4]) @@ -55,7 +55,7 @@ AC_DEFINE_UNQUOTED(VMAJ, [v_maj], [Major version]) AC_DEFINE_UNQUOTED(VMIN, [v_min], [Minor version]) AC_DEFINE_UNQUOTED(VMIC, [v_mic], [Micro version]) AC_DEFINE_UNQUOTED(VREV, [v_rev], [Revison]) -##AC_DEFINE_UNQUOTED(E19_RELEASE_BUILD, [1], [doin it]) +AC_DEFINE_UNQUOTED(E19_RELEASE_BUILD, [1], [doin it]) version_info=lt_cur:lt_rev:lt_age release_info=v_rel AC_SUBST([version_info]) --
[E-devel] E19 ALPHA2
Brace yourselves, because this update is hotter than the sand and bigger than the ocean. The second step in the only release process that will be longer than E17 and Duke Nukem 3D combined, //The E19 Release Cycle//, improves upon the glory of the momentous first step in a number of ways. Most notable of these effervescent changes: * Numerous translation updates and fixes * Greatly improved HiDPI support * Improved detection capabilities when playing hide-n-seek with application windows * Improved Applications menu generation * Completely unaltered NEWS file for fans of the previous release * Wallpaper2 module [[ http://git.enlightenment.org/enlightenment/modules/wallpaper2.git/|removed from tree]] * Various filemanager operations will no longer trigger crashes...maybe * Edge bindings can now be given the same amount of trust and responsibility as an average five year old * Battery popups no longer attempt to take over the user's current session by use of excessive event interception * Unnecessary error messages no longer appear in logs * SPF now rated at 32 As always, stay tuned to the latest infrequent E updates on the [[ http://e.zmike.ninja|release blog]]. =Download= b0be91e1e6282658671280d5ccf77aa80a0bfa19475d8384adf64d1c10184633 http://download.enlightenment.org/rel/apps/enlightenment/enlightenment-0.19.0-alpha2.tar.gz 51d2bb4d7317925f0fe42f9002524a1815edf3f13bbc5a719a99c907f23dcbfc http://download.enlightenment.org/rel/apps/enlightenment/enlightenment-0.19.0-alpha2.tar.bz2 **Disclaimer:** Enlightenment developers cannot be responsible for any successes which occur during testing of E19. See the full announcement for more details: https://phab.enlightenment.org/phame/live/3/post/e19_alpha2_now_with_50_more_explosions/ -- Open source business process management suite built on Java and Eclipse Turn processes into business applications with Bonita BPM Community Edition Quickly connect people, data, and systems into organized workflows Winner of BOSSIE, CODIE, OW2 and Gartner awards http://p.sf.net/sfu/Bonitasoft ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] [EGIT] [core/efl] master 01/01: ecore-drm: Fix formatting from a7428edeb41efe67b0a
On 03/07/14 04:57, Chris Michael wrote:
On 07/02/2014 01:46 PM, Tom Hacohen wrote:
We already had an argument about it on the ML a few months back.
((a == b) !c)
Is the correct way of doing it. You don't need to surround single (or
single negated) expressions with parenthesis. All of us hate it and find
it terribly annoying. It doesn't appear anywhere in the EFL except for
some pieces of code you managed to sneak in. :)
Well actually, it used to be done like that way back in the day (even
before you were around so it's not about me sneaking stuff in and I'd
appreciate it very much if you did not start making this personal).
Opinions are like legs...we all have them. That being said, if this is
No Longer the norm for EFL coding style, then someone fix the coding
conventions page to reflect these new rules...
Yes, you provided us with these two arguments back in the old thread too:
https://www.mail-archive.com/enlightenment-devel@lists.sourceforge.net/msg52916.html
It was long enough, no need to repeat it here. There is was made clear
that this is not the case any more even if it ever was.
You are right though that someone put it in the conventions document on
phab (ECoding), however the conventions were wrong and are now fixed.
So for example:
- if (enc enc-crtc_id)
+ if ((enc) (enc-crtc_id))
Is completely wrong.
Well, nothing technically wrong with it ... One person's preference
over another is all...
Nothing is technically wrong with using 9 spaces as indentation or
putting all of your code in one line, however these are the coding
conventions we've decided to adhere to.
I am sure this thread is probably going to go on for a few more months
... all over a coding style preference. In that process, lets not
forget the 1 golden rule with EFL style...
No, because it already did, a while back (link above).
quote
General rules
ALWAYS KEEP EXISTING CODING STYLE Even if it's different from this,
do not change existing coding style as you introduce new code. If you
want, send different/sequential patches. New code should always keep the
coding style of its surroundings;
/quote
Ecore-drm is all new code you created, there was no existing coding
style. :)
Fix the coding page to reflect the new style and enough with this thread !!
Fixed, and I agree.
--
Tom.
dh
--
Tom.
On 02/07/14 11:57, Chris Michael wrote:
On 07/02/2014 03:17 AM, Stefan Schmidt wrote:
Hello.
On Tue, 2014-07-01 at 08:00, Christopher Michael wrote:
devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=e1e8859aa0d73261de6fa003bfe45959be589818
commit e1e8859aa0d73261de6fa003bfe45959be589818
Author: Chris Michael cp.mich...@samsung.com
Date: Tue Jul 1 10:58:44 2014 -0400
ecore-drm: Fix formatting from a7428edeb41efe67b0a
Fix horrible formatting before it gets too far...
Bad Stefan, no cookie ;)
:)
Signed-off-by: Chris Michael cp.mich...@samsung.com
---
src/lib/ecore_drm/ecore_drm_output.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/lib/ecore_drm/ecore_drm_output.c
b/src/lib/ecore_drm/ecore_drm_output.c
index 8f10614..bf1cca6 100644
--- a/src/lib/ecore_drm/ecore_drm_output.c
+++ b/src/lib/ecore_drm/ecore_drm_output.c
@@ -216,12 +216,12 @@ _ecore_drm_output_crtc_find(Ecore_Drm_Device
*dev, drmModeRes *res, drmModeConne
else
enc = NULL;
- if (enc enc-crtc_id)
+ if ((enc) (enc-crtc_id))
That is really only your taste. The braces are not needed here. Not a
coding style issue. :)
Odd, this page says otherwise ;)
https://phab.enlightenment.org/w/coding_convention/
use parenthesis for every clause or math;
Add parenthesis around all conditions:
if (a) ...
if (!a) ...
if ((a) (b))...
if ((!a) (b))...
{
crtc = enc-crtc_id;
drmModeFreeEncoder(enc);
/* Check is this CRTC is already allocated */
-if (!(dev-crtc_allocator (1 crtc)))
+if (!(dev-crtc_allocator (1 crtc)))
Yeah, my bad. :)
No Worries ;)
dh
regards
Stefan Schmidt
--
Open source business process management suite built on Java and Eclipse
Turn processes into business applications with Bonita BPM Community Edition
Quickly connect people, data, and systems into organized workflows
Winner of BOSSIE, CODIE, OW2 and Gartner awards
http://p.sf.net/sfu/Bonitasoft
___
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [apps/epour] master 01/01: Fix file activation to work again
kuuko pushed a commit to branch master.
http://git.enlightenment.org/apps/epour.git/commit/?id=2da968719d83bb41f3c9c2c5affa9c7f09dd3b4b
commit 2da968719d83bb41f3c9c2c5affa9c7f09dd3b4b
Author: Kai Huuhko kai.huu...@gmail.com
Date: Thu Jul 3 19:38:55 2014 +0300
Fix file activation to work again
---
epour/gui/TorrentProps.py | 17 -
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/epour/gui/TorrentProps.py b/epour/gui/TorrentProps.py
index bec4a5d..22aa8ba 100644
--- a/epour/gui/TorrentProps.py
+++ b/epour/gui/TorrentProps.py
@@ -22,6 +22,7 @@
import cgi
import sys
import os
+import pipes
import logging
log = logging.getLogger(epour)
@@ -230,7 +231,6 @@ class TorrentFiles(StandardWindow):
construct(value, parent=it)
construct(file_dict)
-return
def expand_request_cb(self, gl, item):
item.expanded = True
@@ -279,14 +279,21 @@ class TorrentFiles(StandardWindow):
def item_activated_cb(self, gl, item):
if item.type != ELM_GENLIST_ITEM_NONE:
return
-file_entry, progress, n, h = item.data
-if progress != file_entry.size:
+fn, fe, n = item.data
+h = gl.data[handle]
+progress = h.file_progress()[n]
+
+if progress == 0:
+log.error(Tried to open a file with size 0)
return
-path = os.path.join(h.save_path(), file_entry.path)
+if progress fe.size:
+log.warn(Opening an incomplete file)
+
+path = os.path.join(h.save_path().rstrip(\0), fe.path)
if sys.platform == 'linux2':
-ecore.Exe(xdg-open '{0}'.format(path))
+ecore.Exe('xdg-open %s' % pipes.quote(path))
else:
os.startfile(path)
--
Re: [E-devel] [EGIT] [core/efl] master 01/01: ecore-drm: Fix formatting from a7428edeb41efe67b0a
On 03/07/14 10:17, Cedric BAIL wrote: Hello, On Thu, Jul 3, 2014 at 5:57 AM, Chris Michael devilho...@comcast.net wrote: On 07/02/2014 01:46 PM, Tom Hacohen wrote: We already had an argument about it on the ML a few months back. ((a == b) !c) Is the correct way of doing it. You don't need to surround single (or single negated) expressions with parenthesis. All of us hate it and find it terribly annoying. It doesn't appear anywhere in the EFL except for some pieces of code you managed to sneak in. :) Well actually, it used to be done like that way back in the day (even before you were around so it's not about me sneaking stuff in and I'd appreciate it very much if you did not start making this personal). You may have noticed that I stop answering thread with this kind of behavior. Maybe it is time for us to have a code of conduct to limit this kind of behavior as many of us dislike it, their is no improvement in that regard and it seems it needs to be formalized to have some kind of effect... I haven't noticed, but if you have: that's bad. Why be passive-aggressive about it? Let the culprits (me in this case) know about your concerns and things will solve themselves. In this specific case I don't see anything personal except for a friendly banter that was said with a smile towards Chris who I know very well. The comment was It doesn't appear anywhere in the EFL except for some pieces of code you managed to sneak in. :) which even as a stretch can't be considered as taking things personally. -- Tom. -- Open source business process management suite built on Java and Eclipse Turn processes into business applications with Bonita BPM Community Edition Quickly connect people, data, and systems into organized workflows Winner of BOSSIE, CODIE, OW2 and Gartner awards http://p.sf.net/sfu/Bonitasoft ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] master 01/01: autotools: Removed duplicate from src/Makefile.am.
savio pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=1ede3cc69f9c1181dcacb97480f255e47baa7ba7 commit 1ede3cc69f9c1181dcacb97480f255e47baa7ba7 Author: Savio Sena sa...@expertisesolutions.com.br Date: Thu Jul 3 13:04:08 2014 -0300 autotools: Removed duplicate from src/Makefile.am. --- src/Makefile.am | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 9ba8132..26f42ba 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -32,12 +32,10 @@ include Makefile_Evil.am include Makefile_Escape.am include Makefile_Eina.am -include Makefile_Eina_Cxx.am include Makefile_Eo.am include Makefile_Eet.am include Makefile_Eolian.am include Makefile_Ecore.am -include Makefile_Ecore_Cxx.am include Makefile_Ecore_Con.am include Makefile_Ecore_Ipc.am include Makefile_Ecore_File.am @@ -77,6 +75,7 @@ include Makefile_Evas_Cxx.am endif include Makefile_Eina_Cxx.am +include Makefile_Ecore_Cxx.am include Makefile_Eldbus_Cxx.am include Makefile_Eolian_Cxx.am include Makefile_Eet_Cxx.am --
Re: [E-devel] Model-View-Controller
Hi Gustavo, about the property get/fetch to return a value (sync mode), I like it but in many cases it would be necessary to cache all the values, is it a problem? I'm thinking about cases where we have many files, another thing, model_property_load() needs a cache and property_get() always gives updated values (if you call model_property_load beforehand), maybe if for example, some specific model needs to cache it can then rely on model_load() or cache only 'cheap' properties. One point is that when using sync mode you still have to 'listen' for updated/changed events because they would happen. The View must be ready to handle events no matter what. I like the lazy/dummy approach in model_children_get/fetch() however I have mixed feelings about model_children_load() because I dislike the model_property_load() (see above), have model_load() and model_children_load() without model_property_load() is confused, because in this case model_load() don't load children. what exactly do you have in mind about 'emodel_selection' ? One last thing, to move 'selection' to the 'view': is it a feasible option? Grato Larry Jr. http://www.larryjr.com/ On Wed, Jul 2, 2014 at 7:35 PM, Gustavo Sverzut Barbieri barbi...@gmail.com wrote: On Tue, Jul 1, 2014 at 7:08 PM, Carlos Carvalho ccarva...@expertisesolutions.com.br wrote: Hi gustavo, I'd like to talk a little bit about some points Larry told we are fixing OK. Great, will take some time to review the new code tomorrow. Some comments about your questions: #10, now we have a loaded event, shouldn't we have 'unloaded' event as well in Emodel? I guess so, unloaded event wouldn't hurt. #11, I already started switching from simple eina array to Eina_Value_Struct_Desc in emodel_eio, however I don't know for sure if I got it. It may be leaner to use Eina_Value_Struct_Desc but we don't have many items in that array of properties it isn't much complex to deal with. Anyways I am following the eina_value_02.c already but I'd like to know if there are more implications about using Eina_Value_Struct_Desc instead of eina_array because it is basically used only internally in emodel_eio. that's why, it shouldn't be harder and would consume less bytes per instance as the structure for each instance is smaller and the description is shared (as it's constant and equal to all instances). #13.2. is now using eina_str_join. Agreed it is safer than using strncpy and alike by hand although I had to read eina_str_join() implementation (and it is nice to read code of course :)) to fully understand that the parameter 'size' must be strlen(a)+strlen(b)+2, the '2' here is including the separator character plus '\0' byte, if we miss that the result will be truncated by NULL terminator. 'size' cannot simply be strlen(a)+strlen(b) and perhaps it should be documented both in eina_str_join and eina_str_join_len. What do you think? See: ---snip--- char *str1 = ; char *str2 = ; size_t siz = strlen(str1)+strlen(str2); char *buf = calloc(1, siz); eina_str_join(buf, siz, '#', str1, str2); fprintf(stdout, buf: %s\n, buf); free(buf); ---snip--- result is truncated: ---snip--- buf: #BB ---snip--- great catch, add that to docs :-) (I often use a static buffer like char buf[PATH_MAX] and then use the result size to allocate + memcpy if needed, often it's not as it's a local usage, that's why I missed that in the docs) -- Gustavo Sverzut Barbieri -- Mobile: +55 (19) 99225-2202 Contact: http://www.gustavobarbieri.com.br/contact -- Open source business process management suite built on Java and Eclipse Turn processes into business applications with Bonita BPM Community Edition Quickly connect people, data, and systems into organized workflows Winner of BOSSIE, CODIE, OW2 and Gartner awards http://p.sf.net/sfu/Bonitasoft ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Open source business process management suite built on Java and Eclipse Turn processes into business applications with Bonita BPM Community Edition Quickly connect people, data, and systems into organized workflows Winner of BOSSIE, CODIE, OW2 and Gartner awards http://p.sf.net/sfu/Bonitasoft ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] SVG in edje?
On Mon, Jun 30, 2014 at 8:06 PM, jose_...@juno.com jose_...@juno.com wrote: The svg edje external allows you declare the svg file for use as an edje part, but can the svg file be embedded in the edje (in a data section say) and load it from there? No, it can not, at least from an edje module, which is what the svg edje module is. It can only handle known edje types, for the module it is a path where the svg file is. However, if the poster just wants some simple gradients could he not use evas' map with colors on the edges? BTW, is there any progress on fuller vgfx support in evas proper? -- Original Message -- From: Jorge Luis Zapata Muga To: Enlightenment developer list enlightenment-devel@lists.sourceforge.net Subject: Re: [E-devel] SVG in edje? Date: Mon, 30 Jun 2014 12:15:14 +0200 On Sat, Jun 28, 2014 at 2:43 AM, Simon si...@simotek.net wrote: Hi All, For a theme i'm working on i was thinking about using a basic svg (just a couple of gradients) as the file manager background, so i was wondering if it was possible to embed svgs in a edje file. Also will it Check https://github.com/turran/efl-egueb It is a library that provides several abstractions to ease the use of egueb on efl based applications. (Egueb is a library that does SVG parsing/rendering/interactivity). One of such abstractions is an edje external object. fall back to a color if svg support is not avalible? Cheers Simon -- Open source business process management suite built on Java and Eclipse Turn processes into business applications with Bonita BPM Community Edition Quickly connect people, data, and systems into organized workflows Winner of BOSSIE, CODIE, OW2 and Gartner awards http://p.sf.net/sfu/Bonitasoft ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Open source business process management suite built on Java and Eclipse Turn processes into business applications with Bonita BPM Community Edition Quickly connect people, data, and systems into organized workflows Winner of BOSSIE, CODIE, OW2 and Gartner awards http://p.sf.net/sfu/Bonitasoft ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel Odd Carb-Hormone Trick 1 EASY tip to increase fat-burning, lower blood sugar decrease fat storage http://thirdpartyoffers.juno.com/TGL3141/53b1a7593acd32759054dst03duc -- Open source business process management suite built on Java and Eclipse Turn processes into business applications with Bonita BPM Community Edition Quickly connect people, data, and systems into organized workflows Winner of BOSSIE, CODIE, OW2 and Gartner awards http://p.sf.net/sfu/Bonitasoft ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Open source business process management suite built on Java and Eclipse Turn processes into business applications with Bonita BPM Community Edition Quickly connect people, data, and systems into organized workflows Winner of BOSSIE, CODIE, OW2 and Gartner awards http://p.sf.net/sfu/Bonitasoft ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [apps/terminology] master 01/01: fix possible segfault detected as CID1224396.
billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=651cbfa08c502f982612a6840f86a23e8a3f0191
commit 651cbfa08c502f982612a6840f86a23e8a3f0191
Author: Boris Faure bill...@gmail.com
Date: Thu Jul 3 20:56:36 2014 +0200
fix possible segfault detected as CID1224396.
---
src/bin/miniview.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/bin/miniview.c b/src/bin/miniview.c
index f0e2bd8..a9797d4 100644
--- a/src/bin/miniview.c
+++ b/src/bin/miniview.c
@@ -348,7 +348,9 @@ _deferred_renderer(void *data)
Termpty *ty;
unsigned int colors[512];
- if ((!mv) || (!mv-is_shown) || (!mv-to_render) || (mv-img_h == 0))
+ if (!mv) return EINA_FALSE;
+
+ if ((!mv-is_shown) || (!mv-to_render) || (mv-img_h == 0))
{
mv-deferred_renderer = NULL;
return EINA_FALSE;
--
[EGIT] [core/enlightenment] master 01/01: Updating italian translation
maxerba pushed a commit to branch master. http://git.enlightenment.org/core/enlightenment.git/commit/?id=4d9a95e951a73ad6da2413142c90ecafaad7f087 commit 4d9a95e951a73ad6da2413142c90ecafaad7f087 Author: maxerba maiur...@gmail.com Date: Thu Jul 3 21:02:07 2014 +0200 Updating italian translation --- po/it.po | 860 ++- 1 file changed, 470 insertions(+), 390 deletions(-) diff --git a/po/it.po b/po/it.po index 0b69320..a77e7fd 100644 --- a/po/it.po +++ b/po/it.po @@ -6,8 +6,8 @@ msgid msgstr Project-Id-Version: Enlightenment 0.17\n Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n -POT-Creation-Date: 2014-06-23 08:15+0900\n -PO-Revision-Date: 2014-05-24 10:07+0200\n +POT-Creation-Date: 2014-07-01 23:04+0200\n +PO-Revision-Date: 2014-07-03 21:00+0200\n Last-Translator: Massimo Maiurana maiur...@gmail.com\n Language-Team: General\n Language: it\n @@ -26,7 +26,7 @@ msgstr Informazioni su Enlightenment #: src/modules/conf/e_conf.c:169 #: src/modules/conf_bindings/e_int_config_edgebindings.c:876 #: src/modules/everything/evry_plug_windows.c:455 -#: src/modules/fileman/e_fwin.c:2575 src/modules/mixer/app_mixer.c:505 +#: src/modules/fileman/e_fwin.c:2576 src/modules/mixer/app_mixer.c:505 msgid Close msgstr Chiudi @@ -77,7 +77,7 @@ msgstr Uccidi #: src/bin/e_actions.c:375 src/bin/e_actions.c:2084 src/bin/e_actions.c:2178 #: src/bin/e_actions.c:2238 src/bin/e_actions.c:2298 src/bin/e_actions.c:2363 #: src/bin/e_actions.c:2428 src/bin/e_confirm_dialog.c:53 -#: src/bin/e_desklock.c:543 src/bin/e_fm.c:10596 src/bin/e_fm.c:10949 +#: src/bin/e_desklock.c:543 src/bin/e_fm.c:10595 src/bin/e_fm.c:10948 #: src/bin/e_screensaver.c:197 #: src/modules/quickaccess/e_mod_quickaccess.c:1302 msgid No @@ -93,7 +93,7 @@ msgstr Siete sicuri di voler uscire da Enlightement? #: src/bin/e_actions.c:2082 src/bin/e_actions.c:2176 src/bin/e_actions.c:2236 #: src/bin/e_actions.c:2296 src/bin/e_actions.c:2361 src/bin/e_actions.c:2426 -#: src/bin/e_confirm_dialog.c:52 src/bin/e_desklock.c:541 src/bin/e_fm.c:10599 +#: src/bin/e_confirm_dialog.c:52 src/bin/e_desklock.c:541 src/bin/e_fm.c:10598 #: src/bin/e_screensaver.c:195 #: src/modules/quickaccess/e_mod_quickaccess.c:1302 msgid Yes @@ -148,7 +148,7 @@ msgstr Siete sicuri di voler ibernare il computer? msgid Window : Actions msgstr Finestre : Azioni -#: src/bin/e_actions.c:2918 src/bin/e_fm.c:11725 +#: src/bin/e_actions.c:2918 src/bin/e_fm.c:11724 #: src/bin/e_int_client_menu.c:709 msgid Move msgstr Sposta @@ -309,8 +309,8 @@ msgstr Commuta stato attaccata #: src/bin/e_actions.c:3174 src/bin/e_actions.c:3176 src/bin/e_actions.c:3178 #: src/bin/e_actions.c:3180 src/bin/e_actions.c:3182 src/bin/e_actions.c:3184 #: src/bin/e_actions.c:3186 src/bin/e_actions.c:3188 src/bin/e_actions.c:3401 -#: src/bin/e_actions.c:3406 src/bin/e_int_menus.c:186 -#: src/bin/e_int_config_comp_match.c:78 src/bin/e_int_config_comp_match.c:399 +#: src/bin/e_actions.c:3406 src/bin/e_int_config_comp_match.c:78 +#: src/bin/e_int_config_comp_match.c:399 src/bin/e_int_menus.c:186 #: src/bin/e_int_shelf_config.c:283 #: src/modules/conf_window_manipulation/e_int_config_clientlist.c:118 #: src/modules/fileman/e_mod_menu.c:432 src/modules/gadman/e_mod_gadman.c:120 @@ -795,7 +795,7 @@ msgstr Seleziona #: src/bin/e_color_dialog.c:47 src/bin/e_desktop_editor.c:891 #: src/bin/e_desktop_editor.c:954 src/bin/e_entry_dialog.c:64 -#: src/bin/e_fm.c:10109 src/bin/e_fm_prop.c:625 +#: src/bin/e_fm.c:10108 src/bin/e_fm_prop.c:625 #: src/bin/e_import_config_dialog.c:542 src/bin/e_import_dialog.c:199 #: src/modules/bluez4/agent.c:136 src/modules/bluez4/agent.c:149 #: src/modules/conf_bindings/e_int_config_signalbindings.c:623 @@ -855,6 +855,63 @@ msgstr Titolo msgid Compositor %u msgstr Compositor %u +#: src/bin/e_comp_x.c:391 +msgid Compositor Warning +msgstr Avvertimento del compositor + +#: src/bin/e_comp_x.c:392 +msgid +Your display driver does not support OpenGL, GLSLbrshaders or no OpenGL +engines were compiled or installedbrfor Evas or Ecore-Evas. Falling back +to software engine.brbrYou will need an OpenGL 2.0 (or OpenGL ES 2.0) +capablebrGPU to use OpenGL with compositing. +msgstr Il driver video non supporta gli shader OpenGL obrGLSL, oppure non sono stati compilati o installatibrmotori OpenGL per Evas o Ecore-Evas. Si ripiega sulbrmotore software.brbrPer poter usare OpenGL nel compositing è necessariabruna GPU in grado di supportare OpenGL 2.0 (o OpenGLbrES 2.0). + +#: src/bin/e_comp_x.c:4894 +msgid Lock Failed +msgstr Blocco fallito + +#: src/bin/e_comp_x.c:4895 +msgid +Locking the desktop failed because some applicationbrhas grabbed either +the keyboard or the mouse or bothbrand their grab is unable to be broken. +msgstr Il blocco del desktop è fallito perché alcunebrapplicazioni hanno catturato la tastiera e/o ilbrmouse, e questa cattura non può essere sciolta. + +#:
[EGIT] [apps/terminology] master 01/01: Terminology 0.6.1
billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=3450d06c6bcad911762d34e9d7ac5d49e690700c commit 3450d06c6bcad911762d34e9d7ac5d49e690700c Author: Boris Faure bill...@gmail.com Date: Thu Jul 3 21:07:44 2014 +0200 Terminology 0.6.1 --- ChangeLog| 8 NEWS | 17 - README | 2 +- configure.ac | 2 +- 4 files changed, 26 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 178698c..fb12582 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2014-07-02 + +* Release v0.6.1 +* Add .tga images to recognized files +* Improve power consumption +* Fix issues with the teamwork modules and popups + + 2014-06-30 * Release v0.6.0 diff --git a/NEWS b/NEWS index 6ac97ca..49aeaa0 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,21 @@ = -Terminology 0.6.0 +Terminology 0.6.1 = + +Changes since 0.6.0: + + +Additions: +* Add .tga images to recognized files + +Improvements: +* Improve power consumption + +Fixes: +* Fix issues with the teamwork modules and popups + + Changes since 0.5.1: @@ -22,6 +36,7 @@ Improvements: Fixes: * Various bug fixes + Changes since 0.5.0: diff --git a/README b/README index 779084e..dff5e92 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -Terminology 0.6.0 +Terminology 0.6.1 ** diff --git a/configure.ac b/configure.ac index d5f22bf..e1385c5 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script. # get rid of that stupid cache mechanism rm -f config.cache -AC_INIT([terminology], [0.6.0], [enlightenment-devel@lists.sourceforge.net]) +AC_INIT([terminology], [0.6.1], [enlightenment-devel@lists.sourceforge.net]) AC_PREREQ([2.60]) AC_CONFIG_SRCDIR([configure.ac]) AC_CONFIG_MACRO_DIR([m4]) --
[EGIT] [apps/terminology] annotated tag v0.6.1 created
billiob pushed a change to annotated tag v0.6.1 in repository apps/terminology. at 74be2bdc72 (tag) tagging 3450d06c6bcad911762d34e9d7ac5d49e690700c (commit) replaces v0.6.0 tagged by Boris Faure on Thu Jul 3 21:08:13 2014 +0200 - Log - Terminology 0.6.1 Boris Faure (2): fix possible segfault detected as CID1224396. Terminology 0.6.1 Carsten Haitzler (1): fix continual wakeups with miniview every 0.1 sec Jean-Philippe ANDRÉ (2): extns: Add .tga to the recognized image files Miniview: Fix crash due to miniview render after deletion Mike Blumenkrantz (2): hide tw popup on terminal popup show disallow tw popups while terminology popup is present --- This annotated tag includes the following new commits: new 3450d06c6b Terminology 0.6.1 The 1 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] [apps/econnman] master 01/01: I remember that even in the english description it was specified that this is the version with agent. Anyway I specified it for the italian localization.
maxerba pushed a commit to branch master. http://git.enlightenment.org/apps/econnman.git/commit/?id=1551b89b81940bb2bdca7a11e79f182a88fca219 commit 1551b89b81940bb2bdca7a11e79f182a88fca219 Author: maxerba maiur...@gmail.com Date: Thu Jul 3 21:04:06 2014 +0200 I remember that even in the english description it was specified that this is the version with agent. Anyway I specified it for the italian localization. --- data/desktop/econnman-agent.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/desktop/econnman-agent.desktop b/data/desktop/econnman-agent.desktop index 5677f32..bd60e28 100644 --- a/data/desktop/econnman-agent.desktop +++ b/data/desktop/econnman-agent.desktop @@ -27,7 +27,7 @@ GenericName[es]=Administrador de conexiones GenericName[fr]=Gestionnaire de connexion GenericName[gl]=Xestor de conexións GenericName[hu]=Hálózati kapcsolatok -GenericName[it]=Gestore connessioni +GenericName[it]=Gestore connessioni (con agente) GenericName[ms]=Pengurus Sambungan GenericName[pl]=Menadżer Połączeń GenericName[pt]=Gestor de ligações --
[EGIT] [apps/terminology] master 01/01: improve News/Changelog
billiob pushed a commit to branch master. http://git.enlightenment.org/apps/terminology.git/commit/?id=fb42ea124c5902b62d49346a3ff636bd6dd34cf8 commit fb42ea124c5902b62d49346a3ff636bd6dd34cf8 Author: Boris Faure bill...@gmail.com Date: Thu Jul 3 21:15:19 2014 +0200 improve News/Changelog --- ChangeLog | 2 +- NEWS | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index fb12582..65cb8b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,7 +2,7 @@ * Release v0.6.1 * Add .tga images to recognized files -* Improve power consumption +* Reduced power consumption * Fix issues with the teamwork modules and popups diff --git a/NEWS b/NEWS index 49aeaa0..70c8e4f 100644 --- a/NEWS +++ b/NEWS @@ -10,7 +10,7 @@ Additions: * Add .tga images to recognized files Improvements: -* Improve power consumption +* Reduced power consumption Fixes: * Fix issues with the teamwork modules and popups --
[EGIT] [website/www] master 01/01: update links for terminology 0.6.1
billiob pushed a commit to branch master. http://git.enlightenment.org/website/www.git/commit/?id=eb2e2685092ea7c5787d077b3843edb360b9ee00 commit eb2e2685092ea7c5787d077b3843edb360b9ee00 Author: Boris Faure bill...@gmail.com Date: Thu Jul 3 21:11:42 2014 +0200 update links for terminology 0.6.1 --- public_html/p/about/terminology/en-body | 4 ++-- public_html/p/about/terminology/ko-body | 2 +- public_html/p/download/en-body | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/public_html/p/about/terminology/en-body b/public_html/p/about/terminology/en-body index 98f6700..b52375f 100644 --- a/public_html/p/about/terminology/en-body +++ b/public_html/p/about/terminology/en-body @@ -9,8 +9,8 @@ centerp ?php blinkdl(i/dl.png, - DOWNLOAD TERMINOLOGY 0.6.0, - http://download.enlightenment.org/rel/apps/terminology/terminology-0.6.0.tar.gz;);? + DOWNLOAD TERMINOLOGY 0.6.1, + http://download.enlightenment.org/rel/apps/terminology/terminology-0.6.1.tar.gz;);? /p/center h3What is it?/h3 diff --git a/public_html/p/about/terminology/ko-body b/public_html/p/about/terminology/ko-body index 4aad853..06ca5ca 100644 --- a/public_html/p/about/terminology/ko-body +++ b/public_html/p/about/terminology/ko-body @@ -10,7 +10,7 @@ centerp ?php blinkdl(i/dl.png, 터미놀로지 0.5.1 다운로드, - http://download.enlightenment.org/rel/apps/terminology/terminology-0.6.0.tar.gz;);? + http://download.enlightenment.org/rel/apps/terminology/terminology-0.6.1.tar.gz;);? /p/center h3터미놀로지란?/h3 diff --git a/public_html/p/download/en-body b/public_html/p/download/en-body index a39cf4f..d897e8f 100644 --- a/public_html/p/download/en-body +++ b/public_html/p/download/en-body @@ -138,10 +138,10 @@ ?php frame2();? ?php frame1(width=100%);? - div class=mainpbTerminology/b em0.6.0/em/pp + div class=mainpbTerminology/b em0.6.1/em/pp The best terminal emulator written with the EFL. /pp align=right?php blinkdl(i/dl.png, DOWNLOAD, - http://download.enlightenment.org/rel/apps/terminology/terminology-0.6.0.tar.gz; + http://download.enlightenment.org/rel/apps/terminology/terminology-0.6.1.tar.gz; );?/p/div ?php frame2();? --
[E-devel] Terminology 0.6.1
Terminology 0.6.0 was released yesterday but our awesome crew did some in-flight repairs! Here's the list of changes: - Reduced power consumption - Add .tga images to recognized files - Fix issues with the teamwork module and popups. The tarballs can be found at: http://download.enlightenment.org/rel/apps/terminology/terminology-0.6.1.tar.gz http://download.enlightenment.org/rel/apps/terminology/terminology-0.6.1.tar.xz The new checksums: sha1sum: c0f1f5d32abd2928476f168a8f58c5d3d4169f77 terminology-0.6.1.tar.gz 00cab5cce3ea896812018eba8940921b99d58eea terminology-0.6.1.tar.xz sha256sum 1d8d67cbe31dfba0d1644c7130cf63454d8cc5006034999625be24edbcb429f2 terminology-0.6.1.tar.gz 0c8e636918b118151d801bb5cddf85fe97b3941be115334fa711d0ab45408151 terminology-0.6.1.tar.xz -- Boris Faure for the Terminology space crew signature.asc Description: Digital signature -- Open source business process management suite built on Java and Eclipse Turn processes into business applications with Bonita BPM Community Edition Quickly connect people, data, and systems into organized workflows Winner of BOSSIE, CODIE, OW2 and Gartner awards http://p.sf.net/sfu/Bonitasoft___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/enlightenment] master 01/01: tiling: this should fix swapping the windows with padding!
tasn pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=b0f9480eee2724cac1a9b8e2b9d1c887d59ca053
commit b0f9480eee2724cac1a9b8e2b9d1c887d59ca053
Author: Marcel Hollerbach marcel-hollerb...@t-online.de
Date: Thu Jul 3 20:36:23 2014 +0100
tiling: this should fix swapping the windows with padding!
Summary: add the padding to the if clause
Test Plan: Set a padding and press WIN+Arrow keys
Reviewers: tasn
Reviewed By: tasn
CC: cedric
Differential Revision: https://phab.enlightenment.org/D1117
---
src/modules/tiling/window_tree.c | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/modules/tiling/window_tree.c b/src/modules/tiling/window_tree.c
index 3c71490..82b19d7 100644
--- a/src/modules/tiling/window_tree.c
+++ b/src/modules/tiling/window_tree.c
@@ -525,7 +525,7 @@ static void
_tiling_window_tree_node_move_walker(void *_node)
{
Window_Tree *node = _node;
-
+ int p = tiling_g.config-window_padding;
/* We are only interested in nodes with clients. */
if (!node-client)
return;
@@ -533,22 +533,22 @@ _tiling_window_tree_node_move_walker(void *_node)
switch (_node_move_ctx.cross_edge)
{
case TILING_WINDOW_TREE_EDGE_LEFT:
-if ((node-client-x + node-client-w) == CNODE-client-x)
+if ((node-client-x + node-client-w + p) == CNODE-client-x)
IF_MATCH_SET_LR(node);
break;
case TILING_WINDOW_TREE_EDGE_RIGHT:
-if (node-client-x == (CNODE-client-x + CNODE-client-w))
+if (node-client-x == (CNODE-client-x + CNODE-client-w + p))
IF_MATCH_SET_LR(node);
break;
case TILING_WINDOW_TREE_EDGE_TOP:
-if ((node-client-y + node-client-h) == CNODE-client-y)
+if ((node-client-y + node-client-h + p) == CNODE-client-y)
IF_MATCH_SET_TB(node);
break;
case TILING_WINDOW_TREE_EDGE_BOTTOM:
-if (node-client-y == (CNODE-client-y + CNODE-client-h))
+if (node-client-y == (CNODE-client-y + CNODE-client-h + p))
IF_MATCH_SET_TB(node);
break;
--
[EGIT] [core/efl] master 01/01: ecore: animator use eo_add() instead of eo_add_custom()
jeyzu pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=ec4ffb86d6bc9a3d4e4e81b80359abd7bbdb8f22
commit ec4ffb86d6bc9a3d4e4e81b80359abd7bbdb8f22
Author: Jérémy Zurcher jer...@asynk.ch
Date: Thu Jul 3 22:33:15 2014 +0200
ecore: animator use eo_add() instead of eo_add_custom()
Summary:
- use defauld constructor instead of custom one.
- we don't allow construction of an animator with a NULL callback function,
this is checked in overriden eo_finalize.
- we don't support changing this callback once the object is created,
such calls will call ERR() and return.
see 46a78e8c and f92e5d50 for eo_add_custom() - eo_add() details
Reviewers: tasn
Reviewed By: tasn
CC: cedric
Differential Revision: https://phab.enlightenment.org/D1113
---
src/lib/ecore/ecore_anim.c| 84 +++
src/lib/ecore/ecore_animator.eo | 64 +-
src/tests/ecore/ecore_test_animator.c | 7 ++-
3 files changed, 103 insertions(+), 52 deletions(-)
diff --git a/src/lib/ecore/ecore_anim.c b/src/lib/ecore/ecore_anim.c
index 892359f..0ff0169 100644
--- a/src/lib/ecore/ecore_anim.c
+++ b/src/lib/ecore/ecore_anim.c
@@ -154,42 +154,35 @@ _do_tick(void)
return ECORE_CALLBACK_RENEW;
}
-static Eina_Bool
-_ecore_animator_add(Ecore_Animator *obj,
-Ecore_Animator_Data *animator,
-Ecore_Task_Cb func,
-const void *data)
+EOLIAN static Eo *
+_ecore_animator_eo_base_finalize(Eo *obj, Ecore_Animator_Data *animator)
{
-if (EINA_UNLIKELY(!eina_main_loop_is()))
- {
- eo_error_set(obj);
- EINA_MAIN_LOOP_CHECK_RETURN_VAL(EINA_FALSE);
- }
-
- animator-obj = obj;
- eo_do_super(obj, MY_CLASS, eo_constructor());
- eo_manual_free_set(obj, EINA_TRUE);
-
- if (!func)
+ if (!animator-func)
{
eo_error_set(obj);
ERR(callback function must be set up for an object of class: '%s',
MY_CLASS_NAME);
-return EINA_FALSE;
+goto finalize;
}
- animator-func = func;
- animator-data = (void *)data;
+ if (EINA_UNLIKELY(!eina_main_loop_is()))
+ {
+eo_error_set(obj);
+EINA_MAIN_LOOP_CHECK_RETURN_VAL(
+ eo_do_super(obj, MY_CLASS, eo_finalize()));
+goto finalize;
+ }
+
+ _ecore_lock();
+
+ eo_manual_free_set(obj, EINA_TRUE);
animator-just_added = EINA_TRUE;
animators = (Ecore_Animator_Data
*)eina_inlist_append(EINA_INLIST_GET(animators), EINA_INLIST_GET(animator));
+
_begin_tick();
- return EINA_TRUE;
-}
+ _ecore_unlock();
-EOLIAN static void
-_ecore_animator_eo_base_constructor(Eo *obj, Ecore_Animator_Data *_pd
EINA_UNUSED)
-{
- eo_error_set(obj);
- ERR(only custom constructor can be used with '%s' class, MY_CLASS_NAME);
+finalize:
+ return eo_do_super(obj, MY_CLASS, eo_finalize());
}
EAPI Ecore_Animator *
@@ -198,17 +191,27 @@ ecore_animator_add(Ecore_Task_Cb func,
{
Ecore_Animator *animator = NULL;
- animator = eo_add_custom(MY_CLASS, _ecore_parent,
-ecore_animator_constructor(func, data));
+ animator = eo_add(MY_CLASS, _ecore_parent,
+ ecore_obj_animator_init(func, data));
eo_unref(animator);
return animator;
}
EOLIAN static void
-_ecore_animator_constructor(Eo *obj, Ecore_Animator_Data *animator,
Ecore_Task_Cb func, const void *data)
+_ecore_animator_init(Eo *obj, Ecore_Animator_Data *animator, Ecore_Task_Cb
func, const void *data)
{
+ if (animator-func != NULL)
+ {
+ERR(do not call this function out of '%s' object construction,
MY_CLASS_NAME);
+return;
+ }
+
_ecore_lock();
- _ecore_animator_add(obj, animator, func, data);
+
+ animator-obj = obj;
+ animator-func = func;
+ animator-data = (void *)data;
+
_ecore_unlock();
}
@@ -218,27 +221,32 @@ ecore_animator_timeline_add(doubleruntime,
const void *data)
{
Ecore_Animator *animator;
- animator = eo_add_custom(MY_CLASS, _ecore_parent,
-ecore_animator_timeline_constructor(runtime, func,
data));
+ animator = eo_add(MY_CLASS, _ecore_parent,
+ ecore_obj_animator_timeline_init(runtime, func, data));
eo_unref(animator);
return animator;
}
EOLIAN static void
-_ecore_animator_timeline_constructor(Eo *obj, Ecore_Animator_Data *animator,
double runtime, Ecore_Timeline_Cb func, const void *data)
+_ecore_animator_timeline_init(Eo *obj, Ecore_Animator_Data *animator, double
runtime, Ecore_Timeline_Cb func, const void *data)
{
- _ecore_lock();
- if (runtime = 0.0) runtime = 0.0;
+ if (animator-func != NULL)
+ {
+ERR(do not call this function out of '%s' object construction,
MY_CLASS_NAME);
+return;
+ }
+ if (runtime 0.0) runtime = 0.0;
- if
[EGIT] [core/efl] master 01/01: Revert ecore: animator use eo_add() instead of eo_add_custom()
jeyzu pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=a7dfaef21522ef239ed802eae125d655f537c757
commit a7dfaef21522ef239ed802eae125d655f537c757
Author: Jérémy Zurcher jer...@asynk.ch
Date: Thu Jul 3 23:05:57 2014 +0200
Revert ecore: animator use eo_add() instead of eo_add_custom()
mmhhmm, missing @ Constructor tag, bad for the bindings,
maybe we must split animator and timeline into 2 classes,
maybe support callback hot swaping ...
This reverts commit ec4ffb86d6bc9a3d4e4e81b80359abd7bbdb8f22.
---
src/lib/ecore/ecore_anim.c| 84 ---
src/lib/ecore/ecore_animator.eo | 64 +-
src/tests/ecore/ecore_test_animator.c | 7 +--
3 files changed, 52 insertions(+), 103 deletions(-)
diff --git a/src/lib/ecore/ecore_anim.c b/src/lib/ecore/ecore_anim.c
index 0ff0169..892359f 100644
--- a/src/lib/ecore/ecore_anim.c
+++ b/src/lib/ecore/ecore_anim.c
@@ -154,35 +154,42 @@ _do_tick(void)
return ECORE_CALLBACK_RENEW;
}
-EOLIAN static Eo *
-_ecore_animator_eo_base_finalize(Eo *obj, Ecore_Animator_Data *animator)
+static Eina_Bool
+_ecore_animator_add(Ecore_Animator *obj,
+Ecore_Animator_Data *animator,
+Ecore_Task_Cb func,
+const void *data)
{
- if (!animator-func)
- {
-eo_error_set(obj);
-ERR(callback function must be set up for an object of class: '%s',
MY_CLASS_NAME);
-goto finalize;
- }
+if (EINA_UNLIKELY(!eina_main_loop_is()))
+ {
+ eo_error_set(obj);
+ EINA_MAIN_LOOP_CHECK_RETURN_VAL(EINA_FALSE);
+ }
+
+ animator-obj = obj;
+ eo_do_super(obj, MY_CLASS, eo_constructor());
+ eo_manual_free_set(obj, EINA_TRUE);
- if (EINA_UNLIKELY(!eina_main_loop_is()))
+ if (!func)
{
eo_error_set(obj);
-EINA_MAIN_LOOP_CHECK_RETURN_VAL(
- eo_do_super(obj, MY_CLASS, eo_finalize()));
-goto finalize;
+ERR(callback function must be set up for an object of class: '%s',
MY_CLASS_NAME);
+return EINA_FALSE;
}
- _ecore_lock();
-
- eo_manual_free_set(obj, EINA_TRUE);
+ animator-func = func;
+ animator-data = (void *)data;
animator-just_added = EINA_TRUE;
animators = (Ecore_Animator_Data
*)eina_inlist_append(EINA_INLIST_GET(animators), EINA_INLIST_GET(animator));
-
_begin_tick();
- _ecore_unlock();
+ return EINA_TRUE;
+}
-finalize:
- return eo_do_super(obj, MY_CLASS, eo_finalize());
+EOLIAN static void
+_ecore_animator_eo_base_constructor(Eo *obj, Ecore_Animator_Data *_pd
EINA_UNUSED)
+{
+ eo_error_set(obj);
+ ERR(only custom constructor can be used with '%s' class, MY_CLASS_NAME);
}
EAPI Ecore_Animator *
@@ -191,27 +198,17 @@ ecore_animator_add(Ecore_Task_Cb func,
{
Ecore_Animator *animator = NULL;
- animator = eo_add(MY_CLASS, _ecore_parent,
- ecore_obj_animator_init(func, data));
+ animator = eo_add_custom(MY_CLASS, _ecore_parent,
+ecore_animator_constructor(func, data));
eo_unref(animator);
return animator;
}
EOLIAN static void
-_ecore_animator_init(Eo *obj, Ecore_Animator_Data *animator, Ecore_Task_Cb
func, const void *data)
+_ecore_animator_constructor(Eo *obj, Ecore_Animator_Data *animator,
Ecore_Task_Cb func, const void *data)
{
- if (animator-func != NULL)
- {
-ERR(do not call this function out of '%s' object construction,
MY_CLASS_NAME);
-return;
- }
-
_ecore_lock();
-
- animator-obj = obj;
- animator-func = func;
- animator-data = (void *)data;
-
+ _ecore_animator_add(obj, animator, func, data);
_ecore_unlock();
}
@@ -221,32 +218,27 @@ ecore_animator_timeline_add(doubleruntime,
const void *data)
{
Ecore_Animator *animator;
- animator = eo_add(MY_CLASS, _ecore_parent,
- ecore_obj_animator_timeline_init(runtime, func, data));
+ animator = eo_add_custom(MY_CLASS, _ecore_parent,
+ecore_animator_timeline_constructor(runtime, func,
data));
eo_unref(animator);
return animator;
}
EOLIAN static void
-_ecore_animator_timeline_init(Eo *obj, Ecore_Animator_Data *animator, double
runtime, Ecore_Timeline_Cb func, const void *data)
+_ecore_animator_timeline_constructor(Eo *obj, Ecore_Animator_Data *animator,
double runtime, Ecore_Timeline_Cb func, const void *data)
{
- if (animator-func != NULL)
- {
-ERR(do not call this function out of '%s' object construction,
MY_CLASS_NAME);
-return;
- }
- if (runtime 0.0) runtime = 0.0;
-
_ecore_lock();
+ if (runtime = 0.0) runtime = 0.0;
+
+ if (!_ecore_animator_add(obj, animator, _ecore_animator_run, NULL)) goto
unlock;
- animator-obj = obj;
- animator-func = _ecore_animator_run;
animator-data = obj;
animator-run_func = func;
[EGIT] [core/efl] master 01/01: eolian: have eolian_all_classes_list_get instead of eolian_class_names_list_get
q66 pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=84451db6389efb46cb753d8d721144fc76af7d11
commit 84451db6389efb46cb753d8d721144fc76af7d11
Author: Daniel Kolesa d.kol...@samsung.com
Date: Thu Jul 3 22:12:09 2014 +0100
eolian: have eolian_all_classes_list_get instead of
eolian_class_names_list_get
---
src/bin/eolian_cxx/eolian_wrappers.hh | 2 +-
src/lib/eolian/Eolian.h | 5 ++---
src/lib/eolian/eolian_database.c | 9 ++---
3 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/src/bin/eolian_cxx/eolian_wrappers.hh
b/src/bin/eolian_cxx/eolian_wrappers.hh
index e357c25..f8ff71c 100644
--- a/src/bin/eolian_cxx/eolian_wrappers.hh
+++ b/src/bin/eolian_cxx/eolian_wrappers.hh
@@ -154,7 +154,7 @@ class_namespace_full(Eolian_Class const klass)
inline efl::eina::range_ptr_listconst Eolian_Class
class_list_all()
{
- return ::eolian_class_names_list_get();
+ return ::eolian_all_classes_list_get();
}
inline std::string
diff --git a/src/lib/eolian/Eolian.h b/src/lib/eolian/Eolian.h
index ae6ddcf..a7e4bc2 100644
--- a/src/lib/eolian/Eolian.h
+++ b/src/lib/eolian/Eolian.h
@@ -289,14 +289,13 @@ eolian_class_namespaces_list_get(const Eolian_Class
klass);
EAPI Eolian_Class_Type eolian_class_type_get(const Eolian_Class klass);
/*
- * @brief Returns the names list of all the classes stored into the database.
+ * @brief Returns a list of all the classes stored into the database.
*
* @return the list
*
* @ingroup Eolian
*/
-/* Returns the list of class names of the database */
-EAPI const Eina_List *eolian_class_names_list_get(void);
+EAPI const Eina_List *eolian_all_classes_list_get(void);
/*
* @brief Returns the description of a class.
diff --git a/src/lib/eolian/eolian_database.c b/src/lib/eolian/eolian_database.c
index 55f59a6..1b281ff 100644
--- a/src/lib/eolian/eolian_database.c
+++ b/src/lib/eolian/eolian_database.c
@@ -393,14 +393,9 @@ database_class_del(Eolian_Class class)
}
EAPI const Eina_List *
-eolian_class_names_list_get(void)
+eolian_all_classes_list_get(void)
{
- Eina_List *itr;
- _Class_Desc *cl;
- Eina_List *list = NULL;
- EINA_LIST_FOREACH(_classes, itr, cl)
- list = eina_list_append(list, cl-name);
- return list;
+ return _classes;
}
Eina_Bool
--
[EGIT] [enlightenment/modules/places] master 02/04: Make size units translatable
garik pushed a commit to branch master.
http://git.enlightenment.org/enlightenment/modules/places.git/commit/?id=a2b248521965e10014c344a62c5bd77c96054945
commit a2b248521965e10014c344a62c5bd77c96054945
Author: Igor Murzov ga...@efl.so
Date: Fri Jul 4 02:12:40 2014 +0400
Make size units translatable
---
po/POTFILES.in| 1 +
src/e_mod_main.h | 1 +
src/e_mod_places.c| 12 ++--
src/e_mod_udisks_eldbus.c | 3 ++-
4 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 905efda..5cc1a9b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,3 +2,4 @@ src/e_mod_config.c
src/e_mod_main.c
src/e_mod_main.h
src/e_mod_places.c
+src/e_mod_udisks_eldbus.c
diff --git a/src/e_mod_main.h b/src/e_mod_main.h
index b78b560..8720d8e 100644
--- a/src/e_mod_main.h
+++ b/src/e_mod_main.h
@@ -9,6 +9,7 @@
# define bind_textdomain_codeset(domain,codeset)
# define D_(string) (string)
#endif
+#define N_(string) (string)
/* Macros used for config file versioning */
#define MOD_CONFIG_FILE_EPOCH 0x0001
diff --git a/src/e_mod_places.c b/src/e_mod_places.c
index d186d32..cba6dc2 100644
--- a/src/e_mod_places.c
+++ b/src/e_mod_places.c
@@ -596,30 +596,30 @@ _places_human_size_get(unsigned long long size)
dsize = (double)size;
if (dsize 1024)
- snprintf(hum, sizeof(hum), %.0fb, dsize);
+ snprintf(hum, sizeof(hum), %.0f%s, dsize, D_(b));
else
{
dsize /= 1024.0;
if (dsize 1024)
- suffix = KB;
+ suffix = N_(KB);
else
{
dsize /= 1024.0;
if (dsize 1024)
- suffix = MB;
+ suffix = N_(MB);
else
{
dsize /= 1024.0;
if(dsize 1024)
-suffix = GB;
+suffix = N_(GB);
else
{
dsize /= 1024.0;
- suffix = TB;
+ suffix = N_(TB);
}
}
}
-snprintf(hum, sizeof(hum), %.1f%s, dsize, suffix);
+snprintf(hum, sizeof(hum), %.1f%s, dsize, D_(suffix));
}
return eina_stringshare_add(hum);
diff --git a/src/e_mod_udisks_eldbus.c b/src/e_mod_udisks_eldbus.c
index 8dfdd9e..98c7de4 100644
--- a/src/e_mod_udisks_eldbus.c
+++ b/src/e_mod_udisks_eldbus.c
@@ -7,6 +7,7 @@
#include Eldbus.h
#include e.h
+#include e_mod_main.h
#include e_mod_places.h
@@ -338,7 +339,7 @@ _places_udisks_volume_task_cb(void *data, const
Eldbus_Message *msg,
if (eldbus_message_error_get(msg, NULL, NULL))
{
eldbus_message_arguments_get(msg,s, str);
- e_util_dialog_internal(Operation failed, str);
+ e_util_dialog_internal(D_(Operation failed), str);
}
}
--
[EGIT] [enlightenment/modules/places] master 01/04: Display sizes = 1TB in terse format as well.
garik pushed a commit to branch master.
http://git.enlightenment.org/enlightenment/modules/places.git/commit/?id=701f72dae290f5feabf86590634f050fb89d1427
commit 701f72dae290f5feabf86590634f050fb89d1427
Author: Igor Murzov ga...@efl.so
Date: Fri Jul 4 02:07:22 2014 +0400
Display sizes = 1TB in terse format as well.
---
src/e_mod_places.c | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/e_mod_places.c b/src/e_mod_places.c
index 7891e98..d186d32 100644
--- a/src/e_mod_places.c
+++ b/src/e_mod_places.c
@@ -610,7 +610,13 @@ _places_human_size_get(unsigned long long size)
else
{
dsize /= 1024.0;
- suffix = GB;
+ if(dsize 1024)
+suffix = GB;
+ else
+{
+ dsize /= 1024.0;
+ suffix = TB;
+}
}
}
snprintf(hum, sizeof(hum), %.1f%s, dsize, suffix);
--
[EGIT] [enlightenment/modules/places] master 04/04: Update russian translation
garik pushed a commit to branch master. http://git.enlightenment.org/enlightenment/modules/places.git/commit/?id=818c460775fc326696205d7d55616fb58c4010aa commit 818c460775fc326696205d7d55616fb58c4010aa Author: Igor Murzov ga...@efl.so Date: Fri Jul 4 02:55:37 2014 +0400 Update russian translation --- po/ru.po | 88 ++-- 1 file changed, 58 insertions(+), 30 deletions(-) diff --git a/po/ru.po b/po/ru.po index 15d464d..4bcf48a 100644 --- a/po/ru.po +++ b/po/ru.po @@ -3,78 +3,82 @@ # This file is distributed under the same license as the enlightenment package. # Serguey G Basalaev sbasal...@gmail.com, 2009. # Black Raven, 2009. -# Igor Murzov e-m...@date.by, 2012, 2013. +# Igor Murzov ga...@efl.so, 2012-2014. # msgid msgstr Project-Id-Version: enlightenment\n Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n -POT-Creation-Date: 2013-01-08 02:30+0400\n -PO-Revision-Date: 2013-01-08 02:39+0400\n -Last-Translator: Igor Murzov e-m...@date.by\n +POT-Creation-Date: 2014-07-04 01:32+0400\n +PO-Revision-Date: 2014-07-04 01:39+0400\n +Last-Translator: Игорь Мурзов ga...@efl.so\n Language-Team: Russian r...@li.org\n Language: ru\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -#: src/e_mod_config.c:54 +#: src/e_mod_config.c:55 msgid Places Settings msgstr Настройка Мест -#: src/e_mod_config.c:136 +#: src/e_mod_config.c:138 msgid General msgstr Общее -#: src/e_mod_config.c:139 +#: src/e_mod_config.c:141 msgid Show in main menu msgstr Показывать в главном меню -#: src/e_mod_config.c:143 +#: src/e_mod_config.c:145 msgid Hide the gadget header msgstr Скрыть заголовок гаджета -#: src/e_mod_config.c:147 +#: src/e_mod_config.c:149 +msgid Auto close the popup +msgstr Автоматически закрывать всплывающее окно + +#: src/e_mod_config.c:153 msgid Mount volumes at boot msgstr Монтировать тома при старте системы -#: src/e_mod_config.c:151 +#: src/e_mod_config.c:157 msgid Mount volumes on insert msgstr Монтировать тома при подключении -#: src/e_mod_config.c:155 +#: src/e_mod_config.c:161 msgid Open filemanager on insert msgstr Открыть файловый менеджер при подключении -#: src/e_mod_config.c:162 +#: src/e_mod_config.c:168 msgid Use a custom file manager msgstr Использовать пользовательский файловый менеджер -#: src/e_mod_config.c:175 +#: src/e_mod_config.c:181 msgid Show in menu msgstr Показывать в меню -#: src/e_mod_config.c:178 src/e_mod_places.c:774 +#: src/e_mod_config.c:184 src/e_mod_places.c:800 msgid Home msgstr Домашний каталог -#: src/e_mod_config.c:181 src/e_mod_places.c:783 +#: src/e_mod_config.c:187 src/e_mod_places.c:809 msgid Desktop msgstr Рабочий стол -#: src/e_mod_config.c:184 src/e_mod_places.c:793 +#: src/e_mod_config.c:190 src/e_mod_places.c:818 msgid Trash msgstr Корзина -#: src/e_mod_config.c:187 src/e_mod_places.c:618 src/e_mod_places.c:802 +#: src/e_mod_config.c:193 src/e_mod_places.c:649 src/e_mod_places.c:827 msgid Filesystem msgstr Файловая система -#: src/e_mod_config.c:190 src/e_mod_places.c:811 +#: src/e_mod_config.c:196 src/e_mod_places.c:836 msgid Temp msgstr Временные файлы -#: src/e_mod_config.c:193 +#: src/e_mod_config.c:199 msgid Favorites msgstr Избранное @@ -82,24 +86,24 @@ msgstr Избранное msgid Files msgstr Файлы -#: src/e_mod_main.c:61 src/e_mod_main.c:298 src/e_mod_places.c:236 -#: src/e_mod_places.c:868 +#: src/e_mod_main.c:61 src/e_mod_main.c:315 src/e_mod_places.c:265 +#: src/e_mod_places.c:893 msgid Places msgstr Места -#: src/e_mod_main.c:394 +#: src/e_mod_main.c:412 msgid Places Configuration Updated msgstr Настройки Мест обновлены -#: src/e_mod_main.c:434 +#: src/e_mod_main.c:534 msgid Settings msgstr Настройки -#: src/e_mod_places.c:599 +#: src/e_mod_places.c:497 msgid Warning msgstr Предупреждение -#: src/e_mod_places.c:600 +#: src/e_mod_places.c:498 msgid bCannot run the Enlightenment FileManager./bbrPlease choose a custom file manager inbrthe gadget configuration. @@ -107,23 +111,47 @@ msgstr bНе удалось запустить EFM./bbrПожалуйста, выберите другой файловый менеджерbrв настройках гаджета. -#: src/e_mod_places.c:622 +#: src/e_mod_places.c:599 +msgid b +msgstr Б + +#: src/e_mod_places.c:604 +msgid KB +msgstr КБ + +#: src/e_mod_places.c:609 +msgid MB +msgstr МБ + +#: src/e_mod_places.c:614 +msgid GB +msgstr ГБ + +#: src/e_mod_places.c:618 +msgid TB +msgstr ТБ + +#: src/e_mod_places.c:653 msgid No Name msgstr Без имени -#: src/e_mod_places.c:629 +#: src/e_mod_places.c:660 msgid free of msgstr свободно из -#: src/e_mod_places.c:635 +#: src/e_mod_places.c:666 #, c-format msgid %s Not Mounted msgstr %s Не подключен -#: src/e_mod_places.c:662 +#: src/e_mod_places.c:693 msgid unmount msgstr отключить -#: src/e_mod_places.c:667 +#: src/e_mod_places.c:698 msgid eject msgstr извлечь + +#: src/e_mod_udisks_eldbus.c:342 +msgid Operation
[EGIT] [enlightenment/modules/places] master 03/04: Restore french translation that was lost in 45eaf4422d
garik pushed a commit to branch master. http://git.enlightenment.org/enlightenment/modules/places.git/commit/?id=160db1e6803472735ba01b8d52a75061a5952633 commit 160db1e6803472735ba01b8d52a75061a5952633 Author: Igor Murzov ga...@efl.so Date: Fri Jul 4 02:38:45 2014 +0400 Restore french translation that was lost in 45eaf4422d This partially reverts commit 45eaf4422d --- po/fr.po | 58 ++ 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/po/fr.po b/po/fr.po index eb01bf9..b5552c5 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,15 +7,15 @@ msgid msgstr Project-Id-Version: Places module\n Report-Msgid-Bugs-To: $MSGID_BUGS_ADDRESS\n -POT-Creation-Date: 2013-06-21 01:05+0200\n -PO-Revision-Date: 2013-06-20 06:58+\n -Last-Translator: Eliovir Unknown\n +POT-Creation-Date: 2013-05-22 20:28+0200\n +PO-Revision-Date: 2012-12-21 19:41+\n +Last-Translator: batden dazi...@sfr.fr\n Language-Team: Enlightenment French Team sansgou...@gmail.com\n MIME-Version: 1.0\n Content-Type: text/plain; charset=utf-8\n Content-Transfer-Encoding: 8bit\n -X-Launchpad-Export-Date: 2013-06-22 05:38+\n -X-Generator: Launchpad (build 16677)\n +X-Launchpad-Export-Date: 2013-05-23 05:28+\n +X-Generator: Launchpad (build 16640)\n X-Poedit-Country: FRANCE\n Language: \n X-Poedit-Language: French\n @@ -23,19 +23,19 @@ msgstr #: src/e_mod_config.c:55 msgid Places Settings -msgstr +msgstr Paramétrage de Raccourcis #: src/e_mod_config.c:138 msgid General -msgstr +msgstr Paramètres généraux #: src/e_mod_config.c:141 msgid Show in main menu -msgstr +msgstr Afficher dans le menu principal #: src/e_mod_config.c:145 msgid Hide the gadget header -msgstr +msgstr Masquer l'en-tête du gadget #: src/e_mod_config.c:149 msgid Auto close the popup @@ -47,56 +47,56 @@ msgstr #: src/e_mod_config.c:157 msgid Mount volumes on insert -msgstr +msgstr Montage des volumes à l'insertion #: src/e_mod_config.c:161 msgid Open filemanager on insert -msgstr +msgstr Ouvrir le gestionnaire de fichiers à l'insertion #: src/e_mod_config.c:168 msgid Use a custom file manager -msgstr +msgstr Utiliser un gestionnaire de fichiers personnalisé #: src/e_mod_config.c:181 msgid Show in menu -msgstr +msgstr Afficher dans le menu #: src/e_mod_config.c:184 src/e_mod_places.c:803 msgid Home -msgstr +msgstr Dossier personnel #: src/e_mod_config.c:187 src/e_mod_places.c:812 msgid Desktop -msgstr +msgstr Bureau #: src/e_mod_config.c:190 src/e_mod_places.c:821 msgid Trash -msgstr +msgstr Corbeille #: src/e_mod_config.c:193 src/e_mod_places.c:652 src/e_mod_places.c:830 msgid Filesystem -msgstr +msgstr Racine #: src/e_mod_config.c:196 src/e_mod_places.c:839 msgid Temp -msgstr +msgstr /tmp #: src/e_mod_config.c:199 msgid Favorites -msgstr +msgstr Favoris #: src/e_mod_main.c:59 msgid Files -msgstr +msgstr Fichiers #: src/e_mod_main.c:61 src/e_mod_main.c:329 src/e_mod_places.c:274 #: src/e_mod_places.c:896 msgid Places -msgstr +msgstr Raccourcis #: src/e_mod_main.c:426 msgid Places Configuration Updated -msgstr +msgstr Configuration de Raccourcis actualisée #: src/e_mod_main.c:542 msgid Settings @@ -104,31 +104,33 @@ msgstr Configuration #: src/e_mod_places.c:506 msgid Warning -msgstr +msgstr Avertissement #: src/e_mod_places.c:507 msgid bCannot run the Enlightenment FileManager./bbrPlease choose a custom file manager inbrthe gadget configuration. msgstr +bImpossible d'exécuter EFM./bbrVeuillez choisir un gestionnaire de +fichiersbrpersonnalisé dans la configuration du gadget. #: src/e_mod_places.c:656 msgid No Name -msgstr +msgstr Sans nom #: src/e_mod_places.c:663 msgid free of -msgstr +msgstr de libre sur #: src/e_mod_places.c:669 #, c-format msgid %s Not Mounted -msgstr +msgstr %s Pas Monté #: src/e_mod_places.c:696 msgid unmount -msgstr +msgstr démonter #: src/e_mod_places.c:701 msgid eject -msgstr +msgstr éjecter --
Re: [E-devel] Is there an example of setting font of elementary widgets?
I see. Thank you. On Thu, Jul 3, 2014 at 8:22 AM, Carsten Haitzler ras...@rasterman.com wrote: On Wed, 2 Jul 2014 23:52:13 +0800 Magicloud Magiclouds magicloud.magiclo...@gmail.com said: Although hard to believe there is no way to affect a text rendering. But alright. Thank you. you can always use styles and edje files to make new label styles of your own ... like every widget allows styles and elm allows theme extensions. On Wed, Jul 2, 2014 at 6:07 PM, Carsten Haitzler ras...@rasterman.com wrote: On Wed, 2 Jul 2014 16:58:33 +0800 Magicloud Magiclouds magicloud.magiclo...@gmail.com said: No font set for label? that's what i said. :) On Wed, Jul 2, 2014 at 4:58 PM, Carsten Haitzler ras...@rasterman.com wrote: On Wed, 2 Jul 2014 16:07:58 +0800 Magicloud Magiclouds magicloud.magiclo...@gmail.com said: On Wed, Jul 2, 2014 at 2:49 PM, Carsten Haitzler ras...@rasterman.com wrote: elm_entry_text_style_user_push Ah, thank you. But how is that for label? And if fotn_overlay is not for this, what is it for? label doesn't have this. -- - Codito, ergo sum - I code, therefore I am -- The Rasterman (Carsten Haitzler)ras...@rasterman.com -- 竹密岂妨流水过 山高哪阻野云飞 And for G+, please use magiclouds#gmail.com. -- Open source business process management suite built on Java and Eclipse Turn processes into business applications with Bonita BPM Community Edition Quickly connect people, data, and systems into organized workflows Winner of BOSSIE, CODIE, OW2 and Gartner awards http://p.sf.net/sfu/Bonitasoft ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- - Codito, ergo sum - I code, therefore I am -- The Rasterman (Carsten Haitzler)ras...@rasterman.com -- 竹密岂妨流水过 山高哪阻野云飞 And for G+, please use magiclouds#gmail.com. -- - Codito, ergo sum - I code, therefore I am -- The Rasterman (Carsten Haitzler)ras...@rasterman.com -- 竹密岂妨流水过 山高哪阻野云飞 And for G+, please use magiclouds#gmail.com. -- Open source business process management suite built on Java and Eclipse Turn processes into business applications with Bonita BPM Community Edition Quickly connect people, data, and systems into organized workflows Winner of BOSSIE, CODIE, OW2 and Gartner awards http://p.sf.net/sfu/Bonitasoft ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/elementary] master 01/01: focus: when focus_highlight is enabled, it should be shown immediately.
woohyun pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=a3a41cec1d8bc28b7aed10038fdad598e88a3a50
commit a3a41cec1d8bc28b7aed10038fdad598e88a3a50
Author: WooHyun Jung wh0705.j...@samsung.com
Date: Fri Jul 4 11:16:59 2014 +0900
focus: when focus_highlight is enabled, it should be shown immediately.
---
src/bin/test_focus.c | 21 -
src/lib/elm_win.c| 11 ++-
2 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/src/bin/test_focus.c b/src/bin/test_focus.c
index b450229..d7cef02 100644
--- a/src/bin/test_focus.c
+++ b/src/bin/test_focus.c
@@ -60,6 +60,15 @@ _tb_sel(void *data EINA_UNUSED, Evas_Object *obj, void
*event_info EINA_UNUSED)
}
static void
+_focus_highlight_changed(void *data, Evas_Object *obj, void *event_info
EINA_UNUSED)
+{
+ if (elm_check_state_get(obj))
+ elm_win_focus_highlight_enabled_set(data, EINA_TRUE);
+ else
+ elm_win_focus_highlight_enabled_set(data, EINA_FALSE);
+}
+
+static void
_focus_anim_changed(void *data, Evas_Object *obj, void *event_info EINA_UNUSED)
{
if (elm_check_state_get(obj))
@@ -429,9 +438,19 @@ test_focus(void *data EINA_UNUSED, Evas_Object *obj
EINA_UNUSED, void *event_inf
{
Evas_Object *ck;
+
+ck = elm_check_add(bx);
+elm_object_text_set(ck, Focus Highlight Enable);
+elm_check_state_set(ck, elm_win_focus_highlight_enabled_get(win));
+elm_box_pack_end(bx, ck);
+my_show(ck);
+evas_object_smart_callback_add(ck, changed,
+ _focus_highlight_changed,
+ win);
+
ck = elm_check_add(bx);
elm_object_text_set(ck, Focus Highlight Animation Enable);
-elm_check_state_set(ck, elm_config_focus_highlight_animate_get());
+elm_check_state_set(ck, elm_win_focus_highlight_animate_get(win));
elm_box_pack_end(bx, ck);
my_show(ck);
evas_object_smart_callback_add(ck, changed,
diff --git a/src/lib/elm_win.c b/src/lib/elm_win.c
index 11ca2d3..80e0ce1 100644
--- a/src/lib/elm_win.c
+++ b/src/lib/elm_win.c
@@ -2281,7 +2281,16 @@ _elm_win_focus_highlight_init(Elm_Win_Data *sd)
EVAS_CALLBACK_CANVAS_OBJECT_FOCUS_OUT,
_elm_win_object_focus_out, sd-obj);
- sd-focus_highlight.cur.target = NULL;
+ sd-focus_highlight.cur.target =
_elm_win_focus_target_get(evas_focus_get(sd-evas));
+ if (sd-focus_highlight.cur.target)
+ {
+if (elm_widget_highlight_in_theme_get(sd-focus_highlight.cur.target))
+ sd-focus_highlight.cur.in_theme = EINA_TRUE;
+else
+ _elm_win_focus_target_callbacks_add(sd);
+ }
+
+ sd-focus_highlight.prev.target = NULL;
sd-focus_highlight.fobj = edje_object_add(sd-evas);
sd-focus_highlight.theme_changed = EINA_TRUE;
--
[EGIT] [core/elementary] master 01/01: toolbar: fix focus highlight bug in toolbar
woohyun pushed a commit to branch master.
http://git.enlightenment.org/core/elementary.git/commit/?id=e1c262f989b0e1a0433d31470aa96691a4de5c73
commit e1c262f989b0e1a0433d31470aa96691a4de5c73
Author: WooHyun Jung wh0705.j...@samsung.com
Date: Fri Jul 4 11:55:21 2014 +0900
toolbar: fix focus highlight bug in toolbar
When getting focus_highlight geometry from toolbar, there can be a case
that no item has focus. Then, geometry of toolbar should be refered.
---
src/lib/elm_toolbar.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/lib/elm_toolbar.c b/src/lib/elm_toolbar.c
index 55ec9f8..ea6758b 100644
--- a/src/lib/elm_toolbar.c
+++ b/src/lib/elm_toolbar.c
@@ -2957,7 +2957,7 @@ _elm_toolbar_coordinates_adjust(Elm_Object_Item *it,
}
EOLIAN static void
-_elm_toolbar_elm_widget_focus_highlight_geometry_get(Eo *obj EINA_UNUSED,
Elm_Toolbar_Data *sd, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord
*h)
+_elm_toolbar_elm_widget_focus_highlight_geometry_get(Eo *obj, Elm_Toolbar_Data
*sd, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h)
{
if (sd-focused_item)
{
@@ -2966,6 +2966,8 @@ _elm_toolbar_elm_widget_focus_highlight_geometry_get(Eo
*obj EINA_UNUSED, Elm_To
elm_widget_focus_highlight_focus_part_geometry_get
(VIEW(sd-focused_item), x, y, w, h);
}
+ else
+ evas_object_geometry_get(obj, x, y, w, h);
}
EAPI Evas_Object *
--
[EGIT] [core/efl] master 01/01: evas - gl common - fix drop of image on cache hit in gl engine images
raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=1eaf26989b51ac6af8fbbb2928842e5f783e7846
commit 1eaf26989b51ac6af8fbbb2928842e5f783e7846
Author: Carsten Haitzler (Rasterman) ras...@rasterman.com
Date: Fri Jul 4 12:26:16 2014 +0900
evas - gl common - fix drop of image on cache hit in gl engine images
@fix - this fixes a leak (reference count leak)
---
src/modules/evas/engines/gl_common/evas_gl_image.c | 24 ++
1 file changed, 11 insertions(+), 13 deletions(-)
diff --git a/src/modules/evas/engines/gl_common/evas_gl_image.c
b/src/modules/evas/engines/gl_common/evas_gl_image.c
index 0a6d8c9..4f95a93 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_image.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_image.c
@@ -168,21 +168,19 @@ _evas_gl_common_image(Evas_Engine_GL_Context *gc,
RGBA_Image *im_im,
return NULL;
}
*/
-
+
// FIXME: keep unreffed shared images around
EINA_LIST_FOREACH(gc-shared-images, l, im)
{
- if (im-im == im_im)
- {
-// why did i put this here? i think to free the rgba pixel data once a texture
-// exists.
-// evas_cache_image_drop((im_im-cache_entry));
-gc-shared-images = eina_list_remove_list(gc-shared-images, l);
-gc-shared-images = eina_list_prepend(gc-shared-images, im);
+if (im-im == im_im)
+ {
+ evas_cache_image_drop((im_im-cache_entry));
+ gc-shared-images = eina_list_remove_list(gc-shared-images, l);
+ gc-shared-images = eina_list_prepend(gc-shared-images, im);
evas_gl_common_image_ref(im);
-*error = EVAS_LOAD_ERROR_NONE;
-return im;
- }
+ *error = EVAS_LOAD_ERROR_NONE;
+ return im;
+ }
}
im = calloc(1, sizeof(Evas_GL_Image));
@@ -194,8 +192,8 @@ _evas_gl_common_image(Evas_Engine_GL_Context *gc,
RGBA_Image *im_im,
else
#endif
evas_cache_image_drop((im_im-cache_entry));
- *error = EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED;
- return NULL;
+*error = EVAS_LOAD_ERROR_RESOURCE_ALLOCATION_FAILED;
+return NULL;
}
if (im_im-cache_entry.cspaces)
{
--
[EGIT] [core/elementary] master 01/01: fileselectior - fix to add explicit req on eio in elementary
raster pushed a commit to branch master. http://git.enlightenment.org/core/elementary.git/commit/?id=cab0c66982aac70c4085dc1e5639752cd3d81325 commit cab0c66982aac70c4085dc1e5639752cd3d81325 Author: Carsten Haitzler (Rasterman) ras...@rasterman.com Date: Fri Jul 4 14:29:24 2014 +0900 fileselectior - fix to add explicit req on eio in elementary this adjusts for edje no longer implicitly initting eio (should never have been depended on anyway) --- configure.ac | 2 ++ src/lib/elm_main.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/configure.ac b/configure.ac index dcc6cd6..580e86c 100644 --- a/configure.ac +++ b/configure.ac @@ -195,6 +195,7 @@ PKG_CHECK_MODULES([ELEMENTARY], efreet = efl_version efreet-mime = efl_version efreet-trash = efl_version +eio = efl_version ] ) @@ -220,6 +221,7 @@ requirement_elm=\ efreet = efl_version \ efreet-mime = efl_version \ efreet-trash = efl_version \ +eio = efl_version \ have_elementary_x=no diff --git a/src/lib/elm_main.c b/src/lib/elm_main.c index feda887..5fc8c37 100644 --- a/src/lib/elm_main.c +++ b/src/lib/elm_main.c @@ -613,6 +613,7 @@ elm_quicklaunch_init(intargc, ELM_EVENT_POLICY_CHANGED = ecore_event_type_new(); ecore_file_init(); + eio_init(); _elm_exit_handler = ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, _elm_signal_exit, NULL); @@ -747,6 +748,7 @@ elm_quicklaunch_shutdown(void) _elm_unneed_elocation(); _elm_unneed_ethumb(); _elm_unneed_web(); + eio_shutdown(); ecore_file_shutdown(); #ifdef HAVE_ELEMENTARY_EMAP --
