[EGIT] [core/efl] master 01/01: edje: Set the default image in image set.
jaehwan pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=8ea9bc7ba060347fcfbf3fd03e363755d6d23299
commit 8ea9bc7ba060347fcfbf3fd03e363755d6d23299
Author: Jaehwan Kim jae.hwan@samsung.com
Date: Tue Nov 18 17:13:38 2014 +0900
edje: Set the default image in image set.
If there's no suitable image in image set, set the first image among
the set.
---
src/lib/edje/edje_calc.c | 17 +
1 file changed, 17 insertions(+)
diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c
index 14627cd..f6d75e6 100644
--- a/src/lib/edje/edje_calc.c
+++ b/src/lib/edje/edje_calc.c
@@ -405,6 +405,23 @@ _edje_image_find(Evas_Object *obj, Edje *ed,
Edje_Real_Part_Set **eps,
}
}
+ entry = eina_list_data_get(set-entries);
+ if (entry)
+{
+ if (eps)
+ {
+if (!*eps)
+ *eps = calloc(1, sizeof (Edje_Real_Part_Set));
+if (*eps)
+ {
+ (*eps)-entry = entry;
+ (*eps)-set = set;
+ (*eps)-id = id;
+ }
+ }
+ return entry-id;
+}
+
return -1;
}
--
[EGIT] [core/efl] master 01/02: Evas GL: Add some debug
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=f663980111740112d41fbe86dbe56fabca5a9172
commit f663980111740112d41fbe86dbe56fabca5a9172
Author: Jean-Philippe Andre jp.an...@samsung.com
Date: Tue Nov 18 17:37:25 2014 +0900
Evas GL: Add some debug
It will be triggered when EVAS_GL_API_DEBUG is set.
Yeah, that's abusing the variable a bit, as it was intended for
GL calls only, but this is pretty harmless.
Also add string GL_DEPTH_STENCIL.
---
src/modules/evas/engines/gl_common/evas_gl_core.c | 73 +--
1 file changed, 67 insertions(+), 6 deletions(-)
diff --git a/src/modules/evas/engines/gl_common/evas_gl_core.c
b/src/modules/evas/engines/gl_common/evas_gl_core.c
index 7768af7..81bc3b2 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_core.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_core.c
@@ -128,6 +128,8 @@ _internal_resource_make_current(void *eng_data,
EVGL_Context *ctx)
surface = (void*)rsc-surface;
// Do the make current
+ if (evgl_engine-api_debug_mode)
+ DBG(Calling make_current(%p, %p), surface, context);
ret = evgl_engine-funcs-make_current(eng_data, surface, context, 1);
if (!ret)
{
@@ -769,6 +771,8 @@ _glenum_string_get(GLenum e)
return GL_STENCIL_INDEX8;
// Depth_Stencil
+ case GL_DEPTH_STENCIL:
+return GL_DEPTH_STENCIL;
case GL_DEPTH24_STENCIL8:
return GL_DEPTH24_STENCIL8;
#endif
@@ -1503,6 +1507,7 @@ evgl_surface_create(void *eng_data, Evas_GL_Config *cfg,
int w, int h)
char *s = NULL;
int direct_override = 0, direct_mem_opt = 0;
Eina_Bool need_reconfigure = EINA_FALSE;
+ Eina_Bool dbg;
// Check if engine is valid
if (!evgl_engine)
@@ -1511,6 +1516,7 @@ evgl_surface_create(void *eng_data, Evas_GL_Config *cfg,
int w, int h)
evas_gl_common_error_set(eng_data, EVAS_GL_BAD_ACCESS);
return NULL;
}
+ dbg = evgl_engine-api_debug_mode;
if (!cfg)
{
@@ -1608,6 +1614,7 @@ evgl_surface_create(void *eng_data, Evas_GL_Config *cfg,
int w, int h)
}
}
+ if (dbg) DBG(Calling make_current(NULL, NULL));
if (!evgl_engine-funcs-make_current(eng_data, NULL, NULL, 0))
{
ERR(Error doing make_current(NULL, NULL).);
@@ -1618,7 +1625,6 @@ evgl_surface_create(void *eng_data, Evas_GL_Config *cfg,
int w, int h)
// Keep track of all the created surfaces
LKL(evgl_engine-resource_lock);
evgl_engine-surfaces = eina_list_prepend(evgl_engine-surfaces, sfc);
- LKU(evgl_engine-resource_lock);
if (sfc-direct_fb_opt
(sfc-depth_fmt || sfc-stencil_fmt || sfc-depth_stencil_fmt))
@@ -1627,6 +1633,7 @@ evgl_surface_create(void *eng_data, Evas_GL_Config *cfg,
int w, int h)
evgl_engine-direct_depth_stencil_surfaces =
eina_list_prepend(evgl_engine-direct_depth_stencil_surfaces, sfc);
}
+ LKU(evgl_engine-resource_lock);
if (need_reconfigure)
{
@@ -1634,6 +1641,8 @@ evgl_surface_create(void *eng_data, Evas_GL_Config *cfg,
int w, int h)
ERR(Surface reconfigure is not implemented yet);
}
+ if (dbg) DBG(Created surface sfc %p (eng %p), sfc, eng_data);
+
return sfc;
error:
@@ -1647,6 +1656,7 @@ evgl_pbuffer_surface_create(void *eng_data,
Evas_GL_Config *cfg,
{
EVGL_Surface *sfc = NULL;
void *pbuffer;
+ Eina_Bool dbg;
// Check if engine is valid
if (!evgl_engine)
@@ -1655,6 +1665,7 @@ evgl_pbuffer_surface_create(void *eng_data,
Evas_GL_Config *cfg,
evas_gl_common_error_set(eng_data, EVAS_GL_BAD_ACCESS);
return NULL;
}
+ dbg = evgl_engine-api_debug_mode;
if (!cfg)
{
@@ -1735,6 +1746,7 @@ evgl_pbuffer_surface_create(void *eng_data,
Evas_GL_Config *cfg,
sfc-pbuffer.native_surface = pbuffer;
+ if (dbg) DBG(Calling make_current(NULL, NULL));
if (!evgl_engine-funcs-make_current(eng_data, NULL, NULL, 0))
{
ERR(Error doing make_current(NULL, NULL).);
@@ -1746,6 +1758,8 @@ evgl_pbuffer_surface_create(void *eng_data,
Evas_GL_Config *cfg,
evgl_engine-surfaces = eina_list_prepend(evgl_engine-surfaces, sfc);
LKU(evgl_engine-resource_lock);
+ if (dbg) DBG(Created PBuffer surface sfc %p:%p (eng %p), sfc, pbuffer,
eng_data);
+
return sfc;
error:
@@ -1758,6 +1772,9 @@ evgl_surface_destroy(void *eng_data, EVGL_Surface *sfc)
{
EVGL_Resource *rsc;
Eina_Bool need_reconfigure = EINA_FALSE;
+ Eina_Bool dbg;
+
+ // FIXME: This does some make_current(0,0) which may have side effects
// Check input parameter
if ((!evgl_engine) || (!sfc))
@@ -1773,6 +1790,9 @@ evgl_surface_destroy(void *eng_data, EVGL_Surface *sfc)
return 0;
}
+ if ((dbg = evgl_engine-api_debug_mode))
+ DBG(Destroying surface sfc %p (eng %p), sfc, eng_data);
+
if ((rsc-current_ctx) (rsc-current_ctx-current_sfc == sfc) )
{
if
[EGIT] [core/efl] master 02/02: Evas GL: Create TLS during make_current if there isn't any
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=1608d3039076a0c6072c079a6b6ea8368b4f5b4a
commit 1608d3039076a0c6072c079a6b6ea8368b4f5b4a
Author: Jean-Philippe Andre jp.an...@samsung.com
Date: Tue Nov 18 18:37:59 2014 +0900
Evas GL: Create TLS during make_current if there isn't any
Apps would crash if they call make current without creating
a surface in the same thread. I don't see a good reason why
we should have this a limitation.
---
src/modules/evas/engines/gl_common/evas_gl_core.c | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/modules/evas/engines/gl_common/evas_gl_core.c
b/src/modules/evas/engines/gl_common/evas_gl_core.c
index 81bc3b2..adc027d 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_core.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_core.c
@@ -2041,7 +2041,12 @@ evgl_make_current(void *eng_data, EVGL_Surface *sfc,
EVGL_Context *ctx)
dbg = evgl_engine-api_debug_mode;
if (dbg) DBG((eng = %p, sfc = %p, ctx = %p), rsc = %p, eng_data, sfc,
ctx, rsc);
- if (!rsc) return 0;
+ if (!rsc)
+ {
+DBG(Creating new TLS for this thread: %lu, eina_thread_self());
+rsc = _evgl_tls_resource_create(eng_data);
+if (!rsc) return 0;
+ }
// Unset
if ((!sfc) (!ctx))
@@ -2052,7 +2057,6 @@ evgl_make_current(void *eng_data, EVGL_Surface *sfc,
EVGL_Context *ctx)
evgl_direct_partial_render_end();
}
-// FIXME: This code path does not properly set the underlying TLS vars.
if (dbg) DBG(Calling make_current(NULL, NULL));
if (!evgl_engine-funcs-make_current(eng_data, NULL, NULL, 0))
{
@@ -2060,7 +2064,7 @@ evgl_make_current(void *eng_data, EVGL_Surface *sfc,
EVGL_Context *ctx)
return 0;
}
-//FIXME!!!
+// FIXME -- What is this FIXME about?
if (rsc-current_ctx)
{
rsc-current_ctx-current_sfc = NULL;
--
[EGIT] [core/efl] master 01/01: Ecore File : Added test suite for Ecore File module
stefan pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=9f65759387d4d8d8bb96bb997b40ac8f04214b63
commit 9f65759387d4d8d8bb96bb997b40ac8f04214b63
Author: kabeer khan kabeer.k...@samsung.com
Date: Tue Nov 18 10:26:43 2014 +0100
Ecore File : Added test suite for Ecore File module
Summary:
Added 3 test cases. First to test initialise, shutdown Ecore_File module.
Second to test all file operation functions defined in the module.
Third to test ecore file monitor
Signed-off-by: kabeer khan kabeer.k...@samsung.com
Reviewers: devilhorns, stefan_schmidt
Subscribers: cedric
Differential Revision: https://phab.enlightenment.org/D1662
---
src/Makefile_Ecore.am | 1 +
src/tests/ecore/ecore_suite.c | 1 +
src/tests/ecore/ecore_suite.h | 1 +
src/tests/ecore/ecore_test_ecore_file.c | 280
4 files changed, 283 insertions(+)
diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am
index 67452c6..94d472c 100644
--- a/src/Makefile_Ecore.am
+++ b/src/Makefile_Ecore.am
@@ -178,6 +178,7 @@ tests/ecore/ecore_test_ecore_evas.c \
tests/ecore/ecore_test_animator.c \
tests/ecore/ecore_test_ecore_thread_eina_thread_queue.c \
tests/ecore/ecore_test_ecore_input.c \
+tests/ecore/ecore_test_ecore_file.c \
tests/ecore/ecore_suite.h
tests_ecore_ecore_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
diff --git a/src/tests/ecore/ecore_suite.c b/src/tests/ecore/ecore_suite.c
index 44a3e62..8fbc4b7 100644
--- a/src/tests/ecore/ecore_suite.c
+++ b/src/tests/ecore/ecore_suite.c
@@ -40,6 +40,7 @@ static const Ecore_Test_Case etc[] = {
{ Ecore_Fb, ecore_test_ecore_fb },
#endif
{ Ecore_Input, ecore_test_ecore_input },
+ { Ecore_File, ecore_test_ecore_file },
{ NULL, NULL }
};
diff --git a/src/tests/ecore/ecore_suite.h b/src/tests/ecore/ecore_suite.h
index 803f8f7..11e101d 100644
--- a/src/tests/ecore/ecore_suite.h
+++ b/src/tests/ecore/ecore_suite.h
@@ -17,5 +17,6 @@ void ecore_test_ecore_wayland(TCase *tc);
void ecore_test_ecore_drm(TCase *tc);
void ecore_test_ecore_fb(TCase *tc);
void ecore_test_ecore_input(TCase *tc);
+void ecore_test_ecore_file(TCase *tc);
#endif /* _ECORE_SUITE_H */
diff --git a/src/tests/ecore/ecore_test_ecore_file.c
b/src/tests/ecore/ecore_test_ecore_file.c
new file mode 100644
index 000..d850e1c
--- /dev/null
+++ b/src/tests/ecore/ecore_test_ecore_file.c
@@ -0,0 +1,280 @@
+#ifdef HAVE_CONFIG_H
+# include config.h
+#endif
+
+#include stdio.h
+#include unistd.h
+#include string.h
+
+#include Ecore_File.h
+#include Ecore.h
+#include Eina.h
+
+#include ecore_suite.h
+
+#define MAXSIZE 256
+
+void
+_writeToFile(const char *filePath, char *text)
+{
+ FILE *f = fopen(filePath, r+);
+ if (f == NULL)
+ f = fopen(filePath, w);
+ fail_if(f == NULL);
+ fprintf(f, %s\n, text);
+ fclose(f);
+}
+
+Eina_Tmpstr*
+get_tmp_dir()
+{
+ Eina_Tmpstr *tmp_dir;
+
+ Eina_Bool created = eina_file_mkdtemp(EcoreFileTestXX, tmp_dir);
+
+ if (!created)
+ {
+return NULL;
+ }
+
+ return tmp_dir;
+}
+
+Eina_Tmpstr*
+get_tmp_file()
+{
+ Eina_Tmpstr *tmp_file;
+
+ Eina_Bool created = eina_file_mkstemp(EcoreFileTestXX, tmp_file);
+
+ if (!created)
+ {
+return NULL;
+ }
+
+ return tmp_file;
+}
+
+static void
+file_monitor_cb(void *data EINA_UNUSED, Ecore_File_Monitor *em EINA_UNUSED,
+Ecore_File_Event event, const char *path)
+{
+ switch (event)
+ {
+case ECORE_FILE_EVENT_NONE:
+case ECORE_FILE_EVENT_CREATED_FILE:
+ fprintf(stderr, File created in %s, path);
+ break;
+case ECORE_FILE_EVENT_DELETED_FILE:
+ fprintf(stderr, File deleted in %s, path);
+ break;
+case ECORE_FILE_EVENT_MODIFIED:
+ fprintf(stderr, File modified in %s, path);
+ break;
+case ECORE_FILE_EVENT_CLOSED:
+ fprintf(stderr, File closed in %s, path);
+ break;
+case ECORE_FILE_EVENT_DELETED_DIRECTORY:
+ fprintf(stderr, Directory deleted in %s, path);
+ break;
+case ECORE_FILE_EVENT_CREATED_DIRECTORY:
+ fprintf(stderr, Directory created in %s, path);
+ break;
+case ECORE_FILE_EVENT_DELETED_SELF:
+ fprintf(stderr, Path %s deleted, path);
+ break;
+ }
+}
+
+START_TEST(ecore_test_ecore_file_init)
+{
+ int ret;
+
+ ret = ecore_file_init();
+ fail_if(ret != 1);
+
+ ret = ecore_file_shutdown();
+ fail_if(ret != 0);
+}
+END_TEST
+
+START_TEST(ecore_test_ecore_file_operations)
+{
+ const char* dirs[] = {b, b/c, b/c/d, d, 0};
+ const char *src_dir, *src_file, *dest_file;
+ const char *tmpdir = NULL;
+ char *random_text = This is random test String;
+ char dir[MAXSIZE] = {'\0'};
+ unsigned int ret;
+ Eina_Bool res;
+ Eina_List *list;
+
+#ifndef HAVE_EVIL
+#if defined(HAVE_GETUID)
[EGIT] [core/efl] master 01/01: efreetd_cache: Resolved TODO checking symbolic link to monitor real path
englebass pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=ee3bcaf71d978d225518edf570985525caafa3c9
commit ee3bcaf71d978d225518edf570985525caafa3c9
Author: kabeer khan kabeer.k...@samsung.com
Date: Tue Nov 18 12:24:06 2014 +0100
efreetd_cache: Resolved TODO checking symbolic link to monitor real path
Summary: Signed-off-by: kabeer khan kabeer.k...@samsung.com
Reviewers: englebass
Reviewed By: englebass
Subscribers: devilhorns, cedric
Differential Revision: https://phab.enlightenment.org/D1625
---
src/lib/efreet/efreet_desktop.c | 15 ++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/src/lib/efreet/efreet_desktop.c b/src/lib/efreet/efreet_desktop.c
index f672ba7..3de19be 100644
--- a/src/lib/efreet/efreet_desktop.c
+++ b/src/lib/efreet/efreet_desktop.c
@@ -168,9 +168,22 @@ efreet_desktop_get(const char *file)
info-id == EFREET_DESKTOP_TYPE_LINK ||
info-id == EFREET_DESKTOP_TYPE_DIRECTORY
))
+{
efreet_cache_desktop_add(desktop);
+/* Check Symbolic link */
+char *sym_file;
+Efreet_Desktop *sym_desktop;
+sym_file = ecore_file_readlink(file);
+if (sym_file)
+{
+sym_desktop = efreet_desktop_new(sym_file);
+if (sym_desktop !sym_desktop-eet)
+ efreet_cache_desktop_add(sym_desktop);
+free(sym_file);
+efreet_desktop_free(sym_desktop);
+}
+}
}
-
return desktop;
}
--
[E-devel] Videos from the dev day are finally up!
Hey, Sorry for the delay, but the videos are now finally up. You can get them from here: https://phab.enlightenment.org/w/events/enlightenment_developer_day_2014/ Some videos are missing due to issues with the recording equipment. Many thanks to Cedric for recording and editing everything. -- Tom. -- Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration more Get technology previously reserved for billion-dollar corporations, FREE http://pubads.g.doubleclick.net/gampad/clk?id=157005751iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[E-devel] Dependency versioning proposal
Hello everyone, this has been brewing for a while and I thought it's finally good enough to submit it here. What I'm talking about is a proposal for a policy that specifies the minimum versions of EFL dependencies - i.e. when is it safe to use a library feature that is available from version X. The goal of this is to establish a balance between supporting widespread versions of libraries (that cover the majority of our user base) while still being able to use modern library features added in later versions (as long as all the conditions are met). Anyway, it's all written down on our wiki: https://phab.enlightenment.org/w/efl_dependency_version_proposal/ I came up with the original idea and wrote it down with Stefan, who is in agreement. I also got a favorable response from Tom; now I would like to hear comments and ideas from other developers, so that we can settle on something that can be put in place and followed. Either me or Stefan will adjust the wiki as needed depending on your feedback. D5 -- Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration more Get technology previously reserved for billion-dollar corporations, FREE http://pubads.g.doubleclick.net/gampad/clk?id=157005751iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] master 01/01: Eo: protect against recursive object destruction calls, fixes T1741
tasn pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=18ceed4daf31d2f19261e0fe018c870581357ed0
commit 18ceed4daf31d2f19261e0fe018c870581357ed0
Author: Jérémy Zurcher jer...@asynk.ch
Date: Tue Nov 18 15:24:39 2014 +
Eo: protect against recursive object destruction calls, fixes T1741
Summary:
Eo: semantic obj-del replaced by obj-destructed
Eo: protect against recursive object destruction calls
Eo: add tests for bfada4b
Reviewers: JackDanielZ, tasn
Reviewed By: tasn
Subscribers: cedric
Maniphest Tasks: T1741
Differential Revision: https://phab.enlightenment.org/D1675
Fixes T1741
@fix
---
src/Makefile_Eo.am | 1 +
src/lib/eo/eo.c| 4 +-
src/lib/eo/eo_private.h| 16 --
src/tests/eo/suite/eo_suite.c | 1 +
src/tests/eo/suite/eo_suite.h | 1 +
.../eo/suite/eo_test_class_behaviour_errors.c | 63 ++
6 files changed, 80 insertions(+), 6 deletions(-)
diff --git a/src/Makefile_Eo.am b/src/Makefile_Eo.am
index 306c8c3..1b3ea4a 100644
--- a/src/Makefile_Eo.am
+++ b/src/Makefile_Eo.am
@@ -121,6 +121,7 @@ tests/eo/suite/eo_suite.h \
tests/eo/suite/eo_error_msgs.h \
tests/eo/suite/eo_error_msgs.c \
tests/eo/suite/eo_test_class_errors.c \
+tests/eo/suite/eo_test_class_behaviour_errors.c \
tests/eo/suite/eo_test_call_errors.c \
tests/eo/suite/eo_test_general.c \
tests/eo/suite/eo_test_value.c \
diff --git a/src/lib/eo/eo.c b/src/lib/eo/eo.c
index 37dae75..cc1f8b9 100644
--- a/src/lib/eo/eo.c
+++ b/src/lib/eo/eo.c
@@ -1855,7 +1855,7 @@ eo_destructed_is(const Eo *obj_id)
{
EO_OBJ_POINTER_RETURN_VAL(obj_id, obj, EINA_FALSE);
- return obj-del;
+ return obj-destructed;
}
EAPI void
@@ -1876,7 +1876,7 @@ eo_manual_free(Eo *obj_id)
return EINA_FALSE;
}
- if (!obj-del)
+ if (!obj-destructed)
{
ERR(Tried deleting the object %p while still referenced(%d).,
obj_id, obj-refcount);
return EINA_FALSE;
diff --git a/src/lib/eo/eo_private.h b/src/lib/eo/eo_private.h
index c652271..7ea5014 100644
--- a/src/lib/eo/eo_private.h
+++ b/src/lib/eo/eo_private.h
@@ -104,7 +104,8 @@ struct _Eo_Object
Eina_Bool finalized:1;
Eina_Bool composite:1;
- Eina_Bool del:1;
+ Eina_Bool del_triggered:1;
+ Eina_Bool destructed:1;
Eina_Bool manual_free:1;
};
@@ -235,7 +236,7 @@ _eo_del_internal(const char *file, int line, _Eo_Object
*obj)
}
}
- obj-del = EINA_TRUE;
+ obj-destructed = EINA_TRUE;
obj-refcount--;
}
@@ -278,9 +279,16 @@ _eo_unref(_Eo_Object *obj)
--(obj-refcount);
if (obj-refcount == 0)
{
-if (obj-del)
+if (obj-del_triggered)
{
- ERR(Object %p already deleted., obj);
+ ERR(Object %p deletion already triggered. You wrongly call
eo_unref() within a destructor., obj);
+ return;
+ }
+obj-del_triggered = EINA_TRUE;
+
+if (obj-destructed)
+ {
+ ERR(Object %p already destructed., obj);
return;
}
diff --git a/src/tests/eo/suite/eo_suite.c b/src/tests/eo/suite/eo_suite.c
index 42c6645..90f5577 100644
--- a/src/tests/eo/suite/eo_suite.c
+++ b/src/tests/eo/suite/eo_suite.c
@@ -20,6 +20,7 @@ static const Eo_Test_Case etc[] = {
{ Eo init, eo_test_init },
{ Eo general, eo_test_general },
{ Eo class errors, eo_test_class_errors },
+ { Eo class behaviour errors, eo_test_class_behaviour_errors },
{ Eo call errors, eo_test_call_errors },
{ Eo eina value, eo_test_value },
{ Eo threaded eo calls, eo_test_threaded_calls },
diff --git a/src/tests/eo/suite/eo_suite.h b/src/tests/eo/suite/eo_suite.h
index 94d88bd..ba07799 100644
--- a/src/tests/eo/suite/eo_suite.h
+++ b/src/tests/eo/suite/eo_suite.h
@@ -6,6 +6,7 @@
void eo_test_init(TCase *tc);
void eo_test_general(TCase *tc);
void eo_test_class_errors(TCase *tc);
+void eo_test_class_behaviour_errors(TCase *tc);
void eo_test_call_errors(TCase *tc);
void eo_test_value(TCase *tc);
void eo_test_threaded_calls(TCase *tc);
diff --git a/src/tests/eo/suite/eo_test_class_behaviour_errors.c
b/src/tests/eo/suite/eo_test_class_behaviour_errors.c
new file mode 100644
index 000..1bd0e15
--- /dev/null
+++ b/src/tests/eo/suite/eo_test_class_behaviour_errors.c
@@ -0,0 +1,63 @@
+#ifdef HAVE_CONFIG_H
+# include config.h
+#endif
+
+#include stdio.h
+
+#include Eo.h
+#include eo_suite.h
+#include eo_error_msgs.h
+#include eo_test_class_simple.h
+
+static struct log_ctx ctx;
+
+const Eo_Class *klass;
+
+static void _destructor_unref(Eo *obj, void *class_data EINA_UNUSED)
+{
+ eo_do_super(obj, klass, eo_destructor());
+
+ /* this triggers an eo stack overflow if not correctly protected */
+ eo_unref(obj);
+}
+
[E-devel] Videos from the dev day are finally up!
Hey, Sorry for the delay, but the videos are now finally up. You can get them from here: https://phab.enlightenment.org/w/events/enlightenment_developer_day_2014/ Some videos are missing due to issues with the recording equipment. Many thanks to Cedric for recording and editing everything. -- Tom. -- Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration more Get technology previously reserved for billion-dollar corporations, FREE http://pubads.g.doubleclick.net/gampad/clk?id=157005751iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
Re: [E-devel] Videos from the dev day are finally up!
thx * ! will download these huge ones and view them on house :) 2014-11-18 16:44 GMT+01:00 Tom Hacohen t...@stosb.com: Hey, Sorry for the delay, but the videos are now finally up. You can get them from here: https://phab.enlightenment.org/w/events/enlightenment_developer_day_2014/ Some videos are missing due to issues with the recording equipment. Many thanks to Cedric for recording and editing everything. -- Tom. -- Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration more Get technology previously reserved for billion-dollar corporations, FREE http://pubads.g.doubleclick.net/gampad/clk?id=157005751iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration more Get technology previously reserved for billion-dollar corporations, FREE http://pubads.g.doubleclick.net/gampad/clk?id=157005751iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [apps/ephoto] master 01/01: @feature Moved toolbars to left side panels. Removed grid directory browsing.
okra pushed a commit to branch master.
http://git.enlightenment.org/apps/ephoto.git/commit/?id=ba54326c1ea0240b3fe3eabafdc90e75d0edd7e9
commit ba54326c1ea0240b3fe3eabafdc90e75d0edd7e9
Author: Stephen Houston smhousto...@gmail.com
Date: Tue Nov 18 13:37:49 2014 -0600
@feature Moved toolbars to left side panels. Removed grid directory
browsing.
Moved the toolbars to panels on the left side in order to make better use
of space. Removed the ability to browse using the grid as it is redundant with
the entry and file selector.
---
src/bin/ephoto.h| 4 +-
src/bin/ephoto_main.c | 34 +--
src/bin/ephoto_single_browser.c | 83 +++
src/bin/ephoto_slideshow.c | 1 -
src/bin/ephoto_thumb_browser.c | 217 ++--
5 files changed, 99 insertions(+), 240 deletions(-)
diff --git a/src/bin/ephoto.h b/src/bin/ephoto.h
index fadf91a..9e21fa3 100644
--- a/src/bin/ephoto.h
+++ b/src/bin/ephoto.h
@@ -106,6 +106,7 @@ struct _Ephoto
{
Evas_Object *win;
Evas_Object *bg;
+ Evas_Object *panel;
Evas_Object *pager;
Evas_Object *thumb_browser;
@@ -139,8 +140,6 @@ struct _Ephoto_Entry
Ephoto *ephoto;
Elm_Object_Item *item;
Eina_List *free_listeners;
- Eina_Bool is_dir : 1;
- Eina_Bool is_up : 1;
};
struct _Ephoto_Event_Entry_Create
@@ -153,7 +152,6 @@ void ephoto_entry_free(Ephoto_Entry *entry);
void ephoto_entry_free_listener_add(Ephoto_Entry *entry, void
(*cb)(void *data, const Ephoto_Entry *entry), const void *data);
void ephoto_entry_free_listener_del(Ephoto_Entry *entry, void
(*cb)(void *data, const Ephoto_Entry *entry), const void *data);
void ephoto_entries_free(Ephoto *ephoto);
-int ephoto_entries_cmp(const void *pa, const void *pb);
extern int __log_domain;
#define DBG(...) EINA_LOG_DOM_DBG(__log_domain, __VA_ARGS__)
diff --git a/src/bin/ephoto_main.c b/src/bin/ephoto_main.c
index 97028be..1857933 100644
--- a/src/bin/ephoto_main.c
+++ b/src/bin/ephoto_main.c
@@ -259,18 +259,6 @@ ephoto_title_set(Ephoto *ephoto, const char *title)
elm_win_title_set(ephoto-win, buf);
}
-int
-ephoto_entries_cmp(const void *pa, const void *pb)
-{
- const Ephoto_Entry *a = pa, *b = pb;
- if (a-is_dir == b-is_dir)
- return strcoll(a-basename, b-basename);
- else if (a-is_dir)
- return -1;
- else
- return 1;
-}
-
static void
_ephoto_populate_main(void *data, Eio_File *handler __UNUSED__, const
Eina_File_Direct_Info *info)
{
@@ -279,26 +267,8 @@ _ephoto_populate_main(void *data, Eio_File *handler
__UNUSED__, const Eina_File_
Ephoto_Event_Entry_Create *ev;
e = ephoto_entry_new(ephoto, info-path, info-path + info-name_start);
- if (info-type == EINA_FILE_DIR) e-is_dir = EINA_TRUE;
- else if (info-type == EINA_FILE_REG) e-is_dir = EINA_FALSE;
- else e-is_dir = !_ephoto_eina_file_direct_info_image_useful(info);
-
- if (!ephoto-entries)
- ephoto-entries = eina_list_append(ephoto-entries, e);
- else
- {
-int near_cmp;
-Eina_List *near_node = eina_list_search_sorted_near_list
- (ephoto-entries, ephoto_entries_cmp, e, near_cmp);
-
-if (near_cmp 0)
- ephoto-entries = eina_list_append_relative_list
- (ephoto-entries, e, near_node);
-else
- ephoto-entries = eina_list_prepend_relative_list
- (ephoto-entries, e, near_node);
- }
+ ephoto-entries = eina_list_append(ephoto-entries, e);
ev = calloc(1, sizeof(Ephoto_Event_Entry_Create));
ev-entry = e;
@@ -311,7 +281,7 @@ _ephoto_populate_filter(void *data __UNUSED__, Eio_File
*handler __UNUSED__, con
const char *bname = info-path + info-name_start;
if (bname[0] == '.') return EINA_FALSE;
- if (info-type == EINA_FILE_DIR) return EINA_TRUE;
+ if (info-type == EINA_FILE_DIR) return EINA_FALSE;
return _ephoto_eina_file_direct_info_image_useful(info);
}
diff --git a/src/bin/ephoto_single_browser.c b/src/bin/ephoto_single_browser.c
index 613be0e..9f8204a 100644
--- a/src/bin/ephoto_single_browser.c
+++ b/src/bin/ephoto_single_browser.c
@@ -20,7 +20,8 @@ struct _Ephoto_Single_Browser
Ephoto *ephoto;
Evas_Object *main;
Evas_Object *bar;
- Evas_Object *edje;
+ Evas_Object *table;
+ Evas_Object *panel;
Evas_Object *viewer;
const char *pending_path;
Ephoto_Entry *entry;
@@ -422,25 +423,16 @@ _mouse_wheel(void *data, Evas *e __UNUSED__, Evas_Object
*o __UNUSED__, void *ev
static Ephoto_Entry *
_first_entry_find(Ephoto_Single_Browser *sb)
{
- const Eina_List *l;
- Ephoto_Entry *entry;
EINA_SAFETY_ON_NULL_RETURN_VAL(sb-ephoto, NULL);
- EINA_LIST_FOREACH(sb-ephoto-entries, l, entry)
- if (!entry-is_dir) return entry;
- return NULL;
+ return eina_list_nth(sb-ephoto-entries, 0);
}
static Ephoto_Entry *
_last_entry_find(Ephoto_Single_Browser *sb)
{
- const Eina_List *l;
- Ephoto_Entry
Re: [E-devel] [EGIT] [core/elementary] elementary-1.12 01/01: Update russian translation
And translations are often not up-to-date on .0 releases, so if you want good translations, this is good. Sebastian Den Nov 18, 2014 kl. 16:02 skrev Tom Hacohen t...@stosb.com: Huh? Why not? Translations are a harmless fix, even when new. On Tue, Nov 18, 2014 at 7:29 AM, Stefan Schmidt ste...@datenfreihafen.org wrote: Hello. On 15/11/14 12:19, Igor Murzov wrote: garik pushed a commit to branch elementary-1.12. http://git.enlightenment.org/core/elementary.git/commit/?id=c0481f5131a1a5227d40d02d072d93a0b0204be2 commit c0481f5131a1a5227d40d02d072d93a0b0204be2 Author: Igor Murzov ga...@efl.so Date: Sat Nov 15 14:14:59 2014 +0300 Update russian translation The stable branches are only for fixes. Please don't push translation updates to it. regards Stefan Schmidt -- Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration more Get technology previously reserved for billion-dollar corporations, FREE http://pubads.g.doubleclick.net/gampad/clk?id=157005751iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration more Get technology previously reserved for billion-dollar corporations, FREE http://pubads.g.doubleclick.net/gampad/clk?id=157005751iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration more Get technology previously reserved for billion-dollar corporations, FREE http://pubads.g.doubleclick.net/gampad/clk?id=157005751iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [bindings/python/python-efl] master 01/03: New 1.12 api: edje_object_part_text_input_hint_set/get
davemds pushed a commit to branch master. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=8f05e1c1778df055379d1d5f76c4395fee468918 commit 8f05e1c1778df055379d1d5f76c4395fee468918 Author: Dave Andreoli d...@gurumeditation.it Date: Tue Nov 18 20:55:12 2014 +0100 New 1.12 api: edje_object_part_text_input_hint_set/get --- efl/edje/efl.edje.pyx| 4 efl/edje/efl.edje_object.pxi | 31 +++ include/efl.edje.pxd | 5 + 3 files changed, 40 insertions(+) diff --git a/efl/edje/efl.edje.pyx b/efl/edje/efl.edje.pyx index 60ba34e..402942d 100644 --- a/efl/edje/efl.edje.pyx +++ b/efl/edje/efl.edje.pyx @@ -125,6 +125,10 @@ EDJE_EXTERNAL_PARAM_TYPE_BOOL = 3 EDJE_EXTERNAL_PARAM_TYPE_CHOICE = 4 EDJE_EXTERNAL_PARAM_TYPE_MAX= 5 +# Edje_Input_Hints +EDJE_INPUT_HINT_NONE = 0 +EDJE_INPUT_HINT_AUTO_COMPLETE = 1 +EDJE_INPUT_HINT_SENSITIVE_DATA = 2 def init(): diff --git a/efl/edje/efl.edje_object.pxi b/efl/edje/efl.edje_object.pxi index ed9ce29..dddf916 100644 --- a/efl/edje/efl.edje_object.pxi +++ b/efl/edje/efl.edje_object.pxi @@ -625,6 +625,37 @@ cdef class Edje(Object): libc.stdlib.free(s) return str +def part_text_input_hint_set(self, part, input_hints): + Sets the input hint which allows input methods to fine-tune +their behavior. + +:param part: the part name +:type part: str +:param input_hints: the hints to set +:type input_hints: Edje_Input_Hints + +.. versionadded:: 1.12 + + +if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part) +edje_object_part_text_input_hint_set(self.obj, +const char *part if part is not None else NULL, +input_hints) + +def part_text_input_hint_get(self, part): + Gets the value of input hint. + +:param part: the part name +:type part: str + +.. versionadded:: 1.12 + + + +if isinstance(part, unicode): part = PyUnicode_AsUTF8String(part) +return edje_object_part_text_input_hint_get(self.obj, +const char *part if part is not None else NULL) + def part_swallow(self, part, Object obj): Swallows an object into the edje diff --git a/include/efl.edje.pxd b/include/efl.edje.pxd index 3f3974d..2550cce 100644 --- a/include/efl.edje.pxd +++ b/include/efl.edje.pxd @@ -50,6 +50,9 @@ cdef extern from Edje.h: ctypedef enum Edje_External_Param_Type: pass +ctypedef enum Edje_Input_Hints: + pass + cdef int EDJE_EXTERNAL_INT_UNSET cdef double EDJE_EXTERNAL_DOUBLE_UNSET cdef unsigned int EDJE_EXTERNAL_TYPE_ABI_VERSION @@ -257,6 +260,8 @@ cdef extern from Edje.h: void edje_object_part_text_unescaped_set(Evas_Object *obj, char *part, char *text_to_escape) char *edje_object_part_text_unescaped_get(Evas_Object *obj, char *part) +void edje_object_part_text_input_hint_set(Evas_Object *obj, char *part, Edje_Input_Hints input_hints) +Edje_Input_Hints edje_object_part_text_input_hint_get(Evas_Object *obj, char *part) void edje_object_part_swallow(Evas_Object *obj, char *part, Evas_Object *obj_swallow) void edje_object_part_unswallow(Evas_Object *obj, Evas_Object *obj_swallow) --
[EGIT] [bindings/python/python-efl] master 03/03: New 1.12 API: elm_process_state_get
davemds pushed a commit to branch master. http://git.enlightenment.org/bindings/python/python-efl.git/commit/?id=da1807c379b981ea54733385afc59b205198a8a7 commit da1807c379b981ea54733385afc59b205198a8a7 Author: Dave Andreoli d...@gurumeditation.it Date: Tue Nov 18 21:42:31 2014 +0100 New 1.12 API: elm_process_state_get --- TODO | 1 + efl/elementary/enums.pxd | 4 efl/elementary/general.pxd | 4 +++- efl/elementary/general.pyx | 38 ++ 4 files changed, 46 insertions(+), 1 deletion(-) diff --git a/TODO b/TODO index 6dd0f1d..8f260d3 100644 --- a/TODO +++ b/TODO @@ -44,3 +44,4 @@ Elm - video - web - window ? +* How are the ecore events managed? for example: ELM_EVENT_PROCESS_FOREGROUND diff --git a/efl/elementary/enums.pxd b/efl/elementary/enums.pxd index 09db4e1..a676c6b 100644 --- a/efl/elementary/enums.pxd +++ b/efl/elementary/enums.pxd @@ -417,6 +417,10 @@ cdef extern from Elementary.h: ELM_POPUP_ORIENT_BOTTOM_RIGHT ELM_POPUP_ORIENT_LAST +ctypedef enum Elm_Process_State: +ELM_PROCESS_STATE_FOREGROUND +ELM_PROCESS_STATE_BACKGROUND + ctypedef enum Elm_Scroller_Policy: ELM_SCROLLER_POLICY_AUTO ELM_SCROLLER_POLICY_ON diff --git a/efl/elementary/general.pxd b/efl/elementary/general.pxd index afb06a0..90e10e1 100644 --- a/efl/elementary/general.pxd +++ b/efl/elementary/general.pxd @@ -19,7 +19,8 @@ from efl.evas cimport Eina_List, Eina_Bool from efl.evas cimport Evas_Object, Evas_Font_Size, Evas_Coord from efl.evas.enums cimport Evas_Callback_Type -from enums cimport Elm_Sys_Notify_Closed_Reason, Elm_Sys_Notify_Urgency +from enums cimport Elm_Sys_Notify_Closed_Reason, Elm_Sys_Notify_Urgency, \ +Elm_Process_State cdef extern from time.h: struct tm: @@ -81,6 +82,7 @@ cdef extern from Elementary.h: int elm_shutdown() voidelm_run() nogil voidelm_exit() +Elm_Process_State elm_process_state_get() # General - Quicklaunch (XXX: Only used by macros?) # void elm_quicklaunch_init(int argc, char **argv) diff --git a/efl/elementary/general.pyx b/efl/elementary/general.pyx index be3a096..eb6e6e4 100644 --- a/efl/elementary/general.pyx +++ b/efl/elementary/general.pyx @@ -117,6 +117,25 @@ Possible values for the #ELM_POLICY_THROTTLE policy. Never throttle when windows are all hidden, regardless of config settings. +.. _Elm_Process_State: + +Elm_Process_State +- + +.. data:: ELM_PROCESS_STATE_FOREGROUND + +The process is in a foreground/active/running state - work as normal. + +..versionadded:: 1.12 + +.. data:: ELM_PROCESS_STATE_BACKGROUND + +The process is in the bacgkround, so you may want to stop animating, +fetching data as often etc. + +..versionadded:: 1.12 + + .. _Elm_Sys_Notify_Closed_Reason: Notify close reasons @@ -270,6 +289,9 @@ ELM_GLOB_MATCH_PATH = enums.ELM_GLOB_MATCH_PATH ELM_GLOB_MATCH_PERIOD = enums.ELM_GLOB_MATCH_PERIOD ELM_GLOB_MATCH_NOCASE = enums.ELM_GLOB_MATCH_NOCASE +ELM_PROCESS_STATE_FOREGROUND = enums.ELM_PROCESS_STATE_FOREGROUND +ELM_PROCESS_STATE_BACKGROUND = enums.ELM_PROCESS_STATE_BACKGROUND + import traceback cdef void py_elm_sys_notify_send_cb(void *data, unsigned int id): @@ -508,6 +530,22 @@ def policy_get(Elm_Policy policy): return elm_policy_get(policy) +def process_state_get(): +Get the process state as a while. + +The process may logically be some runnable state. a foreground application +runs as normal and may be user-visible or active in some way. A +background application is not user-visible or otherwise important and +likely should release resources and not wake up often or process much. + +:return: The current process state +:rtype: Elm_Process_State + +.. versionadded: 1.12 + + +return elm_process_state_get() + def coords_finger_size_adjust(int times_w, int w, int times_h, int h): Adjust size of an element for finger usage. --
[EGIT] [e16/e16] master 01/02: Update po.
kwo pushed a commit to branch master. http://git.enlightenment.org/e16/e16.git/commit/?id=200c0c939709dbf455247d0a6407f565c7f1de15 commit 200c0c939709dbf455247d0a6407f565c7f1de15 Author: Kim Woelders k...@woelders.dk Date: Sun Nov 16 13:59:13 2014 +0100 Update po. --- po/ar.po| 4 ++-- po/bg.po| 4 ++-- po/bs.po| 4 ++-- po/ca.po| 4 ++-- po/cs.po| 4 ++-- po/csb.po | 4 ++-- po/da.po| 4 ++-- po/de.po| 4 ++-- po/en_US.po | 4 ++-- po/eo.po| 4 ++-- po/es.po| 4 ++-- po/fo.po| 4 ++-- po/fr.po| 4 ++-- po/gl.po| 4 ++-- po/hr.po| 4 ++-- po/hu.po| 4 ++-- po/it.po| 4 ++-- po/ja.po| 4 ++-- po/ko.po| 4 ++-- po/nb.po| 4 ++-- po/nl.po| 4 ++-- po/pl.po| 4 ++-- po/pt.po| 4 ++-- po/pt_BR.po | 4 ++-- po/ru.po| 4 ++-- po/sk.po| 4 ++-- po/sr.po| 4 ++-- po/sv.po| 4 ++-- po/tr.po| 4 ++-- po/uk.po| 4 ++-- po/zh_CN.po | 4 ++-- 31 files changed, 62 insertions(+), 62 deletions(-) diff --git a/po/ar.po b/po/ar.po index 3373ce2..9431cc4 100644 --- a/po/ar.po +++ b/po/ar.po @@ -6,7 +6,7 @@ msgid msgstr Project-Id-Version: e16\n Report-Msgid-Bugs-To: enlightenment-i...@lists.sourceforge.net\n -POT-Creation-Date: 2014-09-19 21:04+0200\n +POT-Creation-Date: 2014-11-18 21:40+0100\n PO-Revision-Date: 2009-09-28 17:09+\n Last-Translator: Aron Xu Unknown\n Language-Team: Arabic a...@li.org\n @@ -44,7 +44,7 @@ msgstr Mandrake - mandr...@mandrake.net\n Kim Woelders - k...@woelders.dk\n -#: src/aclass.c:218 src/backgrounds.c:256 src/borders.c:695 src/buttons.c:186 +#: src/aclass.c:218 src/backgrounds.c:256 src/borders.c:694 src/buttons.c:186 #: src/cursors.c:135 src/iclass.c:356 src/tclass.c:119 src/tooltips.c:132 #, c-format msgid %u references remain diff --git a/po/bg.po b/po/bg.po index 5a0e7f8..1b7b469 100644 --- a/po/bg.po +++ b/po/bg.po @@ -6,7 +6,7 @@ msgid msgstr Project-Id-Version: e16\n Report-Msgid-Bugs-To: enlightenment-i...@lists.sourceforge.net\n -POT-Creation-Date: 2014-09-19 21:04+0200\n +POT-Creation-Date: 2014-11-18 21:40+0100\n PO-Revision-Date: 2010-05-09 01:24+\n Last-Translator: Aron Xu Unknown\n Language-Team: Bulgarian\n @@ -36,7 +36,7 @@ msgid Kim Woelders - k...@woelders.dk\n msgstr -#: src/aclass.c:218 src/backgrounds.c:256 src/borders.c:695 src/buttons.c:186 +#: src/aclass.c:218 src/backgrounds.c:256 src/borders.c:694 src/buttons.c:186 #: src/cursors.c:135 src/iclass.c:356 src/tclass.c:119 src/tooltips.c:132 #, c-format msgid %u references remain diff --git a/po/bs.po b/po/bs.po index d2394d5..65500c0 100644 --- a/po/bs.po +++ b/po/bs.po @@ -6,7 +6,7 @@ msgid msgstr Project-Id-Version: e16\n Report-Msgid-Bugs-To: enlightenment-i...@lists.sourceforge.net\n -POT-Creation-Date: 2014-09-19 21:04+0200\n +POT-Creation-Date: 2014-11-18 21:40+0100\n PO-Revision-Date: 2010-05-09 01:27+\n Last-Translator: Kemal Sanjta Unknown\n Language-Team: Bosnian lo...@linux.org.ba\n @@ -36,7 +36,7 @@ msgid Kim Woelders - k...@woelders.dk\n msgstr -#: src/aclass.c:218 src/backgrounds.c:256 src/borders.c:695 src/buttons.c:186 +#: src/aclass.c:218 src/backgrounds.c:256 src/borders.c:694 src/buttons.c:186 #: src/cursors.c:135 src/iclass.c:356 src/tclass.c:119 src/tooltips.c:132 #, c-format msgid %u references remain diff --git a/po/ca.po b/po/ca.po index ac7286a..828fda7 100644 --- a/po/ca.po +++ b/po/ca.po @@ -7,7 +7,7 @@ msgid msgstr Project-Id-Version: enlightenment\n Report-Msgid-Bugs-To: enlightenment-i...@lists.sourceforge.net\n -POT-Creation-Date: 2014-09-19 21:04+0200\n +POT-Creation-Date: 2014-11-18 21:40+0100\n PO-Revision-Date: 2014-06-03 09:11+\n Last-Translator: joancoll Unknown\n Language-Team: Catalan c...@li.org\n @@ -46,7 +46,7 @@ msgstr Mandrake - mandr...@mandrake.net\n Kim Woelders - k...@woelders.dk\n -#: src/aclass.c:218 src/backgrounds.c:256 src/borders.c:695 src/buttons.c:186 +#: src/aclass.c:218 src/backgrounds.c:256 src/borders.c:694 src/buttons.c:186 #: src/cursors.c:135 src/iclass.c:356 src/tclass.c:119 src/tooltips.c:132 #, c-format msgid %u references remain diff --git a/po/cs.po b/po/cs.po index a8777ea..ee4fa95 100644 --- a/po/cs.po +++ b/po/cs.po @@ -7,7 +7,7 @@ msgid msgstr Project-Id-Version: e16\n Report-Msgid-Bugs-To: enlightenment-i...@lists.sourceforge.net\n -POT-Creation-Date: 2014-09-19 21:04+0200\n +POT-Creation-Date: 2014-11-18 21:40+0100\n PO-Revision-Date: 2009-11-15 19:33+\n Last-Translator: Kuvaly [LCT] kuv...@seznam.cz\n Language-Team: Czech c...@li.org\n @@ -37,7 +37,7 @@ msgid Kim Woelders - k...@woelders.dk\n msgstr -#: src/aclass.c:218 src/backgrounds.c:256 src/borders.c:695 src/buttons.c:186 +#: src/aclass.c:218 src/backgrounds.c:256 src/borders.c:694 src/buttons.c:186 #: src/cursors.c:135 src/iclass.c:356 src/tclass.c:119 src/tooltips.c:132 #, c-format msgid %u references remain diff --git a/po/csb.po b/po/csb.po index 2e28bba..9278f7b 100644
[EGIT] [e16/e16] annotated tag v1.0.15 created (now c58830d)
This is an automated email from the git hooks/post-receive script. kwo pushed a change to annotated tag v1.0.15 in repository e16/e16. at c58830d (tag) tagging 6ab2ad9a60eb377d621b0e6cb35440e64b61757e (commit) replaces v1.0.14 tagged by Kim Woelders on Tue Nov 18 22:25:18 2014 +0100 - Log - Version 1.0.15. Kim Woelders (47): 1.0.14.000. Fix warnings with gcc 4.9.x. Cosmetics. Minor simplifications in ImagestateDraw...() functions. Minor tweak in EXFillAreaSolid(). Fix potential use of freed pixmap. Move shape window stuff to separate header file. Simplify pager background update. Change some operations to render ones. Wrap XDraw/FillRectangle. Debug tweaks (pager). Remove ancient unused code. Cosmetics (key-keycode). Cosmetics (key-keysym). Avoid unnecessary FP calculation. Randr may report FPS = 0. Move EDBUG_TYPE_ANIM to where it belongs. Tweak screen info printout. Wrap XID and some other X types. Use initially created GC for various operations. Refactor background dialog data handling. Refactor group dialog data handling. Exec/spawn function tweaks. Eliminate some use of EspawnApplication(). Fix glitch in Refactor background dialog data handling. Refactor dialog apply/exit handling. Simplify dialog data handling. Update po. Avoid some potential X-calls/errors when client is destroyed. Remove bogus lithuanian translation (0 translated messages). Remove useless Name[] entries from .desktop files (again). Update po. Autofoo cosmetics (use AC_HELP_STRING). Fix creating bitmap cursor. Add argb option to EPictureCreateBuffer(). Add ERegionCreateFromBitmap() and EPictureFillRect(). Use wrapper functions in ECreatePixmapCursor(). Fix build without composite. Remove useless Name[] entries from .desktop files (again). Update po. Fix some normally disabled debug format strings. 1.0.14.001. Simplify sound configuration. Set lower limit on slide/shade speed. Debug printout cleanups. Update po. 1.0.15. maxerba (6): Updating translations Updating turkish and adding lithuanian and galician translations Adding catalan traslation Updating catalan translation Updating esperanto and french translations Updating desktop files --- No new revisions were added by this update. --
[EGIT] [e16/e16] master 02/02: 1.0.15.
kwo pushed a commit to branch master. http://git.enlightenment.org/e16/e16.git/commit/?id=6ab2ad9a60eb377d621b0e6cb35440e64b61757e commit 6ab2ad9a60eb377d621b0e6cb35440e64b61757e Author: Kim Woelders k...@woelders.dk Date: Sun Nov 16 13:56:16 2014 +0100 1.0.15. --- ChangeLog| 9 + configure.ac | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ddc7c7d..0c230a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5854,3 +5854,12 @@ Updating esperanto and french translations Updating desktop files Remove useless Name[] entries from .desktop files (again). Fix some normally disabled debug format strings. + +--- + +Tue Nov 18 21:42:34 CET 2014 + +--- 1.0.15 --- +Simplify sound configuration. +Set lower limit on slide/shade speed (fix crash if speed is set to 0). +Debug printout cleanups. diff --git a/configure.ac b/configure.ac index 1b164e3..bbdb390 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ -m4_define([pkg_version], [1.0.14]) -m4_define([pkg_revision], [001]) +m4_define([pkg_version], [1.0.15]) +#m4_define([pkg_revision], [001]) m4_define([pkg_version], m4_ifdef([pkg_revision], [pkg_version.pkg_revision], [pkg_version])) m4_define([rpm_revision], m4_ifdef([pkg_revision], [0.%(date '+%y%m%d')], [1])) --
[EGIT] [apps/ephoto] master 01/01: Ephoto: Make the thumb browser alphabetical again. Default panel to visible. Show files in selector.
okra pushed a commit to branch master.
http://git.enlightenment.org/apps/ephoto.git/commit/?id=f7f6c9c59f763f5f1de795a626f335679e6af967
commit f7f6c9c59f763f5f1de795a626f335679e6af967
Author: Stephen Houston smhousto...@gmail.com
Date: Tue Nov 18 15:35:24 2014 -0600
Ephoto: Make the thumb browser alphabetical again. Default panel to
visible. Show files in selector.
---
src/bin/ephoto.h| 1 +
src/bin/ephoto_main.c | 22 ++-
src/bin/ephoto_single_browser.c | 2 +-
src/bin/ephoto_thumb_browser.c | 48 -
4 files changed, 66 insertions(+), 7 deletions(-)
diff --git a/src/bin/ephoto.h b/src/bin/ephoto.h
index 9e21fa3..0315898 100644
--- a/src/bin/ephoto.h
+++ b/src/bin/ephoto.h
@@ -152,6 +152,7 @@ void ephoto_entry_free(Ephoto_Entry *entry);
void ephoto_entry_free_listener_add(Ephoto_Entry *entry, void
(*cb)(void *data, const Ephoto_Entry *entry), const void *data);
void ephoto_entry_free_listener_del(Ephoto_Entry *entry, void
(*cb)(void *data, const Ephoto_Entry *entry), const void *data);
void ephoto_entries_free(Ephoto *ephoto);
+int ephoto_entries_cmp(const void *pa, const void *pb);
extern int __log_domain;
#define DBG(...) EINA_LOG_DOM_DBG(__log_domain, __VA_ARGS__)
diff --git a/src/bin/ephoto_main.c b/src/bin/ephoto_main.c
index 1857933..3004055 100644
--- a/src/bin/ephoto_main.c
+++ b/src/bin/ephoto_main.c
@@ -259,6 +259,13 @@ ephoto_title_set(Ephoto *ephoto, const char *title)
elm_win_title_set(ephoto-win, buf);
}
+int
+ephoto_entries_cmp(const void *pa, const void *pb)
+{
+ const Ephoto_Entry *a = pa, *b = pb;
+ return strcoll(a-basename, b-basename);
+}
+
static void
_ephoto_populate_main(void *data, Eio_File *handler __UNUSED__, const
Eina_File_Direct_Info *info)
{
@@ -268,7 +275,20 @@ _ephoto_populate_main(void *data, Eio_File *handler
__UNUSED__, const Eina_File_
e = ephoto_entry_new(ephoto, info-path, info-path + info-name_start);
- ephoto-entries = eina_list_append(ephoto-entries, e);
+ if (!ephoto-entries)
+ ephoto-entries = eina_list_append(ephoto-entries, e);
+ else
+ {
+int near_cmp;
+Eina_List *near_node = eina_list_search_sorted_near_list
+ (ephoto-entries, ephoto_entries_cmp, e, near_cmp);
+if (near_cmp 0)
+ ephoto-entries = eina_list_append_relative_list
+(ephoto-entries, e, near_node);
+else
+ ephoto-entries = eina_list_prepend_relative_list
+(ephoto-entries, e, near_node);
+ }
ev = calloc(1, sizeof(Ephoto_Event_Entry_Create));
ev-entry = e;
diff --git a/src/bin/ephoto_single_browser.c b/src/bin/ephoto_single_browser.c
index 9f8204a..7785be7 100644
--- a/src/bin/ephoto_single_browser.c
+++ b/src/bin/ephoto_single_browser.c
@@ -822,7 +822,7 @@ ephoto_single_browser_add(Ephoto *ephoto, Evas_Object
*parent)
elm_panel_orient_set(sb-panel, ELM_PANEL_ORIENT_LEFT);
evas_object_size_hint_weight_set(sb-panel, 0.0, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(sb-panel, EVAS_HINT_FILL, EVAS_HINT_FILL);
- elm_panel_hidden_set(sb-panel, EINA_TRUE);
+ elm_panel_hidden_set(sb-panel, EINA_FALSE);
elm_table_pack(sb-table, sb-panel, 0, 0, 1, 1);
evas_object_show(sb-panel);
diff --git a/src/bin/ephoto_thumb_browser.c b/src/bin/ephoto_thumb_browser.c
index c7c316c..7b2ef88 100644
--- a/src/bin/ephoto_thumb_browser.c
+++ b/src/bin/ephoto_thumb_browser.c
@@ -76,16 +76,54 @@ _ephoto_thumb_item_del(void *data __UNUSED__, Evas_Object
*obj __UNUSED__)
static Elm_Gengrid_Item_Class _ephoto_thumb_file_class;
+static int
+_entry_cmp(const void *pa, const void *pb)
+{
+ const Elm_Gengrid_Item *ia = pa;
+ const Ephoto_Entry *a, *b = pb;
+
+ a = elm_object_item_data_get(ia);
+
+ return strcoll(a-basename, b-basename);
+}
+
static void
_entry_item_add(Ephoto_Thumb_Browser *tb, Ephoto_Entry *e)
{
const Elm_Gengrid_Item_Class *ic;
+ int near_cmp;
+ Elm_Object_Item *near_item = NULL;
+ Eina_List *near_node = NULL;
- ic = _ephoto_thumb_file_class;
+ near_node = eina_list_search_sorted_near_list
+ (tb-grid_items, _entry_cmp, e, near_cmp);
+ if (near_node)
+ near_item = near_node-data;
- e-item = elm_gengrid_item_append(tb-grid, ic, e, NULL, NULL);
- tb-grid_items = eina_list_append(tb-grid_items, e-item);
+ ic = _ephoto_thumb_file_class;
+ if (!near_item)
+ {
+e-item = elm_gengrid_item_append(tb-grid, ic, e, NULL, NULL);
+tb-grid_items = eina_list_append(tb-grid_items, e-item);
+ }
+ else
+ {
+if (near_cmp 0)
+ {
+ e-item = elm_gengrid_item_insert_after
+ (tb-grid, ic, e, near_item, NULL, NULL);
+ tb-grid_items = eina_list_append_relative
+ (tb-grid_items, e-item, near_item);
+ }
+else
+ {
+ e-item =
[EGIT] [tools/edi] master 01/01: Fix potential crash when going to the line of a large file.
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/tools/edi.git/commit/?id=6c831a21735e52bb49bfc6ad8148905ad48090ef commit 6c831a21735e52bb49bfc6ad8148905ad48090ef Author: Andy Williams a...@andywilliams.me Date: Tue Nov 18 21:35:18 2014 + Fix potential crash when going to the line of a large file. It will not work first time, but that's a seperate issue --- src/bin/mainview/edi_mainview.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/mainview/edi_mainview.c b/src/bin/mainview/edi_mainview.c index f673bf7..4b513e5 100644 --- a/src/bin/mainview/edi_mainview.c +++ b/src/bin/mainview/edi_mainview.c @@ -559,7 +559,7 @@ edi_mainview_goto(int line) it = elm_naviframe_top_item_get(nf); content = elm_object_item_content_get(it); editor = (Edi_Editor *)evas_object_data_get(content, editor); - if (!content || line = 0) + if (!content || !editor || line = 0) return; _tb = elm_entry_textblock_get(editor-entry); --
[EGIT] [apps/ephoto] master 01/01: Ephoto: @fix revert files being visible in fileselector as there is no way to disable selecting them.
okra pushed a commit to branch master. http://git.enlightenment.org/apps/ephoto.git/commit/?id=833bd4513d73a44de7cbfd7362026856f9b3109e commit 833bd4513d73a44de7cbfd7362026856f9b3109e Author: Stephen Houston smhousto...@gmail.com Date: Tue Nov 18 16:54:54 2014 -0600 Ephoto: @fix revert files being visible in fileselector as there is no way to disable selecting them. --- src/bin/ephoto_single_browser.c | 8 src/bin/ephoto_thumb_browser.c | 4 +--- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/bin/ephoto_single_browser.c b/src/bin/ephoto_single_browser.c index 7785be7..4c2b759 100644 --- a/src/bin/ephoto_single_browser.c +++ b/src/bin/ephoto_single_browser.c @@ -842,16 +842,16 @@ ephoto_single_browser_add(Ephoto *ephoto, Evas_Object *parent) elm_toolbar_item_separator_set(elm_toolbar_item_append(sb-bar, NULL, NULL, NULL, NULL), EINA_TRUE); - icon = elm_toolbar_item_append(sb-bar, zoom-in, In, _zoom_in_cb, sb); + icon = elm_toolbar_item_append(sb-bar, zoom-in, Zoom In, _zoom_in_cb, sb); elm_toolbar_item_priority_set(icon, 100); - icon = elm_toolbar_item_append(sb-bar, zoom-out, Out, _zoom_out_cb, sb); + icon = elm_toolbar_item_append(sb-bar, zoom-out, Zoom Out, _zoom_out_cb, sb); elm_toolbar_item_priority_set(icon, 100); - icon = elm_toolbar_item_append(sb-bar, zoom-fit, Fit, _zoom_fit_cb, sb); + icon = elm_toolbar_item_append(sb-bar, zoom-fit, Zoom Fit, _zoom_fit_cb, sb); elm_toolbar_item_priority_set(icon, 80); - icon = elm_toolbar_item_append(sb-bar, zoom-original, 1:1, _zoom_1_cb, sb); + icon = elm_toolbar_item_append(sb-bar, zoom-original, Zoom 1:1, _zoom_1_cb, sb); elm_toolbar_item_priority_set(icon, 80); elm_toolbar_item_separator_set(elm_toolbar_item_append(sb-bar, NULL, NULL, NULL, NULL), EINA_TRUE); diff --git a/src/bin/ephoto_thumb_browser.c b/src/bin/ephoto_thumb_browser.c index 7b2ef88..65b613c 100644 --- a/src/bin/ephoto_thumb_browser.c +++ b/src/bin/ephoto_thumb_browser.c @@ -379,8 +379,6 @@ ephoto_thumb_browser_add(Ephoto *ephoto, Evas_Object *parent) _ephoto_thumb_file_class.func.state_get = NULL; _ephoto_thumb_file_class.func.del = _ephoto_thumb_item_del; - elm_theme_extension_add(NULL, PACKAGE_DATA_DIR /themes/default/ephoto.edj); - tb-ephoto = ephoto; tb-main = box; @@ -401,7 +399,7 @@ ephoto_thumb_browser_add(Ephoto *ephoto, Evas_Object *parent) evas_object_size_hint_align_set(tb-entry, EVAS_HINT_FILL, EVAS_HINT_FILL); elm_object_text_set(tb-entry, Choose); elm_object_part_content_set(tb-entry, button icon, ic); - elm_fileselector_folder_only_set(tb-entry, EINA_FALSE); + elm_fileselector_folder_only_set(tb-entry, EINA_TRUE); elm_fileselector_entry_inwin_mode_set(tb-entry, EINA_TRUE); elm_fileselector_expandable_set(tb-entry, EINA_FALSE); evas_object_smart_callback_add --
[EGIT] [tools/edi] master 01/01: Merge branch devs/ajwillia-ms/elm_code
ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/tools/edi.git/commit/?id=86856485bd149f8bcb81c9ee1c7f6e755d16e869 commit 86856485bd149f8bcb81c9ee1c7f6e755d16e869 Merge: 6c831a2 4748f81 Author: Andy Williams a...@andywilliams.me Date: Tue Nov 18 23:04:19 2014 + Merge branch devs/ajwillia-ms/elm_code .gitignore | 9 +- Makefile.am| 4 +- configure.ac | 5 + elm_code/Makefile.am | 4 + elm_code/bin/Makefile.am | 20 +++ elm_code/bin/elm_code_test_main.c | 205 + elm_code/bin/elm_code_test_private.h | 6 + elm_code/bin/gettext.h | 280 + elm_code/lib/Elm_Code.h| 135 ++ elm_code/lib/Makefile.am | 27 +++ elm_code/lib/elm_code.c| 112 elm_code/lib/elm_code_common.h | 67 +++ elm_code/lib/elm_code_file.c | 200 + elm_code/lib/elm_code_file.h | 102 +++ elm_code/lib/elm_code_parse.c | 47 + elm_code/lib/elm_code_parse.h | 49 + elm_code/lib/elm_code_private.h| 27 +++ elm_code/lib/elm_code_widget.c | 224 +++ elm_code/lib/elm_code_widget.h | 40 + elm_code/tests/Makefile.am | 26 +++ elm_code/tests/elm_code_file_test_load.c | 78 elm_code/tests/elm_code_file_test_memory.c | 46 + elm_code/tests/elm_code_suite.c| 126 + elm_code/tests/elm_code_suite.h| 14 ++ elm_code/tests/elm_code_test_basic.c | 24 +++ elm_code/tests/elm_code_test_parse.c | 68 +++ elm_code/tests/elm_code_test_widget.c | 46 + elm_code/tests/testfile-withblanks.txt | 8 + elm_code/tests/testfile.txt| 4 + src/bin/Makefile.am| 5 +- src/bin/edi_consolepanel.c | 115 src/bin/edi_consolepanel.h | 4 + src/bin/edi_logpanel.c | 46 +++-- src/bin/edi_main.c | 35 +++- src/bin/editor/edi_editor.c| 7 +- src/lib/Makefile.am| 5 +- src/lib/edi_builder.c | 2 +- 37 files changed, 2180 insertions(+), 42 deletions(-) --
[EGIT] [tools/edi] master 01/01: Fix render test and an end of line corner case
ajwillia-ms pushed a commit to branch master.
http://git.enlightenment.org/tools/edi.git/commit/?id=2387ceac88681987a797e475f315a5fdf4fa025a
commit 2387ceac88681987a797e475f315a5fdf4fa025a
Author: Andy Williams a...@andywilliams.me
Date: Tue Nov 18 23:46:24 2014 +
Fix render test and an end of line corner case
---
elm_code/lib/elm_code_widget.c| 2 +-
elm_code/tests/elm_code_test_widget.c | 12 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/elm_code/lib/elm_code_widget.c b/elm_code/lib/elm_code_widget.c
index 9d44163..572fd3a 100644
--- a/elm_code/lib/elm_code_widget.c
+++ b/elm_code/lib/elm_code_widget.c
@@ -39,7 +39,7 @@ static void
_elm_code_widget_fill_line_token(Evas_Textgrid_Cell *cells, int coun
{
int x;
- for (x = start; x = end x count; x++)
+ for (x = start; x = end x = count; x++)
{
cells[x].fg = type;
}
diff --git a/elm_code/tests/elm_code_test_widget.c
b/elm_code/tests/elm_code_test_widget.c
index 27b867e..9f499ac 100644
--- a/elm_code/tests/elm_code_test_widget.c
+++ b/elm_code/tests/elm_code_test_widget.c
@@ -28,12 +28,12 @@ START_TEST (elm_code_widget_token_render_simple_test)
elm_code_file_line_token_add(file, 1, 22+1, 23+1,
ELM_CODE_TOKEN_TYPE_COMMENT);
elm_code_widget_fill_line_tokens(cells, length, line);
- _assert_cell_type(cells[0], ELM_CODE_TOKEN_TYPE_DEFAULT);
- _assert_cell_type(cells[3], ELM_CODE_TOKEN_TYPE_DEFAULT);
- _assert_cell_type(cells[5], ELM_CODE_TOKEN_TYPE_DEFAULT);
- _assert_cell_type(cells[15], ELM_CODE_TOKEN_TYPE_COMMENT);
- _assert_cell_type(cells[19], ELM_CODE_TOKEN_TYPE_DEFAULT);
- _assert_cell_type(cells[22], ELM_CODE_TOKEN_TYPE_COMMENT);
+ _assert_cell_type(cells[1], ELM_CODE_TOKEN_TYPE_DEFAULT);
+ _assert_cell_type(cells[4], ELM_CODE_TOKEN_TYPE_DEFAULT);
+ _assert_cell_type(cells[6], ELM_CODE_TOKEN_TYPE_DEFAULT);
+ _assert_cell_type(cells[16], ELM_CODE_TOKEN_TYPE_COMMENT);
+ _assert_cell_type(cells[20], ELM_CODE_TOKEN_TYPE_DEFAULT);
+ _assert_cell_type(cells[23], ELM_CODE_TOKEN_TYPE_COMMENT);
elm_code_free(code);
}
--
Re: [E-devel] Videos from the dev day are finally up!
I'll take another look into uploading to YouTube tomorrow. Hopefully that'll make things easier for you. On 18 Nov 2014 20:51, Davide Andreoli d...@gurumeditation.it wrote: Great, thanks, downloading right now ... but... the first video... 950 MB for 16 min?? will took 7/9 hours to download here :/ I hope this is super HD raster :D 2014-11-18 17:08 GMT+01:00 Thanatermesis thanatermesis.e...@gmail.com: thx * ! will download these huge ones and view them on house :) 2014-11-18 16:44 GMT+01:00 Tom Hacohen t...@stosb.com: Hey, Sorry for the delay, but the videos are now finally up. You can get them from here: https://phab.enlightenment.org/w/events/enlightenment_developer_day_2014/ Some videos are missing due to issues with the recording equipment. Many thanks to Cedric for recording and editing everything. -- Tom. -- Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration more Get technology previously reserved for billion-dollar corporations, FREE http://pubads.g.doubleclick.net/gampad/clk?id=157005751iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration more Get technology previously reserved for billion-dollar corporations, FREE http://pubads.g.doubleclick.net/gampad/clk?id=157005751iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration more Get technology previously reserved for billion-dollar corporations, FREE http://pubads.g.doubleclick.net/gampad/clk?id=157005751iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration more Get technology previously reserved for billion-dollar corporations, FREE http://pubads.g.doubleclick.net/gampad/clk?id=157005751iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [apps/ephoto] master 01/01: Rework config loading/saving and remember window size and panel state.
okra pushed a commit to branch master.
http://git.enlightenment.org/apps/ephoto.git/commit/?id=b0ef804dd401522bee356fd8d25ceaf7c0a6ba98
commit b0ef804dd401522bee356fd8d25ceaf7c0a6ba98
Author: Stephen Houston smhousto...@gmail.com
Date: Tue Nov 18 21:18:22 2014 -0600
Rework config loading/saving and remember window size and panel state.
---
src/bin/ephoto.h| 15 ++-
src/bin/ephoto_config.c | 60 +
src/bin/ephoto_main.c | 21 ---
src/bin/ephoto_single_browser.c | 10 ++-
src/bin/ephoto_thumb_browser.c | 14 +++---
5 files changed, 64 insertions(+), 56 deletions(-)
diff --git a/src/bin/ephoto.h b/src/bin/ephoto.h
index 0315898..14a7db2 100644
--- a/src/bin/ephoto.h
+++ b/src/bin/ephoto.h
@@ -40,7 +40,7 @@ void ephoto_directory_set(Ephoto *ephoto, const char
*path);
Ephoto_Orient ephoto_file_orient_get(const char *path);
Eina_Boolephoto_config_init(Ephoto *em);
-void ephoto_config_save(Ephoto *em, Eina_Bool instant);
+void ephoto_config_save(Ephoto *em);
void ephoto_config_free(Ephoto *em);
Evas_Object *ephoto_single_browser_add(Ephoto *ephoto, Evas_Object *parent);
@@ -91,15 +91,16 @@ enum _Ephoto_Orient /* matches with exif orientation tag */
struct _Ephoto_Config
{
int config_version;
- const char *editor;
- double slideshow_timeout;
- const char *slideshow_transition;
-
- /* these should be per-window */
int thumb_size;
int thumb_gen_size;
const char *directory;
-
+ double slideshow_timeout;
+ const char *slideshow_transition;
+ const char *editor;
+ int window_width;
+ int window_height;
+ int thumb_browser_panel;
+ int single_browser_panel;
};
struct _Ephoto
diff --git a/src/bin/ephoto_config.c b/src/bin/ephoto_config.c
index a6f561b..b09290a 100644
--- a/src/bin/ephoto_config.c
+++ b/src/bin/ephoto_config.c
@@ -1,12 +1,11 @@
#include ephoto.h
-#define CONFIG_VERSION 7
+#define CONFIG_VERSION 8
static int _ephoto_config_load(Ephoto *ephoto);
static Eina_Bool _ephoto_on_config_save(void *data);
static Eet_Data_Descriptor *edd = NULL;
-static Ecore_Timer *save_timer = NULL;
Eina_Bool
ephoto_config_init(Ephoto *ephoto)
@@ -37,57 +36,36 @@ ephoto_config_init(Ephoto *ephoto)
C_VAL(D, T, slideshow_timeout, EET_T_DOUBLE);
C_VAL(D, T, slideshow_transition, EET_T_STRING);
C_VAL(D, T, editor, EET_T_STRING);
+ C_VAL(D, T, window_width, EET_T_INT);
+ C_VAL(D, T, window_height, EET_T_INT);
+ C_VAL(D, T, thumb_browser_panel, EET_T_INT);
+ C_VAL(D, T, single_browser_panel, EET_T_INT);
switch (_ephoto_config_load(ephoto))
{
case 0:
/* Start a new config */
ephoto-config-config_version = CONFIG_VERSION;
- ephoto-config-thumb_size = 256;
- ephoto-config-thumb_gen_size = 256;
ephoto-config-slideshow_timeout = 4.0;
ephoto-config-slideshow_transition = eina_stringshare_add(fade);
ephoto-config-editor = eina_stringshare_add(gimp %s);
+ ephoto-config-window_width = 900;
+ ephoto-config-window_height = 600;
+ ephoto-config-thumb_browser_panel = 0;
+ ephoto-config-single_browser_panel = 0;
break;
-
- case -1:
- /* Incremental additions */
- if (ephoto-config-config_version 2)
- {
- ephoto-config-slideshow_timeout = 4.0;
- ephoto-config-slideshow_transition =
- eina_stringshare_add(fade);
- }
- if (ephoto-config-config_version 3)
- ephoto-config-editor = eina_stringshare_add(gimp %s);
-
- if (ephoto-config-config_version 5)
- ephoto-config-thumb_gen_size = 256;
-
- ephoto-config-config_version = CONFIG_VERSION;
- break;
-
default:
return EINA_TRUE;
}
- ephoto_config_save(ephoto, EINA_FALSE);
+ ephoto_config_save(ephoto);
return EINA_TRUE;
}
void
-ephoto_config_save(Ephoto *ephoto, Eina_Bool instant)
+ephoto_config_save(Ephoto *ephoto)
{
- if (save_timer)
- {
-ecore_timer_del(save_timer);
-save_timer = NULL;
- }
-
- if (instant)
- _ephoto_on_config_save(ephoto);
- else
- save_timer = ecore_timer_add(5.0, _ephoto_on_config_save, ephoto);
+ _ephoto_on_config_save(ephoto);
}
void
@@ -126,8 +104,12 @@ _ephoto_config_load(Ephoto *ephoto)
}
if (ephoto-config-config_version CONFIG_VERSION)
- return -1;
-
+ {
+ecore_file_unlink(buf);
+ephoto_config_free(ephoto);
+ephoto-config = calloc(1, sizeof(Ephoto_Config));
+return 0;
+ }
return 1;
}
@@ -154,11 +136,5 @@ _ephoto_on_config_save(void *data)
save_end:
ecore_file_unlink(buf2);
- if (save_timer)
- {
-ecore_timer_del(save_timer);
-save_timer = NULL;
- }
-
return ECORE_CALLBACK_CANCEL;
}
diff --git
Re: [E-devel] Videos from the dev day are finally up!
Hurray! Appreciate this, guys! Gonna make some popcorn :) Thank you as well as cedric :) On 11/18/2014 05:44 PM, Tom Hacohen wrote: Hey, Sorry for the delay, but the videos are now finally up. You can get them from here: https://phab.enlightenment.org/w/events/enlightenment_developer_day_2014/ Some videos are missing due to issues with the recording equipment. Many thanks to Cedric for recording and editing everything. -- Tom. -- Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration more Get technology previously reserved for billion-dollar corporations, FREE http://pubads.g.doubleclick.net/gampad/clk?id=157005751iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel -- Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration more Get technology previously reserved for billion-dollar corporations, FREE http://pubads.g.doubleclick.net/gampad/clk?id=157005751iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
[EGIT] [core/efl] master 02/02: Evas GL: Change comment and DBG message
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=54afef04c2a8c285b4e8b010d59f22ef2cec14bb
commit 54afef04c2a8c285b4e8b010d59f22ef2cec14bb
Author: Jean-Philippe Andre jp.an...@samsung.com
Date: Wed Nov 19 15:30:12 2014 +0900
Evas GL: Change comment and DBG message
---
src/modules/evas/engines/software_generic/evas_engine.c | 14 +-
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/modules/evas/engines/software_generic/evas_engine.c
b/src/modules/evas/engines/software_generic/evas_engine.c
index ccb6ccb..f8e1504 100644
--- a/src/modules/evas/engines/software_generic/evas_engine.c
+++ b/src/modules/evas/engines/software_generic/evas_engine.c
@@ -3619,12 +3619,15 @@ gl_sym_init(void)
#undef FINDSYM
#undef FALLBAK
- // Checking to see if this function exists is a poor but reasonable way to
- // check if it's gles but it works for now
- // FIXME: This is wrong as OpenGL 4.1 also supports this function.
- if (_sym_glGetShaderPrecisionFormat !=
(typeof(_sym_glGetShaderPrecisionFormat))sym_missing )
+ /*
+* For desktop OpenGL we wrap these:
+* - glGetShaderPrecisionFormat
+* - glReleaseShaderCompiler
+* - glShaderBinary
+*/
+ if (_sym_glGetShaderPrecisionFormat !=
(typeof(_sym_glGetShaderPrecisionFormat))sym_missing )
{
-DBG(GL Library is GLES.);
+DBG(The GL library is OpenGL ES or OpenGL 4.1+);
gl_lib_is_gles = 1;
}
@@ -4051,6 +4054,7 @@ override_gl_apis(Evas_GL_API *api)
{
// Override functions wrapped by Evas_GL
// GLES2.0 API compat on top of desktop gl
+// Note that Open GL 4.1+ provides these 3 functions as well
ORD(glGetShaderPrecisionFormat);
ORD(glReleaseShaderCompiler);
ORD(glShaderBinary);
--
[EGIT] [core/efl] master 01/02: Evas GL: Wrap glGetString for VERSION
jpeg pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=1a403849dca1c832c43bf4abf8226da63570fbca
commit 1a403849dca1c832c43bf4abf8226da63570fbca
Author: Jean-Philippe Andre jp.an...@samsung.com
Date: Wed Nov 19 15:08:00 2014 +0900
Evas GL: Wrap glGetString for VERSION
- glGetString(GL_VERSION) should not return OpenGL ES 3.0 because
GLESv3 is not supported yet.
- GL_EXTENSIONS should return only the list of supported extensions
-- disabled for now as the whitelist of safe extensions is way
too small.
---
src/modules/evas/engines/gl_common/evas_gl_api.c | 81 +++---
.../evas/engines/gl_common/evas_gl_api_ext.c | 35 ++
.../evas/engines/gl_common/evas_gl_api_ext.h | 2 +-
src/modules/evas/engines/gl_common/evas_gl_core.c | 2 +-
.../evas/engines/software_generic/evas_engine.c| 1 +
5 files changed, 99 insertions(+), 22 deletions(-)
diff --git a/src/modules/evas/engines/gl_common/evas_gl_api.c
b/src/modules/evas/engines/gl_common/evas_gl_api.c
index 477e831..6007b7c 100644
--- a/src/modules/evas/engines/gl_common/evas_gl_api.c
+++ b/src/modules/evas/engines/gl_common/evas_gl_api.c
@@ -531,6 +531,76 @@ _evgl_glGetIntegerv(GLenum pname, GLint* params)
glGetIntegerv(pname, params);
}
+static const GLubyte *
+_evgl_glGetString(GLenum name)
+{
+ static char _version[64] = {0};
+ EVGL_Resource *rsc;
+ const GLubyte *ret;
+ char *r;
+
+ /* We wrap two values here:
+*
+* VERSION: Since OpenGL ES 3 is not supported yet, we return OpenGL ES 2.0
+* The string is not modified on desktop GL (eg. 4.4.0 NVIDIA 343.22)
+* GLES 3 support is not exposed because apps can't use GLES 3 core
+* functions yet.
+*
+* EXTENSIONS: This should return the list of GL extensions supported by
Evas GL
+* -- FIXME: Unfortunately the whitelist does not contain enough
extensions
+* especially for desktop GL and needs updating as OpenGL evolves.
+*/
+
+ /*
+* Note from Khronos: If an error is generated, glGetString returns 0.
+* I decided not to call glGetString if there is no context as this is
+* known to cause crashes on certain GL drivers (eg. Nvidia binary blob).
+* -- crash moved to app side if they blindly call strstr()
+*/
+
+ if ((!(rsc = _evgl_tls_resource_get())) || !rsc-current_ctx)
+ {
+ERR(Current context is NULL, not calling glGetString);
+// This sets evas_gl_error_get instead of glGetError...
+evas_gl_common_error_set(NULL, EVAS_GL_BAD_CONTEXT);
+return NULL;
+ }
+
+ switch (name)
+ {
+ case GL_VENDOR:
+ case GL_RENDERER:
+ case GL_SHADING_LANGUAGE_VERSION: // wrap me?
+break;
+ case GL_VERSION:
+ret = glGetString(GL_VERSION);
+if (!ret) return NULL;
+if (strstr((const char *) ret, OpenGL ES 3))
+ {
+ // We try not to remove the vendor fluff (contains driver version)
+ strncpy(_version, (const char *) ret, sizeof(_version));
+ r = strchr(_version, '3');
+ *r++ = '2';
+ *r++ = '.';
+ *r++ = '0';
+ *r = ' ';
+ _version[sizeof(_version) - 1] = '\0';
+ return (const GLubyte *) _version;
+ }
+return ret;
+ case GL_EXTENSIONS:
+// return (GLubyte *) evgl_api_ext_string_get
+// (EINA_TRUE, (rsc-current_ctx-version == EVAS_GL_GLES_1_X));
+break;
+ default:
+// GL_INVALID_ENUM is generated if name is not an accepted value.
+WRN(Unknown string requested: %x, (unsigned int) name);
+break;
+ }
+
+ return glGetString(name);
+}
+
static void
_evgl_glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum
format, GLenum type, void* pixels)
{
@@ -1458,13 +1528,7 @@ _evgld_glGetString(GLenum name)
const GLubyte *ret = NULL;
EVGL_FUNC_BEGIN();
-#if 0
- if (name == GL_EXTENSIONS)
- return (GLubyte *)_gl_ext_string; //glGetString(GL_EXTENSIONS);
- else
- return glGetString(name);
-#endif
- ret = glGetString(name);
+ ret = _evgl_glGetString(name);
GLERR(__FUNCTION__, __FILE__, __LINE__, );
EVGL_FUNC_END();
return ret;
@@ -2487,7 +2551,7 @@ _normal_gl_api_get(Evas_GL_API *funcs)
ORD(glGetShaderInfoLog);
// ORD(glGetShaderPrecisionFormat);
ORD(glGetShaderSource);
- ORD(glGetString);
+// ORD(glGetString);
ORD(glGetTexParameterfv);
ORD(glGetTexParameteriv);
ORD(glGetUniformfv);
@@ -2575,6 +2639,7 @@ _normal_gl_api_get(Evas_GL_API *funcs)
ORD(glDisable);
ORD(glEnable);
ORD(glGetIntegerv);
+ ORD(glGetString);
ORD(glReadPixels);
ORD(glScissor);
ORD(glViewport);
diff --git a/src/modules/evas/engines/gl_common/evas_gl_api_ext.c
b/src/modules/evas/engines/gl_common/evas_gl_api_ext.c
index 537b9dd..d19d2eb 100644
---
Re: [E-devel] [EGIT] [core/elementary] elementary-1.12 01/01: Update russian translation
Hello. On 18/11/14 20:48, Sebastian Dransfeld wrote: And translations are often not up-to-date on .0 releases, so if you want good translations, this is good. That is also true for better docs or updated examples, more tests, etc. Where do we draw that line? regards Stefan Schmidt -- Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration more Get technology previously reserved for billion-dollar corporations, FREE http://pubads.g.doubleclick.net/gampad/clk?id=157005751iu=/4140/ostg.clktrk ___ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
